diff --git a/29/32/arm_armv7-a-neon/source-based/libstagefright_bufferqueue_helper.so.lsdump b/29/32/arm_armv7-a-neon/source-based/libstagefright_bufferqueue_helper.so.lsdump
index f78a8c9..ecf3f4a 100644
--- a/29/32/arm_armv7-a-neon/source-based/libstagefright_bufferqueue_helper.so.lsdump
+++ b/29/32/arm_armv7-a-neon/source-based/libstagefright_bufferqueue_helper.so.lsdump
@@ -5,15 +5,15 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_AUDIO_CHANNELTYPE [16]",
    "name" : "OMX_AUDIO_CHANNELTYPE [16]",
-   "referenced_type" : "type-1637",
-   "self_type" : "type-1642",
+   "referenced_type" : "type-1635",
+   "self_type" : "type-1641",
    "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-1499",
+   "referenced_type" : "type-1498",
    "self_type" : "type-1515",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -30,8 +30,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::MediaImage2::PlaneInfo [4]",
    "name" : "android::MediaImage2::PlaneInfo [4]",
-   "referenced_type" : "type-2423",
-   "self_type" : "type-2422",
+   "referenced_type" : "type-2426",
+   "self_type" : "type-2425",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
@@ -39,8 +39,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::MediaImage::PlaneInfo [3]",
    "name" : "android::MediaImage::PlaneInfo [3]",
-   "referenced_type" : "type-2418",
-   "self_type" : "type-2417",
+   "referenced_type" : "type-2421",
+   "self_type" : "type-2420",
    "size" : 60,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
@@ -81,7 +81,7 @@
    "linker_set_key" : "int [3]",
    "name" : "int [3]",
    "referenced_type" : "type-4",
-   "self_type" : "type-2202",
+   "self_type" : "type-2205",
    "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-2202",
-   "self_type" : "type-2201",
+   "referenced_type" : "type-2205",
+   "self_type" : "type-2204",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
   },
@@ -117,7 +117,7 @@
    "linker_set_key" : "unsigned char [16]",
    "name" : "unsigned char [16]",
    "referenced_type" : "type-90",
-   "self_type" : "type-2311",
+   "self_type" : "type-2314",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -126,7 +126,7 @@
    "linker_set_key" : "unsigned char [1]",
    "name" : "unsigned char [1]",
    "referenced_type" : "type-90",
-   "self_type" : "type-1572",
+   "self_type" : "type-1567",
    "size" : 1,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -135,7 +135,7 @@
    "linker_set_key" : "unsigned char [256]",
    "name" : "unsigned char [256]",
    "referenced_type" : "type-90",
-   "self_type" : "type-2312",
+   "self_type" : "type-2315",
    "size" : 256,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -144,7 +144,7 @@
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
    "referenced_type" : "type-90",
-   "self_type" : "type-2179",
+   "self_type" : "type-2182",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -153,7 +153,7 @@
    "linker_set_key" : "unsigned char [64]",
    "name" : "unsigned char [64]",
    "referenced_type" : "type-90",
-   "self_type" : "type-2308",
+   "self_type" : "type-2311",
    "size" : 64,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -204,8 +204,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-1242",
-   "self_type" : "type-1242",
+   "referenced_type" : "type-1245",
+   "self_type" : "type-1245",
    "size" : 2
   },
   {
@@ -246,8 +246,8 @@
    "alignment" : 8,
    "linker_set_key" : "long double",
    "name" : "long double",
-   "referenced_type" : "type-1453",
-   "self_type" : "type-1453",
+   "referenced_type" : "type-1456",
+   "self_type" : "type-1456",
    "size" : 8
   },
   {
@@ -760,6 +760,9 @@
    "name" : "_ZN7android18BnProducerListener18needsReleaseNotifyEv"
   },
   {
+   "name" : "_ZN7android18BnProducerListener18onBuffersDiscardedERKNSt3__16vectorIiNS1_9allocatorIiEEEE"
+  },
+  {
    "name" : "_ZN7android18BpConsumerListenerD0Ev"
   },
   {
@@ -3200,8 +3203,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AACPROFILETYPE",
    "name" : "OMX_AUDIO_AACPROFILETYPE",
-   "referenced_type" : "type-1676",
-   "self_type" : "type-1676",
+   "referenced_type" : "type-1671",
+   "self_type" : "type-1671",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3254,8 +3257,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
    "name" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
-   "referenced_type" : "type-1668",
-   "self_type" : "type-1668",
+   "referenced_type" : "type-1670",
+   "self_type" : "type-1670",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3352,8 +3355,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRBANDMODETYPE",
    "name" : "OMX_AUDIO_AMRBANDMODETYPE",
-   "referenced_type" : "type-1890",
-   "self_type" : "type-1890",
+   "referenced_type" : "type-1881",
+   "self_type" : "type-1881",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3398,8 +3401,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRDTXMODETYPE",
    "name" : "OMX_AUDIO_AMRDTXMODETYPE",
-   "referenced_type" : "type-1901",
-   "self_type" : "type-1901",
+   "referenced_type" : "type-1892",
+   "self_type" : "type-1892",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3448,8 +3451,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
    "name" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
-   "referenced_type" : "type-1877",
-   "self_type" : "type-1877",
+   "referenced_type" : "type-1862",
+   "self_type" : "type-1862",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3498,8 +3501,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CDMARATETYPE",
    "name" : "OMX_AUDIO_CDMARATETYPE",
-   "referenced_type" : "type-2021",
-   "self_type" : "type-2021",
+   "referenced_type" : "type-2013",
+   "self_type" : "type-2013",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3540,8 +3543,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CHANNELMODETYPE",
    "name" : "OMX_AUDIO_CHANNELMODETYPE",
-   "referenced_type" : "type-1652",
-   "self_type" : "type-1652",
+   "referenced_type" : "type-1651",
+   "self_type" : "type-1651",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3606,8 +3609,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CHANNELTYPE",
    "name" : "OMX_AUDIO_CHANNELTYPE",
-   "referenced_type" : "type-1637",
-   "self_type" : "type-1637",
+   "referenced_type" : "type-1635",
+   "self_type" : "type-1635",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3748,8 +3751,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CODINGTYPE",
    "name" : "OMX_AUDIO_CODINGTYPE",
-   "referenced_type" : "type-1618",
-   "self_type" : "type-1618",
+   "referenced_type" : "type-1616",
+   "self_type" : "type-1616",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3790,8 +3793,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_ECHOCANTYPE",
    "name" : "OMX_AUDIO_ECHOCANTYPE",
-   "referenced_type" : "type-2196",
-   "self_type" : "type-2196",
+   "referenced_type" : "type-2199",
+   "self_type" : "type-2199",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3828,8 +3831,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G723RATE",
    "name" : "OMX_AUDIO_G723RATE",
-   "referenced_type" : "type-1808",
-   "self_type" : "type-1808",
+   "referenced_type" : "type-1799",
+   "self_type" : "type-1799",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3874,8 +3877,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G726MODE",
    "name" : "OMX_AUDIO_G726MODE",
-   "referenced_type" : "type-1831",
-   "self_type" : "type-1831",
+   "referenced_type" : "type-1822",
+   "self_type" : "type-1822",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3916,8 +3919,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G729TYPE",
    "name" : "OMX_AUDIO_G729TYPE",
-   "referenced_type" : "type-1851",
-   "self_type" : "type-1851",
+   "referenced_type" : "type-1845",
+   "self_type" : "type-1845",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3974,8 +3977,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDIFORMATTYPE",
    "name" : "OMX_AUDIO_MIDIFORMATTYPE",
-   "referenced_type" : "type-2087",
-   "self_type" : "type-2087",
+   "referenced_type" : "type-2079",
+   "self_type" : "type-2079",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4028,8 +4031,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
    "name" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
-   "referenced_type" : "type-2169",
-   "self_type" : "type-2169",
+   "referenced_type" : "type-2168",
+   "self_type" : "type-2168",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4070,8 +4073,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
    "name" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
-   "referenced_type" : "type-2121",
-   "self_type" : "type-2121",
+   "referenced_type" : "type-2113",
+   "self_type" : "type-2113",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4116,8 +4119,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
    "name" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
-   "referenced_type" : "type-2111",
-   "self_type" : "type-2111",
+   "referenced_type" : "type-2102",
+   "self_type" : "type-2102",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4154,8 +4157,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
    "name" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
-   "referenced_type" : "type-1660",
-   "self_type" : "type-1660",
+   "referenced_type" : "type-1656",
+   "self_type" : "type-1656",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4192,8 +4195,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PCMMODETYPE",
    "name" : "OMX_AUDIO_PCMMODETYPE",
-   "referenced_type" : "type-1633",
-   "self_type" : "type-1633",
+   "referenced_type" : "type-1628",
+   "self_type" : "type-1628",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4250,8 +4253,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_RAFORMATTYPE",
    "name" : "OMX_AUDIO_RAFORMATTYPE",
-   "referenced_type" : "type-1752",
-   "self_type" : "type-1752",
+   "referenced_type" : "type-1746",
+   "self_type" : "type-1746",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4284,8 +4287,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
    "name" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
-   "referenced_type" : "type-1775",
-   "self_type" : "type-1775",
+   "referenced_type" : "type-1766",
+   "self_type" : "type-1766",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4318,8 +4321,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_STEREOWIDENINGTYPE",
    "name" : "OMX_AUDIO_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-2192",
-   "self_type" : "type-2192",
+   "referenced_type" : "type-2195",
+   "self_type" : "type-2195",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4360,8 +4363,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_WMAFORMATTYPE",
    "name" : "OMX_AUDIO_WMAFORMATTYPE",
-   "referenced_type" : "type-1719",
-   "self_type" : "type-1719",
+   "referenced_type" : "type-1711",
+   "self_type" : "type-1711",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4402,8 +4405,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_WMAPROFILETYPE",
    "name" : "OMX_AUDIO_WMAPROFILETYPE",
-   "referenced_type" : "type-1732",
-   "self_type" : "type-1732",
+   "referenced_type" : "type-1722",
+   "self_type" : "type-1722",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4428,8 +4431,8 @@
    ],
    "linker_set_key" : "OMX_BOOL",
    "name" : "OMX_BOOL",
-   "referenced_type" : "type-1293",
-   "self_type" : "type-1293",
+   "referenced_type" : "type-1296",
+   "self_type" : "type-1296",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "underlying_type" : "type-2",
@@ -4466,8 +4469,8 @@
    ],
    "linker_set_key" : "OMX_BUFFERSUPPLIERTYPE",
    "name" : "OMX_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-1601",
-   "self_type" : "type-1601",
+   "referenced_type" : "type-1599",
+   "self_type" : "type-1599",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -4520,8 +4523,8 @@
    ],
    "linker_set_key" : "OMX_COLORBLENDTYPE",
    "name" : "OMX_COLORBLENDTYPE",
-   "referenced_type" : "type-2209",
-   "self_type" : "type-2209",
+   "referenced_type" : "type-2212",
+   "self_type" : "type-2212",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4762,8 +4765,8 @@
    ],
    "linker_set_key" : "OMX_COLOR_FORMATTYPE",
    "name" : "OMX_COLOR_FORMATTYPE",
-   "referenced_type" : "type-2199",
-   "self_type" : "type-2199",
+   "referenced_type" : "type-2202",
+   "self_type" : "type-2202",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4808,8 +4811,8 @@
    ],
    "linker_set_key" : "OMX_COMMANDTYPE",
    "name" : "OMX_COMMANDTYPE",
-   "referenced_type" : "type-1485",
-   "self_type" : "type-1485",
+   "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-2",
@@ -4846,8 +4849,8 @@
    ],
    "linker_set_key" : "OMX_DATAUNITENCAPSULATIONTYPE",
    "name" : "OMX_DATAUNITENCAPSULATIONTYPE",
-   "referenced_type" : "type-2236",
-   "self_type" : "type-2236",
+   "referenced_type" : "type-2239",
+   "self_type" : "type-2239",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4888,8 +4891,8 @@
    ],
    "linker_set_key" : "OMX_DATAUNITTYPE",
    "name" : "OMX_DATAUNITTYPE",
-   "referenced_type" : "type-2235",
-   "self_type" : "type-2235",
+   "referenced_type" : "type-2238",
+   "self_type" : "type-2238",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4914,8 +4917,8 @@
    ],
    "linker_set_key" : "OMX_DIRTYPE",
    "name" : "OMX_DIRTYPE",
-   "referenced_type" : "type-1452",
-   "self_type" : "type-1452",
+   "referenced_type" : "type-1455",
+   "self_type" : "type-1455",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "underlying_type" : "type-2",
@@ -4956,8 +4959,8 @@
    ],
    "linker_set_key" : "OMX_DITHERTYPE",
    "name" : "OMX_DITHERTYPE",
-   "referenced_type" : "type-2238",
-   "self_type" : "type-2238",
+   "referenced_type" : "type-2241",
+   "self_type" : "type-2241",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4982,8 +4985,8 @@
    ],
    "linker_set_key" : "OMX_ENDIANTYPE",
    "name" : "OMX_ENDIANTYPE",
-   "referenced_type" : "type-1460",
-   "self_type" : "type-1460",
+   "referenced_type" : "type-1459",
+   "self_type" : "type-1459",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "underlying_type" : "type-2",
@@ -5160,8 +5163,8 @@
    ],
    "linker_set_key" : "OMX_ERRORTYPE",
    "name" : "OMX_ERRORTYPE",
-   "referenced_type" : "type-1494",
-   "self_type" : "type-1494",
+   "referenced_type" : "type-1495",
+   "self_type" : "type-1495",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-4",
@@ -5234,8 +5237,8 @@
    ],
    "linker_set_key" : "OMX_EVENTTYPE",
    "name" : "OMX_EVENTTYPE",
-   "referenced_type" : "type-1588",
-   "self_type" : "type-1588",
+   "referenced_type" : "type-1589",
+   "self_type" : "type-1589",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -5300,8 +5303,8 @@
    ],
    "linker_set_key" : "OMX_EXPOSURECONTROLTYPE",
    "name" : "OMX_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-2221",
-   "self_type" : "type-2221",
+   "referenced_type" : "type-2224",
+   "self_type" : "type-2224",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -5334,8 +5337,8 @@
    ],
    "linker_set_key" : "OMX_EXTRADATATYPE",
    "name" : "OMX_EXTRADATATYPE",
-   "referenced_type" : "type-1561",
-   "self_type" : "type-1561",
+   "referenced_type" : "type-1556",
+   "self_type" : "type-1556",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -5380,8 +5383,8 @@
    ],
    "linker_set_key" : "OMX_FOCUSSTATUSTYPE",
    "name" : "OMX_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-2246",
-   "self_type" : "type-2246",
+   "referenced_type" : "type-2249",
+   "self_type" : "type-2249",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -5450,8 +5453,8 @@
    ],
    "linker_set_key" : "OMX_IMAGEFILTERTYPE",
    "name" : "OMX_IMAGEFILTERTYPE",
-   "referenced_type" : "type-2205",
-   "self_type" : "type-2205",
+   "referenced_type" : "type-2208",
+   "self_type" : "type-2208",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -5516,8 +5519,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_CODINGTYPE",
    "name" : "OMX_IMAGE_CODINGTYPE",
-   "referenced_type" : "type-2297",
-   "self_type" : "type-2297",
+   "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-2",
@@ -5566,8 +5569,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_FLASHCONTROLTYPE",
    "name" : "OMX_IMAGE_FLASHCONTROLTYPE",
-   "referenced_type" : "type-2300",
-   "self_type" : "type-2300",
+   "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-2",
@@ -5608,8 +5611,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_FOCUSCONTROLTYPE",
    "name" : "OMX_IMAGE_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-2303",
-   "self_type" : "type-2303",
+   "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-2",
@@ -5658,8 +5661,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_HUFFMANTABLETYPE",
    "name" : "OMX_IMAGE_HUFFMANTABLETYPE",
-   "referenced_type" : "type-2309",
-   "self_type" : "type-2309",
+   "referenced_type" : "type-2312",
+   "self_type" : "type-2312",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "underlying_type" : "type-2",
@@ -5700,8 +5703,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
    "name" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-2306",
-   "self_type" : "type-2306",
+   "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-2",
@@ -6560,8 +6563,8 @@
    ],
    "linker_set_key" : "OMX_METADATACHARSETTYPE",
    "name" : "OMX_METADATACHARSETTYPE",
-   "referenced_type" : "type-2345",
-   "self_type" : "type-2345",
+   "referenced_type" : "type-2348",
+   "self_type" : "type-2348",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6602,8 +6605,8 @@
    ],
    "linker_set_key" : "OMX_METADATASCOPETYPE",
    "name" : "OMX_METADATASCOPETYPE",
-   "referenced_type" : "type-2346",
-   "self_type" : "type-2346",
+   "referenced_type" : "type-2349",
+   "self_type" : "type-2349",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6640,8 +6643,8 @@
    ],
    "linker_set_key" : "OMX_METADATASEARCHMODETYPE",
    "name" : "OMX_METADATASEARCHMODETYPE",
-   "referenced_type" : "type-2347",
-   "self_type" : "type-2347",
+   "referenced_type" : "type-2350",
+   "self_type" : "type-2350",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6678,8 +6681,8 @@
    ],
    "linker_set_key" : "OMX_METERINGTYPE",
    "name" : "OMX_METERINGTYPE",
-   "referenced_type" : "type-2242",
-   "self_type" : "type-2242",
+   "referenced_type" : "type-2245",
+   "self_type" : "type-2245",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -6720,8 +6723,8 @@
    ],
    "linker_set_key" : "OMX_MIRRORTYPE",
    "name" : "OMX_MIRRORTYPE",
-   "referenced_type" : "type-2213",
-   "self_type" : "type-2213",
+   "referenced_type" : "type-2216",
+   "self_type" : "type-2216",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -6796,8 +6799,8 @@
    ],
    "linker_set_key" : "OMX_OTHER_FORMATTYPE",
    "name" : "OMX_OTHER_FORMATTYPE",
-   "referenced_type" : "type-2314",
-   "self_type" : "type-2314",
+   "referenced_type" : "type-2317",
+   "self_type" : "type-2317",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -6838,8 +6841,8 @@
    ],
    "linker_set_key" : "OMX_PORTDOMAINTYPE",
    "name" : "OMX_PORTDOMAINTYPE",
-   "referenced_type" : "type-2332",
-   "self_type" : "type-2332",
+   "referenced_type" : "type-2335",
+   "self_type" : "type-2335",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6888,8 +6891,8 @@
    ],
    "linker_set_key" : "OMX_STATETYPE",
    "name" : "OMX_STATETYPE",
-   "referenced_type" : "type-1488",
-   "self_type" : "type-1488",
+   "referenced_type" : "type-1490",
+   "self_type" : "type-1490",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -6922,8 +6925,8 @@
    ],
    "linker_set_key" : "OMX_SUSPENSIONPOLICYTYPE",
    "name" : "OMX_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-2336",
-   "self_type" : "type-2336",
+   "referenced_type" : "type-2339",
+   "self_type" : "type-2339",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6956,8 +6959,8 @@
    ],
    "linker_set_key" : "OMX_SUSPENSIONTYPE",
    "name" : "OMX_SUSPENSIONTYPE",
-   "referenced_type" : "type-2338",
-   "self_type" : "type-2338",
+   "referenced_type" : "type-2341",
+   "self_type" : "type-2341",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6994,8 +6997,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CLOCKSTATE",
    "name" : "OMX_TIME_CLOCKSTATE",
-   "referenced_type" : "type-2321",
-   "self_type" : "type-2321",
+   "referenced_type" : "type-2324",
+   "self_type" : "type-2324",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -7032,8 +7035,8 @@
    ],
    "linker_set_key" : "OMX_TIME_REFCLOCKTYPE",
    "name" : "OMX_TIME_REFCLOCKTYPE",
-   "referenced_type" : "type-2319",
-   "self_type" : "type-2319",
+   "referenced_type" : "type-2322",
+   "self_type" : "type-2322",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -7066,8 +7069,8 @@
    ],
    "linker_set_key" : "OMX_TIME_SEEKMODETYPE",
    "name" : "OMX_TIME_SEEKMODETYPE",
-   "referenced_type" : "type-2315",
-   "self_type" : "type-2315",
+   "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-2",
@@ -7104,8 +7107,8 @@
    ],
    "linker_set_key" : "OMX_TIME_UPDATETYPE",
    "name" : "OMX_TIME_UPDATETYPE",
-   "referenced_type" : "type-2318",
-   "self_type" : "type-2318",
+   "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-2",
@@ -7158,8 +7161,8 @@
    ],
    "linker_set_key" : "OMX_TRANSITIONEFFECTTYPE",
    "name" : "OMX_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-2233",
-   "self_type" : "type-2233",
+   "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-2",
@@ -7264,8 +7267,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCLEVELTYPE",
    "name" : "OMX_VIDEO_AVCLEVELTYPE",
-   "referenced_type" : "type-2280",
-   "self_type" : "type-2280",
+   "referenced_type" : "type-2283",
+   "self_type" : "type-2283",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7302,8 +7305,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
    "name" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
-   "referenced_type" : "type-2282",
-   "self_type" : "type-2282",
+   "referenced_type" : "type-2285",
+   "self_type" : "type-2285",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7356,8 +7359,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCPROFILETYPE",
    "name" : "OMX_VIDEO_AVCPROFILETYPE",
-   "referenced_type" : "type-2279",
-   "self_type" : "type-2279",
+   "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-2",
@@ -7394,8 +7397,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCSLICEMODETYPE",
    "name" : "OMX_VIDEO_AVCSLICEMODETYPE",
-   "referenced_type" : "type-2293",
-   "self_type" : "type-2293",
+   "referenced_type" : "type-2296",
+   "self_type" : "type-2296",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7476,8 +7479,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CODINGTYPE",
    "name" : "OMX_VIDEO_CODINGTYPE",
-   "referenced_type" : "type-2248",
-   "self_type" : "type-2248",
+   "referenced_type" : "type-2251",
+   "self_type" : "type-2251",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7526,8 +7529,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONTROLRATETYPE",
    "name" : "OMX_VIDEO_CONTROLRATETYPE",
-   "referenced_type" : "type-2253",
-   "self_type" : "type-2253",
+   "referenced_type" : "type-2256",
+   "self_type" : "type-2256",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7584,8 +7587,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_H263LEVELTYPE",
    "name" : "OMX_VIDEO_H263LEVELTYPE",
-   "referenced_type" : "type-2264",
-   "self_type" : "type-2264",
+   "referenced_type" : "type-2267",
+   "self_type" : "type-2267",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7646,8 +7649,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_H263PROFILETYPE",
    "name" : "OMX_VIDEO_H263PROFILETYPE",
-   "referenced_type" : "type-2263",
-   "self_type" : "type-2263",
+   "referenced_type" : "type-2266",
+   "self_type" : "type-2266",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7684,8 +7687,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_INTRAREFRESHTYPE",
    "name" : "OMX_VIDEO_INTRAREFRESHTYPE",
-   "referenced_type" : "type-2259",
-   "self_type" : "type-2259",
+   "referenced_type" : "type-2262",
+   "self_type" : "type-2262",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7726,8 +7729,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MOTIONVECTORTYPE",
    "name" : "OMX_VIDEO_MOTIONVECTORTYPE",
-   "referenced_type" : "type-2257",
-   "self_type" : "type-2257",
+   "referenced_type" : "type-2260",
+   "self_type" : "type-2260",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7772,8 +7775,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG2LEVELTYPE",
    "name" : "OMX_VIDEO_MPEG2LEVELTYPE",
-   "referenced_type" : "type-2269",
-   "self_type" : "type-2269",
+   "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-2",
@@ -7822,8 +7825,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG2PROFILETYPE",
    "name" : "OMX_VIDEO_MPEG2PROFILETYPE",
-   "referenced_type" : "type-2268",
-   "self_type" : "type-2268",
+   "referenced_type" : "type-2271",
+   "self_type" : "type-2271",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7888,8 +7891,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG4LEVELTYPE",
    "name" : "OMX_VIDEO_MPEG4LEVELTYPE",
-   "referenced_type" : "type-2272",
-   "self_type" : "type-2272",
+   "referenced_type" : "type-2275",
+   "self_type" : "type-2275",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7978,8 +7981,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG4PROFILETYPE",
    "name" : "OMX_VIDEO_MPEG4PROFILETYPE",
-   "referenced_type" : "type-2271",
-   "self_type" : "type-2271",
+   "referenced_type" : "type-2274",
+   "self_type" : "type-2274",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -8036,8 +8039,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PICTURETYPE",
    "name" : "OMX_VIDEO_PICTURETYPE",
-   "referenced_type" : "type-2265",
-   "self_type" : "type-2265",
+   "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-2",
@@ -8078,8 +8081,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_RVFORMATTYPE",
    "name" : "OMX_VIDEO_RVFORMATTYPE",
-   "referenced_type" : "type-2276",
-   "self_type" : "type-2276",
+   "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-2",
@@ -8120,8 +8123,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_WMVFORMATTYPE",
    "name" : "OMX_VIDEO_WMVFORMATTYPE",
-   "referenced_type" : "type-2274",
-   "self_type" : "type-2274",
+   "referenced_type" : "type-2277",
+   "self_type" : "type-2277",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -8186,8 +8189,8 @@
    ],
    "linker_set_key" : "OMX_WHITEBALCONTROLTYPE",
    "name" : "OMX_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-2219",
-   "self_type" : "type-2219",
+   "referenced_type" : "type-2222",
+   "self_type" : "type-2222",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -8228,8 +8231,8 @@
    ],
    "linker_set_key" : "android::ADebug::Level",
    "name" : "android::ADebug::Level",
-   "referenced_type" : "type-2292",
-   "self_type" : "type-2292",
+   "referenced_type" : "type-2295",
+   "self_type" : "type-2295",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
    "underlying_type" : "type-2",
@@ -8332,8 +8335,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::MatrixCoeffs",
    "name" : "android::ColorAspects::MatrixCoeffs",
-   "referenced_type" : "type-2432",
-   "self_type" : "type-2432",
+   "referenced_type" : "type-2435",
+   "self_type" : "type-2435",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8378,8 +8381,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::Primaries",
    "name" : "android::ColorAspects::Primaries",
-   "referenced_type" : "type-2430",
-   "self_type" : "type-2430",
+   "referenced_type" : "type-2433",
+   "self_type" : "type-2433",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8408,8 +8411,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::Range",
    "name" : "android::ColorAspects::Range",
-   "referenced_type" : "type-2429",
-   "self_type" : "type-2429",
+   "referenced_type" : "type-2432",
+   "self_type" : "type-2432",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8532,8 +8535,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::Transfer",
    "name" : "android::ColorAspects::Transfer",
-   "referenced_type" : "type-2431",
-   "self_type" : "type-2431",
+   "referenced_type" : "type-2434",
+   "self_type" : "type-2434",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8566,8 +8569,8 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorRange",
    "name" : "android::ColorUtils::ColorRange",
-   "referenced_type" : "type-1197",
-   "self_type" : "type-1197",
+   "referenced_type" : "type-1195",
+   "self_type" : "type-1195",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
    "underlying_type" : "type-2",
@@ -8632,8 +8635,8 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorStandard",
    "name" : "android::ColorUtils::ColorStandard",
-   "referenced_type" : "type-1187",
-   "self_type" : "type-1187",
+   "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-2",
@@ -8690,8 +8693,8 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorTransfer",
    "name" : "android::ColorUtils::ColorTransfer",
-   "referenced_type" : "type-1189",
-   "self_type" : "type-1189",
+   "referenced_type" : "type-1192",
+   "self_type" : "type-1192",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
    "underlying_type" : "type-2",
@@ -8756,8 +8759,8 @@
    ],
    "linker_set_key" : "android::HDRStaticInfo::ID",
    "name" : "android::HDRStaticInfo::ID",
-   "referenced_type" : "type-2436",
-   "self_type" : "type-2436",
+   "referenced_type" : "type-2439",
+   "self_type" : "type-2439",
    "size" : 1,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-90",
@@ -8840,8 +8843,8 @@
    ],
    "linker_set_key" : "android::MediaImage2::Type",
    "name" : "android::MediaImage2::Type",
-   "referenced_type" : "type-2421",
-   "self_type" : "type-2421",
+   "referenced_type" : "type-2424",
+   "self_type" : "type-2424",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8892,8 +8895,8 @@
    ],
    "linker_set_key" : "android::MediaImage::Type",
    "name" : "android::MediaImage::Type",
-   "referenced_type" : "type-2416",
-   "self_type" : "type-2416",
+   "referenced_type" : "type-2419",
+   "self_type" : "type-2419",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8926,8 +8929,8 @@
    ],
    "linker_set_key" : "android::MetadataBufferType",
    "name" : "android::MetadataBufferType",
-   "referenced_type" : "type-1234",
-   "self_type" : "type-1234",
+   "referenced_type" : "type-1235",
+   "self_type" : "type-1235",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/MetadataBufferType.h",
    "underlying_type" : "type-4",
@@ -8952,8 +8955,8 @@
    ],
    "linker_set_key" : "android::ProcessState::CallRestriction",
    "name" : "android::ProcessState::CallRestriction",
-   "referenced_type" : "type-1255",
-   "self_type" : "type-1255",
+   "referenced_type" : "type-1259",
+   "self_type" : "type-1259",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h",
    "underlying_type" : "type-4",
@@ -8970,8 +8973,8 @@
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-2657",
-   "self_type" : "type-2657",
+   "referenced_type" : "type-2660",
+   "self_type" : "type-2660",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "underlying_type" : "type-2",
@@ -8988,8 +8991,8 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-2652",
-   "self_type" : "type-2652",
+   "referenced_type" : "type-2655",
+   "self_type" : "type-2655",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "underlying_type" : "type-2",
@@ -9014,8 +9017,8 @@
    ],
    "linker_set_key" : "android::base::LogId",
    "name" : "android::base::LogId",
-   "referenced_type" : "type-4704",
-   "self_type" : "type-4704",
+   "referenced_type" : "type-4711",
+   "self_type" : "type-4711",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "type-2",
@@ -9056,8 +9059,8 @@
    ],
    "linker_set_key" : "android::base::LogSeverity",
    "name" : "android::base::LogSeverity",
-   "referenced_type" : "type-4654",
-   "self_type" : "type-4654",
+   "referenced_type" : "type-4661",
+   "self_type" : "type-4661",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "type-2",
@@ -9192,8 +9195,8 @@
    ],
    "linker_set_key" : "android::hardware::ProcessState::CallRestriction",
    "name" : "android::hardware::ProcessState::CallRestriction",
-   "referenced_type" : "type-1391",
-   "self_type" : "type-1391",
+   "referenced_type" : "type-1394",
+   "self_type" : "type-1394",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "underlying_type" : "type-4",
@@ -12186,8 +12189,8 @@
    ],
    "linker_set_key" : "log_id",
    "name" : "log_id",
-   "referenced_type" : "type-2411",
-   "self_type" : "type-2411",
+   "referenced_type" : "type-2414",
+   "self_type" : "type-2414",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
@@ -12206,9 +12209,9 @@
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1501",
-   "return_type" : "type-1494",
-   "self_type" : "type-1501",
+   "referenced_type" : "type-1500",
+   "return_type" : "type-1495",
+   "self_type" : "type-1500",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -12221,12 +12224,12 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1595"
+     "referenced_type" : "type-1598"
     }
    ],
-   "referenced_type" : "type-2382",
-   "return_type" : "type-1494",
-   "self_type" : "type-2382",
+   "referenced_type" : "type-2385",
+   "return_type" : "type-1495",
+   "self_type" : "type-2385",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12239,7 +12242,7 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-2376"
+     "referenced_type" : "type-2379"
     },
     {
      "referenced_type" : "type-2"
@@ -12251,9 +12254,9 @@
      "referenced_type" : "type-2"
     }
    ],
-   "referenced_type" : "type-2378",
-   "return_type" : "type-1494",
-   "self_type" : "type-2378",
+   "referenced_type" : "type-2381",
+   "return_type" : "type-1495",
+   "self_type" : "type-2381",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12266,7 +12269,7 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-2376"
+     "referenced_type" : "type-2379"
     },
     {
      "referenced_type" : "type-2"
@@ -12281,9 +12284,9 @@
      "referenced_type" : "type-89"
     }
    ],
-   "referenced_type" : "type-2375",
-   "return_type" : "type-1494",
-   "self_type" : "type-2375",
+   "referenced_type" : "type-2378",
+   "return_type" : "type-1495",
+   "self_type" : "type-2378",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12296,7 +12299,7 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-2376"
+     "referenced_type" : "type-2379"
     },
     {
      "referenced_type" : "type-2"
@@ -12308,9 +12311,9 @@
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-2387",
-   "return_type" : "type-1494",
-   "self_type" : "type-2387",
+   "referenced_type" : "type-2390",
+   "return_type" : "type-1495",
+   "self_type" : "type-2390",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12323,15 +12326,15 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-2385"
+     "referenced_type" : "type-2388"
     },
     {
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-2384",
-   "return_type" : "type-1494",
-   "self_type" : "type-2384",
+   "referenced_type" : "type-2387",
+   "return_type" : "type-1495",
+   "self_type" : "type-2387",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12344,7 +12347,7 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-1488"
     },
     {
      "referenced_type" : "type-2"
@@ -12353,9 +12356,9 @@
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-2362",
-   "return_type" : "type-1494",
-   "self_type" : "type-2362",
+   "referenced_type" : "type-2365",
+   "return_type" : "type-1495",
+   "self_type" : "type-2365",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12374,9 +12377,9 @@
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-2364",
-   "return_type" : "type-1494",
-   "self_type" : "type-2364",
+   "referenced_type" : "type-2367",
+   "return_type" : "type-1495",
+   "self_type" : "type-2367",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12389,12 +12392,12 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-2370"
+     "referenced_type" : "type-2373"
     }
    ],
-   "referenced_type" : "type-2369",
-   "return_type" : "type-1494",
-   "self_type" : "type-2369",
+   "referenced_type" : "type-2372",
+   "return_type" : "type-1495",
+   "self_type" : "type-2372",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12410,12 +12413,12 @@
      "referenced_type" : "type-254"
     },
     {
-     "referenced_type" : "type-2367"
+     "referenced_type" : "type-2370"
     }
    ],
-   "referenced_type" : "type-2366",
-   "return_type" : "type-1494",
-   "self_type" : "type-2366",
+   "referenced_type" : "type-2369",
+   "return_type" : "type-1495",
+   "self_type" : "type-2369",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12431,18 +12434,18 @@
      "referenced_type" : "type-254"
     },
     {
-     "referenced_type" : "type-2359"
+     "referenced_type" : "type-2362"
     },
     {
-     "referenced_type" : "type-2359"
+     "referenced_type" : "type-2362"
     },
     {
-     "referenced_type" : "type-2360"
+     "referenced_type" : "type-2363"
     }
    ],
-   "referenced_type" : "type-2358",
-   "return_type" : "type-1494",
-   "self_type" : "type-2358",
+   "referenced_type" : "type-2361",
+   "return_type" : "type-1495",
+   "self_type" : "type-2361",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12461,9 +12464,9 @@
      "referenced_type" : "type-2"
     }
    ],
-   "referenced_type" : "type-2389",
-   "return_type" : "type-1494",
-   "self_type" : "type-2389",
+   "referenced_type" : "type-2392",
+   "return_type" : "type-1495",
+   "self_type" : "type-2392",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12479,12 +12482,12 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1595"
+     "referenced_type" : "type-1598"
     }
    ],
-   "referenced_type" : "type-2380",
-   "return_type" : "type-1494",
-   "self_type" : "type-2380",
+   "referenced_type" : "type-2383",
+   "return_type" : "type-1495",
+   "self_type" : "type-2383",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12506,12 +12509,12 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-2373"
+     "referenced_type" : "type-2376"
     }
    ],
-   "referenced_type" : "type-2372",
-   "return_type" : "type-1494",
-   "self_type" : "type-2372",
+   "referenced_type" : "type-2375",
+   "return_type" : "type-1495",
+   "self_type" : "type-2375",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12527,12 +12530,12 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1595"
+     "referenced_type" : "type-1598"
     }
    ],
-   "referenced_type" : "type-1594",
-   "return_type" : "type-1494",
-   "self_type" : "type-1594",
+   "referenced_type" : "type-1597",
+   "return_type" : "type-1495",
+   "self_type" : "type-1597",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -12548,7 +12551,7 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1588"
+     "referenced_type" : "type-1589"
     },
     {
      "referenced_type" : "type-2"
@@ -12560,9 +12563,9 @@
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1592",
-   "return_type" : "type-1494",
-   "self_type" : "type-1592",
+   "referenced_type" : "type-1595",
+   "return_type" : "type-1495",
+   "self_type" : "type-1595",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -12572,18 +12575,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1247"
+     "referenced_type" : "type-1250"
     },
     {
-     "referenced_type" : "type-1037"
+     "referenced_type" : "type-1041"
     },
     {
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1246",
+   "referenced_type" : "type-1249",
    "return_type" : "type-93",
-   "self_type" : "type-1246",
+   "self_type" : "type-1249",
    "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h"
   },
   {
@@ -12593,18 +12596,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1247"
+     "referenced_type" : "type-1250"
     },
     {
-     "referenced_type" : "type-1388"
+     "referenced_type" : "type-1391"
     },
     {
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1387",
+   "referenced_type" : "type-1390",
    "return_type" : "type-93",
-   "self_type" : "type-1387",
+   "self_type" : "type-1390",
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
   {
@@ -12659,7 +12662,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1381"
+     "referenced_type" : "type-1384"
     },
     {
      "referenced_type" : "type-97"
@@ -12677,9 +12680,9 @@
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1380",
+   "referenced_type" : "type-1383",
    "return_type" : "type-9",
-   "self_type" : "type-1380",
+   "self_type" : "type-1383",
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   }
  ],
@@ -12707,7 +12710,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-4500"
+     "referenced_type" : "type-4506"
     }
    ],
    "return_type" : "type-50",
@@ -12735,7 +12738,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1271"
+     "referenced_type" : "type-1275"
     }
    ],
    "return_type" : "type-50",
@@ -13014,7 +13017,7 @@
      "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-2190"
+     "referenced_type" : "type-2193"
     }
    ],
    "return_type" : "type-9",
@@ -13360,7 +13363,7 @@
      "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-2492"
+     "referenced_type" : "type-2495"
     },
     {
      "referenced_type" : "type-4"
@@ -13469,13 +13472,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2522"
+     "referenced_type" : "type-2525"
     },
     {
      "referenced_type" : "type-725"
     }
    ],
-   "return_type" : "type-2525",
+   "return_type" : "type-2528",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -13485,13 +13488,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2522"
+     "referenced_type" : "type-2525"
     },
     {
-     "referenced_type" : "type-1862"
+     "referenced_type" : "type-1866"
     }
    ],
-   "return_type" : "type-2525",
+   "return_type" : "type-2528",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -13502,7 +13505,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2673"
+     "referenced_type" : "type-2676"
     },
     {
      "referenced_type" : "type-11"
@@ -13522,7 +13525,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2673"
+     "referenced_type" : "type-2676"
     },
     {
      "referenced_type" : "type-8"
@@ -13542,7 +13545,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2673"
+     "referenced_type" : "type-2676"
     },
     {
      "referenced_type" : "type-8"
@@ -13562,7 +13565,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2673"
+     "referenced_type" : "type-2676"
     },
     {
      "referenced_type" : "type-8"
@@ -13585,7 +13588,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2673"
+     "referenced_type" : "type-2676"
     },
     {
      "referenced_type" : "type-8"
@@ -13608,7 +13611,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2673"
+     "referenced_type" : "type-2676"
     },
     {
      "referenced_type" : "type-8"
@@ -13631,7 +13634,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2673"
+     "referenced_type" : "type-2676"
     },
     {
      "referenced_type" : "type-8"
@@ -13654,7 +13657,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2676"
+     "referenced_type" : "type-2679"
     },
     {
      "referenced_type" : "type-11"
@@ -13674,7 +13677,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2676"
+     "referenced_type" : "type-2679"
     },
     {
      "referenced_type" : "type-8"
@@ -13694,7 +13697,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2676"
+     "referenced_type" : "type-2679"
     },
     {
      "referenced_type" : "type-8"
@@ -13714,7 +13717,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2676"
+     "referenced_type" : "type-2679"
     },
     {
      "referenced_type" : "type-8"
@@ -13737,7 +13740,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2676"
+     "referenced_type" : "type-2679"
     },
     {
      "referenced_type" : "type-8"
@@ -13760,7 +13763,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2676"
+     "referenced_type" : "type-2679"
     },
     {
      "referenced_type" : "type-8"
@@ -13783,7 +13786,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2676"
+     "referenced_type" : "type-2679"
     },
     {
      "referenced_type" : "type-8"
@@ -13806,7 +13809,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2668"
+     "referenced_type" : "type-2671"
     },
     {
      "referenced_type" : "type-11"
@@ -13826,7 +13829,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2668"
+     "referenced_type" : "type-2671"
     },
     {
      "referenced_type" : "type-8"
@@ -13846,7 +13849,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2668"
+     "referenced_type" : "type-2671"
     },
     {
      "referenced_type" : "type-8"
@@ -13866,7 +13869,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2668"
+     "referenced_type" : "type-2671"
     },
     {
      "referenced_type" : "type-8"
@@ -13889,7 +13892,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2668"
+     "referenced_type" : "type-2671"
     },
     {
      "referenced_type" : "type-8"
@@ -13912,7 +13915,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2668"
+     "referenced_type" : "type-2671"
     },
     {
      "referenced_type" : "type-8"
@@ -13935,7 +13938,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2668"
+     "referenced_type" : "type-2671"
     },
     {
      "referenced_type" : "type-8"
@@ -13957,10 +13960,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2547"
+     "referenced_type" : "type-2550"
     }
    ],
-   "return_type" : "type-2476",
+   "return_type" : "type-2479",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -13970,7 +13973,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2547"
+     "referenced_type" : "type-2550"
     }
    ],
    "return_type" : "type-570",
@@ -13983,10 +13986,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2547"
+     "referenced_type" : "type-2550"
     }
    ],
-   "return_type" : "type-2463",
+   "return_type" : "type-2466",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -13997,18 +14000,18 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1513"
+     "referenced_type" : "type-1517"
     },
     {
-     "referenced_type" : "type-1648"
+     "referenced_type" : "type-1652"
     },
     {
-     "referenced_type" : "type-3128"
+     "referenced_type" : "type-3131"
     }
    ],
    "return_type" : "type-4",
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-3129", "type-83" ]
+   "template_args" : [ "type-3132", "type-83" ]
   },
   {
    "function_name" : "android::Parcel::readNullableStrongBinder",
@@ -14017,15 +14020,15 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1513"
+     "referenced_type" : "type-1517"
     },
     {
-     "referenced_type" : "type-2534"
+     "referenced_type" : "type-2537"
     }
    ],
    "return_type" : "type-4",
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-3130" ]
+   "template_args" : [ "type-3133" ]
   },
   {
    "access" : "protected",
@@ -14035,7 +14038,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-978"
+     "referenced_type" : "type-980"
     },
     {
      "referenced_type" : "type-8"
@@ -14055,7 +14058,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-978"
+     "referenced_type" : "type-980"
     },
     {
      "referenced_type" : "type-8"
@@ -14075,7 +14078,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-978"
+     "referenced_type" : "type-980"
     },
     {
      "referenced_type" : "type-8"
@@ -14098,7 +14101,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-978"
+     "referenced_type" : "type-980"
     },
     {
      "referenced_type" : "type-8"
@@ -14121,7 +14124,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-978"
+     "referenced_type" : "type-980"
     },
     {
      "referenced_type" : "type-8"
@@ -14144,7 +14147,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-978"
+     "referenced_type" : "type-980"
     },
     {
      "referenced_type" : "type-8"
@@ -14167,7 +14170,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1228"
+     "referenced_type" : "type-1232"
     },
     {
      "referenced_type" : "type-8"
@@ -14187,7 +14190,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1228"
+     "referenced_type" : "type-1232"
     },
     {
      "referenced_type" : "type-8"
@@ -14207,7 +14210,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1228"
+     "referenced_type" : "type-1232"
     },
     {
      "referenced_type" : "type-8"
@@ -14230,7 +14233,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1228"
+     "referenced_type" : "type-1232"
     },
     {
      "referenced_type" : "type-8"
@@ -14253,7 +14256,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1228"
+     "referenced_type" : "type-1232"
     },
     {
      "referenced_type" : "type-8"
@@ -14276,7 +14279,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1228"
+     "referenced_type" : "type-1232"
     },
     {
      "referenced_type" : "type-8"
@@ -14299,7 +14302,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2689"
+     "referenced_type" : "type-2692"
     },
     {
      "referenced_type" : "type-8"
@@ -14319,7 +14322,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2689"
+     "referenced_type" : "type-2692"
     },
     {
      "referenced_type" : "type-8"
@@ -14339,7 +14342,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2689"
+     "referenced_type" : "type-2692"
     },
     {
      "referenced_type" : "type-8"
@@ -14362,7 +14365,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2689"
+     "referenced_type" : "type-2692"
     },
     {
      "referenced_type" : "type-8"
@@ -14385,7 +14388,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2689"
+     "referenced_type" : "type-2692"
     },
     {
      "referenced_type" : "type-8"
@@ -14408,7 +14411,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2689"
+     "referenced_type" : "type-2692"
     },
     {
      "referenced_type" : "type-8"
@@ -14445,7 +14448,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-4500"
+     "referenced_type" : "type-4506"
     }
    ],
    "return_type" : "type-50",
@@ -14459,8 +14462,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem &",
    "name" : "android::BufferItem &",
-   "referenced_type" : "type-1224",
-   "self_type" : "type-1223",
+   "referenced_type" : "type-1227",
+   "self_type" : "type-1226",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14468,8 +14471,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem &",
    "name" : "android::BufferItem &",
-   "referenced_type" : "type-3796",
-   "self_type" : "type-3795",
+   "referenced_type" : "type-3802",
+   "self_type" : "type-3801",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14477,8 +14480,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem &",
    "name" : "android::BufferItem &",
-   "referenced_type" : "type-5717",
-   "self_type" : "type-5716",
+   "referenced_type" : "type-5726",
+   "self_type" : "type-5725",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14486,8 +14489,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem &",
    "name" : "android::BufferItem &",
-   "referenced_type" : "type-8033",
-   "self_type" : "type-8032",
+   "referenced_type" : "type-8057",
+   "self_type" : "type-8056",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14495,8 +14498,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem &",
    "name" : "android::BufferItem &",
-   "referenced_type" : "type-8578",
-   "self_type" : "type-8577",
+   "referenced_type" : "type-8605",
+   "self_type" : "type-8604",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14504,8 +14507,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *&",
    "name" : "android::BufferItem *&",
-   "referenced_type" : "type-1669",
-   "self_type" : "type-1853",
+   "referenced_type" : "type-1673",
+   "self_type" : "type-1857",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -14513,8 +14516,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *&",
    "name" : "android::BufferItem *&",
-   "referenced_type" : "type-4124",
-   "self_type" : "type-4132",
+   "referenced_type" : "type-4130",
+   "self_type" : "type-4138",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -14522,8 +14525,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *&",
    "name" : "android::BufferItem *&",
-   "referenced_type" : "type-6045",
-   "self_type" : "type-6053",
+   "referenced_type" : "type-6054",
+   "self_type" : "type-6062",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -14531,8 +14534,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *&",
    "name" : "android::BufferItem *&",
-   "referenced_type" : "type-8871",
-   "self_type" : "type-8885",
+   "referenced_type" : "type-8899",
+   "self_type" : "type-8913",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -14540,8 +14543,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::CompositorTiming &",
    "name" : "android::CompositorTiming &",
-   "referenced_type" : "type-1431",
-   "self_type" : "type-1430",
+   "referenced_type" : "type-1434",
+   "self_type" : "type-1433",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14549,8 +14552,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::CompositorTiming &",
    "name" : "android::CompositorTiming &",
-   "referenced_type" : "type-3961",
-   "self_type" : "type-3960",
+   "referenced_type" : "type-3967",
+   "self_type" : "type-3966",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14558,8 +14561,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::CompositorTiming &",
    "name" : "android::CompositorTiming &",
-   "referenced_type" : "type-5882",
-   "self_type" : "type-5881",
+   "referenced_type" : "type-5891",
+   "self_type" : "type-5890",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14567,8 +14570,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::CompositorTiming &",
    "name" : "android::CompositorTiming &",
-   "referenced_type" : "type-8714",
-   "self_type" : "type-8713",
+   "referenced_type" : "type-8741",
+   "self_type" : "type-8740",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14576,8 +14579,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-2528",
-   "self_type" : "type-2527",
+   "referenced_type" : "type-2531",
+   "self_type" : "type-2530",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14585,8 +14588,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-4415",
-   "self_type" : "type-4414",
+   "referenced_type" : "type-4417",
+   "self_type" : "type-4416",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14594,8 +14597,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-4671",
-   "self_type" : "type-4670",
+   "referenced_type" : "type-4677",
+   "self_type" : "type-4676",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14603,8 +14606,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-4939",
-   "self_type" : "type-4938",
+   "referenced_type" : "type-4945",
+   "self_type" : "type-4944",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14612,8 +14615,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-6312",
-   "self_type" : "type-6311",
+   "referenced_type" : "type-6317",
+   "self_type" : "type-6316",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14621,8 +14624,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-6552",
-   "self_type" : "type-6551",
+   "referenced_type" : "type-6561",
+   "self_type" : "type-6560",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14630,8 +14633,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-7044",
-   "self_type" : "type-7043",
+   "referenced_type" : "type-7052",
+   "self_type" : "type-7051",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14639,8 +14642,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-8175",
-   "self_type" : "type-8174",
+   "referenced_type" : "type-8199",
+   "self_type" : "type-8198",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14648,8 +14651,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-9180",
-   "self_type" : "type-9179",
+   "referenced_type" : "type-9204",
+   "self_type" : "type-9203",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14657,8 +14660,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-9362",
-   "self_type" : "type-9361",
+   "referenced_type" : "type-9389",
+   "self_type" : "type-9388",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14666,8 +14669,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-9474",
-   "self_type" : "type-9473",
+   "referenced_type" : "type-9501",
+   "self_type" : "type-9500",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14675,8 +14678,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot::State &",
    "name" : "android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-4585",
-   "self_type" : "type-4584",
+   "referenced_type" : "type-4591",
+   "self_type" : "type-4590",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14684,8 +14687,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot::State &",
    "name" : "android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-6469",
-   "self_type" : "type-6468",
+   "referenced_type" : "type-6478",
+   "self_type" : "type-6477",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14693,8 +14696,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot::State &",
    "name" : "android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-9382",
-   "self_type" : "type-9381",
+   "referenced_type" : "type-9411",
+   "self_type" : "type-9410",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14703,7 +14706,7 @@
    "linker_set_key" : "android::Flattenable<android::BufferItem> &",
    "name" : "android::Flattenable<android::BufferItem> &",
    "referenced_type" : "type-21",
-   "self_type" : "type-1514",
+   "self_type" : "type-1518",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14712,7 +14715,7 @@
    "linker_set_key" : "android::Flattenable<android::Fence> &",
    "name" : "android::Flattenable<android::Fence> &",
    "referenced_type" : "type-16",
-   "self_type" : "type-1651",
+   "self_type" : "type-1655",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14721,7 +14724,7 @@
    "linker_set_key" : "android::Flattenable<android::FrameEventHistoryDelta> &",
    "name" : "android::Flattenable<android::FrameEventHistoryDelta> &",
    "referenced_type" : "type-25",
-   "self_type" : "type-4324",
+   "self_type" : "type-4330",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14730,7 +14733,7 @@
    "linker_set_key" : "android::Flattenable<android::GraphicBuffer> &",
    "name" : "android::Flattenable<android::GraphicBuffer> &",
    "referenced_type" : "type-14",
-   "self_type" : "type-1650",
+   "self_type" : "type-1654",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14739,7 +14742,7 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> &",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> &",
    "referenced_type" : "type-32",
-   "self_type" : "type-4326",
+   "self_type" : "type-4333",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14748,7 +14751,7 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> &",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> &",
    "referenced_type" : "type-34",
-   "self_type" : "type-4325",
+   "self_type" : "type-4332",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14756,8 +14759,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-2391",
-   "self_type" : "type-2390",
+   "referenced_type" : "type-2394",
+   "self_type" : "type-2393",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14765,8 +14768,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-4217",
-   "self_type" : "type-4216",
+   "referenced_type" : "type-4223",
+   "self_type" : "type-4222",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14774,8 +14777,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-4678",
-   "self_type" : "type-4677",
+   "referenced_type" : "type-4685",
+   "self_type" : "type-4684",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14783,8 +14786,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-4769",
-   "self_type" : "type-4768",
+   "referenced_type" : "type-4775",
+   "self_type" : "type-4774",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14792,8 +14795,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-6138",
-   "self_type" : "type-6137",
+   "referenced_type" : "type-6147",
+   "self_type" : "type-6146",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14801,8 +14804,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-6559",
-   "self_type" : "type-6558",
+   "referenced_type" : "type-6569",
+   "self_type" : "type-6568",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14810,8 +14813,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-6635",
-   "self_type" : "type-6634",
+   "referenced_type" : "type-6644",
+   "self_type" : "type-6643",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14819,8 +14822,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-8149",
-   "self_type" : "type-8148",
+   "referenced_type" : "type-8173",
+   "self_type" : "type-8172",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14828,8 +14831,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-8973",
-   "self_type" : "type-8972",
+   "referenced_type" : "type-9000",
+   "self_type" : "type-8999",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14837,8 +14840,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-8994",
-   "self_type" : "type-8993",
+   "referenced_type" : "type-9022",
+   "self_type" : "type-9021",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14846,8 +14849,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-9481",
-   "self_type" : "type-9480",
+   "referenced_type" : "type-9508",
+   "self_type" : "type-9507",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14855,8 +14858,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1086",
-   "self_type" : "type-1085",
+   "referenced_type" : "type-1089",
+   "self_type" : "type-1088",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14864,8 +14867,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1268",
-   "self_type" : "type-1267",
+   "referenced_type" : "type-1271",
+   "self_type" : "type-1270",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14873,8 +14876,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1410",
-   "self_type" : "type-1409",
+   "referenced_type" : "type-1413",
+   "self_type" : "type-1412",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14882,8 +14885,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1446",
-   "self_type" : "type-1445",
+   "referenced_type" : "type-1449",
+   "self_type" : "type-1448",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14891,8 +14894,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-2172",
-   "self_type" : "type-2171",
+   "referenced_type" : "type-2176",
+   "self_type" : "type-2175",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14900,8 +14903,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3250",
-   "self_type" : "type-3249",
+   "referenced_type" : "type-3253",
+   "self_type" : "type-3252",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14918,8 +14921,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3463",
-   "self_type" : "type-3462",
+   "referenced_type" : "type-3466",
+   "self_type" : "type-3465",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14927,8 +14930,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3528",
-   "self_type" : "type-3527",
+   "referenced_type" : "type-3531",
+   "self_type" : "type-3530",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14936,8 +14939,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3639",
-   "self_type" : "type-3638",
+   "referenced_type" : "type-3642",
+   "self_type" : "type-3641",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14945,8 +14948,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3696",
-   "self_type" : "type-3695",
+   "referenced_type" : "type-3702",
+   "self_type" : "type-3701",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14954,8 +14957,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3821",
-   "self_type" : "type-3820",
+   "referenced_type" : "type-3827",
+   "self_type" : "type-3826",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14963,8 +14966,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3937",
-   "self_type" : "type-3936",
+   "referenced_type" : "type-3943",
+   "self_type" : "type-3942",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14972,8 +14975,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3978",
-   "self_type" : "type-3977",
+   "referenced_type" : "type-3985",
+   "self_type" : "type-3984",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14981,8 +14984,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-4207",
-   "self_type" : "type-4206",
+   "referenced_type" : "type-4214",
+   "self_type" : "type-4213",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14990,8 +14993,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-4386",
-   "self_type" : "type-4385",
+   "referenced_type" : "type-4392",
+   "self_type" : "type-4391",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14999,8 +15002,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-4597",
-   "self_type" : "type-4596",
+   "referenced_type" : "type-4604",
+   "self_type" : "type-4603",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15008,8 +15011,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-4764",
-   "self_type" : "type-4763",
+   "referenced_type" : "type-4771",
+   "self_type" : "type-4770",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15017,8 +15020,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5171",
-   "self_type" : "type-5170",
+   "referenced_type" : "type-5177",
+   "self_type" : "type-5176",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15026,8 +15029,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5384",
-   "self_type" : "type-5383",
+   "referenced_type" : "type-5390",
+   "self_type" : "type-5389",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15035,8 +15038,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5449",
-   "self_type" : "type-5448",
+   "referenced_type" : "type-5455",
+   "self_type" : "type-5454",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15044,8 +15047,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5560",
-   "self_type" : "type-5559",
+   "referenced_type" : "type-5566",
+   "self_type" : "type-5565",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15053,8 +15056,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5617",
-   "self_type" : "type-5616",
+   "referenced_type" : "type-5626",
+   "self_type" : "type-5625",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15062,8 +15065,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5742",
-   "self_type" : "type-5741",
+   "referenced_type" : "type-5751",
+   "self_type" : "type-5750",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15071,8 +15074,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5858",
-   "self_type" : "type-5857",
+   "referenced_type" : "type-5867",
+   "self_type" : "type-5866",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15080,8 +15083,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5899",
-   "self_type" : "type-5898",
+   "referenced_type" : "type-5909",
+   "self_type" : "type-5908",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15089,8 +15092,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6128",
-   "self_type" : "type-6127",
+   "referenced_type" : "type-6138",
+   "self_type" : "type-6137",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15098,8 +15101,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6283",
-   "self_type" : "type-6282",
+   "referenced_type" : "type-6292",
+   "self_type" : "type-6291",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15107,8 +15110,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6481",
-   "self_type" : "type-6480",
+   "referenced_type" : "type-6491",
+   "self_type" : "type-6490",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15116,8 +15119,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6630",
-   "self_type" : "type-6629",
+   "referenced_type" : "type-6640",
+   "self_type" : "type-6639",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15125,8 +15128,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6857",
-   "self_type" : "type-6856",
+   "referenced_type" : "type-6867",
+   "self_type" : "type-6866",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15134,8 +15137,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-7009",
-   "self_type" : "type-7008",
+   "referenced_type" : "type-7018",
+   "self_type" : "type-7017",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15143,8 +15146,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-7100",
-   "self_type" : "type-7099",
+   "referenced_type" : "type-7109",
+   "self_type" : "type-7108",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15152,8 +15155,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-7258",
-   "self_type" : "type-7257",
+   "referenced_type" : "type-7278",
+   "self_type" : "type-7277",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15161,8 +15164,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-7324",
-   "self_type" : "type-7323",
+   "referenced_type" : "type-7344",
+   "self_type" : "type-7343",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15170,8 +15173,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-7487",
-   "self_type" : "type-7486",
+   "referenced_type" : "type-7508",
+   "self_type" : "type-7507",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15188,8 +15191,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-7700",
-   "self_type" : "type-7699",
+   "referenced_type" : "type-7721",
+   "self_type" : "type-7720",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15197,8 +15200,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-7765",
-   "self_type" : "type-7764",
+   "referenced_type" : "type-7786",
+   "self_type" : "type-7785",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15206,8 +15209,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-7876",
-   "self_type" : "type-7875",
+   "referenced_type" : "type-7897",
+   "self_type" : "type-7896",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15215,8 +15218,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-7933",
-   "self_type" : "type-7932",
+   "referenced_type" : "type-7957",
+   "self_type" : "type-7956",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15224,8 +15227,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-8058",
-   "self_type" : "type-8057",
+   "referenced_type" : "type-8082",
+   "self_type" : "type-8081",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15233,8 +15236,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-8218",
-   "self_type" : "type-8217",
+   "referenced_type" : "type-8242",
+   "self_type" : "type-8241",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15242,8 +15245,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-8301",
-   "self_type" : "type-8300",
+   "referenced_type" : "type-8325",
+   "self_type" : "type-8324",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15251,8 +15254,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-8353",
-   "self_type" : "type-8352",
+   "referenced_type" : "type-8377",
+   "self_type" : "type-8376",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15269,8 +15272,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-8447",
-   "self_type" : "type-8446",
+   "referenced_type" : "type-8471",
+   "self_type" : "type-8470",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15278,8 +15281,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-8491",
-   "self_type" : "type-8490",
+   "referenced_type" : "type-8518",
+   "self_type" : "type-8517",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15287,8 +15290,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-8586",
-   "self_type" : "type-8585",
+   "referenced_type" : "type-8614",
+   "self_type" : "type-8613",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15296,8 +15299,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-8692",
-   "self_type" : "type-8691",
+   "referenced_type" : "type-8719",
+   "self_type" : "type-8718",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15305,8 +15308,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-8729",
-   "self_type" : "type-8728",
+   "referenced_type" : "type-8756",
+   "self_type" : "type-8755",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15314,8 +15317,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-8975",
-   "self_type" : "type-8974",
+   "referenced_type" : "type-9002",
+   "self_type" : "type-9001",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15323,8 +15326,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-9147",
-   "self_type" : "type-9146",
+   "referenced_type" : "type-9175",
+   "self_type" : "type-9174",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15332,8 +15335,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-9398",
-   "self_type" : "type-9397",
+   "referenced_type" : "type-9425",
+   "self_type" : "type-9424",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15341,8 +15344,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-9537",
-   "self_type" : "type-9536",
+   "referenced_type" : "type-9564",
+   "self_type" : "type-9563",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15350,8 +15353,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-9759",
-   "self_type" : "type-9758",
+   "referenced_type" : "type-9786",
+   "self_type" : "type-9785",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15431,8 +15434,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-3472",
-   "self_type" : "type-3471",
+   "referenced_type" : "type-3475",
+   "self_type" : "type-3474",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15440,8 +15443,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-4303",
-   "self_type" : "type-4302",
+   "referenced_type" : "type-4309",
+   "self_type" : "type-4308",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15449,8 +15452,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-4755",
-   "self_type" : "type-4754",
+   "referenced_type" : "type-4761",
+   "self_type" : "type-4760",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15458,8 +15461,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-5393",
-   "self_type" : "type-5392",
+   "referenced_type" : "type-5399",
+   "self_type" : "type-5398",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15467,8 +15470,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-6212",
-   "self_type" : "type-6211",
+   "referenced_type" : "type-6221",
+   "self_type" : "type-6220",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15476,8 +15479,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-6622",
-   "self_type" : "type-6621",
+   "referenced_type" : "type-6631",
+   "self_type" : "type-6630",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15494,8 +15497,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-7709",
-   "self_type" : "type-7708",
+   "referenced_type" : "type-7730",
+   "self_type" : "type-7729",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15503,8 +15506,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-8309",
-   "self_type" : "type-8308",
+   "referenced_type" : "type-8333",
+   "self_type" : "type-8332",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15512,8 +15515,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-9070",
-   "self_type" : "type-9069",
+   "referenced_type" : "type-9097",
+   "self_type" : "type-9096",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15521,8 +15524,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-9530",
-   "self_type" : "type-9529",
+   "referenced_type" : "type-9557",
+   "self_type" : "type-9556",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15530,8 +15533,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
-   "referenced_type" : "type-1239",
-   "self_type" : "type-2660",
+   "referenced_type" : "type-1242",
+   "self_type" : "type-2663",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -15540,7 +15543,7 @@
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
    "referenced_type" : "type-121",
-   "self_type" : "type-2654",
+   "self_type" : "type-2657",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -15548,8 +15551,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 *&",
    "name" : "android::String8 *&",
-   "referenced_type" : "type-1885",
-   "self_type" : "type-1884",
+   "referenced_type" : "type-1889",
+   "self_type" : "type-1888",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -15557,8 +15560,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1101",
-   "self_type" : "type-1100",
+   "referenced_type" : "type-1104",
+   "self_type" : "type-1103",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15575,8 +15578,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1237",
-   "self_type" : "type-1236",
+   "referenced_type" : "type-1240",
+   "self_type" : "type-1239",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15584,8 +15587,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1365",
-   "self_type" : "type-1364",
+   "referenced_type" : "type-1368",
+   "self_type" : "type-1367",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15593,8 +15596,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1451",
-   "self_type" : "type-1450",
+   "referenced_type" : "type-1454",
+   "self_type" : "type-1453",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15602,8 +15605,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1524",
-   "self_type" : "type-1523",
+   "referenced_type" : "type-1529",
+   "self_type" : "type-1528",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15611,8 +15614,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1665",
-   "self_type" : "type-1664",
+   "referenced_type" : "type-1669",
+   "self_type" : "type-1668",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15620,8 +15623,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3168",
-   "self_type" : "type-3167",
+   "referenced_type" : "type-3171",
+   "self_type" : "type-3170",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15629,8 +15632,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3532",
-   "self_type" : "type-3531",
+   "referenced_type" : "type-3535",
+   "self_type" : "type-3534",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15638,8 +15641,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3643",
-   "self_type" : "type-3642",
+   "referenced_type" : "type-3646",
+   "self_type" : "type-3645",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15647,8 +15650,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3705",
-   "self_type" : "type-3704",
+   "referenced_type" : "type-3711",
+   "self_type" : "type-3710",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15656,8 +15659,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3806",
-   "self_type" : "type-3805",
+   "referenced_type" : "type-3812",
+   "self_type" : "type-3811",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15665,8 +15668,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3911",
-   "self_type" : "type-3910",
+   "referenced_type" : "type-3918",
+   "self_type" : "type-3917",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15674,8 +15677,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3984",
-   "self_type" : "type-3983",
+   "referenced_type" : "type-3990",
+   "self_type" : "type-3989",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15683,8 +15686,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4036",
-   "self_type" : "type-4035",
+   "referenced_type" : "type-4042",
+   "self_type" : "type-4041",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15692,8 +15695,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4121",
-   "self_type" : "type-4120",
+   "referenced_type" : "type-4127",
+   "self_type" : "type-4126",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15701,8 +15704,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4345",
-   "self_type" : "type-4344",
+   "referenced_type" : "type-4351",
+   "self_type" : "type-4350",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15710,8 +15713,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4484",
-   "self_type" : "type-4483",
+   "referenced_type" : "type-4490",
+   "self_type" : "type-4489",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15719,8 +15722,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4531",
-   "self_type" : "type-4530",
+   "referenced_type" : "type-4537",
+   "self_type" : "type-4536",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15728,8 +15731,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4553",
-   "self_type" : "type-4552",
+   "referenced_type" : "type-4559",
+   "self_type" : "type-4558",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15737,8 +15740,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4592",
-   "self_type" : "type-4591",
+   "referenced_type" : "type-4599",
+   "self_type" : "type-4598",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15746,8 +15749,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4771",
-   "self_type" : "type-4770",
+   "referenced_type" : "type-4777",
+   "self_type" : "type-4776",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15755,8 +15758,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4858",
-   "self_type" : "type-4857",
+   "referenced_type" : "type-4864",
+   "self_type" : "type-4863",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15764,8 +15767,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5089",
-   "self_type" : "type-5088",
+   "referenced_type" : "type-5095",
+   "self_type" : "type-5094",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15773,8 +15776,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5453",
-   "self_type" : "type-5452",
+   "referenced_type" : "type-5459",
+   "self_type" : "type-5458",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15782,8 +15785,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5564",
-   "self_type" : "type-5563",
+   "referenced_type" : "type-5570",
+   "self_type" : "type-5569",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15791,8 +15794,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5626",
-   "self_type" : "type-5625",
+   "referenced_type" : "type-5635",
+   "self_type" : "type-5634",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15800,8 +15803,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5727",
-   "self_type" : "type-5726",
+   "referenced_type" : "type-5736",
+   "self_type" : "type-5735",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15809,8 +15812,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5832",
-   "self_type" : "type-5831",
+   "referenced_type" : "type-5842",
+   "self_type" : "type-5841",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15818,8 +15821,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5905",
-   "self_type" : "type-5904",
+   "referenced_type" : "type-5914",
+   "self_type" : "type-5913",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15827,8 +15830,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5957",
-   "self_type" : "type-5956",
+   "referenced_type" : "type-5966",
+   "self_type" : "type-5965",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15836,8 +15839,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6042",
-   "self_type" : "type-6041",
+   "referenced_type" : "type-6051",
+   "self_type" : "type-6050",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15845,8 +15848,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6245",
-   "self_type" : "type-6244",
+   "referenced_type" : "type-6254",
+   "self_type" : "type-6253",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15854,8 +15857,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6370",
-   "self_type" : "type-6369",
+   "referenced_type" : "type-6379",
+   "self_type" : "type-6378",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15863,8 +15866,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6415",
-   "self_type" : "type-6414",
+   "referenced_type" : "type-6424",
+   "self_type" : "type-6423",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15872,8 +15875,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6437",
-   "self_type" : "type-6436",
+   "referenced_type" : "type-6446",
+   "self_type" : "type-6445",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15881,8 +15884,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6476",
-   "self_type" : "type-6475",
+   "referenced_type" : "type-6486",
+   "self_type" : "type-6485",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15890,8 +15893,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6637",
-   "self_type" : "type-6636",
+   "referenced_type" : "type-6646",
+   "self_type" : "type-6645",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15899,8 +15902,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6722",
-   "self_type" : "type-6721",
+   "referenced_type" : "type-6731",
+   "self_type" : "type-6730",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15908,8 +15911,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6748",
-   "self_type" : "type-6747",
+   "referenced_type" : "type-6757",
+   "self_type" : "type-6756",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15917,8 +15920,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6854",
-   "self_type" : "type-6853",
+   "referenced_type" : "type-6864",
+   "self_type" : "type-6863",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15926,8 +15929,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6885",
-   "self_type" : "type-6884",
+   "referenced_type" : "type-6895",
+   "self_type" : "type-6894",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15935,8 +15938,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7007",
-   "self_type" : "type-7006",
+   "referenced_type" : "type-7015",
+   "self_type" : "type-7014",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15944,8 +15947,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7067",
-   "self_type" : "type-7066",
+   "referenced_type" : "type-7075",
+   "self_type" : "type-7074",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15953,8 +15956,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7105",
-   "self_type" : "type-7104",
+   "referenced_type" : "type-7113",
+   "self_type" : "type-7112",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15962,8 +15965,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7256",
-   "self_type" : "type-7255",
+   "referenced_type" : "type-7276",
+   "self_type" : "type-7275",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15971,8 +15974,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7294",
-   "self_type" : "type-7293",
+   "referenced_type" : "type-7314",
+   "self_type" : "type-7313",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15980,8 +15983,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7330",
-   "self_type" : "type-7329",
+   "referenced_type" : "type-7350",
+   "self_type" : "type-7349",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15989,8 +15992,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7405",
-   "self_type" : "type-7404",
+   "referenced_type" : "type-7426",
+   "self_type" : "type-7425",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15998,8 +16001,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7769",
-   "self_type" : "type-7768",
+   "referenced_type" : "type-7790",
+   "self_type" : "type-7789",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16007,8 +16010,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7880",
-   "self_type" : "type-7879",
+   "referenced_type" : "type-7901",
+   "self_type" : "type-7900",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16016,8 +16019,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7942",
-   "self_type" : "type-7941",
+   "referenced_type" : "type-7966",
+   "self_type" : "type-7965",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16025,8 +16028,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-8043",
-   "self_type" : "type-8042",
+   "referenced_type" : "type-8067",
+   "self_type" : "type-8066",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16034,8 +16037,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-8211",
-   "self_type" : "type-8210",
+   "referenced_type" : "type-8235",
+   "self_type" : "type-8234",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16043,8 +16046,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-8357",
-   "self_type" : "type-8356",
+   "referenced_type" : "type-8381",
+   "self_type" : "type-8380",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16061,8 +16064,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-8453",
-   "self_type" : "type-8452",
+   "referenced_type" : "type-8477",
+   "self_type" : "type-8476",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16070,8 +16073,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-8497",
-   "self_type" : "type-8496",
+   "referenced_type" : "type-8524",
+   "self_type" : "type-8523",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16079,8 +16082,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-8580",
-   "self_type" : "type-8579",
+   "referenced_type" : "type-8607",
+   "self_type" : "type-8606",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16088,8 +16091,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-8666",
-   "self_type" : "type-8665",
+   "referenced_type" : "type-8693",
+   "self_type" : "type-8692",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16097,8 +16100,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-8734",
-   "self_type" : "type-8733",
+   "referenced_type" : "type-8761",
+   "self_type" : "type-8760",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16106,8 +16109,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-8786",
-   "self_type" : "type-8785",
+   "referenced_type" : "type-8815",
+   "self_type" : "type-8814",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16115,8 +16118,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-8869",
-   "self_type" : "type-8868",
+   "referenced_type" : "type-8897",
+   "self_type" : "type-8896",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16124,8 +16127,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-9103",
-   "self_type" : "type-9102",
+   "referenced_type" : "type-9131",
+   "self_type" : "type-9130",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16133,8 +16136,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-9246",
-   "self_type" : "type-9245",
+   "referenced_type" : "type-9275",
+   "self_type" : "type-9274",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16142,8 +16145,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-9305",
-   "self_type" : "type-9304",
+   "referenced_type" : "type-9333",
+   "self_type" : "type-9332",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16151,8 +16154,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-9335",
-   "self_type" : "type-9334",
+   "referenced_type" : "type-9364",
+   "self_type" : "type-9363",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16160,8 +16163,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-9391",
-   "self_type" : "type-9390",
+   "referenced_type" : "type-9421",
+   "self_type" : "type-9420",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16169,8 +16172,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-9542",
-   "self_type" : "type-9541",
+   "referenced_type" : "type-9569",
+   "self_type" : "type-9568",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16178,8 +16181,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-9620",
-   "self_type" : "type-9619",
+   "referenced_type" : "type-9648",
+   "self_type" : "type-9647",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16187,8 +16190,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-9656",
-   "self_type" : "type-9655",
+   "referenced_type" : "type-9683",
+   "self_type" : "type-9682",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16196,8 +16199,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-9756",
-   "self_type" : "type-9755",
+   "referenced_type" : "type-9784",
+   "self_type" : "type-9783",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16205,8 +16208,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-9785",
-   "self_type" : "type-9784",
+   "referenced_type" : "type-9813",
+   "self_type" : "type-9812",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16232,8 +16235,8 @@
    "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",
+   "referenced_type" : "type-6779",
+   "self_type" : "type-6782",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16241,24 +16244,6 @@
    "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,
@@ -16266,8 +16251,8 @@
   },
   {
    "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> > &",
+   "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-4494",
    "self_type" : "type-4497",
    "size" : 4,
@@ -16275,10 +16260,28 @@
   },
   {
    "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-4371",
+   "self_type" : "type-4374",
+   "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-4500",
+   "self_type" : "type-4503",
+   "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-4356",
+   "referenced_type" : "type-4359",
+   "self_type" : "type-4362",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16295,8 +16298,8 @@
    "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",
+   "referenced_type" : "type-6783",
+   "self_type" : "type-6786",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16322,8 +16325,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1383",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1386",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16331,8 +16334,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-3921",
-   "self_type" : "type-3920",
+   "referenced_type" : "type-3927",
+   "self_type" : "type-3926",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16340,8 +16343,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-5842",
-   "self_type" : "type-5841",
+   "referenced_type" : "type-5851",
+   "self_type" : "type-5850",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16349,8 +16352,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-8675",
-   "self_type" : "type-8674",
+   "referenced_type" : "type-8703",
+   "self_type" : "type-8702",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16368,7 +16371,7 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> > &",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> > &",
    "referenced_type" : "type-381",
-   "self_type" : "type-6896",
+   "self_type" : "type-6905",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16377,7 +16380,7 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect> &",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect> &",
    "referenced_type" : "type-372",
-   "self_type" : "type-4594",
+   "self_type" : "type-4600",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16386,7 +16389,7 @@
    "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-4347",
+   "self_type" : "type-4353",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16395,7 +16398,7 @@
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming &",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming &",
    "referenced_type" : "type-588",
-   "self_type" : "type-4586",
+   "self_type" : "type-4592",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16404,7 +16407,7 @@
    "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-4590",
+   "self_type" : "type-4597",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16413,7 +16416,7 @@
    "linker_set_key" : "android::hardware::hidl_array<int, 4> &",
    "name" : "android::hardware::hidl_array<int, 4> &",
    "referenced_type" : "type-384",
-   "self_type" : "type-6897",
+   "self_type" : "type-7114",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16431,7 +16434,7 @@
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> &",
    "name" : "android::hardware::hidl_vec<unsigned char> &",
    "referenced_type" : "type-452",
-   "self_type" : "type-4379",
+   "self_type" : "type-4385",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16440,7 +16443,7 @@
    "linker_set_key" : "android::hardware::media::V1_0::Rect &",
    "name" : "android::hardware::media::V1_0::Rect &",
    "referenced_type" : "type-375",
-   "self_type" : "type-4598",
+   "self_type" : "type-4605",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16449,7 +16452,7 @@
    "linker_set_key" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > &",
    "name" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > &",
    "referenced_type" : "type-160",
-   "self_type" : "type-2642",
+   "self_type" : "type-2645",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16458,7 +16461,7 @@
    "linker_set_key" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > &",
    "name" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > &",
    "referenced_type" : "type-147",
-   "self_type" : "type-2638",
+   "self_type" : "type-2641",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16467,7 +16470,7 @@
    "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int> &",
    "name" : "android::key_value_pair_t<unsigned int, unsigned int> &",
    "referenced_type" : "type-143",
-   "self_type" : "type-2637",
+   "self_type" : "type-2640",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16476,7 +16479,7 @@
    "linker_set_key" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > &",
    "name" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > &",
    "referenced_type" : "type-581",
-   "self_type" : "type-2512",
+   "self_type" : "type-2515",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16485,7 +16488,7 @@
    "linker_set_key" : "android::sp<android::ALooper> &",
    "name" : "android::sp<android::ALooper> &",
    "referenced_type" : "type-321",
-   "self_type" : "type-2266",
+   "self_type" : "type-2269",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16494,7 +16497,7 @@
    "linker_set_key" : "android::sp<android::AMessage> &",
    "name" : "android::sp<android::AMessage> &",
    "referenced_type" : "type-259",
-   "self_type" : "type-2077",
+   "self_type" : "type-2068",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16503,7 +16506,7 @@
    "linker_set_key" : "android::sp<android::ComponentWrapper> &",
    "name" : "android::sp<android::ComponentWrapper> &",
    "referenced_type" : "type-567",
-   "self_type" : "type-2490",
+   "self_type" : "type-2493",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16511,8 +16514,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::Fence> &",
    "name" : "android::sp<android::Fence> &",
-   "referenced_type" : "type-1864",
-   "self_type" : "type-2525",
+   "referenced_type" : "type-1868",
+   "self_type" : "type-2528",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16521,7 +16524,7 @@
    "linker_set_key" : "android::sp<android::FrameDropper> &",
    "name" : "android::sp<android::FrameDropper> &",
    "referenced_type" : "type-578",
-   "self_type" : "type-2505",
+   "self_type" : "type-2508",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16539,7 +16542,7 @@
    "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy> &",
    "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy> &",
    "referenced_type" : "type-473",
-   "self_type" : "type-2497",
+   "self_type" : "type-2500",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16547,8 +16550,8 @@
    "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",
+   "referenced_type" : "type-4265",
+   "self_type" : "type-4268",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16556,8 +16559,8 @@
    "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",
+   "referenced_type" : "type-4274",
+   "self_type" : "type-4277",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16565,8 +16568,8 @@
    "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",
+   "referenced_type" : "type-4833",
+   "self_type" : "type-4844",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16574,8 +16577,8 @@
    "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",
+   "referenced_type" : "type-7038",
+   "self_type" : "type-7048",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16628,8 +16631,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::NativeHandle> *&",
    "name" : "android::sp<android::NativeHandle> *&",
-   "referenced_type" : "type-1880",
-   "self_type" : "type-1879",
+   "referenced_type" : "type-1884",
+   "self_type" : "type-1883",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16637,8 +16640,8 @@
    "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",
+   "referenced_type" : "type-2473",
+   "self_type" : "type-6916",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16656,7 +16659,7 @@
    "linker_set_key" : "android::wp<android::IBinder::DeathRecipient> &",
    "name" : "android::wp<android::IBinder::DeathRecipient> &",
    "referenced_type" : "type-172",
-   "self_type" : "type-4304",
+   "self_type" : "type-4310",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16665,7 +16668,7 @@
    "linker_set_key" : "android_cta861_3_metadata &",
    "name" : "android_cta861_3_metadata &",
    "referenced_type" : "type-305",
-   "self_type" : "type-1476",
+   "self_type" : "type-1480",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16683,7 +16686,7 @@
    "linker_set_key" : "android_smpte2086_metadata &",
    "name" : "android_smpte2086_metadata &",
    "referenced_type" : "type-304",
-   "self_type" : "type-1475",
+   "self_type" : "type-1479",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16700,8 +16703,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AString &",
    "name" : "const android::AString &",
-   "referenced_type" : "type-2110",
-   "self_type" : "type-2241",
+   "referenced_type" : "type-2101",
+   "self_type" : "type-2244",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -16709,8 +16712,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-1219",
-   "self_type" : "type-1222",
+   "referenced_type" : "type-1223",
+   "self_type" : "type-1225",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16718,8 +16721,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-1530",
-   "self_type" : "type-1532",
+   "referenced_type" : "type-1533",
+   "self_type" : "type-1535",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16727,8 +16730,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-1671",
-   "self_type" : "type-1673",
+   "referenced_type" : "type-1675",
+   "self_type" : "type-1677",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16736,8 +16739,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-3441",
-   "self_type" : "type-3443",
+   "referenced_type" : "type-3444",
+   "self_type" : "type-3446",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -16745,8 +16748,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-3633",
-   "self_type" : "type-3637",
+   "referenced_type" : "type-3636",
+   "self_type" : "type-3640",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16754,8 +16757,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-3791",
-   "self_type" : "type-3794",
+   "referenced_type" : "type-3798",
+   "self_type" : "type-3800",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16763,8 +16766,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-4040",
-   "self_type" : "type-4043",
+   "referenced_type" : "type-4047",
+   "self_type" : "type-4049",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16772,8 +16775,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-4126",
-   "self_type" : "type-4128",
+   "referenced_type" : "type-4132",
+   "self_type" : "type-4134",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16781,8 +16784,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-5362",
-   "self_type" : "type-5364",
+   "referenced_type" : "type-5368",
+   "self_type" : "type-5370",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -16790,8 +16793,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-5554",
-   "self_type" : "type-5558",
+   "referenced_type" : "type-5560",
+   "self_type" : "type-5564",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16799,8 +16802,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-5712",
-   "self_type" : "type-5715",
+   "referenced_type" : "type-5722",
+   "self_type" : "type-5724",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16808,8 +16811,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-5961",
-   "self_type" : "type-5964",
+   "referenced_type" : "type-5971",
+   "self_type" : "type-5973",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16817,8 +16820,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-6047",
-   "self_type" : "type-6049",
+   "referenced_type" : "type-6056",
+   "self_type" : "type-6058",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16835,8 +16838,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-7678",
-   "self_type" : "type-7680",
+   "referenced_type" : "type-7699",
+   "self_type" : "type-7701",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -16844,8 +16847,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-7870",
-   "self_type" : "type-7874",
+   "referenced_type" : "type-7891",
+   "self_type" : "type-7895",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16853,8 +16856,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-8028",
-   "self_type" : "type-8031",
+   "referenced_type" : "type-8053",
+   "self_type" : "type-8055",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16862,8 +16865,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-8282",
-   "self_type" : "type-8284",
+   "referenced_type" : "type-8306",
+   "self_type" : "type-8308",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -16871,8 +16874,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-8441",
-   "self_type" : "type-8445",
+   "referenced_type" : "type-8465",
+   "self_type" : "type-8469",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16880,8 +16883,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-8574",
-   "self_type" : "type-8576",
+   "referenced_type" : "type-8601",
+   "self_type" : "type-8603",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16889,8 +16892,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-8792",
-   "self_type" : "type-8794",
+   "referenced_type" : "type-8819",
+   "self_type" : "type-8821",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16898,8 +16901,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-8874",
-   "self_type" : "type-8876",
+   "referenced_type" : "type-8901",
+   "self_type" : "type-8903",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16916,8 +16919,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::CompositorTiming &",
    "name" : "const android::CompositorTiming &",
-   "referenced_type" : "type-1424",
-   "self_type" : "type-1426",
+   "referenced_type" : "type-1427",
+   "self_type" : "type-1429",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16925,8 +16928,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::CompositorTiming &",
    "name" : "const android::CompositorTiming &",
-   "referenced_type" : "type-3952",
-   "self_type" : "type-3954",
+   "referenced_type" : "type-3960",
+   "self_type" : "type-3962",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16934,8 +16937,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::CompositorTiming &",
    "name" : "const android::CompositorTiming &",
-   "referenced_type" : "type-5873",
-   "self_type" : "type-5875",
+   "referenced_type" : "type-5884",
+   "self_type" : "type-5886",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16943,8 +16946,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::CompositorTiming &",
    "name" : "const android::CompositorTiming &",
-   "referenced_type" : "type-8707",
-   "self_type" : "type-8709",
+   "referenced_type" : "type-8734",
+   "self_type" : "type-8736",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16952,8 +16955,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-4579",
-   "self_type" : "type-4581",
+   "referenced_type" : "type-4585",
+   "self_type" : "type-4587",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16961,8 +16964,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-4747",
-   "self_type" : "type-4749",
+   "referenced_type" : "type-4754",
+   "self_type" : "type-4756",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16970,8 +16973,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-6463",
-   "self_type" : "type-6465",
+   "referenced_type" : "type-6472",
+   "self_type" : "type-6474",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16979,8 +16982,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-6615",
-   "self_type" : "type-6617",
+   "referenced_type" : "type-6625",
+   "self_type" : "type-6627",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16988,8 +16991,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-9376",
-   "self_type" : "type-9378",
+   "referenced_type" : "type-9405",
+   "self_type" : "type-9407",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16997,8 +17000,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-9524",
-   "self_type" : "type-9526",
+   "referenced_type" : "type-9551",
+   "self_type" : "type-9553",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17006,8 +17009,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Flattenable<android::BufferItem> &",
    "name" : "const android::Flattenable<android::BufferItem> &",
-   "referenced_type" : "type-1506",
-   "self_type" : "type-1512",
+   "referenced_type" : "type-1509",
+   "self_type" : "type-1516",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17015,8 +17018,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Flattenable<android::Fence> &",
    "name" : "const android::Flattenable<android::Fence> &",
-   "referenced_type" : "type-1634",
-   "self_type" : "type-1647",
+   "referenced_type" : "type-1638",
+   "self_type" : "type-1650",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17024,8 +17027,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Flattenable<android::FrameEventHistoryDelta> &",
    "name" : "const android::Flattenable<android::FrameEventHistoryDelta> &",
-   "referenced_type" : "type-4306",
-   "self_type" : "type-4322",
+   "referenced_type" : "type-4312",
+   "self_type" : "type-4328",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17033,8 +17036,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Flattenable<android::GraphicBuffer> &",
    "name" : "const android::Flattenable<android::GraphicBuffer> &",
-   "referenced_type" : "type-1638",
-   "self_type" : "type-1646",
+   "referenced_type" : "type-1643",
+   "self_type" : "type-1649",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17042,8 +17045,8 @@
    "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",
+   "referenced_type" : "type-4315",
+   "self_type" : "type-4327",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17051,8 +17054,8 @@
    "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",
+   "referenced_type" : "type-4318",
+   "self_type" : "type-4329",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17114,8 +17117,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel &",
    "name" : "const android::Parcel &",
-   "referenced_type" : "type-4533",
-   "self_type" : "type-4532",
+   "referenced_type" : "type-4539",
+   "self_type" : "type-4538",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17123,8 +17126,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel &",
    "name" : "const android::Parcel &",
-   "referenced_type" : "type-6417",
-   "self_type" : "type-6416",
+   "referenced_type" : "type-6426",
+   "self_type" : "type-6425",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17132,8 +17135,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel &",
    "name" : "const android::Parcel &",
-   "referenced_type" : "type-9308",
-   "self_type" : "type-9307",
+   "referenced_type" : "type-9335",
+   "self_type" : "type-9334",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17150,8 +17153,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-1215",
-   "self_type" : "type-1217",
+   "referenced_type" : "type-1218",
+   "self_type" : "type-1220",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17159,8 +17162,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-1490",
-   "self_type" : "type-1492",
+   "referenced_type" : "type-1493",
+   "self_type" : "type-1496",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17168,8 +17171,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-1621",
-   "self_type" : "type-1623",
+   "referenced_type" : "type-1624",
+   "self_type" : "type-1626",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17177,8 +17180,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-2683",
-   "self_type" : "type-2685",
+   "referenced_type" : "type-2686",
+   "self_type" : "type-2688",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17186,8 +17189,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-3466",
-   "self_type" : "type-3468",
+   "referenced_type" : "type-3469",
+   "self_type" : "type-3471",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17195,8 +17198,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-3787",
-   "self_type" : "type-3789",
+   "referenced_type" : "type-3793",
+   "self_type" : "type-3795",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17204,8 +17207,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-4011",
-   "self_type" : "type-4013",
+   "referenced_type" : "type-4017",
+   "self_type" : "type-4019",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17213,8 +17216,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-4090",
-   "self_type" : "type-4092",
+   "referenced_type" : "type-4096",
+   "self_type" : "type-4098",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17222,8 +17225,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-4292",
-   "self_type" : "type-4294",
+   "referenced_type" : "type-4298",
+   "self_type" : "type-4300",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17231,8 +17234,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-4572",
-   "self_type" : "type-4574",
+   "referenced_type" : "type-4578",
+   "self_type" : "type-4580",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17240,8 +17243,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-4736",
-   "self_type" : "type-4738",
+   "referenced_type" : "type-4743",
+   "self_type" : "type-4745",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17249,8 +17252,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-5019",
-   "self_type" : "type-5021",
+   "referenced_type" : "type-5025",
+   "self_type" : "type-5027",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17258,8 +17261,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-5387",
-   "self_type" : "type-5389",
+   "referenced_type" : "type-5393",
+   "self_type" : "type-5395",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17267,8 +17270,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-5708",
-   "self_type" : "type-5710",
+   "referenced_type" : "type-5717",
+   "self_type" : "type-5719",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17276,8 +17279,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-5932",
-   "self_type" : "type-5934",
+   "referenced_type" : "type-5941",
+   "self_type" : "type-5943",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17285,8 +17288,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-6011",
-   "self_type" : "type-6013",
+   "referenced_type" : "type-6020",
+   "self_type" : "type-6022",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17294,8 +17297,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-6201",
-   "self_type" : "type-6203",
+   "referenced_type" : "type-6210",
+   "self_type" : "type-6212",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17303,8 +17306,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-6456",
-   "self_type" : "type-6458",
+   "referenced_type" : "type-6465",
+   "self_type" : "type-6467",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17312,8 +17315,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-6605",
-   "self_type" : "type-6607",
+   "referenced_type" : "type-6615",
+   "self_type" : "type-6617",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17321,8 +17324,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-6836",
-   "self_type" : "type-6839",
+   "referenced_type" : "type-6846",
+   "self_type" : "type-6849",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17330,8 +17333,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-6990",
-   "self_type" : "type-6992",
+   "referenced_type" : "type-6999",
+   "self_type" : "type-7001",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17339,8 +17342,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-7221",
-   "self_type" : "type-7223",
+   "referenced_type" : "type-7230",
+   "self_type" : "type-7232",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17348,8 +17351,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-7241",
-   "self_type" : "type-7243",
+   "referenced_type" : "type-7262",
+   "self_type" : "type-7265",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17366,8 +17369,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-7703",
-   "self_type" : "type-7705",
+   "referenced_type" : "type-7724",
+   "self_type" : "type-7726",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17375,8 +17378,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-8024",
-   "self_type" : "type-8026",
+   "referenced_type" : "type-8048",
+   "self_type" : "type-8050",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17384,8 +17387,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-8206",
-   "self_type" : "type-8208",
+   "referenced_type" : "type-8230",
+   "self_type" : "type-8232",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17393,8 +17396,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-8305",
-   "self_type" : "type-8307",
+   "referenced_type" : "type-8329",
+   "self_type" : "type-8331",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17402,8 +17405,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-8570",
-   "self_type" : "type-8572",
+   "referenced_type" : "type-8597",
+   "self_type" : "type-8599",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17411,8 +17414,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-8760",
-   "self_type" : "type-8762",
+   "referenced_type" : "type-8788",
+   "self_type" : "type-8790",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17420,8 +17423,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-8839",
-   "self_type" : "type-8841",
+   "referenced_type" : "type-8866",
+   "self_type" : "type-8868",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17429,8 +17432,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-9057",
-   "self_type" : "type-9060",
+   "referenced_type" : "type-9085",
+   "self_type" : "type-9087",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17438,8 +17441,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-9368",
-   "self_type" : "type-9370",
+   "referenced_type" : "type-9396",
+   "self_type" : "type-9398",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17447,8 +17450,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-9515",
-   "self_type" : "type-9517",
+   "referenced_type" : "type-9542",
+   "self_type" : "type-9544",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17456,8 +17459,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-9739",
-   "self_type" : "type-9741",
+   "referenced_type" : "type-9766",
+   "self_type" : "type-9768",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17465,8 +17468,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-9840",
-   "self_type" : "type-9843",
+   "referenced_type" : "type-9863",
+   "self_type" : "type-9869",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17474,8 +17477,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SafeInterface::ParcelHandler &",
    "name" : "const android::SafeInterface::ParcelHandler &",
-   "referenced_type" : "type-1256",
-   "self_type" : "type-1675",
+   "referenced_type" : "type-1254",
+   "self_type" : "type-1680",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -17483,8 +17486,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-1248",
-   "self_type" : "type-1247",
+   "referenced_type" : "type-1251",
+   "self_type" : "type-1250",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -17492,8 +17495,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 &",
    "name" : "const android::String8 &",
-   "referenced_type" : "type-1875",
-   "self_type" : "type-1874",
+   "referenced_type" : "type-1879",
+   "self_type" : "type-1878",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -17510,8 +17513,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1385",
-   "self_type" : "type-1386",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1389",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -17546,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-4348",
-   "self_type" : "type-4570",
+   "referenced_type" : "type-4354",
+   "self_type" : "type-4576",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17555,8 +17558,8 @@
    "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-4582",
-   "self_type" : "type-4583",
+   "referenced_type" : "type-4588",
+   "self_type" : "type-4589",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17663,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-2619",
-   "self_type" : "type-2620",
+   "referenced_type" : "type-2622",
+   "self_type" : "type-2623",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17672,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-2617",
-   "self_type" : "type-2618",
+   "referenced_type" : "type-2620",
+   "self_type" : "type-2621",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17681,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-2613",
-   "self_type" : "type-2614",
+   "referenced_type" : "type-2616",
+   "self_type" : "type-2617",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17690,8 +17693,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-2409",
-   "self_type" : "type-2408",
+   "referenced_type" : "type-2412",
+   "self_type" : "type-2411",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -17699,8 +17702,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-4845",
-   "self_type" : "type-4844",
+   "referenced_type" : "type-4851",
+   "self_type" : "type-4850",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -17708,8 +17711,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-6709",
-   "self_type" : "type-6708",
+   "referenced_type" : "type-6718",
+   "self_type" : "type-6717",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -17717,8 +17720,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-8154",
-   "self_type" : "type-8156",
+   "referenced_type" : "type-8178",
+   "self_type" : "type-8180",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -17726,8 +17729,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-8989",
-   "self_type" : "type-8988",
+   "referenced_type" : "type-9016",
+   "self_type" : "type-9015",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -17735,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-1304",
-   "self_type" : "type-1486",
+   "referenced_type" : "type-1301",
+   "self_type" : "type-1489",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17753,8 +17756,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::AMessage> &",
    "name" : "const android::sp<android::AMessage> &",
-   "referenced_type" : "type-2175",
-   "self_type" : "type-2190",
+   "referenced_type" : "type-2174",
+   "self_type" : "type-2193",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17762,8 +17765,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::BpGraphicBufferProducer> &",
    "name" : "const android::sp<android::BpGraphicBufferProducer> &",
-   "referenced_type" : "type-4227",
-   "self_type" : "type-4232",
+   "referenced_type" : "type-4233",
+   "self_type" : "type-4238",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17771,8 +17774,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::BpProducerListener> &",
    "name" : "const android::sp<android::BpProducerListener> &",
-   "referenced_type" : "type-4516",
-   "self_type" : "type-4517",
+   "referenced_type" : "type-4522",
+   "self_type" : "type-4523",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17789,8 +17792,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::ComponentWrapper> &",
    "name" : "const android::sp<android::ComponentWrapper> &",
-   "referenced_type" : "type-2491",
-   "self_type" : "type-2492",
+   "referenced_type" : "type-2494",
+   "self_type" : "type-2495",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17798,8 +17801,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::Fence> &",
    "name" : "const android::sp<android::Fence> &",
-   "referenced_type" : "type-1863",
-   "self_type" : "type-1862",
+   "referenced_type" : "type-1867",
+   "self_type" : "type-1866",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17807,8 +17810,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::GraphicBuffer> &",
    "name" : "const android::sp<android::GraphicBuffer> &",
-   "referenced_type" : "type-1196",
-   "self_type" : "type-1859",
+   "referenced_type" : "type-1200",
+   "self_type" : "type-1864",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17825,8 +17828,8 @@
    "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",
+   "referenced_type" : "type-4270",
+   "self_type" : "type-4396",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17834,8 +17837,8 @@
    "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",
+   "referenced_type" : "type-4279",
+   "self_type" : "type-4397",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17843,8 +17846,8 @@
    "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",
+   "referenced_type" : "type-4832",
+   "self_type" : "type-4837",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17852,8 +17855,8 @@
    "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",
+   "referenced_type" : "type-7037",
+   "self_type" : "type-7043",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17861,8 +17864,8 @@
    "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",
+   "referenced_type" : "type-4306",
+   "self_type" : "type-4307",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17870,8 +17873,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IBinder> &",
    "name" : "const android::sp<android::IBinder> &",
-   "referenced_type" : "type-1036",
-   "self_type" : "type-1037",
+   "referenced_type" : "type-1040",
+   "self_type" : "type-1041",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17897,8 +17900,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer> &",
    "name" : "const android::sp<android::IGraphicBufferProducer> &",
-   "referenced_type" : "type-2485",
-   "self_type" : "type-2486",
+   "referenced_type" : "type-2488",
+   "self_type" : "type-2489",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17915,8 +17918,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::ITransactionCompletedListener> &",
    "name" : "const android::sp<android::ITransactionCompletedListener> &",
-   "referenced_type" : "type-1046",
-   "self_type" : "type-1047",
+   "referenced_type" : "type-1049",
+   "self_type" : "type-1050",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17933,8 +17936,8 @@
    "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",
+   "referenced_type" : "type-1392",
+   "self_type" : "type-1391",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -17942,8 +17945,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-2468",
-   "self_type" : "type-4222",
+   "referenced_type" : "type-2471",
+   "self_type" : "type-4228",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17951,8 +17954,8 @@
    "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-2458",
-   "self_type" : "type-4510",
+   "referenced_type" : "type-2461",
+   "self_type" : "type-4516",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17960,8 +17963,8 @@
    "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",
+   "referenced_type" : "type-4245",
+   "self_type" : "type-4250",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17969,8 +17972,8 @@
    "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",
+   "referenced_type" : "type-4476",
+   "self_type" : "type-4525",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17978,8 +17981,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-2482",
-   "self_type" : "type-4223",
+   "referenced_type" : "type-2485",
+   "self_type" : "type-4229",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17987,8 +17990,8 @@
    "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",
+   "referenced_type" : "type-2477",
+   "self_type" : "type-4519",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17996,8 +17999,8 @@
    "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",
+   "referenced_type" : "type-4239",
+   "self_type" : "type-4244",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18005,8 +18008,8 @@
    "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",
+   "referenced_type" : "type-4469",
+   "self_type" : "type-4524",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18050,8 +18053,8 @@
    "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",
+   "referenced_type" : "type-4296",
+   "self_type" : "type-4301",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18059,8 +18062,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::IBinder> &",
    "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "type-4280",
-   "self_type" : "type-4281",
+   "referenced_type" : "type-4286",
+   "self_type" : "type-4287",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18068,8 +18071,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android_cta861_3_metadata &",
    "name" : "const android_cta861_3_metadata &",
-   "referenced_type" : "type-1473",
-   "self_type" : "type-1474",
+   "referenced_type" : "type-1477",
+   "self_type" : "type-1478",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18086,8 +18089,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android_smpte2086_metadata &",
    "name" : "const android_smpte2086_metadata &",
-   "referenced_type" : "type-1471",
-   "self_type" : "type-1472",
+   "referenced_type" : "type-1474",
+   "self_type" : "type-1476",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18104,8 +18107,8 @@
    "alignment" : 4,
    "linker_set_key" : "const double &",
    "name" : "const double &",
-   "referenced_type" : "type-1077",
-   "self_type" : "type-1124",
+   "referenced_type" : "type-1080",
+   "self_type" : "type-1123",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18132,7 +18135,7 @@
    "linker_set_key" : "const int *&",
    "name" : "const int *&",
    "referenced_type" : "type-479",
-   "self_type" : "type-1511",
+   "self_type" : "type-1514",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18146,57 +18149,57 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1109",
-   "self_type" : "type-1111",
+   "referenced_type" : "type-1112",
+   "self_type" : "type-1114",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1281",
-   "self_type" : "type-1283",
+   "referenced_type" : "type-1284",
+   "self_type" : "type-1286",
    "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",
+   "referenced_type" : "type-3309",
+   "self_type" : "type-3311",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3538",
-   "self_type" : "type-3540",
+   "referenced_type" : "type-3541",
+   "self_type" : "type-3543",
    "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",
+   "referenced_type" : "type-3650",
+   "self_type" : "type-3652",
    "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",
+   "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-3832",
-   "self_type" : "type-3834",
+   "referenced_type" : "type-3838",
+   "self_type" : "type-3840",
    "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",
+   "referenced_type" : "type-4378",
+   "self_type" : "type-4380",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -18209,239 +18212,232 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-4501",
-   "self_type" : "type-4503",
+   "referenced_type" : "type-4507",
+   "self_type" : "type-4509",
    "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",
+   "referenced_type" : "type-4544",
+   "self_type" : "type-4546",
    "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",
+   "referenced_type" : "type-4569",
+   "self_type" : "type-4571",
    "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",
+   "referenced_type" : "type-4723",
+   "self_type" : "type-4725",
    "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",
+   "referenced_type" : "type-4853",
+   "self_type" : "type-4855",
    "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",
+   "referenced_type" : "type-5233",
+   "self_type" : "type-5235",
    "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",
+   "referenced_type" : "type-5465",
+   "self_type" : "type-5467",
    "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",
+   "referenced_type" : "type-5574",
+   "self_type" : "type-5576",
    "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",
+   "referenced_type" : "type-5640",
+   "self_type" : "type-5642",
    "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",
+   "referenced_type" : "type-5762",
+   "self_type" : "type-5764",
    "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",
+   "referenced_type" : "type-6278",
+   "self_type" : "type-6280",
    "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",
+   "referenced_type" : "type-6394",
+   "self_type" : "type-6396",
    "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",
+   "referenced_type" : "type-6431",
+   "self_type" : "type-6433",
    "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",
+   "referenced_type" : "type-6456",
+   "self_type" : "type-6458",
    "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",
+   "referenced_type" : "type-6599",
+   "self_type" : "type-6601",
    "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",
+   "referenced_type" : "type-6720",
+   "self_type" : "type-6722",
    "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",
+   "referenced_type" : "type-6747",
+   "self_type" : "type-6749",
    "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",
+   "referenced_type" : "type-6792",
+   "self_type" : "type-6794",
    "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",
+   "referenced_type" : "type-6881",
+   "self_type" : "type-6883",
    "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",
+   "referenced_type" : "type-6944",
+   "self_type" : "type-6946",
    "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",
+   "referenced_type" : "type-7059",
+   "self_type" : "type-7061",
    "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",
+   "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-7284",
-   "self_type" : "type-7286",
+   "referenced_type" : "type-7304",
+   "self_type" : "type-7306",
    "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",
+   "referenced_type" : "type-7357",
+   "self_type" : "type-7359",
    "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",
+   "referenced_type" : "type-7564",
+   "self_type" : "type-7566",
    "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",
+   "referenced_type" : "type-7796",
+   "self_type" : "type-7798",
    "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",
+   "referenced_type" : "type-7905",
+   "self_type" : "type-7907",
    "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",
+   "referenced_type" : "type-7971",
+   "self_type" : "type-7973",
    "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",
+   "referenced_type" : "type-8093",
+   "self_type" : "type-8095",
    "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",
+   "referenced_type" : "type-8249",
+   "self_type" : "type-8254",
    "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",
+   "referenced_type" : "type-8385",
+   "self_type" : "type-8387",
    "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",
+   "referenced_type" : "type-8481",
+   "self_type" : "type-8483",
    "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",
+   "referenced_type" : "type-8528",
+   "self_type" : "type-8532",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -18454,79 +18450,86 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-9131",
-   "self_type" : "type-9133",
+   "referenced_type" : "type-8620",
+   "self_type" : "type-8622",
    "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",
+   "referenced_type" : "type-9159",
+   "self_type" : "type-9161",
    "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",
+   "referenced_type" : "type-9293",
+   "self_type" : "type-9296",
    "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",
+   "referenced_type" : "type-9346",
+   "self_type" : "type-9348",
    "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",
+   "referenced_type" : "type-9382",
+   "self_type" : "type-9384",
    "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",
+   "referenced_type" : "type-9531",
+   "self_type" : "type-9533",
    "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",
+   "referenced_type" : "type-9631",
+   "self_type" : "type-9633",
    "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",
+   "referenced_type" : "type-9669",
+   "self_type" : "type-9671",
    "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",
+   "referenced_type" : "type-9720",
+   "self_type" : "type-9722",
    "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",
+   "referenced_type" : "type-9800",
+   "self_type" : "type-9802",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-9865",
+   "self_type" : "type-9867",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const log_msg &",
    "name" : "const log_msg &",
-   "referenced_type" : "type-2313",
-   "self_type" : "type-2331",
+   "referenced_type" : "type-2316",
+   "self_type" : "type-2334",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -18561,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-2643",
-   "self_type" : "type-2646",
+   "referenced_type" : "type-2646",
+   "self_type" : "type-2649",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18570,8 +18573,8 @@
    "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",
+   "referenced_type" : "type-4993",
+   "self_type" : "type-4995",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18579,8 +18582,8 @@
    "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",
+   "referenced_type" : "type-7198",
+   "self_type" : "type-7200",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18588,8 +18591,8 @@
    "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",
+   "referenced_type" : "type-8221",
+   "self_type" : "type-8223",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18597,8 +18600,8 @@
    "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",
+   "referenced_type" : "type-9708",
+   "self_type" : "type-9716",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18606,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-2639",
-   "self_type" : "type-2641",
+   "referenced_type" : "type-2642",
+   "self_type" : "type-2644",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18615,8 +18618,8 @@
    "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",
+   "referenced_type" : "type-4989",
+   "self_type" : "type-4991",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18624,8 +18627,8 @@
    "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",
+   "referenced_type" : "type-7194",
+   "self_type" : "type-7196",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18633,8 +18636,8 @@
    "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",
+   "referenced_type" : "type-8216",
+   "self_type" : "type-8218",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18642,8 +18645,8 @@
    "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",
+   "referenced_type" : "type-9696",
+   "self_type" : "type-9704",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18651,8 +18654,8 @@
    "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",
+   "referenced_type" : "type-1646",
+   "self_type" : "type-1648",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -18660,8 +18663,8 @@
    "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",
+   "referenced_type" : "type-4111",
+   "self_type" : "type-4113",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -18669,8 +18672,8 @@
    "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",
+   "referenced_type" : "type-6035",
+   "self_type" : "type-6037",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -18678,8 +18681,8 @@
    "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",
+   "referenced_type" : "type-8880",
+   "self_type" : "type-8882",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -18696,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-1107",
-   "self_type" : "type-1106",
+   "referenced_type" : "type-1110",
+   "self_type" : "type-1109",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18705,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-1279",
-   "self_type" : "type-1278",
+   "referenced_type" : "type-1282",
+   "self_type" : "type-1281",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18714,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-3271",
-   "self_type" : "type-3270",
+   "referenced_type" : "type-3274",
+   "self_type" : "type-3273",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18723,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-3535",
-   "self_type" : "type-3534",
+   "referenced_type" : "type-3538",
+   "self_type" : "type-3537",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18732,8 +18735,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-3645",
-   "self_type" : "type-3644",
+   "referenced_type" : "type-3648",
+   "self_type" : "type-3647",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18741,8 +18744,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-3708",
-   "self_type" : "type-3707",
+   "referenced_type" : "type-3714",
+   "self_type" : "type-3713",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18750,8 +18753,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-3830",
-   "self_type" : "type-3829",
+   "referenced_type" : "type-3836",
+   "self_type" : "type-3835",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18768,8 +18771,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-4351",
-   "self_type" : "type-4350",
+   "referenced_type" : "type-4357",
+   "self_type" : "type-4356",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18777,8 +18780,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-4486",
-   "self_type" : "type-4485",
+   "referenced_type" : "type-4492",
+   "self_type" : "type-4491",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18786,8 +18789,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-4555",
-   "self_type" : "type-4554",
+   "referenced_type" : "type-4561",
+   "self_type" : "type-4560",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18795,8 +18798,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-4619",
-   "self_type" : "type-4618",
+   "referenced_type" : "type-4623",
+   "self_type" : "type-4622",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18804,8 +18807,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-4659",
-   "self_type" : "type-4658",
+   "referenced_type" : "type-4666",
+   "self_type" : "type-4665",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18813,8 +18816,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-4867",
-   "self_type" : "type-4866",
+   "referenced_type" : "type-4873",
+   "self_type" : "type-4872",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18822,8 +18825,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-5192",
-   "self_type" : "type-5191",
+   "referenced_type" : "type-5198",
+   "self_type" : "type-5197",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18831,8 +18834,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-5456",
-   "self_type" : "type-5455",
+   "referenced_type" : "type-5462",
+   "self_type" : "type-5461",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18840,8 +18843,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-5566",
-   "self_type" : "type-5565",
+   "referenced_type" : "type-5572",
+   "self_type" : "type-5571",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18849,8 +18852,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-5629",
-   "self_type" : "type-5628",
+   "referenced_type" : "type-5638",
+   "self_type" : "type-5637",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18858,8 +18861,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-5751",
-   "self_type" : "type-5750",
+   "referenced_type" : "type-5760",
+   "self_type" : "type-5759",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18867,8 +18870,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-6251",
-   "self_type" : "type-6250",
+   "referenced_type" : "type-6260",
+   "self_type" : "type-6259",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18876,8 +18879,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-6372",
-   "self_type" : "type-6371",
+   "referenced_type" : "type-6381",
+   "self_type" : "type-6380",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18885,8 +18888,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-6439",
-   "self_type" : "type-6438",
+   "referenced_type" : "type-6448",
+   "self_type" : "type-6447",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18894,8 +18897,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-6503",
-   "self_type" : "type-6502",
+   "referenced_type" : "type-6510",
+   "self_type" : "type-6509",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18903,8 +18906,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-6541",
-   "self_type" : "type-6540",
+   "referenced_type" : "type-6551",
+   "self_type" : "type-6550",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18912,8 +18915,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-6731",
-   "self_type" : "type-6730",
+   "referenced_type" : "type-6740",
+   "self_type" : "type-6739",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18921,8 +18924,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-6750",
-   "self_type" : "type-6749",
+   "referenced_type" : "type-6759",
+   "self_type" : "type-6758",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18930,8 +18933,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-6755",
-   "self_type" : "type-6754",
+   "referenced_type" : "type-6765",
+   "self_type" : "type-6764",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18939,8 +18942,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-6887",
-   "self_type" : "type-6886",
+   "referenced_type" : "type-6897",
+   "self_type" : "type-6896",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18948,8 +18951,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-6899",
-   "self_type" : "type-6898",
+   "referenced_type" : "type-6907",
+   "self_type" : "type-6906",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18957,8 +18960,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-7078",
-   "self_type" : "type-7077",
+   "referenced_type" : "type-7086",
+   "self_type" : "type-7085",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18966,8 +18969,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-7107",
-   "self_type" : "type-7106",
+   "referenced_type" : "type-7116",
+   "self_type" : "type-7115",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18975,8 +18978,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-7303",
-   "self_type" : "type-7302",
+   "referenced_type" : "type-7323",
+   "self_type" : "type-7322",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18984,8 +18987,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-7332",
-   "self_type" : "type-7331",
+   "referenced_type" : "type-7353",
+   "self_type" : "type-7352",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18993,8 +18996,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-7508",
-   "self_type" : "type-7507",
+   "referenced_type" : "type-7529",
+   "self_type" : "type-7528",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19002,8 +19005,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-7772",
-   "self_type" : "type-7771",
+   "referenced_type" : "type-7793",
+   "self_type" : "type-7792",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19011,8 +19014,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-7882",
-   "self_type" : "type-7881",
+   "referenced_type" : "type-7903",
+   "self_type" : "type-7902",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19020,8 +19023,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-7945",
-   "self_type" : "type-7944",
+   "referenced_type" : "type-7969",
+   "self_type" : "type-7968",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19029,8 +19032,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-8067",
-   "self_type" : "type-8066",
+   "referenced_type" : "type-8091",
+   "self_type" : "type-8090",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19038,8 +19041,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-8222",
-   "self_type" : "type-8221",
+   "referenced_type" : "type-8246",
+   "self_type" : "type-8245",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19047,8 +19050,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-8359",
-   "self_type" : "type-8358",
+   "referenced_type" : "type-8383",
+   "self_type" : "type-8382",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19056,8 +19059,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-8455",
-   "self_type" : "type-8454",
+   "referenced_type" : "type-8479",
+   "self_type" : "type-8478",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19065,8 +19068,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-8499",
-   "self_type" : "type-8498",
+   "referenced_type" : "type-8526",
+   "self_type" : "type-8525",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19083,8 +19086,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-8591",
-   "self_type" : "type-8590",
+   "referenced_type" : "type-8618",
+   "self_type" : "type-8617",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19092,8 +19095,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-9111",
-   "self_type" : "type-9110",
+   "referenced_type" : "type-9139",
+   "self_type" : "type-9138",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19101,8 +19104,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-9250",
-   "self_type" : "type-9249",
+   "referenced_type" : "type-9277",
+   "self_type" : "type-9276",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19110,8 +19113,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-9338",
-   "self_type" : "type-9337",
+   "referenced_type" : "type-9366",
+   "self_type" : "type-9365",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19119,8 +19122,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-9421",
-   "self_type" : "type-9420",
+   "referenced_type" : "type-9447",
+   "self_type" : "type-9446",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19128,8 +19131,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-9464",
-   "self_type" : "type-9463",
+   "referenced_type" : "type-9492",
+   "self_type" : "type-9491",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19137,8 +19140,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-9630",
-   "self_type" : "type-9629",
+   "referenced_type" : "type-9660",
+   "self_type" : "type-9659",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19146,8 +19149,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-9658",
-   "self_type" : "type-9657",
+   "referenced_type" : "type-9685",
+   "self_type" : "type-9684",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19155,8 +19158,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-9663",
-   "self_type" : "type-9662",
+   "referenced_type" : "type-9690",
+   "self_type" : "type-9689",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19164,8 +19167,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-9787",
-   "self_type" : "type-9786",
+   "referenced_type" : "type-9816",
+   "self_type" : "type-9815",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19173,8 +19176,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-9799",
-   "self_type" : "type-9798",
+   "referenced_type" : "type-9827",
+   "self_type" : "type-9826",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19182,8 +19185,8 @@
    "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",
+   "referenced_type" : "type-4382",
+   "self_type" : "type-4384",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19191,8 +19194,8 @@
    "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",
+   "referenced_type" : "type-4510",
+   "self_type" : "type-4512",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19200,8 +19203,8 @@
    "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",
+   "referenced_type" : "type-6282",
+   "self_type" : "type-6284",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19209,8 +19212,8 @@
    "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",
+   "referenced_type" : "type-6397",
+   "self_type" : "type-6399",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19218,8 +19221,8 @@
    "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",
+   "referenced_type" : "type-9163",
+   "self_type" : "type-9165",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19227,8 +19230,8 @@
    "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",
+   "referenced_type" : "type-9297",
+   "self_type" : "type-9299",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19263,8 +19266,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
-   "referenced_type" : "type-2520",
-   "self_type" : "type-2615",
+   "referenced_type" : "type-2523",
+   "self_type" : "type-2618",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19290,8 +19293,8 @@
    "alignment" : 4,
    "linker_set_key" : "int *&",
    "name" : "int *&",
-   "referenced_type" : "type-1509",
-   "self_type" : "type-1508",
+   "referenced_type" : "type-1512",
+   "self_type" : "type-1511",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -19300,7 +19303,7 @@
    "linker_set_key" : "long long &",
    "name" : "long long &",
    "referenced_type" : "type-169",
-   "self_type" : "type-1429",
+   "self_type" : "type-1432",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -19308,8 +19311,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-4758",
-   "self_type" : "type-4757",
+   "referenced_type" : "type-4765",
+   "self_type" : "type-4764",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -19317,8 +19320,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-4862",
-   "self_type" : "type-4861",
+   "referenced_type" : "type-4868",
+   "self_type" : "type-4867",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -19326,8 +19329,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-6624",
-   "self_type" : "type-6623",
+   "referenced_type" : "type-6634",
+   "self_type" : "type-6633",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -19335,8 +19338,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-6726",
-   "self_type" : "type-6725",
+   "referenced_type" : "type-6735",
+   "self_type" : "type-6734",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -19344,8 +19347,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-6848",
-   "self_type" : "type-6847",
+   "referenced_type" : "type-6858",
+   "self_type" : "type-6857",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -19353,8 +19356,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-6995",
-   "self_type" : "type-6994",
+   "referenced_type" : "type-7004",
+   "self_type" : "type-7003",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -19362,8 +19365,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-7071",
-   "self_type" : "type-7070",
+   "referenced_type" : "type-7081",
+   "self_type" : "type-7080",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -19371,8 +19374,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-7245",
-   "self_type" : "type-7244",
+   "referenced_type" : "type-7267",
+   "self_type" : "type-7266",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -19380,8 +19383,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-7298",
-   "self_type" : "type-7297",
+   "referenced_type" : "type-7318",
+   "self_type" : "type-7317",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -19389,8 +19392,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-9532",
-   "self_type" : "type-9531",
+   "referenced_type" : "type-9559",
+   "self_type" : "type-9558",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -19398,8 +19401,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-9625",
-   "self_type" : "type-9624",
+   "referenced_type" : "type-9652",
+   "self_type" : "type-9651",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -19407,8 +19410,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-9749",
-   "self_type" : "type-9748",
+   "referenced_type" : "type-9778",
+   "self_type" : "type-9777",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -19425,8 +19428,8 @@
    "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",
+   "referenced_type" : "type-3186",
+   "self_type" : "type-3185",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -19434,8 +19437,8 @@
    "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",
+   "referenced_type" : "type-5110",
+   "self_type" : "type-5109",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -19443,8 +19446,8 @@
    "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",
+   "referenced_type" : "type-7441",
+   "self_type" : "type-7440",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -19452,8 +19455,8 @@
    "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",
+   "referenced_type" : "type-8237",
+   "self_type" : "type-8236",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -19461,8 +19464,8 @@
    "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",
+   "referenced_type" : "type-1652",
+   "self_type" : "type-1886",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -19470,8 +19473,8 @@
    "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",
+   "referenced_type" : "type-4116",
+   "self_type" : "type-4142",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -19479,8 +19482,8 @@
    "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",
+   "referenced_type" : "type-6040",
+   "self_type" : "type-6066",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -19488,8 +19491,8 @@
    "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",
+   "referenced_type" : "type-8885",
+   "self_type" : "type-8917",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -19498,7 +19501,7 @@
    "linker_set_key" : "unsigned char &",
    "name" : "unsigned char &",
    "referenced_type" : "type-90",
-   "self_type" : "type-1428",
+   "self_type" : "type-1431",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -19525,7 +19528,7 @@
    "linker_set_key" : "unsigned long long *&",
    "name" : "unsigned long long *&",
    "referenced_type" : "type-91",
-   "self_type" : "type-1871",
+   "self_type" : "type-1875",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -19534,7 +19537,7 @@
    "linker_set_key" : "unsigned short &",
    "name" : "unsigned short &",
    "referenced_type" : "type-497",
-   "self_type" : "type-1427",
+   "self_type" : "type-1430",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -19542,8 +19545,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-1444",
-   "self_type" : "type-1443",
+   "referenced_type" : "type-1447",
+   "self_type" : "type-1446",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -19551,8 +19554,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-3976",
-   "self_type" : "type-3975",
+   "referenced_type" : "type-3982",
+   "self_type" : "type-3981",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -19560,8 +19563,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-5897",
-   "self_type" : "type-5896",
+   "referenced_type" : "type-5906",
+   "self_type" : "type-5905",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -19578,8 +19581,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-8727",
-   "self_type" : "type-8726",
+   "referenced_type" : "type-8754",
+   "self_type" : "type-8753",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   }
@@ -19590,8 +19593,8 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-2402",
-   "self_type" : "type-2401",
+   "referenced_type" : "type-2405",
+   "self_type" : "type-2404",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -19599,8 +19602,8 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-4833",
-   "self_type" : "type-4832",
+   "referenced_type" : "type-4839",
+   "self_type" : "type-4838",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -19608,8 +19611,8 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-6697",
-   "self_type" : "type-6696",
+   "referenced_type" : "type-6706",
+   "self_type" : "type-6705",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -19617,8 +19620,8 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-8151",
-   "self_type" : "type-8150",
+   "referenced_type" : "type-8175",
+   "self_type" : "type-8174",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -19626,8 +19629,8 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-8984",
-   "self_type" : "type-8983",
+   "referenced_type" : "type-9011",
+   "self_type" : "type-9010",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -19644,8 +19647,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1142",
-   "self_type" : "type-1141",
+   "referenced_type" : "type-1137",
+   "self_type" : "type-1136",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19653,8 +19656,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1165",
-   "self_type" : "type-1164",
+   "referenced_type" : "type-1170",
+   "self_type" : "type-1169",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19662,8 +19665,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1350",
-   "self_type" : "type-1349",
+   "referenced_type" : "type-1353",
+   "self_type" : "type-1352",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19671,8 +19674,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1407",
-   "self_type" : "type-1406",
+   "referenced_type" : "type-1410",
+   "self_type" : "type-1409",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19680,8 +19683,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1423",
-   "self_type" : "type-1422",
+   "referenced_type" : "type-1426",
+   "self_type" : "type-1425",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19689,8 +19692,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1439",
-   "self_type" : "type-1438",
+   "referenced_type" : "type-1442",
+   "self_type" : "type-1441",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19698,8 +19701,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1505",
-   "self_type" : "type-1504",
+   "referenced_type" : "type-1508",
+   "self_type" : "type-1507",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19707,8 +19710,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1632",
-   "self_type" : "type-1631",
+   "referenced_type" : "type-1637",
+   "self_type" : "type-1636",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19716,8 +19719,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2612",
-   "self_type" : "type-2611",
+   "referenced_type" : "type-2615",
+   "self_type" : "type-2614",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19725,8 +19728,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3478",
-   "self_type" : "type-3477",
+   "referenced_type" : "type-3481",
+   "self_type" : "type-3480",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19734,8 +19737,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3579",
-   "self_type" : "type-3578",
+   "referenced_type" : "type-3578",
+   "self_type" : "type-3577",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19743,8 +19746,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3655",
-   "self_type" : "type-3654",
+   "referenced_type" : "type-3658",
+   "self_type" : "type-3657",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19752,8 +19755,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3745",
-   "self_type" : "type-3744",
+   "referenced_type" : "type-3743",
+   "self_type" : "type-3742",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19761,8 +19764,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3770",
-   "self_type" : "type-3769",
+   "referenced_type" : "type-3777",
+   "self_type" : "type-3776",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19770,8 +19773,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3904",
-   "self_type" : "type-3903",
+   "referenced_type" : "type-3910",
+   "self_type" : "type-3909",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19779,8 +19782,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3935",
-   "self_type" : "type-3934",
+   "referenced_type" : "type-3941",
+   "self_type" : "type-3940",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19788,8 +19791,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3951",
-   "self_type" : "type-3950",
+   "referenced_type" : "type-3957",
+   "self_type" : "type-3956",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19797,8 +19800,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3971",
-   "self_type" : "type-3970",
+   "referenced_type" : "type-3977",
+   "self_type" : "type-3976",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19806,8 +19809,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4019",
-   "self_type" : "type-4018",
+   "referenced_type" : "type-4026",
+   "self_type" : "type-4025",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19815,8 +19818,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4097",
-   "self_type" : "type-4096",
+   "referenced_type" : "type-4103",
+   "self_type" : "type-4102",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19824,8 +19827,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4299",
-   "self_type" : "type-4298",
+   "referenced_type" : "type-4305",
+   "self_type" : "type-4304",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19833,8 +19836,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4472",
-   "self_type" : "type-4471",
+   "referenced_type" : "type-4478",
+   "self_type" : "type-4477",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19842,8 +19845,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4525",
-   "self_type" : "type-4524",
+   "referenced_type" : "type-4531",
+   "self_type" : "type-4530",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19851,8 +19854,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4551",
-   "self_type" : "type-4550",
+   "referenced_type" : "type-4557",
+   "self_type" : "type-4556",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19860,8 +19863,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4578",
-   "self_type" : "type-4577",
+   "referenced_type" : "type-4584",
+   "self_type" : "type-4583",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19869,8 +19872,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4745",
-   "self_type" : "type-4744",
+   "referenced_type" : "type-4752",
+   "self_type" : "type-4751",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19878,8 +19881,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4855",
-   "self_type" : "type-4854",
+   "referenced_type" : "type-4861",
+   "self_type" : "type-4860",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19887,8 +19890,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4967",
-   "self_type" : "type-4966",
+   "referenced_type" : "type-4973",
+   "self_type" : "type-4972",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19896,8 +19899,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5399",
-   "self_type" : "type-5398",
+   "referenced_type" : "type-5405",
+   "self_type" : "type-5404",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19905,8 +19908,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5500",
-   "self_type" : "type-5499",
+   "referenced_type" : "type-5502",
+   "self_type" : "type-5501",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19914,8 +19917,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5576",
-   "self_type" : "type-5575",
+   "referenced_type" : "type-5582",
+   "self_type" : "type-5581",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19923,8 +19926,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5666",
-   "self_type" : "type-5665",
+   "referenced_type" : "type-5667",
+   "self_type" : "type-5666",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19932,8 +19935,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5691",
-   "self_type" : "type-5690",
+   "referenced_type" : "type-5701",
+   "self_type" : "type-5700",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19941,8 +19944,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5825",
-   "self_type" : "type-5824",
+   "referenced_type" : "type-5834",
+   "self_type" : "type-5833",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19950,8 +19953,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5856",
-   "self_type" : "type-5855",
+   "referenced_type" : "type-5865",
+   "self_type" : "type-5864",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19959,8 +19962,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5872",
-   "self_type" : "type-5871",
+   "referenced_type" : "type-5881",
+   "self_type" : "type-5880",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19968,8 +19971,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5892",
-   "self_type" : "type-5891",
+   "referenced_type" : "type-5901",
+   "self_type" : "type-5900",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19977,8 +19980,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5940",
-   "self_type" : "type-5939",
+   "referenced_type" : "type-5950",
+   "self_type" : "type-5949",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19986,8 +19989,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6018",
-   "self_type" : "type-6017",
+   "referenced_type" : "type-6027",
+   "self_type" : "type-6026",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19995,8 +19998,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6208",
-   "self_type" : "type-6207",
+   "referenced_type" : "type-6217",
+   "self_type" : "type-6216",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20004,8 +20007,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6361",
-   "self_type" : "type-6360",
+   "referenced_type" : "type-6370",
+   "self_type" : "type-6369",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20013,8 +20016,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6409",
-   "self_type" : "type-6408",
+   "referenced_type" : "type-6418",
+   "self_type" : "type-6417",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20022,8 +20025,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6435",
-   "self_type" : "type-6434",
+   "referenced_type" : "type-6444",
+   "self_type" : "type-6443",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20031,8 +20034,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6462",
-   "self_type" : "type-6461",
+   "referenced_type" : "type-6471",
+   "self_type" : "type-6470",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20040,8 +20043,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6613",
-   "self_type" : "type-6612",
+   "referenced_type" : "type-6623",
+   "self_type" : "type-6622",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20049,8 +20052,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6719",
-   "self_type" : "type-6718",
+   "referenced_type" : "type-6728",
+   "self_type" : "type-6727",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20058,8 +20061,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6746",
-   "self_type" : "type-6745",
+   "referenced_type" : "type-6755",
+   "self_type" : "type-6754",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20067,8 +20070,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6846",
-   "self_type" : "type-6845",
+   "referenced_type" : "type-6856",
+   "self_type" : "type-6855",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20076,8 +20079,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6882",
-   "self_type" : "type-6881",
+   "referenced_type" : "type-6892",
+   "self_type" : "type-6891",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20085,8 +20088,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7003",
-   "self_type" : "type-7002",
+   "referenced_type" : "type-7011",
+   "self_type" : "type-7010",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20094,8 +20097,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7062",
-   "self_type" : "type-7061",
+   "referenced_type" : "type-7071",
+   "self_type" : "type-7070",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20103,8 +20106,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7162",
-   "self_type" : "type-7161",
+   "referenced_type" : "type-7171",
+   "self_type" : "type-7170",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20112,8 +20115,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7169",
-   "self_type" : "type-7168",
+   "referenced_type" : "type-7178",
+   "self_type" : "type-7177",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20121,8 +20124,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7253",
-   "self_type" : "type-7252",
+   "referenced_type" : "type-7273",
+   "self_type" : "type-7272",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20130,8 +20133,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7292",
-   "self_type" : "type-7291",
+   "referenced_type" : "type-7312",
+   "self_type" : "type-7311",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20139,8 +20142,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7396",
-   "self_type" : "type-7395",
+   "referenced_type" : "type-7419",
+   "self_type" : "type-7418",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20157,8 +20160,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7715",
-   "self_type" : "type-7714",
+   "referenced_type" : "type-7736",
+   "self_type" : "type-7735",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20166,8 +20169,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7816",
-   "self_type" : "type-7815",
+   "referenced_type" : "type-7833",
+   "self_type" : "type-7832",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20175,8 +20178,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7892",
-   "self_type" : "type-7891",
+   "referenced_type" : "type-7913",
+   "self_type" : "type-7912",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20184,8 +20187,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7982",
-   "self_type" : "type-7981",
+   "referenced_type" : "type-7998",
+   "self_type" : "type-7997",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20193,8 +20196,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-8007",
-   "self_type" : "type-8006",
+   "referenced_type" : "type-8032",
+   "self_type" : "type-8031",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20202,8 +20205,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-8190",
-   "self_type" : "type-8189",
+   "referenced_type" : "type-8215",
+   "self_type" : "type-8214",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20211,8 +20214,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-8314",
-   "self_type" : "type-8313",
+   "referenced_type" : "type-8338",
+   "self_type" : "type-8337",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20220,8 +20223,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-8402",
-   "self_type" : "type-8401",
+   "referenced_type" : "type-8422",
+   "self_type" : "type-8421",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20229,8 +20232,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-8465",
-   "self_type" : "type-8464",
+   "referenced_type" : "type-8489",
+   "self_type" : "type-8488",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20238,8 +20241,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-8537",
-   "self_type" : "type-8536",
+   "referenced_type" : "type-8556",
+   "self_type" : "type-8555",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20247,8 +20250,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-8559",
-   "self_type" : "type-8558",
+   "referenced_type" : "type-8586",
+   "self_type" : "type-8585",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20256,8 +20259,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-8658",
-   "self_type" : "type-8657",
+   "referenced_type" : "type-8685",
+   "self_type" : "type-8684",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20265,8 +20268,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-8689",
-   "self_type" : "type-8688",
+   "referenced_type" : "type-8717",
+   "self_type" : "type-8716",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20274,8 +20277,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-8706",
-   "self_type" : "type-8705",
+   "referenced_type" : "type-8733",
+   "self_type" : "type-8732",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20283,8 +20286,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-8722",
-   "self_type" : "type-8721",
+   "referenced_type" : "type-8749",
+   "self_type" : "type-8748",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20292,8 +20295,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-8769",
-   "self_type" : "type-8768",
+   "referenced_type" : "type-8796",
+   "self_type" : "type-8795",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20301,8 +20304,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-8846",
-   "self_type" : "type-8845",
+   "referenced_type" : "type-8873",
+   "self_type" : "type-8872",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20310,8 +20313,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-9065",
-   "self_type" : "type-9064",
+   "referenced_type" : "type-904",
+   "self_type" : "type-903",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20319,8 +20322,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-908",
-   "self_type" : "type-907",
+   "referenced_type" : "type-9092",
+   "self_type" : "type-9091",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20328,8 +20331,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-9233",
-   "self_type" : "type-9232",
+   "referenced_type" : "type-9261",
+   "self_type" : "type-9260",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20337,8 +20340,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-9296",
-   "self_type" : "type-9295",
+   "referenced_type" : "type-9325",
+   "self_type" : "type-9324",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20346,8 +20349,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-9331",
-   "self_type" : "type-9330",
+   "referenced_type" : "type-9360",
+   "self_type" : "type-9359",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20355,8 +20358,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-9375",
-   "self_type" : "type-9374",
+   "referenced_type" : "type-9402",
+   "self_type" : "type-9401",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20364,8 +20367,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-9522",
-   "self_type" : "type-9521",
+   "referenced_type" : "type-9549",
+   "self_type" : "type-9548",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20373,8 +20376,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-9615",
-   "self_type" : "type-9614",
+   "referenced_type" : "type-9640",
+   "self_type" : "type-9639",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20382,8 +20385,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-9617",
-   "self_type" : "type-9616",
+   "referenced_type" : "type-9644",
+   "self_type" : "type-9643",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20391,8 +20394,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-9653",
-   "self_type" : "type-9652",
+   "referenced_type" : "type-9681",
+   "self_type" : "type-9680",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20400,8 +20403,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-9747",
-   "self_type" : "type-9746",
+   "referenced_type" : "type-9776",
+   "self_type" : "type-9775",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20409,8 +20412,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-9782",
-   "self_type" : "type-9781",
+   "referenced_type" : "type-9809",
+   "self_type" : "type-9808",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20418,8 +20421,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE *",
    "name" : "OMX_BUFFERHEADERTYPE *",
-   "referenced_type" : "type-1540",
-   "self_type" : "type-1595",
+   "referenced_type" : "type-1536",
+   "self_type" : "type-1598",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -20427,8 +20430,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE **",
    "name" : "OMX_BUFFERHEADERTYPE **",
-   "referenced_type" : "type-1595",
-   "self_type" : "type-2376",
+   "referenced_type" : "type-1598",
+   "self_type" : "type-2379",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -20436,8 +20439,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_CALLBACKTYPE *",
    "name" : "OMX_CALLBACKTYPE *",
-   "referenced_type" : "type-1590",
-   "self_type" : "type-2385",
+   "referenced_type" : "type-1593",
+   "self_type" : "type-2388",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -20445,8 +20448,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *)",
    "name" : "OMX_ERRORTYPE (*)(void *)",
-   "referenced_type" : "type-1501",
-   "self_type" : "type-1500",
+   "referenced_type" : "type-1500",
+   "self_type" : "type-1499",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -20454,8 +20457,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-2382",
-   "self_type" : "type-2381",
+   "referenced_type" : "type-2385",
+   "self_type" : "type-2384",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -20463,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-2378",
-   "self_type" : "type-2377",
+   "referenced_type" : "type-2381",
+   "self_type" : "type-2380",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -20472,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-2375",
-   "self_type" : "type-2374",
+   "referenced_type" : "type-2378",
+   "self_type" : "type-2377",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -20481,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-2387",
-   "self_type" : "type-2386",
+   "referenced_type" : "type-2390",
+   "self_type" : "type-2389",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -20490,8 +20493,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
-   "referenced_type" : "type-2384",
-   "self_type" : "type-2383",
+   "referenced_type" : "type-2387",
+   "self_type" : "type-2386",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -20499,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-2362",
-   "self_type" : "type-2361",
+   "referenced_type" : "type-2365",
+   "self_type" : "type-2364",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -20508,8 +20511,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
-   "referenced_type" : "type-2364",
-   "self_type" : "type-2363",
+   "referenced_type" : "type-2367",
+   "self_type" : "type-2366",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -20517,51 +20520,6 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
-   "referenced_type" : "type-2369",
-   "self_type" : "type-2368",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, char *, OMX_INDEXTYPE *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, char *, OMX_INDEXTYPE *)",
-   "referenced_type" : "type-2366",
-   "self_type" : "type-2365",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-2358",
-   "self_type" : "type-2357",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, unsigned char *, unsigned int)",
-   "name" : "OMX_ERRORTYPE (*)(void *, unsigned char *, unsigned int)",
-   "referenced_type" : "type-2389",
-   "self_type" : "type-2388",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, unsigned int, OMX_BUFFERHEADERTYPE *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, unsigned int, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-2380",
-   "self_type" : "type-2379",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-2372",
    "self_type" : "type-2371",
    "size" : 4,
@@ -20569,10 +20527,55 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, char *, OMX_INDEXTYPE *)",
+   "name" : "OMX_ERRORTYPE (*)(void *, char *, OMX_INDEXTYPE *)",
+   "referenced_type" : "type-2369",
+   "self_type" : "type-2368",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "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-2361",
+   "self_type" : "type-2360",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, unsigned char *, unsigned int)",
+   "name" : "OMX_ERRORTYPE (*)(void *, unsigned char *, unsigned int)",
+   "referenced_type" : "type-2392",
+   "self_type" : "type-2391",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, unsigned int, OMX_BUFFERHEADERTYPE *)",
+   "name" : "OMX_ERRORTYPE (*)(void *, unsigned int, OMX_BUFFERHEADERTYPE *)",
+   "referenced_type" : "type-2383",
+   "self_type" : "type-2382",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "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-2375",
+   "self_type" : "type-2374",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, void *, OMX_BUFFERHEADERTYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, void *, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-1594",
-   "self_type" : "type-1593",
+   "referenced_type" : "type-1597",
+   "self_type" : "type-1596",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -20580,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-1592",
-   "self_type" : "type-1591",
+   "referenced_type" : "type-1595",
+   "self_type" : "type-1594",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -20590,7 +20593,7 @@
    "linker_set_key" : "OMX_INDEXTYPE *",
    "name" : "OMX_INDEXTYPE *",
    "referenced_type" : "type-1484",
-   "self_type" : "type-2367",
+   "self_type" : "type-2370",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -20598,8 +20601,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_STATETYPE *",
    "name" : "OMX_STATETYPE *",
-   "referenced_type" : "type-1488",
-   "self_type" : "type-2370",
+   "referenced_type" : "type-1490",
+   "self_type" : "type-2373",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -20607,8 +20610,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_TUNNELSETUPTYPE *",
    "name" : "OMX_TUNNELSETUPTYPE *",
-   "referenced_type" : "type-1612",
-   "self_type" : "type-2373",
+   "referenced_type" : "type-1613",
+   "self_type" : "type-2376",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -20616,8 +20619,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_VERSIONTYPE *",
    "name" : "OMX_VERSIONTYPE *",
-   "referenced_type" : "type-1478",
-   "self_type" : "type-2359",
+   "referenced_type" : "type-1481",
+   "self_type" : "type-2362",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -20634,8 +20637,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1115",
-   "self_type" : "type-1114",
+   "referenced_type" : "type-1118",
+   "self_type" : "type-1117",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20643,8 +20646,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1335",
-   "self_type" : "type-1334",
+   "referenced_type" : "type-1338",
+   "self_type" : "type-1337",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20652,8 +20655,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1402",
-   "self_type" : "type-1401",
+   "referenced_type" : "type-1405",
+   "self_type" : "type-1404",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20661,8 +20664,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1418",
-   "self_type" : "type-1417",
+   "referenced_type" : "type-1421",
+   "self_type" : "type-1420",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20670,8 +20673,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1435",
-   "self_type" : "type-1434",
+   "referenced_type" : "type-1438",
+   "self_type" : "type-1437",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20679,8 +20682,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1437",
-   "self_type" : "type-1436",
+   "referenced_type" : "type-1440",
+   "self_type" : "type-1439",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20688,8 +20691,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1503",
-   "self_type" : "type-1502",
+   "referenced_type" : "type-1506",
+   "self_type" : "type-1505",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20697,8 +20700,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1630",
-   "self_type" : "type-1629",
+   "referenced_type" : "type-1634",
+   "self_type" : "type-1633",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20706,8 +20709,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2609",
-   "self_type" : "type-2608",
+   "referenced_type" : "type-2612",
+   "self_type" : "type-2611",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20715,8 +20718,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3476",
-   "self_type" : "type-3475",
+   "referenced_type" : "type-3479",
+   "self_type" : "type-3478",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20724,8 +20727,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3548",
-   "self_type" : "type-3547",
+   "referenced_type" : "type-3547",
+   "self_type" : "type-3546",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20733,8 +20736,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3653",
-   "self_type" : "type-3652",
+   "referenced_type" : "type-3656",
+   "self_type" : "type-3655",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20742,8 +20745,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3718",
-   "self_type" : "type-3717",
+   "referenced_type" : "type-3724",
+   "self_type" : "type-3723",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20751,8 +20754,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3886",
-   "self_type" : "type-3885",
+   "referenced_type" : "type-3892",
+   "self_type" : "type-3891",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20760,8 +20763,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3929",
-   "self_type" : "type-3928",
+   "referenced_type" : "type-3936",
+   "self_type" : "type-3935",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20769,8 +20772,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3945",
-   "self_type" : "type-3944",
+   "referenced_type" : "type-3951",
+   "self_type" : "type-3950",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20778,8 +20781,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3965",
-   "self_type" : "type-3964",
+   "referenced_type" : "type-3971",
+   "self_type" : "type-3970",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20787,8 +20790,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3967",
-   "self_type" : "type-3966",
+   "referenced_type" : "type-3973",
+   "self_type" : "type-3972",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20796,8 +20799,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4017",
-   "self_type" : "type-4016",
+   "referenced_type" : "type-4023",
+   "self_type" : "type-4022",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20805,8 +20808,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4095",
-   "self_type" : "type-4094",
+   "referenced_type" : "type-4101",
+   "self_type" : "type-4100",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20814,8 +20817,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4297",
-   "self_type" : "type-4296",
+   "referenced_type" : "type-4303",
+   "self_type" : "type-4302",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20823,8 +20826,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4512",
-   "self_type" : "type-4511",
+   "referenced_type" : "type-4518",
+   "self_type" : "type-4517",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20832,8 +20835,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4523",
-   "self_type" : "type-4522",
+   "referenced_type" : "type-4529",
+   "self_type" : "type-4528",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20841,8 +20844,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4549",
-   "self_type" : "type-4548",
+   "referenced_type" : "type-4555",
+   "self_type" : "type-4554",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20850,8 +20853,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4576",
-   "self_type" : "type-4575",
+   "referenced_type" : "type-4582",
+   "self_type" : "type-4581",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20859,8 +20862,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4743",
-   "self_type" : "type-4742",
+   "referenced_type" : "type-4749",
+   "self_type" : "type-4748",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20868,8 +20871,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4853",
-   "self_type" : "type-4852",
+   "referenced_type" : "type-4859",
+   "self_type" : "type-4858",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20877,8 +20880,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4964",
-   "self_type" : "type-4963",
+   "referenced_type" : "type-4970",
+   "self_type" : "type-4969",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20886,8 +20889,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5397",
-   "self_type" : "type-5396",
+   "referenced_type" : "type-5403",
+   "self_type" : "type-5402",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20895,8 +20898,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5469",
-   "self_type" : "type-5468",
+   "referenced_type" : "type-5471",
+   "self_type" : "type-5470",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20904,8 +20907,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5574",
-   "self_type" : "type-5573",
+   "referenced_type" : "type-5580",
+   "self_type" : "type-5579",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20913,8 +20916,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5639",
-   "self_type" : "type-5638",
+   "referenced_type" : "type-5648",
+   "self_type" : "type-5647",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20922,8 +20925,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5807",
-   "self_type" : "type-5806",
+   "referenced_type" : "type-5816",
+   "self_type" : "type-5815",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20931,8 +20934,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5850",
-   "self_type" : "type-5849",
+   "referenced_type" : "type-5860",
+   "self_type" : "type-5859",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20940,8 +20943,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5866",
-   "self_type" : "type-5865",
+   "referenced_type" : "type-5875",
+   "self_type" : "type-5874",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20949,8 +20952,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5886",
-   "self_type" : "type-5885",
+   "referenced_type" : "type-5895",
+   "self_type" : "type-5894",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20958,8 +20961,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5888",
-   "self_type" : "type-5887",
+   "referenced_type" : "type-5897",
+   "self_type" : "type-5896",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20967,8 +20970,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5938",
-   "self_type" : "type-5937",
+   "referenced_type" : "type-5947",
+   "self_type" : "type-5946",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20976,8 +20979,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6016",
-   "self_type" : "type-6015",
+   "referenced_type" : "type-6025",
+   "self_type" : "type-6024",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20985,8 +20988,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6206",
-   "self_type" : "type-6205",
+   "referenced_type" : "type-6215",
+   "self_type" : "type-6214",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20994,8 +20997,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6396",
-   "self_type" : "type-6395",
+   "referenced_type" : "type-6405",
+   "self_type" : "type-6404",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21003,8 +21006,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6407",
-   "self_type" : "type-6406",
+   "referenced_type" : "type-6416",
+   "self_type" : "type-6415",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21012,8 +21015,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6433",
-   "self_type" : "type-6432",
+   "referenced_type" : "type-6442",
+   "self_type" : "type-6441",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21021,8 +21024,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6460",
-   "self_type" : "type-6459",
+   "referenced_type" : "type-6469",
+   "self_type" : "type-6468",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21030,8 +21033,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6611",
-   "self_type" : "type-6610",
+   "referenced_type" : "type-6620",
+   "self_type" : "type-6619",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21039,8 +21042,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6717",
-   "self_type" : "type-6716",
+   "referenced_type" : "type-6726",
+   "self_type" : "type-6725",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21048,8 +21051,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6744",
-   "self_type" : "type-6743",
+   "referenced_type" : "type-6753",
+   "self_type" : "type-6752",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21057,8 +21060,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6844",
-   "self_type" : "type-6843",
+   "referenced_type" : "type-6854",
+   "self_type" : "type-6853",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21066,8 +21069,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6880",
-   "self_type" : "type-6879",
+   "referenced_type" : "type-6890",
+   "self_type" : "type-6889",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21075,8 +21078,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7000",
-   "self_type" : "type-6999",
+   "referenced_type" : "type-7009",
+   "self_type" : "type-7008",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21084,8 +21087,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7060",
-   "self_type" : "type-7059",
+   "referenced_type" : "type-7069",
+   "self_type" : "type-7068",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21093,8 +21096,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7150",
-   "self_type" : "type-7149",
+   "referenced_type" : "type-7159",
+   "self_type" : "type-7158",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21102,8 +21105,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7166",
-   "self_type" : "type-7165",
+   "referenced_type" : "type-7175",
+   "self_type" : "type-7174",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21111,8 +21114,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7251",
-   "self_type" : "type-7250",
+   "referenced_type" : "type-7271",
+   "self_type" : "type-7270",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21120,8 +21123,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7290",
-   "self_type" : "type-7289",
+   "referenced_type" : "type-7310",
+   "self_type" : "type-7309",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21129,8 +21132,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7383",
-   "self_type" : "type-7382",
+   "referenced_type" : "type-7405",
+   "self_type" : "type-7404",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21147,8 +21150,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7713",
-   "self_type" : "type-7712",
+   "referenced_type" : "type-7734",
+   "self_type" : "type-7733",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21156,8 +21159,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7785",
-   "self_type" : "type-7784",
+   "referenced_type" : "type-7802",
+   "self_type" : "type-7801",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21165,8 +21168,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7890",
-   "self_type" : "type-7889",
+   "referenced_type" : "type-7911",
+   "self_type" : "type-7910",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21174,8 +21177,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7955",
-   "self_type" : "type-7954",
+   "referenced_type" : "type-7979",
+   "self_type" : "type-7978",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21183,8 +21186,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-8123",
-   "self_type" : "type-8122",
+   "referenced_type" : "type-8147",
+   "self_type" : "type-8146",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21192,8 +21195,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-8188",
-   "self_type" : "type-8187",
+   "referenced_type" : "type-8212",
+   "self_type" : "type-8211",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21201,8 +21204,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-8312",
-   "self_type" : "type-8311",
+   "referenced_type" : "type-8336",
+   "self_type" : "type-8335",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21210,8 +21213,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-8371",
-   "self_type" : "type-8370",
+   "referenced_type" : "type-8391",
+   "self_type" : "type-8390",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21219,8 +21222,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-8463",
-   "self_type" : "type-8462",
+   "referenced_type" : "type-8487",
+   "self_type" : "type-8486",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21228,8 +21231,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-8510",
-   "self_type" : "type-8509",
+   "referenced_type" : "type-8538",
+   "self_type" : "type-8537",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21237,8 +21240,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-8642",
-   "self_type" : "type-8641",
+   "referenced_type" : "type-8669",
+   "self_type" : "type-8668",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21246,8 +21249,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-8684",
-   "self_type" : "type-8683",
+   "referenced_type" : "type-868",
+   "self_type" : "type-867",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21255,8 +21258,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-8700",
-   "self_type" : "type-8699",
+   "referenced_type" : "type-8711",
+   "self_type" : "type-8710",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21264,8 +21267,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-8718",
-   "self_type" : "type-8717",
+   "referenced_type" : "type-8727",
+   "self_type" : "type-8726",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21273,8 +21276,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-872",
-   "self_type" : "type-871",
+   "referenced_type" : "type-8745",
+   "self_type" : "type-8744",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21282,8 +21285,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-8720",
-   "self_type" : "type-8719",
+   "referenced_type" : "type-8747",
+   "self_type" : "type-8746",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21291,8 +21294,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-8767",
-   "self_type" : "type-8766",
+   "referenced_type" : "type-8794",
+   "self_type" : "type-8793",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21300,8 +21303,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-8844",
-   "self_type" : "type-8843",
+   "referenced_type" : "type-8871",
+   "self_type" : "type-8870",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21309,8 +21312,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-9063",
-   "self_type" : "type-9062",
+   "referenced_type" : "type-9090",
+   "self_type" : "type-9089",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21318,8 +21321,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-9279",
-   "self_type" : "type-9278",
+   "referenced_type" : "type-9307",
+   "self_type" : "type-9306",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21327,8 +21330,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-9294",
-   "self_type" : "type-9293",
+   "referenced_type" : "type-9322",
+   "self_type" : "type-9321",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21336,8 +21339,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-9329",
-   "self_type" : "type-9328",
+   "referenced_type" : "type-9358",
+   "self_type" : "type-9357",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21345,8 +21348,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-9373",
-   "self_type" : "type-9372",
+   "referenced_type" : "type-9400",
+   "self_type" : "type-9399",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21354,8 +21357,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-9520",
-   "self_type" : "type-9519",
+   "referenced_type" : "type-9547",
+   "self_type" : "type-9546",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21363,8 +21366,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-9610",
-   "self_type" : "type-9609",
+   "referenced_type" : "type-9635",
+   "self_type" : "type-9634",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21372,8 +21375,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-9613",
-   "self_type" : "type-9612",
+   "referenced_type" : "type-9642",
+   "self_type" : "type-9641",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21381,8 +21384,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-9651",
-   "self_type" : "type-9650",
+   "referenced_type" : "type-9679",
+   "self_type" : "type-9678",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21390,8 +21393,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-9745",
-   "self_type" : "type-9744",
+   "referenced_type" : "type-9774",
+   "self_type" : "type-9773",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21399,8 +21402,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-9780",
-   "self_type" : "type-9779",
+   "referenced_type" : "type-9807",
+   "self_type" : "type-9806",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21444,8 +21447,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ALooper::LooperThread *",
    "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-3759",
-   "self_type" : "type-3758",
+   "referenced_type" : "type-3763",
+   "self_type" : "type-3762",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21453,8 +21456,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ALooper::LooperThread *",
    "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-5680",
-   "self_type" : "type-5679",
+   "referenced_type" : "type-5687",
+   "self_type" : "type-5686",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21462,8 +21465,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ALooper::LooperThread *",
    "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-7996",
-   "self_type" : "type-7995",
+   "referenced_type" : "type-8018",
+   "self_type" : "type-8017",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21471,8 +21474,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ALooper::LooperThread *",
    "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-8144",
-   "self_type" : "type-8143",
+   "referenced_type" : "type-8168",
+   "self_type" : "type-8167",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21489,8 +21492,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::AReplyToken *",
    "name" : "android::AReplyToken *",
-   "referenced_type" : "type-1044",
-   "self_type" : "type-1163",
+   "referenced_type" : "type-1043",
+   "self_type" : "type-1166",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -21508,7 +21511,7 @@
    "linker_set_key" : "android::BBinder *",
    "name" : "android::BBinder *",
    "referenced_type" : "type-67",
-   "self_type" : "type-1206",
+   "self_type" : "type-1209",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -21535,7 +21538,7 @@
    "linker_set_key" : "android::BnInterface<android::IGraphicBufferProducer> *",
    "name" : "android::BnInterface<android::IGraphicBufferProducer> *",
    "referenced_type" : "type-71",
-   "self_type" : "type-1271",
+   "self_type" : "type-1275",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21544,7 +21547,7 @@
    "linker_set_key" : "android::BnInterface<android::IProducerListener> *",
    "name" : "android::BnInterface<android::IProducerListener> *",
    "referenced_type" : "type-80",
-   "self_type" : "type-4500",
+   "self_type" : "type-4506",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21552,8 +21555,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BnInterface<android::ITransactionCompletedListener> *",
    "name" : "android::BnInterface<android::ITransactionCompletedListener> *",
-   "referenced_type" : "type-1031",
-   "self_type" : "type-1034",
+   "referenced_type" : "type-1034",
+   "self_type" : "type-1037",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21561,8 +21564,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpConsumerListener *",
    "name" : "android::BpConsumerListener *",
-   "referenced_type" : "type-1579",
-   "self_type" : "type-1578",
+   "referenced_type" : "type-1583",
+   "self_type" : "type-1582",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21570,8 +21573,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpConsumerListener *",
    "name" : "android::BpConsumerListener *",
-   "referenced_type" : "type-4059",
-   "self_type" : "type-4058",
+   "referenced_type" : "type-4065",
+   "self_type" : "type-4064",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21579,8 +21582,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpConsumerListener *",
    "name" : "android::BpConsumerListener *",
-   "referenced_type" : "type-5980",
-   "self_type" : "type-5979",
+   "referenced_type" : "type-5989",
+   "self_type" : "type-5988",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21588,8 +21591,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpConsumerListener *",
    "name" : "android::BpConsumerListener *",
-   "referenced_type" : "type-8808",
-   "self_type" : "type-8807",
+   "referenced_type" : "type-8835",
+   "self_type" : "type-8834",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21597,8 +21600,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpGraphicBufferConsumer *",
    "name" : "android::BpGraphicBufferConsumer *",
-   "referenced_type" : "type-1603",
-   "self_type" : "type-1602",
+   "referenced_type" : "type-1607",
+   "self_type" : "type-1606",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21606,8 +21609,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpGraphicBufferConsumer *",
    "name" : "android::BpGraphicBufferConsumer *",
-   "referenced_type" : "type-4076",
-   "self_type" : "type-4075",
+   "referenced_type" : "type-4082",
+   "self_type" : "type-4081",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21615,8 +21618,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpGraphicBufferConsumer *",
    "name" : "android::BpGraphicBufferConsumer *",
-   "referenced_type" : "type-5997",
-   "self_type" : "type-5996",
+   "referenced_type" : "type-6006",
+   "self_type" : "type-6005",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21624,8 +21627,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpGraphicBufferConsumer *",
    "name" : "android::BpGraphicBufferConsumer *",
-   "referenced_type" : "type-8823",
-   "self_type" : "type-8822",
+   "referenced_type" : "type-8850",
+   "self_type" : "type-8849",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21633,8 +21636,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpGraphicBufferProducer *",
    "name" : "android::BpGraphicBufferProducer *",
-   "referenced_type" : "type-4230",
-   "self_type" : "type-4229",
+   "referenced_type" : "type-4236",
+   "self_type" : "type-4235",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21642,8 +21645,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpGraphicBufferProducer *",
    "name" : "android::BpGraphicBufferProducer *",
-   "referenced_type" : "type-6150",
-   "self_type" : "type-6149",
+   "referenced_type" : "type-6159",
+   "self_type" : "type-6158",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21651,8 +21654,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpGraphicBufferProducer *",
    "name" : "android::BpGraphicBufferProducer *",
-   "referenced_type" : "type-9007",
-   "self_type" : "type-9006",
+   "referenced_type" : "type-9034",
+   "self_type" : "type-9033",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21660,8 +21663,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpInterface<android::IConsumerListener> *",
    "name" : "android::BpInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-1495",
-   "self_type" : "type-1498",
+   "referenced_type" : "type-1501",
+   "self_type" : "type-1504",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -21669,8 +21672,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpInterface<android::IGraphicBufferConsumer> *",
    "name" : "android::BpInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-1624",
-   "self_type" : "type-1628",
+   "referenced_type" : "type-1629",
+   "self_type" : "type-1632",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -21678,8 +21681,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpInterface<android::IGraphicBufferProducer> *",
    "name" : "android::BpInterface<android::IGraphicBufferProducer> *",
-   "referenced_type" : "type-4317",
-   "self_type" : "type-4320",
+   "referenced_type" : "type-4323",
+   "self_type" : "type-4326",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -21687,8 +21690,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpInterface<android::IProducerListener> *",
    "name" : "android::BpInterface<android::IProducerListener> *",
-   "referenced_type" : "type-4479",
-   "self_type" : "type-4482",
+   "referenced_type" : "type-4485",
+   "self_type" : "type-4488",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -21696,8 +21699,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpProducerListener *",
    "name" : "android::BpProducerListener *",
-   "referenced_type" : "type-4452",
-   "self_type" : "type-4451",
+   "referenced_type" : "type-4458",
+   "self_type" : "type-4457",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21705,8 +21708,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpProducerListener *",
    "name" : "android::BpProducerListener *",
-   "referenced_type" : "type-6349",
-   "self_type" : "type-6348",
+   "referenced_type" : "type-6358",
+   "self_type" : "type-6357",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21714,8 +21717,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpProducerListener *",
    "name" : "android::BpProducerListener *",
-   "referenced_type" : "type-9221",
-   "self_type" : "type-9220",
+   "referenced_type" : "type-9249",
+   "self_type" : "type-9248",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21732,8 +21735,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-1067",
-   "self_type" : "type-1066",
+   "referenced_type" : "type-1070",
+   "self_type" : "type-1069",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -21741,8 +21744,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-1529",
-   "self_type" : "type-1528",
+   "referenced_type" : "type-1532",
+   "self_type" : "type-1531",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -21750,8 +21753,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-1670",
-   "self_type" : "type-1669",
+   "referenced_type" : "type-1674",
+   "self_type" : "type-1673",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -21759,8 +21762,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-3636",
-   "self_type" : "type-3635",
+   "referenced_type" : "type-3639",
+   "self_type" : "type-3638",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -21768,8 +21771,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-3680",
-   "self_type" : "type-3679",
+   "referenced_type" : "type-3686",
+   "self_type" : "type-3685",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -21777,8 +21780,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-4039",
-   "self_type" : "type-4038",
+   "referenced_type" : "type-4046",
+   "self_type" : "type-4045",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -21786,8 +21789,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-4125",
-   "self_type" : "type-4124",
+   "referenced_type" : "type-4131",
+   "self_type" : "type-4130",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -21795,8 +21798,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-5557",
-   "self_type" : "type-5556",
+   "referenced_type" : "type-5563",
+   "self_type" : "type-5562",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -21804,8 +21807,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-5601",
-   "self_type" : "type-5600",
+   "referenced_type" : "type-5610",
+   "self_type" : "type-5609",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -21813,8 +21816,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-5960",
-   "self_type" : "type-5959",
+   "referenced_type" : "type-5970",
+   "self_type" : "type-5969",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -21822,8 +21825,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-6046",
-   "self_type" : "type-6045",
+   "referenced_type" : "type-6055",
+   "self_type" : "type-6054",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -21831,8 +21834,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-7873",
-   "self_type" : "type-7872",
+   "referenced_type" : "type-7894",
+   "self_type" : "type-7893",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -21840,8 +21843,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-7917",
-   "self_type" : "type-7916",
+   "referenced_type" : "type-7941",
+   "self_type" : "type-7940",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -21849,8 +21852,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-8444",
-   "self_type" : "type-8443",
+   "referenced_type" : "type-8468",
+   "self_type" : "type-8467",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -21858,8 +21861,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-8482",
-   "self_type" : "type-8481",
+   "referenced_type" : "type-8509",
+   "self_type" : "type-8508",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -21867,8 +21870,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-8791",
-   "self_type" : "type-8790",
+   "referenced_type" : "type-8818",
+   "self_type" : "type-8817",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -21876,8 +21879,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-8872",
-   "self_type" : "type-8871",
+   "referenced_type" : "type-8900",
+   "self_type" : "type-8899",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -21894,8 +21897,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
    "name" : "android::BufferQueue::ProxyConsumerListener *",
-   "referenced_type" : "type-2536",
-   "self_type" : "type-2535",
+   "referenced_type" : "type-2539",
+   "self_type" : "type-2538",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21903,8 +21906,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
    "name" : "android::BufferQueue::ProxyConsumerListener *",
-   "referenced_type" : "type-4948",
-   "self_type" : "type-4947",
+   "referenced_type" : "type-4954",
+   "self_type" : "type-4953",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21912,8 +21915,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
    "name" : "android::BufferQueue::ProxyConsumerListener *",
-   "referenced_type" : "type-7065",
-   "self_type" : "type-7064",
+   "referenced_type" : "type-7073",
+   "self_type" : "type-7072",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21921,8 +21924,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
    "name" : "android::BufferQueue::ProxyConsumerListener *",
-   "referenced_type" : "type-8182",
-   "self_type" : "type-8181",
+   "referenced_type" : "type-8206",
+   "self_type" : "type-8205",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21930,8 +21933,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
    "name" : "android::BufferQueue::ProxyConsumerListener *",
-   "referenced_type" : "type-9395",
-   "self_type" : "type-9394",
+   "referenced_type" : "type-9419",
+   "self_type" : "type-9418",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21939,8 +21942,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueConsumer *",
    "name" : "android::BufferQueueConsumer *",
-   "referenced_type" : "type-3491",
-   "self_type" : "type-3490",
+   "referenced_type" : "type-3494",
+   "self_type" : "type-3493",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21948,8 +21951,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueConsumer *",
    "name" : "android::BufferQueueConsumer *",
-   "referenced_type" : "type-5412",
-   "self_type" : "type-5411",
+   "referenced_type" : "type-5418",
+   "self_type" : "type-5417",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21957,8 +21960,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueConsumer *",
    "name" : "android::BufferQueueConsumer *",
-   "referenced_type" : "type-7728",
-   "self_type" : "type-7727",
+   "referenced_type" : "type-7749",
+   "self_type" : "type-7748",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21975,8 +21978,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueConsumer *",
    "name" : "android::BufferQueueConsumer *",
-   "referenced_type" : "type-8324",
-   "self_type" : "type-8323",
+   "referenced_type" : "type-8348",
+   "self_type" : "type-8347",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21984,8 +21987,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-1169",
-   "self_type" : "type-1168",
+   "referenced_type" : "type-1172",
+   "self_type" : "type-1171",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21993,8 +21996,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-3517",
-   "self_type" : "type-3516",
+   "referenced_type" : "type-3520",
+   "self_type" : "type-3519",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22002,8 +22005,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-3615",
-   "self_type" : "type-3614",
+   "referenced_type" : "type-3618",
+   "self_type" : "type-3617",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22011,8 +22014,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-3773",
-   "self_type" : "type-3772",
+   "referenced_type" : "type-3779",
+   "self_type" : "type-3778",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22020,8 +22023,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-5438",
-   "self_type" : "type-5437",
+   "referenced_type" : "type-5444",
+   "self_type" : "type-5443",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22029,8 +22032,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-5536",
-   "self_type" : "type-5535",
+   "referenced_type" : "type-5542",
+   "self_type" : "type-5541",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22038,8 +22041,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-5694",
-   "self_type" : "type-5693",
+   "referenced_type" : "type-5703",
+   "self_type" : "type-5702",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22047,8 +22050,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-7754",
-   "self_type" : "type-7753",
+   "referenced_type" : "type-7775",
+   "self_type" : "type-7774",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22056,8 +22059,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-7852",
-   "self_type" : "type-7851",
+   "referenced_type" : "type-7873",
+   "self_type" : "type-7872",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22065,8 +22068,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-8010",
-   "self_type" : "type-8009",
+   "referenced_type" : "type-8034",
+   "self_type" : "type-8033",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22083,8 +22086,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-8343",
-   "self_type" : "type-8342",
+   "referenced_type" : "type-8367",
+   "self_type" : "type-8366",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22092,8 +22095,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-8430",
-   "self_type" : "type-8429",
+   "referenced_type" : "type-8454",
+   "self_type" : "type-8453",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22101,8 +22104,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-8561",
-   "self_type" : "type-8560",
+   "referenced_type" : "type-8588",
+   "self_type" : "type-8587",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22119,8 +22122,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueProducer *",
    "name" : "android::BufferQueueProducer *",
-   "referenced_type" : "type-3502",
-   "self_type" : "type-3501",
+   "referenced_type" : "type-3505",
+   "self_type" : "type-3504",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22128,8 +22131,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueProducer *",
    "name" : "android::BufferQueueProducer *",
-   "referenced_type" : "type-5423",
-   "self_type" : "type-5422",
+   "referenced_type" : "type-5429",
+   "self_type" : "type-5428",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22137,8 +22140,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueProducer *",
    "name" : "android::BufferQueueProducer *",
-   "referenced_type" : "type-7739",
-   "self_type" : "type-7738",
+   "referenced_type" : "type-7760",
+   "self_type" : "type-7759",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22155,8 +22158,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueProducer *",
    "name" : "android::BufferQueueProducer *",
-   "referenced_type" : "type-8333",
-   "self_type" : "type-8332",
+   "referenced_type" : "type-8357",
+   "self_type" : "type-8356",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22173,8 +22176,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ComposerService *",
    "name" : "android::ComposerService *",
-   "referenced_type" : "type-1092",
-   "self_type" : "type-1091",
+   "referenced_type" : "type-1095",
+   "self_type" : "type-1094",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -22182,8 +22185,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ComposerService *",
    "name" : "android::ComposerService *",
-   "referenced_type" : "type-3700",
-   "self_type" : "type-3699",
+   "referenced_type" : "type-3706",
+   "self_type" : "type-3705",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -22191,8 +22194,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ComposerService *",
    "name" : "android::ComposerService *",
-   "referenced_type" : "type-5621",
-   "self_type" : "type-5620",
+   "referenced_type" : "type-5630",
+   "self_type" : "type-5629",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -22200,8 +22203,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ComposerService *",
    "name" : "android::ComposerService *",
-   "referenced_type" : "type-7937",
-   "self_type" : "type-7936",
+   "referenced_type" : "type-7961",
+   "self_type" : "type-7960",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -22209,8 +22212,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ComposerService *",
    "name" : "android::ComposerService *",
-   "referenced_type" : "type-8495",
-   "self_type" : "type-8494",
+   "referenced_type" : "type-8522",
+   "self_type" : "type-8521",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -22227,8 +22230,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-1253",
-   "self_type" : "type-1252",
+   "referenced_type" : "type-1257",
+   "self_type" : "type-1256",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22236,8 +22239,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-1455",
-   "self_type" : "type-1454",
+   "referenced_type" : "type-1458",
+   "self_type" : "type-1457",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22245,8 +22248,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-3813",
-   "self_type" : "type-3812",
+   "referenced_type" : "type-3820",
+   "self_type" : "type-3819",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22254,8 +22257,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-3986",
-   "self_type" : "type-3985",
+   "referenced_type" : "type-3992",
+   "self_type" : "type-3991",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22263,8 +22266,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-5734",
-   "self_type" : "type-5733",
+   "referenced_type" : "type-5744",
+   "self_type" : "type-5743",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22272,8 +22275,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-5907",
-   "self_type" : "type-5906",
+   "referenced_type" : "type-5916",
+   "self_type" : "type-5915",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22281,8 +22284,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-8050",
-   "self_type" : "type-8049",
+   "referenced_type" : "type-8075",
+   "self_type" : "type-8074",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22290,8 +22293,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-8584",
-   "self_type" : "type-8583",
+   "referenced_type" : "type-8611",
+   "self_type" : "type-8610",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22299,8 +22302,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-8736",
-   "self_type" : "type-8735",
+   "referenced_type" : "type-8763",
+   "self_type" : "type-8762",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22308,8 +22311,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-3291",
-   "self_type" : "type-3290",
+   "referenced_type" : "type-3294",
+   "self_type" : "type-3293",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22317,8 +22320,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-3480",
-   "self_type" : "type-3479",
+   "referenced_type" : "type-3483",
+   "self_type" : "type-3482",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22335,8 +22338,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-5212",
-   "self_type" : "type-5211",
+   "referenced_type" : "type-5218",
+   "self_type" : "type-5217",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22344,8 +22347,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-5401",
-   "self_type" : "type-5400",
+   "referenced_type" : "type-5407",
+   "self_type" : "type-5406",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22353,17 +22356,8 @@
    "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",
+   "referenced_type" : "type-7549",
+   "self_type" : "type-7548",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22380,8 +22374,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-8228",
-   "self_type" : "type-8227",
+   "referenced_type" : "type-7738",
+   "self_type" : "type-7737",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22389,8 +22383,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-8316",
-   "self_type" : "type-8315",
+   "referenced_type" : "type-8252",
+   "self_type" : "type-8251",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-8340",
+   "self_type" : "type-8339",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22416,8 +22419,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-1285",
-   "self_type" : "type-1284",
+   "referenced_type" : "type-1288",
+   "self_type" : "type-1287",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22425,8 +22428,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-1414",
-   "self_type" : "type-1413",
+   "referenced_type" : "type-1417",
+   "self_type" : "type-1416",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22434,8 +22437,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-1433",
-   "self_type" : "type-1432",
+   "referenced_type" : "type-1436",
+   "self_type" : "type-1435",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22443,8 +22446,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-1457",
-   "self_type" : "type-1456",
+   "referenced_type" : "type-1461",
+   "self_type" : "type-1460",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22452,8 +22455,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-1584",
-   "self_type" : "type-1583",
+   "referenced_type" : "type-1588",
+   "self_type" : "type-1587",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22461,8 +22464,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-1611",
-   "self_type" : "type-1610",
+   "referenced_type" : "type-1615",
+   "self_type" : "type-1614",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22470,8 +22473,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-1866",
-   "self_type" : "type-1865",
+   "referenced_type" : "type-1870",
+   "self_type" : "type-1869",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22479,8 +22482,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3447",
-   "self_type" : "type-3446",
+   "referenced_type" : "type-3450",
+   "self_type" : "type-3449",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22488,8 +22491,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3485",
-   "self_type" : "type-3484",
+   "referenced_type" : "type-3488",
+   "self_type" : "type-3487",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22497,8 +22500,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3658",
-   "self_type" : "type-3657",
+   "referenced_type" : "type-3661",
+   "self_type" : "type-3660",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22506,8 +22509,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3660",
-   "self_type" : "type-3659",
+   "referenced_type" : "type-3663",
+   "self_type" : "type-3662",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22515,8 +22518,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3836",
-   "self_type" : "type-3835",
+   "referenced_type" : "type-3842",
+   "self_type" : "type-3841",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22524,8 +22527,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3941",
-   "self_type" : "type-3940",
+   "referenced_type" : "type-3947",
+   "self_type" : "type-3946",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22533,8 +22536,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3963",
-   "self_type" : "type-3962",
+   "referenced_type" : "type-3969",
+   "self_type" : "type-3968",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22542,8 +22545,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3988",
-   "self_type" : "type-3987",
+   "referenced_type" : "type-3994",
+   "self_type" : "type-3993",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22551,8 +22554,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-4064",
-   "self_type" : "type-4063",
+   "referenced_type" : "type-4070",
+   "self_type" : "type-4069",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22560,8 +22563,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-4083",
-   "self_type" : "type-4082",
+   "referenced_type" : "type-4089",
+   "self_type" : "type-4088",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22569,8 +22572,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-4395",
-   "self_type" : "type-4394",
+   "referenced_type" : "type-4399",
+   "self_type" : "type-4398",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22578,8 +22581,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-4653",
-   "self_type" : "type-4652",
+   "referenced_type" : "type-4659",
+   "self_type" : "type-4658",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22587,8 +22590,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-4669",
-   "self_type" : "type-4668",
+   "referenced_type" : "type-4675",
+   "self_type" : "type-4674",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22596,8 +22599,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-4932",
-   "self_type" : "type-4931",
+   "referenced_type" : "type-4938",
+   "self_type" : "type-4937",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22605,8 +22608,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5368",
-   "self_type" : "type-5367",
+   "referenced_type" : "type-5374",
+   "self_type" : "type-5373",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22614,8 +22617,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5406",
-   "self_type" : "type-5405",
+   "referenced_type" : "type-5412",
+   "self_type" : "type-5411",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22623,8 +22626,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5579",
-   "self_type" : "type-5578",
+   "referenced_type" : "type-5585",
+   "self_type" : "type-5584",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22632,8 +22635,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5581",
-   "self_type" : "type-5580",
+   "referenced_type" : "type-5587",
+   "self_type" : "type-5586",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22641,8 +22644,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5757",
-   "self_type" : "type-5756",
+   "referenced_type" : "type-5766",
+   "self_type" : "type-5765",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22650,8 +22653,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5862",
-   "self_type" : "type-5861",
+   "referenced_type" : "type-5871",
+   "self_type" : "type-5870",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22659,8 +22662,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5884",
-   "self_type" : "type-5883",
+   "referenced_type" : "type-5893",
+   "self_type" : "type-5892",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22668,8 +22671,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5909",
-   "self_type" : "type-5908",
+   "referenced_type" : "type-5918",
+   "self_type" : "type-5917",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22677,8 +22680,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5985",
-   "self_type" : "type-5984",
+   "referenced_type" : "type-5994",
+   "self_type" : "type-5993",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22686,8 +22689,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6004",
-   "self_type" : "type-6003",
+   "referenced_type" : "type-6013",
+   "self_type" : "type-6012",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22695,8 +22698,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6292",
-   "self_type" : "type-6291",
+   "referenced_type" : "type-6299",
+   "self_type" : "type-6298",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22704,8 +22707,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6537",
-   "self_type" : "type-6536",
+   "referenced_type" : "type-6546",
+   "self_type" : "type-6545",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22713,8 +22716,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6550",
-   "self_type" : "type-6549",
+   "referenced_type" : "type-6559",
+   "self_type" : "type-6558",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22722,8 +22725,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6764",
-   "self_type" : "type-6763",
+   "referenced_type" : "type-6773",
+   "self_type" : "type-6772",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22731,8 +22734,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6914",
-   "self_type" : "type-6913",
+   "referenced_type" : "type-6923",
+   "self_type" : "type-6922",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22749,8 +22752,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-7081",
-   "self_type" : "type-7080",
+   "referenced_type" : "type-7089",
+   "self_type" : "type-7088",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22767,8 +22770,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-7306",
-   "self_type" : "type-7305",
+   "referenced_type" : "type-7327",
+   "self_type" : "type-7326",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22776,8 +22779,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-7684",
-   "self_type" : "type-7683",
+   "referenced_type" : "type-7705",
+   "self_type" : "type-7704",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22785,8 +22788,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-7722",
-   "self_type" : "type-7721",
+   "referenced_type" : "type-7743",
+   "self_type" : "type-7742",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22803,8 +22806,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-7895",
-   "self_type" : "type-7894",
+   "referenced_type" : "type-7916",
+   "self_type" : "type-7915",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22812,8 +22815,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-7897",
-   "self_type" : "type-7896",
+   "referenced_type" : "type-7918",
+   "self_type" : "type-7917",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22821,8 +22824,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-8073",
-   "self_type" : "type-8072",
+   "referenced_type" : "type-8097",
+   "self_type" : "type-8096",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22830,8 +22833,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-8173",
-   "self_type" : "type-8172",
+   "referenced_type" : "type-8197",
+   "self_type" : "type-8196",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22839,8 +22842,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-8286",
-   "self_type" : "type-8285",
+   "referenced_type" : "type-8310",
+   "self_type" : "type-8309",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22848,8 +22851,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-8318",
-   "self_type" : "type-8317",
+   "referenced_type" : "type-8342",
+   "self_type" : "type-8341",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22857,8 +22860,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-8468",
-   "self_type" : "type-8467",
+   "referenced_type" : "type-8492",
+   "self_type" : "type-8491",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22866,8 +22869,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-8470",
-   "self_type" : "type-8469",
+   "referenced_type" : "type-8494",
+   "self_type" : "type-8493",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22875,8 +22878,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-8597",
-   "self_type" : "type-8596",
+   "referenced_type" : "type-8624",
+   "self_type" : "type-8623",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22884,8 +22887,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-8696",
-   "self_type" : "type-8695",
+   "referenced_type" : "type-8723",
+   "self_type" : "type-8722",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22893,8 +22896,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-8716",
-   "self_type" : "type-8715",
+   "referenced_type" : "type-8743",
+   "self_type" : "type-8742",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22902,8 +22905,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-8738",
-   "self_type" : "type-8737",
+   "referenced_type" : "type-8765",
+   "self_type" : "type-8764",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22911,8 +22914,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-8813",
-   "self_type" : "type-8812",
+   "referenced_type" : "type-8840",
+   "self_type" : "type-8839",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22920,8 +22923,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-8830",
-   "self_type" : "type-8829",
+   "referenced_type" : "type-8857",
+   "self_type" : "type-8856",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22929,8 +22932,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-9157",
-   "self_type" : "type-9156",
+   "referenced_type" : "type-9183",
+   "self_type" : "type-9182",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22938,8 +22941,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-9347",
-   "self_type" : "type-9346",
+   "referenced_type" : "type-9374",
+   "self_type" : "type-9373",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22947,8 +22950,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-9459",
-   "self_type" : "type-9458",
+   "referenced_type" : "type-9487",
+   "self_type" : "type-9486",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22956,8 +22959,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-9472",
-   "self_type" : "type-9471",
+   "referenced_type" : "type-9499",
+   "self_type" : "type-9498",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22965,8 +22968,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-9672",
-   "self_type" : "type-9671",
+   "referenced_type" : "type-9701",
+   "self_type" : "type-9700",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22974,8 +22977,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-9816",
-   "self_type" : "type-9815",
+   "referenced_type" : "type-9843",
+   "self_type" : "type-9842",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22983,8 +22986,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FileDescriptor::Autoclose *",
    "name" : "android::FileDescriptor::Autoclose *",
-   "referenced_type" : "type-1204",
-   "self_type" : "type-1213",
+   "referenced_type" : "type-1203",
+   "self_type" : "type-1212",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h"
   },
@@ -22993,7 +22996,7 @@
    "linker_set_key" : "android::Flattenable<android::BufferItem> *",
    "name" : "android::Flattenable<android::BufferItem> *",
    "referenced_type" : "type-21",
-   "self_type" : "type-1510",
+   "self_type" : "type-1513",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -23002,7 +23005,7 @@
    "linker_set_key" : "android::Flattenable<android::Fence> *",
    "name" : "android::Flattenable<android::Fence> *",
    "referenced_type" : "type-16",
-   "self_type" : "type-1636",
+   "self_type" : "type-1642",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -23011,7 +23014,7 @@
    "linker_set_key" : "android::Flattenable<android::FrameEventHistoryDelta> *",
    "name" : "android::Flattenable<android::FrameEventHistoryDelta> *",
    "referenced_type" : "type-25",
-   "self_type" : "type-4308",
+   "self_type" : "type-4314",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -23020,7 +23023,7 @@
    "linker_set_key" : "android::Flattenable<android::GraphicBuffer> *",
    "name" : "android::Flattenable<android::GraphicBuffer> *",
    "referenced_type" : "type-14",
-   "self_type" : "type-1640",
+   "self_type" : "type-1645",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -23029,7 +23032,7 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> *",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> *",
    "referenced_type" : "type-32",
-   "self_type" : "type-4311",
+   "self_type" : "type-4317",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -23038,7 +23041,7 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> *",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> *",
    "referenced_type" : "type-34",
-   "self_type" : "type-4314",
+   "self_type" : "type-4320",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -23055,8 +23058,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-1175",
-   "self_type" : "type-1174",
+   "referenced_type" : "type-1178",
+   "self_type" : "type-1177",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23064,8 +23067,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-1468",
-   "self_type" : "type-1467",
+   "referenced_type" : "type-1472",
+   "self_type" : "type-1471",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23073,8 +23076,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-3778",
-   "self_type" : "type-3777",
+   "referenced_type" : "type-3784",
+   "self_type" : "type-3783",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23082,8 +23085,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-3997",
-   "self_type" : "type-3996",
+   "referenced_type" : "type-4003",
+   "self_type" : "type-4002",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23091,8 +23094,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-5699",
-   "self_type" : "type-5698",
+   "referenced_type" : "type-5708",
+   "self_type" : "type-5707",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23100,8 +23103,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-5918",
-   "self_type" : "type-5917",
+   "referenced_type" : "type-5927",
+   "self_type" : "type-5926",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23109,8 +23112,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-8015",
-   "self_type" : "type-8014",
+   "referenced_type" : "type-8039",
+   "self_type" : "type-8038",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23118,8 +23121,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-8565",
-   "self_type" : "type-8564",
+   "referenced_type" : "type-8592",
+   "self_type" : "type-8591",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23127,8 +23130,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-8747",
-   "self_type" : "type-8746",
+   "referenced_type" : "type-8774",
+   "self_type" : "type-8773",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23145,8 +23148,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1331",
-   "self_type" : "type-1330",
+   "referenced_type" : "type-1330",
+   "self_type" : "type-1329",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23154,8 +23157,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1416",
-   "self_type" : "type-1415",
+   "referenced_type" : "type-1419",
+   "self_type" : "type-1418",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23163,8 +23166,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1459",
-   "self_type" : "type-1458",
+   "referenced_type" : "type-1463",
+   "self_type" : "type-1462",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23172,8 +23175,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1587",
-   "self_type" : "type-1586",
+   "referenced_type" : "type-1591",
+   "self_type" : "type-1590",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23181,8 +23184,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1608",
-   "self_type" : "type-1607",
+   "referenced_type" : "type-1612",
+   "self_type" : "type-1611",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23190,8 +23193,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3452",
-   "self_type" : "type-3451",
+   "referenced_type" : "type-3455",
+   "self_type" : "type-3454",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23199,8 +23202,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3487",
-   "self_type" : "type-3486",
+   "referenced_type" : "type-3490",
+   "self_type" : "type-3489",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23208,8 +23211,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3597",
-   "self_type" : "type-3596",
+   "referenced_type" : "type-3600",
+   "self_type" : "type-3599",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23217,8 +23220,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3662",
-   "self_type" : "type-3661",
+   "referenced_type" : "type-3665",
+   "self_type" : "type-3664",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23226,8 +23229,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3882",
-   "self_type" : "type-3881",
+   "referenced_type" : "type-3884",
+   "self_type" : "type-3883",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23235,8 +23238,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3943",
-   "self_type" : "type-3942",
+   "referenced_type" : "type-3949",
+   "self_type" : "type-3948",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23244,8 +23247,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3990",
-   "self_type" : "type-3989",
+   "referenced_type" : "type-3996",
+   "self_type" : "type-3995",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23253,8 +23256,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-4066",
-   "self_type" : "type-4065",
+   "referenced_type" : "type-4072",
+   "self_type" : "type-4071",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23262,8 +23265,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-4081",
-   "self_type" : "type-4080",
+   "referenced_type" : "type-4087",
+   "self_type" : "type-4086",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23271,8 +23274,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-4447",
-   "self_type" : "type-4446",
+   "referenced_type" : "type-4453",
+   "self_type" : "type-4452",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23280,8 +23283,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-4547",
-   "self_type" : "type-4546",
+   "referenced_type" : "type-4551",
+   "self_type" : "type-4550",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23289,8 +23292,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-4676",
-   "self_type" : "type-4675",
+   "referenced_type" : "type-4683",
+   "self_type" : "type-4682",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23298,8 +23301,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5373",
-   "self_type" : "type-5372",
+   "referenced_type" : "type-5379",
+   "self_type" : "type-5378",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23307,8 +23310,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5408",
-   "self_type" : "type-5407",
+   "referenced_type" : "type-5414",
+   "self_type" : "type-5413",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23316,8 +23319,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5518",
-   "self_type" : "type-5517",
+   "referenced_type" : "type-5524",
+   "self_type" : "type-5523",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23325,8 +23328,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5583",
-   "self_type" : "type-5582",
+   "referenced_type" : "type-5589",
+   "self_type" : "type-5588",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23334,8 +23337,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5803",
-   "self_type" : "type-5802",
+   "referenced_type" : "type-5808",
+   "self_type" : "type-5807",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23343,8 +23346,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5864",
-   "self_type" : "type-5863",
+   "referenced_type" : "type-5873",
+   "self_type" : "type-5872",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23352,8 +23355,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5911",
-   "self_type" : "type-5910",
+   "referenced_type" : "type-5920",
+   "self_type" : "type-5919",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23361,8 +23364,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5987",
-   "self_type" : "type-5986",
+   "referenced_type" : "type-5996",
+   "self_type" : "type-5995",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23370,8 +23373,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6002",
-   "self_type" : "type-6001",
+   "referenced_type" : "type-6011",
+   "self_type" : "type-6010",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23379,8 +23382,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6344",
-   "self_type" : "type-6343",
+   "referenced_type" : "type-6353",
+   "self_type" : "type-6352",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23388,8 +23391,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6431",
-   "self_type" : "type-6430",
+   "referenced_type" : "type-6438",
+   "self_type" : "type-6437",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23397,8 +23400,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6557",
-   "self_type" : "type-6556",
+   "referenced_type" : "type-6567",
+   "self_type" : "type-6566",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23406,8 +23409,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6766",
-   "self_type" : "type-6765",
+   "referenced_type" : "type-6776",
+   "self_type" : "type-6775",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23415,8 +23418,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6917",
-   "self_type" : "type-6916",
+   "referenced_type" : "type-6926",
+   "self_type" : "type-6925",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23424,17 +23427,8 @@
    "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",
+   "referenced_type" : "type-7092",
+   "self_type" : "type-7091",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23451,6 +23445,15 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-7329",
+   "self_type" : "type-7328",
+   "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,
@@ -23460,8 +23463,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-7689",
-   "self_type" : "type-7688",
+   "referenced_type" : "type-7710",
+   "self_type" : "type-7709",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23469,8 +23472,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-7724",
-   "self_type" : "type-7723",
+   "referenced_type" : "type-7745",
+   "self_type" : "type-7744",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23487,8 +23490,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-7834",
-   "self_type" : "type-7833",
+   "referenced_type" : "type-7855",
+   "self_type" : "type-7854",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23496,8 +23499,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-7899",
-   "self_type" : "type-7898",
+   "referenced_type" : "type-7920",
+   "self_type" : "type-7919",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23505,8 +23508,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-8119",
-   "self_type" : "type-8118",
+   "referenced_type" : "type-8139",
+   "self_type" : "type-8138",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23514,8 +23517,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-8146",
-   "self_type" : "type-8145",
+   "referenced_type" : "type-8170",
+   "self_type" : "type-8169",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23523,8 +23526,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-8292",
-   "self_type" : "type-8291",
+   "referenced_type" : "type-8316",
+   "self_type" : "type-8315",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23532,8 +23535,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-8320",
-   "self_type" : "type-8319",
+   "referenced_type" : "type-8344",
+   "self_type" : "type-8343",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23541,8 +23544,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-8419",
-   "self_type" : "type-8418",
+   "referenced_type" : "type-8443",
+   "self_type" : "type-8442",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23550,8 +23553,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-8472",
-   "self_type" : "type-8471",
+   "referenced_type" : "type-8496",
+   "self_type" : "type-8495",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23559,8 +23562,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-8638",
-   "self_type" : "type-8637",
+   "referenced_type" : "type-8661",
+   "self_type" : "type-8660",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23568,8 +23571,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-8698",
-   "self_type" : "type-8697",
+   "referenced_type" : "type-8725",
+   "self_type" : "type-8724",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23577,8 +23580,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-8740",
-   "self_type" : "type-8739",
+   "referenced_type" : "type-8767",
+   "self_type" : "type-8766",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23586,8 +23589,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-8789",
-   "self_type" : "type-8788",
+   "referenced_type" : "type-8812",
+   "self_type" : "type-8811",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23595,8 +23598,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-8815",
-   "self_type" : "type-8814",
+   "referenced_type" : "type-8842",
+   "self_type" : "type-8841",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23604,8 +23607,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-8828",
-   "self_type" : "type-8827",
+   "referenced_type" : "type-8855",
+   "self_type" : "type-8854",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23613,8 +23616,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-9215",
-   "self_type" : "type-9214",
+   "referenced_type" : "type-9242",
+   "self_type" : "type-9241",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23631,8 +23634,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-9479",
-   "self_type" : "type-9478",
+   "referenced_type" : "type-9506",
+   "self_type" : "type-9505",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23640,8 +23643,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-9676",
-   "self_type" : "type-9675",
+   "referenced_type" : "type-9703",
+   "self_type" : "type-9702",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23649,8 +23652,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-9819",
-   "self_type" : "type-9818",
+   "referenced_type" : "type-9846",
+   "self_type" : "type-9845",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23658,8 +23661,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1088",
-   "self_type" : "type-1087",
+   "referenced_type" : "type-1091",
+   "self_type" : "type-1090",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23667,8 +23670,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1270",
-   "self_type" : "type-1269",
+   "referenced_type" : "type-1273",
+   "self_type" : "type-1272",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23676,8 +23679,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1412",
-   "self_type" : "type-1411",
+   "referenced_type" : "type-1415",
+   "self_type" : "type-1414",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23685,8 +23688,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1448",
-   "self_type" : "type-1447",
+   "referenced_type" : "type-1451",
+   "self_type" : "type-1450",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23694,8 +23697,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-2174",
-   "self_type" : "type-2173",
+   "referenced_type" : "type-2178",
+   "self_type" : "type-2177",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23703,8 +23706,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3252",
-   "self_type" : "type-3251",
+   "referenced_type" : "type-3255",
+   "self_type" : "type-3254",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23721,8 +23724,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3465",
-   "self_type" : "type-3464",
+   "referenced_type" : "type-3468",
+   "self_type" : "type-3467",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23730,8 +23733,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3530",
-   "self_type" : "type-3529",
+   "referenced_type" : "type-3533",
+   "self_type" : "type-3532",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23739,8 +23742,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3641",
-   "self_type" : "type-3640",
+   "referenced_type" : "type-3644",
+   "self_type" : "type-3643",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23748,8 +23751,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3698",
-   "self_type" : "type-3697",
+   "referenced_type" : "type-3704",
+   "self_type" : "type-3703",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23757,8 +23760,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3823",
-   "self_type" : "type-3822",
+   "referenced_type" : "type-3829",
+   "self_type" : "type-3828",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23766,8 +23769,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3939",
-   "self_type" : "type-3938",
+   "referenced_type" : "type-3945",
+   "self_type" : "type-3944",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23775,8 +23778,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3980",
-   "self_type" : "type-3979",
+   "referenced_type" : "type-3987",
+   "self_type" : "type-3986",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23784,8 +23787,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-4209",
-   "self_type" : "type-4208",
+   "referenced_type" : "type-4216",
+   "self_type" : "type-4215",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23793,8 +23796,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-4388",
-   "self_type" : "type-4387",
+   "referenced_type" : "type-4394",
+   "self_type" : "type-4393",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23802,8 +23805,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-4600",
-   "self_type" : "type-4599",
+   "referenced_type" : "type-4607",
+   "self_type" : "type-4606",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23811,8 +23814,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-4766",
-   "self_type" : "type-4765",
+   "referenced_type" : "type-4773",
+   "self_type" : "type-4772",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23820,8 +23823,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5173",
-   "self_type" : "type-5172",
+   "referenced_type" : "type-5179",
+   "self_type" : "type-5178",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23829,8 +23832,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5386",
-   "self_type" : "type-5385",
+   "referenced_type" : "type-5392",
+   "self_type" : "type-5391",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23838,8 +23841,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5451",
-   "self_type" : "type-5450",
+   "referenced_type" : "type-5457",
+   "self_type" : "type-5456",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23847,8 +23850,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5562",
-   "self_type" : "type-5561",
+   "referenced_type" : "type-5568",
+   "self_type" : "type-5567",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23856,8 +23859,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5619",
-   "self_type" : "type-5618",
+   "referenced_type" : "type-5628",
+   "self_type" : "type-5627",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23865,8 +23868,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5744",
-   "self_type" : "type-5743",
+   "referenced_type" : "type-5753",
+   "self_type" : "type-5752",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23874,8 +23877,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5860",
-   "self_type" : "type-5859",
+   "referenced_type" : "type-5869",
+   "self_type" : "type-5868",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23883,8 +23886,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5901",
-   "self_type" : "type-5900",
+   "referenced_type" : "type-5911",
+   "self_type" : "type-5910",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23892,8 +23895,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6130",
-   "self_type" : "type-6129",
+   "referenced_type" : "type-6140",
+   "self_type" : "type-6139",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23901,8 +23904,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6285",
-   "self_type" : "type-6284",
+   "referenced_type" : "type-6294",
+   "self_type" : "type-6293",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23910,8 +23913,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6484",
-   "self_type" : "type-6483",
+   "referenced_type" : "type-6494",
+   "self_type" : "type-6493",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23919,8 +23922,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6632",
-   "self_type" : "type-6631",
+   "referenced_type" : "type-6642",
+   "self_type" : "type-6641",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23928,8 +23931,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6859",
-   "self_type" : "type-6858",
+   "referenced_type" : "type-6869",
+   "self_type" : "type-6868",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23937,8 +23940,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-7011",
-   "self_type" : "type-7010",
+   "referenced_type" : "type-7020",
+   "self_type" : "type-7019",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23946,8 +23949,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-7102",
-   "self_type" : "type-7101",
+   "referenced_type" : "type-7111",
+   "self_type" : "type-7110",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23955,8 +23958,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-7260",
-   "self_type" : "type-7259",
+   "referenced_type" : "type-7280",
+   "self_type" : "type-7279",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23964,8 +23967,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-7326",
-   "self_type" : "type-7325",
+   "referenced_type" : "type-7346",
+   "self_type" : "type-7345",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23973,8 +23976,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-7489",
-   "self_type" : "type-7488",
+   "referenced_type" : "type-7510",
+   "self_type" : "type-7509",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23991,8 +23994,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-7702",
-   "self_type" : "type-7701",
+   "referenced_type" : "type-7723",
+   "self_type" : "type-7722",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -24000,8 +24003,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-7767",
-   "self_type" : "type-7766",
+   "referenced_type" : "type-7788",
+   "self_type" : "type-7787",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -24009,8 +24012,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-7878",
-   "self_type" : "type-7877",
+   "referenced_type" : "type-7899",
+   "self_type" : "type-7898",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -24018,8 +24021,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-7935",
-   "self_type" : "type-7934",
+   "referenced_type" : "type-7959",
+   "self_type" : "type-7958",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -24027,8 +24030,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-8060",
-   "self_type" : "type-8059",
+   "referenced_type" : "type-8084",
+   "self_type" : "type-8083",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -24036,8 +24039,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-8220",
-   "self_type" : "type-8219",
+   "referenced_type" : "type-8244",
+   "self_type" : "type-8243",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -24045,8 +24048,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-8303",
-   "self_type" : "type-8302",
+   "referenced_type" : "type-8328",
+   "self_type" : "type-8327",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -24054,8 +24057,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-8355",
-   "self_type" : "type-8354",
+   "referenced_type" : "type-8379",
+   "self_type" : "type-8378",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -24072,8 +24075,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-8449",
-   "self_type" : "type-8448",
+   "referenced_type" : "type-8473",
+   "self_type" : "type-8472",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -24081,8 +24084,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-8493",
-   "self_type" : "type-8492",
+   "referenced_type" : "type-8520",
+   "self_type" : "type-8519",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -24090,8 +24093,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-8588",
-   "self_type" : "type-8587",
+   "referenced_type" : "type-8616",
+   "self_type" : "type-8615",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -24099,8 +24102,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-8694",
-   "self_type" : "type-8693",
+   "referenced_type" : "type-8721",
+   "self_type" : "type-8720",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -24108,8 +24111,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-8731",
-   "self_type" : "type-8730",
+   "referenced_type" : "type-8758",
+   "self_type" : "type-8757",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -24117,8 +24120,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-8977",
-   "self_type" : "type-8976",
+   "referenced_type" : "type-9004",
+   "self_type" : "type-9003",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -24126,8 +24129,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-9149",
-   "self_type" : "type-9148",
+   "referenced_type" : "type-9177",
+   "self_type" : "type-9176",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -24135,8 +24138,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-9401",
-   "self_type" : "type-9400",
+   "referenced_type" : "type-9428",
+   "self_type" : "type-9427",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -24144,8 +24147,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-9539",
-   "self_type" : "type-9538",
+   "referenced_type" : "type-9567",
+   "self_type" : "type-9566",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -24153,8 +24156,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-9761",
-   "self_type" : "type-9760",
+   "referenced_type" : "type-9788",
+   "self_type" : "type-9787",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -24189,8 +24192,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
    "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-3902",
-   "self_type" : "type-3901",
+   "referenced_type" : "type-3908",
+   "self_type" : "type-3907",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24207,8 +24210,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
    "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-5823",
-   "self_type" : "type-5822",
+   "referenced_type" : "type-5832",
+   "self_type" : "type-5831",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24216,8 +24219,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
    "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-8139",
-   "self_type" : "type-8138",
+   "referenced_type" : "type-8163",
+   "self_type" : "type-8162",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24225,8 +24228,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
    "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-8166",
-   "self_type" : "type-8165",
+   "referenced_type" : "type-8190",
+   "self_type" : "type-8189",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24243,8 +24246,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-4257",
-   "self_type" : "type-4256",
+   "referenced_type" : "type-4263",
+   "self_type" : "type-4262",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24252,8 +24255,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-4266",
-   "self_type" : "type-4265",
+   "referenced_type" : "type-4272",
+   "self_type" : "type-4271",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24261,8 +24264,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-4693",
-   "self_type" : "type-4692",
+   "referenced_type" : "type-4700",
+   "self_type" : "type-4699",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24270,8 +24273,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-6172",
-   "self_type" : "type-6171",
+   "referenced_type" : "type-6181",
+   "self_type" : "type-6180",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24279,8 +24282,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-6178",
-   "self_type" : "type-6177",
+   "referenced_type" : "type-6187",
+   "self_type" : "type-6186",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24288,8 +24291,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-6573",
-   "self_type" : "type-6572",
+   "referenced_type" : "type-6583",
+   "self_type" : "type-6582",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24297,8 +24300,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-6920",
-   "self_type" : "type-6919",
+   "referenced_type" : "type-6929",
+   "self_type" : "type-6928",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24306,8 +24309,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-9029",
-   "self_type" : "type-9028",
+   "referenced_type" : "type-9056",
+   "self_type" : "type-9055",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24315,8 +24318,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-9035",
-   "self_type" : "type-9034",
+   "referenced_type" : "type-9062",
+   "self_type" : "type-9061",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24324,8 +24327,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-9492",
-   "self_type" : "type-9491",
+   "referenced_type" : "type-9519",
+   "self_type" : "type-9518",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24333,8 +24336,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-9822",
-   "self_type" : "type-9821",
+   "referenced_type" : "type-9849",
+   "self_type" : "type-9848",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24342,8 +24345,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
    "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
-   "referenced_type" : "type-4829",
-   "self_type" : "type-4828",
+   "referenced_type" : "type-4835",
+   "self_type" : "type-4834",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24351,8 +24354,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
    "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
-   "referenced_type" : "type-6694",
-   "self_type" : "type-6693",
+   "referenced_type" : "type-6703",
+   "self_type" : "type-6702",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24360,8 +24363,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
    "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
-   "referenced_type" : "type-7031",
-   "self_type" : "type-7030",
+   "referenced_type" : "type-7040",
+   "self_type" : "type-7039",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24369,8 +24372,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
    "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
-   "referenced_type" : "type-7275",
-   "self_type" : "type-7274",
+   "referenced_type" : "type-7295",
+   "self_type" : "type-7294",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24378,8 +24381,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
    "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
-   "referenced_type" : "type-9594",
-   "self_type" : "type-9593",
+   "referenced_type" : "type-9622",
+   "self_type" : "type-9621",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24387,8 +24390,8 @@
    "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",
+   "referenced_type" : "type-4289",
+   "self_type" : "type-4288",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24396,8 +24399,8 @@
    "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",
+   "referenced_type" : "type-4671",
+   "self_type" : "type-4670",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24405,8 +24408,8 @@
    "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",
+   "referenced_type" : "type-6201",
+   "self_type" : "type-6200",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24414,8 +24417,8 @@
    "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",
+   "referenced_type" : "type-6556",
+   "self_type" : "type-6555",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24423,8 +24426,8 @@
    "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",
+   "referenced_type" : "type-9076",
+   "self_type" : "type-9075",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24432,8 +24435,8 @@
    "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",
+   "referenced_type" : "type-9497",
+   "self_type" : "type-9496",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24441,8 +24444,8 @@
    "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",
+   "referenced_type" : "type-4831",
+   "self_type" : "type-4830",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24450,8 +24453,8 @@
    "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",
+   "referenced_type" : "type-6700",
+   "self_type" : "type-6699",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24459,8 +24462,8 @@
    "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",
+   "referenced_type" : "type-9618",
+   "self_type" : "type-9617",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24468,8 +24471,8 @@
    "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",
+   "referenced_type" : "type-4291",
+   "self_type" : "type-4290",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24477,8 +24480,8 @@
    "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",
+   "referenced_type" : "type-6203",
+   "self_type" : "type-6202",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24486,8 +24489,8 @@
    "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",
+   "referenced_type" : "type-6911",
+   "self_type" : "type-6910",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24495,8 +24498,8 @@
    "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",
+   "referenced_type" : "type-9078",
+   "self_type" : "type-9077",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24504,8 +24507,8 @@
    "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",
+   "referenced_type" : "type-9831",
+   "self_type" : "type-9830",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24513,8 +24516,8 @@
    "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",
+   "referenced_type" : "type-7035",
+   "self_type" : "type-7034",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24522,8 +24525,8 @@
    "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",
+   "referenced_type" : "type-7292",
+   "self_type" : "type-7291",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24531,8 +24534,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::HpGraphicBufferProducer *",
    "name" : "android::HpGraphicBufferProducer *",
-   "referenced_type" : "type-4246",
-   "self_type" : "type-4245",
+   "referenced_type" : "type-4252",
+   "self_type" : "type-4251",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24540,8 +24543,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::HpGraphicBufferProducer *",
    "name" : "android::HpGraphicBufferProducer *",
-   "referenced_type" : "type-6161",
-   "self_type" : "type-6160",
+   "referenced_type" : "type-6170",
+   "self_type" : "type-6169",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24549,8 +24552,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::HpGraphicBufferProducer *",
    "name" : "android::HpGraphicBufferProducer *",
-   "referenced_type" : "type-9018",
-   "self_type" : "type-9017",
+   "referenced_type" : "type-9045",
+   "self_type" : "type-9044",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24558,8 +24561,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::HpProducerListener *",
    "name" : "android::HpProducerListener *",
-   "referenced_type" : "type-4521",
-   "self_type" : "type-4520",
+   "referenced_type" : "type-4527",
+   "self_type" : "type-4526",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24567,8 +24570,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::HpProducerListener *",
    "name" : "android::HpProducerListener *",
-   "referenced_type" : "type-6405",
-   "self_type" : "type-6404",
+   "referenced_type" : "type-6414",
+   "self_type" : "type-6413",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24576,8 +24579,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::HpProducerListener *",
    "name" : "android::HpProducerListener *",
-   "referenced_type" : "type-9290",
-   "self_type" : "type-9289",
+   "referenced_type" : "type-9318",
+   "self_type" : "type-9317",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24612,8 +24615,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-1154",
-   "self_type" : "type-1153",
+   "referenced_type" : "type-1157",
+   "self_type" : "type-1156",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24621,8 +24624,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-1576",
-   "self_type" : "type-1575",
+   "referenced_type" : "type-1579",
+   "self_type" : "type-1578",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24630,8 +24633,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-1614",
-   "self_type" : "type-1613",
+   "referenced_type" : "type-1618",
+   "self_type" : "type-1617",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24639,8 +24642,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-3498",
-   "self_type" : "type-3497",
+   "referenced_type" : "type-3501",
+   "self_type" : "type-3500",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24648,8 +24651,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-3605",
-   "self_type" : "type-3604",
+   "referenced_type" : "type-3608",
+   "self_type" : "type-3607",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24657,8 +24660,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-3664",
-   "self_type" : "type-3663",
+   "referenced_type" : "type-3667",
+   "self_type" : "type-3666",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24666,8 +24669,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-3757",
-   "self_type" : "type-3756",
+   "referenced_type" : "type-3765",
+   "self_type" : "type-3764",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24675,8 +24678,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-4055",
-   "self_type" : "type-4054",
+   "referenced_type" : "type-4062",
+   "self_type" : "type-4061",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24684,8 +24687,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-4085",
-   "self_type" : "type-4084",
+   "referenced_type" : "type-4091",
+   "self_type" : "type-4090",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24693,8 +24696,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-4945",
-   "self_type" : "type-4944",
+   "referenced_type" : "type-4951",
+   "self_type" : "type-4950",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24702,8 +24705,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-5419",
-   "self_type" : "type-5418",
+   "referenced_type" : "type-5425",
+   "self_type" : "type-5424",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24711,8 +24714,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-5526",
-   "self_type" : "type-5525",
+   "referenced_type" : "type-5532",
+   "self_type" : "type-5531",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24720,8 +24723,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-5585",
-   "self_type" : "type-5584",
+   "referenced_type" : "type-5591",
+   "self_type" : "type-5590",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24729,8 +24732,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-5678",
-   "self_type" : "type-5677",
+   "referenced_type" : "type-5689",
+   "self_type" : "type-5688",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24738,8 +24741,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-5976",
-   "self_type" : "type-5975",
+   "referenced_type" : "type-5986",
+   "self_type" : "type-5985",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24747,8 +24750,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-6006",
-   "self_type" : "type-6005",
+   "referenced_type" : "type-6015",
+   "self_type" : "type-6014",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24756,8 +24759,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-7058",
-   "self_type" : "type-7057",
+   "referenced_type" : "type-7066",
+   "self_type" : "type-7065",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24765,8 +24768,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-7086",
-   "self_type" : "type-7085",
+   "referenced_type" : "type-7096",
+   "self_type" : "type-7095",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24774,8 +24777,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-7311",
-   "self_type" : "type-7310",
+   "referenced_type" : "type-7331",
+   "self_type" : "type-7330",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24783,8 +24786,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-7735",
-   "self_type" : "type-7734",
+   "referenced_type" : "type-7756",
+   "self_type" : "type-7755",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24792,8 +24795,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-7842",
-   "self_type" : "type-7841",
+   "referenced_type" : "type-7863",
+   "self_type" : "type-7862",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24801,8 +24804,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-7901",
-   "self_type" : "type-7900",
+   "referenced_type" : "type-7922",
+   "self_type" : "type-7921",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24819,8 +24822,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-7994",
-   "self_type" : "type-7993",
+   "referenced_type" : "type-8020",
+   "self_type" : "type-8019",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24828,8 +24831,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-8180",
-   "self_type" : "type-8179",
+   "referenced_type" : "type-8204",
+   "self_type" : "type-8203",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24837,8 +24840,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-8329",
-   "self_type" : "type-8328",
+   "referenced_type" : "type-8353",
+   "self_type" : "type-8352",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24846,8 +24849,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-8424",
-   "self_type" : "type-8423",
+   "referenced_type" : "type-8449",
+   "self_type" : "type-8448",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24855,8 +24858,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-8474",
-   "self_type" : "type-8473",
+   "referenced_type" : "type-8498",
+   "self_type" : "type-8497",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24864,17 +24867,8 @@
    "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",
+   "referenced_type" : "type-8576",
+   "self_type" : "type-8575",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24891,6 +24885,15 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-8859",
+   "self_type" : "type-8858",
+   "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,
@@ -24900,8 +24903,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-9384",
-   "self_type" : "type-9383",
+   "referenced_type" : "type-9404",
+   "self_type" : "type-9403",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24918,8 +24921,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-1172",
-   "self_type" : "type-1171",
+   "referenced_type" : "type-1175",
+   "self_type" : "type-1174",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24927,8 +24930,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-1466",
-   "self_type" : "type-1465",
+   "referenced_type" : "type-1470",
+   "self_type" : "type-1469",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24936,8 +24939,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-1599",
-   "self_type" : "type-1598",
+   "referenced_type" : "type-1603",
+   "self_type" : "type-1602",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24945,8 +24948,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-3489",
-   "self_type" : "type-3488",
+   "referenced_type" : "type-3492",
+   "self_type" : "type-3491",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24954,8 +24957,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-3776",
-   "self_type" : "type-3775",
+   "referenced_type" : "type-3782",
+   "self_type" : "type-3781",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24963,8 +24966,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-3969",
-   "self_type" : "type-3968",
+   "referenced_type" : "type-3975",
+   "self_type" : "type-3974",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24972,8 +24975,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-3995",
-   "self_type" : "type-3994",
+   "referenced_type" : "type-4001",
+   "self_type" : "type-4000",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24981,8 +24984,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-4073",
-   "self_type" : "type-4072",
+   "referenced_type" : "type-4079",
+   "self_type" : "type-4078",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24990,8 +24993,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-5410",
-   "self_type" : "type-5409",
+   "referenced_type" : "type-5416",
+   "self_type" : "type-5415",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24999,8 +25002,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-5697",
-   "self_type" : "type-5696",
+   "referenced_type" : "type-5706",
+   "self_type" : "type-5705",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25017,8 +25020,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-5890",
-   "self_type" : "type-5889",
+   "referenced_type" : "type-5899",
+   "self_type" : "type-5898",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25026,8 +25029,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-5916",
-   "self_type" : "type-5915",
+   "referenced_type" : "type-5925",
+   "self_type" : "type-5924",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25035,8 +25038,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-5994",
-   "self_type" : "type-5993",
+   "referenced_type" : "type-6003",
+   "self_type" : "type-6002",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25044,8 +25047,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-7726",
-   "self_type" : "type-7725",
+   "referenced_type" : "type-7747",
+   "self_type" : "type-7746",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25062,8 +25065,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-8013",
-   "self_type" : "type-8012",
+   "referenced_type" : "type-8037",
+   "self_type" : "type-8036",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25071,8 +25074,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-8168",
-   "self_type" : "type-8167",
+   "referenced_type" : "type-8192",
+   "self_type" : "type-8191",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25080,8 +25083,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-8204",
-   "self_type" : "type-8203",
+   "referenced_type" : "type-8228",
+   "self_type" : "type-8227",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25089,8 +25092,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-8322",
-   "self_type" : "type-8321",
+   "referenced_type" : "type-8346",
+   "self_type" : "type-8345",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25098,8 +25101,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-8563",
-   "self_type" : "type-8562",
+   "referenced_type" : "type-8590",
+   "self_type" : "type-8589",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25107,8 +25110,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-8745",
-   "self_type" : "type-8744",
+   "referenced_type" : "type-8772",
+   "self_type" : "type-8771",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25116,8 +25119,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-8820",
-   "self_type" : "type-8819",
+   "referenced_type" : "type-8847",
+   "self_type" : "type-8846",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25125,8 +25128,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-3500",
-   "self_type" : "type-3499",
+   "referenced_type" : "type-3503",
+   "self_type" : "type-3502",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25134,8 +25137,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-3956",
-   "self_type" : "type-3955",
+   "referenced_type" : "type-3959",
+   "self_type" : "type-3958",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25143,8 +25146,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-4225",
-   "self_type" : "type-4224",
+   "referenced_type" : "type-4231",
+   "self_type" : "type-4230",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25152,8 +25155,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-5421",
-   "self_type" : "type-5420",
+   "referenced_type" : "type-5427",
+   "self_type" : "type-5426",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25170,8 +25173,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-5877",
-   "self_type" : "type-5876",
+   "referenced_type" : "type-5883",
+   "self_type" : "type-5882",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25179,8 +25182,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-6146",
-   "self_type" : "type-6145",
+   "referenced_type" : "type-6155",
+   "self_type" : "type-6154",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25188,8 +25191,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-6769",
-   "self_type" : "type-6768",
+   "referenced_type" : "type-6778",
+   "self_type" : "type-6777",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25197,8 +25200,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-7737",
-   "self_type" : "type-7736",
+   "referenced_type" : "type-7758",
+   "self_type" : "type-7757",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25215,8 +25218,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-8164",
-   "self_type" : "type-8163",
+   "referenced_type" : "type-8188",
+   "self_type" : "type-8187",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25224,8 +25227,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-8199",
-   "self_type" : "type-8198",
+   "referenced_type" : "type-8220",
+   "self_type" : "type-8219",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25233,8 +25236,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-8331",
-   "self_type" : "type-8330",
+   "referenced_type" : "type-8355",
+   "self_type" : "type-8354",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25242,8 +25245,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-9003",
-   "self_type" : "type-9002",
+   "referenced_type" : "type-9030",
+   "self_type" : "type-9029",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25251,8 +25254,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-9678",
-   "self_type" : "type-9677",
+   "referenced_type" : "type-9706",
+   "self_type" : "type-9705",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25269,8 +25272,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1265",
-   "self_type" : "type-1264",
+   "referenced_type" : "type-1268",
+   "self_type" : "type-1267",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -25278,8 +25281,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1369",
-   "self_type" : "type-1368",
+   "referenced_type" : "type-1372",
+   "self_type" : "type-1371",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -25287,8 +25290,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-3818",
-   "self_type" : "type-3817",
+   "referenced_type" : "type-3825",
+   "self_type" : "type-3824",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -25296,8 +25299,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-3914",
-   "self_type" : "type-3913",
+   "referenced_type" : "type-3920",
+   "self_type" : "type-3919",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -25305,8 +25308,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-5739",
-   "self_type" : "type-5738",
+   "referenced_type" : "type-5749",
+   "self_type" : "type-5748",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -25314,8 +25317,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-5835",
-   "self_type" : "type-5834",
+   "referenced_type" : "type-5844",
+   "self_type" : "type-5843",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -25323,8 +25326,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-8055",
-   "self_type" : "type-8054",
+   "referenced_type" : "type-8080",
+   "self_type" : "type-8079",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -25332,8 +25335,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-8582",
-   "self_type" : "type-8581",
+   "referenced_type" : "type-8609",
+   "self_type" : "type-8608",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -25341,8 +25344,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-8668",
-   "self_type" : "type-8667",
+   "referenced_type" : "type-8695",
+   "self_type" : "type-8694",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -25359,8 +25362,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-1159",
-   "self_type" : "type-1158",
+   "referenced_type" : "type-1162",
+   "self_type" : "type-1161",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25368,8 +25371,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-3508",
-   "self_type" : "type-3507",
+   "referenced_type" : "type-3511",
+   "self_type" : "type-3510",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25377,8 +25380,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-3618",
-   "self_type" : "type-3617",
+   "referenced_type" : "type-3621",
+   "self_type" : "type-3620",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25386,8 +25389,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-3666",
-   "self_type" : "type-3665",
+   "referenced_type" : "type-3669",
+   "self_type" : "type-3668",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25395,8 +25398,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-3764",
-   "self_type" : "type-3763",
+   "referenced_type" : "type-3770",
+   "self_type" : "type-3769",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25404,8 +25407,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-4251",
-   "self_type" : "type-4250",
+   "referenced_type" : "type-4257",
+   "self_type" : "type-4256",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25413,8 +25416,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-4515",
-   "self_type" : "type-4514",
+   "referenced_type" : "type-4521",
+   "self_type" : "type-4520",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25422,8 +25425,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-4558",
-   "self_type" : "type-4557",
+   "referenced_type" : "type-4564",
+   "self_type" : "type-4563",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25431,8 +25434,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-4688",
-   "self_type" : "type-4687",
+   "referenced_type" : "type-4694",
+   "self_type" : "type-4693",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25440,8 +25443,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-4950",
-   "self_type" : "type-4949",
+   "referenced_type" : "type-4956",
+   "self_type" : "type-4955",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25449,8 +25452,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-5429",
-   "self_type" : "type-5428",
+   "referenced_type" : "type-5435",
+   "self_type" : "type-5434",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25458,8 +25461,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-5539",
-   "self_type" : "type-5538",
+   "referenced_type" : "type-5545",
+   "self_type" : "type-5544",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25467,8 +25470,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-5587",
-   "self_type" : "type-5586",
+   "referenced_type" : "type-5593",
+   "self_type" : "type-5592",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25476,8 +25479,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-5685",
-   "self_type" : "type-5684",
+   "referenced_type" : "type-5694",
+   "self_type" : "type-5693",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25485,8 +25488,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6166",
-   "self_type" : "type-6165",
+   "referenced_type" : "type-6175",
+   "self_type" : "type-6174",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25494,8 +25497,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6399",
-   "self_type" : "type-6398",
+   "referenced_type" : "type-6408",
+   "self_type" : "type-6407",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25503,8 +25506,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6442",
-   "self_type" : "type-6441",
+   "referenced_type" : "type-6451",
+   "self_type" : "type-6450",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25512,8 +25515,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6568",
-   "self_type" : "type-6567",
+   "referenced_type" : "type-6577",
+   "self_type" : "type-6576",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25521,8 +25524,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6753",
-   "self_type" : "type-6752",
+   "referenced_type" : "type-6762",
+   "self_type" : "type-6761",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25530,8 +25533,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6759",
-   "self_type" : "type-6758",
+   "referenced_type" : "type-6769",
+   "self_type" : "type-6768",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25539,8 +25542,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6893",
-   "self_type" : "type-6892",
+   "referenced_type" : "type-6902",
+   "self_type" : "type-6901",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25548,8 +25551,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6912",
-   "self_type" : "type-6911",
+   "referenced_type" : "type-6921",
+   "self_type" : "type-6920",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25557,8 +25560,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7076",
-   "self_type" : "type-7075",
+   "referenced_type" : "type-7079",
+   "self_type" : "type-7078",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25566,8 +25569,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7088",
-   "self_type" : "type-7087",
+   "referenced_type" : "type-7098",
+   "self_type" : "type-7097",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25575,8 +25578,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7313",
-   "self_type" : "type-7312",
+   "referenced_type" : "type-7333",
+   "self_type" : "type-7332",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25584,8 +25587,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7745",
-   "self_type" : "type-7744",
+   "referenced_type" : "type-7766",
+   "self_type" : "type-7765",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25593,8 +25596,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7855",
-   "self_type" : "type-7854",
+   "referenced_type" : "type-7876",
+   "self_type" : "type-7875",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25602,8 +25605,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7903",
-   "self_type" : "type-7902",
+   "referenced_type" : "type-7924",
+   "self_type" : "type-7923",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25611,8 +25614,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-8001",
-   "self_type" : "type-8000",
+   "referenced_type" : "type-8025",
+   "self_type" : "type-8024",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25629,8 +25632,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-8184",
-   "self_type" : "type-8183",
+   "referenced_type" : "type-8208",
+   "self_type" : "type-8207",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25638,8 +25641,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-8338",
-   "self_type" : "type-8337",
+   "referenced_type" : "type-8362",
+   "self_type" : "type-8361",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25647,8 +25650,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-8432",
-   "self_type" : "type-8431",
+   "referenced_type" : "type-8456",
+   "self_type" : "type-8455",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25656,8 +25659,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-8476",
-   "self_type" : "type-8475",
+   "referenced_type" : "type-8500",
+   "self_type" : "type-8499",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25665,8 +25668,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-8554",
-   "self_type" : "type-8553",
+   "referenced_type" : "type-8581",
+   "self_type" : "type-8580",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25674,8 +25677,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-9023",
-   "self_type" : "type-9022",
+   "referenced_type" : "type-9050",
+   "self_type" : "type-9049",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25683,8 +25686,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-9283",
-   "self_type" : "type-9282",
+   "referenced_type" : "type-9311",
+   "self_type" : "type-9310",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25692,8 +25695,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-9342",
-   "self_type" : "type-9341",
+   "referenced_type" : "type-9370",
+   "self_type" : "type-9369",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25701,8 +25704,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-9405",
-   "self_type" : "type-9404",
+   "referenced_type" : "type-9430",
+   "self_type" : "type-9429",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25710,8 +25713,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-9487",
-   "self_type" : "type-9486",
+   "referenced_type" : "type-9514",
+   "self_type" : "type-9513",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25737,8 +25740,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-9661",
-   "self_type" : "type-9660",
+   "referenced_type" : "type-9688",
+   "self_type" : "type-9687",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25746,8 +25749,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-9667",
-   "self_type" : "type-9666",
+   "referenced_type" : "type-9695",
+   "self_type" : "type-9694",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25755,8 +25758,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-9793",
-   "self_type" : "type-9792",
+   "referenced_type" : "type-9821",
+   "self_type" : "type-9820",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25764,8 +25767,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-9814",
-   "self_type" : "type-9813",
+   "referenced_type" : "type-9841",
+   "self_type" : "type-9840",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25773,8 +25776,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ISurfaceComposer *",
    "name" : "android::ISurfaceComposer *",
-   "referenced_type" : "type-1050",
-   "self_type" : "type-1049",
+   "referenced_type" : "type-1053",
+   "self_type" : "type-1052",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25782,8 +25785,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ISurfaceComposer *",
    "name" : "android::ISurfaceComposer *",
-   "referenced_type" : "type-3677",
-   "self_type" : "type-3676",
+   "referenced_type" : "type-3683",
+   "self_type" : "type-3682",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25791,8 +25794,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ISurfaceComposer *",
    "name" : "android::ISurfaceComposer *",
-   "referenced_type" : "type-5598",
-   "self_type" : "type-5597",
+   "referenced_type" : "type-5607",
+   "self_type" : "type-5606",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25800,8 +25803,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ISurfaceComposer *",
    "name" : "android::ISurfaceComposer *",
-   "referenced_type" : "type-7914",
-   "self_type" : "type-7913",
+   "referenced_type" : "type-7938",
+   "self_type" : "type-7937",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25809,8 +25812,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ISurfaceComposer *",
    "name" : "android::ISurfaceComposer *",
-   "referenced_type" : "type-8480",
-   "self_type" : "type-8479",
+   "referenced_type" : "type-8507",
+   "self_type" : "type-8506",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25818,8 +25821,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ITransactionCompletedListener *",
    "name" : "android::ITransactionCompletedListener *",
-   "referenced_type" : "type-1042",
-   "self_type" : "type-1041",
+   "referenced_type" : "type-1046",
+   "self_type" : "type-1045",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25827,8 +25830,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ITransactionCompletedListener *",
    "name" : "android::ITransactionCompletedListener *",
-   "referenced_type" : "type-3672",
-   "self_type" : "type-3671",
+   "referenced_type" : "type-3678",
+   "self_type" : "type-3677",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25836,8 +25839,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ITransactionCompletedListener *",
    "name" : "android::ITransactionCompletedListener *",
-   "referenced_type" : "type-5593",
-   "self_type" : "type-5592",
+   "referenced_type" : "type-5602",
+   "self_type" : "type-5601",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25845,8 +25848,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ITransactionCompletedListener *",
    "name" : "android::ITransactionCompletedListener *",
-   "referenced_type" : "type-7909",
-   "self_type" : "type-7908",
+   "referenced_type" : "type-7933",
+   "self_type" : "type-7932",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25854,8 +25857,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ITransactionCompletedListener *",
    "name" : "android::ITransactionCompletedListener *",
-   "referenced_type" : "type-8478",
-   "self_type" : "type-8477",
+   "referenced_type" : "type-8505",
+   "self_type" : "type-8504",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25890,8 +25893,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::LWProducerListener *",
    "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-2539",
-   "self_type" : "type-2538",
+   "referenced_type" : "type-2542",
+   "self_type" : "type-2541",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25899,8 +25902,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::LWProducerListener *",
    "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-4953",
-   "self_type" : "type-4952",
+   "referenced_type" : "type-4959",
+   "self_type" : "type-4958",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25908,8 +25911,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::LWProducerListener *",
    "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-7090",
-   "self_type" : "type-7089",
+   "referenced_type" : "type-7094",
+   "self_type" : "type-7093",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25917,8 +25920,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::LWProducerListener *",
    "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-8186",
-   "self_type" : "type-8185",
+   "referenced_type" : "type-8210",
+   "self_type" : "type-8209",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25926,8 +25929,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::LWProducerListener *",
    "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-9431",
-   "self_type" : "type-9430",
+   "referenced_type" : "type-9452",
+   "self_type" : "type-9451",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25936,7 +25939,7 @@
    "linker_set_key" : "android::LightFlattenablePod<android::Rect> *",
    "name" : "android::LightFlattenablePod<android::Rect> *",
    "referenced_type" : "type-46",
-   "self_type" : "type-4589",
+   "self_type" : "type-4595",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -25980,8 +25983,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::List<Event>::_Node *",
    "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-3687",
-   "self_type" : "type-3686",
+   "referenced_type" : "type-3693",
+   "self_type" : "type-3692",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -25989,8 +25992,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::List<Event>::_Node *",
    "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-5608",
-   "self_type" : "type-5607",
+   "referenced_type" : "type-5617",
+   "self_type" : "type-5616",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -25998,8 +26001,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::List<Event>::_Node *",
    "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-7924",
-   "self_type" : "type-7923",
+   "referenced_type" : "type-7948",
+   "self_type" : "type-7947",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -26007,8 +26010,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::List<Event>::_Node *",
    "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-8215",
-   "self_type" : "type-8214",
+   "referenced_type" : "type-8240",
+   "self_type" : "type-8239",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -26124,8 +26127,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::OMXPluginBase *",
    "name" : "android::OMXPluginBase *",
-   "referenced_type" : "type-2393",
-   "self_type" : "type-2394",
+   "referenced_type" : "type-2396",
+   "self_type" : "type-2397",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h"
   },
@@ -26142,8 +26145,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel::FlattenableHelper<android::BufferItem> *",
    "name" : "android::Parcel::FlattenableHelper<android::BufferItem> *",
-   "referenced_type" : "type-1516",
-   "self_type" : "type-1518",
+   "referenced_type" : "type-1520",
+   "self_type" : "type-1522",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -26151,8 +26154,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel::FlattenableHelper<android::Fence> *",
    "name" : "android::Parcel::FlattenableHelper<android::Fence> *",
-   "referenced_type" : "type-1658",
-   "self_type" : "type-1661",
+   "referenced_type" : "type-1662",
+   "self_type" : "type-1665",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -26160,8 +26163,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta> *",
    "name" : "android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta> *",
-   "referenced_type" : "type-4328",
-   "self_type" : "type-4330",
+   "referenced_type" : "type-4334",
+   "self_type" : "type-4336",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -26169,8 +26172,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel::FlattenableHelper<android::GraphicBuffer> *",
    "name" : "android::Parcel::FlattenableHelper<android::GraphicBuffer> *",
-   "referenced_type" : "type-1653",
-   "self_type" : "type-1655",
+   "referenced_type" : "type-1657",
+   "self_type" : "type-1659",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -26178,8 +26181,8 @@
    "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",
+   "referenced_type" : "type-4339",
+   "self_type" : "type-4342",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -26187,8 +26190,8 @@
    "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",
+   "referenced_type" : "type-4345",
+   "self_type" : "type-4347",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -26232,8 +26235,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ProcessState *",
    "name" : "android::ProcessState *",
-   "referenced_type" : "type-1261",
-   "self_type" : "type-1260",
+   "referenced_type" : "type-1264",
+   "self_type" : "type-1263",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26277,8 +26280,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1079",
-   "self_type" : "type-1078",
+   "referenced_type" : "type-1082",
+   "self_type" : "type-1081",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26286,8 +26289,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1191",
-   "self_type" : "type-1190",
+   "referenced_type" : "type-1194",
+   "self_type" : "type-1193",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26295,8 +26298,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1352",
-   "self_type" : "type-1351",
+   "referenced_type" : "type-1355",
+   "self_type" : "type-1354",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26304,8 +26307,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1404",
-   "self_type" : "type-1403",
+   "referenced_type" : "type-1407",
+   "self_type" : "type-1406",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26313,8 +26316,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1419",
+   "referenced_type" : "type-1423",
+   "self_type" : "type-1422",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26322,8 +26325,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1441",
-   "self_type" : "type-1440",
+   "referenced_type" : "type-1444",
+   "self_type" : "type-1443",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26331,8 +26334,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1482",
-   "self_type" : "type-1481",
+   "referenced_type" : "type-1486",
+   "self_type" : "type-1485",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26340,8 +26343,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1616",
-   "self_type" : "type-1615",
+   "referenced_type" : "type-1620",
+   "self_type" : "type-1619",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26349,8 +26352,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2649",
-   "self_type" : "type-2648",
+   "referenced_type" : "type-2652",
+   "self_type" : "type-2651",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26358,8 +26361,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3459",
-   "self_type" : "type-3458",
+   "referenced_type" : "type-3462",
+   "self_type" : "type-3461",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26367,8 +26370,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3525",
-   "self_type" : "type-3524",
+   "referenced_type" : "type-3528",
+   "self_type" : "type-3527",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26376,8 +26379,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3627",
-   "self_type" : "type-3626",
+   "referenced_type" : "type-3630",
+   "self_type" : "type-3629",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26385,8 +26388,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3689",
-   "self_type" : "type-3688",
+   "referenced_type" : "type-3695",
+   "self_type" : "type-3694",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26394,8 +26397,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3781",
-   "self_type" : "type-3780",
+   "referenced_type" : "type-3787",
+   "self_type" : "type-3786",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26403,8 +26406,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3842",
-   "self_type" : "type-3841",
+   "referenced_type" : "type-3848",
+   "self_type" : "type-3847",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26412,8 +26415,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3906",
-   "self_type" : "type-3905",
+   "referenced_type" : "type-3912",
+   "self_type" : "type-3911",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26421,8 +26424,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3932",
-   "self_type" : "type-3931",
+   "referenced_type" : "type-3938",
+   "self_type" : "type-3937",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26430,8 +26433,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3947",
-   "self_type" : "type-3946",
+   "referenced_type" : "type-3954",
+   "self_type" : "type-3953",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26439,8 +26442,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3973",
-   "self_type" : "type-3972",
+   "referenced_type" : "type-3979",
+   "self_type" : "type-3978",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26448,8 +26451,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4006",
-   "self_type" : "type-4005",
+   "referenced_type" : "type-4012",
+   "self_type" : "type-4011",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26457,8 +26460,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4087",
-   "self_type" : "type-4086",
+   "referenced_type" : "type-4093",
+   "self_type" : "type-4092",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26466,8 +26469,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4287",
-   "self_type" : "type-4286",
+   "referenced_type" : "type-4293",
+   "self_type" : "type-4292",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26475,8 +26478,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4474",
-   "self_type" : "type-4473",
+   "referenced_type" : "type-4480",
+   "self_type" : "type-4479",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26484,8 +26487,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4527",
-   "self_type" : "type-4526",
+   "referenced_type" : "type-4533",
+   "self_type" : "type-4532",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26493,8 +26496,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4535",
-   "self_type" : "type-4534",
+   "referenced_type" : "type-4542",
+   "self_type" : "type-4541",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26502,8 +26505,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4561",
-   "self_type" : "type-4560",
+   "referenced_type" : "type-4567",
+   "self_type" : "type-4566",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26511,8 +26514,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4711",
-   "self_type" : "type-4710",
+   "referenced_type" : "type-4718",
+   "self_type" : "type-4717",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26520,8 +26523,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4842",
-   "self_type" : "type-4841",
+   "referenced_type" : "type-4848",
+   "self_type" : "type-4847",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26529,8 +26532,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4991",
-   "self_type" : "type-4990",
+   "referenced_type" : "type-4997",
+   "self_type" : "type-4996",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26538,8 +26541,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5380",
-   "self_type" : "type-5379",
+   "referenced_type" : "type-5386",
+   "self_type" : "type-5385",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26547,8 +26550,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5446",
-   "self_type" : "type-5445",
+   "referenced_type" : "type-5452",
+   "self_type" : "type-5451",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26565,8 +26568,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5548",
-   "self_type" : "type-5547",
+   "referenced_type" : "type-5554",
+   "self_type" : "type-5553",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26574,8 +26577,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5610",
-   "self_type" : "type-5609",
+   "referenced_type" : "type-5619",
+   "self_type" : "type-5618",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26583,8 +26586,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5702",
-   "self_type" : "type-5701",
+   "referenced_type" : "type-5711",
+   "self_type" : "type-5710",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26592,8 +26595,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5763",
-   "self_type" : "type-5762",
+   "referenced_type" : "type-5772",
+   "self_type" : "type-5771",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26601,8 +26604,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5827",
-   "self_type" : "type-5826",
+   "referenced_type" : "type-5836",
+   "self_type" : "type-5835",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26610,8 +26613,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5853",
-   "self_type" : "type-5852",
+   "referenced_type" : "type-5862",
+   "self_type" : "type-5861",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26619,8 +26622,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5868",
-   "self_type" : "type-5867",
+   "referenced_type" : "type-5878",
+   "self_type" : "type-5877",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26628,8 +26631,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5894",
-   "self_type" : "type-5893",
+   "referenced_type" : "type-5903",
+   "self_type" : "type-5902",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26637,8 +26640,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5927",
-   "self_type" : "type-5926",
+   "referenced_type" : "type-5936",
+   "self_type" : "type-5935",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26646,8 +26649,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6008",
-   "self_type" : "type-6007",
+   "referenced_type" : "type-6017",
+   "self_type" : "type-6016",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26655,8 +26658,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6196",
-   "self_type" : "type-6195",
+   "referenced_type" : "type-6205",
+   "self_type" : "type-6204",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26664,8 +26667,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6363",
-   "self_type" : "type-6362",
+   "referenced_type" : "type-6372",
+   "self_type" : "type-6371",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26673,8 +26676,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6411",
-   "self_type" : "type-6410",
+   "referenced_type" : "type-6420",
+   "self_type" : "type-6419",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26682,8 +26685,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6419",
-   "self_type" : "type-6418",
+   "referenced_type" : "type-6429",
+   "self_type" : "type-6428",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26691,8 +26694,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6445",
-   "self_type" : "type-6444",
+   "referenced_type" : "type-6454",
+   "self_type" : "type-6453",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26700,8 +26703,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6585",
-   "self_type" : "type-6584",
+   "referenced_type" : "type-6595",
+   "self_type" : "type-6594",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26709,8 +26712,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6706",
-   "self_type" : "type-6705",
+   "referenced_type" : "type-6715",
+   "self_type" : "type-6714",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26718,8 +26721,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6736",
-   "self_type" : "type-6735",
+   "referenced_type" : "type-6745",
+   "self_type" : "type-6744",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26727,8 +26730,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6779",
-   "self_type" : "type-6778",
+   "referenced_type" : "type-6789",
+   "self_type" : "type-6788",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26736,8 +26739,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6869",
-   "self_type" : "type-6868",
+   "referenced_type" : "type-6878",
+   "self_type" : "type-6877",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26745,8 +26748,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6932",
-   "self_type" : "type-6931",
+   "referenced_type" : "type-6941",
+   "self_type" : "type-6940",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26754,8 +26757,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7047",
-   "self_type" : "type-7046",
+   "referenced_type" : "type-7057",
+   "self_type" : "type-7056",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26763,8 +26766,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7094",
-   "self_type" : "type-7093",
+   "referenced_type" : "type-7103",
+   "self_type" : "type-7102",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26772,8 +26775,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7193",
-   "self_type" : "type-7192",
+   "referenced_type" : "type-7202",
+   "self_type" : "type-7201",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26781,8 +26784,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7282",
-   "self_type" : "type-7281",
+   "referenced_type" : "type-7302",
+   "self_type" : "type-7301",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26790,8 +26793,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7319",
-   "self_type" : "type-7318",
+   "referenced_type" : "type-7341",
+   "self_type" : "type-7340",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26808,8 +26811,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7696",
-   "self_type" : "type-7695",
+   "referenced_type" : "type-7717",
+   "self_type" : "type-7716",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26817,8 +26820,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7762",
-   "self_type" : "type-7761",
+   "referenced_type" : "type-7783",
+   "self_type" : "type-7782",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26826,8 +26829,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7864",
-   "self_type" : "type-7863",
+   "referenced_type" : "type-7885",
+   "self_type" : "type-7884",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26835,8 +26838,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7926",
-   "self_type" : "type-7925",
+   "referenced_type" : "type-7950",
+   "self_type" : "type-7949",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26844,8 +26847,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-8018",
-   "self_type" : "type-8017",
+   "referenced_type" : "type-8042",
+   "self_type" : "type-8041",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26853,8 +26856,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-8079",
-   "self_type" : "type-8078",
+   "referenced_type" : "type-8103",
+   "self_type" : "type-8102",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26862,8 +26865,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-8141",
-   "self_type" : "type-8140",
+   "referenced_type" : "type-8165",
+   "self_type" : "type-8164",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26871,8 +26874,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-8201",
-   "self_type" : "type-8200",
+   "referenced_type" : "type-8225",
+   "self_type" : "type-8224",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26880,17 +26883,8 @@
    "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",
+   "referenced_type" : "type-8321",
+   "self_type" : "type-8320",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26907,8 +26901,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-8438",
-   "self_type" : "type-8437",
+   "referenced_type" : "type-8373",
+   "self_type" : "type-8372",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26916,8 +26910,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-8487",
-   "self_type" : "type-8486",
+   "referenced_type" : "type-8462",
+   "self_type" : "type-8461",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26925,8 +26919,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-8567",
-   "self_type" : "type-8566",
+   "referenced_type" : "type-8514",
+   "self_type" : "type-8513",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26934,8 +26928,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-8660",
-   "self_type" : "type-8659",
+   "referenced_type" : "type-8594",
+   "self_type" : "type-8593",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26943,8 +26937,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-8686",
-   "self_type" : "type-8685",
+   "referenced_type" : "type-8687",
+   "self_type" : "type-8686",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26952,8 +26946,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-8702",
-   "self_type" : "type-8701",
+   "referenced_type" : "type-8713",
+   "self_type" : "type-8712",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26961,8 +26955,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-8724",
-   "self_type" : "type-8723",
+   "referenced_type" : "type-8730",
+   "self_type" : "type-8729",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26970,8 +26964,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-8756",
-   "self_type" : "type-8755",
+   "referenced_type" : "type-8751",
+   "self_type" : "type-8750",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26979,8 +26973,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-8834",
-   "self_type" : "type-8833",
+   "referenced_type" : "type-8783",
+   "self_type" : "type-8782",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26988,8 +26982,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-9053",
-   "self_type" : "type-9052",
+   "referenced_type" : "type-8863",
+   "self_type" : "type-8862",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26997,8 +26991,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-9237",
-   "self_type" : "type-9236",
+   "referenced_type" : "type-9080",
+   "self_type" : "type-9079",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27006,8 +27000,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-9299",
-   "self_type" : "type-9298",
+   "referenced_type" : "type-9265",
+   "self_type" : "type-9264",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27015,8 +27009,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-9314",
-   "self_type" : "type-9313",
+   "referenced_type" : "type-9327",
+   "self_type" : "type-9326",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27024,8 +27018,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-9351",
-   "self_type" : "type-9350",
+   "referenced_type" : "type-9342",
+   "self_type" : "type-9341",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27033,8 +27027,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-9500",
-   "self_type" : "type-9499",
+   "referenced_type" : "type-9378",
+   "self_type" : "type-9377",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27042,8 +27036,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-9602",
-   "self_type" : "type-9601",
+   "referenced_type" : "type-9528",
+   "self_type" : "type-9527",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27051,8 +27045,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-9637",
-   "self_type" : "type-9636",
+   "referenced_type" : "type-9629",
+   "self_type" : "type-9628",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27060,8 +27054,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-9691",
-   "self_type" : "type-9690",
+   "referenced_type" : "type-9666",
+   "self_type" : "type-9665",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-9718",
+   "self_type" : "type-9717",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27078,8 +27081,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-9751",
-   "self_type" : "type-9750",
+   "referenced_type" : "type-9770",
+   "self_type" : "type-9769",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27087,8 +27090,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-9769",
-   "self_type" : "type-9768",
+   "referenced_type" : "type-9798",
+   "self_type" : "type-9797",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27096,8 +27099,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-9832",
-   "self_type" : "type-9831",
+   "referenced_type" : "type-9860",
+   "self_type" : "type-9859",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27114,8 +27117,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ReferenceRenamer *",
    "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-1166",
-   "self_type" : "type-1212",
+   "referenced_type" : "type-1167",
+   "self_type" : "type-1211",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27123,8 +27126,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> > *",
    "name" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> > *",
-   "referenced_type" : "type-1563",
-   "self_type" : "type-1564",
+   "referenced_type" : "type-1568",
+   "self_type" : "type-1569",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -27132,8 +27135,8 @@
    "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",
+   "referenced_type" : "type-1572",
+   "self_type" : "type-1573",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -27141,132 +27144,6 @@
    "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,
@@ -27274,8 +27151,17 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long> > *",
-   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long> > *",
+   "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-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<android_dataspace_t> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<android_dataspace_t> > *",
    "referenced_type" : "type-2091",
    "self_type" : "type-2092",
    "size" : 4,
@@ -27283,116 +27169,125 @@
   },
   {
    "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-2111",
+   "self_type" : "type-2112",
+   "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-2097",
+   "self_type" : "type-2098",
+   "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-2116",
+   "self_type" : "type-2117",
+   "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-2086",
+   "self_type" : "type-2087",
+   "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-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<int *, const sp<GraphicBuffer> &> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int *, const sp<GraphicBuffer> &> > *",
+   "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, unsigned long long, const sp<Fence> &> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int, unsigned long long, const sp<Fence> &> > *",
+   "referenced_type" : "type-2064",
+   "self_type" : "type-2065",
+   "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-2055",
+   "self_type" : "type-2056",
+   "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-2107",
+   "self_type" : "type-2108",
+   "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-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<unsigned int> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned int> > *",
+   "referenced_type" : "type-2103",
+   "self_type" : "type-2104",
+   "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-2077",
+   "self_type" : "type-2078",
+   "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-2095",
+   "self_type" : "type-2096",
+   "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,
@@ -27400,17 +27295,62 @@
   },
   {
    "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",
+   "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-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<unsigned long long *> > *",
-   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long *> > *",
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<android_dataspace_t> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<android_dataspace_t> > *",
+   "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<bool, vector<Segment, allocator<Segment> > *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool, vector<Segment, allocator<Segment> > *> > *",
+   "referenced_type" : "type-2169",
+   "self_type" : "type-2170",
+   "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-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<const String8 &, String8 *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &, String8 *> > *",
+   "referenced_type" : "type-2171",
+   "self_type" : "type-2172",
+   "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-2155",
+   "self_type" : "type-2156",
+   "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-2147",
    "self_type" : "type-2148",
    "size" : 4,
@@ -27418,10 +27358,73 @@
   },
   {
    "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-2142",
+   "self_type" : "type-2143",
+   "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-2144",
+   "self_type" : "type-2145",
+   "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-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<sp<NativeHandle> *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<sp<NativeHandle> *> > *",
+   "referenced_type" : "type-2166",
+   "self_type" : "type-2167",
+   "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-2153",
+   "self_type" : "type-2154",
+   "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-2164",
+   "self_type" : "type-2165",
+   "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-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<unsigned long long> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long> > *",
-   "referenced_type" : "type-2156",
-   "self_type" : "type-2157",
+   "referenced_type" : "type-2160",
+   "self_type" : "type-2161",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -27429,8 +27432,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::SafeBnInterface<android::IConsumerListener> *",
    "name" : "android::SafeBnInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-1287",
-   "self_type" : "type-1292",
+   "referenced_type" : "type-1290",
+   "self_type" : "type-1295",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -27438,8 +27441,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
    "name" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-1276",
-   "self_type" : "type-1286",
+   "referenced_type" : "type-1279",
+   "self_type" : "type-1289",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -27447,8 +27450,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::SafeBnInterface<android::ITransactionCompletedListener> *",
    "name" : "android::SafeBnInterface<android::ITransactionCompletedListener> *",
-   "referenced_type" : "type-1102",
-   "self_type" : "type-1105",
+   "referenced_type" : "type-1105",
+   "self_type" : "type-1108",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -27456,8 +27459,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::SafeBpInterface<android::IConsumerListener> *",
    "name" : "android::SafeBpInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-1537",
-   "self_type" : "type-1539",
+   "referenced_type" : "type-1541",
+   "self_type" : "type-1543",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -27465,8 +27468,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::SafeBpInterface<android::IGraphicBufferConsumer> *",
    "name" : "android::SafeBpInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-1716",
-   "self_type" : "type-1718",
+   "referenced_type" : "type-1720",
+   "self_type" : "type-1723",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -27474,8 +27477,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::SafeInterface::ParcelHandler *",
    "name" : "android::SafeInterface::ParcelHandler *",
-   "referenced_type" : "type-1235",
-   "self_type" : "type-1245",
+   "referenced_type" : "type-1238",
+   "self_type" : "type-1247",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -27493,7 +27496,7 @@
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > > *",
    "name" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > > *",
    "referenced_type" : "type-159",
-   "self_type" : "type-2674",
+   "self_type" : "type-2677",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27502,7 +27505,7 @@
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > > *",
    "name" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > > *",
    "referenced_type" : "type-146",
-   "self_type" : "type-2669",
+   "self_type" : "type-2672",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27511,7 +27514,7 @@
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
    "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
    "referenced_type" : "type-139",
-   "self_type" : "type-2666",
+   "self_type" : "type-2669",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27519,8 +27522,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 *",
    "name" : "android::String16 *",
-   "referenced_type" : "type-1239",
-   "self_type" : "type-2661",
+   "referenced_type" : "type-1242",
+   "self_type" : "type-2664",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -27529,7 +27532,7 @@
    "linker_set_key" : "android::String8 *",
    "name" : "android::String8 *",
    "referenced_type" : "type-121",
-   "self_type" : "type-1885",
+   "self_type" : "type-1889",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -27537,8 +27540,8 @@
    "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",
+   "referenced_type" : "type-2470",
+   "self_type" : "type-2469",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27546,8 +27549,8 @@
    "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",
+   "referenced_type" : "type-4895",
+   "self_type" : "type-4894",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27555,8 +27558,8 @@
    "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",
+   "referenced_type" : "type-6871",
+   "self_type" : "type-6870",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27564,8 +27567,8 @@
    "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",
+   "referenced_type" : "type-8183",
+   "self_type" : "type-8182",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27573,8 +27576,8 @@
    "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",
+   "referenced_type" : "type-9219",
+   "self_type" : "type-9218",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27592,7 +27595,7 @@
    "linker_set_key" : "android::Vector<android::BufferItem> *",
    "name" : "android::Vector<android::BufferItem> *",
    "referenced_type" : "type-837",
-   "self_type" : "type-976",
+   "self_type" : "type-978",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27600,8 +27603,8 @@
    "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",
+   "referenced_type" : "type-1228",
+   "self_type" : "type-1230",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27609,8 +27612,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<int> *",
    "name" : "android::Vector<int> *",
-   "referenced_type" : "type-2686",
-   "self_type" : "type-2687",
+   "referenced_type" : "type-2689",
+   "self_type" : "type-2690",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27618,8 +27621,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<long long> *",
    "name" : "android::Vector<long long> *",
-   "referenced_type" : "type-1081",
-   "self_type" : "type-1082",
+   "referenced_type" : "type-1084",
+   "self_type" : "type-1085",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27627,8 +27630,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::VirtualLightRefBase *",
    "name" : "android::VirtualLightRefBase *",
-   "referenced_type" : "type-2354",
-   "self_type" : "type-2392",
+   "referenced_type" : "type-2357",
+   "self_type" : "type-2395",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -27636,8 +27639,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::base::EagerEvaluator<char *, char *> *",
    "name" : "android::base::EagerEvaluator<char *, char *> *",
-   "referenced_type" : "type-4699",
-   "self_type" : "type-4701",
+   "referenced_type" : "type-4705",
+   "self_type" : "type-4708",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27645,8 +27648,8 @@
    "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",
+   "referenced_type" : "type-4702",
+   "self_type" : "type-4703",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27654,8 +27657,8 @@
    "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",
+   "referenced_type" : "type-4689",
+   "self_type" : "type-4692",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27663,8 +27666,8 @@
    "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",
+   "referenced_type" : "type-4672",
+   "self_type" : "type-4687",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27672,8 +27675,8 @@
    "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",
+   "referenced_type" : "type-4729",
+   "self_type" : "type-4735",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27681,8 +27684,8 @@
    "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",
+   "referenced_type" : "type-4736",
+   "self_type" : "type-4739",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27690,8 +27693,8 @@
    "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",
+   "referenced_type" : "type-4710",
+   "self_type" : "type-4712",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27699,8 +27702,8 @@
    "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",
+   "referenced_type" : "type-4713",
+   "self_type" : "type-4714",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27708,8 +27711,8 @@
    "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",
+   "referenced_type" : "type-4740",
+   "self_type" : "type-4746",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27717,8 +27720,8 @@
    "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",
+   "referenced_type" : "type-4747",
+   "self_type" : "type-4753",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27726,8 +27729,8 @@
    "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",
+   "referenced_type" : "type-4716",
+   "self_type" : "type-4721",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27735,8 +27738,8 @@
    "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",
+   "referenced_type" : "type-4722",
+   "self_type" : "type-4727",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27744,8 +27747,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::base::ErrnoRestorer *",
    "name" : "android::base::ErrnoRestorer *",
-   "referenced_type" : "type-4656",
-   "self_type" : "type-4822",
+   "referenced_type" : "type-4663",
+   "self_type" : "type-4828",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27753,8 +27756,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
    "name" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
-   "referenced_type" : "type-2553",
-   "self_type" : "type-2565",
+   "referenced_type" : "type-2556",
+   "self_type" : "type-2568",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -27771,8 +27774,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1362",
-   "self_type" : "type-1361",
+   "referenced_type" : "type-1365",
+   "self_type" : "type-1364",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27789,8 +27792,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1359",
-   "self_type" : "type-1358",
+   "referenced_type" : "type-1362",
+   "self_type" : "type-1361",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27798,8 +27801,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1377",
-   "self_type" : "type-1381",
+   "referenced_type" : "type-1380",
+   "self_type" : "type-1384",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -27807,8 +27810,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1396",
-   "self_type" : "type-1395",
+   "referenced_type" : "type-1399",
+   "self_type" : "type-1398",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27816,8 +27819,8 @@
    "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",
+   "referenced_type" : "type-6779",
+   "self_type" : "type-6780",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27825,24 +27828,6 @@
    "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,
@@ -27850,8 +27835,8 @@
   },
   {
    "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> > *",
+   "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-4494",
    "self_type" : "type-4495",
    "size" : 4,
@@ -27859,10 +27844,28 @@
   },
   {
    "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-4371",
+   "self_type" : "type-4372",
+   "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-4500",
+   "self_type" : "type-4501",
+   "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",
+   "referenced_type" : "type-4359",
+   "self_type" : "type-4360",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27879,8 +27882,8 @@
    "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",
+   "referenced_type" : "type-6783",
+   "self_type" : "type-6784",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27943,7 +27946,7 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> > *",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> > *",
    "referenced_type" : "type-381",
-   "self_type" : "type-6895",
+   "self_type" : "type-6904",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -27952,7 +27955,7 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect> *",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect> *",
    "referenced_type" : "type-372",
-   "self_type" : "type-4595",
+   "self_type" : "type-4601",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -27961,7 +27964,7 @@
    "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",
+   "self_type" : "type-4352",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -27979,7 +27982,7 @@
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
    "referenced_type" : "type-595",
-   "self_type" : "type-2464",
+   "self_type" : "type-2467",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27996,8 +27999,8 @@
    "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",
+   "referenced_type" : "type-2459",
+   "self_type" : "type-2458",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28005,8 +28008,8 @@
    "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",
+   "referenced_type" : "type-4691",
+   "self_type" : "type-4690",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28014,8 +28017,8 @@
    "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",
+   "referenced_type" : "type-6574",
+   "self_type" : "type-6573",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28023,8 +28026,8 @@
    "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",
+   "referenced_type" : "type-9511",
+   "self_type" : "type-9510",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28032,8 +28035,8 @@
    "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",
+   "referenced_type" : "type-4248",
+   "self_type" : "type-4247",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28041,8 +28044,8 @@
    "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",
+   "referenced_type" : "type-6167",
+   "self_type" : "type-6166",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28050,8 +28053,8 @@
    "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",
+   "referenced_type" : "type-9042",
+   "self_type" : "type-9041",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28059,8 +28062,8 @@
    "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",
+   "referenced_type" : "type-4471",
+   "self_type" : "type-4470",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28068,8 +28071,8 @@
    "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",
+   "referenced_type" : "type-6366",
+   "self_type" : "type-6365",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28077,8 +28080,8 @@
    "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",
+   "referenced_type" : "type-9256",
+   "self_type" : "type-9255",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28087,7 +28090,7 @@
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
    "referenced_type" : "type-677",
-   "self_type" : "type-2477",
+   "self_type" : "type-2480",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28096,7 +28099,7 @@
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
    "referenced_type" : "type-604",
-   "self_type" : "type-2471",
+   "self_type" : "type-2474",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28104,8 +28107,8 @@
    "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",
+   "referenced_type" : "type-2483",
+   "self_type" : "type-2482",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28113,8 +28116,8 @@
    "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",
+   "referenced_type" : "type-4903",
+   "self_type" : "type-4902",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28122,8 +28125,8 @@
    "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",
+   "referenced_type" : "type-6900",
+   "self_type" : "type-6899",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28131,8 +28134,8 @@
    "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",
+   "referenced_type" : "type-8186",
+   "self_type" : "type-8185",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28140,8 +28143,8 @@
    "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",
+   "referenced_type" : "type-9273",
+   "self_type" : "type-9272",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28149,8 +28152,8 @@
    "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",
+   "referenced_type" : "type-6918",
+   "self_type" : "type-6917",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28158,8 +28161,8 @@
    "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",
+   "referenced_type" : "type-9839",
+   "self_type" : "type-9838",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28167,8 +28170,8 @@
    "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",
+   "referenced_type" : "type-4242",
+   "self_type" : "type-4241",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28176,8 +28179,8 @@
    "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",
+   "referenced_type" : "type-6163",
+   "self_type" : "type-6162",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28185,8 +28188,8 @@
    "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",
+   "referenced_type" : "type-9038",
+   "self_type" : "type-9037",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28194,8 +28197,8 @@
    "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",
+   "referenced_type" : "type-4463",
+   "self_type" : "type-4462",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28203,8 +28206,8 @@
    "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",
+   "referenced_type" : "type-6361",
+   "self_type" : "type-6360",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28212,8 +28215,8 @@
    "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",
+   "referenced_type" : "type-6771",
+   "self_type" : "type-6770",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28221,8 +28224,8 @@
    "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",
+   "referenced_type" : "type-9252",
+   "self_type" : "type-9251",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28230,8 +28233,8 @@
    "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",
+   "referenced_type" : "type-9699",
+   "self_type" : "type-9698",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28294,7 +28297,7 @@
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > *",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > *",
    "referenced_type" : "type-462",
-   "self_type" : "type-6939",
+   "self_type" : "type-6949",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -28303,7 +28306,7 @@
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::media::V1_0::Rect> *",
    "name" : "android::hardware::hidl_vec<android::hardware::media::V1_0::Rect> *",
    "referenced_type" : "type-453",
-   "self_type" : "type-4567",
+   "self_type" : "type-4573",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -28312,7 +28315,7 @@
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> *",
    "name" : "android::hardware::hidl_vec<unsigned char> *",
    "referenced_type" : "type-452",
-   "self_type" : "type-4374",
+   "self_type" : "type-4381",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -28339,7 +28342,7 @@
    "linker_set_key" : "android::hidl::base::V1_0::IBase *",
    "name" : "android::hidl::base::V1_0::IBase *",
    "referenced_type" : "type-530",
-   "self_type" : "type-2445",
+   "self_type" : "type-2448",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28348,7 +28351,7 @@
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "android::hidl::manager::V1_0::IServiceNotification *",
    "referenced_type" : "type-533",
-   "self_type" : "type-2449",
+   "self_type" : "type-2452",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28357,7 +28360,7 @@
    "linker_set_key" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
    "name" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
    "referenced_type" : "type-160",
-   "self_type" : "type-2623",
+   "self_type" : "type-2626",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28366,7 +28369,7 @@
    "linker_set_key" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
    "name" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
    "referenced_type" : "type-147",
-   "self_type" : "type-2622",
+   "self_type" : "type-2625",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28375,7 +28378,7 @@
    "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int> *",
    "name" : "android::key_value_pair_t<unsigned int, unsigned int> *",
    "referenced_type" : "type-143",
-   "self_type" : "type-2621",
+   "self_type" : "type-2624",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28383,8 +28386,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::AHandler> *",
    "name" : "android::sp<android::AHandler> *",
-   "referenced_type" : "type-1188",
-   "self_type" : "type-1243",
+   "referenced_type" : "type-1191",
+   "self_type" : "type-1246",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28393,7 +28396,7 @@
    "linker_set_key" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
    "name" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
    "referenced_type" : "type-581",
-   "self_type" : "type-2511",
+   "self_type" : "type-2514",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28402,7 +28405,7 @@
    "linker_set_key" : "android::sp<android::ALooper> *",
    "name" : "android::sp<android::ALooper> *",
    "referenced_type" : "type-321",
-   "self_type" : "type-2244",
+   "self_type" : "type-2247",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28411,7 +28414,7 @@
    "linker_set_key" : "android::sp<android::AMessage> *",
    "name" : "android::sp<android::AMessage> *",
    "referenced_type" : "type-259",
-   "self_type" : "type-1956",
+   "self_type" : "type-1947",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28419,8 +28422,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::BpGraphicBufferProducer> *",
    "name" : "android::sp<android::BpGraphicBufferProducer> *",
-   "referenced_type" : "type-4228",
-   "self_type" : "type-4274",
+   "referenced_type" : "type-4234",
+   "self_type" : "type-4280",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28428,8 +28431,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::BpProducerListener> *",
    "name" : "android::sp<android::BpProducerListener> *",
-   "referenced_type" : "type-4454",
-   "self_type" : "type-4453",
+   "referenced_type" : "type-4460",
+   "self_type" : "type-4459",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28447,7 +28450,7 @@
    "linker_set_key" : "android::sp<android::ComponentWrapper> *",
    "name" : "android::sp<android::ComponentWrapper> *",
    "referenced_type" : "type-567",
-   "self_type" : "type-2488",
+   "self_type" : "type-2491",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28464,8 +28467,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::Fence> *",
    "name" : "android::sp<android::Fence> *",
-   "referenced_type" : "type-1864",
-   "self_type" : "type-2522",
+   "referenced_type" : "type-1868",
+   "self_type" : "type-2525",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28474,7 +28477,7 @@
    "linker_set_key" : "android::sp<android::FrameDropper> *",
    "name" : "android::sp<android::FrameDropper> *",
    "referenced_type" : "type-578",
-   "self_type" : "type-2504",
+   "self_type" : "type-2507",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28482,8 +28485,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::GLConsumer::EglImage> *",
    "name" : "android::sp<android::GLConsumer::EglImage> *",
-   "referenced_type" : "type-1173",
-   "self_type" : "type-1177",
+   "referenced_type" : "type-1176",
+   "self_type" : "type-1181",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28492,7 +28495,7 @@
    "linker_set_key" : "android::sp<android::GraphicBuffer> *",
    "name" : "android::sp<android::GraphicBuffer> *",
    "referenced_type" : "type-733",
-   "self_type" : "type-1194",
+   "self_type" : "type-1198",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28501,7 +28504,7 @@
    "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy> *",
    "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy> *",
    "referenced_type" : "type-473",
-   "self_type" : "type-2496",
+   "self_type" : "type-2499",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28509,8 +28512,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::GraphicBufferSource> *",
    "name" : "android::sp<android::GraphicBufferSource> *",
-   "referenced_type" : "type-2542",
-   "self_type" : "type-2541",
+   "referenced_type" : "type-2545",
+   "self_type" : "type-2544",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28518,8 +28521,8 @@
    "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",
+   "referenced_type" : "type-4265",
+   "self_type" : "type-4264",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28527,8 +28530,8 @@
    "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",
+   "referenced_type" : "type-4274",
+   "self_type" : "type-4273",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28536,8 +28539,8 @@
    "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",
+   "referenced_type" : "type-4833",
+   "self_type" : "type-4842",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28545,8 +28548,8 @@
    "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",
+   "referenced_type" : "type-7038",
+   "self_type" : "type-7046",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28555,7 +28558,7 @@
    "linker_set_key" : "android::sp<android::IBinder::DeathRecipient> *",
    "name" : "android::sp<android::IBinder::DeathRecipient> *",
    "referenced_type" : "type-843",
-   "self_type" : "type-1274",
+   "self_type" : "type-1278",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28564,7 +28567,7 @@
    "linker_set_key" : "android::sp<android::IBinder> *",
    "name" : "android::sp<android::IBinder> *",
    "referenced_type" : "type-795",
-   "self_type" : "type-1035",
+   "self_type" : "type-1039",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28573,7 +28576,7 @@
    "linker_set_key" : "android::sp<android::IConsumerListener> *",
    "name" : "android::sp<android::IConsumerListener> *",
    "referenced_type" : "type-939",
-   "self_type" : "type-2534",
+   "self_type" : "type-2537",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28582,7 +28585,7 @@
    "linker_set_key" : "android::sp<android::IGraphicBufferConsumer> *",
    "name" : "android::sp<android::IGraphicBufferConsumer> *",
    "referenced_type" : "type-574",
-   "self_type" : "type-2498",
+   "self_type" : "type-2501",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28591,7 +28594,7 @@
    "linker_set_key" : "android::sp<android::IGraphicBufferProducer> *",
    "name" : "android::sp<android::IGraphicBufferProducer> *",
    "referenced_type" : "type-570",
-   "self_type" : "type-2484",
+   "self_type" : "type-2487",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28609,7 +28612,7 @@
    "linker_set_key" : "android::sp<android::IProducerListener> *",
    "name" : "android::sp<android::IProducerListener> *",
    "referenced_type" : "type-957",
-   "self_type" : "type-2537",
+   "self_type" : "type-2540",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28617,8 +28620,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::ITransactionCompletedListener> *",
    "name" : "android::sp<android::ITransactionCompletedListener> *",
-   "referenced_type" : "type-1040",
-   "self_type" : "type-1045",
+   "referenced_type" : "type-1044",
+   "self_type" : "type-1048",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28627,7 +28630,7 @@
    "linker_set_key" : "android::sp<android::NativeHandle> *",
    "name" : "android::sp<android::NativeHandle> *",
    "referenced_type" : "type-932",
-   "self_type" : "type-1880",
+   "self_type" : "type-1884",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28635,8 +28638,8 @@
    "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",
+   "referenced_type" : "type-2466",
+   "self_type" : "type-2468",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28644,8 +28647,8 @@
    "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",
+   "referenced_type" : "type-2457",
+   "self_type" : "type-2460",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28653,8 +28656,8 @@
    "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",
+   "referenced_type" : "type-4246",
+   "self_type" : "type-4283",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28662,8 +28665,8 @@
    "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",
+   "referenced_type" : "type-4473",
+   "self_type" : "type-4472",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28671,8 +28674,8 @@
    "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",
+   "referenced_type" : "type-2479",
+   "self_type" : "type-2481",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28680,8 +28683,8 @@
    "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",
+   "referenced_type" : "type-2473",
+   "self_type" : "type-2476",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28689,8 +28692,8 @@
    "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",
+   "referenced_type" : "type-4240",
+   "self_type" : "type-4281",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28698,8 +28701,8 @@
    "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",
+   "referenced_type" : "type-4466",
+   "self_type" : "type-4465",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28708,7 +28711,7 @@
    "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",
+   "self_type" : "type-4395",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28716,8 +28719,8 @@
    "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",
+   "referenced_type" : "type-2447",
+   "self_type" : "type-4227",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28725,8 +28728,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "referenced_type" : "type-2448",
-   "self_type" : "type-2450",
+   "referenced_type" : "type-2451",
+   "self_type" : "type-2453",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28734,8 +28737,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<const android::AHandler> *",
    "name" : "android::sp<const android::AHandler> *",
-   "referenced_type" : "type-2516",
-   "self_type" : "type-2519",
+   "referenced_type" : "type-2519",
+   "self_type" : "type-2522",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28780,7 +28783,7 @@
    "linker_set_key" : "android::wp<android::IBinder::DeathRecipient> *",
    "name" : "android::wp<android::IBinder::DeathRecipient> *",
    "referenced_type" : "type-172",
-   "self_type" : "type-1244",
+   "self_type" : "type-1248",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28789,7 +28792,7 @@
    "linker_set_key" : "android::wp<android::IBinder> *",
    "name" : "android::wp<android::IBinder> *",
    "referenced_type" : "type-130",
-   "self_type" : "type-4279",
+   "self_type" : "type-4285",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28798,7 +28801,7 @@
    "linker_set_key" : "android_dataspace_t *",
    "name" : "android_dataspace_t *",
    "referenced_type" : "type-170",
-   "self_type" : "type-1667",
+   "self_type" : "type-1672",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28815,8 +28818,8 @@
    "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",
+   "referenced_type" : "type-1249",
+   "self_type" : "type-1252",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h"
   },
@@ -28824,8 +28827,8 @@
    "alignment" : 4,
    "linker_set_key" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
    "name" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
-   "referenced_type" : "type-1387",
-   "self_type" : "type-1390",
+   "referenced_type" : "type-1390",
+   "self_type" : "type-1393",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -28834,7 +28837,7 @@
    "linker_set_key" : "bool *",
    "name" : "bool *",
    "referenced_type" : "type-93",
-   "self_type" : "type-1272",
+   "self_type" : "type-1274",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28851,8 +28854,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AHandler *",
    "name" : "const android::AHandler *",
-   "referenced_type" : "type-2518",
-   "self_type" : "type-2517",
+   "referenced_type" : "type-2521",
+   "self_type" : "type-2520",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28860,8 +28863,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AHandlerReflector<android::GraphicBufferSource> *",
    "name" : "const android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-2514",
-   "self_type" : "type-2515",
+   "referenced_type" : "type-2517",
+   "self_type" : "type-2518",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28869,8 +28872,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ALooper *",
    "name" : "const android::ALooper *",
-   "referenced_type" : "type-2289",
-   "self_type" : "type-2301",
+   "referenced_type" : "type-2292",
+   "self_type" : "type-2304",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28878,8 +28881,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AReplyToken *",
    "name" : "const android::AReplyToken *",
-   "referenced_type" : "type-1167",
-   "self_type" : "type-1170",
+   "referenced_type" : "type-1168",
+   "self_type" : "type-1173",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -28887,8 +28890,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AString *",
    "name" : "const android::AString *",
-   "referenced_type" : "type-2110",
-   "self_type" : "type-2230",
+   "referenced_type" : "type-2101",
+   "self_type" : "type-2233",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -28914,8 +28917,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BnInterface<android::IGraphicBufferProducer> *",
    "name" : "const android::BnInterface<android::IGraphicBufferProducer> *",
-   "referenced_type" : "type-1232",
-   "self_type" : "type-1233",
+   "referenced_type" : "type-1236",
+   "self_type" : "type-1237",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -28923,8 +28926,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BnInterface<android::IProducerListener> *",
    "name" : "const android::BnInterface<android::IProducerListener> *",
-   "referenced_type" : "type-4477",
-   "self_type" : "type-4478",
+   "referenced_type" : "type-4483",
+   "self_type" : "type-4484",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -28932,8 +28935,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BnInterface<android::ITransactionCompletedListener> *",
    "name" : "const android::BnInterface<android::ITransactionCompletedListener> *",
-   "referenced_type" : "type-1093",
-   "self_type" : "type-1094",
+   "referenced_type" : "type-1096",
+   "self_type" : "type-1097",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -28950,8 +28953,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-1069",
-   "self_type" : "type-1071",
+   "referenced_type" : "type-1072",
+   "self_type" : "type-1074",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28959,8 +28962,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-1219",
-   "self_type" : "type-1218",
+   "referenced_type" : "type-1223",
+   "self_type" : "type-1222",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -28968,8 +28971,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-3633",
-   "self_type" : "type-3632",
+   "referenced_type" : "type-3636",
+   "self_type" : "type-3635",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -28977,8 +28980,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-3682",
-   "self_type" : "type-3684",
+   "referenced_type" : "type-3688",
+   "self_type" : "type-3690",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28986,8 +28989,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-3791",
-   "self_type" : "type-3790",
+   "referenced_type" : "type-3798",
+   "self_type" : "type-3797",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -28995,8 +28998,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-5554",
-   "self_type" : "type-5553",
+   "referenced_type" : "type-5560",
+   "self_type" : "type-5559",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -29004,8 +29007,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-5603",
-   "self_type" : "type-5605",
+   "referenced_type" : "type-5612",
+   "self_type" : "type-5614",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -29013,8 +29016,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-5712",
-   "self_type" : "type-5711",
+   "referenced_type" : "type-5722",
+   "self_type" : "type-5721",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -29022,8 +29025,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-7870",
-   "self_type" : "type-7869",
+   "referenced_type" : "type-7891",
+   "self_type" : "type-7890",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -29031,8 +29034,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-7919",
-   "self_type" : "type-7921",
+   "referenced_type" : "type-7943",
+   "self_type" : "type-7945",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -29040,8 +29043,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-8028",
-   "self_type" : "type-8027",
+   "referenced_type" : "type-8053",
+   "self_type" : "type-8052",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -29049,8 +29052,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-8441",
-   "self_type" : "type-8440",
+   "referenced_type" : "type-8465",
+   "self_type" : "type-8464",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -29058,8 +29061,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-8483",
-   "self_type" : "type-8485",
+   "referenced_type" : "type-8510",
+   "self_type" : "type-8512",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -29067,8 +29070,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-8574",
-   "self_type" : "type-8573",
+   "referenced_type" : "type-8601",
+   "self_type" : "type-8600",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -29085,8 +29088,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferQueueCore *",
    "name" : "const android::BufferQueueCore *",
-   "referenced_type" : "type-3521",
-   "self_type" : "type-3523",
+   "referenced_type" : "type-3524",
+   "self_type" : "type-3526",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29094,8 +29097,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferQueueCore *",
    "name" : "const android::BufferQueueCore *",
-   "referenced_type" : "type-5442",
-   "self_type" : "type-5444",
+   "referenced_type" : "type-5448",
+   "self_type" : "type-5450",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29103,8 +29106,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferQueueCore *",
    "name" : "const android::BufferQueueCore *",
-   "referenced_type" : "type-7758",
-   "self_type" : "type-7760",
+   "referenced_type" : "type-7779",
+   "self_type" : "type-7781",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29121,8 +29124,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferQueueCore *",
    "name" : "const android::BufferQueueCore *",
-   "referenced_type" : "type-8344",
-   "self_type" : "type-8346",
+   "referenced_type" : "type-8368",
+   "self_type" : "type-8370",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29130,8 +29133,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ComponentWrapper *",
    "name" : "const android::ComponentWrapper *",
-   "referenced_type" : "type-2494",
-   "self_type" : "type-2495",
+   "referenced_type" : "type-2497",
+   "self_type" : "type-2498",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29139,8 +29142,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ConsumerListener *",
    "name" : "const android::ConsumerListener *",
-   "referenced_type" : "type-3513",
-   "self_type" : "type-3515",
+   "referenced_type" : "type-3516",
+   "self_type" : "type-3518",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29148,8 +29151,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ConsumerListener *",
    "name" : "const android::ConsumerListener *",
-   "referenced_type" : "type-5434",
-   "self_type" : "type-5436",
+   "referenced_type" : "type-5440",
+   "self_type" : "type-5442",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29157,8 +29160,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ConsumerListener *",
    "name" : "const android::ConsumerListener *",
-   "referenced_type" : "type-7750",
-   "self_type" : "type-7752",
+   "referenced_type" : "type-7771",
+   "self_type" : "type-7773",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29175,8 +29178,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ConsumerListener *",
    "name" : "const android::ConsumerListener *",
-   "referenced_type" : "type-8339",
-   "self_type" : "type-8341",
+   "referenced_type" : "type-8363",
+   "self_type" : "type-8365",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29184,8 +29187,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-1309",
-   "self_type" : "type-1315",
+   "referenced_type" : "type-1312",
+   "self_type" : "type-1316",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29193,8 +29196,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-2530",
-   "self_type" : "type-2532",
+   "referenced_type" : "type-2533",
+   "self_type" : "type-2535",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29202,8 +29205,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-3448",
-   "self_type" : "type-3450",
+   "referenced_type" : "type-3451",
+   "self_type" : "type-3453",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29211,8 +29214,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-3593",
-   "self_type" : "type-3595",
+   "referenced_type" : "type-3596",
+   "self_type" : "type-3598",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29220,8 +29223,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-3859",
-   "self_type" : "type-3865",
+   "referenced_type" : "type-3865",
+   "self_type" : "type-3869",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29229,8 +29232,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-4422",
-   "self_type" : "type-4430",
+   "referenced_type" : "type-4428",
+   "self_type" : "type-4432",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29238,8 +29241,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-4672",
-   "self_type" : "type-4674",
+   "referenced_type" : "type-4679",
+   "self_type" : "type-4681",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29247,8 +29250,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-4941",
-   "self_type" : "type-4943",
+   "referenced_type" : "type-4947",
+   "self_type" : "type-4949",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29256,8 +29259,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-5369",
-   "self_type" : "type-5371",
+   "referenced_type" : "type-5375",
+   "self_type" : "type-5377",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29265,8 +29268,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-5514",
-   "self_type" : "type-5516",
+   "referenced_type" : "type-5520",
+   "self_type" : "type-5522",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29274,8 +29277,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-5780",
-   "self_type" : "type-5786",
+   "referenced_type" : "type-5789",
+   "self_type" : "type-5793",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29283,8 +29286,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-6319",
-   "self_type" : "type-6327",
+   "referenced_type" : "type-6328",
+   "self_type" : "type-6332",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29292,8 +29295,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-6553",
-   "self_type" : "type-6555",
+   "referenced_type" : "type-6563",
+   "self_type" : "type-6565",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29301,8 +29304,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-7049",
-   "self_type" : "type-7054",
+   "referenced_type" : "type-7054",
+   "self_type" : "type-7062",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29319,8 +29322,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-7685",
-   "self_type" : "type-7687",
+   "referenced_type" : "type-7706",
+   "self_type" : "type-7708",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29328,8 +29331,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-7830",
-   "self_type" : "type-7832",
+   "referenced_type" : "type-7851",
+   "self_type" : "type-7853",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29337,8 +29340,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-8096",
-   "self_type" : "type-8102",
+   "referenced_type" : "type-8120",
+   "self_type" : "type-8124",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29346,8 +29349,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-8176",
-   "self_type" : "type-8178",
+   "referenced_type" : "type-8200",
+   "self_type" : "type-8202",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29355,8 +29358,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-8287",
-   "self_type" : "type-8290",
+   "referenced_type" : "type-8312",
+   "self_type" : "type-8314",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29364,8 +29367,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-8415",
-   "self_type" : "type-8417",
+   "referenced_type" : "type-8439",
+   "self_type" : "type-8441",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29373,8 +29376,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-8616",
-   "self_type" : "type-8622",
+   "referenced_type" : "type-8643",
+   "self_type" : "type-8647",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29382,8 +29385,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-9188",
-   "self_type" : "type-9197",
+   "referenced_type" : "type-9216",
+   "self_type" : "type-9222",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29400,8 +29403,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-9365",
-   "self_type" : "type-9371",
+   "referenced_type" : "type-9392",
+   "self_type" : "type-9394",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29409,8 +29412,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-9475",
-   "self_type" : "type-9477",
+   "referenced_type" : "type-9502",
+   "self_type" : "type-9504",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29419,7 +29422,7 @@
    "linker_set_key" : "const android::FileDescriptor::Autoclose *",
    "name" : "const android::FileDescriptor::Autoclose *",
    "referenced_type" : "type-1221",
-   "self_type" : "type-1230",
+   "self_type" : "type-1229",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h"
   },
@@ -29427,8 +29430,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Flattenable<android::BufferItem> *",
    "name" : "const android::Flattenable<android::BufferItem> *",
-   "referenced_type" : "type-1506",
-   "self_type" : "type-1507",
+   "referenced_type" : "type-1509",
+   "self_type" : "type-1510",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -29436,24 +29439,6 @@
    "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,
@@ -29461,17 +29446,8 @@
   },
   {
    "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> *",
+   "linker_set_key" : "const android::Flattenable<android::FrameEventHistoryDelta> *",
+   "name" : "const android::Flattenable<android::FrameEventHistoryDelta> *",
    "referenced_type" : "type-4312",
    "self_type" : "type-4313",
    "size" : 4,
@@ -29479,10 +29455,37 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::GraphicBuffer> *",
+   "name" : "const android::Flattenable<android::GraphicBuffer> *",
+   "referenced_type" : "type-1643",
+   "self_type" : "type-1644",
+   "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-4315",
+   "self_type" : "type-4316",
+   "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-4318",
+   "self_type" : "type-4319",
+   "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",
+   "referenced_type" : "type-2511",
+   "self_type" : "type-2513",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29490,8 +29493,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-1346",
-   "self_type" : "type-1348",
+   "referenced_type" : "type-1349",
+   "self_type" : "type-1351",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29499,8 +29502,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-1461",
-   "self_type" : "type-1463",
+   "referenced_type" : "type-1465",
+   "self_type" : "type-1467",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29508,8 +29511,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-2403",
-   "self_type" : "type-2425",
+   "referenced_type" : "type-2406",
+   "self_type" : "type-2428",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29517,8 +29520,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-3454",
-   "self_type" : "type-3456",
+   "referenced_type" : "type-3457",
+   "self_type" : "type-3459",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29526,8 +29529,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-3598",
-   "self_type" : "type-3600",
+   "referenced_type" : "type-3601",
+   "self_type" : "type-3603",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29535,8 +29538,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-3898",
-   "self_type" : "type-3900",
+   "referenced_type" : "type-3904",
+   "self_type" : "type-3906",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29544,8 +29547,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-3991",
-   "self_type" : "type-3993",
+   "referenced_type" : "type-3997",
+   "self_type" : "type-3999",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29553,8 +29556,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-4218",
-   "self_type" : "type-4220",
+   "referenced_type" : "type-4224",
+   "self_type" : "type-4226",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29562,8 +29565,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-4838",
-   "self_type" : "type-4870",
+   "referenced_type" : "type-4840",
+   "self_type" : "type-4876",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29571,8 +29574,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-5375",
-   "self_type" : "type-5377",
+   "referenced_type" : "type-5381",
+   "self_type" : "type-5383",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29580,8 +29583,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-5519",
-   "self_type" : "type-5521",
+   "referenced_type" : "type-5525",
+   "self_type" : "type-5527",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29589,8 +29592,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-5819",
-   "self_type" : "type-5821",
+   "referenced_type" : "type-5828",
+   "self_type" : "type-5830",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29598,8 +29601,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-5912",
-   "self_type" : "type-5914",
+   "referenced_type" : "type-5921",
+   "self_type" : "type-5923",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29607,8 +29610,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-6139",
-   "self_type" : "type-6141",
+   "referenced_type" : "type-6148",
+   "self_type" : "type-6150",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29616,8 +29619,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-6702",
-   "self_type" : "type-6734",
+   "referenced_type" : "type-6707",
+   "self_type" : "type-6743",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29634,8 +29637,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-7691",
-   "self_type" : "type-7693",
+   "referenced_type" : "type-7712",
+   "self_type" : "type-7714",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29643,8 +29646,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-7835",
-   "self_type" : "type-7837",
+   "referenced_type" : "type-7856",
+   "self_type" : "type-7858",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29652,8 +29655,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-8135",
-   "self_type" : "type-8137",
+   "referenced_type" : "type-8159",
+   "self_type" : "type-8161",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29661,8 +29664,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-8152",
-   "self_type" : "type-8157",
+   "referenced_type" : "type-8176",
+   "self_type" : "type-8181",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29670,8 +29673,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-8293",
-   "self_type" : "type-8295",
+   "referenced_type" : "type-8317",
+   "self_type" : "type-8319",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29679,8 +29682,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-8420",
-   "self_type" : "type-8422",
+   "referenced_type" : "type-8444",
+   "self_type" : "type-8446",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29688,8 +29691,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-8653",
-   "self_type" : "type-8655",
+   "referenced_type" : "type-8680",
+   "self_type" : "type-8683",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29697,8 +29700,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-8741",
-   "self_type" : "type-8743",
+   "referenced_type" : "type-8768",
+   "self_type" : "type-8770",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29706,8 +29709,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-8985",
-   "self_type" : "type-8995",
+   "referenced_type" : "type-9012",
+   "self_type" : "type-9020",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29715,8 +29718,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-8996",
-   "self_type" : "type-8998",
+   "referenced_type" : "type-9023",
+   "self_type" : "type-9025",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29733,8 +29736,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBufferSource *",
    "name" : "const android::GraphicBufferSource *",
-   "referenced_type" : "type-2546",
-   "self_type" : "type-2547",
+   "referenced_type" : "type-2549",
+   "self_type" : "type-2550",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29742,8 +29745,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IBinder *",
    "name" : "const android::IBinder *",
-   "referenced_type" : "type-1520",
-   "self_type" : "type-1525",
+   "referenced_type" : "type-1524",
+   "self_type" : "type-1530",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29751,8 +29754,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IBinder::DeathRecipient *",
    "name" : "const android::IBinder::DeathRecipient *",
-   "referenced_type" : "type-4315",
-   "self_type" : "type-4316",
+   "referenced_type" : "type-4321",
+   "self_type" : "type-4322",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29760,8 +29763,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-1155",
-   "self_type" : "type-1157",
+   "referenced_type" : "type-1158",
+   "self_type" : "type-1160",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29769,8 +29772,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-1580",
-   "self_type" : "type-1582",
+   "referenced_type" : "type-1584",
+   "self_type" : "type-1586",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29778,8 +29781,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-3611",
-   "self_type" : "type-3613",
+   "referenced_type" : "type-3614",
+   "self_type" : "type-3616",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29787,8 +29790,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-3760",
-   "self_type" : "type-3762",
+   "referenced_type" : "type-3766",
+   "self_type" : "type-3768",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29796,8 +29799,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-4060",
-   "self_type" : "type-4062",
+   "referenced_type" : "type-4066",
+   "self_type" : "type-4068",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29805,8 +29808,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-5532",
-   "self_type" : "type-5534",
+   "referenced_type" : "type-5538",
+   "self_type" : "type-5540",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29814,8 +29817,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-5681",
-   "self_type" : "type-5683",
+   "referenced_type" : "type-5690",
+   "self_type" : "type-5692",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29823,8 +29826,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-5981",
-   "self_type" : "type-5983",
+   "referenced_type" : "type-5990",
+   "self_type" : "type-5992",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29832,8 +29835,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-7848",
-   "self_type" : "type-7850",
+   "referenced_type" : "type-7869",
+   "self_type" : "type-7871",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29841,8 +29844,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-7997",
-   "self_type" : "type-7999",
+   "referenced_type" : "type-8021",
+   "self_type" : "type-8023",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29850,8 +29853,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-8426",
-   "self_type" : "type-8428",
+   "referenced_type" : "type-8450",
+   "self_type" : "type-8452",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29859,8 +29862,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-8550",
-   "self_type" : "type-8552",
+   "referenced_type" : "type-8577",
+   "self_type" : "type-8579",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29868,8 +29871,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-8809",
-   "self_type" : "type-8811",
+   "referenced_type" : "type-8836",
+   "self_type" : "type-8838",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29886,8 +29889,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-1604",
-   "self_type" : "type-1606",
+   "referenced_type" : "type-1608",
+   "self_type" : "type-1610",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29895,8 +29898,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-2501",
-   "self_type" : "type-2503",
+   "referenced_type" : "type-2504",
+   "self_type" : "type-2506",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29904,8 +29907,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-3494",
-   "self_type" : "type-3496",
+   "referenced_type" : "type-3497",
+   "self_type" : "type-3499",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29913,8 +29916,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-4077",
-   "self_type" : "type-4079",
+   "referenced_type" : "type-4083",
+   "self_type" : "type-4085",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29922,8 +29925,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-4914",
-   "self_type" : "type-4916",
+   "referenced_type" : "type-4920",
+   "self_type" : "type-4922",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29931,8 +29934,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-5415",
-   "self_type" : "type-5417",
+   "referenced_type" : "type-5421",
+   "self_type" : "type-5423",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29940,8 +29943,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-5998",
-   "self_type" : "type-6000",
+   "referenced_type" : "type-6007",
+   "self_type" : "type-6009",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29949,8 +29952,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6940",
-   "self_type" : "type-6942",
+   "referenced_type" : "type-6947",
+   "self_type" : "type-6950",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29958,8 +29961,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-7731",
-   "self_type" : "type-7733",
+   "referenced_type" : "type-7752",
+   "self_type" : "type-7754",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29976,8 +29979,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-8169",
-   "self_type" : "type-8171",
+   "referenced_type" : "type-8193",
+   "self_type" : "type-8195",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29985,8 +29988,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-8325",
-   "self_type" : "type-8327",
+   "referenced_type" : "type-8349",
+   "self_type" : "type-8351",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29994,8 +29997,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-8824",
-   "self_type" : "type-8826",
+   "referenced_type" : "type-8851",
+   "self_type" : "type-8853",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30003,8 +30006,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-9310",
-   "self_type" : "type-9312",
+   "referenced_type" : "type-9337",
+   "self_type" : "type-9339",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30012,8 +30015,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferProducer *",
    "name" : "const android::IGraphicBufferProducer *",
-   "referenced_type" : "type-3504",
-   "self_type" : "type-3506",
+   "referenced_type" : "type-3507",
+   "self_type" : "type-3509",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30021,8 +30024,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferProducer *",
    "name" : "const android::IGraphicBufferProducer *",
-   "referenced_type" : "type-4247",
-   "self_type" : "type-4249",
+   "referenced_type" : "type-4253",
+   "self_type" : "type-4255",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30030,8 +30033,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferProducer *",
    "name" : "const android::IGraphicBufferProducer *",
-   "referenced_type" : "type-5425",
-   "self_type" : "type-5427",
+   "referenced_type" : "type-5431",
+   "self_type" : "type-5433",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30039,8 +30042,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferProducer *",
    "name" : "const android::IGraphicBufferProducer *",
-   "referenced_type" : "type-6162",
-   "self_type" : "type-6164",
+   "referenced_type" : "type-6171",
+   "self_type" : "type-6173",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30048,8 +30051,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferProducer *",
    "name" : "const android::IGraphicBufferProducer *",
-   "referenced_type" : "type-7741",
-   "self_type" : "type-7743",
+   "referenced_type" : "type-7762",
+   "self_type" : "type-7764",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30066,8 +30069,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferProducer *",
    "name" : "const android::IGraphicBufferProducer *",
-   "referenced_type" : "type-8334",
-   "self_type" : "type-8336",
+   "referenced_type" : "type-8358",
+   "self_type" : "type-8360",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30075,8 +30078,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferProducer *",
    "name" : "const android::IGraphicBufferProducer *",
-   "referenced_type" : "type-9019",
-   "self_type" : "type-9021",
+   "referenced_type" : "type-9046",
+   "self_type" : "type-9048",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30084,8 +30087,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-1160",
-   "self_type" : "type-1162",
+   "referenced_type" : "type-1031",
+   "self_type" : "type-1033",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30093,8 +30096,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-3623",
-   "self_type" : "type-3625",
+   "referenced_type" : "type-1163",
+   "self_type" : "type-1165",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30102,8 +30105,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-3765",
-   "self_type" : "type-3767",
+   "referenced_type" : "type-3626",
+   "self_type" : "type-3628",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30111,8 +30114,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-4253",
-   "self_type" : "type-4255",
+   "referenced_type" : "type-3670",
+   "self_type" : "type-3672",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30120,8 +30123,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-4449",
-   "self_type" : "type-4448",
+   "referenced_type" : "type-3771",
+   "self_type" : "type-3773",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30129,8 +30132,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-4689",
-   "self_type" : "type-4691",
+   "referenced_type" : "type-4259",
+   "self_type" : "type-4261",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30138,8 +30141,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-5544",
-   "self_type" : "type-5546",
+   "referenced_type" : "type-4455",
+   "self_type" : "type-4454",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30147,8 +30150,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-5686",
-   "self_type" : "type-5688",
+   "referenced_type" : "type-4696",
+   "self_type" : "type-4698",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30156,8 +30159,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-6168",
-   "self_type" : "type-6170",
+   "referenced_type" : "type-5550",
+   "self_type" : "type-5552",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30165,8 +30168,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-6346",
-   "self_type" : "type-6345",
+   "referenced_type" : "type-5594",
+   "self_type" : "type-5596",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30174,8 +30177,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-6569",
-   "self_type" : "type-6571",
+   "referenced_type" : "type-5695",
+   "self_type" : "type-5697",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30183,8 +30186,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-7860",
-   "self_type" : "type-7862",
+   "referenced_type" : "type-6177",
+   "self_type" : "type-6179",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30192,8 +30195,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-8002",
-   "self_type" : "type-8004",
+   "referenced_type" : "type-6355",
+   "self_type" : "type-6354",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30201,8 +30204,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-8433",
-   "self_type" : "type-8435",
+   "referenced_type" : "type-6579",
+   "self_type" : "type-6581",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30210,8 +30213,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-8555",
-   "self_type" : "type-8557",
+   "referenced_type" : "type-7881",
+   "self_type" : "type-7883",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30219,8 +30222,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-9025",
-   "self_type" : "type-9027",
+   "referenced_type" : "type-7925",
+   "self_type" : "type-7927",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30228,8 +30231,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-9218",
-   "self_type" : "type-9217",
+   "referenced_type" : "type-8026",
+   "self_type" : "type-8028",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30237,8 +30240,53 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-9488",
-   "self_type" : "type-9490",
+   "referenced_type" : "type-8457",
+   "self_type" : "type-8459",
+   "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-8501",
+   "self_type" : "type-8503",
+   "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-8582",
+   "self_type" : "type-8584",
+   "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-9052",
+   "self_type" : "type-9054",
+   "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-9246",
+   "self_type" : "type-9245",
+   "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-9515",
+   "self_type" : "type-9517",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30273,8 +30321,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect> *",
    "name" : "const android::LightFlattenablePod<android::Rect> *",
-   "referenced_type" : "type-4587",
-   "self_type" : "type-4588",
+   "referenced_type" : "type-4593",
+   "self_type" : "type-4594",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30291,8 +30339,8 @@
    "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",
+   "referenced_type" : "type-1233",
+   "self_type" : "type-1234",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -30300,8 +30348,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::LightRefBase<android::NativeHandle> *",
    "name" : "const android::LightRefBase<android::NativeHandle> *",
-   "referenced_type" : "type-2663",
-   "self_type" : "type-2672",
+   "referenced_type" : "type-2666",
+   "self_type" : "type-2675",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -30418,7 +30466,7 @@
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
    "referenced_type" : "type-118",
-   "self_type" : "type-1513",
+   "self_type" : "type-1517",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -30435,8 +30483,8 @@
    "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",
+   "referenced_type" : "type-1523",
+   "self_type" : "type-1525",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -30444,8 +30492,8 @@
    "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",
+   "referenced_type" : "type-1666",
+   "self_type" : "type-1667",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -30453,8 +30501,8 @@
    "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",
+   "referenced_type" : "type-4337",
+   "self_type" : "type-4338",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -30462,8 +30510,8 @@
    "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",
+   "referenced_type" : "type-1660",
+   "self_type" : "type-1661",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -30471,8 +30519,8 @@
    "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",
+   "referenced_type" : "type-4343",
+   "self_type" : "type-4344",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -30480,8 +30528,8 @@
    "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",
+   "referenced_type" : "type-4348",
+   "self_type" : "type-4349",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -30498,8 +30546,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1215",
-   "self_type" : "type-1214",
+   "referenced_type" : "type-1218",
+   "self_type" : "type-1217",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30507,8 +30555,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1490",
-   "self_type" : "type-1489",
+   "referenced_type" : "type-1493",
+   "self_type" : "type-1492",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30516,8 +30564,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1621",
-   "self_type" : "type-1620",
+   "referenced_type" : "type-1624",
+   "self_type" : "type-1623",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30525,8 +30573,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-2683",
-   "self_type" : "type-2682",
+   "referenced_type" : "type-2686",
+   "self_type" : "type-2685",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30534,8 +30582,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-3787",
-   "self_type" : "type-3786",
+   "referenced_type" : "type-3793",
+   "self_type" : "type-3792",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30543,8 +30591,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4011",
-   "self_type" : "type-4010",
+   "referenced_type" : "type-4017",
+   "self_type" : "type-4016",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30552,8 +30600,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4090",
-   "self_type" : "type-4089",
+   "referenced_type" : "type-4096",
+   "self_type" : "type-4095",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30561,8 +30609,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4292",
-   "self_type" : "type-4291",
+   "referenced_type" : "type-4298",
+   "self_type" : "type-4297",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30570,8 +30618,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4572",
-   "self_type" : "type-4571",
+   "referenced_type" : "type-4578",
+   "self_type" : "type-4577",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30579,8 +30627,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4736",
-   "self_type" : "type-4735",
+   "referenced_type" : "type-4743",
+   "self_type" : "type-4742",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30588,8 +30636,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-5019",
-   "self_type" : "type-5018",
+   "referenced_type" : "type-5025",
+   "self_type" : "type-5024",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30597,8 +30645,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-5708",
-   "self_type" : "type-5707",
+   "referenced_type" : "type-5717",
+   "self_type" : "type-5716",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30606,8 +30654,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-5932",
-   "self_type" : "type-5931",
+   "referenced_type" : "type-5941",
+   "self_type" : "type-5940",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30615,8 +30663,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-6011",
-   "self_type" : "type-6010",
+   "referenced_type" : "type-6020",
+   "self_type" : "type-6019",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30624,8 +30672,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-6201",
-   "self_type" : "type-6200",
+   "referenced_type" : "type-6210",
+   "self_type" : "type-6209",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30633,8 +30681,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-6456",
-   "self_type" : "type-6455",
+   "referenced_type" : "type-6465",
+   "self_type" : "type-6464",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30642,8 +30690,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-6605",
-   "self_type" : "type-6604",
+   "referenced_type" : "type-6615",
+   "self_type" : "type-6614",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30651,8 +30699,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-6836",
-   "self_type" : "type-6835",
+   "referenced_type" : "type-6846",
+   "self_type" : "type-6845",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30660,8 +30708,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-6990",
-   "self_type" : "type-6989",
+   "referenced_type" : "type-6999",
+   "self_type" : "type-6998",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30669,8 +30717,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-7221",
-   "self_type" : "type-7220",
+   "referenced_type" : "type-7230",
+   "self_type" : "type-7229",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30678,8 +30726,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-7241",
-   "self_type" : "type-7240",
+   "referenced_type" : "type-7262",
+   "self_type" : "type-7261",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30687,8 +30735,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-8024",
-   "self_type" : "type-8023",
+   "referenced_type" : "type-8048",
+   "self_type" : "type-8047",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30696,8 +30744,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-8206",
-   "self_type" : "type-8205",
+   "referenced_type" : "type-8230",
+   "self_type" : "type-8229",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30705,8 +30753,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-8570",
-   "self_type" : "type-8569",
+   "referenced_type" : "type-8597",
+   "self_type" : "type-8596",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30714,8 +30762,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-8760",
-   "self_type" : "type-8759",
+   "referenced_type" : "type-8788",
+   "self_type" : "type-8787",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30723,8 +30771,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-8839",
-   "self_type" : "type-8838",
+   "referenced_type" : "type-8866",
+   "self_type" : "type-8865",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30732,8 +30780,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-9057",
-   "self_type" : "type-9056",
+   "referenced_type" : "type-9085",
+   "self_type" : "type-9084",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30741,8 +30789,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-9368",
-   "self_type" : "type-9367",
+   "referenced_type" : "type-9396",
+   "self_type" : "type-9395",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30750,8 +30798,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-9515",
-   "self_type" : "type-9514",
+   "referenced_type" : "type-9542",
+   "self_type" : "type-9541",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30759,8 +30807,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-9739",
-   "self_type" : "type-9738",
+   "referenced_type" : "type-9766",
+   "self_type" : "type-9765",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30768,8 +30816,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-9840",
-   "self_type" : "type-9839",
+   "referenced_type" : "type-9863",
+   "self_type" : "type-9862",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30777,8 +30825,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::RefBase *",
    "name" : "const android::RefBase *",
-   "referenced_type" : "type-1449",
-   "self_type" : "type-1480",
+   "referenced_type" : "type-1452",
+   "self_type" : "type-1483",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -30786,8 +30834,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SafeBpInterface<android::IConsumerListener> *",
    "name" : "const android::SafeBpInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-1551",
-   "self_type" : "type-1552",
+   "referenced_type" : "type-1554",
+   "self_type" : "type-1555",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -30795,8 +30843,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SafeBpInterface<android::IGraphicBufferConsumer> *",
    "name" : "const android::SafeBpInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-1886",
-   "self_type" : "type-1887",
+   "referenced_type" : "type-1890",
+   "self_type" : "type-1891",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -30804,8 +30852,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SafeInterface::ParcelHandler *",
    "name" : "const android::SafeInterface::ParcelHandler *",
-   "referenced_type" : "type-1256",
-   "self_type" : "type-1266",
+   "referenced_type" : "type-1254",
+   "self_type" : "type-1269",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -30813,8 +30861,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-2675",
-   "self_type" : "type-2676",
+   "referenced_type" : "type-2678",
+   "self_type" : "type-2679",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -30822,8 +30870,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-2671",
-   "self_type" : "type-2673",
+   "referenced_type" : "type-2674",
+   "self_type" : "type-2676",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -30831,8 +30879,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-2667",
-   "self_type" : "type-2668",
+   "referenced_type" : "type-2670",
+   "self_type" : "type-2671",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -30840,8 +30888,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 *",
    "name" : "const android::String16 *",
-   "referenced_type" : "type-1248",
-   "self_type" : "type-2658",
+   "referenced_type" : "type-1251",
+   "self_type" : "type-2661",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -30849,8 +30897,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 *",
    "name" : "const android::String8 *",
-   "referenced_type" : "type-1875",
-   "self_type" : "type-2653",
+   "referenced_type" : "type-1879",
+   "self_type" : "type-2656",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -30858,8 +30906,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::BufferItem> *",
    "name" : "const android::Vector<android::BufferItem> *",
-   "referenced_type" : "type-977",
-   "self_type" : "type-978",
+   "referenced_type" : "type-979",
+   "self_type" : "type-980",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30867,8 +30915,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::Rect> *",
    "name" : "const android::Vector<android::Rect> *",
-   "referenced_type" : "type-2679",
-   "self_type" : "type-2680",
+   "referenced_type" : "type-2682",
+   "self_type" : "type-2683",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30876,8 +30924,8 @@
    "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",
+   "referenced_type" : "type-1231",
+   "self_type" : "type-1232",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30885,8 +30933,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<int> *",
    "name" : "const android::Vector<int> *",
-   "referenced_type" : "type-2688",
-   "self_type" : "type-2689",
+   "referenced_type" : "type-2691",
+   "self_type" : "type-2692",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30894,8 +30942,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<long long> *",
    "name" : "const android::Vector<long long> *",
-   "referenced_type" : "type-1083",
-   "self_type" : "type-1084",
+   "referenced_type" : "type-1086",
+   "self_type" : "type-1087",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30903,8 +30951,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::VectorImpl *",
    "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-2664",
-   "self_type" : "type-2665",
+   "referenced_type" : "type-2667",
+   "self_type" : "type-2668",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -30912,8 +30960,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::base::ErrnoRestorer *",
    "name" : "const android::base::ErrnoRestorer *",
-   "referenced_type" : "type-4655",
-   "self_type" : "type-4661",
+   "referenced_type" : "type-4662",
+   "self_type" : "type-4668",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -30921,8 +30969,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser> *",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser> *",
-   "referenced_type" : "type-2580",
-   "self_type" : "type-2595",
+   "referenced_type" : "type-2583",
+   "self_type" : "type-2598",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -30939,8 +30987,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::BpHwRefBase *",
    "name" : "const android::hardware::BpHwRefBase *",
-   "referenced_type" : "type-1374",
-   "self_type" : "type-1375",
+   "referenced_type" : "type-1377",
+   "self_type" : "type-1378",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -30948,8 +30996,8 @@
    "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",
+   "referenced_type" : "type-6932",
+   "self_type" : "type-6933",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -30957,24 +31005,6 @@
    "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,
@@ -30982,8 +31012,8 @@
   },
   {
    "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> > *",
+   "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-4498",
    "self_type" : "type-4499",
    "size" : 4,
@@ -30991,10 +31021,28 @@
   },
   {
    "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-4375",
+   "self_type" : "type-4376",
+   "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-4504",
+   "self_type" : "type-4505",
+   "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-4357",
-   "self_type" : "type-4358",
+   "referenced_type" : "type-4363",
+   "self_type" : "type-4364",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -31002,8 +31050,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<int> *",
    "name" : "const android::hardware::Return<int> *",
-   "referenced_type" : "type-4698",
-   "self_type" : "type-4700",
+   "referenced_type" : "type-4704",
+   "self_type" : "type-4706",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -31011,8 +31059,8 @@
    "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",
+   "referenced_type" : "type-6935",
+   "self_type" : "type-6936",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -31074,8 +31122,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-4348",
-   "self_type" : "type-4349",
+   "referenced_type" : "type-4354",
+   "self_type" : "type-4355",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -31101,8 +31149,8 @@
    "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-2460",
-   "self_type" : "type-2461",
+   "referenced_type" : "type-2463",
+   "self_type" : "type-2464",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31128,8 +31176,8 @@
    "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",
+   "referenced_type" : "type-4732",
+   "self_type" : "type-4733",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -31191,8 +31239,8 @@
    "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",
+   "referenced_type" : "type-4386",
+   "self_type" : "type-4387",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -31227,8 +31275,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-2619",
-   "self_type" : "type-2627",
+   "referenced_type" : "type-2622",
+   "self_type" : "type-2630",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -31236,8 +31284,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-2617",
-   "self_type" : "type-2626",
+   "referenced_type" : "type-2620",
+   "self_type" : "type-2629",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -31245,8 +31293,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-2613",
-   "self_type" : "type-2625",
+   "referenced_type" : "type-2616",
+   "self_type" : "type-2628",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -31254,8 +31302,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
    "name" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
-   "referenced_type" : "type-1304",
-   "self_type" : "type-2513",
+   "referenced_type" : "type-1301",
+   "self_type" : "type-2516",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31264,7 +31312,7 @@
    "linker_set_key" : "const android::sp<android::ALooper> *",
    "name" : "const android::sp<android::ALooper> *",
    "referenced_type" : "type-320",
-   "self_type" : "type-2277",
+   "self_type" : "type-2280",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31272,8 +31320,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::AMessage> *",
    "name" : "const android::sp<android::AMessage> *",
-   "referenced_type" : "type-2175",
-   "self_type" : "type-2203",
+   "referenced_type" : "type-2174",
+   "self_type" : "type-2206",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31290,8 +31338,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::ComponentWrapper> *",
    "name" : "const android::sp<android::ComponentWrapper> *",
-   "referenced_type" : "type-2491",
-   "self_type" : "type-2493",
+   "referenced_type" : "type-2494",
+   "self_type" : "type-2496",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31308,8 +31356,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::Fence> *",
    "name" : "const android::sp<android::Fence> *",
-   "referenced_type" : "type-1863",
-   "self_type" : "type-2529",
+   "referenced_type" : "type-1867",
+   "self_type" : "type-2532",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31317,8 +31365,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::FrameDropper> *",
    "name" : "const android::sp<android::FrameDropper> *",
-   "referenced_type" : "type-2506",
-   "self_type" : "type-2507",
+   "referenced_type" : "type-2509",
+   "self_type" : "type-2510",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31326,8 +31374,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::GraphicBuffer> *",
    "name" : "const android::sp<android::GraphicBuffer> *",
-   "referenced_type" : "type-1196",
-   "self_type" : "type-1195",
+   "referenced_type" : "type-1200",
+   "self_type" : "type-1199",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31335,8 +31383,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::GraphicBufferSource> *",
    "name" : "const android::sp<android::GraphicBufferSource> *",
-   "referenced_type" : "type-2544",
-   "self_type" : "type-2545",
+   "referenced_type" : "type-2547",
+   "self_type" : "type-2548",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31344,8 +31392,8 @@
    "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",
+   "referenced_type" : "type-4270",
+   "self_type" : "type-4269",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31353,8 +31401,8 @@
    "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",
+   "referenced_type" : "type-4279",
+   "self_type" : "type-4278",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31362,8 +31410,8 @@
    "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",
+   "referenced_type" : "type-4832",
+   "self_type" : "type-4845",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31371,8 +31419,8 @@
    "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",
+   "referenced_type" : "type-7037",
+   "self_type" : "type-7049",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31380,8 +31428,8 @@
    "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",
+   "referenced_type" : "type-4306",
+   "self_type" : "type-4390",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31389,8 +31437,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IBinder> *",
    "name" : "const android::sp<android::IBinder> *",
-   "referenced_type" : "type-1036",
-   "self_type" : "type-1273",
+   "referenced_type" : "type-1040",
+   "self_type" : "type-1277",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31408,7 +31456,7 @@
    "linker_set_key" : "const android::sp<android::IGraphicBufferConsumer> *",
    "name" : "const android::sp<android::IGraphicBufferConsumer> *",
    "referenced_type" : "type-789",
-   "self_type" : "type-2500",
+   "self_type" : "type-2503",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31416,8 +31464,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer> *",
    "name" : "const android::sp<android::IGraphicBufferProducer> *",
-   "referenced_type" : "type-2485",
-   "self_type" : "type-2487",
+   "referenced_type" : "type-2488",
+   "self_type" : "type-2490",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31425,8 +31473,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IInterface> *",
    "name" : "const android::sp<android::IInterface> *",
-   "referenced_type" : "type-1487",
-   "self_type" : "type-1493",
+   "referenced_type" : "type-1491",
+   "self_type" : "type-1497",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31444,7 +31492,7 @@
    "linker_set_key" : "const android::sp<android::NativeHandle> *",
    "name" : "const android::sp<android::NativeHandle> *",
    "referenced_type" : "type-934",
-   "self_type" : "type-1597",
+   "self_type" : "type-1601",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31452,8 +31500,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-2468",
-   "self_type" : "type-2469",
+   "referenced_type" : "type-2471",
+   "self_type" : "type-2472",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31461,8 +31509,8 @@
    "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-2458",
-   "self_type" : "type-2459",
+   "referenced_type" : "type-2461",
+   "self_type" : "type-2462",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31470,8 +31518,8 @@
    "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",
+   "referenced_type" : "type-4245",
+   "self_type" : "type-4284",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31479,8 +31527,8 @@
    "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",
+   "referenced_type" : "type-4476",
+   "self_type" : "type-4475",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31488,8 +31536,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-2482",
-   "self_type" : "type-2483",
+   "referenced_type" : "type-2485",
+   "self_type" : "type-2486",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31497,8 +31545,8 @@
    "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-2475",
+   "referenced_type" : "type-2477",
+   "self_type" : "type-2478",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31506,8 +31554,8 @@
    "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",
+   "referenced_type" : "type-4239",
+   "self_type" : "type-4282",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31515,8 +31563,8 @@
    "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",
+   "referenced_type" : "type-4469",
+   "self_type" : "type-4468",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31525,7 +31573,7 @@
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient> *",
    "name" : "const android::sp<android::hardware::hidl_death_recipient> *",
    "referenced_type" : "type-513",
-   "self_type" : "type-2442",
+   "self_type" : "type-2445",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31533,8 +31581,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-2446",
-   "self_type" : "type-2447",
+   "referenced_type" : "type-2449",
+   "self_type" : "type-2450",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31542,8 +31590,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "referenced_type" : "type-2451",
-   "self_type" : "type-2453",
+   "referenced_type" : "type-2454",
+   "self_type" : "type-2456",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31578,8 +31626,8 @@
    "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",
+   "referenced_type" : "type-4296",
+   "self_type" : "type-4311",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -31596,8 +31644,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-1241",
-   "self_type" : "type-1240",
+   "referenced_type" : "type-1244",
+   "self_type" : "type-1243",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -31623,8 +31671,8 @@
    "alignment" : 4,
    "linker_set_key" : "const log_msg *",
    "name" : "const log_msg *",
-   "referenced_type" : "type-2313",
-   "self_type" : "type-2320",
+   "referenced_type" : "type-2316",
+   "self_type" : "type-2323",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -31633,7 +31681,7 @@
    "linker_set_key" : "const long long *",
    "name" : "const long long *",
    "referenced_type" : "type-560",
-   "self_type" : "type-1068",
+   "self_type" : "type-1071",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -31651,7 +31699,7 @@
    "linker_set_key" : "const signed char *",
    "name" : "const signed char *",
    "referenced_type" : "type-437",
-   "self_type" : "type-4723",
+   "self_type" : "type-4730",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -31659,8 +31707,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-4759",
-   "self_type" : "type-4761",
+   "referenced_type" : "type-4766",
+   "self_type" : "type-4768",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -31668,8 +31716,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-4863",
-   "self_type" : "type-4865",
+   "referenced_type" : "type-4869",
+   "self_type" : "type-4871",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -31677,8 +31725,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-6625",
-   "self_type" : "type-6627",
+   "referenced_type" : "type-6635",
+   "self_type" : "type-6637",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -31686,8 +31734,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-6727",
-   "self_type" : "type-6729",
+   "referenced_type" : "type-6736",
+   "self_type" : "type-6738",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -31695,8 +31743,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-6850",
-   "self_type" : "type-6852",
+   "referenced_type" : "type-6859",
+   "self_type" : "type-6862",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -31704,8 +31752,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-6997",
-   "self_type" : "type-7004",
+   "referenced_type" : "type-7006",
+   "self_type" : "type-7012",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -31713,8 +31761,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-7072",
-   "self_type" : "type-7074",
+   "referenced_type" : "type-7082",
+   "self_type" : "type-7084",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -31722,8 +31770,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-7248",
-   "self_type" : "type-7254",
+   "referenced_type" : "type-7268",
+   "self_type" : "type-7274",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -31731,8 +31779,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-7299",
-   "self_type" : "type-7301",
+   "referenced_type" : "type-7319",
+   "self_type" : "type-7321",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -31740,8 +31788,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-9533",
-   "self_type" : "type-9535",
+   "referenced_type" : "type-9560",
+   "self_type" : "type-9562",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -31749,8 +31797,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-9626",
-   "self_type" : "type-9628",
+   "referenced_type" : "type-9655",
+   "self_type" : "type-9657",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -31758,8 +31806,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-9752",
-   "self_type" : "type-9754",
+   "referenced_type" : "type-9780",
+   "self_type" : "type-9782",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -31804,7 +31852,7 @@
    "linker_set_key" : "float *",
    "name" : "float *",
    "referenced_type" : "type-268",
-   "self_type" : "type-1275",
+   "self_type" : "type-1276",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -31822,7 +31870,7 @@
    "linker_set_key" : "int *",
    "name" : "int *",
    "referenced_type" : "type-4",
-   "self_type" : "type-1509",
+   "self_type" : "type-1512",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -31830,8 +31878,8 @@
    "alignment" : 4,
    "linker_set_key" : "log_msg *",
    "name" : "log_msg *",
-   "referenced_type" : "type-2177",
-   "self_type" : "type-2342",
+   "referenced_type" : "type-2180",
+   "self_type" : "type-2345",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -31858,7 +31906,7 @@
    "linker_set_key" : "signed char *",
    "name" : "signed char *",
    "referenced_type" : "type-438",
-   "self_type" : "type-4731",
+   "self_type" : "type-4737",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -31866,8 +31914,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::tuple<> *",
    "name" : "std::tuple<> *",
-   "referenced_type" : "type-1566",
-   "self_type" : "type-1565",
+   "referenced_type" : "type-1571",
+   "self_type" : "type-1570",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -31875,573 +31923,6 @@
    "alignment" : 4,
    "linker_set_key" : "std::tuple<> *",
    "name" : "std::tuple<> *",
-   "referenced_type" : "type-2072",
-   "self_type" : "type-2071",
-   "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-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-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,
@@ -32449,17 +31930,368 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "std::tuple<unsigned long long> *",
-   "name" : "std::tuple<unsigned long long> *",
-   "referenced_type" : "type-4162",
-   "self_type" : "type-4161",
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-4056",
+   "self_type" : "type-4055",
    "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> *",
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "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<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-5980",
+   "self_type" : "type-5979",
+   "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-6090",
+   "self_type" : "type-6089",
+   "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-8827",
+   "self_type" : "type-8826",
+   "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-8949",
+   "self_type" : "type-8948",
+   "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-2054",
+   "self_type" : "type-2053",
+   "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-4150",
+   "self_type" : "type-4149",
+   "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-6074",
+   "self_type" : "type-6073",
+   "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-8933",
+   "self_type" : "type-8932",
+   "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-1575",
+   "self_type" : "type-1574",
+   "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-4059",
+   "self_type" : "type-4058",
+   "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-5983",
+   "self_type" : "type-5982",
+   "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-8830",
+   "self_type" : "type-8829",
+   "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-2119",
+   "self_type" : "type-2118",
+   "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-4195",
+   "self_type" : "type-4194",
+   "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-6119",
+   "self_type" : "type-6118",
+   "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-8979",
+   "self_type" : "type-8978",
+   "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-2089",
+   "self_type" : "type-2088",
+   "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-4175",
+   "self_type" : "type-4174",
+   "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-6099",
+   "self_type" : "type-6098",
+   "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-8958",
+   "self_type" : "type-8957",
+   "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-2094",
+   "self_type" : "type-2093",
+   "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-4178",
+   "self_type" : "type-4177",
+   "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-6102",
+   "self_type" : "type-6101",
+   "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-8961",
+   "self_type" : "type-8960",
+   "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-2115",
+   "self_type" : "type-2114",
+   "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-4192",
+   "self_type" : "type-4191",
+   "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-6116",
+   "self_type" : "type-6115",
+   "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-8976",
+   "self_type" : "type-8975",
+   "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-2100",
+   "self_type" : "type-2099",
+   "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-4182",
+   "self_type" : "type-4181",
+   "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-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> *",
+   "name" : "std::tuple<bool> *",
+   "referenced_type" : "type-8966",
+   "self_type" : "type-8965",
+   "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-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, sp<GraphicBuffer> > *",
+   "name" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "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<int, sp<GraphicBuffer> > *",
+   "name" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "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<int, sp<GraphicBuffer> > *",
+   "name" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "referenced_type" : "type-8939",
+   "self_type" : "type-8938",
+   "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-2067",
+   "self_type" : "type-2066",
+   "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-4159",
+   "self_type" : "type-4158",
+   "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-6083",
    "self_type" : "type-6082",
    "size" : 4,
@@ -32467,10 +32299,226 @@
   },
   {
    "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-8942",
+   "self_type" : "type-8941",
+   "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-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> *",
+   "name" : "std::tuple<int> *",
+   "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> *",
+   "name" : "std::tuple<int> *",
+   "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<int> *",
+   "name" : "std::tuple<int> *",
+   "referenced_type" : "type-8936",
+   "self_type" : "type-8935",
+   "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-2072",
+   "self_type" : "type-2071",
+   "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-4163",
+   "self_type" : "type-4162",
+   "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-6087",
+   "self_type" : "type-6086",
+   "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-8945",
+   "self_type" : "type-8944",
+   "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-2110",
+   "self_type" : "type-2109",
+   "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-4189",
+   "self_type" : "type-4188",
+   "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-6113",
+   "self_type" : "type-6112",
+   "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-8973",
+   "self_type" : "type-8972",
+   "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-2085",
+   "self_type" : "type-2084",
+   "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-4172",
+   "self_type" : "type-4171",
+   "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-6096",
+   "self_type" : "type-6095",
+   "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-8955",
+   "self_type" : "type-8954",
+   "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-2106",
+   "self_type" : "type-2105",
+   "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-4186",
+   "self_type" : "type-4185",
+   "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-6110",
+   "self_type" : "type-6109",
+   "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-8969",
+   "self_type" : "type-8968",
+   "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",
+   "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 long long> *",
+   "name" : "std::tuple<unsigned long long> *",
+   "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<unsigned long long> *",
+   "name" : "std::tuple<unsigned long long> *",
+   "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<unsigned long long> *",
+   "name" : "std::tuple<unsigned long long> *",
+   "referenced_type" : "type-8952",
+   "self_type" : "type-8951",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -32478,8 +32526,8 @@
    "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",
+   "referenced_type" : "type-1653",
+   "self_type" : "type-1652",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -32487,8 +32535,8 @@
    "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",
+   "referenced_type" : "type-4117",
+   "self_type" : "type-4116",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -32496,8 +32544,8 @@
    "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",
+   "referenced_type" : "type-6041",
+   "self_type" : "type-6040",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -32505,8 +32553,8 @@
    "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",
+   "referenced_type" : "type-8886",
+   "self_type" : "type-8885",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -32515,7 +32563,7 @@
    "linker_set_key" : "unsigned char (*)[128]",
    "name" : "unsigned char (*)[128]",
    "referenced_type" : "type-1527",
-   "self_type" : "type-2360",
+   "self_type" : "type-2363",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -32533,7 +32581,7 @@
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
    "referenced_type" : "type-2",
-   "self_type" : "type-1680",
+   "self_type" : "type-1684",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -32559,8 +32607,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
    "name" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
-   "referenced_type" : "type-1380",
-   "self_type" : "type-1379",
+   "referenced_type" : "type-1383",
+   "self_type" : "type-1382",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -32600,8 +32648,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1078",
-   "self_type" : "type-1080",
+   "referenced_type" : "type-1081",
+   "self_type" : "type-1083",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32610,8 +32658,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1190",
-   "self_type" : "type-1192",
+   "referenced_type" : "type-1193",
+   "self_type" : "type-1196",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32620,8 +32668,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1351",
-   "self_type" : "type-1353",
+   "referenced_type" : "type-1354",
+   "self_type" : "type-1356",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32630,8 +32678,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1403",
-   "self_type" : "type-1405",
+   "referenced_type" : "type-1406",
+   "self_type" : "type-1408",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32640,8 +32688,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1419",
-   "self_type" : "type-1421",
+   "referenced_type" : "type-1422",
+   "self_type" : "type-1424",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32650,8 +32698,8 @@
    "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",
+   "referenced_type" : "type-1443",
+   "self_type" : "type-1445",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32660,8 +32708,8 @@
    "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",
+   "referenced_type" : "type-1485",
+   "self_type" : "type-1487",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32670,8 +32718,8 @@
    "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",
+   "referenced_type" : "type-1619",
+   "self_type" : "type-1622",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32680,8 +32728,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2648",
-   "self_type" : "type-2651",
+   "referenced_type" : "type-2651",
+   "self_type" : "type-2654",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32690,8 +32738,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",
+   "referenced_type" : "type-3461",
+   "self_type" : "type-3463",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32700,8 +32748,8 @@
    "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",
+   "referenced_type" : "type-3527",
+   "self_type" : "type-3529",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32710,8 +32758,8 @@
    "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",
+   "referenced_type" : "type-3629",
+   "self_type" : "type-3631",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32720,8 +32768,8 @@
    "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",
+   "referenced_type" : "type-3694",
+   "self_type" : "type-3696",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32730,8 +32778,8 @@
    "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",
+   "referenced_type" : "type-3786",
+   "self_type" : "type-3788",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32740,8 +32788,8 @@
    "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",
+   "referenced_type" : "type-3847",
+   "self_type" : "type-3846",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32750,8 +32798,8 @@
    "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",
+   "referenced_type" : "type-3911",
+   "self_type" : "type-3913",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32760,8 +32808,8 @@
    "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",
+   "referenced_type" : "type-3937",
+   "self_type" : "type-3939",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32770,8 +32818,8 @@
    "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",
+   "referenced_type" : "type-3953",
+   "self_type" : "type-3955",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32780,8 +32828,8 @@
    "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",
+   "referenced_type" : "type-3978",
+   "self_type" : "type-3980",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32790,8 +32838,8 @@
    "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",
+   "referenced_type" : "type-4011",
+   "self_type" : "type-4013",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32800,8 +32848,8 @@
    "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",
+   "referenced_type" : "type-4092",
+   "self_type" : "type-4094",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32810,8 +32858,8 @@
    "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",
+   "referenced_type" : "type-4292",
+   "self_type" : "type-4294",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32820,8 +32868,8 @@
    "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",
+   "referenced_type" : "type-4479",
+   "self_type" : "type-4481",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32830,8 +32878,8 @@
    "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",
+   "referenced_type" : "type-4532",
+   "self_type" : "type-4534",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32840,8 +32888,8 @@
    "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",
+   "referenced_type" : "type-4541",
+   "self_type" : "type-4543",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32850,8 +32898,8 @@
    "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",
+   "referenced_type" : "type-4566",
+   "self_type" : "type-4568",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32860,8 +32908,8 @@
    "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",
+   "referenced_type" : "type-4717",
+   "self_type" : "type-4720",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32870,8 +32918,8 @@
    "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",
+   "referenced_type" : "type-4847",
+   "self_type" : "type-4849",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32880,8 +32928,8 @@
    "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",
+   "referenced_type" : "type-4996",
+   "self_type" : "type-4998",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32890,8 +32938,8 @@
    "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",
+   "referenced_type" : "type-5385",
+   "self_type" : "type-5387",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32900,8 +32948,8 @@
    "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",
+   "referenced_type" : "type-5451",
+   "self_type" : "type-5453",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32920,8 +32968,8 @@
    "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",
+   "referenced_type" : "type-5553",
+   "self_type" : "type-5555",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32930,8 +32978,8 @@
    "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",
+   "referenced_type" : "type-5618",
+   "self_type" : "type-5620",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32940,8 +32988,8 @@
    "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",
+   "referenced_type" : "type-5710",
+   "self_type" : "type-5712",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32950,8 +32998,8 @@
    "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",
+   "referenced_type" : "type-5771",
+   "self_type" : "type-5770",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32960,8 +33008,8 @@
    "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",
+   "referenced_type" : "type-5835",
+   "self_type" : "type-5837",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32970,8 +33018,8 @@
    "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",
+   "referenced_type" : "type-5861",
+   "self_type" : "type-5863",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32980,8 +33028,8 @@
    "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",
+   "referenced_type" : "type-5877",
+   "self_type" : "type-5879",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32990,8 +33038,8 @@
    "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",
+   "referenced_type" : "type-5902",
+   "self_type" : "type-5904",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33000,8 +33048,8 @@
    "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",
+   "referenced_type" : "type-5935",
+   "self_type" : "type-5937",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33010,8 +33058,8 @@
    "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",
+   "referenced_type" : "type-6016",
+   "self_type" : "type-6018",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33020,8 +33068,8 @@
    "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",
+   "referenced_type" : "type-6204",
+   "self_type" : "type-6206",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33030,8 +33078,8 @@
    "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",
+   "referenced_type" : "type-6371",
+   "self_type" : "type-6373",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33040,8 +33088,8 @@
    "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",
+   "referenced_type" : "type-6419",
+   "self_type" : "type-6421",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33050,8 +33098,8 @@
    "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",
+   "referenced_type" : "type-6428",
+   "self_type" : "type-6430",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33060,8 +33108,8 @@
    "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",
+   "referenced_type" : "type-6453",
+   "self_type" : "type-6455",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33070,8 +33118,8 @@
    "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",
+   "referenced_type" : "type-6594",
+   "self_type" : "type-6597",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33080,8 +33128,8 @@
    "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",
+   "referenced_type" : "type-6714",
+   "self_type" : "type-6716",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33090,8 +33138,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-6735",
-   "self_type" : "type-6737",
+   "referenced_type" : "type-6744",
+   "self_type" : "type-6746",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33100,8 +33148,8 @@
    "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",
+   "referenced_type" : "type-6788",
+   "self_type" : "type-6790",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33110,8 +33158,8 @@
    "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",
+   "referenced_type" : "type-6877",
+   "self_type" : "type-6880",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33120,8 +33168,8 @@
    "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",
+   "referenced_type" : "type-6940",
+   "self_type" : "type-6942",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33130,8 +33178,8 @@
    "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",
+   "referenced_type" : "type-7056",
+   "self_type" : "type-7058",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33140,8 +33188,8 @@
    "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",
+   "referenced_type" : "type-7102",
+   "self_type" : "type-7105",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33150,8 +33198,8 @@
    "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",
+   "referenced_type" : "type-7201",
+   "self_type" : "type-7203",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33160,8 +33208,8 @@
    "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",
+   "referenced_type" : "type-7301",
+   "self_type" : "type-7303",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33170,8 +33218,8 @@
    "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",
+   "referenced_type" : "type-7340",
+   "self_type" : "type-7342",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33190,8 +33238,8 @@
    "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",
+   "referenced_type" : "type-7716",
+   "self_type" : "type-7718",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33200,8 +33248,8 @@
    "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",
+   "referenced_type" : "type-7782",
+   "self_type" : "type-7784",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33210,8 +33258,8 @@
    "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",
+   "referenced_type" : "type-7884",
+   "self_type" : "type-7886",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33220,8 +33268,8 @@
    "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",
+   "referenced_type" : "type-7949",
+   "self_type" : "type-7951",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33230,8 +33278,8 @@
    "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",
+   "referenced_type" : "type-8041",
+   "self_type" : "type-8043",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33240,8 +33288,8 @@
    "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",
+   "referenced_type" : "type-8102",
+   "self_type" : "type-8101",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33250,8 +33298,8 @@
    "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",
+   "referenced_type" : "type-8164",
+   "self_type" : "type-8166",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33260,8 +33308,8 @@
    "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",
+   "referenced_type" : "type-8224",
+   "self_type" : "type-8226",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33270,18 +33318,8 @@
    "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",
+   "referenced_type" : "type-8320",
+   "self_type" : "type-8322",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33300,8 +33338,8 @@
    "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",
+   "referenced_type" : "type-8372",
+   "self_type" : "type-8374",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33310,8 +33348,8 @@
    "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",
+   "referenced_type" : "type-8461",
+   "self_type" : "type-8463",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33320,8 +33358,8 @@
    "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",
+   "referenced_type" : "type-8513",
+   "self_type" : "type-8515",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33330,8 +33368,8 @@
    "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",
+   "referenced_type" : "type-8593",
+   "self_type" : "type-8595",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33340,8 +33378,8 @@
    "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",
+   "referenced_type" : "type-8686",
+   "self_type" : "type-8688",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33350,8 +33388,8 @@
    "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",
+   "referenced_type" : "type-8712",
+   "self_type" : "type-8714",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33360,8 +33398,8 @@
    "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",
+   "referenced_type" : "type-8729",
+   "self_type" : "type-8731",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33370,8 +33408,8 @@
    "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",
+   "referenced_type" : "type-8750",
+   "self_type" : "type-8752",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33380,8 +33418,8 @@
    "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",
+   "referenced_type" : "type-8782",
+   "self_type" : "type-8784",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33390,8 +33428,8 @@
    "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",
+   "referenced_type" : "type-8862",
+   "self_type" : "type-8864",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33400,8 +33438,8 @@
    "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",
+   "referenced_type" : "type-9079",
+   "self_type" : "type-9081",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33410,8 +33448,8 @@
    "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",
+   "referenced_type" : "type-9264",
+   "self_type" : "type-9266",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33420,8 +33458,8 @@
    "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",
+   "referenced_type" : "type-9326",
+   "self_type" : "type-9329",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33430,8 +33468,8 @@
    "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",
+   "referenced_type" : "type-9341",
+   "self_type" : "type-9344",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33440,8 +33478,8 @@
    "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",
+   "referenced_type" : "type-9377",
+   "self_type" : "type-9379",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33450,8 +33488,8 @@
    "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",
+   "referenced_type" : "type-9527",
+   "self_type" : "type-9529",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33460,8 +33498,8 @@
    "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",
+   "referenced_type" : "type-9628",
+   "self_type" : "type-9630",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33470,8 +33508,18 @@
    "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",
+   "referenced_type" : "type-9665",
+   "self_type" : "type-9667",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-9717",
+   "self_type" : "type-9719",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33490,8 +33538,8 @@
    "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",
+   "referenced_type" : "type-9769",
+   "self_type" : "type-9779",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33500,8 +33548,8 @@
    "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",
+   "referenced_type" : "type-9797",
+   "self_type" : "type-9799",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33510,8 +33558,8 @@
    "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",
+   "referenced_type" : "type-9859",
+   "self_type" : "type-9861",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33520,8 +33568,8 @@
    "is_const" : true,
    "linker_set_key" : "android::hardware::IBinder *const",
    "name" : "android::hardware::IBinder *const",
-   "referenced_type" : "type-1358",
-   "self_type" : "type-1372",
+   "referenced_type" : "type-1361",
+   "self_type" : "type-1375",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -33531,7 +33579,7 @@
    "linker_set_key" : "const android::AHandler",
    "name" : "const android::AHandler",
    "referenced_type" : "type-264",
-   "self_type" : "type-2518",
+   "self_type" : "type-2521",
    "size" : 48,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33541,7 +33589,7 @@
    "linker_set_key" : "const android::AHandlerReflector<android::GraphicBufferSource>",
    "name" : "const android::AHandlerReflector<android::GraphicBufferSource>",
    "referenced_type" : "type-583",
-   "self_type" : "type-2514",
+   "self_type" : "type-2517",
    "size" : 56,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33551,7 +33599,7 @@
    "linker_set_key" : "const android::ALooper",
    "name" : "const android::ALooper",
    "referenced_type" : "type-248",
-   "self_type" : "type-2289",
+   "self_type" : "type-2292",
    "size" : 52,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33560,8 +33608,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AReplyToken",
    "name" : "const android::AReplyToken",
-   "referenced_type" : "type-1044",
-   "self_type" : "type-1167",
+   "referenced_type" : "type-1043",
+   "self_type" : "type-1168",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -33571,7 +33619,7 @@
    "linker_set_key" : "const android::AString",
    "name" : "const android::AString",
    "referenced_type" : "type-253",
-   "self_type" : "type-2110",
+   "self_type" : "type-2101",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -33601,7 +33649,7 @@
    "linker_set_key" : "const android::BnInterface<android::IGraphicBufferProducer>",
    "name" : "const android::BnInterface<android::IGraphicBufferProducer>",
    "referenced_type" : "type-71",
-   "self_type" : "type-1232",
+   "self_type" : "type-1236",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -33611,7 +33659,7 @@
    "linker_set_key" : "const android::BnInterface<android::IProducerListener>",
    "name" : "const android::BnInterface<android::IProducerListener>",
    "referenced_type" : "type-80",
-   "self_type" : "type-4477",
+   "self_type" : "type-4483",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -33620,8 +33668,8 @@
    "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",
+   "referenced_type" : "type-1034",
+   "self_type" : "type-1096",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -33640,8 +33688,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-1070",
-   "self_type" : "type-1069",
+   "referenced_type" : "type-1073",
+   "self_type" : "type-1072",
    "size" : 168,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -33650,8 +33698,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-1220",
-   "self_type" : "type-1219",
+   "referenced_type" : "type-1224",
+   "self_type" : "type-1223",
    "size" : 168,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -33660,8 +33708,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-1531",
-   "self_type" : "type-1530",
+   "referenced_type" : "type-1534",
+   "self_type" : "type-1533",
    "size" : 168,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -33670,8 +33718,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-1672",
-   "self_type" : "type-1671",
+   "referenced_type" : "type-1676",
+   "self_type" : "type-1675",
    "size" : 168,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -33680,8 +33728,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-3442",
-   "self_type" : "type-3441",
+   "referenced_type" : "type-3445",
+   "self_type" : "type-3444",
    "size" : 168,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -33690,8 +33738,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-3634",
-   "self_type" : "type-3633",
+   "referenced_type" : "type-3637",
+   "self_type" : "type-3636",
    "size" : 168,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -33700,8 +33748,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-3683",
-   "self_type" : "type-3682",
+   "referenced_type" : "type-3689",
+   "self_type" : "type-3688",
    "size" : 168,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -33710,8 +33758,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-3792",
-   "self_type" : "type-3791",
+   "referenced_type" : "type-3799",
+   "self_type" : "type-3798",
    "size" : 168,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -33720,8 +33768,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-4041",
-   "self_type" : "type-4040",
+   "referenced_type" : "type-4048",
+   "self_type" : "type-4047",
    "size" : 168,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -33730,8 +33778,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-4127",
-   "self_type" : "type-4126",
+   "referenced_type" : "type-4133",
+   "self_type" : "type-4132",
    "size" : 168,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -33740,8 +33788,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-5363",
-   "self_type" : "type-5362",
+   "referenced_type" : "type-5369",
+   "self_type" : "type-5368",
    "size" : 168,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -33750,8 +33798,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-5555",
-   "self_type" : "type-5554",
+   "referenced_type" : "type-5561",
+   "self_type" : "type-5560",
    "size" : 168,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -33760,8 +33808,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-5604",
-   "self_type" : "type-5603",
+   "referenced_type" : "type-5613",
+   "self_type" : "type-5612",
    "size" : 168,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -33770,8 +33818,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-5713",
-   "self_type" : "type-5712",
+   "referenced_type" : "type-5723",
+   "self_type" : "type-5722",
    "size" : 168,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -33780,8 +33828,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-5962",
-   "self_type" : "type-5961",
+   "referenced_type" : "type-5972",
+   "self_type" : "type-5971",
    "size" : 168,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -33790,8 +33838,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-6048",
-   "self_type" : "type-6047",
+   "referenced_type" : "type-6057",
+   "self_type" : "type-6056",
    "size" : 168,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -33810,8 +33858,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-7679",
-   "self_type" : "type-7678",
+   "referenced_type" : "type-7700",
+   "self_type" : "type-7699",
    "size" : 168,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -33820,8 +33868,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-7871",
-   "self_type" : "type-7870",
+   "referenced_type" : "type-7892",
+   "self_type" : "type-7891",
    "size" : 168,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -33830,8 +33878,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-7920",
-   "self_type" : "type-7919",
+   "referenced_type" : "type-7944",
+   "self_type" : "type-7943",
    "size" : 168,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -33840,8 +33888,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-8029",
-   "self_type" : "type-8028",
+   "referenced_type" : "type-8054",
+   "self_type" : "type-8053",
    "size" : 168,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -33850,8 +33898,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-8283",
-   "self_type" : "type-8282",
+   "referenced_type" : "type-8307",
+   "self_type" : "type-8306",
    "size" : 168,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -33860,8 +33908,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-8442",
-   "self_type" : "type-8441",
+   "referenced_type" : "type-8466",
+   "self_type" : "type-8465",
    "size" : 168,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -33870,8 +33918,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-8484",
-   "self_type" : "type-8483",
+   "referenced_type" : "type-8511",
+   "self_type" : "type-8510",
    "size" : 168,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -33880,8 +33928,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-8575",
-   "self_type" : "type-8574",
+   "referenced_type" : "type-8602",
+   "self_type" : "type-8601",
    "size" : 168,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -33890,8 +33938,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-8793",
-   "self_type" : "type-8792",
+   "referenced_type" : "type-8820",
+   "self_type" : "type-8819",
    "size" : 168,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -33900,8 +33948,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-8875",
-   "self_type" : "type-8874",
+   "referenced_type" : "type-8902",
+   "self_type" : "type-8901",
    "size" : 168,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -33920,8 +33968,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferQueueCore",
    "name" : "const android::BufferQueueCore",
-   "referenced_type" : "type-3522",
-   "self_type" : "type-3521",
+   "referenced_type" : "type-3525",
+   "self_type" : "type-3524",
    "size" : 3928,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33930,8 +33978,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferQueueCore",
    "name" : "const android::BufferQueueCore",
-   "referenced_type" : "type-5443",
-   "self_type" : "type-5442",
+   "referenced_type" : "type-5449",
+   "self_type" : "type-5448",
    "size" : 3928,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33940,8 +33988,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferQueueCore",
    "name" : "const android::BufferQueueCore",
-   "referenced_type" : "type-7759",
-   "self_type" : "type-7758",
+   "referenced_type" : "type-7780",
+   "self_type" : "type-7779",
    "size" : 3928,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33960,8 +34008,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferQueueCore",
    "name" : "const android::BufferQueueCore",
-   "referenced_type" : "type-8345",
-   "self_type" : "type-8344",
+   "referenced_type" : "type-8369",
+   "self_type" : "type-8368",
    "size" : 3928,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33971,7 +34019,7 @@
    "linker_set_key" : "const android::ComponentWrapper",
    "name" : "const android::ComponentWrapper",
    "referenced_type" : "type-569",
-   "self_type" : "type-2494",
+   "self_type" : "type-2497",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33980,8 +34028,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::CompositorTiming",
    "name" : "const android::CompositorTiming",
-   "referenced_type" : "type-1425",
-   "self_type" : "type-1424",
+   "referenced_type" : "type-1428",
+   "self_type" : "type-1427",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -33990,8 +34038,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::CompositorTiming",
    "name" : "const android::CompositorTiming",
-   "referenced_type" : "type-3953",
-   "self_type" : "type-3952",
+   "referenced_type" : "type-3961",
+   "self_type" : "type-3960",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -34000,8 +34048,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::CompositorTiming",
    "name" : "const android::CompositorTiming",
-   "referenced_type" : "type-5874",
-   "self_type" : "type-5873",
+   "referenced_type" : "type-5885",
+   "self_type" : "type-5884",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -34010,8 +34058,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::CompositorTiming",
    "name" : "const android::CompositorTiming",
-   "referenced_type" : "type-8708",
-   "self_type" : "type-8707",
+   "referenced_type" : "type-8735",
+   "self_type" : "type-8734",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -34020,8 +34068,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ConsumerListener",
    "name" : "const android::ConsumerListener",
-   "referenced_type" : "type-3514",
-   "self_type" : "type-3513",
+   "referenced_type" : "type-3517",
+   "self_type" : "type-3516",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34030,8 +34078,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ConsumerListener",
    "name" : "const android::ConsumerListener",
-   "referenced_type" : "type-5435",
-   "self_type" : "type-5434",
+   "referenced_type" : "type-5441",
+   "self_type" : "type-5440",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34040,8 +34088,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ConsumerListener",
    "name" : "const android::ConsumerListener",
-   "referenced_type" : "type-7751",
-   "self_type" : "type-7750",
+   "referenced_type" : "type-7772",
+   "self_type" : "type-7771",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34060,8 +34108,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ConsumerListener",
    "name" : "const android::ConsumerListener",
-   "referenced_type" : "type-8340",
-   "self_type" : "type-8339",
+   "referenced_type" : "type-8364",
+   "self_type" : "type-8363",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34070,8 +34118,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-1310",
-   "self_type" : "type-1309",
+   "referenced_type" : "type-1313",
+   "self_type" : "type-1312",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34080,8 +34128,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-2531",
-   "self_type" : "type-2530",
+   "referenced_type" : "type-2534",
+   "self_type" : "type-2533",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34090,8 +34138,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-3449",
-   "self_type" : "type-3448",
+   "referenced_type" : "type-3452",
+   "self_type" : "type-3451",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34100,8 +34148,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-3594",
-   "self_type" : "type-3593",
+   "referenced_type" : "type-3597",
+   "self_type" : "type-3596",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34110,8 +34158,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-3860",
-   "self_type" : "type-3859",
+   "referenced_type" : "type-3866",
+   "self_type" : "type-3865",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34120,8 +34168,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-4423",
-   "self_type" : "type-4422",
+   "referenced_type" : "type-4429",
+   "self_type" : "type-4428",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34130,8 +34178,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-4673",
-   "self_type" : "type-4672",
+   "referenced_type" : "type-4680",
+   "self_type" : "type-4679",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34140,8 +34188,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-4942",
-   "self_type" : "type-4941",
+   "referenced_type" : "type-4948",
+   "self_type" : "type-4947",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34150,8 +34198,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-5370",
-   "self_type" : "type-5369",
+   "referenced_type" : "type-5376",
+   "self_type" : "type-5375",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34160,8 +34208,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-5515",
-   "self_type" : "type-5514",
+   "referenced_type" : "type-5521",
+   "self_type" : "type-5520",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34170,8 +34218,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-5781",
-   "self_type" : "type-5780",
+   "referenced_type" : "type-5790",
+   "self_type" : "type-5789",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34180,8 +34228,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-6320",
-   "self_type" : "type-6319",
+   "referenced_type" : "type-6329",
+   "self_type" : "type-6328",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34190,8 +34238,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-6554",
-   "self_type" : "type-6553",
+   "referenced_type" : "type-6564",
+   "self_type" : "type-6563",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34200,8 +34248,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-7050",
-   "self_type" : "type-7049",
+   "referenced_type" : "type-7055",
+   "self_type" : "type-7054",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34220,8 +34268,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-7686",
-   "self_type" : "type-7685",
+   "referenced_type" : "type-7707",
+   "self_type" : "type-7706",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34230,8 +34278,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-7831",
-   "self_type" : "type-7830",
+   "referenced_type" : "type-7852",
+   "self_type" : "type-7851",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34240,8 +34288,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-8097",
-   "self_type" : "type-8096",
+   "referenced_type" : "type-8121",
+   "self_type" : "type-8120",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34250,8 +34298,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-8177",
-   "self_type" : "type-8176",
+   "referenced_type" : "type-8201",
+   "self_type" : "type-8200",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34260,8 +34308,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-8288",
-   "self_type" : "type-8287",
+   "referenced_type" : "type-8313",
+   "self_type" : "type-8312",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34270,8 +34318,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-8416",
-   "self_type" : "type-8415",
+   "referenced_type" : "type-8440",
+   "self_type" : "type-8439",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34280,8 +34328,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-8617",
-   "self_type" : "type-8616",
+   "referenced_type" : "type-8644",
+   "self_type" : "type-8643",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34290,8 +34338,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-9189",
-   "self_type" : "type-9188",
+   "referenced_type" : "type-9217",
+   "self_type" : "type-9216",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34310,8 +34358,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-9366",
-   "self_type" : "type-9365",
+   "referenced_type" : "type-9393",
+   "self_type" : "type-9392",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34320,8 +34368,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-9476",
-   "self_type" : "type-9475",
+   "referenced_type" : "type-9503",
+   "self_type" : "type-9502",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34330,8 +34378,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot::State",
    "name" : "const android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-4580",
-   "self_type" : "type-4579",
+   "referenced_type" : "type-4586",
+   "self_type" : "type-4585",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -34340,8 +34388,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot::State",
    "name" : "const android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-4748",
-   "self_type" : "type-4747",
+   "referenced_type" : "type-4755",
+   "self_type" : "type-4754",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -34350,8 +34398,8 @@
    "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",
+   "referenced_type" : "type-6473",
+   "self_type" : "type-6472",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -34360,8 +34408,8 @@
    "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",
+   "referenced_type" : "type-6626",
+   "self_type" : "type-6625",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -34370,8 +34418,8 @@
    "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",
+   "referenced_type" : "type-9406",
+   "self_type" : "type-9405",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -34380,8 +34428,8 @@
    "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",
+   "referenced_type" : "type-9552",
+   "self_type" : "type-9551",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -34390,7 +34438,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::FileDescriptor::Autoclose",
    "name" : "const android::FileDescriptor::Autoclose",
-   "referenced_type" : "type-1204",
+   "referenced_type" : "type-1203",
    "self_type" : "type-1221",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h"
@@ -34401,7 +34449,7 @@
    "linker_set_key" : "const android::Flattenable<android::BufferItem>",
    "name" : "const android::Flattenable<android::BufferItem>",
    "referenced_type" : "type-21",
-   "self_type" : "type-1506",
+   "self_type" : "type-1509",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -34411,7 +34459,7 @@
    "linker_set_key" : "const android::Flattenable<android::Fence>",
    "name" : "const android::Flattenable<android::Fence>",
    "referenced_type" : "type-16",
-   "self_type" : "type-1634",
+   "self_type" : "type-1638",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -34421,7 +34469,7 @@
    "linker_set_key" : "const android::Flattenable<android::FrameEventHistoryDelta>",
    "name" : "const android::Flattenable<android::FrameEventHistoryDelta>",
    "referenced_type" : "type-25",
-   "self_type" : "type-4306",
+   "self_type" : "type-4312",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -34431,7 +34479,7 @@
    "linker_set_key" : "const android::Flattenable<android::GraphicBuffer>",
    "name" : "const android::Flattenable<android::GraphicBuffer>",
    "referenced_type" : "type-14",
-   "self_type" : "type-1638",
+   "self_type" : "type-1643",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -34441,7 +34489,7 @@
    "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
    "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
    "referenced_type" : "type-32",
-   "self_type" : "type-4309",
+   "self_type" : "type-4315",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -34451,7 +34499,7 @@
    "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
    "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
    "referenced_type" : "type-34",
-   "self_type" : "type-4312",
+   "self_type" : "type-4318",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -34461,7 +34509,7 @@
    "linker_set_key" : "const android::FrameDropper",
    "name" : "const android::FrameDropper",
    "referenced_type" : "type-580",
-   "self_type" : "type-2508",
+   "self_type" : "type-2511",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34470,8 +34518,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-1347",
-   "self_type" : "type-1346",
+   "referenced_type" : "type-1350",
+   "self_type" : "type-1349",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34480,8 +34528,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-1462",
-   "self_type" : "type-1461",
+   "referenced_type" : "type-1466",
+   "self_type" : "type-1465",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34490,8 +34538,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-2404",
-   "self_type" : "type-2403",
+   "referenced_type" : "type-2407",
+   "self_type" : "type-2406",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34500,8 +34548,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-3455",
-   "self_type" : "type-3454",
+   "referenced_type" : "type-3458",
+   "self_type" : "type-3457",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34510,8 +34558,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-3599",
-   "self_type" : "type-3598",
+   "referenced_type" : "type-3602",
+   "self_type" : "type-3601",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34520,8 +34568,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-3899",
-   "self_type" : "type-3898",
+   "referenced_type" : "type-3905",
+   "self_type" : "type-3904",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34530,8 +34578,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-3992",
-   "self_type" : "type-3991",
+   "referenced_type" : "type-3998",
+   "self_type" : "type-3997",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34540,8 +34588,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-4219",
-   "self_type" : "type-4218",
+   "referenced_type" : "type-4225",
+   "self_type" : "type-4224",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34550,8 +34598,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-4839",
-   "self_type" : "type-4838",
+   "referenced_type" : "type-4841",
+   "self_type" : "type-4840",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34560,8 +34608,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-5376",
-   "self_type" : "type-5375",
+   "referenced_type" : "type-5382",
+   "self_type" : "type-5381",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34570,8 +34618,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-5520",
-   "self_type" : "type-5519",
+   "referenced_type" : "type-5526",
+   "self_type" : "type-5525",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34580,8 +34628,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-5820",
-   "self_type" : "type-5819",
+   "referenced_type" : "type-5829",
+   "self_type" : "type-5828",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34590,8 +34638,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-5913",
-   "self_type" : "type-5912",
+   "referenced_type" : "type-5922",
+   "self_type" : "type-5921",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34600,8 +34648,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-6140",
-   "self_type" : "type-6139",
+   "referenced_type" : "type-6149",
+   "self_type" : "type-6148",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34610,8 +34658,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-6703",
-   "self_type" : "type-6702",
+   "referenced_type" : "type-6708",
+   "self_type" : "type-6707",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34630,8 +34678,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-7692",
-   "self_type" : "type-7691",
+   "referenced_type" : "type-7713",
+   "self_type" : "type-7712",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34640,8 +34688,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-7836",
-   "self_type" : "type-7835",
+   "referenced_type" : "type-7857",
+   "self_type" : "type-7856",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34650,8 +34698,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-8136",
-   "self_type" : "type-8135",
+   "referenced_type" : "type-8160",
+   "self_type" : "type-8159",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34660,8 +34708,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-8153",
-   "self_type" : "type-8152",
+   "referenced_type" : "type-8177",
+   "self_type" : "type-8176",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34670,8 +34718,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-8294",
-   "self_type" : "type-8293",
+   "referenced_type" : "type-8318",
+   "self_type" : "type-8317",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34680,8 +34728,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-8421",
-   "self_type" : "type-8420",
+   "referenced_type" : "type-8445",
+   "self_type" : "type-8444",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34690,8 +34738,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-8654",
-   "self_type" : "type-8653",
+   "referenced_type" : "type-8681",
+   "self_type" : "type-8680",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34700,8 +34748,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-8742",
-   "self_type" : "type-8741",
+   "referenced_type" : "type-8769",
+   "self_type" : "type-8768",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34710,8 +34758,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-8986",
-   "self_type" : "type-8985",
+   "referenced_type" : "type-9013",
+   "self_type" : "type-9012",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34720,8 +34768,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-8997",
-   "self_type" : "type-8996",
+   "referenced_type" : "type-9024",
+   "self_type" : "type-9023",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34741,7 +34789,7 @@
    "linker_set_key" : "const android::GraphicBufferSource",
    "name" : "const android::GraphicBufferSource",
    "referenced_type" : "type-566",
-   "self_type" : "type-2546",
+   "self_type" : "type-2549",
    "size" : 280,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34771,7 +34819,7 @@
    "linker_set_key" : "const android::IBinder",
    "name" : "const android::IBinder",
    "referenced_type" : "type-51",
-   "self_type" : "type-1520",
+   "self_type" : "type-1524",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34781,7 +34829,7 @@
    "linker_set_key" : "const android::IBinder::DeathRecipient",
    "name" : "const android::IBinder::DeathRecipient",
    "referenced_type" : "type-174",
-   "self_type" : "type-4315",
+   "self_type" : "type-4321",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -34790,8 +34838,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-1156",
-   "self_type" : "type-1155",
+   "referenced_type" : "type-1159",
+   "self_type" : "type-1158",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34800,8 +34848,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-1581",
-   "self_type" : "type-1580",
+   "referenced_type" : "type-1585",
+   "self_type" : "type-1584",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34810,8 +34858,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-3612",
-   "self_type" : "type-3611",
+   "referenced_type" : "type-3615",
+   "self_type" : "type-3614",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34820,8 +34868,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-3761",
-   "self_type" : "type-3760",
+   "referenced_type" : "type-3767",
+   "self_type" : "type-3766",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34830,8 +34878,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-4061",
-   "self_type" : "type-4060",
+   "referenced_type" : "type-4067",
+   "self_type" : "type-4066",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34840,8 +34888,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-5533",
-   "self_type" : "type-5532",
+   "referenced_type" : "type-5539",
+   "self_type" : "type-5538",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34850,8 +34898,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-5682",
-   "self_type" : "type-5681",
+   "referenced_type" : "type-5691",
+   "self_type" : "type-5690",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34860,8 +34908,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-5982",
-   "self_type" : "type-5981",
+   "referenced_type" : "type-5991",
+   "self_type" : "type-5990",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34870,8 +34918,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-7849",
-   "self_type" : "type-7848",
+   "referenced_type" : "type-7870",
+   "self_type" : "type-7869",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34880,8 +34928,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-7998",
-   "self_type" : "type-7997",
+   "referenced_type" : "type-8022",
+   "self_type" : "type-8021",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34890,8 +34938,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-8427",
-   "self_type" : "type-8426",
+   "referenced_type" : "type-8451",
+   "self_type" : "type-8450",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34900,8 +34948,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-8551",
-   "self_type" : "type-8550",
+   "referenced_type" : "type-8578",
+   "self_type" : "type-8577",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34910,8 +34958,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-8810",
-   "self_type" : "type-8809",
+   "referenced_type" : "type-8837",
+   "self_type" : "type-8836",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34930,8 +34978,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-1605",
-   "self_type" : "type-1604",
+   "referenced_type" : "type-1609",
+   "self_type" : "type-1608",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34940,8 +34988,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-2502",
-   "self_type" : "type-2501",
+   "referenced_type" : "type-2505",
+   "self_type" : "type-2504",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34950,8 +34998,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-3495",
-   "self_type" : "type-3494",
+   "referenced_type" : "type-3498",
+   "self_type" : "type-3497",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34960,8 +35008,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-4078",
-   "self_type" : "type-4077",
+   "referenced_type" : "type-4084",
+   "self_type" : "type-4083",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34970,8 +35018,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-4915",
-   "self_type" : "type-4914",
+   "referenced_type" : "type-4921",
+   "self_type" : "type-4920",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34980,8 +35028,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-5416",
-   "self_type" : "type-5415",
+   "referenced_type" : "type-5422",
+   "self_type" : "type-5421",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34990,8 +35038,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-5999",
-   "self_type" : "type-5998",
+   "referenced_type" : "type-6008",
+   "self_type" : "type-6007",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35000,8 +35048,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-6941",
-   "self_type" : "type-6940",
+   "referenced_type" : "type-6948",
+   "self_type" : "type-6947",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35010,8 +35058,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-7732",
-   "self_type" : "type-7731",
+   "referenced_type" : "type-7753",
+   "self_type" : "type-7752",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35030,8 +35078,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-8170",
-   "self_type" : "type-8169",
+   "referenced_type" : "type-8194",
+   "self_type" : "type-8193",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35040,8 +35088,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-8326",
-   "self_type" : "type-8325",
+   "referenced_type" : "type-8350",
+   "self_type" : "type-8349",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35050,8 +35098,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-8825",
-   "self_type" : "type-8824",
+   "referenced_type" : "type-8852",
+   "self_type" : "type-8851",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35060,8 +35108,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-9311",
-   "self_type" : "type-9310",
+   "referenced_type" : "type-9338",
+   "self_type" : "type-9337",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35070,8 +35118,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferProducer",
    "name" : "const android::IGraphicBufferProducer",
-   "referenced_type" : "type-3505",
-   "self_type" : "type-3504",
+   "referenced_type" : "type-3508",
+   "self_type" : "type-3507",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35080,8 +35128,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferProducer",
    "name" : "const android::IGraphicBufferProducer",
-   "referenced_type" : "type-4248",
-   "self_type" : "type-4247",
+   "referenced_type" : "type-4254",
+   "self_type" : "type-4253",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35090,8 +35138,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferProducer",
    "name" : "const android::IGraphicBufferProducer",
-   "referenced_type" : "type-5426",
-   "self_type" : "type-5425",
+   "referenced_type" : "type-5432",
+   "self_type" : "type-5431",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35100,8 +35148,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferProducer",
    "name" : "const android::IGraphicBufferProducer",
-   "referenced_type" : "type-6163",
-   "self_type" : "type-6162",
+   "referenced_type" : "type-6172",
+   "self_type" : "type-6171",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35110,8 +35158,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferProducer",
    "name" : "const android::IGraphicBufferProducer",
-   "referenced_type" : "type-7742",
-   "self_type" : "type-7741",
+   "referenced_type" : "type-7763",
+   "self_type" : "type-7762",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35130,8 +35178,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferProducer",
    "name" : "const android::IGraphicBufferProducer",
-   "referenced_type" : "type-8335",
-   "self_type" : "type-8334",
+   "referenced_type" : "type-8359",
+   "self_type" : "type-8358",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35140,8 +35188,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferProducer",
    "name" : "const android::IGraphicBufferProducer",
-   "referenced_type" : "type-9020",
-   "self_type" : "type-9019",
+   "referenced_type" : "type-9047",
+   "self_type" : "type-9046",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35150,8 +35198,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-1161",
-   "self_type" : "type-1160",
+   "referenced_type" : "type-1032",
+   "self_type" : "type-1031",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35160,8 +35208,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-3624",
-   "self_type" : "type-3623",
+   "referenced_type" : "type-1164",
+   "self_type" : "type-1163",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35170,8 +35218,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-3766",
-   "self_type" : "type-3765",
+   "referenced_type" : "type-3627",
+   "self_type" : "type-3626",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35180,8 +35228,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-4254",
-   "self_type" : "type-4253",
+   "referenced_type" : "type-3671",
+   "self_type" : "type-3670",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35190,8 +35238,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-4450",
-   "self_type" : "type-4449",
+   "referenced_type" : "type-3772",
+   "self_type" : "type-3771",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35200,8 +35248,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-4690",
-   "self_type" : "type-4689",
+   "referenced_type" : "type-4260",
+   "self_type" : "type-4259",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35210,8 +35258,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-5545",
-   "self_type" : "type-5544",
+   "referenced_type" : "type-4456",
+   "self_type" : "type-4455",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35220,8 +35268,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-5687",
-   "self_type" : "type-5686",
+   "referenced_type" : "type-4697",
+   "self_type" : "type-4696",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35230,8 +35278,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-6169",
-   "self_type" : "type-6168",
+   "referenced_type" : "type-5551",
+   "self_type" : "type-5550",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35240,8 +35288,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-6347",
-   "self_type" : "type-6346",
+   "referenced_type" : "type-5595",
+   "self_type" : "type-5594",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35250,8 +35298,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-6570",
-   "self_type" : "type-6569",
+   "referenced_type" : "type-5696",
+   "self_type" : "type-5695",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35260,8 +35308,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-7861",
-   "self_type" : "type-7860",
+   "referenced_type" : "type-6178",
+   "self_type" : "type-6177",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35270,8 +35318,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-8003",
-   "self_type" : "type-8002",
+   "referenced_type" : "type-6356",
+   "self_type" : "type-6355",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35280,8 +35328,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-8434",
-   "self_type" : "type-8433",
+   "referenced_type" : "type-6580",
+   "self_type" : "type-6579",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35290,8 +35338,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-8556",
-   "self_type" : "type-8555",
+   "referenced_type" : "type-7882",
+   "self_type" : "type-7881",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35300,8 +35348,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-9026",
-   "self_type" : "type-9025",
+   "referenced_type" : "type-7926",
+   "self_type" : "type-7925",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35310,8 +35358,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-9219",
-   "self_type" : "type-9218",
+   "referenced_type" : "type-8027",
+   "self_type" : "type-8026",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35320,8 +35368,58 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-9489",
-   "self_type" : "type-9488",
+   "referenced_type" : "type-8458",
+   "self_type" : "type-8457",
+   "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-8502",
+   "self_type" : "type-8501",
+   "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-8583",
+   "self_type" : "type-8582",
+   "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-9053",
+   "self_type" : "type-9052",
+   "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-9247",
+   "self_type" : "type-9246",
+   "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-9516",
+   "self_type" : "type-9515",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35361,7 +35459,7 @@
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect>",
    "name" : "const android::LightFlattenablePod<android::Rect>",
    "referenced_type" : "type-46",
-   "self_type" : "type-4587",
+   "self_type" : "type-4593",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -35380,8 +35478,8 @@
    "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",
+   "referenced_type" : "type-1214",
+   "self_type" : "type-1233",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -35391,7 +35489,7 @@
    "linker_set_key" : "const android::LightRefBase<android::NativeHandle>",
    "name" : "const android::LightRefBase<android::NativeHandle>",
    "referenced_type" : "type-521",
-   "self_type" : "type-2663",
+   "self_type" : "type-2666",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -35540,8 +35638,8 @@
    "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",
+   "referenced_type" : "type-1520",
+   "self_type" : "type-1523",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -35550,8 +35648,8 @@
    "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",
+   "referenced_type" : "type-1662",
+   "self_type" : "type-1666",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -35560,8 +35658,8 @@
    "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",
+   "referenced_type" : "type-4334",
+   "self_type" : "type-4337",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -35570,8 +35668,8 @@
    "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",
+   "referenced_type" : "type-1657",
+   "self_type" : "type-1660",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -35580,8 +35678,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-4333",
-   "self_type" : "type-4336",
+   "referenced_type" : "type-4339",
+   "self_type" : "type-4343",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -35590,8 +35688,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-4338",
-   "self_type" : "type-4341",
+   "referenced_type" : "type-4345",
+   "self_type" : "type-4348",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -35620,8 +35718,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-1216",
-   "self_type" : "type-1215",
+   "referenced_type" : "type-1219",
+   "self_type" : "type-1218",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35630,8 +35728,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-1491",
-   "self_type" : "type-1490",
+   "referenced_type" : "type-1494",
+   "self_type" : "type-1493",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35640,8 +35738,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-1622",
-   "self_type" : "type-1621",
+   "referenced_type" : "type-1625",
+   "self_type" : "type-1624",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35650,8 +35748,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-2684",
-   "self_type" : "type-2683",
+   "referenced_type" : "type-2687",
+   "self_type" : "type-2686",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35660,8 +35758,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-3467",
-   "self_type" : "type-3466",
+   "referenced_type" : "type-3470",
+   "self_type" : "type-3469",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -35670,8 +35768,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-3788",
-   "self_type" : "type-3787",
+   "referenced_type" : "type-3794",
+   "self_type" : "type-3793",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35680,8 +35778,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4012",
-   "self_type" : "type-4011",
+   "referenced_type" : "type-4018",
+   "self_type" : "type-4017",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35690,8 +35788,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4091",
-   "self_type" : "type-4090",
+   "referenced_type" : "type-4097",
+   "self_type" : "type-4096",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35700,8 +35798,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4293",
-   "self_type" : "type-4292",
+   "referenced_type" : "type-4299",
+   "self_type" : "type-4298",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35710,8 +35808,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4573",
-   "self_type" : "type-4572",
+   "referenced_type" : "type-4579",
+   "self_type" : "type-4578",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35720,8 +35818,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4737",
-   "self_type" : "type-4736",
+   "referenced_type" : "type-4744",
+   "self_type" : "type-4743",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35730,8 +35828,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-5020",
-   "self_type" : "type-5019",
+   "referenced_type" : "type-5026",
+   "self_type" : "type-5025",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35740,8 +35838,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-5388",
-   "self_type" : "type-5387",
+   "referenced_type" : "type-5394",
+   "self_type" : "type-5393",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -35750,8 +35848,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-5709",
-   "self_type" : "type-5708",
+   "referenced_type" : "type-5718",
+   "self_type" : "type-5717",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35760,8 +35858,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-5933",
-   "self_type" : "type-5932",
+   "referenced_type" : "type-5942",
+   "self_type" : "type-5941",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35770,8 +35868,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-6012",
-   "self_type" : "type-6011",
+   "referenced_type" : "type-6021",
+   "self_type" : "type-6020",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35780,8 +35878,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-6202",
-   "self_type" : "type-6201",
+   "referenced_type" : "type-6211",
+   "self_type" : "type-6210",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35790,8 +35888,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-6457",
-   "self_type" : "type-6456",
+   "referenced_type" : "type-6466",
+   "self_type" : "type-6465",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35800,8 +35898,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-6606",
-   "self_type" : "type-6605",
+   "referenced_type" : "type-6616",
+   "self_type" : "type-6615",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35810,8 +35908,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-6837",
-   "self_type" : "type-6836",
+   "referenced_type" : "type-6847",
+   "self_type" : "type-6846",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35820,8 +35918,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-6991",
-   "self_type" : "type-6990",
+   "referenced_type" : "type-7000",
+   "self_type" : "type-6999",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35830,8 +35928,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-7222",
-   "self_type" : "type-7221",
+   "referenced_type" : "type-7231",
+   "self_type" : "type-7230",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35840,8 +35938,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-7242",
-   "self_type" : "type-7241",
+   "referenced_type" : "type-7263",
+   "self_type" : "type-7262",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35860,8 +35958,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-7704",
-   "self_type" : "type-7703",
+   "referenced_type" : "type-7725",
+   "self_type" : "type-7724",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -35870,8 +35968,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-8025",
-   "self_type" : "type-8024",
+   "referenced_type" : "type-8049",
+   "self_type" : "type-8048",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35880,8 +35978,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-8207",
-   "self_type" : "type-8206",
+   "referenced_type" : "type-8231",
+   "self_type" : "type-8230",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35890,8 +35988,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-8306",
-   "self_type" : "type-8305",
+   "referenced_type" : "type-8330",
+   "self_type" : "type-8329",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -35900,8 +35998,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-8571",
-   "self_type" : "type-8570",
+   "referenced_type" : "type-8598",
+   "self_type" : "type-8597",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35910,8 +36008,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-8761",
-   "self_type" : "type-8760",
+   "referenced_type" : "type-8789",
+   "self_type" : "type-8788",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35920,8 +36018,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-8840",
-   "self_type" : "type-8839",
+   "referenced_type" : "type-8867",
+   "self_type" : "type-8866",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35930,8 +36028,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-9058",
-   "self_type" : "type-9057",
+   "referenced_type" : "type-9086",
+   "self_type" : "type-9085",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35940,8 +36038,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-9369",
-   "self_type" : "type-9368",
+   "referenced_type" : "type-9397",
+   "self_type" : "type-9396",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35950,8 +36048,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-9516",
-   "self_type" : "type-9515",
+   "referenced_type" : "type-9543",
+   "self_type" : "type-9542",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35960,8 +36058,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-9740",
-   "self_type" : "type-9739",
+   "referenced_type" : "type-9767",
+   "self_type" : "type-9766",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35970,8 +36068,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-9841",
-   "self_type" : "type-9840",
+   "referenced_type" : "type-9864",
+   "self_type" : "type-9863",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35981,7 +36079,7 @@
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
    "referenced_type" : "type-52",
-   "self_type" : "type-1449",
+   "self_type" : "type-1452",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -35990,8 +36088,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SafeBpInterface<android::IConsumerListener>",
    "name" : "const android::SafeBpInterface<android::IConsumerListener>",
-   "referenced_type" : "type-1537",
-   "self_type" : "type-1551",
+   "referenced_type" : "type-1541",
+   "self_type" : "type-1554",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -36000,8 +36098,8 @@
    "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",
+   "referenced_type" : "type-1720",
+   "self_type" : "type-1890",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -36010,8 +36108,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SafeInterface::ParcelHandler",
    "name" : "const android::SafeInterface::ParcelHandler",
-   "referenced_type" : "type-1235",
-   "self_type" : "type-1256",
+   "referenced_type" : "type-1238",
+   "self_type" : "type-1254",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -36021,7 +36119,7 @@
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
    "name" : "const android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
    "referenced_type" : "type-159",
-   "self_type" : "type-2675",
+   "self_type" : "type-2678",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -36031,7 +36129,7 @@
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "const android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "referenced_type" : "type-146",
-   "self_type" : "type-2671",
+   "self_type" : "type-2674",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -36041,7 +36139,7 @@
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "const android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
    "referenced_type" : "type-139",
-   "self_type" : "type-2667",
+   "self_type" : "type-2670",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -36050,8 +36148,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-1239",
-   "self_type" : "type-1248",
+   "referenced_type" : "type-1242",
+   "self_type" : "type-1251",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -36061,7 +36159,7 @@
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
    "referenced_type" : "type-121",
-   "self_type" : "type-1875",
+   "self_type" : "type-1879",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -36071,7 +36169,7 @@
    "linker_set_key" : "const android::Vector<android::BufferItem>",
    "name" : "const android::Vector<android::BufferItem>",
    "referenced_type" : "type-837",
-   "self_type" : "type-977",
+   "self_type" : "type-979",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -36080,8 +36178,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<android::Rect>",
    "name" : "const android::Vector<android::Rect>",
-   "referenced_type" : "type-2677",
-   "self_type" : "type-2679",
+   "referenced_type" : "type-2680",
+   "self_type" : "type-2682",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -36090,8 +36188,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",
+   "referenced_type" : "type-1228",
+   "self_type" : "type-1231",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -36100,8 +36198,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<int>",
    "name" : "const android::Vector<int>",
-   "referenced_type" : "type-2686",
-   "self_type" : "type-2688",
+   "referenced_type" : "type-2689",
+   "self_type" : "type-2691",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -36110,8 +36208,8 @@
    "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",
+   "referenced_type" : "type-1084",
+   "self_type" : "type-1086",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -36121,7 +36219,7 @@
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
    "referenced_type" : "type-141",
-   "self_type" : "type-2664",
+   "self_type" : "type-2667",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -36130,8 +36228,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::base::ErrnoRestorer",
    "name" : "const android::base::ErrnoRestorer",
-   "referenced_type" : "type-4656",
-   "self_type" : "type-4655",
+   "referenced_type" : "type-4663",
+   "self_type" : "type-4662",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -36140,8 +36238,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
-   "referenced_type" : "type-2553",
-   "self_type" : "type-2580",
+   "referenced_type" : "type-2556",
+   "self_type" : "type-2583",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -36160,8 +36258,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::BpHwRefBase",
    "name" : "const android::hardware::BpHwRefBase",
-   "referenced_type" : "type-1371",
-   "self_type" : "type-1374",
+   "referenced_type" : "type-1374",
+   "self_type" : "type-1377",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -36170,8 +36268,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1377",
-   "self_type" : "type-1385",
+   "referenced_type" : "type-1380",
+   "self_type" : "type-1388",
    "size" : 68,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -36180,8 +36278,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-6770",
-   "self_type" : "type-6923",
+   "referenced_type" : "type-6779",
+   "self_type" : "type-6932",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -36190,26 +36288,6 @@
    "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,
@@ -36218,8 +36296,8 @@
   {
    "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> >",
+   "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-4494",
    "self_type" : "type-4498",
    "size" : 28,
@@ -36228,10 +36306,30 @@
   {
    "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-4371",
+   "self_type" : "type-4375",
+   "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-4500",
+   "self_type" : "type-4504",
+   "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-4353",
-   "self_type" : "type-4357",
+   "referenced_type" : "type-4359",
+   "self_type" : "type-4363",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -36241,7 +36339,7 @@
    "linker_set_key" : "const android::hardware::Return<int>",
    "name" : "const android::hardware::Return<int>",
    "referenced_type" : "type-413",
-   "self_type" : "type-4698",
+   "self_type" : "type-4704",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -36250,8 +36348,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",
+   "referenced_type" : "type-6783",
+   "self_type" : "type-6935",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -36321,7 +36419,7 @@
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned char>",
    "name" : "const android::hardware::details::hidl_pointer<unsigned char>",
    "referenced_type" : "type-390",
-   "self_type" : "type-4348",
+   "self_type" : "type-4354",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -36351,7 +36449,7 @@
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming",
    "referenced_type" : "type-588",
-   "self_type" : "type-4582",
+   "self_type" : "type-4588",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -36390,8 +36488,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-2456",
-   "self_type" : "type-2460",
+   "referenced_type" : "type-2459",
+   "self_type" : "type-2463",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -36621,7 +36719,7 @@
    "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",
+   "self_type" : "type-4732",
    "size" : 64,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -36711,7 +36809,7 @@
    "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",
+   "self_type" : "type-4386",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -36771,7 +36869,7 @@
    "linker_set_key" : "const android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "const android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "referenced_type" : "type-160",
-   "self_type" : "type-2619",
+   "self_type" : "type-2622",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -36781,7 +36879,7 @@
    "linker_set_key" : "const android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "name" : "const android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "referenced_type" : "type-147",
-   "self_type" : "type-2617",
+   "self_type" : "type-2620",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -36791,7 +36889,7 @@
    "linker_set_key" : "const android::key_value_pair_t<unsigned int, unsigned int>",
    "name" : "const android::key_value_pair_t<unsigned int, unsigned int>",
    "referenced_type" : "type-143",
-   "self_type" : "type-2613",
+   "self_type" : "type-2616",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -36799,40 +36897,40 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer>",
    "name" : "const android::sp<ANativeWindowBuffer>",
-   "referenced_type" : "type-2410",
-   "self_type" : "type-2409",
+   "referenced_type" : "type-2413",
+   "self_type" : "type-2412",
    "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",
+   "referenced_type" : "type-4852",
+   "self_type" : "type-4851",
    "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",
+   "referenced_type" : "type-6719",
+   "self_type" : "type-6718",
    "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",
+   "referenced_type" : "type-8179",
+   "self_type" : "type-8178",
    "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",
+   "referenced_type" : "type-9017",
+   "self_type" : "type-9016",
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
   {
@@ -36841,7 +36939,7 @@
    "linker_set_key" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
    "name" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
    "referenced_type" : "type-581",
-   "self_type" : "type-1304",
+   "self_type" : "type-1301",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -36861,7 +36959,7 @@
    "linker_set_key" : "const android::sp<android::AMessage>",
    "name" : "const android::sp<android::AMessage>",
    "referenced_type" : "type-259",
-   "self_type" : "type-2175",
+   "self_type" : "type-2174",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -36870,8 +36968,8 @@
    "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",
+   "referenced_type" : "type-4234",
+   "self_type" : "type-4233",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -36880,8 +36978,8 @@
    "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",
+   "referenced_type" : "type-4460",
+   "self_type" : "type-4522",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -36901,7 +36999,7 @@
    "linker_set_key" : "const android::sp<android::ComponentWrapper>",
    "name" : "const android::sp<android::ComponentWrapper>",
    "referenced_type" : "type-567",
-   "self_type" : "type-2491",
+   "self_type" : "type-2494",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -36920,8 +37018,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::Fence>",
    "name" : "const android::sp<android::Fence>",
-   "referenced_type" : "type-1864",
-   "self_type" : "type-1863",
+   "referenced_type" : "type-1868",
+   "self_type" : "type-1867",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -36931,7 +37029,7 @@
    "linker_set_key" : "const android::sp<android::FrameDropper>",
    "name" : "const android::sp<android::FrameDropper>",
    "referenced_type" : "type-578",
-   "self_type" : "type-2506",
+   "self_type" : "type-2509",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -36941,7 +37039,7 @@
    "linker_set_key" : "const android::sp<android::GraphicBuffer>",
    "name" : "const android::sp<android::GraphicBuffer>",
    "referenced_type" : "type-733",
-   "self_type" : "type-1196",
+   "self_type" : "type-1200",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -36960,8 +37058,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::GraphicBufferSource>",
    "name" : "const android::sp<android::GraphicBufferSource>",
-   "referenced_type" : "type-2542",
-   "self_type" : "type-2544",
+   "referenced_type" : "type-2545",
+   "self_type" : "type-2547",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -36970,8 +37068,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-4259",
-   "self_type" : "type-4264",
+   "referenced_type" : "type-4265",
+   "self_type" : "type-4270",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -36980,8 +37078,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-4268",
-   "self_type" : "type-4273",
+   "referenced_type" : "type-4274",
+   "self_type" : "type-4279",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -36990,8 +37088,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-4827",
-   "self_type" : "type-4826",
+   "referenced_type" : "type-4833",
+   "self_type" : "type-4832",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -37000,8 +37098,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-7029",
-   "self_type" : "type-7028",
+   "referenced_type" : "type-7038",
+   "self_type" : "type-7037",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -37011,7 +37109,7 @@
    "linker_set_key" : "const android::sp<android::IBinder::DeathRecipient>",
    "name" : "const android::sp<android::IBinder::DeathRecipient>",
    "referenced_type" : "type-843",
-   "self_type" : "type-4300",
+   "self_type" : "type-4306",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -37021,7 +37119,7 @@
    "linker_set_key" : "const android::sp<android::IBinder>",
    "name" : "const android::sp<android::IBinder>",
    "referenced_type" : "type-795",
-   "self_type" : "type-1036",
+   "self_type" : "type-1040",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -37051,7 +37149,7 @@
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer>",
    "name" : "const android::sp<android::IGraphicBufferProducer>",
    "referenced_type" : "type-570",
-   "self_type" : "type-2485",
+   "self_type" : "type-2488",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -37061,7 +37159,7 @@
    "linker_set_key" : "const android::sp<android::IInterface>",
    "name" : "const android::sp<android::IInterface>",
    "referenced_type" : "type-646",
-   "self_type" : "type-1487",
+   "self_type" : "type-1491",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -37080,8 +37178,8 @@
    "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",
+   "referenced_type" : "type-1044",
+   "self_type" : "type-1049",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -37100,8 +37198,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",
+   "referenced_type" : "type-1262",
+   "self_type" : "type-1261",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -37110,8 +37208,8 @@
    "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",
+   "referenced_type" : "type-1370",
+   "self_type" : "type-1392",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -37120,8 +37218,8 @@
    "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",
+   "referenced_type" : "type-1397",
+   "self_type" : "type-1396",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -37130,8 +37228,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-2463",
-   "self_type" : "type-2468",
+   "referenced_type" : "type-2466",
+   "self_type" : "type-2471",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -37140,8 +37238,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener>",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener>",
-   "referenced_type" : "type-2454",
-   "self_type" : "type-2458",
+   "referenced_type" : "type-2457",
+   "self_type" : "type-2461",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -37150,8 +37248,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-4240",
-   "self_type" : "type-4239",
+   "referenced_type" : "type-4246",
+   "self_type" : "type-4245",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -37160,8 +37258,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-4466",
-   "self_type" : "type-4469",
+   "referenced_type" : "type-4473",
+   "self_type" : "type-4476",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -37170,8 +37268,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-2476",
-   "self_type" : "type-2482",
+   "referenced_type" : "type-2479",
+   "self_type" : "type-2485",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -37180,8 +37278,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener>",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener>",
-   "referenced_type" : "type-2470",
-   "self_type" : "type-2474",
+   "referenced_type" : "type-2473",
+   "self_type" : "type-2477",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -37190,8 +37288,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-4234",
-   "self_type" : "type-4233",
+   "referenced_type" : "type-4240",
+   "self_type" : "type-4239",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -37200,8 +37298,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-4459",
-   "self_type" : "type-4462",
+   "referenced_type" : "type-4466",
+   "self_type" : "type-4469",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -37220,8 +37318,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-2444",
-   "self_type" : "type-2446",
+   "referenced_type" : "type-2447",
+   "self_type" : "type-2449",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -37230,8 +37328,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification>",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification>",
-   "referenced_type" : "type-2448",
-   "self_type" : "type-2451",
+   "referenced_type" : "type-2451",
+   "self_type" : "type-2454",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -37271,7 +37369,7 @@
    "linker_set_key" : "const android::wp<android::IBinder::DeathRecipient>",
    "name" : "const android::wp<android::IBinder::DeathRecipient>",
    "referenced_type" : "type-172",
-   "self_type" : "type-4289",
+   "self_type" : "type-4296",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -37281,7 +37379,7 @@
    "linker_set_key" : "const android::wp<android::IBinder>",
    "name" : "const android::wp<android::IBinder>",
    "referenced_type" : "type-130",
-   "self_type" : "type-4280",
+   "self_type" : "type-4286",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -37291,7 +37389,7 @@
    "linker_set_key" : "const android_cta861_3_metadata",
    "name" : "const android_cta861_3_metadata",
    "referenced_type" : "type-305",
-   "self_type" : "type-1473",
+   "self_type" : "type-1477",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -37311,7 +37409,7 @@
    "linker_set_key" : "const android_smpte2086_metadata",
    "name" : "const android_smpte2086_metadata",
    "referenced_type" : "type-304",
-   "self_type" : "type-1471",
+   "self_type" : "type-1474",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -37341,7 +37439,7 @@
    "linker_set_key" : "const char *const",
    "name" : "const char *const",
    "referenced_type" : "type-122",
-   "self_type" : "type-1103",
+   "self_type" : "type-1106",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -37350,8 +37448,8 @@
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-1242",
-   "self_type" : "type-1241",
+   "referenced_type" : "type-1245",
+   "self_type" : "type-1244",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -37361,7 +37459,7 @@
    "linker_set_key" : "const double",
    "name" : "const double",
    "referenced_type" : "type-269",
-   "self_type" : "type-1077",
+   "self_type" : "type-1080",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -37397,64 +37495,64 @@
    "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-1113",
+   "self_type" : "type-1112",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1282",
-   "self_type" : "type-1281",
+   "referenced_type" : "type-1285",
+   "self_type" : "type-1284",
    "source_file" : "/system/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",
+   "referenced_type" : "type-3310",
+   "self_type" : "type-3309",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3539",
-   "self_type" : "type-3538",
+   "referenced_type" : "type-3542",
+   "self_type" : "type-3541",
    "source_file" : "/system/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",
+   "referenced_type" : "type-3651",
+   "self_type" : "type-3650",
    "source_file" : "/system/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",
+   "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-3833",
-   "self_type" : "type-3832",
+   "referenced_type" : "type-3839",
+   "self_type" : "type-3838",
    "source_file" : "/system/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",
+   "referenced_type" : "type-4379",
+   "self_type" : "type-4378",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -37469,272 +37567,272 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-4502",
-   "self_type" : "type-4501",
+   "referenced_type" : "type-4508",
+   "self_type" : "type-4507",
    "source_file" : "/system/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",
+   "referenced_type" : "type-4545",
+   "self_type" : "type-4544",
    "source_file" : "/system/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",
+   "referenced_type" : "type-4570",
+   "self_type" : "type-4569",
    "source_file" : "/system/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",
+   "referenced_type" : "type-4724",
+   "self_type" : "type-4723",
    "source_file" : "/system/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",
+   "referenced_type" : "type-4854",
+   "self_type" : "type-4853",
    "source_file" : "/system/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",
+   "referenced_type" : "type-5234",
+   "self_type" : "type-5233",
    "source_file" : "/system/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",
+   "referenced_type" : "type-5466",
+   "self_type" : "type-5465",
    "source_file" : "/system/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",
+   "referenced_type" : "type-5575",
+   "self_type" : "type-5574",
    "source_file" : "/system/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",
+   "referenced_type" : "type-5641",
+   "self_type" : "type-5640",
    "source_file" : "/system/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",
+   "referenced_type" : "type-5763",
+   "self_type" : "type-5762",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6279",
+   "self_type" : "type-6278",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6395",
+   "self_type" : "type-6394",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6432",
+   "self_type" : "type-6431",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6457",
+   "self_type" : "type-6456",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6600",
+   "self_type" : "type-6599",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6721",
+   "self_type" : "type-6720",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6748",
+   "self_type" : "type-6747",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6793",
+   "self_type" : "type-6792",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6882",
+   "self_type" : "type-6881",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6945",
+   "self_type" : "type-6944",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7060",
+   "self_type" : "type-7059",
    "source_file" : "/system/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",
+   "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-7285",
-   "self_type" : "type-7284",
+   "referenced_type" : "type-7305",
+   "self_type" : "type-7304",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7358",
+   "self_type" : "type-7357",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7565",
+   "self_type" : "type-7564",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7797",
+   "self_type" : "type-7796",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7906",
+   "self_type" : "type-7905",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7972",
+   "self_type" : "type-7971",
    "source_file" : "/system/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",
+   "referenced_type" : "type-8094",
+   "self_type" : "type-8093",
    "source_file" : "/system/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",
+   "referenced_type" : "type-8250",
+   "self_type" : "type-8249",
    "source_file" : "/system/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",
+   "referenced_type" : "type-8386",
+   "self_type" : "type-8385",
    "source_file" : "/system/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",
+   "referenced_type" : "type-8482",
+   "self_type" : "type-8481",
    "source_file" : "/system/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",
+   "referenced_type" : "type-8529",
+   "self_type" : "type-8528",
    "source_file" : "/system/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",
+   "referenced_type" : "type-8621",
+   "self_type" : "type-8620",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -37749,80 +37847,80 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-9132",
-   "self_type" : "type-9131",
+   "referenced_type" : "type-9160",
+   "self_type" : "type-9159",
    "source_file" : "/system/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",
+   "referenced_type" : "type-9294",
+   "self_type" : "type-9293",
    "source_file" : "/system/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",
+   "referenced_type" : "type-9347",
+   "self_type" : "type-9346",
    "source_file" : "/system/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",
+   "referenced_type" : "type-9383",
+   "self_type" : "type-9382",
    "source_file" : "/system/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",
+   "referenced_type" : "type-9532",
+   "self_type" : "type-9531",
    "source_file" : "/system/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",
+   "referenced_type" : "type-9632",
+   "self_type" : "type-9631",
    "source_file" : "/system/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",
+   "referenced_type" : "type-9670",
+   "self_type" : "type-9669",
    "source_file" : "/system/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",
+   "referenced_type" : "type-9721",
+   "self_type" : "type-9720",
    "source_file" : "/system/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",
+   "referenced_type" : "type-9801",
+   "self_type" : "type-9800",
    "source_file" : "/system/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",
+   "referenced_type" : "type-9866",
+   "self_type" : "type-9865",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -37830,8 +37928,8 @@
    "is_const" : true,
    "linker_set_key" : "const log_msg",
    "name" : "const log_msg",
-   "referenced_type" : "type-2177",
-   "self_type" : "type-2313",
+   "referenced_type" : "type-2180",
+   "self_type" : "type-2316",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -37880,8 +37978,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-1314",
-   "self_type" : "type-1313",
+   "referenced_type" : "type-1318",
+   "self_type" : "type-1317",
    "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"
   },
@@ -37890,8 +37988,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-3392",
-   "self_type" : "type-3391",
+   "referenced_type" : "type-3395",
+   "self_type" : "type-3394",
    "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"
   },
@@ -37900,8 +37998,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-3562",
-   "self_type" : "type-3561",
+   "referenced_type" : "type-3565",
+   "self_type" : "type-3564",
    "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"
   },
@@ -37910,8 +38008,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-3864",
-   "self_type" : "type-3863",
+   "referenced_type" : "type-3871",
+   "self_type" : "type-3870",
    "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"
   },
@@ -37920,8 +38018,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-4413",
-   "self_type" : "type-4412",
+   "referenced_type" : "type-4421",
+   "self_type" : "type-4420",
    "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"
   },
@@ -37930,8 +38028,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-4624",
-   "self_type" : "type-4623",
+   "referenced_type" : "type-4630",
+   "self_type" : "type-4629",
    "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"
   },
@@ -37940,8 +38038,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-4794",
-   "self_type" : "type-4793",
+   "referenced_type" : "type-4800",
+   "self_type" : "type-4799",
    "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"
   },
@@ -37950,8 +38048,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-5313",
-   "self_type" : "type-5312",
+   "referenced_type" : "type-5319",
+   "self_type" : "type-5318",
    "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"
   },
@@ -37960,8 +38058,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-5483",
-   "self_type" : "type-5482",
+   "referenced_type" : "type-5489",
+   "self_type" : "type-5488",
    "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"
   },
@@ -37970,8 +38068,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-5785",
-   "self_type" : "type-5784",
+   "referenced_type" : "type-5795",
+   "self_type" : "type-5794",
    "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"
   },
@@ -37990,8 +38088,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-6310",
-   "self_type" : "type-6309",
+   "referenced_type" : "type-6321",
+   "self_type" : "type-6320",
    "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"
   },
@@ -38000,8 +38098,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-6508",
-   "self_type" : "type-6507",
+   "referenced_type" : "type-6517",
+   "self_type" : "type-6516",
    "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"
   },
@@ -38010,8 +38108,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-6660",
-   "self_type" : "type-6659",
+   "referenced_type" : "type-6669",
+   "self_type" : "type-6668",
    "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"
   },
@@ -38020,8 +38118,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-6864",
-   "self_type" : "type-6863",
+   "referenced_type" : "type-6875",
+   "self_type" : "type-6874",
    "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"
   },
@@ -38030,8 +38128,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-7017",
-   "self_type" : "type-7016",
+   "referenced_type" : "type-7027",
+   "self_type" : "type-7026",
    "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"
   },
@@ -38040,8 +38138,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-7131",
-   "self_type" : "type-7130",
+   "referenced_type" : "type-7141",
+   "self_type" : "type-7140",
    "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"
   },
@@ -38050,8 +38148,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-7264",
-   "self_type" : "type-7263",
+   "referenced_type" : "type-7284",
+   "self_type" : "type-7283",
    "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"
   },
@@ -38060,8 +38158,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-7362",
-   "self_type" : "type-7361",
+   "referenced_type" : "type-7384",
+   "self_type" : "type-7383",
    "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"
   },
@@ -38070,8 +38168,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-7629",
-   "self_type" : "type-7628",
+   "referenced_type" : "type-7650",
+   "self_type" : "type-7649",
    "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"
   },
@@ -38080,8 +38178,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-7799",
-   "self_type" : "type-7798",
+   "referenced_type" : "type-7820",
+   "self_type" : "type-7819",
    "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"
   },
@@ -38090,8 +38188,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-8101",
-   "self_type" : "type-8100",
+   "referenced_type" : "type-8126",
+   "self_type" : "type-8125",
    "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"
   },
@@ -38100,8 +38198,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-8253",
-   "self_type" : "type-8252",
+   "referenced_type" : "type-8277",
+   "self_type" : "type-8276",
    "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"
   },
@@ -38110,8 +38208,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-8385",
-   "self_type" : "type-8384",
+   "referenced_type" : "type-8409",
+   "self_type" : "type-8408",
    "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"
   },
@@ -38120,8 +38218,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-8621",
-   "self_type" : "type-8620",
+   "referenced_type" : "type-8649",
+   "self_type" : "type-8648",
    "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"
   },
@@ -38140,8 +38238,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-9178",
-   "self_type" : "type-9177",
+   "referenced_type" : "type-9208",
+   "self_type" : "type-9207",
    "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"
   },
@@ -38150,8 +38248,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-9427",
-   "self_type" : "type-9426",
+   "referenced_type" : "type-9456",
+   "self_type" : "type-9455",
    "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"
   },
@@ -38160,8 +38258,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-9562",
-   "self_type" : "type-9561",
+   "referenced_type" : "type-9589",
+   "self_type" : "type-9588",
    "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"
   },
@@ -38170,8 +38268,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-9765",
-   "self_type" : "type-9764",
+   "referenced_type" : "type-9792",
+   "self_type" : "type-9791",
    "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"
   },
@@ -38180,8 +38278,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-1312",
-   "self_type" : "type-1311",
+   "referenced_type" : "type-1315",
+   "self_type" : "type-1314",
    "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"
   },
@@ -38190,8 +38288,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-3390",
-   "self_type" : "type-3389",
+   "referenced_type" : "type-3393",
+   "self_type" : "type-3392",
    "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"
   },
@@ -38200,8 +38298,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-3560",
-   "self_type" : "type-3559",
+   "referenced_type" : "type-3563",
+   "self_type" : "type-3562",
    "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"
   },
@@ -38210,8 +38308,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-3862",
-   "self_type" : "type-3861",
+   "referenced_type" : "type-3868",
+   "self_type" : "type-3867",
    "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"
   },
@@ -38220,8 +38318,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-4411",
-   "self_type" : "type-4410",
+   "referenced_type" : "type-4419",
+   "self_type" : "type-4418",
    "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"
   },
@@ -38230,8 +38328,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-4622",
-   "self_type" : "type-4621",
+   "referenced_type" : "type-4628",
+   "self_type" : "type-4627",
    "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"
   },
@@ -38240,8 +38338,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-4792",
-   "self_type" : "type-4791",
+   "referenced_type" : "type-4798",
+   "self_type" : "type-4797",
    "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"
   },
@@ -38250,8 +38348,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-5311",
-   "self_type" : "type-5310",
+   "referenced_type" : "type-5317",
+   "self_type" : "type-5316",
    "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"
   },
@@ -38260,8 +38358,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-5481",
-   "self_type" : "type-5480",
+   "referenced_type" : "type-5487",
+   "self_type" : "type-5486",
    "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"
   },
@@ -38270,8 +38368,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-5783",
-   "self_type" : "type-5782",
+   "referenced_type" : "type-5792",
+   "self_type" : "type-5791",
    "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"
   },
@@ -38290,8 +38388,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-6308",
-   "self_type" : "type-6307",
+   "referenced_type" : "type-6319",
+   "self_type" : "type-6318",
    "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"
   },
@@ -38300,8 +38398,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-6506",
-   "self_type" : "type-6505",
+   "referenced_type" : "type-6515",
+   "self_type" : "type-6514",
    "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"
   },
@@ -38310,8 +38408,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-6658",
-   "self_type" : "type-6657",
+   "referenced_type" : "type-6667",
+   "self_type" : "type-6666",
    "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"
   },
@@ -38320,8 +38418,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-6862",
-   "self_type" : "type-6861",
+   "referenced_type" : "type-6873",
+   "self_type" : "type-6872",
    "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"
   },
@@ -38330,8 +38428,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-7014",
-   "self_type" : "type-7013",
+   "referenced_type" : "type-7023",
+   "self_type" : "type-7022",
    "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"
   },
@@ -38340,8 +38438,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-7129",
-   "self_type" : "type-7128",
+   "referenced_type" : "type-7139",
+   "self_type" : "type-7138",
    "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"
   },
@@ -38350,8 +38448,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-7262",
-   "self_type" : "type-7261",
+   "referenced_type" : "type-7282",
+   "self_type" : "type-7281",
    "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"
   },
@@ -38360,8 +38458,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-7360",
-   "self_type" : "type-7359",
+   "referenced_type" : "type-7382",
+   "self_type" : "type-7381",
    "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"
   },
@@ -38370,8 +38468,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-7627",
-   "self_type" : "type-7626",
+   "referenced_type" : "type-7648",
+   "self_type" : "type-7647",
    "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"
   },
@@ -38380,8 +38478,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-7797",
-   "self_type" : "type-7796",
+   "referenced_type" : "type-7818",
+   "self_type" : "type-7817",
    "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"
   },
@@ -38390,8 +38488,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-8099",
-   "self_type" : "type-8098",
+   "referenced_type" : "type-8123",
+   "self_type" : "type-8122",
    "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"
   },
@@ -38400,8 +38498,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-8251",
-   "self_type" : "type-8250",
+   "referenced_type" : "type-8275",
+   "self_type" : "type-8274",
    "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"
   },
@@ -38410,8 +38508,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-8383",
-   "self_type" : "type-8382",
+   "referenced_type" : "type-8407",
+   "self_type" : "type-8406",
    "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"
   },
@@ -38420,8 +38518,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-8619",
-   "self_type" : "type-8618",
+   "referenced_type" : "type-8646",
+   "self_type" : "type-8645",
    "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"
   },
@@ -38440,8 +38538,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-9176",
-   "self_type" : "type-9175",
+   "referenced_type" : "type-9206",
+   "self_type" : "type-9205",
    "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"
   },
@@ -38450,8 +38548,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-9424",
-   "self_type" : "type-9423",
+   "referenced_type" : "type-9454",
+   "self_type" : "type-9453",
    "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"
   },
@@ -38460,8 +38558,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-9560",
-   "self_type" : "type-9559",
+   "referenced_type" : "type-9587",
+   "self_type" : "type-9586",
    "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"
   },
@@ -38470,8 +38568,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-9763",
-   "self_type" : "type-9762",
+   "referenced_type" : "type-9790",
+   "self_type" : "type-9789",
    "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"
   },
@@ -38480,8 +38578,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-1321",
-   "self_type" : "type-1320",
+   "referenced_type" : "type-1324",
+   "self_type" : "type-1323",
    "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"
   },
@@ -38490,8 +38588,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-3404",
-   "self_type" : "type-3403",
+   "referenced_type" : "type-3407",
+   "self_type" : "type-3406",
    "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"
   },
@@ -38500,8 +38598,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-3568",
-   "self_type" : "type-3567",
+   "referenced_type" : "type-3571",
+   "self_type" : "type-3570",
    "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"
   },
@@ -38510,8 +38608,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-3872",
-   "self_type" : "type-3871",
+   "referenced_type" : "type-3878",
+   "self_type" : "type-3877",
    "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"
   },
@@ -38520,8 +38618,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-4421",
-   "self_type" : "type-4420",
+   "referenced_type" : "type-4427",
+   "self_type" : "type-4426",
    "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"
   },
@@ -38530,8 +38628,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-4630",
-   "self_type" : "type-4629",
+   "referenced_type" : "type-4636",
+   "self_type" : "type-4635",
    "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"
   },
@@ -38540,8 +38638,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-4800",
-   "self_type" : "type-4799",
+   "referenced_type" : "type-4806",
+   "self_type" : "type-4805",
    "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"
   },
@@ -38550,8 +38648,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-5325",
-   "self_type" : "type-5324",
+   "referenced_type" : "type-5331",
+   "self_type" : "type-5330",
    "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"
   },
@@ -38560,8 +38658,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-5489",
-   "self_type" : "type-5488",
+   "referenced_type" : "type-5495",
+   "self_type" : "type-5494",
    "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"
   },
@@ -38570,8 +38668,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-5793",
-   "self_type" : "type-5792",
+   "referenced_type" : "type-5802",
+   "self_type" : "type-5801",
    "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"
   },
@@ -38590,8 +38688,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-6318",
-   "self_type" : "type-6317",
+   "referenced_type" : "type-6327",
+   "self_type" : "type-6326",
    "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"
   },
@@ -38600,8 +38698,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-6514",
-   "self_type" : "type-6513",
+   "referenced_type" : "type-6523",
+   "self_type" : "type-6522",
    "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"
   },
@@ -38610,8 +38708,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-6666",
-   "self_type" : "type-6665",
+   "referenced_type" : "type-6675",
+   "self_type" : "type-6674",
    "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"
   },
@@ -38620,8 +38718,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-6793",
-   "self_type" : "type-6792",
+   "referenced_type" : "type-6803",
+   "self_type" : "type-6802",
    "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"
   },
@@ -38630,8 +38728,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-7023",
-   "self_type" : "type-7022",
+   "referenced_type" : "type-7033",
+   "self_type" : "type-7032",
    "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"
   },
@@ -38640,8 +38738,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-7138",
-   "self_type" : "type-7137",
+   "referenced_type" : "type-7147",
+   "self_type" : "type-7146",
    "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"
   },
@@ -38650,8 +38748,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-7270",
-   "self_type" : "type-7269",
+   "referenced_type" : "type-7290",
+   "self_type" : "type-7289",
    "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"
   },
@@ -38660,8 +38758,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-7369",
-   "self_type" : "type-7368",
+   "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"
   },
@@ -38670,8 +38768,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-7641",
-   "self_type" : "type-7640",
+   "referenced_type" : "type-7662",
+   "self_type" : "type-7661",
    "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"
   },
@@ -38680,8 +38778,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-7805",
-   "self_type" : "type-7804",
+   "referenced_type" : "type-7826",
+   "self_type" : "type-7825",
    "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"
   },
@@ -38690,8 +38788,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-8109",
-   "self_type" : "type-8108",
+   "referenced_type" : "type-8133",
+   "self_type" : "type-8132",
    "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"
   },
@@ -38700,8 +38798,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-8259",
-   "self_type" : "type-8258",
+   "referenced_type" : "type-8284",
+   "self_type" : "type-8283",
    "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"
   },
@@ -38710,8 +38808,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-8391",
-   "self_type" : "type-8390",
+   "referenced_type" : "type-8415",
+   "self_type" : "type-8414",
    "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"
   },
@@ -38720,8 +38818,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-8628",
-   "self_type" : "type-8627",
+   "referenced_type" : "type-8655",
+   "self_type" : "type-8654",
    "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"
   },
@@ -38740,8 +38838,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-9187",
-   "self_type" : "type-9186",
+   "referenced_type" : "type-9215",
+   "self_type" : "type-9214",
    "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"
   },
@@ -38750,8 +38848,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-9435",
-   "self_type" : "type-9434",
+   "referenced_type" : "type-9462",
+   "self_type" : "type-9461",
    "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"
   },
@@ -38760,8 +38858,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-9568",
-   "self_type" : "type-9567",
+   "referenced_type" : "type-9595",
+   "self_type" : "type-9594",
    "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"
   },
@@ -38770,8 +38868,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-9701",
-   "self_type" : "type-9700",
+   "referenced_type" : "type-9728",
+   "self_type" : "type-9727",
    "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"
   },
@@ -38780,8 +38878,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-1319",
-   "self_type" : "type-1318",
+   "referenced_type" : "type-1322",
+   "self_type" : "type-1321",
    "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"
   },
@@ -38790,8 +38888,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-3402",
-   "self_type" : "type-3401",
+   "referenced_type" : "type-3405",
+   "self_type" : "type-3404",
    "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"
   },
@@ -38800,8 +38898,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-3566",
-   "self_type" : "type-3565",
+   "referenced_type" : "type-3569",
+   "self_type" : "type-3568",
    "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"
   },
@@ -38810,8 +38908,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-3870",
-   "self_type" : "type-3869",
+   "referenced_type" : "type-3876",
+   "self_type" : "type-3875",
    "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"
   },
@@ -38820,8 +38918,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-4419",
-   "self_type" : "type-4418",
+   "referenced_type" : "type-4425",
+   "self_type" : "type-4424",
    "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"
   },
@@ -38830,8 +38928,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-4628",
-   "self_type" : "type-4627",
+   "referenced_type" : "type-4634",
+   "self_type" : "type-4633",
    "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"
   },
@@ -38840,8 +38938,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-4798",
-   "self_type" : "type-4797",
+   "referenced_type" : "type-4804",
+   "self_type" : "type-4803",
    "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"
   },
@@ -38850,8 +38948,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-5323",
-   "self_type" : "type-5322",
+   "referenced_type" : "type-5329",
+   "self_type" : "type-5328",
    "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"
   },
@@ -38860,8 +38958,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-5487",
-   "self_type" : "type-5486",
+   "referenced_type" : "type-5493",
+   "self_type" : "type-5492",
    "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"
   },
@@ -38870,8 +38968,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-5791",
-   "self_type" : "type-5790",
+   "referenced_type" : "type-5800",
+   "self_type" : "type-5799",
    "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"
   },
@@ -38890,8 +38988,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-6316",
-   "self_type" : "type-6315",
+   "referenced_type" : "type-6325",
+   "self_type" : "type-6324",
    "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"
   },
@@ -38900,8 +38998,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-6512",
-   "self_type" : "type-6511",
+   "referenced_type" : "type-6521",
+   "self_type" : "type-6520",
    "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"
   },
@@ -38910,8 +39008,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-6664",
-   "self_type" : "type-6663",
+   "referenced_type" : "type-6673",
+   "self_type" : "type-6672",
    "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"
   },
@@ -38920,8 +39018,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-6791",
-   "self_type" : "type-6790",
+   "referenced_type" : "type-6801",
+   "self_type" : "type-6800",
    "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"
   },
@@ -38930,8 +39028,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-7021",
-   "self_type" : "type-7020",
+   "referenced_type" : "type-7031",
+   "self_type" : "type-7030",
    "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"
   },
@@ -38940,8 +39038,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-7136",
-   "self_type" : "type-7135",
+   "referenced_type" : "type-7145",
+   "self_type" : "type-7144",
    "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"
   },
@@ -38950,8 +39048,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-7268",
-   "self_type" : "type-7267",
+   "referenced_type" : "type-7288",
+   "self_type" : "type-7287",
    "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"
   },
@@ -38960,8 +39058,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-7367",
-   "self_type" : "type-7366",
+   "referenced_type" : "type-7389",
+   "self_type" : "type-7388",
    "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"
   },
@@ -38970,8 +39068,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-7639",
-   "self_type" : "type-7638",
+   "referenced_type" : "type-7660",
+   "self_type" : "type-7659",
    "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"
   },
@@ -38980,8 +39078,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-7803",
-   "self_type" : "type-7802",
+   "referenced_type" : "type-7824",
+   "self_type" : "type-7823",
    "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"
   },
@@ -38990,8 +39088,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-8107",
-   "self_type" : "type-8106",
+   "referenced_type" : "type-8131",
+   "self_type" : "type-8130",
    "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"
   },
@@ -39000,8 +39098,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-8257",
-   "self_type" : "type-8256",
+   "referenced_type" : "type-8282",
+   "self_type" : "type-8281",
    "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"
   },
@@ -39010,8 +39108,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-8389",
-   "self_type" : "type-8388",
+   "referenced_type" : "type-8413",
+   "self_type" : "type-8412",
    "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"
   },
@@ -39020,8 +39118,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-8626",
-   "self_type" : "type-8625",
+   "referenced_type" : "type-8653",
+   "self_type" : "type-8652",
    "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"
   },
@@ -39040,8 +39138,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-9185",
-   "self_type" : "type-9184",
+   "referenced_type" : "type-9213",
+   "self_type" : "type-9212",
    "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"
   },
@@ -39050,8 +39148,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-9433",
-   "self_type" : "type-9432",
+   "referenced_type" : "type-9460",
+   "self_type" : "type-9459",
    "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"
   },
@@ -39060,8 +39158,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-9566",
-   "self_type" : "type-9565",
+   "referenced_type" : "type-9593",
+   "self_type" : "type-9592",
    "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"
   },
@@ -39070,8 +39168,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-9699",
-   "self_type" : "type-9698",
+   "referenced_type" : "type-9726",
+   "self_type" : "type-9725",
    "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"
   },
@@ -39080,8 +39178,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-1317",
-   "self_type" : "type-1316",
+   "referenced_type" : "type-1320",
+   "self_type" : "type-1319",
    "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"
   },
@@ -39090,8 +39188,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-3400",
-   "self_type" : "type-3399",
+   "referenced_type" : "type-3403",
+   "self_type" : "type-3402",
    "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"
   },
@@ -39100,8 +39198,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-3564",
-   "self_type" : "type-3563",
+   "referenced_type" : "type-3567",
+   "self_type" : "type-3566",
    "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"
   },
@@ -39110,8 +39208,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-3868",
-   "self_type" : "type-3867",
+   "referenced_type" : "type-3874",
+   "self_type" : "type-3873",
    "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"
   },
@@ -39120,8 +39218,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-4417",
-   "self_type" : "type-4416",
+   "referenced_type" : "type-4423",
+   "self_type" : "type-4422",
    "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"
   },
@@ -39130,8 +39228,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-4626",
-   "self_type" : "type-4625",
+   "referenced_type" : "type-4632",
+   "self_type" : "type-4631",
    "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"
   },
@@ -39140,8 +39238,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-4796",
-   "self_type" : "type-4795",
+   "referenced_type" : "type-4802",
+   "self_type" : "type-4801",
    "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"
   },
@@ -39150,8 +39248,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-5321",
-   "self_type" : "type-5320",
+   "referenced_type" : "type-5327",
+   "self_type" : "type-5326",
    "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"
   },
@@ -39160,8 +39258,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-5485",
-   "self_type" : "type-5484",
+   "referenced_type" : "type-5491",
+   "self_type" : "type-5490",
    "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"
   },
@@ -39170,8 +39268,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-5789",
-   "self_type" : "type-5788",
+   "referenced_type" : "type-5798",
+   "self_type" : "type-5797",
    "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"
   },
@@ -39190,8 +39288,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-6314",
-   "self_type" : "type-6313",
+   "referenced_type" : "type-6323",
+   "self_type" : "type-6322",
    "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"
   },
@@ -39200,8 +39298,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-6510",
-   "self_type" : "type-6509",
+   "referenced_type" : "type-6519",
+   "self_type" : "type-6518",
    "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"
   },
@@ -39210,8 +39308,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-6662",
-   "self_type" : "type-6661",
+   "referenced_type" : "type-6671",
+   "self_type" : "type-6670",
    "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"
   },
@@ -39220,8 +39318,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-6789",
-   "self_type" : "type-6788",
+   "referenced_type" : "type-6799",
+   "self_type" : "type-6798",
    "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"
   },
@@ -39230,8 +39328,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-7019",
-   "self_type" : "type-7018",
+   "referenced_type" : "type-7029",
+   "self_type" : "type-7028",
    "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"
   },
@@ -39240,8 +39338,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-7134",
-   "self_type" : "type-7133",
+   "referenced_type" : "type-7143",
+   "self_type" : "type-7142",
    "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"
   },
@@ -39250,8 +39348,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-7266",
-   "self_type" : "type-7265",
+   "referenced_type" : "type-7286",
+   "self_type" : "type-7285",
    "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"
   },
@@ -39260,8 +39358,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-7365",
-   "self_type" : "type-7364",
+   "referenced_type" : "type-7387",
+   "self_type" : "type-7386",
    "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"
   },
@@ -39270,8 +39368,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-7637",
-   "self_type" : "type-7636",
+   "referenced_type" : "type-7658",
+   "self_type" : "type-7657",
    "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"
   },
@@ -39280,8 +39378,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-7801",
-   "self_type" : "type-7800",
+   "referenced_type" : "type-7822",
+   "self_type" : "type-7821",
    "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"
   },
@@ -39290,8 +39388,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-8105",
-   "self_type" : "type-8104",
+   "referenced_type" : "type-8129",
+   "self_type" : "type-8128",
    "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"
   },
@@ -39300,8 +39398,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-8255",
-   "self_type" : "type-8254",
+   "referenced_type" : "type-8279",
+   "self_type" : "type-8278",
    "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"
   },
@@ -39310,8 +39408,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-8387",
-   "self_type" : "type-8386",
+   "referenced_type" : "type-8411",
+   "self_type" : "type-8410",
    "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"
   },
@@ -39320,8 +39418,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-8624",
-   "self_type" : "type-8623",
+   "referenced_type" : "type-8651",
+   "self_type" : "type-8650",
    "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"
   },
@@ -39340,8 +39438,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-9183",
-   "self_type" : "type-9182",
+   "referenced_type" : "type-9210",
+   "self_type" : "type-9209",
    "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"
   },
@@ -39350,8 +39448,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-9429",
-   "self_type" : "type-9428",
+   "referenced_type" : "type-9458",
+   "self_type" : "type-9457",
    "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"
   },
@@ -39360,8 +39458,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-9564",
-   "self_type" : "type-9563",
+   "referenced_type" : "type-9591",
+   "self_type" : "type-9590",
    "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"
   },
@@ -39370,8 +39468,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-9697",
-   "self_type" : "type-9696",
+   "referenced_type" : "type-9724",
+   "self_type" : "type-9723",
    "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"
   },
@@ -39380,8 +39478,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1119",
-   "self_type" : "type-1118",
+   "referenced_type" : "type-1122",
+   "self_type" : "type-1121",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39390,8 +39488,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1297",
-   "self_type" : "type-1296",
+   "referenced_type" : "type-1300",
+   "self_type" : "type-1299",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39400,8 +39498,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3374",
+   "self_type" : "type-3373",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39410,8 +39508,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3551",
+   "self_type" : "type-3550",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39420,8 +39518,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3728",
+   "self_type" : "type-3727",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39430,8 +39528,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3853",
+   "self_type" : "type-3852",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39440,8 +39538,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4405",
+   "self_type" : "type-4404",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39450,8 +39548,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4613",
+   "self_type" : "type-4612",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39460,8 +39558,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4786",
+   "self_type" : "type-4785",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39470,8 +39568,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5298",
+   "self_type" : "type-5297",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39480,8 +39578,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5475",
+   "self_type" : "type-5474",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39500,8 +39598,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5652",
+   "self_type" : "type-5651",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39510,8 +39608,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5777",
+   "self_type" : "type-5776",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39520,8 +39618,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6305",
+   "self_type" : "type-6304",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39530,8 +39628,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6500",
+   "self_type" : "type-6499",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39540,8 +39638,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6655",
+   "self_type" : "type-6654",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39550,8 +39648,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6808",
+   "self_type" : "type-6807",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39560,8 +39658,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6955",
+   "self_type" : "type-6954",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39570,8 +39668,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7126",
+   "self_type" : "type-7125",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39580,8 +39678,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7369",
+   "self_type" : "type-7368",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39590,8 +39688,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7629",
+   "self_type" : "type-7628",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39600,8 +39698,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7806",
+   "self_type" : "type-7805",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39610,8 +39708,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7983",
+   "self_type" : "type-7982",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39620,8 +39718,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8108",
+   "self_type" : "type-8107",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39630,8 +39728,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8262",
+   "self_type" : "type-8261",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39640,8 +39738,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8395",
+   "self_type" : "type-8394",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39650,8 +39748,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8542",
+   "self_type" : "type-8541",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39660,8 +39758,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8632",
+   "self_type" : "type-8631",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39670,8 +39768,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-872",
+   "self_type" : "type-871",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39680,8 +39778,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-9191",
+   "self_type" : "type-9190",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39690,8 +39788,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-9436",
+   "self_type" : "type-9435",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39700,8 +39798,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-9575",
+   "self_type" : "type-9574",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39710,8 +39808,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-9732",
+   "self_type" : "type-9731",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39720,8 +39818,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-9874",
+   "self_type" : "type-9873",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39730,8 +39828,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-1126",
-   "self_type" : "type-1125",
+   "referenced_type" : "type-1129",
+   "self_type" : "type-1128",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39740,8 +39838,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-1303",
-   "self_type" : "type-1302",
+   "referenced_type" : "type-1307",
+   "self_type" : "type-1306",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39750,8 +39848,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-3377",
-   "self_type" : "type-3376",
+   "referenced_type" : "type-3380",
+   "self_type" : "type-3379",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39760,8 +39858,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-3554",
-   "self_type" : "type-3553",
+   "referenced_type" : "type-3557",
+   "self_type" : "type-3556",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39770,8 +39868,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-3729",
-   "self_type" : "type-3728",
+   "referenced_type" : "type-3735",
+   "self_type" : "type-3734",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39780,8 +39878,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-3853",
-   "self_type" : "type-3852",
+   "referenced_type" : "type-3860",
+   "self_type" : "type-3859",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39790,8 +39888,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-4405",
-   "self_type" : "type-4404",
+   "referenced_type" : "type-4411",
+   "self_type" : "type-4410",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39800,8 +39898,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-4613",
-   "self_type" : "type-4612",
+   "referenced_type" : "type-4619",
+   "self_type" : "type-4618",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39810,8 +39908,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-4785",
-   "self_type" : "type-4784",
+   "referenced_type" : "type-4792",
+   "self_type" : "type-4791",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39820,8 +39918,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-5298",
-   "self_type" : "type-5297",
+   "referenced_type" : "type-5304",
+   "self_type" : "type-5303",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39830,8 +39928,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-5475",
-   "self_type" : "type-5474",
+   "referenced_type" : "type-5481",
+   "self_type" : "type-5480",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39850,8 +39948,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-5650",
-   "self_type" : "type-5649",
+   "referenced_type" : "type-5659",
+   "self_type" : "type-5658",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39860,8 +39958,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-5774",
-   "self_type" : "type-5773",
+   "referenced_type" : "type-5784",
+   "self_type" : "type-5783",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39870,8 +39968,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-6302",
-   "self_type" : "type-6301",
+   "referenced_type" : "type-6311",
+   "self_type" : "type-6310",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39880,8 +39978,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-6497",
-   "self_type" : "type-6496",
+   "referenced_type" : "type-6506",
+   "self_type" : "type-6505",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39890,8 +39988,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-6651",
-   "self_type" : "type-6650",
+   "referenced_type" : "type-6661",
+   "self_type" : "type-6660",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39900,8 +39998,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-6805",
-   "self_type" : "type-6804",
+   "referenced_type" : "type-6815",
+   "self_type" : "type-6814",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39910,8 +40008,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-6953",
-   "self_type" : "type-6952",
+   "referenced_type" : "type-6962",
+   "self_type" : "type-6961",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39920,8 +40018,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-7123",
-   "self_type" : "type-7122",
+   "referenced_type" : "type-7132",
+   "self_type" : "type-7131",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39930,8 +40028,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-7354",
-   "self_type" : "type-7353",
+   "referenced_type" : "type-7375",
+   "self_type" : "type-7374",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39940,8 +40038,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-7614",
-   "self_type" : "type-7613",
+   "referenced_type" : "type-7635",
+   "self_type" : "type-7634",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39950,8 +40048,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-7791",
-   "self_type" : "type-7790",
+   "referenced_type" : "type-7812",
+   "self_type" : "type-7811",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39960,8 +40058,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-7966",
-   "self_type" : "type-7965",
+   "referenced_type" : "type-7990",
+   "self_type" : "type-7989",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39970,8 +40068,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-8090",
-   "self_type" : "type-8089",
+   "referenced_type" : "type-8115",
+   "self_type" : "type-8114",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39980,8 +40078,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-8244",
-   "self_type" : "type-8243",
+   "referenced_type" : "type-8268",
+   "self_type" : "type-8267",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39990,8 +40088,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-8377",
-   "self_type" : "type-8376",
+   "referenced_type" : "type-8401",
+   "self_type" : "type-8400",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40000,8 +40098,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-8521",
-   "self_type" : "type-8520",
+   "referenced_type" : "type-8548",
+   "self_type" : "type-8547",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40010,8 +40108,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-8611",
-   "self_type" : "type-8610",
+   "referenced_type" : "type-8638",
+   "self_type" : "type-8637",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40030,8 +40128,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-9169",
-   "self_type" : "type-9168",
+   "referenced_type" : "type-9197",
+   "self_type" : "type-9196",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40040,8 +40138,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-9415",
-   "self_type" : "type-9414",
+   "referenced_type" : "type-9443",
+   "self_type" : "type-9442",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40050,8 +40148,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-9554",
-   "self_type" : "type-9553",
+   "referenced_type" : "type-9581",
+   "self_type" : "type-9580",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40060,8 +40158,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-9711",
-   "self_type" : "type-9710",
+   "referenced_type" : "type-9738",
+   "self_type" : "type-9737",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40070,8 +40168,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-9853",
-   "self_type" : "type-9852",
+   "referenced_type" : "type-9880",
+   "self_type" : "type-9879",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40080,8 +40178,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-1128",
-   "self_type" : "type-1127",
+   "referenced_type" : "type-1131",
+   "self_type" : "type-1130",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40090,8 +40188,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-1306",
-   "self_type" : "type-1305",
+   "referenced_type" : "type-1309",
+   "self_type" : "type-1308",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40100,8 +40198,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-3380",
-   "self_type" : "type-3379",
+   "referenced_type" : "type-3383",
+   "self_type" : "type-3382",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40110,8 +40208,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-3556",
-   "self_type" : "type-3555",
+   "referenced_type" : "type-3559",
+   "self_type" : "type-3558",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40120,8 +40218,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-3731",
-   "self_type" : "type-3730",
+   "referenced_type" : "type-3737",
+   "self_type" : "type-3736",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40130,8 +40228,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-3856",
-   "self_type" : "type-3855",
+   "referenced_type" : "type-3862",
+   "self_type" : "type-3861",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40140,8 +40238,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-4407",
-   "self_type" : "type-4406",
+   "referenced_type" : "type-4413",
+   "self_type" : "type-4412",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40150,8 +40248,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-4615",
-   "self_type" : "type-4614",
+   "referenced_type" : "type-4621",
+   "self_type" : "type-4620",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40160,8 +40258,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-4787",
-   "self_type" : "type-4786",
+   "referenced_type" : "type-4794",
+   "self_type" : "type-4793",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40170,8 +40268,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-5301",
-   "self_type" : "type-5300",
+   "referenced_type" : "type-5307",
+   "self_type" : "type-5306",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40180,8 +40278,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-5477",
-   "self_type" : "type-5476",
+   "referenced_type" : "type-5483",
+   "self_type" : "type-5482",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40200,8 +40298,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-5652",
-   "self_type" : "type-5651",
+   "referenced_type" : "type-5661",
+   "self_type" : "type-5660",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40210,8 +40308,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-5777",
-   "self_type" : "type-5776",
+   "referenced_type" : "type-5786",
+   "self_type" : "type-5785",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40220,8 +40318,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-6304",
-   "self_type" : "type-6303",
+   "referenced_type" : "type-6313",
+   "self_type" : "type-6312",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40230,8 +40328,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-6499",
-   "self_type" : "type-6498",
+   "referenced_type" : "type-6508",
+   "self_type" : "type-6507",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40240,8 +40338,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-6653",
-   "self_type" : "type-6652",
+   "referenced_type" : "type-6663",
+   "self_type" : "type-6662",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40250,8 +40348,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-6807",
-   "self_type" : "type-6806",
+   "referenced_type" : "type-6817",
+   "self_type" : "type-6816",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40260,8 +40358,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-6955",
-   "self_type" : "type-6954",
+   "referenced_type" : "type-6964",
+   "self_type" : "type-6963",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40270,8 +40368,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-7125",
-   "self_type" : "type-7124",
+   "referenced_type" : "type-7134",
+   "self_type" : "type-7133",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40280,8 +40378,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-7356",
-   "self_type" : "type-7355",
+   "referenced_type" : "type-7377",
+   "self_type" : "type-7376",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40290,8 +40388,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-7617",
-   "self_type" : "type-7616",
+   "referenced_type" : "type-7638",
+   "self_type" : "type-7637",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40300,8 +40398,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-7793",
-   "self_type" : "type-7792",
+   "referenced_type" : "type-7814",
+   "self_type" : "type-7813",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40310,8 +40408,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-7968",
-   "self_type" : "type-7967",
+   "referenced_type" : "type-7992",
+   "self_type" : "type-7991",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40320,8 +40418,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-8093",
-   "self_type" : "type-8092",
+   "referenced_type" : "type-8117",
+   "self_type" : "type-8116",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40330,8 +40428,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-8246",
-   "self_type" : "type-8245",
+   "referenced_type" : "type-8270",
+   "self_type" : "type-8269",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40340,8 +40438,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-8379",
-   "self_type" : "type-8378",
+   "referenced_type" : "type-8403",
+   "self_type" : "type-8402",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40350,8 +40448,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-8523",
-   "self_type" : "type-8522",
+   "referenced_type" : "type-8550",
+   "self_type" : "type-8549",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40360,8 +40458,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-8613",
-   "self_type" : "type-8612",
+   "referenced_type" : "type-8640",
+   "self_type" : "type-8639",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40380,8 +40478,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-9172",
-   "self_type" : "type-9171",
+   "referenced_type" : "type-9199",
+   "self_type" : "type-9198",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40390,8 +40488,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-9417",
-   "self_type" : "type-9416",
+   "referenced_type" : "type-9445",
+   "self_type" : "type-9444",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40400,8 +40498,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-9556",
-   "self_type" : "type-9555",
+   "referenced_type" : "type-9583",
+   "self_type" : "type-9582",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40410,8 +40508,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-9713",
-   "self_type" : "type-9712",
+   "referenced_type" : "type-9740",
+   "self_type" : "type-9739",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40420,8 +40518,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-9855",
-   "self_type" : "type-9854",
+   "referenced_type" : "type-9883",
+   "self_type" : "type-9882",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40430,8 +40528,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-1123",
-   "self_type" : "type-1122",
+   "referenced_type" : "type-1127",
+   "self_type" : "type-1126",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40440,8 +40538,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-1301",
-   "self_type" : "type-1300",
+   "referenced_type" : "type-1305",
+   "self_type" : "type-1304",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40450,8 +40548,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-3375",
-   "self_type" : "type-3374",
+   "referenced_type" : "type-3378",
+   "self_type" : "type-3377",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40460,8 +40558,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-3552",
-   "self_type" : "type-3551",
+   "referenced_type" : "type-3555",
+   "self_type" : "type-3554",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40470,8 +40568,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-3726",
-   "self_type" : "type-3725",
+   "referenced_type" : "type-3733",
+   "self_type" : "type-3732",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40480,8 +40578,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-3851",
-   "self_type" : "type-3850",
+   "referenced_type" : "type-3858",
+   "self_type" : "type-3857",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40490,8 +40588,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-4403",
-   "self_type" : "type-4402",
+   "referenced_type" : "type-4409",
+   "self_type" : "type-4408",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40500,8 +40598,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-4611",
-   "self_type" : "type-4610",
+   "referenced_type" : "type-4617",
+   "self_type" : "type-4616",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40510,8 +40608,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-4783",
-   "self_type" : "type-4782",
+   "referenced_type" : "type-4790",
+   "self_type" : "type-4789",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40520,8 +40618,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-5296",
-   "self_type" : "type-5295",
+   "referenced_type" : "type-5302",
+   "self_type" : "type-5301",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40530,8 +40628,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-5473",
-   "self_type" : "type-5472",
+   "referenced_type" : "type-5479",
+   "self_type" : "type-5478",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40550,8 +40648,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-5647",
-   "self_type" : "type-5646",
+   "referenced_type" : "type-5657",
+   "self_type" : "type-5656",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40560,8 +40658,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-5772",
-   "self_type" : "type-5771",
+   "referenced_type" : "type-5782",
+   "self_type" : "type-5781",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40570,8 +40668,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-6300",
-   "self_type" : "type-6299",
+   "referenced_type" : "type-6309",
+   "self_type" : "type-6308",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40580,8 +40678,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-6495",
-   "self_type" : "type-6494",
+   "referenced_type" : "type-6504",
+   "self_type" : "type-6503",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40590,8 +40688,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-6649",
-   "self_type" : "type-6648",
+   "referenced_type" : "type-6659",
+   "self_type" : "type-6658",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40600,8 +40698,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-6803",
-   "self_type" : "type-6802",
+   "referenced_type" : "type-6813",
+   "self_type" : "type-6812",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40610,8 +40708,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-6951",
-   "self_type" : "type-6950",
+   "referenced_type" : "type-6960",
+   "self_type" : "type-6959",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40620,8 +40718,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-7121",
-   "self_type" : "type-7120",
+   "referenced_type" : "type-7130",
+   "self_type" : "type-7129",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40630,8 +40728,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-7352",
-   "self_type" : "type-7351",
+   "referenced_type" : "type-7373",
+   "self_type" : "type-7372",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40640,8 +40738,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-7612",
-   "self_type" : "type-7611",
+   "referenced_type" : "type-7633",
+   "self_type" : "type-7632",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40650,8 +40748,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-7789",
-   "self_type" : "type-7788",
+   "referenced_type" : "type-7810",
+   "self_type" : "type-7809",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40660,8 +40758,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-7963",
-   "self_type" : "type-7962",
+   "referenced_type" : "type-7988",
+   "self_type" : "type-7987",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40670,8 +40768,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-8088",
-   "self_type" : "type-8087",
+   "referenced_type" : "type-8113",
+   "self_type" : "type-8112",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40680,8 +40778,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-8241",
-   "self_type" : "type-8240",
+   "referenced_type" : "type-8266",
+   "self_type" : "type-8265",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40690,8 +40788,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-8375",
-   "self_type" : "type-8374",
+   "referenced_type" : "type-8399",
+   "self_type" : "type-8398",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40700,8 +40798,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-8519",
-   "self_type" : "type-8518",
+   "referenced_type" : "type-8546",
+   "self_type" : "type-8545",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40710,8 +40808,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-8608",
-   "self_type" : "type-8607",
+   "referenced_type" : "type-8636",
+   "self_type" : "type-8635",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40730,8 +40828,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-9167",
-   "self_type" : "type-9166",
+   "referenced_type" : "type-9195",
+   "self_type" : "type-9194",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40740,8 +40838,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-9413",
-   "self_type" : "type-9412",
+   "referenced_type" : "type-9440",
+   "self_type" : "type-9439",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40750,8 +40848,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-9552",
-   "self_type" : "type-9551",
+   "referenced_type" : "type-9579",
+   "self_type" : "type-9578",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40760,8 +40858,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-9709",
-   "self_type" : "type-9708",
+   "referenced_type" : "type-9736",
+   "self_type" : "type-9735",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40770,8 +40868,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-9851",
-   "self_type" : "type-9850",
+   "referenced_type" : "type-9878",
+   "self_type" : "type-9877",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40780,8 +40878,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-1130",
-   "self_type" : "type-1129",
+   "referenced_type" : "type-1133",
+   "self_type" : "type-1132",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40790,8 +40888,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-1308",
-   "self_type" : "type-1307",
+   "referenced_type" : "type-1311",
+   "self_type" : "type-1310",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40800,8 +40898,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-3383",
-   "self_type" : "type-3382",
+   "referenced_type" : "type-3386",
+   "self_type" : "type-3385",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40810,8 +40908,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-3558",
-   "self_type" : "type-3557",
+   "referenced_type" : "type-3561",
+   "self_type" : "type-3560",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40820,8 +40918,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-3733",
-   "self_type" : "type-3732",
+   "referenced_type" : "type-3739",
+   "self_type" : "type-3738",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40830,8 +40928,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-3858",
-   "self_type" : "type-3857",
+   "referenced_type" : "type-3864",
+   "self_type" : "type-3863",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40840,8 +40938,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-4409",
-   "self_type" : "type-4408",
+   "referenced_type" : "type-4415",
+   "self_type" : "type-4414",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40850,8 +40948,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-4617",
-   "self_type" : "type-4616",
+   "referenced_type" : "type-4626",
+   "self_type" : "type-4625",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40860,8 +40958,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-4789",
-   "self_type" : "type-4788",
+   "referenced_type" : "type-4796",
+   "self_type" : "type-4795",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40870,8 +40968,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-5304",
-   "self_type" : "type-5303",
+   "referenced_type" : "type-5310",
+   "self_type" : "type-5309",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40880,8 +40978,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-5479",
-   "self_type" : "type-5478",
+   "referenced_type" : "type-5485",
+   "self_type" : "type-5484",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40890,8 +40988,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-5654",
-   "self_type" : "type-5653",
+   "referenced_type" : "type-5663",
+   "self_type" : "type-5662",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40900,8 +40998,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-5779",
-   "self_type" : "type-5778",
+   "referenced_type" : "type-5788",
+   "self_type" : "type-5787",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40920,8 +41018,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-6306",
-   "self_type" : "type-6305",
+   "referenced_type" : "type-6315",
+   "self_type" : "type-6314",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40930,8 +41028,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-6501",
-   "self_type" : "type-6500",
+   "referenced_type" : "type-6513",
+   "self_type" : "type-6512",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40940,8 +41038,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-6655",
-   "self_type" : "type-6654",
+   "referenced_type" : "type-6665",
+   "self_type" : "type-6664",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40950,8 +41048,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-6809",
-   "self_type" : "type-6808",
+   "referenced_type" : "type-6819",
+   "self_type" : "type-6818",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40960,8 +41058,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-6958",
-   "self_type" : "type-6957",
+   "referenced_type" : "type-6967",
+   "self_type" : "type-6966",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40970,8 +41068,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-7127",
-   "self_type" : "type-7126",
+   "referenced_type" : "type-7136",
+   "self_type" : "type-7135",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40980,8 +41078,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-7358",
-   "self_type" : "type-7357",
+   "referenced_type" : "type-7380",
+   "self_type" : "type-7379",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40990,8 +41088,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-7620",
-   "self_type" : "type-7619",
+   "referenced_type" : "type-7641",
+   "self_type" : "type-7640",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41000,8 +41098,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-7795",
-   "self_type" : "type-7794",
+   "referenced_type" : "type-7816",
+   "self_type" : "type-7815",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41010,8 +41108,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-7970",
-   "self_type" : "type-7969",
+   "referenced_type" : "type-7994",
+   "self_type" : "type-7993",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41020,8 +41118,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-8095",
-   "self_type" : "type-8094",
+   "referenced_type" : "type-8119",
+   "self_type" : "type-8118",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41030,8 +41128,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-8248",
-   "self_type" : "type-8247",
+   "referenced_type" : "type-8273",
+   "self_type" : "type-8272",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41040,8 +41138,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-8381",
-   "self_type" : "type-8380",
+   "referenced_type" : "type-8405",
+   "self_type" : "type-8404",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41050,8 +41148,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-8525",
-   "self_type" : "type-8524",
+   "referenced_type" : "type-8552",
+   "self_type" : "type-8551",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41060,8 +41158,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-8615",
-   "self_type" : "type-8614",
+   "referenced_type" : "type-8642",
+   "self_type" : "type-8641",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41080,8 +41178,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-9174",
-   "self_type" : "type-9173",
+   "referenced_type" : "type-9201",
+   "self_type" : "type-9200",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41090,8 +41188,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-9419",
-   "self_type" : "type-9418",
+   "referenced_type" : "type-9450",
+   "self_type" : "type-9449",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41100,8 +41198,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-9558",
-   "self_type" : "type-9557",
+   "referenced_type" : "type-9585",
+   "self_type" : "type-9584",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41110,8 +41208,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-9715",
-   "self_type" : "type-9714",
+   "referenced_type" : "type-9742",
+   "self_type" : "type-9741",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41120,8 +41218,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-9857",
-   "self_type" : "type-9856",
+   "referenced_type" : "type-9885",
+   "self_type" : "type-9884",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41130,8 +41228,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-1117",
-   "self_type" : "type-1116",
+   "referenced_type" : "type-1120",
+   "self_type" : "type-1119",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41140,8 +41238,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-1295",
-   "self_type" : "type-1294",
+   "referenced_type" : "type-1298",
+   "self_type" : "type-1297",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41150,8 +41248,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-3369",
-   "self_type" : "type-3368",
+   "referenced_type" : "type-3372",
+   "self_type" : "type-3371",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41160,8 +41258,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-3544",
-   "self_type" : "type-3543",
+   "referenced_type" : "type-3549",
+   "self_type" : "type-3548",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41170,8 +41268,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-3720",
-   "self_type" : "type-3719",
+   "referenced_type" : "type-3726",
+   "self_type" : "type-3725",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41180,8 +41278,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-3845",
-   "self_type" : "type-3844",
+   "referenced_type" : "type-3851",
+   "self_type" : "type-3850",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41190,8 +41288,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-4397",
-   "self_type" : "type-4396",
+   "referenced_type" : "type-4403",
+   "self_type" : "type-4402",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41200,8 +41298,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-4605",
-   "self_type" : "type-4604",
+   "referenced_type" : "type-4611",
+   "self_type" : "type-4610",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41210,8 +41308,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-4776",
-   "self_type" : "type-4775",
+   "referenced_type" : "type-4783",
+   "self_type" : "type-4782",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41220,8 +41318,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-5290",
-   "self_type" : "type-5289",
+   "referenced_type" : "type-5296",
+   "self_type" : "type-5295",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41230,8 +41328,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-5465",
-   "self_type" : "type-5464",
+   "referenced_type" : "type-5473",
+   "self_type" : "type-5472",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41250,8 +41348,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-5641",
-   "self_type" : "type-5640",
+   "referenced_type" : "type-5650",
+   "self_type" : "type-5649",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41260,8 +41358,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-5766",
-   "self_type" : "type-5765",
+   "referenced_type" : "type-5775",
+   "self_type" : "type-5774",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41270,8 +41368,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-6294",
-   "self_type" : "type-6293",
+   "referenced_type" : "type-6303",
+   "self_type" : "type-6302",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41280,8 +41378,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-6489",
-   "self_type" : "type-6488",
+   "referenced_type" : "type-6498",
+   "self_type" : "type-6497",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41290,8 +41388,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-6642",
-   "self_type" : "type-6641",
+   "referenced_type" : "type-6652",
+   "self_type" : "type-6651",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41300,8 +41398,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-6796",
-   "self_type" : "type-6795",
+   "referenced_type" : "type-6806",
+   "self_type" : "type-6805",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41310,8 +41408,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-6944",
-   "self_type" : "type-6943",
+   "referenced_type" : "type-6953",
+   "self_type" : "type-6952",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41320,8 +41418,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-7115",
-   "self_type" : "type-7114",
+   "referenced_type" : "type-7124",
+   "self_type" : "type-7123",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41330,8 +41428,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-7345",
-   "self_type" : "type-7344",
+   "referenced_type" : "type-7367",
+   "self_type" : "type-7366",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41340,8 +41438,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-7606",
-   "self_type" : "type-7605",
+   "referenced_type" : "type-7627",
+   "self_type" : "type-7626",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41350,8 +41448,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-7781",
-   "self_type" : "type-7780",
+   "referenced_type" : "type-7804",
+   "self_type" : "type-7803",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41360,8 +41458,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-7957",
-   "self_type" : "type-7956",
+   "referenced_type" : "type-7981",
+   "self_type" : "type-7980",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41370,8 +41468,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-8082",
-   "self_type" : "type-8081",
+   "referenced_type" : "type-8106",
+   "self_type" : "type-8105",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41380,8 +41478,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-8235",
-   "self_type" : "type-8234",
+   "referenced_type" : "type-8259",
+   "self_type" : "type-8258",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41390,8 +41488,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-8367",
-   "self_type" : "type-8366",
+   "referenced_type" : "type-8393",
+   "self_type" : "type-8392",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41400,8 +41498,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-8513",
-   "self_type" : "type-8512",
+   "referenced_type" : "type-8540",
+   "self_type" : "type-8539",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41410,8 +41508,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-8602",
-   "self_type" : "type-8601",
+   "referenced_type" : "type-8630",
+   "self_type" : "type-8629",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41420,8 +41518,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-868",
-   "self_type" : "type-867",
+   "referenced_type" : "type-870",
+   "self_type" : "type-869",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41430,8 +41528,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-9161",
-   "self_type" : "type-9160",
+   "referenced_type" : "type-9189",
+   "self_type" : "type-9188",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41440,8 +41538,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-9407",
-   "self_type" : "type-9406",
+   "referenced_type" : "type-9434",
+   "self_type" : "type-9433",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41450,8 +41548,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-9546",
-   "self_type" : "type-9545",
+   "referenced_type" : "type-9573",
+   "self_type" : "type-9572",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41460,8 +41558,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-9703",
-   "self_type" : "type-9702",
+   "referenced_type" : "type-9730",
+   "self_type" : "type-9729",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41470,8 +41568,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-9845",
-   "self_type" : "type-9844",
+   "referenced_type" : "type-9872",
+   "self_type" : "type-9871",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41480,8 +41578,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-1121",
-   "self_type" : "type-1120",
+   "referenced_type" : "type-1125",
+   "self_type" : "type-1124",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41490,8 +41588,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-1299",
-   "self_type" : "type-1298",
+   "referenced_type" : "type-1303",
+   "self_type" : "type-1302",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41500,8 +41598,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-3373",
-   "self_type" : "type-3372",
+   "referenced_type" : "type-3376",
+   "self_type" : "type-3375",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41510,8 +41608,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-3550",
-   "self_type" : "type-3549",
+   "referenced_type" : "type-3553",
+   "self_type" : "type-3552",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41520,8 +41618,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-3724",
-   "self_type" : "type-3723",
+   "referenced_type" : "type-3731",
+   "self_type" : "type-3730",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41530,8 +41628,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-3849",
-   "self_type" : "type-3848",
+   "referenced_type" : "type-3856",
+   "self_type" : "type-3855",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41540,8 +41638,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-4401",
-   "self_type" : "type-4400",
+   "referenced_type" : "type-4407",
+   "self_type" : "type-4406",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41550,8 +41648,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-4609",
-   "self_type" : "type-4608",
+   "referenced_type" : "type-4615",
+   "self_type" : "type-4614",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41560,8 +41658,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-4781",
-   "self_type" : "type-4780",
+   "referenced_type" : "type-4788",
+   "self_type" : "type-4787",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41570,8 +41668,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-5294",
-   "self_type" : "type-5293",
+   "referenced_type" : "type-5300",
+   "self_type" : "type-5299",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41580,8 +41678,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-5471",
-   "self_type" : "type-5470",
+   "referenced_type" : "type-5477",
+   "self_type" : "type-5476",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41600,8 +41698,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-5645",
-   "self_type" : "type-5644",
+   "referenced_type" : "type-5655",
+   "self_type" : "type-5654",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41610,8 +41708,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-5770",
-   "self_type" : "type-5769",
+   "referenced_type" : "type-5780",
+   "self_type" : "type-5779",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41620,8 +41718,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-6298",
-   "self_type" : "type-6297",
+   "referenced_type" : "type-6307",
+   "self_type" : "type-6306",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41630,8 +41728,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-6493",
-   "self_type" : "type-6492",
+   "referenced_type" : "type-6502",
+   "self_type" : "type-6501",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41640,8 +41738,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-6647",
-   "self_type" : "type-6646",
+   "referenced_type" : "type-6657",
+   "self_type" : "type-6656",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41650,8 +41748,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-6800",
-   "self_type" : "type-6799",
+   "referenced_type" : "type-6810",
+   "self_type" : "type-6809",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41660,8 +41758,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-6949",
-   "self_type" : "type-6948",
+   "referenced_type" : "type-6958",
+   "self_type" : "type-6957",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41670,8 +41768,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-7119",
-   "self_type" : "type-7118",
+   "referenced_type" : "type-7128",
+   "self_type" : "type-7127",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41680,8 +41778,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-7349",
-   "self_type" : "type-7348",
+   "referenced_type" : "type-7371",
+   "self_type" : "type-7370",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41690,8 +41788,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-7610",
-   "self_type" : "type-7609",
+   "referenced_type" : "type-7631",
+   "self_type" : "type-7630",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41700,8 +41798,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-7787",
-   "self_type" : "type-7786",
+   "referenced_type" : "type-7808",
+   "self_type" : "type-7807",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41710,8 +41808,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-7961",
-   "self_type" : "type-7960",
+   "referenced_type" : "type-7986",
+   "self_type" : "type-7985",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41720,8 +41818,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-8086",
-   "self_type" : "type-8085",
+   "referenced_type" : "type-8111",
+   "self_type" : "type-8110",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41730,8 +41828,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-8239",
-   "self_type" : "type-8238",
+   "referenced_type" : "type-8264",
+   "self_type" : "type-8263",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41740,8 +41838,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-8373",
-   "self_type" : "type-8372",
+   "referenced_type" : "type-8397",
+   "self_type" : "type-8396",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41750,8 +41848,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-8517",
-   "self_type" : "type-8516",
+   "referenced_type" : "type-8544",
+   "self_type" : "type-8543",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41760,8 +41858,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-8606",
-   "self_type" : "type-8605",
+   "referenced_type" : "type-8634",
+   "self_type" : "type-8633",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41780,8 +41878,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-9165",
-   "self_type" : "type-9164",
+   "referenced_type" : "type-9193",
+   "self_type" : "type-9192",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41790,8 +41888,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-9411",
-   "self_type" : "type-9410",
+   "referenced_type" : "type-9438",
+   "self_type" : "type-9437",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41800,8 +41898,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-9550",
-   "self_type" : "type-9549",
+   "referenced_type" : "type-9577",
+   "self_type" : "type-9576",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41810,8 +41908,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-9707",
-   "self_type" : "type-9706",
+   "referenced_type" : "type-9734",
+   "self_type" : "type-9733",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41820,8 +41918,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-9849",
-   "self_type" : "type-9848",
+   "referenced_type" : "type-9876",
+   "self_type" : "type-9875",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41830,8 +41928,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-1139",
+   "self_type" : "type-1138",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -41840,8 +41938,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-1328",
+   "self_type" : "type-1327",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -41850,8 +41948,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3417",
+   "self_type" : "type-3416",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -41860,8 +41958,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3576",
+   "self_type" : "type-3575",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -41870,8 +41968,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3745",
+   "self_type" : "type-3744",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -41880,8 +41978,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3882",
+   "self_type" : "type-3881",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -41890,8 +41988,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4435",
+   "self_type" : "type-4434",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -41900,8 +41998,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4640",
+   "self_type" : "type-4639",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -41910,8 +42008,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4811",
+   "self_type" : "type-4810",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -41920,8 +42018,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5341",
+   "self_type" : "type-5340",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -41930,8 +42028,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5500",
+   "self_type" : "type-5499",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -41940,8 +42038,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5669",
+   "self_type" : "type-5668",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -41950,8 +42048,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5806",
+   "self_type" : "type-5805",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -41960,8 +42058,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6335",
+   "self_type" : "type-6334",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -41980,8 +42078,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6527",
+   "self_type" : "type-6526",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -41990,8 +42088,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6680",
+   "self_type" : "type-6679",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42000,8 +42098,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6823",
+   "self_type" : "type-6822",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42010,8 +42108,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6972",
+   "self_type" : "type-6971",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42020,8 +42118,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7151",
+   "self_type" : "type-7150",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42030,8 +42128,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "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"
   },
@@ -42040,8 +42138,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7672",
+   "self_type" : "type-7671",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42050,8 +42148,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7831",
+   "self_type" : "type-7830",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42060,8 +42158,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8000",
+   "self_type" : "type-7999",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42070,8 +42168,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8137",
+   "self_type" : "type-8136",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42080,8 +42178,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8288",
+   "self_type" : "type-8287",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42090,8 +42188,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8420",
+   "self_type" : "type-8419",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42100,8 +42198,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8558",
+   "self_type" : "type-8557",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42110,8 +42208,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8659",
+   "self_type" : "type-8658",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42130,8 +42228,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-9224",
+   "self_type" : "type-9223",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42140,8 +42238,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-9467",
+   "self_type" : "type-9466",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42150,8 +42248,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-9599",
+   "self_type" : "type-9598",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42160,8 +42258,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-9746",
+   "self_type" : "type-9745",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42170,8 +42268,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-9890",
+   "self_type" : "type-9889",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42180,8 +42278,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-1138",
-   "self_type" : "type-1137",
+   "referenced_type" : "type-1143",
+   "self_type" : "type-1142",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42190,8 +42288,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-1329",
-   "self_type" : "type-1328",
+   "referenced_type" : "type-1334",
+   "self_type" : "type-1333",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42200,8 +42298,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-3418",
-   "self_type" : "type-3417",
+   "referenced_type" : "type-3421",
+   "self_type" : "type-3420",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42210,8 +42308,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-3577",
-   "self_type" : "type-3576",
+   "referenced_type" : "type-3582",
+   "self_type" : "type-3581",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42220,8 +42318,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-3741",
-   "self_type" : "type-3740",
+   "referenced_type" : "type-3749",
+   "self_type" : "type-3748",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42230,8 +42328,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-3880",
-   "self_type" : "type-3879",
+   "referenced_type" : "type-3888",
+   "self_type" : "type-3887",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42240,8 +42338,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-4432",
-   "self_type" : "type-4431",
+   "referenced_type" : "type-4439",
+   "self_type" : "type-4438",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42250,8 +42348,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-4638",
-   "self_type" : "type-4637",
+   "referenced_type" : "type-4644",
+   "self_type" : "type-4643",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42260,8 +42358,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-4808",
-   "self_type" : "type-4807",
+   "referenced_type" : "type-4815",
+   "self_type" : "type-4814",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42270,8 +42368,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-5339",
-   "self_type" : "type-5338",
+   "referenced_type" : "type-5345",
+   "self_type" : "type-5344",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42280,8 +42378,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-5498",
-   "self_type" : "type-5497",
+   "referenced_type" : "type-5506",
+   "self_type" : "type-5505",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42290,8 +42388,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-5662",
-   "self_type" : "type-5661",
+   "referenced_type" : "type-5673",
+   "self_type" : "type-5672",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42300,8 +42398,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-5801",
-   "self_type" : "type-5800",
+   "referenced_type" : "type-5812",
+   "self_type" : "type-5811",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42310,8 +42408,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-6329",
-   "self_type" : "type-6328",
+   "referenced_type" : "type-6339",
+   "self_type" : "type-6338",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42330,8 +42428,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-6522",
-   "self_type" : "type-6521",
+   "referenced_type" : "type-6531",
+   "self_type" : "type-6530",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42340,8 +42438,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-6674",
-   "self_type" : "type-6673",
+   "referenced_type" : "type-6684",
+   "self_type" : "type-6683",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42350,8 +42448,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-6818",
-   "self_type" : "type-6817",
+   "referenced_type" : "type-6828",
+   "self_type" : "type-6827",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42360,8 +42458,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-6967",
-   "self_type" : "type-6966",
+   "referenced_type" : "type-6976",
+   "self_type" : "type-6975",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42370,8 +42468,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-7146",
-   "self_type" : "type-7145",
+   "referenced_type" : "type-7155",
+   "self_type" : "type-7154",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42380,8 +42478,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-7379",
-   "self_type" : "type-7378",
+   "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"
   },
@@ -42390,8 +42488,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-7655",
-   "self_type" : "type-7654",
+   "referenced_type" : "type-7676",
+   "self_type" : "type-7675",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42400,8 +42498,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-7814",
-   "self_type" : "type-7813",
+   "referenced_type" : "type-7837",
+   "self_type" : "type-7836",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42410,8 +42508,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-7978",
-   "self_type" : "type-7977",
+   "referenced_type" : "type-8004",
+   "self_type" : "type-8003",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42420,8 +42518,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-8117",
-   "self_type" : "type-8116",
+   "referenced_type" : "type-8143",
+   "self_type" : "type-8142",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42430,8 +42528,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-8268",
-   "self_type" : "type-8267",
+   "referenced_type" : "type-8292",
+   "self_type" : "type-8291",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42440,8 +42538,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-8400",
-   "self_type" : "type-8399",
+   "referenced_type" : "type-8426",
+   "self_type" : "type-8425",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42450,8 +42548,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-8533",
-   "self_type" : "type-8532",
+   "referenced_type" : "type-8562",
+   "self_type" : "type-8561",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42460,8 +42558,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-8636",
-   "self_type" : "type-8635",
+   "referenced_type" : "type-8665",
+   "self_type" : "type-8664",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42470,8 +42568,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-906",
-   "self_type" : "type-905",
+   "referenced_type" : "type-908",
+   "self_type" : "type-907",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42480,8 +42578,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-9199",
-   "self_type" : "type-9198",
+   "referenced_type" : "type-9228",
+   "self_type" : "type-9227",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42490,8 +42588,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-9443",
-   "self_type" : "type-9442",
+   "referenced_type" : "type-9471",
+   "self_type" : "type-9470",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42500,8 +42598,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-9576",
-   "self_type" : "type-9575",
+   "referenced_type" : "type-9603",
+   "self_type" : "type-9602",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42510,8 +42608,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-9723",
-   "self_type" : "type-9722",
+   "referenced_type" : "type-9750",
+   "self_type" : "type-9749",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42520,8 +42618,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-9867",
-   "self_type" : "type-9866",
+   "referenced_type" : "type-9894",
+   "self_type" : "type-9893",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42530,8 +42628,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-1136",
-   "self_type" : "type-1135",
+   "referenced_type" : "type-1141",
+   "self_type" : "type-1140",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42540,8 +42638,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-1327",
-   "self_type" : "type-1326",
+   "referenced_type" : "type-1332",
+   "self_type" : "type-1331",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42550,8 +42648,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-3416",
-   "self_type" : "type-3415",
+   "referenced_type" : "type-3419",
+   "self_type" : "type-3418",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42560,8 +42658,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-3575",
-   "self_type" : "type-3574",
+   "referenced_type" : "type-3580",
+   "self_type" : "type-3579",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42570,8 +42668,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-3739",
-   "self_type" : "type-3738",
+   "referenced_type" : "type-3747",
+   "self_type" : "type-3746",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42580,8 +42678,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-3878",
-   "self_type" : "type-3877",
+   "referenced_type" : "type-3886",
+   "self_type" : "type-3885",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42590,8 +42688,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-4429",
-   "self_type" : "type-4428",
+   "referenced_type" : "type-4437",
+   "self_type" : "type-4436",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42600,8 +42698,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-4636",
-   "self_type" : "type-4635",
+   "referenced_type" : "type-4642",
+   "self_type" : "type-4641",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42610,8 +42708,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-4806",
-   "self_type" : "type-4805",
+   "referenced_type" : "type-4813",
+   "self_type" : "type-4812",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42620,8 +42718,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-5337",
-   "self_type" : "type-5336",
+   "referenced_type" : "type-5343",
+   "self_type" : "type-5342",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42630,8 +42728,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-5496",
-   "self_type" : "type-5495",
+   "referenced_type" : "type-5504",
+   "self_type" : "type-5503",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42640,8 +42738,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-5660",
-   "self_type" : "type-5659",
+   "referenced_type" : "type-5671",
+   "self_type" : "type-5670",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42650,8 +42748,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-5799",
-   "self_type" : "type-5798",
+   "referenced_type" : "type-5810",
+   "self_type" : "type-5809",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42660,8 +42758,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-6326",
-   "self_type" : "type-6325",
+   "referenced_type" : "type-6337",
+   "self_type" : "type-6336",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42680,8 +42778,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-6520",
-   "self_type" : "type-6519",
+   "referenced_type" : "type-6529",
+   "self_type" : "type-6528",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42690,8 +42788,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-6672",
-   "self_type" : "type-6671",
+   "referenced_type" : "type-6682",
+   "self_type" : "type-6681",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42700,8 +42798,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-6816",
-   "self_type" : "type-6815",
+   "referenced_type" : "type-6825",
+   "self_type" : "type-6824",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42710,8 +42808,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-6965",
-   "self_type" : "type-6964",
+   "referenced_type" : "type-6974",
+   "self_type" : "type-6973",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42720,8 +42818,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-7144",
-   "self_type" : "type-7143",
+   "referenced_type" : "type-7153",
+   "self_type" : "type-7152",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42730,8 +42828,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-7376",
-   "self_type" : "type-7375",
+   "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"
   },
@@ -42740,8 +42838,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-7653",
-   "self_type" : "type-7652",
+   "referenced_type" : "type-7674",
+   "self_type" : "type-7673",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42750,8 +42848,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-7812",
-   "self_type" : "type-7811",
+   "referenced_type" : "type-7835",
+   "self_type" : "type-7834",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42760,8 +42858,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-7976",
-   "self_type" : "type-7975",
+   "referenced_type" : "type-8002",
+   "self_type" : "type-8001",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42770,8 +42868,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-8115",
-   "self_type" : "type-8114",
+   "referenced_type" : "type-8141",
+   "self_type" : "type-8140",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42780,8 +42878,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-8266",
-   "self_type" : "type-8265",
+   "referenced_type" : "type-8290",
+   "self_type" : "type-8289",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42790,8 +42888,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-8397",
-   "self_type" : "type-8396",
+   "referenced_type" : "type-8424",
+   "self_type" : "type-8423",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42800,8 +42898,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-8531",
-   "self_type" : "type-8530",
+   "referenced_type" : "type-8560",
+   "self_type" : "type-8559",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42810,8 +42908,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-8634",
-   "self_type" : "type-8633",
+   "referenced_type" : "type-8663",
+   "self_type" : "type-8662",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42820,8 +42918,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-904",
-   "self_type" : "type-903",
+   "referenced_type" : "type-906",
+   "self_type" : "type-905",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42830,8 +42928,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-9195",
-   "self_type" : "type-9194",
+   "referenced_type" : "type-9226",
+   "self_type" : "type-9225",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42840,8 +42938,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-9441",
-   "self_type" : "type-9440",
+   "referenced_type" : "type-9469",
+   "self_type" : "type-9468",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42850,8 +42948,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-9574",
-   "self_type" : "type-9573",
+   "referenced_type" : "type-9601",
+   "self_type" : "type-9600",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42860,8 +42958,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-9721",
-   "self_type" : "type-9720",
+   "referenced_type" : "type-9748",
+   "self_type" : "type-9747",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42870,8 +42968,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-9865",
-   "self_type" : "type-9864",
+   "referenced_type" : "type-9892",
+   "self_type" : "type-9891",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42880,8 +42978,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-1132",
-   "self_type" : "type-1131",
+   "referenced_type" : "type-1135",
+   "self_type" : "type-1134",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42890,8 +42988,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-1323",
-   "self_type" : "type-1322",
+   "referenced_type" : "type-1326",
+   "self_type" : "type-1325",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42900,8 +42998,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-3412",
-   "self_type" : "type-3411",
+   "referenced_type" : "type-3415",
+   "self_type" : "type-3414",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42910,8 +43008,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-3571",
-   "self_type" : "type-3570",
+   "referenced_type" : "type-3574",
+   "self_type" : "type-3573",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42920,8 +43018,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-3735",
-   "self_type" : "type-3734",
+   "referenced_type" : "type-3741",
+   "self_type" : "type-3740",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42930,8 +43028,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-3874",
-   "self_type" : "type-3873",
+   "referenced_type" : "type-3880",
+   "self_type" : "type-3879",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42940,8 +43038,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-4425",
-   "self_type" : "type-4424",
+   "referenced_type" : "type-4431",
+   "self_type" : "type-4430",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42950,8 +43048,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-4632",
-   "self_type" : "type-4631",
+   "referenced_type" : "type-4638",
+   "self_type" : "type-4637",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42960,8 +43058,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-4802",
-   "self_type" : "type-4801",
+   "referenced_type" : "type-4809",
+   "self_type" : "type-4808",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42970,8 +43068,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-5333",
-   "self_type" : "type-5332",
+   "referenced_type" : "type-5339",
+   "self_type" : "type-5338",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42980,8 +43078,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-5492",
-   "self_type" : "type-5491",
+   "referenced_type" : "type-5498",
+   "self_type" : "type-5497",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42990,8 +43088,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-5656",
-   "self_type" : "type-5655",
+   "referenced_type" : "type-5665",
+   "self_type" : "type-5664",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43000,8 +43098,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-5795",
-   "self_type" : "type-5794",
+   "referenced_type" : "type-5804",
+   "self_type" : "type-5803",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43010,8 +43108,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-6322",
-   "self_type" : "type-6321",
+   "referenced_type" : "type-6331",
+   "self_type" : "type-6330",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43030,8 +43128,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-6516",
-   "self_type" : "type-6515",
+   "referenced_type" : "type-6525",
+   "self_type" : "type-6524",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43040,8 +43138,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-6668",
-   "self_type" : "type-6667",
+   "referenced_type" : "type-6678",
+   "self_type" : "type-6677",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43050,8 +43148,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-6812",
-   "self_type" : "type-6811",
+   "referenced_type" : "type-6821",
+   "self_type" : "type-6820",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43060,8 +43158,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-6960",
-   "self_type" : "type-6959",
+   "referenced_type" : "type-6969",
+   "self_type" : "type-6968",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43070,8 +43168,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-7140",
-   "self_type" : "type-7139",
+   "referenced_type" : "type-7149",
+   "self_type" : "type-7148",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43080,8 +43178,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-7372",
-   "self_type" : "type-7371",
+   "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"
   },
@@ -43090,8 +43188,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-7649",
-   "self_type" : "type-7648",
+   "referenced_type" : "type-7670",
+   "self_type" : "type-7669",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43100,8 +43198,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-7808",
-   "self_type" : "type-7807",
+   "referenced_type" : "type-7829",
+   "self_type" : "type-7828",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43110,8 +43208,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-7972",
-   "self_type" : "type-7971",
+   "referenced_type" : "type-7996",
+   "self_type" : "type-7995",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43120,8 +43218,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-8111",
-   "self_type" : "type-8110",
+   "referenced_type" : "type-8135",
+   "self_type" : "type-8134",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43130,8 +43228,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-8262",
-   "self_type" : "type-8261",
+   "referenced_type" : "type-8286",
+   "self_type" : "type-8285",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43140,8 +43238,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-8393",
-   "self_type" : "type-8392",
+   "referenced_type" : "type-8418",
+   "self_type" : "type-8417",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43150,8 +43248,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-8527",
-   "self_type" : "type-8526",
+   "referenced_type" : "type-8554",
+   "self_type" : "type-8553",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43160,8 +43258,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-8630",
-   "self_type" : "type-8629",
+   "referenced_type" : "type-8657",
+   "self_type" : "type-8656",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43180,8 +43278,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-9191",
-   "self_type" : "type-9190",
+   "referenced_type" : "type-9221",
+   "self_type" : "type-9220",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43190,8 +43288,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-9437",
-   "self_type" : "type-9436",
+   "referenced_type" : "type-9465",
+   "self_type" : "type-9464",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43200,8 +43298,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-9570",
-   "self_type" : "type-9569",
+   "referenced_type" : "type-9597",
+   "self_type" : "type-9596",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43210,8 +43308,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-9717",
-   "self_type" : "type-9716",
+   "referenced_type" : "type-9744",
+   "self_type" : "type-9743",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43220,8 +43318,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-9860",
-   "self_type" : "type-9859",
+   "referenced_type" : "type-9888",
+   "self_type" : "type-9887",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43230,8 +43328,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-1140",
-   "self_type" : "type-1139",
+   "referenced_type" : "type-1145",
+   "self_type" : "type-1144",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43240,8 +43338,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-1333",
-   "self_type" : "type-1332",
+   "referenced_type" : "type-1336",
+   "self_type" : "type-1335",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43250,8 +43348,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-3421",
-   "self_type" : "type-3420",
+   "referenced_type" : "type-3424",
+   "self_type" : "type-3423",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43260,8 +43358,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-3581",
-   "self_type" : "type-3580",
+   "referenced_type" : "type-3584",
+   "self_type" : "type-3583",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43270,8 +43368,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-3743",
-   "self_type" : "type-3742",
+   "referenced_type" : "type-3751",
+   "self_type" : "type-3750",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43280,8 +43378,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-3884",
-   "self_type" : "type-3883",
+   "referenced_type" : "type-3890",
+   "self_type" : "type-3889",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43290,8 +43388,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-4434",
-   "self_type" : "type-4433",
+   "referenced_type" : "type-4441",
+   "self_type" : "type-4440",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43300,8 +43398,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-4640",
-   "self_type" : "type-4639",
+   "referenced_type" : "type-4646",
+   "self_type" : "type-4645",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43310,8 +43408,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-4810",
-   "self_type" : "type-4809",
+   "referenced_type" : "type-4817",
+   "self_type" : "type-4816",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43320,8 +43418,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-5342",
-   "self_type" : "type-5341",
+   "referenced_type" : "type-5348",
+   "self_type" : "type-5347",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43330,8 +43428,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-5502",
-   "self_type" : "type-5501",
+   "referenced_type" : "type-5508",
+   "self_type" : "type-5507",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43340,8 +43438,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-5664",
-   "self_type" : "type-5663",
+   "referenced_type" : "type-5675",
+   "self_type" : "type-5674",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43350,8 +43448,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-5805",
-   "self_type" : "type-5804",
+   "referenced_type" : "type-5814",
+   "self_type" : "type-5813",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43360,8 +43458,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-6331",
-   "self_type" : "type-6330",
+   "referenced_type" : "type-6341",
+   "self_type" : "type-6340",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43380,8 +43478,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-6524",
-   "self_type" : "type-6523",
+   "referenced_type" : "type-6533",
+   "self_type" : "type-6532",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43390,8 +43488,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-6676",
-   "self_type" : "type-6675",
+   "referenced_type" : "type-6686",
+   "self_type" : "type-6685",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43400,8 +43498,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-6820",
-   "self_type" : "type-6819",
+   "referenced_type" : "type-6830",
+   "self_type" : "type-6829",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43410,8 +43508,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-6969",
-   "self_type" : "type-6968",
+   "referenced_type" : "type-6978",
+   "self_type" : "type-6977",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43420,8 +43518,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-7148",
-   "self_type" : "type-7147",
+   "referenced_type" : "type-7157",
+   "self_type" : "type-7156",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43430,8 +43528,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-7381",
-   "self_type" : "type-7380",
+   "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"
   },
@@ -43440,8 +43538,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-7658",
-   "self_type" : "type-7657",
+   "referenced_type" : "type-7679",
+   "self_type" : "type-7678",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43450,8 +43548,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-7818",
-   "self_type" : "type-7817",
+   "referenced_type" : "type-7839",
+   "self_type" : "type-7838",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43460,8 +43558,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-7980",
-   "self_type" : "type-7979",
+   "referenced_type" : "type-8006",
+   "self_type" : "type-8005",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43470,8 +43568,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-8121",
-   "self_type" : "type-8120",
+   "referenced_type" : "type-8145",
+   "self_type" : "type-8144",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43480,8 +43578,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-8270",
-   "self_type" : "type-8269",
+   "referenced_type" : "type-8294",
+   "self_type" : "type-8293",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43490,8 +43588,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-8404",
-   "self_type" : "type-8403",
+   "referenced_type" : "type-8428",
+   "self_type" : "type-8427",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43500,8 +43598,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-8535",
-   "self_type" : "type-8534",
+   "referenced_type" : "type-8564",
+   "self_type" : "type-8563",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43510,8 +43608,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-8640",
-   "self_type" : "type-8639",
+   "referenced_type" : "type-8667",
+   "self_type" : "type-8666",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43530,8 +43628,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-9201",
-   "self_type" : "type-9200",
+   "referenced_type" : "type-9230",
+   "self_type" : "type-9229",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43540,8 +43638,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-9445",
-   "self_type" : "type-9444",
+   "referenced_type" : "type-9473",
+   "self_type" : "type-9472",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43550,8 +43648,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-9578",
-   "self_type" : "type-9577",
+   "referenced_type" : "type-9605",
+   "self_type" : "type-9604",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43560,8 +43658,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-9725",
-   "self_type" : "type-9724",
+   "referenced_type" : "type-9752",
+   "self_type" : "type-9751",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43570,8 +43668,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-9869",
-   "self_type" : "type-9868",
+   "referenced_type" : "type-9896",
+   "self_type" : "type-9895",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43580,8 +43678,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-1153",
+   "self_type" : "type-1152",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43590,8 +43688,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-1346",
+   "self_type" : "type-1345",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43600,8 +43698,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3437",
+   "self_type" : "type-3436",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43610,8 +43708,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3592",
+   "self_type" : "type-3591",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43620,8 +43718,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3759",
+   "self_type" : "type-3758",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43630,8 +43728,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3901",
+   "self_type" : "type-3900",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43640,8 +43738,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4449",
+   "self_type" : "type-4448",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43650,8 +43748,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4655",
+   "self_type" : "type-4654",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43660,8 +43758,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4825",
+   "self_type" : "type-4824",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43670,8 +43768,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5361",
+   "self_type" : "type-5360",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43680,8 +43778,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5516",
+   "self_type" : "type-5515",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43690,8 +43788,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5683",
+   "self_type" : "type-5682",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43700,8 +43798,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5825",
+   "self_type" : "type-5824",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43710,8 +43808,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6349",
+   "self_type" : "type-6348",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43720,8 +43818,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6542",
+   "self_type" : "type-6541",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43730,8 +43828,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6694",
+   "self_type" : "type-6693",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43750,8 +43848,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6838",
+   "self_type" : "type-6837",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43760,8 +43858,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6988",
+   "self_type" : "type-6987",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43770,8 +43868,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7167",
+   "self_type" : "type-7166",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43780,8 +43878,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7251",
+   "self_type" : "type-7250",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43790,8 +43888,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7414",
+   "self_type" : "type-7413",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43800,8 +43898,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7692",
+   "self_type" : "type-7691",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43810,8 +43908,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7847",
+   "self_type" : "type-7846",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43820,8 +43918,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8014",
+   "self_type" : "type-8013",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43830,8 +43928,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8156",
+   "self_type" : "type-8155",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43840,8 +43938,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8303",
+   "self_type" : "type-8302",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43850,8 +43948,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8436",
+   "self_type" : "type-8435",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43860,8 +43958,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8572",
+   "self_type" : "type-8571",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/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-8677",
+   "self_type" : "type-8676",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43880,8 +43988,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-9238",
+   "self_type" : "type-9237",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43890,8 +43998,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-9482",
+   "self_type" : "type-9481",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43900,8 +44008,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-9613",
+   "self_type" : "type-9612",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43910,18 +44018,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-9760",
+   "self_type" : "type-9759",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43930,8 +44028,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-1148",
-   "self_type" : "type-1147",
+   "referenced_type" : "type-1151",
+   "self_type" : "type-1150",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43940,8 +44038,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-1341",
-   "self_type" : "type-1340",
+   "referenced_type" : "type-1344",
+   "self_type" : "type-1343",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43950,8 +44048,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-3432",
-   "self_type" : "type-3431",
+   "referenced_type" : "type-3435",
+   "self_type" : "type-3434",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43960,8 +44058,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-3587",
-   "self_type" : "type-3586",
+   "referenced_type" : "type-3590",
+   "self_type" : "type-3589",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43970,8 +44068,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-3751",
-   "self_type" : "type-3750",
+   "referenced_type" : "type-3757",
+   "self_type" : "type-3756",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43980,8 +44078,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-3893",
-   "self_type" : "type-3892",
+   "referenced_type" : "type-3899",
+   "self_type" : "type-3898",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43990,8 +44088,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-4441",
-   "self_type" : "type-4440",
+   "referenced_type" : "type-4447",
+   "self_type" : "type-4446",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44000,8 +44098,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-4646",
-   "self_type" : "type-4645",
+   "referenced_type" : "type-4653",
+   "self_type" : "type-4652",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44010,8 +44108,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-4817",
-   "self_type" : "type-4816",
+   "referenced_type" : "type-4823",
+   "self_type" : "type-4822",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44020,8 +44118,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-5353",
-   "self_type" : "type-5352",
+   "referenced_type" : "type-5359",
+   "self_type" : "type-5358",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44030,8 +44128,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-5508",
-   "self_type" : "type-5507",
+   "referenced_type" : "type-5514",
+   "self_type" : "type-5513",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44040,8 +44138,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-5672",
-   "self_type" : "type-5671",
+   "referenced_type" : "type-5681",
+   "self_type" : "type-5680",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44050,8 +44148,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-5814",
-   "self_type" : "type-5813",
+   "referenced_type" : "type-5823",
+   "self_type" : "type-5822",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44060,8 +44158,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-6338",
-   "self_type" : "type-6337",
+   "referenced_type" : "type-6347",
+   "self_type" : "type-6346",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44070,8 +44168,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-6530",
-   "self_type" : "type-6529",
+   "referenced_type" : "type-6540",
+   "self_type" : "type-6539",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44090,8 +44188,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-6683",
-   "self_type" : "type-6682",
+   "referenced_type" : "type-6692",
+   "self_type" : "type-6691",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44100,8 +44198,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-6827",
-   "self_type" : "type-6826",
+   "referenced_type" : "type-6836",
+   "self_type" : "type-6835",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44110,8 +44208,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-6976",
-   "self_type" : "type-6975",
+   "referenced_type" : "type-6985",
+   "self_type" : "type-6984",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44120,8 +44218,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-7156",
-   "self_type" : "type-7155",
+   "referenced_type" : "type-7165",
+   "self_type" : "type-7164",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44130,8 +44228,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-7389",
-   "self_type" : "type-7388",
+   "referenced_type" : "type-7249",
+   "self_type" : "type-7248",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44140,8 +44238,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-7669",
-   "self_type" : "type-7668",
+   "referenced_type" : "type-7412",
+   "self_type" : "type-7411",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44150,8 +44248,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-7824",
-   "self_type" : "type-7823",
+   "referenced_type" : "type-7690",
+   "self_type" : "type-7689",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44160,8 +44258,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-7988",
-   "self_type" : "type-7987",
+   "referenced_type" : "type-7845",
+   "self_type" : "type-7844",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44170,8 +44268,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-8130",
-   "self_type" : "type-8129",
+   "referenced_type" : "type-8012",
+   "self_type" : "type-8011",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44180,8 +44278,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-8277",
-   "self_type" : "type-8276",
+   "referenced_type" : "type-8154",
+   "self_type" : "type-8153",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44190,8 +44288,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-8410",
-   "self_type" : "type-8409",
+   "referenced_type" : "type-8301",
+   "self_type" : "type-8300",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44200,8 +44298,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-8543",
-   "self_type" : "type-8542",
+   "referenced_type" : "type-8434",
+   "self_type" : "type-8433",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44210,8 +44308,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8570",
+   "self_type" : "type-8569",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-8675",
+   "self_type" : "type-8674",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44230,8 +44338,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-9209",
-   "self_type" : "type-9208",
+   "referenced_type" : "type-9236",
+   "self_type" : "type-9235",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44240,8 +44348,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-9452",
-   "self_type" : "type-9451",
+   "referenced_type" : "type-9480",
+   "self_type" : "type-9479",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44250,8 +44358,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-9584",
-   "self_type" : "type-9583",
+   "referenced_type" : "type-9611",
+   "self_type" : "type-9610",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44260,18 +44368,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-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",
+   "referenced_type" : "type-9758",
+   "self_type" : "type-9757",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44280,8 +44378,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-1146",
-   "self_type" : "type-1145",
+   "referenced_type" : "type-1149",
+   "self_type" : "type-1148",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44290,8 +44388,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-1339",
-   "self_type" : "type-1338",
+   "referenced_type" : "type-1342",
+   "self_type" : "type-1341",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44300,8 +44398,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-3430",
-   "self_type" : "type-3429",
+   "referenced_type" : "type-3433",
+   "self_type" : "type-3432",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44310,8 +44408,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-3585",
-   "self_type" : "type-3584",
+   "referenced_type" : "type-3588",
+   "self_type" : "type-3587",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44320,8 +44418,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-3749",
-   "self_type" : "type-3748",
+   "referenced_type" : "type-3755",
+   "self_type" : "type-3754",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44330,8 +44428,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-3891",
-   "self_type" : "type-3890",
+   "referenced_type" : "type-3897",
+   "self_type" : "type-3896",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44340,8 +44438,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-4439",
-   "self_type" : "type-4438",
+   "referenced_type" : "type-4445",
+   "self_type" : "type-4444",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44350,8 +44448,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-4644",
-   "self_type" : "type-4643",
+   "referenced_type" : "type-4650",
+   "self_type" : "type-4649",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44360,8 +44458,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-4815",
-   "self_type" : "type-4814",
+   "referenced_type" : "type-4821",
+   "self_type" : "type-4820",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44370,8 +44468,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-5351",
-   "self_type" : "type-5350",
+   "referenced_type" : "type-5357",
+   "self_type" : "type-5356",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44380,8 +44478,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-5506",
-   "self_type" : "type-5505",
+   "referenced_type" : "type-5512",
+   "self_type" : "type-5511",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44390,8 +44488,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-5670",
-   "self_type" : "type-5669",
+   "referenced_type" : "type-5679",
+   "self_type" : "type-5678",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44400,8 +44498,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-5812",
-   "self_type" : "type-5811",
+   "referenced_type" : "type-5821",
+   "self_type" : "type-5820",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44410,8 +44508,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-6336",
-   "self_type" : "type-6335",
+   "referenced_type" : "type-6345",
+   "self_type" : "type-6344",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44420,8 +44518,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-6528",
-   "self_type" : "type-6527",
+   "referenced_type" : "type-6537",
+   "self_type" : "type-6536",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44440,8 +44538,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-6681",
-   "self_type" : "type-6680",
+   "referenced_type" : "type-6690",
+   "self_type" : "type-6689",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44450,8 +44548,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-6825",
-   "self_type" : "type-6824",
+   "referenced_type" : "type-6834",
+   "self_type" : "type-6833",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44460,8 +44558,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-6974",
-   "self_type" : "type-6973",
+   "referenced_type" : "type-6983",
+   "self_type" : "type-6982",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44470,8 +44568,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-7154",
-   "self_type" : "type-7153",
+   "referenced_type" : "type-7163",
+   "self_type" : "type-7162",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44480,8 +44578,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-7387",
-   "self_type" : "type-7386",
+   "referenced_type" : "type-7247",
+   "self_type" : "type-7246",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44490,8 +44588,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-7667",
-   "self_type" : "type-7666",
+   "referenced_type" : "type-7409",
+   "self_type" : "type-7408",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44500,8 +44598,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-7822",
-   "self_type" : "type-7821",
+   "referenced_type" : "type-7688",
+   "self_type" : "type-7687",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44510,8 +44608,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-7986",
-   "self_type" : "type-7985",
+   "referenced_type" : "type-7843",
+   "self_type" : "type-7842",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44520,8 +44618,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-8128",
-   "self_type" : "type-8127",
+   "referenced_type" : "type-8010",
+   "self_type" : "type-8009",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44530,8 +44628,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-8275",
-   "self_type" : "type-8274",
+   "referenced_type" : "type-8152",
+   "self_type" : "type-8151",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44540,8 +44638,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-8408",
-   "self_type" : "type-8407",
+   "referenced_type" : "type-8299",
+   "self_type" : "type-8298",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44550,8 +44648,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-8541",
-   "self_type" : "type-8540",
+   "referenced_type" : "type-8432",
+   "self_type" : "type-8431",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44560,8 +44658,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8568",
+   "self_type" : "type-8567",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-8673",
+   "self_type" : "type-8672",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44580,8 +44688,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-9207",
-   "self_type" : "type-9206",
+   "referenced_type" : "type-9234",
+   "self_type" : "type-9233",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44590,8 +44698,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-9450",
-   "self_type" : "type-9449",
+   "referenced_type" : "type-9478",
+   "self_type" : "type-9477",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44600,8 +44708,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-9582",
-   "self_type" : "type-9581",
+   "referenced_type" : "type-9609",
+   "self_type" : "type-9608",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44610,18 +44718,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-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",
+   "referenced_type" : "type-9756",
+   "self_type" : "type-9755",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44630,8 +44728,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-1144",
-   "self_type" : "type-1143",
+   "referenced_type" : "type-1147",
+   "self_type" : "type-1146",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44640,8 +44738,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-1337",
-   "self_type" : "type-1336",
+   "referenced_type" : "type-1340",
+   "self_type" : "type-1339",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44650,8 +44748,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-3428",
-   "self_type" : "type-3427",
+   "referenced_type" : "type-3431",
+   "self_type" : "type-3430",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44660,8 +44758,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-3583",
-   "self_type" : "type-3582",
+   "referenced_type" : "type-3586",
+   "self_type" : "type-3585",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44670,8 +44768,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-3747",
-   "self_type" : "type-3746",
+   "referenced_type" : "type-3753",
+   "self_type" : "type-3752",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44680,8 +44778,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-3889",
-   "self_type" : "type-3888",
+   "referenced_type" : "type-3895",
+   "self_type" : "type-3894",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44690,8 +44788,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-4437",
-   "self_type" : "type-4436",
+   "referenced_type" : "type-4443",
+   "self_type" : "type-4442",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44700,8 +44798,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-4642",
-   "self_type" : "type-4641",
+   "referenced_type" : "type-4648",
+   "self_type" : "type-4647",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44710,8 +44808,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-4813",
-   "self_type" : "type-4812",
+   "referenced_type" : "type-4819",
+   "self_type" : "type-4818",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44720,8 +44818,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-5349",
-   "self_type" : "type-5348",
+   "referenced_type" : "type-5355",
+   "self_type" : "type-5354",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44730,8 +44828,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-5504",
-   "self_type" : "type-5503",
+   "referenced_type" : "type-5510",
+   "self_type" : "type-5509",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44740,8 +44838,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-5668",
-   "self_type" : "type-5667",
+   "referenced_type" : "type-5677",
+   "self_type" : "type-5676",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44750,8 +44848,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-5810",
-   "self_type" : "type-5809",
+   "referenced_type" : "type-5819",
+   "self_type" : "type-5818",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44760,8 +44858,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-6334",
-   "self_type" : "type-6333",
+   "referenced_type" : "type-6343",
+   "self_type" : "type-6342",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44770,8 +44868,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-6526",
-   "self_type" : "type-6525",
+   "referenced_type" : "type-6535",
+   "self_type" : "type-6534",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44790,8 +44888,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-6679",
-   "self_type" : "type-6678",
+   "referenced_type" : "type-6688",
+   "self_type" : "type-6687",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44800,8 +44898,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-6822",
-   "self_type" : "type-6821",
+   "referenced_type" : "type-6832",
+   "self_type" : "type-6831",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44810,8 +44908,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-6972",
-   "self_type" : "type-6971",
+   "referenced_type" : "type-6981",
+   "self_type" : "type-6980",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44820,8 +44918,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-7152",
-   "self_type" : "type-7151",
+   "referenced_type" : "type-7161",
+   "self_type" : "type-7160",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44830,8 +44928,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-7385",
-   "self_type" : "type-7384",
+   "referenced_type" : "type-7407",
+   "self_type" : "type-7406",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44840,8 +44938,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-7665",
-   "self_type" : "type-7664",
+   "referenced_type" : "type-7686",
+   "self_type" : "type-7685",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44850,8 +44948,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-7820",
-   "self_type" : "type-7819",
+   "referenced_type" : "type-7841",
+   "self_type" : "type-7840",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44860,8 +44958,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-7984",
-   "self_type" : "type-7983",
+   "referenced_type" : "type-8008",
+   "self_type" : "type-8007",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44870,8 +44968,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-8126",
-   "self_type" : "type-8125",
+   "referenced_type" : "type-8150",
+   "self_type" : "type-8149",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44880,8 +44978,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-8273",
-   "self_type" : "type-8272",
+   "referenced_type" : "type-8297",
+   "self_type" : "type-8296",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44890,8 +44988,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-8406",
-   "self_type" : "type-8405",
+   "referenced_type" : "type-8430",
+   "self_type" : "type-8429",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44900,8 +44998,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-8539",
-   "self_type" : "type-8538",
+   "referenced_type" : "type-8566",
+   "self_type" : "type-8565",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44910,8 +45008,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-8644",
-   "self_type" : "type-8643",
+   "referenced_type" : "type-8671",
+   "self_type" : "type-8670",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44930,8 +45028,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-9205",
-   "self_type" : "type-9204",
+   "referenced_type" : "type-9232",
+   "self_type" : "type-9231",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44940,8 +45038,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-9448",
-   "self_type" : "type-9447",
+   "referenced_type" : "type-9476",
+   "self_type" : "type-9475",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44950,8 +45048,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-9580",
-   "self_type" : "type-9579",
+   "referenced_type" : "type-9607",
+   "self_type" : "type-9606",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44960,8 +45058,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-9727",
-   "self_type" : "type-9726",
+   "referenced_type" : "type-9754",
+   "self_type" : "type-9753",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44970,8 +45068,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-9872",
-   "self_type" : "type-9871",
+   "referenced_type" : "type-9898",
+   "self_type" : "type-9897",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44980,8 +45078,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-1152",
-   "self_type" : "type-1151",
+   "referenced_type" : "type-1155",
+   "self_type" : "type-1154",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44990,8 +45088,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-1345",
-   "self_type" : "type-1344",
+   "referenced_type" : "type-1348",
+   "self_type" : "type-1347",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45000,8 +45098,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-3436",
-   "self_type" : "type-3435",
+   "referenced_type" : "type-3439",
+   "self_type" : "type-3438",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45010,8 +45108,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-3591",
-   "self_type" : "type-3590",
+   "referenced_type" : "type-3594",
+   "self_type" : "type-3593",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45020,8 +45118,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-3755",
-   "self_type" : "type-3754",
+   "referenced_type" : "type-3761",
+   "self_type" : "type-3760",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45030,8 +45128,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-3897",
-   "self_type" : "type-3896",
+   "referenced_type" : "type-3903",
+   "self_type" : "type-3902",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45040,8 +45138,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-4445",
-   "self_type" : "type-4444",
+   "referenced_type" : "type-4451",
+   "self_type" : "type-4450",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45050,8 +45148,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-4650",
-   "self_type" : "type-4649",
+   "referenced_type" : "type-4657",
+   "self_type" : "type-4656",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45060,8 +45158,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-4821",
-   "self_type" : "type-4820",
+   "referenced_type" : "type-4827",
+   "self_type" : "type-4826",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45070,8 +45168,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-5357",
-   "self_type" : "type-5356",
+   "referenced_type" : "type-5363",
+   "self_type" : "type-5362",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45080,8 +45178,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-5512",
-   "self_type" : "type-5511",
+   "referenced_type" : "type-5518",
+   "self_type" : "type-5517",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45090,8 +45188,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-5676",
-   "self_type" : "type-5675",
+   "referenced_type" : "type-5685",
+   "self_type" : "type-5684",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45100,8 +45198,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-5818",
-   "self_type" : "type-5817",
+   "referenced_type" : "type-5827",
+   "self_type" : "type-5826",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45110,8 +45208,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-6342",
-   "self_type" : "type-6341",
+   "referenced_type" : "type-6351",
+   "self_type" : "type-6350",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45120,8 +45218,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-6534",
-   "self_type" : "type-6533",
+   "referenced_type" : "type-6544",
+   "self_type" : "type-6543",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45130,8 +45228,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-6687",
-   "self_type" : "type-6686",
+   "referenced_type" : "type-6696",
+   "self_type" : "type-6695",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45150,8 +45248,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-6831",
-   "self_type" : "type-6830",
+   "referenced_type" : "type-6840",
+   "self_type" : "type-6839",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45160,8 +45258,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-6981",
-   "self_type" : "type-6980",
+   "referenced_type" : "type-6990",
+   "self_type" : "type-6989",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45170,8 +45268,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-7160",
-   "self_type" : "type-7159",
+   "referenced_type" : "type-7169",
+   "self_type" : "type-7168",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45180,8 +45278,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-7394",
-   "self_type" : "type-7393",
+   "referenced_type" : "type-7253",
+   "self_type" : "type-7252",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45190,8 +45288,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-7673",
-   "self_type" : "type-7672",
+   "referenced_type" : "type-7416",
+   "self_type" : "type-7415",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45200,8 +45298,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-7828",
-   "self_type" : "type-7827",
+   "referenced_type" : "type-7694",
+   "self_type" : "type-7693",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45210,8 +45308,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-7992",
-   "self_type" : "type-7991",
+   "referenced_type" : "type-7849",
+   "self_type" : "type-7848",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45220,8 +45318,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-8134",
-   "self_type" : "type-8133",
+   "referenced_type" : "type-8016",
+   "self_type" : "type-8015",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45230,8 +45328,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-8281",
-   "self_type" : "type-8280",
+   "referenced_type" : "type-8158",
+   "self_type" : "type-8157",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45240,8 +45338,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-8414",
-   "self_type" : "type-8413",
+   "referenced_type" : "type-8305",
+   "self_type" : "type-8304",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45250,8 +45348,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-8547",
-   "self_type" : "type-8546",
+   "referenced_type" : "type-8438",
+   "self_type" : "type-8437",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45260,8 +45358,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8574",
+   "self_type" : "type-8573",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/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-8679",
+   "self_type" : "type-8678",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45280,8 +45388,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-9213",
-   "self_type" : "type-9212",
+   "referenced_type" : "type-9240",
+   "self_type" : "type-9239",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45290,8 +45398,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-9456",
-   "self_type" : "type-9455",
+   "referenced_type" : "type-9484",
+   "self_type" : "type-9483",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45300,8 +45408,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-9588",
-   "self_type" : "type-9587",
+   "referenced_type" : "type-9615",
+   "self_type" : "type-9614",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45310,18 +45418,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-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",
+   "referenced_type" : "type-9762",
+   "self_type" : "type-9761",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45340,8 +45438,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-1113",
-   "self_type" : "type-1112",
+   "referenced_type" : "type-1116",
+   "self_type" : "type-1115",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45350,8 +45448,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-1290",
-   "self_type" : "type-1289",
+   "referenced_type" : "type-1293",
+   "self_type" : "type-1292",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45360,8 +45458,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-3355",
-   "self_type" : "type-3354",
+   "referenced_type" : "type-3358",
+   "self_type" : "type-3357",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45370,8 +45468,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-3542",
-   "self_type" : "type-3541",
+   "referenced_type" : "type-3545",
+   "self_type" : "type-3544",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45380,8 +45478,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-3651",
-   "self_type" : "type-3650",
+   "referenced_type" : "type-3654",
+   "self_type" : "type-3653",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45390,8 +45488,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-3715",
-   "self_type" : "type-3714",
+   "referenced_type" : "type-3722",
+   "self_type" : "type-3721",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45400,8 +45498,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-3839",
-   "self_type" : "type-3838",
+   "referenced_type" : "type-3845",
+   "self_type" : "type-3844",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45410,8 +45508,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-4393",
-   "self_type" : "type-4392",
+   "referenced_type" : "type-4401",
+   "self_type" : "type-4400",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45420,8 +45518,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-4508",
-   "self_type" : "type-4507",
+   "referenced_type" : "type-4515",
+   "self_type" : "type-4514",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45430,8 +45528,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-4544",
-   "self_type" : "type-4543",
+   "referenced_type" : "type-4553",
+   "self_type" : "type-4552",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45440,8 +45538,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-4603",
-   "self_type" : "type-4602",
+   "referenced_type" : "type-4609",
+   "self_type" : "type-4608",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45450,8 +45548,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-4773",
-   "self_type" : "type-4772",
+   "referenced_type" : "type-4780",
+   "self_type" : "type-4779",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45460,8 +45558,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-4851",
-   "self_type" : "type-4850",
+   "referenced_type" : "type-4857",
+   "self_type" : "type-4856",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45470,8 +45568,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-5276",
-   "self_type" : "type-5275",
+   "referenced_type" : "type-5282",
+   "self_type" : "type-5281",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45490,8 +45588,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-5463",
-   "self_type" : "type-5462",
+   "referenced_type" : "type-5469",
+   "self_type" : "type-5468",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45500,8 +45598,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-5572",
-   "self_type" : "type-5571",
+   "referenced_type" : "type-5578",
+   "self_type" : "type-5577",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45510,8 +45608,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-5636",
-   "self_type" : "type-5635",
+   "referenced_type" : "type-5646",
+   "self_type" : "type-5645",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45520,8 +45618,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-5760",
-   "self_type" : "type-5759",
+   "referenced_type" : "type-5769",
+   "self_type" : "type-5768",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45530,8 +45628,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-6290",
-   "self_type" : "type-6289",
+   "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"
   },
@@ -45540,8 +45638,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-6392",
-   "self_type" : "type-6391",
+   "referenced_type" : "type-6402",
+   "self_type" : "type-6401",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45550,8 +45648,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-6428",
-   "self_type" : "type-6427",
+   "referenced_type" : "type-6440",
+   "self_type" : "type-6439",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45560,8 +45658,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-6487",
-   "self_type" : "type-6486",
+   "referenced_type" : "type-6496",
+   "self_type" : "type-6495",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45570,8 +45668,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-6639",
-   "self_type" : "type-6638",
+   "referenced_type" : "type-6649",
+   "self_type" : "type-6648",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45580,8 +45678,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-6715",
-   "self_type" : "type-6714",
+   "referenced_type" : "type-6724",
+   "self_type" : "type-6723",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45590,8 +45688,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-6742",
-   "self_type" : "type-6741",
+   "referenced_type" : "type-6751",
+   "self_type" : "type-6750",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45600,8 +45698,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-6833",
-   "self_type" : "type-6832",
+   "referenced_type" : "type-6842",
+   "self_type" : "type-6841",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45610,8 +45708,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-6877",
-   "self_type" : "type-6876",
+   "referenced_type" : "type-6886",
+   "self_type" : "type-6885",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45620,8 +45718,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-6983",
-   "self_type" : "type-6982",
+   "referenced_type" : "type-6992",
+   "self_type" : "type-6991",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45630,8 +45728,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-7056",
-   "self_type" : "type-7055",
+   "referenced_type" : "type-7064",
+   "self_type" : "type-7063",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45640,8 +45738,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-7113",
-   "self_type" : "type-7112",
+   "referenced_type" : "type-7122",
+   "self_type" : "type-7121",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45650,8 +45748,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-7288",
-   "self_type" : "type-7287",
+   "referenced_type" : "type-7255",
+   "self_type" : "type-7254",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45660,8 +45758,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-7342",
-   "self_type" : "type-7341",
+   "referenced_type" : "type-7308",
+   "self_type" : "type-7307",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45670,8 +45768,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-7592",
-   "self_type" : "type-7591",
+   "referenced_type" : "type-7364",
+   "self_type" : "type-7363",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45680,8 +45778,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-7779",
-   "self_type" : "type-7778",
+   "referenced_type" : "type-7613",
+   "self_type" : "type-7612",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45690,8 +45788,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-7888",
-   "self_type" : "type-7887",
+   "referenced_type" : "type-7800",
+   "self_type" : "type-7799",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45700,8 +45798,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-7952",
-   "self_type" : "type-7951",
+   "referenced_type" : "type-7909",
+   "self_type" : "type-7908",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45710,8 +45808,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-8076",
-   "self_type" : "type-8075",
+   "referenced_type" : "type-7977",
+   "self_type" : "type-7976",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45720,8 +45818,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-8232",
-   "self_type" : "type-8231",
+   "referenced_type" : "type-8100",
+   "self_type" : "type-8099",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45730,8 +45828,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-8365",
-   "self_type" : "type-8364",
+   "referenced_type" : "type-8257",
+   "self_type" : "type-8256",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45740,8 +45838,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-8461",
-   "self_type" : "type-8460",
+   "referenced_type" : "type-8389",
+   "self_type" : "type-8388",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45750,8 +45848,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-8507",
-   "self_type" : "type-8506",
+   "referenced_type" : "type-8485",
+   "self_type" : "type-8484",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45760,8 +45858,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8535",
+   "self_type" : "type-8534",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-8627",
+   "self_type" : "type-8626",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45780,8 +45888,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-9155",
-   "self_type" : "type-9154",
+   "referenced_type" : "type-9185",
+   "self_type" : "type-9184",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45790,8 +45898,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-9274",
-   "self_type" : "type-9273",
+   "referenced_type" : "type-9303",
+   "self_type" : "type-9302",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45800,8 +45908,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-9325",
-   "self_type" : "type-9324",
+   "referenced_type" : "type-9354",
+   "self_type" : "type-9353",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45810,8 +45918,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-9403",
-   "self_type" : "type-9402",
+   "referenced_type" : "type-9432",
+   "self_type" : "type-9431",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45820,8 +45928,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-9544",
-   "self_type" : "type-9543",
+   "referenced_type" : "type-9571",
+   "self_type" : "type-9570",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45830,8 +45938,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-9608",
-   "self_type" : "type-9607",
+   "referenced_type" : "type-9637",
+   "self_type" : "type-9636",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45840,8 +45948,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-9648",
-   "self_type" : "type-9647",
+   "referenced_type" : "type-9676",
+   "self_type" : "type-9675",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45850,8 +45958,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-9737",
-   "self_type" : "type-9736",
+   "referenced_type" : "type-9764",
+   "self_type" : "type-9763",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45860,18 +45968,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-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",
+   "referenced_type" : "type-9804",
+   "self_type" : "type-9803",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45880,8 +45978,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-4760",
-   "self_type" : "type-4759",
+   "referenced_type" : "type-4767",
+   "self_type" : "type-4766",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -45890,8 +45988,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-4864",
-   "self_type" : "type-4863",
+   "referenced_type" : "type-4870",
+   "self_type" : "type-4869",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -45900,8 +45998,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-6626",
-   "self_type" : "type-6625",
+   "referenced_type" : "type-6636",
+   "self_type" : "type-6635",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -45910,8 +46008,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-6728",
-   "self_type" : "type-6727",
+   "referenced_type" : "type-6737",
+   "self_type" : "type-6736",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -45920,188 +46018,228 @@
    "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-6860",
+   "self_type" : "type-6859",
+   "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-7007",
+   "self_type" : "type-7006",
+   "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-7083",
+   "self_type" : "type-7082",
+   "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-7269",
+   "self_type" : "type-7268",
+   "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-7320",
+   "self_type" : "type-7319",
+   "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-9561",
+   "self_type" : "type-9560",
+   "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-9656",
+   "self_type" : "type-9655",
+   "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-9781",
+   "self_type" : "type-9780",
+   "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-2647",
+   "self_type" : "type-2646",
+   "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-4994",
+   "self_type" : "type-4993",
+   "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-7199",
+   "self_type" : "type-7198",
+   "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-8222",
+   "self_type" : "type-8221",
+   "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-9709",
+   "self_type" : "type-9708",
+   "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-2643",
+   "self_type" : "type-2642",
+   "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-4990",
+   "self_type" : "type-4989",
+   "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-7195",
+   "self_type" : "type-7194",
+   "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-8217",
+   "self_type" : "type-8216",
+   "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-9697",
+   "self_type" : "type-9696",
+   "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-4759",
+   "self_type" : "type-4758",
+   "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-4866",
+   "self_type" : "type-4865",
+   "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-6629",
+   "self_type" : "type-6628",
+   "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-6733",
+   "self_type" : "type-6732",
+   "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-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"
   },
@@ -46110,8 +46248,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-4860",
-   "self_type" : "type-4859",
+   "referenced_type" : "type-6996",
+   "self_type" : "type-6995",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -46120,8 +46258,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-6620",
-   "self_type" : "type-6619",
+   "referenced_type" : "type-7077",
+   "self_type" : "type-7076",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -46130,8 +46268,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-6724",
-   "self_type" : "type-6723",
+   "referenced_type" : "type-7259",
+   "self_type" : "type-7258",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -46140,8 +46278,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-6841",
-   "self_type" : "type-6840",
+   "referenced_type" : "type-7316",
+   "self_type" : "type-7315",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -46150,8 +46288,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-6987",
-   "self_type" : "type-6986",
+   "referenced_type" : "type-9555",
+   "self_type" : "type-9554",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -46160,8 +46298,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-7069",
-   "self_type" : "type-7068",
+   "referenced_type" : "type-9650",
+   "self_type" : "type-9649",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -46170,48 +46308,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-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",
+   "referenced_type" : "type-9772",
+   "self_type" : "type-9771",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -46220,8 +46318,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-1644",
-   "self_type" : "type-1643",
+   "referenced_type" : "type-1647",
+   "self_type" : "type-1646",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -46230,8 +46328,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-4105",
-   "self_type" : "type-4104",
+   "referenced_type" : "type-4112",
+   "self_type" : "type-4111",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -46240,8 +46338,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-6026",
-   "self_type" : "type-6025",
+   "referenced_type" : "type-6036",
+   "self_type" : "type-6035",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -46250,8 +46348,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-8854",
-   "self_type" : "type-8853",
+   "referenced_type" : "type-8881",
+   "self_type" : "type-8880",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -46270,8 +46368,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1108",
-   "self_type" : "type-1107",
+   "referenced_type" : "type-1111",
+   "self_type" : "type-1110",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46280,8 +46378,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1280",
-   "self_type" : "type-1279",
+   "referenced_type" : "type-1283",
+   "self_type" : "type-1282",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46290,8 +46388,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-3275",
+   "self_type" : "type-3274",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46300,8 +46398,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-3539",
+   "self_type" : "type-3538",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46310,8 +46408,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-3649",
+   "self_type" : "type-3648",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46320,8 +46418,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-3715",
+   "self_type" : "type-3714",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46330,8 +46428,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-3837",
+   "self_type" : "type-3836",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46350,8 +46448,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-4358",
+   "self_type" : "type-4357",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46360,8 +46458,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-4493",
+   "self_type" : "type-4492",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46370,8 +46468,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-4562",
+   "self_type" : "type-4561",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46380,8 +46478,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-4624",
+   "self_type" : "type-4623",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46390,8 +46488,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-4667",
+   "self_type" : "type-4666",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46400,8 +46498,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-4874",
+   "self_type" : "type-4873",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46410,8 +46508,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-5199",
+   "self_type" : "type-5198",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46420,8 +46518,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-5463",
+   "self_type" : "type-5462",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46430,8 +46528,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-5573",
+   "self_type" : "type-5572",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46440,8 +46538,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-5639",
+   "self_type" : "type-5638",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46450,8 +46548,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-5761",
+   "self_type" : "type-5760",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46460,8 +46558,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6261",
+   "self_type" : "type-6260",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46470,8 +46568,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6382",
+   "self_type" : "type-6381",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46480,8 +46578,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6449",
+   "self_type" : "type-6448",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46490,8 +46588,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6511",
+   "self_type" : "type-6510",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46500,8 +46598,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6552",
+   "self_type" : "type-6551",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46510,8 +46608,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6741",
+   "self_type" : "type-6740",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46520,8 +46618,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6760",
+   "self_type" : "type-6759",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46530,8 +46628,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6766",
+   "self_type" : "type-6765",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46540,8 +46638,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6898",
+   "self_type" : "type-6897",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46550,8 +46648,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6908",
+   "self_type" : "type-6907",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46560,8 +46658,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7087",
+   "self_type" : "type-7086",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46570,8 +46668,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7117",
+   "self_type" : "type-7116",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46580,8 +46678,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7324",
+   "self_type" : "type-7323",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46590,8 +46688,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7354",
+   "self_type" : "type-7353",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46600,8 +46698,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7530",
+   "self_type" : "type-7529",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46610,8 +46708,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7794",
+   "self_type" : "type-7793",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46620,8 +46718,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7904",
+   "self_type" : "type-7903",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46630,8 +46728,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7970",
+   "self_type" : "type-7969",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46640,8 +46738,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-8092",
+   "self_type" : "type-8091",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46650,8 +46748,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-8247",
+   "self_type" : "type-8246",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46660,8 +46758,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-8384",
+   "self_type" : "type-8383",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46670,8 +46768,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-8480",
+   "self_type" : "type-8479",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46680,18 +46778,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-8527",
+   "self_type" : "type-8526",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46710,8 +46798,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-8619",
+   "self_type" : "type-8618",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46720,8 +46808,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-9140",
+   "self_type" : "type-9139",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46730,8 +46818,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-9278",
+   "self_type" : "type-9277",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46740,8 +46828,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-9367",
+   "self_type" : "type-9366",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46750,8 +46838,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-9448",
+   "self_type" : "type-9447",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46760,8 +46848,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-9493",
+   "self_type" : "type-9492",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46770,8 +46858,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-9661",
+   "self_type" : "type-9660",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46780,8 +46868,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-9686",
+   "self_type" : "type-9685",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46790,8 +46878,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-9691",
+   "self_type" : "type-9690",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46800,8 +46888,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-9800",
-   "self_type" : "type-9799",
+   "referenced_type" : "type-9817",
+   "self_type" : "type-9816",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-9828",
+   "self_type" : "type-9827",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46810,8 +46908,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-4376",
-   "self_type" : "type-4375",
+   "referenced_type" : "type-4383",
+   "self_type" : "type-4382",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -46820,8 +46918,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-4505",
-   "self_type" : "type-4504",
+   "referenced_type" : "type-4511",
+   "self_type" : "type-4510",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -46830,8 +46928,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-6273",
-   "self_type" : "type-6272",
+   "referenced_type" : "type-6283",
+   "self_type" : "type-6282",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -46840,8 +46938,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-6389",
-   "self_type" : "type-6388",
+   "referenced_type" : "type-6398",
+   "self_type" : "type-6397",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -46850,8 +46948,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-9136",
-   "self_type" : "type-9135",
+   "referenced_type" : "type-9164",
+   "self_type" : "type-9163",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -46860,8 +46958,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-9269",
-   "self_type" : "type-9268",
+   "referenced_type" : "type-9298",
+   "self_type" : "type-9297",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -46901,7 +46999,7 @@
    "linker_set_key" : "const unsigned short",
    "name" : "const unsigned short",
    "referenced_type" : "type-497",
-   "self_type" : "type-2520",
+   "self_type" : "type-2523",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -46929,7 +47027,7 @@
    "linker_set_key" : "volatile int",
    "name" : "volatile int",
    "referenced_type" : "type-4",
-   "self_type" : "type-1250",
+   "self_type" : "type-1253",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h"
   }
@@ -46947,7 +47045,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -46962,8 +47060,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_BALANCETYPE",
    "name" : "OMX_AUDIO_CONFIG_BALANCETYPE",
-   "referenced_type" : "type-2184",
-   "self_type" : "type-2184",
+   "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_BALANCETYPE"
@@ -46979,7 +47077,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -46989,7 +47087,7 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nBass",
@@ -46999,8 +47097,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_BASSTYPE",
    "name" : "OMX_AUDIO_CONFIG_BASSTYPE",
-   "referenced_type" : "type-2188",
-   "self_type" : "type-2188",
+   "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_BASSTYPE"
@@ -47016,7 +47114,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47031,18 +47129,18 @@
     {
      "field_name" : "bMute",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bIsMIDI",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
    "name" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
-   "referenced_type" : "type-2186",
-   "self_type" : "type-2186",
+   "referenced_type" : "type-2189",
+   "self_type" : "type-2189",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE"
@@ -47058,7 +47156,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47073,23 +47171,23 @@
     {
      "field_name" : "bLinear",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "sVolume",
      "field_offset" : 160,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     },
     {
      "field_name" : "bIsMIDI",
      "field_offset" : 256,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
    "name" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
-   "referenced_type" : "type-2183",
-   "self_type" : "type-2183",
+   "referenced_type" : "type-2186",
+   "self_type" : "type-2186",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE"
@@ -47105,7 +47203,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47115,17 +47213,17 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "sDelay",
      "field_offset" : 128,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "sModulationRate",
      "field_offset" : 224,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "nModulationDepth",
@@ -47135,13 +47233,13 @@
     {
      "field_name" : "nFeedback",
      "field_offset" : 352,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
    "name" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
-   "referenced_type" : "type-2194",
-   "self_type" : "type-2194",
+   "referenced_type" : "type-2197",
+   "self_type" : "type-2197",
    "size" : 56,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHORUSTYPE"
@@ -47157,7 +47255,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47167,13 +47265,13 @@
     {
      "field_name" : "eEchoCancelation",
      "field_offset" : 96,
-     "referenced_type" : "type-2196"
+     "referenced_type" : "type-2199"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
-   "referenced_type" : "type-2197",
-   "self_type" : "type-2197",
+   "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_ECHOCANCELATIONTYPE"
@@ -47189,7 +47287,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47199,28 +47297,28 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "sBandIndex",
      "field_offset" : 128,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "sCenterFreq",
      "field_offset" : 224,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "sBandLevel",
      "field_offset" : 320,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
    "name" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
-   "referenced_type" : "type-2191",
-   "self_type" : "type-2191",
+   "referenced_type" : "type-2194",
+   "self_type" : "type-2194",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE"
@@ -47236,7 +47334,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47246,13 +47344,13 @@
     {
      "field_name" : "bLoudness",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
    "name" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
-   "referenced_type" : "type-2187",
-   "self_type" : "type-2187",
+   "referenced_type" : "type-2190",
+   "self_type" : "type-2190",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE"
@@ -47268,7 +47366,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47278,17 +47376,17 @@
     {
      "field_name" : "sPitchTransposition",
      "field_offset" : 96,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     },
     {
      "field_name" : "sPlayBackRate",
      "field_offset" : 192,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "sTempo",
      "field_offset" : 288,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "nMaxPolyphony",
@@ -47338,8 +47436,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
-   "referenced_type" : "type-2165",
-   "self_type" : "type-2165",
+   "referenced_type" : "type-2157",
+   "self_type" : "type-2157",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE"
@@ -47355,7 +47453,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47370,13 +47468,13 @@
     {
      "field_name" : "nMidiEvents",
      "field_offset" : 128,
-     "referenced_type" : "type-1572"
+     "referenced_type" : "type-1567"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
-   "referenced_type" : "type-2143",
-   "self_type" : "type-2143",
+   "referenced_type" : "type-2135",
+   "self_type" : "type-2135",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE"
@@ -47392,7 +47490,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47412,13 +47510,13 @@
     {
      "field_name" : "nData",
      "field_offset" : 160,
-     "referenced_type" : "type-1572"
+     "referenced_type" : "type-1567"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
-   "referenced_type" : "type-2181",
-   "self_type" : "type-2181",
+   "referenced_type" : "type-2184",
+   "self_type" : "type-2184",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE"
@@ -47434,7 +47532,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47469,8 +47567,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
-   "referenced_type" : "type-2176",
-   "self_type" : "type-2176",
+   "referenced_type" : "type-2179",
+   "self_type" : "type-2179",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE"
@@ -47486,7 +47584,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47516,8 +47614,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
-   "referenced_type" : "type-2154",
-   "self_type" : "type-2154",
+   "referenced_type" : "type-2146",
+   "self_type" : "type-2146",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE"
@@ -47533,7 +47631,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47558,7 +47656,7 @@
     {
      "field_name" : "bVibra",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nNumMetaEvents",
@@ -47573,13 +47671,13 @@
     {
      "field_name" : "eMIDIPlayBackState",
      "field_offset" : 288,
-     "referenced_type" : "type-2169"
+     "referenced_type" : "type-2168"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
-   "referenced_type" : "type-2170",
-   "self_type" : "type-2170",
+   "referenced_type" : "type-2173",
+   "self_type" : "type-2173",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE"
@@ -47595,7 +47693,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47605,13 +47703,13 @@
     {
      "field_name" : "bMute",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MUTETYPE",
    "name" : "OMX_AUDIO_CONFIG_MUTETYPE",
-   "referenced_type" : "type-2185",
-   "self_type" : "type-2185",
+   "referenced_type" : "type-2188",
+   "self_type" : "type-2188",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MUTETYPE"
@@ -47627,7 +47725,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47637,13 +47735,13 @@
     {
      "field_name" : "bNoiseReduction",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
-   "referenced_type" : "type-2198",
-   "self_type" : "type-2198",
+   "referenced_type" : "type-2201",
+   "self_type" : "type-2201",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE"
@@ -47659,7 +47757,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47669,47 +47767,47 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "sRoomLevel",
      "field_offset" : 128,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     },
     {
      "field_name" : "sRoomHighFreqLevel",
      "field_offset" : 224,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     },
     {
      "field_name" : "sReflectionsLevel",
      "field_offset" : 320,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     },
     {
      "field_name" : "sReflectionsDelay",
      "field_offset" : 416,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "sReverbLevel",
      "field_offset" : 512,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     },
     {
      "field_name" : "sReverbDelay",
      "field_offset" : 608,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "sDecayTime",
      "field_offset" : 704,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "nDecayHighFreqRatio",
      "field_offset" : 800,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "nDensity",
@@ -47724,13 +47822,13 @@
     {
      "field_name" : "sReferenceHighFreq",
      "field_offset" : 960,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
-   "referenced_type" : "type-2195",
-   "self_type" : "type-2195",
+   "referenced_type" : "type-2198",
+   "self_type" : "type-2198",
    "size" : 132,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE"
@@ -47746,7 +47844,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47756,12 +47854,12 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eWideningType",
      "field_offset" : 128,
-     "referenced_type" : "type-2192"
+     "referenced_type" : "type-2195"
     },
     {
      "field_name" : "nStereoWidening",
@@ -47771,8 +47869,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
    "name" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-2193",
-   "self_type" : "type-2193",
+   "referenced_type" : "type-2196",
+   "self_type" : "type-2196",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE"
@@ -47788,7 +47886,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47798,7 +47896,7 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nTreble",
@@ -47808,8 +47906,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_TREBLETYPE",
    "name" : "OMX_AUDIO_CONFIG_TREBLETYPE",
-   "referenced_type" : "type-2189",
-   "self_type" : "type-2189",
+   "referenced_type" : "type-2192",
+   "self_type" : "type-2192",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_TREBLETYPE"
@@ -47825,7 +47923,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47835,18 +47933,18 @@
     {
      "field_name" : "bLinear",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "sVolume",
      "field_offset" : 128,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
    "name" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
-   "referenced_type" : "type-2182",
-   "self_type" : "type-2182",
+   "referenced_type" : "type-2185",
+   "self_type" : "type-2185",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_VOLUMETYPE"
@@ -47862,7 +47960,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47907,23 +48005,23 @@
     {
      "field_name" : "eAACProfile",
      "field_offset" : 320,
-     "referenced_type" : "type-1676"
+     "referenced_type" : "type-1671"
     },
     {
      "field_name" : "eAACStreamFormat",
      "field_offset" : 352,
-     "referenced_type" : "type-1668"
+     "referenced_type" : "type-1670"
     },
     {
      "field_name" : "eChannelMode",
      "field_offset" : 384,
-     "referenced_type" : "type-1652"
+     "referenced_type" : "type-1651"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
    "name" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
-   "referenced_type" : "type-1687",
-   "self_type" : "type-1687",
+   "referenced_type" : "type-1679",
+   "self_type" : "type-1679",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_AACPROFILETYPE"
@@ -47939,7 +48037,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47964,8 +48062,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_ADPCMTYPE",
    "name" : "OMX_AUDIO_PARAM_ADPCMTYPE",
-   "referenced_type" : "type-1798",
-   "self_type" : "type-1798",
+   "referenced_type" : "type-1789",
+   "self_type" : "type-1789",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_ADPCMTYPE"
@@ -47981,7 +48079,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48001,23 +48099,23 @@
     {
      "field_name" : "eAMRBandMode",
      "field_offset" : 160,
-     "referenced_type" : "type-1890"
+     "referenced_type" : "type-1881"
     },
     {
      "field_name" : "eAMRDTXMode",
      "field_offset" : 192,
-     "referenced_type" : "type-1901"
+     "referenced_type" : "type-1892"
     },
     {
      "field_name" : "eAMRFrameFormat",
      "field_offset" : 224,
-     "referenced_type" : "type-1877"
+     "referenced_type" : "type-1862"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_AMRTYPE",
    "name" : "OMX_AUDIO_PARAM_AMRTYPE",
-   "referenced_type" : "type-1912",
-   "self_type" : "type-1912",
+   "referenced_type" : "type-1903",
+   "self_type" : "type-1903",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_AMRTYPE"
@@ -48033,7 +48131,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48048,12 +48146,12 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-2021"
+     "referenced_type" : "type-2013"
     },
     {
      "field_name" : "bRATE_REDUCon",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nMinBitRate",
@@ -48068,23 +48166,23 @@
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 256,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bNoiseSuppressor",
      "field_offset" : 288,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_EVRCTYPE",
    "name" : "OMX_AUDIO_PARAM_EVRCTYPE",
-   "referenced_type" : "type-2055",
-   "self_type" : "type-2055",
+   "referenced_type" : "type-2046",
+   "self_type" : "type-2046",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_EVRCTYPE"
@@ -48100,7 +48198,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48125,8 +48223,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_FLACTYPE",
    "name" : "OMX_AUDIO_PARAM_FLACTYPE",
-   "referenced_type" : "type-1709",
-   "self_type" : "type-1709",
+   "referenced_type" : "type-1700",
+   "self_type" : "type-1700",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_FLACTYPE"
@@ -48142,7 +48240,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48157,28 +48255,28 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eBitRate",
      "field_offset" : 160,
-     "referenced_type" : "type-1808"
+     "referenced_type" : "type-1799"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G723TYPE",
    "name" : "OMX_AUDIO_PARAM_G723TYPE",
-   "referenced_type" : "type-1818",
-   "self_type" : "type-1818",
+   "referenced_type" : "type-1812",
+   "self_type" : "type-1812",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G723TYPE"
@@ -48194,7 +48292,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48209,13 +48307,13 @@
     {
      "field_name" : "eG726Mode",
      "field_offset" : 128,
-     "referenced_type" : "type-1831"
+     "referenced_type" : "type-1822"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G726TYPE",
    "name" : "OMX_AUDIO_PARAM_G726TYPE",
-   "referenced_type" : "type-1841",
-   "self_type" : "type-1841",
+   "referenced_type" : "type-1832",
+   "self_type" : "type-1832",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G726TYPE"
@@ -48231,7 +48329,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48246,18 +48344,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eBitType",
      "field_offset" : 160,
-     "referenced_type" : "type-1851"
+     "referenced_type" : "type-1845"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G729TYPE",
    "name" : "OMX_AUDIO_PARAM_G729TYPE",
-   "referenced_type" : "type-1860",
-   "self_type" : "type-1860",
+   "referenced_type" : "type-1855",
+   "self_type" : "type-1855",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G729TYPE"
@@ -48273,7 +48371,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48283,18 +48381,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
-   "referenced_type" : "type-1945",
-   "self_type" : "type-1945",
+   "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_GSMEFRTYPE"
@@ -48310,7 +48408,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48320,18 +48418,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMFRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMFRTYPE",
-   "referenced_type" : "type-1923",
-   "self_type" : "type-1923",
+   "referenced_type" : "type-1914",
+   "self_type" : "type-1914",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_GSMFRTYPE"
@@ -48347,7 +48445,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48357,18 +48455,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMHRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMHRTYPE",
-   "referenced_type" : "type-1934",
-   "self_type" : "type-1934",
+   "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_GSMHRTYPE"
@@ -48384,7 +48482,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48409,18 +48507,18 @@
     {
      "field_name" : "eMidiSoundBank",
      "field_offset" : 192,
-     "referenced_type" : "type-2111"
+     "referenced_type" : "type-2102"
     },
     {
      "field_name" : "eMidiSoundBankLayout",
      "field_offset" : 224,
-     "referenced_type" : "type-2121"
+     "referenced_type" : "type-2113"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
    "name" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
-   "referenced_type" : "type-2132",
-   "self_type" : "type-2132",
+   "referenced_type" : "type-2124",
+   "self_type" : "type-2124",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE"
@@ -48436,7 +48534,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48451,23 +48549,23 @@
     {
      "field_name" : "sMaxPolyphony",
      "field_offset" : 128,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "bLoadDefaultSound",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eMidiFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-2087"
+     "referenced_type" : "type-2079"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MIDITYPE",
    "name" : "OMX_AUDIO_PARAM_MIDITYPE",
-   "referenced_type" : "type-2098",
-   "self_type" : "type-2098",
+   "referenced_type" : "type-2090",
+   "self_type" : "type-2090",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MIDITYPE"
@@ -48483,7 +48581,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48513,18 +48611,18 @@
     {
      "field_name" : "eChannelMode",
      "field_offset" : 224,
-     "referenced_type" : "type-1652"
+     "referenced_type" : "type-1651"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-1660"
+     "referenced_type" : "type-1656"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MP3TYPE",
    "name" : "OMX_AUDIO_PARAM_MP3TYPE",
-   "referenced_type" : "type-1666",
-   "self_type" : "type-1666",
+   "referenced_type" : "type-1664",
+   "self_type" : "type-1664",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MP3TYPE"
@@ -48540,7 +48638,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48560,12 +48658,12 @@
     {
      "field_name" : "eEndian",
      "field_offset" : 160,
-     "referenced_type" : "type-1460"
+     "referenced_type" : "type-1459"
     },
     {
      "field_name" : "bInterleaved",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nBitPerSample",
@@ -48580,18 +48678,18 @@
     {
      "field_name" : "ePCMMode",
      "field_offset" : 288,
-     "referenced_type" : "type-1633"
+     "referenced_type" : "type-1628"
     },
     {
      "field_name" : "eChannelMapping",
      "field_offset" : 320,
-     "referenced_type" : "type-1642"
+     "referenced_type" : "type-1641"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PCMMODETYPE",
    "name" : "OMX_AUDIO_PARAM_PCMMODETYPE",
-   "referenced_type" : "type-1641",
-   "self_type" : "type-1641",
+   "referenced_type" : "type-1640",
+   "self_type" : "type-1640",
    "size" : 104,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PCMMODETYPE"
@@ -48607,7 +48705,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48622,18 +48720,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
-   "referenced_type" : "type-2000",
-   "self_type" : "type-2000",
+   "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_PDCEFRTYPE"
@@ -48649,7 +48747,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48664,18 +48762,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCFRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCFRTYPE",
-   "referenced_type" : "type-1989",
-   "self_type" : "type-1989",
+   "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_PDCFRTYPE"
@@ -48691,7 +48789,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48706,18 +48804,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCHRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCHRTYPE",
-   "referenced_type" : "type-2011",
-   "self_type" : "type-2011",
+   "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_PDCHRTYPE"
@@ -48733,7 +48831,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48748,7 +48846,7 @@
     {
      "field_name" : "eEncoding",
      "field_offset" : 128,
-     "referenced_type" : "type-1618"
+     "referenced_type" : "type-1616"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PORTFORMATTYPE",
@@ -48770,7 +48868,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48785,7 +48883,7 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-2021"
+     "referenced_type" : "type-2013"
     },
     {
      "field_name" : "nMinBitRate",
@@ -48800,8 +48898,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_QCELP13TYPE",
    "name" : "OMX_AUDIO_PARAM_QCELP13TYPE",
-   "referenced_type" : "type-2043",
-   "self_type" : "type-2043",
+   "referenced_type" : "type-2035",
+   "self_type" : "type-2035",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_QCELP13TYPE"
@@ -48817,7 +48915,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48837,7 +48935,7 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 160,
-     "referenced_type" : "type-2021"
+     "referenced_type" : "type-2013"
     },
     {
      "field_name" : "nMinBitRate",
@@ -48852,8 +48950,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_QCELP8TYPE",
    "name" : "OMX_AUDIO_PARAM_QCELP8TYPE",
-   "referenced_type" : "type-2032",
-   "self_type" : "type-2032",
+   "referenced_type" : "type-2024",
+   "self_type" : "type-2024",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_QCELP8TYPE"
@@ -48869,7 +48967,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48914,13 +49012,13 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 320,
-     "referenced_type" : "type-1752"
+     "referenced_type" : "type-1746"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_RATYPE",
    "name" : "OMX_AUDIO_PARAM_RATYPE",
-   "referenced_type" : "type-1765",
-   "self_type" : "type-1765",
+   "referenced_type" : "type-1756",
+   "self_type" : "type-1756",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_RATYPE"
@@ -48936,7 +49034,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48976,23 +49074,23 @@
     {
      "field_name" : "bEnableBitrate",
      "field_offset" : 288,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eChannelMode",
      "field_offset" : 320,
-     "referenced_type" : "type-1652"
+     "referenced_type" : "type-1651"
     },
     {
      "field_name" : "eSBCAllocType",
      "field_offset" : 352,
-     "referenced_type" : "type-1775"
+     "referenced_type" : "type-1766"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_SBCTYPE",
    "name" : "OMX_AUDIO_PARAM_SBCTYPE",
-   "referenced_type" : "type-1785",
-   "self_type" : "type-1785",
+   "referenced_type" : "type-1779",
+   "self_type" : "type-1779",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_SBCTYPE"
@@ -49008,7 +49106,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -49023,12 +49121,12 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-2021"
+     "referenced_type" : "type-2013"
     },
     {
      "field_name" : "bRATE_REDUCon",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nMinBitRate",
@@ -49043,23 +49141,23 @@
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 256,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bNoiseSuppressor",
      "field_offset" : 288,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_SMVTYPE",
    "name" : "OMX_AUDIO_PARAM_SMVTYPE",
-   "referenced_type" : "type-2065",
-   "self_type" : "type-2065",
+   "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_SMVTYPE"
@@ -49075,7 +49173,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -49090,18 +49188,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
-   "referenced_type" : "type-1978",
-   "self_type" : "type-1978",
+   "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_TDMAEFRTYPE"
@@ -49117,7 +49215,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -49132,18 +49230,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
    "name" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
-   "referenced_type" : "type-1967",
-   "self_type" : "type-1967",
+   "referenced_type" : "type-1958",
+   "self_type" : "type-1958",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_TDMAFRTYPE"
@@ -49159,7 +49257,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -49204,18 +49302,18 @@
     {
      "field_name" : "bManaged",
      "field_offset" : 320,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bDownmix",
      "field_offset" : 352,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_VORBISTYPE",
    "name" : "OMX_AUDIO_PARAM_VORBISTYPE",
-   "referenced_type" : "type-1698",
-   "self_type" : "type-1698",
+   "referenced_type" : "type-1689",
+   "self_type" : "type-1689",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_VORBISTYPE"
@@ -49231,7 +49329,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -49251,12 +49349,12 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-1719"
+     "referenced_type" : "type-1711"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 192,
-     "referenced_type" : "type-1732"
+     "referenced_type" : "type-1722"
     },
     {
      "field_name" : "nSamplingRate",
@@ -49281,8 +49379,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_WMATYPE",
    "name" : "OMX_AUDIO_PARAM_WMATYPE",
-   "referenced_type" : "type-1742",
-   "self_type" : "type-1742",
+   "referenced_type" : "type-1733",
+   "self_type" : "type-1733",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_WMATYPE"
@@ -49303,18 +49401,18 @@
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 64,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eEncoding",
      "field_offset" : 96,
-     "referenced_type" : "type-1618"
+     "referenced_type" : "type-1616"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PORTDEFINITIONTYPE",
    "name" : "OMX_AUDIO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-1619",
-   "self_type" : "type-1619",
+   "referenced_type" : "type-1621",
+   "self_type" : "type-1621",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PORTDEFINITIONTYPE"
@@ -49340,8 +49438,8 @@
    ],
    "linker_set_key" : "OMX_BS32",
    "name" : "OMX_BS32",
-   "referenced_type" : "type-1470",
-   "self_type" : "type-1470",
+   "referenced_type" : "type-1473",
+   "self_type" : "type-1473",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_BS32"
@@ -49367,8 +49465,8 @@
    ],
    "linker_set_key" : "OMX_BU32",
    "name" : "OMX_BU32",
-   "referenced_type" : "type-1469",
-   "self_type" : "type-1469",
+   "referenced_type" : "type-1468",
+   "self_type" : "type-1468",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_BU32"
@@ -49384,7 +49482,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "pBuffer",
@@ -49464,8 +49562,8 @@
    ],
    "linker_set_key" : "OMX_BUFFERHEADERTYPE",
    "name" : "OMX_BUFFERHEADERTYPE",
-   "referenced_type" : "type-1540",
-   "self_type" : "type-1540",
+   "referenced_type" : "type-1536",
+   "self_type" : "type-1536",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_BUFFERHEADERTYPE"
@@ -49476,23 +49574,23 @@
    [
     {
      "field_name" : "EventHandler",
-     "referenced_type" : "type-1591"
+     "referenced_type" : "type-1594"
     },
     {
      "field_name" : "EmptyBufferDone",
      "field_offset" : 32,
-     "referenced_type" : "type-1593"
+     "referenced_type" : "type-1596"
     },
     {
      "field_name" : "FillBufferDone",
      "field_offset" : 64,
-     "referenced_type" : "type-1593"
+     "referenced_type" : "type-1596"
     }
    ],
    "linker_set_key" : "OMX_CALLBACKTYPE",
    "name" : "OMX_CALLBACKTYPE",
-   "referenced_type" : "type-1590",
-   "self_type" : "type-1590",
+   "referenced_type" : "type-1593",
+   "self_type" : "type-1593",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_CALLBACKTYPE"
@@ -49508,13 +49606,13 @@
     {
      "field_name" : "pInitialize",
      "field_offset" : 32,
-     "referenced_type" : "type-1500"
+     "referenced_type" : "type-1499"
     }
    ],
    "linker_set_key" : "OMX_COMPONENTREGISTERTYPE",
    "name" : "OMX_COMPONENTREGISTERTYPE",
-   "referenced_type" : "type-1499",
-   "self_type" : "type-1499",
+   "referenced_type" : "type-1498",
+   "self_type" : "type-1498",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_COMPONENTREGISTERTYPE"
@@ -49530,7 +49628,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "pComponentPrivate",
@@ -49545,98 +49643,98 @@
     {
      "field_name" : "GetComponentVersion",
      "field_offset" : 128,
-     "referenced_type" : "type-2357"
+     "referenced_type" : "type-2360"
     },
     {
      "field_name" : "SendCommand",
      "field_offset" : 160,
-     "referenced_type" : "type-2361"
+     "referenced_type" : "type-2364"
     },
     {
      "field_name" : "GetParameter",
      "field_offset" : 192,
-     "referenced_type" : "type-2363"
+     "referenced_type" : "type-2366"
     },
     {
      "field_name" : "SetParameter",
      "field_offset" : 224,
-     "referenced_type" : "type-2363"
+     "referenced_type" : "type-2366"
     },
     {
      "field_name" : "GetConfig",
      "field_offset" : 256,
-     "referenced_type" : "type-2363"
+     "referenced_type" : "type-2366"
     },
     {
      "field_name" : "SetConfig",
      "field_offset" : 288,
-     "referenced_type" : "type-2363"
+     "referenced_type" : "type-2366"
     },
     {
      "field_name" : "GetExtensionIndex",
      "field_offset" : 320,
-     "referenced_type" : "type-2365"
+     "referenced_type" : "type-2368"
     },
     {
      "field_name" : "GetState",
      "field_offset" : 352,
-     "referenced_type" : "type-2368"
+     "referenced_type" : "type-2371"
     },
     {
      "field_name" : "ComponentTunnelRequest",
      "field_offset" : 384,
-     "referenced_type" : "type-2371"
+     "referenced_type" : "type-2374"
     },
     {
      "field_name" : "UseBuffer",
      "field_offset" : 416,
-     "referenced_type" : "type-2374"
+     "referenced_type" : "type-2377"
     },
     {
      "field_name" : "AllocateBuffer",
      "field_offset" : 448,
-     "referenced_type" : "type-2377"
+     "referenced_type" : "type-2380"
     },
     {
      "field_name" : "FreeBuffer",
      "field_offset" : 480,
-     "referenced_type" : "type-2379"
+     "referenced_type" : "type-2382"
     },
     {
      "field_name" : "EmptyThisBuffer",
      "field_offset" : 512,
-     "referenced_type" : "type-2381"
+     "referenced_type" : "type-2384"
     },
     {
      "field_name" : "FillThisBuffer",
      "field_offset" : 544,
-     "referenced_type" : "type-2381"
+     "referenced_type" : "type-2384"
     },
     {
      "field_name" : "SetCallbacks",
      "field_offset" : 576,
-     "referenced_type" : "type-2383"
+     "referenced_type" : "type-2386"
     },
     {
      "field_name" : "ComponentDeInit",
      "field_offset" : 608,
-     "referenced_type" : "type-1500"
+     "referenced_type" : "type-1499"
     },
     {
      "field_name" : "UseEGLImage",
      "field_offset" : 640,
-     "referenced_type" : "type-2386"
+     "referenced_type" : "type-2389"
     },
     {
      "field_name" : "ComponentRoleEnum",
      "field_offset" : 672,
-     "referenced_type" : "type-2388"
+     "referenced_type" : "type-2391"
     }
    ],
    "linker_set_key" : "OMX_COMPONENTTYPE",
    "name" : "OMX_COMPONENTTYPE",
-   "referenced_type" : "type-2356",
-   "self_type" : "type-2356",
+   "referenced_type" : "type-2359",
+   "self_type" : "type-2359",
    "size" : 88,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_COMPONENTTYPE"
@@ -49652,7 +49750,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -49672,8 +49770,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_BACKLIGHTTYPE",
    "name" : "OMX_CONFIG_BACKLIGHTTYPE",
-   "referenced_type" : "type-2226",
-   "self_type" : "type-2226",
+   "referenced_type" : "type-2229",
+   "self_type" : "type-2229",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_BACKLIGHTTYPE"
@@ -49689,18 +49787,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "bEnabled",
      "field_offset" : 64,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_BOOLEANTYPE",
    "name" : "OMX_CONFIG_BOOLEANTYPE",
-   "referenced_type" : "type-2340",
-   "self_type" : "type-2340",
+   "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_CONFIG_BOOLEANTYPE"
@@ -49716,7 +49814,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -49731,8 +49829,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_BRIGHTNESSTYPE",
    "name" : "OMX_CONFIG_BRIGHTNESSTYPE",
-   "referenced_type" : "type-2225",
-   "self_type" : "type-2225",
+   "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_BRIGHTNESSTYPE"
@@ -49748,7 +49846,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -49758,12 +49856,12 @@
     {
      "field_name" : "bContinuous",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bFrameLimited",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nFrameLimit",
@@ -49773,8 +49871,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_CAPTUREMODETYPE",
    "name" : "OMX_CONFIG_CAPTUREMODETYPE",
-   "referenced_type" : "type-2240",
-   "self_type" : "type-2240",
+   "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"
@@ -49790,7 +49888,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -49805,13 +49903,13 @@
     {
      "field_name" : "eColorBlend",
      "field_offset" : 128,
-     "referenced_type" : "type-2209"
+     "referenced_type" : "type-2212"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_COLORBLENDTYPE",
    "name" : "OMX_CONFIG_COLORBLENDTYPE",
-   "referenced_type" : "type-2210",
-   "self_type" : "type-2210",
+   "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_CONFIG_COLORBLENDTYPE"
@@ -49827,7 +49925,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -49837,7 +49935,7 @@
     {
      "field_name" : "xColorMatrix",
      "field_offset" : 96,
-     "referenced_type" : "type-2201"
+     "referenced_type" : "type-2204"
     },
     {
      "field_name" : "xColorOffset",
@@ -49847,8 +49945,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_COLORCONVERSIONTYPE",
    "name" : "OMX_CONFIG_COLORCONVERSIONTYPE",
-   "referenced_type" : "type-2200",
-   "self_type" : "type-2200",
+   "referenced_type" : "type-2203",
+   "self_type" : "type-2203",
    "size" : 64,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORCONVERSIONTYPE"
@@ -49864,7 +49962,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -49874,7 +49972,7 @@
     {
      "field_name" : "bColorEnhancement",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nCustomizedU",
@@ -49889,8 +49987,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
    "name" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
-   "referenced_type" : "type-2207",
-   "self_type" : "type-2207",
+   "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_COLORENHANCEMENTTYPE"
@@ -49906,7 +50004,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -49926,8 +50024,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_COLORKEYTYPE",
    "name" : "OMX_CONFIG_COLORKEYTYPE",
-   "referenced_type" : "type-2208",
-   "self_type" : "type-2208",
+   "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_CONFIG_COLORKEYTYPE"
@@ -49943,12 +50041,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nParentNodeID",
@@ -49963,8 +50061,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
    "name" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
-   "referenced_type" : "type-2350",
-   "self_type" : "type-2350",
+   "referenced_type" : "type-2353",
+   "self_type" : "type-2353",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE"
@@ -49980,12 +50078,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nParentNodeID",
@@ -50010,13 +50108,13 @@
     {
      "field_name" : "bIsLeafType",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
    "name" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
-   "referenced_type" : "type-2351",
-   "self_type" : "type-2351",
+   "referenced_type" : "type-2354",
+   "self_type" : "type-2354",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_CONTAINERNODEIDTYPE"
@@ -50032,7 +50130,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50047,8 +50145,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_CONTRASTTYPE",
    "name" : "OMX_CONFIG_CONTRASTTYPE",
-   "referenced_type" : "type-2224",
-   "self_type" : "type-2224",
+   "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_CONTRASTTYPE"
@@ -50064,7 +50162,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50074,13 +50172,13 @@
     {
      "field_name" : "eDither",
      "field_offset" : 96,
-     "referenced_type" : "type-2238"
+     "referenced_type" : "type-2241"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_DITHERTYPE",
    "name" : "OMX_CONFIG_DITHERTYPE",
-   "referenced_type" : "type-2239",
-   "self_type" : "type-2239",
+   "referenced_type" : "type-2242",
+   "self_type" : "type-2242",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_DITHERTYPE"
@@ -50096,7 +50194,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50106,13 +50204,13 @@
     {
      "field_name" : "eExposureControl",
      "field_offset" : 96,
-     "referenced_type" : "type-2221"
+     "referenced_type" : "type-2224"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
    "name" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-2222",
-   "self_type" : "type-2222",
+   "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_EXPOSURECONTROLTYPE"
@@ -50128,7 +50226,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50138,7 +50236,7 @@
     {
      "field_name" : "eMetering",
      "field_offset" : 96,
-     "referenced_type" : "type-2242"
+     "referenced_type" : "type-2245"
     },
     {
      "field_name" : "xEVCompensation",
@@ -50153,7 +50251,7 @@
     {
      "field_name" : "bAutoAperture",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nShutterSpeedMsec",
@@ -50163,7 +50261,7 @@
     {
      "field_name" : "bAutoShutterSpeed",
      "field_offset" : 256,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nSensitivity",
@@ -50173,13 +50271,13 @@
     {
      "field_name" : "bAutoSensitivity",
      "field_offset" : 320,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_EXPOSUREVALUETYPE",
    "name" : "OMX_CONFIG_EXPOSUREVALUETYPE",
-   "referenced_type" : "type-2243",
-   "self_type" : "type-2243",
+   "referenced_type" : "type-2246",
+   "self_type" : "type-2246",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_EXPOSUREVALUETYPE"
@@ -50195,7 +50293,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50205,53 +50303,53 @@
     {
      "field_name" : "bCenter",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bLeft",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bRight",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bTop",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bBottom",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bTopLeft",
      "field_offset" : 256,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bTopRight",
      "field_offset" : 288,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bBottomLeft",
      "field_offset" : 320,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bBottomRight",
      "field_offset" : 352,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_FOCUSREGIONTYPE",
    "name" : "OMX_CONFIG_FOCUSREGIONTYPE",
-   "referenced_type" : "type-2245",
-   "self_type" : "type-2245",
+   "referenced_type" : "type-2248",
+   "self_type" : "type-2248",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_FOCUSREGIONTYPE"
@@ -50267,7 +50365,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50282,8 +50380,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_FRAMERATETYPE",
    "name" : "OMX_CONFIG_FRAMERATETYPE",
-   "referenced_type" : "type-2286",
-   "self_type" : "type-2286",
+   "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_FRAMERATETYPE"
@@ -50299,7 +50397,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50309,13 +50407,13 @@
     {
      "field_name" : "bStab",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_FRAMESTABTYPE",
    "name" : "OMX_CONFIG_FRAMESTABTYPE",
-   "referenced_type" : "type-2218",
-   "self_type" : "type-2218",
+   "referenced_type" : "type-2221",
+   "self_type" : "type-2221",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_FRAMESTABTYPE"
@@ -50331,7 +50429,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50346,8 +50444,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_GAMMATYPE",
    "name" : "OMX_CONFIG_GAMMATYPE",
-   "referenced_type" : "type-2227",
-   "self_type" : "type-2227",
+   "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_GAMMATYPE"
@@ -50363,7 +50461,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50373,13 +50471,13 @@
     {
      "field_name" : "eImageFilter",
      "field_offset" : 96,
-     "referenced_type" : "type-2205"
+     "referenced_type" : "type-2208"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_IMAGEFILTERTYPE",
    "name" : "OMX_CONFIG_IMAGEFILTERTYPE",
-   "referenced_type" : "type-2206",
-   "self_type" : "type-2206",
+   "referenced_type" : "type-2209",
+   "self_type" : "type-2209",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_IMAGEFILTERTYPE"
@@ -50395,7 +50493,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50405,13 +50503,13 @@
     {
      "field_name" : "IntraRefreshVOP",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
    "name" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
-   "referenced_type" : "type-2287",
-   "self_type" : "type-2287",
+   "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_INTRAREFRESHVOPTYPE"
@@ -50427,7 +50525,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50442,8 +50540,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_LIGHTNESSTYPE",
    "name" : "OMX_CONFIG_LIGHTNESSTYPE",
-   "referenced_type" : "type-2229",
-   "self_type" : "type-2229",
+   "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"
@@ -50459,7 +50557,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50474,13 +50572,13 @@
     {
      "field_name" : "ErrMap",
      "field_offset" : 128,
-     "referenced_type" : "type-1572"
+     "referenced_type" : "type-1567"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
    "name" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
-   "referenced_type" : "type-2288",
-   "self_type" : "type-2288",
+   "referenced_type" : "type-2291",
+   "self_type" : "type-2291",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE"
@@ -50496,7 +50594,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50506,13 +50604,13 @@
     {
      "field_name" : "bEnabled",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
    "name" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
-   "referenced_type" : "type-2290",
-   "self_type" : "type-2290",
+   "referenced_type" : "type-2293",
+   "self_type" : "type-2293",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_MBERRORREPORTINGTYPE"
@@ -50528,12 +50626,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "eScopeMode",
      "field_offset" : 64,
-     "referenced_type" : "type-2346"
+     "referenced_type" : "type-2349"
     },
     {
      "field_name" : "nScopeSpecifier",
@@ -50548,8 +50646,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
    "name" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
-   "referenced_type" : "type-2348",
-   "self_type" : "type-2348",
+   "referenced_type" : "type-2351",
+   "self_type" : "type-2351",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_METADATAITEMCOUNTTYPE"
@@ -50565,12 +50663,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "eScopeMode",
      "field_offset" : 64,
-     "referenced_type" : "type-2346"
+     "referenced_type" : "type-2349"
     },
     {
      "field_name" : "nScopeSpecifier",
@@ -50585,12 +50683,12 @@
     {
      "field_name" : "eSearchMode",
      "field_offset" : 160,
-     "referenced_type" : "type-2347"
+     "referenced_type" : "type-2350"
     },
     {
      "field_name" : "eKeyCharset",
      "field_offset" : 192,
-     "referenced_type" : "type-2345"
+     "referenced_type" : "type-2348"
     },
     {
      "field_name" : "nKeySizeUsed",
@@ -50605,7 +50703,7 @@
     {
      "field_name" : "eValueCharset",
      "field_offset" : 1280,
-     "referenced_type" : "type-2345"
+     "referenced_type" : "type-2348"
     },
     {
      "field_name" : "sLanguageCountry",
@@ -50625,13 +50723,13 @@
     {
      "field_name" : "nValue",
      "field_offset" : 1408,
-     "referenced_type" : "type-1572"
+     "referenced_type" : "type-1567"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_METADATAITEMTYPE",
    "name" : "OMX_CONFIG_METADATAITEMTYPE",
-   "referenced_type" : "type-2349",
-   "self_type" : "type-2349",
+   "referenced_type" : "type-2352",
+   "self_type" : "type-2352",
    "size" : 180,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_METADATAITEMTYPE"
@@ -50647,7 +50745,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50657,13 +50755,13 @@
     {
      "field_name" : "eMirror",
      "field_offset" : 96,
-     "referenced_type" : "type-2213"
+     "referenced_type" : "type-2216"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MIRRORTYPE",
    "name" : "OMX_CONFIG_MIRRORTYPE",
-   "referenced_type" : "type-2214",
-   "self_type" : "type-2214",
+   "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_CONFIG_MIRRORTYPE"
@@ -50679,7 +50777,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50699,8 +50797,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_PLANEBLENDTYPE",
    "name" : "OMX_CONFIG_PLANEBLENDTYPE",
-   "referenced_type" : "type-2231",
-   "self_type" : "type-2231",
+   "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_CONFIG_PLANEBLENDTYPE"
@@ -50716,7 +50814,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50736,8 +50834,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_POINTTYPE",
    "name" : "OMX_CONFIG_POINTTYPE",
-   "referenced_type" : "type-2215",
-   "self_type" : "type-2215",
+   "referenced_type" : "type-2218",
+   "self_type" : "type-2218",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_POINTTYPE"
@@ -50753,7 +50851,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50783,8 +50881,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_RECTTYPE",
    "name" : "OMX_CONFIG_RECTTYPE",
-   "referenced_type" : "type-2216",
-   "self_type" : "type-2216",
+   "referenced_type" : "type-2219",
+   "self_type" : "type-2219",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_RECTTYPE"
@@ -50800,7 +50898,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50815,8 +50913,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_ROTATIONTYPE",
    "name" : "OMX_CONFIG_ROTATIONTYPE",
-   "referenced_type" : "type-2212",
-   "self_type" : "type-2212",
+   "referenced_type" : "type-2215",
+   "self_type" : "type-2215",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_ROTATIONTYPE"
@@ -50832,7 +50930,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50847,8 +50945,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_SATURATIONTYPE",
    "name" : "OMX_CONFIG_SATURATIONTYPE",
-   "referenced_type" : "type-2228",
-   "self_type" : "type-2228",
+   "referenced_type" : "type-2231",
+   "self_type" : "type-2231",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_SATURATIONTYPE"
@@ -50864,7 +50962,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50884,8 +50982,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_SCALEFACTORTYPE",
    "name" : "OMX_CONFIG_SCALEFACTORTYPE",
-   "referenced_type" : "type-2204",
-   "self_type" : "type-2204",
+   "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_SCALEFACTORTYPE"
@@ -50901,7 +50999,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50911,13 +51009,13 @@
     {
      "field_name" : "eEffect",
      "field_offset" : 96,
-     "referenced_type" : "type-2233"
+     "referenced_type" : "type-2236"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
    "name" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-2234",
-   "self_type" : "type-2234",
+   "referenced_type" : "type-2237",
+   "self_type" : "type-2237",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_TRANSITIONEFFECTTYPE"
@@ -50933,7 +51031,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50943,13 +51041,13 @@
     {
      "field_name" : "eWhiteBalControl",
      "field_offset" : 96,
-     "referenced_type" : "type-2219"
+     "referenced_type" : "type-2222"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
    "name" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-2220",
-   "self_type" : "type-2220",
+   "referenced_type" : "type-2223",
+   "self_type" : "type-2223",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_WHITEBALCONTROLTYPE"
@@ -50965,7 +51063,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50985,8 +51083,8 @@
    ],
    "linker_set_key" : "OMX_FRAMESIZETYPE",
    "name" : "OMX_FRAMESIZETYPE",
-   "referenced_type" : "type-2211",
-   "self_type" : "type-2211",
+   "referenced_type" : "type-2214",
+   "self_type" : "type-2214",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_FRAMESIZETYPE"
@@ -51002,7 +51100,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -51012,7 +51110,7 @@
     {
      "field_name" : "eFocusControl",
      "field_offset" : 96,
-     "referenced_type" : "type-2303"
+     "referenced_type" : "type-2306"
     },
     {
      "field_name" : "nFocusSteps",
@@ -51027,8 +51125,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
    "name" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-2304",
-   "self_type" : "type-2304",
+   "referenced_type" : "type-2307",
+   "self_type" : "type-2307",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE"
@@ -51044,7 +51142,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -51054,13 +51152,13 @@
     {
      "field_name" : "eFlashControl",
      "field_offset" : 96,
-     "referenced_type" : "type-2300"
+     "referenced_type" : "type-2303"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
    "name" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
-   "referenced_type" : "type-2302",
-   "self_type" : "type-2302",
+   "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_FLASHCONTROLTYPE"
@@ -51076,7 +51174,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -51086,23 +51184,23 @@
     {
      "field_name" : "eHuffmanTable",
      "field_offset" : 96,
-     "referenced_type" : "type-2309"
+     "referenced_type" : "type-2312"
     },
     {
      "field_name" : "nNumberOfHuffmanCodeOfLength",
      "field_offset" : 128,
-     "referenced_type" : "type-2311"
+     "referenced_type" : "type-2314"
     },
     {
      "field_name" : "nHuffmanTable",
      "field_offset" : 256,
-     "referenced_type" : "type-2312"
+     "referenced_type" : "type-2315"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
    "name" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
-   "referenced_type" : "type-2310",
-   "self_type" : "type-2310",
+   "referenced_type" : "type-2313",
+   "self_type" : "type-2313",
    "size" : 288,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE"
@@ -51118,7 +51216,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -51133,18 +51231,18 @@
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-2297"
+     "referenced_type" : "type-2300"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-2199"
+     "referenced_type" : "type-2202"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
    "name" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-2299",
-   "self_type" : "type-2299",
+   "referenced_type" : "type-2302",
+   "self_type" : "type-2302",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_PORTFORMATTYPE"
@@ -51160,7 +51258,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -51175,8 +51273,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_QFACTORTYPE",
    "name" : "OMX_IMAGE_PARAM_QFACTORTYPE",
-   "referenced_type" : "type-2305",
-   "self_type" : "type-2305",
+   "referenced_type" : "type-2308",
+   "self_type" : "type-2308",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_QFACTORTYPE"
@@ -51192,7 +51290,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -51202,18 +51300,18 @@
     {
      "field_name" : "eQuantizationTable",
      "field_offset" : 96,
-     "referenced_type" : "type-2306"
+     "referenced_type" : "type-2309"
     },
     {
      "field_name" : "nQuantizationMatrix",
      "field_offset" : 128,
-     "referenced_type" : "type-2308"
+     "referenced_type" : "type-2311"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
    "name" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-2307",
-   "self_type" : "type-2307",
+   "referenced_type" : "type-2310",
+   "self_type" : "type-2310",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE"
@@ -51254,17 +51352,17 @@
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 224,
-     "referenced_type" : "type-2297"
+     "referenced_type" : "type-2300"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-2199"
+     "referenced_type" : "type-2202"
     },
     {
      "field_name" : "pNativeWindow",
@@ -51274,8 +51372,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_PORTDEFINITIONTYPE",
    "name" : "OMX_IMAGE_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-2298",
-   "self_type" : "type-2298",
+   "referenced_type" : "type-2301",
+   "self_type" : "type-2301",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PORTDEFINITIONTYPE"
@@ -51296,8 +51394,8 @@
    ],
    "linker_set_key" : "OMX_MARKTYPE",
    "name" : "OMX_MARKTYPE",
-   "referenced_type" : "type-1477",
-   "self_type" : "type-1477",
+   "referenced_type" : "type-1475",
+   "self_type" : "type-1475",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_MARKTYPE"
@@ -51313,18 +51411,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "bEnablePM",
      "field_offset" : 64,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_OTHER_CONFIG_POWERTYPE",
    "name" : "OMX_OTHER_CONFIG_POWERTYPE",
-   "referenced_type" : "type-2327",
-   "self_type" : "type-2327",
+   "referenced_type" : "type-2330",
+   "self_type" : "type-2330",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_CONFIG_POWERTYPE"
@@ -51340,13 +51438,13 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     }
    ],
    "linker_set_key" : "OMX_OTHER_CONFIG_STATSTYPE",
    "name" : "OMX_OTHER_CONFIG_STATSTYPE",
-   "referenced_type" : "type-2328",
-   "self_type" : "type-2328",
+   "referenced_type" : "type-2331",
+   "self_type" : "type-2331",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_CONFIG_STATSTYPE"
@@ -51362,7 +51460,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -51372,7 +51470,7 @@
     {
      "field_name" : "eType",
      "field_offset" : 96,
-     "referenced_type" : "type-1561"
+     "referenced_type" : "type-1556"
     },
     {
      "field_name" : "nDataSize",
@@ -51382,13 +51480,13 @@
     {
      "field_name" : "data",
      "field_offset" : 160,
-     "referenced_type" : "type-1572"
+     "referenced_type" : "type-1567"
     }
    ],
    "linker_set_key" : "OMX_OTHER_EXTRADATATYPE",
    "name" : "OMX_OTHER_EXTRADATATYPE",
-   "referenced_type" : "type-1571",
-   "self_type" : "type-1571",
+   "referenced_type" : "type-1566",
+   "self_type" : "type-1566",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_OTHER_EXTRADATATYPE"
@@ -51404,7 +51502,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -51419,13 +51517,13 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-2314"
+     "referenced_type" : "type-2317"
     }
    ],
    "linker_set_key" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
    "name" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-2330",
-   "self_type" : "type-2330",
+   "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"
@@ -51436,13 +51534,13 @@
    [
     {
      "field_name" : "eFormat",
-     "referenced_type" : "type-2314"
+     "referenced_type" : "type-2317"
     }
    ],
    "linker_set_key" : "OMX_OTHER_PORTDEFINITIONTYPE",
    "name" : "OMX_OTHER_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-2329",
-   "self_type" : "type-2329",
+   "referenced_type" : "type-2332",
+   "self_type" : "type-2332",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_PORTDEFINITIONTYPE"
@@ -51458,7 +51556,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -51468,13 +51566,13 @@
     {
      "field_name" : "eBufferSupplier",
      "field_offset" : 96,
-     "referenced_type" : "type-1601"
+     "referenced_type" : "type-1599"
     }
    ],
    "linker_set_key" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
    "name" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-1609",
-   "self_type" : "type-1609",
+   "referenced_type" : "type-1605",
+   "self_type" : "type-1605",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PARAM_BUFFERSUPPLIERTYPE"
@@ -51490,7 +51588,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "cRole",
@@ -51517,7 +51615,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "hPipe",
@@ -51527,8 +51625,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_CONTENTPIPETYPE",
    "name" : "OMX_PARAM_CONTENTPIPETYPE",
-   "referenced_type" : "type-2343",
-   "self_type" : "type-2343",
+   "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_PARAM_CONTENTPIPETYPE"
@@ -51544,18 +51642,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "contentURI",
      "field_offset" : 64,
-     "referenced_type" : "type-1572"
+     "referenced_type" : "type-1567"
     }
    ],
    "linker_set_key" : "OMX_PARAM_CONTENTURITYPE",
    "name" : "OMX_PARAM_CONTENTURITYPE",
-   "referenced_type" : "type-2341",
-   "self_type" : "type-2341",
+   "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"
@@ -51571,7 +51669,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -51581,18 +51679,18 @@
     {
      "field_name" : "eUnitType",
      "field_offset" : 96,
-     "referenced_type" : "type-2235"
+     "referenced_type" : "type-2238"
     },
     {
      "field_name" : "eEncapsulationType",
      "field_offset" : 128,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2239"
     }
    ],
    "linker_set_key" : "OMX_PARAM_DATAUNITTYPE",
    "name" : "OMX_PARAM_DATAUNITTYPE",
-   "referenced_type" : "type-2237",
-   "self_type" : "type-2237",
+   "referenced_type" : "type-2240",
+   "self_type" : "type-2240",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_DATAUNITTYPE"
@@ -51608,7 +51706,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -51618,13 +51716,13 @@
     {
      "field_name" : "bDeblocking",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_PARAM_DEBLOCKINGTYPE",
    "name" : "OMX_PARAM_DEBLOCKINGTYPE",
-   "referenced_type" : "type-2217",
-   "self_type" : "type-2217",
+   "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_PARAM_DEBLOCKINGTYPE"
@@ -51640,7 +51738,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -51650,58 +51748,58 @@
     {
      "field_name" : "eFocusStatus",
      "field_offset" : 96,
-     "referenced_type" : "type-2246"
+     "referenced_type" : "type-2249"
     },
     {
      "field_name" : "bCenterStatus",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bLeftStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bRightStatus",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bTopStatus",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bBottomStatus",
      "field_offset" : 256,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bTopLeftStatus",
      "field_offset" : 288,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bTopRightStatus",
      "field_offset" : 320,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bBottomLeftStatus",
      "field_offset" : 352,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bBottomRightStatus",
      "field_offset" : 384,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_PARAM_FOCUSSTATUSTYPE",
    "name" : "OMX_PARAM_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-2247",
-   "self_type" : "type-2247",
+   "referenced_type" : "type-2250",
+   "self_type" : "type-2250",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_FOCUSSTATUSTYPE"
@@ -51717,7 +51815,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -51727,7 +51825,7 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nInterleavePortIndex",
@@ -51737,8 +51835,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_INTERLEAVETYPE",
    "name" : "OMX_PARAM_INTERLEAVETYPE",
-   "referenced_type" : "type-2232",
-   "self_type" : "type-2232",
+   "referenced_type" : "type-2235",
+   "self_type" : "type-2235",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_INTERLEAVETYPE"
@@ -51754,7 +51852,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -51769,8 +51867,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_MACROBLOCKSTYPE",
    "name" : "OMX_PARAM_MACROBLOCKSTYPE",
-   "referenced_type" : "type-2291",
-   "self_type" : "type-2291",
+   "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"
@@ -51786,17 +51884,17 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eKeyCharset",
      "field_offset" : 96,
-     "referenced_type" : "type-2345"
+     "referenced_type" : "type-2348"
     },
     {
      "field_name" : "nKeySizeUsed",
@@ -51821,13 +51919,13 @@
     {
      "field_name" : "bEnabled",
      "field_offset" : 2240,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_PARAM_METADATAFILTERTYPE",
    "name" : "OMX_PARAM_METADATAFILTERTYPE",
-   "referenced_type" : "type-2355",
-   "self_type" : "type-2355",
+   "referenced_type" : "type-2358",
+   "self_type" : "type-2358",
    "size" : 284,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_METADATAFILTERTYPE"
@@ -51843,7 +51941,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -51853,7 +51951,7 @@
     {
      "field_name" : "eDir",
      "field_offset" : 96,
-     "referenced_type" : "type-1452"
+     "referenced_type" : "type-1455"
     },
     {
      "field_name" : "nBufferCountActual",
@@ -51873,27 +51971,27 @@
     {
      "field_name" : "bEnabled",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bPopulated",
      "field_offset" : 256,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eDomain",
      "field_offset" : 288,
-     "referenced_type" : "type-2332"
+     "referenced_type" : "type-2335"
     },
     {
      "field_name" : "format",
      "field_offset" : 320,
-     "referenced_type" : "type-2334"
+     "referenced_type" : "type-2337"
     },
     {
      "field_name" : "bBuffersContiguous",
      "field_offset" : 704,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nBufferAlignment",
@@ -51903,8 +52001,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_PORTDEFINITIONTYPE",
    "name" : "OMX_PARAM_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-2333",
-   "self_type" : "type-2333",
+   "referenced_type" : "type-2336",
+   "self_type" : "type-2336",
    "size" : 96,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_PORTDEFINITIONTYPE"
@@ -51915,27 +52013,27 @@
    [
     {
      "field_name" : "audio",
-     "referenced_type" : "type-1619"
+     "referenced_type" : "type-1621"
     },
     {
      "field_name" : "video",
-     "referenced_type" : "type-2249"
+     "referenced_type" : "type-2252"
     },
     {
      "field_name" : "image",
-     "referenced_type" : "type-2298"
+     "referenced_type" : "type-2301"
     },
     {
      "field_name" : "other",
-     "referenced_type" : "type-2329"
+     "referenced_type" : "type-2332"
     }
    ],
    "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-2334",
-   "self_type" : "type-2334",
+   "referenced_type" : "type-2337",
+   "self_type" : "type-2337",
    "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)"
@@ -51951,7 +52049,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -51966,18 +52064,18 @@
     {
      "field_name" : "bOneShot",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "sFrameSize",
      "field_offset" : 160,
-     "referenced_type" : "type-2211"
+     "referenced_type" : "type-2214"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SENSORMODETYPE",
    "name" : "OMX_PARAM_SENSORMODETYPE",
-   "referenced_type" : "type-2223",
-   "self_type" : "type-2223",
+   "referenced_type" : "type-2226",
+   "self_type" : "type-2226",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_SENSORMODETYPE"
@@ -51993,18 +52091,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "ePolicy",
      "field_offset" : 64,
-     "referenced_type" : "type-2336"
+     "referenced_type" : "type-2339"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
    "name" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-2337",
-   "self_type" : "type-2337",
+   "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_PARAM_SUSPENSIONPOLICYTYPE"
@@ -52020,18 +52118,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "eType",
      "field_offset" : 64,
-     "referenced_type" : "type-2338"
+     "referenced_type" : "type-2341"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SUSPENSIONTYPE",
    "name" : "OMX_PARAM_SUSPENSIONTYPE",
-   "referenced_type" : "type-2339",
-   "self_type" : "type-2339",
+   "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_PARAM_SUSPENSIONTYPE"
@@ -52047,7 +52145,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -52062,8 +52160,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_U32TYPE",
    "name" : "OMX_PARAM_U32TYPE",
-   "referenced_type" : "type-2335",
-   "self_type" : "type-2335",
+   "referenced_type" : "type-2338",
+   "self_type" : "type-2338",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_U32TYPE"
@@ -52079,7 +52177,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPorts",
@@ -52094,8 +52192,8 @@
    ],
    "linker_set_key" : "OMX_PORT_PARAM_TYPE",
    "name" : "OMX_PORT_PARAM_TYPE",
-   "referenced_type" : "type-1585",
-   "self_type" : "type-1585",
+   "referenced_type" : "type-1581",
+   "self_type" : "type-1581",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PORT_PARAM_TYPE"
@@ -52111,7 +52209,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nGroupPriority",
@@ -52126,8 +52224,8 @@
    ],
    "linker_set_key" : "OMX_PRIORITYMGMTTYPE",
    "name" : "OMX_PRIORITYMGMTTYPE",
-   "referenced_type" : "type-1522",
-   "self_type" : "type-1522",
+   "referenced_type" : "type-1519",
+   "self_type" : "type-1519",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PRIORITYMGMTTYPE"
@@ -52143,18 +52241,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "bResourceConcealmentForbidden",
      "field_offset" : 64,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_RESOURCECONCEALMENTTYPE",
    "name" : "OMX_RESOURCECONCEALMENTTYPE",
-   "referenced_type" : "type-2344",
-   "self_type" : "type-2344",
+   "referenced_type" : "type-2347",
+   "self_type" : "type-2347",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_RESOURCECONCEALMENTTYPE"
@@ -52170,18 +52268,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "eClock",
      "field_offset" : 64,
-     "referenced_type" : "type-2319"
+     "referenced_type" : "type-2322"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
    "name" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
-   "referenced_type" : "type-2326",
-   "self_type" : "type-2326",
+   "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_TIME_CONFIG_ACTIVEREFCLOCKTYPE"
@@ -52197,12 +52295,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "eState",
      "field_offset" : 64,
-     "referenced_type" : "type-2321"
+     "referenced_type" : "type-2324"
     },
     {
      "field_name" : "nStartTime",
@@ -52222,8 +52320,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
    "name" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
-   "referenced_type" : "type-2325",
-   "self_type" : "type-2325",
+   "referenced_type" : "type-2328",
+   "self_type" : "type-2328",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_CLOCKSTATETYPE"
@@ -52239,7 +52337,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -52264,8 +52362,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
    "name" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
-   "referenced_type" : "type-2322",
-   "self_type" : "type-2322",
+   "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_MEDIATIMEREQUESTTYPE"
@@ -52281,7 +52379,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "xScale",
@@ -52291,8 +52389,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_SCALETYPE",
    "name" : "OMX_TIME_CONFIG_SCALETYPE",
-   "referenced_type" : "type-2324",
-   "self_type" : "type-2324",
+   "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_TIME_CONFIG_SCALETYPE"
@@ -52308,18 +52406,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "eType",
      "field_offset" : 64,
-     "referenced_type" : "type-2315"
+     "referenced_type" : "type-2318"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_SEEKMODETYPE",
    "name" : "OMX_TIME_CONFIG_SEEKMODETYPE",
-   "referenced_type" : "type-2316",
-   "self_type" : "type-2316",
+   "referenced_type" : "type-2319",
+   "self_type" : "type-2319",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_SEEKMODETYPE"
@@ -52335,7 +52433,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -52350,8 +52448,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
    "name" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
-   "referenced_type" : "type-2317",
-   "self_type" : "type-2317",
+   "referenced_type" : "type-2320",
+   "self_type" : "type-2320",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_TIMESTAMPTYPE"
@@ -52367,7 +52465,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nClientPrivate",
@@ -52377,7 +52475,7 @@
     {
      "field_name" : "eUpdateType",
      "field_offset" : 96,
-     "referenced_type" : "type-2318"
+     "referenced_type" : "type-2321"
     },
     {
      "field_name" : "nMediaTimestamp",
@@ -52402,13 +52500,13 @@
     {
      "field_name" : "eState",
      "field_offset" : 352,
-     "referenced_type" : "type-2321"
+     "referenced_type" : "type-2324"
     }
    ],
    "linker_set_key" : "OMX_TIME_MEDIATIMETYPE",
    "name" : "OMX_TIME_MEDIATIMETYPE",
-   "referenced_type" : "type-2323",
-   "self_type" : "type-2323",
+   "referenced_type" : "type-2326",
+   "self_type" : "type-2326",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_MEDIATIMETYPE"
@@ -52424,13 +52522,13 @@
     {
      "field_name" : "eSupplier",
      "field_offset" : 32,
-     "referenced_type" : "type-1601"
+     "referenced_type" : "type-1599"
     }
    ],
    "linker_set_key" : "OMX_TUNNELSETUPTYPE",
    "name" : "OMX_TUNNELSETUPTYPE",
-   "referenced_type" : "type-1612",
-   "self_type" : "type-1612",
+   "referenced_type" : "type-1613",
+   "self_type" : "type-1613",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_TUNNELSETUPTYPE"
@@ -52441,7 +52539,7 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-1479"
+     "referenced_type" : "type-1482"
     },
     {
      "field_name" : "nVersion",
@@ -52451,8 +52549,8 @@
    "linker_set_key" : "OMX_VERSIONTYPE",
    "name" : "OMX_VERSIONTYPE",
    "record_kind" : "union",
-   "referenced_type" : "type-1478",
-   "self_type" : "type-1478",
+   "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"
@@ -52484,8 +52582,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "OMX_VERSIONTYPE::(anonymous struct at frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h:376:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h:376:5",
    "name" : "OMX_VERSIONTYPE::(anonymous struct at frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h:376:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h:376:5",
-   "referenced_type" : "type-1479",
-   "self_type" : "type-1479",
+   "referenced_type" : "type-1482",
+   "self_type" : "type-1482",
    "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)"
@@ -52501,7 +52599,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -52521,8 +52619,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
    "name" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
-   "referenced_type" : "type-2295",
-   "self_type" : "type-2295",
+   "referenced_type" : "type-2298",
+   "self_type" : "type-2298",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD"
@@ -52538,7 +52636,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -52553,8 +52651,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_BITRATETYPE",
    "name" : "OMX_VIDEO_CONFIG_BITRATETYPE",
-   "referenced_type" : "type-2285",
-   "self_type" : "type-2285",
+   "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_VIDEO_CONFIG_BITRATETYPE"
@@ -52570,7 +52668,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -52585,8 +52683,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_NALSIZE",
    "name" : "OMX_VIDEO_CONFIG_NALSIZE",
-   "referenced_type" : "type-2296",
-   "self_type" : "type-2296",
+   "referenced_type" : "type-2299",
+   "self_type" : "type-2299",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_NALSIZE"
@@ -52602,7 +52700,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -52622,13 +52720,13 @@
     {
      "field_name" : "eSliceMode",
      "field_offset" : 128,
-     "referenced_type" : "type-2293"
+     "referenced_type" : "type-2296"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
    "name" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
-   "referenced_type" : "type-2294",
-   "self_type" : "type-2294",
+   "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_PARAM_AVCSLICEFMO"
@@ -52644,7 +52742,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -52669,7 +52767,7 @@
     {
      "field_name" : "bUseHadamard",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nRefFrames",
@@ -52689,32 +52787,32 @@
     {
      "field_name" : "bEnableUEP",
      "field_offset" : 320,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bEnableFMO",
      "field_offset" : 352,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bEnableASO",
      "field_offset" : 384,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bEnableRS",
      "field_offset" : 416,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 448,
-     "referenced_type" : "type-2279"
+     "referenced_type" : "type-2282"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 480,
-     "referenced_type" : "type-2280"
+     "referenced_type" : "type-2283"
     },
     {
      "field_name" : "nAllowedPictureTypes",
@@ -52724,22 +52822,22 @@
     {
      "field_name" : "bFrameMBsOnly",
      "field_offset" : 544,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bMBAFF",
      "field_offset" : 576,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bEntropyCodingCABAC",
      "field_offset" : 608,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bWeightedPPrediction",
      "field_offset" : 640,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nWeightedBipredicitonMode",
@@ -52749,17 +52847,17 @@
     {
      "field_name" : "bconstIpred",
      "field_offset" : 704,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bDirect8x8Inference",
      "field_offset" : 736,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bDirectSpatialTemporal",
      "field_offset" : 768,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nCabacInitIdc",
@@ -52769,13 +52867,13 @@
     {
      "field_name" : "eLoopFilterMode",
      "field_offset" : 832,
-     "referenced_type" : "type-2282"
+     "referenced_type" : "type-2285"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_AVCTYPE",
    "name" : "OMX_VIDEO_PARAM_AVCTYPE",
-   "referenced_type" : "type-2283",
-   "self_type" : "type-2283",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2286",
    "size" : 108,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_AVCTYPE"
@@ -52791,7 +52889,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -52801,17 +52899,17 @@
     {
      "field_name" : "eControlRate",
      "field_offset" : 96,
-     "referenced_type" : "type-2253"
+     "referenced_type" : "type-2256"
     },
     {
      "field_offset" : 128,
-     "referenced_type" : "type-2255"
+     "referenced_type" : "type-2258"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_BITRATETYPE",
    "name" : "OMX_VIDEO_PARAM_BITRATETYPE",
-   "referenced_type" : "type-2254",
-   "self_type" : "type-2254",
+   "referenced_type" : "type-2257",
+   "self_type" : "type-2257",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_BITRATETYPE"
@@ -52833,8 +52931,8 @@
    "linker_set_key" : "OMX_VIDEO_PARAM_BITRATETYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5",
    "name" : "OMX_VIDEO_PARAM_BITRATETYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5",
    "record_kind" : "union",
-   "referenced_type" : "type-2255",
-   "self_type" : "type-2255",
+   "referenced_type" : "type-2258",
+   "self_type" : "type-2258",
    "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)"
@@ -52850,7 +52948,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -52860,12 +52958,12 @@
     {
      "field_name" : "bEnableHEC",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bEnableResync",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nResynchMarkerSpacing",
@@ -52875,18 +52973,18 @@
     {
      "field_name" : "bEnableDataPartitioning",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bEnableRVLC",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE",
    "name" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE",
-   "referenced_type" : "type-2261",
-   "self_type" : "type-2261",
+   "referenced_type" : "type-2264",
+   "self_type" : "type-2264",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE"
@@ -52902,7 +53000,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -52922,17 +53020,17 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 160,
-     "referenced_type" : "type-2263"
+     "referenced_type" : "type-2266"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 192,
-     "referenced_type" : "type-2264"
+     "referenced_type" : "type-2267"
     },
     {
      "field_name" : "bPLUSPTYPEAllowed",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nAllowedPictureTypes",
@@ -52942,7 +53040,7 @@
     {
      "field_name" : "bForceRoundingTypeToZero",
      "field_offset" : 288,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nPictureHeaderRepetition",
@@ -52957,8 +53055,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_H263TYPE",
    "name" : "OMX_VIDEO_PARAM_H263TYPE",
-   "referenced_type" : "type-2267",
-   "self_type" : "type-2267",
+   "referenced_type" : "type-2270",
+   "self_type" : "type-2270",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_H263TYPE"
@@ -52974,7 +53072,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -52984,7 +53082,7 @@
     {
      "field_name" : "eRefreshMode",
      "field_offset" : 96,
-     "referenced_type" : "type-2259"
+     "referenced_type" : "type-2262"
     },
     {
      "field_name" : "nAirMBs",
@@ -53004,8 +53102,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
    "name" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
-   "referenced_type" : "type-2260",
-   "self_type" : "type-2260",
+   "referenced_type" : "type-2263",
+   "self_type" : "type-2263",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE"
@@ -53021,7 +53119,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -53031,17 +53129,17 @@
     {
      "field_name" : "eAccuracy",
      "field_offset" : 96,
-     "referenced_type" : "type-2257"
+     "referenced_type" : "type-2260"
     },
     {
      "field_name" : "bUnrestrictedMVs",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bFourMV",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "sXSearchRange",
@@ -53056,8 +53154,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
    "name" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
-   "referenced_type" : "type-2258",
-   "self_type" : "type-2258",
+   "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_MOTIONVECTORTYPE"
@@ -53073,7 +53171,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -53093,18 +53191,18 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 160,
-     "referenced_type" : "type-2268"
+     "referenced_type" : "type-2271"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 192,
-     "referenced_type" : "type-2269"
+     "referenced_type" : "type-2272"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MPEG2TYPE",
    "name" : "OMX_VIDEO_PARAM_MPEG2TYPE",
-   "referenced_type" : "type-2270",
-   "self_type" : "type-2270",
+   "referenced_type" : "type-2273",
+   "self_type" : "type-2273",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MPEG2TYPE"
@@ -53120,7 +53218,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -53135,12 +53233,12 @@
     {
      "field_name" : "bSVH",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bGov",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nPFrames",
@@ -53160,7 +53258,7 @@
     {
      "field_name" : "bACPred",
      "field_offset" : 288,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nMaxPacketSize",
@@ -53175,12 +53273,12 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 384,
-     "referenced_type" : "type-2271"
+     "referenced_type" : "type-2274"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 416,
-     "referenced_type" : "type-2272"
+     "referenced_type" : "type-2275"
     },
     {
      "field_name" : "nAllowedPictureTypes",
@@ -53195,13 +53293,13 @@
     {
      "field_name" : "bReversibleVLC",
      "field_offset" : 512,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MPEG4TYPE",
    "name" : "OMX_VIDEO_PARAM_MPEG4TYPE",
-   "referenced_type" : "type-2273",
-   "self_type" : "type-2273",
+   "referenced_type" : "type-2276",
+   "self_type" : "type-2276",
    "size" : 68,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MPEG4TYPE"
@@ -53217,7 +53315,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -53232,12 +53330,12 @@
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-2248"
+     "referenced_type" : "type-2251"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-2199"
+     "referenced_type" : "type-2202"
     },
     {
      "field_name" : "xFramerate",
@@ -53247,8 +53345,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
    "name" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-2250",
-   "self_type" : "type-2250",
+   "referenced_type" : "type-2253",
+   "self_type" : "type-2253",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_PORTFORMATTYPE"
@@ -53264,7 +53362,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -53289,8 +53387,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
    "name" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
-   "referenced_type" : "type-2284",
-   "self_type" : "type-2284",
+   "referenced_type" : "type-2287",
+   "self_type" : "type-2287",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE"
@@ -53306,7 +53404,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -53331,8 +53429,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
    "name" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
-   "referenced_type" : "type-2251",
-   "self_type" : "type-2251",
+   "referenced_type" : "type-2254",
+   "self_type" : "type-2254",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE"
@@ -53348,7 +53446,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -53358,7 +53456,7 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 96,
-     "referenced_type" : "type-2276"
+     "referenced_type" : "type-2279"
     },
     {
      "field_name" : "nBitsPerPixel",
@@ -53398,23 +53496,23 @@
     {
      "field_name" : "bEnablePostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bEnableTemporalInterpolation",
      "field_offset" : 352,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bEnableLatencyMode",
      "field_offset" : 384,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_RVTYPE",
    "name" : "OMX_VIDEO_PARAM_RVTYPE",
-   "referenced_type" : "type-2278",
-   "self_type" : "type-2278",
+   "referenced_type" : "type-2281",
+   "self_type" : "type-2281",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_RVTYPE"
@@ -53430,7 +53528,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -53440,43 +53538,43 @@
     {
      "field_name" : "b16x16",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "b16x8",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "b8x16",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "b8x8",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "b8x4",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "b4x8",
      "field_offset" : 256,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "b4x4",
      "field_offset" : 288,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VBSMCTYPE",
    "name" : "OMX_VIDEO_PARAM_VBSMCTYPE",
-   "referenced_type" : "type-2262",
-   "self_type" : "type-2262",
+   "referenced_type" : "type-2265",
+   "self_type" : "type-2265",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_VBSMCTYPE"
@@ -53492,7 +53590,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -53502,7 +53600,7 @@
     {
      "field_name" : "bEnableVFU",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nFirstGOB",
@@ -53522,8 +53620,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
    "name" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
-   "referenced_type" : "type-2252",
-   "self_type" : "type-2252",
+   "referenced_type" : "type-2255",
+   "self_type" : "type-2255",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE"
@@ -53539,7 +53637,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -53549,13 +53647,13 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 96,
-     "referenced_type" : "type-2274"
+     "referenced_type" : "type-2277"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_WMVTYPE",
    "name" : "OMX_VIDEO_PARAM_WMVTYPE",
-   "referenced_type" : "type-2275",
-   "self_type" : "type-2275",
+   "referenced_type" : "type-2278",
+   "self_type" : "type-2278",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_WMVTYPE"
@@ -53606,17 +53704,17 @@
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 256,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 288,
-     "referenced_type" : "type-2248"
+     "referenced_type" : "type-2251"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 320,
-     "referenced_type" : "type-2199"
+     "referenced_type" : "type-2202"
     },
     {
      "field_name" : "pNativeWindow",
@@ -53626,8 +53724,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PORTDEFINITIONTYPE",
    "name" : "OMX_VIDEO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-2249",
-   "self_type" : "type-2249",
+   "referenced_type" : "type-2252",
+   "self_type" : "type-2252",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PORTDEFINITIONTYPE"
@@ -53637,7 +53735,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1166"
+     "referenced_type" : "type-1167"
     }
    ],
    "fields" :
@@ -53646,20 +53744,20 @@
      "access" : "private",
      "field_name" : "d_",
      "field_offset" : 32,
-     "referenced_type" : "type-1194"
+     "referenced_type" : "type-1198"
     },
     {
      "access" : "private",
      "field_name" : "s_",
      "field_offset" : 64,
-     "referenced_type" : "type-1195"
+     "referenced_type" : "type-1199"
     }
    ],
    "linker_set_key" : "Renamer",
    "name" : "Renamer",
    "record_kind" : "class",
-   "referenced_type" : "type-1193",
-   "self_type" : "type-1193",
+   "referenced_type" : "type-1197",
+   "self_type" : "type-1197",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSZN7android14ReferenceMover15move_referencesINS_13GraphicBufferEEEvPNS_2spIT_EEPKS5_jE7Renamer",
@@ -53689,8 +53787,8 @@
    "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-1039",
-   "self_type" : "type-1039",
+   "referenced_type" : "type-1042",
+   "self_type" : "type-1042",
    "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"
@@ -53699,8 +53797,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::ADebug",
    "name" : "android::ADebug",
-   "referenced_type" : "type-2281",
-   "self_type" : "type-2281",
+   "referenced_type" : "type-2284",
+   "self_type" : "type-2284",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
    "unique_id" : "_ZTSN7android6ADebugE"
@@ -54199,8 +54297,8 @@
    ],
    "linker_set_key" : "android::AReplyToken",
    "name" : "android::AReplyToken",
-   "referenced_type" : "type-1044",
-   "self_type" : "type-1044",
+   "referenced_type" : "type-1043",
+   "self_type" : "type-1043",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android11AReplyTokenE",
@@ -55169,6 +55267,10 @@
      "mangled_component_name" : "_ZN7android16ProducerListener18needsReleaseNotifyEv"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ProducerListener18onBuffersDiscardedERKNSt3__16vectorIiNS1_9allocatorIiEEEE"
+    },
+    {
      "mangled_component_name" : "_ZNK7android17IProducerListener13getHalVariantEv"
     },
     {
@@ -55319,7 +55421,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1096"
+     "referenced_type" : "type-1099"
     },
     {
      "referenced_type" : "type-67"
@@ -55328,11 +55430,11 @@
    "linker_set_key" : "android::BnInterface<android::ISurfaceComposer>",
    "name" : "android::BnInterface<android::ISurfaceComposer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1095",
-   "self_type" : "type-1095",
+   "referenced_type" : "type-1098",
+   "self_type" : "type-1098",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-1097" ],
+   "template_args" : [ "type-1100" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_16ISurfaceComposerEEE",
    "vtable_components" :
    [
@@ -55367,7 +55469,7 @@
     },
     {
      "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ISurfaceComposer28createDisplayEventConnectionENS0_11VsyncSourceE"
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer28createDisplayEventConnectionENS0_11VsyncSourceENS0_13ConfigChangedE"
     },
     {
      "is_pure" : true,
@@ -55446,6 +55548,10 @@
     },
     {
      "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer13captureScreenEyPNS_8hardware8graphics6common4V1_29DataspaceEPNS_2spINS_13GraphicBufferEEE"
+    },
+    {
+     "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"
     },
     {
@@ -55525,6 +55631,10 @@
      "mangled_component_name" : "_ZNK7android16ISurfaceComposer20setDisplayBrightnessERKNS_2spINS_7IBinderEEEf"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer15notifyPowerHintEi"
+    },
+    {
      "mangled_component_name" : "_ZN7android11BnInterfaceINS_16ISurfaceComposerEE19queryLocalInterfaceERKNS_8String16E"
     },
     {
@@ -55643,7 +55753,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1032"
+     "referenced_type" : "type-1035"
     },
     {
      "referenced_type" : "type-67"
@@ -55652,11 +55762,11 @@
    "linker_set_key" : "android::BnInterface<android::ITransactionCompletedListener>",
    "name" : "android::BnInterface<android::ITransactionCompletedListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1031",
-   "self_type" : "type-1031",
+   "referenced_type" : "type-1034",
+   "self_type" : "type-1034",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-1033" ],
+   "template_args" : [ "type-1036" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_29ITransactionCompletedListenerEEE",
    "vtable_components" :
    [
@@ -55808,7 +55918,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1496"
+     "referenced_type" : "type-1502"
     },
     {
      "referenced_type" : "type-48"
@@ -55817,11 +55927,11 @@
    "linker_set_key" : "android::BpInterface<android::IConsumerListener>",
    "name" : "android::BpInterface<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1495",
-   "self_type" : "type-1495",
+   "referenced_type" : "type-1501",
+   "self_type" : "type-1501",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-1497" ],
+   "template_args" : [ "type-1503" ],
    "unique_id" : "_ZTSN7android11BpInterfaceINS_17IConsumerListenerEEE",
    "vtable_components" :
    [
@@ -55977,7 +56087,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1625"
+     "referenced_type" : "type-1630"
     },
     {
      "referenced_type" : "type-48"
@@ -55986,11 +56096,11 @@
    "linker_set_key" : "android::BpInterface<android::IGraphicBufferConsumer>",
    "name" : "android::BpInterface<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1624",
-   "self_type" : "type-1624",
+   "referenced_type" : "type-1629",
+   "self_type" : "type-1629",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-1626" ],
+   "template_args" : [ "type-1631" ],
    "unique_id" : "_ZTSN7android11BpInterfaceINS_22IGraphicBufferConsumerEEE",
    "vtable_components" :
    [
@@ -56182,7 +56292,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-4318"
+     "referenced_type" : "type-4324"
     },
     {
      "referenced_type" : "type-48"
@@ -56191,11 +56301,11 @@
    "linker_set_key" : "android::BpInterface<android::IGraphicBufferProducer>",
    "name" : "android::BpInterface<android::IGraphicBufferProducer>",
    "record_kind" : "class",
-   "referenced_type" : "type-4317",
-   "self_type" : "type-4317",
+   "referenced_type" : "type-4323",
+   "self_type" : "type-4323",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-4319" ],
+   "template_args" : [ "type-4325" ],
    "unique_id" : "_ZTSN7android11BpInterfaceINS_22IGraphicBufferProducerEEE",
    "vtable_components" :
    [
@@ -56411,7 +56521,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-4480"
+     "referenced_type" : "type-4486"
     },
     {
      "referenced_type" : "type-48"
@@ -56420,11 +56530,11 @@
    "linker_set_key" : "android::BpInterface<android::IProducerListener>",
    "name" : "android::BpInterface<android::IProducerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-4479",
-   "self_type" : "type-4479",
+   "referenced_type" : "type-4485",
+   "self_type" : "type-4485",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-4481" ],
+   "template_args" : [ "type-4487" ],
    "unique_id" : "_ZTSN7android11BpInterfaceINS_17IProducerListenerEEE",
    "vtable_components" :
    [
@@ -56456,6 +56566,10 @@
      "mangled_component_name" : "_ZN7android16ProducerListener18needsReleaseNotifyEv"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ProducerListener18onBuffersDiscardedERKNSt3__16vectorIiNS1_9allocatorIiEEEE"
+    },
+    {
      "mangled_component_name" : "_ZNK7android17IProducerListener13getHalVariantEv"
     },
     {
@@ -56688,28 +56802,28 @@
    [
     {
      "field_name" : "mRange",
-     "referenced_type" : "type-2429"
+     "referenced_type" : "type-2432"
     },
     {
      "field_name" : "mPrimaries",
      "field_offset" : 32,
-     "referenced_type" : "type-2430"
+     "referenced_type" : "type-2433"
     },
     {
      "field_name" : "mTransfer",
      "field_offset" : 64,
-     "referenced_type" : "type-2431"
+     "referenced_type" : "type-2434"
     },
     {
      "field_name" : "mMatrixCoeffs",
      "field_offset" : 96,
-     "referenced_type" : "type-2432"
+     "referenced_type" : "type-2435"
     }
    ],
    "linker_set_key" : "android::ColorAspects",
    "name" : "android::ColorAspects",
-   "referenced_type" : "type-2428",
-   "self_type" : "type-2428",
+   "referenced_type" : "type-2431",
+   "self_type" : "type-2431",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android12ColorAspectsE"
@@ -56718,8 +56832,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::ColorUtils",
    "name" : "android::ColorUtils",
-   "referenced_type" : "type-1181",
-   "self_type" : "type-1181",
+   "referenced_type" : "type-1180",
+   "self_type" : "type-1180",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
    "unique_id" : "_ZTSN7android10ColorUtilsE"
@@ -56728,8 +56842,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::CompileTimeAssert<true>",
    "name" : "android::CompileTimeAssert<true>",
-   "referenced_type" : "type-2690",
-   "self_type" : "type-2690",
+   "referenced_type" : "type-2693",
+   "self_type" : "type-2693",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Debug.h",
    "unique_id" : "_ZTSN7android17CompileTimeAssertILb1EEE"
@@ -56822,7 +56936,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -56832,7 +56946,7 @@
     {
      "field_name" : "bTunneled",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nAudioHwSync",
@@ -56847,8 +56961,8 @@
    ],
    "linker_set_key" : "android::ConfigureVideoTunnelModeParams",
    "name" : "android::ConfigureVideoTunnelModeParams",
-   "referenced_type" : "type-2426",
-   "self_type" : "type-2426",
+   "referenced_type" : "type-2429",
+   "self_type" : "type-2429",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android30ConfigureVideoTunnelModeParamsE"
@@ -56864,7 +56978,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -56874,12 +56988,12 @@
     {
      "field_name" : "bRequestingDataSpace",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bDataSpaceChanged",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nPixelFormat",
@@ -56894,13 +57008,13 @@
     {
      "field_name" : "sAspects",
      "field_offset" : 224,
-     "referenced_type" : "type-2428"
+     "referenced_type" : "type-2431"
     }
    ],
    "linker_set_key" : "android::DescribeColorAspectsParams",
    "name" : "android::DescribeColorAspectsParams",
-   "referenced_type" : "type-2427",
-   "self_type" : "type-2427",
+   "referenced_type" : "type-2430",
+   "self_type" : "type-2430",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26DescribeColorAspectsParamsE"
@@ -56916,12 +57030,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 64,
-     "referenced_type" : "type-2199"
+     "referenced_type" : "type-2202"
     },
     {
      "field_name" : "nFrameWidth",
@@ -56946,18 +57060,18 @@
     {
      "field_name" : "bUsingNativeBuffers",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "sMediaImage",
      "field_offset" : 256,
-     "referenced_type" : "type-2420"
+     "referenced_type" : "type-2423"
     }
    ],
    "linker_set_key" : "android::DescribeColorFormat2Params",
    "name" : "android::DescribeColorFormat2Params",
-   "referenced_type" : "type-2419",
-   "self_type" : "type-2419",
+   "referenced_type" : "type-2422",
+   "self_type" : "type-2422",
    "size" : 136,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26DescribeColorFormat2ParamsE"
@@ -56973,12 +57087,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 64,
-     "referenced_type" : "type-2199"
+     "referenced_type" : "type-2202"
     },
     {
      "field_name" : "nFrameWidth",
@@ -57003,18 +57117,18 @@
     {
      "field_name" : "bUsingNativeBuffers",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "sMediaImage",
      "field_offset" : 256,
-     "referenced_type" : "type-2415"
+     "referenced_type" : "type-2418"
     }
    ],
    "linker_set_key" : "android::DescribeColorFormatParams",
    "name" : "android::DescribeColorFormatParams",
-   "referenced_type" : "type-2414",
-   "self_type" : "type-2414",
+   "referenced_type" : "type-2417",
+   "self_type" : "type-2417",
    "size" : 112,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android25DescribeColorFormatParamsE"
@@ -57030,7 +57144,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -57050,13 +57164,13 @@
     {
      "field_name" : "nValue",
      "field_offset" : 160,
-     "referenced_type" : "type-1572"
+     "referenced_type" : "type-1567"
     }
    ],
    "linker_set_key" : "android::DescribeHDR10PlusInfoParams",
    "name" : "android::DescribeHDR10PlusInfoParams",
-   "referenced_type" : "type-2440",
-   "self_type" : "type-2440",
+   "referenced_type" : "type-2443",
+   "self_type" : "type-2443",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android27DescribeHDR10PlusInfoParamsE"
@@ -57072,7 +57186,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -57082,13 +57196,13 @@
     {
      "field_name" : "sInfo",
      "field_offset" : 96,
-     "referenced_type" : "type-2435"
+     "referenced_type" : "type-2438"
     }
    ],
    "linker_set_key" : "android::DescribeHDRStaticInfoParams",
    "name" : "android::DescribeHDRStaticInfoParams",
-   "referenced_type" : "type-2434",
-   "self_type" : "type-2434",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2437",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android27DescribeHDRStaticInfoParamsE"
@@ -57104,7 +57218,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -57114,13 +57228,13 @@
     {
      "field_name" : "enable",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "android::EnableAndroidNativeBuffersParams",
    "name" : "android::EnableAndroidNativeBuffersParams",
-   "referenced_type" : "type-2395",
-   "self_type" : "type-2395",
+   "referenced_type" : "type-2398",
+   "self_type" : "type-2398",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android32EnableAndroidNativeBuffersParamsE"
@@ -57132,13 +57246,13 @@
     {
      "access" : "private",
      "field_name" : "mSharedFd",
-     "referenced_type" : "type-1199"
+     "referenced_type" : "type-1202"
     }
    ],
    "linker_set_key" : "android::FileDescriptor",
    "name" : "android::FileDescriptor",
-   "referenced_type" : "type-1198",
-   "self_type" : "type-1198",
+   "referenced_type" : "type-1201",
+   "self_type" : "type-1201",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h",
    "unique_id" : "_ZTSN7android14FileDescriptorE"
@@ -57155,8 +57269,8 @@
    ],
    "linker_set_key" : "android::FileDescriptor::Autoclose",
    "name" : "android::FileDescriptor::Autoclose",
-   "referenced_type" : "type-1204",
-   "self_type" : "type-1204",
+   "referenced_type" : "type-1203",
+   "self_type" : "type-1203",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h",
    "unique_id" : "_ZTSN7android14FileDescriptor9AutocloseE"
@@ -57340,7 +57454,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -57355,8 +57469,8 @@
    ],
    "linker_set_key" : "android::GetAndroidNativeBufferUsageParams",
    "name" : "android::GetAndroidNativeBufferUsageParams",
-   "referenced_type" : "type-2412",
-   "self_type" : "type-2412",
+   "referenced_type" : "type-2415",
+   "self_type" : "type-2415",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android33GetAndroidNativeBufferUsageParamsE"
@@ -57702,17 +57816,17 @@
    [
     {
      "field_name" : "mID",
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2439"
     },
     {
      "field_offset" : 8,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2440"
     }
    ],
    "linker_set_key" : "android::HDRStaticInfo",
    "name" : "android::HDRStaticInfo",
-   "referenced_type" : "type-2435",
-   "self_type" : "type-2435",
+   "referenced_type" : "type-2438",
+   "self_type" : "type-2438",
    "size" : 25,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfoE"
@@ -57723,15 +57837,15 @@
    [
     {
      "field_name" : "sType1",
-     "referenced_type" : "type-2438"
+     "referenced_type" : "type-2441"
     }
    ],
    "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-2437",
-   "self_type" : "type-2437",
+   "referenced_type" : "type-2440",
+   "self_type" : "type-2440",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfoUt_E"
@@ -57752,8 +57866,8 @@
    ],
    "linker_set_key" : "android::HDRStaticInfo::Primaries1",
    "name" : "android::HDRStaticInfo::Primaries1",
-   "referenced_type" : "type-2439",
-   "self_type" : "type-2439",
+   "referenced_type" : "type-2442",
+   "self_type" : "type-2442",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfo10Primaries1E"
@@ -57764,22 +57878,22 @@
    [
     {
      "field_name" : "mR",
-     "referenced_type" : "type-2439"
+     "referenced_type" : "type-2442"
     },
     {
      "field_name" : "mG",
      "field_offset" : 32,
-     "referenced_type" : "type-2439"
+     "referenced_type" : "type-2442"
     },
     {
      "field_name" : "mB",
      "field_offset" : 64,
-     "referenced_type" : "type-2439"
+     "referenced_type" : "type-2442"
     },
     {
      "field_name" : "mW",
      "field_offset" : 96,
-     "referenced_type" : "type-2439"
+     "referenced_type" : "type-2442"
     },
     {
      "field_name" : "mMaxDisplayLuminance",
@@ -57804,8 +57918,8 @@
    ],
    "linker_set_key" : "android::HDRStaticInfo::Type1",
    "name" : "android::HDRStaticInfo::Type1",
-   "referenced_type" : "type-2438",
-   "self_type" : "type-2438",
+   "referenced_type" : "type-2441",
+   "self_type" : "type-2441",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfo5Type1E"
@@ -58129,31 +58243,31 @@
     {
      "access" : "private",
      "field_name" : "mProcess",
-     "referenced_type" : "type-1258"
+     "referenced_type" : "type-1261"
     },
     {
      "access" : "private",
      "field_name" : "mPendingStrongDerefs",
      "field_offset" : 32,
-     "referenced_type" : "type-1205"
+     "referenced_type" : "type-1208"
     },
     {
      "access" : "private",
      "field_name" : "mPendingWeakDerefs",
      "field_offset" : 192,
-     "referenced_type" : "type-1207"
+     "referenced_type" : "type-1210"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteStrongDerefs",
      "field_offset" : 352,
-     "referenced_type" : "type-1208"
+     "referenced_type" : "type-1213"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteWeakDerefs",
      "field_offset" : 512,
-     "referenced_type" : "type-1207"
+     "referenced_type" : "type-1210"
     },
     {
      "access" : "private",
@@ -58219,20 +58333,20 @@
      "access" : "private",
      "field_name" : "mIPCThreadStateBase",
      "field_offset" : 1888,
-     "referenced_type" : "type-1264"
+     "referenced_type" : "type-1267"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 1920,
-     "referenced_type" : "type-1255"
+     "referenced_type" : "type-1259"
     }
    ],
    "linker_set_key" : "android::IPCThreadState",
    "name" : "android::IPCThreadState",
    "record_kind" : "class",
-   "referenced_type" : "type-1257",
-   "self_type" : "type-1257",
+   "referenced_type" : "type-1260",
+   "self_type" : "type-1260",
    "size" : 244,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h",
    "unique_id" : "_ZTSN7android14IPCThreadStateE"
@@ -58244,17 +58358,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-1200"
+     "referenced_type" : "type-1204"
     }
    ],
    "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",
+   "referenced_type" : "type-1241",
+   "self_type" : "type-1241",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-1239", "type-795" ],
+   "template_args" : [ "type-1242", "type-795" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_7IBinderEEEEE"
   },
   {
@@ -58264,17 +58378,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-1354"
+     "referenced_type" : "type-1357"
     }
    ],
    "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",
+   "referenced_type" : "type-1369",
+   "self_type" : "type-1369",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-1239", "type-1367" ],
+   "template_args" : [ "type-1242", "type-1370" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
   },
   {
@@ -58342,11 +58456,11 @@
    "linker_set_key" : "android::LightFlattenable<android::FrameStats>",
    "name" : "android::LightFlattenable<android::FrameStats>",
    "record_kind" : "class",
-   "referenced_type" : "type-1098",
-   "self_type" : "type-1098",
+   "referenced_type" : "type-1101",
+   "self_type" : "type-1101",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1099" ],
+   "template_args" : [ "type-1102" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_10FrameStatsEEE"
   },
   {
@@ -58460,17 +58574,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-1210"
+     "referenced_type" : "type-1215"
     }
    ],
    "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",
+   "referenced_type" : "type-1214",
+   "self_type" : "type-1214",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-1211" ],
+   "template_args" : [ "type-1216" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_10GLConsumer8EglImageEEE"
   },
   {
@@ -58500,17 +58614,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-2353"
+     "referenced_type" : "type-2356"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
    "name" : "android::LightRefBase<android::VirtualLightRefBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-2352",
-   "self_type" : "type-2352",
+   "referenced_type" : "type-2355",
+   "self_type" : "type-2355",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-2354" ],
+   "template_args" : [ "type-2357" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
   },
   {
@@ -58921,7 +59035,7 @@
    [
     {
      "field_name" : "mType",
-     "referenced_type" : "type-2416"
+     "referenced_type" : "type-2419"
     },
     {
      "field_name" : "mNumPlanes",
@@ -58946,13 +59060,13 @@
     {
      "field_name" : "mPlane",
      "field_offset" : 160,
-     "referenced_type" : "type-2417"
+     "referenced_type" : "type-2420"
     }
    ],
    "linker_set_key" : "android::MediaImage",
    "name" : "android::MediaImage",
-   "referenced_type" : "type-2415",
-   "self_type" : "type-2415",
+   "referenced_type" : "type-2418",
+   "self_type" : "type-2418",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android10MediaImageE"
@@ -58963,7 +59077,7 @@
    [
     {
      "field_name" : "mType",
-     "referenced_type" : "type-2421"
+     "referenced_type" : "type-2424"
     },
     {
      "field_name" : "mNumPlanes",
@@ -58993,13 +59107,13 @@
     {
      "field_name" : "mPlane",
      "field_offset" : 192,
-     "referenced_type" : "type-2422"
+     "referenced_type" : "type-2425"
     }
    ],
    "linker_set_key" : "android::MediaImage2",
    "name" : "android::MediaImage2",
-   "referenced_type" : "type-2420",
-   "self_type" : "type-2420",
+   "referenced_type" : "type-2423",
+   "self_type" : "type-2423",
    "size" : 104,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android11MediaImage2E"
@@ -59035,8 +59149,8 @@
    ],
    "linker_set_key" : "android::MediaImage2::PlaneInfo",
    "name" : "android::MediaImage2::PlaneInfo",
-   "referenced_type" : "type-2423",
-   "self_type" : "type-2423",
+   "referenced_type" : "type-2426",
+   "self_type" : "type-2426",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android11MediaImage29PlaneInfoE"
@@ -59072,8 +59186,8 @@
    ],
    "linker_set_key" : "android::MediaImage::PlaneInfo",
    "name" : "android::MediaImage::PlaneInfo",
-   "referenced_type" : "type-2418",
-   "self_type" : "type-2418",
+   "referenced_type" : "type-2421",
+   "self_type" : "type-2421",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android10MediaImage9PlaneInfoE"
@@ -59152,8 +59266,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::OMXPluginBase",
    "name" : "android::OMXPluginBase",
-   "referenced_type" : "type-2393",
-   "self_type" : "type-2393",
+   "referenced_type" : "type-2396",
+   "self_type" : "type-2396",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h",
    "unique_id" : "_ZTSN7android13OMXPluginBaseE",
@@ -59365,17 +59479,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 32,
-     "referenced_type" : "type-1512"
+     "referenced_type" : "type-1516"
     }
    ],
    "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",
+   "referenced_type" : "type-1520",
+   "self_type" : "type-1520",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-1517" ],
+   "template_args" : [ "type-1521" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_10BufferItemEEE",
    "vtable_components" :
    [
@@ -59414,17 +59528,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 32,
-     "referenced_type" : "type-1647"
+     "referenced_type" : "type-1650"
     }
    ],
    "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",
+   "referenced_type" : "type-1662",
+   "self_type" : "type-1662",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-1659" ],
+   "template_args" : [ "type-1663" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_5FenceEEE",
    "vtable_components" :
    [
@@ -59463,17 +59577,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 32,
-     "referenced_type" : "type-4322"
+     "referenced_type" : "type-4328"
     }
    ],
    "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",
+   "referenced_type" : "type-4334",
+   "self_type" : "type-4334",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-4329" ],
+   "template_args" : [ "type-4335" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEEE",
    "vtable_components" :
    [
@@ -59512,17 +59626,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 32,
-     "referenced_type" : "type-1646"
+     "referenced_type" : "type-1649"
     }
    ],
    "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",
+   "referenced_type" : "type-1657",
+   "self_type" : "type-1657",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-1654" ],
+   "template_args" : [ "type-1658" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_13GraphicBufferEEE",
    "vtable_components" :
    [
@@ -59561,17 +59675,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 32,
-     "referenced_type" : "type-4321"
+     "referenced_type" : "type-4327"
     }
    ],
    "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",
+   "referenced_type" : "type-4339",
+   "self_type" : "type-4339",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-4334" ],
+   "template_args" : [ "type-4340" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEEE",
    "vtable_components" :
    [
@@ -59610,17 +59724,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 32,
-     "referenced_type" : "type-4323"
+     "referenced_type" : "type-4329"
     }
    ],
    "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",
+   "referenced_type" : "type-4345",
+   "self_type" : "type-4345",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-4339" ],
+   "template_args" : [ "type-4346" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEEE",
    "vtable_components" :
    [
@@ -59765,7 +59879,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -59775,7 +59889,7 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nMaxFrameWidth",
@@ -59790,8 +59904,8 @@
    ],
    "linker_set_key" : "android::PrepareForAdaptivePlaybackParams",
    "name" : "android::PrepareForAdaptivePlaybackParams",
-   "referenced_type" : "type-2406",
-   "self_type" : "type-2406",
+   "referenced_type" : "type-2409",
+   "self_type" : "type-2409",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android32PrepareForAdaptivePlaybackParamsE"
@@ -59807,18 +59921,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 64,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "android::PrependSPSPPSToIDRFramesParams",
    "name" : "android::PrependSPSPPSToIDRFramesParams",
-   "referenced_type" : "type-2413",
-   "self_type" : "type-2413",
+   "referenced_type" : "type-2416",
+   "self_type" : "type-2416",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android30PrependSPSPPSToIDRFramesParamsE"
@@ -59856,13 +59970,13 @@
      "access" : "private",
      "field_name" : "mThreadCountLock",
      "field_offset" : 128,
-     "referenced_type" : "type-1262"
+     "referenced_type" : "type-1265"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountDecrement",
      "field_offset" : 160,
-     "referenced_type" : "type-1263"
+     "referenced_type" : "type-1266"
     },
     {
      "access" : "private",
@@ -59892,7 +60006,7 @@
      "access" : "private",
      "field_name" : "mHandleToObject",
      "field_offset" : 352,
-     "referenced_type" : "type-1202"
+     "referenced_type" : "type-1206"
     },
     {
      "access" : "private",
@@ -59904,7 +60018,7 @@
      "access" : "private",
      "field_name" : "mBinderContextCheckFunc",
      "field_offset" : 544,
-     "referenced_type" : "type-1249"
+     "referenced_type" : "type-1252"
     },
     {
      "access" : "private",
@@ -59916,7 +60030,7 @@
      "access" : "private",
      "field_name" : "mContexts",
      "field_offset" : 608,
-     "referenced_type" : "type-1238"
+     "referenced_type" : "type-1241"
     },
     {
      "access" : "private",
@@ -59934,20 +60048,20 @@
      "access" : "private",
      "field_name" : "mThreadPoolSeq",
      "field_offset" : 832,
-     "referenced_type" : "type-1250"
+     "referenced_type" : "type-1253"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 864,
-     "referenced_type" : "type-1255"
+     "referenced_type" : "type-1259"
     }
    ],
    "linker_set_key" : "android::ProcessState",
    "name" : "android::ProcessState",
    "record_kind" : "class",
-   "referenced_type" : "type-1261",
-   "self_type" : "type-1261",
+   "referenced_type" : "type-1264",
+   "self_type" : "type-1264",
    "size" : 120,
    "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h",
    "unique_id" : "_ZTSN7android12ProcessStateE",
@@ -60035,8 +60149,8 @@
    ],
    "linker_set_key" : "android::ProcessState::handle_entry",
    "name" : "android::ProcessState::handle_entry",
-   "referenced_type" : "type-1203",
-   "self_type" : "type-1203",
+   "referenced_type" : "type-1207",
+   "self_type" : "type-1207",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h",
    "unique_id" : "_ZTSN7android12ProcessState12handle_entryE"
@@ -60164,8 +60278,8 @@
    "linker_set_key" : "android::ReferenceMover",
    "name" : "android::ReferenceMover",
    "record_kind" : "class",
-   "referenced_type" : "type-1589",
-   "self_type" : "type-1589",
+   "referenced_type" : "type-1592",
+   "self_type" : "type-1592",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android14ReferenceMoverE"
@@ -60175,8 +60289,8 @@
    "linker_set_key" : "android::ReferenceRenamer",
    "name" : "android::ReferenceRenamer",
    "record_kind" : "class",
-   "referenced_type" : "type-1166",
-   "self_type" : "type-1166",
+   "referenced_type" : "type-1167",
+   "self_type" : "type-1167",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android16ReferenceRenamerE",
@@ -60199,8 +60313,8 @@
    "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",
+   "referenced_type" : "type-1565",
+   "self_type" : "type-1565",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE16ElementIsPointerILj0EJRKNS_10BufferItemEEEE"
@@ -60212,14 +60326,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> >",
    "name" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> >",
    "record_kind" : "class",
-   "referenced_type" : "type-1563",
-   "self_type" : "type-1563",
+   "referenced_type" : "type-1568",
+   "self_type" : "type-1568",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE11InputReaderIJNSt3__15tupleIJEEEEEE"
@@ -60231,14 +60345,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-1572",
+   "self_type" : "type-1572",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE11InputReaderIJNSt3__15tupleIJRKNS_10BufferItemEEEEEEE"
@@ -60247,8 +60361,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::MethodCaller<tuple<> >",
    "name" : "android::SafeBnInterface<IConsumerListener>::MethodCaller<tuple<> >",
-   "referenced_type" : "type-1573",
-   "self_type" : "type-1573",
+   "referenced_type" : "type-1576",
+   "self_type" : "type-1576",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE12MethodCallerIJNSt3__15tupleIJEEEEEE"
@@ -60257,8 +60371,8 @@
    "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",
+   "referenced_type" : "type-1577",
+   "self_type" : "type-1577",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE12MethodCallerIJNSt3__15tupleIJRKNS_10BufferItemEEEEEEE"
@@ -60267,52 +60381,52 @@
    "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",
+   "referenced_type" : "type-1559",
+   "self_type" : "type-1559",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1556" ],
+   "template_args" : [ "type-1560" ],
    "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",
+   "referenced_type" : "type-1561",
+   "self_type" : "type-1561",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1558" ],
+   "template_args" : [ "type-1562" ],
    "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",
+   "referenced_type" : "type-1563",
+   "self_type" : "type-1563",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1560" ],
+   "template_args" : [ "type-1564" ],
    "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",
+   "referenced_type" : "type-1557",
+   "self_type" : "type-1557",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1554" ],
+   "template_args" : [ "type-1558" ],
    "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",
+   "referenced_type" : "type-2025",
+   "self_type" : "type-2025",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJPNS_10BufferItemExyEEE"
@@ -60321,8 +60435,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, android_dataspace_t>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, android_dataspace_t>",
-   "referenced_type" : "type-2037",
-   "self_type" : "type-2037",
+   "referenced_type" : "type-2041",
+   "self_type" : "type-2041",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJ19android_dataspace_tEEE"
@@ -60331,8 +60445,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, bool, vector<Segment, allocator<Segment> > *>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, bool, vector<Segment, allocator<Segment> > *>",
-   "referenced_type" : "type-2042",
-   "self_type" : "type-2042",
+   "referenced_type" : "type-2047",
+   "self_type" : "type-2047",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS7_EEEEEEE"
@@ -60341,8 +60455,8 @@
    "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",
+   "referenced_type" : "type-2043",
+   "self_type" : "type-2043",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJbEEE"
@@ -60351,8 +60465,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, const String8 &, String8 *>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, const String8 &, String8 *>",
-   "referenced_type" : "type-2045",
-   "self_type" : "type-2045",
+   "referenced_type" : "type-2049",
+   "self_type" : "type-2049",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJRKNS_7String8EPS4_EEE"
@@ -60361,8 +60475,8 @@
    "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",
+   "referenced_type" : "type-2040",
+   "self_type" : "type-2040",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJRKNS_7String8EEEE"
@@ -60371,8 +60485,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, const sp<IConsumerListener> &, bool>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, const sp<IConsumerListener> &, bool>",
-   "referenced_type" : "type-2030",
-   "self_type" : "type-2030",
+   "referenced_type" : "type-2034",
+   "self_type" : "type-2034",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJRKNS_2spINS_17IConsumerListenerEEEbEEE"
@@ -60381,8 +60495,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, int *, const sp<GraphicBuffer> &>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, int *, const sp<GraphicBuffer> &>",
-   "referenced_type" : "type-2025",
-   "self_type" : "type-2025",
+   "referenced_type" : "type-2029",
+   "self_type" : "type-2029",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJPiRKNS_2spINS_13GraphicBufferEEEEEE"
@@ -60391,8 +60505,8 @@
    "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",
+   "referenced_type" : "type-2031",
+   "self_type" : "type-2031",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJiyRKNS_2spINS_5FenceEEEEEE"
@@ -60401,8 +60515,8 @@
    "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",
+   "referenced_type" : "type-2028",
+   "self_type" : "type-2028",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJiEEE"
@@ -60411,8 +60525,8 @@
    "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",
+   "referenced_type" : "type-2045",
+   "self_type" : "type-2045",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJPNS_2spINS_12NativeHandleEEEEEE"
@@ -60421,8 +60535,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned int, unsigned int>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned int, unsigned int>",
-   "referenced_type" : "type-2034",
-   "self_type" : "type-2034",
+   "referenced_type" : "type-2038",
+   "self_type" : "type-2038",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJjjEEE"
@@ -60431,8 +60545,8 @@
    "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",
+   "referenced_type" : "type-2044",
+   "self_type" : "type-2044",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJjEEE"
@@ -60441,8 +60555,8 @@
    "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",
+   "referenced_type" : "type-2037",
+   "self_type" : "type-2037",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJPyEEE"
@@ -60451,8 +60565,8 @@
    "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",
+   "referenced_type" : "type-2042",
+   "self_type" : "type-2042",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJyEEE"
@@ -60461,8 +60575,8 @@
    "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",
+   "referenced_type" : "type-2026",
+   "self_type" : "type-2026",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJPNS_10BufferItemExyEEE"
@@ -60471,8 +60585,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, bool, vector<Segment, allocator<Segment> > *>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, bool, vector<Segment, allocator<Segment> > *>",
-   "referenced_type" : "type-2044",
-   "self_type" : "type-2044",
+   "referenced_type" : "type-2048",
+   "self_type" : "type-2048",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS7_EEEEEEE"
@@ -60481,8 +60595,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, const String8 &, String8 *>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, const String8 &, String8 *>",
-   "referenced_type" : "type-2046",
-   "self_type" : "type-2046",
+   "referenced_type" : "type-2050",
+   "self_type" : "type-2050",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJRKNS_7String8EPS4_EEE"
@@ -60491,8 +60605,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, const sp<IConsumerListener> &, bool>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, const sp<IConsumerListener> &, bool>",
-   "referenced_type" : "type-2031",
-   "self_type" : "type-2031",
+   "referenced_type" : "type-2036",
+   "self_type" : "type-2036",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJRKNS_2spINS_17IConsumerListenerEEEbEEE"
@@ -60501,8 +60615,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, int *, const sp<GraphicBuffer> &>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, int *, const sp<GraphicBuffer> &>",
-   "referenced_type" : "type-2026",
-   "self_type" : "type-2026",
+   "referenced_type" : "type-2030",
+   "self_type" : "type-2030",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJPiRKNS_2spINS_13GraphicBufferEEEEEE"
@@ -60511,8 +60625,8 @@
    "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",
+   "referenced_type" : "type-2032",
+   "self_type" : "type-2032",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJiyRKNS_2spINS_5FenceEEEEEE"
@@ -60521,8 +60635,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, unsigned int, unsigned int>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, unsigned int, unsigned int>",
-   "referenced_type" : "type-2035",
-   "self_type" : "type-2035",
+   "referenced_type" : "type-2039",
+   "self_type" : "type-2039",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJjjEEE"
@@ -60531,8 +60645,8 @@
    "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",
+   "referenced_type" : "type-2027",
+   "self_type" : "type-2027",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj2EJPNS_10BufferItemExyEEE"
@@ -60541,8 +60655,8 @@
    "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",
+   "referenced_type" : "type-2033",
+   "self_type" : "type-2033",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj2EJiyRKNS_2spINS_5FenceEEEEEE"
@@ -60554,14 +60668,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2073",
+   "self_type" : "type-2073",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJEEEEEE"
@@ -60573,14 +60687,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2051",
+   "self_type" : "type-2051",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPNS_10BufferItemExyEEEEEE"
@@ -60592,14 +60706,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2091",
+   "self_type" : "type-2091",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJ19android_dataspace_tEEEEEE"
@@ -60611,14 +60725,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2111",
+   "self_type" : "type-2111",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJbPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEEEE"
@@ -60630,14 +60744,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2097",
+   "self_type" : "type-2097",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJbEEEEEE"
@@ -60649,14 +60763,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2116",
+   "self_type" : "type-2116",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJRKNS_7String8EPS6_EEEEEE"
@@ -60668,14 +60782,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2086",
+   "self_type" : "type-2086",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJRKNS_7String8EEEEEEE"
@@ -60687,14 +60801,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2069",
+   "self_type" : "type-2069",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEEbEEEEEE"
@@ -60706,14 +60820,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2060",
+   "self_type" : "type-2060",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
@@ -60725,14 +60839,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2064",
+   "self_type" : "type-2064",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJiyRKNS_2spINS_5FenceEEEEEEEEE"
@@ -60744,14 +60858,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2055",
+   "self_type" : "type-2055",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJiEEEEEE"
@@ -60763,14 +60877,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2107",
+   "self_type" : "type-2107",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPNS_2spINS_12NativeHandleEEEEEEEEE"
@@ -60782,14 +60896,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2082",
+   "self_type" : "type-2082",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJjjEEEEEE"
@@ -60801,14 +60915,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2103",
+   "self_type" : "type-2103",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJjEEEEEE"
@@ -60820,14 +60934,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2077",
+   "self_type" : "type-2077",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPyEEEEEE"
@@ -60839,14 +60953,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2095",
+   "self_type" : "type-2095",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJyEEEEEE"
@@ -60855,8 +60969,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<> >",
-   "referenced_type" : "type-2122",
-   "self_type" : "type-2122",
+   "referenced_type" : "type-2126",
+   "self_type" : "type-2126",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJEEEEEE"
@@ -60865,8 +60979,8 @@
    "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",
+   "referenced_type" : "type-2120",
+   "self_type" : "type-2120",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPNS_10BufferItemExyEEEEEE"
@@ -60875,8 +60989,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<android_dataspace_t> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<android_dataspace_t> >",
-   "referenced_type" : "type-2126",
-   "self_type" : "type-2126",
+   "referenced_type" : "type-2130",
+   "self_type" : "type-2130",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJ19android_dataspace_tEEEEEE"
@@ -60885,8 +60999,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<bool, vector<Segment, allocator<Segment> > *> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<bool, vector<Segment, allocator<Segment> > *> >",
-   "referenced_type" : "type-2131",
-   "self_type" : "type-2131",
+   "referenced_type" : "type-2136",
+   "self_type" : "type-2136",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJbPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEEEE"
@@ -60895,8 +61009,8 @@
    "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",
+   "referenced_type" : "type-2132",
+   "self_type" : "type-2132",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJbEEEEEE"
@@ -60905,8 +61019,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<const String8 &, String8 *> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<const String8 &, String8 *> >",
-   "referenced_type" : "type-2133",
-   "self_type" : "type-2133",
+   "referenced_type" : "type-2137",
+   "self_type" : "type-2137",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJRKNS_7String8EPS6_EEEEEE"
@@ -60915,8 +61029,8 @@
    "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",
+   "referenced_type" : "type-2129",
+   "self_type" : "type-2129",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJRKNS_7String8EEEEEEE"
@@ -60925,8 +61039,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<const sp<IConsumerListener> &, bool> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<const sp<IConsumerListener> &, bool> >",
-   "referenced_type" : "type-2120",
-   "self_type" : "type-2120",
+   "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_2spINS_17IConsumerListenerEEEbEEEEEE"
@@ -60935,8 +61049,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<int *, const sp<GraphicBuffer> &> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<int *, const sp<GraphicBuffer> &> >",
-   "referenced_type" : "type-2118",
-   "self_type" : "type-2118",
+   "referenced_type" : "type-2122",
+   "self_type" : "type-2122",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
@@ -60945,8 +61059,8 @@
    "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",
+   "referenced_type" : "type-2123",
+   "self_type" : "type-2123",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJiyRKNS_2spINS_5FenceEEEEEEEEE"
@@ -60955,8 +61069,8 @@
    "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",
+   "referenced_type" : "type-2121",
+   "self_type" : "type-2121",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJiEEEEEE"
@@ -60965,8 +61079,8 @@
    "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",
+   "referenced_type" : "type-2134",
+   "self_type" : "type-2134",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPNS_2spINS_12NativeHandleEEEEEEEEE"
@@ -60975,8 +61089,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned int, unsigned int> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned int, unsigned int> >",
-   "referenced_type" : "type-2124",
-   "self_type" : "type-2124",
+   "referenced_type" : "type-2128",
+   "self_type" : "type-2128",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJjjEEEEEE"
@@ -60985,8 +61099,8 @@
    "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",
+   "referenced_type" : "type-2133",
+   "self_type" : "type-2133",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJjEEEEEE"
@@ -60995,8 +61109,8 @@
    "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",
+   "referenced_type" : "type-2127",
+   "self_type" : "type-2127",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPyEEEEEE"
@@ -61005,8 +61119,8 @@
    "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",
+   "referenced_type" : "type-2131",
+   "self_type" : "type-2131",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJyEEEEEE"
@@ -61018,13 +61132,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<> >",
-   "referenced_type" : "type-2145",
-   "self_type" : "type-2145",
+   "referenced_type" : "type-2149",
+   "self_type" : "type-2149",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJEEEEEE"
@@ -61036,13 +61150,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2138",
+   "self_type" : "type-2138",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPNS_10BufferItemExyEEEEEE"
@@ -61054,13 +61168,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2158",
+   "self_type" : "type-2158",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJ19android_dataspace_tEEEEEE"
@@ -61072,13 +61186,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2169",
+   "self_type" : "type-2169",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJbPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEEEE"
@@ -61090,13 +61204,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool> >",
-   "referenced_type" : "type-2158",
-   "self_type" : "type-2158",
+   "referenced_type" : "type-2162",
+   "self_type" : "type-2162",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJbEEEEEE"
@@ -61108,13 +61222,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2171",
+   "self_type" : "type-2171",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJRKNS_7String8EPS6_EEEEEE"
@@ -61126,13 +61240,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2155",
+   "self_type" : "type-2155",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJRKNS_7String8EEEEEEE"
@@ -61144,13 +61258,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2147",
+   "self_type" : "type-2147",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEEbEEEEEE"
@@ -61162,13 +61276,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2142",
+   "self_type" : "type-2142",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
@@ -61180,13 +61294,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2144",
+   "self_type" : "type-2144",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJiyRKNS_2spINS_5FenceEEEEEEEEE"
@@ -61198,13 +61312,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int> >",
-   "referenced_type" : "type-2136",
-   "self_type" : "type-2136",
+   "referenced_type" : "type-2140",
+   "self_type" : "type-2140",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJiEEEEEE"
@@ -61216,13 +61330,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2166",
+   "self_type" : "type-2166",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPNS_2spINS_12NativeHandleEEEEEEEEE"
@@ -61234,13 +61348,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2153",
+   "self_type" : "type-2153",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJjjEEEEEE"
@@ -61252,13 +61366,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2164",
+   "self_type" : "type-2164",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJjEEEEEE"
@@ -61270,13 +61384,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2151",
+   "self_type" : "type-2151",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPyEEEEEE"
@@ -61288,13 +61402,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2160",
+   "self_type" : "type-2160",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJyEEEEEE"
@@ -61303,660 +61417,660 @@
    "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",
+   "referenced_type" : "type-1974",
+   "self_type" : "type-1974",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1971" ],
+   "template_args" : [ "type-1975" ],
    "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",
+   "referenced_type" : "type-1939",
+   "self_type" : "type-1939",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1936" ],
+   "template_args" : [ "type-1940" ],
    "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",
+   "referenced_type" : "type-1992",
+   "self_type" : "type-1992",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1988" ],
+   "template_args" : [ "type-1993" ],
    "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",
+   "referenced_type" : "type-2011",
+   "self_type" : "type-2011",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2008" ],
+   "template_args" : [ "type-2012" ],
    "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",
+   "referenced_type" : "type-1998",
+   "self_type" : "type-1998",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1995" ],
+   "template_args" : [ "type-1999" ],
    "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",
+   "referenced_type" : "type-2018",
+   "self_type" : "type-2018",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2015" ],
+   "template_args" : [ "type-2019" ],
    "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",
+   "referenced_type" : "type-1987",
+   "self_type" : "type-1987",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1984" ],
+   "template_args" : [ "type-1988" ],
    "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",
+   "referenced_type" : "type-1967",
+   "self_type" : "type-1967",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1964" ],
+   "template_args" : [ "type-1968" ],
    "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",
+   "referenced_type" : "type-1952",
+   "self_type" : "type-1952",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1949" ],
+   "template_args" : [ "type-1953" ],
    "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",
+   "referenced_type" : "type-1959",
+   "self_type" : "type-1959",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1955" ],
+   "template_args" : [ "type-1960" ],
    "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",
+   "referenced_type" : "type-1948",
+   "self_type" : "type-1948",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1944" ],
+   "template_args" : [ "type-1949" ],
    "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",
+   "referenced_type" : "type-2007",
+   "self_type" : "type-2007",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2004" ],
+   "template_args" : [ "type-2008" ],
    "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",
+   "referenced_type" : "type-1981",
+   "self_type" : "type-1981",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1977" ],
+   "template_args" : [ "type-1982" ],
    "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",
+   "referenced_type" : "type-2003",
+   "self_type" : "type-2003",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1999" ],
+   "template_args" : [ "type-2004" ],
    "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",
+   "referenced_type" : "type-1976",
+   "self_type" : "type-1976",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1973" ],
+   "template_args" : [ "type-1977" ],
    "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",
+   "referenced_type" : "type-1996",
+   "self_type" : "type-1996",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1993" ],
+   "template_args" : [ "type-1997" ],
    "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",
+   "referenced_type" : "type-1945",
+   "self_type" : "type-1945",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1942" ],
+   "template_args" : [ "type-1946" ],
    "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",
+   "referenced_type" : "type-1943",
+   "self_type" : "type-1943",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1940" ],
+   "template_args" : [ "type-1944" ],
    "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",
+   "referenced_type" : "type-1941",
+   "self_type" : "type-1941",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1938" ],
+   "template_args" : [ "type-1942" ],
    "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",
+   "referenced_type" : "type-2022",
+   "self_type" : "type-2022",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2019" ],
+   "template_args" : [ "type-2023" ],
    "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",
+   "referenced_type" : "type-1989",
+   "self_type" : "type-1989",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1986" ],
+   "template_args" : [ "type-1990" ],
    "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",
+   "referenced_type" : "type-2020",
+   "self_type" : "type-2020",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2017" ],
+   "template_args" : [ "type-2021" ],
    "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",
+   "referenced_type" : "type-1994",
+   "self_type" : "type-1994",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1991" ],
+   "template_args" : [ "type-1995" ],
    "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",
+   "referenced_type" : "type-2016",
+   "self_type" : "type-2016",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2013" ],
+   "template_args" : [ "type-2017" ],
    "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",
+   "referenced_type" : "type-2000",
+   "self_type" : "type-2000",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1997" ],
+   "template_args" : [ "type-2001" ],
    "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",
+   "referenced_type" : "type-2014",
+   "self_type" : "type-2014",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2010" ],
+   "template_args" : [ "type-2015" ],
    "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",
+   "referenced_type" : "type-1956",
+   "self_type" : "type-1956",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1953" ],
+   "template_args" : [ "type-1957" ],
    "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",
+   "referenced_type" : "type-1965",
+   "self_type" : "type-1965",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1962" ],
+   "template_args" : [ "type-1966" ],
    "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",
+   "referenced_type" : "type-1963",
+   "self_type" : "type-1963",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1960" ],
+   "template_args" : [ "type-1964" ],
    "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",
+   "referenced_type" : "type-1950",
+   "self_type" : "type-1950",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1947" ],
+   "template_args" : [ "type-1951" ],
    "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",
+   "referenced_type" : "type-1954",
+   "self_type" : "type-1954",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1951" ],
+   "template_args" : [ "type-1955" ],
    "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",
+   "referenced_type" : "type-1961",
+   "self_type" : "type-1961",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1958" ],
+   "template_args" : [ "type-1962" ],
    "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",
+   "referenced_type" : "type-1970",
+   "self_type" : "type-1970",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1966" ],
+   "template_args" : [ "type-1971" ],
    "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",
+   "referenced_type" : "type-1972",
+   "self_type" : "type-1972",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1969" ],
+   "template_args" : [ "type-1973" ],
    "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",
+   "referenced_type" : "type-2009",
+   "self_type" : "type-2009",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2006" ],
+   "template_args" : [ "type-2010" ],
    "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",
+   "referenced_type" : "type-1985",
+   "self_type" : "type-1985",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1982" ],
+   "template_args" : [ "type-1986" ],
    "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",
+   "referenced_type" : "type-2005",
+   "self_type" : "type-2005",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2002" ],
+   "template_args" : [ "type-2006" ],
    "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",
+   "referenced_type" : "type-1983",
+   "self_type" : "type-1983",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1980" ],
+   "template_args" : [ "type-1984" ],
    "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",
+   "referenced_type" : "type-1978",
+   "self_type" : "type-1978",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1975" ],
+   "template_args" : [ "type-1979" ],
    "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",
+   "referenced_type" : "type-1893",
+   "self_type" : "type-1893",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1889" ],
+   "template_args" : [ "type-1894" ],
    "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",
+   "referenced_type" : "type-1937",
+   "self_type" : "type-1937",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1933" ],
+   "template_args" : [ "type-1938" ],
    "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",
+   "referenced_type" : "type-1926",
+   "self_type" : "type-1926",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1922" ],
+   "template_args" : [ "type-1927" ],
    "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",
+   "referenced_type" : "type-1930",
+   "self_type" : "type-1930",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1927" ],
+   "template_args" : [ "type-1931" ],
    "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",
+   "referenced_type" : "type-1915",
+   "self_type" : "type-1915",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1911" ],
+   "template_args" : [ "type-1916" ],
    "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",
+   "referenced_type" : "type-1934",
+   "self_type" : "type-1934",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1931" ],
+   "template_args" : [ "type-1935" ],
    "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",
+   "referenced_type" : "type-1923",
+   "self_type" : "type-1923",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1920" ],
+   "template_args" : [ "type-1924" ],
    "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",
+   "referenced_type" : "type-1910",
+   "self_type" : "type-1910",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1907" ],
+   "template_args" : [ "type-1911" ],
    "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",
+   "referenced_type" : "type-1904",
+   "self_type" : "type-1904",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1900" ],
+   "template_args" : [ "type-1905" ],
    "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",
+   "referenced_type" : "type-1912",
+   "self_type" : "type-1912",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1909" ],
+   "template_args" : [ "type-1913" ],
    "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",
+   "referenced_type" : "type-1901",
+   "self_type" : "type-1901",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1898" ],
+   "template_args" : [ "type-1902" ],
    "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",
+   "referenced_type" : "type-1906",
+   "self_type" : "type-1906",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1903" ],
+   "template_args" : [ "type-1907" ],
    "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",
+   "referenced_type" : "type-1899",
+   "self_type" : "type-1899",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1896" ],
+   "template_args" : [ "type-1900" ],
    "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",
+   "referenced_type" : "type-1895",
+   "self_type" : "type-1895",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1892" ],
+   "template_args" : [ "type-1896" ],
    "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",
+   "referenced_type" : "type-1928",
+   "self_type" : "type-1928",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1925" ],
+   "template_args" : [ "type-1929" ],
    "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",
+   "referenced_type" : "type-1919",
+   "self_type" : "type-1919",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1916" ],
+   "template_args" : [ "type-1920" ],
    "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",
+   "referenced_type" : "type-1921",
+   "self_type" : "type-1921",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1918" ],
+   "template_args" : [ "type-1922" ],
    "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",
+   "referenced_type" : "type-1917",
+   "self_type" : "type-1917",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1914" ],
+   "template_args" : [ "type-1918" ],
    "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",
+   "referenced_type" : "type-1908",
+   "self_type" : "type-1908",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1905" ],
+   "template_args" : [ "type-1909" ],
    "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",
+   "referenced_type" : "type-1897",
+   "self_type" : "type-1897",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1894" ],
+   "template_args" : [ "type-1898" ],
    "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",
+   "referenced_type" : "type-1932",
+   "self_type" : "type-1932",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1929" ],
+   "template_args" : [ "type-1933" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEJEEE"
   },
   {
@@ -61973,17 +62087,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 160,
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<android::IConsumerListener>",
    "name" : "android::SafeBnInterface<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1287",
-   "self_type" : "type-1287",
+   "referenced_type" : "type-1290",
+   "self_type" : "type-1290",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1288" ],
+   "template_args" : [ "type-1291" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEEE",
    "vtable_components" :
    [
@@ -62184,17 +62298,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 128,
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<android::IGraphicBufferConsumer>",
    "name" : "android::SafeBnInterface<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1276",
-   "self_type" : "type-1276",
+   "referenced_type" : "type-1279",
+   "self_type" : "type-1279",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1277" ],
+   "template_args" : [ "type-1280" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEEE",
    "vtable_components" :
    [
@@ -62422,7 +62536,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1031"
+     "referenced_type" : "type-1034"
     }
    ],
    "fields" :
@@ -62431,17 +62545,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 128,
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<android::ITransactionCompletedListener>",
    "name" : "android::SafeBnInterface<android::ITransactionCompletedListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1102",
-   "self_type" : "type-1102",
+   "referenced_type" : "type-1105",
+   "self_type" : "type-1105",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1104" ],
+   "template_args" : [ "type-1107" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEEE",
    "vtable_components" :
    [
@@ -62592,525 +62706,525 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IConsumerListener>::ArgsMatchParams<std::tuple<>, std::tuple<> >",
    "name" : "android::SafeBpInterface<IConsumerListener>::ArgsMatchParams<std::tuple<>, std::tuple<> >",
-   "referenced_type" : "type-1544",
-   "self_type" : "type-1544",
+   "referenced_type" : "type-1547",
+   "self_type" : "type-1547",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1545", "type-1546" ],
+   "template_args" : [ "type-1548", "type-1549" ],
    "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",
+   "referenced_type" : "type-1550",
+   "self_type" : "type-1550",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1548", "type-1549" ],
+   "template_args" : [ "type-1551", "type-1552" ],
    "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",
+   "referenced_type" : "type-1544",
+   "self_type" : "type-1544",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1542", "type-1543" ],
+   "template_args" : [ "type-1545", "type-1546" ],
    "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",
+   "referenced_type" : "type-1553",
+   "self_type" : "type-1553",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1532" ],
+   "template_args" : [ "type-1535" ],
    "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",
+   "referenced_type" : "type-1819",
+   "self_type" : "type-1819",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1816", "type-1817" ],
+   "template_args" : [ "type-1820", "type-1821" ],
    "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",
+   "referenced_type" : "type-1803",
+   "self_type" : "type-1803",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1800", "type-1801" ],
+   "template_args" : [ "type-1804", "type-1805" ],
    "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",
+   "referenced_type" : "type-1833",
+   "self_type" : "type-1833",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1829", "type-1830" ],
+   "template_args" : [ "type-1834", "type-1835" ],
    "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",
+   "referenced_type" : "type-1849",
+   "self_type" : "type-1849",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1846", "type-1847" ],
+   "template_args" : [ "type-1850", "type-1851" ],
    "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",
+   "referenced_type" : "type-1839",
+   "self_type" : "type-1839",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1836", "type-1837" ],
+   "template_args" : [ "type-1840", "type-1841" ],
    "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",
+   "referenced_type" : "type-1852",
+   "self_type" : "type-1852",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1849", "type-1850" ],
+   "template_args" : [ "type-1853", "type-1854" ],
    "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",
+   "referenced_type" : "type-1829",
+   "self_type" : "type-1829",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1826", "type-1827" ],
+   "template_args" : [ "type-1830", "type-1831" ],
    "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",
+   "referenced_type" : "type-1816",
+   "self_type" : "type-1816",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1813", "type-1814" ],
+   "template_args" : [ "type-1817", "type-1818" ],
    "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",
+   "referenced_type" : "type-1813",
+   "self_type" : "type-1813",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1810", "type-1811" ],
+   "template_args" : [ "type-1814", "type-1815" ],
    "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",
+   "referenced_type" : "type-1806",
+   "self_type" : "type-1806",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1803", "type-1804" ],
+   "template_args" : [ "type-1807", "type-1808" ],
    "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",
+   "referenced_type" : "type-1809",
+   "self_type" : "type-1809",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1806", "type-1807" ],
+   "template_args" : [ "type-1810", "type-1811" ],
    "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",
+   "referenced_type" : "type-1846",
+   "self_type" : "type-1846",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1843", "type-1844" ],
+   "template_args" : [ "type-1847", "type-1848" ],
    "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",
+   "referenced_type" : "type-1826",
+   "self_type" : "type-1826",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1823", "type-1824" ],
+   "template_args" : [ "type-1827", "type-1828" ],
    "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",
+   "referenced_type" : "type-1842",
+   "self_type" : "type-1842",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1839", "type-1840" ],
+   "template_args" : [ "type-1843", "type-1844" ],
    "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",
+   "referenced_type" : "type-1836",
+   "self_type" : "type-1836",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1833", "type-1834" ],
+   "template_args" : [ "type-1837", "type-1838" ],
    "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",
+   "referenced_type" : "type-1823",
+   "self_type" : "type-1823",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1820", "type-1821" ],
+   "template_args" : [ "type-1824", "type-1825" ],
    "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",
+   "referenced_type" : "type-1724",
+   "self_type" : "type-1724",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1721", "type-1722" ],
+   "template_args" : [ "type-1725", "type-1726" ],
    "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",
+   "referenced_type" : "type-1773",
+   "self_type" : "type-1773",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1770", "type-1771" ],
+   "template_args" : [ "type-1774", "type-1775" ],
    "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",
+   "referenced_type" : "type-1790",
+   "self_type" : "type-1790",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1787", "type-1788" ],
+   "template_args" : [ "type-1791", "type-1792" ],
    "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",
+   "referenced_type" : "type-1780",
+   "self_type" : "type-1780",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1777", "type-1778" ],
+   "template_args" : [ "type-1781", "type-1782" ],
    "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",
+   "referenced_type" : "type-1796",
+   "self_type" : "type-1796",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1793", "type-1794" ],
+   "template_args" : [ "type-1797", "type-1798" ],
    "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",
+   "referenced_type" : "type-1770",
+   "self_type" : "type-1770",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1767", "type-1768" ],
+   "template_args" : [ "type-1771", "type-1772" ],
    "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",
+   "referenced_type" : "type-1753",
+   "self_type" : "type-1753",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1750", "type-1751" ],
+   "template_args" : [ "type-1754", "type-1755" ],
    "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",
+   "referenced_type" : "type-1743",
+   "self_type" : "type-1743",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1740", "type-1741" ],
+   "template_args" : [ "type-1744", "type-1745" ],
    "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",
+   "referenced_type" : "type-1734",
+   "self_type" : "type-1734",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1730", "type-1731" ],
+   "template_args" : [ "type-1735", "type-1736" ],
    "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",
+   "referenced_type" : "type-1737",
+   "self_type" : "type-1737",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1734", "type-1735" ],
+   "template_args" : [ "type-1738", "type-1739" ],
    "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",
+   "referenced_type" : "type-1786",
+   "self_type" : "type-1786",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1783", "type-1784" ],
+   "template_args" : [ "type-1787", "type-1788" ],
    "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",
+   "referenced_type" : "type-1763",
+   "self_type" : "type-1763",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1760", "type-1761" ],
+   "template_args" : [ "type-1764", "type-1765" ],
    "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",
+   "referenced_type" : "type-1783",
+   "self_type" : "type-1783",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1780", "type-1781" ],
+   "template_args" : [ "type-1784", "type-1785" ],
    "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",
+   "referenced_type" : "type-1776",
+   "self_type" : "type-1776",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1773", "type-1774" ],
+   "template_args" : [ "type-1777", "type-1778" ],
    "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",
+   "referenced_type" : "type-1760",
+   "self_type" : "type-1760",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1757", "type-1758" ],
+   "template_args" : [ "type-1761", "type-1762" ],
    "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",
+   "referenced_type" : "type-1727",
+   "self_type" : "type-1727",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1724", "type-1725" ],
+   "template_args" : [ "type-1728", "type-1729" ],
    "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",
+   "referenced_type" : "type-1793",
+   "self_type" : "type-1793",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1790", "type-1791" ],
+   "template_args" : [ "type-1794", "type-1795" ],
    "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",
+   "referenced_type" : "type-1800",
+   "self_type" : "type-1800",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1796", "type-1797" ],
+   "template_args" : [ "type-1801", "type-1802" ],
    "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",
+   "referenced_type" : "type-1757",
+   "self_type" : "type-1757",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1754", "type-1755" ],
+   "template_args" : [ "type-1758", "type-1759" ],
    "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",
+   "referenced_type" : "type-1747",
+   "self_type" : "type-1747",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1744", "type-1745" ],
+   "template_args" : [ "type-1748", "type-1749" ],
    "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",
+   "referenced_type" : "type-1740",
+   "self_type" : "type-1740",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1737", "type-1738" ],
+   "template_args" : [ "type-1741", "type-1742" ],
    "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",
+   "referenced_type" : "type-1767",
+   "self_type" : "type-1767",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1763", "type-1764" ],
+   "template_args" : [ "type-1768", "type-1769" ],
    "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",
+   "referenced_type" : "type-1730",
+   "self_type" : "type-1730",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1727", "type-1728" ],
+   "template_args" : [ "type-1731", "type-1732" ],
    "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",
+   "referenced_type" : "type-1750",
+   "self_type" : "type-1750",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1747", "type-1748" ],
+   "template_args" : [ "type-1751", "type-1752" ],
    "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",
+   "referenced_type" : "type-1856",
+   "self_type" : "type-1856",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1853" ],
+   "template_args" : [ "type-1857" ],
    "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",
+   "referenced_type" : "type-1887",
+   "self_type" : "type-1887",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1884" ],
+   "template_args" : [ "type-1888" ],
    "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",
+   "referenced_type" : "type-1882",
+   "self_type" : "type-1882",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1879" ],
+   "template_args" : [ "type-1883" ],
    "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",
+   "referenced_type" : "type-1880",
+   "self_type" : "type-1880",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-767" ],
@@ -63120,8 +63234,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<bool &>",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<bool &>",
-   "referenced_type" : "type-1869",
-   "self_type" : "type-1869",
+   "referenced_type" : "type-1873",
+   "self_type" : "type-1873",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-766" ],
@@ -63131,41 +63245,41 @@
    "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",
+   "referenced_type" : "type-1877",
+   "self_type" : "type-1877",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1874" ],
+   "template_args" : [ "type-1878" ],
    "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",
+   "referenced_type" : "type-1865",
+   "self_type" : "type-1865",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1862" ],
+   "template_args" : [ "type-1866" ],
    "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",
+   "referenced_type" : "type-1863",
+   "self_type" : "type-1863",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1859" ],
+   "template_args" : [ "type-1864" ],
    "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",
+   "referenced_type" : "type-1872",
+   "self_type" : "type-1872",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-944" ],
@@ -63175,8 +63289,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int &>",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int &>",
-   "referenced_type" : "type-1856",
-   "self_type" : "type-1856",
+   "referenced_type" : "type-1860",
+   "self_type" : "type-1860",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-198" ],
@@ -63186,41 +63300,41 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int *&>",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int *&>",
-   "referenced_type" : "type-1857",
-   "self_type" : "type-1857",
+   "referenced_type" : "type-1861",
+   "self_type" : "type-1861",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1508" ],
+   "template_args" : [ "type-1511" ],
    "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",
+   "referenced_type" : "type-1858",
+   "self_type" : "type-1858",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1429" ],
+   "template_args" : [ "type-1432" ],
    "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",
+   "referenced_type" : "type-1885",
+   "self_type" : "type-1885",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1882" ],
+   "template_args" : [ "type-1886" ],
    "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",
+   "referenced_type" : "type-1876",
+   "self_type" : "type-1876",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-10" ],
@@ -63230,8 +63344,8 @@
    "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",
+   "referenced_type" : "type-1859",
+   "self_type" : "type-1859",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-544" ],
@@ -63241,11 +63355,11 @@
    "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",
+   "referenced_type" : "type-1874",
+   "self_type" : "type-1874",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1871" ],
+   "template_args" : [ "type-1875" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRPyEE"
   },
   {
@@ -63253,7 +63367,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1495"
+     "referenced_type" : "type-1501"
     }
    ],
    "fields" :
@@ -63262,17 +63376,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 192,
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeBpInterface<android::IConsumerListener>",
    "name" : "android::SafeBpInterface<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1537",
-   "self_type" : "type-1537",
+   "referenced_type" : "type-1541",
+   "self_type" : "type-1541",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1538" ],
+   "template_args" : [ "type-1542" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_17IConsumerListenerEEE",
    "vtable_components" :
    [
@@ -63428,7 +63542,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1624"
+     "referenced_type" : "type-1629"
     }
    ],
    "fields" :
@@ -63437,17 +63551,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 160,
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeBpInterface<android::IGraphicBufferConsumer>",
    "name" : "android::SafeBpInterface<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1716",
-   "self_type" : "type-1716",
+   "referenced_type" : "type-1720",
+   "self_type" : "type-1720",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1717" ],
+   "template_args" : [ "type-1721" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEEE",
    "vtable_components" :
    [
@@ -63638,198 +63752,198 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)()>",
    "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)()>",
-   "referenced_type" : "type-1692",
-   "self_type" : "type-1692",
+   "referenced_type" : "type-1696",
+   "self_type" : "type-1696",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1693" ],
+   "template_args" : [ "type-1697" ],
    "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",
+   "referenced_type" : "type-1685",
+   "self_type" : "type-1685",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1682" ],
+   "template_args" : [ "type-1686" ],
    "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",
+   "referenced_type" : "type-1705",
+   "self_type" : "type-1705",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1702" ],
+   "template_args" : [ "type-1706" ],
    "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",
+   "referenced_type" : "type-1709",
+   "self_type" : "type-1709",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1706" ],
+   "template_args" : [ "type-1710" ],
    "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",
+   "referenced_type" : "type-1716",
+   "self_type" : "type-1716",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1713" ],
+   "template_args" : [ "type-1717" ],
    "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",
+   "referenced_type" : "type-1703",
+   "self_type" : "type-1703",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1700" ],
+   "template_args" : [ "type-1704" ],
    "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",
+   "referenced_type" : "type-1718",
+   "self_type" : "type-1718",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1715" ],
+   "template_args" : [ "type-1719" ],
    "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",
+   "referenced_type" : "type-1694",
+   "self_type" : "type-1694",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1691" ],
+   "template_args" : [ "type-1695" ],
    "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",
+   "referenced_type" : "type-1690",
+   "self_type" : "type-1690",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1686" ],
+   "template_args" : [ "type-1691" ],
    "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",
+   "referenced_type" : "type-1687",
+   "self_type" : "type-1687",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1684" ],
+   "template_args" : [ "type-1688" ],
    "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",
+   "referenced_type" : "type-1692",
+   "self_type" : "type-1692",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1689" ],
+   "template_args" : [ "type-1693" ],
    "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",
+   "referenced_type" : "type-1714",
+   "self_type" : "type-1714",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1711" ],
+   "template_args" : [ "type-1715" ],
    "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",
+   "referenced_type" : "type-1712",
+   "self_type" : "type-1712",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1708" ],
+   "template_args" : [ "type-1713" ],
    "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",
+   "referenced_type" : "type-1701",
+   "self_type" : "type-1701",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1697" ],
+   "template_args" : [ "type-1702" ],
    "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",
+   "referenced_type" : "type-1698",
+   "self_type" : "type-1698",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1695" ],
+   "template_args" : [ "type-1699" ],
    "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",
+   "referenced_type" : "type-1707",
+   "self_type" : "type-1707",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1704" ],
+   "template_args" : [ "type-1708" ],
    "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",
+   "referenced_type" : "type-1537",
+   "self_type" : "type-1537",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1534" ],
+   "template_args" : [ "type-1538" ],
    "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",
+   "referenced_type" : "type-1539",
+   "self_type" : "type-1539",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1536" ],
+   "template_args" : [ "type-1540" ],
    "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_16ConsumerListenerEFvRKNS_10BufferItemEEEE"
   },
   {
@@ -63839,14 +63953,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeInterface::ParcelHandler",
    "name" : "android::SafeInterface::ParcelHandler",
    "record_kind" : "class",
-   "referenced_type" : "type-1235",
-   "self_type" : "type-1235",
+   "referenced_type" : "type-1238",
+   "self_type" : "type-1238",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android13SafeInterface13ParcelHandlerE"
@@ -63855,8 +63969,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParcelHandler::HandleInt<false, 4, unsigned int>",
    "name" : "android::SafeInterface::ParcelHandler::HandleInt<false, 4, unsigned int>",
-   "referenced_type" : "type-1679",
-   "self_type" : "type-1679",
+   "referenced_type" : "type-1683",
+   "self_type" : "type-1683",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-2" ],
@@ -63866,8 +63980,8 @@
    "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",
+   "referenced_type" : "type-1681",
+   "self_type" : "type-1681",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-92" ],
@@ -63877,8 +63991,8 @@
    "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",
+   "referenced_type" : "type-1682",
+   "self_type" : "type-1682",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-4" ],
@@ -63888,8 +64002,8 @@
    "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",
+   "referenced_type" : "type-1678",
+   "self_type" : "type-1678",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-169" ],
@@ -63919,11 +64033,11 @@
    "linker_set_key" : "android::Singleton<android::ComposerService>",
    "name" : "android::Singleton<android::ComposerService>",
    "record_kind" : "class",
-   "referenced_type" : "type-1089",
-   "self_type" : "type-1089",
+   "referenced_type" : "type-1092",
+   "self_type" : "type-1092",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-1090" ],
+   "template_args" : [ "type-1093" ],
    "unique_id" : "_ZTSN7android9SingletonINS_15ComposerServiceEEE"
   },
   {
@@ -63950,11 +64064,11 @@
    "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",
+   "referenced_type" : "type-1204",
+   "self_type" : "type-1204",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-1201" ],
+   "template_args" : [ "type-1205" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEEE",
    "vtable_components" :
    [
@@ -64008,11 +64122,11 @@
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
    "name" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-1354",
-   "self_type" : "type-1354",
+   "referenced_type" : "type-1357",
+   "self_type" : "type-1357",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-1355" ],
+   "template_args" : [ "type-1358" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
    "vtable_components" :
    [
@@ -64302,7 +64416,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -64312,13 +64426,13 @@
     {
      "field_name" : "bStoreMetaData",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "android::StoreMetaDataInBuffersParams",
    "name" : "android::StoreMetaDataInBuffersParams",
-   "referenced_type" : "type-2396",
-   "self_type" : "type-2396",
+   "referenced_type" : "type-2399",
+   "self_type" : "type-2399",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android28StoreMetaDataInBuffersParamsE"
@@ -64330,14 +64444,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-1240"
+     "referenced_type" : "type-1243"
     }
    ],
    "linker_set_key" : "android::String16",
    "name" : "android::String16",
    "record_kind" : "class",
-   "referenced_type" : "type-1239",
-   "self_type" : "type-1239",
+   "referenced_type" : "type-1242",
+   "self_type" : "type-1242",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "unique_id" : "_ZTSN7android8String16E"
@@ -64526,7 +64640,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -64541,18 +64655,18 @@
     {
      "field_name" : "bufferHeader",
      "field_offset" : 128,
-     "referenced_type" : "type-2376"
+     "referenced_type" : "type-2379"
     },
     {
      "field_name" : "nativeBuffer",
      "field_offset" : 160,
-     "referenced_type" : "type-2408"
+     "referenced_type" : "type-2411"
     }
    ],
    "linker_set_key" : "android::UseAndroidNativeBufferParams",
    "name" : "android::UseAndroidNativeBufferParams",
-   "referenced_type" : "type-2407",
-   "self_type" : "type-2407",
+   "referenced_type" : "type-2410",
+   "self_type" : "type-2410",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android28UseAndroidNativeBufferParamsE"
@@ -64569,11 +64683,11 @@
    "linker_set_key" : "android::Vector<android::BBinder *>",
    "name" : "android::Vector<android::BBinder *>",
    "record_kind" : "class",
-   "referenced_type" : "type-1205",
-   "self_type" : "type-1205",
+   "referenced_type" : "type-1208",
+   "self_type" : "type-1208",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-1206" ],
+   "template_args" : [ "type-1209" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7BBinderEEE",
    "vtable_components" :
    [
@@ -64679,11 +64793,11 @@
    "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",
+   "referenced_type" : "type-1206",
+   "self_type" : "type-1206",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-1203" ],
+   "template_args" : [ "type-1207" ],
    "unique_id" : "_ZTSN7android6VectorINS_12ProcessState12handle_entryEEE",
    "vtable_components" :
    [
@@ -64734,11 +64848,11 @@
    "linker_set_key" : "android::Vector<android::Rect>",
    "name" : "android::Vector<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-2677",
-   "self_type" : "type-2677",
+   "referenced_type" : "type-2680",
+   "self_type" : "type-2680",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-2678" ],
+   "template_args" : [ "type-2681" ],
    "unique_id" : "_ZTSN7android6VectorINS_4RectEEE",
    "vtable_components" :
    [
@@ -64789,8 +64903,8 @@
    "linker_set_key" : "android::Vector<android::RefBase *>",
    "name" : "android::Vector<android::RefBase *>",
    "record_kind" : "class",
-   "referenced_type" : "type-1208",
-   "self_type" : "type-1208",
+   "referenced_type" : "type-1213",
+   "self_type" : "type-1213",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-270" ],
@@ -64844,8 +64958,8 @@
    "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",
+   "referenced_type" : "type-1210",
+   "self_type" : "type-1210",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-56" ],
@@ -64899,11 +65013,11 @@
    "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",
+   "referenced_type" : "type-1363",
+   "self_type" : "type-1363",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-1361" ],
+   "template_args" : [ "type-1364" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_8hardware9BHwBinderEEE",
    "vtable_components" :
    [
@@ -64954,11 +65068,11 @@
    "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "record_kind" : "class",
-   "referenced_type" : "type-1356",
-   "self_type" : "type-1356",
+   "referenced_type" : "type-1359",
+   "self_type" : "type-1359",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-1357" ],
+   "template_args" : [ "type-1360" ],
    "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
    "vtable_components" :
    [
@@ -65009,8 +65123,8 @@
    "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",
+   "referenced_type" : "type-1228",
+   "self_type" : "type-1228",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-733" ],
@@ -65064,8 +65178,8 @@
    "linker_set_key" : "android::Vector<int>",
    "name" : "android::Vector<int>",
    "record_kind" : "class",
-   "referenced_type" : "type-2686",
-   "self_type" : "type-2686",
+   "referenced_type" : "type-2689",
+   "self_type" : "type-2689",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-4" ],
@@ -65119,8 +65233,8 @@
    "linker_set_key" : "android::Vector<long long>",
    "name" : "android::Vector<long long>",
    "record_kind" : "class",
-   "referenced_type" : "type-1081",
-   "self_type" : "type-1081",
+   "referenced_type" : "type-1084",
+   "self_type" : "type-1084",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-169" ],
@@ -65247,13 +65361,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2397"
+     "referenced_type" : "type-2400"
     }
    ],
    "linker_set_key" : "android::VideoDecoderOutputMetaData",
    "name" : "android::VideoDecoderOutputMetaData",
-   "referenced_type" : "type-2398",
-   "self_type" : "type-2398",
+   "referenced_type" : "type-2401",
+   "self_type" : "type-2401",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26VideoDecoderOutputMetaDataE"
@@ -65264,7 +65378,7 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-1234"
+     "referenced_type" : "type-1235"
     },
     {
      "field_name" : "pHandle",
@@ -65274,8 +65388,8 @@
    ],
    "linker_set_key" : "android::VideoGrallocMetadata",
    "name" : "android::VideoGrallocMetadata",
-   "referenced_type" : "type-2397",
-   "self_type" : "type-2397",
+   "referenced_type" : "type-2400",
+   "self_type" : "type-2400",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android20VideoGrallocMetadataE"
@@ -65286,7 +65400,7 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-1234"
+     "referenced_type" : "type-1235"
     },
     {
      "field_name" : "pHandle",
@@ -65296,8 +65410,8 @@
    ],
    "linker_set_key" : "android::VideoNativeHandleMetadata",
    "name" : "android::VideoNativeHandleMetadata",
-   "referenced_type" : "type-2405",
-   "self_type" : "type-2405",
+   "referenced_type" : "type-2408",
+   "self_type" : "type-2408",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android25VideoNativeHandleMetadataE"
@@ -65308,12 +65422,12 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-1234"
+     "referenced_type" : "type-1235"
     },
     {
      "field_name" : "pBuffer",
      "field_offset" : 32,
-     "referenced_type" : "type-2401"
+     "referenced_type" : "type-2404"
     },
     {
      "field_name" : "nFenceFd",
@@ -65323,8 +65437,8 @@
    ],
    "linker_set_key" : "android::VideoNativeMetadata",
    "name" : "android::VideoNativeMetadata",
-   "referenced_type" : "type-2400",
-   "self_type" : "type-2400",
+   "referenced_type" : "type-2403",
+   "self_type" : "type-2403",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android19VideoNativeMetadataE"
@@ -65334,14 +65448,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2352"
+     "referenced_type" : "type-2355"
     }
    ],
    "linker_set_key" : "android::VirtualLightRefBase",
    "name" : "android::VirtualLightRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-2354",
-   "self_type" : "type-2354",
+   "referenced_type" : "type-2357",
+   "self_type" : "type-2357",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
    "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
@@ -65388,30 +65502,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::aggregate_traits<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-2606",
-   "self_type" : "type-2606",
+   "referenced_type" : "type-2609",
+   "self_type" : "type-2609",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-4", "type-2607" ],
+   "template_args" : [ "type-4", "type-2610" ],
    "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-2603",
-   "self_type" : "type-2603",
+   "referenced_type" : "type-2606",
+   "self_type" : "type-2606",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-4", "type-2604" ],
+   "template_args" : [ "type-4", "type-2607" ],
    "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-2602",
-   "self_type" : "type-2602",
+   "referenced_type" : "type-2605",
+   "self_type" : "type-2605",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2", "type-2" ],
@@ -65470,13 +65584,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-980"
+     "referenced_type" : "type-977"
     }
    ],
    "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-979",
-   "self_type" : "type-979",
+   "referenced_type" : "type-976",
+   "self_type" : "type-976",
    "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"
@@ -65613,8 +65727,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::base::DefaultCloser",
    "name" : "android::base::DefaultCloser",
-   "referenced_type" : "type-2523",
-   "self_type" : "type-2523",
+   "referenced_type" : "type-2526",
+   "self_type" : "type-2526",
    "size" : 1,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "unique_id" : "_ZTSN7android4base13DefaultCloserE"
@@ -65635,8 +65749,8 @@
    ],
    "linker_set_key" : "android::base::EagerEvaluator<char *, char *>",
    "name" : "android::base::EagerEvaluator<char *, char *>",
-   "referenced_type" : "type-4699",
-   "self_type" : "type-4699",
+   "referenced_type" : "type-4705",
+   "self_type" : "type-4705",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-254", "type-254" ],
@@ -65658,8 +65772,8 @@
    ],
    "linker_set_key" : "android::base::EagerEvaluator<char *, const char *>",
    "name" : "android::base::EagerEvaluator<char *, const char *>",
-   "referenced_type" : "type-4695",
-   "self_type" : "type-4695",
+   "referenced_type" : "type-4702",
+   "self_type" : "type-4702",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-254", "type-122" ],
@@ -65681,8 +65795,8 @@
    ],
    "linker_set_key" : "android::base::EagerEvaluator<const char *, char *>",
    "name" : "android::base::EagerEvaluator<const char *, char *>",
-   "referenced_type" : "type-4681",
-   "self_type" : "type-4681",
+   "referenced_type" : "type-4689",
+   "self_type" : "type-4689",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-122", "type-254" ],
@@ -65704,8 +65818,8 @@
    ],
    "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",
+   "referenced_type" : "type-4672",
+   "self_type" : "type-4672",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-122", "type-122" ],
@@ -65727,11 +65841,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",
+   "referenced_type" : "type-4729",
+   "self_type" : "type-4729",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-4723", "type-4723" ],
+   "template_args" : [ "type-4730", "type-4730" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaS3_EE"
   },
   {
@@ -65750,11 +65864,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",
+   "referenced_type" : "type-4736",
+   "self_type" : "type-4736",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-4723", "type-4731" ],
+   "template_args" : [ "type-4730", "type-4737" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaPaEE"
   },
   {
@@ -65773,8 +65887,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-4703",
-   "self_type" : "type-4703",
+   "referenced_type" : "type-4710",
+   "self_type" : "type-4710",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-97", "type-97" ],
@@ -65796,8 +65910,8 @@
    ],
    "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",
+   "referenced_type" : "type-4713",
+   "self_type" : "type-4713",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-97", "type-89" ],
@@ -65819,11 +65933,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",
+   "referenced_type" : "type-4740",
+   "self_type" : "type-4740",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-4731", "type-4723" ],
+   "template_args" : [ "type-4737", "type-4730" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaPKaEE"
   },
   {
@@ -65842,11 +65956,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",
+   "referenced_type" : "type-4747",
+   "self_type" : "type-4747",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-4731", "type-4731" ],
+   "template_args" : [ "type-4737", "type-4737" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaS2_EE"
   },
   {
@@ -65865,8 +65979,8 @@
    ],
    "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",
+   "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-97" ],
@@ -65888,8 +66002,8 @@
    ],
    "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",
+   "referenced_type" : "type-4722",
+   "self_type" : "type-4722",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-89", "type-89" ],
@@ -65908,8 +66022,8 @@
    "linker_set_key" : "android::base::ErrnoRestorer",
    "name" : "android::base::ErrnoRestorer",
    "record_kind" : "class",
-   "referenced_type" : "type-4656",
-   "self_type" : "type-4656",
+   "referenced_type" : "type-4663",
+   "self_type" : "type-4663",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base13ErrnoRestorerE"
@@ -65921,14 +66035,14 @@
     {
      "access" : "private",
      "field_name" : "data_",
-     "referenced_type" : "type-4752"
+     "referenced_type" : "type-4758"
     }
    ],
    "linker_set_key" : "android::base::LogMessage",
    "name" : "android::base::LogMessage",
    "record_kind" : "class",
-   "referenced_type" : "type-4751",
-   "self_type" : "type-4751",
+   "referenced_type" : "type-4757",
+   "self_type" : "type-4757",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base10LogMessageE"
@@ -65940,14 +66054,14 @@
     {
      "access" : "private",
      "field_name" : "default_log_id_",
-     "referenced_type" : "type-4704"
+     "referenced_type" : "type-4711"
     }
    ],
    "linker_set_key" : "android::base::LogdLogger",
    "name" : "android::base::LogdLogger",
    "record_kind" : "class",
-   "referenced_type" : "type-4721",
-   "self_type" : "type-4721",
+   "referenced_type" : "type-4728",
+   "self_type" : "type-4728",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base10LogdLoggerE"
@@ -65959,14 +66073,14 @@
     {
      "access" : "private",
      "field_name" : "old_",
-     "referenced_type" : "type-4654"
+     "referenced_type" : "type-4661"
     }
    ],
    "linker_set_key" : "android::base::ScopedLogSeverity",
    "name" : "android::base::ScopedLogSeverity",
    "record_kind" : "class",
-   "referenced_type" : "type-4756",
-   "self_type" : "type-4756",
+   "referenced_type" : "type-4763",
+   "self_type" : "type-4763",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base17ScopedLogSeverityE"
@@ -65984,11 +66098,11 @@
    "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser>",
    "name" : "android::base::unique_fd_impl<android::base::DefaultCloser>",
    "record_kind" : "class",
-   "referenced_type" : "type-2553",
-   "self_type" : "type-2553",
+   "referenced_type" : "type-2556",
+   "self_type" : "type-2556",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h",
-   "template_args" : [ "type-2523" ],
+   "template_args" : [ "type-2526" ],
    "unique_id" : "_ZTSN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
   },
   {
@@ -66027,7 +66141,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1362"
     }
    ],
    "fields" :
@@ -66048,7 +66162,7 @@
      "access" : "private",
      "field_name" : "mExtras",
      "field_offset" : 96,
-     "referenced_type" : "type-1363"
+     "referenced_type" : "type-1366"
     },
     {
      "access" : "private",
@@ -66060,8 +66174,8 @@
    "linker_set_key" : "android::hardware::BHwBinder",
    "name" : "android::hardware::BHwBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-1362",
-   "self_type" : "type-1362",
+   "referenced_type" : "type-1365",
+   "self_type" : "type-1365",
    "size" : 28,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware9BHwBinderE",
@@ -66177,7 +66291,7 @@
      "access" : "private",
      "field_name" : "mRemote",
      "field_offset" : 32,
-     "referenced_type" : "type-1372"
+     "referenced_type" : "type-1375"
     },
     {
      "access" : "private",
@@ -66189,14 +66303,14 @@
      "access" : "private",
      "field_name" : "mState",
      "field_offset" : 96,
-     "referenced_type" : "type-1373"
+     "referenced_type" : "type-1376"
     }
    ],
    "linker_set_key" : "android::hardware::BpHwRefBase",
    "name" : "android::hardware::BpHwRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-1371",
-   "self_type" : "type-1371",
+   "referenced_type" : "type-1374",
+   "self_type" : "type-1374",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE",
@@ -66415,8 +66529,8 @@
    "linker_set_key" : "android::hardware::IBinder",
    "name" : "android::hardware::IBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-1359",
-   "self_type" : "type-1359",
+   "referenced_type" : "type-1362",
+   "self_type" : "type-1362",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinderE",
@@ -66532,8 +66646,8 @@
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient",
    "name" : "android::hardware::IBinder::DeathRecipient",
    "record_kind" : "class",
-   "referenced_type" : "type-1370",
-   "self_type" : "type-1370",
+   "referenced_type" : "type-1373",
+   "self_type" : "type-1373",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinder14DeathRecipientE",
@@ -66620,8 +66734,8 @@
    "linker_set_key" : "android::hardware::IInterface",
    "name" : "android::hardware::IInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1376",
+   "referenced_type" : "type-1379",
+   "self_type" : "type-1379",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
    "unique_id" : "_ZTSN7android8hardware10IInterfaceE",
@@ -66703,43 +66817,43 @@
     {
      "access" : "private",
      "field_name" : "mProcess",
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1396"
     },
     {
      "access" : "private",
      "field_name" : "mPendingStrongDerefs",
      "field_offset" : 32,
-     "referenced_type" : "type-1360"
+     "referenced_type" : "type-1363"
     },
     {
      "access" : "private",
      "field_name" : "mPendingWeakDerefs",
      "field_offset" : 192,
-     "referenced_type" : "type-1207"
+     "referenced_type" : "type-1210"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteStrongDerefs",
      "field_offset" : 352,
-     "referenced_type" : "type-1208"
+     "referenced_type" : "type-1213"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteWeakDerefs",
      "field_offset" : 512,
-     "referenced_type" : "type-1207"
+     "referenced_type" : "type-1210"
     },
     {
      "access" : "private",
      "field_name" : "mIn",
      "field_offset" : 672,
-     "referenced_type" : "type-1377"
+     "referenced_type" : "type-1380"
     },
     {
      "access" : "private",
      "field_name" : "mOut",
      "field_offset" : 1216,
-     "referenced_type" : "type-1377"
+     "referenced_type" : "type-1380"
     },
     {
      "access" : "private",
@@ -66781,7 +66895,7 @@
      "access" : "private",
      "field_name" : "mContextObject",
      "field_offset" : 1952,
-     "referenced_type" : "type-1399"
+     "referenced_type" : "type-1402"
     },
     {
      "access" : "private",
@@ -66799,26 +66913,26 @@
      "access" : "private",
      "field_name" : "mPostCommandTasks",
      "field_offset" : 2016,
-     "referenced_type" : "type-1400"
+     "referenced_type" : "type-1403"
     },
     {
      "access" : "private",
      "field_name" : "mIPCThreadStateBase",
      "field_offset" : 2112,
-     "referenced_type" : "type-1368"
+     "referenced_type" : "type-1371"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 2144,
-     "referenced_type" : "type-1391"
+     "referenced_type" : "type-1394"
     }
    ],
    "linker_set_key" : "android::hardware::IPCThreadState",
    "name" : "android::hardware::IPCThreadState",
    "record_kind" : "class",
-   "referenced_type" : "type-1392",
-   "self_type" : "type-1392",
+   "referenced_type" : "type-1395",
+   "self_type" : "type-1395",
    "size" : 272,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h",
    "unique_id" : "_ZTSN7android8hardware14IPCThreadStateE"
@@ -66836,7 +66950,7 @@
      "access" : "private",
      "field_name" : "mBufCache",
      "field_offset" : 32,
-     "referenced_type" : "type-1378"
+     "referenced_type" : "type-1381"
     },
     {
      "access" : "private",
@@ -66920,7 +67034,7 @@
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 480,
-     "referenced_type" : "type-1379"
+     "referenced_type" : "type-1382"
     },
     {
      "access" : "private",
@@ -66932,8 +67046,8 @@
    "linker_set_key" : "android::hardware::Parcel",
    "name" : "android::hardware::Parcel",
    "record_kind" : "class",
-   "referenced_type" : "type-1377",
-   "self_type" : "type-1377",
+   "referenced_type" : "type-1380",
+   "self_type" : "type-1380",
    "size" : 68,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6ParcelE"
@@ -66960,8 +67074,8 @@
    ],
    "linker_set_key" : "android::hardware::Parcel::BufferInfo",
    "name" : "android::hardware::Parcel::BufferInfo",
-   "referenced_type" : "type-1382",
-   "self_type" : "type-1382",
+   "referenced_type" : "type-1385",
+   "self_type" : "type-1385",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE"
@@ -66993,13 +67107,13 @@
      "access" : "private",
      "field_name" : "mThreadCountLock",
      "field_offset" : 96,
-     "referenced_type" : "type-1397"
+     "referenced_type" : "type-1400"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountDecrement",
      "field_offset" : 128,
-     "referenced_type" : "type-1398"
+     "referenced_type" : "type-1401"
     },
     {
      "access" : "private",
@@ -67029,7 +67143,7 @@
      "access" : "private",
      "field_name" : "mHandleToObject",
      "field_offset" : 352,
-     "referenced_type" : "type-1356"
+     "referenced_type" : "type-1359"
     },
     {
      "access" : "private",
@@ -67041,7 +67155,7 @@
      "access" : "private",
      "field_name" : "mBinderContextCheckFunc",
      "field_offset" : 544,
-     "referenced_type" : "type-1390"
+     "referenced_type" : "type-1393"
     },
     {
      "access" : "private",
@@ -67053,7 +67167,7 @@
      "access" : "private",
      "field_name" : "mContexts",
      "field_offset" : 608,
-     "referenced_type" : "type-1366"
+     "referenced_type" : "type-1369"
     },
     {
      "access" : "private",
@@ -67077,7 +67191,7 @@
      "access" : "private",
      "field_name" : "mThreadPoolSeq",
      "field_offset" : 832,
-     "referenced_type" : "type-1250"
+     "referenced_type" : "type-1253"
     },
     {
      "access" : "private",
@@ -67089,14 +67203,14 @@
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 896,
-     "referenced_type" : "type-1391"
+     "referenced_type" : "type-1394"
     }
    ],
    "linker_set_key" : "android::hardware::ProcessState",
    "name" : "android::hardware::ProcessState",
    "record_kind" : "class",
-   "referenced_type" : "type-1396",
-   "self_type" : "type-1396",
+   "referenced_type" : "type-1399",
+   "self_type" : "type-1399",
    "size" : 128,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessStateE",
@@ -67174,7 +67288,7 @@
    [
     {
      "field_name" : "binder",
-     "referenced_type" : "type-1358"
+     "referenced_type" : "type-1361"
     },
     {
      "field_name" : "refs",
@@ -67184,8 +67298,8 @@
    ],
    "linker_set_key" : "android::hardware::ProcessState::handle_entry",
    "name" : "android::hardware::ProcessState::handle_entry",
-   "referenced_type" : "type-1357",
-   "self_type" : "type-1357",
+   "referenced_type" : "type-1360",
+   "self_type" : "type-1360",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE"
@@ -67210,8 +67324,8 @@
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::bufferqueue::V2_0::Status>",
    "name" : "android::hardware::Return<android::hardware::graphics::bufferqueue::V2_0::Status>",
    "record_kind" : "class",
-   "referenced_type" : "type-6770",
-   "self_type" : "type-6770",
+   "referenced_type" : "type-6779",
+   "self_type" : "type-6779",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "template_args" : [ "type-607" ],
@@ -67231,17 +67345,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-2463"
+     "referenced_type" : "type-2466"
     }
    ],
    "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",
+   "referenced_type" : "type-4365",
+   "self_type" : "type-4365",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-2463" ],
+   "template_args" : [ "type-2466" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducerEEEEE"
   },
   {
@@ -67258,17 +67372,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-2454"
+     "referenced_type" : "type-2457"
     }
    ],
    "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",
+   "referenced_type" : "type-4494",
+   "self_type" : "type-4494",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-2454" ],
+   "template_args" : [ "type-2457" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V1_017IProducerListenerEEEEE"
   },
   {
@@ -67285,17 +67399,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-2476"
+     "referenced_type" : "type-2479"
     }
    ],
    "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",
+   "referenced_type" : "type-4371",
+   "self_type" : "type-4371",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-2476" ],
+   "template_args" : [ "type-2479" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V2_022IGraphicBufferProducerEEEEE"
   },
   {
@@ -67312,17 +67426,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-2470"
+     "referenced_type" : "type-2473"
     }
    ],
    "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",
+   "referenced_type" : "type-4500",
+   "self_type" : "type-4500",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-2470" ],
+   "template_args" : [ "type-2473" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V2_017IProducerListenerEEEEE"
   },
   {
@@ -67345,8 +67459,8 @@
    "linker_set_key" : "android::hardware::Return<bool>",
    "name" : "android::hardware::Return<bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-4353",
-   "self_type" : "type-4353",
+   "referenced_type" : "type-4359",
+   "self_type" : "type-4359",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "template_args" : [ "type-93" ],
@@ -67399,8 +67513,8 @@
    "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",
+   "referenced_type" : "type-6783",
+   "self_type" : "type-6783",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "template_args" : [ "type-92" ],
@@ -68471,8 +68585,8 @@
    ],
    "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-2456",
+   "referenced_type" : "type-2459",
+   "self_type" : "type-2459",
    "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",
@@ -71049,8 +71163,8 @@
    "linker_set_key" : "android::sp<android::AHandler>",
    "name" : "android::sp<android::AHandler>",
    "record_kind" : "class",
-   "referenced_type" : "type-1188",
-   "self_type" : "type-1188",
+   "referenced_type" : "type-1191",
+   "self_type" : "type-1191",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-264" ],
@@ -71143,17 +71257,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4229"
+     "referenced_type" : "type-4235"
     }
    ],
    "linker_set_key" : "android::sp<android::BpGraphicBufferProducer>",
    "name" : "android::sp<android::BpGraphicBufferProducer>",
    "record_kind" : "class",
-   "referenced_type" : "type-4228",
-   "self_type" : "type-4228",
+   "referenced_type" : "type-4234",
+   "self_type" : "type-4234",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4231" ],
+   "template_args" : [ "type-4237" ],
    "unique_id" : "_ZTSN7android2spINS_23BpGraphicBufferProducerEEE"
   },
   {
@@ -71163,17 +71277,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4451"
+     "referenced_type" : "type-4457"
     }
    ],
    "linker_set_key" : "android::sp<android::BpProducerListener>",
    "name" : "android::sp<android::BpProducerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-4454",
-   "self_type" : "type-4454",
+   "referenced_type" : "type-4460",
+   "self_type" : "type-4460",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4455" ],
+   "template_args" : [ "type-4461" ],
    "unique_id" : "_ZTSN7android2spINS_18BpProducerListenerEEE"
   },
   {
@@ -71243,17 +71357,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1865"
+     "referenced_type" : "type-1869"
     }
    ],
    "linker_set_key" : "android::sp<android::Fence>",
    "name" : "android::sp<android::Fence>",
    "record_kind" : "class",
-   "referenced_type" : "type-1864",
-   "self_type" : "type-1864",
+   "referenced_type" : "type-1868",
+   "self_type" : "type-1868",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1867" ],
+   "template_args" : [ "type-1871" ],
    "unique_id" : "_ZTSN7android2spINS_5FenceEEE"
   },
   {
@@ -71283,17 +71397,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1174"
+     "referenced_type" : "type-1177"
     }
    ],
    "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",
+   "referenced_type" : "type-1176",
+   "self_type" : "type-1176",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1176" ],
+   "template_args" : [ "type-1179" ],
    "unique_id" : "_ZTSN7android2spINS_10GLConsumer8EglImageEEE"
   },
   {
@@ -71349,8 +71463,8 @@
    "linker_set_key" : "android::sp<android::GraphicBufferSource>",
    "name" : "android::sp<android::GraphicBufferSource>",
    "record_kind" : "class",
-   "referenced_type" : "type-2542",
-   "self_type" : "type-2542",
+   "referenced_type" : "type-2545",
+   "self_type" : "type-2545",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-566" ],
@@ -71363,17 +71477,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4256"
+     "referenced_type" : "type-4262"
     }
    ],
    "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",
+   "referenced_type" : "type-4265",
+   "self_type" : "type-4265",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4260" ],
+   "template_args" : [ "type-4266" ],
    "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE8ObituaryEEE"
   },
   {
@@ -71383,17 +71497,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4265"
+     "referenced_type" : "type-4271"
     }
    ],
    "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",
+   "referenced_type" : "type-4274",
+   "self_type" : "type-4274",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4269" ],
+   "template_args" : [ "type-4275" ],
    "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE8ObituaryEEE"
   },
   {
@@ -71403,17 +71517,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4828"
+     "referenced_type" : "type-4834"
     }
    ],
    "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",
+   "referenced_type" : "type-4833",
+   "self_type" : "type-4833",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4830" ],
+   "template_args" : [ "type-4836" ],
    "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE8ObituaryEEE"
   },
   {
@@ -71423,17 +71537,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-7030"
+     "referenced_type" : "type-7039"
     }
    ],
    "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",
+   "referenced_type" : "type-7038",
+   "self_type" : "type-7038",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-7032" ],
+   "template_args" : [ "type-7041" ],
    "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE8ObituaryEEE"
   },
   {
@@ -71583,17 +71697,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1049"
+     "referenced_type" : "type-1052"
     }
    ],
    "linker_set_key" : "android::sp<android::ISurfaceComposer>",
    "name" : "android::sp<android::ISurfaceComposer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1048",
-   "self_type" : "type-1048",
+   "referenced_type" : "type-1051",
+   "self_type" : "type-1051",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1051" ],
+   "template_args" : [ "type-1054" ],
    "unique_id" : "_ZTSN7android2spINS_16ISurfaceComposerEEE"
   },
   {
@@ -71603,17 +71717,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1041"
+     "referenced_type" : "type-1045"
     }
    ],
    "linker_set_key" : "android::sp<android::ITransactionCompletedListener>",
    "name" : "android::sp<android::ITransactionCompletedListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1040",
-   "self_type" : "type-1040",
+   "referenced_type" : "type-1044",
+   "self_type" : "type-1044",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1043" ],
+   "template_args" : [ "type-1047" ],
    "unique_id" : "_ZTSN7android2spINS_29ITransactionCompletedListenerEEE"
   },
   {
@@ -71643,17 +71757,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1260"
+     "referenced_type" : "type-1263"
     }
    ],
    "linker_set_key" : "android::sp<android::ProcessState>",
    "name" : "android::sp<android::ProcessState>",
    "record_kind" : "class",
-   "referenced_type" : "type-1259",
-   "self_type" : "type-1259",
+   "referenced_type" : "type-1262",
+   "self_type" : "type-1262",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1261" ],
+   "template_args" : [ "type-1264" ],
    "unique_id" : "_ZTSN7android2spINS_12ProcessStateEEE"
   },
   {
@@ -71683,17 +71797,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1361"
+     "referenced_type" : "type-1364"
     }
    ],
    "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",
+   "referenced_type" : "type-1402",
+   "self_type" : "type-1402",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1362" ],
+   "template_args" : [ "type-1365" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
   },
   {
@@ -71703,17 +71817,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1358"
+     "referenced_type" : "type-1361"
     }
    ],
    "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",
+   "referenced_type" : "type-1370",
+   "self_type" : "type-1370",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1359" ],
+   "template_args" : [ "type-1362" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
   },
   {
@@ -71723,17 +71837,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1395"
+     "referenced_type" : "type-1398"
     }
    ],
    "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",
+   "referenced_type" : "type-1397",
+   "self_type" : "type-1397",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1396" ],
+   "template_args" : [ "type-1399" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
   },
   {
@@ -71743,14 +71857,14 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2464"
+     "referenced_type" : "type-2467"
     }
    ],
    "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-2463",
-   "self_type" : "type-2463",
+   "referenced_type" : "type-2466",
+   "self_type" : "type-2466",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-595" ],
@@ -71763,17 +71877,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2455"
+     "referenced_type" : "type-2458"
     }
    ],
    "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-2454",
-   "self_type" : "type-2454",
+   "referenced_type" : "type-2457",
+   "self_type" : "type-2457",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-2456" ],
+   "template_args" : [ "type-2459" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerEEE"
   },
   {
@@ -71783,17 +71897,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4241"
+     "referenced_type" : "type-4247"
     }
    ],
    "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",
+   "referenced_type" : "type-4246",
+   "self_type" : "type-4246",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4243" ],
+   "template_args" : [ "type-4249" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerEEE"
   },
   {
@@ -71803,17 +71917,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4463"
+     "referenced_type" : "type-4470"
     }
    ],
    "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",
+   "referenced_type" : "type-4473",
+   "self_type" : "type-4473",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4467" ],
+   "template_args" : [ "type-4474" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerEEE"
   },
   {
@@ -71823,14 +71937,14 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2477"
+     "referenced_type" : "type-2480"
     }
    ],
    "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-2476",
-   "self_type" : "type-2476",
+   "referenced_type" : "type-2479",
+   "self_type" : "type-2479",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-677" ],
@@ -71843,14 +71957,14 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2471"
+     "referenced_type" : "type-2474"
     }
    ],
    "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-2470",
-   "self_type" : "type-2470",
+   "referenced_type" : "type-2473",
+   "self_type" : "type-2473",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-604" ],
@@ -71863,17 +71977,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4235"
+     "referenced_type" : "type-4241"
     }
    ],
    "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",
+   "referenced_type" : "type-4240",
+   "self_type" : "type-4240",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4237" ],
+   "template_args" : [ "type-4243" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerEEE"
   },
   {
@@ -71883,17 +71997,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4456"
+     "referenced_type" : "type-4462"
     }
    ],
    "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",
+   "referenced_type" : "type-4466",
+   "self_type" : "type-4466",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4460" ],
+   "template_args" : [ "type-4467" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerEEE"
   },
   {
@@ -71923,14 +72037,14 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2445"
+     "referenced_type" : "type-2448"
     }
    ],
    "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-2444",
-   "self_type" : "type-2444",
+   "referenced_type" : "type-2447",
+   "self_type" : "type-2447",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-530" ],
@@ -71943,14 +72057,14 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2449"
+     "referenced_type" : "type-2452"
     }
    ],
    "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-2448",
-   "self_type" : "type-2448",
+   "referenced_type" : "type-2451",
+   "self_type" : "type-2451",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-533" ],
@@ -71963,36 +72077,36 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2517"
+     "referenced_type" : "type-2520"
     }
    ],
    "linker_set_key" : "android::sp<const android::AHandler>",
    "name" : "android::sp<const android::AHandler>",
    "record_kind" : "class",
-   "referenced_type" : "type-2516",
-   "self_type" : "type-2516",
+   "referenced_type" : "type-2519",
+   "self_type" : "type-2519",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-2518" ],
+   "template_args" : [ "type-2521" ],
    "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",
+   "referenced_type" : "type-1064",
+   "self_type" : "type-1064",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1062" ],
+   "template_args" : [ "type-1065" ],
    "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-2588",
-   "self_type" : "type-2588",
+   "referenced_type" : "type-2591",
+   "self_type" : "type-2591",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-160" ],
@@ -72002,8 +72116,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::trait_pointer<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-2585",
-   "self_type" : "type-2585",
+   "referenced_type" : "type-2588",
+   "self_type" : "type-2588",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-147" ],
@@ -72013,8 +72127,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::trait_pointer<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-2581",
-   "self_type" : "type-2581",
+   "referenced_type" : "type-2584",
+   "self_type" : "type-2584",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-143" ],
@@ -72024,8 +72138,8 @@
    "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",
+   "referenced_type" : "type-1186",
+   "self_type" : "type-1186",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-733" ],
@@ -72035,8 +72149,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<int>",
    "name" : "android::trait_pointer<int>",
-   "referenced_type" : "type-2584",
-   "self_type" : "type-2584",
+   "referenced_type" : "type-2587",
+   "self_type" : "type-2587",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -72046,8 +72160,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<long long>",
    "name" : "android::trait_pointer<long long>",
-   "referenced_type" : "type-1060",
-   "self_type" : "type-1060",
+   "referenced_type" : "type-1063",
+   "self_type" : "type-1063",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-169" ],
@@ -72057,30 +72171,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::trait_pointer<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-2589",
-   "self_type" : "type-2589",
+   "referenced_type" : "type-2592",
+   "self_type" : "type-2592",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2590" ],
+   "template_args" : [ "type-2593" ],
    "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-2586",
-   "self_type" : "type-2586",
+   "referenced_type" : "type-2589",
+   "self_type" : "type-2589",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2587" ],
+   "template_args" : [ "type-2590" ],
    "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-2582",
-   "self_type" : "type-2582",
+   "referenced_type" : "type-2585",
+   "self_type" : "type-2585",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -72090,19 +72204,19 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::BufferItem>",
    "name" : "android::trait_trivial_copy<android::BufferItem>",
-   "referenced_type" : "type-1056",
-   "self_type" : "type-1056",
+   "referenced_type" : "type-1059",
+   "self_type" : "type-1059",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1057" ],
+   "template_args" : [ "type-1060" ],
    "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-2572",
-   "self_type" : "type-2572",
+   "referenced_type" : "type-2575",
+   "self_type" : "type-2575",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-160" ],
@@ -72112,8 +72226,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-2569",
-   "self_type" : "type-2569",
+   "referenced_type" : "type-2572",
+   "self_type" : "type-2572",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-147" ],
@@ -72123,8 +72237,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-2566",
-   "self_type" : "type-2566",
+   "referenced_type" : "type-2569",
+   "self_type" : "type-2569",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-143" ],
@@ -72134,8 +72248,8 @@
    "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",
+   "referenced_type" : "type-1184",
+   "self_type" : "type-1184",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-733" ],
@@ -72145,8 +72259,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-2462",
-   "self_type" : "type-2462",
+   "referenced_type" : "type-2465",
+   "self_type" : "type-2465",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-93" ],
@@ -72156,8 +72270,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-2499",
-   "self_type" : "type-2499",
+   "referenced_type" : "type-2502",
+   "self_type" : "type-2502",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-124" ],
@@ -72189,8 +72303,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-2655",
-   "self_type" : "type-2655",
+   "referenced_type" : "type-2658",
+   "self_type" : "type-2658",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -72222,8 +72336,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<short>",
    "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-2594",
-   "self_type" : "type-2594",
+   "referenced_type" : "type-2597",
+   "self_type" : "type-2597",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-499" ],
@@ -72233,30 +72347,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::trait_trivial_copy<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-2570",
-   "self_type" : "type-2570",
+   "referenced_type" : "type-2573",
+   "self_type" : "type-2573",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2571" ],
+   "template_args" : [ "type-2574" ],
    "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-2567",
-   "self_type" : "type-2567",
+   "referenced_type" : "type-2570",
+   "self_type" : "type-2570",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2568" ],
+   "template_args" : [ "type-2571" ],
    "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-2540",
-   "self_type" : "type-2540",
+   "referenced_type" : "type-2543",
+   "self_type" : "type-2543",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-90" ],
@@ -72299,8 +72413,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
    "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-2634",
-   "self_type" : "type-2634",
+   "referenced_type" : "type-2637",
+   "self_type" : "type-2637",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-497" ],
@@ -72310,8 +72424,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-2433",
-   "self_type" : "type-2433",
+   "referenced_type" : "type-2436",
+   "self_type" : "type-2436",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-9" ],
@@ -72321,19 +72435,19 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::BufferItem>",
    "name" : "android::trait_trivial_ctor<android::BufferItem>",
-   "referenced_type" : "type-1052",
-   "self_type" : "type-1052",
+   "referenced_type" : "type-1055",
+   "self_type" : "type-1055",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1053" ],
+   "template_args" : [ "type-1056" ],
    "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-2554",
-   "self_type" : "type-2554",
+   "referenced_type" : "type-2557",
+   "self_type" : "type-2557",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-160" ],
@@ -72343,8 +72457,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-2549",
-   "self_type" : "type-2549",
+   "referenced_type" : "type-2552",
+   "self_type" : "type-2552",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-147" ],
@@ -72354,8 +72468,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-2548",
-   "self_type" : "type-2548",
+   "referenced_type" : "type-2551",
+   "self_type" : "type-2551",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-143" ],
@@ -72365,8 +72479,8 @@
    "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",
+   "referenced_type" : "type-1182",
+   "self_type" : "type-1182",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-733" ],
@@ -72376,8 +72490,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-2443",
-   "self_type" : "type-2443",
+   "referenced_type" : "type-2446",
+   "self_type" : "type-2446",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-93" ],
@@ -72387,8 +72501,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-2481",
-   "self_type" : "type-2481",
+   "referenced_type" : "type-2484",
+   "self_type" : "type-2484",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-124" ],
@@ -72420,8 +72534,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-2647",
-   "self_type" : "type-2647",
+   "referenced_type" : "type-2650",
+   "self_type" : "type-2650",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -72453,8 +72567,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<short>",
    "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-2563",
-   "self_type" : "type-2563",
+   "referenced_type" : "type-2566",
+   "self_type" : "type-2566",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-499" ],
@@ -72464,30 +72578,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::trait_trivial_ctor<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-2555",
-   "self_type" : "type-2555",
+   "referenced_type" : "type-2558",
+   "self_type" : "type-2558",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2556" ],
+   "template_args" : [ "type-2559" ],
    "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-2550",
-   "self_type" : "type-2550",
+   "referenced_type" : "type-2553",
+   "self_type" : "type-2553",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2551" ],
+   "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-2526",
-   "self_type" : "type-2526",
+   "referenced_type" : "type-2529",
+   "self_type" : "type-2529",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-90" ],
@@ -72497,8 +72611,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
    "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-2670",
-   "self_type" : "type-2670",
+   "referenced_type" : "type-2673",
+   "self_type" : "type-2673",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -72530,8 +72644,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned short>",
    "name" : "android::trait_trivial_ctor<unsigned short>",
-   "referenced_type" : "type-2616",
-   "self_type" : "type-2616",
+   "referenced_type" : "type-2619",
+   "self_type" : "type-2619",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-497" ],
@@ -72541,8 +72655,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-2399",
-   "self_type" : "type-2399",
+   "referenced_type" : "type-2402",
+   "self_type" : "type-2402",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-9" ],
@@ -72552,19 +72666,19 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::BufferItem>",
    "name" : "android::trait_trivial_dtor<android::BufferItem>",
-   "referenced_type" : "type-1054",
-   "self_type" : "type-1054",
+   "referenced_type" : "type-1057",
+   "self_type" : "type-1057",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1055" ],
+   "template_args" : [ "type-1058" ],
    "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-2564",
-   "self_type" : "type-2564",
+   "referenced_type" : "type-2567",
+   "self_type" : "type-2567",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-160" ],
@@ -72574,8 +72688,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-2560",
-   "self_type" : "type-2560",
+   "referenced_type" : "type-2563",
+   "self_type" : "type-2563",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-147" ],
@@ -72585,8 +72699,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-2557",
-   "self_type" : "type-2557",
+   "referenced_type" : "type-2560",
+   "self_type" : "type-2560",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-143" ],
@@ -72596,8 +72710,8 @@
    "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",
+   "referenced_type" : "type-1183",
+   "self_type" : "type-1183",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-733" ],
@@ -72607,8 +72721,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<bool>",
    "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-2452",
-   "self_type" : "type-2452",
+   "referenced_type" : "type-2455",
+   "self_type" : "type-2455",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-93" ],
@@ -72618,8 +72732,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-2489",
-   "self_type" : "type-2489",
+   "referenced_type" : "type-2492",
+   "self_type" : "type-2492",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-124" ],
@@ -72651,8 +72765,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<int>",
    "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-2650",
-   "self_type" : "type-2650",
+   "referenced_type" : "type-2653",
+   "self_type" : "type-2653",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -72684,8 +72798,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<short>",
    "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-2583",
-   "self_type" : "type-2583",
+   "referenced_type" : "type-2586",
+   "self_type" : "type-2586",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-499" ],
@@ -72695,30 +72809,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::trait_trivial_dtor<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-2561",
-   "self_type" : "type-2561",
+   "referenced_type" : "type-2564",
+   "self_type" : "type-2564",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2562" ],
+   "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-2558",
-   "self_type" : "type-2558",
+   "referenced_type" : "type-2561",
+   "self_type" : "type-2561",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2559" ],
+   "template_args" : [ "type-2562" ],
    "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-2533",
-   "self_type" : "type-2533",
+   "referenced_type" : "type-2536",
+   "self_type" : "type-2536",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-90" ],
@@ -72728,8 +72842,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
    "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-2681",
-   "self_type" : "type-2681",
+   "referenced_type" : "type-2684",
+   "self_type" : "type-2684",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -72761,8 +72875,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned short>",
    "name" : "android::trait_trivial_dtor<unsigned short>",
-   "referenced_type" : "type-2624",
-   "self_type" : "type-2624",
+   "referenced_type" : "type-2627",
+   "self_type" : "type-2627",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-497" ],
@@ -72772,8 +72886,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-2424",
-   "self_type" : "type-2424",
+   "referenced_type" : "type-2427",
+   "self_type" : "type-2427",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-9" ],
@@ -72783,30 +72897,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::BufferItem>",
    "name" : "android::trait_trivial_move<android::BufferItem>",
-   "referenced_type" : "type-1058",
-   "self_type" : "type-1058",
+   "referenced_type" : "type-1061",
+   "self_type" : "type-1061",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1059" ],
+   "template_args" : [ "type-1062" ],
    "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-2662",
-   "self_type" : "type-2662",
+   "referenced_type" : "type-2665",
+   "self_type" : "type-2665",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-1239" ],
+   "template_args" : [ "type-1242" ],
    "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-2656",
-   "self_type" : "type-2656",
+   "referenced_type" : "type-2659",
+   "self_type" : "type-2659",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "template_args" : [ "type-121" ],
@@ -72816,8 +72930,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
-   "referenced_type" : "type-2579",
-   "self_type" : "type-2579",
+   "referenced_type" : "type-2582",
+   "self_type" : "type-2582",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-160" ],
@@ -72827,8 +72941,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-2576",
-   "self_type" : "type-2576",
+   "referenced_type" : "type-2579",
+   "self_type" : "type-2579",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-147" ],
@@ -72838,8 +72952,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-2573",
-   "self_type" : "type-2573",
+   "referenced_type" : "type-2576",
+   "self_type" : "type-2576",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-143" ],
@@ -72849,8 +72963,8 @@
    "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",
+   "referenced_type" : "type-1185",
+   "self_type" : "type-1185",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-733" ],
@@ -72860,8 +72974,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<bool>",
    "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-2472",
-   "self_type" : "type-2472",
+   "referenced_type" : "type-2475",
+   "self_type" : "type-2475",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-93" ],
@@ -72871,8 +72985,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-2521",
-   "self_type" : "type-2521",
+   "referenced_type" : "type-2524",
+   "self_type" : "type-2524",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-124" ],
@@ -72904,8 +73018,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-2659",
-   "self_type" : "type-2659",
+   "referenced_type" : "type-2662",
+   "self_type" : "type-2662",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -72937,8 +73051,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<short>",
    "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-2605",
-   "self_type" : "type-2605",
+   "referenced_type" : "type-2608",
+   "self_type" : "type-2608",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-499" ],
@@ -72948,30 +73062,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::trait_trivial_move<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-2577",
-   "self_type" : "type-2577",
+   "referenced_type" : "type-2580",
+   "self_type" : "type-2580",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2578" ],
+   "template_args" : [ "type-2581" ],
    "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-2574",
-   "self_type" : "type-2574",
+   "referenced_type" : "type-2577",
+   "self_type" : "type-2577",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2575" ],
+   "template_args" : [ "type-2578" ],
    "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-2552",
-   "self_type" : "type-2552",
+   "referenced_type" : "type-2555",
+   "self_type" : "type-2555",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-90" ],
@@ -73014,8 +73128,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned short>",
    "name" : "android::trait_trivial_move<unsigned short>",
-   "referenced_type" : "type-2645",
-   "self_type" : "type-2645",
+   "referenced_type" : "type-2648",
+   "self_type" : "type-2648",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-497" ],
@@ -73025,8 +73139,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-2441",
-   "self_type" : "type-2441",
+   "referenced_type" : "type-2444",
+   "self_type" : "type-2444",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-9" ],
@@ -73036,19 +73150,19 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::BufferItem>",
    "name" : "android::traits<android::BufferItem>",
-   "referenced_type" : "type-1064",
-   "self_type" : "type-1064",
+   "referenced_type" : "type-1067",
+   "self_type" : "type-1067",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1065" ],
+   "template_args" : [ "type-1068" ],
    "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-2599",
-   "self_type" : "type-2599",
+   "referenced_type" : "type-2602",
+   "self_type" : "type-2602",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-160" ],
@@ -73058,8 +73172,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::traits<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-2596",
-   "self_type" : "type-2596",
+   "referenced_type" : "type-2599",
+   "self_type" : "type-2599",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-147" ],
@@ -73069,8 +73183,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::traits<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-2591",
-   "self_type" : "type-2591",
+   "referenced_type" : "type-2594",
+   "self_type" : "type-2594",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-143" ],
@@ -73080,8 +73194,8 @@
    "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",
+   "referenced_type" : "type-1187",
+   "self_type" : "type-1187",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-733" ],
@@ -73091,8 +73205,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<int>",
    "name" : "android::traits<int>",
-   "referenced_type" : "type-2593",
-   "self_type" : "type-2593",
+   "referenced_type" : "type-2596",
+   "self_type" : "type-2596",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -73102,8 +73216,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<long long>",
    "name" : "android::traits<long long>",
-   "referenced_type" : "type-1063",
-   "self_type" : "type-1063",
+   "referenced_type" : "type-1066",
+   "self_type" : "type-1066",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-169" ],
@@ -73113,30 +73227,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::traits<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-2600",
-   "self_type" : "type-2600",
+   "referenced_type" : "type-2603",
+   "self_type" : "type-2603",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2601" ],
+   "template_args" : [ "type-2604" ],
    "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-2597",
-   "self_type" : "type-2597",
+   "referenced_type" : "type-2600",
+   "self_type" : "type-2600",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2598" ],
+   "template_args" : [ "type-2601" ],
    "unique_id" : "_ZTSN7android6traitsINSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<unsigned int>",
    "name" : "android::traits<unsigned int>",
-   "referenced_type" : "type-2592",
-   "self_type" : "type-2592",
+   "referenced_type" : "type-2595",
+   "self_type" : "type-2595",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -73147,16 +73261,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1075"
+     "referenced_type" : "type-1078"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::BufferItem>",
    "name" : "android::use_trivial_move<android::BufferItem>",
-   "referenced_type" : "type-1074",
-   "self_type" : "type-1074",
+   "referenced_type" : "type-1077",
+   "self_type" : "type-1077",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1076" ],
+   "template_args" : [ "type-1079" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_10BufferItemEEE"
   },
   {
@@ -73164,13 +73278,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2636"
+     "referenced_type" : "type-2639"
     }
    ],
    "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-2635",
-   "self_type" : "type-2635",
+   "referenced_type" : "type-2638",
+   "self_type" : "type-2638",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-160" ],
@@ -73181,13 +73295,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2633"
+     "referenced_type" : "type-2636"
     }
    ],
    "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-2632",
-   "self_type" : "type-2632",
+   "referenced_type" : "type-2635",
+   "self_type" : "type-2635",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-147" ],
@@ -73198,13 +73312,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2629"
+     "referenced_type" : "type-2632"
     }
    ],
    "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-2628",
-   "self_type" : "type-2628",
+   "referenced_type" : "type-2631",
+   "self_type" : "type-2631",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-143" ],
@@ -73215,13 +73329,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1186"
+     "referenced_type" : "type-1190"
     }
    ],
    "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",
+   "referenced_type" : "type-1189",
+   "self_type" : "type-1189",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-733" ],
@@ -73232,13 +73346,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2631"
+     "referenced_type" : "type-2634"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<int>",
    "name" : "android::use_trivial_move<int>",
-   "referenced_type" : "type-2630",
-   "self_type" : "type-2630",
+   "referenced_type" : "type-2633",
+   "self_type" : "type-2633",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -73249,13 +73363,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1073"
+     "referenced_type" : "type-1076"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<long long>",
    "name" : "android::use_trivial_move<long long>",
-   "referenced_type" : "type-1072",
-   "self_type" : "type-1072",
+   "referenced_type" : "type-1075",
+   "self_type" : "type-1075",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-169" ],
@@ -73320,7 +73434,7 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1252"
+     "referenced_type" : "type-1256"
     },
     {
      "access" : "private",
@@ -73332,11 +73446,11 @@
    "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",
+   "referenced_type" : "type-1255",
+   "self_type" : "type-1255",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-1254" ],
+   "template_args" : [ "type-1258" ],
    "unique_id" : "_ZTSN7android2wpINS_12ConsumerBase22FrameAvailableListenerEEE"
   },
   {
@@ -73687,13 +73801,13 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-2178"
+     "referenced_type" : "type-2181"
     }
    ],
    "linker_set_key" : "log_msg",
    "name" : "log_msg",
-   "referenced_type" : "type-2177",
-   "self_type" : "type-2177",
+   "referenced_type" : "type-2180",
+   "self_type" : "type-2180",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
@@ -73704,15 +73818,15 @@
    [
     {
      "field_name" : "buf",
-     "referenced_type" : "type-2179"
+     "referenced_type" : "type-2182"
     },
     {
      "field_name" : "entry",
-     "referenced_type" : "type-1408"
+     "referenced_type" : "type-1411"
     },
     {
      "field_name" : "entry_v4",
-     "referenced_type" : "type-1408"
+     "referenced_type" : "type-1411"
     },
     {
      "field_name" : "entry_v3",
@@ -73720,19 +73834,19 @@
     },
     {
      "field_name" : "entry_v2",
-     "referenced_type" : "type-1291"
+     "referenced_type" : "type-1294"
     },
     {
      "field_name" : "entry_v1",
-     "referenced_type" : "type-2180"
+     "referenced_type" : "type-2183"
     }
    ],
    "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-2178",
-   "self_type" : "type-2178",
+   "referenced_type" : "type-2181",
+   "self_type" : "type-2181",
    "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)"
@@ -73753,8 +73867,8 @@
    ],
    "linker_set_key" : "log_time",
    "name" : "log_time",
-   "referenced_type" : "type-2509",
-   "self_type" : "type-2509",
+   "referenced_type" : "type-2512",
+   "self_type" : "type-2512",
    "size" : 8,
    "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
    "unique_id" : "_ZTS8log_time"
@@ -73800,8 +73914,8 @@
    ],
    "linker_set_key" : "logger_entry",
    "name" : "logger_entry",
-   "referenced_type" : "type-2180",
-   "self_type" : "type-2180",
+   "referenced_type" : "type-2183",
+   "self_type" : "type-2183",
    "size" : 20,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
@@ -73852,8 +73966,8 @@
    ],
    "linker_set_key" : "logger_entry_v2",
    "name" : "logger_entry_v2",
-   "referenced_type" : "type-1291",
-   "self_type" : "type-1291",
+   "referenced_type" : "type-1294",
+   "self_type" : "type-1294",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
@@ -73961,8 +74075,8 @@
    ],
    "linker_set_key" : "logger_entry_v4",
    "name" : "logger_entry_v4",
-   "referenced_type" : "type-1408",
-   "self_type" : "type-1408",
+   "referenced_type" : "type-1411",
+   "self_type" : "type-1411",
    "size" : 28,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
@@ -74006,8 +74120,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser> &&",
    "name" : "android::base::unique_fd_impl<android::base::DefaultCloser> &&",
-   "referenced_type" : "type-2553",
-   "self_type" : "type-2610",
+   "referenced_type" : "type-2556",
+   "self_type" : "type-2613",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -74024,8 +74138,8 @@
    "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",
+   "referenced_type" : "type-6779",
+   "self_type" : "type-6781",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -74033,24 +74147,6 @@
    "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,
@@ -74058,8 +74154,8 @@
   },
   {
    "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> > &&",
+   "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-4494",
    "self_type" : "type-4496",
    "size" : 4,
@@ -74067,10 +74163,28 @@
   },
   {
    "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-4371",
+   "self_type" : "type-4373",
+   "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-4500",
+   "self_type" : "type-4502",
+   "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-4355",
+   "referenced_type" : "type-4359",
+   "self_type" : "type-4361",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -74087,8 +74201,8 @@
    "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",
+   "referenced_type" : "type-6783",
+   "self_type" : "type-6785",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -74142,7 +74256,7 @@
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> &&",
    "name" : "android::hardware::hidl_vec<unsigned char> &&",
    "referenced_type" : "type-452",
-   "self_type" : "type-4566",
+   "self_type" : "type-4572",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -74151,7 +74265,7 @@
    "linker_set_key" : "android::sp<android::ALooper> &&",
    "name" : "android::sp<android::ALooper> &&",
    "referenced_type" : "type-321",
-   "self_type" : "type-2256",
+   "self_type" : "type-2259",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -74168,8 +74282,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::Fence> &&",
    "name" : "android::sp<android::Fence> &&",
-   "referenced_type" : "type-1864",
-   "self_type" : "type-2524",
+   "referenced_type" : "type-1868",
+   "self_type" : "type-2527",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -74177,8 +74291,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::GraphicBufferSource> &&",
    "name" : "android::sp<android::GraphicBufferSource> &&",
-   "referenced_type" : "type-2542",
-   "self_type" : "type-2543",
+   "referenced_type" : "type-2545",
+   "self_type" : "type-2546",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -74186,8 +74300,8 @@
    "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-4261",
+   "referenced_type" : "type-4265",
+   "self_type" : "type-4267",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -74195,8 +74309,8 @@
    "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",
+   "referenced_type" : "type-4274",
+   "self_type" : "type-4276",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -74204,8 +74318,8 @@
    "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",
+   "referenced_type" : "type-4833",
+   "self_type" : "type-4843",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -74213,8 +74327,8 @@
    "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",
+   "referenced_type" : "type-7038",
+   "self_type" : "type-7047",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -74223,7 +74337,7 @@
    "linker_set_key" : "android::sp<android::IBinder::DeathRecipient> &&",
    "name" : "android::sp<android::IBinder::DeathRecipient> &&",
    "referenced_type" : "type-843",
-   "self_type" : "type-4383",
+   "self_type" : "type-4389",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -74232,7 +74346,7 @@
    "linker_set_key" : "android::sp<android::IConsumerListener> &&",
    "name" : "android::sp<android::IConsumerListener> &&",
    "referenced_type" : "type-939",
-   "self_type" : "type-1577",
+   "self_type" : "type-1580",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -74241,7 +74355,7 @@
    "linker_set_key" : "android::sp<android::IGraphicBufferConsumer> &&",
    "name" : "android::sp<android::IGraphicBufferConsumer> &&",
    "referenced_type" : "type-574",
-   "self_type" : "type-1600",
+   "self_type" : "type-1604",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -74250,7 +74364,7 @@
    "linker_set_key" : "android::sp<android::IGraphicBufferProducer> &&",
    "name" : "android::sp<android::IGraphicBufferProducer> &&",
    "referenced_type" : "type-570",
-   "self_type" : "type-4226",
+   "self_type" : "type-4232",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -74259,7 +74373,7 @@
    "linker_set_key" : "android::sp<android::IProducerListener> &&",
    "name" : "android::sp<android::IProducerListener> &&",
    "referenced_type" : "type-957",
-   "self_type" : "type-4252",
+   "self_type" : "type-4258",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -74268,7 +74382,7 @@
    "linker_set_key" : "android::sp<android::NativeHandle> &&",
    "name" : "android::sp<android::NativeHandle> &&",
    "referenced_type" : "type-932",
-   "self_type" : "type-1596",
+   "self_type" : "type-1600",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   }
diff --git a/29/32/arm_armv7-a-neon/source-based/libui.so.lsdump b/29/32/arm_armv7-a-neon/source-based/libui.so.lsdump
index 20c7f22..517f12f 100644
--- a/29/32/arm_armv7-a-neon/source-based/libui.so.lsdump
+++ b/29/32/arm_armv7-a-neon/source-based/libui.so.lsdump
@@ -5,8 +5,8 @@
    "alignment" : 4,
    "linker_set_key" : "AHardwareBuffer_Plane [4]",
    "name" : "AHardwareBuffer_Plane [4]",
-   "referenced_type" : "type-509",
-   "self_type" : "type-508",
+   "referenced_type" : "type-506",
+   "self_type" : "type-505",
    "size" : 48,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h"
   },
@@ -14,7 +14,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<float> [3]",
    "name" : "android::details::TVec3<float> [3]",
-   "referenced_type" : "type-17",
+   "referenced_type" : "type-18",
    "self_type" : "type-904",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
@@ -23,8 +23,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<float> [4]",
    "name" : "android::details::TVec4<float> [4]",
-   "referenced_type" : "type-200",
-   "self_type" : "type-2277",
+   "referenced_type" : "type-192",
+   "self_type" : "type-2279",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -32,7 +32,7 @@
    "alignment" : 1,
    "linker_set_key" : "char [0]",
    "name" : "char [0]",
-   "referenced_type" : "type-288",
+   "referenced_type" : "type-285",
    "self_type" : "type-1261",
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -47,16 +47,16 @@
    "alignment" : 4,
    "linker_set_key" : "int [0]",
    "name" : "int [0]",
-   "referenced_type" : "type-103",
-   "self_type" : "type-145",
+   "referenced_type" : "type-105",
+   "self_type" : "type-148",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int [7]",
    "name" : "int [7]",
-   "referenced_type" : "type-103",
-   "self_type" : "type-564",
+   "referenced_type" : "type-105",
+   "self_type" : "type-561",
    "size" : 28,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -64,7 +64,7 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
-   "referenced_type" : "type-218",
+   "referenced_type" : "type-220",
    "self_type" : "type-1270",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
@@ -73,7 +73,7 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [10]",
    "name" : "unsigned int [10]",
-   "referenced_type" : "type-123",
+   "referenced_type" : "type-125",
    "self_type" : "type-1109",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -82,8 +82,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [12]",
    "name" : "unsigned int [12]",
-   "referenced_type" : "type-123",
-   "self_type" : "type-559",
+   "referenced_type" : "type-125",
+   "self_type" : "type-556",
    "size" : 48,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -91,8 +91,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [25]",
    "name" : "unsigned int [25]",
-   "referenced_type" : "type-123",
-   "self_type" : "type-558",
+   "referenced_type" : "type-125",
+   "self_type" : "type-555",
    "size" : 100,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -100,8 +100,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [3]",
    "name" : "unsigned int [3]",
-   "referenced_type" : "type-123",
-   "self_type" : "type-941",
+   "referenced_type" : "type-125",
+   "self_type" : "type-935",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -109,8 +109,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [8]",
    "name" : "unsigned int [8]",
-   "referenced_type" : "type-123",
-   "self_type" : "type-349",
+   "referenced_type" : "type-125",
+   "self_type" : "type-346",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -118,26 +118,17 @@
    "alignment" : 4,
    "linker_set_key" : "void *[1]",
    "name" : "void *[1]",
-   "referenced_type" : "type-227",
-   "self_type" : "type-523",
+   "referenced_type" : "type-229",
+   "self_type" : "type-521",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void *[3]",
-   "name" : "void *[3]",
-   "referenced_type" : "type-227",
-   "self_type" : "type-596",
-   "size" : 12,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "void *[4]",
    "name" : "void *[4]",
-   "referenced_type" : "type-227",
-   "self_type" : "type-519",
+   "referenced_type" : "type-229",
+   "self_type" : "type-517",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -145,8 +136,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *[6]",
    "name" : "void *[6]",
-   "referenced_type" : "type-227",
-   "self_type" : "type-524",
+   "referenced_type" : "type-229",
+   "self_type" : "type-522",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -154,7 +145,7 @@
    "alignment" : 4,
    "linker_set_key" : "void *[7]",
    "name" : "void *[7]",
-   "referenced_type" : "type-227",
+   "referenced_type" : "type-229",
    "self_type" : "type-609",
    "size" : 28,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
@@ -178,8 +169,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-288",
-   "self_type" : "type-288",
+   "referenced_type" : "type-285",
+   "self_type" : "type-285",
    "size" : 1
   },
   {
@@ -188,16 +179,16 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-182",
-   "self_type" : "type-182",
+   "referenced_type" : "type-185",
+   "self_type" : "type-185",
    "size" : 2
   },
   {
    "alignment" : 8,
    "linker_set_key" : "double",
    "name" : "double",
-   "referenced_type" : "type-41",
-   "self_type" : "type-41",
+   "referenced_type" : "type-43",
+   "self_type" : "type-43",
    "size" : 8
   },
   {
@@ -213,8 +204,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-103",
-   "self_type" : "type-103",
+   "referenced_type" : "type-105",
+   "self_type" : "type-105",
    "size" : 4
   },
   {
@@ -222,16 +213,16 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-687",
-   "self_type" : "type-687",
+   "referenced_type" : "type-684",
+   "self_type" : "type-684",
    "size" : 4
   },
   {
    "alignment" : 8,
    "linker_set_key" : "long double",
    "name" : "long double",
-   "referenced_type" : "type-298",
-   "self_type" : "type-298",
+   "referenced_type" : "type-295",
+   "self_type" : "type-295",
    "size" : 8
   },
   {
@@ -239,8 +230,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-284",
-   "self_type" : "type-284",
+   "referenced_type" : "type-12",
+   "self_type" : "type-12",
    "size" : 8
   },
   {
@@ -267,8 +258,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned char",
    "name" : "unsigned char",
-   "referenced_type" : "type-218",
-   "self_type" : "type-218",
+   "referenced_type" : "type-220",
+   "self_type" : "type-220",
    "size" : 1
   },
   {
@@ -277,8 +268,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned int",
    "name" : "unsigned int",
-   "referenced_type" : "type-123",
-   "self_type" : "type-123",
+   "referenced_type" : "type-125",
+   "self_type" : "type-125",
    "size" : 4
   },
   {
@@ -297,8 +288,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-124",
-   "self_type" : "type-124",
+   "referenced_type" : "type-126",
+   "self_type" : "type-126",
    "size" : 8
   },
   {
@@ -314,8 +305,8 @@
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-151",
-   "self_type" : "type-151"
+   "referenced_type" : "type-154",
+   "self_type" : "type-154"
   }
  ],
  "elf_functions" :
@@ -1661,12 +1652,18 @@
    "name" : "__aeabi_memset8"
   },
   {
+   "name" : "__aeabi_uidiv"
+  },
+  {
    "name" : "__aeabi_uidivmod"
   },
   {
    "name" : "__udivmodsi4"
   },
   {
+   "name" : "__udivsi3"
+  },
+  {
    "name" : "android_convertGralloc0To1Usage"
   },
   {
@@ -1848,11 +1845,11 @@
    ],
    "linker_set_key" : "AHardwareBuffer_Format",
    "name" : "AHardwareBuffer_Format",
-   "referenced_type" : "type-616",
-   "self_type" : "type-616",
+   "referenced_type" : "type-617",
+   "self_type" : "type-617",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "AHardwareBuffer_Format"
   },
   {
@@ -2014,11 +2011,11 @@
    ],
    "linker_set_key" : "AHardwareBuffer_UsageFlags",
    "name" : "AHardwareBuffer_UsageFlags",
-   "referenced_type" : "type-678",
-   "self_type" : "type-678",
+   "referenced_type" : "type-676",
+   "self_type" : "type-676",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "AHardwareBuffer_UsageFlags"
   },
   {
@@ -2036,11 +2033,11 @@
    ],
    "linker_set_key" : "android::Condition::WakeUpType",
    "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-260",
-   "self_type" : "type-260",
+   "referenced_type" : "type-256",
+   "self_type" : "type-256",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android9Condition10WakeUpTypeE"
   },
   {
@@ -2066,7 +2063,7 @@
    "self_type" : "type-1346",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android5Fence6StatusE"
   },
   {
@@ -2088,11 +2085,11 @@
    ],
    "linker_set_key" : "android::FenceTime::Snapshot::State",
    "name" : "android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1384",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1388",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android9FenceTime8Snapshot5StateE"
   },
   {
@@ -2115,11 +2112,11 @@
    ],
    "linker_set_key" : "android::FenceTime::State",
    "name" : "android::FenceTime::State",
-   "referenced_type" : "type-1378",
-   "self_type" : "type-1378",
+   "referenced_type" : "type-1383",
+   "self_type" : "type-1383",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android9FenceTime5StateE"
   },
   {
@@ -2145,11 +2142,11 @@
    ],
    "linker_set_key" : "android::GraphicBuffer::HandleWrapMethod",
    "name" : "android::GraphicBuffer::HandleWrapMethod",
-   "referenced_type" : "type-629",
-   "self_type" : "type-629",
+   "referenced_type" : "type-630",
+   "self_type" : "type-630",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h",
-   "underlying_type" : "type-218",
+   "underlying_type" : "type-220",
    "unique_id" : "_ZTSN7android13GraphicBuffer16HandleWrapMethodE"
   },
   {
@@ -2167,11 +2164,11 @@
    ],
    "linker_set_key" : "android::GraphicBufferMapper::Version",
    "name" : "android::GraphicBufferMapper::Version",
-   "referenced_type" : "type-529",
-   "self_type" : "type-529",
+   "referenced_type" : "type-527",
+   "self_type" : "type-527",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android19GraphicBufferMapper7VersionE"
   },
   {
@@ -2185,11 +2182,11 @@
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-183",
-   "self_type" : "type-183",
+   "referenced_type" : "type-186",
+   "self_type" : "type-186",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android8String1613StaticLinkageE"
   },
   {
@@ -2203,11 +2200,11 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-864",
-   "self_type" : "type-864",
+   "referenced_type" : "type-862",
+   "self_type" : "type-862",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7String813StaticLinkageE"
   },
   {
@@ -2225,7 +2222,7 @@
    "self_type" : "type-975",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details6TMat33IfE7no_initE"
   },
   {
@@ -2239,11 +2236,11 @@
    ],
    "linker_set_key" : "android::details::TMat44<float>::no_init",
    "name" : "android::details::TMat44<float>::no_init",
-   "referenced_type" : "type-2278",
-   "self_type" : "type-2278",
+   "referenced_type" : "type-2281",
+   "self_type" : "type-2281",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details6TMat44IfE7no_initE"
   },
   {
@@ -2257,11 +2254,11 @@
    ],
    "linker_set_key" : "android::details::TQuaternion<double>::no_init",
    "name" : "android::details::TQuaternion<double>::no_init",
-   "referenced_type" : "type-389",
-   "self_type" : "type-389",
+   "referenced_type" : "type-386",
+   "self_type" : "type-386",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details11TQuaternionIdE7no_initE"
   },
   {
@@ -2275,11 +2272,11 @@
    ],
    "linker_set_key" : "android::details::TQuaternion<float>::no_init",
    "name" : "android::details::TQuaternion<float>::no_init",
-   "referenced_type" : "type-428",
-   "self_type" : "type-428",
+   "referenced_type" : "type-425",
+   "self_type" : "type-425",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details11TQuaternionIfE7no_initE"
   },
   {
@@ -2297,7 +2294,7 @@
    "self_type" : "type-1255",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec2IbE7no_initE"
   },
   {
@@ -2315,7 +2312,7 @@
    "self_type" : "type-1068",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec2IdE7no_initE"
   },
   {
@@ -2333,7 +2330,7 @@
    "self_type" : "type-1135",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec2IfE7no_initE"
   },
   {
@@ -2351,7 +2348,7 @@
    "self_type" : "type-1365",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec3IdE7no_initE"
   },
   {
@@ -2365,11 +2362,11 @@
    ],
    "linker_set_key" : "android::details::TVec3<float>::no_init",
    "name" : "android::details::TVec3<float>::no_init",
-   "referenced_type" : "type-1412",
-   "self_type" : "type-1412",
+   "referenced_type" : "type-1414",
+   "self_type" : "type-1414",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec3IfE7no_initE"
   },
   {
@@ -2383,11 +2380,11 @@
    ],
    "linker_set_key" : "android::details::TVec4<double>::no_init",
    "name" : "android::details::TVec4<double>::no_init",
-   "referenced_type" : "type-148",
-   "self_type" : "type-148",
+   "referenced_type" : "type-137",
+   "self_type" : "type-137",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec4IdE7no_initE"
   },
   {
@@ -2401,11 +2398,11 @@
    ],
    "linker_set_key" : "android::details::TVec4<float>::no_init",
    "name" : "android::details::TVec4<float>::no_init",
-   "referenced_type" : "type-309",
-   "self_type" : "type-309",
+   "referenced_type" : "type-304",
+   "self_type" : "type-304",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec4IfE7no_initE"
   },
   {
@@ -2420,11 +2417,11 @@
    ],
    "linker_set_key" : "android::half::Binary",
    "name" : "android::half::Binary",
-   "referenced_type" : "type-403",
-   "self_type" : "type-403",
+   "referenced_type" : "type-399",
+   "self_type" : "type-399",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android4half6BinaryE"
   },
   {
@@ -2450,7 +2447,7 @@
    "self_type" : "type-1321",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware21HidlReturnRestrictionE"
   },
   {
@@ -2472,7 +2469,7 @@
    "self_type" : "type-1129",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android8hardware8MQFlavorE"
   },
   {
@@ -2494,11 +2491,11 @@
    ],
    "linker_set_key" : "android::hardware::ProcessState::CallRestriction",
    "name" : "android::hardware::ProcessState::CallRestriction",
-   "referenced_type" : "type-276",
-   "self_type" : "type-276",
+   "referenced_type" : "type-272",
+   "self_type" : "type-272",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware12ProcessState15CallRestrictionE"
   },
   {
@@ -2552,7 +2549,7 @@
    "self_type" : "type-1308",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware6Status9ExceptionE"
   },
   {
@@ -2606,7 +2603,7 @@
    "self_type" : "type-1223",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentor20InstrumentationEventE"
   },
   {
@@ -2708,11 +2705,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_0::BufferUsage",
-   "referenced_type" : "type-150",
-   "self_type" : "type-150",
+   "referenced_type" : "type-153",
+   "self_type" : "type-153",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_011BufferUsageE"
   },
   {
@@ -2766,7 +2763,7 @@
    "self_type" : "type-1140",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09ColorModeE"
   },
   {
@@ -2808,7 +2805,7 @@
    "self_type" : "type-1141",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_014ColorTransformE"
   },
   {
@@ -3050,7 +3047,7 @@
    "self_type" : "type-1139",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09DataspaceE"
   },
   {
@@ -3076,7 +3073,7 @@
    "self_type" : "type-1143",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_03HdrE"
   },
   {
@@ -3170,7 +3167,7 @@
    "self_type" : "type-1137",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_011PixelFormatE"
   },
   {
@@ -3204,7 +3201,7 @@
    "self_type" : "type-1138",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09TransformE"
   },
   {
@@ -3314,11 +3311,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_1::BufferUsage",
-   "referenced_type" : "type-158",
-   "self_type" : "type-158",
+   "referenced_type" : "type-160",
+   "self_type" : "type-160",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_111BufferUsageE"
   },
   {
@@ -3384,7 +3381,7 @@
    "self_type" : "type-1170",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_19ColorModeE"
   },
   {
@@ -3642,7 +3639,7 @@
    "self_type" : "type-1169",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_19DataspaceE"
   },
   {
@@ -3764,7 +3761,7 @@
    "self_type" : "type-1168",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_111PixelFormatE"
   },
   {
@@ -3794,7 +3791,7 @@
    "self_type" : "type-1171",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_112RenderIntentE"
   },
   {
@@ -3908,11 +3905,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_2::BufferUsage",
-   "referenced_type" : "type-420",
-   "self_type" : "type-420",
+   "referenced_type" : "type-417",
+   "self_type" : "type-417",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_211BufferUsageE"
   },
   {
@@ -3982,7 +3979,7 @@
    "self_type" : "type-1192",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_29ColorModeE"
   },
   {
@@ -4256,7 +4253,7 @@
    "self_type" : "type-1191",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_29DataspaceE"
   },
   {
@@ -4286,7 +4283,7 @@
    "self_type" : "type-1190",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_23HdrE"
   },
   {
@@ -4412,7 +4409,7 @@
    "self_type" : "type-1194",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_211PixelFormatE"
   },
   {
@@ -4434,11 +4431,11 @@
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-164",
-   "self_type" : "type-164",
+   "referenced_type" : "type-167",
+   "self_type" : "type-167",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfo12ArchitectureE"
   },
   {
@@ -4476,11 +4473,11 @@
    ],
    "linker_set_key" : "android::ui::Transform::orientation_flags",
    "name" : "android::ui::Transform::orientation_flags",
-   "referenced_type" : "type-2289",
-   "self_type" : "type-2289",
+   "referenced_type" : "type-2291",
+   "self_type" : "type-2291",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android2ui9Transform17orientation_flagsE"
   },
   {
@@ -4510,11 +4507,11 @@
    ],
    "linker_set_key" : "android::ui::Transform::type_mask",
    "name" : "android::ui::Transform::type_mask",
-   "referenced_type" : "type-2290",
-   "self_type" : "type-2290",
+   "referenced_type" : "type-2292",
+   "self_type" : "type-2292",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android2ui9Transform9type_maskE"
   },
   {
@@ -4564,7 +4561,7 @@
    "self_type" : "type-1257",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_LogPriority"
   },
   {
@@ -4618,7 +4615,7 @@
    "self_type" : "type-1212",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_color_mode_t"
   },
   {
@@ -4644,7 +4641,7 @@
    "self_type" : "type-1217",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_color_mode_v1_1_t"
   },
   {
@@ -4686,7 +4683,7 @@
    "self_type" : "type-1213",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_color_transform_t"
   },
   {
@@ -4928,7 +4925,7 @@
    "self_type" : "type-1211",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_dataspace_t"
   },
   {
@@ -4958,7 +4955,7 @@
    "self_type" : "type-1216",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_dataspace_v1_1_t"
   },
   {
@@ -4988,7 +4985,7 @@
    "self_type" : "type-1221",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_dataspace_v1_2_t"
   },
   {
@@ -5030,7 +5027,7 @@
    "self_type" : "type-1225",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_flex_component"
   },
   {
@@ -5068,7 +5065,7 @@
    "self_type" : "type-1227",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_flex_format"
   },
   {
@@ -5094,7 +5091,7 @@
    "self_type" : "type-1214",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_hdr_t"
   },
   {
@@ -5112,7 +5109,7 @@
    "self_type" : "type-1220",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_hdr_v1_2_t"
   },
   {
@@ -5142,7 +5139,7 @@
    "self_type" : "type-1224",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTS25android_pixel_format_sw_t"
   },
   {
@@ -5236,7 +5233,7 @@
    "self_type" : "type-1209",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_pixel_format_t"
   },
   {
@@ -5278,7 +5275,7 @@
    "self_type" : "type-1215",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_pixel_format_v1_1_t"
   },
   {
@@ -5296,7 +5293,7 @@
    "self_type" : "type-1222",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_pixel_format_v1_2_t"
   },
   {
@@ -5326,7 +5323,7 @@
    "self_type" : "type-1219",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_render_intent_v1_1_t"
   },
   {
@@ -5360,7 +5357,7 @@
    "self_type" : "type-1210",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_transform_t"
   },
   {
@@ -5414,7 +5411,7 @@
    "self_type" : "type-1258",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "log_id"
   }
  ],
@@ -5427,18 +5424,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-272"
+     "referenced_type" : "type-268"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
-   "referenced_type" : "type-271",
+   "referenced_type" : "type-267",
    "return_type" : "type-6",
-   "self_type" : "type-271",
+   "self_type" : "type-267",
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
   {
@@ -5451,11 +5448,11 @@
      "referenced_type" : "type-604"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
    "referenced_type" : "type-606",
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "self_type" : "type-606",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -5469,26 +5466,26 @@
      "referenced_type" : "type-604"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-343"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
    "referenced_type" : "type-603",
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "self_type" : "type-603",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -5499,15 +5496,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "referenced_type" : "type-580",
-   "return_type" : "type-103",
-   "self_type" : "type-580",
+   "referenced_type" : "type-578",
+   "return_type" : "type-105",
+   "self_type" : "type-578",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5517,18 +5514,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "referenced_type" : "type-592",
-   "return_type" : "type-103",
-   "self_type" : "type-592",
+   "referenced_type" : "type-590",
+   "return_type" : "type-105",
+   "self_type" : "type-590",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5538,33 +5535,33 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "referenced_type" : "type-588",
-   "return_type" : "type-103",
-   "self_type" : "type-588",
+   "referenced_type" : "type-586",
+   "return_type" : "type-105",
+   "self_type" : "type-586",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5574,36 +5571,36 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-595",
-   "return_type" : "type-103",
-   "self_type" : "type-595",
+   "referenced_type" : "type-593",
+   "return_type" : "type-105",
+   "self_type" : "type-593",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5613,33 +5610,33 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     }
    ],
-   "referenced_type" : "type-584",
-   "return_type" : "type-103",
-   "self_type" : "type-584",
+   "referenced_type" : "type-582",
+   "return_type" : "type-105",
+   "self_type" : "type-582",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5649,36 +5646,93 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-590",
-   "return_type" : "type-103",
-   "self_type" : "type-590",
+   "referenced_type" : "type-588",
+   "return_type" : "type-105",
+   "self_type" : "type-588",
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "name" : "int (const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-579"
+    },
+    {
+     "referenced_type" : "type-145"
+    },
+    {
+     "referenced_type" : "type-124"
+    },
+    {
+     "referenced_type" : "type-124"
+    }
+   ],
+   "referenced_type" : "type-595",
+   "return_type" : "type-105",
+   "self_type" : "type-595",
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "name" : "int (const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-579"
+    },
+    {
+     "referenced_type" : "type-145"
+    },
+    {
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-105"
+    },
+    {
+     "referenced_type" : "type-105"
+    },
+    {
+     "referenced_type" : "type-125"
+    }
+   ],
+   "referenced_type" : "type-597",
+   "return_type" : "type-105",
+   "self_type" : "type-597",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5688,15 +5742,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-586",
-   "return_type" : "type-103",
-   "self_type" : "type-586",
+   "referenced_type" : "type-584",
+   "return_type" : "type-105",
+   "self_type" : "type-584",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5706,18 +5760,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-554"
+     "referenced_type" : "type-551"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
-     "referenced_type" : "type-556"
+     "referenced_type" : "type-553"
     }
    ],
-   "referenced_type" : "type-553",
-   "return_type" : "type-103",
-   "self_type" : "type-553",
+   "referenced_type" : "type-550",
+   "return_type" : "type-105",
+   "self_type" : "type-550",
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
   {
@@ -5727,12 +5781,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     }
    ],
-   "referenced_type" : "type-573",
-   "return_type" : "type-103",
-   "self_type" : "type-573",
+   "referenced_type" : "type-570",
+   "return_type" : "type-105",
+   "self_type" : "type-570",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5742,15 +5796,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "referenced_type" : "type-571",
-   "return_type" : "type-103",
-   "self_type" : "type-571",
+   "referenced_type" : "type-568",
+   "return_type" : "type-105",
+   "self_type" : "type-568",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5760,15 +5814,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-566",
-   "return_type" : "type-103",
-   "self_type" : "type-566",
+   "referenced_type" : "type-563",
+   "return_type" : "type-105",
+   "self_type" : "type-563",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5778,24 +5832,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-569",
-   "return_type" : "type-103",
-   "self_type" : "type-569",
+   "referenced_type" : "type-566",
+   "return_type" : "type-105",
+   "self_type" : "type-566",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5805,12 +5859,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-557"
+     "referenced_type" : "type-554"
     }
    ],
-   "referenced_type" : "type-561",
-   "return_type" : "type-103",
-   "self_type" : "type-561",
+   "referenced_type" : "type-558",
+   "return_type" : "type-105",
+   "self_type" : "type-558",
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
   {
@@ -5820,12 +5874,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
-   "referenced_type" : "type-249",
-   "return_type" : "type-103",
-   "self_type" : "type-249",
+   "referenced_type" : "type-251",
+   "return_type" : "type-105",
+   "self_type" : "type-251",
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
   {
@@ -5838,14 +5892,14 @@
      "referenced_type" : "type-604"
     },
     {
-     "referenced_type" : "type-576"
+     "referenced_type" : "type-573"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "referenced_type" : "type-608",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "self_type" : "type-608",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -5856,27 +5910,27 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-222"
-    },
-    {
-     "referenced_type" : "type-223"
-    },
-    {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-224"
     },
     {
      "referenced_type" : "type-225"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-227"
+    },
+    {
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-229"
     }
    ],
-   "referenced_type" : "type-221",
-   "return_type" : "type-151",
-   "self_type" : "type-221",
+   "referenced_type" : "type-223",
+   "return_type" : "type-154",
+   "self_type" : "type-223",
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
   {
@@ -5886,12 +5940,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-522"
+     "referenced_type" : "type-520"
     }
    ],
-   "referenced_type" : "type-521",
-   "return_type" : "type-151",
-   "self_type" : "type-521",
+   "referenced_type" : "type-519",
+   "return_type" : "type-154",
+   "self_type" : "type-519",
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
   {
@@ -5901,18 +5955,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     },
     {
-     "referenced_type" : "type-576"
+     "referenced_type" : "type-573"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-575",
-   "return_type" : "type-151",
-   "self_type" : "type-575",
+   "referenced_type" : "type-572",
+   "return_type" : "type-154",
+   "self_type" : "type-572",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   }
  ],
@@ -5927,7 +5981,7 @@
      "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-1433",
+   "return_type" : "type-1436",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5939,7 +5993,7 @@
      "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-1434",
+   "return_type" : "type-1437",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5951,7 +6005,7 @@
      "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-1435",
+   "return_type" : "type-1438",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5963,7 +6017,7 @@
      "referenced_type" : "type-1192"
     }
    ],
-   "return_type" : "type-1436",
+   "return_type" : "type-1439",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5975,7 +6029,7 @@
      "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-1437",
+   "return_type" : "type-1440",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5984,10 +6038,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-1438",
+   "return_type" : "type-1441",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5999,7 +6053,7 @@
      "referenced_type" : "type-1171"
     }
    ],
-   "return_type" : "type-1439",
+   "return_type" : "type-1442",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -6011,7 +6065,7 @@
      "referenced_type" : "type-1213"
     }
    ],
-   "return_type" : "type-1440",
+   "return_type" : "type-1443",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -6023,7 +6077,7 @@
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-1441",
+   "return_type" : "type-1444",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -6110,7 +6164,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1042"
@@ -6119,7 +6173,7 @@
      "referenced_type" : "type-1042"
     }
    ],
-   "return_type" : "type-1442",
+   "return_type" : "type-1445",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6129,10 +6183,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6141,14 +6195,14 @@
      "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-1030"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1443"
+     "referenced_type" : "type-1446"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6158,10 +6212,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6171,18 +6225,18 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1444"
+     "referenced_type" : "type-1447"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1445"
+     "referenced_type" : "type-1448"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1446"
+     "referenced_type" : "type-1449"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6192,10 +6246,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6208,10 +6262,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1447"
+     "referenced_type" : "type-1450"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6221,23 +6275,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-1030"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1448"
+     "referenced_type" : "type-1451"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6247,28 +6301,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1449"
+     "referenced_type" : "type-1452"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1450"
+     "referenced_type" : "type-1453"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1451"
+     "referenced_type" : "type-1454"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6278,23 +6332,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
      "referenced_type" : "type-10"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1452"
+     "referenced_type" : "type-1455"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6304,10 +6358,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6316,14 +6370,14 @@
      "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-1030"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1453"
+     "referenced_type" : "type-1456"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6333,10 +6387,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6346,18 +6400,18 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1454"
+     "referenced_type" : "type-1457"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1455"
+     "referenced_type" : "type-1458"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1456"
+     "referenced_type" : "type-1459"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6367,10 +6421,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6383,10 +6437,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1457"
+     "referenced_type" : "type-1460"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6396,23 +6450,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-1030"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1458"
+     "referenced_type" : "type-1461"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6422,28 +6476,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1459"
+     "referenced_type" : "type-1462"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1460"
+     "referenced_type" : "type-1463"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1464"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6453,23 +6507,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
      "referenced_type" : "type-10"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1462"
+     "referenced_type" : "type-1465"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6479,16 +6533,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1427"
+     "referenced_type" : "type-1431"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
   {
@@ -6497,10 +6551,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/PixelFormat.h"
   },
   {
@@ -6510,10 +6564,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1400"
+     "referenced_type" : "type-1404"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -6523,13 +6577,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1400"
+     "referenced_type" : "type-1404"
     },
     {
-     "referenced_type" : "type-1401"
+     "referenced_type" : "type-1405"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -6539,25 +6593,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6568,10 +6622,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6581,13 +6635,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6598,28 +6652,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-1463"
+     "referenced_type" : "type-1466"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6630,34 +6684,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-629"
+     "referenced_type" : "type-630"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6667,19 +6721,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6689,22 +6743,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6714,16 +6768,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-1464"
+     "referenced_type" : "type-1467"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6733,22 +6787,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "return_type" : "type-6",
@@ -6761,10 +6815,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-621",
+   "return_type" : "type-622",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6773,10 +6827,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-621"
+     "referenced_type" : "type-622"
     }
    ],
-   "return_type" : "type-680",
+   "return_type" : "type-679",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6788,13 +6842,13 @@
      "referenced_type" : "type-628"
     }
    ],
-   "return_type" : "type-623",
+   "return_type" : "type-624",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
    "function_name" : "android::GraphicBuffer::dumpAllocationsToSystemLog",
    "linker_set_key" : "_ZN7android13GraphicBuffer26dumpAllocationsToSystemLogEv",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6806,7 +6860,7 @@
      "referenced_type" : "type-636"
     }
    ],
-   "return_type" : "type-679",
+   "return_type" : "type-678",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6816,24 +6870,24 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6843,27 +6897,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6873,10 +6927,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6886,27 +6940,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6916,30 +6970,30 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6949,33 +7003,33 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6985,16 +7039,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7004,19 +7058,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7026,7 +7080,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
      "referenced_type" : "type-1251"
@@ -7041,7 +7095,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7051,34 +7105,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-629"
+     "referenced_type" : "type-630"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7088,26 +7142,26 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1465"
+     "referenced_type" : "type-1468"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7117,25 +7171,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1132"
@@ -7144,7 +7198,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7154,29 +7208,29 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1466"
+     "referenced_type" : "type-1469"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7186,10 +7240,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7199,34 +7253,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-629"
+     "referenced_type" : "type-630"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7236,26 +7290,26 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1467"
+     "referenced_type" : "type-1470"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7265,25 +7319,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1132"
@@ -7292,7 +7346,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7302,29 +7356,29 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1468"
+     "referenced_type" : "type-1471"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7334,10 +7388,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7348,10 +7402,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7362,10 +7416,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7376,10 +7430,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7388,16 +7442,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/PixelFormat.h"
   },
   {
    "function_name" : "android::Gralloc2Mapper::preload",
    "linker_set_key" : "_ZN7android14Gralloc2Mapper7preloadEv",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7407,10 +7461,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-343"
+     "referenced_type" : "type-340"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7420,10 +7474,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-343"
+     "referenced_type" : "type-340"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7439,10 +7493,10 @@
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7458,7 +7512,7 @@
      "referenced_type" : "type-970"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7474,7 +7528,7 @@
      "referenced_type" : "type-970"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7487,7 +7541,7 @@
      "referenced_type" : "type-966"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7500,7 +7554,7 @@
      "referenced_type" : "type-966"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7526,13 +7580,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-360"
+     "referenced_type" : "type-357"
     },
     {
-     "referenced_type" : "type-354"
+     "referenced_type" : "type-351"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7542,13 +7596,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-360"
+     "referenced_type" : "type-357"
     },
     {
-     "referenced_type" : "type-354"
+     "referenced_type" : "type-351"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7567,7 +7621,7 @@
      "referenced_type" : "type-1042"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -7586,7 +7640,7 @@
      "referenced_type" : "type-1042"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -7596,16 +7650,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1405"
+     "referenced_type" : "type-1409"
     },
     {
      "referenced_type" : "type-1361"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -7616,10 +7670,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1405"
+     "referenced_type" : "type-1409"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -7629,13 +7683,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1405"
+     "referenced_type" : "type-1409"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-1469",
+   "return_type" : "type-1472",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -7645,19 +7699,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
    "function_name" : "android::GraphicBufferMapper::preloadHal",
    "linker_set_key" : "_ZN7android19GraphicBufferMapper10preloadHalEv",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7667,28 +7721,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-350"
+     "referenced_type" : "type-347"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7698,16 +7752,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7717,34 +7771,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-343"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7754,25 +7808,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7782,19 +7836,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7804,30 +7858,30 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7837,13 +7891,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7853,33 +7907,33 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7889,36 +7943,36 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7928,22 +7982,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7954,10 +8008,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7968,10 +8022,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7980,16 +8034,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2298"
+     "referenced_type" : "type-2300"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/UiConfig.h"
   },
   {
    "function_name" : "android::GraphicBufferAllocator::dumpToSystemLog",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocator15dumpToSystemLogEv",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -7999,13 +8053,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -8015,93 +8069,93 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-126"
+    },
+    {
+     "referenced_type" : "type-343"
     },
     {
      "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-122"
-    },
-    {
-     "referenced_type" : "type-124"
-    },
-    {
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorC1Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorC2Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::~GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorD1Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::~GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorD2Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -8114,7 +8168,7 @@
      "referenced_type" : "type-1359"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -8127,7 +8181,7 @@
      "referenced_type" : "type-1359"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -8137,7 +8191,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     },
     {
      "referenced_type" : "type-10"
@@ -8146,7 +8200,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8156,7 +8210,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     },
     {
      "referenced_type" : "type-10"
@@ -8171,7 +8225,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8181,10 +8235,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-10"
@@ -8193,7 +8247,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8203,10 +8257,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8242,13 +8296,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     },
     {
-     "referenced_type" : "type-2288"
+     "referenced_type" : "type-2290"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8258,13 +8312,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8274,10 +8328,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8287,13 +8341,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     },
     {
-     "referenced_type" : "type-2288"
+     "referenced_type" : "type-2290"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8303,13 +8357,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8319,10 +8373,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8332,10 +8386,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8345,10 +8399,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8358,13 +8412,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     },
     {
-     "referenced_type" : "type-2288"
+     "referenced_type" : "type-2290"
     }
    ],
-   "return_type" : "type-2292",
+   "return_type" : "type-2294",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8377,7 +8431,7 @@
      "referenced_type" : "type-1296"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
   },
   {
@@ -8390,16 +8444,16 @@
      "referenced_type" : "type-1296"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1300",
@@ -8415,10 +8469,10 @@
      "referenced_type" : "type-1296"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1300",
@@ -8434,10 +8488,10 @@
      "referenced_type" : "type-1296"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1300",
@@ -8453,10 +8507,10 @@
      "referenced_type" : "type-1358"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8469,10 +8523,10 @@
      "referenced_type" : "type-1358"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8481,7 +8535,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "referenced_type" : "type-1361"
@@ -8499,7 +8553,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-889"
+     "referenced_type" : "type-879"
     },
     {
      "referenced_type" : "type-1361"
@@ -8533,7 +8587,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8549,7 +8603,7 @@
      "referenced_type" : "type-1341"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8562,10 +8616,10 @@
      "referenced_type" : "type-1358"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8581,7 +8635,7 @@
      "referenced_type" : "type-1341"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8594,10 +8648,10 @@
      "referenced_type" : "type-1358"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8607,13 +8661,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8623,13 +8677,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8639,19 +8693,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8662,16 +8716,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8682,22 +8736,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8708,16 +8762,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8727,16 +8781,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8746,10 +8800,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8759,22 +8813,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8784,19 +8838,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2225"
+     "referenced_type" : "type-2228"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8806,25 +8860,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2225"
+     "referenced_type" : "type-2228"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8834,19 +8888,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2225"
+     "referenced_type" : "type-2228"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8856,25 +8910,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2225"
+     "referenced_type" : "type-2228"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8883,10 +8937,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2221",
+   "return_type" : "type-2224",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8896,13 +8950,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8912,16 +8966,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8931,16 +8985,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8950,10 +9004,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8963,13 +9017,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8979,13 +9033,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8995,19 +9049,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9017,13 +9071,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9033,13 +9087,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9049,19 +9103,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9071,13 +9125,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9087,13 +9141,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9103,19 +9157,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9125,10 +9179,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "default_arg" : true,
@@ -9145,7 +9199,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-10"
@@ -9154,7 +9208,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9164,19 +9218,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2225"
+     "referenced_type" : "type-2228"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9186,16 +9240,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2225"
+     "referenced_type" : "type-2228"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9205,16 +9259,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9224,13 +9278,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9240,13 +9294,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9256,10 +9310,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9269,13 +9323,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9285,13 +9339,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9301,10 +9355,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9314,10 +9368,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9327,10 +9381,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9340,13 +9394,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9356,10 +9410,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     }
    ],
-   "return_type" : "type-284",
+   "return_type" : "type-12",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9369,13 +9423,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9385,13 +9439,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-1394"
+     "referenced_type" : "type-1398"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9401,7 +9455,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
      "referenced_type" : "type-1251"
@@ -9416,7 +9470,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9426,13 +9480,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9442,13 +9496,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9458,13 +9512,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9474,13 +9528,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9490,13 +9544,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-1410"
+     "referenced_type" : "type-1415"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9506,13 +9560,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9523,7 +9577,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
      "referenced_type" : "type-1361"
@@ -9532,7 +9586,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9542,13 +9596,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9558,13 +9612,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-1410"
+     "referenced_type" : "type-1415"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9574,13 +9628,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9591,7 +9645,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
      "referenced_type" : "type-1361"
@@ -9600,7 +9654,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9610,25 +9664,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
    "function_name" : "android::Singleton<android::GraphicBufferMapper>::getInstance",
    "linker_set_key" : "_ZN7android9SingletonINS_19GraphicBufferMapperEE11getInstanceEv",
-   "return_type" : "type-526",
+   "return_type" : "type-524",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "function_name" : "android::Singleton<android::GraphicBufferAllocator>::getInstance",
    "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11getInstanceEv",
-   "return_type" : "type-544",
+   "return_type" : "type-541",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
@@ -9638,7 +9692,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1429"
+     "referenced_type" : "type-1433"
     }
    ],
    "return_type" : "type-6",
@@ -9651,10 +9705,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1429"
+     "referenced_type" : "type-1433"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
   {
@@ -9664,16 +9718,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1429"
+     "referenced_type" : "type-1433"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
   {
@@ -9693,7 +9747,7 @@
      "referenced_type" : "type-1119"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9707,13 +9761,13 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9727,13 +9781,13 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9747,16 +9801,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9770,16 +9824,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9793,16 +9847,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9816,16 +9870,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9835,10 +9889,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9848,28 +9902,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-350"
+     "referenced_type" : "type-347"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9879,7 +9933,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
    "return_type" : "type-636",
@@ -9892,10 +9946,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9905,7 +9959,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
    "return_type" : "type-628",
@@ -9918,7 +9972,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     },
     {
      "referenced_type" : "type-1249"
@@ -9933,7 +9987,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9943,10 +9997,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9956,13 +10010,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -9972,28 +10026,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-350"
+     "referenced_type" : "type-347"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10003,16 +10057,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
      "referenced_type" : "type-1122"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-343"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10022,16 +10076,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10041,19 +10095,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10063,31 +10117,31 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10098,13 +10152,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-351"
+     "referenced_type" : "type-348"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10114,25 +10168,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10142,31 +10196,31 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10176,13 +10230,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10192,7 +10246,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     }
    ],
    "return_type" : "type-6",
@@ -10205,10 +10259,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-973"
+     "referenced_type" : "type-974"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -10218,16 +10272,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-973"
+     "referenced_type" : "type-974"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -10237,10 +10291,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-362"
+     "referenced_type" : "type-359"
     }
    ],
-   "return_type" : "type-1566",
+   "return_type" : "type-1569",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10250,34 +10304,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-362"
+     "referenced_type" : "type-359"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-126"
+    },
+    {
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-123"
-    },
-    {
-     "referenced_type" : "type-122"
-    },
-    {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-343"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10287,7 +10341,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-362"
+     "referenced_type" : "type-359"
     }
    ],
    "return_type" : "type-6",
@@ -10300,10 +10354,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-721"
+     "referenced_type" : "type-722"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -10313,13 +10367,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-721"
+     "referenced_type" : "type-722"
     },
     {
      "referenced_type" : "type-723"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -10329,13 +10383,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1241",
@@ -10348,7 +10402,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
    "return_type" : "type-6",
@@ -10361,10 +10415,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10374,7 +10428,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
    "return_type" : "type-10",
@@ -10387,7 +10441,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
    "return_type" : "type-10",
@@ -10400,7 +10454,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
    "return_type" : "type-10",
@@ -10413,7 +10467,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
    "return_type" : "type-10",
@@ -10426,13 +10480,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10442,16 +10496,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
-    },
-    {
      "referenced_type" : "type-2293"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-2295"
+    },
+    {
+     "referenced_type" : "type-283"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10462,10 +10516,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10475,10 +10529,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10488,10 +10542,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
-   "return_type" : "type-2283",
+   "return_type" : "type-2286",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10501,10 +10555,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
-   "return_type" : "type-2276",
+   "return_type" : "type-2278",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10514,7 +10568,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
      "referenced_type" : "type-1246"
@@ -10534,13 +10588,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2221",
+   "return_type" : "type-2224",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10550,13 +10604,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
      "referenced_type" : "type-1050"
     }
    ],
-   "return_type" : "type-22",
+   "return_type" : "type-23",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10566,13 +10620,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
      "referenced_type" : "type-1054"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-18",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10582,7 +10636,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
      "referenced_type" : "type-1280"
@@ -10598,16 +10652,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-22",
+   "return_type" : "type-23",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10617,10 +10671,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "return_type" : "type-1054",
@@ -10633,13 +10687,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
-     "referenced_type" : "type-2288"
+     "referenced_type" : "type-2290"
     }
    ],
-   "return_type" : "type-2283",
+   "return_type" : "type-2286",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10687,13 +10741,13 @@
      "referenced_type" : "type-1299"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1241",
@@ -10757,7 +10811,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10770,7 +10824,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-284",
+   "return_type" : "type-12",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10783,7 +10837,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10796,7 +10850,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10821,7 +10875,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10831,13 +10885,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10847,13 +10901,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10863,19 +10917,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10885,10 +10939,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10898,10 +10952,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
    "return_type" : "type-6",
@@ -10914,7 +10968,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     }
    ],
    "return_type" : "type-1299",
@@ -10927,17 +10981,17 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10947,20 +11001,20 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2228"
+     "referenced_type" : "type-2231"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10970,7 +11024,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     }
    ],
    "return_type" : "type-1299",
@@ -10983,13 +11037,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10999,13 +11053,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11015,19 +11069,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11037,16 +11091,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11056,7 +11110,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
      "referenced_type" : "type-1284"
@@ -11072,13 +11126,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-6",
@@ -11091,10 +11145,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     }
    ],
    "return_type" : "type-1299",
@@ -11107,13 +11161,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11123,13 +11177,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11139,19 +11193,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11161,13 +11215,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11177,13 +11231,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11193,19 +11247,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11216,16 +11270,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11236,22 +11290,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11262,16 +11316,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11281,16 +11335,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11301,16 +11355,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2219"
+     "referenced_type" : "type-2222"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11321,16 +11375,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2219"
+     "referenced_type" : "type-2222"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11341,19 +11395,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2219"
+     "referenced_type" : "type-2222"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11364,19 +11418,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2219"
+     "referenced_type" : "type-2222"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11387,19 +11441,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2219"
+     "referenced_type" : "type-2222"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11410,19 +11464,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2219"
+     "referenced_type" : "type-2222"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11432,10 +11486,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1396"
+     "referenced_type" : "type-1400"
     }
    ],
-   "return_type" : "type-1383",
+   "return_type" : "type-1387",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11445,10 +11499,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1396"
+     "referenced_type" : "type-1400"
     }
    ],
-   "return_type" : "type-284",
+   "return_type" : "type-12",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11458,7 +11512,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1396"
+     "referenced_type" : "type-1400"
     }
    ],
    "return_type" : "type-6",
@@ -11471,10 +11525,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1394"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11484,10 +11538,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1394"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11497,7 +11551,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1394"
     },
     {
      "referenced_type" : "type-1249"
@@ -11512,24 +11566,24 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   }
  ],
  "global_vars" :
  [
   {
-   "access" : "private",
+   "access" : "protected",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocator10sAllocListE",
    "name" : "android::GraphicBufferAllocator::sAllocList",
-   "referenced_type" : "type-1570",
+   "referenced_type" : "type-1573",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocator5sLockE",
    "name" : "android::GraphicBufferAllocator::sLock",
-   "referenced_type" : "type-252",
+   "referenced_type" : "type-280",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -11565,41 +11619,41 @@
   {
    "linker_set_key" : "_ZN7android6Region14INVALID_REGIONE",
    "name" : "android::Region::INVALID_REGION",
-   "referenced_type" : "type-2220",
+   "referenced_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
    "linker_set_key" : "_ZN7android9FenceTime8NO_FENCEE",
    "name" : "android::FenceTime::NO_FENCE",
-   "referenced_type" : "type-1391",
+   "referenced_type" : "type-1395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_19GraphicBufferMapperEE5sLockE",
    "name" : "android::Singleton<android::GraphicBufferMapper>::sLock",
-   "referenced_type" : "type-252",
+   "referenced_type" : "type-280",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_19GraphicBufferMapperEE9sInstanceE",
    "name" : "android::Singleton<android::GraphicBufferMapper>::sInstance",
-   "referenced_type" : "type-539",
+   "referenced_type" : "type-537",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE5sLockE",
    "name" : "android::Singleton<android::GraphicBufferAllocator>::sLock",
-   "referenced_type" : "type-252",
+   "referenced_type" : "type-280",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE9sInstanceE",
    "name" : "android::Singleton<android::GraphicBufferAllocator>::sInstance",
-   "referenced_type" : "type-545",
+   "referenced_type" : "type-542",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   }
  ],
@@ -11609,8 +11663,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot &",
    "name" : "android::FenceTime::Snapshot &",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1387",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1392",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -11618,8 +11672,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot::State &",
    "name" : "android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1408",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1412",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -11627,8 +11681,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferAllocator &",
    "name" : "android::GraphicBufferAllocator &",
-   "referenced_type" : "type-542",
-   "self_type" : "type-544",
+   "referenced_type" : "type-539",
+   "self_type" : "type-541",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -11636,8 +11690,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-527",
-   "self_type" : "type-526",
+   "referenced_type" : "type-525",
+   "self_type" : "type-524",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -11654,8 +11708,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex &",
    "name" : "android::Mutex &",
-   "referenced_type" : "type-252",
-   "self_type" : "type-256",
+   "referenced_type" : "type-280",
+   "self_type" : "type-1379",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -11672,8 +11726,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock &",
    "name" : "android::RWLock &",
-   "referenced_type" : "type-262",
-   "self_type" : "type-266",
+   "referenced_type" : "type-258",
+   "self_type" : "type-262",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -11690,8 +11744,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Region &",
    "name" : "android::Region &",
-   "referenced_type" : "type-2221",
-   "self_type" : "type-2225",
+   "referenced_type" : "type-2224",
+   "self_type" : "type-2228",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -11699,8 +11753,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
-   "referenced_type" : "type-179",
-   "self_type" : "type-188",
+   "referenced_type" : "type-182",
+   "self_type" : "type-190",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -11708,8 +11762,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
-   "referenced_type" : "type-285",
-   "self_type" : "type-890",
+   "referenced_type" : "type-282",
+   "self_type" : "type-888",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -11717,8 +11771,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<android::Rect> &",
    "name" : "android::Vector<android::Rect> &",
-   "referenced_type" : "type-2213",
-   "self_type" : "type-2217",
+   "referenced_type" : "type-2216",
+   "self_type" : "type-2220",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -11735,8 +11789,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TMat44<float> &",
    "name" : "android::details::TMat44<float> &",
-   "referenced_type" : "type-2276",
-   "self_type" : "type-2282",
+   "referenced_type" : "type-2278",
+   "self_type" : "type-2285",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -11744,8 +11798,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TQuaternion<double> &",
    "name" : "android::details::TQuaternion<double> &",
-   "referenced_type" : "type-331",
-   "self_type" : "type-406",
+   "referenced_type" : "type-328",
+   "self_type" : "type-403",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -11753,8 +11807,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TQuaternion<float> &",
    "name" : "android::details::TQuaternion<float> &",
-   "referenced_type" : "type-410",
-   "self_type" : "type-438",
+   "referenced_type" : "type-407",
+   "self_type" : "type-435",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -11771,7 +11825,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec2<double> &",
    "name" : "android::details::TVec2<double> &",
-   "referenced_type" : "type-55",
+   "referenced_type" : "type-57",
    "self_type" : "type-1081",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -11780,7 +11834,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec2<float> &",
    "name" : "android::details::TVec2<float> &",
-   "referenced_type" : "type-22",
+   "referenced_type" : "type-23",
    "self_type" : "type-1048",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -11789,7 +11843,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<double> &",
    "name" : "android::details::TVec3<double> &",
-   "referenced_type" : "type-66",
+   "referenced_type" : "type-68",
    "self_type" : "type-1390",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
@@ -11798,7 +11852,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<float> &",
    "name" : "android::details::TVec3<float> &",
-   "referenced_type" : "type-17",
+   "referenced_type" : "type-18",
    "self_type" : "type-1052",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -11807,8 +11861,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<double> &",
    "name" : "android::details::TVec4<double> &",
-   "referenced_type" : "type-50",
-   "self_type" : "type-185",
+   "referenced_type" : "type-52",
+   "self_type" : "type-181",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -11816,8 +11870,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<float> &",
    "name" : "android::details::TVec4<float> &",
-   "referenced_type" : "type-200",
-   "self_type" : "type-330",
+   "referenced_type" : "type-192",
+   "self_type" : "type-327",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -11825,8 +11879,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &",
-   "referenced_type" : "type-99",
-   "self_type" : "type-108",
+   "referenced_type" : "type-101",
+   "self_type" : "type-110",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11834,8 +11888,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &",
-   "referenced_type" : "type-393",
-   "self_type" : "type-400",
+   "referenced_type" : "type-392",
+   "self_type" : "type-397",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11843,8 +11897,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &",
-   "referenced_type" : "type-111",
-   "self_type" : "type-114",
+   "referenced_type" : "type-113",
+   "self_type" : "type-116",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11861,7 +11915,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status &",
    "name" : "android::hardware::Status &",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1313",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -11870,8 +11924,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1658",
-   "self_type" : "type-1657",
+   "referenced_type" : "type-1662",
+   "self_type" : "type-1661",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11879,8 +11933,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1777",
-   "self_type" : "type-1776",
+   "referenced_type" : "type-1778",
+   "self_type" : "type-1777",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11888,8 +11942,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-230",
-   "self_type" : "type-229",
+   "referenced_type" : "type-232",
+   "self_type" : "type-231",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11897,8 +11951,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-2627",
-   "self_type" : "type-2626",
+   "referenced_type" : "type-2632",
+   "self_type" : "type-2631",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11906,8 +11960,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-2841",
-   "self_type" : "type-2840",
+   "referenced_type" : "type-2843",
+   "self_type" : "type-2842",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11915,8 +11969,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-2917",
-   "self_type" : "type-2916",
+   "referenced_type" : "type-2920",
+   "self_type" : "type-2919",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11924,8 +11978,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-431",
-   "self_type" : "type-430",
+   "referenced_type" : "type-428",
+   "self_type" : "type-427",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11933,8 +11987,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int> &",
    "name" : "android::hardware::details::hidl_pointer<unsigned int> &",
-   "referenced_type" : "type-120",
-   "self_type" : "type-178",
+   "referenced_type" : "type-122",
+   "self_type" : "type-180",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11951,8 +12005,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned int> &",
    "name" : "android::hardware::hidl_vec<unsigned int> &",
-   "referenced_type" : "type-128",
-   "self_type" : "type-131",
+   "referenced_type" : "type-131",
+   "self_type" : "type-133",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11970,7 +12024,7 @@
    "linker_set_key" : "android::sp<android::Fence> &",
    "name" : "android::sp<android::Fence> &",
    "referenced_type" : "type-1357",
-   "self_type" : "type-1411",
+   "self_type" : "type-1416",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11978,8 +12032,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &",
-   "referenced_type" : "type-355",
-   "self_type" : "type-377",
+   "referenced_type" : "type-352",
+   "self_type" : "type-374",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11987,8 +12041,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &",
-   "referenced_type" : "type-484",
-   "self_type" : "type-489",
+   "referenced_type" : "type-481",
+   "self_type" : "type-487",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11996,8 +12050,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &",
-   "referenced_type" : "type-338",
-   "self_type" : "type-385",
+   "referenced_type" : "type-335",
+   "self_type" : "type-382",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12005,8 +12059,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
-   "referenced_type" : "type-86",
-   "self_type" : "type-93",
+   "referenced_type" : "type-88",
+   "self_type" : "type-95",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12014,8 +12068,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &",
-   "referenced_type" : "type-497",
-   "self_type" : "type-503",
+   "referenced_type" : "type-494",
+   "self_type" : "type-500",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12023,8 +12077,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ui::Transform &",
    "name" : "android::ui::Transform &",
-   "referenced_type" : "type-2283",
-   "self_type" : "type-2292",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2294",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -12047,78 +12101,78 @@
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-2204",
+   "referenced_type" : "type-2206",
    "self_type" : "type-2230",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-2249",
-   "self_type" : "type-2251",
+   "referenced_type" : "type-2252",
+   "self_type" : "type-2254",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-2740",
-   "self_type" : "type-2742",
+   "referenced_type" : "type-2742",
+   "self_type" : "type-2744",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
    "referenced_type" : "type-3102",
-   "self_type" : "type-3134",
+   "self_type" : "type-3137",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-3368",
-   "self_type" : "type-3370",
+   "referenced_type" : "type-3371",
+   "self_type" : "type-3373",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-2139",
+   "referenced_type" : "type-2138",
    "self_type" : "type-2149",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-2273",
-   "self_type" : "type-2275",
+   "referenced_type" : "type-2275",
+   "self_type" : "type-2277",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-2731",
-   "self_type" : "type-2733",
+   "referenced_type" : "type-2733",
+   "self_type" : "type-2735",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-3015",
-   "self_type" : "type-3025",
+   "referenced_type" : "type-3014",
+   "self_type" : "type-3024",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-3378",
-   "self_type" : "type-3380",
+   "referenced_type" : "type-3381",
+   "self_type" : "type-3383",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-961",
-   "self_type" : "type-974",
+   "referenced_type" : "type-958",
+   "self_type" : "type-972",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
@@ -12134,7 +12188,7 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ColorSpace::TransferParameters &",
    "name" : "const android::ColorSpace::TransferParameters &",
-   "referenced_type" : "type-1033",
+   "referenced_type" : "type-1030",
    "self_type" : "type-1041",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
@@ -12143,8 +12197,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot &",
    "name" : "const android::FenceTime::Snapshot &",
-   "referenced_type" : "type-1388",
-   "self_type" : "type-1394",
+   "referenced_type" : "type-1393",
+   "self_type" : "type-1398",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -12152,8 +12206,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-1406",
-   "self_type" : "type-1407",
+   "referenced_type" : "type-1410",
+   "self_type" : "type-1411",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -12170,8 +12224,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Gralloc2Mapper &",
    "name" : "const android::Gralloc2Mapper &",
-   "referenced_type" : "type-344",
-   "self_type" : "type-354",
+   "referenced_type" : "type-341",
+   "self_type" : "type-351",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -12179,8 +12233,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-1875",
-   "self_type" : "type-1874",
+   "referenced_type" : "type-1877",
+   "self_type" : "type-1876",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12188,8 +12242,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-2009",
-   "self_type" : "type-2008",
+   "referenced_type" : "type-2012",
+   "self_type" : "type-2011",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12197,8 +12251,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-2015",
-   "self_type" : "type-2014",
+   "referenced_type" : "type-2018",
+   "self_type" : "type-2017",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12206,17 +12260,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-3028",
-   "self_type" : "type-3027",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::GrallocMapper &",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-3194",
-   "self_type" : "type-3193",
+   "referenced_type" : "type-3031",
+   "self_type" : "type-3030",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12233,6 +12278,15 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
+   "referenced_type" : "type-3201",
+   "self_type" : "type-3200",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GrallocMapper &",
+   "name" : "const android::GrallocMapper &",
    "referenced_type" : "type-612",
    "self_type" : "type-611",
    "size" : 4,
@@ -12242,8 +12296,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-802",
-   "self_type" : "type-801",
+   "referenced_type" : "type-803",
+   "self_type" : "type-802",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12251,8 +12305,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-827",
-   "self_type" : "type-826",
+   "referenced_type" : "type-828",
+   "self_type" : "type-827",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12261,7 +12315,7 @@
    "linker_set_key" : "const android::GraphicBufferAllocator::alloc_rec_t &",
    "name" : "const android::GraphicBufferAllocator::alloc_rec_t &",
    "referenced_type" : "type-706",
-   "self_type" : "type-707",
+   "self_type" : "type-708",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12269,8 +12323,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBufferMapper &",
    "name" : "const android::GraphicBufferMapper &",
-   "referenced_type" : "type-614",
-   "self_type" : "type-630",
+   "referenced_type" : "type-615",
+   "self_type" : "type-631",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -12296,8 +12350,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Region &",
    "name" : "const android::Region &",
-   "referenced_type" : "type-2220",
-   "self_type" : "type-2224",
+   "referenced_type" : "type-2223",
+   "self_type" : "type-2227",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -12305,8 +12359,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-184",
-   "self_type" : "type-187",
+   "referenced_type" : "type-187",
+   "self_type" : "type-189",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -12314,8 +12368,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 &",
    "name" : "const android::String8 &",
-   "referenced_type" : "type-873",
-   "self_type" : "type-889",
+   "referenced_type" : "type-863",
+   "self_type" : "type-879",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -12323,8 +12377,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::Rect> &",
    "name" : "const android::Vector<android::Rect> &",
-   "referenced_type" : "type-2215",
-   "self_type" : "type-2216",
+   "referenced_type" : "type-2218",
+   "self_type" : "type-2219",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -12332,8 +12386,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TMat33<float> &",
    "name" : "const android::details::TMat33<float> &",
-   "referenced_type" : "type-925",
-   "self_type" : "type-934",
+   "referenced_type" : "type-919",
+   "self_type" : "type-926",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -12341,8 +12395,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TMat44<float> &",
    "name" : "const android::details::TMat44<float> &",
-   "referenced_type" : "type-2280",
-   "self_type" : "type-2281",
+   "referenced_type" : "type-2283",
+   "self_type" : "type-2284",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -12350,8 +12404,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TQuaternion<double> &",
    "name" : "const android::details::TQuaternion<double> &",
-   "referenced_type" : "type-404",
-   "self_type" : "type-405",
+   "referenced_type" : "type-401",
+   "self_type" : "type-402",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -12359,8 +12413,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TQuaternion<float> &",
    "name" : "const android::details::TQuaternion<float> &",
-   "referenced_type" : "type-432",
-   "self_type" : "type-433",
+   "referenced_type" : "type-429",
+   "self_type" : "type-430",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -12413,8 +12467,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TVec4<double> &",
    "name" : "const android::details::TVec4<double> &",
-   "referenced_type" : "type-166",
-   "self_type" : "type-177",
+   "referenced_type" : "type-164",
+   "self_type" : "type-171",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -12422,8 +12476,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TVec4<float> &",
    "name" : "const android::details::TVec4<float> &",
-   "referenced_type" : "type-325",
-   "self_type" : "type-326",
+   "referenced_type" : "type-322",
+   "self_type" : "type-323",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -12431,8 +12485,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-231",
-   "self_type" : "type-232",
+   "referenced_type" : "type-233",
+   "self_type" : "type-234",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -12494,8 +12548,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned int> &",
    "name" : "const android::hardware::hidl_vec<unsigned int> &",
-   "referenced_type" : "type-132",
-   "self_type" : "type-133",
+   "referenced_type" : "type-134",
+   "self_type" : "type-135",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12513,7 +12567,7 @@
    "linker_set_key" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> &",
    "name" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> &",
    "referenced_type" : "type-693",
-   "self_type" : "type-695",
+   "self_type" : "type-698",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12530,8 +12584,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
    "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-273",
-   "self_type" : "type-272",
+   "referenced_type" : "type-269",
+   "self_type" : "type-268",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -12539,8 +12593,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
-   "referenced_type" : "type-91",
-   "self_type" : "type-92",
+   "referenced_type" : "type-93",
+   "self_type" : "type-94",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12566,8 +12620,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ui::Transform &",
    "name" : "const android::ui::Transform &",
-   "referenced_type" : "type-2286",
-   "self_type" : "type-2288",
+   "referenced_type" : "type-2289",
+   "self_type" : "type-2290",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -12575,7 +12629,7 @@
    "alignment" : 4,
    "linker_set_key" : "const bool &",
    "name" : "const bool &",
-   "referenced_type" : "type-370",
+   "referenced_type" : "type-367",
    "self_type" : "type-1276",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -12584,7 +12638,7 @@
    "alignment" : 4,
    "linker_set_key" : "const double &",
    "name" : "const double &",
-   "referenced_type" : "type-853",
+   "referenced_type" : "type-850",
    "self_type" : "type-859",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -12593,7 +12647,7 @@
    "alignment" : 4,
    "linker_set_key" : "const float &",
    "name" : "const float &",
-   "referenced_type" : "type-563",
+   "referenced_type" : "type-560",
    "self_type" : "type-1218",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -12608,44 +12662,44 @@
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-2256",
-   "self_type" : "type-2258",
+   "referenced_type" : "type-2259",
+   "self_type" : "type-2261",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-2262",
-   "self_type" : "type-2264",
+   "referenced_type" : "type-2264",
+   "self_type" : "type-2266",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-2743",
-   "self_type" : "type-2745",
+   "referenced_type" : "type-2745",
+   "self_type" : "type-2747",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-3178",
-   "self_type" : "type-3190",
+   "referenced_type" : "type-3177",
+   "self_type" : "type-3191",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-3371",
-   "self_type" : "type-3373",
+   "referenced_type" : "type-3374",
+   "self_type" : "type-3376",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const int &",
    "name" : "const int &",
-   "referenced_type" : "type-562",
-   "self_type" : "type-837",
+   "referenced_type" : "type-559",
+   "self_type" : "type-835",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12668,169 +12722,169 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-125",
-   "self_type" : "type-127",
+   "referenced_type" : "type-128",
+   "self_type" : "type-130",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1576",
-   "self_type" : "type-1578",
+   "referenced_type" : "type-1580",
+   "self_type" : "type-1582",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1611",
-   "self_type" : "type-1613",
+   "referenced_type" : "type-1616",
+   "self_type" : "type-1618",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1767",
-   "self_type" : "type-1769",
+   "referenced_type" : "type-1768",
+   "self_type" : "type-1770",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1892",
-   "self_type" : "type-1894",
+   "referenced_type" : "type-1894",
+   "self_type" : "type-1896",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1966",
-   "self_type" : "type-1968",
+   "referenced_type" : "type-1968",
+   "self_type" : "type-1970",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2042",
-   "self_type" : "type-2044",
+   "referenced_type" : "type-2046",
+   "self_type" : "type-2048",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2094",
-   "self_type" : "type-2096",
+   "referenced_type" : "type-2096",
+   "self_type" : "type-2098",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2156",
-   "self_type" : "type-2158",
+   "referenced_type" : "type-2158",
+   "self_type" : "type-2160",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2322",
-   "self_type" : "type-2324",
+   "referenced_type" : "type-2324",
+   "self_type" : "type-2326",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2545",
-   "self_type" : "type-2547",
+   "referenced_type" : "type-2550",
+   "self_type" : "type-2552",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2580",
-   "self_type" : "type-2582",
+   "referenced_type" : "type-2586",
+   "self_type" : "type-2588",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2755",
-   "self_type" : "type-2757",
+   "referenced_type" : "type-2757",
+   "self_type" : "type-2759",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2816",
-   "self_type" : "type-2818",
+   "referenced_type" : "type-2818",
+   "self_type" : "type-2820",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2835",
-   "self_type" : "type-2837",
+   "referenced_type" : "type-2837",
+   "self_type" : "type-2839",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2902",
-   "self_type" : "type-2904",
+   "referenced_type" : "type-2905",
+   "self_type" : "type-2907",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3048",
-   "self_type" : "type-3050",
+   "referenced_type" : "type-3051",
+   "self_type" : "type-3053",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3139",
-   "self_type" : "type-3142",
+   "referenced_type" : "type-3143",
+   "self_type" : "type-3146",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3216",
-   "self_type" : "type-3218",
+   "referenced_type" : "type-3219",
+   "self_type" : "type-3221",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3258",
-   "self_type" : "type-3260",
+   "referenced_type" : "type-3261",
+   "self_type" : "type-3263",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3309",
-   "self_type" : "type-3311",
+   "referenced_type" : "type-3312",
+   "self_type" : "type-3314",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3419",
-   "self_type" : "type-3421",
+   "referenced_type" : "type-3422",
+   "self_type" : "type-3424",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-36",
-   "self_type" : "type-39",
+   "referenced_type" : "type-39",
+   "self_type" : "type-41",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-416",
-   "self_type" : "type-418",
+   "referenced_type" : "type-413",
+   "self_type" : "type-415",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12843,15 +12897,15 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-747",
+   "referenced_type" : "type-748",
    "self_type" : "type-750",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-854",
-   "self_type" : "type-856",
+   "referenced_type" : "type-856",
+   "self_type" : "type-858",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12890,8 +12944,8 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle *const &",
    "name" : "const native_handle *const &",
-   "referenced_type" : "type-696",
-   "self_type" : "type-697",
+   "referenced_type" : "type-699",
+   "self_type" : "type-700",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12899,8 +12953,8 @@
    "alignment" : 4,
    "linker_set_key" : "const short &",
    "name" : "const short &",
-   "referenced_type" : "type-825",
-   "self_type" : "type-829",
+   "referenced_type" : "type-823",
+   "self_type" : "type-826",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12909,7 +12963,7 @@
    "linker_set_key" : "const signed char &",
    "name" : "const signed char &",
    "referenced_type" : "type-799",
-   "self_type" : "type-804",
+   "self_type" : "type-801",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12926,8 +12980,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3> &",
    "name" : "const std::array<android::details::TVec2<float>, 3> &",
-   "referenced_type" : "type-2201",
-   "self_type" : "type-2203",
+   "referenced_type" : "type-2203",
+   "self_type" : "type-2205",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12935,8 +12989,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3> &",
    "name" : "const std::array<android::details::TVec2<float>, 3> &",
-   "referenced_type" : "type-2737",
-   "self_type" : "type-2739",
+   "referenced_type" : "type-2739",
+   "self_type" : "type-2741",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12944,8 +12998,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3> &",
    "name" : "const std::array<android::details::TVec2<float>, 3> &",
-   "referenced_type" : "type-3090",
-   "self_type" : "type-3098",
+   "referenced_type" : "type-3089",
+   "self_type" : "type-3095",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12953,8 +13007,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1015",
-   "self_type" : "type-1029",
+   "referenced_type" : "type-1007",
+   "self_type" : "type-1021",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12962,8 +13016,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2182",
-   "self_type" : "type-2196",
+   "referenced_type" : "type-2176",
+   "self_type" : "type-2190",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12971,8 +13025,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2734",
-   "self_type" : "type-2736",
+   "referenced_type" : "type-2736",
+   "self_type" : "type-2738",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12980,8 +13034,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-3072",
-   "self_type" : "type-3082",
+   "referenced_type" : "type-3069",
+   "self_type" : "type-3083",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12998,8 +13052,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<float (float)> &",
    "name" : "const std::function<float (float)> &",
-   "referenced_type" : "type-2266",
-   "self_type" : "type-2287",
+   "referenced_type" : "type-2267",
+   "self_type" : "type-2280",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13007,8 +13061,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<float (float)> &",
    "name" : "const std::function<float (float)> &",
-   "referenced_type" : "type-2746",
-   "self_type" : "type-2748",
+   "referenced_type" : "type-2748",
+   "self_type" : "type-2750",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13016,7 +13070,7 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<float (float)> &",
    "name" : "const std::function<float (float)> &",
-   "referenced_type" : "type-3191",
+   "referenced_type" : "type-3194",
    "self_type" : "type-3196",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -13025,8 +13079,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-1391",
-   "self_type" : "type-1401",
+   "referenced_type" : "type-1395",
+   "self_type" : "type-1405",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13034,8 +13088,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-2513",
-   "self_type" : "type-2520",
+   "referenced_type" : "type-2518",
+   "self_type" : "type-2525",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13043,8 +13097,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-2808",
-   "self_type" : "type-2810",
+   "referenced_type" : "type-2810",
+   "self_type" : "type-2812",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13052,8 +13106,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-3610",
-   "self_type" : "type-3617",
+   "referenced_type" : "type-3616",
+   "self_type" : "type-3623",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13061,8 +13115,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> > &",
    "name" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> > &",
-   "referenced_type" : "type-2142",
-   "self_type" : "type-2144",
+   "referenced_type" : "type-2144",
+   "self_type" : "type-2146",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -13070,8 +13124,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> > &",
    "name" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> > &",
-   "referenced_type" : "type-3299",
-   "self_type" : "type-3301",
+   "referenced_type" : "type-3302",
+   "self_type" : "type-3304",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -13088,8 +13142,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1031",
-   "self_type" : "type-1030",
+   "referenced_type" : "type-1032",
+   "self_type" : "type-1031",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13106,8 +13160,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1581",
-   "self_type" : "type-1580",
+   "referenced_type" : "type-1585",
+   "self_type" : "type-1584",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13115,8 +13169,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1712",
-   "self_type" : "type-1711",
+   "referenced_type" : "type-1713",
+   "self_type" : "type-1712",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13124,8 +13178,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1818",
-   "self_type" : "type-1817",
+   "referenced_type" : "type-1819",
+   "self_type" : "type-1818",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13133,8 +13187,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1887",
-   "self_type" : "type-1886",
+   "referenced_type" : "type-1889",
+   "self_type" : "type-1888",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13142,8 +13196,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1951",
-   "self_type" : "type-1950",
+   "referenced_type" : "type-1953",
+   "self_type" : "type-1952",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13151,8 +13205,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2020",
-   "self_type" : "type-2019",
+   "referenced_type" : "type-2023",
+   "self_type" : "type-2022",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13160,8 +13214,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2137",
-   "self_type" : "type-2136",
+   "referenced_type" : "type-2141",
+   "self_type" : "type-2140",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13169,8 +13223,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2198",
-   "self_type" : "type-2197",
+   "referenced_type" : "type-2201",
+   "self_type" : "type-2200",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13178,8 +13232,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2416",
-   "self_type" : "type-2415",
+   "referenced_type" : "type-2418",
+   "self_type" : "type-2417",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13187,8 +13241,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2550",
-   "self_type" : "type-2549",
+   "referenced_type" : "type-2555",
+   "self_type" : "type-2554",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13196,8 +13250,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2681",
-   "self_type" : "type-2680",
+   "referenced_type" : "type-2683",
+   "self_type" : "type-2682",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13205,8 +13259,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2794",
-   "self_type" : "type-2793",
+   "referenced_type" : "type-2796",
+   "self_type" : "type-2795",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13214,8 +13268,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2820",
-   "self_type" : "type-2819",
+   "referenced_type" : "type-2822",
+   "self_type" : "type-2821",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13223,8 +13277,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2871",
-   "self_type" : "type-2870",
+   "referenced_type" : "type-2873",
+   "self_type" : "type-2872",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13232,8 +13286,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2962",
-   "self_type" : "type-2961",
+   "referenced_type" : "type-2964",
+   "self_type" : "type-2963",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13241,8 +13295,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3043",
-   "self_type" : "type-3042",
+   "referenced_type" : "type-3046",
+   "self_type" : "type-3045",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13250,8 +13304,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3118",
-   "self_type" : "type-3117",
+   "referenced_type" : "type-3122",
+   "self_type" : "type-3121",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13259,8 +13313,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3201",
-   "self_type" : "type-3200",
+   "referenced_type" : "type-3204",
+   "self_type" : "type-3203",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13268,8 +13322,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-328",
-   "self_type" : "type-327",
+   "referenced_type" : "type-325",
+   "self_type" : "type-324",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13277,8 +13331,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3296",
-   "self_type" : "type-3295",
+   "referenced_type" : "type-3299",
+   "self_type" : "type-3298",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13286,8 +13340,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3347",
-   "self_type" : "type-3346",
+   "referenced_type" : "type-3350",
+   "self_type" : "type-3349",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13295,8 +13349,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3513",
-   "self_type" : "type-3512",
+   "referenced_type" : "type-3516",
+   "self_type" : "type-3515",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13304,8 +13358,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-45",
-   "self_type" : "type-44",
+   "referenced_type" : "type-47",
+   "self_type" : "type-46",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13313,8 +13367,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-478",
-   "self_type" : "type-477",
+   "referenced_type" : "type-475",
+   "self_type" : "type-474",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13331,8 +13385,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-726",
-   "self_type" : "type-725",
+   "referenced_type" : "type-727",
+   "self_type" : "type-726",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13340,8 +13394,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-832",
-   "self_type" : "type-831",
+   "referenced_type" : "type-833",
+   "self_type" : "type-832",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13349,8 +13403,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-959",
-   "self_type" : "type-958",
+   "referenced_type" : "type-961",
+   "self_type" : "type-960",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13358,8 +13412,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned char &",
    "name" : "const unsigned char &",
-   "referenced_type" : "type-224",
-   "self_type" : "type-821",
+   "referenced_type" : "type-226",
+   "self_type" : "type-812",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13367,8 +13421,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned int &",
    "name" : "const unsigned int &",
-   "referenced_type" : "type-236",
-   "self_type" : "type-846",
+   "referenced_type" : "type-238",
+   "self_type" : "type-842",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13376,7 +13430,7 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long &",
    "name" : "const unsigned long long &",
-   "referenced_type" : "type-226",
+   "referenced_type" : "type-228",
    "self_type" : "type-849",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -13386,7 +13440,7 @@
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
    "referenced_type" : "type-830",
-   "self_type" : "type-834",
+   "self_type" : "type-831",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13412,7 +13466,7 @@
    "alignment" : 4,
    "linker_set_key" : "int &",
    "name" : "int &",
-   "referenced_type" : "type-103",
+   "referenced_type" : "type-105",
    "self_type" : "type-1145",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
@@ -13421,7 +13475,7 @@
    "alignment" : 4,
    "linker_set_key" : "int *&",
    "name" : "int *&",
-   "referenced_type" : "type-593",
+   "referenced_type" : "type-591",
    "self_type" : "type-1347",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
@@ -13430,8 +13484,8 @@
    "alignment" : 4,
    "linker_set_key" : "long long &",
    "name" : "long long &",
-   "referenced_type" : "type-284",
-   "self_type" : "type-1409",
+   "referenced_type" : "type-12",
+   "self_type" : "type-1413",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -13439,8 +13493,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-1936",
-   "self_type" : "type-1935",
+   "referenced_type" : "type-1933",
+   "self_type" : "type-1932",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13448,8 +13502,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-2260",
-   "self_type" : "type-2259",
+   "referenced_type" : "type-2263",
+   "self_type" : "type-2262",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13457,8 +13511,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-2722",
-   "self_type" : "type-2721",
+   "referenced_type" : "type-2724",
+   "self_type" : "type-2723",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13466,8 +13520,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-2823",
-   "self_type" : "type-2822",
+   "referenced_type" : "type-2825",
+   "self_type" : "type-2824",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13475,8 +13529,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-3375",
-   "self_type" : "type-3374",
+   "referenced_type" : "type-3378",
+   "self_type" : "type-3377",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13484,8 +13538,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-703",
-   "self_type" : "type-702",
+   "referenced_type" : "type-696",
+   "self_type" : "type-695",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13493,8 +13547,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1949",
-   "self_type" : "type-1948",
+   "referenced_type" : "type-1951",
+   "self_type" : "type-1950",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -13502,8 +13556,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2229",
-   "self_type" : "type-2228",
+   "referenced_type" : "type-2232",
+   "self_type" : "type-2231",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -13511,8 +13565,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2294",
-   "self_type" : "type-2293",
+   "referenced_type" : "type-2296",
+   "self_type" : "type-2295",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -13520,8 +13574,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2299",
-   "self_type" : "type-2298",
+   "referenced_type" : "type-2301",
+   "self_type" : "type-2300",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/UiConfig.h"
   },
@@ -13529,8 +13583,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-3116",
-   "self_type" : "type-3115",
+   "referenced_type" : "type-3120",
+   "self_type" : "type-3119",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -13538,8 +13592,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-3360",
-   "self_type" : "type-3359",
+   "referenced_type" : "type-3363",
+   "self_type" : "type-3362",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -13547,8 +13601,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-3392",
-   "self_type" : "type-3391",
+   "referenced_type" : "type-3395",
+   "self_type" : "type-3394",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -13556,8 +13610,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-3397",
-   "self_type" : "type-3396",
+   "referenced_type" : "type-3400",
+   "self_type" : "type-3399",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/UiConfig.h"
   },
@@ -13574,7 +13628,7 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int &",
    "name" : "unsigned int &",
-   "referenced_type" : "type-123",
+   "referenced_type" : "type-125",
    "self_type" : "type-1250",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
@@ -13583,7 +13637,7 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned long long &",
    "name" : "unsigned long long &",
-   "referenced_type" : "type-124",
+   "referenced_type" : "type-126",
    "self_type" : "type-1146",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
@@ -13592,7 +13646,7 @@
    "alignment" : 4,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-227",
+   "referenced_type" : "type-229",
    "self_type" : "type-1249",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
@@ -13604,8 +13658,8 @@
    "alignment" : 4,
    "linker_set_key" : "AHardwareBuffer *",
    "name" : "AHardwareBuffer *",
-   "referenced_type" : "type-1880",
-   "self_type" : "type-1879",
+   "referenced_type" : "type-1882",
+   "self_type" : "type-1881",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -13613,8 +13667,8 @@
    "alignment" : 4,
    "linker_set_key" : "AHardwareBuffer *",
    "name" : "AHardwareBuffer *",
-   "referenced_type" : "type-3035",
-   "self_type" : "type-3034",
+   "referenced_type" : "type-3039",
+   "self_type" : "type-3038",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -13622,8 +13676,8 @@
    "alignment" : 4,
    "linker_set_key" : "AHardwareBuffer *",
    "name" : "AHardwareBuffer *",
-   "referenced_type" : "type-622",
-   "self_type" : "type-621",
+   "referenced_type" : "type-623",
+   "self_type" : "type-622",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -13631,7 +13685,7 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-517",
+   "referenced_type" : "type-515",
    "self_type" : "type-636",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
@@ -13658,8 +13712,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2482",
-   "self_type" : "type-2481",
+   "referenced_type" : "type-2484",
+   "self_type" : "type-2483",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13667,8 +13721,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2504",
-   "self_type" : "type-2503",
+   "referenced_type" : "type-2506",
+   "self_type" : "type-2505",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13676,8 +13730,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2802",
-   "self_type" : "type-2801",
+   "referenced_type" : "type-2804",
+   "self_type" : "type-2803",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13685,8 +13739,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2807",
-   "self_type" : "type-2806",
+   "referenced_type" : "type-2809",
+   "self_type" : "type-2808",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13694,8 +13748,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3579",
-   "self_type" : "type-3578",
+   "referenced_type" : "type-3582",
+   "self_type" : "type-3581",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13703,8 +13757,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3601",
-   "self_type" : "type-3600",
+   "referenced_type" : "type-3604",
+   "self_type" : "type-3603",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13721,8 +13775,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1414",
-   "self_type" : "type-1413",
+   "referenced_type" : "type-1418",
+   "self_type" : "type-1417",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13730,8 +13784,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2472",
-   "self_type" : "type-2471",
+   "referenced_type" : "type-2474",
+   "self_type" : "type-2473",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13739,8 +13793,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2529",
-   "self_type" : "type-2528",
+   "referenced_type" : "type-2534",
+   "self_type" : "type-2533",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13748,8 +13802,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2797",
-   "self_type" : "type-2796",
+   "referenced_type" : "type-2799",
+   "self_type" : "type-2798",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13757,8 +13811,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2812",
-   "self_type" : "type-2811",
+   "referenced_type" : "type-2814",
+   "self_type" : "type-2813",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13766,8 +13820,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3569",
-   "self_type" : "type-3568",
+   "referenced_type" : "type-3572",
+   "self_type" : "type-3571",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13775,8 +13829,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3626",
-   "self_type" : "type-3625",
+   "referenced_type" : "type-3632",
+   "self_type" : "type-3631",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13793,8 +13847,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
    "name" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
-   "referenced_type" : "type-516",
-   "self_type" : "type-537",
+   "referenced_type" : "type-514",
+   "self_type" : "type-534",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
   },
@@ -13803,7 +13857,7 @@
    "linker_set_key" : "android::ColorSpace *",
    "name" : "android::ColorSpace *",
    "referenced_type" : "type-979",
-   "self_type" : "type-1006",
+   "self_type" : "type-1000",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -13820,8 +13874,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Condition *",
    "name" : "android::Condition *",
-   "referenced_type" : "type-258",
-   "self_type" : "type-261",
+   "referenced_type" : "type-254",
+   "self_type" : "type-257",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h"
   },
@@ -13838,8 +13892,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime *",
    "name" : "android::FenceTime *",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1393",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1397",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13847,8 +13901,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot *",
    "name" : "android::FenceTime::Snapshot *",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1382",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1386",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13856,8 +13910,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTimeline *",
    "name" : "android::FenceTimeline *",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1400",
+   "referenced_type" : "type-1401",
+   "self_type" : "type-1404",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13865,8 +13919,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceToFenceTimeMap *",
    "name" : "android::FenceToFenceTimeMap *",
-   "referenced_type" : "type-1402",
-   "self_type" : "type-1405",
+   "referenced_type" : "type-1406",
+   "self_type" : "type-1409",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13883,8 +13937,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FrameStats *",
    "name" : "android::FrameStats *",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1427",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1431",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
@@ -13892,8 +13946,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Gralloc2Allocator *",
    "name" : "android::Gralloc2Allocator *",
-   "referenced_type" : "type-353",
-   "self_type" : "type-360",
+   "referenced_type" : "type-350",
+   "self_type" : "type-357",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -13901,8 +13955,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Gralloc2Mapper *",
    "name" : "android::Gralloc2Mapper *",
-   "referenced_type" : "type-337",
-   "self_type" : "type-343",
+   "referenced_type" : "type-334",
+   "self_type" : "type-340",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -13910,8 +13964,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-525",
-   "self_type" : "type-680",
+   "referenced_type" : "type-523",
+   "self_type" : "type-679",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13919,8 +13973,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferAllocator *",
    "name" : "android::GraphicBufferAllocator *",
-   "referenced_type" : "type-542",
-   "self_type" : "type-545",
+   "referenced_type" : "type-539",
+   "self_type" : "type-542",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -13928,8 +13982,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-527",
-   "self_type" : "type-539",
+   "referenced_type" : "type-525",
+   "self_type" : "type-537",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -13946,8 +14000,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1679",
-   "self_type" : "type-1678",
+   "referenced_type" : "type-1680",
+   "self_type" : "type-1679",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13955,8 +14009,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1781",
-   "self_type" : "type-1780",
+   "referenced_type" : "type-1782",
+   "self_type" : "type-1781",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13964,8 +14018,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-2648",
-   "self_type" : "type-2647",
+   "referenced_type" : "type-2650",
+   "self_type" : "type-2649",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13973,8 +14027,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-2843",
-   "self_type" : "type-2842",
+   "referenced_type" : "type-2845",
+   "self_type" : "type-2844",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13982,8 +14036,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-292",
-   "self_type" : "type-291",
+   "referenced_type" : "type-289",
+   "self_type" : "type-288",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13991,8 +14045,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-2921",
-   "self_type" : "type-2920",
+   "referenced_type" : "type-2923",
+   "self_type" : "type-2922",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -14000,8 +14054,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-437",
-   "self_type" : "type-436",
+   "referenced_type" : "type-434",
+   "self_type" : "type-433",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -14009,8 +14063,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
-   "referenced_type" : "type-715",
-   "self_type" : "type-716",
+   "referenced_type" : "type-716",
+   "self_type" : "type-717",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -14019,7 +14073,7 @@
    "linker_set_key" : "android::LightFlattenablePod<android::Rect> *",
    "name" : "android::LightFlattenablePod<android::Rect> *",
    "referenced_type" : "type-1243",
-   "self_type" : "type-2233",
+   "self_type" : "type-2236",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14036,8 +14090,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex *",
    "name" : "android::Mutex *",
-   "referenced_type" : "type-252",
-   "self_type" : "type-254",
+   "referenced_type" : "type-280",
+   "self_type" : "type-1376",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -14045,8 +14099,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex::Autolock *",
    "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-255",
-   "self_type" : "type-257",
+   "referenced_type" : "type-1378",
+   "self_type" : "type-1380",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -14063,8 +14117,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock *",
    "name" : "android::RWLock *",
-   "referenced_type" : "type-262",
-   "self_type" : "type-264",
+   "referenced_type" : "type-258",
+   "self_type" : "type-260",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -14072,8 +14126,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock::AutoRLock *",
    "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-265",
-   "self_type" : "type-267",
+   "referenced_type" : "type-261",
+   "self_type" : "type-263",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -14081,8 +14135,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock::AutoWLock *",
    "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-268",
-   "self_type" : "type-269",
+   "referenced_type" : "type-264",
+   "self_type" : "type-265",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -14099,8 +14153,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase *",
    "name" : "android::RefBase *",
-   "referenced_type" : "type-172",
-   "self_type" : "type-246",
+   "referenced_type" : "type-175",
+   "self_type" : "type-248",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14108,8 +14162,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-118",
-   "self_type" : "type-117",
+   "referenced_type" : "type-120",
+   "self_type" : "type-119",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14135,8 +14189,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-14",
-   "self_type" : "type-13",
+   "referenced_type" : "type-1577",
+   "self_type" : "type-1576",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14144,8 +14198,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1573",
-   "self_type" : "type-1572",
+   "referenced_type" : "type-16",
+   "self_type" : "type-15",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14153,8 +14207,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1608",
-   "self_type" : "type-1607",
+   "referenced_type" : "type-1612",
+   "self_type" : "type-1611",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14162,8 +14216,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-175",
-   "self_type" : "type-174",
+   "referenced_type" : "type-1766",
+   "self_type" : "type-1765",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14171,8 +14225,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1765",
-   "self_type" : "type-1764",
+   "referenced_type" : "type-178",
+   "self_type" : "type-177",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14180,8 +14234,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1839",
-   "self_type" : "type-1838",
+   "referenced_type" : "type-1840",
+   "self_type" : "type-1839",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14189,8 +14243,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1964",
-   "self_type" : "type-1963",
+   "referenced_type" : "type-1966",
+   "self_type" : "type-1965",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14198,8 +14252,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2039",
-   "self_type" : "type-2038",
+   "referenced_type" : "type-2042",
+   "self_type" : "type-2041",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14207,8 +14261,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2092",
-   "self_type" : "type-2091",
+   "referenced_type" : "type-2094",
+   "self_type" : "type-2093",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14216,8 +14270,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2154",
-   "self_type" : "type-2153",
+   "referenced_type" : "type-2156",
+   "self_type" : "type-2155",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14225,8 +14279,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2308",
-   "self_type" : "type-2307",
+   "referenced_type" : "type-2310",
+   "self_type" : "type-2309",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14234,8 +14288,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2474",
-   "self_type" : "type-2473",
+   "referenced_type" : "type-2476",
+   "self_type" : "type-2475",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14243,8 +14297,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2500",
-   "self_type" : "type-2499",
+   "referenced_type" : "type-2502",
+   "self_type" : "type-2501",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14252,8 +14306,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2542",
-   "self_type" : "type-2541",
+   "referenced_type" : "type-2547",
+   "self_type" : "type-2546",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14261,8 +14315,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2577",
-   "self_type" : "type-2576",
+   "referenced_type" : "type-2582",
+   "self_type" : "type-2581",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14270,8 +14324,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2752",
-   "self_type" : "type-2751",
+   "referenced_type" : "type-2754",
+   "self_type" : "type-2753",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14279,8 +14333,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2799",
-   "self_type" : "type-2798",
+   "referenced_type" : "type-2801",
+   "self_type" : "type-2800",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14288,8 +14342,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2804",
-   "self_type" : "type-2803",
+   "referenced_type" : "type-2806",
+   "self_type" : "type-2805",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14297,8 +14351,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2814",
-   "self_type" : "type-2813",
+   "referenced_type" : "type-2816",
+   "self_type" : "type-2815",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14306,8 +14360,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2833",
-   "self_type" : "type-2832",
+   "referenced_type" : "type-2835",
+   "self_type" : "type-2834",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14315,8 +14369,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2899",
-   "self_type" : "type-2898",
+   "referenced_type" : "type-2901",
+   "self_type" : "type-2900",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14324,8 +14378,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2984",
-   "self_type" : "type-2983",
+   "referenced_type" : "type-2986",
+   "self_type" : "type-2985",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14333,8 +14387,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3136",
-   "self_type" : "type-3135",
+   "referenced_type" : "type-3140",
+   "self_type" : "type-3139",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14342,8 +14396,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3214",
-   "self_type" : "type-3213",
+   "referenced_type" : "type-3217",
+   "self_type" : "type-3216",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14351,8 +14405,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3256",
-   "self_type" : "type-3255",
+   "referenced_type" : "type-3259",
+   "self_type" : "type-3258",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14360,8 +14414,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3307",
-   "self_type" : "type-3306",
+   "referenced_type" : "type-3310",
+   "self_type" : "type-3309",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14369,8 +14423,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3405",
-   "self_type" : "type-3404",
+   "referenced_type" : "type-3408",
+   "self_type" : "type-3407",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14378,8 +14432,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3571",
-   "self_type" : "type-3570",
+   "referenced_type" : "type-3574",
+   "self_type" : "type-3573",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14387,8 +14441,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3597",
-   "self_type" : "type-3596",
+   "referenced_type" : "type-3600",
+   "self_type" : "type-3599",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14396,8 +14450,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-408",
-   "self_type" : "type-407",
+   "referenced_type" : "type-405",
+   "self_type" : "type-404",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14405,8 +14459,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-514",
-   "self_type" : "type-513",
+   "referenced_type" : "type-511",
+   "self_type" : "type-510",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14414,8 +14468,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-744",
-   "self_type" : "type-743",
+   "referenced_type" : "type-745",
+   "self_type" : "type-744",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14423,8 +14477,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-851",
-   "self_type" : "type-850",
+   "referenced_type" : "type-852",
+   "self_type" : "type-851",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14450,8 +14504,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_type *",
    "name" : "android::RefBase::weakref_type *",
-   "referenced_type" : "type-198",
-   "self_type" : "type-197",
+   "referenced_type" : "type-211",
+   "self_type" : "type-210",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -14468,8 +14522,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Region *",
    "name" : "android::Region *",
-   "referenced_type" : "type-2221",
-   "self_type" : "type-2223",
+   "referenced_type" : "type-2224",
+   "self_type" : "type-2226",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -14495,8 +14549,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 *",
    "name" : "android::String16 *",
-   "referenced_type" : "type-179",
-   "self_type" : "type-189",
+   "referenced_type" : "type-182",
+   "self_type" : "type-191",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -14504,8 +14558,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 *",
    "name" : "android::String8 *",
-   "referenced_type" : "type-285",
-   "self_type" : "type-901",
+   "referenced_type" : "type-282",
+   "self_type" : "type-891",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -14513,8 +14567,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Thread *",
    "name" : "android::Thread *",
-   "referenced_type" : "type-369",
-   "self_type" : "type-368",
+   "referenced_type" : "type-366",
+   "self_type" : "type-365",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14522,8 +14576,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<android::Rect> *",
    "name" : "android::Vector<android::Rect> *",
-   "referenced_type" : "type-2213",
-   "self_type" : "type-2214",
+   "referenced_type" : "type-2216",
+   "self_type" : "type-2217",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14531,8 +14585,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<long long> *",
    "name" : "android::Vector<long long> *",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1424",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1428",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14567,8 +14621,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TMat44<float> *",
    "name" : "android::details::TMat44<float> *",
-   "referenced_type" : "type-2276",
-   "self_type" : "type-2279",
+   "referenced_type" : "type-2278",
+   "self_type" : "type-2282",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -14577,7 +14631,7 @@
    "linker_set_key" : "android::details::TMatTransform<android::details::TMat33, float> *",
    "name" : "android::details::TMatTransform<android::details::TMat33, float> *",
    "referenced_type" : "type-910",
-   "self_type" : "type-957",
+   "self_type" : "type-949",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -14585,8 +14639,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TMatTransform<android::details::TMat44, float> *",
    "name" : "android::details::TMatTransform<android::details::TMat44, float> *",
-   "referenced_type" : "type-2270",
-   "self_type" : "type-2271",
+   "referenced_type" : "type-2272",
+   "self_type" : "type-2273",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -14594,8 +14648,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TQuaternion<double> *",
    "name" : "android::details::TQuaternion<double> *",
-   "referenced_type" : "type-331",
-   "self_type" : "type-397",
+   "referenced_type" : "type-328",
+   "self_type" : "type-391",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -14603,8 +14657,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TQuaternion<float> *",
    "name" : "android::details::TQuaternion<float> *",
-   "referenced_type" : "type-410",
-   "self_type" : "type-429",
+   "referenced_type" : "type-407",
+   "self_type" : "type-426",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -14621,7 +14675,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec2<double> *",
    "name" : "android::details::TVec2<double> *",
-   "referenced_type" : "type-55",
+   "referenced_type" : "type-57",
    "self_type" : "type-1069",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -14630,7 +14684,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec2<float> *",
    "name" : "android::details::TVec2<float> *",
-   "referenced_type" : "type-22",
+   "referenced_type" : "type-23",
    "self_type" : "type-1245",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -14639,7 +14693,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<double> *",
    "name" : "android::details::TVec3<double> *",
-   "referenced_type" : "type-66",
+   "referenced_type" : "type-68",
    "self_type" : "type-1368",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
@@ -14648,8 +14702,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<float> *",
    "name" : "android::details::TVec3<float> *",
-   "referenced_type" : "type-17",
-   "self_type" : "type-16",
+   "referenced_type" : "type-18",
+   "self_type" : "type-17",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
   },
@@ -14657,8 +14711,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<double> *",
    "name" : "android::details::TVec4<double> *",
-   "referenced_type" : "type-50",
-   "self_type" : "type-155",
+   "referenced_type" : "type-52",
+   "self_type" : "type-151",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -14666,8 +14720,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<float> *",
    "name" : "android::details::TVec4<float> *",
-   "referenced_type" : "type-200",
-   "self_type" : "type-316",
+   "referenced_type" : "type-192",
+   "self_type" : "type-311",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -14675,7 +14729,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec2, float> *",
    "name" : "android::details::TVecAddOperators<android::details::TVec2, float> *",
-   "referenced_type" : "type-28",
+   "referenced_type" : "type-29",
    "self_type" : "type-1049",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -14684,7 +14738,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec3, float> *",
    "name" : "android::details::TVecAddOperators<android::details::TVec3, float> *",
-   "referenced_type" : "type-34",
+   "referenced_type" : "type-35",
    "self_type" : "type-1053",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -14693,7 +14747,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec2, float> *",
    "name" : "android::details::TVecProductOperators<android::details::TVec2, float> *",
-   "referenced_type" : "type-27",
+   "referenced_type" : "type-28",
    "self_type" : "type-1057",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -14702,7 +14756,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec3, float> *",
    "name" : "android::details::TVecProductOperators<android::details::TVec3, float> *",
-   "referenced_type" : "type-33",
+   "referenced_type" : "type-34",
    "self_type" : "type-1058",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -14712,7 +14766,7 @@
    "linker_set_key" : "android::half *",
    "name" : "android::half *",
    "referenced_type" : "type-1",
-   "self_type" : "type-1381",
+   "self_type" : "type-1377",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -14738,8 +14792,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-242",
-   "self_type" : "type-241",
+   "referenced_type" : "type-244",
+   "self_type" : "type-243",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14756,8 +14810,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-196",
-   "self_type" : "type-195",
+   "referenced_type" : "type-209",
+   "self_type" : "type-208",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14765,8 +14819,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-215",
-   "self_type" : "type-222",
+   "referenced_type" : "type-217",
+   "self_type" : "type-224",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -14774,8 +14828,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-281",
-   "self_type" : "type-280",
+   "referenced_type" : "type-277",
+   "self_type" : "type-276",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14783,8 +14837,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
-   "referenced_type" : "type-99",
-   "self_type" : "type-106",
+   "referenced_type" : "type-101",
+   "self_type" : "type-108",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14792,8 +14846,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
-   "referenced_type" : "type-393",
-   "self_type" : "type-398",
+   "referenced_type" : "type-392",
+   "self_type" : "type-395",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14801,8 +14855,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
-   "referenced_type" : "type-111",
-   "self_type" : "type-112",
+   "referenced_type" : "type-113",
+   "self_type" : "type-114",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14819,7 +14873,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status *",
    "name" : "android::hardware::Status *",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1309",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -14846,8 +14900,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int> *",
    "name" : "android::hardware::details::hidl_pointer<unsigned int> *",
-   "referenced_type" : "type-120",
-   "self_type" : "type-169",
+   "referenced_type" : "type-122",
+   "self_type" : "type-172",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14855,7 +14909,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status *",
    "name" : "android::hardware::details::return_status *",
-   "referenced_type" : "type-101",
+   "referenced_type" : "type-103",
    "self_type" : "type-1315",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -14864,8 +14918,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1727",
-   "self_type" : "type-1726",
+   "referenced_type" : "type-1728",
+   "self_type" : "type-1727",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14873,8 +14927,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1924",
-   "self_type" : "type-1923",
+   "referenced_type" : "type-1926",
+   "self_type" : "type-1925",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14882,8 +14936,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1954",
-   "self_type" : "type-1953",
+   "referenced_type" : "type-1956",
+   "self_type" : "type-1955",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14891,8 +14945,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2024",
-   "self_type" : "type-2023",
+   "referenced_type" : "type-2027",
+   "self_type" : "type-2026",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14900,8 +14954,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2696",
-   "self_type" : "type-2695",
+   "referenced_type" : "type-2698",
+   "self_type" : "type-2697",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14909,8 +14963,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2878",
-   "self_type" : "type-2877",
+   "referenced_type" : "type-2880",
+   "self_type" : "type-2879",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14918,8 +14972,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-3084",
-   "self_type" : "type-3083",
+   "referenced_type" : "type-3088",
+   "self_type" : "type-3087",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14927,8 +14981,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-3122",
-   "self_type" : "type-3121",
+   "referenced_type" : "type-3126",
+   "self_type" : "type-3125",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14936,8 +14990,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-3204",
-   "self_type" : "type-3203",
+   "referenced_type" : "type-3207",
+   "self_type" : "type-3206",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14945,8 +14999,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-357",
-   "self_type" : "type-356",
+   "referenced_type" : "type-354",
+   "self_type" : "type-353",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14954,8 +15008,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-685",
-   "self_type" : "type-684",
+   "referenced_type" : "type-687",
+   "self_type" : "type-686",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14972,8 +15026,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-836",
-   "self_type" : "type-835",
+   "referenced_type" : "type-837",
+   "self_type" : "type-836",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14981,8 +15035,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-1821",
-   "self_type" : "type-1820",
+   "referenced_type" : "type-1822",
+   "self_type" : "type-1821",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14990,8 +15044,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-1960",
-   "self_type" : "type-1959",
+   "referenced_type" : "type-1962",
+   "self_type" : "type-1961",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14999,8 +15053,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-2031",
-   "self_type" : "type-2030",
+   "referenced_type" : "type-2034",
+   "self_type" : "type-2033",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15008,8 +15062,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-2966",
-   "self_type" : "type-2965",
+   "referenced_type" : "type-2968",
+   "self_type" : "type-2967",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15017,8 +15071,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-3129",
-   "self_type" : "type-3128",
+   "referenced_type" : "type-3133",
+   "self_type" : "type-3132",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15026,8 +15080,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-3210",
-   "self_type" : "type-3209",
+   "referenced_type" : "type-3213",
+   "self_type" : "type-3212",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15035,8 +15089,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-486",
-   "self_type" : "type-485",
+   "referenced_type" : "type-483",
+   "self_type" : "type-482",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15044,8 +15098,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-737",
-   "self_type" : "type-736",
+   "referenced_type" : "type-738",
+   "self_type" : "type-737",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15053,8 +15107,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-843",
-   "self_type" : "type-842",
+   "referenced_type" : "type-844",
+   "self_type" : "type-843",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15062,8 +15116,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1716",
-   "self_type" : "type-1715",
+   "referenced_type" : "type-1717",
+   "self_type" : "type-1716",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15071,8 +15125,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1926",
-   "self_type" : "type-1925",
+   "referenced_type" : "type-1928",
+   "self_type" : "type-1927",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15080,8 +15134,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1956",
-   "self_type" : "type-1955",
+   "referenced_type" : "type-1958",
+   "self_type" : "type-1957",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15089,8 +15143,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2027",
-   "self_type" : "type-2026",
+   "referenced_type" : "type-2029",
+   "self_type" : "type-2028",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15098,8 +15152,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2685",
-   "self_type" : "type-2684",
+   "referenced_type" : "type-2687",
+   "self_type" : "type-2686",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15107,8 +15161,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2884",
-   "self_type" : "type-2883",
+   "referenced_type" : "type-2886",
+   "self_type" : "type-2885",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15116,8 +15170,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-3087",
-   "self_type" : "type-3086",
+   "referenced_type" : "type-3092",
+   "self_type" : "type-3091",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15125,8 +15179,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-3124",
-   "self_type" : "type-3123",
+   "referenced_type" : "type-3128",
+   "self_type" : "type-3127",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15134,8 +15188,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-3206",
-   "self_type" : "type-3205",
+   "referenced_type" : "type-3209",
+   "self_type" : "type-3208",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15143,8 +15197,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-340",
-   "self_type" : "type-339",
+   "referenced_type" : "type-337",
+   "self_type" : "type-336",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15179,8 +15233,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1587",
-   "self_type" : "type-1586",
+   "referenced_type" : "type-1591",
+   "self_type" : "type-1590",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15188,8 +15242,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1928",
-   "self_type" : "type-1927",
+   "referenced_type" : "type-1930",
+   "self_type" : "type-1929",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15197,8 +15251,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1958",
-   "self_type" : "type-1957",
+   "referenced_type" : "type-1960",
+   "self_type" : "type-1959",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15206,8 +15260,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2029",
-   "self_type" : "type-2028",
+   "referenced_type" : "type-2031",
+   "self_type" : "type-2030",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15215,8 +15269,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2556",
-   "self_type" : "type-2555",
+   "referenced_type" : "type-2561",
+   "self_type" : "type-2560",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15224,8 +15278,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2828",
-   "self_type" : "type-2827",
+   "referenced_type" : "type-2830",
+   "self_type" : "type-2829",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15233,8 +15287,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-3089",
-   "self_type" : "type-3088",
+   "referenced_type" : "type-3094",
+   "self_type" : "type-3093",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15242,8 +15296,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-3127",
-   "self_type" : "type-3126",
+   "referenced_type" : "type-3131",
+   "self_type" : "type-3130",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15251,8 +15305,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-3208",
-   "self_type" : "type-3207",
+   "referenced_type" : "type-3211",
+   "self_type" : "type-3210",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15287,8 +15341,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-88",
-   "self_type" : "type-87",
+   "referenced_type" : "type-90",
+   "self_type" : "type-89",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15296,8 +15350,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
-   "referenced_type" : "type-1724",
-   "self_type" : "type-1723",
+   "referenced_type" : "type-1725",
+   "self_type" : "type-1724",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15305,8 +15359,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
-   "referenced_type" : "type-2693",
-   "self_type" : "type-2692",
+   "referenced_type" : "type-2695",
+   "self_type" : "type-2694",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15314,8 +15368,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
-   "referenced_type" : "type-2875",
-   "self_type" : "type-2874",
+   "referenced_type" : "type-2878",
+   "self_type" : "type-2877",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15323,8 +15377,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
-   "referenced_type" : "type-352",
-   "self_type" : "type-351",
+   "referenced_type" : "type-349",
+   "self_type" : "type-348",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15332,8 +15386,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-1831",
-   "self_type" : "type-1830",
+   "referenced_type" : "type-1832",
+   "self_type" : "type-1831",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15341,8 +15395,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-1962",
-   "self_type" : "type-1961",
+   "referenced_type" : "type-1964",
+   "self_type" : "type-1963",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15350,8 +15404,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-2033",
-   "self_type" : "type-2032",
+   "referenced_type" : "type-2036",
+   "self_type" : "type-2035",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15359,8 +15413,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-2976",
-   "self_type" : "type-2975",
+   "referenced_type" : "type-2978",
+   "self_type" : "type-2977",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15368,8 +15422,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-3132",
-   "self_type" : "type-3131",
+   "referenced_type" : "type-3136",
+   "self_type" : "type-3135",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15377,8 +15431,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-3212",
-   "self_type" : "type-3211",
+   "referenced_type" : "type-3215",
+   "self_type" : "type-3214",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15386,8 +15440,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-499",
-   "self_type" : "type-498",
+   "referenced_type" : "type-496",
+   "self_type" : "type-495",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15404,8 +15458,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-845",
-   "self_type" : "type-844",
+   "referenced_type" : "type-846",
+   "self_type" : "type-845",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15431,8 +15485,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_handle *",
    "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-139",
-   "self_type" : "type-138",
+   "referenced_type" : "type-142",
+   "self_type" : "type-141",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15449,8 +15503,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned int> *",
    "name" : "android::hardware::hidl_vec<unsigned int> *",
-   "referenced_type" : "type-128",
-   "self_type" : "type-129",
+   "referenced_type" : "type-131",
+   "self_type" : "type-132",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15467,8 +15521,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::base::V1_0::IBase *",
    "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-171",
-   "self_type" : "type-364",
+   "referenced_type" : "type-174",
+   "self_type" : "type-361",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15476,8 +15530,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-295",
-   "self_type" : "type-372",
+   "referenced_type" : "type-292",
+   "self_type" : "type-369",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15486,7 +15540,7 @@
    "linker_set_key" : "android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "referenced_type" : "type-694",
-   "self_type" : "type-698",
+   "self_type" : "type-701",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15503,8 +15557,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::GraphicBuffer> *",
    "name" : "android::sp<android::GraphicBuffer> *",
-   "referenced_type" : "type-679",
-   "self_type" : "type-681",
+   "referenced_type" : "type-678",
+   "self_type" : "type-682",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15512,8 +15566,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
-   "referenced_type" : "type-355",
-   "self_type" : "type-376",
+   "referenced_type" : "type-352",
+   "self_type" : "type-373",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15521,8 +15575,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
-   "referenced_type" : "type-484",
-   "self_type" : "type-488",
+   "referenced_type" : "type-481",
+   "self_type" : "type-486",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15530,8 +15584,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
-   "referenced_type" : "type-338",
-   "self_type" : "type-384",
+   "referenced_type" : "type-335",
+   "self_type" : "type-381",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15539,8 +15593,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
-   "referenced_type" : "type-86",
-   "self_type" : "type-90",
+   "referenced_type" : "type-88",
+   "self_type" : "type-92",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15548,8 +15602,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
-   "referenced_type" : "type-497",
-   "self_type" : "type-502",
+   "referenced_type" : "type-494",
+   "self_type" : "type-499",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15557,8 +15611,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "referenced_type" : "type-371",
-   "self_type" : "type-373",
+   "referenced_type" : "type-368",
+   "self_type" : "type-370",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15575,8 +15629,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ui::Transform *",
    "name" : "android::ui::Transform *",
-   "referenced_type" : "type-2283",
-   "self_type" : "type-2285",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2288",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -15584,8 +15638,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ui::Transform::mat33 *",
    "name" : "android::ui::Transform::mat33 *",
-   "referenced_type" : "type-2284",
-   "self_type" : "type-2297",
+   "referenced_type" : "type-2287",
+   "self_type" : "type-2299",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -15602,8 +15656,8 @@
    "alignment" : 4,
    "linker_set_key" : "android_native_base_t *",
    "name" : "android_native_base_t *",
-   "referenced_type" : "type-518",
-   "self_type" : "type-522",
+   "referenced_type" : "type-516",
+   "self_type" : "type-520",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -15611,8 +15665,8 @@
    "alignment" : 4,
    "linker_set_key" : "android_ycbcr *",
    "name" : "android_ycbcr *",
-   "referenced_type" : "type-348",
-   "self_type" : "type-347",
+   "referenced_type" : "type-345",
+   "self_type" : "type-344",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15620,8 +15674,8 @@
    "alignment" : 4,
    "linker_set_key" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
    "name" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
-   "referenced_type" : "type-271",
-   "self_type" : "type-274",
+   "referenced_type" : "type-267",
+   "self_type" : "type-270",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -15630,7 +15684,7 @@
    "linker_set_key" : "bool *",
    "name" : "bool *",
    "referenced_type" : "type-6",
-   "self_type" : "type-350",
+   "self_type" : "type-347",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15638,8 +15692,8 @@
    "alignment" : 4,
    "linker_set_key" : "char *",
    "name" : "char *",
-   "referenced_type" : "type-288",
-   "self_type" : "type-576",
+   "referenced_type" : "type-285",
+   "self_type" : "type-573",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -15647,8 +15701,8 @@
    "alignment" : 4,
    "linker_set_key" : "const AHardwareBuffer *",
    "name" : "const AHardwareBuffer *",
-   "referenced_type" : "type-1882",
-   "self_type" : "type-1884",
+   "referenced_type" : "type-1884",
+   "self_type" : "type-1886",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -15656,8 +15710,8 @@
    "alignment" : 4,
    "linker_set_key" : "const AHardwareBuffer *",
    "name" : "const AHardwareBuffer *",
-   "referenced_type" : "type-3038",
-   "self_type" : "type-3040",
+   "referenced_type" : "type-3041",
+   "self_type" : "type-3043",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -15674,7 +15728,7 @@
    "alignment" : 4,
    "linker_set_key" : "const ANativeWindowBuffer *",
    "name" : "const ANativeWindowBuffer *",
-   "referenced_type" : "type-637",
+   "referenced_type" : "type-638",
    "self_type" : "type-639",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
@@ -15683,8 +15737,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
    "name" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
-   "referenced_type" : "type-535",
-   "self_type" : "type-536",
+   "referenced_type" : "type-532",
+   "self_type" : "type-533",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
   },
@@ -15719,8 +15773,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime *",
    "name" : "const android::FenceTime *",
-   "referenced_type" : "type-1395",
-   "self_type" : "type-1396",
+   "referenced_type" : "type-1399",
+   "self_type" : "type-1400",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -15728,8 +15782,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot *",
    "name" : "const android::FenceTime::Snapshot *",
-   "referenced_type" : "type-1388",
-   "self_type" : "type-1389",
+   "referenced_type" : "type-1393",
+   "self_type" : "type-1394",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -15746,8 +15800,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FrameStats *",
    "name" : "const android::FrameStats *",
-   "referenced_type" : "type-1428",
-   "self_type" : "type-1429",
+   "referenced_type" : "type-1432",
+   "self_type" : "type-1433",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
@@ -15755,8 +15809,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Gralloc2Allocator *",
    "name" : "const android::Gralloc2Allocator *",
-   "referenced_type" : "type-361",
-   "self_type" : "type-362",
+   "referenced_type" : "type-358",
+   "self_type" : "type-359",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15764,8 +15818,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Gralloc2Mapper *",
    "name" : "const android::Gralloc2Mapper *",
-   "referenced_type" : "type-344",
-   "self_type" : "type-345",
+   "referenced_type" : "type-341",
+   "self_type" : "type-342",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15773,8 +15827,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-624",
-   "self_type" : "type-623",
+   "referenced_type" : "type-625",
+   "self_type" : "type-624",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -15782,8 +15836,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBufferAllocator *",
    "name" : "const android::GraphicBufferAllocator *",
-   "referenced_type" : "type-720",
-   "self_type" : "type-721",
+   "referenced_type" : "type-721",
+   "self_type" : "type-722",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -15791,8 +15845,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBufferMapper *",
    "name" : "const android::GraphicBufferMapper *",
-   "referenced_type" : "type-614",
-   "self_type" : "type-615",
+   "referenced_type" : "type-615",
+   "self_type" : "type-616",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -15800,8 +15854,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::HdrCapabilities *",
    "name" : "const android::HdrCapabilities *",
-   "referenced_type" : "type-972",
-   "self_type" : "type-973",
+   "referenced_type" : "type-973",
+   "self_type" : "type-974",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -15809,8 +15863,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
-   "referenced_type" : "type-717",
-   "self_type" : "type-718",
+   "referenced_type" : "type-718",
+   "self_type" : "type-719",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -15818,8 +15872,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect> *",
    "name" : "const android::LightFlattenablePod<android::Rect> *",
-   "referenced_type" : "type-2231",
-   "self_type" : "type-2232",
+   "referenced_type" : "type-2234",
+   "self_type" : "type-2235",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15872,8 +15926,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Region *",
    "name" : "const android::Region *",
-   "referenced_type" : "type-2220",
-   "self_type" : "type-2226",
+   "referenced_type" : "type-2223",
+   "self_type" : "type-2229",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -15890,8 +15944,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 *",
    "name" : "const android::String16 *",
-   "referenced_type" : "type-184",
-   "self_type" : "type-186",
+   "referenced_type" : "type-187",
+   "self_type" : "type-188",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -15899,8 +15953,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 *",
    "name" : "const android::String8 *",
-   "referenced_type" : "type-873",
-   "self_type" : "type-878",
+   "referenced_type" : "type-863",
+   "self_type" : "type-874",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -15908,8 +15962,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::Rect> *",
    "name" : "const android::Vector<android::Rect> *",
-   "referenced_type" : "type-2215",
-   "self_type" : "type-2219",
+   "referenced_type" : "type-2218",
+   "self_type" : "type-2222",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -15917,8 +15971,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<long long> *",
    "name" : "const android::Vector<long long> *",
-   "referenced_type" : "type-1425",
-   "self_type" : "type-1426",
+   "referenced_type" : "type-1429",
+   "self_type" : "type-1430",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -15926,8 +15980,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::VectorImpl *",
    "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-1422",
-   "self_type" : "type-1423",
+   "referenced_type" : "type-1426",
+   "self_type" : "type-1427",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -15944,7 +15998,7 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TMat33<float> *",
    "name" : "const android::details::TMat33<float> *",
-   "referenced_type" : "type-925",
+   "referenced_type" : "type-919",
    "self_type" : "type-976",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
@@ -15972,7 +16026,7 @@
    "linker_set_key" : "const android::details::TVec3<float> *",
    "name" : "const android::details::TVec3<float> *",
    "referenced_type" : "type-1055",
-   "self_type" : "type-1418",
+   "self_type" : "type-1419",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
   },
@@ -15980,8 +16034,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::half *",
    "name" : "const android::half *",
-   "referenced_type" : "type-42",
-   "self_type" : "type-130",
+   "referenced_type" : "type-44",
+   "self_type" : "type-127",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -16007,8 +16061,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::BpHwRefBase *",
    "name" : "const android::hardware::BpHwRefBase *",
-   "referenced_type" : "type-211",
-   "self_type" : "type-212",
+   "referenced_type" : "type-213",
+   "self_type" : "type-214",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -16016,8 +16070,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
-   "referenced_type" : "type-109",
-   "self_type" : "type-110",
+   "referenced_type" : "type-111",
+   "self_type" : "type-112",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16025,8 +16079,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
-   "referenced_type" : "type-401",
-   "self_type" : "type-402",
+   "referenced_type" : "type-398",
+   "self_type" : "type-400",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16034,8 +16088,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
-   "referenced_type" : "type-115",
-   "self_type" : "type-116",
+   "referenced_type" : "type-117",
+   "self_type" : "type-118",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16061,8 +16115,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle> *",
-   "referenced_type" : "type-293",
-   "self_type" : "type-297",
+   "referenced_type" : "type-290",
+   "self_type" : "type-294",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16070,8 +16124,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned int> *",
    "name" : "const android::hardware::details::hidl_pointer<unsigned int> *",
-   "referenced_type" : "type-190",
-   "self_type" : "type-214",
+   "referenced_type" : "type-203",
+   "self_type" : "type-216",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16088,8 +16142,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1744",
-   "self_type" : "type-1746",
+   "referenced_type" : "type-1745",
+   "self_type" : "type-1747",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16097,8 +16151,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2713",
-   "self_type" : "type-2715",
+   "referenced_type" : "type-2715",
+   "self_type" : "type-2717",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16106,8 +16160,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2879",
-   "self_type" : "type-2882",
+   "referenced_type" : "type-2882",
+   "self_type" : "type-2884",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16115,8 +16169,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-381",
-   "self_type" : "type-383",
+   "referenced_type" : "type-378",
+   "self_type" : "type-380",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16124,8 +16178,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-1827",
-   "self_type" : "type-1829",
+   "referenced_type" : "type-1828",
+   "self_type" : "type-1830",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16133,8 +16187,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-2972",
-   "self_type" : "type-2974",
+   "referenced_type" : "type-2974",
+   "self_type" : "type-2976",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16142,8 +16196,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-494",
-   "self_type" : "type-496",
+   "referenced_type" : "type-491",
+   "self_type" : "type-493",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16151,8 +16205,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::BufferUsage *",
    "name" : "const android::hardware::graphics::common::V1_0::BufferUsage *",
-   "referenced_type" : "type-153",
-   "self_type" : "type-152",
+   "referenced_type" : "type-156",
+   "self_type" : "type-155",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16160,8 +16214,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::BufferUsage *",
    "name" : "const android::hardware::graphics::common::V1_1::BufferUsage *",
-   "referenced_type" : "type-160",
-   "self_type" : "type-159",
+   "referenced_type" : "type-162",
+   "self_type" : "type-161",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16169,8 +16223,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::BufferUsage *",
    "name" : "const android::hardware::graphics::common::V1_2::BufferUsage *",
-   "referenced_type" : "type-422",
-   "self_type" : "type-421",
+   "referenced_type" : "type-419",
+   "self_type" : "type-418",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16178,8 +16232,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1584",
-   "self_type" : "type-1583",
+   "referenced_type" : "type-1588",
+   "self_type" : "type-1587",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16187,8 +16241,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2553",
-   "self_type" : "type-2552",
+   "referenced_type" : "type-2558",
+   "self_type" : "type-2557",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16196,8 +16250,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2825",
-   "self_type" : "type-2824",
+   "referenced_type" : "type-2827",
+   "self_type" : "type-2826",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16205,8 +16259,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-84",
-   "self_type" : "type-83",
+   "referenced_type" : "type-86",
+   "self_type" : "type-85",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16214,8 +16268,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1594",
-   "self_type" : "type-1596",
+   "referenced_type" : "type-1598",
+   "self_type" : "type-1600",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16223,8 +16277,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2563",
-   "self_type" : "type-2565",
+   "referenced_type" : "type-2568",
+   "self_type" : "type-2570",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16232,8 +16286,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2829",
-   "self_type" : "type-2831",
+   "referenced_type" : "type-2831",
+   "self_type" : "type-2833",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16241,8 +16295,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-96",
-   "self_type" : "type-98",
+   "referenced_type" : "type-98",
+   "self_type" : "type-100",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16250,8 +16304,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-1753",
-   "self_type" : "type-1752",
+   "referenced_type" : "type-1754",
+   "self_type" : "type-1753",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16259,8 +16313,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-2887",
-   "self_type" : "type-2886",
+   "referenced_type" : "type-2889",
+   "self_type" : "type-2888",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16268,8 +16322,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-391",
-   "self_type" : "type-390",
+   "referenced_type" : "type-388",
+   "self_type" : "type-387",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16286,8 +16340,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void> *",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void> *",
-   "referenced_type" : "type-154",
-   "self_type" : "type-156",
+   "referenced_type" : "type-157",
+   "self_type" : "type-158",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16295,8 +16349,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void> *",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void> *",
-   "referenced_type" : "type-161",
-   "self_type" : "type-162",
+   "referenced_type" : "type-163",
+   "self_type" : "type-165",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16304,8 +16358,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void> *",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void> *",
-   "referenced_type" : "type-423",
-   "self_type" : "type-424",
+   "referenced_type" : "type-420",
+   "self_type" : "type-421",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16322,8 +16376,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_handle> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_handle> *",
-   "referenced_type" : "type-146",
-   "self_type" : "type-147",
+   "referenced_type" : "type-149",
+   "self_type" : "type-150",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16331,8 +16385,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned int> *",
    "name" : "const android::hardware::hidl_vec<unsigned int> *",
-   "referenced_type" : "type-132",
-   "self_type" : "type-134",
+   "referenced_type" : "type-134",
+   "self_type" : "type-136",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16349,8 +16403,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
    "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-170",
-   "self_type" : "type-176",
+   "referenced_type" : "type-173",
+   "self_type" : "type-179",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
@@ -16358,8 +16412,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-294",
-   "self_type" : "type-296",
+   "referenced_type" : "type-291",
+   "self_type" : "type-293",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
@@ -16368,7 +16422,7 @@
    "linker_set_key" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "referenced_type" : "type-693",
-   "self_type" : "type-699",
+   "self_type" : "type-702",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16385,8 +16439,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
    "name" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
-   "referenced_type" : "type-379",
-   "self_type" : "type-380",
+   "referenced_type" : "type-376",
+   "self_type" : "type-377",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16394,8 +16448,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
    "name" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
-   "referenced_type" : "type-492",
-   "self_type" : "type-493",
+   "referenced_type" : "type-489",
+   "self_type" : "type-490",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16403,8 +16457,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
-   "referenced_type" : "type-387",
-   "self_type" : "type-388",
+   "referenced_type" : "type-384",
+   "self_type" : "type-385",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16412,8 +16466,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
-   "referenced_type" : "type-91",
-   "self_type" : "type-95",
+   "referenced_type" : "type-93",
+   "self_type" : "type-97",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16421,8 +16475,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
    "name" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
-   "referenced_type" : "type-505",
-   "self_type" : "type-506",
+   "referenced_type" : "type-502",
+   "self_type" : "type-503",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16439,8 +16493,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::base::V1_0::IBase> *",
    "name" : "const android::sp<android::hidl::base::V1_0::IBase> *",
-   "referenced_type" : "type-365",
-   "self_type" : "type-366",
+   "referenced_type" : "type-362",
+   "self_type" : "type-363",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16448,8 +16502,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "referenced_type" : "type-374",
-   "self_type" : "type-375",
+   "referenced_type" : "type-371",
+   "self_type" : "type-372",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16466,8 +16520,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ui::Transform *",
    "name" : "const android::ui::Transform *",
-   "referenced_type" : "type-2286",
-   "self_type" : "type-2291",
+   "referenced_type" : "type-2289",
+   "self_type" : "type-2293",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -16475,8 +16529,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ui::Transform::mat33 *",
    "name" : "const android::ui::Transform::mat33 *",
-   "referenced_type" : "type-2295",
-   "self_type" : "type-2296",
+   "referenced_type" : "type-2297",
+   "self_type" : "type-2298",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -16484,8 +16538,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-287",
-   "self_type" : "type-286",
+   "referenced_type" : "type-284",
+   "self_type" : "type-283",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -16493,8 +16547,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-181",
-   "self_type" : "type-180",
+   "referenced_type" : "type-184",
+   "self_type" : "type-183",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -16502,8 +16556,8 @@
    "alignment" : 4,
    "linker_set_key" : "const gralloc_module_t *",
    "name" : "const gralloc_module_t *",
-   "referenced_type" : "type-582",
-   "self_type" : "type-581",
+   "referenced_type" : "type-580",
+   "self_type" : "type-579",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -16511,8 +16565,8 @@
    "alignment" : 4,
    "linker_set_key" : "const hw_module_t *",
    "name" : "const hw_module_t *",
-   "referenced_type" : "type-555",
-   "self_type" : "type-554",
+   "referenced_type" : "type-552",
+   "self_type" : "type-551",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -16520,7 +16574,7 @@
    "alignment" : 4,
    "linker_set_key" : "const int *",
    "name" : "const int *",
-   "referenced_type" : "type-562",
+   "referenced_type" : "type-559",
    "self_type" : "type-1348",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
@@ -16539,7 +16593,7 @@
    "linker_set_key" : "const long long *",
    "name" : "const long long *",
    "referenced_type" : "type-847",
-   "self_type" : "type-1415",
+   "self_type" : "type-1420",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16547,8 +16601,8 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle *",
    "name" : "const native_handle *",
-   "referenced_type" : "type-143",
-   "self_type" : "type-142",
+   "referenced_type" : "type-146",
+   "self_type" : "type-145",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16556,8 +16610,8 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle **",
    "name" : "const native_handle **",
-   "referenced_type" : "type-142",
-   "self_type" : "type-346",
+   "referenced_type" : "type-145",
+   "self_type" : "type-343",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -16565,8 +16619,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned char *",
    "name" : "const unsigned char *",
-   "referenced_type" : "type-224",
-   "self_type" : "type-223",
+   "referenced_type" : "type-226",
+   "self_type" : "type-225",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16574,7 +16628,7 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned int *",
    "name" : "const unsigned int *",
-   "referenced_type" : "type-236",
+   "referenced_type" : "type-238",
    "self_type" : "type-1104",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -16583,8 +16637,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long *",
    "name" : "const unsigned long long *",
-   "referenced_type" : "type-226",
-   "self_type" : "type-225",
+   "referenced_type" : "type-228",
+   "self_type" : "type-227",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16601,8 +16655,8 @@
    "alignment" : 4,
    "linker_set_key" : "framebuffer_device_t *",
    "name" : "framebuffer_device_t *",
-   "referenced_type" : "type-546",
-   "self_type" : "type-567",
+   "referenced_type" : "type-543",
+   "self_type" : "type-564",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16610,8 +16664,8 @@
    "alignment" : 4,
    "linker_set_key" : "hw_device_t *",
    "name" : "hw_device_t *",
-   "referenced_type" : "type-547",
-   "self_type" : "type-557",
+   "referenced_type" : "type-544",
+   "self_type" : "type-554",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -16619,8 +16673,8 @@
    "alignment" : 4,
    "linker_set_key" : "hw_device_t **",
    "name" : "hw_device_t **",
-   "referenced_type" : "type-557",
-   "self_type" : "type-556",
+   "referenced_type" : "type-554",
+   "self_type" : "type-553",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -16628,8 +16682,8 @@
    "alignment" : 4,
    "linker_set_key" : "hw_module_methods_t *",
    "name" : "hw_module_methods_t *",
-   "referenced_type" : "type-551",
-   "self_type" : "type-550",
+   "referenced_type" : "type-548",
+   "self_type" : "type-547",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -16637,8 +16691,8 @@
    "alignment" : 4,
    "linker_set_key" : "hw_module_t *",
    "name" : "hw_module_t *",
-   "referenced_type" : "type-549",
-   "self_type" : "type-548",
+   "referenced_type" : "type-546",
+   "self_type" : "type-545",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -16664,8 +16718,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *)",
    "name" : "int (*)(const gralloc_module_t *, const native_handle *)",
-   "referenced_type" : "type-580",
-   "self_type" : "type-579",
+   "referenced_type" : "type-578",
+   "self_type" : "type-577",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -16673,42 +16727,6 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int *)",
    "name" : "int (*)(const gralloc_module_t *, const native_handle *, int *)",
-   "referenced_type" : "type-592",
-   "self_type" : "type-591",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "referenced_type" : "type-588",
-   "self_type" : "type-587",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "referenced_type" : "type-595",
-   "self_type" : "type-594",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "referenced_type" : "type-584",
-   "self_type" : "type-583",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
    "referenced_type" : "type-590",
    "self_type" : "type-589",
    "size" : 4,
@@ -16716,8 +16734,8 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, int, ...)",
-   "name" : "int (*)(const gralloc_module_t *, int, ...)",
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
    "referenced_type" : "type-586",
    "self_type" : "type-585",
    "size" : 4,
@@ -16725,10 +16743,64 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
+   "referenced_type" : "type-593",
+   "self_type" : "type-592",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
+   "referenced_type" : "type-582",
+   "self_type" : "type-581",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
+   "referenced_type" : "type-588",
+   "self_type" : "type-587",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "referenced_type" : "type-595",
+   "self_type" : "type-594",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "referenced_type" : "type-597",
+   "self_type" : "type-596",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, int, ...)",
+   "name" : "int (*)(const gralloc_module_t *, int, ...)",
+   "referenced_type" : "type-584",
+   "self_type" : "type-583",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "int (*)(const hw_module_t *, const char *, hw_device_t **)",
    "name" : "int (*)(const hw_module_t *, const char *, hw_device_t **)",
-   "referenced_type" : "type-553",
-   "self_type" : "type-552",
+   "referenced_type" : "type-550",
+   "self_type" : "type-549",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -16736,8 +16808,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(framebuffer_device_t *)",
    "name" : "int (*)(framebuffer_device_t *)",
-   "referenced_type" : "type-573",
-   "self_type" : "type-572",
+   "referenced_type" : "type-570",
+   "self_type" : "type-569",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16745,8 +16817,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(framebuffer_device_t *, const native_handle *)",
    "name" : "int (*)(framebuffer_device_t *, const native_handle *)",
-   "referenced_type" : "type-571",
-   "self_type" : "type-570",
+   "referenced_type" : "type-568",
+   "self_type" : "type-567",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16754,8 +16826,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(framebuffer_device_t *, int)",
    "name" : "int (*)(framebuffer_device_t *, int)",
-   "referenced_type" : "type-566",
-   "self_type" : "type-565",
+   "referenced_type" : "type-563",
+   "self_type" : "type-562",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16763,8 +16835,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(framebuffer_device_t *, int, int, int, int)",
    "name" : "int (*)(framebuffer_device_t *, int, int, int, int)",
-   "referenced_type" : "type-569",
-   "self_type" : "type-568",
+   "referenced_type" : "type-566",
+   "self_type" : "type-565",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16772,8 +16844,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(hw_device_t *)",
    "name" : "int (*)(hw_device_t *)",
-   "referenced_type" : "type-561",
-   "self_type" : "type-560",
+   "referenced_type" : "type-558",
+   "self_type" : "type-557",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -16781,8 +16853,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
-   "referenced_type" : "type-249",
-   "self_type" : "type-250",
+   "referenced_type" : "type-251",
+   "self_type" : "type-252",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
@@ -16790,8 +16862,8 @@
    "alignment" : 4,
    "linker_set_key" : "int *",
    "name" : "int *",
-   "referenced_type" : "type-103",
-   "self_type" : "type-593",
+   "referenced_type" : "type-105",
+   "self_type" : "type-591",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
@@ -16808,8 +16880,8 @@
    "alignment" : 4,
    "linker_set_key" : "long long *",
    "name" : "long long *",
-   "referenced_type" : "type-284",
-   "self_type" : "type-1432",
+   "referenced_type" : "type-12",
+   "self_type" : "type-11",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16817,7 +16889,7 @@
    "alignment" : 4,
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
-   "referenced_type" : "type-144",
+   "referenced_type" : "type-147",
    "self_type" : "type-1132",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
@@ -16826,8 +16898,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned char *",
    "name" : "unsigned char *",
-   "referenced_type" : "type-218",
-   "self_type" : "type-217",
+   "referenced_type" : "type-220",
+   "self_type" : "type-219",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -16835,8 +16907,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
-   "referenced_type" : "type-123",
-   "self_type" : "type-122",
+   "referenced_type" : "type-125",
+   "self_type" : "type-124",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16844,8 +16916,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned long long *",
    "name" : "unsigned long long *",
-   "referenced_type" : "type-124",
-   "self_type" : "type-219",
+   "referenced_type" : "type-126",
+   "self_type" : "type-221",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16862,8 +16934,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
    "name" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
-   "referenced_type" : "type-221",
-   "self_type" : "type-220",
+   "referenced_type" : "type-223",
+   "self_type" : "type-222",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16871,8 +16943,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(android_native_base_t *)",
    "name" : "void (*)(android_native_base_t *)",
-   "referenced_type" : "type-521",
-   "self_type" : "type-520",
+   "referenced_type" : "type-519",
+   "self_type" : "type-518",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -16880,8 +16952,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(framebuffer_device_t *, char *, int)",
    "name" : "void (*)(framebuffer_device_t *, char *, int)",
-   "referenced_type" : "type-575",
-   "self_type" : "type-574",
+   "referenced_type" : "type-572",
+   "self_type" : "type-571",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16889,8 +16961,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *",
    "name" : "void *",
-   "referenced_type" : "type-151",
-   "self_type" : "type-227",
+   "referenced_type" : "type-154",
+   "self_type" : "type-229",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -16898,8 +16970,8 @@
    "alignment" : 4,
    "linker_set_key" : "void **",
    "name" : "void **",
-   "referenced_type" : "type-227",
-   "self_type" : "type-251",
+   "referenced_type" : "type-229",
+   "self_type" : "type-253",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   }
@@ -16911,8 +16983,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-117",
-   "self_type" : "type-119",
+   "referenced_type" : "type-119",
+   "self_type" : "type-121",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16941,8 +17013,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-13",
-   "self_type" : "type-15",
+   "referenced_type" : "type-1576",
+   "self_type" : "type-1579",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16951,8 +17023,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1572",
-   "self_type" : "type-1574",
+   "referenced_type" : "type-15",
+   "self_type" : "type-37",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16961,8 +17033,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1607",
-   "self_type" : "type-1609",
+   "referenced_type" : "type-1611",
+   "self_type" : "type-1613",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16971,8 +17043,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-174",
-   "self_type" : "type-173",
+   "referenced_type" : "type-1765",
+   "self_type" : "type-1767",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16981,8 +17053,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1764",
-   "self_type" : "type-1766",
+   "referenced_type" : "type-177",
+   "self_type" : "type-176",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16991,8 +17063,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1838",
-   "self_type" : "type-1840",
+   "referenced_type" : "type-1839",
+   "self_type" : "type-1841",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17001,8 +17073,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1963",
-   "self_type" : "type-1965",
+   "referenced_type" : "type-1965",
+   "self_type" : "type-1967",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17011,8 +17083,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2038",
-   "self_type" : "type-2040",
+   "referenced_type" : "type-2041",
+   "self_type" : "type-2043",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17021,8 +17093,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2091",
-   "self_type" : "type-2093",
+   "referenced_type" : "type-2093",
+   "self_type" : "type-2095",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17031,8 +17103,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2153",
-   "self_type" : "type-2155",
+   "referenced_type" : "type-2155",
+   "self_type" : "type-2157",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17041,8 +17113,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2307",
-   "self_type" : "type-2306",
+   "referenced_type" : "type-2309",
+   "self_type" : "type-2308",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17051,8 +17123,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2473",
-   "self_type" : "type-2475",
+   "referenced_type" : "type-2475",
+   "self_type" : "type-2477",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17061,8 +17133,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2499",
-   "self_type" : "type-2501",
+   "referenced_type" : "type-2501",
+   "self_type" : "type-2503",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17071,8 +17143,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2541",
-   "self_type" : "type-2543",
+   "referenced_type" : "type-2546",
+   "self_type" : "type-2549",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17081,8 +17153,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2576",
-   "self_type" : "type-2578",
+   "referenced_type" : "type-2581",
+   "self_type" : "type-2583",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17091,8 +17163,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2751",
-   "self_type" : "type-2753",
+   "referenced_type" : "type-2753",
+   "self_type" : "type-2755",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17101,8 +17173,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2798",
-   "self_type" : "type-2800",
+   "referenced_type" : "type-2800",
+   "self_type" : "type-2802",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17111,8 +17183,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2803",
-   "self_type" : "type-2805",
+   "referenced_type" : "type-2805",
+   "self_type" : "type-2807",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17121,8 +17193,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2813",
-   "self_type" : "type-2815",
+   "referenced_type" : "type-2815",
+   "self_type" : "type-2817",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17131,8 +17203,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2832",
-   "self_type" : "type-2834",
+   "referenced_type" : "type-2834",
+   "self_type" : "type-2836",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17141,8 +17213,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2898",
-   "self_type" : "type-2900",
+   "referenced_type" : "type-2900",
+   "self_type" : "type-2902",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17151,8 +17223,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2983",
-   "self_type" : "type-2985",
+   "referenced_type" : "type-2985",
+   "self_type" : "type-2987",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17161,8 +17233,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3135",
-   "self_type" : "type-3137",
+   "referenced_type" : "type-3139",
+   "self_type" : "type-3141",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17171,8 +17243,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3213",
-   "self_type" : "type-3215",
+   "referenced_type" : "type-3216",
+   "self_type" : "type-3218",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17181,8 +17253,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3255",
-   "self_type" : "type-3257",
+   "referenced_type" : "type-3258",
+   "self_type" : "type-3260",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17191,8 +17263,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3306",
-   "self_type" : "type-3308",
+   "referenced_type" : "type-3309",
+   "self_type" : "type-3311",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17201,8 +17273,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3404",
-   "self_type" : "type-3403",
+   "referenced_type" : "type-3407",
+   "self_type" : "type-3406",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17211,8 +17283,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3570",
-   "self_type" : "type-3572",
+   "referenced_type" : "type-3573",
+   "self_type" : "type-3575",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17221,8 +17293,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3596",
-   "self_type" : "type-3598",
+   "referenced_type" : "type-3599",
+   "self_type" : "type-3601",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17231,8 +17303,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-407",
-   "self_type" : "type-409",
+   "referenced_type" : "type-404",
+   "self_type" : "type-406",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17241,8 +17313,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-513",
-   "self_type" : "type-515",
+   "referenced_type" : "type-510",
+   "self_type" : "type-512",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17251,8 +17323,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-743",
-   "self_type" : "type-745",
+   "referenced_type" : "type-744",
+   "self_type" : "type-746",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17261,8 +17333,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-850",
-   "self_type" : "type-852",
+   "referenced_type" : "type-851",
+   "self_type" : "type-853",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17291,8 +17363,8 @@
    "is_const" : true,
    "linker_set_key" : "android::hardware::IBinder *const",
    "name" : "android::hardware::IBinder *const",
-   "referenced_type" : "type-195",
-   "self_type" : "type-194",
+   "referenced_type" : "type-208",
+   "self_type" : "type-207",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -17308,24 +17380,24 @@
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-2205",
-   "self_type" : "type-2204",
+   "referenced_type" : "type-2207",
+   "self_type" : "type-2206",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-2250",
-   "self_type" : "type-2249",
+   "referenced_type" : "type-2253",
+   "self_type" : "type-2252",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-2741",
-   "self_type" : "type-2740",
+   "referenced_type" : "type-2743",
+   "self_type" : "type-2742",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
@@ -17340,24 +17412,24 @@
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-3369",
-   "self_type" : "type-3368",
+   "referenced_type" : "type-3372",
+   "self_type" : "type-3371",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const AHardwareBuffer",
    "name" : "const AHardwareBuffer",
-   "referenced_type" : "type-1883",
-   "self_type" : "type-1882",
+   "referenced_type" : "type-1885",
+   "self_type" : "type-1884",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const AHardwareBuffer",
    "name" : "const AHardwareBuffer",
-   "referenced_type" : "type-3039",
-   "self_type" : "type-3038",
+   "referenced_type" : "type-3042",
+   "self_type" : "type-3041",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -17373,8 +17445,8 @@
    "is_const" : true,
    "linker_set_key" : "const ANativeWindowBuffer",
    "name" : "const ANativeWindowBuffer",
-   "referenced_type" : "type-517",
-   "self_type" : "type-637",
+   "referenced_type" : "type-515",
+   "self_type" : "type-638",
    "size" : 96,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -17382,48 +17454,48 @@
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-2140",
-   "self_type" : "type-2139",
+   "referenced_type" : "type-2139",
+   "self_type" : "type-2138",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-2274",
-   "self_type" : "type-2273",
+   "referenced_type" : "type-2276",
+   "self_type" : "type-2275",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-2732",
-   "self_type" : "type-2731",
+   "referenced_type" : "type-2734",
+   "self_type" : "type-2733",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-3016",
-   "self_type" : "type-3015",
+   "referenced_type" : "type-3015",
+   "self_type" : "type-3014",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-3379",
-   "self_type" : "type-3378",
+   "referenced_type" : "type-3382",
+   "self_type" : "type-3381",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-962",
-   "self_type" : "type-961",
+   "referenced_type" : "type-959",
+   "self_type" : "type-958",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
@@ -17431,8 +17503,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
    "name" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
-   "referenced_type" : "type-516",
-   "self_type" : "type-535",
+   "referenced_type" : "type-514",
+   "self_type" : "type-532",
    "size" : 104,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
   },
@@ -17452,7 +17524,7 @@
    "linker_set_key" : "const android::ColorSpace::TransferParameters",
    "name" : "const android::ColorSpace::TransferParameters",
    "referenced_type" : "type-981",
-   "self_type" : "type-1033",
+   "self_type" : "type-1030",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -17481,8 +17553,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime",
    "name" : "const android::FenceTime",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1395",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1399",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -17491,8 +17563,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot",
    "name" : "const android::FenceTime::Snapshot",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1388",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1393",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -17501,8 +17573,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot::State",
    "name" : "const android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1406",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1410",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17511,8 +17583,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::State",
    "name" : "const android::FenceTime::State",
-   "referenced_type" : "type-1378",
-   "self_type" : "type-1377",
+   "referenced_type" : "type-1383",
+   "self_type" : "type-1382",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -17531,8 +17603,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FrameStats",
    "name" : "const android::FrameStats",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1428",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1432",
    "size" : 72,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
@@ -17541,8 +17613,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Gralloc2Allocator",
    "name" : "const android::Gralloc2Allocator",
-   "referenced_type" : "type-353",
-   "self_type" : "type-361",
+   "referenced_type" : "type-350",
+   "self_type" : "type-358",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -17551,8 +17623,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Gralloc2Mapper",
    "name" : "const android::Gralloc2Mapper",
-   "referenced_type" : "type-337",
-   "self_type" : "type-344",
+   "referenced_type" : "type-334",
+   "self_type" : "type-341",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -17561,8 +17633,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-1876",
-   "self_type" : "type-1875",
+   "referenced_type" : "type-1878",
+   "self_type" : "type-1877",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -17571,8 +17643,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-2010",
-   "self_type" : "type-2009",
+   "referenced_type" : "type-2013",
+   "self_type" : "type-2012",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -17581,8 +17653,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-2016",
-   "self_type" : "type-2015",
+   "referenced_type" : "type-2019",
+   "self_type" : "type-2018",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -17591,18 +17663,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-3029",
-   "self_type" : "type-3028",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::GrallocMapper",
-   "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-3195",
-   "self_type" : "type-3194",
+   "referenced_type" : "type-3032",
+   "self_type" : "type-3031",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -17621,6 +17683,16 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
+   "referenced_type" : "type-3202",
+   "self_type" : "type-3201",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GrallocMapper",
+   "name" : "const android::GrallocMapper",
    "referenced_type" : "type-613",
    "self_type" : "type-612",
    "size" : 4,
@@ -17631,8 +17703,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-803",
-   "self_type" : "type-802",
+   "referenced_type" : "type-804",
+   "self_type" : "type-803",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -17641,8 +17713,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-828",
-   "self_type" : "type-827",
+   "referenced_type" : "type-829",
+   "self_type" : "type-828",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -17651,8 +17723,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-525",
-   "self_type" : "type-624",
+   "referenced_type" : "type-523",
+   "self_type" : "type-625",
    "size" : 160,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -17661,8 +17733,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferAllocator",
    "name" : "const android::GraphicBufferAllocator",
-   "referenced_type" : "type-542",
-   "self_type" : "type-720",
+   "referenced_type" : "type-539",
+   "self_type" : "type-721",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -17671,7 +17743,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferAllocator::alloc_rec_t",
    "name" : "const android::GraphicBufferAllocator::alloc_rec_t",
-   "referenced_type" : "type-676",
+   "referenced_type" : "type-680",
    "self_type" : "type-706",
    "size" : 48,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -17681,8 +17753,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferMapper",
    "name" : "const android::GraphicBufferMapper",
-   "referenced_type" : "type-527",
-   "self_type" : "type-614",
+   "referenced_type" : "type-525",
+   "self_type" : "type-615",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -17692,7 +17764,7 @@
    "linker_set_key" : "const android::HdrCapabilities",
    "name" : "const android::HdrCapabilities",
    "referenced_type" : "type-964",
-   "self_type" : "type-972",
+   "self_type" : "type-973",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -17701,8 +17773,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-715",
-   "self_type" : "type-717",
+   "referenced_type" : "type-716",
+   "self_type" : "type-718",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -17712,7 +17784,7 @@
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect>",
    "name" : "const android::LightFlattenablePod<android::Rect>",
    "referenced_type" : "type-1243",
-   "self_type" : "type-2231",
+   "self_type" : "type-2234",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17761,7 +17833,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
-   "referenced_type" : "type-172",
+   "referenced_type" : "type-175",
    "self_type" : "type-1078",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
@@ -17771,8 +17843,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Region",
    "name" : "const android::Region",
-   "referenced_type" : "type-2221",
-   "self_type" : "type-2220",
+   "referenced_type" : "type-2224",
+   "self_type" : "type-2223",
    "size" : 20,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -17791,8 +17863,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-179",
-   "self_type" : "type-184",
+   "referenced_type" : "type-182",
+   "self_type" : "type-187",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -17801,8 +17873,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
-   "referenced_type" : "type-285",
-   "self_type" : "type-873",
+   "referenced_type" : "type-282",
+   "self_type" : "type-863",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -17811,8 +17883,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<android::Rect>",
    "name" : "const android::Vector<android::Rect>",
-   "referenced_type" : "type-2213",
-   "self_type" : "type-2215",
+   "referenced_type" : "type-2216",
+   "self_type" : "type-2218",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17821,8 +17893,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<long long>",
    "name" : "const android::Vector<long long>",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1425",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1429",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17831,8 +17903,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
-   "referenced_type" : "type-235",
-   "self_type" : "type-1422",
+   "referenced_type" : "type-237",
+   "self_type" : "type-1426",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -17852,7 +17924,7 @@
    "linker_set_key" : "const android::details::TMat33<float>",
    "name" : "const android::details::TMat33<float>",
    "referenced_type" : "type-903",
-   "self_type" : "type-925",
+   "self_type" : "type-919",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -17861,8 +17933,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TMat44<float>",
    "name" : "const android::details::TMat44<float>",
-   "referenced_type" : "type-2276",
-   "self_type" : "type-2280",
+   "referenced_type" : "type-2278",
+   "self_type" : "type-2283",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -17871,8 +17943,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TQuaternion<double>",
    "name" : "const android::details::TQuaternion<double>",
-   "referenced_type" : "type-331",
-   "self_type" : "type-404",
+   "referenced_type" : "type-328",
+   "self_type" : "type-401",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -17881,8 +17953,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TQuaternion<float>",
    "name" : "const android::details::TQuaternion<float>",
-   "referenced_type" : "type-410",
-   "self_type" : "type-432",
+   "referenced_type" : "type-407",
+   "self_type" : "type-429",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -17901,7 +17973,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec2<double>",
    "name" : "const android::details::TVec2<double>",
-   "referenced_type" : "type-55",
+   "referenced_type" : "type-57",
    "self_type" : "type-1070",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -17911,7 +17983,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec2<float>",
    "name" : "const android::details::TVec2<float>",
-   "referenced_type" : "type-22",
+   "referenced_type" : "type-23",
    "self_type" : "type-1051",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -17921,7 +17993,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec3<double>",
    "name" : "const android::details::TVec3<double>",
-   "referenced_type" : "type-66",
+   "referenced_type" : "type-68",
    "self_type" : "type-1369",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
@@ -17931,7 +18003,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec3<float>",
    "name" : "const android::details::TVec3<float>",
-   "referenced_type" : "type-17",
+   "referenced_type" : "type-18",
    "self_type" : "type-1055",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -17941,8 +18013,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec4<double>",
    "name" : "const android::details::TVec4<double>",
-   "referenced_type" : "type-50",
-   "self_type" : "type-166",
+   "referenced_type" : "type-52",
+   "self_type" : "type-164",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -17951,8 +18023,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec4<float>",
    "name" : "const android::details::TVec4<float>",
-   "referenced_type" : "type-200",
-   "self_type" : "type-325",
+   "referenced_type" : "type-192",
+   "self_type" : "type-322",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -17962,7 +18034,7 @@
    "linker_set_key" : "const android::half",
    "name" : "const android::half",
    "referenced_type" : "type-1",
-   "self_type" : "type-42",
+   "self_type" : "type-44",
    "size" : 2,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -17991,8 +18063,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::BpHwRefBase",
    "name" : "const android::hardware::BpHwRefBase",
-   "referenced_type" : "type-193",
-   "self_type" : "type-211",
+   "referenced_type" : "type-206",
+   "self_type" : "type-213",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -18001,8 +18073,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-215",
-   "self_type" : "type-231",
+   "referenced_type" : "type-217",
+   "self_type" : "type-233",
    "size" : 68,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -18011,8 +18083,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
-   "referenced_type" : "type-99",
-   "self_type" : "type-109",
+   "referenced_type" : "type-101",
+   "self_type" : "type-111",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -18021,8 +18093,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
-   "referenced_type" : "type-393",
-   "self_type" : "type-401",
+   "referenced_type" : "type-392",
+   "self_type" : "type-398",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -18031,8 +18103,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
-   "referenced_type" : "type-111",
-   "self_type" : "type-115",
+   "referenced_type" : "type-113",
+   "self_type" : "type-117",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -18041,7 +18113,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Status",
    "name" : "const android::hardware::Status",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1310",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -18061,8 +18133,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
-   "referenced_type" : "type-136",
-   "self_type" : "type-293",
+   "referenced_type" : "type-139",
+   "self_type" : "type-290",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18071,8 +18143,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned int>",
    "name" : "const android::hardware::details::hidl_pointer<unsigned int>",
-   "referenced_type" : "type-120",
-   "self_type" : "type-190",
+   "referenced_type" : "type-122",
+   "self_type" : "type-203",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18081,7 +18153,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::return_status",
    "name" : "const android::hardware::details::return_status",
-   "referenced_type" : "type-101",
+   "referenced_type" : "type-103",
    "self_type" : "type-1319",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -18091,8 +18163,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
-   "referenced_type" : "type-1745",
-   "self_type" : "type-1744",
+   "referenced_type" : "type-1746",
+   "self_type" : "type-1745",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18101,8 +18173,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
-   "referenced_type" : "type-2714",
-   "self_type" : "type-2713",
+   "referenced_type" : "type-2716",
+   "self_type" : "type-2715",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18111,8 +18183,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
-   "referenced_type" : "type-2880",
-   "self_type" : "type-2879",
+   "referenced_type" : "type-2883",
+   "self_type" : "type-2882",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18121,8 +18193,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
-   "referenced_type" : "type-382",
-   "self_type" : "type-381",
+   "referenced_type" : "type-379",
+   "self_type" : "type-378",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18131,8 +18203,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
-   "referenced_type" : "type-1828",
-   "self_type" : "type-1827",
+   "referenced_type" : "type-1829",
+   "self_type" : "type-1828",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18141,8 +18213,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
-   "referenced_type" : "type-2973",
-   "self_type" : "type-2972",
+   "referenced_type" : "type-2975",
+   "self_type" : "type-2974",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18151,8 +18223,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
-   "referenced_type" : "type-495",
-   "self_type" : "type-494",
+   "referenced_type" : "type-492",
+   "self_type" : "type-491",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18161,8 +18233,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_0::BufferUsage",
-   "referenced_type" : "type-150",
-   "self_type" : "type-153",
+   "referenced_type" : "type-153",
+   "self_type" : "type-156",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18231,8 +18303,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_1::BufferUsage",
-   "referenced_type" : "type-158",
-   "self_type" : "type-160",
+   "referenced_type" : "type-160",
+   "self_type" : "type-162",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -18281,8 +18353,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_2::BufferUsage",
-   "referenced_type" : "type-420",
-   "self_type" : "type-422",
+   "referenced_type" : "type-417",
+   "self_type" : "type-419",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -18331,8 +18403,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper",
-   "referenced_type" : "type-1585",
-   "self_type" : "type-1584",
+   "referenced_type" : "type-1589",
+   "self_type" : "type-1588",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18341,8 +18413,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper",
-   "referenced_type" : "type-2554",
-   "self_type" : "type-2553",
+   "referenced_type" : "type-2559",
+   "self_type" : "type-2558",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18351,8 +18423,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper",
-   "referenced_type" : "type-2826",
-   "self_type" : "type-2825",
+   "referenced_type" : "type-2828",
+   "self_type" : "type-2827",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18361,8 +18433,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper",
-   "referenced_type" : "type-85",
-   "self_type" : "type-84",
+   "referenced_type" : "type-87",
+   "self_type" : "type-86",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18371,8 +18443,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper",
-   "referenced_type" : "type-1595",
-   "self_type" : "type-1594",
+   "referenced_type" : "type-1599",
+   "self_type" : "type-1598",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18381,8 +18453,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper",
-   "referenced_type" : "type-2564",
-   "self_type" : "type-2563",
+   "referenced_type" : "type-2569",
+   "self_type" : "type-2568",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18391,8 +18463,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper",
-   "referenced_type" : "type-2830",
-   "self_type" : "type-2829",
+   "referenced_type" : "type-2832",
+   "self_type" : "type-2831",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18401,8 +18473,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper",
-   "referenced_type" : "type-97",
-   "self_type" : "type-96",
+   "referenced_type" : "type-99",
+   "self_type" : "type-98",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18411,8 +18483,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper",
-   "referenced_type" : "type-1754",
-   "self_type" : "type-1753",
+   "referenced_type" : "type-1755",
+   "self_type" : "type-1754",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18421,8 +18493,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper",
-   "referenced_type" : "type-2888",
-   "self_type" : "type-2887",
+   "referenced_type" : "type-2890",
+   "self_type" : "type-2889",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18431,8 +18503,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper",
-   "referenced_type" : "type-392",
-   "self_type" : "type-391",
+   "referenced_type" : "type-389",
+   "self_type" : "type-388",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18451,8 +18523,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
-   "referenced_type" : "type-149",
-   "self_type" : "type-154",
+   "referenced_type" : "type-152",
+   "self_type" : "type-157",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18461,8 +18533,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
-   "referenced_type" : "type-157",
-   "self_type" : "type-161",
+   "referenced_type" : "type-159",
+   "self_type" : "type-163",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18471,8 +18543,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
-   "referenced_type" : "type-419",
-   "self_type" : "type-423",
+   "referenced_type" : "type-416",
+   "self_type" : "type-420",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18481,7 +18553,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-139",
+   "referenced_type" : "type-142",
    "self_type" : "type-1121",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -18511,8 +18583,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_handle>",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_handle>",
-   "referenced_type" : "type-135",
-   "self_type" : "type-146",
+   "referenced_type" : "type-138",
+   "self_type" : "type-149",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18521,8 +18593,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned int>",
    "name" : "const android::hardware::hidl_vec<unsigned int>",
-   "referenced_type" : "type-128",
-   "self_type" : "type-132",
+   "referenced_type" : "type-131",
+   "self_type" : "type-134",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18541,8 +18613,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "const android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-164",
-   "self_type" : "type-165",
+   "referenced_type" : "type-167",
+   "self_type" : "type-168",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18551,8 +18623,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase",
    "name" : "const android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-171",
-   "self_type" : "type-170",
+   "referenced_type" : "type-174",
+   "self_type" : "type-173",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
@@ -18561,8 +18633,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-295",
-   "self_type" : "type-294",
+   "referenced_type" : "type-292",
+   "self_type" : "type-291",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
@@ -18591,8 +18663,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::IBinder>",
    "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-248",
-   "self_type" : "type-273",
+   "referenced_type" : "type-250",
+   "self_type" : "type-269",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -18601,8 +18673,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::ProcessState>",
    "name" : "const android::sp<android::hardware::ProcessState>",
-   "referenced_type" : "type-279",
-   "self_type" : "type-278",
+   "referenced_type" : "type-275",
+   "self_type" : "type-274",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -18611,8 +18683,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
    "name" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
-   "referenced_type" : "type-355",
-   "self_type" : "type-379",
+   "referenced_type" : "type-352",
+   "self_type" : "type-376",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18621,8 +18693,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
    "name" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
-   "referenced_type" : "type-484",
-   "self_type" : "type-492",
+   "referenced_type" : "type-481",
+   "self_type" : "type-489",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18631,8 +18703,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
-   "referenced_type" : "type-338",
-   "self_type" : "type-387",
+   "referenced_type" : "type-335",
+   "self_type" : "type-384",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18641,8 +18713,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
-   "referenced_type" : "type-86",
-   "self_type" : "type-91",
+   "referenced_type" : "type-88",
+   "self_type" : "type-93",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18651,8 +18723,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
    "name" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
-   "referenced_type" : "type-497",
-   "self_type" : "type-505",
+   "referenced_type" : "type-494",
+   "self_type" : "type-502",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18671,8 +18743,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::base::V1_0::IBase>",
    "name" : "const android::sp<android::hidl::base::V1_0::IBase>",
-   "referenced_type" : "type-363",
-   "self_type" : "type-365",
+   "referenced_type" : "type-360",
+   "self_type" : "type-362",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18681,8 +18753,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification>",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification>",
-   "referenced_type" : "type-371",
-   "self_type" : "type-374",
+   "referenced_type" : "type-368",
+   "self_type" : "type-371",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18701,8 +18773,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ui::Transform",
    "name" : "const android::ui::Transform",
-   "referenced_type" : "type-2283",
-   "self_type" : "type-2286",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2289",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -18711,8 +18783,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ui::Transform::mat33",
    "name" : "const android::ui::Transform::mat33",
-   "referenced_type" : "type-2284",
-   "self_type" : "type-2295",
+   "referenced_type" : "type-2287",
+   "self_type" : "type-2297",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -18722,7 +18794,7 @@
    "linker_set_key" : "const bool",
    "name" : "const bool",
    "referenced_type" : "type-6",
-   "self_type" : "type-370",
+   "self_type" : "type-367",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -18731,8 +18803,8 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-288",
-   "self_type" : "type-287",
+   "referenced_type" : "type-285",
+   "self_type" : "type-284",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -18741,8 +18813,8 @@
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-182",
-   "self_type" : "type-181",
+   "referenced_type" : "type-185",
+   "self_type" : "type-184",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -18751,8 +18823,8 @@
    "is_const" : true,
    "linker_set_key" : "const double",
    "name" : "const double",
-   "referenced_type" : "type-41",
-   "self_type" : "type-853",
+   "referenced_type" : "type-43",
+   "self_type" : "type-850",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18762,7 +18834,7 @@
    "linker_set_key" : "const float",
    "name" : "const float",
    "referenced_type" : "type-10",
-   "self_type" : "type-563",
+   "self_type" : "type-560",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
   },
@@ -18778,40 +18850,40 @@
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-2257",
-   "self_type" : "type-2256",
+   "referenced_type" : "type-2260",
+   "self_type" : "type-2259",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-2263",
-   "self_type" : "type-2262",
+   "referenced_type" : "type-2265",
+   "self_type" : "type-2264",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-2744",
-   "self_type" : "type-2743",
+   "referenced_type" : "type-2746",
+   "self_type" : "type-2745",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-3179",
-   "self_type" : "type-3178",
+   "referenced_type" : "type-3178",
+   "self_type" : "type-3177",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-3372",
-   "self_type" : "type-3371",
+   "referenced_type" : "type-3375",
+   "self_type" : "type-3374",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
@@ -18819,8 +18891,8 @@
    "is_const" : true,
    "linker_set_key" : "const gralloc_module_t",
    "name" : "const gralloc_module_t",
-   "referenced_type" : "type-578",
-   "self_type" : "type-582",
+   "referenced_type" : "type-576",
+   "self_type" : "type-580",
    "size" : 176,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -18829,8 +18901,8 @@
    "is_const" : true,
    "linker_set_key" : "const hw_module_t",
    "name" : "const hw_module_t",
-   "referenced_type" : "type-549",
-   "self_type" : "type-555",
+   "referenced_type" : "type-546",
+   "self_type" : "type-552",
    "size" : 128,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -18839,8 +18911,8 @@
    "is_const" : true,
    "linker_set_key" : "const int",
    "name" : "const int",
-   "referenced_type" : "type-103",
-   "self_type" : "type-562",
+   "referenced_type" : "type-105",
+   "self_type" : "type-559",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -18856,192 +18928,192 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-126",
-   "self_type" : "type-125",
+   "referenced_type" : "type-129",
+   "self_type" : "type-128",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1577",
-   "self_type" : "type-1576",
+   "referenced_type" : "type-1581",
+   "self_type" : "type-1580",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1612",
-   "self_type" : "type-1611",
+   "referenced_type" : "type-1617",
+   "self_type" : "type-1616",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1768",
-   "self_type" : "type-1767",
+   "referenced_type" : "type-1769",
+   "self_type" : "type-1768",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1893",
-   "self_type" : "type-1892",
+   "referenced_type" : "type-1895",
+   "self_type" : "type-1894",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1967",
-   "self_type" : "type-1966",
+   "referenced_type" : "type-1969",
+   "self_type" : "type-1968",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2043",
-   "self_type" : "type-2042",
+   "referenced_type" : "type-2047",
+   "self_type" : "type-2046",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2095",
-   "self_type" : "type-2094",
+   "referenced_type" : "type-2097",
+   "self_type" : "type-2096",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2157",
-   "self_type" : "type-2156",
+   "referenced_type" : "type-2159",
+   "self_type" : "type-2158",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2323",
-   "self_type" : "type-2322",
+   "referenced_type" : "type-2325",
+   "self_type" : "type-2324",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2546",
-   "self_type" : "type-2545",
+   "referenced_type" : "type-2551",
+   "self_type" : "type-2550",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2581",
-   "self_type" : "type-2580",
+   "referenced_type" : "type-2587",
+   "self_type" : "type-2586",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2756",
-   "self_type" : "type-2755",
+   "referenced_type" : "type-2758",
+   "self_type" : "type-2757",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2817",
-   "self_type" : "type-2816",
+   "referenced_type" : "type-2819",
+   "self_type" : "type-2818",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2836",
-   "self_type" : "type-2835",
+   "referenced_type" : "type-2838",
+   "self_type" : "type-2837",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2903",
-   "self_type" : "type-2902",
+   "referenced_type" : "type-2906",
+   "self_type" : "type-2905",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3049",
-   "self_type" : "type-3048",
+   "referenced_type" : "type-3052",
+   "self_type" : "type-3051",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3140",
-   "self_type" : "type-3139",
+   "referenced_type" : "type-3144",
+   "self_type" : "type-3143",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3217",
-   "self_type" : "type-3216",
+   "referenced_type" : "type-3220",
+   "self_type" : "type-3219",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3259",
-   "self_type" : "type-3258",
+   "referenced_type" : "type-3262",
+   "self_type" : "type-3261",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3310",
-   "self_type" : "type-3309",
+   "referenced_type" : "type-3313",
+   "self_type" : "type-3312",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3420",
-   "self_type" : "type-3419",
+   "referenced_type" : "type-3423",
+   "self_type" : "type-3422",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-37",
-   "self_type" : "type-36",
+   "referenced_type" : "type-40",
+   "self_type" : "type-39",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-417",
-   "self_type" : "type-416",
+   "referenced_type" : "type-414",
+   "self_type" : "type-413",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -19056,16 +19128,16 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-748",
-   "self_type" : "type-747",
+   "referenced_type" : "type-749",
+   "self_type" : "type-748",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-855",
-   "self_type" : "type-854",
+   "referenced_type" : "type-857",
+   "self_type" : "type-856",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -19099,7 +19171,7 @@
    "is_const" : true,
    "linker_set_key" : "const long long",
    "name" : "const long long",
-   "referenced_type" : "type-284",
+   "referenced_type" : "type-12",
    "self_type" : "type-847",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -19109,8 +19181,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle",
    "name" : "const native_handle",
-   "referenced_type" : "type-144",
-   "self_type" : "type-143",
+   "referenced_type" : "type-147",
+   "self_type" : "type-146",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19119,8 +19191,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle *const",
    "name" : "const native_handle *const",
-   "referenced_type" : "type-142",
-   "self_type" : "type-696",
+   "referenced_type" : "type-145",
+   "self_type" : "type-699",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19130,7 +19202,7 @@
    "linker_set_key" : "const short",
    "name" : "const short",
    "referenced_type" : "type-599",
-   "self_type" : "type-825",
+   "self_type" : "type-823",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19159,8 +19231,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3>",
    "name" : "const std::array<android::details::TVec2<float>, 3>",
-   "referenced_type" : "type-2202",
-   "self_type" : "type-2201",
+   "referenced_type" : "type-2204",
+   "self_type" : "type-2203",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -19169,8 +19241,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3>",
    "name" : "const std::array<android::details::TVec2<float>, 3>",
-   "referenced_type" : "type-2738",
-   "self_type" : "type-2737",
+   "referenced_type" : "type-2740",
+   "self_type" : "type-2739",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -19179,8 +19251,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3>",
    "name" : "const std::array<android::details::TVec2<float>, 3>",
-   "referenced_type" : "type-3091",
-   "self_type" : "type-3090",
+   "referenced_type" : "type-3090",
+   "self_type" : "type-3089",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -19199,8 +19271,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1687",
-   "self_type" : "type-1686",
+   "referenced_type" : "type-1688",
+   "self_type" : "type-1687",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19209,8 +19281,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1786",
-   "self_type" : "type-1785",
+   "referenced_type" : "type-1787",
+   "self_type" : "type-1786",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19219,8 +19291,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1900",
-   "self_type" : "type-1899",
+   "referenced_type" : "type-1902",
+   "self_type" : "type-1901",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19229,8 +19301,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1974",
-   "self_type" : "type-1973",
+   "referenced_type" : "type-1978",
+   "self_type" : "type-1977",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19239,8 +19311,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2054",
-   "self_type" : "type-2053",
+   "referenced_type" : "type-2057",
+   "self_type" : "type-2056",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19249,8 +19321,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2100",
-   "self_type" : "type-2099",
+   "referenced_type" : "type-2103",
+   "self_type" : "type-2102",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19259,8 +19331,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2162",
-   "self_type" : "type-2161",
+   "referenced_type" : "type-2164",
+   "self_type" : "type-2163",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19269,8 +19341,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2361",
-   "self_type" : "type-2360",
+   "referenced_type" : "type-2363",
+   "self_type" : "type-2362",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19279,8 +19351,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2656",
-   "self_type" : "type-2655",
+   "referenced_type" : "type-2658",
+   "self_type" : "type-2657",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19289,8 +19361,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2762",
-   "self_type" : "type-2761",
+   "referenced_type" : "type-2764",
+   "self_type" : "type-2763",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19299,8 +19371,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2849",
-   "self_type" : "type-2848",
+   "referenced_type" : "type-2851",
+   "self_type" : "type-2850",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19309,8 +19381,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2925",
-   "self_type" : "type-2924",
+   "referenced_type" : "type-2928",
+   "self_type" : "type-2927",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19319,8 +19391,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-302",
-   "self_type" : "type-301",
+   "referenced_type" : "type-299",
+   "self_type" : "type-298",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19329,8 +19401,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-3056",
-   "self_type" : "type-3055",
+   "referenced_type" : "type-3060",
+   "self_type" : "type-3059",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19339,8 +19411,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-3154",
-   "self_type" : "type-3153",
+   "referenced_type" : "type-3158",
+   "self_type" : "type-3157",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19349,8 +19421,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-3224",
-   "self_type" : "type-3223",
+   "referenced_type" : "type-3227",
+   "self_type" : "type-3226",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19359,8 +19431,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-3264",
-   "self_type" : "type-3263",
+   "referenced_type" : "type-3267",
+   "self_type" : "type-3266",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19369,8 +19441,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-3315",
-   "self_type" : "type-3314",
+   "referenced_type" : "type-3318",
+   "self_type" : "type-3317",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19379,8 +19451,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-3458",
-   "self_type" : "type-3457",
+   "referenced_type" : "type-3461",
+   "self_type" : "type-3460",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19389,8 +19461,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-442",
-   "self_type" : "type-441",
+   "referenced_type" : "type-439",
+   "self_type" : "type-438",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19409,8 +19481,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-762",
-   "self_type" : "type-761",
+   "referenced_type" : "type-764",
+   "self_type" : "type-763",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19419,8 +19491,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-866",
-   "self_type" : "type-865",
+   "referenced_type" : "type-867",
+   "self_type" : "type-866",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19429,8 +19501,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-922",
-   "self_type" : "type-921",
+   "referenced_type" : "type-923",
+   "self_type" : "type-922",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19449,8 +19521,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1001",
-   "self_type" : "type-1000",
+   "referenced_type" : "type-1002",
+   "self_type" : "type-1001",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19469,8 +19541,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1693",
-   "self_type" : "type-1692",
+   "referenced_type" : "type-1694",
+   "self_type" : "type-1693",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19479,8 +19551,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1792",
-   "self_type" : "type-1791",
+   "referenced_type" : "type-1793",
+   "self_type" : "type-1792",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19489,8 +19561,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1906",
-   "self_type" : "type-1905",
+   "referenced_type" : "type-1908",
+   "self_type" : "type-1907",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19499,8 +19571,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1982",
-   "self_type" : "type-1981",
+   "referenced_type" : "type-1984",
+   "self_type" : "type-1983",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19509,8 +19581,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2060",
-   "self_type" : "type-2059",
+   "referenced_type" : "type-2063",
+   "self_type" : "type-2062",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19519,8 +19591,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2107",
-   "self_type" : "type-2106",
+   "referenced_type" : "type-2110",
+   "self_type" : "type-2109",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19529,8 +19601,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2168",
-   "self_type" : "type-2167",
+   "referenced_type" : "type-2171",
+   "self_type" : "type-2170",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19539,8 +19611,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2367",
-   "self_type" : "type-2366",
+   "referenced_type" : "type-2369",
+   "self_type" : "type-2368",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19549,8 +19621,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2662",
-   "self_type" : "type-2661",
+   "referenced_type" : "type-2664",
+   "self_type" : "type-2663",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19559,8 +19631,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2768",
-   "self_type" : "type-2767",
+   "referenced_type" : "type-2770",
+   "self_type" : "type-2769",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19569,8 +19641,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2855",
-   "self_type" : "type-2854",
+   "referenced_type" : "type-2857",
+   "self_type" : "type-2856",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19579,8 +19651,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2932",
-   "self_type" : "type-2931",
+   "referenced_type" : "type-2934",
+   "self_type" : "type-2933",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19589,8 +19661,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-3062",
-   "self_type" : "type-3061",
+   "referenced_type" : "type-3066",
+   "self_type" : "type-3065",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19599,8 +19671,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-308",
-   "self_type" : "type-307",
+   "referenced_type" : "type-306",
+   "self_type" : "type-305",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19609,8 +19681,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-3161",
-   "self_type" : "type-3160",
+   "referenced_type" : "type-3165",
+   "self_type" : "type-3164",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19619,8 +19691,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-3230",
-   "self_type" : "type-3229",
+   "referenced_type" : "type-3233",
+   "self_type" : "type-3232",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19629,8 +19701,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-3270",
-   "self_type" : "type-3269",
+   "referenced_type" : "type-3273",
+   "self_type" : "type-3272",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19639,8 +19711,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-3321",
-   "self_type" : "type-3320",
+   "referenced_type" : "type-3324",
+   "self_type" : "type-3323",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19649,8 +19721,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-3464",
-   "self_type" : "type-3463",
+   "referenced_type" : "type-3467",
+   "self_type" : "type-3466",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19659,8 +19731,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-448",
-   "self_type" : "type-447",
+   "referenced_type" : "type-445",
+   "self_type" : "type-444",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19669,8 +19741,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-658",
-   "self_type" : "type-657",
+   "referenced_type" : "type-659",
+   "self_type" : "type-658",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19689,8 +19761,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-872",
-   "self_type" : "type-871",
+   "referenced_type" : "type-873",
+   "self_type" : "type-872",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19699,8 +19771,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-929",
-   "self_type" : "type-928",
+   "referenced_type" : "type-930",
+   "self_type" : "type-929",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19709,8 +19781,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1003",
-   "self_type" : "type-1002",
+   "referenced_type" : "type-1004",
+   "self_type" : "type-1003",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19729,8 +19801,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1695",
-   "self_type" : "type-1694",
+   "referenced_type" : "type-1696",
+   "self_type" : "type-1695",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19739,8 +19811,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1794",
-   "self_type" : "type-1793",
+   "referenced_type" : "type-1795",
+   "self_type" : "type-1794",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19749,8 +19821,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1908",
-   "self_type" : "type-1907",
+   "referenced_type" : "type-1910",
+   "self_type" : "type-1909",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19759,8 +19831,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1984",
-   "self_type" : "type-1983",
+   "referenced_type" : "type-1986",
+   "self_type" : "type-1985",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19769,8 +19841,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2063",
-   "self_type" : "type-2062",
+   "referenced_type" : "type-2066",
+   "self_type" : "type-2065",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19779,8 +19851,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2109",
-   "self_type" : "type-2108",
+   "referenced_type" : "type-2112",
+   "self_type" : "type-2111",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19789,8 +19861,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2170",
-   "self_type" : "type-2169",
+   "referenced_type" : "type-2173",
+   "self_type" : "type-2172",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19799,8 +19871,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2369",
-   "self_type" : "type-2368",
+   "referenced_type" : "type-2371",
+   "self_type" : "type-2370",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19809,8 +19881,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2664",
-   "self_type" : "type-2663",
+   "referenced_type" : "type-2666",
+   "self_type" : "type-2665",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19819,8 +19891,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2770",
-   "self_type" : "type-2769",
+   "referenced_type" : "type-2772",
+   "self_type" : "type-2771",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19829,8 +19901,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2857",
-   "self_type" : "type-2856",
+   "referenced_type" : "type-2859",
+   "self_type" : "type-2858",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19839,8 +19911,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2934",
-   "self_type" : "type-2933",
+   "referenced_type" : "type-2937",
+   "self_type" : "type-2936",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19849,8 +19921,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-3064",
-   "self_type" : "type-3063",
+   "referenced_type" : "type-3068",
+   "self_type" : "type-3067",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19859,8 +19931,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-311",
-   "self_type" : "type-310",
+   "referenced_type" : "type-308",
+   "self_type" : "type-307",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19869,8 +19941,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-3163",
-   "self_type" : "type-3162",
+   "referenced_type" : "type-3167",
+   "self_type" : "type-3166",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19879,8 +19951,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-3232",
-   "self_type" : "type-3231",
+   "referenced_type" : "type-3235",
+   "self_type" : "type-3234",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19889,8 +19961,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-3272",
-   "self_type" : "type-3271",
+   "referenced_type" : "type-3275",
+   "self_type" : "type-3274",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19899,8 +19971,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-3323",
-   "self_type" : "type-3322",
+   "referenced_type" : "type-3326",
+   "self_type" : "type-3325",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19909,8 +19981,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-3466",
-   "self_type" : "type-3465",
+   "referenced_type" : "type-3469",
+   "self_type" : "type-3468",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19919,8 +19991,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-450",
-   "self_type" : "type-449",
+   "referenced_type" : "type-447",
+   "self_type" : "type-446",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19929,8 +20001,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-660",
-   "self_type" : "type-659",
+   "referenced_type" : "type-661",
+   "self_type" : "type-660",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19949,8 +20021,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-875",
-   "self_type" : "type-874",
+   "referenced_type" : "type-876",
+   "self_type" : "type-875",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19959,8 +20031,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-931",
-   "self_type" : "type-930",
+   "referenced_type" : "type-932",
+   "self_type" : "type-931",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19979,8 +20051,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1691",
-   "self_type" : "type-1690",
+   "referenced_type" : "type-1692",
+   "self_type" : "type-1691",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19989,8 +20061,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1790",
-   "self_type" : "type-1789",
+   "referenced_type" : "type-1791",
+   "self_type" : "type-1790",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19999,8 +20071,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1904",
-   "self_type" : "type-1903",
+   "referenced_type" : "type-1906",
+   "self_type" : "type-1905",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20009,8 +20081,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1978",
-   "self_type" : "type-1977",
+   "referenced_type" : "type-1982",
+   "self_type" : "type-1981",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20019,8 +20091,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2058",
-   "self_type" : "type-2057",
+   "referenced_type" : "type-2061",
+   "self_type" : "type-2060",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20029,8 +20101,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2105",
-   "self_type" : "type-2104",
+   "referenced_type" : "type-2108",
+   "self_type" : "type-2107",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20039,8 +20111,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2166",
-   "self_type" : "type-2165",
+   "referenced_type" : "type-2168",
+   "self_type" : "type-2167",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20049,8 +20121,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2365",
-   "self_type" : "type-2364",
+   "referenced_type" : "type-2367",
+   "self_type" : "type-2366",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20059,8 +20131,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2660",
-   "self_type" : "type-2659",
+   "referenced_type" : "type-2662",
+   "self_type" : "type-2661",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20069,8 +20141,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2766",
-   "self_type" : "type-2765",
+   "referenced_type" : "type-2768",
+   "self_type" : "type-2767",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20079,8 +20151,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2853",
-   "self_type" : "type-2852",
+   "referenced_type" : "type-2855",
+   "self_type" : "type-2854",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20089,8 +20161,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2930",
-   "self_type" : "type-2929",
+   "referenced_type" : "type-2932",
+   "self_type" : "type-2931",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20099,8 +20171,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-3060",
-   "self_type" : "type-3059",
+   "referenced_type" : "type-303",
+   "self_type" : "type-302",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20109,8 +20181,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-306",
-   "self_type" : "type-305",
+   "referenced_type" : "type-3064",
+   "self_type" : "type-3063",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20119,8 +20191,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-3158",
-   "self_type" : "type-3157",
+   "referenced_type" : "type-3162",
+   "self_type" : "type-3161",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20129,8 +20201,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-3228",
-   "self_type" : "type-3227",
+   "referenced_type" : "type-3231",
+   "self_type" : "type-3230",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20139,8 +20211,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-3268",
-   "self_type" : "type-3267",
+   "referenced_type" : "type-3271",
+   "self_type" : "type-3270",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20149,8 +20221,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-3319",
-   "self_type" : "type-3318",
+   "referenced_type" : "type-3322",
+   "self_type" : "type-3321",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20159,8 +20231,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-3462",
-   "self_type" : "type-3461",
+   "referenced_type" : "type-3465",
+   "self_type" : "type-3464",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20169,8 +20241,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-446",
-   "self_type" : "type-445",
+   "referenced_type" : "type-443",
+   "self_type" : "type-442",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20179,8 +20251,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-656",
-   "self_type" : "type-655",
+   "referenced_type" : "type-657",
+   "self_type" : "type-656",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20189,8 +20261,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-766",
-   "self_type" : "type-765",
+   "referenced_type" : "type-768",
+   "self_type" : "type-767",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20199,8 +20271,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-870",
-   "self_type" : "type-869",
+   "referenced_type" : "type-871",
+   "self_type" : "type-870",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20209,8 +20281,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-927",
-   "self_type" : "type-926",
+   "referenced_type" : "type-928",
+   "self_type" : "type-927",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20229,8 +20301,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1005",
-   "self_type" : "type-1004",
+   "referenced_type" : "type-1006",
+   "self_type" : "type-1005",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20249,8 +20321,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1697",
-   "self_type" : "type-1696",
+   "referenced_type" : "type-1698",
+   "self_type" : "type-1697",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20259,8 +20331,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1796",
-   "self_type" : "type-1795",
+   "referenced_type" : "type-1797",
+   "self_type" : "type-1796",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20269,8 +20341,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1910",
-   "self_type" : "type-1909",
+   "referenced_type" : "type-1912",
+   "self_type" : "type-1911",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20279,8 +20351,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1986",
-   "self_type" : "type-1985",
+   "referenced_type" : "type-1988",
+   "self_type" : "type-1987",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20289,8 +20361,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2065",
-   "self_type" : "type-2064",
+   "referenced_type" : "type-2068",
+   "self_type" : "type-2067",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20299,8 +20371,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2111",
-   "self_type" : "type-2110",
+   "referenced_type" : "type-2114",
+   "self_type" : "type-2113",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20309,8 +20381,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2172",
-   "self_type" : "type-2171",
+   "referenced_type" : "type-2175",
+   "self_type" : "type-2174",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20319,8 +20391,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2371",
-   "self_type" : "type-2370",
+   "referenced_type" : "type-2373",
+   "self_type" : "type-2372",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20329,8 +20401,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2666",
-   "self_type" : "type-2665",
+   "referenced_type" : "type-2668",
+   "self_type" : "type-2667",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20339,8 +20411,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2772",
-   "self_type" : "type-2771",
+   "referenced_type" : "type-2774",
+   "self_type" : "type-2773",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20349,8 +20421,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2859",
-   "self_type" : "type-2858",
+   "referenced_type" : "type-2861",
+   "self_type" : "type-2860",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20359,8 +20431,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2936",
-   "self_type" : "type-2935",
+   "referenced_type" : "type-2939",
+   "self_type" : "type-2938",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20369,8 +20441,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-3067",
-   "self_type" : "type-3066",
+   "referenced_type" : "type-3072",
+   "self_type" : "type-3071",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20379,8 +20451,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-313",
-   "self_type" : "type-312",
+   "referenced_type" : "type-310",
+   "self_type" : "type-309",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20389,8 +20461,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-3165",
-   "self_type" : "type-3164",
+   "referenced_type" : "type-3169",
+   "self_type" : "type-3168",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20399,8 +20471,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-3234",
-   "self_type" : "type-3233",
+   "referenced_type" : "type-3237",
+   "self_type" : "type-3236",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20409,8 +20481,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-3274",
-   "self_type" : "type-3273",
+   "referenced_type" : "type-3277",
+   "self_type" : "type-3276",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20419,8 +20491,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-3325",
-   "self_type" : "type-3324",
+   "referenced_type" : "type-3328",
+   "self_type" : "type-3327",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20429,8 +20501,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-3468",
-   "self_type" : "type-3467",
+   "referenced_type" : "type-3471",
+   "self_type" : "type-3470",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20439,8 +20511,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-452",
-   "self_type" : "type-451",
+   "referenced_type" : "type-449",
+   "self_type" : "type-448",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20469,8 +20541,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-877",
-   "self_type" : "type-876",
+   "referenced_type" : "type-878",
+   "self_type" : "type-877",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20479,8 +20551,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-933",
-   "self_type" : "type-932",
+   "referenced_type" : "type-934",
+   "self_type" : "type-933",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20499,8 +20571,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1685",
-   "self_type" : "type-1684",
+   "referenced_type" : "type-1686",
+   "self_type" : "type-1685",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20509,8 +20581,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1784",
-   "self_type" : "type-1783",
+   "referenced_type" : "type-1785",
+   "self_type" : "type-1784",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20519,8 +20591,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1898",
-   "self_type" : "type-1897",
+   "referenced_type" : "type-1900",
+   "self_type" : "type-1899",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20529,8 +20601,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1972",
-   "self_type" : "type-1971",
+   "referenced_type" : "type-1974",
+   "self_type" : "type-1973",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20539,8 +20611,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2052",
-   "self_type" : "type-2051",
+   "referenced_type" : "type-2055",
+   "self_type" : "type-2054",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20549,8 +20621,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2098",
-   "self_type" : "type-2097",
+   "referenced_type" : "type-2101",
+   "self_type" : "type-2100",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20559,8 +20631,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2160",
-   "self_type" : "type-2159",
+   "referenced_type" : "type-2162",
+   "self_type" : "type-2161",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20569,8 +20641,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2359",
-   "self_type" : "type-2358",
+   "referenced_type" : "type-2361",
+   "self_type" : "type-2360",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20579,8 +20651,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2654",
-   "self_type" : "type-2653",
+   "referenced_type" : "type-2656",
+   "self_type" : "type-2655",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20589,8 +20661,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2760",
-   "self_type" : "type-2759",
+   "referenced_type" : "type-2762",
+   "self_type" : "type-2761",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20599,8 +20671,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2847",
-   "self_type" : "type-2846",
+   "referenced_type" : "type-2849",
+   "self_type" : "type-2848",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20609,8 +20681,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2923",
-   "self_type" : "type-2922",
+   "referenced_type" : "type-2925",
+   "self_type" : "type-2924",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20619,8 +20691,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-300",
-   "self_type" : "type-299",
+   "referenced_type" : "type-297",
+   "self_type" : "type-296",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20629,8 +20701,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-3054",
-   "self_type" : "type-3053",
+   "referenced_type" : "type-3057",
+   "self_type" : "type-3056",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20639,8 +20711,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-3152",
-   "self_type" : "type-3151",
+   "referenced_type" : "type-3156",
+   "self_type" : "type-3155",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20649,8 +20721,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-3222",
-   "self_type" : "type-3221",
+   "referenced_type" : "type-3225",
+   "self_type" : "type-3224",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20659,8 +20731,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-3262",
-   "self_type" : "type-3261",
+   "referenced_type" : "type-3265",
+   "self_type" : "type-3264",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20669,8 +20741,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-3313",
-   "self_type" : "type-3312",
+   "referenced_type" : "type-3316",
+   "self_type" : "type-3315",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20679,8 +20751,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-3456",
-   "self_type" : "type-3455",
+   "referenced_type" : "type-3459",
+   "self_type" : "type-3458",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20689,8 +20761,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-440",
-   "self_type" : "type-439",
+   "referenced_type" : "type-437",
+   "self_type" : "type-436",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20699,8 +20771,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-649",
-   "self_type" : "type-648",
+   "referenced_type" : "type-650",
+   "self_type" : "type-649",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20719,8 +20791,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-863",
-   "self_type" : "type-862",
+   "referenced_type" : "type-865",
+   "self_type" : "type-864",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20729,8 +20801,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-920",
-   "self_type" : "type-919",
+   "referenced_type" : "type-921",
+   "self_type" : "type-920",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20759,8 +20831,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1689",
-   "self_type" : "type-1688",
+   "referenced_type" : "type-1690",
+   "self_type" : "type-1689",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20769,8 +20841,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1788",
-   "self_type" : "type-1787",
+   "referenced_type" : "type-1789",
+   "self_type" : "type-1788",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20779,8 +20851,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1902",
-   "self_type" : "type-1901",
+   "referenced_type" : "type-1904",
+   "self_type" : "type-1903",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20789,8 +20861,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1976",
-   "self_type" : "type-1975",
+   "referenced_type" : "type-1980",
+   "self_type" : "type-1979",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20799,8 +20871,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2056",
-   "self_type" : "type-2055",
+   "referenced_type" : "type-2059",
+   "self_type" : "type-2058",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20809,8 +20881,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2102",
-   "self_type" : "type-2101",
+   "referenced_type" : "type-2105",
+   "self_type" : "type-2104",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20819,8 +20891,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2164",
-   "self_type" : "type-2163",
+   "referenced_type" : "type-2166",
+   "self_type" : "type-2165",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20829,8 +20901,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2363",
-   "self_type" : "type-2362",
+   "referenced_type" : "type-2365",
+   "self_type" : "type-2364",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20839,8 +20911,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2658",
-   "self_type" : "type-2657",
+   "referenced_type" : "type-2660",
+   "self_type" : "type-2659",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20849,8 +20921,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2764",
-   "self_type" : "type-2763",
+   "referenced_type" : "type-2766",
+   "self_type" : "type-2765",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20859,8 +20931,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2851",
-   "self_type" : "type-2850",
+   "referenced_type" : "type-2853",
+   "self_type" : "type-2852",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20869,8 +20941,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2927",
-   "self_type" : "type-2926",
+   "referenced_type" : "type-2930",
+   "self_type" : "type-2929",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20879,8 +20951,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-304",
-   "self_type" : "type-303",
+   "referenced_type" : "type-301",
+   "self_type" : "type-300",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20889,8 +20961,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-3058",
-   "self_type" : "type-3057",
+   "referenced_type" : "type-3062",
+   "self_type" : "type-3061",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20899,8 +20971,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-3156",
-   "self_type" : "type-3155",
+   "referenced_type" : "type-3160",
+   "self_type" : "type-3159",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20909,8 +20981,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-3226",
-   "self_type" : "type-3225",
+   "referenced_type" : "type-3229",
+   "self_type" : "type-3228",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20919,8 +20991,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-3266",
-   "self_type" : "type-3265",
+   "referenced_type" : "type-3269",
+   "self_type" : "type-3268",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20929,8 +21001,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-3317",
-   "self_type" : "type-3316",
+   "referenced_type" : "type-3320",
+   "self_type" : "type-3319",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20939,8 +21011,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-3460",
-   "self_type" : "type-3459",
+   "referenced_type" : "type-3463",
+   "self_type" : "type-3462",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20949,8 +21021,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-444",
-   "self_type" : "type-443",
+   "referenced_type" : "type-441",
+   "self_type" : "type-440",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20969,8 +21041,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-764",
-   "self_type" : "type-763",
+   "referenced_type" : "type-766",
+   "self_type" : "type-765",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20979,8 +21051,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-868",
-   "self_type" : "type-867",
+   "referenced_type" : "type-869",
+   "self_type" : "type-868",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20989,8 +21061,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-924",
-   "self_type" : "type-923",
+   "referenced_type" : "type-925",
+   "self_type" : "type-924",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -21009,8 +21081,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1010",
-   "self_type" : "type-1009",
+   "referenced_type" : "type-1012",
+   "self_type" : "type-1011",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21029,8 +21101,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1702",
-   "self_type" : "type-1701",
+   "referenced_type" : "type-1703",
+   "self_type" : "type-1702",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21039,8 +21111,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1800",
-   "self_type" : "type-1799",
+   "referenced_type" : "type-1801",
+   "self_type" : "type-1800",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21049,8 +21121,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1914",
-   "self_type" : "type-1913",
+   "referenced_type" : "type-1916",
+   "self_type" : "type-1915",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21059,8 +21131,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1990",
-   "self_type" : "type-1989",
+   "referenced_type" : "type-1992",
+   "self_type" : "type-1991",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21069,8 +21141,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2070",
-   "self_type" : "type-2069",
+   "referenced_type" : "type-2073",
+   "self_type" : "type-2072",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21079,8 +21151,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2116",
-   "self_type" : "type-2115",
+   "referenced_type" : "type-2119",
+   "self_type" : "type-2118",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21089,8 +21161,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2177",
-   "self_type" : "type-2176",
+   "referenced_type" : "type-2181",
+   "self_type" : "type-2180",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21099,8 +21171,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2379",
-   "self_type" : "type-2378",
+   "referenced_type" : "type-2381",
+   "self_type" : "type-2380",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21109,8 +21181,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2671",
-   "self_type" : "type-2670",
+   "referenced_type" : "type-2673",
+   "self_type" : "type-2672",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21119,8 +21191,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2776",
-   "self_type" : "type-2775",
+   "referenced_type" : "type-2778",
+   "self_type" : "type-2777",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21129,8 +21201,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2863",
-   "self_type" : "type-2862",
+   "referenced_type" : "type-2865",
+   "self_type" : "type-2864",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21139,8 +21211,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2941",
-   "self_type" : "type-2940",
+   "referenced_type" : "type-2944",
+   "self_type" : "type-2943",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21149,8 +21221,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-3071",
-   "self_type" : "type-3070",
+   "referenced_type" : "type-3076",
+   "self_type" : "type-3075",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21159,8 +21231,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-3170",
-   "self_type" : "type-3169",
+   "referenced_type" : "type-315",
+   "self_type" : "type-314",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21169,8 +21241,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-318",
-   "self_type" : "type-317",
+   "referenced_type" : "type-3174",
+   "self_type" : "type-3173",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21179,8 +21251,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-3238",
-   "self_type" : "type-3237",
+   "referenced_type" : "type-3241",
+   "self_type" : "type-3240",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21189,8 +21261,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-3278",
-   "self_type" : "type-3277",
+   "referenced_type" : "type-3281",
+   "self_type" : "type-3280",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21199,8 +21271,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-3329",
-   "self_type" : "type-3328",
+   "referenced_type" : "type-3332",
+   "self_type" : "type-3331",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21209,8 +21281,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-3476",
-   "self_type" : "type-3475",
+   "referenced_type" : "type-3479",
+   "self_type" : "type-3478",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21219,8 +21291,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-457",
-   "self_type" : "type-456",
+   "referenced_type" : "type-454",
+   "self_type" : "type-453",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21229,8 +21301,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-667",
-   "self_type" : "type-666",
+   "referenced_type" : "type-668",
+   "self_type" : "type-667",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21239,8 +21311,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-778",
-   "self_type" : "type-777",
+   "referenced_type" : "type-779",
+   "self_type" : "type-778",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21249,8 +21321,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-882",
-   "self_type" : "type-881",
+   "referenced_type" : "type-883",
+   "self_type" : "type-882",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21259,8 +21331,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-938",
-   "self_type" : "type-937",
+   "referenced_type" : "type-939",
+   "self_type" : "type-938",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21269,8 +21341,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1013",
+   "referenced_type" : "type-1016",
+   "self_type" : "type-1015",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21289,8 +21361,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1706",
-   "self_type" : "type-1705",
+   "referenced_type" : "type-1707",
+   "self_type" : "type-1706",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21299,8 +21371,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1804",
-   "self_type" : "type-1803",
+   "referenced_type" : "type-1805",
+   "self_type" : "type-1804",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21309,8 +21381,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1918",
-   "self_type" : "type-1917",
+   "referenced_type" : "type-1920",
+   "self_type" : "type-1919",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21319,8 +21391,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1994",
-   "self_type" : "type-1993",
+   "referenced_type" : "type-1996",
+   "self_type" : "type-1995",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21329,8 +21401,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2074",
-   "self_type" : "type-2073",
+   "referenced_type" : "type-2077",
+   "self_type" : "type-2076",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21339,8 +21411,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2121",
-   "self_type" : "type-2120",
+   "referenced_type" : "type-2124",
+   "self_type" : "type-2123",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21349,8 +21421,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2181",
-   "self_type" : "type-2180",
+   "referenced_type" : "type-2185",
+   "self_type" : "type-2184",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21359,8 +21431,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2383",
-   "self_type" : "type-2382",
+   "referenced_type" : "type-2385",
+   "self_type" : "type-2384",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21369,8 +21441,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2675",
-   "self_type" : "type-2674",
+   "referenced_type" : "type-2677",
+   "self_type" : "type-2676",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21379,8 +21451,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2780",
-   "self_type" : "type-2779",
+   "referenced_type" : "type-2782",
+   "self_type" : "type-2781",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21389,8 +21461,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2867",
-   "self_type" : "type-2866",
+   "referenced_type" : "type-2869",
+   "self_type" : "type-2868",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21399,8 +21471,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2945",
-   "self_type" : "type-2944",
+   "referenced_type" : "type-2948",
+   "self_type" : "type-2947",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21409,8 +21481,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-3077",
-   "self_type" : "type-3076",
+   "referenced_type" : "type-3080",
+   "self_type" : "type-3079",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21419,8 +21491,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-3175",
-   "self_type" : "type-3174",
+   "referenced_type" : "type-3180",
+   "self_type" : "type-3179",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21429,8 +21501,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-322",
-   "self_type" : "type-321",
+   "referenced_type" : "type-319",
+   "self_type" : "type-318",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21439,8 +21511,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-3242",
-   "self_type" : "type-3241",
+   "referenced_type" : "type-3245",
+   "self_type" : "type-3244",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21449,8 +21521,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-3282",
-   "self_type" : "type-3281",
+   "referenced_type" : "type-3285",
+   "self_type" : "type-3284",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21459,8 +21531,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-3333",
-   "self_type" : "type-3332",
+   "referenced_type" : "type-3336",
+   "self_type" : "type-3335",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21469,8 +21541,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-3480",
-   "self_type" : "type-3479",
+   "referenced_type" : "type-3483",
+   "self_type" : "type-3482",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21479,8 +21551,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-461",
-   "self_type" : "type-460",
+   "referenced_type" : "type-459",
+   "self_type" : "type-458",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21489,8 +21561,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-672",
-   "self_type" : "type-671",
+   "referenced_type" : "type-673",
+   "self_type" : "type-672",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21509,8 +21581,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-886",
-   "self_type" : "type-885",
+   "referenced_type" : "type-887",
+   "self_type" : "type-886",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21519,8 +21591,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-943",
-   "self_type" : "type-942",
+   "referenced_type" : "type-944",
+   "self_type" : "type-943",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21529,8 +21601,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1012",
-   "self_type" : "type-1011",
+   "referenced_type" : "type-1014",
+   "self_type" : "type-1013",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21549,8 +21621,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1704",
-   "self_type" : "type-1703",
+   "referenced_type" : "type-1705",
+   "self_type" : "type-1704",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21559,8 +21631,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1802",
-   "self_type" : "type-1801",
+   "referenced_type" : "type-1803",
+   "self_type" : "type-1802",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21569,8 +21641,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1916",
-   "self_type" : "type-1915",
+   "referenced_type" : "type-1918",
+   "self_type" : "type-1917",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21579,8 +21651,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1992",
-   "self_type" : "type-1991",
+   "referenced_type" : "type-1994",
+   "self_type" : "type-1993",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21589,8 +21661,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2072",
-   "self_type" : "type-2071",
+   "referenced_type" : "type-2075",
+   "self_type" : "type-2074",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21599,8 +21671,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2118",
-   "self_type" : "type-2117",
+   "referenced_type" : "type-2121",
+   "self_type" : "type-2120",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21609,8 +21681,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2179",
-   "self_type" : "type-2178",
+   "referenced_type" : "type-2183",
+   "self_type" : "type-2182",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21619,8 +21691,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2381",
-   "self_type" : "type-2380",
+   "referenced_type" : "type-2383",
+   "self_type" : "type-2382",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21629,8 +21701,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2673",
-   "self_type" : "type-2672",
+   "referenced_type" : "type-2675",
+   "self_type" : "type-2674",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21639,8 +21711,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2778",
-   "self_type" : "type-2777",
+   "referenced_type" : "type-2780",
+   "self_type" : "type-2779",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21649,8 +21721,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2865",
-   "self_type" : "type-2864",
+   "referenced_type" : "type-2867",
+   "self_type" : "type-2866",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21659,8 +21731,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2943",
-   "self_type" : "type-2942",
+   "referenced_type" : "type-2946",
+   "self_type" : "type-2945",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21669,8 +21741,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-3075",
-   "self_type" : "type-3074",
+   "referenced_type" : "type-3078",
+   "self_type" : "type-3077",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21679,8 +21751,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-3172",
-   "self_type" : "type-3171",
+   "referenced_type" : "type-3176",
+   "self_type" : "type-3175",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21689,8 +21761,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-320",
-   "self_type" : "type-319",
+   "referenced_type" : "type-317",
+   "self_type" : "type-316",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21699,8 +21771,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-3240",
-   "self_type" : "type-3239",
+   "referenced_type" : "type-3243",
+   "self_type" : "type-3242",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21709,8 +21781,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-3280",
-   "self_type" : "type-3279",
+   "referenced_type" : "type-3283",
+   "self_type" : "type-3282",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21719,8 +21791,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-3331",
-   "self_type" : "type-3330",
+   "referenced_type" : "type-3334",
+   "self_type" : "type-3333",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21729,8 +21801,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-3478",
-   "self_type" : "type-3477",
+   "referenced_type" : "type-3481",
+   "self_type" : "type-3480",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21739,8 +21811,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-459",
-   "self_type" : "type-458",
+   "referenced_type" : "type-457",
+   "self_type" : "type-456",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21759,8 +21831,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-780",
-   "self_type" : "type-779",
+   "referenced_type" : "type-781",
+   "self_type" : "type-780",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21769,8 +21841,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-884",
-   "self_type" : "type-883",
+   "referenced_type" : "type-885",
+   "self_type" : "type-884",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21779,8 +21851,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-940",
-   "self_type" : "type-939",
+   "referenced_type" : "type-941",
+   "self_type" : "type-940",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21789,8 +21861,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1008",
-   "self_type" : "type-1007",
+   "referenced_type" : "type-1010",
+   "self_type" : "type-1009",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21809,8 +21881,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1699",
-   "self_type" : "type-1698",
+   "referenced_type" : "type-1701",
+   "self_type" : "type-1700",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21819,8 +21891,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1798",
-   "self_type" : "type-1797",
+   "referenced_type" : "type-1799",
+   "self_type" : "type-1798",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21829,8 +21901,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1912",
-   "self_type" : "type-1911",
+   "referenced_type" : "type-1914",
+   "self_type" : "type-1913",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21839,8 +21911,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1988",
-   "self_type" : "type-1987",
+   "referenced_type" : "type-1990",
+   "self_type" : "type-1989",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21849,8 +21921,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2068",
-   "self_type" : "type-2067",
+   "referenced_type" : "type-2071",
+   "self_type" : "type-2070",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21859,8 +21931,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2114",
-   "self_type" : "type-2113",
+   "referenced_type" : "type-2117",
+   "self_type" : "type-2116",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21869,8 +21941,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2175",
-   "self_type" : "type-2174",
+   "referenced_type" : "type-2179",
+   "self_type" : "type-2178",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21879,8 +21951,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2377",
-   "self_type" : "type-2376",
+   "referenced_type" : "type-2379",
+   "self_type" : "type-2378",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21889,8 +21961,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2668",
-   "self_type" : "type-2667",
+   "referenced_type" : "type-2671",
+   "self_type" : "type-2670",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21899,8 +21971,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2774",
-   "self_type" : "type-2773",
+   "referenced_type" : "type-2776",
+   "self_type" : "type-2775",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21909,8 +21981,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2861",
-   "self_type" : "type-2860",
+   "referenced_type" : "type-2863",
+   "self_type" : "type-2862",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21919,8 +21991,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2939",
-   "self_type" : "type-2938",
+   "referenced_type" : "type-2941",
+   "self_type" : "type-2940",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21929,8 +22001,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-3069",
-   "self_type" : "type-3068",
+   "referenced_type" : "type-3074",
+   "self_type" : "type-3073",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21939,8 +22011,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-315",
-   "self_type" : "type-314",
+   "referenced_type" : "type-313",
+   "self_type" : "type-312",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21949,8 +22021,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-3168",
-   "self_type" : "type-3167",
+   "referenced_type" : "type-3172",
+   "self_type" : "type-3171",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21959,8 +22031,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-3236",
-   "self_type" : "type-3235",
+   "referenced_type" : "type-3239",
+   "self_type" : "type-3238",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21969,8 +22041,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-3276",
-   "self_type" : "type-3275",
+   "referenced_type" : "type-3279",
+   "self_type" : "type-3278",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21979,8 +22051,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-3327",
-   "self_type" : "type-3326",
+   "referenced_type" : "type-3330",
+   "self_type" : "type-3329",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21989,8 +22061,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-3474",
-   "self_type" : "type-3473",
+   "referenced_type" : "type-3477",
+   "self_type" : "type-3476",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21999,8 +22071,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-455",
-   "self_type" : "type-454",
+   "referenced_type" : "type-452",
+   "self_type" : "type-451",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22009,8 +22081,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-665",
-   "self_type" : "type-664",
+   "referenced_type" : "type-666",
+   "self_type" : "type-665",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22019,8 +22091,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-776",
-   "self_type" : "type-775",
+   "referenced_type" : "type-777",
+   "self_type" : "type-776",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22029,8 +22101,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-880",
-   "self_type" : "type-879",
+   "referenced_type" : "type-881",
+   "self_type" : "type-880",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22039,8 +22111,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-936",
-   "self_type" : "type-935",
+   "referenced_type" : "type-937",
+   "self_type" : "type-936",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22069,8 +22141,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1708",
-   "self_type" : "type-1707",
+   "referenced_type" : "type-1709",
+   "self_type" : "type-1708",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22079,8 +22151,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1806",
-   "self_type" : "type-1805",
+   "referenced_type" : "type-1807",
+   "self_type" : "type-1806",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22089,8 +22161,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1920",
-   "self_type" : "type-1919",
+   "referenced_type" : "type-1922",
+   "self_type" : "type-1921",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22099,8 +22171,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1996",
-   "self_type" : "type-1995",
+   "referenced_type" : "type-1998",
+   "self_type" : "type-1997",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22109,8 +22181,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2076",
-   "self_type" : "type-2075",
+   "referenced_type" : "type-2080",
+   "self_type" : "type-2079",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22119,8 +22191,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2123",
-   "self_type" : "type-2122",
+   "referenced_type" : "type-2126",
+   "self_type" : "type-2125",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22129,8 +22201,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2185",
-   "self_type" : "type-2184",
+   "referenced_type" : "type-2187",
+   "self_type" : "type-2186",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22139,8 +22211,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2385",
-   "self_type" : "type-2384",
+   "referenced_type" : "type-2387",
+   "self_type" : "type-2386",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22149,8 +22221,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2677",
-   "self_type" : "type-2676",
+   "referenced_type" : "type-2679",
+   "self_type" : "type-2678",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22159,8 +22231,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2782",
-   "self_type" : "type-2781",
+   "referenced_type" : "type-2784",
+   "self_type" : "type-2783",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22169,8 +22241,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2869",
-   "self_type" : "type-2868",
+   "referenced_type" : "type-2871",
+   "self_type" : "type-2870",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22179,8 +22251,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2948",
-   "self_type" : "type-2947",
+   "referenced_type" : "type-2950",
+   "self_type" : "type-2949",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22189,8 +22261,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-3079",
-   "self_type" : "type-3078",
+   "referenced_type" : "type-3082",
+   "self_type" : "type-3081",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22199,8 +22271,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-3177",
-   "self_type" : "type-3176",
+   "referenced_type" : "type-3182",
+   "self_type" : "type-3181",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22209,8 +22281,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-3244",
-   "self_type" : "type-3243",
+   "referenced_type" : "type-321",
+   "self_type" : "type-320",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22219,8 +22291,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-324",
-   "self_type" : "type-323",
+   "referenced_type" : "type-3247",
+   "self_type" : "type-3246",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22229,8 +22301,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-3284",
-   "self_type" : "type-3283",
+   "referenced_type" : "type-3287",
+   "self_type" : "type-3286",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22239,8 +22311,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-3335",
-   "self_type" : "type-3334",
+   "referenced_type" : "type-3338",
+   "self_type" : "type-3337",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22249,8 +22321,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-3482",
-   "self_type" : "type-3481",
+   "referenced_type" : "type-3485",
+   "self_type" : "type-3484",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22259,8 +22331,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-464",
-   "self_type" : "type-463",
+   "referenced_type" : "type-461",
+   "self_type" : "type-460",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22269,8 +22341,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-674",
-   "self_type" : "type-673",
+   "referenced_type" : "type-675",
+   "self_type" : "type-674",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22289,8 +22361,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-888",
-   "self_type" : "type-887",
+   "referenced_type" : "type-890",
+   "self_type" : "type-889",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22299,8 +22371,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-945",
-   "self_type" : "type-944",
+   "referenced_type" : "type-946",
+   "self_type" : "type-945",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22309,8 +22381,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1026",
-   "self_type" : "type-1025",
+   "referenced_type" : "type-1027",
+   "self_type" : "type-1026",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22329,8 +22401,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1814",
-   "self_type" : "type-1813",
+   "referenced_type" : "type-1815",
+   "self_type" : "type-1814",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22339,8 +22411,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2004",
-   "self_type" : "type-2003",
+   "referenced_type" : "type-2006",
+   "self_type" : "type-2005",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22349,8 +22421,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2086",
-   "self_type" : "type-2085",
+   "referenced_type" : "type-2089",
+   "self_type" : "type-2088",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22359,8 +22431,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2132",
-   "self_type" : "type-2131",
+   "referenced_type" : "type-2135",
+   "self_type" : "type-2134",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22369,8 +22441,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2193",
-   "self_type" : "type-2192",
+   "referenced_type" : "type-2196",
+   "self_type" : "type-2195",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22379,8 +22451,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2397",
-   "self_type" : "type-2396",
+   "referenced_type" : "type-2399",
+   "self_type" : "type-2398",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22389,8 +22461,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2790",
-   "self_type" : "type-2789",
+   "referenced_type" : "type-2792",
+   "self_type" : "type-2791",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22399,8 +22471,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2957",
-   "self_type" : "type-2956",
+   "referenced_type" : "type-2959",
+   "self_type" : "type-2958",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22409,8 +22481,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-3187",
-   "self_type" : "type-3186",
+   "referenced_type" : "type-3190",
+   "self_type" : "type-3189",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22419,8 +22491,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-3252",
-   "self_type" : "type-3251",
+   "referenced_type" : "type-3255",
+   "self_type" : "type-3254",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22429,8 +22501,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-3292",
-   "self_type" : "type-3291",
+   "referenced_type" : "type-3295",
+   "self_type" : "type-3294",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22439,8 +22511,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-3343",
-   "self_type" : "type-3342",
+   "referenced_type" : "type-3346",
+   "self_type" : "type-3345",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22449,8 +22521,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-3494",
-   "self_type" : "type-3493",
+   "referenced_type" : "type-3497",
+   "self_type" : "type-3496",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22459,8 +22531,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-473",
-   "self_type" : "type-472",
+   "referenced_type" : "type-470",
+   "self_type" : "type-469",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22469,8 +22541,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-794",
-   "self_type" : "type-793",
+   "referenced_type" : "type-795",
+   "self_type" : "type-794",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22479,8 +22551,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-898",
-   "self_type" : "type-897",
+   "referenced_type" : "type-899",
+   "self_type" : "type-898",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22489,8 +22561,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-954",
-   "self_type" : "type-953",
+   "referenced_type" : "type-955",
+   "self_type" : "type-954",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22499,8 +22571,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-1024",
-   "self_type" : "type-1023",
+   "referenced_type" : "type-1025",
+   "self_type" : "type-1024",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22519,8 +22591,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-1812",
-   "self_type" : "type-1811",
+   "referenced_type" : "type-1813",
+   "self_type" : "type-1812",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22529,8 +22601,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2002",
-   "self_type" : "type-2001",
+   "referenced_type" : "type-2004",
+   "self_type" : "type-2003",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22539,8 +22611,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2084",
-   "self_type" : "type-2083",
+   "referenced_type" : "type-2087",
+   "self_type" : "type-2086",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22549,8 +22621,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2130",
-   "self_type" : "type-2129",
+   "referenced_type" : "type-2133",
+   "self_type" : "type-2132",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22559,8 +22631,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2191",
-   "self_type" : "type-2190",
+   "referenced_type" : "type-2194",
+   "self_type" : "type-2193",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22569,8 +22641,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2395",
-   "self_type" : "type-2394",
+   "referenced_type" : "type-2397",
+   "self_type" : "type-2396",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22579,8 +22651,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2788",
-   "self_type" : "type-2787",
+   "referenced_type" : "type-2790",
+   "self_type" : "type-2789",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22589,8 +22661,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2955",
-   "self_type" : "type-2954",
+   "referenced_type" : "type-2957",
+   "self_type" : "type-2956",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22599,8 +22671,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-3185",
-   "self_type" : "type-3184",
+   "referenced_type" : "type-3188",
+   "self_type" : "type-3187",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22609,8 +22681,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-3250",
-   "self_type" : "type-3249",
+   "referenced_type" : "type-3253",
+   "self_type" : "type-3252",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22619,8 +22691,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-3290",
-   "self_type" : "type-3289",
+   "referenced_type" : "type-3293",
+   "self_type" : "type-3292",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22629,8 +22701,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-3341",
-   "self_type" : "type-3340",
+   "referenced_type" : "type-3344",
+   "self_type" : "type-3343",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22639,8 +22711,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-3492",
-   "self_type" : "type-3491",
+   "referenced_type" : "type-3495",
+   "self_type" : "type-3494",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22649,8 +22721,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-471",
-   "self_type" : "type-470",
+   "referenced_type" : "type-468",
+   "self_type" : "type-467",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22659,8 +22731,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-792",
-   "self_type" : "type-791",
+   "referenced_type" : "type-793",
+   "self_type" : "type-792",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22669,8 +22741,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-896",
-   "self_type" : "type-895",
+   "referenced_type" : "type-897",
+   "self_type" : "type-896",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22679,8 +22751,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-952",
-   "self_type" : "type-951",
+   "referenced_type" : "type-953",
+   "self_type" : "type-952",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22689,8 +22761,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-1022",
-   "self_type" : "type-1021",
+   "referenced_type" : "type-1023",
+   "self_type" : "type-1022",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22709,8 +22781,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-1810",
-   "self_type" : "type-1809",
+   "referenced_type" : "type-1811",
+   "self_type" : "type-1810",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22719,8 +22791,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2000",
-   "self_type" : "type-1999",
+   "referenced_type" : "type-2002",
+   "self_type" : "type-2001",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22729,8 +22801,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2082",
-   "self_type" : "type-2081",
+   "referenced_type" : "type-2085",
+   "self_type" : "type-2084",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22739,8 +22811,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2128",
-   "self_type" : "type-2127",
+   "referenced_type" : "type-2131",
+   "self_type" : "type-2130",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22749,8 +22821,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2189",
-   "self_type" : "type-2188",
+   "referenced_type" : "type-2192",
+   "self_type" : "type-2191",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22759,8 +22831,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2393",
-   "self_type" : "type-2392",
+   "referenced_type" : "type-2395",
+   "self_type" : "type-2394",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22769,8 +22841,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2786",
-   "self_type" : "type-2785",
+   "referenced_type" : "type-2788",
+   "self_type" : "type-2787",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22779,8 +22851,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2952",
-   "self_type" : "type-2951",
+   "referenced_type" : "type-2955",
+   "self_type" : "type-2954",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22789,8 +22861,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-3183",
-   "self_type" : "type-3182",
+   "referenced_type" : "type-3186",
+   "self_type" : "type-3185",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22799,8 +22871,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-3248",
-   "self_type" : "type-3247",
+   "referenced_type" : "type-3251",
+   "self_type" : "type-3250",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22809,8 +22881,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-3288",
-   "self_type" : "type-3287",
+   "referenced_type" : "type-3291",
+   "self_type" : "type-3290",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22819,8 +22891,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-3339",
-   "self_type" : "type-3338",
+   "referenced_type" : "type-3342",
+   "self_type" : "type-3341",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22829,8 +22901,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-3490",
-   "self_type" : "type-3489",
+   "referenced_type" : "type-3493",
+   "self_type" : "type-3492",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22839,8 +22911,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-468",
-   "self_type" : "type-467",
+   "referenced_type" : "type-466",
+   "self_type" : "type-465",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22849,8 +22921,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-790",
-   "self_type" : "type-789",
+   "referenced_type" : "type-791",
+   "self_type" : "type-790",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22859,8 +22931,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-894",
-   "self_type" : "type-893",
+   "referenced_type" : "type-895",
+   "self_type" : "type-894",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22869,8 +22941,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-950",
-   "self_type" : "type-949",
+   "referenced_type" : "type-951",
+   "self_type" : "type-950",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22899,8 +22971,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-1808",
-   "self_type" : "type-1807",
+   "referenced_type" : "type-1809",
+   "self_type" : "type-1808",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22909,8 +22981,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-1998",
-   "self_type" : "type-1997",
+   "referenced_type" : "type-2000",
+   "self_type" : "type-1999",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22919,8 +22991,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2080",
-   "self_type" : "type-2079",
+   "referenced_type" : "type-2083",
+   "self_type" : "type-2082",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22929,8 +23001,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2125",
-   "self_type" : "type-2124",
+   "referenced_type" : "type-2128",
+   "self_type" : "type-2127",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22939,8 +23011,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2187",
-   "self_type" : "type-2186",
+   "referenced_type" : "type-2189",
+   "self_type" : "type-2188",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22949,8 +23021,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2391",
-   "self_type" : "type-2390",
+   "referenced_type" : "type-2393",
+   "self_type" : "type-2392",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22959,8 +23031,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2784",
-   "self_type" : "type-2783",
+   "referenced_type" : "type-2786",
+   "self_type" : "type-2785",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22969,8 +23041,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2950",
-   "self_type" : "type-2949",
+   "referenced_type" : "type-2953",
+   "self_type" : "type-2952",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22979,8 +23051,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-3181",
-   "self_type" : "type-3180",
+   "referenced_type" : "type-3184",
+   "self_type" : "type-3183",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22989,8 +23061,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-3246",
-   "self_type" : "type-3245",
+   "referenced_type" : "type-3249",
+   "self_type" : "type-3248",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22999,8 +23071,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-3286",
-   "self_type" : "type-3285",
+   "referenced_type" : "type-3289",
+   "self_type" : "type-3288",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23009,8 +23081,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-3337",
-   "self_type" : "type-3336",
+   "referenced_type" : "type-3340",
+   "self_type" : "type-3339",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23019,8 +23091,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-3488",
-   "self_type" : "type-3487",
+   "referenced_type" : "type-3491",
+   "self_type" : "type-3490",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23029,8 +23101,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-466",
-   "self_type" : "type-465",
+   "referenced_type" : "type-464",
+   "self_type" : "type-463",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23039,8 +23111,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-788",
-   "self_type" : "type-787",
+   "referenced_type" : "type-789",
+   "self_type" : "type-788",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23049,8 +23121,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-892",
-   "self_type" : "type-891",
+   "referenced_type" : "type-893",
+   "self_type" : "type-892",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23059,8 +23131,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-947",
-   "self_type" : "type-946",
+   "referenced_type" : "type-948",
+   "self_type" : "type-947",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23069,8 +23141,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1028",
-   "self_type" : "type-1027",
+   "referenced_type" : "type-1029",
+   "self_type" : "type-1028",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23089,8 +23161,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1816",
-   "self_type" : "type-1815",
+   "referenced_type" : "type-1817",
+   "self_type" : "type-1816",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23099,8 +23171,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2006",
-   "self_type" : "type-2005",
+   "referenced_type" : "type-2008",
+   "self_type" : "type-2007",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23109,8 +23181,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2088",
-   "self_type" : "type-2087",
+   "referenced_type" : "type-2091",
+   "self_type" : "type-2090",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23119,8 +23191,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2134",
-   "self_type" : "type-2133",
+   "referenced_type" : "type-2137",
+   "self_type" : "type-2136",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23129,8 +23201,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2195",
-   "self_type" : "type-2194",
+   "referenced_type" : "type-2198",
+   "self_type" : "type-2197",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23139,8 +23211,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2399",
-   "self_type" : "type-2398",
+   "referenced_type" : "type-2401",
+   "self_type" : "type-2400",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23149,8 +23221,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2792",
-   "self_type" : "type-2791",
+   "referenced_type" : "type-2794",
+   "self_type" : "type-2793",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23159,8 +23231,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2959",
-   "self_type" : "type-2958",
+   "referenced_type" : "type-2962",
+   "self_type" : "type-2961",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23169,8 +23241,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-3189",
-   "self_type" : "type-3188",
+   "referenced_type" : "type-3193",
+   "self_type" : "type-3192",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23179,8 +23251,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-3254",
-   "self_type" : "type-3253",
+   "referenced_type" : "type-3257",
+   "self_type" : "type-3256",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23189,8 +23261,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-3294",
-   "self_type" : "type-3293",
+   "referenced_type" : "type-3297",
+   "self_type" : "type-3296",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23199,8 +23271,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-3345",
-   "self_type" : "type-3344",
+   "referenced_type" : "type-3348",
+   "self_type" : "type-3347",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23209,8 +23281,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-3496",
-   "self_type" : "type-3495",
+   "referenced_type" : "type-3499",
+   "self_type" : "type-3498",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23219,8 +23291,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-475",
-   "self_type" : "type-474",
+   "referenced_type" : "type-472",
+   "self_type" : "type-471",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23239,8 +23311,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-900",
-   "self_type" : "type-899",
+   "referenced_type" : "type-901",
+   "self_type" : "type-900",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23249,8 +23321,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-956",
-   "self_type" : "type-955",
+   "referenced_type" : "type-957",
+   "self_type" : "type-956",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23259,8 +23331,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1633",
-   "self_type" : "type-1632",
+   "referenced_type" : "type-1637",
+   "self_type" : "type-1636",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23269,8 +23341,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-168",
-   "self_type" : "type-167",
+   "referenced_type" : "type-170",
+   "self_type" : "type-169",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23279,8 +23351,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1774",
-   "self_type" : "type-1773",
+   "referenced_type" : "type-1775",
+   "self_type" : "type-1774",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23289,8 +23361,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1896",
-   "self_type" : "type-1895",
+   "referenced_type" : "type-1898",
+   "self_type" : "type-1897",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23299,8 +23371,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1970",
-   "self_type" : "type-1969",
+   "referenced_type" : "type-1972",
+   "self_type" : "type-1971",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23309,8 +23381,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2050",
-   "self_type" : "type-2049",
+   "referenced_type" : "type-2052",
+   "self_type" : "type-2051",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23319,8 +23391,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2602",
-   "self_type" : "type-2601",
+   "referenced_type" : "type-2607",
+   "self_type" : "type-2606",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23329,8 +23401,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2839",
-   "self_type" : "type-2838",
+   "referenced_type" : "type-2841",
+   "self_type" : "type-2840",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23339,8 +23411,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2912",
-   "self_type" : "type-2911",
+   "referenced_type" : "type-2914",
+   "self_type" : "type-2913",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23349,8 +23421,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-3052",
-   "self_type" : "type-3051",
+   "referenced_type" : "type-3055",
+   "self_type" : "type-3054",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23359,8 +23431,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-3148",
-   "self_type" : "type-3147",
+   "referenced_type" : "type-3152",
+   "self_type" : "type-3151",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23369,8 +23441,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-3220",
-   "self_type" : "type-3219",
+   "referenced_type" : "type-3223",
+   "self_type" : "type-3222",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23379,8 +23451,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-426",
-   "self_type" : "type-425",
+   "referenced_type" : "type-423",
+   "self_type" : "type-422",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23389,8 +23461,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-646",
-   "self_type" : "type-645",
+   "referenced_type" : "type-647",
+   "self_type" : "type-646",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23399,8 +23471,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-756",
-   "self_type" : "type-755",
+   "referenced_type" : "type-757",
+   "self_type" : "type-756",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23419,8 +23491,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1016",
-   "self_type" : "type-1015",
+   "referenced_type" : "type-1008",
+   "self_type" : "type-1007",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -23429,8 +23501,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2183",
-   "self_type" : "type-2182",
+   "referenced_type" : "type-2177",
+   "self_type" : "type-2176",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -23439,8 +23511,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2735",
-   "self_type" : "type-2734",
+   "referenced_type" : "type-2737",
+   "self_type" : "type-2736",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -23449,8 +23521,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-3073",
-   "self_type" : "type-3072",
+   "referenced_type" : "type-3070",
+   "self_type" : "type-3069",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -23459,8 +23531,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-1980",
-   "self_type" : "type-1979",
+   "referenced_type" : "type-1976",
+   "self_type" : "type-1975",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23469,8 +23541,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-2246",
-   "self_type" : "type-2245",
+   "referenced_type" : "type-2249",
+   "self_type" : "type-2248",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23479,8 +23551,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-2727",
-   "self_type" : "type-2726",
+   "referenced_type" : "type-2729",
+   "self_type" : "type-2728",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23489,8 +23561,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-2845",
-   "self_type" : "type-2844",
+   "referenced_type" : "type-2847",
+   "self_type" : "type-2846",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23499,8 +23571,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-3365",
-   "self_type" : "type-3364",
+   "referenced_type" : "type-3368",
+   "self_type" : "type-3367",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23509,8 +23581,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-768",
-   "self_type" : "type-767",
+   "referenced_type" : "type-762",
+   "self_type" : "type-761",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23519,8 +23591,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_round_style",
    "name" : "const std::float_round_style",
-   "referenced_type" : "type-2046",
-   "self_type" : "type-2045",
+   "referenced_type" : "type-2045",
+   "self_type" : "type-2044",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23529,8 +23601,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_round_style",
    "name" : "const std::float_round_style",
-   "referenced_type" : "type-2248",
-   "self_type" : "type-2247",
+   "referenced_type" : "type-2251",
+   "self_type" : "type-2250",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23539,8 +23611,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_round_style",
    "name" : "const std::float_round_style",
-   "referenced_type" : "type-2730",
-   "self_type" : "type-2729",
+   "referenced_type" : "type-2732",
+   "self_type" : "type-2731",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23549,8 +23621,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_round_style",
    "name" : "const std::float_round_style",
-   "referenced_type" : "type-2915",
-   "self_type" : "type-2914",
+   "referenced_type" : "type-2917",
+   "self_type" : "type-2916",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23559,8 +23631,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_round_style",
    "name" : "const std::float_round_style",
-   "referenced_type" : "type-3367",
-   "self_type" : "type-3366",
+   "referenced_type" : "type-3370",
+   "self_type" : "type-3369",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23569,8 +23641,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_round_style",
    "name" : "const std::float_round_style",
-   "referenced_type" : "type-858",
-   "self_type" : "type-857",
+   "referenced_type" : "type-855",
+   "self_type" : "type-854",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23589,8 +23661,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<float (float)>",
    "name" : "const std::function<float (float)>",
-   "referenced_type" : "type-2267",
-   "self_type" : "type-2266",
+   "referenced_type" : "type-2268",
+   "self_type" : "type-2267",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -23599,8 +23671,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<float (float)>",
    "name" : "const std::function<float (float)>",
-   "referenced_type" : "type-2747",
-   "self_type" : "type-2746",
+   "referenced_type" : "type-2749",
+   "self_type" : "type-2748",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -23609,8 +23681,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<float (float)>",
    "name" : "const std::function<float (float)>",
-   "referenced_type" : "type-3192",
-   "self_type" : "type-3191",
+   "referenced_type" : "type-3195",
+   "self_type" : "type-3194",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -23619,8 +23691,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-1392",
-   "self_type" : "type-1391",
+   "referenced_type" : "type-1396",
+   "self_type" : "type-1395",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -23629,8 +23701,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-2514",
-   "self_type" : "type-2513",
+   "referenced_type" : "type-2519",
+   "self_type" : "type-2518",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -23639,8 +23711,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-2809",
-   "self_type" : "type-2808",
+   "referenced_type" : "type-2811",
+   "self_type" : "type-2810",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -23649,8 +23721,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-3611",
-   "self_type" : "type-3610",
+   "referenced_type" : "type-3617",
+   "self_type" : "type-3616",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -23659,8 +23731,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> >",
    "name" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> >",
-   "referenced_type" : "type-2143",
-   "self_type" : "type-2142",
+   "referenced_type" : "type-2145",
+   "self_type" : "type-2144",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -23669,8 +23741,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> >",
    "name" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> >",
-   "referenced_type" : "type-3300",
-   "self_type" : "type-3299",
+   "referenced_type" : "type-3303",
+   "self_type" : "type-3302",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -23689,8 +23761,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1032",
-   "self_type" : "type-1031",
+   "referenced_type" : "type-1033",
+   "self_type" : "type-1032",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23709,8 +23781,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1582",
-   "self_type" : "type-1581",
+   "referenced_type" : "type-1586",
+   "self_type" : "type-1585",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23719,8 +23791,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1713",
-   "self_type" : "type-1712",
+   "referenced_type" : "type-1714",
+   "self_type" : "type-1713",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23729,8 +23801,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1819",
-   "self_type" : "type-1818",
+   "referenced_type" : "type-1820",
+   "self_type" : "type-1819",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23739,8 +23811,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1888",
-   "self_type" : "type-1887",
+   "referenced_type" : "type-1890",
+   "self_type" : "type-1889",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23749,8 +23821,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1952",
-   "self_type" : "type-1951",
+   "referenced_type" : "type-1954",
+   "self_type" : "type-1953",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23759,8 +23831,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2021",
-   "self_type" : "type-2020",
+   "referenced_type" : "type-2024",
+   "self_type" : "type-2023",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23769,8 +23841,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2138",
-   "self_type" : "type-2137",
+   "referenced_type" : "type-2142",
+   "self_type" : "type-2141",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23779,8 +23851,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2199",
-   "self_type" : "type-2198",
+   "referenced_type" : "type-2202",
+   "self_type" : "type-2201",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23789,8 +23861,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2417",
-   "self_type" : "type-2416",
+   "referenced_type" : "type-2419",
+   "self_type" : "type-2418",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23799,8 +23871,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2551",
-   "self_type" : "type-2550",
+   "referenced_type" : "type-2556",
+   "self_type" : "type-2555",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23809,8 +23881,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2682",
-   "self_type" : "type-2681",
+   "referenced_type" : "type-2684",
+   "self_type" : "type-2683",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23819,8 +23891,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2795",
-   "self_type" : "type-2794",
+   "referenced_type" : "type-2797",
+   "self_type" : "type-2796",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23829,8 +23901,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2821",
-   "self_type" : "type-2820",
+   "referenced_type" : "type-2823",
+   "self_type" : "type-2822",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23839,8 +23911,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2872",
-   "self_type" : "type-2871",
+   "referenced_type" : "type-2874",
+   "self_type" : "type-2873",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23849,8 +23921,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2963",
-   "self_type" : "type-2962",
+   "referenced_type" : "type-2965",
+   "self_type" : "type-2964",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23859,8 +23931,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3044",
-   "self_type" : "type-3043",
+   "referenced_type" : "type-3047",
+   "self_type" : "type-3046",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23869,8 +23941,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3119",
-   "self_type" : "type-3118",
+   "referenced_type" : "type-3123",
+   "self_type" : "type-3122",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23879,8 +23951,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3202",
-   "self_type" : "type-3201",
+   "referenced_type" : "type-3205",
+   "self_type" : "type-3204",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23889,8 +23961,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3297",
-   "self_type" : "type-3296",
+   "referenced_type" : "type-326",
+   "self_type" : "type-325",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23899,8 +23971,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-329",
-   "self_type" : "type-328",
+   "referenced_type" : "type-3300",
+   "self_type" : "type-3299",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23909,8 +23981,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3348",
-   "self_type" : "type-3347",
+   "referenced_type" : "type-3351",
+   "self_type" : "type-3350",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23919,8 +23991,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3514",
-   "self_type" : "type-3513",
+   "referenced_type" : "type-3517",
+   "self_type" : "type-3516",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23929,8 +24001,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-46",
-   "self_type" : "type-45",
+   "referenced_type" : "type-476",
+   "self_type" : "type-475",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23939,8 +24011,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-479",
-   "self_type" : "type-478",
+   "referenced_type" : "type-48",
+   "self_type" : "type-47",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23959,8 +24031,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-727",
-   "self_type" : "type-726",
+   "referenced_type" : "type-728",
+   "self_type" : "type-727",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23969,8 +24041,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-833",
-   "self_type" : "type-832",
+   "referenced_type" : "type-834",
+   "self_type" : "type-833",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23979,8 +24051,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-960",
-   "self_type" : "type-959",
+   "referenced_type" : "type-962",
+   "self_type" : "type-961",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23989,8 +24061,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned char",
    "name" : "const unsigned char",
-   "referenced_type" : "type-218",
-   "self_type" : "type-224",
+   "referenced_type" : "type-220",
+   "self_type" : "type-226",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -23999,8 +24071,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned int",
    "name" : "const unsigned int",
-   "referenced_type" : "type-123",
-   "self_type" : "type-236",
+   "referenced_type" : "type-125",
+   "self_type" : "type-238",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
   },
@@ -24009,8 +24081,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned long long",
    "name" : "const unsigned long long",
-   "referenced_type" : "type-124",
-   "self_type" : "type-226",
+   "referenced_type" : "type-126",
+   "self_type" : "type-228",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -24028,7 +24100,7 @@
    "is_const" : true,
    "linker_set_key" : "const void",
    "name" : "const void",
-   "referenced_type" : "type-151",
+   "referenced_type" : "type-154",
    "self_type" : "type-1118",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -24037,8 +24109,8 @@
    "is_const" : true,
    "linker_set_key" : "unsigned int const[3]",
    "name" : "unsigned int const[3]",
-   "referenced_type" : "type-941",
-   "self_type" : "type-948",
+   "referenced_type" : "type-935",
+   "self_type" : "type-942",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -24048,7 +24120,7 @@
    "linker_set_key" : "volatile bool",
    "name" : "volatile bool",
    "referenced_type" : "type-6",
-   "self_type" : "type-270",
+   "self_type" : "type-266",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Thread.h"
   },
@@ -24057,8 +24129,8 @@
    "is_volatile" : true,
    "linker_set_key" : "volatile int",
    "name" : "volatile int",
-   "referenced_type" : "type-103",
-   "self_type" : "type-275",
+   "referenced_type" : "type-105",
+   "self_type" : "type-271",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   }
@@ -24071,48 +24143,48 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "layers",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "format",
      "field_offset" : 96,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "usage",
      "field_offset" : 128,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "stride",
      "field_offset" : 192,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "rfu0",
      "field_offset" : 224,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "rfu1",
      "field_offset" : 256,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "AHardwareBuffer_Desc",
    "name" : "AHardwareBuffer_Desc",
-   "referenced_type" : "type-683",
-   "self_type" : "type-683",
+   "referenced_type" : "type-685",
+   "self_type" : "type-685",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
    "unique_id" : "AHardwareBuffer_Desc"
@@ -24123,23 +24195,23 @@
    [
     {
      "field_name" : "data",
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "pixelStride",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "rowStride",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "linker_set_key" : "AHardwareBuffer_Plane",
    "name" : "AHardwareBuffer_Plane",
-   "referenced_type" : "type-509",
-   "self_type" : "type-509",
+   "referenced_type" : "type-506",
+   "self_type" : "type-506",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
    "unique_id" : "AHardwareBuffer_Plane"
@@ -24150,18 +24222,18 @@
    [
     {
      "field_name" : "planeCount",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "planes",
      "field_offset" : 32,
-     "referenced_type" : "type-508"
+     "referenced_type" : "type-505"
     }
    ],
    "linker_set_key" : "AHardwareBuffer_Planes",
    "name" : "AHardwareBuffer_Planes",
-   "referenced_type" : "type-507",
-   "self_type" : "type-507",
+   "referenced_type" : "type-504",
+   "self_type" : "type-504",
    "size" : 52,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
    "unique_id" : "AHardwareBuffer_Planes"
@@ -24172,63 +24244,63 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-518"
+     "referenced_type" : "type-516"
     },
     {
      "field_name" : "width",
      "field_offset" : 256,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "height",
      "field_offset" : 288,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "stride",
      "field_offset" : 320,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "format",
      "field_offset" : 352,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "usage_deprecated",
      "field_offset" : 384,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "layerCount",
      "field_offset" : 416,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 448,
-     "referenced_type" : "type-523"
+     "referenced_type" : "type-521"
     },
     {
      "field_name" : "handle",
      "field_offset" : 480,
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
      "field_name" : "usage",
      "field_offset" : 512,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "reserved_proc",
      "field_offset" : 576,
-     "referenced_type" : "type-524"
+     "referenced_type" : "type-522"
     }
    ],
    "linker_set_key" : "ANativeWindowBuffer",
    "name" : "ANativeWindowBuffer",
-   "referenced_type" : "type-517",
-   "self_type" : "type-517",
+   "referenced_type" : "type-515",
+   "self_type" : "type-515",
    "size" : 96,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
    "unique_id" : "ANativeWindowBuffer"
@@ -24239,22 +24311,22 @@
    [
     {
      "field_name" : "left",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "top",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "right",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "bottom",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "ARect",
@@ -24271,7 +24343,7 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-547"
+     "referenced_type" : "type-544"
     },
     {
      "field_name" : "alloc",
@@ -24307,20 +24379,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-517"
+     "referenced_type" : "type-515"
     },
     {
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
    "name" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
    "record_kind" : "class",
-   "referenced_type" : "type-516",
-   "self_type" : "type-516",
+   "referenced_type" : "type-514",
+   "self_type" : "type-514",
    "size" : 104,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h",
-   "template_args" : [ "type-517", "type-525", "type-172", "type-518" ],
+   "template_args" : [ "type-515", "type-523", "type-175", "type-516" ],
    "unique_id" : "_ZTSN7android17ANativeObjectBaseI19ANativeWindowBufferNS_13GraphicBufferENS_7RefBaseE21android_native_base_tEE",
    "vtable_components" :
    [
@@ -24408,7 +24480,7 @@
      "access" : "private",
      "field_name" : "mWhitePoint",
      "field_offset" : 1664,
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     }
    ],
    "linker_set_key" : "android::ColorSpace",
@@ -24515,14 +24587,14 @@
     {
      "access" : "private",
      "field_name" : "mCond",
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-255"
     }
    ],
    "linker_set_key" : "android::Condition",
    "name" : "android::Condition",
    "record_kind" : "class",
-   "referenced_type" : "type-258",
-   "self_type" : "type-258",
+   "referenced_type" : "type-254",
+   "self_type" : "type-254",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "unique_id" : "_ZTSN7android9ConditionE"
@@ -24563,13 +24635,13 @@
     {
      "access" : "private",
      "field_name" : "mState",
-     "referenced_type" : "type-1377"
+     "referenced_type" : "type-1382"
     },
     {
      "access" : "private",
      "field_name" : "mMutex",
      "field_offset" : 32,
-     "referenced_type" : "type-1379"
+     "referenced_type" : "type-1384"
     },
     {
      "access" : "private",
@@ -24581,14 +24653,14 @@
      "access" : "private",
      "field_name" : "mSignalTime",
      "field_offset" : 128,
-     "referenced_type" : "type-1380"
+     "referenced_type" : "type-1385"
     }
    ],
    "linker_set_key" : "android::FenceTime",
    "name" : "android::FenceTime",
    "record_kind" : "class",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1376",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1381",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android9FenceTimeE"
@@ -24598,14 +24670,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1385"
+     "referenced_type" : "type-1389"
     }
    ],
    "fields" :
    [
     {
      "field_name" : "state",
-     "referenced_type" : "type-1384"
+     "referenced_type" : "type-1388"
     },
     {
      "field_name" : "fence",
@@ -24615,13 +24687,13 @@
     {
      "field_name" : "signalTime",
      "field_offset" : 64,
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
    "linker_set_key" : "android::FenceTime::Snapshot",
    "name" : "android::FenceTime::Snapshot",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1383",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1387",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android9FenceTime8SnapshotE"
@@ -24633,20 +24705,20 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-1398"
+     "referenced_type" : "type-1402"
     },
     {
      "access" : "private",
      "field_name" : "mQueue",
      "field_offset" : 32,
-     "referenced_type" : "type-1399"
+     "referenced_type" : "type-1403"
     }
    ],
    "linker_set_key" : "android::FenceTimeline",
    "name" : "android::FenceTimeline",
    "record_kind" : "class",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1397",
+   "referenced_type" : "type-1401",
+   "self_type" : "type-1401",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android13FenceTimelineE"
@@ -24658,20 +24730,20 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-1403"
+     "referenced_type" : "type-1407"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-1404"
+     "referenced_type" : "type-1408"
     }
    ],
    "linker_set_key" : "android::FenceToFenceTimeMap",
    "name" : "android::FenceToFenceTimeMap",
    "record_kind" : "class",
-   "referenced_type" : "type-1402",
-   "self_type" : "type-1402",
+   "referenced_type" : "type-1406",
+   "self_type" : "type-1406",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android19FenceToFenceTimeMapE"
@@ -24693,11 +24765,11 @@
    "linker_set_key" : "android::Flattenable<android::FenceTime::Snapshot>",
    "name" : "android::Flattenable<android::FenceTime::Snapshot>",
    "record_kind" : "class",
-   "referenced_type" : "type-1385",
-   "self_type" : "type-1385",
+   "referenced_type" : "type-1389",
+   "self_type" : "type-1389",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1383" ],
+   "template_args" : [ "type-1387" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_9FenceTime8SnapshotEEE"
   },
   {
@@ -24705,11 +24777,11 @@
    "linker_set_key" : "android::Flattenable<android::GraphicBuffer>",
    "name" : "android::Flattenable<android::GraphicBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-532",
-   "self_type" : "type-532",
+   "referenced_type" : "type-530",
+   "self_type" : "type-530",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-525" ],
+   "template_args" : [ "type-523" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_13GraphicBufferEEE"
   },
   {
@@ -24761,36 +24833,36 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1419"
+     "referenced_type" : "type-1423"
     }
    ],
    "fields" :
    [
     {
      "field_name" : "refreshPeriodNano",
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     },
     {
      "field_name" : "desiredPresentTimesNano",
      "field_offset" : 64,
-     "referenced_type" : "type-1421"
+     "referenced_type" : "type-1425"
     },
     {
      "field_name" : "actualPresentTimesNano",
      "field_offset" : 224,
-     "referenced_type" : "type-1421"
+     "referenced_type" : "type-1425"
     },
     {
      "field_name" : "frameReadyTimesNano",
      "field_offset" : 384,
-     "referenced_type" : "type-1421"
+     "referenced_type" : "type-1425"
     }
    ],
    "linker_set_key" : "android::FrameStats",
    "name" : "android::FrameStats",
    "record_kind" : "class",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1420",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1424",
    "size" : 72,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h",
    "unique_id" : "_ZTSN7android10FrameStatsE"
@@ -24800,7 +24872,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-359"
+     "referenced_type" : "type-356"
     }
    ],
    "fields" :
@@ -24809,20 +24881,20 @@
      "access" : "private",
      "field_name" : "mMapper",
      "field_offset" : 32,
-     "referenced_type" : "type-354"
+     "referenced_type" : "type-351"
     },
     {
      "access" : "private",
      "field_name" : "mAllocator",
      "field_offset" : 64,
-     "referenced_type" : "type-355"
+     "referenced_type" : "type-352"
     }
    ],
    "linker_set_key" : "android::Gralloc2Allocator",
    "name" : "android::Gralloc2Allocator",
    "record_kind" : "class",
-   "referenced_type" : "type-353",
-   "self_type" : "type-353",
+   "referenced_type" : "type-350",
+   "self_type" : "type-350",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h",
    "unique_id" : "_ZTSN7android17Gralloc2AllocatorE",
@@ -24859,7 +24931,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-342"
+     "referenced_type" : "type-339"
     }
    ],
    "fields" :
@@ -24868,20 +24940,20 @@
      "access" : "private",
      "field_name" : "mMapper",
      "field_offset" : 32,
-     "referenced_type" : "type-338"
+     "referenced_type" : "type-335"
     },
     {
      "access" : "private",
      "field_name" : "mMapperV2_1",
      "field_offset" : 64,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-88"
     }
    ],
    "linker_set_key" : "android::Gralloc2Mapper",
    "name" : "android::Gralloc2Mapper",
    "record_kind" : "class",
-   "referenced_type" : "type-337",
-   "self_type" : "type-337",
+   "referenced_type" : "type-334",
+   "self_type" : "type-334",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h",
    "unique_id" : "_ZTSN7android14Gralloc2MapperE",
@@ -24939,10 +25011,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-516"
+     "referenced_type" : "type-514"
     },
     {
-     "referenced_type" : "type-532"
+     "referenced_type" : "type-530"
     }
    ],
    "fields" :
@@ -24951,62 +25023,62 @@
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 832,
-     "referenced_type" : "type-218"
+     "referenced_type" : "type-220"
     },
     {
      "access" : "private",
      "field_name" : "mBufferMapper",
      "field_offset" : 864,
-     "referenced_type" : "type-526"
+     "referenced_type" : "type-524"
     },
     {
      "access" : "private",
      "field_name" : "mInitCheck",
      "field_offset" : 896,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mTransportNumFds",
      "field_offset" : 928,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mTransportNumInts",
      "field_offset" : 960,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mId",
      "field_offset" : 1024,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
      "field_name" : "mBufferId",
      "field_offset" : 1088,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mGenerationNumber",
      "field_offset" : 1120,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mDeathCallbacks",
      "field_offset" : 1152,
-     "referenced_type" : "type-531"
+     "referenced_type" : "type-529"
     }
    ],
    "linker_set_key" : "android::GraphicBuffer",
    "name" : "android::GraphicBuffer",
    "record_kind" : "class",
-   "referenced_type" : "type-525",
-   "self_type" : "type-525",
+   "referenced_type" : "type-523",
+   "self_type" : "type-523",
    "size" : 160,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h",
    "unique_id" : "_ZTSN7android13GraphicBufferE",
@@ -25046,7 +25118,91 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "protected",
+     "field_name" : "mMapper",
+     "referenced_type" : "type-524"
+    },
+    {
+     "access" : "protected",
+     "field_name" : "mAllocator",
+     "field_offset" : 32,
+     "referenced_type" : "type-540"
+    }
+   ],
+   "linker_set_key" : "android::GraphicBufferAllocator",
+   "name" : "android::GraphicBufferAllocator",
+   "record_kind" : "class",
+   "referenced_type" : "type-539",
+   "self_type" : "type-539",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h",
+   "unique_id" : "_ZTSN7android22GraphicBufferAllocatorE"
+  },
+  {
+   "access" : "protected",
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "width",
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "height",
+     "field_offset" : 32,
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "stride",
+     "field_offset" : 64,
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "format",
+     "field_offset" : 96,
+     "referenced_type" : "type-105"
+    },
+    {
+     "field_name" : "layerCount",
+     "field_offset" : 128,
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "usage",
+     "field_offset" : 192,
+     "referenced_type" : "type-126"
+    },
+    {
+     "field_name" : "size",
+     "field_offset" : 256,
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "requestorName",
+     "field_offset" : 288,
+     "referenced_type" : "type-681"
+    }
+   ],
+   "linker_set_key" : "android::GraphicBufferAllocator::alloc_rec_t",
+   "name" : "android::GraphicBufferAllocator::alloc_rec_t",
+   "referenced_type" : "type-680",
+   "self_type" : "type-680",
+   "size" : 48,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h",
+   "unique_id" : "_ZTSN7android22GraphicBufferAllocator11alloc_rec_tE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-528"
     }
    ],
    "fields" :
@@ -25058,100 +25214,16 @@
     },
     {
      "access" : "private",
-     "field_name" : "mAllocator",
-     "field_offset" : 32,
-     "referenced_type" : "type-543"
-    }
-   ],
-   "linker_set_key" : "android::GraphicBufferAllocator",
-   "name" : "android::GraphicBufferAllocator",
-   "record_kind" : "class",
-   "referenced_type" : "type-542",
-   "self_type" : "type-542",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h",
-   "unique_id" : "_ZTSN7android22GraphicBufferAllocatorE"
-  },
-  {
-   "access" : "private",
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "width",
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "height",
-     "field_offset" : 32,
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "stride",
-     "field_offset" : 64,
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "format",
-     "field_offset" : 96,
-     "referenced_type" : "type-103"
-    },
-    {
-     "field_name" : "layerCount",
-     "field_offset" : 128,
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "usage",
-     "field_offset" : 192,
-     "referenced_type" : "type-124"
-    },
-    {
-     "field_name" : "size",
-     "field_offset" : 256,
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "requestorName",
-     "field_offset" : 288,
-     "referenced_type" : "type-677"
-    }
-   ],
-   "linker_set_key" : "android::GraphicBufferAllocator::alloc_rec_t",
-   "name" : "android::GraphicBufferAllocator::alloc_rec_t",
-   "referenced_type" : "type-676",
-   "self_type" : "type-676",
-   "size" : 48,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h",
-   "unique_id" : "_ZTSN7android22GraphicBufferAllocator11alloc_rec_tE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-530"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMapper",
-     "referenced_type" : "type-528"
-    },
-    {
-     "access" : "private",
      "field_name" : "mMapperVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-529"
+     "referenced_type" : "type-527"
     }
    ],
    "linker_set_key" : "android::GraphicBufferMapper",
    "name" : "android::GraphicBufferMapper",
    "record_kind" : "class",
-   "referenced_type" : "type-527",
-   "self_type" : "type-527",
+   "referenced_type" : "type-525",
+   "self_type" : "type-525",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h",
    "unique_id" : "_ZTSN7android19GraphicBufferMapperE"
@@ -25206,17 +25278,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-235"
     }
    ],
    "linker_set_key" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
    "name" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
    "record_kind" : "class",
-   "referenced_type" : "type-247",
-   "self_type" : "type-247",
+   "referenced_type" : "type-249",
+   "self_type" : "type-249",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-179", "type-248" ],
+   "template_args" : [ "type-182", "type-250" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
   },
   {
@@ -25232,11 +25304,11 @@
    "linker_set_key" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "record_kind" : "class",
-   "referenced_type" : "type-715",
-   "self_type" : "type-715",
+   "referenced_type" : "type-716",
+   "self_type" : "type-716",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-142", "type-676" ],
+   "template_args" : [ "type-145", "type-680" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -25244,11 +25316,11 @@
    "linker_set_key" : "android::LightFlattenable<android::FrameStats>",
    "name" : "android::LightFlattenable<android::FrameStats>",
    "record_kind" : "class",
-   "referenced_type" : "type-1419",
-   "self_type" : "type-1419",
+   "referenced_type" : "type-1423",
+   "self_type" : "type-1423",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1420" ],
+   "template_args" : [ "type-1424" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_10FrameStatsEEE"
   },
   {
@@ -25292,11 +25364,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Region>",
    "name" : "android::LightFlattenable<android::Region>",
    "record_kind" : "class",
-   "referenced_type" : "type-2222",
-   "self_type" : "type-2222",
+   "referenced_type" : "type-2225",
+   "self_type" : "type-2225",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-2221" ],
+   "template_args" : [ "type-2224" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_6RegionEEE"
   },
   {
@@ -25402,14 +25474,14 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-281"
     }
    ],
    "linker_set_key" : "android::Mutex",
    "name" : "android::Mutex",
    "record_kind" : "class",
-   "referenced_type" : "type-252",
-   "self_type" : "type-252",
+   "referenced_type" : "type-280",
+   "self_type" : "type-280",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5MutexE"
@@ -25421,14 +25493,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-256"
+     "referenced_type" : "type-1379"
     }
    ],
    "linker_set_key" : "android::Mutex::Autolock",
    "name" : "android::Mutex::Autolock",
    "record_kind" : "class",
-   "referenced_type" : "type-255",
-   "self_type" : "type-255",
+   "referenced_type" : "type-1378",
+   "self_type" : "type-1378",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5Mutex8AutolockE"
@@ -25477,12 +25549,12 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "y",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::Point",
@@ -25501,14 +25573,14 @@
     {
      "access" : "private",
      "field_name" : "mRWLock",
-     "referenced_type" : "type-263"
+     "referenced_type" : "type-259"
     }
    ],
    "linker_set_key" : "android::RWLock",
    "name" : "android::RWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-262",
-   "self_type" : "type-262",
+   "referenced_type" : "type-258",
+   "self_type" : "type-258",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLockE"
@@ -25520,14 +25592,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-262"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoRLock",
    "name" : "android::RWLock::AutoRLock",
    "record_kind" : "class",
-   "referenced_type" : "type-265",
-   "self_type" : "type-265",
+   "referenced_type" : "type-261",
+   "self_type" : "type-261",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
@@ -25539,14 +25611,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-262"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoWLock",
    "name" : "android::RWLock::AutoWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-268",
-   "self_type" : "type-268",
+   "referenced_type" : "type-264",
+   "self_type" : "type-264",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
@@ -25579,14 +25651,14 @@
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 32,
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-176"
     }
    ],
    "linker_set_key" : "android::RefBase",
    "name" : "android::RefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-172",
-   "self_type" : "type-172",
+   "referenced_type" : "type-175",
+   "self_type" : "type-175",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBaseE",
@@ -25626,8 +25698,8 @@
    "linker_set_key" : "android::RefBase::weakref_type",
    "name" : "android::RefBase::weakref_type",
    "record_kind" : "class",
-   "referenced_type" : "type-198",
-   "self_type" : "type-198",
+   "referenced_type" : "type-211",
+   "self_type" : "type-211",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBase12weakref_typeE"
@@ -25673,7 +25745,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2222"
+     "referenced_type" : "type-2225"
     }
    ],
    "fields" :
@@ -25681,14 +25753,14 @@
     {
      "access" : "private",
      "field_name" : "mStorage",
-     "referenced_type" : "type-2213"
+     "referenced_type" : "type-2216"
     }
    ],
    "linker_set_key" : "android::Region",
    "name" : "android::Region",
    "record_kind" : "class",
-   "referenced_type" : "type-2221",
-   "self_type" : "type-2221",
+   "referenced_type" : "type-2224",
+   "self_type" : "type-2224",
    "size" : 20,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h",
    "unique_id" : "_ZTSN7android6RegionE"
@@ -25700,7 +25772,7 @@
     {
      "access" : "private",
      "field_name" : "mTag",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "android::ScopedTrace",
@@ -25717,11 +25789,11 @@
    "linker_set_key" : "android::Singleton<android::GraphicBufferAllocator>",
    "name" : "android::Singleton<android::GraphicBufferAllocator>",
    "record_kind" : "class",
-   "referenced_type" : "type-541",
-   "self_type" : "type-541",
+   "referenced_type" : "type-538",
+   "self_type" : "type-538",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-542" ],
+   "template_args" : [ "type-539" ],
    "unique_id" : "_ZTSN7android9SingletonINS_22GraphicBufferAllocatorEEE"
   },
   {
@@ -25729,11 +25801,11 @@
    "linker_set_key" : "android::Singleton<android::GraphicBufferMapper>",
    "name" : "android::Singleton<android::GraphicBufferMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-530",
-   "self_type" : "type-530",
+   "referenced_type" : "type-528",
+   "self_type" : "type-528",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-527" ],
+   "template_args" : [ "type-525" ],
    "unique_id" : "_ZTSN7android9SingletonINS_19GraphicBufferMapperEEE"
   },
   {
@@ -25742,17 +25814,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-234"
+     "referenced_type" : "type-236"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
    "name" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-233",
-   "self_type" : "type-233",
+   "referenced_type" : "type-235",
+   "self_type" : "type-235",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-237" ],
+   "template_args" : [ "type-239" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
    "vtable_components" :
    [
@@ -25800,7 +25872,7 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-234"
+     "referenced_type" : "type-236"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
@@ -25857,14 +25929,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::SortedVectorImpl",
    "name" : "android::SortedVectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-234",
-   "self_type" : "type-234",
+   "referenced_type" : "type-236",
+   "self_type" : "type-236",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android16SortedVectorImplE",
@@ -25922,14 +25994,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-180"
+     "referenced_type" : "type-183"
     }
    ],
    "linker_set_key" : "android::String16",
    "name" : "android::String16",
    "record_kind" : "class",
-   "referenced_type" : "type-179",
-   "self_type" : "type-179",
+   "referenced_type" : "type-182",
+   "self_type" : "type-182",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "unique_id" : "_ZTSN7android8String16E"
@@ -25941,14 +26013,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     }
    ],
    "linker_set_key" : "android::String8",
    "name" : "android::String8",
    "record_kind" : "class",
-   "referenced_type" : "type-285",
-   "self_type" : "type-285",
+   "referenced_type" : "type-282",
+   "self_type" : "type-282",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "unique_id" : "_ZTSN7android7String8E"
@@ -25959,7 +26031,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "fields" :
@@ -25968,62 +26040,62 @@
      "access" : "private",
      "field_name" : "mCanCallJava",
      "field_offset" : 32,
-     "referenced_type" : "type-370"
+     "referenced_type" : "type-367"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 64,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 96,
-     "referenced_type" : "type-252"
+     "referenced_type" : "type-280"
     },
     {
      "access" : "private",
      "field_name" : "mThreadExitedCondition",
      "field_offset" : 128,
-     "referenced_type" : "type-258"
+     "referenced_type" : "type-254"
     },
     {
      "access" : "private",
      "field_name" : "mStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mExitPending",
      "field_offset" : 192,
-     "referenced_type" : "type-270"
+     "referenced_type" : "type-266"
     },
     {
      "access" : "private",
      "field_name" : "mRunning",
      "field_offset" : 200,
-     "referenced_type" : "type-270"
+     "referenced_type" : "type-266"
     },
     {
      "access" : "private",
      "field_name" : "mHoldSelf",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-364"
     },
     {
      "access" : "private",
      "field_name" : "mTid",
      "field_offset" : 256,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::Thread",
    "name" : "android::Thread",
    "record_kind" : "class",
-   "referenced_type" : "type-369",
-   "self_type" : "type-369",
+   "referenced_type" : "type-366",
+   "self_type" : "type-366",
    "size" : 44,
    "source_file" : "/system/core/libutils/include/utils/Thread.h",
    "unique_id" : "_ZTSN7android6ThreadE",
@@ -26113,14 +26185,14 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::Rect>",
    "name" : "android::Vector<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-2213",
-   "self_type" : "type-2213",
+   "referenced_type" : "type-2216",
+   "self_type" : "type-2216",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-1241" ],
@@ -26168,17 +26240,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::RefBase *>",
    "name" : "android::Vector<android::RefBase *>",
    "record_kind" : "class",
-   "referenced_type" : "type-245",
-   "self_type" : "type-245",
+   "referenced_type" : "type-247",
+   "self_type" : "type-247",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-246" ],
+   "template_args" : [ "type-248" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7RefBaseEEE",
    "vtable_components" :
    [
@@ -26223,17 +26295,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::RefBase::weakref_type *>",
    "name" : "android::Vector<android::RefBase::weakref_type *>",
    "record_kind" : "class",
-   "referenced_type" : "type-244",
-   "self_type" : "type-244",
+   "referenced_type" : "type-246",
+   "self_type" : "type-246",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-197" ],
+   "template_args" : [ "type-210" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7RefBase12weakref_typeEEE",
    "vtable_components" :
    [
@@ -26278,17 +26350,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::BHwBinder *>",
    "name" : "android::Vector<android::hardware::BHwBinder *>",
    "record_kind" : "class",
-   "referenced_type" : "type-240",
-   "self_type" : "type-240",
+   "referenced_type" : "type-242",
+   "self_type" : "type-242",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-241" ],
+   "template_args" : [ "type-243" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_8hardware9BHwBinderEEE",
    "vtable_components" :
    [
@@ -26333,17 +26405,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "record_kind" : "class",
-   "referenced_type" : "type-238",
-   "self_type" : "type-238",
+   "referenced_type" : "type-240",
+   "self_type" : "type-240",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-239" ],
+   "template_args" : [ "type-241" ],
    "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
    "vtable_components" :
    [
@@ -26388,17 +26460,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<long long>",
    "name" : "android::Vector<long long>",
    "record_kind" : "class",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1421",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1425",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android6VectorIxEE",
    "vtable_components" :
    [
@@ -26445,32 +26517,32 @@
      "access" : "private",
      "field_name" : "mStorage",
      "field_offset" : 32,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "access" : "private",
      "field_name" : "mCount",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mFlags",
      "field_offset" : 96,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "access" : "private",
      "field_name" : "mItemSize",
      "field_offset" : 128,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     }
    ],
    "linker_set_key" : "android::VectorImpl",
    "name" : "android::VectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-235",
-   "self_type" : "type-235",
+   "referenced_type" : "type-237",
+   "self_type" : "type-237",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android10VectorImplE",
@@ -26556,11 +26628,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::aggregate_traits<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-824",
-   "self_type" : "type-824",
+   "referenced_type" : "type-825",
+   "self_type" : "type-825",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142", "type-676" ],
+   "template_args" : [ "type-145", "type-680" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -26580,7 +26652,7 @@
     {
      "access" : "private",
      "field_name" : "fd_",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser>",
@@ -26645,28 +26717,28 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2254"
+     "referenced_type" : "type-2257"
+    },
+    {
+     "referenced_type" : "type-2258"
     },
     {
      "referenced_type" : "type-2255"
     },
     {
-     "referenced_type" : "type-2252"
-    },
-    {
-     "referenced_type" : "type-2265"
-    },
-    {
-     "referenced_type" : "type-2268"
+     "referenced_type" : "type-2269"
     },
     {
      "referenced_type" : "type-2270"
     },
     {
-     "referenced_type" : "type-2269"
+     "referenced_type" : "type-2272"
     },
     {
-     "referenced_type" : "type-2272"
+     "referenced_type" : "type-2271"
+    },
+    {
+     "referenced_type" : "type-2274"
     }
    ],
    "fields" :
@@ -26674,14 +26746,14 @@
     {
      "access" : "private",
      "field_name" : "m_value",
-     "referenced_type" : "type-2277"
+     "referenced_type" : "type-2279"
     }
    ],
    "linker_set_key" : "android::details::TMat44<float>",
    "name" : "android::details::TMat44<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2276",
-   "self_type" : "type-2276",
+   "referenced_type" : "type-2278",
+   "self_type" : "type-2278",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h",
    "template_args" : [ "type-10" ],
@@ -26704,8 +26776,8 @@
    "linker_set_key" : "android::details::TMatDebug<android::details::TMat44, float>",
    "name" : "android::details::TMatDebug<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2272",
-   "self_type" : "type-2272",
+   "referenced_type" : "type-2274",
+   "self_type" : "type-2274",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26728,8 +26800,8 @@
    "linker_set_key" : "android::details::TMatHelpers<android::details::TMat44, float>",
    "name" : "android::details::TMatHelpers<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2269",
-   "self_type" : "type-2269",
+   "referenced_type" : "type-2271",
+   "self_type" : "type-2271",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26752,8 +26824,8 @@
    "linker_set_key" : "android::details::TMatProductOperators<android::details::TMat44, float>",
    "name" : "android::details::TMatProductOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2265",
-   "self_type" : "type-2265",
+   "referenced_type" : "type-2269",
+   "self_type" : "type-2269",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26776,8 +26848,8 @@
    "linker_set_key" : "android::details::TMatSquareFunctions<android::details::TMat44, float>",
    "name" : "android::details::TMatSquareFunctions<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2268",
-   "self_type" : "type-2268",
+   "referenced_type" : "type-2270",
+   "self_type" : "type-2270",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26800,8 +26872,8 @@
    "linker_set_key" : "android::details::TMatTransform<android::details::TMat44, float>",
    "name" : "android::details::TMatTransform<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2270",
-   "self_type" : "type-2270",
+   "referenced_type" : "type-2272",
+   "self_type" : "type-2272",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26812,11 +26884,11 @@
    "linker_set_key" : "android::details::TQuatDebug<android::details::TQuaternion, double>",
    "name" : "android::details::TQuatDebug<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-49",
-   "self_type" : "type-49",
+   "referenced_type" : "type-51",
+   "self_type" : "type-51",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details10TQuatDebugINS0_11TQuaternionEdEE"
   },
   {
@@ -26824,8 +26896,8 @@
    "linker_set_key" : "android::details::TQuatDebug<android::details::TQuaternion, float>",
    "name" : "android::details::TQuatDebug<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-48",
-   "self_type" : "type-48",
+   "referenced_type" : "type-50",
+   "self_type" : "type-50",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26836,11 +26908,11 @@
    "linker_set_key" : "android::details::TQuatFunctions<android::details::TQuaternion, double>",
    "name" : "android::details::TQuatFunctions<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-47",
-   "self_type" : "type-47",
+   "referenced_type" : "type-49",
+   "self_type" : "type-49",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details14TQuatFunctionsINS0_11TQuaternionEdEE"
   },
   {
@@ -26848,8 +26920,8 @@
    "linker_set_key" : "android::details::TQuatFunctions<android::details::TQuaternion, float>",
    "name" : "android::details::TQuatFunctions<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-43",
-   "self_type" : "type-43",
+   "referenced_type" : "type-45",
+   "self_type" : "type-45",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26860,11 +26932,11 @@
    "linker_set_key" : "android::details::TQuatProductOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TQuatProductOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-40",
-   "self_type" : "type-40",
+   "referenced_type" : "type-42",
+   "self_type" : "type-42",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details21TQuatProductOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -26884,38 +26956,38 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-334"
+     "referenced_type" : "type-331"
     },
     {
-     "referenced_type" : "type-335"
+     "referenced_type" : "type-332"
     },
     {
-     "referenced_type" : "type-336"
+     "referenced_type" : "type-333"
     },
     {
-     "referenced_type" : "type-40"
-    },
-    {
-     "referenced_type" : "type-47"
+     "referenced_type" : "type-42"
     },
     {
      "referenced_type" : "type-49"
+    },
+    {
+     "referenced_type" : "type-51"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-332"
+     "referenced_type" : "type-329"
     }
    ],
    "linker_set_key" : "android::details::TQuaternion<double>",
    "name" : "android::details::TQuaternion<double>",
    "record_kind" : "class",
-   "referenced_type" : "type-331",
-   "self_type" : "type-331",
+   "referenced_type" : "type-328",
+   "self_type" : "type-328",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details11TQuaternionIdEE"
   },
   {
@@ -26923,27 +26995,27 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-330"
     },
     {
      "field_name" : "xyzw",
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-52"
     },
     {
      "field_name" : "xyz",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-68"
     },
     {
      "field_name" : "xy",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "name" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "record_kind" : "union",
-   "referenced_type" : "type-332",
-   "self_type" : "type-332",
+   "referenced_type" : "type-329",
+   "self_type" : "type-329",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIdEUt_E"
@@ -26954,29 +27026,29 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "z",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "w",
      "field_offset" : 192,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
    "name" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
-   "referenced_type" : "type-333",
-   "self_type" : "type-333",
+   "referenced_type" : "type-330",
+   "self_type" : "type-330",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIdEUt_Ut_E"
@@ -26986,35 +27058,35 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-413"
+     "referenced_type" : "type-410"
     },
     {
-     "referenced_type" : "type-414"
+     "referenced_type" : "type-411"
     },
     {
-     "referenced_type" : "type-415"
+     "referenced_type" : "type-412"
     },
     {
      "referenced_type" : "type-38"
     },
     {
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-50"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-411"
+     "referenced_type" : "type-408"
     }
    ],
    "linker_set_key" : "android::details::TQuaternion<float>",
    "name" : "android::details::TQuaternion<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-410",
-   "self_type" : "type-410",
+   "referenced_type" : "type-407",
+   "self_type" : "type-407",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "template_args" : [ "type-10" ],
@@ -27025,27 +27097,27 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-412"
+     "referenced_type" : "type-409"
     },
     {
      "field_name" : "xyzw",
-     "referenced_type" : "type-200"
+     "referenced_type" : "type-192"
     },
     {
      "field_name" : "xyz",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-18"
     },
     {
      "field_name" : "xy",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "name" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "record_kind" : "union",
-   "referenced_type" : "type-411",
-   "self_type" : "type-411",
+   "referenced_type" : "type-408",
+   "self_type" : "type-408",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIfEUt_E"
@@ -27077,8 +27149,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
    "name" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
-   "referenced_type" : "type-412",
-   "self_type" : "type-412",
+   "referenced_type" : "type-409",
+   "self_type" : "type-409",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIfEUt_Ut_E"
@@ -27088,16 +27160,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-396"
+     "referenced_type" : "type-390"
     },
     {
-     "referenced_type" : "type-427"
+     "referenced_type" : "type-424"
     },
     {
-     "referenced_type" : "type-462"
+     "referenced_type" : "type-455"
     },
     {
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-507"
     },
     {
      "referenced_type" : "type-600"
@@ -27220,12 +27292,6 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-61"
-    },
-    {
      "referenced_type" : "type-62"
     },
     {
@@ -27236,22 +27302,28 @@
     },
     {
      "referenced_type" : "type-65"
+    },
+    {
+     "referenced_type" : "type-66"
+    },
+    {
+     "referenced_type" : "type-67"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-58"
     }
    ],
    "linker_set_key" : "android::details::TVec2<double>",
    "name" : "android::details::TVec2<double>",
    "record_kind" : "class",
-   "referenced_type" : "type-55",
-   "self_type" : "type-55",
+   "referenced_type" : "type-57",
+   "self_type" : "type-57",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details5TVec2IdEE"
   },
   {
@@ -27259,21 +27331,21 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-57"
-    },
-    {
-     "referenced_type" : "type-58"
-    },
-    {
      "referenced_type" : "type-59"
+    },
+    {
+     "referenced_type" : "type-60"
+    },
+    {
+     "referenced_type" : "type-61"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5) at frameworks/native/libs/math/include/math/vec2.h:49:5",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5) at frameworks/native/libs/math/include/math/vec2.h:49:5",
    "record_kind" : "union",
-   "referenced_type" : "type-56",
-   "self_type" : "type-56",
+   "referenced_type" : "type-58",
+   "self_type" : "type-58",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_E"
@@ -27284,19 +27356,19 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:50:9) at frameworks/native/libs/math/include/math/vec2.h:50:9",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:50:9) at frameworks/native/libs/math/include/math/vec2.h:50:9",
-   "referenced_type" : "type-57",
-   "self_type" : "type-57",
+   "referenced_type" : "type-59",
+   "self_type" : "type-59",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_Ut_E"
@@ -27307,19 +27379,19 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "t",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:51:9) at frameworks/native/libs/math/include/math/vec2.h:51:9",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:51:9) at frameworks/native/libs/math/include/math/vec2.h:51:9",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
+   "referenced_type" : "type-60",
+   "self_type" : "type-60",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_Ut0_E"
@@ -27330,19 +27402,19 @@
    [
     {
      "field_name" : "r",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "g",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:52:9) at frameworks/native/libs/math/include/math/vec2.h:52:9",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:52:9) at frameworks/native/libs/math/include/math/vec2.h:52:9",
-   "referenced_type" : "type-59",
-   "self_type" : "type-59",
+   "referenced_type" : "type-61",
+   "self_type" : "type-61",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_Ut1_E"
@@ -27352,9 +27424,6 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-27"
-    },
-    {
      "referenced_type" : "type-28"
     },
     {
@@ -27368,19 +27437,22 @@
     },
     {
      "referenced_type" : "type-32"
+    },
+    {
+     "referenced_type" : "type-33"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-24"
     }
    ],
    "linker_set_key" : "android::details::TVec2<float>",
    "name" : "android::details::TVec2<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-22",
-   "self_type" : "type-22",
+   "referenced_type" : "type-23",
+   "self_type" : "type-23",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "template_args" : [ "type-10" ],
@@ -27391,21 +27463,21 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-24"
-    },
-    {
      "referenced_type" : "type-25"
     },
     {
      "referenced_type" : "type-26"
+    },
+    {
+     "referenced_type" : "type-27"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5) at frameworks/native/libs/math/include/math/vec2.h:49:5",
    "name" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5) at frameworks/native/libs/math/include/math/vec2.h:49:5",
    "record_kind" : "union",
-   "referenced_type" : "type-23",
-   "self_type" : "type-23",
+   "referenced_type" : "type-24",
+   "self_type" : "type-24",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IfEUt_E"
@@ -27427,8 +27499,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:50:9) at frameworks/native/libs/math/include/math/vec2.h:50:9",
    "name" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:50:9) at frameworks/native/libs/math/include/math/vec2.h:50:9",
-   "referenced_type" : "type-24",
-   "self_type" : "type-24",
+   "referenced_type" : "type-25",
+   "self_type" : "type-25",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IfEUt_Ut_E"
@@ -27450,8 +27522,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:51:9) at frameworks/native/libs/math/include/math/vec2.h:51:9",
    "name" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:51:9) at frameworks/native/libs/math/include/math/vec2.h:51:9",
-   "referenced_type" : "type-25",
-   "self_type" : "type-25",
+   "referenced_type" : "type-26",
+   "self_type" : "type-26",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IfEUt_Ut0_E"
@@ -27473,8 +27545,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:52:9) at frameworks/native/libs/math/include/math/vec2.h:52:9",
    "name" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:52:9) at frameworks/native/libs/math/include/math/vec2.h:52:9",
-   "referenced_type" : "type-26",
-   "self_type" : "type-26",
+   "referenced_type" : "type-27",
+   "self_type" : "type-27",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IfEUt_Ut1_E"
@@ -27484,12 +27556,6 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-72"
-    },
-    {
      "referenced_type" : "type-73"
     },
     {
@@ -27500,22 +27566,28 @@
     },
     {
      "referenced_type" : "type-76"
+    },
+    {
+     "referenced_type" : "type-77"
+    },
+    {
+     "referenced_type" : "type-78"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-69"
     }
    ],
    "linker_set_key" : "android::details::TVec3<double>",
    "name" : "android::details::TVec3<double>",
    "record_kind" : "class",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
+   "referenced_type" : "type-68",
+   "self_type" : "type-68",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details5TVec3IdEE"
   },
   {
@@ -27523,33 +27595,33 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-68"
-    },
-    {
-     "referenced_type" : "type-69"
-    },
-    {
      "referenced_type" : "type-70"
     },
     {
+     "referenced_type" : "type-71"
+    },
+    {
+     "referenced_type" : "type-72"
+    },
+    {
      "field_name" : "xy",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "st",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "rg",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5) at frameworks/native/libs/math/include/math/vec3.h:47:5",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5) at frameworks/native/libs/math/include/math/vec3.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-67",
-   "self_type" : "type-67",
+   "referenced_type" : "type-69",
+   "self_type" : "type-69",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_E"
@@ -27560,24 +27632,24 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "z",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:48:9) at frameworks/native/libs/math/include/math/vec3.h:48:9",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:48:9) at frameworks/native/libs/math/include/math/vec3.h:48:9",
-   "referenced_type" : "type-68",
-   "self_type" : "type-68",
+   "referenced_type" : "type-70",
+   "self_type" : "type-70",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_Ut_E"
@@ -27588,24 +27660,24 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "t",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "p",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:49:9) at frameworks/native/libs/math/include/math/vec3.h:49:9",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:49:9) at frameworks/native/libs/math/include/math/vec3.h:49:9",
-   "referenced_type" : "type-69",
-   "self_type" : "type-69",
+   "referenced_type" : "type-71",
+   "self_type" : "type-71",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_Ut0_E"
@@ -27616,24 +27688,24 @@
    [
     {
      "field_name" : "r",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "g",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "b",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:50:9) at frameworks/native/libs/math/include/math/vec3.h:50:9",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:50:9) at frameworks/native/libs/math/include/math/vec3.h:50:9",
-   "referenced_type" : "type-70",
-   "self_type" : "type-70",
+   "referenced_type" : "type-72",
+   "self_type" : "type-72",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_Ut1_E"
@@ -27643,35 +27715,35 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-33"
+     "referenced_type" : "type-34"
     },
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-35"
     },
     {
      "referenced_type" : "type-9"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-13"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "type-36"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-19"
     }
    ],
    "linker_set_key" : "android::details::TVec3<float>",
    "name" : "android::details::TVec3<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-17",
-   "self_type" : "type-17",
+   "referenced_type" : "type-18",
+   "self_type" : "type-18",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "template_args" : [ "type-10" ],
@@ -27682,33 +27754,33 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-19"
-    },
-    {
      "referenced_type" : "type-20"
     },
     {
      "referenced_type" : "type-21"
     },
     {
-     "field_name" : "xy",
      "referenced_type" : "type-22"
     },
     {
+     "field_name" : "xy",
+     "referenced_type" : "type-23"
+    },
+    {
      "field_name" : "st",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "rg",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5) at frameworks/native/libs/math/include/math/vec3.h:47:5",
    "name" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5) at frameworks/native/libs/math/include/math/vec3.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-18",
-   "self_type" : "type-18",
+   "referenced_type" : "type-19",
+   "self_type" : "type-19",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IfEUt_E"
@@ -27735,8 +27807,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:48:9) at frameworks/native/libs/math/include/math/vec3.h:48:9",
    "name" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:48:9) at frameworks/native/libs/math/include/math/vec3.h:48:9",
-   "referenced_type" : "type-19",
-   "self_type" : "type-19",
+   "referenced_type" : "type-20",
+   "self_type" : "type-20",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IfEUt_Ut_E"
@@ -27763,8 +27835,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:49:9) at frameworks/native/libs/math/include/math/vec3.h:49:9",
    "name" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:49:9) at frameworks/native/libs/math/include/math/vec3.h:49:9",
-   "referenced_type" : "type-20",
-   "self_type" : "type-20",
+   "referenced_type" : "type-21",
+   "self_type" : "type-21",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IfEUt_Ut0_E"
@@ -27791,8 +27863,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:50:9) at frameworks/native/libs/math/include/math/vec3.h:50:9",
    "name" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:50:9) at frameworks/native/libs/math/include/math/vec3.h:50:9",
-   "referenced_type" : "type-21",
-   "self_type" : "type-21",
+   "referenced_type" : "type-22",
+   "self_type" : "type-22",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IfEUt_Ut1_E"
@@ -27802,12 +27874,6 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-78"
-    },
-    {
      "referenced_type" : "type-79"
     },
     {
@@ -27818,22 +27884,28 @@
     },
     {
      "referenced_type" : "type-82"
+    },
+    {
+     "referenced_type" : "type-83"
+    },
+    {
+     "referenced_type" : "type-84"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-53"
     }
    ],
    "linker_set_key" : "android::details::TVec4<double>",
    "name" : "android::details::TVec4<double>",
    "record_kind" : "class",
-   "referenced_type" : "type-50",
-   "self_type" : "type-50",
+   "referenced_type" : "type-52",
+   "self_type" : "type-52",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details5TVec4IdEE"
   },
   {
@@ -27841,45 +27913,45 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-52"
-    },
-    {
-     "referenced_type" : "type-53"
-    },
-    {
      "referenced_type" : "type-54"
     },
     {
-     "field_name" : "xy",
      "referenced_type" : "type-55"
     },
     {
+     "referenced_type" : "type-56"
+    },
+    {
+     "field_name" : "xy",
+     "referenced_type" : "type-57"
+    },
+    {
      "field_name" : "st",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "rg",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "xyz",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-68"
     },
     {
      "field_name" : "stp",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-68"
     },
     {
      "field_name" : "rgb",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-68"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-51",
-   "self_type" : "type-51",
+   "referenced_type" : "type-53",
+   "self_type" : "type-53",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_E"
@@ -27890,29 +27962,29 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "z",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "w",
      "field_offset" : 192,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
-   "referenced_type" : "type-52",
-   "self_type" : "type-52",
+   "referenced_type" : "type-54",
+   "self_type" : "type-54",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_Ut_E"
@@ -27923,29 +27995,29 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "t",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "p",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "q",
      "field_offset" : 192,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
-   "referenced_type" : "type-53",
-   "self_type" : "type-53",
+   "referenced_type" : "type-55",
+   "self_type" : "type-55",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_Ut0_E"
@@ -27956,29 +28028,29 @@
    [
     {
      "field_name" : "r",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "g",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "b",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "a",
      "field_offset" : 192,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
-   "referenced_type" : "type-54",
-   "self_type" : "type-54",
+   "referenced_type" : "type-56",
+   "self_type" : "type-56",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_Ut1_E"
@@ -27988,35 +28060,35 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-205"
+     "referenced_type" : "type-197"
     },
     {
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-198"
     },
     {
-     "referenced_type" : "type-207"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-200"
     },
     {
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-201"
     },
     {
-     "referenced_type" : "type-210"
+     "referenced_type" : "type-202"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-193"
     }
    ],
    "linker_set_key" : "android::details::TVec4<float>",
    "name" : "android::details::TVec4<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-200",
-   "self_type" : "type-200",
+   "referenced_type" : "type-192",
+   "self_type" : "type-192",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "template_args" : [ "type-10" ],
@@ -28027,45 +28099,45 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-202"
+     "referenced_type" : "type-194"
     },
     {
-     "referenced_type" : "type-203"
+     "referenced_type" : "type-195"
     },
     {
-     "referenced_type" : "type-204"
+     "referenced_type" : "type-196"
     },
     {
      "field_name" : "xy",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "st",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "rg",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "xyz",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-18"
     },
     {
      "field_name" : "stp",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-18"
     },
     {
      "field_name" : "rgb",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-18"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-201",
-   "self_type" : "type-201",
+   "referenced_type" : "type-193",
+   "self_type" : "type-193",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_E"
@@ -28097,8 +28169,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
-   "referenced_type" : "type-202",
-   "self_type" : "type-202",
+   "referenced_type" : "type-194",
+   "self_type" : "type-194",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_Ut_E"
@@ -28130,8 +28202,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
-   "referenced_type" : "type-203",
-   "self_type" : "type-203",
+   "referenced_type" : "type-195",
+   "self_type" : "type-195",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_Ut0_E"
@@ -28163,8 +28235,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
-   "referenced_type" : "type-204",
-   "self_type" : "type-204",
+   "referenced_type" : "type-196",
+   "self_type" : "type-196",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_Ut1_E"
@@ -28186,8 +28258,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TMat44, float>",
    "name" : "android::details::TVecAddOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2252",
-   "self_type" : "type-2252",
+   "referenced_type" : "type-2255",
+   "self_type" : "type-2255",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28198,11 +28270,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TVecAddOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-334",
-   "self_type" : "type-334",
+   "referenced_type" : "type-331",
+   "self_type" : "type-331",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -28210,8 +28282,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TQuaternion, float>",
    "name" : "android::details::TVecAddOperators<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-413",
-   "self_type" : "type-413",
+   "referenced_type" : "type-410",
+   "self_type" : "type-410",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28222,8 +28294,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecAddOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-427",
-   "self_type" : "type-427",
+   "referenced_type" : "type-424",
+   "self_type" : "type-424",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -28234,11 +28306,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecAddOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-61",
-   "self_type" : "type-61",
+   "referenced_type" : "type-63",
+   "self_type" : "type-63",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -28246,8 +28318,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec2, float>",
    "name" : "android::details::TVecAddOperators<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-28",
-   "self_type" : "type-28",
+   "referenced_type" : "type-29",
+   "self_type" : "type-29",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28258,11 +28330,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecAddOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-72",
-   "self_type" : "type-72",
+   "referenced_type" : "type-74",
+   "self_type" : "type-74",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -28270,8 +28342,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec3, float>",
    "name" : "android::details::TVecAddOperators<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-34",
-   "self_type" : "type-34",
+   "referenced_type" : "type-35",
+   "self_type" : "type-35",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28282,11 +28354,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecAddOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-78",
-   "self_type" : "type-78",
+   "referenced_type" : "type-80",
+   "self_type" : "type-80",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -28294,8 +28366,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecAddOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-206",
-   "self_type" : "type-206",
+   "referenced_type" : "type-198",
+   "self_type" : "type-198",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28318,8 +28390,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TMat44, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2255",
-   "self_type" : "type-2255",
+   "referenced_type" : "type-2258",
+   "self_type" : "type-2258",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28330,11 +28402,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-336",
-   "self_type" : "type-336",
+   "referenced_type" : "type-333",
+   "self_type" : "type-333",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -28342,8 +28414,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TQuaternion, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-415",
-   "self_type" : "type-415",
+   "referenced_type" : "type-412",
+   "self_type" : "type-412",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28354,8 +28426,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-510",
-   "self_type" : "type-510",
+   "referenced_type" : "type-507",
+   "self_type" : "type-507",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -28366,11 +28438,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-63",
-   "self_type" : "type-63",
+   "referenced_type" : "type-65",
+   "self_type" : "type-65",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -28378,8 +28450,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec2, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-30",
-   "self_type" : "type-30",
+   "referenced_type" : "type-31",
+   "self_type" : "type-31",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28390,11 +28462,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-74",
-   "self_type" : "type-74",
+   "referenced_type" : "type-76",
+   "self_type" : "type-76",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -28402,8 +28474,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec3, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-11",
-   "self_type" : "type-11",
+   "referenced_type" : "type-13",
+   "self_type" : "type-13",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28414,11 +28486,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-80",
-   "self_type" : "type-80",
+   "referenced_type" : "type-82",
+   "self_type" : "type-82",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -28426,8 +28498,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-208",
-   "self_type" : "type-208",
+   "referenced_type" : "type-200",
+   "self_type" : "type-200",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28450,11 +28522,11 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec2, double>",
    "name" : "android::details::TVecDebug<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-65",
-   "self_type" : "type-65",
+   "referenced_type" : "type-67",
+   "self_type" : "type-67",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details9TVecDebugINS0_5TVec2EdEE"
   },
   {
@@ -28462,8 +28534,8 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec2, float>",
    "name" : "android::details::TVecDebug<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-32",
-   "self_type" : "type-32",
+   "referenced_type" : "type-33",
+   "self_type" : "type-33",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28474,11 +28546,11 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec3, double>",
    "name" : "android::details::TVecDebug<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-76",
-   "self_type" : "type-76",
+   "referenced_type" : "type-78",
+   "self_type" : "type-78",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details9TVecDebugINS0_5TVec3EdEE"
   },
   {
@@ -28486,8 +28558,8 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec3, float>",
    "name" : "android::details::TVecDebug<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-35",
-   "self_type" : "type-35",
+   "referenced_type" : "type-36",
+   "self_type" : "type-36",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28498,11 +28570,11 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec4, double>",
    "name" : "android::details::TVecDebug<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-82",
-   "self_type" : "type-82",
+   "referenced_type" : "type-84",
+   "self_type" : "type-84",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details9TVecDebugINS0_5TVec4EdEE"
   },
   {
@@ -28510,8 +28582,8 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec4, float>",
    "name" : "android::details::TVecDebug<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-210",
-   "self_type" : "type-210",
+   "referenced_type" : "type-202",
+   "self_type" : "type-202",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28534,11 +28606,11 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec2, double>",
    "name" : "android::details::TVecFunctions<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-64",
-   "self_type" : "type-64",
+   "referenced_type" : "type-66",
+   "self_type" : "type-66",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details13TVecFunctionsINS0_5TVec2EdEE"
   },
   {
@@ -28546,8 +28618,8 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec2, float>",
    "name" : "android::details::TVecFunctions<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-31",
-   "self_type" : "type-31",
+   "referenced_type" : "type-32",
+   "self_type" : "type-32",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28558,11 +28630,11 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec3, double>",
    "name" : "android::details::TVecFunctions<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-75",
-   "self_type" : "type-75",
+   "referenced_type" : "type-77",
+   "self_type" : "type-77",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details13TVecFunctionsINS0_5TVec3EdEE"
   },
   {
@@ -28570,8 +28642,8 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec3, float>",
    "name" : "android::details::TVecFunctions<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-12",
-   "self_type" : "type-12",
+   "referenced_type" : "type-14",
+   "self_type" : "type-14",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28582,11 +28654,11 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec4, double>",
    "name" : "android::details::TVecFunctions<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-81",
-   "self_type" : "type-81",
+   "referenced_type" : "type-83",
+   "self_type" : "type-83",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details13TVecFunctionsINS0_5TVec4EdEE"
   },
   {
@@ -28594,8 +28666,8 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec4, float>",
    "name" : "android::details::TVecFunctions<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-209",
-   "self_type" : "type-209",
+   "referenced_type" : "type-201",
+   "self_type" : "type-201",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28606,8 +28678,8 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecProductOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-396",
-   "self_type" : "type-396",
+   "referenced_type" : "type-390",
+   "self_type" : "type-390",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -28618,11 +28690,11 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecProductOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-60",
-   "self_type" : "type-60",
+   "referenced_type" : "type-62",
+   "self_type" : "type-62",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details20TVecProductOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -28630,8 +28702,8 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec2, float>",
    "name" : "android::details::TVecProductOperators<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-27",
-   "self_type" : "type-27",
+   "referenced_type" : "type-28",
+   "self_type" : "type-28",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28642,11 +28714,11 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecProductOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-71",
-   "self_type" : "type-71",
+   "referenced_type" : "type-73",
+   "self_type" : "type-73",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details20TVecProductOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -28654,8 +28726,8 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec3, float>",
    "name" : "android::details::TVecProductOperators<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-33",
-   "self_type" : "type-33",
+   "referenced_type" : "type-34",
+   "self_type" : "type-34",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28666,11 +28738,11 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecProductOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-77",
-   "self_type" : "type-77",
+   "referenced_type" : "type-79",
+   "self_type" : "type-79",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details20TVecProductOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -28678,8 +28750,8 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecProductOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-205",
-   "self_type" : "type-205",
+   "referenced_type" : "type-197",
+   "self_type" : "type-197",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28702,8 +28774,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TMat44, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2254",
-   "self_type" : "type-2254",
+   "referenced_type" : "type-2257",
+   "self_type" : "type-2257",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28714,11 +28786,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-335",
-   "self_type" : "type-335",
+   "referenced_type" : "type-332",
+   "self_type" : "type-332",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -28726,8 +28798,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TQuaternion, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-414",
-   "self_type" : "type-414",
+   "referenced_type" : "type-411",
+   "self_type" : "type-411",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28738,8 +28810,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-462",
-   "self_type" : "type-462",
+   "referenced_type" : "type-455",
+   "self_type" : "type-455",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -28750,11 +28822,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-62",
-   "self_type" : "type-62",
+   "referenced_type" : "type-64",
+   "self_type" : "type-64",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -28762,8 +28834,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec2, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-29",
-   "self_type" : "type-29",
+   "referenced_type" : "type-30",
+   "self_type" : "type-30",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28774,11 +28846,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-73",
-   "self_type" : "type-73",
+   "referenced_type" : "type-75",
+   "self_type" : "type-75",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -28798,11 +28870,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-79",
-   "self_type" : "type-79",
+   "referenced_type" : "type-81",
+   "self_type" : "type-81",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -28810,8 +28882,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-207",
-   "self_type" : "type-207",
+   "referenced_type" : "type-199",
+   "self_type" : "type-199",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28877,7 +28949,7 @@
    [
     {
      "field_name" : "bits",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "fp",
@@ -28899,7 +28971,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-196"
+     "referenced_type" : "type-209"
     }
    ],
    "fields" :
@@ -28908,32 +28980,32 @@
      "access" : "protected",
      "field_name" : "mSchedPolicy",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "protected",
      "field_name" : "mSchedPriority",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mExtras",
      "field_offset" : 96,
-     "referenced_type" : "type-243"
+     "referenced_type" : "type-245"
     },
     {
      "access" : "private",
      "field_name" : "mReserved0",
      "field_offset" : 128,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
    "linker_set_key" : "android::hardware::BHwBinder",
    "name" : "android::hardware::BHwBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-242",
-   "self_type" : "type-242",
+   "referenced_type" : "type-244",
+   "self_type" : "type-244",
    "size" : 28,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware9BHwBinderE",
@@ -29040,7 +29112,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "fields" :
@@ -29049,26 +29121,26 @@
      "access" : "private",
      "field_name" : "mRemote",
      "field_offset" : 32,
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-207"
     },
     {
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 64,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-210"
     },
     {
      "access" : "private",
      "field_name" : "mState",
      "field_offset" : 96,
-     "referenced_type" : "type-199"
+     "referenced_type" : "type-212"
     }
    ],
    "linker_set_key" : "android::hardware::BpHwRefBase",
    "name" : "android::hardware::BpHwRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-193",
-   "self_type" : "type-193",
+   "referenced_type" : "type-206",
+   "self_type" : "type-206",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE",
@@ -29157,22 +29229,22 @@
    [
     {
      "field_name" : "flags",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "fdIndex",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "offset",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "extent",
      "field_offset" : 128,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "android::hardware::GrantorDescriptor",
@@ -29193,7 +29265,7 @@
     },
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::HidlMemory",
@@ -29281,14 +29353,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::IBinder",
    "name" : "android::hardware::IBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-196",
-   "self_type" : "type-196",
+   "referenced_type" : "type-209",
+   "self_type" : "type-209",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinderE",
@@ -29398,14 +29470,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient",
    "name" : "android::hardware::IBinder::DeathRecipient",
    "record_kind" : "class",
-   "referenced_type" : "type-192",
-   "self_type" : "type-192",
+   "referenced_type" : "type-205",
+   "self_type" : "type-205",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinder14DeathRecipientE",
@@ -29486,14 +29558,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::IInterface",
    "name" : "android::hardware::IInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-213",
-   "self_type" : "type-213",
+   "referenced_type" : "type-215",
+   "self_type" : "type-215",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
    "unique_id" : "_ZTSN7android8hardware10IInterfaceE",
@@ -29575,85 +29647,85 @@
     {
      "access" : "private",
      "field_name" : "mProcess",
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-274"
     },
     {
      "access" : "private",
      "field_name" : "mPendingStrongDerefs",
      "field_offset" : 32,
-     "referenced_type" : "type-240"
+     "referenced_type" : "type-242"
     },
     {
      "access" : "private",
      "field_name" : "mPendingWeakDerefs",
      "field_offset" : 192,
-     "referenced_type" : "type-244"
+     "referenced_type" : "type-246"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteStrongDerefs",
      "field_offset" : 352,
-     "referenced_type" : "type-245"
+     "referenced_type" : "type-247"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteWeakDerefs",
      "field_offset" : 512,
-     "referenced_type" : "type-244"
+     "referenced_type" : "type-246"
     },
     {
      "access" : "private",
      "field_name" : "mIn",
      "field_offset" : 672,
-     "referenced_type" : "type-215"
+     "referenced_type" : "type-217"
     },
     {
      "access" : "private",
      "field_name" : "mOut",
      "field_offset" : 1216,
-     "referenced_type" : "type-215"
+     "referenced_type" : "type-217"
     },
     {
      "access" : "private",
      "field_name" : "mLastError",
      "field_offset" : 1760,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mCallingPid",
      "field_offset" : 1792,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mCallingSid",
      "field_offset" : 1824,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "access" : "private",
      "field_name" : "mCallingUid",
      "field_offset" : 1856,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mStrictModePolicy",
      "field_offset" : 1888,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mLastTransactionBinderFlags",
      "field_offset" : 1920,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mContextObject",
      "field_offset" : 1952,
-     "referenced_type" : "type-289"
+     "referenced_type" : "type-286"
     },
     {
      "access" : "private",
@@ -29671,26 +29743,26 @@
      "access" : "private",
      "field_name" : "mPostCommandTasks",
      "field_offset" : 2016,
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-287"
     },
     {
      "access" : "private",
      "field_name" : "mIPCThreadStateBase",
      "field_offset" : 2112,
-     "referenced_type" : "type-291"
+     "referenced_type" : "type-288"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 2144,
-     "referenced_type" : "type-276"
+     "referenced_type" : "type-272"
     }
    ],
    "linker_set_key" : "android::hardware::IPCThreadState",
    "name" : "android::hardware::IPCThreadState",
    "record_kind" : "class",
-   "referenced_type" : "type-277",
-   "self_type" : "type-277",
+   "referenced_type" : "type-273",
+   "self_type" : "type-273",
    "size" : 272,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h",
    "unique_id" : "_ZTSN7android8hardware14IPCThreadStateE"
@@ -29702,73 +29774,73 @@
     {
      "access" : "private",
      "field_name" : "mBufCachePos",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mBufCache",
      "field_offset" : 32,
-     "referenced_type" : "type-216"
+     "referenced_type" : "type-218"
     },
     {
      "access" : "private",
      "field_name" : "mError",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mData",
      "field_offset" : 160,
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-219"
     },
     {
      "access" : "private",
      "field_name" : "mDataSize",
      "field_offset" : 192,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mDataCapacity",
      "field_offset" : 224,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mDataPos",
      "field_offset" : 256,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mObjects",
      "field_offset" : 288,
-     "referenced_type" : "type-219"
+     "referenced_type" : "type-221"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsSize",
      "field_offset" : 320,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsCapacity",
      "field_offset" : 352,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mNextObjectHint",
      "field_offset" : 384,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mNumRef",
      "field_offset" : 416,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -29792,20 +29864,20 @@
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 480,
-     "referenced_type" : "type-220"
+     "referenced_type" : "type-222"
     },
     {
      "access" : "private",
      "field_name" : "mOwnerCookie",
      "field_offset" : 512,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
    "linker_set_key" : "android::hardware::Parcel",
    "name" : "android::hardware::Parcel",
    "record_kind" : "class",
-   "referenced_type" : "type-215",
-   "self_type" : "type-215",
+   "referenced_type" : "type-217",
+   "self_type" : "type-217",
    "size" : 68,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6ParcelE"
@@ -29817,23 +29889,23 @@
    [
     {
      "field_name" : "index",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "buffer",
      "field_offset" : 64,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "bufend",
      "field_offset" : 128,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "android::hardware::Parcel::BufferInfo",
    "name" : "android::hardware::Parcel::BufferInfo",
-   "referenced_type" : "type-228",
-   "self_type" : "type-228",
+   "referenced_type" : "type-230",
+   "self_type" : "type-230",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE"
@@ -29844,7 +29916,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "fields" :
@@ -29853,55 +29925,55 @@
      "access" : "private",
      "field_name" : "mDriverFD",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mVMStart",
      "field_offset" : 64,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountLock",
      "field_offset" : 96,
-     "referenced_type" : "type-282"
+     "referenced_type" : "type-278"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountDecrement",
      "field_offset" : 128,
-     "referenced_type" : "type-283"
+     "referenced_type" : "type-279"
     },
     {
      "access" : "private",
      "field_name" : "mExecutingThreadsCount",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mMaxThreads",
      "field_offset" : 192,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mStarvationStartTimeMs",
      "field_offset" : 256,
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 320,
-     "referenced_type" : "type-252"
+     "referenced_type" : "type-280"
     },
     {
      "access" : "private",
      "field_name" : "mHandleToObject",
      "field_offset" : 352,
-     "referenced_type" : "type-238"
+     "referenced_type" : "type-240"
     },
     {
      "access" : "private",
@@ -29913,25 +29985,25 @@
      "access" : "private",
      "field_name" : "mBinderContextCheckFunc",
      "field_offset" : 544,
-     "referenced_type" : "type-274"
+     "referenced_type" : "type-270"
     },
     {
      "access" : "private",
      "field_name" : "mBinderContextUserData",
      "field_offset" : 576,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "access" : "private",
      "field_name" : "mContexts",
      "field_offset" : 608,
-     "referenced_type" : "type-247"
+     "referenced_type" : "type-249"
     },
     {
      "access" : "private",
      "field_name" : "mRootDir",
      "field_offset" : 768,
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-282"
     },
     {
      "access" : "private",
@@ -29949,26 +30021,26 @@
      "access" : "private",
      "field_name" : "mThreadPoolSeq",
      "field_offset" : 832,
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-271"
     },
     {
      "access" : "private",
      "field_name" : "mMmapSize",
      "field_offset" : 864,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 896,
-     "referenced_type" : "type-276"
+     "referenced_type" : "type-272"
     }
    ],
    "linker_set_key" : "android::hardware::ProcessState",
    "name" : "android::hardware::ProcessState",
    "record_kind" : "class",
-   "referenced_type" : "type-281",
-   "self_type" : "type-281",
+   "referenced_type" : "type-277",
+   "self_type" : "type-277",
    "size" : 128,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessStateE",
@@ -30046,18 +30118,18 @@
    [
     {
      "field_name" : "binder",
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-208"
     },
     {
      "field_name" : "refs",
      "field_offset" : 32,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-210"
     }
    ],
    "linker_set_key" : "android::hardware::ProcessState::handle_entry",
    "name" : "android::hardware::ProcessState::handle_entry",
-   "referenced_type" : "type-239",
-   "self_type" : "type-239",
+   "referenced_type" : "type-241",
+   "self_type" : "type-241",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE"
@@ -30067,7 +30139,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "fields" :
@@ -30076,17 +30148,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-102"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
    "record_kind" : "class",
-   "referenced_type" : "type-99",
-   "self_type" : "type-99",
+   "referenced_type" : "type-101",
+   "self_type" : "type-101",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-105" ],
+   "template_args" : [ "type-107" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS0_8graphics6mapper4V2_05ErrorEEE"
   },
   {
@@ -30094,7 +30166,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "fields" :
@@ -30103,17 +30175,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-393"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
    "record_kind" : "class",
-   "referenced_type" : "type-393",
-   "self_type" : "type-393",
+   "referenced_type" : "type-392",
+   "self_type" : "type-392",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-395" ],
+   "template_args" : [ "type-394" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS0_8graphics6mapper4V3_05ErrorEEE"
   },
   {
@@ -30121,7 +30193,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "fields" :
@@ -30130,17 +30202,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-88"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
    "record_kind" : "class",
-   "referenced_type" : "type-111",
-   "self_type" : "type-111",
+   "referenced_type" : "type-113",
+   "self_type" : "type-113",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-88" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics6mapper4V2_17IMapperEEEEE"
   },
   {
@@ -30148,7 +30220,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "linker_set_key" : "android::hardware::Return<void>",
@@ -30158,7 +30230,7 @@
    "self_type" : "type-1322",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIvEE"
   },
   {
@@ -30168,26 +30240,26 @@
     {
      "access" : "private",
      "field_name" : "mException",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mErrorCode",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-106"
     }
    ],
    "linker_set_key" : "android::hardware::Status",
    "name" : "android::hardware::Status",
    "record_kind" : "class",
-   "referenced_type" : "type-102",
-   "self_type" : "type-102",
+   "referenced_type" : "type-104",
+   "self_type" : "type-104",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware6StatusE"
@@ -30293,7 +30365,7 @@
    "self_type" : "type-1103",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware7details14const_accessorIjLj10EJEEE"
   },
   {
@@ -30307,12 +30379,12 @@
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-1099",
    "self_type" : "type-1099",
@@ -30344,16 +30416,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-137"
+     "referenced_type" : "type-140"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
-   "referenced_type" : "type-136",
-   "self_type" : "type-136",
+   "referenced_type" : "type-139",
+   "self_type" : "type-139",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-139" ],
+   "template_args" : [ "type-142" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_handleEEE"
   },
   {
@@ -30371,7 +30443,7 @@
    "self_type" : "type-1071",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-287" ],
+   "template_args" : [ "type-284" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEE"
   },
   {
@@ -30381,16 +30453,16 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-1072",
    "self_type" : "type-1072",
@@ -30404,16 +30476,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-144"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>",
-   "referenced_type" : "type-140",
-   "self_type" : "type-140",
+   "referenced_type" : "type-143",
+   "self_type" : "type-143",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-143" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEE"
   },
   {
@@ -30423,19 +30495,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-141",
-   "self_type" : "type-141",
+   "referenced_type" : "type-144",
+   "self_type" : "type-144",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEUt_E"
@@ -30447,19 +30519,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-141"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<hidl_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<hidl_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-137",
-   "self_type" : "type-137",
+   "referenced_type" : "type-140",
+   "self_type" : "type-140",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_handleEEUt_E"
@@ -30479,7 +30551,7 @@
    "self_type" : "type-1150",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-144" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEE"
   },
   {
@@ -30493,12 +30565,12 @@
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-1151",
    "self_type" : "type-1151",
@@ -30512,16 +30584,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-121"
+     "referenced_type" : "type-123"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int>",
    "name" : "android::hardware::details::hidl_pointer<unsigned int>",
-   "referenced_type" : "type-120",
-   "self_type" : "type-120",
+   "referenced_type" : "type-122",
+   "self_type" : "type-122",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIjEE"
   },
   {
@@ -30531,19 +30603,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<unsigned int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<unsigned int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-121",
-   "self_type" : "type-121",
+   "referenced_type" : "type-123",
+   "self_type" : "type-123",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIjEUt_E"
@@ -30565,7 +30637,7 @@
     {
      "access" : "private",
      "field_name" : "mStatus",
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-104"
     },
     {
      "access" : "private",
@@ -30577,8 +30649,8 @@
    "linker_set_key" : "android::hardware::details::return_status",
    "name" : "android::hardware::details::return_status",
    "record_kind" : "class",
-   "referenced_type" : "type-101",
-   "self_type" : "type-101",
+   "referenced_type" : "type-103",
+   "self_type" : "type-103",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware7details13return_statusE"
@@ -30591,7 +30663,7 @@
    "self_type" : "type-1102",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware7details9std_arrayIjLj10EJEEE"
   },
   {
@@ -30605,7 +30677,7 @@
     {
      "field_name" : "nativeHandle",
      "field_offset" : 320,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-142"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::HardwareBuffer",
@@ -30632,7 +30704,7 @@
    "self_type" : "type-1108",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware10hidl_arrayIjLj10EJEEE"
   },
   {
@@ -30641,7 +30713,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_death_recipient",
@@ -30726,33 +30798,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
    "name" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
-   "referenced_type" : "type-149",
-   "self_type" : "type-149",
+   "referenced_type" : "type-152",
+   "self_type" : "type-152",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-150", "type-151" ],
+   "template_args" : [ "type-153", "type-154" ],
    "unique_id" : "_ZTSN7android8hardware15hidl_enum_rangeINS0_8graphics6common4V1_011BufferUsageEvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
    "name" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
-   "referenced_type" : "type-157",
-   "self_type" : "type-157",
+   "referenced_type" : "type-159",
+   "self_type" : "type-159",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-158", "type-151" ],
+   "template_args" : [ "type-160", "type-154" ],
    "unique_id" : "_ZTSN7android8hardware15hidl_enum_rangeINS0_8graphics6common4V1_111BufferUsageEvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
    "name" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
-   "referenced_type" : "type-419",
-   "self_type" : "type-419",
+   "referenced_type" : "type-416",
+   "self_type" : "type-416",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-420", "type-151" ],
+   "template_args" : [ "type-417", "type-154" ],
    "unique_id" : "_ZTSN7android8hardware15hidl_enum_rangeINS0_8graphics6common4V1_211BufferUsageEvEE"
   },
   {
@@ -30762,7 +30834,7 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-140"
+     "referenced_type" : "type-143"
     },
     {
      "access" : "private",
@@ -30773,8 +30845,8 @@
    ],
    "linker_set_key" : "android::hardware::hidl_handle",
    "name" : "android::hardware::hidl_handle",
-   "referenced_type" : "type-139",
-   "self_type" : "type-139",
+   "referenced_type" : "type-142",
+   "self_type" : "type-142",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_handleE"
@@ -30786,13 +30858,13 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-142"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 128,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
@@ -30822,7 +30894,7 @@
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -30852,7 +30924,7 @@
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -30877,13 +30949,13 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-136"
+     "referenced_type" : "type-139"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -30894,11 +30966,11 @@
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_handle>",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_handle>",
-   "referenced_type" : "type-135",
-   "self_type" : "type-135",
+   "referenced_type" : "type-138",
+   "self_type" : "type-138",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-139" ],
+   "template_args" : [ "type-142" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_11hidl_handleEEE"
   },
   {
@@ -30908,13 +30980,13 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-120"
+     "referenced_type" : "type-122"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -30925,11 +30997,11 @@
    ],
    "linker_set_key" : "android::hardware::hidl_vec<unsigned int>",
    "name" : "android::hardware::hidl_vec<unsigned int>",
-   "referenced_type" : "type-128",
-   "self_type" : "type-128",
+   "referenced_type" : "type-131",
+   "self_type" : "type-131",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecIjEE"
   },
   {
@@ -30962,23 +31034,23 @@
    [
     {
      "field_name" : "pid",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "ptr",
      "field_offset" : 64,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "arch",
      "field_offset" : 128,
-     "referenced_type" : "type-164"
+     "referenced_type" : "type-167"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo",
    "name" : "android::hidl::base::V1_0::DebugInfo",
-   "referenced_type" : "type-163",
-   "self_type" : "type-163",
+   "referenced_type" : "type-166",
+   "self_type" : "type-166",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfoE"
@@ -30989,13 +31061,13 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::IBase",
    "name" : "android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-171",
-   "self_type" : "type-171",
+   "referenced_type" : "type-174",
+   "self_type" : "type-174",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_05IBaseE",
@@ -31104,13 +31176,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-174"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification",
    "name" : "android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-295",
-   "self_type" : "type-295",
+   "referenced_type" : "type-292",
+   "self_type" : "type-292",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_020IServiceNotificationE",
@@ -31224,12 +31296,12 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
      "field_name" : "value",
      "field_offset" : 64,
-     "referenced_type" : "type-676"
+     "referenced_type" : "type-680"
     }
    ],
    "linker_set_key" : "android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
@@ -31238,7 +31310,7 @@
    "self_type" : "type-694",
    "size" : 56,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142", "type-676" ],
+   "template_args" : [ "type-145", "type-680" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -31268,17 +31340,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
    "linker_set_key" : "android::sp<android::GraphicBuffer>",
    "name" : "android::sp<android::GraphicBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-679",
-   "self_type" : "type-679",
+   "referenced_type" : "type-678",
+   "self_type" : "type-678",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-525" ],
+   "template_args" : [ "type-523" ],
    "unique_id" : "_ZTSN7android2spINS_13GraphicBufferEEE"
   },
   {
@@ -31288,17 +31360,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-365"
     }
    ],
    "linker_set_key" : "android::sp<android::Thread>",
    "name" : "android::sp<android::Thread>",
    "record_kind" : "class",
-   "referenced_type" : "type-367",
-   "self_type" : "type-367",
+   "referenced_type" : "type-364",
+   "self_type" : "type-364",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-369" ],
+   "template_args" : [ "type-366" ],
    "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
   },
   {
@@ -31308,17 +31380,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-241"
+     "referenced_type" : "type-243"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::BHwBinder>",
    "name" : "android::sp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-289",
-   "self_type" : "type-289",
+   "referenced_type" : "type-286",
+   "self_type" : "type-286",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-242" ],
+   "template_args" : [ "type-244" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
   },
   {
@@ -31328,17 +31400,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-208"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IBinder>",
    "name" : "android::sp<android::hardware::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-248",
-   "self_type" : "type-248",
+   "referenced_type" : "type-250",
+   "self_type" : "type-250",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-196" ],
+   "template_args" : [ "type-209" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
   },
   {
@@ -31348,17 +31420,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-280"
+     "referenced_type" : "type-276"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::ProcessState>",
    "name" : "android::sp<android::hardware::ProcessState>",
    "record_kind" : "class",
-   "referenced_type" : "type-279",
-   "self_type" : "type-279",
+   "referenced_type" : "type-275",
+   "self_type" : "type-275",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-281" ],
+   "template_args" : [ "type-277" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
   },
   {
@@ -31368,17 +31440,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-356"
+     "referenced_type" : "type-353"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
    "record_kind" : "class",
-   "referenced_type" : "type-355",
-   "self_type" : "type-355",
+   "referenced_type" : "type-352",
+   "self_type" : "type-352",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-358" ],
+   "template_args" : [ "type-355" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics9allocator4V2_010IAllocatorEEE"
   },
   {
@@ -31388,17 +31460,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-485"
+     "referenced_type" : "type-482"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
    "record_kind" : "class",
-   "referenced_type" : "type-484",
-   "self_type" : "type-484",
+   "referenced_type" : "type-481",
+   "self_type" : "type-481",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-487" ],
+   "template_args" : [ "type-484" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics9allocator4V3_010IAllocatorEEE"
   },
   {
@@ -31408,17 +31480,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-339"
+     "referenced_type" : "type-336"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-338",
-   "self_type" : "type-338",
+   "referenced_type" : "type-335",
+   "self_type" : "type-335",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-341" ],
+   "template_args" : [ "type-338" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics6mapper4V2_07IMapperEEE"
   },
   {
@@ -31428,17 +31500,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-87"
+     "referenced_type" : "type-89"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-86",
-   "self_type" : "type-86",
+   "referenced_type" : "type-88",
+   "self_type" : "type-88",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-89" ],
+   "template_args" : [ "type-91" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics6mapper4V2_17IMapperEEE"
   },
   {
@@ -31448,17 +31520,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-498"
+     "referenced_type" : "type-495"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-497",
-   "self_type" : "type-497",
+   "referenced_type" : "type-494",
+   "self_type" : "type-494",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-500" ],
+   "template_args" : [ "type-497" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics6mapper4V3_07IMapperEEE"
   },
   {
@@ -31488,17 +31560,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-364"
+     "referenced_type" : "type-361"
     }
    ],
    "linker_set_key" : "android::sp<android::hidl::base::V1_0::IBase>",
    "name" : "android::sp<android::hidl::base::V1_0::IBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-363",
-   "self_type" : "type-363",
+   "referenced_type" : "type-360",
+   "self_type" : "type-360",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-171" ],
+   "template_args" : [ "type-174" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl4base4V1_05IBaseEEE"
   },
   {
@@ -31508,36 +31580,36 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-369"
     }
    ],
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceNotification>",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification>",
    "record_kind" : "class",
-   "referenced_type" : "type-371",
-   "self_type" : "type-371",
+   "referenced_type" : "type-368",
+   "self_type" : "type-368",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-295" ],
+   "template_args" : [ "type-292" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::trait_pointer<android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-819",
-   "self_type" : "type-819",
+   "referenced_type" : "type-820",
+   "self_type" : "type-820",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::Rect>",
    "name" : "android::trait_pointer<android::Rect>",
-   "referenced_type" : "type-2234",
-   "self_type" : "type-2234",
+   "referenced_type" : "type-2237",
+   "self_type" : "type-2237",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -31547,8 +31619,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::trait_pointer<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-817",
-   "self_type" : "type-817",
+   "referenced_type" : "type-818",
+   "self_type" : "type-818",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -31558,33 +31630,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<const native_handle *>",
    "name" : "android::trait_pointer<const native_handle *>",
-   "referenced_type" : "type-818",
-   "self_type" : "type-818",
+   "referenced_type" : "type-819",
+   "self_type" : "type-819",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android13trait_pointerIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<long long>",
    "name" : "android::trait_pointer<long long>",
-   "referenced_type" : "type-1430",
-   "self_type" : "type-1430",
+   "referenced_type" : "type-1434",
+   "self_type" : "type-1434",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android13trait_pointerIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::trait_trivial_copy<android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-812",
-   "self_type" : "type-812",
+   "referenced_type" : "type-813",
+   "self_type" : "type-813",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -31613,8 +31685,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-813",
-   "self_type" : "type-813",
+   "referenced_type" : "type-814",
+   "self_type" : "type-814",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -31624,8 +31696,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-483",
-   "self_type" : "type-483",
+   "referenced_type" : "type-480",
+   "self_type" : "type-480",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -31635,11 +31707,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-512",
-   "self_type" : "type-512",
+   "referenced_type" : "type-509",
+   "self_type" : "type-509",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-288" ],
+   "template_args" : [ "type-285" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
   },
   {
@@ -31650,26 +31722,26 @@
    "self_type" : "type-811",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<double>",
    "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-795",
-   "self_type" : "type-795",
+   "referenced_type" : "type-787",
+   "self_type" : "type-787",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<float>",
    "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-757",
-   "self_type" : "type-757",
+   "referenced_type" : "type-755",
+   "self_type" : "type-755",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-10" ],
@@ -31679,11 +31751,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-647",
-   "self_type" : "type-647",
+   "referenced_type" : "type-645",
+   "self_type" : "type-645",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIiEE"
   },
   {
@@ -31694,26 +31766,26 @@
    "self_type" : "type-741",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long>",
    "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-704",
-   "self_type" : "type-704",
+   "referenced_type" : "type-697",
+   "self_type" : "type-697",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-687" ],
+   "template_args" : [ "type-684" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<short>",
    "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-617",
-   "self_type" : "type-617",
+   "referenced_type" : "type-614",
+   "self_type" : "type-614",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-599" ],
@@ -31723,22 +31795,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned char>",
    "name" : "android::trait_trivial_copy<unsigned char>",
-   "referenced_type" : "type-540",
-   "self_type" : "type-540",
+   "referenced_type" : "type-536",
+   "self_type" : "type-536",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-218" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned int>",
    "name" : "android::trait_trivial_copy<unsigned int>",
-   "referenced_type" : "type-675",
-   "self_type" : "type-675",
+   "referenced_type" : "type-671",
+   "self_type" : "type-671",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIjEE"
   },
   {
@@ -31749,15 +31821,15 @@
    "self_type" : "type-751",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long>",
    "name" : "android::trait_trivial_copy<unsigned long>",
-   "referenced_type" : "type-722",
-   "self_type" : "type-722",
+   "referenced_type" : "type-720",
+   "self_type" : "type-720",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-710" ],
@@ -31767,8 +31839,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
    "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-631",
-   "self_type" : "type-631",
+   "referenced_type" : "type-629",
+   "self_type" : "type-629",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-3" ],
@@ -31778,11 +31850,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-476",
-   "self_type" : "type-476",
+   "referenced_type" : "type-473",
+   "self_type" : "type-473",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
   },
   {
@@ -31793,7 +31865,7 @@
    "self_type" : "type-807",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -31833,8 +31905,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-481",
-   "self_type" : "type-481",
+   "referenced_type" : "type-478",
+   "self_type" : "type-478",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -31844,11 +31916,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-501",
-   "self_type" : "type-501",
+   "referenced_type" : "type-498",
+   "self_type" : "type-498",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-288" ],
+   "template_args" : [ "type-285" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
   },
   {
@@ -31859,18 +31931,18 @@
    "self_type" : "type-806",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<double>",
    "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-781",
-   "self_type" : "type-781",
+   "referenced_type" : "type-775",
+   "self_type" : "type-775",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIdEE"
   },
   {
@@ -31888,11 +31960,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-638",
-   "self_type" : "type-638",
+   "referenced_type" : "type-637",
+   "self_type" : "type-637",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIiEE"
   },
   {
@@ -31903,18 +31975,18 @@
    "self_type" : "type-729",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long>",
    "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-686",
-   "self_type" : "type-686",
+   "referenced_type" : "type-683",
+   "self_type" : "type-683",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-687" ],
+   "template_args" : [ "type-684" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
   },
   {
@@ -31932,33 +32004,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned char>",
    "name" : "android::trait_trivial_ctor<unsigned char>",
-   "referenced_type" : "type-534",
-   "self_type" : "type-534",
+   "referenced_type" : "type-531",
+   "self_type" : "type-531",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-218" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
    "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-661",
-   "self_type" : "type-661",
+   "referenced_type" : "type-655",
+   "self_type" : "type-655",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
    "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-746",
-   "self_type" : "type-746",
+   "referenced_type" : "type-743",
+   "self_type" : "type-743",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIyEE"
   },
   {
@@ -31976,8 +32048,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned short>",
    "name" : "android::trait_trivial_ctor<unsigned short>",
-   "referenced_type" : "type-620",
-   "self_type" : "type-620",
+   "referenced_type" : "type-619",
+   "self_type" : "type-619",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-3" ],
@@ -31987,11 +32059,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-453",
-   "self_type" : "type-453",
+   "referenced_type" : "type-450",
+   "self_type" : "type-450",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
   },
   {
@@ -32002,7 +32074,7 @@
    "self_type" : "type-809",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -32042,8 +32114,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<bool>",
    "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-482",
-   "self_type" : "type-482",
+   "referenced_type" : "type-479",
+   "self_type" : "type-479",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -32053,11 +32125,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-511",
-   "self_type" : "type-511",
+   "referenced_type" : "type-508",
+   "self_type" : "type-508",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-288" ],
+   "template_args" : [ "type-285" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
   },
   {
@@ -32068,7 +32140,7 @@
    "self_type" : "type-808",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIPK13native_handleEE"
   },
   {
@@ -32079,7 +32151,7 @@
    "self_type" : "type-786",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIdEE"
   },
   {
@@ -32101,18 +32173,18 @@
    "self_type" : "type-644",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long long>",
    "name" : "android::trait_trivial_dtor<long long>",
-   "referenced_type" : "type-738",
-   "self_type" : "type-738",
+   "referenced_type" : "type-736",
+   "self_type" : "type-736",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
   },
   {
@@ -32123,7 +32195,7 @@
    "self_type" : "type-692",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-687" ],
+   "template_args" : [ "type-684" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
   },
   {
@@ -32141,41 +32213,41 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned char>",
    "name" : "android::trait_trivial_dtor<unsigned char>",
-   "referenced_type" : "type-538",
-   "self_type" : "type-538",
+   "referenced_type" : "type-535",
+   "self_type" : "type-535",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-218" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
    "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-668",
-   "self_type" : "type-668",
+   "referenced_type" : "type-664",
+   "self_type" : "type-664",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
    "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-749",
-   "self_type" : "type-749",
+   "referenced_type" : "type-747",
+   "self_type" : "type-747",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long>",
    "name" : "android::trait_trivial_dtor<unsigned long>",
-   "referenced_type" : "type-719",
-   "self_type" : "type-719",
+   "referenced_type" : "type-715",
+   "self_type" : "type-715",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-710" ],
@@ -32185,8 +32257,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned short>",
    "name" : "android::trait_trivial_dtor<unsigned short>",
-   "referenced_type" : "type-625",
-   "self_type" : "type-625",
+   "referenced_type" : "type-621",
+   "self_type" : "type-621",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-3" ],
@@ -32196,22 +32268,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-469",
-   "self_type" : "type-469",
+   "referenced_type" : "type-462",
+   "self_type" : "type-462",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::trait_trivial_move<android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-815",
-   "self_type" : "type-815",
+   "referenced_type" : "type-816",
+   "self_type" : "type-816",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -32240,11 +32312,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String16>",
    "name" : "android::trait_trivial_move<android::String16>",
-   "referenced_type" : "type-191",
-   "self_type" : "type-191",
+   "referenced_type" : "type-204",
+   "self_type" : "type-204",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-179" ],
+   "template_args" : [ "type-182" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8String16EEE"
   },
   {
@@ -32255,15 +32327,15 @@
    "self_type" : "type-902",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-285" ],
+   "template_args" : [ "type-282" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-816",
-   "self_type" : "type-816",
+   "referenced_type" : "type-817",
+   "self_type" : "type-817",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -32273,8 +32345,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<bool>",
    "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-490",
-   "self_type" : "type-490",
+   "referenced_type" : "type-485",
+   "self_type" : "type-485",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -32284,22 +32356,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-533",
-   "self_type" : "type-533",
+   "referenced_type" : "type-513",
+   "self_type" : "type-513",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-288" ],
+   "template_args" : [ "type-285" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<const native_handle *>",
    "name" : "android::trait_trivial_move<const native_handle *>",
-   "referenced_type" : "type-814",
-   "self_type" : "type-814",
+   "referenced_type" : "type-815",
+   "self_type" : "type-815",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIPK13native_handleEE"
   },
   {
@@ -32310,7 +32382,7 @@
    "self_type" : "type-798",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIdEE"
   },
   {
@@ -32328,11 +32400,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-650",
-   "self_type" : "type-650",
+   "referenced_type" : "type-648",
+   "self_type" : "type-648",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIiEE"
   },
   {
@@ -32343,18 +32415,18 @@
    "self_type" : "type-742",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long>",
    "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-708",
-   "self_type" : "type-708",
+   "referenced_type" : "type-707",
+   "self_type" : "type-707",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-687" ],
+   "template_args" : [ "type-684" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
   },
   {
@@ -32372,22 +32444,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned char>",
    "name" : "android::trait_trivial_move<unsigned char>",
-   "referenced_type" : "type-577",
-   "self_type" : "type-577",
+   "referenced_type" : "type-574",
+   "self_type" : "type-574",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-218" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned int>",
    "name" : "android::trait_trivial_move<unsigned int>",
-   "referenced_type" : "type-682",
-   "self_type" : "type-682",
+   "referenced_type" : "type-677",
+   "self_type" : "type-677",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIjEE"
   },
   {
@@ -32398,15 +32470,15 @@
    "self_type" : "type-752",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long>",
    "name" : "android::trait_trivial_move<unsigned long>",
-   "referenced_type" : "type-728",
-   "self_type" : "type-728",
+   "referenced_type" : "type-725",
+   "self_type" : "type-725",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-710" ],
@@ -32427,30 +32499,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-480",
-   "self_type" : "type-480",
+   "referenced_type" : "type-477",
+   "self_type" : "type-477",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::traits<android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-823",
-   "self_type" : "type-823",
+   "referenced_type" : "type-824",
+   "self_type" : "type-824",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android6traitsINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::Rect>",
    "name" : "android::traits<android::Rect>",
-   "referenced_type" : "type-2235",
-   "self_type" : "type-2235",
+   "referenced_type" : "type-2238",
+   "self_type" : "type-2238",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -32460,8 +32532,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::traits<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-820",
-   "self_type" : "type-820",
+   "referenced_type" : "type-821",
+   "self_type" : "type-821",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -32475,18 +32547,18 @@
    "self_type" : "type-822",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android6traitsIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<long long>",
    "name" : "android::traits<long long>",
-   "referenced_type" : "type-1431",
-   "self_type" : "type-1431",
+   "referenced_type" : "type-1435",
+   "self_type" : "type-1435",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android6traitsIxEE"
   },
   {
@@ -32495,12 +32567,12 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::ui::Size",
@@ -32518,20 +32590,20 @@
     {
      "access" : "private",
      "field_name" : "mMatrix",
-     "referenced_type" : "type-2284"
+     "referenced_type" : "type-2287"
     },
     {
      "access" : "private",
      "field_name" : "mType",
      "field_offset" : 288,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "linker_set_key" : "android::ui::Transform",
    "name" : "android::ui::Transform",
    "record_kind" : "class",
-   "referenced_type" : "type-2283",
-   "self_type" : "type-2283",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2286",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "unique_id" : "_ZTSN7android2ui9TransformE"
@@ -32548,8 +32620,8 @@
    ],
    "linker_set_key" : "android::ui::Transform::mat33",
    "name" : "android::ui::Transform::mat33",
-   "referenced_type" : "type-2284",
-   "self_type" : "type-2284",
+   "referenced_type" : "type-2287",
+   "self_type" : "type-2287",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "unique_id" : "_ZTSN7android2ui9Transform5mat33E"
@@ -32559,13 +32631,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2209"
+     "referenced_type" : "type-2212"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::Rect>",
    "name" : "android::use_trivial_move<android::Rect>",
-   "referenced_type" : "type-2208",
-   "self_type" : "type-2208",
+   "referenced_type" : "type-2211",
+   "self_type" : "type-2211",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -32576,13 +32648,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-701"
+     "referenced_type" : "type-704"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-700",
-   "self_type" : "type-700",
+   "referenced_type" : "type-703",
+   "self_type" : "type-703",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -32593,16 +32665,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1417"
+     "referenced_type" : "type-1422"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<long long>",
    "name" : "android::use_trivial_move<long long>",
-   "referenced_type" : "type-1416",
-   "self_type" : "type-1416",
+   "referenced_type" : "type-1421",
+   "self_type" : "type-1421",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveIxEE"
   },
   {
@@ -32633,12 +32705,12 @@
    [
     {
      "field_name" : "num_points",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 32,
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     },
     {
      "field_name" : "xyzc_points",
@@ -32665,7 +32737,7 @@
     {
      "field_name" : "num_planes",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "planes",
@@ -32687,7 +32759,7 @@
    [
     {
      "field_name" : "top_left",
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-219"
     },
     {
      "field_name" : "component",
@@ -32697,32 +32769,32 @@
     {
      "field_name" : "bits_per_component",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "bits_used",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "h_increment",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "v_increment",
      "field_offset" : 160,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "h_subsampling",
      "field_offset" : 192,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "v_subsampling",
      "field_offset" : 224,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android_flex_plane",
@@ -32739,33 +32811,33 @@
    [
     {
      "field_name" : "magic",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "version",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 64,
-     "referenced_type" : "type-519"
+     "referenced_type" : "type-517"
     },
     {
      "field_name" : "incRef",
      "field_offset" : 192,
-     "referenced_type" : "type-520"
+     "referenced_type" : "type-518"
     },
     {
      "field_name" : "decRef",
      "field_offset" : 224,
-     "referenced_type" : "type-520"
+     "referenced_type" : "type-518"
     }
    ],
    "linker_set_key" : "android_native_base_t",
    "name" : "android_native_base_t",
-   "referenced_type" : "type-518",
-   "self_type" : "type-518",
+   "referenced_type" : "type-516",
+   "self_type" : "type-516",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
    "unique_id" : "android_native_base_t"
@@ -32776,28 +32848,28 @@
    [
     {
      "field_name" : "left",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "top",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "right",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "bottom",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android_native_rect_t",
    "name" : "android_native_rect_t",
-   "referenced_type" : "type-619",
-   "self_type" : "type-619",
+   "referenced_type" : "type-620",
+   "self_type" : "type-620",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
    "unique_id" : "android_native_rect_t"
@@ -32872,43 +32944,43 @@
    [
     {
      "field_name" : "y",
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "cb",
      "field_offset" : 32,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "cr",
      "field_offset" : 64,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "ystride",
      "field_offset" : 96,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "cstride",
      "field_offset" : 128,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "chroma_step",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 192,
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     }
    ],
    "linker_set_key" : "android_ycbcr",
    "name" : "android_ycbcr",
-   "referenced_type" : "type-348",
-   "self_type" : "type-348",
+   "referenced_type" : "type-345",
+   "self_type" : "type-345",
    "size" : 56,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_ycbcr"
@@ -32919,108 +32991,108 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-547"
+     "referenced_type" : "type-544"
     },
     {
      "field_name" : "flags",
      "field_offset" : 512,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "field_name" : "width",
      "field_offset" : 544,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "field_name" : "height",
      "field_offset" : 576,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "field_name" : "stride",
      "field_offset" : 608,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "format",
      "field_offset" : 640,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "xdpi",
      "field_offset" : 672,
-     "referenced_type" : "type-563"
+     "referenced_type" : "type-560"
     },
     {
      "field_name" : "ydpi",
      "field_offset" : 704,
-     "referenced_type" : "type-563"
+     "referenced_type" : "type-560"
     },
     {
      "field_name" : "fps",
      "field_offset" : 736,
-     "referenced_type" : "type-563"
+     "referenced_type" : "type-560"
     },
     {
      "field_name" : "minSwapInterval",
      "field_offset" : 768,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "maxSwapInterval",
      "field_offset" : 800,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "numFramebuffers",
      "field_offset" : 832,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 864,
-     "referenced_type" : "type-564"
+     "referenced_type" : "type-561"
     },
     {
      "field_name" : "setSwapInterval",
      "field_offset" : 1088,
-     "referenced_type" : "type-565"
+     "referenced_type" : "type-562"
     },
     {
      "field_name" : "setUpdateRect",
      "field_offset" : 1120,
-     "referenced_type" : "type-568"
+     "referenced_type" : "type-565"
     },
     {
      "field_name" : "post",
      "field_offset" : 1152,
-     "referenced_type" : "type-570"
+     "referenced_type" : "type-567"
     },
     {
      "field_name" : "compositionComplete",
      "field_offset" : 1184,
-     "referenced_type" : "type-572"
+     "referenced_type" : "type-569"
     },
     {
      "field_name" : "dump",
      "field_offset" : 1216,
-     "referenced_type" : "type-574"
+     "referenced_type" : "type-571"
     },
     {
      "field_name" : "enableScreen",
      "field_offset" : 1248,
-     "referenced_type" : "type-565"
+     "referenced_type" : "type-562"
     },
     {
      "field_name" : "reserved_proc",
      "field_offset" : 1280,
-     "referenced_type" : "type-524"
+     "referenced_type" : "type-522"
     }
    ],
    "linker_set_key" : "framebuffer_device_t",
    "name" : "framebuffer_device_t",
-   "referenced_type" : "type-546",
-   "self_type" : "type-546",
+   "referenced_type" : "type-543",
+   "self_type" : "type-543",
    "size" : 184,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h",
    "unique_id" : "framebuffer_device_t"
@@ -33031,63 +33103,73 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-549"
+     "referenced_type" : "type-546"
     },
     {
      "field_name" : "registerBuffer",
      "field_offset" : 1024,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-577"
     },
     {
      "field_name" : "unregisterBuffer",
      "field_offset" : 1056,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-577"
     },
     {
      "field_name" : "lock",
      "field_offset" : 1088,
-     "referenced_type" : "type-583"
+     "referenced_type" : "type-581"
     },
     {
      "field_name" : "unlock",
      "field_offset" : 1120,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-577"
     },
     {
      "field_name" : "perform",
      "field_offset" : 1152,
-     "referenced_type" : "type-585"
+     "referenced_type" : "type-583"
     },
     {
      "field_name" : "lock_ycbcr",
      "field_offset" : 1184,
-     "referenced_type" : "type-587"
+     "referenced_type" : "type-585"
     },
     {
      "field_name" : "lockAsync",
      "field_offset" : 1216,
-     "referenced_type" : "type-589"
+     "referenced_type" : "type-587"
     },
     {
      "field_name" : "unlockAsync",
      "field_offset" : 1248,
-     "referenced_type" : "type-591"
+     "referenced_type" : "type-589"
     },
     {
      "field_name" : "lockAsync_ycbcr",
      "field_offset" : 1280,
+     "referenced_type" : "type-592"
+    },
+    {
+     "field_name" : "getTransportSize",
+     "field_offset" : 1312,
      "referenced_type" : "type-594"
     },
     {
-     "field_name" : "reserved_proc",
-     "field_offset" : 1312,
+     "field_name" : "validateBufferSize",
+     "field_offset" : 1344,
      "referenced_type" : "type-596"
+    },
+    {
+     "field_name" : "reserved_proc",
+     "field_offset" : 1376,
+     "referenced_type" : "type-521"
     }
    ],
    "linker_set_key" : "gralloc_module_t",
    "name" : "gralloc_module_t",
-   "referenced_type" : "type-578",
-   "self_type" : "type-578",
+   "referenced_type" : "type-576",
+   "self_type" : "type-576",
    "size" : 176,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h",
    "unique_id" : "gralloc_module_t"
@@ -33098,33 +33180,33 @@
    [
     {
      "field_name" : "tag",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "version",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "module",
      "field_offset" : 64,
-     "referenced_type" : "type-548"
+     "referenced_type" : "type-545"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 96,
-     "referenced_type" : "type-559"
+     "referenced_type" : "type-556"
     },
     {
      "field_name" : "close",
      "field_offset" : 480,
-     "referenced_type" : "type-560"
+     "referenced_type" : "type-557"
     }
    ],
    "linker_set_key" : "hw_device_t",
    "name" : "hw_device_t",
-   "referenced_type" : "type-547",
-   "self_type" : "type-547",
+   "referenced_type" : "type-544",
+   "self_type" : "type-544",
    "size" : 64,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
    "unique_id" : "hw_device_t"
@@ -33135,13 +33217,13 @@
    [
     {
      "field_name" : "open",
-     "referenced_type" : "type-552"
+     "referenced_type" : "type-549"
     }
    ],
    "linker_set_key" : "hw_module_methods_t",
    "name" : "hw_module_methods_t",
-   "referenced_type" : "type-551",
-   "self_type" : "type-551",
+   "referenced_type" : "type-548",
+   "self_type" : "type-548",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
    "unique_id" : "hw_module_methods_t"
@@ -33152,7 +33234,7 @@
    [
     {
      "field_name" : "tag",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "module_api_version",
@@ -33167,38 +33249,38 @@
     {
      "field_name" : "id",
      "field_offset" : 64,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "field_name" : "name",
      "field_offset" : 96,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "field_name" : "author",
      "field_offset" : 128,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "field_name" : "methods",
      "field_offset" : 160,
-     "referenced_type" : "type-550"
+     "referenced_type" : "type-547"
     },
     {
      "field_name" : "dso",
      "field_offset" : 192,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 224,
-     "referenced_type" : "type-558"
+     "referenced_type" : "type-555"
     }
    ],
    "linker_set_key" : "hw_module_t",
    "name" : "hw_module_t",
-   "referenced_type" : "type-549",
-   "self_type" : "type-549",
+   "referenced_type" : "type-546",
+   "self_type" : "type-546",
    "size" : 128,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
    "unique_id" : "hw_module_t"
@@ -33264,12 +33346,12 @@
    [
     {
      "field_name" : "tv_sec",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "tv_nsec",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "linker_set_key" : "log_time",
@@ -33296,22 +33378,22 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "msg",
@@ -33343,27 +33425,27 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "euid",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "msg",
@@ -33395,27 +33477,27 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "lid",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "msg",
@@ -33447,32 +33529,32 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "lid",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "uid",
      "field_offset" : 192,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "msg",
@@ -33494,28 +33576,28 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "numFds",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "numInts",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "data",
      "field_offset" : 96,
-     "referenced_type" : "type-145"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "native_handle",
    "name" : "native_handle",
-   "referenced_type" : "type-144",
-   "self_type" : "type-144",
+   "referenced_type" : "type-147",
+   "self_type" : "type-147",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
    "unique_id" : "native_handle"
@@ -33525,13 +33607,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-435"
+     "referenced_type" : "type-432"
     }
    ],
    "linker_set_key" : "std::is_floating_point<android::half>",
    "name" : "std::is_floating_point<android::half>",
-   "referenced_type" : "type-434",
-   "self_type" : "type-434",
+   "referenced_type" : "type-431",
+   "self_type" : "type-431",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h",
    "template_args" : [ "type-1" ],
@@ -33542,8 +33624,8 @@
    "linker_set_key" : "std::numeric_limits<android::half>",
    "name" : "std::numeric_limits<android::half>",
    "record_kind" : "class",
-   "referenced_type" : "type-597",
-   "self_type" : "type-597",
+   "referenced_type" : "type-575",
+   "self_type" : "type-575",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h",
    "template_args" : [ "type-1" ],
@@ -33556,8 +33638,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot &&",
    "name" : "android::FenceTime::Snapshot &&",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1386",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1391",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -33583,8 +33665,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &&",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &&",
-   "referenced_type" : "type-99",
-   "self_type" : "type-107",
+   "referenced_type" : "type-101",
+   "self_type" : "type-109",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -33592,8 +33674,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &&",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &&",
-   "referenced_type" : "type-393",
-   "self_type" : "type-399",
+   "referenced_type" : "type-392",
+   "self_type" : "type-396",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -33601,8 +33683,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &&",
-   "referenced_type" : "type-111",
-   "self_type" : "type-113",
+   "referenced_type" : "type-113",
+   "self_type" : "type-115",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -33619,7 +33701,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status &&",
    "name" : "android::hardware::Status &&",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1312",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -33628,7 +33710,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status &&",
    "name" : "android::hardware::details::return_status &&",
-   "referenced_type" : "type-101",
+   "referenced_type" : "type-103",
    "self_type" : "type-1318",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -33637,7 +33719,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_handle &&",
    "name" : "android::hardware::hidl_handle &&",
-   "referenced_type" : "type-139",
+   "referenced_type" : "type-142",
    "self_type" : "type-1087",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -33656,7 +33738,7 @@
    "linker_set_key" : "android::sp<android::Fence> &&",
    "name" : "android::sp<android::Fence> &&",
    "referenced_type" : "type-1357",
-   "self_type" : "type-1410",
+   "self_type" : "type-1415",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33664,8 +33746,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &&",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &&",
-   "referenced_type" : "type-355",
-   "self_type" : "type-378",
+   "referenced_type" : "type-352",
+   "self_type" : "type-375",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33673,8 +33755,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &&",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &&",
-   "referenced_type" : "type-484",
-   "self_type" : "type-491",
+   "referenced_type" : "type-481",
+   "self_type" : "type-488",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33682,8 +33764,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &&",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &&",
-   "referenced_type" : "type-338",
-   "self_type" : "type-386",
+   "referenced_type" : "type-335",
+   "self_type" : "type-383",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33691,8 +33773,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &&",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &&",
-   "referenced_type" : "type-86",
-   "self_type" : "type-94",
+   "referenced_type" : "type-88",
+   "self_type" : "type-96",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33700,8 +33782,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &&",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &&",
-   "referenced_type" : "type-497",
-   "self_type" : "type-504",
+   "referenced_type" : "type-494",
+   "self_type" : "type-501",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33709,7 +33791,7 @@
    "alignment" : 4,
    "linker_set_key" : "int &&",
    "name" : "int &&",
-   "referenced_type" : "type-103",
+   "referenced_type" : "type-105",
    "self_type" : "type-1294",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
diff --git a/29/32/x86/source-based/libstagefright_bufferqueue_helper.so.lsdump b/29/32/x86/source-based/libstagefright_bufferqueue_helper.so.lsdump
index 01acb53..ae1a1d3 100644
--- a/29/32/x86/source-based/libstagefright_bufferqueue_helper.so.lsdump
+++ b/29/32/x86/source-based/libstagefright_bufferqueue_helper.so.lsdump
@@ -5,15 +5,15 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_AUDIO_CHANNELTYPE [16]",
    "name" : "OMX_AUDIO_CHANNELTYPE [16]",
-   "referenced_type" : "type-1637",
-   "self_type" : "type-1642",
+   "referenced_type" : "type-1635",
+   "self_type" : "type-1641",
    "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-1499",
+   "referenced_type" : "type-1498",
    "self_type" : "type-1515",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -30,8 +30,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::MediaImage2::PlaneInfo [4]",
    "name" : "android::MediaImage2::PlaneInfo [4]",
-   "referenced_type" : "type-2423",
-   "self_type" : "type-2422",
+   "referenced_type" : "type-2426",
+   "self_type" : "type-2425",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
@@ -39,8 +39,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::MediaImage::PlaneInfo [3]",
    "name" : "android::MediaImage::PlaneInfo [3]",
-   "referenced_type" : "type-2418",
-   "self_type" : "type-2417",
+   "referenced_type" : "type-2421",
+   "self_type" : "type-2420",
    "size" : 60,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
@@ -81,7 +81,7 @@
    "linker_set_key" : "int [3]",
    "name" : "int [3]",
    "referenced_type" : "type-4",
-   "self_type" : "type-2202",
+   "self_type" : "type-2205",
    "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-2202",
-   "self_type" : "type-2201",
+   "referenced_type" : "type-2205",
+   "self_type" : "type-2204",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
   },
@@ -117,7 +117,7 @@
    "linker_set_key" : "unsigned char [16]",
    "name" : "unsigned char [16]",
    "referenced_type" : "type-90",
-   "self_type" : "type-2311",
+   "self_type" : "type-2314",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -126,7 +126,7 @@
    "linker_set_key" : "unsigned char [1]",
    "name" : "unsigned char [1]",
    "referenced_type" : "type-90",
-   "self_type" : "type-1572",
+   "self_type" : "type-1567",
    "size" : 1,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -135,7 +135,7 @@
    "linker_set_key" : "unsigned char [256]",
    "name" : "unsigned char [256]",
    "referenced_type" : "type-90",
-   "self_type" : "type-2312",
+   "self_type" : "type-2315",
    "size" : 256,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -144,7 +144,7 @@
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
    "referenced_type" : "type-90",
-   "self_type" : "type-2179",
+   "self_type" : "type-2182",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -153,7 +153,7 @@
    "linker_set_key" : "unsigned char [64]",
    "name" : "unsigned char [64]",
    "referenced_type" : "type-90",
-   "self_type" : "type-2308",
+   "self_type" : "type-2311",
    "size" : 64,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -203,8 +203,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-1242",
-   "self_type" : "type-1242",
+   "referenced_type" : "type-1245",
+   "self_type" : "type-1245",
    "size" : 2
   },
   {
@@ -245,8 +245,8 @@
    "alignment" : 4,
    "linker_set_key" : "long double",
    "name" : "long double",
-   "referenced_type" : "type-1453",
-   "self_type" : "type-1453",
+   "referenced_type" : "type-1456",
+   "self_type" : "type-1456",
    "size" : 8
   },
   {
@@ -759,6 +759,9 @@
    "name" : "_ZN7android18BnProducerListener18needsReleaseNotifyEv"
   },
   {
+   "name" : "_ZN7android18BnProducerListener18onBuffersDiscardedERKNSt3__16vectorIiNS1_9allocatorIiEEEE"
+  },
+  {
    "name" : "_ZN7android18BpConsumerListenerD0Ev"
   },
   {
@@ -3121,8 +3124,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AACPROFILETYPE",
    "name" : "OMX_AUDIO_AACPROFILETYPE",
-   "referenced_type" : "type-1676",
-   "self_type" : "type-1676",
+   "referenced_type" : "type-1671",
+   "self_type" : "type-1671",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3175,8 +3178,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
    "name" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
-   "referenced_type" : "type-1668",
-   "self_type" : "type-1668",
+   "referenced_type" : "type-1670",
+   "self_type" : "type-1670",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3273,8 +3276,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRBANDMODETYPE",
    "name" : "OMX_AUDIO_AMRBANDMODETYPE",
-   "referenced_type" : "type-1890",
-   "self_type" : "type-1890",
+   "referenced_type" : "type-1881",
+   "self_type" : "type-1881",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3319,8 +3322,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRDTXMODETYPE",
    "name" : "OMX_AUDIO_AMRDTXMODETYPE",
-   "referenced_type" : "type-1901",
-   "self_type" : "type-1901",
+   "referenced_type" : "type-1892",
+   "self_type" : "type-1892",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3369,8 +3372,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
    "name" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
-   "referenced_type" : "type-1877",
-   "self_type" : "type-1877",
+   "referenced_type" : "type-1862",
+   "self_type" : "type-1862",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3419,8 +3422,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CDMARATETYPE",
    "name" : "OMX_AUDIO_CDMARATETYPE",
-   "referenced_type" : "type-2021",
-   "self_type" : "type-2021",
+   "referenced_type" : "type-2013",
+   "self_type" : "type-2013",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3461,8 +3464,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CHANNELMODETYPE",
    "name" : "OMX_AUDIO_CHANNELMODETYPE",
-   "referenced_type" : "type-1652",
-   "self_type" : "type-1652",
+   "referenced_type" : "type-1651",
+   "self_type" : "type-1651",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3527,8 +3530,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CHANNELTYPE",
    "name" : "OMX_AUDIO_CHANNELTYPE",
-   "referenced_type" : "type-1637",
-   "self_type" : "type-1637",
+   "referenced_type" : "type-1635",
+   "self_type" : "type-1635",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3669,8 +3672,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CODINGTYPE",
    "name" : "OMX_AUDIO_CODINGTYPE",
-   "referenced_type" : "type-1618",
-   "self_type" : "type-1618",
+   "referenced_type" : "type-1616",
+   "self_type" : "type-1616",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3711,8 +3714,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_ECHOCANTYPE",
    "name" : "OMX_AUDIO_ECHOCANTYPE",
-   "referenced_type" : "type-2196",
-   "self_type" : "type-2196",
+   "referenced_type" : "type-2199",
+   "self_type" : "type-2199",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3749,8 +3752,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G723RATE",
    "name" : "OMX_AUDIO_G723RATE",
-   "referenced_type" : "type-1808",
-   "self_type" : "type-1808",
+   "referenced_type" : "type-1799",
+   "self_type" : "type-1799",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3795,8 +3798,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G726MODE",
    "name" : "OMX_AUDIO_G726MODE",
-   "referenced_type" : "type-1831",
-   "self_type" : "type-1831",
+   "referenced_type" : "type-1822",
+   "self_type" : "type-1822",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3837,8 +3840,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G729TYPE",
    "name" : "OMX_AUDIO_G729TYPE",
-   "referenced_type" : "type-1851",
-   "self_type" : "type-1851",
+   "referenced_type" : "type-1845",
+   "self_type" : "type-1845",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3895,8 +3898,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDIFORMATTYPE",
    "name" : "OMX_AUDIO_MIDIFORMATTYPE",
-   "referenced_type" : "type-2087",
-   "self_type" : "type-2087",
+   "referenced_type" : "type-2079",
+   "self_type" : "type-2079",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3949,8 +3952,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
    "name" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
-   "referenced_type" : "type-2169",
-   "self_type" : "type-2169",
+   "referenced_type" : "type-2168",
+   "self_type" : "type-2168",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3991,8 +3994,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
    "name" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
-   "referenced_type" : "type-2121",
-   "self_type" : "type-2121",
+   "referenced_type" : "type-2113",
+   "self_type" : "type-2113",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4037,8 +4040,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
    "name" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
-   "referenced_type" : "type-2111",
-   "self_type" : "type-2111",
+   "referenced_type" : "type-2102",
+   "self_type" : "type-2102",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4075,8 +4078,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
    "name" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
-   "referenced_type" : "type-1660",
-   "self_type" : "type-1660",
+   "referenced_type" : "type-1656",
+   "self_type" : "type-1656",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4113,8 +4116,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PCMMODETYPE",
    "name" : "OMX_AUDIO_PCMMODETYPE",
-   "referenced_type" : "type-1633",
-   "self_type" : "type-1633",
+   "referenced_type" : "type-1628",
+   "self_type" : "type-1628",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4171,8 +4174,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_RAFORMATTYPE",
    "name" : "OMX_AUDIO_RAFORMATTYPE",
-   "referenced_type" : "type-1752",
-   "self_type" : "type-1752",
+   "referenced_type" : "type-1746",
+   "self_type" : "type-1746",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4205,8 +4208,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
    "name" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
-   "referenced_type" : "type-1775",
-   "self_type" : "type-1775",
+   "referenced_type" : "type-1766",
+   "self_type" : "type-1766",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4239,8 +4242,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_STEREOWIDENINGTYPE",
    "name" : "OMX_AUDIO_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-2192",
-   "self_type" : "type-2192",
+   "referenced_type" : "type-2195",
+   "self_type" : "type-2195",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4281,8 +4284,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_WMAFORMATTYPE",
    "name" : "OMX_AUDIO_WMAFORMATTYPE",
-   "referenced_type" : "type-1719",
-   "self_type" : "type-1719",
+   "referenced_type" : "type-1711",
+   "self_type" : "type-1711",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4323,8 +4326,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_WMAPROFILETYPE",
    "name" : "OMX_AUDIO_WMAPROFILETYPE",
-   "referenced_type" : "type-1732",
-   "self_type" : "type-1732",
+   "referenced_type" : "type-1722",
+   "self_type" : "type-1722",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4349,8 +4352,8 @@
    ],
    "linker_set_key" : "OMX_BOOL",
    "name" : "OMX_BOOL",
-   "referenced_type" : "type-1293",
-   "self_type" : "type-1293",
+   "referenced_type" : "type-1296",
+   "self_type" : "type-1296",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "underlying_type" : "type-2",
@@ -4387,8 +4390,8 @@
    ],
    "linker_set_key" : "OMX_BUFFERSUPPLIERTYPE",
    "name" : "OMX_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-1601",
-   "self_type" : "type-1601",
+   "referenced_type" : "type-1599",
+   "self_type" : "type-1599",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -4441,8 +4444,8 @@
    ],
    "linker_set_key" : "OMX_COLORBLENDTYPE",
    "name" : "OMX_COLORBLENDTYPE",
-   "referenced_type" : "type-2209",
-   "self_type" : "type-2209",
+   "referenced_type" : "type-2212",
+   "self_type" : "type-2212",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4683,8 +4686,8 @@
    ],
    "linker_set_key" : "OMX_COLOR_FORMATTYPE",
    "name" : "OMX_COLOR_FORMATTYPE",
-   "referenced_type" : "type-2199",
-   "self_type" : "type-2199",
+   "referenced_type" : "type-2202",
+   "self_type" : "type-2202",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4729,8 +4732,8 @@
    ],
    "linker_set_key" : "OMX_COMMANDTYPE",
    "name" : "OMX_COMMANDTYPE",
-   "referenced_type" : "type-1485",
-   "self_type" : "type-1485",
+   "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-2",
@@ -4767,8 +4770,8 @@
    ],
    "linker_set_key" : "OMX_DATAUNITENCAPSULATIONTYPE",
    "name" : "OMX_DATAUNITENCAPSULATIONTYPE",
-   "referenced_type" : "type-2236",
-   "self_type" : "type-2236",
+   "referenced_type" : "type-2239",
+   "self_type" : "type-2239",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4809,8 +4812,8 @@
    ],
    "linker_set_key" : "OMX_DATAUNITTYPE",
    "name" : "OMX_DATAUNITTYPE",
-   "referenced_type" : "type-2235",
-   "self_type" : "type-2235",
+   "referenced_type" : "type-2238",
+   "self_type" : "type-2238",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4835,8 +4838,8 @@
    ],
    "linker_set_key" : "OMX_DIRTYPE",
    "name" : "OMX_DIRTYPE",
-   "referenced_type" : "type-1452",
-   "self_type" : "type-1452",
+   "referenced_type" : "type-1455",
+   "self_type" : "type-1455",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "underlying_type" : "type-2",
@@ -4877,8 +4880,8 @@
    ],
    "linker_set_key" : "OMX_DITHERTYPE",
    "name" : "OMX_DITHERTYPE",
-   "referenced_type" : "type-2238",
-   "self_type" : "type-2238",
+   "referenced_type" : "type-2241",
+   "self_type" : "type-2241",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4903,8 +4906,8 @@
    ],
    "linker_set_key" : "OMX_ENDIANTYPE",
    "name" : "OMX_ENDIANTYPE",
-   "referenced_type" : "type-1460",
-   "self_type" : "type-1460",
+   "referenced_type" : "type-1459",
+   "self_type" : "type-1459",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "underlying_type" : "type-2",
@@ -5081,8 +5084,8 @@
    ],
    "linker_set_key" : "OMX_ERRORTYPE",
    "name" : "OMX_ERRORTYPE",
-   "referenced_type" : "type-1494",
-   "self_type" : "type-1494",
+   "referenced_type" : "type-1495",
+   "self_type" : "type-1495",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-4",
@@ -5155,8 +5158,8 @@
    ],
    "linker_set_key" : "OMX_EVENTTYPE",
    "name" : "OMX_EVENTTYPE",
-   "referenced_type" : "type-1588",
-   "self_type" : "type-1588",
+   "referenced_type" : "type-1589",
+   "self_type" : "type-1589",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -5221,8 +5224,8 @@
    ],
    "linker_set_key" : "OMX_EXPOSURECONTROLTYPE",
    "name" : "OMX_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-2221",
-   "self_type" : "type-2221",
+   "referenced_type" : "type-2224",
+   "self_type" : "type-2224",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -5255,8 +5258,8 @@
    ],
    "linker_set_key" : "OMX_EXTRADATATYPE",
    "name" : "OMX_EXTRADATATYPE",
-   "referenced_type" : "type-1561",
-   "self_type" : "type-1561",
+   "referenced_type" : "type-1556",
+   "self_type" : "type-1556",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -5301,8 +5304,8 @@
    ],
    "linker_set_key" : "OMX_FOCUSSTATUSTYPE",
    "name" : "OMX_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-2246",
-   "self_type" : "type-2246",
+   "referenced_type" : "type-2249",
+   "self_type" : "type-2249",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -5371,8 +5374,8 @@
    ],
    "linker_set_key" : "OMX_IMAGEFILTERTYPE",
    "name" : "OMX_IMAGEFILTERTYPE",
-   "referenced_type" : "type-2205",
-   "self_type" : "type-2205",
+   "referenced_type" : "type-2208",
+   "self_type" : "type-2208",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -5437,8 +5440,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_CODINGTYPE",
    "name" : "OMX_IMAGE_CODINGTYPE",
-   "referenced_type" : "type-2297",
-   "self_type" : "type-2297",
+   "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-2",
@@ -5487,8 +5490,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_FLASHCONTROLTYPE",
    "name" : "OMX_IMAGE_FLASHCONTROLTYPE",
-   "referenced_type" : "type-2300",
-   "self_type" : "type-2300",
+   "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-2",
@@ -5529,8 +5532,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_FOCUSCONTROLTYPE",
    "name" : "OMX_IMAGE_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-2303",
-   "self_type" : "type-2303",
+   "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-2",
@@ -5579,8 +5582,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_HUFFMANTABLETYPE",
    "name" : "OMX_IMAGE_HUFFMANTABLETYPE",
-   "referenced_type" : "type-2309",
-   "self_type" : "type-2309",
+   "referenced_type" : "type-2312",
+   "self_type" : "type-2312",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "underlying_type" : "type-2",
@@ -5621,8 +5624,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
    "name" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-2306",
-   "self_type" : "type-2306",
+   "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-2",
@@ -6481,8 +6484,8 @@
    ],
    "linker_set_key" : "OMX_METADATACHARSETTYPE",
    "name" : "OMX_METADATACHARSETTYPE",
-   "referenced_type" : "type-2345",
-   "self_type" : "type-2345",
+   "referenced_type" : "type-2348",
+   "self_type" : "type-2348",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6523,8 +6526,8 @@
    ],
    "linker_set_key" : "OMX_METADATASCOPETYPE",
    "name" : "OMX_METADATASCOPETYPE",
-   "referenced_type" : "type-2346",
-   "self_type" : "type-2346",
+   "referenced_type" : "type-2349",
+   "self_type" : "type-2349",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6561,8 +6564,8 @@
    ],
    "linker_set_key" : "OMX_METADATASEARCHMODETYPE",
    "name" : "OMX_METADATASEARCHMODETYPE",
-   "referenced_type" : "type-2347",
-   "self_type" : "type-2347",
+   "referenced_type" : "type-2350",
+   "self_type" : "type-2350",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6599,8 +6602,8 @@
    ],
    "linker_set_key" : "OMX_METERINGTYPE",
    "name" : "OMX_METERINGTYPE",
-   "referenced_type" : "type-2242",
-   "self_type" : "type-2242",
+   "referenced_type" : "type-2245",
+   "self_type" : "type-2245",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -6641,8 +6644,8 @@
    ],
    "linker_set_key" : "OMX_MIRRORTYPE",
    "name" : "OMX_MIRRORTYPE",
-   "referenced_type" : "type-2213",
-   "self_type" : "type-2213",
+   "referenced_type" : "type-2216",
+   "self_type" : "type-2216",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -6717,8 +6720,8 @@
    ],
    "linker_set_key" : "OMX_OTHER_FORMATTYPE",
    "name" : "OMX_OTHER_FORMATTYPE",
-   "referenced_type" : "type-2314",
-   "self_type" : "type-2314",
+   "referenced_type" : "type-2317",
+   "self_type" : "type-2317",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -6759,8 +6762,8 @@
    ],
    "linker_set_key" : "OMX_PORTDOMAINTYPE",
    "name" : "OMX_PORTDOMAINTYPE",
-   "referenced_type" : "type-2332",
-   "self_type" : "type-2332",
+   "referenced_type" : "type-2335",
+   "self_type" : "type-2335",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6809,8 +6812,8 @@
    ],
    "linker_set_key" : "OMX_STATETYPE",
    "name" : "OMX_STATETYPE",
-   "referenced_type" : "type-1488",
-   "self_type" : "type-1488",
+   "referenced_type" : "type-1490",
+   "self_type" : "type-1490",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -6843,8 +6846,8 @@
    ],
    "linker_set_key" : "OMX_SUSPENSIONPOLICYTYPE",
    "name" : "OMX_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-2336",
-   "self_type" : "type-2336",
+   "referenced_type" : "type-2339",
+   "self_type" : "type-2339",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6877,8 +6880,8 @@
    ],
    "linker_set_key" : "OMX_SUSPENSIONTYPE",
    "name" : "OMX_SUSPENSIONTYPE",
-   "referenced_type" : "type-2338",
-   "self_type" : "type-2338",
+   "referenced_type" : "type-2341",
+   "self_type" : "type-2341",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6915,8 +6918,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CLOCKSTATE",
    "name" : "OMX_TIME_CLOCKSTATE",
-   "referenced_type" : "type-2321",
-   "self_type" : "type-2321",
+   "referenced_type" : "type-2324",
+   "self_type" : "type-2324",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -6953,8 +6956,8 @@
    ],
    "linker_set_key" : "OMX_TIME_REFCLOCKTYPE",
    "name" : "OMX_TIME_REFCLOCKTYPE",
-   "referenced_type" : "type-2319",
-   "self_type" : "type-2319",
+   "referenced_type" : "type-2322",
+   "self_type" : "type-2322",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -6987,8 +6990,8 @@
    ],
    "linker_set_key" : "OMX_TIME_SEEKMODETYPE",
    "name" : "OMX_TIME_SEEKMODETYPE",
-   "referenced_type" : "type-2315",
-   "self_type" : "type-2315",
+   "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-2",
@@ -7025,8 +7028,8 @@
    ],
    "linker_set_key" : "OMX_TIME_UPDATETYPE",
    "name" : "OMX_TIME_UPDATETYPE",
-   "referenced_type" : "type-2318",
-   "self_type" : "type-2318",
+   "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-2",
@@ -7079,8 +7082,8 @@
    ],
    "linker_set_key" : "OMX_TRANSITIONEFFECTTYPE",
    "name" : "OMX_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-2233",
-   "self_type" : "type-2233",
+   "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-2",
@@ -7185,8 +7188,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCLEVELTYPE",
    "name" : "OMX_VIDEO_AVCLEVELTYPE",
-   "referenced_type" : "type-2280",
-   "self_type" : "type-2280",
+   "referenced_type" : "type-2283",
+   "self_type" : "type-2283",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7223,8 +7226,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
    "name" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
-   "referenced_type" : "type-2282",
-   "self_type" : "type-2282",
+   "referenced_type" : "type-2285",
+   "self_type" : "type-2285",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7277,8 +7280,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCPROFILETYPE",
    "name" : "OMX_VIDEO_AVCPROFILETYPE",
-   "referenced_type" : "type-2279",
-   "self_type" : "type-2279",
+   "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-2",
@@ -7315,8 +7318,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCSLICEMODETYPE",
    "name" : "OMX_VIDEO_AVCSLICEMODETYPE",
-   "referenced_type" : "type-2293",
-   "self_type" : "type-2293",
+   "referenced_type" : "type-2296",
+   "self_type" : "type-2296",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7397,8 +7400,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CODINGTYPE",
    "name" : "OMX_VIDEO_CODINGTYPE",
-   "referenced_type" : "type-2248",
-   "self_type" : "type-2248",
+   "referenced_type" : "type-2251",
+   "self_type" : "type-2251",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7447,8 +7450,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONTROLRATETYPE",
    "name" : "OMX_VIDEO_CONTROLRATETYPE",
-   "referenced_type" : "type-2253",
-   "self_type" : "type-2253",
+   "referenced_type" : "type-2256",
+   "self_type" : "type-2256",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7505,8 +7508,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_H263LEVELTYPE",
    "name" : "OMX_VIDEO_H263LEVELTYPE",
-   "referenced_type" : "type-2264",
-   "self_type" : "type-2264",
+   "referenced_type" : "type-2267",
+   "self_type" : "type-2267",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7567,8 +7570,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_H263PROFILETYPE",
    "name" : "OMX_VIDEO_H263PROFILETYPE",
-   "referenced_type" : "type-2263",
-   "self_type" : "type-2263",
+   "referenced_type" : "type-2266",
+   "self_type" : "type-2266",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7605,8 +7608,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_INTRAREFRESHTYPE",
    "name" : "OMX_VIDEO_INTRAREFRESHTYPE",
-   "referenced_type" : "type-2259",
-   "self_type" : "type-2259",
+   "referenced_type" : "type-2262",
+   "self_type" : "type-2262",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7647,8 +7650,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MOTIONVECTORTYPE",
    "name" : "OMX_VIDEO_MOTIONVECTORTYPE",
-   "referenced_type" : "type-2257",
-   "self_type" : "type-2257",
+   "referenced_type" : "type-2260",
+   "self_type" : "type-2260",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7693,8 +7696,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG2LEVELTYPE",
    "name" : "OMX_VIDEO_MPEG2LEVELTYPE",
-   "referenced_type" : "type-2269",
-   "self_type" : "type-2269",
+   "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-2",
@@ -7743,8 +7746,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG2PROFILETYPE",
    "name" : "OMX_VIDEO_MPEG2PROFILETYPE",
-   "referenced_type" : "type-2268",
-   "self_type" : "type-2268",
+   "referenced_type" : "type-2271",
+   "self_type" : "type-2271",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7809,8 +7812,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG4LEVELTYPE",
    "name" : "OMX_VIDEO_MPEG4LEVELTYPE",
-   "referenced_type" : "type-2272",
-   "self_type" : "type-2272",
+   "referenced_type" : "type-2275",
+   "self_type" : "type-2275",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7899,8 +7902,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG4PROFILETYPE",
    "name" : "OMX_VIDEO_MPEG4PROFILETYPE",
-   "referenced_type" : "type-2271",
-   "self_type" : "type-2271",
+   "referenced_type" : "type-2274",
+   "self_type" : "type-2274",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7957,8 +7960,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PICTURETYPE",
    "name" : "OMX_VIDEO_PICTURETYPE",
-   "referenced_type" : "type-2265",
-   "self_type" : "type-2265",
+   "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-2",
@@ -7999,8 +8002,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_RVFORMATTYPE",
    "name" : "OMX_VIDEO_RVFORMATTYPE",
-   "referenced_type" : "type-2276",
-   "self_type" : "type-2276",
+   "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-2",
@@ -8041,8 +8044,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_WMVFORMATTYPE",
    "name" : "OMX_VIDEO_WMVFORMATTYPE",
-   "referenced_type" : "type-2274",
-   "self_type" : "type-2274",
+   "referenced_type" : "type-2277",
+   "self_type" : "type-2277",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -8107,8 +8110,8 @@
    ],
    "linker_set_key" : "OMX_WHITEBALCONTROLTYPE",
    "name" : "OMX_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-2219",
-   "self_type" : "type-2219",
+   "referenced_type" : "type-2222",
+   "self_type" : "type-2222",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -8149,8 +8152,8 @@
    ],
    "linker_set_key" : "android::ADebug::Level",
    "name" : "android::ADebug::Level",
-   "referenced_type" : "type-2292",
-   "self_type" : "type-2292",
+   "referenced_type" : "type-2295",
+   "self_type" : "type-2295",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
    "underlying_type" : "type-2",
@@ -8253,8 +8256,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::MatrixCoeffs",
    "name" : "android::ColorAspects::MatrixCoeffs",
-   "referenced_type" : "type-2432",
-   "self_type" : "type-2432",
+   "referenced_type" : "type-2435",
+   "self_type" : "type-2435",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8299,8 +8302,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::Primaries",
    "name" : "android::ColorAspects::Primaries",
-   "referenced_type" : "type-2430",
-   "self_type" : "type-2430",
+   "referenced_type" : "type-2433",
+   "self_type" : "type-2433",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8329,8 +8332,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::Range",
    "name" : "android::ColorAspects::Range",
-   "referenced_type" : "type-2429",
-   "self_type" : "type-2429",
+   "referenced_type" : "type-2432",
+   "self_type" : "type-2432",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8453,8 +8456,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::Transfer",
    "name" : "android::ColorAspects::Transfer",
-   "referenced_type" : "type-2431",
-   "self_type" : "type-2431",
+   "referenced_type" : "type-2434",
+   "self_type" : "type-2434",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8487,8 +8490,8 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorRange",
    "name" : "android::ColorUtils::ColorRange",
-   "referenced_type" : "type-1197",
-   "self_type" : "type-1197",
+   "referenced_type" : "type-1195",
+   "self_type" : "type-1195",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
    "underlying_type" : "type-2",
@@ -8553,8 +8556,8 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorStandard",
    "name" : "android::ColorUtils::ColorStandard",
-   "referenced_type" : "type-1187",
-   "self_type" : "type-1187",
+   "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-2",
@@ -8611,8 +8614,8 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorTransfer",
    "name" : "android::ColorUtils::ColorTransfer",
-   "referenced_type" : "type-1189",
-   "self_type" : "type-1189",
+   "referenced_type" : "type-1192",
+   "self_type" : "type-1192",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
    "underlying_type" : "type-2",
@@ -8677,8 +8680,8 @@
    ],
    "linker_set_key" : "android::HDRStaticInfo::ID",
    "name" : "android::HDRStaticInfo::ID",
-   "referenced_type" : "type-2436",
-   "self_type" : "type-2436",
+   "referenced_type" : "type-2439",
+   "self_type" : "type-2439",
    "size" : 1,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-90",
@@ -8761,8 +8764,8 @@
    ],
    "linker_set_key" : "android::MediaImage2::Type",
    "name" : "android::MediaImage2::Type",
-   "referenced_type" : "type-2421",
-   "self_type" : "type-2421",
+   "referenced_type" : "type-2424",
+   "self_type" : "type-2424",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8813,8 +8816,8 @@
    ],
    "linker_set_key" : "android::MediaImage::Type",
    "name" : "android::MediaImage::Type",
-   "referenced_type" : "type-2416",
-   "self_type" : "type-2416",
+   "referenced_type" : "type-2419",
+   "self_type" : "type-2419",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8847,8 +8850,8 @@
    ],
    "linker_set_key" : "android::MetadataBufferType",
    "name" : "android::MetadataBufferType",
-   "referenced_type" : "type-1234",
-   "self_type" : "type-1234",
+   "referenced_type" : "type-1235",
+   "self_type" : "type-1235",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/MetadataBufferType.h",
    "underlying_type" : "type-4",
@@ -8873,8 +8876,8 @@
    ],
    "linker_set_key" : "android::ProcessState::CallRestriction",
    "name" : "android::ProcessState::CallRestriction",
-   "referenced_type" : "type-1255",
-   "self_type" : "type-1255",
+   "referenced_type" : "type-1259",
+   "self_type" : "type-1259",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h",
    "underlying_type" : "type-4",
@@ -8891,8 +8894,8 @@
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-2657",
-   "self_type" : "type-2657",
+   "referenced_type" : "type-2660",
+   "self_type" : "type-2660",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "underlying_type" : "type-2",
@@ -8909,8 +8912,8 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-2652",
-   "self_type" : "type-2652",
+   "referenced_type" : "type-2655",
+   "self_type" : "type-2655",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "underlying_type" : "type-2",
@@ -8935,8 +8938,8 @@
    ],
    "linker_set_key" : "android::base::LogId",
    "name" : "android::base::LogId",
-   "referenced_type" : "type-4704",
-   "self_type" : "type-4704",
+   "referenced_type" : "type-4711",
+   "self_type" : "type-4711",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "type-2",
@@ -8977,8 +8980,8 @@
    ],
    "linker_set_key" : "android::base::LogSeverity",
    "name" : "android::base::LogSeverity",
-   "referenced_type" : "type-4654",
-   "self_type" : "type-4654",
+   "referenced_type" : "type-4661",
+   "self_type" : "type-4661",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "type-2",
@@ -9113,8 +9116,8 @@
    ],
    "linker_set_key" : "android::hardware::ProcessState::CallRestriction",
    "name" : "android::hardware::ProcessState::CallRestriction",
-   "referenced_type" : "type-1391",
-   "self_type" : "type-1391",
+   "referenced_type" : "type-1394",
+   "self_type" : "type-1394",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "underlying_type" : "type-4",
@@ -12107,8 +12110,8 @@
    ],
    "linker_set_key" : "log_id",
    "name" : "log_id",
-   "referenced_type" : "type-2411",
-   "self_type" : "type-2411",
+   "referenced_type" : "type-2414",
+   "self_type" : "type-2414",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
@@ -12127,9 +12130,9 @@
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1501",
-   "return_type" : "type-1494",
-   "self_type" : "type-1501",
+   "referenced_type" : "type-1500",
+   "return_type" : "type-1495",
+   "self_type" : "type-1500",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -12142,12 +12145,12 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1595"
+     "referenced_type" : "type-1598"
     }
    ],
-   "referenced_type" : "type-2382",
-   "return_type" : "type-1494",
-   "self_type" : "type-2382",
+   "referenced_type" : "type-2385",
+   "return_type" : "type-1495",
+   "self_type" : "type-2385",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12160,7 +12163,7 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-2376"
+     "referenced_type" : "type-2379"
     },
     {
      "referenced_type" : "type-2"
@@ -12172,9 +12175,9 @@
      "referenced_type" : "type-2"
     }
    ],
-   "referenced_type" : "type-2378",
-   "return_type" : "type-1494",
-   "self_type" : "type-2378",
+   "referenced_type" : "type-2381",
+   "return_type" : "type-1495",
+   "self_type" : "type-2381",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12187,7 +12190,7 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-2376"
+     "referenced_type" : "type-2379"
     },
     {
      "referenced_type" : "type-2"
@@ -12202,9 +12205,9 @@
      "referenced_type" : "type-89"
     }
    ],
-   "referenced_type" : "type-2375",
-   "return_type" : "type-1494",
-   "self_type" : "type-2375",
+   "referenced_type" : "type-2378",
+   "return_type" : "type-1495",
+   "self_type" : "type-2378",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12217,7 +12220,7 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-2376"
+     "referenced_type" : "type-2379"
     },
     {
      "referenced_type" : "type-2"
@@ -12229,9 +12232,9 @@
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-2387",
-   "return_type" : "type-1494",
-   "self_type" : "type-2387",
+   "referenced_type" : "type-2390",
+   "return_type" : "type-1495",
+   "self_type" : "type-2390",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12244,15 +12247,15 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-2385"
+     "referenced_type" : "type-2388"
     },
     {
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-2384",
-   "return_type" : "type-1494",
-   "self_type" : "type-2384",
+   "referenced_type" : "type-2387",
+   "return_type" : "type-1495",
+   "self_type" : "type-2387",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12265,7 +12268,7 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-1488"
     },
     {
      "referenced_type" : "type-2"
@@ -12274,9 +12277,9 @@
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-2362",
-   "return_type" : "type-1494",
-   "self_type" : "type-2362",
+   "referenced_type" : "type-2365",
+   "return_type" : "type-1495",
+   "self_type" : "type-2365",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12295,9 +12298,9 @@
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-2364",
-   "return_type" : "type-1494",
-   "self_type" : "type-2364",
+   "referenced_type" : "type-2367",
+   "return_type" : "type-1495",
+   "self_type" : "type-2367",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12310,12 +12313,12 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-2370"
+     "referenced_type" : "type-2373"
     }
    ],
-   "referenced_type" : "type-2369",
-   "return_type" : "type-1494",
-   "self_type" : "type-2369",
+   "referenced_type" : "type-2372",
+   "return_type" : "type-1495",
+   "self_type" : "type-2372",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12331,12 +12334,12 @@
      "referenced_type" : "type-254"
     },
     {
-     "referenced_type" : "type-2367"
+     "referenced_type" : "type-2370"
     }
    ],
-   "referenced_type" : "type-2366",
-   "return_type" : "type-1494",
-   "self_type" : "type-2366",
+   "referenced_type" : "type-2369",
+   "return_type" : "type-1495",
+   "self_type" : "type-2369",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12352,18 +12355,18 @@
      "referenced_type" : "type-254"
     },
     {
-     "referenced_type" : "type-2359"
+     "referenced_type" : "type-2362"
     },
     {
-     "referenced_type" : "type-2359"
+     "referenced_type" : "type-2362"
     },
     {
-     "referenced_type" : "type-2360"
+     "referenced_type" : "type-2363"
     }
    ],
-   "referenced_type" : "type-2358",
-   "return_type" : "type-1494",
-   "self_type" : "type-2358",
+   "referenced_type" : "type-2361",
+   "return_type" : "type-1495",
+   "self_type" : "type-2361",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12382,9 +12385,9 @@
      "referenced_type" : "type-2"
     }
    ],
-   "referenced_type" : "type-2389",
-   "return_type" : "type-1494",
-   "self_type" : "type-2389",
+   "referenced_type" : "type-2392",
+   "return_type" : "type-1495",
+   "self_type" : "type-2392",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12400,12 +12403,12 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1595"
+     "referenced_type" : "type-1598"
     }
    ],
-   "referenced_type" : "type-2380",
-   "return_type" : "type-1494",
-   "self_type" : "type-2380",
+   "referenced_type" : "type-2383",
+   "return_type" : "type-1495",
+   "self_type" : "type-2383",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12427,12 +12430,12 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-2373"
+     "referenced_type" : "type-2376"
     }
    ],
-   "referenced_type" : "type-2372",
-   "return_type" : "type-1494",
-   "self_type" : "type-2372",
+   "referenced_type" : "type-2375",
+   "return_type" : "type-1495",
+   "self_type" : "type-2375",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12448,12 +12451,12 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1595"
+     "referenced_type" : "type-1598"
     }
    ],
-   "referenced_type" : "type-1594",
-   "return_type" : "type-1494",
-   "self_type" : "type-1594",
+   "referenced_type" : "type-1597",
+   "return_type" : "type-1495",
+   "self_type" : "type-1597",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -12469,7 +12472,7 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1588"
+     "referenced_type" : "type-1589"
     },
     {
      "referenced_type" : "type-2"
@@ -12481,9 +12484,9 @@
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1592",
-   "return_type" : "type-1494",
-   "self_type" : "type-1592",
+   "referenced_type" : "type-1595",
+   "return_type" : "type-1495",
+   "self_type" : "type-1595",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -12493,18 +12496,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1247"
+     "referenced_type" : "type-1250"
     },
     {
-     "referenced_type" : "type-1037"
+     "referenced_type" : "type-1041"
     },
     {
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1246",
+   "referenced_type" : "type-1249",
    "return_type" : "type-93",
-   "self_type" : "type-1246",
+   "self_type" : "type-1249",
    "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h"
   },
   {
@@ -12514,18 +12517,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1247"
+     "referenced_type" : "type-1250"
     },
     {
-     "referenced_type" : "type-1388"
+     "referenced_type" : "type-1391"
     },
     {
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1387",
+   "referenced_type" : "type-1390",
    "return_type" : "type-93",
-   "self_type" : "type-1387",
+   "self_type" : "type-1390",
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
   {
@@ -12580,7 +12583,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1381"
+     "referenced_type" : "type-1384"
     },
     {
      "referenced_type" : "type-97"
@@ -12598,9 +12601,9 @@
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1380",
+   "referenced_type" : "type-1383",
    "return_type" : "type-9",
-   "self_type" : "type-1380",
+   "self_type" : "type-1383",
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   }
  ],
@@ -12628,7 +12631,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-4500"
+     "referenced_type" : "type-4506"
     }
    ],
    "return_type" : "type-50",
@@ -12656,7 +12659,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1271"
+     "referenced_type" : "type-1275"
     }
    ],
    "return_type" : "type-50",
@@ -12935,7 +12938,7 @@
      "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-2190"
+     "referenced_type" : "type-2193"
     }
    ],
    "return_type" : "type-9",
@@ -13281,7 +13284,7 @@
      "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-2492"
+     "referenced_type" : "type-2495"
     },
     {
      "referenced_type" : "type-4"
@@ -13390,13 +13393,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2522"
+     "referenced_type" : "type-2525"
     },
     {
      "referenced_type" : "type-725"
     }
    ],
-   "return_type" : "type-2525",
+   "return_type" : "type-2528",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -13406,13 +13409,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2522"
+     "referenced_type" : "type-2525"
     },
     {
-     "referenced_type" : "type-1862"
+     "referenced_type" : "type-1866"
     }
    ],
-   "return_type" : "type-2525",
+   "return_type" : "type-2528",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -13423,7 +13426,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2673"
+     "referenced_type" : "type-2676"
     },
     {
      "referenced_type" : "type-11"
@@ -13443,7 +13446,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2673"
+     "referenced_type" : "type-2676"
     },
     {
      "referenced_type" : "type-8"
@@ -13463,7 +13466,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2673"
+     "referenced_type" : "type-2676"
     },
     {
      "referenced_type" : "type-8"
@@ -13483,7 +13486,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2673"
+     "referenced_type" : "type-2676"
     },
     {
      "referenced_type" : "type-8"
@@ -13506,7 +13509,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2673"
+     "referenced_type" : "type-2676"
     },
     {
      "referenced_type" : "type-8"
@@ -13529,7 +13532,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2673"
+     "referenced_type" : "type-2676"
     },
     {
      "referenced_type" : "type-8"
@@ -13552,7 +13555,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2673"
+     "referenced_type" : "type-2676"
     },
     {
      "referenced_type" : "type-8"
@@ -13575,7 +13578,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2676"
+     "referenced_type" : "type-2679"
     },
     {
      "referenced_type" : "type-11"
@@ -13595,7 +13598,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2676"
+     "referenced_type" : "type-2679"
     },
     {
      "referenced_type" : "type-8"
@@ -13615,7 +13618,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2676"
+     "referenced_type" : "type-2679"
     },
     {
      "referenced_type" : "type-8"
@@ -13635,7 +13638,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2676"
+     "referenced_type" : "type-2679"
     },
     {
      "referenced_type" : "type-8"
@@ -13658,7 +13661,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2676"
+     "referenced_type" : "type-2679"
     },
     {
      "referenced_type" : "type-8"
@@ -13681,7 +13684,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2676"
+     "referenced_type" : "type-2679"
     },
     {
      "referenced_type" : "type-8"
@@ -13704,7 +13707,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2676"
+     "referenced_type" : "type-2679"
     },
     {
      "referenced_type" : "type-8"
@@ -13727,7 +13730,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2668"
+     "referenced_type" : "type-2671"
     },
     {
      "referenced_type" : "type-11"
@@ -13747,7 +13750,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2668"
+     "referenced_type" : "type-2671"
     },
     {
      "referenced_type" : "type-8"
@@ -13767,7 +13770,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2668"
+     "referenced_type" : "type-2671"
     },
     {
      "referenced_type" : "type-8"
@@ -13787,7 +13790,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2668"
+     "referenced_type" : "type-2671"
     },
     {
      "referenced_type" : "type-8"
@@ -13810,7 +13813,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2668"
+     "referenced_type" : "type-2671"
     },
     {
      "referenced_type" : "type-8"
@@ -13833,7 +13836,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2668"
+     "referenced_type" : "type-2671"
     },
     {
      "referenced_type" : "type-8"
@@ -13856,7 +13859,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2668"
+     "referenced_type" : "type-2671"
     },
     {
      "referenced_type" : "type-8"
@@ -13878,10 +13881,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2547"
+     "referenced_type" : "type-2550"
     }
    ],
-   "return_type" : "type-2476",
+   "return_type" : "type-2479",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -13891,7 +13894,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2547"
+     "referenced_type" : "type-2550"
     }
    ],
    "return_type" : "type-570",
@@ -13904,10 +13907,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2547"
+     "referenced_type" : "type-2550"
     }
    ],
-   "return_type" : "type-2463",
+   "return_type" : "type-2466",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -13918,18 +13921,18 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1513"
+     "referenced_type" : "type-1517"
     },
     {
-     "referenced_type" : "type-1648"
+     "referenced_type" : "type-1652"
     },
     {
-     "referenced_type" : "type-3128"
+     "referenced_type" : "type-3131"
     }
    ],
    "return_type" : "type-4",
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-3129", "type-83" ]
+   "template_args" : [ "type-3132", "type-83" ]
   },
   {
    "function_name" : "android::Parcel::readNullableStrongBinder",
@@ -13938,15 +13941,15 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1513"
+     "referenced_type" : "type-1517"
     },
     {
-     "referenced_type" : "type-2534"
+     "referenced_type" : "type-2537"
     }
    ],
    "return_type" : "type-4",
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-3130" ]
+   "template_args" : [ "type-3133" ]
   },
   {
    "access" : "protected",
@@ -13956,7 +13959,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-978"
+     "referenced_type" : "type-980"
     },
     {
      "referenced_type" : "type-8"
@@ -13976,7 +13979,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-978"
+     "referenced_type" : "type-980"
     },
     {
      "referenced_type" : "type-8"
@@ -13996,7 +13999,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-978"
+     "referenced_type" : "type-980"
     },
     {
      "referenced_type" : "type-8"
@@ -14019,7 +14022,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-978"
+     "referenced_type" : "type-980"
     },
     {
      "referenced_type" : "type-8"
@@ -14042,7 +14045,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-978"
+     "referenced_type" : "type-980"
     },
     {
      "referenced_type" : "type-8"
@@ -14065,7 +14068,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-978"
+     "referenced_type" : "type-980"
     },
     {
      "referenced_type" : "type-8"
@@ -14088,7 +14091,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1228"
+     "referenced_type" : "type-1232"
     },
     {
      "referenced_type" : "type-8"
@@ -14108,7 +14111,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1228"
+     "referenced_type" : "type-1232"
     },
     {
      "referenced_type" : "type-8"
@@ -14128,7 +14131,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1228"
+     "referenced_type" : "type-1232"
     },
     {
      "referenced_type" : "type-8"
@@ -14151,7 +14154,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1228"
+     "referenced_type" : "type-1232"
     },
     {
      "referenced_type" : "type-8"
@@ -14174,7 +14177,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1228"
+     "referenced_type" : "type-1232"
     },
     {
      "referenced_type" : "type-8"
@@ -14197,7 +14200,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1228"
+     "referenced_type" : "type-1232"
     },
     {
      "referenced_type" : "type-8"
@@ -14220,7 +14223,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2689"
+     "referenced_type" : "type-2692"
     },
     {
      "referenced_type" : "type-8"
@@ -14240,7 +14243,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2689"
+     "referenced_type" : "type-2692"
     },
     {
      "referenced_type" : "type-8"
@@ -14260,7 +14263,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2689"
+     "referenced_type" : "type-2692"
     },
     {
      "referenced_type" : "type-8"
@@ -14283,7 +14286,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2689"
+     "referenced_type" : "type-2692"
     },
     {
      "referenced_type" : "type-8"
@@ -14306,7 +14309,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2689"
+     "referenced_type" : "type-2692"
     },
     {
      "referenced_type" : "type-8"
@@ -14329,7 +14332,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2689"
+     "referenced_type" : "type-2692"
     },
     {
      "referenced_type" : "type-8"
@@ -14366,7 +14369,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-4500"
+     "referenced_type" : "type-4506"
     }
    ],
    "return_type" : "type-50",
@@ -14380,8 +14383,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem &",
    "name" : "android::BufferItem &",
-   "referenced_type" : "type-1224",
-   "self_type" : "type-1223",
+   "referenced_type" : "type-1227",
+   "self_type" : "type-1226",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14389,8 +14392,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem &",
    "name" : "android::BufferItem &",
-   "referenced_type" : "type-3796",
-   "self_type" : "type-3795",
+   "referenced_type" : "type-3802",
+   "self_type" : "type-3801",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14398,8 +14401,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem &",
    "name" : "android::BufferItem &",
-   "referenced_type" : "type-5857",
-   "self_type" : "type-5856",
+   "referenced_type" : "type-5877",
+   "self_type" : "type-5876",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14407,8 +14410,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem &",
    "name" : "android::BufferItem &",
-   "referenced_type" : "type-6402",
-   "self_type" : "type-6401",
+   "referenced_type" : "type-6425",
+   "self_type" : "type-6424",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14416,8 +14419,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *&",
    "name" : "android::BufferItem *&",
-   "referenced_type" : "type-1669",
-   "self_type" : "type-1853",
+   "referenced_type" : "type-1673",
+   "self_type" : "type-1857",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -14425,8 +14428,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *&",
    "name" : "android::BufferItem *&",
-   "referenced_type" : "type-4124",
-   "self_type" : "type-4132",
+   "referenced_type" : "type-4130",
+   "self_type" : "type-4138",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -14434,8 +14437,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *&",
    "name" : "android::BufferItem *&",
-   "referenced_type" : "type-6695",
-   "self_type" : "type-6709",
+   "referenced_type" : "type-6719",
+   "self_type" : "type-6733",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -14443,8 +14446,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::CompositorTiming &",
    "name" : "android::CompositorTiming &",
-   "referenced_type" : "type-1431",
-   "self_type" : "type-1430",
+   "referenced_type" : "type-1434",
+   "self_type" : "type-1433",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14452,8 +14455,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::CompositorTiming &",
    "name" : "android::CompositorTiming &",
-   "referenced_type" : "type-3961",
-   "self_type" : "type-3960",
+   "referenced_type" : "type-3967",
+   "self_type" : "type-3966",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14461,8 +14464,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::CompositorTiming &",
    "name" : "android::CompositorTiming &",
-   "referenced_type" : "type-6538",
-   "self_type" : "type-6537",
+   "referenced_type" : "type-6561",
+   "self_type" : "type-6560",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14470,8 +14473,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-2528",
-   "self_type" : "type-2527",
+   "referenced_type" : "type-2531",
+   "self_type" : "type-2530",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14479,8 +14482,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-4415",
-   "self_type" : "type-4414",
+   "referenced_type" : "type-4417",
+   "self_type" : "type-4416",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14488,8 +14491,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-4671",
-   "self_type" : "type-4670",
+   "referenced_type" : "type-4677",
+   "self_type" : "type-4676",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14497,8 +14500,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-4939",
-   "self_type" : "type-4938",
+   "referenced_type" : "type-4945",
+   "self_type" : "type-4944",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14506,8 +14509,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-5999",
-   "self_type" : "type-5998",
+   "referenced_type" : "type-6019",
+   "self_type" : "type-6018",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14515,8 +14518,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-7004",
-   "self_type" : "type-7003",
+   "referenced_type" : "type-7024",
+   "self_type" : "type-7023",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14524,8 +14527,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-7186",
-   "self_type" : "type-7185",
+   "referenced_type" : "type-7209",
+   "self_type" : "type-7208",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14533,8 +14536,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-7298",
-   "self_type" : "type-7297",
+   "referenced_type" : "type-7321",
+   "self_type" : "type-7320",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14542,8 +14545,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot::State &",
    "name" : "android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-4585",
-   "self_type" : "type-4584",
+   "referenced_type" : "type-4591",
+   "self_type" : "type-4590",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14551,8 +14554,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot::State &",
    "name" : "android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-7206",
-   "self_type" : "type-7205",
+   "referenced_type" : "type-7231",
+   "self_type" : "type-7230",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14561,7 +14564,7 @@
    "linker_set_key" : "android::Flattenable<android::BufferItem> &",
    "name" : "android::Flattenable<android::BufferItem> &",
    "referenced_type" : "type-21",
-   "self_type" : "type-1514",
+   "self_type" : "type-1518",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14570,7 +14573,7 @@
    "linker_set_key" : "android::Flattenable<android::Fence> &",
    "name" : "android::Flattenable<android::Fence> &",
    "referenced_type" : "type-16",
-   "self_type" : "type-1651",
+   "self_type" : "type-1655",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14579,7 +14582,7 @@
    "linker_set_key" : "android::Flattenable<android::FrameEventHistoryDelta> &",
    "name" : "android::Flattenable<android::FrameEventHistoryDelta> &",
    "referenced_type" : "type-25",
-   "self_type" : "type-4324",
+   "self_type" : "type-4330",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14588,7 +14591,7 @@
    "linker_set_key" : "android::Flattenable<android::GraphicBuffer> &",
    "name" : "android::Flattenable<android::GraphicBuffer> &",
    "referenced_type" : "type-14",
-   "self_type" : "type-1650",
+   "self_type" : "type-1654",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14597,7 +14600,7 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> &",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> &",
    "referenced_type" : "type-32",
-   "self_type" : "type-4326",
+   "self_type" : "type-4333",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14606,7 +14609,7 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> &",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> &",
    "referenced_type" : "type-34",
-   "self_type" : "type-4325",
+   "self_type" : "type-4332",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14614,8 +14617,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-2391",
-   "self_type" : "type-2390",
+   "referenced_type" : "type-2394",
+   "self_type" : "type-2393",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14623,8 +14626,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-4217",
-   "self_type" : "type-4216",
+   "referenced_type" : "type-4223",
+   "self_type" : "type-4222",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14632,8 +14635,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-4678",
-   "self_type" : "type-4677",
+   "referenced_type" : "type-4685",
+   "self_type" : "type-4684",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14641,8 +14644,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-4769",
-   "self_type" : "type-4768",
+   "referenced_type" : "type-4775",
+   "self_type" : "type-4774",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14650,8 +14653,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-5973",
-   "self_type" : "type-5972",
+   "referenced_type" : "type-5993",
+   "self_type" : "type-5992",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14659,8 +14662,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-6797",
-   "self_type" : "type-6796",
+   "referenced_type" : "type-6820",
+   "self_type" : "type-6819",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14668,8 +14671,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-6818",
-   "self_type" : "type-6817",
+   "referenced_type" : "type-6842",
+   "self_type" : "type-6841",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14677,8 +14680,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-7305",
-   "self_type" : "type-7304",
+   "referenced_type" : "type-7328",
+   "self_type" : "type-7327",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14686,8 +14689,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1086",
-   "self_type" : "type-1085",
+   "referenced_type" : "type-1089",
+   "self_type" : "type-1088",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14695,8 +14698,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1268",
-   "self_type" : "type-1267",
+   "referenced_type" : "type-1271",
+   "self_type" : "type-1270",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14704,8 +14707,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1410",
-   "self_type" : "type-1409",
+   "referenced_type" : "type-1413",
+   "self_type" : "type-1412",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14713,8 +14716,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1446",
-   "self_type" : "type-1445",
+   "referenced_type" : "type-1449",
+   "self_type" : "type-1448",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14722,8 +14725,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-2172",
-   "self_type" : "type-2171",
+   "referenced_type" : "type-2176",
+   "self_type" : "type-2175",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14731,8 +14734,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3250",
-   "self_type" : "type-3249",
+   "referenced_type" : "type-3253",
+   "self_type" : "type-3252",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14749,8 +14752,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3463",
-   "self_type" : "type-3462",
+   "referenced_type" : "type-3466",
+   "self_type" : "type-3465",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14758,8 +14761,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3528",
-   "self_type" : "type-3527",
+   "referenced_type" : "type-3531",
+   "self_type" : "type-3530",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14767,8 +14770,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3639",
-   "self_type" : "type-3638",
+   "referenced_type" : "type-3642",
+   "self_type" : "type-3641",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14776,8 +14779,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3696",
-   "self_type" : "type-3695",
+   "referenced_type" : "type-3702",
+   "self_type" : "type-3701",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14785,8 +14788,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3821",
-   "self_type" : "type-3820",
+   "referenced_type" : "type-3827",
+   "self_type" : "type-3826",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14794,8 +14797,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3937",
-   "self_type" : "type-3936",
+   "referenced_type" : "type-3943",
+   "self_type" : "type-3942",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14803,8 +14806,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3978",
-   "self_type" : "type-3977",
+   "referenced_type" : "type-3985",
+   "self_type" : "type-3984",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14812,8 +14815,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-4207",
-   "self_type" : "type-4206",
+   "referenced_type" : "type-4214",
+   "self_type" : "type-4213",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14821,8 +14824,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-4386",
-   "self_type" : "type-4385",
+   "referenced_type" : "type-4392",
+   "self_type" : "type-4391",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14830,8 +14833,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-4597",
-   "self_type" : "type-4596",
+   "referenced_type" : "type-4604",
+   "self_type" : "type-4603",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14839,8 +14842,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-4764",
-   "self_type" : "type-4763",
+   "referenced_type" : "type-4771",
+   "self_type" : "type-4770",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14848,8 +14851,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5080",
-   "self_type" : "type-5079",
+   "referenced_type" : "type-5096",
+   "self_type" : "type-5095",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14857,8 +14860,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5148",
-   "self_type" : "type-5147",
+   "referenced_type" : "type-5164",
+   "self_type" : "type-5163",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14866,8 +14869,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5311",
-   "self_type" : "type-5310",
+   "referenced_type" : "type-5328",
+   "self_type" : "type-5327",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14875,8 +14878,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5524",
-   "self_type" : "type-5523",
+   "referenced_type" : "type-5541",
+   "self_type" : "type-5540",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14884,8 +14887,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5589",
-   "self_type" : "type-5588",
+   "referenced_type" : "type-5606",
+   "self_type" : "type-5605",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14893,8 +14896,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5700",
-   "self_type" : "type-5699",
+   "referenced_type" : "type-5717",
+   "self_type" : "type-5716",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14902,8 +14905,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5757",
-   "self_type" : "type-5756",
+   "referenced_type" : "type-5777",
+   "self_type" : "type-5776",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14911,8 +14914,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5882",
-   "self_type" : "type-5881",
+   "referenced_type" : "type-5902",
+   "self_type" : "type-5901",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14920,8 +14923,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6042",
-   "self_type" : "type-6041",
+   "referenced_type" : "type-6062",
+   "self_type" : "type-6061",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14929,8 +14932,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6125",
-   "self_type" : "type-6124",
+   "referenced_type" : "type-6145",
+   "self_type" : "type-6144",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14938,8 +14941,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6177",
-   "self_type" : "type-6176",
+   "referenced_type" : "type-6197",
+   "self_type" : "type-6196",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14947,8 +14950,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6271",
-   "self_type" : "type-6270",
+   "referenced_type" : "type-6291",
+   "self_type" : "type-6290",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14956,8 +14959,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6315",
-   "self_type" : "type-6314",
+   "referenced_type" : "type-6338",
+   "self_type" : "type-6337",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14965,8 +14968,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6410",
-   "self_type" : "type-6409",
+   "referenced_type" : "type-6434",
+   "self_type" : "type-6433",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14974,8 +14977,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6516",
-   "self_type" : "type-6515",
+   "referenced_type" : "type-6539",
+   "self_type" : "type-6538",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14983,8 +14986,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6553",
-   "self_type" : "type-6552",
+   "referenced_type" : "type-6576",
+   "self_type" : "type-6575",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14992,8 +14995,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6799",
-   "self_type" : "type-6798",
+   "referenced_type" : "type-6822",
+   "self_type" : "type-6821",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15001,8 +15004,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6971",
-   "self_type" : "type-6970",
+   "referenced_type" : "type-6995",
+   "self_type" : "type-6994",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15010,8 +15013,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-7222",
-   "self_type" : "type-7221",
+   "referenced_type" : "type-7245",
+   "self_type" : "type-7244",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15019,8 +15022,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-7361",
-   "self_type" : "type-7360",
+   "referenced_type" : "type-7384",
+   "self_type" : "type-7383",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15037,8 +15040,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-7585",
-   "self_type" : "type-7584",
+   "referenced_type" : "type-7608",
+   "self_type" : "type-7607",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15127,8 +15130,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-3472",
-   "self_type" : "type-3471",
+   "referenced_type" : "type-3475",
+   "self_type" : "type-3474",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15136,8 +15139,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-4303",
-   "self_type" : "type-4302",
+   "referenced_type" : "type-4309",
+   "self_type" : "type-4308",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15145,8 +15148,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-4755",
-   "self_type" : "type-4754",
+   "referenced_type" : "type-4761",
+   "self_type" : "type-4760",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15154,8 +15157,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-5533",
-   "self_type" : "type-5532",
+   "referenced_type" : "type-5550",
+   "self_type" : "type-5549",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15163,8 +15166,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-6133",
-   "self_type" : "type-6132",
+   "referenced_type" : "type-6153",
+   "self_type" : "type-6152",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15172,8 +15175,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-6894",
-   "self_type" : "type-6893",
+   "referenced_type" : "type-6917",
+   "self_type" : "type-6916",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15181,8 +15184,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-7354",
-   "self_type" : "type-7353",
+   "referenced_type" : "type-7377",
+   "self_type" : "type-7376",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15199,8 +15202,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
-   "referenced_type" : "type-1239",
-   "self_type" : "type-2660",
+   "referenced_type" : "type-1242",
+   "self_type" : "type-2663",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -15209,7 +15212,7 @@
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
    "referenced_type" : "type-121",
-   "self_type" : "type-2654",
+   "self_type" : "type-2657",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -15217,8 +15220,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 *&",
    "name" : "android::String8 *&",
-   "referenced_type" : "type-1885",
-   "self_type" : "type-1884",
+   "referenced_type" : "type-1889",
+   "self_type" : "type-1888",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -15226,8 +15229,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1101",
-   "self_type" : "type-1100",
+   "referenced_type" : "type-1104",
+   "self_type" : "type-1103",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15244,8 +15247,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1237",
-   "self_type" : "type-1236",
+   "referenced_type" : "type-1240",
+   "self_type" : "type-1239",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15253,8 +15256,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1365",
-   "self_type" : "type-1364",
+   "referenced_type" : "type-1368",
+   "self_type" : "type-1367",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15262,8 +15265,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1451",
-   "self_type" : "type-1450",
+   "referenced_type" : "type-1454",
+   "self_type" : "type-1453",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15271,8 +15274,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1524",
-   "self_type" : "type-1523",
+   "referenced_type" : "type-1529",
+   "self_type" : "type-1528",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15280,8 +15283,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1665",
-   "self_type" : "type-1664",
+   "referenced_type" : "type-1669",
+   "self_type" : "type-1668",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15289,8 +15292,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3168",
-   "self_type" : "type-3167",
+   "referenced_type" : "type-3171",
+   "self_type" : "type-3170",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15298,8 +15301,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3532",
-   "self_type" : "type-3531",
+   "referenced_type" : "type-3535",
+   "self_type" : "type-3534",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15307,8 +15310,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3643",
-   "self_type" : "type-3642",
+   "referenced_type" : "type-3646",
+   "self_type" : "type-3645",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15316,8 +15319,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3705",
-   "self_type" : "type-3704",
+   "referenced_type" : "type-3711",
+   "self_type" : "type-3710",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15325,8 +15328,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3806",
-   "self_type" : "type-3805",
+   "referenced_type" : "type-3812",
+   "self_type" : "type-3811",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15334,8 +15337,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3911",
-   "self_type" : "type-3910",
+   "referenced_type" : "type-3918",
+   "self_type" : "type-3917",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15343,8 +15346,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3984",
-   "self_type" : "type-3983",
+   "referenced_type" : "type-3990",
+   "self_type" : "type-3989",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15352,8 +15355,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4036",
-   "self_type" : "type-4035",
+   "referenced_type" : "type-4042",
+   "self_type" : "type-4041",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15361,8 +15364,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4121",
-   "self_type" : "type-4120",
+   "referenced_type" : "type-4127",
+   "self_type" : "type-4126",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15370,8 +15373,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4345",
-   "self_type" : "type-4344",
+   "referenced_type" : "type-4351",
+   "self_type" : "type-4350",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15379,8 +15382,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4484",
-   "self_type" : "type-4483",
+   "referenced_type" : "type-4490",
+   "self_type" : "type-4489",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15388,8 +15391,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4531",
-   "self_type" : "type-4530",
+   "referenced_type" : "type-4537",
+   "self_type" : "type-4536",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15397,8 +15400,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4553",
-   "self_type" : "type-4552",
+   "referenced_type" : "type-4559",
+   "self_type" : "type-4558",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15406,8 +15409,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4592",
-   "self_type" : "type-4591",
+   "referenced_type" : "type-4599",
+   "self_type" : "type-4598",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15415,8 +15418,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4771",
-   "self_type" : "type-4770",
+   "referenced_type" : "type-4777",
+   "self_type" : "type-4776",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15424,8 +15427,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4858",
-   "self_type" : "type-4857",
+   "referenced_type" : "type-4864",
+   "self_type" : "type-4863",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15433,8 +15436,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5078",
-   "self_type" : "type-5077",
+   "referenced_type" : "type-5094",
+   "self_type" : "type-5093",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15442,8 +15445,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5118",
-   "self_type" : "type-5117",
+   "referenced_type" : "type-5134",
+   "self_type" : "type-5133",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15451,8 +15454,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5154",
-   "self_type" : "type-5153",
+   "referenced_type" : "type-5170",
+   "self_type" : "type-5169",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15460,8 +15463,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5229",
-   "self_type" : "type-5228",
+   "referenced_type" : "type-5246",
+   "self_type" : "type-5245",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15469,8 +15472,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5593",
-   "self_type" : "type-5592",
+   "referenced_type" : "type-5610",
+   "self_type" : "type-5609",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15478,8 +15481,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5704",
-   "self_type" : "type-5703",
+   "referenced_type" : "type-5721",
+   "self_type" : "type-5720",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15487,8 +15490,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5766",
-   "self_type" : "type-5765",
+   "referenced_type" : "type-5786",
+   "self_type" : "type-5785",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15496,8 +15499,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5867",
-   "self_type" : "type-5866",
+   "referenced_type" : "type-5887",
+   "self_type" : "type-5886",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15505,8 +15508,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6035",
-   "self_type" : "type-6034",
+   "referenced_type" : "type-6055",
+   "self_type" : "type-6054",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15514,8 +15517,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6181",
-   "self_type" : "type-6180",
+   "referenced_type" : "type-6201",
+   "self_type" : "type-6200",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15523,8 +15526,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6277",
-   "self_type" : "type-6276",
+   "referenced_type" : "type-6297",
+   "self_type" : "type-6296",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15532,8 +15535,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6321",
-   "self_type" : "type-6320",
+   "referenced_type" : "type-6344",
+   "self_type" : "type-6343",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15541,8 +15544,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6404",
-   "self_type" : "type-6403",
+   "referenced_type" : "type-6427",
+   "self_type" : "type-6426",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15550,8 +15553,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6490",
-   "self_type" : "type-6489",
+   "referenced_type" : "type-6513",
+   "self_type" : "type-6512",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15559,8 +15562,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6558",
-   "self_type" : "type-6557",
+   "referenced_type" : "type-6581",
+   "self_type" : "type-6580",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15568,8 +15571,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6610",
-   "self_type" : "type-6609",
+   "referenced_type" : "type-6635",
+   "self_type" : "type-6634",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15577,8 +15580,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6693",
-   "self_type" : "type-6692",
+   "referenced_type" : "type-6717",
+   "self_type" : "type-6716",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15586,8 +15589,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6927",
-   "self_type" : "type-6926",
+   "referenced_type" : "type-6951",
+   "self_type" : "type-6950",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15595,8 +15598,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7070",
-   "self_type" : "type-7069",
+   "referenced_type" : "type-7095",
+   "self_type" : "type-7094",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15604,8 +15607,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7129",
-   "self_type" : "type-7128",
+   "referenced_type" : "type-7153",
+   "self_type" : "type-7152",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15613,8 +15616,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7159",
-   "self_type" : "type-7158",
+   "referenced_type" : "type-7184",
+   "self_type" : "type-7183",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15622,8 +15625,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7215",
-   "self_type" : "type-7214",
+   "referenced_type" : "type-7241",
+   "self_type" : "type-7240",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15631,8 +15634,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7366",
-   "self_type" : "type-7365",
+   "referenced_type" : "type-7389",
+   "self_type" : "type-7388",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15640,8 +15643,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7444",
-   "self_type" : "type-7443",
+   "referenced_type" : "type-7468",
+   "self_type" : "type-7467",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15649,8 +15652,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7480",
-   "self_type" : "type-7479",
+   "referenced_type" : "type-7503",
+   "self_type" : "type-7502",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15658,8 +15661,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7582",
-   "self_type" : "type-7581",
+   "referenced_type" : "type-7606",
+   "self_type" : "type-7605",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15667,8 +15670,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7611",
-   "self_type" : "type-7610",
+   "referenced_type" : "type-7635",
+   "self_type" : "type-7634",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15703,8 +15706,8 @@
    "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",
+   "referenced_type" : "type-7528",
+   "self_type" : "type-7533",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15712,24 +15715,6 @@
    "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,
@@ -15737,8 +15722,8 @@
   },
   {
    "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> > &",
+   "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-4494",
    "self_type" : "type-4497",
    "size" : 4,
@@ -15746,10 +15731,28 @@
   },
   {
    "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-4371",
+   "self_type" : "type-4374",
+   "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-4500",
+   "self_type" : "type-4503",
+   "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-4356",
+   "referenced_type" : "type-4359",
+   "self_type" : "type-4362",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15766,8 +15769,8 @@
    "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",
+   "referenced_type" : "type-7534",
+   "self_type" : "type-7537",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15793,8 +15796,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1383",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1386",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -15802,8 +15805,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-3921",
-   "self_type" : "type-3920",
+   "referenced_type" : "type-3927",
+   "self_type" : "type-3926",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -15811,8 +15814,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-6499",
-   "self_type" : "type-6498",
+   "referenced_type" : "type-6523",
+   "self_type" : "type-6522",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -15830,7 +15833,7 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> > &",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> > &",
    "referenced_type" : "type-381",
-   "self_type" : "type-7622",
+   "self_type" : "type-7646",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15839,7 +15842,7 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect> &",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect> &",
    "referenced_type" : "type-372",
-   "self_type" : "type-4594",
+   "self_type" : "type-4600",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15848,7 +15851,7 @@
    "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-4347",
+   "self_type" : "type-4353",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15857,7 +15860,7 @@
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming &",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming &",
    "referenced_type" : "type-588",
-   "self_type" : "type-4586",
+   "self_type" : "type-4592",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15866,7 +15869,7 @@
    "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-4590",
+   "self_type" : "type-4597",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15875,7 +15878,7 @@
    "linker_set_key" : "android::hardware::hidl_array<int, 4> &",
    "name" : "android::hardware::hidl_array<int, 4> &",
    "referenced_type" : "type-384",
-   "self_type" : "type-7623",
+   "self_type" : "type-5171",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15893,7 +15896,7 @@
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> &",
    "name" : "android::hardware::hidl_vec<unsigned char> &",
    "referenced_type" : "type-452",
-   "self_type" : "type-4379",
+   "self_type" : "type-4385",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15902,7 +15905,7 @@
    "linker_set_key" : "android::hardware::media::V1_0::Rect &",
    "name" : "android::hardware::media::V1_0::Rect &",
    "referenced_type" : "type-375",
-   "self_type" : "type-4598",
+   "self_type" : "type-4605",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15911,7 +15914,7 @@
    "linker_set_key" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > &",
    "name" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > &",
    "referenced_type" : "type-160",
-   "self_type" : "type-2642",
+   "self_type" : "type-2645",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15920,7 +15923,7 @@
    "linker_set_key" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > &",
    "name" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > &",
    "referenced_type" : "type-147",
-   "self_type" : "type-2638",
+   "self_type" : "type-2641",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15929,7 +15932,7 @@
    "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int> &",
    "name" : "android::key_value_pair_t<unsigned int, unsigned int> &",
    "referenced_type" : "type-143",
-   "self_type" : "type-2637",
+   "self_type" : "type-2640",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15938,7 +15941,7 @@
    "linker_set_key" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > &",
    "name" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > &",
    "referenced_type" : "type-581",
-   "self_type" : "type-2512",
+   "self_type" : "type-2515",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15947,7 +15950,7 @@
    "linker_set_key" : "android::sp<android::ALooper> &",
    "name" : "android::sp<android::ALooper> &",
    "referenced_type" : "type-321",
-   "self_type" : "type-2266",
+   "self_type" : "type-2269",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15956,7 +15959,7 @@
    "linker_set_key" : "android::sp<android::AMessage> &",
    "name" : "android::sp<android::AMessage> &",
    "referenced_type" : "type-259",
-   "self_type" : "type-2077",
+   "self_type" : "type-2068",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15965,7 +15968,7 @@
    "linker_set_key" : "android::sp<android::ComponentWrapper> &",
    "name" : "android::sp<android::ComponentWrapper> &",
    "referenced_type" : "type-567",
-   "self_type" : "type-2490",
+   "self_type" : "type-2493",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15973,8 +15976,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::Fence> &",
    "name" : "android::sp<android::Fence> &",
-   "referenced_type" : "type-1864",
-   "self_type" : "type-2525",
+   "referenced_type" : "type-1868",
+   "self_type" : "type-2528",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15983,7 +15986,7 @@
    "linker_set_key" : "android::sp<android::FrameDropper> &",
    "name" : "android::sp<android::FrameDropper> &",
    "referenced_type" : "type-578",
-   "self_type" : "type-2505",
+   "self_type" : "type-2508",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16001,7 +16004,7 @@
    "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy> &",
    "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy> &",
    "referenced_type" : "type-473",
-   "self_type" : "type-2497",
+   "self_type" : "type-2500",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16009,8 +16012,8 @@
    "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",
+   "referenced_type" : "type-4265",
+   "self_type" : "type-4268",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16018,8 +16021,8 @@
    "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",
+   "referenced_type" : "type-4274",
+   "self_type" : "type-4277",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16027,8 +16030,8 @@
    "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",
+   "referenced_type" : "type-4833",
+   "self_type" : "type-4844",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16036,8 +16039,8 @@
    "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",
+   "referenced_type" : "type-5112",
+   "self_type" : "type-5119",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16090,8 +16093,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::NativeHandle> *&",
    "name" : "android::sp<android::NativeHandle> *&",
-   "referenced_type" : "type-1880",
-   "self_type" : "type-1879",
+   "referenced_type" : "type-1884",
+   "self_type" : "type-1883",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16099,8 +16102,8 @@
    "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",
+   "referenced_type" : "type-2473",
+   "self_type" : "type-7658",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16118,7 +16121,7 @@
    "linker_set_key" : "android::wp<android::IBinder::DeathRecipient> &",
    "name" : "android::wp<android::IBinder::DeathRecipient> &",
    "referenced_type" : "type-172",
-   "self_type" : "type-4304",
+   "self_type" : "type-4310",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16127,7 +16130,7 @@
    "linker_set_key" : "android_cta861_3_metadata &",
    "name" : "android_cta861_3_metadata &",
    "referenced_type" : "type-305",
-   "self_type" : "type-1476",
+   "self_type" : "type-1480",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16145,7 +16148,7 @@
    "linker_set_key" : "android_smpte2086_metadata &",
    "name" : "android_smpte2086_metadata &",
    "referenced_type" : "type-304",
-   "self_type" : "type-1475",
+   "self_type" : "type-1479",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16162,8 +16165,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AString &",
    "name" : "const android::AString &",
-   "referenced_type" : "type-2110",
-   "self_type" : "type-2241",
+   "referenced_type" : "type-2101",
+   "self_type" : "type-2244",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -16171,8 +16174,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-1219",
-   "self_type" : "type-1222",
+   "referenced_type" : "type-1223",
+   "self_type" : "type-1225",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16180,8 +16183,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-1530",
-   "self_type" : "type-1532",
+   "referenced_type" : "type-1533",
+   "self_type" : "type-1535",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16189,8 +16192,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-1671",
-   "self_type" : "type-1673",
+   "referenced_type" : "type-1675",
+   "self_type" : "type-1677",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16198,8 +16201,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-3441",
-   "self_type" : "type-3443",
+   "referenced_type" : "type-3444",
+   "self_type" : "type-3446",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -16207,8 +16210,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-3633",
-   "self_type" : "type-3637",
+   "referenced_type" : "type-3636",
+   "self_type" : "type-3640",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16216,8 +16219,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-3791",
-   "self_type" : "type-3794",
+   "referenced_type" : "type-3798",
+   "self_type" : "type-3800",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16225,8 +16228,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-4040",
-   "self_type" : "type-4043",
+   "referenced_type" : "type-4047",
+   "self_type" : "type-4049",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16234,8 +16237,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-4126",
-   "self_type" : "type-4128",
+   "referenced_type" : "type-4132",
+   "self_type" : "type-4134",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16243,8 +16246,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-5502",
-   "self_type" : "type-5504",
+   "referenced_type" : "type-5519",
+   "self_type" : "type-5521",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -16252,8 +16255,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-5694",
-   "self_type" : "type-5698",
+   "referenced_type" : "type-5711",
+   "self_type" : "type-5715",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16261,8 +16264,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-5852",
-   "self_type" : "type-5855",
+   "referenced_type" : "type-5873",
+   "self_type" : "type-5875",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16270,8 +16273,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-6106",
-   "self_type" : "type-6108",
+   "referenced_type" : "type-6126",
+   "self_type" : "type-6128",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -16279,8 +16282,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-6265",
-   "self_type" : "type-6269",
+   "referenced_type" : "type-6285",
+   "self_type" : "type-6289",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16288,8 +16291,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-6398",
-   "self_type" : "type-6400",
+   "referenced_type" : "type-6421",
+   "self_type" : "type-6423",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16297,8 +16300,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-6616",
-   "self_type" : "type-6618",
+   "referenced_type" : "type-6639",
+   "self_type" : "type-6641",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16306,8 +16309,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-6698",
-   "self_type" : "type-6700",
+   "referenced_type" : "type-6721",
+   "self_type" : "type-6723",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16333,8 +16336,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::CompositorTiming &",
    "name" : "const android::CompositorTiming &",
-   "referenced_type" : "type-1424",
-   "self_type" : "type-1426",
+   "referenced_type" : "type-1427",
+   "self_type" : "type-1429",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16342,8 +16345,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::CompositorTiming &",
    "name" : "const android::CompositorTiming &",
-   "referenced_type" : "type-3952",
-   "self_type" : "type-3954",
+   "referenced_type" : "type-3960",
+   "self_type" : "type-3962",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16351,8 +16354,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::CompositorTiming &",
    "name" : "const android::CompositorTiming &",
-   "referenced_type" : "type-6531",
-   "self_type" : "type-6533",
+   "referenced_type" : "type-6554",
+   "self_type" : "type-6556",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16360,8 +16363,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-4579",
-   "self_type" : "type-4581",
+   "referenced_type" : "type-4585",
+   "self_type" : "type-4587",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16369,8 +16372,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-4747",
-   "self_type" : "type-4749",
+   "referenced_type" : "type-4754",
+   "self_type" : "type-4756",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16378,8 +16381,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-7200",
-   "self_type" : "type-7202",
+   "referenced_type" : "type-7225",
+   "self_type" : "type-7227",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16387,8 +16390,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-7348",
-   "self_type" : "type-7350",
+   "referenced_type" : "type-7371",
+   "self_type" : "type-7373",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16396,8 +16399,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Flattenable<android::BufferItem> &",
    "name" : "const android::Flattenable<android::BufferItem> &",
-   "referenced_type" : "type-1506",
-   "self_type" : "type-1512",
+   "referenced_type" : "type-1509",
+   "self_type" : "type-1516",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16405,8 +16408,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Flattenable<android::Fence> &",
    "name" : "const android::Flattenable<android::Fence> &",
-   "referenced_type" : "type-1634",
-   "self_type" : "type-1647",
+   "referenced_type" : "type-1638",
+   "self_type" : "type-1650",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16414,8 +16417,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Flattenable<android::FrameEventHistoryDelta> &",
    "name" : "const android::Flattenable<android::FrameEventHistoryDelta> &",
-   "referenced_type" : "type-4306",
-   "self_type" : "type-4322",
+   "referenced_type" : "type-4312",
+   "self_type" : "type-4328",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16423,8 +16426,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Flattenable<android::GraphicBuffer> &",
    "name" : "const android::Flattenable<android::GraphicBuffer> &",
-   "referenced_type" : "type-1638",
-   "self_type" : "type-1646",
+   "referenced_type" : "type-1643",
+   "self_type" : "type-1649",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16432,8 +16435,8 @@
    "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",
+   "referenced_type" : "type-4315",
+   "self_type" : "type-4327",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16441,8 +16444,8 @@
    "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",
+   "referenced_type" : "type-4318",
+   "self_type" : "type-4329",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16504,8 +16507,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel &",
    "name" : "const android::Parcel &",
-   "referenced_type" : "type-4533",
-   "self_type" : "type-4532",
+   "referenced_type" : "type-4539",
+   "self_type" : "type-4538",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16513,8 +16516,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel &",
    "name" : "const android::Parcel &",
-   "referenced_type" : "type-7132",
-   "self_type" : "type-7131",
+   "referenced_type" : "type-7155",
+   "self_type" : "type-7154",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16531,8 +16534,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-1215",
-   "self_type" : "type-1217",
+   "referenced_type" : "type-1218",
+   "self_type" : "type-1220",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16540,8 +16543,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-1490",
-   "self_type" : "type-1492",
+   "referenced_type" : "type-1493",
+   "self_type" : "type-1496",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16549,8 +16552,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-1621",
-   "self_type" : "type-1623",
+   "referenced_type" : "type-1624",
+   "self_type" : "type-1626",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16558,8 +16561,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-2683",
-   "self_type" : "type-2685",
+   "referenced_type" : "type-2686",
+   "self_type" : "type-2688",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16567,8 +16570,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-3466",
-   "self_type" : "type-3468",
+   "referenced_type" : "type-3469",
+   "self_type" : "type-3471",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16576,8 +16579,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-3787",
-   "self_type" : "type-3789",
+   "referenced_type" : "type-3793",
+   "self_type" : "type-3795",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16585,8 +16588,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-4011",
-   "self_type" : "type-4013",
+   "referenced_type" : "type-4017",
+   "self_type" : "type-4019",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16594,8 +16597,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-4090",
-   "self_type" : "type-4092",
+   "referenced_type" : "type-4096",
+   "self_type" : "type-4098",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16603,8 +16606,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-4292",
-   "self_type" : "type-4294",
+   "referenced_type" : "type-4298",
+   "self_type" : "type-4300",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16612,8 +16615,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-4572",
-   "self_type" : "type-4574",
+   "referenced_type" : "type-4578",
+   "self_type" : "type-4580",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16621,8 +16624,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-4736",
-   "self_type" : "type-4738",
+   "referenced_type" : "type-4743",
+   "self_type" : "type-4745",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16630,8 +16633,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-5019",
-   "self_type" : "type-5021",
+   "referenced_type" : "type-5025",
+   "self_type" : "type-5027",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16639,8 +16642,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-5063",
-   "self_type" : "type-5065",
+   "referenced_type" : "type-5080",
+   "self_type" : "type-5083",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16648,8 +16651,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-5527",
-   "self_type" : "type-5529",
+   "referenced_type" : "type-5544",
+   "self_type" : "type-5546",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16657,8 +16660,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-5848",
-   "self_type" : "type-5850",
+   "referenced_type" : "type-5868",
+   "self_type" : "type-5870",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16666,8 +16669,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-6030",
-   "self_type" : "type-6032",
+   "referenced_type" : "type-6050",
+   "self_type" : "type-6052",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16675,8 +16678,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-6129",
-   "self_type" : "type-6131",
+   "referenced_type" : "type-6149",
+   "self_type" : "type-6151",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16684,8 +16687,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-6394",
-   "self_type" : "type-6396",
+   "referenced_type" : "type-6417",
+   "self_type" : "type-6419",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16693,8 +16696,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-6584",
-   "self_type" : "type-6586",
+   "referenced_type" : "type-6608",
+   "self_type" : "type-6610",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16702,8 +16705,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-6663",
-   "self_type" : "type-6665",
+   "referenced_type" : "type-6686",
+   "self_type" : "type-6688",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16711,8 +16714,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-6881",
-   "self_type" : "type-6884",
+   "referenced_type" : "type-6905",
+   "self_type" : "type-6907",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16720,8 +16723,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-7192",
-   "self_type" : "type-7194",
+   "referenced_type" : "type-7216",
+   "self_type" : "type-7218",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16729,8 +16732,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-7339",
-   "self_type" : "type-7341",
+   "referenced_type" : "type-7362",
+   "self_type" : "type-7364",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16738,8 +16741,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-7565",
-   "self_type" : "type-7567",
+   "referenced_type" : "type-7588",
+   "self_type" : "type-7590",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16756,8 +16759,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-7666",
-   "self_type" : "type-7669",
+   "referenced_type" : "type-7685",
+   "self_type" : "type-7691",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16765,8 +16768,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SafeInterface::ParcelHandler &",
    "name" : "const android::SafeInterface::ParcelHandler &",
-   "referenced_type" : "type-1256",
-   "self_type" : "type-1675",
+   "referenced_type" : "type-1254",
+   "self_type" : "type-1680",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16774,8 +16777,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-1248",
-   "self_type" : "type-1247",
+   "referenced_type" : "type-1251",
+   "self_type" : "type-1250",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -16783,8 +16786,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 &",
    "name" : "const android::String8 &",
-   "referenced_type" : "type-1875",
-   "self_type" : "type-1874",
+   "referenced_type" : "type-1879",
+   "self_type" : "type-1878",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -16801,8 +16804,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1385",
-   "self_type" : "type-1386",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1389",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16837,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-4348",
-   "self_type" : "type-4570",
+   "referenced_type" : "type-4354",
+   "self_type" : "type-4576",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16846,8 +16849,8 @@
    "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-4582",
-   "self_type" : "type-4583",
+   "referenced_type" : "type-4588",
+   "self_type" : "type-4589",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16954,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-2619",
-   "self_type" : "type-2620",
+   "referenced_type" : "type-2622",
+   "self_type" : "type-2623",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16963,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-2617",
-   "self_type" : "type-2618",
+   "referenced_type" : "type-2620",
+   "self_type" : "type-2621",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16972,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-2613",
-   "self_type" : "type-2614",
+   "referenced_type" : "type-2616",
+   "self_type" : "type-2617",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16981,8 +16984,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-2409",
-   "self_type" : "type-2408",
+   "referenced_type" : "type-2412",
+   "self_type" : "type-2411",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -16990,8 +16993,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-4845",
-   "self_type" : "type-4844",
+   "referenced_type" : "type-4851",
+   "self_type" : "type-4850",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -16999,8 +17002,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-5978",
-   "self_type" : "type-5980",
+   "referenced_type" : "type-5998",
+   "self_type" : "type-6000",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -17008,8 +17011,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-6813",
-   "self_type" : "type-6812",
+   "referenced_type" : "type-6836",
+   "self_type" : "type-6835",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -17017,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-1304",
-   "self_type" : "type-1486",
+   "referenced_type" : "type-1301",
+   "self_type" : "type-1489",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17035,8 +17038,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::AMessage> &",
    "name" : "const android::sp<android::AMessage> &",
-   "referenced_type" : "type-2175",
-   "self_type" : "type-2190",
+   "referenced_type" : "type-2174",
+   "self_type" : "type-2193",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17044,8 +17047,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::BpGraphicBufferProducer> &",
    "name" : "const android::sp<android::BpGraphicBufferProducer> &",
-   "referenced_type" : "type-4227",
-   "self_type" : "type-4232",
+   "referenced_type" : "type-4233",
+   "self_type" : "type-4238",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17053,8 +17056,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::BpProducerListener> &",
    "name" : "const android::sp<android::BpProducerListener> &",
-   "referenced_type" : "type-4516",
-   "self_type" : "type-4517",
+   "referenced_type" : "type-4522",
+   "self_type" : "type-4523",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17071,8 +17074,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::ComponentWrapper> &",
    "name" : "const android::sp<android::ComponentWrapper> &",
-   "referenced_type" : "type-2491",
-   "self_type" : "type-2492",
+   "referenced_type" : "type-2494",
+   "self_type" : "type-2495",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17080,8 +17083,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::Fence> &",
    "name" : "const android::sp<android::Fence> &",
-   "referenced_type" : "type-1863",
-   "self_type" : "type-1862",
+   "referenced_type" : "type-1867",
+   "self_type" : "type-1866",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17089,8 +17092,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::GraphicBuffer> &",
    "name" : "const android::sp<android::GraphicBuffer> &",
-   "referenced_type" : "type-1196",
-   "self_type" : "type-1859",
+   "referenced_type" : "type-1200",
+   "self_type" : "type-1864",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17107,8 +17110,8 @@
    "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",
+   "referenced_type" : "type-4270",
+   "self_type" : "type-4396",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17116,8 +17119,8 @@
    "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",
+   "referenced_type" : "type-4279",
+   "self_type" : "type-4397",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17125,8 +17128,8 @@
    "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",
+   "referenced_type" : "type-4832",
+   "self_type" : "type-4837",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17134,8 +17137,8 @@
    "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",
+   "referenced_type" : "type-5111",
+   "self_type" : "type-5116",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17143,8 +17146,8 @@
    "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",
+   "referenced_type" : "type-4306",
+   "self_type" : "type-4307",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17152,8 +17155,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IBinder> &",
    "name" : "const android::sp<android::IBinder> &",
-   "referenced_type" : "type-1036",
-   "self_type" : "type-1037",
+   "referenced_type" : "type-1040",
+   "self_type" : "type-1041",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17179,8 +17182,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer> &",
    "name" : "const android::sp<android::IGraphicBufferProducer> &",
-   "referenced_type" : "type-2485",
-   "self_type" : "type-2486",
+   "referenced_type" : "type-2488",
+   "self_type" : "type-2489",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17197,8 +17200,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::ITransactionCompletedListener> &",
    "name" : "const android::sp<android::ITransactionCompletedListener> &",
-   "referenced_type" : "type-1046",
-   "self_type" : "type-1047",
+   "referenced_type" : "type-1049",
+   "self_type" : "type-1050",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17215,8 +17218,8 @@
    "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",
+   "referenced_type" : "type-1392",
+   "self_type" : "type-1391",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -17224,8 +17227,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-2468",
-   "self_type" : "type-4222",
+   "referenced_type" : "type-2471",
+   "self_type" : "type-4228",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17233,8 +17236,8 @@
    "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-2458",
-   "self_type" : "type-4510",
+   "referenced_type" : "type-2461",
+   "self_type" : "type-4516",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17242,8 +17245,8 @@
    "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",
+   "referenced_type" : "type-4245",
+   "self_type" : "type-4250",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17251,8 +17254,8 @@
    "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",
+   "referenced_type" : "type-4476",
+   "self_type" : "type-4525",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17260,8 +17263,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-2482",
-   "self_type" : "type-4223",
+   "referenced_type" : "type-2485",
+   "self_type" : "type-4229",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17269,8 +17272,8 @@
    "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",
+   "referenced_type" : "type-2477",
+   "self_type" : "type-4519",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17278,8 +17281,8 @@
    "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",
+   "referenced_type" : "type-4239",
+   "self_type" : "type-4244",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17287,8 +17290,8 @@
    "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",
+   "referenced_type" : "type-4469",
+   "self_type" : "type-4524",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17332,8 +17335,8 @@
    "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",
+   "referenced_type" : "type-4296",
+   "self_type" : "type-4301",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17341,8 +17344,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::IBinder> &",
    "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "type-4280",
-   "self_type" : "type-4281",
+   "referenced_type" : "type-4286",
+   "self_type" : "type-4287",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17350,8 +17353,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android_cta861_3_metadata &",
    "name" : "const android_cta861_3_metadata &",
-   "referenced_type" : "type-1473",
-   "self_type" : "type-1474",
+   "referenced_type" : "type-1477",
+   "self_type" : "type-1478",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17368,8 +17371,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android_smpte2086_metadata &",
    "name" : "const android_smpte2086_metadata &",
-   "referenced_type" : "type-1471",
-   "self_type" : "type-1472",
+   "referenced_type" : "type-1474",
+   "self_type" : "type-1476",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17386,8 +17389,8 @@
    "alignment" : 4,
    "linker_set_key" : "const double &",
    "name" : "const double &",
-   "referenced_type" : "type-1077",
-   "self_type" : "type-1124",
+   "referenced_type" : "type-1080",
+   "self_type" : "type-1123",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17414,7 +17417,7 @@
    "linker_set_key" : "const int *&",
    "name" : "const int *&",
    "referenced_type" : "type-479",
-   "self_type" : "type-1511",
+   "self_type" : "type-1514",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17428,57 +17431,57 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1109",
-   "self_type" : "type-1111",
+   "referenced_type" : "type-1112",
+   "self_type" : "type-1114",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1281",
-   "self_type" : "type-1283",
+   "referenced_type" : "type-1284",
+   "self_type" : "type-1286",
    "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",
+   "referenced_type" : "type-3309",
+   "self_type" : "type-3311",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3538",
-   "self_type" : "type-3540",
+   "referenced_type" : "type-3541",
+   "self_type" : "type-3543",
    "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",
+   "referenced_type" : "type-3650",
+   "self_type" : "type-3652",
    "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",
+   "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-3832",
-   "self_type" : "type-3834",
+   "referenced_type" : "type-3838",
+   "self_type" : "type-3840",
    "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",
+   "referenced_type" : "type-4378",
+   "self_type" : "type-4380",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -17491,190 +17494,190 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-4501",
-   "self_type" : "type-4503",
+   "referenced_type" : "type-4507",
+   "self_type" : "type-4509",
    "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",
+   "referenced_type" : "type-4544",
+   "self_type" : "type-4546",
    "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",
+   "referenced_type" : "type-4569",
+   "self_type" : "type-4571",
    "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",
+   "referenced_type" : "type-4723",
+   "self_type" : "type-4725",
    "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",
+   "referenced_type" : "type-4853",
+   "self_type" : "type-4855",
    "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",
+   "referenced_type" : "type-5124",
+   "self_type" : "type-5126",
    "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",
+   "referenced_type" : "type-5177",
+   "self_type" : "type-5179",
    "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",
+   "referenced_type" : "type-5384",
+   "self_type" : "type-5386",
    "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",
+   "referenced_type" : "type-5616",
+   "self_type" : "type-5618",
    "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",
+   "referenced_type" : "type-5725",
+   "self_type" : "type-5727",
    "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",
+   "referenced_type" : "type-5791",
+   "self_type" : "type-5793",
    "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",
+   "referenced_type" : "type-5913",
+   "self_type" : "type-5915",
    "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",
+   "referenced_type" : "type-6069",
+   "self_type" : "type-6074",
    "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",
+   "referenced_type" : "type-6205",
+   "self_type" : "type-6207",
    "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",
+   "referenced_type" : "type-6301",
+   "self_type" : "type-6303",
    "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",
+   "referenced_type" : "type-6348",
+   "self_type" : "type-6352",
    "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",
+   "referenced_type" : "type-6440",
+   "self_type" : "type-6442",
    "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",
+   "referenced_type" : "type-6979",
+   "self_type" : "type-6981",
    "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",
+   "referenced_type" : "type-7113",
+   "self_type" : "type-7116",
    "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",
+   "referenced_type" : "type-7166",
+   "self_type" : "type-7168",
    "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",
+   "referenced_type" : "type-7202",
+   "self_type" : "type-7204",
    "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",
+   "referenced_type" : "type-7351",
+   "self_type" : "type-7353",
    "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",
+   "referenced_type" : "type-7451",
+   "self_type" : "type-7453",
    "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",
+   "referenced_type" : "type-7489",
+   "self_type" : "type-7491",
    "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",
+   "referenced_type" : "type-7542",
+   "self_type" : "type-7544",
    "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",
+   "referenced_type" : "type-7622",
+   "self_type" : "type-7624",
    "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",
+   "referenced_type" : "type-7687",
+   "self_type" : "type-7689",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -17688,8 +17691,8 @@
    "alignment" : 4,
    "linker_set_key" : "const log_msg &",
    "name" : "const log_msg &",
-   "referenced_type" : "type-2313",
-   "self_type" : "type-2331",
+   "referenced_type" : "type-2316",
+   "self_type" : "type-2334",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -17724,8 +17727,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
-   "referenced_type" : "type-2643",
-   "self_type" : "type-2646",
+   "referenced_type" : "type-2646",
+   "self_type" : "type-2649",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17733,8 +17736,8 @@
    "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",
+   "referenced_type" : "type-4993",
+   "self_type" : "type-4995",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17742,8 +17745,8 @@
    "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",
+   "referenced_type" : "type-6041",
+   "self_type" : "type-6043",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17751,8 +17754,8 @@
    "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",
+   "referenced_type" : "type-7529",
+   "self_type" : "type-7538",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17760,8 +17763,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
-   "referenced_type" : "type-2639",
-   "self_type" : "type-2641",
+   "referenced_type" : "type-2642",
+   "self_type" : "type-2644",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17769,8 +17772,8 @@
    "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",
+   "referenced_type" : "type-4989",
+   "self_type" : "type-4991",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17778,8 +17781,8 @@
    "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",
+   "referenced_type" : "type-6036",
+   "self_type" : "type-6038",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17787,8 +17790,8 @@
    "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",
+   "referenced_type" : "type-7516",
+   "self_type" : "type-7524",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17796,8 +17799,8 @@
    "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",
+   "referenced_type" : "type-1646",
+   "self_type" : "type-1648",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17805,8 +17808,8 @@
    "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",
+   "referenced_type" : "type-4111",
+   "self_type" : "type-4113",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17814,8 +17817,8 @@
    "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",
+   "referenced_type" : "type-6700",
+   "self_type" : "type-6702",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17832,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-1107",
-   "self_type" : "type-1106",
+   "referenced_type" : "type-1110",
+   "self_type" : "type-1109",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17841,8 +17844,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-1279",
-   "self_type" : "type-1278",
+   "referenced_type" : "type-1282",
+   "self_type" : "type-1281",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17850,8 +17853,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-3271",
-   "self_type" : "type-3270",
+   "referenced_type" : "type-3274",
+   "self_type" : "type-3273",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17859,8 +17862,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-3535",
-   "self_type" : "type-3534",
+   "referenced_type" : "type-3538",
+   "self_type" : "type-3537",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17868,8 +17871,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-3645",
-   "self_type" : "type-3644",
+   "referenced_type" : "type-3648",
+   "self_type" : "type-3647",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17877,8 +17880,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-3708",
-   "self_type" : "type-3707",
+   "referenced_type" : "type-3714",
+   "self_type" : "type-3713",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17886,8 +17889,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-3830",
-   "self_type" : "type-3829",
+   "referenced_type" : "type-3836",
+   "self_type" : "type-3835",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17904,8 +17907,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-4351",
-   "self_type" : "type-4350",
+   "referenced_type" : "type-4357",
+   "self_type" : "type-4356",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17913,8 +17916,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-4486",
-   "self_type" : "type-4485",
+   "referenced_type" : "type-4492",
+   "self_type" : "type-4491",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17922,8 +17925,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-4555",
-   "self_type" : "type-4554",
+   "referenced_type" : "type-4561",
+   "self_type" : "type-4560",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17931,8 +17934,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-4619",
-   "self_type" : "type-4618",
+   "referenced_type" : "type-4623",
+   "self_type" : "type-4622",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17940,8 +17943,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-4659",
-   "self_type" : "type-4658",
+   "referenced_type" : "type-4666",
+   "self_type" : "type-4665",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17949,8 +17952,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-4867",
-   "self_type" : "type-4866",
+   "referenced_type" : "type-4873",
+   "self_type" : "type-4872",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17958,8 +17961,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-5127",
-   "self_type" : "type-5126",
+   "referenced_type" : "type-5143",
+   "self_type" : "type-5142",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17967,8 +17970,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-5156",
-   "self_type" : "type-5155",
+   "referenced_type" : "type-5173",
+   "self_type" : "type-5172",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17976,8 +17979,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-5332",
-   "self_type" : "type-5331",
+   "referenced_type" : "type-5349",
+   "self_type" : "type-5348",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17985,8 +17988,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-5596",
-   "self_type" : "type-5595",
+   "referenced_type" : "type-5613",
+   "self_type" : "type-5612",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17994,8 +17997,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-5706",
-   "self_type" : "type-5705",
+   "referenced_type" : "type-5723",
+   "self_type" : "type-5722",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18003,8 +18006,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-5769",
-   "self_type" : "type-5768",
+   "referenced_type" : "type-5789",
+   "self_type" : "type-5788",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18012,8 +18015,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-5891",
-   "self_type" : "type-5890",
+   "referenced_type" : "type-5911",
+   "self_type" : "type-5910",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18021,8 +18024,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-6046",
-   "self_type" : "type-6045",
+   "referenced_type" : "type-6066",
+   "self_type" : "type-6065",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18030,8 +18033,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-6183",
-   "self_type" : "type-6182",
+   "referenced_type" : "type-6203",
+   "self_type" : "type-6202",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18039,8 +18042,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-6279",
-   "self_type" : "type-6278",
+   "referenced_type" : "type-6299",
+   "self_type" : "type-6298",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18048,8 +18051,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-6323",
-   "self_type" : "type-6322",
+   "referenced_type" : "type-6346",
+   "self_type" : "type-6345",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18057,8 +18060,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-6415",
-   "self_type" : "type-6414",
+   "referenced_type" : "type-6438",
+   "self_type" : "type-6437",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18066,8 +18069,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-6935",
-   "self_type" : "type-6934",
+   "referenced_type" : "type-6959",
+   "self_type" : "type-6958",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18075,8 +18078,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-7074",
-   "self_type" : "type-7073",
+   "referenced_type" : "type-7097",
+   "self_type" : "type-7096",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18084,8 +18087,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-7162",
-   "self_type" : "type-7161",
+   "referenced_type" : "type-7186",
+   "self_type" : "type-7185",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18093,8 +18096,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-7245",
-   "self_type" : "type-7244",
+   "referenced_type" : "type-7267",
+   "self_type" : "type-7266",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18102,8 +18105,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-7288",
-   "self_type" : "type-7287",
+   "referenced_type" : "type-7312",
+   "self_type" : "type-7311",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18111,8 +18114,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-7454",
-   "self_type" : "type-7453",
+   "referenced_type" : "type-7480",
+   "self_type" : "type-7479",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18120,8 +18123,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-7482",
-   "self_type" : "type-7481",
+   "referenced_type" : "type-7505",
+   "self_type" : "type-7504",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18129,8 +18132,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-7487",
-   "self_type" : "type-7486",
+   "referenced_type" : "type-7510",
+   "self_type" : "type-7509",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18138,8 +18141,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-7613",
-   "self_type" : "type-7612",
+   "referenced_type" : "type-7638",
+   "self_type" : "type-7637",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18147,8 +18150,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-7625",
-   "self_type" : "type-7624",
+   "referenced_type" : "type-7649",
+   "self_type" : "type-7648",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18165,8 +18168,8 @@
    "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",
+   "referenced_type" : "type-4382",
+   "self_type" : "type-4384",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18174,8 +18177,8 @@
    "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",
+   "referenced_type" : "type-4510",
+   "self_type" : "type-4512",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18183,8 +18186,8 @@
    "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",
+   "referenced_type" : "type-6983",
+   "self_type" : "type-6985",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18192,8 +18195,8 @@
    "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",
+   "referenced_type" : "type-7117",
+   "self_type" : "type-7119",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18228,8 +18231,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
-   "referenced_type" : "type-2520",
-   "self_type" : "type-2615",
+   "referenced_type" : "type-2523",
+   "self_type" : "type-2618",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18255,8 +18258,8 @@
    "alignment" : 4,
    "linker_set_key" : "int *&",
    "name" : "int *&",
-   "referenced_type" : "type-1509",
-   "self_type" : "type-1508",
+   "referenced_type" : "type-1512",
+   "self_type" : "type-1511",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18265,7 +18268,7 @@
    "linker_set_key" : "long long &",
    "name" : "long long &",
    "referenced_type" : "type-169",
-   "self_type" : "type-1429",
+   "self_type" : "type-1432",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18273,8 +18276,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-4758",
-   "self_type" : "type-4757",
+   "referenced_type" : "type-4765",
+   "self_type" : "type-4764",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18282,8 +18285,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-4862",
-   "self_type" : "type-4861",
+   "referenced_type" : "type-4868",
+   "self_type" : "type-4867",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18291,8 +18294,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-5067",
-   "self_type" : "type-5066",
+   "referenced_type" : "type-5085",
+   "self_type" : "type-5084",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18300,8 +18303,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-5122",
-   "self_type" : "type-5121",
+   "referenced_type" : "type-5138",
+   "self_type" : "type-5137",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18309,8 +18312,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-7356",
-   "self_type" : "type-7355",
+   "referenced_type" : "type-7379",
+   "self_type" : "type-7378",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18318,8 +18321,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-7449",
-   "self_type" : "type-7448",
+   "referenced_type" : "type-7472",
+   "self_type" : "type-7471",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18327,8 +18330,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-7575",
-   "self_type" : "type-7574",
+   "referenced_type" : "type-7600",
+   "self_type" : "type-7599",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18345,8 +18348,8 @@
    "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",
+   "referenced_type" : "type-3186",
+   "self_type" : "type-3185",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -18354,8 +18357,8 @@
    "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",
+   "referenced_type" : "type-5261",
+   "self_type" : "type-5260",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -18363,8 +18366,8 @@
    "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",
+   "referenced_type" : "type-6057",
+   "self_type" : "type-6056",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -18372,8 +18375,8 @@
    "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",
+   "referenced_type" : "type-1652",
+   "self_type" : "type-1886",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -18381,8 +18384,8 @@
    "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",
+   "referenced_type" : "type-4116",
+   "self_type" : "type-4142",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -18390,8 +18393,8 @@
    "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",
+   "referenced_type" : "type-6705",
+   "self_type" : "type-6737",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -18400,7 +18403,7 @@
    "linker_set_key" : "unsigned char &",
    "name" : "unsigned char &",
    "referenced_type" : "type-90",
-   "self_type" : "type-1428",
+   "self_type" : "type-1431",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18427,7 +18430,7 @@
    "linker_set_key" : "unsigned long long *&",
    "name" : "unsigned long long *&",
    "referenced_type" : "type-91",
-   "self_type" : "type-1871",
+   "self_type" : "type-1875",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -18436,7 +18439,7 @@
    "linker_set_key" : "unsigned short &",
    "name" : "unsigned short &",
    "referenced_type" : "type-497",
-   "self_type" : "type-1427",
+   "self_type" : "type-1430",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18444,8 +18447,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-1444",
-   "self_type" : "type-1443",
+   "referenced_type" : "type-1447",
+   "self_type" : "type-1446",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18453,8 +18456,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-3976",
-   "self_type" : "type-3975",
+   "referenced_type" : "type-3982",
+   "self_type" : "type-3981",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18462,8 +18465,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-6551",
-   "self_type" : "type-6550",
+   "referenced_type" : "type-6574",
+   "self_type" : "type-6573",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18483,8 +18486,8 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-2402",
-   "self_type" : "type-2401",
+   "referenced_type" : "type-2405",
+   "self_type" : "type-2404",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -18492,8 +18495,8 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-4833",
-   "self_type" : "type-4832",
+   "referenced_type" : "type-4839",
+   "self_type" : "type-4838",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -18501,8 +18504,8 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-5975",
-   "self_type" : "type-5974",
+   "referenced_type" : "type-5995",
+   "self_type" : "type-5994",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -18510,8 +18513,8 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-6808",
-   "self_type" : "type-6807",
+   "referenced_type" : "type-6831",
+   "self_type" : "type-6830",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -18528,8 +18531,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1142",
-   "self_type" : "type-1141",
+   "referenced_type" : "type-1137",
+   "self_type" : "type-1136",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18537,8 +18540,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1165",
-   "self_type" : "type-1164",
+   "referenced_type" : "type-1170",
+   "self_type" : "type-1169",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18546,8 +18549,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1350",
-   "self_type" : "type-1349",
+   "referenced_type" : "type-1353",
+   "self_type" : "type-1352",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18555,8 +18558,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1407",
-   "self_type" : "type-1406",
+   "referenced_type" : "type-1410",
+   "self_type" : "type-1409",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18564,8 +18567,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1423",
-   "self_type" : "type-1422",
+   "referenced_type" : "type-1426",
+   "self_type" : "type-1425",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18573,8 +18576,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1439",
-   "self_type" : "type-1438",
+   "referenced_type" : "type-1442",
+   "self_type" : "type-1441",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18582,8 +18585,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1505",
-   "self_type" : "type-1504",
+   "referenced_type" : "type-1508",
+   "self_type" : "type-1507",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18591,8 +18594,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1632",
-   "self_type" : "type-1631",
+   "referenced_type" : "type-1637",
+   "self_type" : "type-1636",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18600,8 +18603,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2612",
-   "self_type" : "type-2611",
+   "referenced_type" : "type-2615",
+   "self_type" : "type-2614",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18609,8 +18612,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3478",
-   "self_type" : "type-3477",
+   "referenced_type" : "type-3481",
+   "self_type" : "type-3480",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18618,8 +18621,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3579",
-   "self_type" : "type-3578",
+   "referenced_type" : "type-3578",
+   "self_type" : "type-3577",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18627,8 +18630,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3655",
-   "self_type" : "type-3654",
+   "referenced_type" : "type-3658",
+   "self_type" : "type-3657",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18636,8 +18639,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3745",
-   "self_type" : "type-3744",
+   "referenced_type" : "type-3743",
+   "self_type" : "type-3742",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18645,8 +18648,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3770",
-   "self_type" : "type-3769",
+   "referenced_type" : "type-3777",
+   "self_type" : "type-3776",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18654,8 +18657,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3904",
-   "self_type" : "type-3903",
+   "referenced_type" : "type-3910",
+   "self_type" : "type-3909",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18663,8 +18666,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3935",
-   "self_type" : "type-3934",
+   "referenced_type" : "type-3941",
+   "self_type" : "type-3940",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18672,8 +18675,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3951",
-   "self_type" : "type-3950",
+   "referenced_type" : "type-3957",
+   "self_type" : "type-3956",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18681,8 +18684,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3971",
-   "self_type" : "type-3970",
+   "referenced_type" : "type-3977",
+   "self_type" : "type-3976",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18690,8 +18693,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4019",
-   "self_type" : "type-4018",
+   "referenced_type" : "type-4026",
+   "self_type" : "type-4025",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18699,8 +18702,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4097",
-   "self_type" : "type-4096",
+   "referenced_type" : "type-4103",
+   "self_type" : "type-4102",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18708,8 +18711,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4299",
-   "self_type" : "type-4298",
+   "referenced_type" : "type-4305",
+   "self_type" : "type-4304",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18717,8 +18720,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4472",
-   "self_type" : "type-4471",
+   "referenced_type" : "type-4478",
+   "self_type" : "type-4477",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18726,8 +18729,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4525",
-   "self_type" : "type-4524",
+   "referenced_type" : "type-4531",
+   "self_type" : "type-4530",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18735,8 +18738,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4551",
-   "self_type" : "type-4550",
+   "referenced_type" : "type-4557",
+   "self_type" : "type-4556",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18744,8 +18747,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4578",
-   "self_type" : "type-4577",
+   "referenced_type" : "type-4584",
+   "self_type" : "type-4583",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18753,8 +18756,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4745",
-   "self_type" : "type-4744",
+   "referenced_type" : "type-4752",
+   "self_type" : "type-4751",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18762,8 +18765,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4855",
-   "self_type" : "type-4854",
+   "referenced_type" : "type-4861",
+   "self_type" : "type-4860",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18771,8 +18774,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4967",
-   "self_type" : "type-4966",
+   "referenced_type" : "type-4973",
+   "self_type" : "type-4972",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18780,8 +18783,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5075",
-   "self_type" : "type-5074",
+   "referenced_type" : "type-5091",
+   "self_type" : "type-5090",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18789,8 +18792,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5116",
-   "self_type" : "type-5115",
+   "referenced_type" : "type-5132",
+   "self_type" : "type-5131",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18798,8 +18801,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5220",
-   "self_type" : "type-5219",
+   "referenced_type" : "type-5239",
+   "self_type" : "type-5238",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18807,8 +18810,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5539",
-   "self_type" : "type-5538",
+   "referenced_type" : "type-5556",
+   "self_type" : "type-5555",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18816,8 +18819,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5640",
-   "self_type" : "type-5639",
+   "referenced_type" : "type-5653",
+   "self_type" : "type-5652",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18825,8 +18828,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5716",
-   "self_type" : "type-5715",
+   "referenced_type" : "type-5733",
+   "self_type" : "type-5732",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18834,8 +18837,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5806",
-   "self_type" : "type-5805",
+   "referenced_type" : "type-5818",
+   "self_type" : "type-5817",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18843,8 +18846,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5831",
-   "self_type" : "type-5830",
+   "referenced_type" : "type-5852",
+   "self_type" : "type-5851",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18852,8 +18855,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6014",
-   "self_type" : "type-6013",
+   "referenced_type" : "type-6035",
+   "self_type" : "type-6034",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18861,8 +18864,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6138",
-   "self_type" : "type-6137",
+   "referenced_type" : "type-6158",
+   "self_type" : "type-6157",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18870,8 +18873,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6226",
-   "self_type" : "type-6225",
+   "referenced_type" : "type-6242",
+   "self_type" : "type-6241",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18879,8 +18882,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6289",
-   "self_type" : "type-6288",
+   "referenced_type" : "type-6309",
+   "self_type" : "type-6308",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18888,8 +18891,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6361",
-   "self_type" : "type-6360",
+   "referenced_type" : "type-6376",
+   "self_type" : "type-6375",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18897,8 +18900,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6383",
-   "self_type" : "type-6382",
+   "referenced_type" : "type-6406",
+   "self_type" : "type-6405",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18906,8 +18909,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6482",
-   "self_type" : "type-6481",
+   "referenced_type" : "type-6505",
+   "self_type" : "type-6504",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18915,8 +18918,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6513",
-   "self_type" : "type-6512",
+   "referenced_type" : "type-6537",
+   "self_type" : "type-6536",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18924,8 +18927,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6530",
-   "self_type" : "type-6529",
+   "referenced_type" : "type-6553",
+   "self_type" : "type-6552",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18933,8 +18936,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6546",
-   "self_type" : "type-6545",
+   "referenced_type" : "type-6569",
+   "self_type" : "type-6568",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18942,8 +18945,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6593",
-   "self_type" : "type-6592",
+   "referenced_type" : "type-6616",
+   "self_type" : "type-6615",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18951,8 +18954,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6670",
-   "self_type" : "type-6669",
+   "referenced_type" : "type-6693",
+   "self_type" : "type-6692",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18960,8 +18963,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6889",
-   "self_type" : "type-6888",
+   "referenced_type" : "type-6912",
+   "self_type" : "type-6911",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18969,8 +18972,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7057",
-   "self_type" : "type-7056",
+   "referenced_type" : "type-7081",
+   "self_type" : "type-7080",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18978,8 +18981,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7120",
-   "self_type" : "type-7119",
+   "referenced_type" : "type-7145",
+   "self_type" : "type-7144",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18987,8 +18990,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7155",
-   "self_type" : "type-7154",
+   "referenced_type" : "type-7180",
+   "self_type" : "type-7179",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18996,8 +18999,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7199",
-   "self_type" : "type-7198",
+   "referenced_type" : "type-7222",
+   "self_type" : "type-7221",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19005,8 +19008,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7346",
-   "self_type" : "type-7345",
+   "referenced_type" : "type-7369",
+   "self_type" : "type-7368",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19014,8 +19017,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7439",
-   "self_type" : "type-7438",
+   "referenced_type" : "type-7460",
+   "self_type" : "type-7459",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19023,8 +19026,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7441",
-   "self_type" : "type-7440",
+   "referenced_type" : "type-7464",
+   "self_type" : "type-7463",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19032,8 +19035,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7477",
-   "self_type" : "type-7476",
+   "referenced_type" : "type-7501",
+   "self_type" : "type-7500",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19041,8 +19044,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7573",
-   "self_type" : "type-7572",
+   "referenced_type" : "type-7598",
+   "self_type" : "type-7597",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19050,8 +19053,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7608",
-   "self_type" : "type-7607",
+   "referenced_type" : "type-7631",
+   "self_type" : "type-7630",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19068,8 +19071,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-908",
-   "self_type" : "type-907",
+   "referenced_type" : "type-904",
+   "self_type" : "type-903",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19077,8 +19080,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE *",
    "name" : "OMX_BUFFERHEADERTYPE *",
-   "referenced_type" : "type-1540",
-   "self_type" : "type-1595",
+   "referenced_type" : "type-1536",
+   "self_type" : "type-1598",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -19086,8 +19089,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE **",
    "name" : "OMX_BUFFERHEADERTYPE **",
-   "referenced_type" : "type-1595",
-   "self_type" : "type-2376",
+   "referenced_type" : "type-1598",
+   "self_type" : "type-2379",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19095,8 +19098,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_CALLBACKTYPE *",
    "name" : "OMX_CALLBACKTYPE *",
-   "referenced_type" : "type-1590",
-   "self_type" : "type-2385",
+   "referenced_type" : "type-1593",
+   "self_type" : "type-2388",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19104,8 +19107,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *)",
    "name" : "OMX_ERRORTYPE (*)(void *)",
-   "referenced_type" : "type-1501",
-   "self_type" : "type-1500",
+   "referenced_type" : "type-1500",
+   "self_type" : "type-1499",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -19113,8 +19116,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-2382",
-   "self_type" : "type-2381",
+   "referenced_type" : "type-2385",
+   "self_type" : "type-2384",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19122,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-2378",
-   "self_type" : "type-2377",
+   "referenced_type" : "type-2381",
+   "self_type" : "type-2380",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19131,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-2375",
-   "self_type" : "type-2374",
+   "referenced_type" : "type-2378",
+   "self_type" : "type-2377",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19140,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-2387",
-   "self_type" : "type-2386",
+   "referenced_type" : "type-2390",
+   "self_type" : "type-2389",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19149,8 +19152,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
-   "referenced_type" : "type-2384",
-   "self_type" : "type-2383",
+   "referenced_type" : "type-2387",
+   "self_type" : "type-2386",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19158,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-2362",
-   "self_type" : "type-2361",
+   "referenced_type" : "type-2365",
+   "self_type" : "type-2364",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19167,8 +19170,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
-   "referenced_type" : "type-2364",
-   "self_type" : "type-2363",
+   "referenced_type" : "type-2367",
+   "self_type" : "type-2366",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19176,51 +19179,6 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
-   "referenced_type" : "type-2369",
-   "self_type" : "type-2368",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, char *, OMX_INDEXTYPE *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, char *, OMX_INDEXTYPE *)",
-   "referenced_type" : "type-2366",
-   "self_type" : "type-2365",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-2358",
-   "self_type" : "type-2357",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, unsigned char *, unsigned int)",
-   "name" : "OMX_ERRORTYPE (*)(void *, unsigned char *, unsigned int)",
-   "referenced_type" : "type-2389",
-   "self_type" : "type-2388",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, unsigned int, OMX_BUFFERHEADERTYPE *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, unsigned int, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-2380",
-   "self_type" : "type-2379",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-2372",
    "self_type" : "type-2371",
    "size" : 4,
@@ -19228,10 +19186,55 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, char *, OMX_INDEXTYPE *)",
+   "name" : "OMX_ERRORTYPE (*)(void *, char *, OMX_INDEXTYPE *)",
+   "referenced_type" : "type-2369",
+   "self_type" : "type-2368",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "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-2361",
+   "self_type" : "type-2360",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, unsigned char *, unsigned int)",
+   "name" : "OMX_ERRORTYPE (*)(void *, unsigned char *, unsigned int)",
+   "referenced_type" : "type-2392",
+   "self_type" : "type-2391",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, unsigned int, OMX_BUFFERHEADERTYPE *)",
+   "name" : "OMX_ERRORTYPE (*)(void *, unsigned int, OMX_BUFFERHEADERTYPE *)",
+   "referenced_type" : "type-2383",
+   "self_type" : "type-2382",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "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-2375",
+   "self_type" : "type-2374",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, void *, OMX_BUFFERHEADERTYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, void *, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-1594",
-   "self_type" : "type-1593",
+   "referenced_type" : "type-1597",
+   "self_type" : "type-1596",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -19239,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-1592",
-   "self_type" : "type-1591",
+   "referenced_type" : "type-1595",
+   "self_type" : "type-1594",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -19249,7 +19252,7 @@
    "linker_set_key" : "OMX_INDEXTYPE *",
    "name" : "OMX_INDEXTYPE *",
    "referenced_type" : "type-1484",
-   "self_type" : "type-2367",
+   "self_type" : "type-2370",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19257,8 +19260,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_STATETYPE *",
    "name" : "OMX_STATETYPE *",
-   "referenced_type" : "type-1488",
-   "self_type" : "type-2370",
+   "referenced_type" : "type-1490",
+   "self_type" : "type-2373",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19266,8 +19269,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_TUNNELSETUPTYPE *",
    "name" : "OMX_TUNNELSETUPTYPE *",
-   "referenced_type" : "type-1612",
-   "self_type" : "type-2373",
+   "referenced_type" : "type-1613",
+   "self_type" : "type-2376",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19275,8 +19278,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_VERSIONTYPE *",
    "name" : "OMX_VERSIONTYPE *",
-   "referenced_type" : "type-1478",
-   "self_type" : "type-2359",
+   "referenced_type" : "type-1481",
+   "self_type" : "type-2362",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19293,8 +19296,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1115",
-   "self_type" : "type-1114",
+   "referenced_type" : "type-1118",
+   "self_type" : "type-1117",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19302,8 +19305,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1335",
-   "self_type" : "type-1334",
+   "referenced_type" : "type-1338",
+   "self_type" : "type-1337",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19311,8 +19314,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1402",
-   "self_type" : "type-1401",
+   "referenced_type" : "type-1405",
+   "self_type" : "type-1404",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19320,8 +19323,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1418",
-   "self_type" : "type-1417",
+   "referenced_type" : "type-1421",
+   "self_type" : "type-1420",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19329,8 +19332,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1435",
-   "self_type" : "type-1434",
+   "referenced_type" : "type-1438",
+   "self_type" : "type-1437",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19338,8 +19341,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1437",
-   "self_type" : "type-1436",
+   "referenced_type" : "type-1440",
+   "self_type" : "type-1439",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19347,8 +19350,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1503",
-   "self_type" : "type-1502",
+   "referenced_type" : "type-1506",
+   "self_type" : "type-1505",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19356,8 +19359,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1630",
-   "self_type" : "type-1629",
+   "referenced_type" : "type-1634",
+   "self_type" : "type-1633",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19365,8 +19368,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2609",
-   "self_type" : "type-2608",
+   "referenced_type" : "type-2612",
+   "self_type" : "type-2611",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19374,8 +19377,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3476",
-   "self_type" : "type-3475",
+   "referenced_type" : "type-3479",
+   "self_type" : "type-3478",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19383,8 +19386,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3548",
-   "self_type" : "type-3547",
+   "referenced_type" : "type-3547",
+   "self_type" : "type-3546",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19392,8 +19395,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3653",
-   "self_type" : "type-3652",
+   "referenced_type" : "type-3656",
+   "self_type" : "type-3655",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19401,8 +19404,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3718",
-   "self_type" : "type-3717",
+   "referenced_type" : "type-3724",
+   "self_type" : "type-3723",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19410,8 +19413,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3886",
-   "self_type" : "type-3885",
+   "referenced_type" : "type-3892",
+   "self_type" : "type-3891",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19419,8 +19422,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3929",
-   "self_type" : "type-3928",
+   "referenced_type" : "type-3936",
+   "self_type" : "type-3935",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19428,8 +19431,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3945",
-   "self_type" : "type-3944",
+   "referenced_type" : "type-3951",
+   "self_type" : "type-3950",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19437,8 +19440,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3965",
-   "self_type" : "type-3964",
+   "referenced_type" : "type-3971",
+   "self_type" : "type-3970",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19446,8 +19449,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3967",
-   "self_type" : "type-3966",
+   "referenced_type" : "type-3973",
+   "self_type" : "type-3972",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19455,8 +19458,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4017",
-   "self_type" : "type-4016",
+   "referenced_type" : "type-4023",
+   "self_type" : "type-4022",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19464,8 +19467,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4095",
-   "self_type" : "type-4094",
+   "referenced_type" : "type-4101",
+   "self_type" : "type-4100",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19473,8 +19476,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4297",
-   "self_type" : "type-4296",
+   "referenced_type" : "type-4303",
+   "self_type" : "type-4302",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19482,8 +19485,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4512",
-   "self_type" : "type-4511",
+   "referenced_type" : "type-4518",
+   "self_type" : "type-4517",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19491,8 +19494,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4523",
-   "self_type" : "type-4522",
+   "referenced_type" : "type-4529",
+   "self_type" : "type-4528",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19500,8 +19503,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4549",
-   "self_type" : "type-4548",
+   "referenced_type" : "type-4555",
+   "self_type" : "type-4554",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19509,8 +19512,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4576",
-   "self_type" : "type-4575",
+   "referenced_type" : "type-4582",
+   "self_type" : "type-4581",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19518,8 +19521,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4743",
-   "self_type" : "type-4742",
+   "referenced_type" : "type-4749",
+   "self_type" : "type-4748",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19527,8 +19530,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4853",
-   "self_type" : "type-4852",
+   "referenced_type" : "type-4859",
+   "self_type" : "type-4858",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19536,8 +19539,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4964",
-   "self_type" : "type-4963",
+   "referenced_type" : "type-4970",
+   "self_type" : "type-4969",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19545,8 +19548,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5073",
-   "self_type" : "type-5072",
+   "referenced_type" : "type-5089",
+   "self_type" : "type-5088",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19554,8 +19557,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5114",
-   "self_type" : "type-5113",
+   "referenced_type" : "type-5130",
+   "self_type" : "type-5129",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19563,8 +19566,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5207",
-   "self_type" : "type-5206",
+   "referenced_type" : "type-5225",
+   "self_type" : "type-5224",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19572,8 +19575,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5537",
-   "self_type" : "type-5536",
+   "referenced_type" : "type-5554",
+   "self_type" : "type-5553",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19581,8 +19584,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5609",
-   "self_type" : "type-5608",
+   "referenced_type" : "type-5622",
+   "self_type" : "type-5621",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19590,8 +19593,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5714",
-   "self_type" : "type-5713",
+   "referenced_type" : "type-5731",
+   "self_type" : "type-5730",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19599,8 +19602,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5779",
-   "self_type" : "type-5778",
+   "referenced_type" : "type-5799",
+   "self_type" : "type-5798",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19608,8 +19611,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5947",
-   "self_type" : "type-5946",
+   "referenced_type" : "type-5967",
+   "self_type" : "type-5966",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19617,8 +19620,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6012",
-   "self_type" : "type-6011",
+   "referenced_type" : "type-6032",
+   "self_type" : "type-6031",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19626,8 +19629,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6136",
-   "self_type" : "type-6135",
+   "referenced_type" : "type-6156",
+   "self_type" : "type-6155",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19635,8 +19638,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6195",
-   "self_type" : "type-6194",
+   "referenced_type" : "type-6211",
+   "self_type" : "type-6210",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19644,8 +19647,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6287",
-   "self_type" : "type-6286",
+   "referenced_type" : "type-6307",
+   "self_type" : "type-6306",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19653,8 +19656,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6334",
-   "self_type" : "type-6333",
+   "referenced_type" : "type-6358",
+   "self_type" : "type-6357",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19662,8 +19665,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6466",
-   "self_type" : "type-6465",
+   "referenced_type" : "type-6489",
+   "self_type" : "type-6488",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19671,8 +19674,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6508",
-   "self_type" : "type-6507",
+   "referenced_type" : "type-6531",
+   "self_type" : "type-6530",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19680,8 +19683,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6524",
-   "self_type" : "type-6523",
+   "referenced_type" : "type-6547",
+   "self_type" : "type-6546",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19689,8 +19692,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6542",
-   "self_type" : "type-6541",
+   "referenced_type" : "type-6565",
+   "self_type" : "type-6564",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19698,8 +19701,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6544",
-   "self_type" : "type-6543",
+   "referenced_type" : "type-6567",
+   "self_type" : "type-6566",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19707,8 +19710,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6591",
-   "self_type" : "type-6590",
+   "referenced_type" : "type-6614",
+   "self_type" : "type-6613",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19716,8 +19719,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6668",
-   "self_type" : "type-6667",
+   "referenced_type" : "type-6691",
+   "self_type" : "type-6690",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19725,8 +19728,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6887",
-   "self_type" : "type-6886",
+   "referenced_type" : "type-6910",
+   "self_type" : "type-6909",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19734,8 +19737,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7103",
-   "self_type" : "type-7102",
+   "referenced_type" : "type-7127",
+   "self_type" : "type-7126",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19743,8 +19746,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7118",
-   "self_type" : "type-7117",
+   "referenced_type" : "type-7142",
+   "self_type" : "type-7141",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19752,8 +19755,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7153",
-   "self_type" : "type-7152",
+   "referenced_type" : "type-7178",
+   "self_type" : "type-7177",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19761,8 +19764,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7197",
-   "self_type" : "type-7196",
+   "referenced_type" : "type-7220",
+   "self_type" : "type-7219",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19770,8 +19773,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7344",
-   "self_type" : "type-7343",
+   "referenced_type" : "type-7367",
+   "self_type" : "type-7366",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19779,8 +19782,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7434",
-   "self_type" : "type-7433",
+   "referenced_type" : "type-7455",
+   "self_type" : "type-7454",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19788,8 +19791,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7437",
-   "self_type" : "type-7436",
+   "referenced_type" : "type-7462",
+   "self_type" : "type-7461",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19797,8 +19800,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7475",
-   "self_type" : "type-7474",
+   "referenced_type" : "type-7499",
+   "self_type" : "type-7498",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19806,8 +19809,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7571",
-   "self_type" : "type-7570",
+   "referenced_type" : "type-7596",
+   "self_type" : "type-7595",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19815,8 +19818,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7606",
-   "self_type" : "type-7605",
+   "referenced_type" : "type-7629",
+   "self_type" : "type-7628",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19833,8 +19836,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-872",
-   "self_type" : "type-871",
+   "referenced_type" : "type-868",
+   "self_type" : "type-867",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19878,8 +19881,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ALooper::LooperThread *",
    "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-3759",
-   "self_type" : "type-3758",
+   "referenced_type" : "type-3763",
+   "self_type" : "type-3762",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19887,8 +19890,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ALooper::LooperThread *",
    "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-5820",
-   "self_type" : "type-5819",
+   "referenced_type" : "type-5838",
+   "self_type" : "type-5837",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19896,8 +19899,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ALooper::LooperThread *",
    "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-5968",
-   "self_type" : "type-5967",
+   "referenced_type" : "type-5988",
+   "self_type" : "type-5987",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19914,8 +19917,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::AReplyToken *",
    "name" : "android::AReplyToken *",
-   "referenced_type" : "type-1044",
-   "self_type" : "type-1163",
+   "referenced_type" : "type-1043",
+   "self_type" : "type-1166",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -19933,7 +19936,7 @@
    "linker_set_key" : "android::BBinder *",
    "name" : "android::BBinder *",
    "referenced_type" : "type-67",
-   "self_type" : "type-1206",
+   "self_type" : "type-1209",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -19960,7 +19963,7 @@
    "linker_set_key" : "android::BnInterface<android::IGraphicBufferProducer> *",
    "name" : "android::BnInterface<android::IGraphicBufferProducer> *",
    "referenced_type" : "type-71",
-   "self_type" : "type-1271",
+   "self_type" : "type-1275",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19969,7 +19972,7 @@
    "linker_set_key" : "android::BnInterface<android::IProducerListener> *",
    "name" : "android::BnInterface<android::IProducerListener> *",
    "referenced_type" : "type-80",
-   "self_type" : "type-4500",
+   "self_type" : "type-4506",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19977,8 +19980,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BnInterface<android::ITransactionCompletedListener> *",
    "name" : "android::BnInterface<android::ITransactionCompletedListener> *",
-   "referenced_type" : "type-1031",
-   "self_type" : "type-1034",
+   "referenced_type" : "type-1034",
+   "self_type" : "type-1037",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19986,8 +19989,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpConsumerListener *",
    "name" : "android::BpConsumerListener *",
-   "referenced_type" : "type-1579",
-   "self_type" : "type-1578",
+   "referenced_type" : "type-1583",
+   "self_type" : "type-1582",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19995,8 +19998,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpConsumerListener *",
    "name" : "android::BpConsumerListener *",
-   "referenced_type" : "type-4059",
-   "self_type" : "type-4058",
+   "referenced_type" : "type-4065",
+   "self_type" : "type-4064",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20004,8 +20007,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpConsumerListener *",
    "name" : "android::BpConsumerListener *",
-   "referenced_type" : "type-6632",
-   "self_type" : "type-6631",
+   "referenced_type" : "type-6655",
+   "self_type" : "type-6654",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20013,8 +20016,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpGraphicBufferConsumer *",
    "name" : "android::BpGraphicBufferConsumer *",
-   "referenced_type" : "type-1603",
-   "self_type" : "type-1602",
+   "referenced_type" : "type-1607",
+   "self_type" : "type-1606",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20022,8 +20025,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpGraphicBufferConsumer *",
    "name" : "android::BpGraphicBufferConsumer *",
-   "referenced_type" : "type-4076",
-   "self_type" : "type-4075",
+   "referenced_type" : "type-4082",
+   "self_type" : "type-4081",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20031,8 +20034,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpGraphicBufferConsumer *",
    "name" : "android::BpGraphicBufferConsumer *",
-   "referenced_type" : "type-6647",
-   "self_type" : "type-6646",
+   "referenced_type" : "type-6670",
+   "self_type" : "type-6669",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20040,8 +20043,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpGraphicBufferProducer *",
    "name" : "android::BpGraphicBufferProducer *",
-   "referenced_type" : "type-4230",
-   "self_type" : "type-4229",
+   "referenced_type" : "type-4236",
+   "self_type" : "type-4235",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20049,8 +20052,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpGraphicBufferProducer *",
    "name" : "android::BpGraphicBufferProducer *",
-   "referenced_type" : "type-6831",
-   "self_type" : "type-6830",
+   "referenced_type" : "type-6854",
+   "self_type" : "type-6853",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20058,8 +20061,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpInterface<android::IConsumerListener> *",
    "name" : "android::BpInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-1495",
-   "self_type" : "type-1498",
+   "referenced_type" : "type-1501",
+   "self_type" : "type-1504",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -20067,8 +20070,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpInterface<android::IGraphicBufferConsumer> *",
    "name" : "android::BpInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-1624",
-   "self_type" : "type-1628",
+   "referenced_type" : "type-1629",
+   "self_type" : "type-1632",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -20076,8 +20079,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpInterface<android::IGraphicBufferProducer> *",
    "name" : "android::BpInterface<android::IGraphicBufferProducer> *",
-   "referenced_type" : "type-4317",
-   "self_type" : "type-4320",
+   "referenced_type" : "type-4323",
+   "self_type" : "type-4326",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -20085,8 +20088,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpInterface<android::IProducerListener> *",
    "name" : "android::BpInterface<android::IProducerListener> *",
-   "referenced_type" : "type-4479",
-   "self_type" : "type-4482",
+   "referenced_type" : "type-4485",
+   "self_type" : "type-4488",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -20094,8 +20097,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpProducerListener *",
    "name" : "android::BpProducerListener *",
-   "referenced_type" : "type-4452",
-   "self_type" : "type-4451",
+   "referenced_type" : "type-4458",
+   "self_type" : "type-4457",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20103,8 +20106,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpProducerListener *",
    "name" : "android::BpProducerListener *",
-   "referenced_type" : "type-7045",
-   "self_type" : "type-7044",
+   "referenced_type" : "type-7069",
+   "self_type" : "type-7068",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20121,8 +20124,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-1067",
-   "self_type" : "type-1066",
+   "referenced_type" : "type-1070",
+   "self_type" : "type-1069",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20130,8 +20133,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-1529",
-   "self_type" : "type-1528",
+   "referenced_type" : "type-1532",
+   "self_type" : "type-1531",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -20139,8 +20142,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-1670",
-   "self_type" : "type-1669",
+   "referenced_type" : "type-1674",
+   "self_type" : "type-1673",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -20148,8 +20151,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-3636",
-   "self_type" : "type-3635",
+   "referenced_type" : "type-3639",
+   "self_type" : "type-3638",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -20157,8 +20160,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-3680",
-   "self_type" : "type-3679",
+   "referenced_type" : "type-3686",
+   "self_type" : "type-3685",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20166,8 +20169,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-4039",
-   "self_type" : "type-4038",
+   "referenced_type" : "type-4046",
+   "self_type" : "type-4045",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -20175,8 +20178,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-4125",
-   "self_type" : "type-4124",
+   "referenced_type" : "type-4131",
+   "self_type" : "type-4130",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -20184,8 +20187,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-5697",
-   "self_type" : "type-5696",
+   "referenced_type" : "type-5714",
+   "self_type" : "type-5713",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -20193,8 +20196,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-5741",
-   "self_type" : "type-5740",
+   "referenced_type" : "type-5761",
+   "self_type" : "type-5760",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20202,8 +20205,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-6268",
-   "self_type" : "type-6267",
+   "referenced_type" : "type-6288",
+   "self_type" : "type-6287",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -20211,8 +20214,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-6306",
-   "self_type" : "type-6305",
+   "referenced_type" : "type-6329",
+   "self_type" : "type-6328",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20220,8 +20223,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-6615",
-   "self_type" : "type-6614",
+   "referenced_type" : "type-6638",
+   "self_type" : "type-6637",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -20229,8 +20232,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-6696",
-   "self_type" : "type-6695",
+   "referenced_type" : "type-6720",
+   "self_type" : "type-6719",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -20247,8 +20250,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
    "name" : "android::BufferQueue::ProxyConsumerListener *",
-   "referenced_type" : "type-2536",
-   "self_type" : "type-2535",
+   "referenced_type" : "type-2539",
+   "self_type" : "type-2538",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20256,8 +20259,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
    "name" : "android::BufferQueue::ProxyConsumerListener *",
-   "referenced_type" : "type-4948",
-   "self_type" : "type-4947",
+   "referenced_type" : "type-4954",
+   "self_type" : "type-4953",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20265,8 +20268,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
    "name" : "android::BufferQueue::ProxyConsumerListener *",
-   "referenced_type" : "type-6006",
-   "self_type" : "type-6005",
+   "referenced_type" : "type-6026",
+   "self_type" : "type-6025",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20274,8 +20277,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
    "name" : "android::BufferQueue::ProxyConsumerListener *",
-   "referenced_type" : "type-7219",
-   "self_type" : "type-7218",
+   "referenced_type" : "type-7239",
+   "self_type" : "type-7238",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20283,8 +20286,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueConsumer *",
    "name" : "android::BufferQueueConsumer *",
-   "referenced_type" : "type-3491",
-   "self_type" : "type-3490",
+   "referenced_type" : "type-3494",
+   "self_type" : "type-3493",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20292,8 +20295,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueConsumer *",
    "name" : "android::BufferQueueConsumer *",
-   "referenced_type" : "type-5552",
-   "self_type" : "type-5551",
+   "referenced_type" : "type-5569",
+   "self_type" : "type-5568",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20301,8 +20304,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueConsumer *",
    "name" : "android::BufferQueueConsumer *",
-   "referenced_type" : "type-6148",
-   "self_type" : "type-6147",
+   "referenced_type" : "type-6168",
+   "self_type" : "type-6167",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20319,8 +20322,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-1169",
-   "self_type" : "type-1168",
+   "referenced_type" : "type-1172",
+   "self_type" : "type-1171",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20328,8 +20331,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-3517",
-   "self_type" : "type-3516",
+   "referenced_type" : "type-3520",
+   "self_type" : "type-3519",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20337,8 +20340,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-3615",
-   "self_type" : "type-3614",
+   "referenced_type" : "type-3618",
+   "self_type" : "type-3617",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20346,8 +20349,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-3773",
-   "self_type" : "type-3772",
+   "referenced_type" : "type-3779",
+   "self_type" : "type-3778",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20355,8 +20358,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-5578",
-   "self_type" : "type-5577",
+   "referenced_type" : "type-5595",
+   "self_type" : "type-5594",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20364,8 +20367,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-5676",
-   "self_type" : "type-5675",
+   "referenced_type" : "type-5693",
+   "self_type" : "type-5692",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20373,8 +20376,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-5834",
-   "self_type" : "type-5833",
+   "referenced_type" : "type-5854",
+   "self_type" : "type-5853",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20382,8 +20385,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-6167",
-   "self_type" : "type-6166",
+   "referenced_type" : "type-6187",
+   "self_type" : "type-6186",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20391,8 +20394,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-6254",
-   "self_type" : "type-6253",
+   "referenced_type" : "type-6274",
+   "self_type" : "type-6273",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20400,8 +20403,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-6385",
-   "self_type" : "type-6384",
+   "referenced_type" : "type-6408",
+   "self_type" : "type-6407",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20427,8 +20430,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueProducer *",
    "name" : "android::BufferQueueProducer *",
-   "referenced_type" : "type-3502",
-   "self_type" : "type-3501",
+   "referenced_type" : "type-3505",
+   "self_type" : "type-3504",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20436,8 +20439,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueProducer *",
    "name" : "android::BufferQueueProducer *",
-   "referenced_type" : "type-5563",
-   "self_type" : "type-5562",
+   "referenced_type" : "type-5580",
+   "self_type" : "type-5579",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20445,8 +20448,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueProducer *",
    "name" : "android::BufferQueueProducer *",
-   "referenced_type" : "type-6157",
-   "self_type" : "type-6156",
+   "referenced_type" : "type-6177",
+   "self_type" : "type-6176",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20472,8 +20475,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ComposerService *",
    "name" : "android::ComposerService *",
-   "referenced_type" : "type-1092",
-   "self_type" : "type-1091",
+   "referenced_type" : "type-1095",
+   "self_type" : "type-1094",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -20481,8 +20484,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ComposerService *",
    "name" : "android::ComposerService *",
-   "referenced_type" : "type-3700",
-   "self_type" : "type-3699",
+   "referenced_type" : "type-3706",
+   "self_type" : "type-3705",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -20490,8 +20493,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ComposerService *",
    "name" : "android::ComposerService *",
-   "referenced_type" : "type-5761",
-   "self_type" : "type-5760",
+   "referenced_type" : "type-5781",
+   "self_type" : "type-5780",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -20499,8 +20502,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ComposerService *",
    "name" : "android::ComposerService *",
-   "referenced_type" : "type-6319",
-   "self_type" : "type-6318",
+   "referenced_type" : "type-6342",
+   "self_type" : "type-6341",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -20517,8 +20520,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-1253",
-   "self_type" : "type-1252",
+   "referenced_type" : "type-1257",
+   "self_type" : "type-1256",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20526,8 +20529,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-1455",
-   "self_type" : "type-1454",
+   "referenced_type" : "type-1458",
+   "self_type" : "type-1457",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20535,8 +20538,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-3813",
-   "self_type" : "type-3812",
+   "referenced_type" : "type-3820",
+   "self_type" : "type-3819",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20544,8 +20547,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-3986",
-   "self_type" : "type-3985",
+   "referenced_type" : "type-3992",
+   "self_type" : "type-3991",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20553,8 +20556,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-5874",
-   "self_type" : "type-5873",
+   "referenced_type" : "type-5895",
+   "self_type" : "type-5894",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20562,8 +20565,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-6408",
-   "self_type" : "type-6407",
+   "referenced_type" : "type-6431",
+   "self_type" : "type-6430",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20571,8 +20574,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-6560",
-   "self_type" : "type-6559",
+   "referenced_type" : "type-6583",
+   "self_type" : "type-6582",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20580,8 +20583,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-3291",
-   "self_type" : "type-3290",
+   "referenced_type" : "type-3294",
+   "self_type" : "type-3293",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20589,8 +20592,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-3480",
-   "self_type" : "type-3479",
+   "referenced_type" : "type-3483",
+   "self_type" : "type-3482",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20607,8 +20610,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-5352",
-   "self_type" : "type-5351",
+   "referenced_type" : "type-5369",
+   "self_type" : "type-5368",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20616,8 +20619,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-5541",
-   "self_type" : "type-5540",
+   "referenced_type" : "type-5558",
+   "self_type" : "type-5557",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20625,8 +20628,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-6052",
-   "self_type" : "type-6051",
+   "referenced_type" : "type-6072",
+   "self_type" : "type-6071",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20634,8 +20637,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-6140",
-   "self_type" : "type-6139",
+   "referenced_type" : "type-6160",
+   "self_type" : "type-6159",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20670,8 +20673,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-1285",
-   "self_type" : "type-1284",
+   "referenced_type" : "type-1288",
+   "self_type" : "type-1287",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20679,8 +20682,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-1414",
-   "self_type" : "type-1413",
+   "referenced_type" : "type-1417",
+   "self_type" : "type-1416",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20688,8 +20691,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-1433",
-   "self_type" : "type-1432",
+   "referenced_type" : "type-1436",
+   "self_type" : "type-1435",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20697,8 +20700,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-1457",
-   "self_type" : "type-1456",
+   "referenced_type" : "type-1461",
+   "self_type" : "type-1460",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20706,8 +20709,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-1584",
-   "self_type" : "type-1583",
+   "referenced_type" : "type-1588",
+   "self_type" : "type-1587",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20715,8 +20718,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-1611",
-   "self_type" : "type-1610",
+   "referenced_type" : "type-1615",
+   "self_type" : "type-1614",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20724,8 +20727,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-1866",
-   "self_type" : "type-1865",
+   "referenced_type" : "type-1870",
+   "self_type" : "type-1869",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20733,8 +20736,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3447",
-   "self_type" : "type-3446",
+   "referenced_type" : "type-3450",
+   "self_type" : "type-3449",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20742,8 +20745,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3485",
-   "self_type" : "type-3484",
+   "referenced_type" : "type-3488",
+   "self_type" : "type-3487",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20751,8 +20754,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3658",
-   "self_type" : "type-3657",
+   "referenced_type" : "type-3661",
+   "self_type" : "type-3660",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20760,8 +20763,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3660",
-   "self_type" : "type-3659",
+   "referenced_type" : "type-3663",
+   "self_type" : "type-3662",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20769,8 +20772,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3836",
-   "self_type" : "type-3835",
+   "referenced_type" : "type-3842",
+   "self_type" : "type-3841",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20778,8 +20781,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3941",
-   "self_type" : "type-3940",
+   "referenced_type" : "type-3947",
+   "self_type" : "type-3946",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20787,8 +20790,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3963",
-   "self_type" : "type-3962",
+   "referenced_type" : "type-3969",
+   "self_type" : "type-3968",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20796,8 +20799,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3988",
-   "self_type" : "type-3987",
+   "referenced_type" : "type-3994",
+   "self_type" : "type-3993",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20805,8 +20808,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-4064",
-   "self_type" : "type-4063",
+   "referenced_type" : "type-4070",
+   "self_type" : "type-4069",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20814,8 +20817,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-4083",
-   "self_type" : "type-4082",
+   "referenced_type" : "type-4089",
+   "self_type" : "type-4088",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20823,8 +20826,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-4395",
-   "self_type" : "type-4394",
+   "referenced_type" : "type-4399",
+   "self_type" : "type-4398",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20832,8 +20835,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-4653",
-   "self_type" : "type-4652",
+   "referenced_type" : "type-4659",
+   "self_type" : "type-4658",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20841,8 +20844,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-4669",
-   "self_type" : "type-4668",
+   "referenced_type" : "type-4675",
+   "self_type" : "type-4674",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20850,8 +20853,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-4932",
-   "self_type" : "type-4931",
+   "referenced_type" : "type-4938",
+   "self_type" : "type-4937",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20859,8 +20862,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5130",
-   "self_type" : "type-5129",
+   "referenced_type" : "type-5147",
+   "self_type" : "type-5146",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20868,8 +20871,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5508",
-   "self_type" : "type-5507",
+   "referenced_type" : "type-5525",
+   "self_type" : "type-5524",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20877,8 +20880,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5546",
-   "self_type" : "type-5545",
+   "referenced_type" : "type-5563",
+   "self_type" : "type-5562",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20886,8 +20889,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5719",
-   "self_type" : "type-5718",
+   "referenced_type" : "type-5736",
+   "self_type" : "type-5735",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20895,8 +20898,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5721",
-   "self_type" : "type-5720",
+   "referenced_type" : "type-5738",
+   "self_type" : "type-5737",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20904,8 +20907,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5897",
-   "self_type" : "type-5896",
+   "referenced_type" : "type-5917",
+   "self_type" : "type-5916",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20913,8 +20916,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5997",
-   "self_type" : "type-5996",
+   "referenced_type" : "type-6017",
+   "self_type" : "type-6016",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20922,8 +20925,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6110",
-   "self_type" : "type-6109",
+   "referenced_type" : "type-6130",
+   "self_type" : "type-6129",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20931,8 +20934,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6142",
-   "self_type" : "type-6141",
+   "referenced_type" : "type-6162",
+   "self_type" : "type-6161",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20940,8 +20943,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6292",
-   "self_type" : "type-6291",
+   "referenced_type" : "type-6312",
+   "self_type" : "type-6311",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20949,8 +20952,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6294",
-   "self_type" : "type-6293",
+   "referenced_type" : "type-6314",
+   "self_type" : "type-6313",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20958,8 +20961,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6421",
-   "self_type" : "type-6420",
+   "referenced_type" : "type-6444",
+   "self_type" : "type-6443",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20967,8 +20970,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6520",
-   "self_type" : "type-6519",
+   "referenced_type" : "type-6543",
+   "self_type" : "type-6542",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20976,8 +20979,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6540",
-   "self_type" : "type-6539",
+   "referenced_type" : "type-6563",
+   "self_type" : "type-6562",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20985,8 +20988,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6562",
-   "self_type" : "type-6561",
+   "referenced_type" : "type-6585",
+   "self_type" : "type-6584",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20994,8 +20997,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6637",
-   "self_type" : "type-6636",
+   "referenced_type" : "type-6660",
+   "self_type" : "type-6659",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21003,8 +21006,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6654",
-   "self_type" : "type-6653",
+   "referenced_type" : "type-6677",
+   "self_type" : "type-6676",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21012,8 +21015,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6981",
-   "self_type" : "type-6980",
+   "referenced_type" : "type-7003",
+   "self_type" : "type-7002",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21021,8 +21024,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-7171",
-   "self_type" : "type-7170",
+   "referenced_type" : "type-7194",
+   "self_type" : "type-7193",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21039,8 +21042,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-7283",
-   "self_type" : "type-7282",
+   "referenced_type" : "type-7307",
+   "self_type" : "type-7306",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21048,8 +21051,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-7296",
-   "self_type" : "type-7295",
+   "referenced_type" : "type-7319",
+   "self_type" : "type-7318",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21057,8 +21060,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-7496",
-   "self_type" : "type-7495",
+   "referenced_type" : "type-7521",
+   "self_type" : "type-7520",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21066,8 +21069,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-7642",
-   "self_type" : "type-7641",
+   "referenced_type" : "type-7665",
+   "self_type" : "type-7664",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21084,8 +21087,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FileDescriptor::Autoclose *",
    "name" : "android::FileDescriptor::Autoclose *",
-   "referenced_type" : "type-1204",
-   "self_type" : "type-1213",
+   "referenced_type" : "type-1203",
+   "self_type" : "type-1212",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h"
   },
@@ -21094,7 +21097,7 @@
    "linker_set_key" : "android::Flattenable<android::BufferItem> *",
    "name" : "android::Flattenable<android::BufferItem> *",
    "referenced_type" : "type-21",
-   "self_type" : "type-1510",
+   "self_type" : "type-1513",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -21103,7 +21106,7 @@
    "linker_set_key" : "android::Flattenable<android::Fence> *",
    "name" : "android::Flattenable<android::Fence> *",
    "referenced_type" : "type-16",
-   "self_type" : "type-1636",
+   "self_type" : "type-1642",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -21112,7 +21115,7 @@
    "linker_set_key" : "android::Flattenable<android::FrameEventHistoryDelta> *",
    "name" : "android::Flattenable<android::FrameEventHistoryDelta> *",
    "referenced_type" : "type-25",
-   "self_type" : "type-4308",
+   "self_type" : "type-4314",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -21121,7 +21124,7 @@
    "linker_set_key" : "android::Flattenable<android::GraphicBuffer> *",
    "name" : "android::Flattenable<android::GraphicBuffer> *",
    "referenced_type" : "type-14",
-   "self_type" : "type-1640",
+   "self_type" : "type-1645",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -21130,7 +21133,7 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> *",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> *",
    "referenced_type" : "type-32",
-   "self_type" : "type-4311",
+   "self_type" : "type-4317",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -21139,7 +21142,7 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> *",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> *",
    "referenced_type" : "type-34",
-   "self_type" : "type-4314",
+   "self_type" : "type-4320",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -21156,8 +21159,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-1175",
-   "self_type" : "type-1174",
+   "referenced_type" : "type-1178",
+   "self_type" : "type-1177",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21165,8 +21168,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-1468",
-   "self_type" : "type-1467",
+   "referenced_type" : "type-1472",
+   "self_type" : "type-1471",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21174,8 +21177,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-3778",
-   "self_type" : "type-3777",
+   "referenced_type" : "type-3784",
+   "self_type" : "type-3783",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21183,8 +21186,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-3997",
-   "self_type" : "type-3996",
+   "referenced_type" : "type-4003",
+   "self_type" : "type-4002",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21192,8 +21195,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-5839",
-   "self_type" : "type-5838",
+   "referenced_type" : "type-5859",
+   "self_type" : "type-5858",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21201,8 +21204,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-6389",
-   "self_type" : "type-6388",
+   "referenced_type" : "type-6412",
+   "self_type" : "type-6411",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21210,8 +21213,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-6571",
-   "self_type" : "type-6570",
+   "referenced_type" : "type-6594",
+   "self_type" : "type-6593",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21228,8 +21231,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1331",
-   "self_type" : "type-1330",
+   "referenced_type" : "type-1330",
+   "self_type" : "type-1329",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21237,8 +21240,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1416",
-   "self_type" : "type-1415",
+   "referenced_type" : "type-1419",
+   "self_type" : "type-1418",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21246,8 +21249,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1459",
-   "self_type" : "type-1458",
+   "referenced_type" : "type-1463",
+   "self_type" : "type-1462",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21255,8 +21258,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1587",
-   "self_type" : "type-1586",
+   "referenced_type" : "type-1591",
+   "self_type" : "type-1590",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21264,8 +21267,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1608",
-   "self_type" : "type-1607",
+   "referenced_type" : "type-1612",
+   "self_type" : "type-1611",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21273,8 +21276,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3452",
-   "self_type" : "type-3451",
+   "referenced_type" : "type-3455",
+   "self_type" : "type-3454",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21282,8 +21285,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3487",
-   "self_type" : "type-3486",
+   "referenced_type" : "type-3490",
+   "self_type" : "type-3489",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21291,8 +21294,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3597",
-   "self_type" : "type-3596",
+   "referenced_type" : "type-3600",
+   "self_type" : "type-3599",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21300,8 +21303,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3662",
-   "self_type" : "type-3661",
+   "referenced_type" : "type-3665",
+   "self_type" : "type-3664",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21309,8 +21312,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3882",
-   "self_type" : "type-3881",
+   "referenced_type" : "type-3884",
+   "self_type" : "type-3883",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21318,8 +21321,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3943",
-   "self_type" : "type-3942",
+   "referenced_type" : "type-3949",
+   "self_type" : "type-3948",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21327,8 +21330,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3990",
-   "self_type" : "type-3989",
+   "referenced_type" : "type-3996",
+   "self_type" : "type-3995",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21336,8 +21339,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-4066",
-   "self_type" : "type-4065",
+   "referenced_type" : "type-4072",
+   "self_type" : "type-4071",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21345,8 +21348,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-4081",
-   "self_type" : "type-4080",
+   "referenced_type" : "type-4087",
+   "self_type" : "type-4086",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21354,8 +21357,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-4447",
-   "self_type" : "type-4446",
+   "referenced_type" : "type-4453",
+   "self_type" : "type-4452",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21363,8 +21366,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-4547",
-   "self_type" : "type-4546",
+   "referenced_type" : "type-4551",
+   "self_type" : "type-4550",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21372,8 +21375,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-4676",
-   "self_type" : "type-4675",
+   "referenced_type" : "type-4683",
+   "self_type" : "type-4682",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21381,8 +21384,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5132",
-   "self_type" : "type-5131",
+   "referenced_type" : "type-5149",
+   "self_type" : "type-5148",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21390,8 +21393,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5513",
-   "self_type" : "type-5512",
+   "referenced_type" : "type-5530",
+   "self_type" : "type-5529",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21399,8 +21402,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5548",
-   "self_type" : "type-5547",
+   "referenced_type" : "type-5565",
+   "self_type" : "type-5564",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21408,8 +21411,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5658",
-   "self_type" : "type-5657",
+   "referenced_type" : "type-5675",
+   "self_type" : "type-5674",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21417,8 +21420,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5723",
-   "self_type" : "type-5722",
+   "referenced_type" : "type-5740",
+   "self_type" : "type-5739",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21426,8 +21429,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5943",
-   "self_type" : "type-5942",
+   "referenced_type" : "type-5959",
+   "self_type" : "type-5958",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21435,8 +21438,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5970",
-   "self_type" : "type-5969",
+   "referenced_type" : "type-5990",
+   "self_type" : "type-5989",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21444,8 +21447,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6116",
-   "self_type" : "type-6115",
+   "referenced_type" : "type-6136",
+   "self_type" : "type-6135",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21453,8 +21456,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6144",
-   "self_type" : "type-6143",
+   "referenced_type" : "type-6164",
+   "self_type" : "type-6163",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21462,8 +21465,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6243",
-   "self_type" : "type-6242",
+   "referenced_type" : "type-6263",
+   "self_type" : "type-6262",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21471,8 +21474,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6296",
-   "self_type" : "type-6295",
+   "referenced_type" : "type-6316",
+   "self_type" : "type-6315",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21480,8 +21483,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6462",
-   "self_type" : "type-6461",
+   "referenced_type" : "type-6481",
+   "self_type" : "type-6480",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21489,8 +21492,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6522",
-   "self_type" : "type-6521",
+   "referenced_type" : "type-6545",
+   "self_type" : "type-6544",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21498,8 +21501,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6564",
-   "self_type" : "type-6563",
+   "referenced_type" : "type-6587",
+   "self_type" : "type-6586",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21507,8 +21510,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6613",
-   "self_type" : "type-6612",
+   "referenced_type" : "type-6632",
+   "self_type" : "type-6631",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21516,8 +21519,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6639",
-   "self_type" : "type-6638",
+   "referenced_type" : "type-6662",
+   "self_type" : "type-6661",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21525,8 +21528,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6652",
-   "self_type" : "type-6651",
+   "referenced_type" : "type-6675",
+   "self_type" : "type-6674",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21534,17 +21537,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-7039",
-   "self_type" : "type-7038",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-7303",
-   "self_type" : "type-7302",
+   "referenced_type" : "type-7062",
+   "self_type" : "type-7061",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21561,6 +21555,15 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-7326",
+   "self_type" : "type-7325",
+   "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,
@@ -21570,8 +21573,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-7500",
-   "self_type" : "type-7499",
+   "referenced_type" : "type-7523",
+   "self_type" : "type-7522",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21579,8 +21582,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-7645",
-   "self_type" : "type-7644",
+   "referenced_type" : "type-7668",
+   "self_type" : "type-7667",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21606,8 +21609,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1088",
-   "self_type" : "type-1087",
+   "referenced_type" : "type-1091",
+   "self_type" : "type-1090",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21615,8 +21618,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1270",
-   "self_type" : "type-1269",
+   "referenced_type" : "type-1273",
+   "self_type" : "type-1272",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21624,8 +21627,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1412",
-   "self_type" : "type-1411",
+   "referenced_type" : "type-1415",
+   "self_type" : "type-1414",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21633,8 +21636,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1448",
-   "self_type" : "type-1447",
+   "referenced_type" : "type-1451",
+   "self_type" : "type-1450",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21642,8 +21645,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-2174",
-   "self_type" : "type-2173",
+   "referenced_type" : "type-2178",
+   "self_type" : "type-2177",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21651,8 +21654,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3252",
-   "self_type" : "type-3251",
+   "referenced_type" : "type-3255",
+   "self_type" : "type-3254",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21669,8 +21672,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3465",
-   "self_type" : "type-3464",
+   "referenced_type" : "type-3468",
+   "self_type" : "type-3467",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21678,8 +21681,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3530",
-   "self_type" : "type-3529",
+   "referenced_type" : "type-3533",
+   "self_type" : "type-3532",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21687,8 +21690,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3641",
-   "self_type" : "type-3640",
+   "referenced_type" : "type-3644",
+   "self_type" : "type-3643",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21696,8 +21699,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3698",
-   "self_type" : "type-3697",
+   "referenced_type" : "type-3704",
+   "self_type" : "type-3703",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21705,8 +21708,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3823",
-   "self_type" : "type-3822",
+   "referenced_type" : "type-3829",
+   "self_type" : "type-3828",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21714,8 +21717,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3939",
-   "self_type" : "type-3938",
+   "referenced_type" : "type-3945",
+   "self_type" : "type-3944",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21723,8 +21726,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3980",
-   "self_type" : "type-3979",
+   "referenced_type" : "type-3987",
+   "self_type" : "type-3986",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21732,8 +21735,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-4209",
-   "self_type" : "type-4208",
+   "referenced_type" : "type-4216",
+   "self_type" : "type-4215",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21741,8 +21744,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-4388",
-   "self_type" : "type-4387",
+   "referenced_type" : "type-4394",
+   "self_type" : "type-4393",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21750,8 +21753,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-4600",
-   "self_type" : "type-4599",
+   "referenced_type" : "type-4607",
+   "self_type" : "type-4606",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21759,8 +21762,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-4766",
-   "self_type" : "type-4765",
+   "referenced_type" : "type-4773",
+   "self_type" : "type-4772",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21768,8 +21771,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5082",
-   "self_type" : "type-5081",
+   "referenced_type" : "type-5098",
+   "self_type" : "type-5097",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21777,8 +21780,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5150",
-   "self_type" : "type-5149",
+   "referenced_type" : "type-5166",
+   "self_type" : "type-5165",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21786,8 +21789,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5313",
-   "self_type" : "type-5312",
+   "referenced_type" : "type-5330",
+   "self_type" : "type-5329",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21795,8 +21798,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5526",
-   "self_type" : "type-5525",
+   "referenced_type" : "type-5543",
+   "self_type" : "type-5542",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21804,8 +21807,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5591",
-   "self_type" : "type-5590",
+   "referenced_type" : "type-5608",
+   "self_type" : "type-5607",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21813,8 +21816,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5702",
-   "self_type" : "type-5701",
+   "referenced_type" : "type-5719",
+   "self_type" : "type-5718",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21822,8 +21825,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5759",
-   "self_type" : "type-5758",
+   "referenced_type" : "type-5779",
+   "self_type" : "type-5778",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21831,8 +21834,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5884",
-   "self_type" : "type-5883",
+   "referenced_type" : "type-5904",
+   "self_type" : "type-5903",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21840,8 +21843,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6044",
-   "self_type" : "type-6043",
+   "referenced_type" : "type-6064",
+   "self_type" : "type-6063",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21849,8 +21852,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6127",
-   "self_type" : "type-6126",
+   "referenced_type" : "type-6148",
+   "self_type" : "type-6147",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21858,8 +21861,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6179",
-   "self_type" : "type-6178",
+   "referenced_type" : "type-6199",
+   "self_type" : "type-6198",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21867,8 +21870,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6273",
-   "self_type" : "type-6272",
+   "referenced_type" : "type-6293",
+   "self_type" : "type-6292",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21876,8 +21879,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6317",
-   "self_type" : "type-6316",
+   "referenced_type" : "type-6340",
+   "self_type" : "type-6339",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21885,8 +21888,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6412",
-   "self_type" : "type-6411",
+   "referenced_type" : "type-6436",
+   "self_type" : "type-6435",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21894,8 +21897,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6518",
-   "self_type" : "type-6517",
+   "referenced_type" : "type-6541",
+   "self_type" : "type-6540",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21903,8 +21906,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6555",
-   "self_type" : "type-6554",
+   "referenced_type" : "type-6578",
+   "self_type" : "type-6577",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21912,8 +21915,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6801",
-   "self_type" : "type-6800",
+   "referenced_type" : "type-6824",
+   "self_type" : "type-6823",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21921,8 +21924,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6973",
-   "self_type" : "type-6972",
+   "referenced_type" : "type-6997",
+   "self_type" : "type-6996",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21930,8 +21933,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-7225",
-   "self_type" : "type-7224",
+   "referenced_type" : "type-7248",
+   "self_type" : "type-7247",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21939,8 +21942,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-7363",
-   "self_type" : "type-7362",
+   "referenced_type" : "type-7387",
+   "self_type" : "type-7386",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21957,8 +21960,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-7587",
-   "self_type" : "type-7586",
+   "referenced_type" : "type-7610",
+   "self_type" : "type-7609",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -22002,8 +22005,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
    "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-3902",
-   "self_type" : "type-3901",
+   "referenced_type" : "type-3908",
+   "self_type" : "type-3907",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22020,8 +22023,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
    "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-5963",
-   "self_type" : "type-5962",
+   "referenced_type" : "type-5983",
+   "self_type" : "type-5982",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22029,8 +22032,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
    "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-5990",
-   "self_type" : "type-5989",
+   "referenced_type" : "type-6010",
+   "self_type" : "type-6009",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22047,8 +22050,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-4257",
-   "self_type" : "type-4256",
+   "referenced_type" : "type-4263",
+   "self_type" : "type-4262",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22056,8 +22059,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-4266",
-   "self_type" : "type-4265",
+   "referenced_type" : "type-4272",
+   "self_type" : "type-4271",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22065,8 +22068,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-4693",
-   "self_type" : "type-4692",
+   "referenced_type" : "type-4700",
+   "self_type" : "type-4699",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22074,8 +22077,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-6853",
-   "self_type" : "type-6852",
+   "referenced_type" : "type-6876",
+   "self_type" : "type-6875",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22083,8 +22086,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-6859",
-   "self_type" : "type-6858",
+   "referenced_type" : "type-6882",
+   "self_type" : "type-6881",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22092,8 +22095,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-7316",
-   "self_type" : "type-7315",
+   "referenced_type" : "type-7339",
+   "self_type" : "type-7338",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22101,8 +22104,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-7648",
-   "self_type" : "type-7647",
+   "referenced_type" : "type-7671",
+   "self_type" : "type-7670",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22110,8 +22113,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
    "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
-   "referenced_type" : "type-4829",
-   "self_type" : "type-4828",
+   "referenced_type" : "type-4835",
+   "self_type" : "type-4834",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22119,8 +22122,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
    "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
-   "referenced_type" : "type-5098",
-   "self_type" : "type-5097",
+   "referenced_type" : "type-5114",
+   "self_type" : "type-5113",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22128,8 +22131,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
    "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
-   "referenced_type" : "type-7418",
-   "self_type" : "type-7417",
+   "referenced_type" : "type-7442",
+   "self_type" : "type-7441",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22137,8 +22140,8 @@
    "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",
+   "referenced_type" : "type-4289",
+   "self_type" : "type-4288",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22146,8 +22149,8 @@
    "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",
+   "referenced_type" : "type-4671",
+   "self_type" : "type-4670",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22155,8 +22158,8 @@
    "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",
+   "referenced_type" : "type-6896",
+   "self_type" : "type-6895",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22164,8 +22167,8 @@
    "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",
+   "referenced_type" : "type-7317",
+   "self_type" : "type-7316",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22173,8 +22176,8 @@
    "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",
+   "referenced_type" : "type-4831",
+   "self_type" : "type-4830",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22182,8 +22185,8 @@
    "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",
+   "referenced_type" : "type-7438",
+   "self_type" : "type-7437",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22191,8 +22194,8 @@
    "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",
+   "referenced_type" : "type-4291",
+   "self_type" : "type-4290",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22200,8 +22203,8 @@
    "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",
+   "referenced_type" : "type-6898",
+   "self_type" : "type-6897",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22209,8 +22212,8 @@
    "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",
+   "referenced_type" : "type-7653",
+   "self_type" : "type-7652",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22218,8 +22221,8 @@
    "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",
+   "referenced_type" : "type-5110",
+   "self_type" : "type-5109",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22227,8 +22230,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::HpGraphicBufferProducer *",
    "name" : "android::HpGraphicBufferProducer *",
-   "referenced_type" : "type-4246",
-   "self_type" : "type-4245",
+   "referenced_type" : "type-4252",
+   "self_type" : "type-4251",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22236,8 +22239,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::HpGraphicBufferProducer *",
    "name" : "android::HpGraphicBufferProducer *",
-   "referenced_type" : "type-6842",
-   "self_type" : "type-6841",
+   "referenced_type" : "type-6865",
+   "self_type" : "type-6864",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22245,8 +22248,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::HpProducerListener *",
    "name" : "android::HpProducerListener *",
-   "referenced_type" : "type-4521",
-   "self_type" : "type-4520",
+   "referenced_type" : "type-4527",
+   "self_type" : "type-4526",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22254,8 +22257,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::HpProducerListener *",
    "name" : "android::HpProducerListener *",
-   "referenced_type" : "type-7114",
-   "self_type" : "type-7113",
+   "referenced_type" : "type-7138",
+   "self_type" : "type-7137",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22290,8 +22293,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-1154",
-   "self_type" : "type-1153",
+   "referenced_type" : "type-1157",
+   "self_type" : "type-1156",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22299,8 +22302,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-1576",
-   "self_type" : "type-1575",
+   "referenced_type" : "type-1579",
+   "self_type" : "type-1578",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22308,8 +22311,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-1614",
-   "self_type" : "type-1613",
+   "referenced_type" : "type-1618",
+   "self_type" : "type-1617",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22317,8 +22320,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-3498",
-   "self_type" : "type-3497",
+   "referenced_type" : "type-3501",
+   "self_type" : "type-3500",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22326,8 +22329,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-3605",
-   "self_type" : "type-3604",
+   "referenced_type" : "type-3608",
+   "self_type" : "type-3607",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22335,8 +22338,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-3664",
-   "self_type" : "type-3663",
+   "referenced_type" : "type-3667",
+   "self_type" : "type-3666",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22344,8 +22347,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-3757",
-   "self_type" : "type-3756",
+   "referenced_type" : "type-3765",
+   "self_type" : "type-3764",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22353,8 +22356,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-4055",
-   "self_type" : "type-4054",
+   "referenced_type" : "type-4062",
+   "self_type" : "type-4061",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22362,8 +22365,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-4085",
-   "self_type" : "type-4084",
+   "referenced_type" : "type-4091",
+   "self_type" : "type-4090",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22371,8 +22374,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-4945",
-   "self_type" : "type-4944",
+   "referenced_type" : "type-4951",
+   "self_type" : "type-4950",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22380,8 +22383,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-5135",
-   "self_type" : "type-5134",
+   "referenced_type" : "type-5151",
+   "self_type" : "type-5150",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22389,8 +22392,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-5559",
-   "self_type" : "type-5558",
+   "referenced_type" : "type-5576",
+   "self_type" : "type-5575",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22398,8 +22401,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-5666",
-   "self_type" : "type-5665",
+   "referenced_type" : "type-5683",
+   "self_type" : "type-5682",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22407,8 +22410,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-5725",
-   "self_type" : "type-5724",
+   "referenced_type" : "type-5742",
+   "self_type" : "type-5741",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22416,8 +22419,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-5818",
-   "self_type" : "type-5817",
+   "referenced_type" : "type-5840",
+   "self_type" : "type-5839",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22425,8 +22428,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-6004",
-   "self_type" : "type-6003",
+   "referenced_type" : "type-6024",
+   "self_type" : "type-6023",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22434,8 +22437,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-6153",
-   "self_type" : "type-6152",
+   "referenced_type" : "type-6173",
+   "self_type" : "type-6172",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22443,8 +22446,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-6248",
-   "self_type" : "type-6247",
+   "referenced_type" : "type-6269",
+   "self_type" : "type-6268",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22452,8 +22455,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-6298",
-   "self_type" : "type-6297",
+   "referenced_type" : "type-6318",
+   "self_type" : "type-6317",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22461,8 +22464,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-6373",
-   "self_type" : "type-6372",
+   "referenced_type" : "type-6396",
+   "self_type" : "type-6395",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22470,8 +22473,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-6629",
-   "self_type" : "type-6628",
+   "referenced_type" : "type-6652",
+   "self_type" : "type-6651",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22479,8 +22482,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-6656",
-   "self_type" : "type-6655",
+   "referenced_type" : "type-6679",
+   "self_type" : "type-6678",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22488,8 +22491,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-7208",
-   "self_type" : "type-7207",
+   "referenced_type" : "type-7224",
+   "self_type" : "type-7223",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22524,8 +22527,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-1172",
-   "self_type" : "type-1171",
+   "referenced_type" : "type-1175",
+   "self_type" : "type-1174",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22533,8 +22536,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-1466",
-   "self_type" : "type-1465",
+   "referenced_type" : "type-1470",
+   "self_type" : "type-1469",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22542,8 +22545,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-1599",
-   "self_type" : "type-1598",
+   "referenced_type" : "type-1603",
+   "self_type" : "type-1602",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22551,8 +22554,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-3489",
-   "self_type" : "type-3488",
+   "referenced_type" : "type-3492",
+   "self_type" : "type-3491",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22560,8 +22563,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-3776",
-   "self_type" : "type-3775",
+   "referenced_type" : "type-3782",
+   "self_type" : "type-3781",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22569,8 +22572,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-3969",
-   "self_type" : "type-3968",
+   "referenced_type" : "type-3975",
+   "self_type" : "type-3974",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22578,8 +22581,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-3995",
-   "self_type" : "type-3994",
+   "referenced_type" : "type-4001",
+   "self_type" : "type-4000",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22587,8 +22590,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-4073",
-   "self_type" : "type-4072",
+   "referenced_type" : "type-4079",
+   "self_type" : "type-4078",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22596,8 +22599,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-5550",
-   "self_type" : "type-5549",
+   "referenced_type" : "type-5567",
+   "self_type" : "type-5566",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22614,8 +22617,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-5837",
-   "self_type" : "type-5836",
+   "referenced_type" : "type-5857",
+   "self_type" : "type-5856",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22623,8 +22626,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-5992",
-   "self_type" : "type-5991",
+   "referenced_type" : "type-6012",
+   "self_type" : "type-6011",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22632,8 +22635,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6028",
-   "self_type" : "type-6027",
+   "referenced_type" : "type-6048",
+   "self_type" : "type-6047",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22641,8 +22644,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6146",
-   "self_type" : "type-6145",
+   "referenced_type" : "type-6166",
+   "self_type" : "type-6165",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22650,8 +22653,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6387",
-   "self_type" : "type-6386",
+   "referenced_type" : "type-6410",
+   "self_type" : "type-6409",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22659,8 +22662,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6569",
-   "self_type" : "type-6568",
+   "referenced_type" : "type-6592",
+   "self_type" : "type-6591",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22668,8 +22671,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6644",
-   "self_type" : "type-6643",
+   "referenced_type" : "type-6667",
+   "self_type" : "type-6666",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22686,8 +22689,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-3500",
-   "self_type" : "type-3499",
+   "referenced_type" : "type-3503",
+   "self_type" : "type-3502",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22695,8 +22698,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-3956",
-   "self_type" : "type-3955",
+   "referenced_type" : "type-3959",
+   "self_type" : "type-3958",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22704,8 +22707,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-4225",
-   "self_type" : "type-4224",
+   "referenced_type" : "type-4231",
+   "self_type" : "type-4230",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22713,8 +22716,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-5561",
-   "self_type" : "type-5560",
+   "referenced_type" : "type-5578",
+   "self_type" : "type-5577",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22731,8 +22734,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-5988",
-   "self_type" : "type-5987",
+   "referenced_type" : "type-6008",
+   "self_type" : "type-6007",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22740,8 +22743,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-6023",
-   "self_type" : "type-6022",
+   "referenced_type" : "type-6040",
+   "self_type" : "type-6039",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22749,8 +22752,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-6155",
-   "self_type" : "type-6154",
+   "referenced_type" : "type-6175",
+   "self_type" : "type-6174",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22758,8 +22761,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-6827",
-   "self_type" : "type-6826",
+   "referenced_type" : "type-6850",
+   "self_type" : "type-6849",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22767,8 +22770,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-7502",
-   "self_type" : "type-7501",
+   "referenced_type" : "type-7526",
+   "self_type" : "type-7525",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22794,8 +22797,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1265",
-   "self_type" : "type-1264",
+   "referenced_type" : "type-1268",
+   "self_type" : "type-1267",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -22803,8 +22806,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1369",
-   "self_type" : "type-1368",
+   "referenced_type" : "type-1372",
+   "self_type" : "type-1371",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -22812,8 +22815,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-3818",
-   "self_type" : "type-3817",
+   "referenced_type" : "type-3825",
+   "self_type" : "type-3824",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -22821,8 +22824,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-3914",
-   "self_type" : "type-3913",
+   "referenced_type" : "type-3920",
+   "self_type" : "type-3919",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -22830,8 +22833,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-5879",
-   "self_type" : "type-5878",
+   "referenced_type" : "type-5900",
+   "self_type" : "type-5899",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -22839,8 +22842,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-6406",
-   "self_type" : "type-6405",
+   "referenced_type" : "type-6429",
+   "self_type" : "type-6428",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -22848,8 +22851,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-6492",
-   "self_type" : "type-6491",
+   "referenced_type" : "type-6515",
+   "self_type" : "type-6514",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -22866,8 +22869,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-1159",
-   "self_type" : "type-1158",
+   "referenced_type" : "type-1162",
+   "self_type" : "type-1161",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22875,8 +22878,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-3508",
-   "self_type" : "type-3507",
+   "referenced_type" : "type-3511",
+   "self_type" : "type-3510",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22884,8 +22887,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-3618",
-   "self_type" : "type-3617",
+   "referenced_type" : "type-3621",
+   "self_type" : "type-3620",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22893,8 +22896,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-3666",
-   "self_type" : "type-3665",
+   "referenced_type" : "type-3669",
+   "self_type" : "type-3668",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22902,8 +22905,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-3764",
-   "self_type" : "type-3763",
+   "referenced_type" : "type-3770",
+   "self_type" : "type-3769",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22911,8 +22914,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-4251",
-   "self_type" : "type-4250",
+   "referenced_type" : "type-4257",
+   "self_type" : "type-4256",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22920,8 +22923,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-4515",
-   "self_type" : "type-4514",
+   "referenced_type" : "type-4521",
+   "self_type" : "type-4520",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22929,8 +22932,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-4558",
-   "self_type" : "type-4557",
+   "referenced_type" : "type-4564",
+   "self_type" : "type-4563",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22938,8 +22941,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-4688",
-   "self_type" : "type-4687",
+   "referenced_type" : "type-4694",
+   "self_type" : "type-4693",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22947,8 +22950,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-4950",
-   "self_type" : "type-4949",
+   "referenced_type" : "type-4956",
+   "self_type" : "type-4955",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22956,8 +22959,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-5137",
-   "self_type" : "type-5136",
+   "referenced_type" : "type-5153",
+   "self_type" : "type-5152",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22965,8 +22968,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-5569",
-   "self_type" : "type-5568",
+   "referenced_type" : "type-5586",
+   "self_type" : "type-5585",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22974,8 +22977,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-5679",
-   "self_type" : "type-5678",
+   "referenced_type" : "type-5696",
+   "self_type" : "type-5695",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22983,8 +22986,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-5727",
-   "self_type" : "type-5726",
+   "referenced_type" : "type-5744",
+   "self_type" : "type-5743",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22992,8 +22995,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-5825",
-   "self_type" : "type-5824",
+   "referenced_type" : "type-5845",
+   "self_type" : "type-5844",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23001,8 +23004,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6008",
-   "self_type" : "type-6007",
+   "referenced_type" : "type-6028",
+   "self_type" : "type-6027",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23010,8 +23013,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6162",
-   "self_type" : "type-6161",
+   "referenced_type" : "type-6182",
+   "self_type" : "type-6181",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23019,8 +23022,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6256",
-   "self_type" : "type-6255",
+   "referenced_type" : "type-6276",
+   "self_type" : "type-6275",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23028,8 +23031,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6300",
-   "self_type" : "type-6299",
+   "referenced_type" : "type-6320",
+   "self_type" : "type-6319",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23037,8 +23040,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6378",
-   "self_type" : "type-6377",
+   "referenced_type" : "type-6401",
+   "self_type" : "type-6400",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23046,8 +23049,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6847",
-   "self_type" : "type-6846",
+   "referenced_type" : "type-6870",
+   "self_type" : "type-6869",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23055,8 +23058,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7107",
-   "self_type" : "type-7106",
+   "referenced_type" : "type-7131",
+   "self_type" : "type-7130",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23064,8 +23067,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7166",
-   "self_type" : "type-7165",
+   "referenced_type" : "type-7190",
+   "self_type" : "type-7189",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23073,8 +23076,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7229",
-   "self_type" : "type-7228",
+   "referenced_type" : "type-7250",
+   "self_type" : "type-7249",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23082,8 +23085,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7311",
-   "self_type" : "type-7310",
+   "referenced_type" : "type-7334",
+   "self_type" : "type-7333",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23091,8 +23094,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7485",
-   "self_type" : "type-7484",
+   "referenced_type" : "type-7508",
+   "self_type" : "type-7507",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23100,8 +23103,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7491",
-   "self_type" : "type-7490",
+   "referenced_type" : "type-7515",
+   "self_type" : "type-7514",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23109,8 +23112,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7619",
-   "self_type" : "type-7618",
+   "referenced_type" : "type-7643",
+   "self_type" : "type-7642",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23118,8 +23121,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7640",
-   "self_type" : "type-7639",
+   "referenced_type" : "type-7663",
+   "self_type" : "type-7662",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23154,8 +23157,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ISurfaceComposer *",
    "name" : "android::ISurfaceComposer *",
-   "referenced_type" : "type-1050",
-   "self_type" : "type-1049",
+   "referenced_type" : "type-1053",
+   "self_type" : "type-1052",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23163,8 +23166,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ISurfaceComposer *",
    "name" : "android::ISurfaceComposer *",
-   "referenced_type" : "type-3677",
-   "self_type" : "type-3676",
+   "referenced_type" : "type-3683",
+   "self_type" : "type-3682",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23172,8 +23175,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ISurfaceComposer *",
    "name" : "android::ISurfaceComposer *",
-   "referenced_type" : "type-5738",
-   "self_type" : "type-5737",
+   "referenced_type" : "type-5758",
+   "self_type" : "type-5757",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23181,8 +23184,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ISurfaceComposer *",
    "name" : "android::ISurfaceComposer *",
-   "referenced_type" : "type-6304",
-   "self_type" : "type-6303",
+   "referenced_type" : "type-6327",
+   "self_type" : "type-6326",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23190,8 +23193,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ITransactionCompletedListener *",
    "name" : "android::ITransactionCompletedListener *",
-   "referenced_type" : "type-1042",
-   "self_type" : "type-1041",
+   "referenced_type" : "type-1046",
+   "self_type" : "type-1045",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23199,8 +23202,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ITransactionCompletedListener *",
    "name" : "android::ITransactionCompletedListener *",
-   "referenced_type" : "type-3672",
-   "self_type" : "type-3671",
+   "referenced_type" : "type-3678",
+   "self_type" : "type-3677",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23208,8 +23211,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ITransactionCompletedListener *",
    "name" : "android::ITransactionCompletedListener *",
-   "referenced_type" : "type-5733",
-   "self_type" : "type-5732",
+   "referenced_type" : "type-5753",
+   "self_type" : "type-5752",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23217,8 +23220,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ITransactionCompletedListener *",
    "name" : "android::ITransactionCompletedListener *",
-   "referenced_type" : "type-6302",
-   "self_type" : "type-6301",
+   "referenced_type" : "type-6325",
+   "self_type" : "type-6324",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23253,8 +23256,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::LWProducerListener *",
    "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-2539",
-   "self_type" : "type-2538",
+   "referenced_type" : "type-2542",
+   "self_type" : "type-2541",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23262,8 +23265,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::LWProducerListener *",
    "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-4953",
-   "self_type" : "type-4952",
+   "referenced_type" : "type-4959",
+   "self_type" : "type-4958",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23271,8 +23274,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::LWProducerListener *",
    "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-6010",
-   "self_type" : "type-6009",
+   "referenced_type" : "type-6030",
+   "self_type" : "type-6029",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23280,8 +23283,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::LWProducerListener *",
    "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-7255",
-   "self_type" : "type-7254",
+   "referenced_type" : "type-7272",
+   "self_type" : "type-7271",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23290,7 +23293,7 @@
    "linker_set_key" : "android::LightFlattenablePod<android::Rect> *",
    "name" : "android::LightFlattenablePod<android::Rect> *",
    "referenced_type" : "type-46",
-   "self_type" : "type-4589",
+   "self_type" : "type-4595",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -23334,8 +23337,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::List<Event>::_Node *",
    "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-3687",
-   "self_type" : "type-3686",
+   "referenced_type" : "type-3693",
+   "self_type" : "type-3692",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -23343,8 +23346,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::List<Event>::_Node *",
    "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-5748",
-   "self_type" : "type-5747",
+   "referenced_type" : "type-5768",
+   "self_type" : "type-5767",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -23352,8 +23355,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::List<Event>::_Node *",
    "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-6039",
-   "self_type" : "type-6038",
+   "referenced_type" : "type-6060",
+   "self_type" : "type-6059",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -23469,8 +23472,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::OMXPluginBase *",
    "name" : "android::OMXPluginBase *",
-   "referenced_type" : "type-2393",
-   "self_type" : "type-2394",
+   "referenced_type" : "type-2396",
+   "self_type" : "type-2397",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h"
   },
@@ -23487,8 +23490,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel::FlattenableHelper<android::BufferItem> *",
    "name" : "android::Parcel::FlattenableHelper<android::BufferItem> *",
-   "referenced_type" : "type-1516",
-   "self_type" : "type-1518",
+   "referenced_type" : "type-1520",
+   "self_type" : "type-1522",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -23496,8 +23499,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel::FlattenableHelper<android::Fence> *",
    "name" : "android::Parcel::FlattenableHelper<android::Fence> *",
-   "referenced_type" : "type-1658",
-   "self_type" : "type-1661",
+   "referenced_type" : "type-1662",
+   "self_type" : "type-1665",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -23505,8 +23508,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta> *",
    "name" : "android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta> *",
-   "referenced_type" : "type-4328",
-   "self_type" : "type-4330",
+   "referenced_type" : "type-4334",
+   "self_type" : "type-4336",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -23514,8 +23517,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel::FlattenableHelper<android::GraphicBuffer> *",
    "name" : "android::Parcel::FlattenableHelper<android::GraphicBuffer> *",
-   "referenced_type" : "type-1653",
-   "self_type" : "type-1655",
+   "referenced_type" : "type-1657",
+   "self_type" : "type-1659",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -23523,8 +23526,8 @@
    "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",
+   "referenced_type" : "type-4339",
+   "self_type" : "type-4342",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -23532,8 +23535,8 @@
    "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",
+   "referenced_type" : "type-4345",
+   "self_type" : "type-4347",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -23577,8 +23580,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ProcessState *",
    "name" : "android::ProcessState *",
-   "referenced_type" : "type-1261",
-   "self_type" : "type-1260",
+   "referenced_type" : "type-1264",
+   "self_type" : "type-1263",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23622,8 +23625,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1079",
-   "self_type" : "type-1078",
+   "referenced_type" : "type-1082",
+   "self_type" : "type-1081",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23631,8 +23634,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1191",
-   "self_type" : "type-1190",
+   "referenced_type" : "type-1194",
+   "self_type" : "type-1193",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23640,8 +23643,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1352",
-   "self_type" : "type-1351",
+   "referenced_type" : "type-1355",
+   "self_type" : "type-1354",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23649,8 +23652,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1404",
-   "self_type" : "type-1403",
+   "referenced_type" : "type-1407",
+   "self_type" : "type-1406",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23658,8 +23661,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1419",
+   "referenced_type" : "type-1423",
+   "self_type" : "type-1422",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23667,8 +23670,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1441",
-   "self_type" : "type-1440",
+   "referenced_type" : "type-1444",
+   "self_type" : "type-1443",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23676,8 +23679,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1482",
-   "self_type" : "type-1481",
+   "referenced_type" : "type-1486",
+   "self_type" : "type-1485",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23685,8 +23688,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1616",
-   "self_type" : "type-1615",
+   "referenced_type" : "type-1620",
+   "self_type" : "type-1619",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23694,8 +23697,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2649",
-   "self_type" : "type-2648",
+   "referenced_type" : "type-2652",
+   "self_type" : "type-2651",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23703,8 +23706,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3459",
-   "self_type" : "type-3458",
+   "referenced_type" : "type-3462",
+   "self_type" : "type-3461",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23712,8 +23715,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3525",
-   "self_type" : "type-3524",
+   "referenced_type" : "type-3528",
+   "self_type" : "type-3527",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23721,8 +23724,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3627",
-   "self_type" : "type-3626",
+   "referenced_type" : "type-3630",
+   "self_type" : "type-3629",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23730,8 +23733,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3689",
-   "self_type" : "type-3688",
+   "referenced_type" : "type-3695",
+   "self_type" : "type-3694",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23739,8 +23742,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3781",
-   "self_type" : "type-3780",
+   "referenced_type" : "type-3787",
+   "self_type" : "type-3786",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23748,8 +23751,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3842",
-   "self_type" : "type-3841",
+   "referenced_type" : "type-3848",
+   "self_type" : "type-3847",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23757,8 +23760,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3906",
-   "self_type" : "type-3905",
+   "referenced_type" : "type-3912",
+   "self_type" : "type-3911",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23766,8 +23769,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3932",
-   "self_type" : "type-3931",
+   "referenced_type" : "type-3938",
+   "self_type" : "type-3937",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23775,8 +23778,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3947",
-   "self_type" : "type-3946",
+   "referenced_type" : "type-3954",
+   "self_type" : "type-3953",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23784,8 +23787,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3973",
-   "self_type" : "type-3972",
+   "referenced_type" : "type-3979",
+   "self_type" : "type-3978",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23793,8 +23796,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4006",
-   "self_type" : "type-4005",
+   "referenced_type" : "type-4012",
+   "self_type" : "type-4011",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23802,8 +23805,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4087",
-   "self_type" : "type-4086",
+   "referenced_type" : "type-4093",
+   "self_type" : "type-4092",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23811,8 +23814,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4287",
-   "self_type" : "type-4286",
+   "referenced_type" : "type-4293",
+   "self_type" : "type-4292",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23820,8 +23823,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4474",
-   "self_type" : "type-4473",
+   "referenced_type" : "type-4480",
+   "self_type" : "type-4479",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23829,8 +23832,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4527",
-   "self_type" : "type-4526",
+   "referenced_type" : "type-4533",
+   "self_type" : "type-4532",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23838,8 +23841,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4535",
-   "self_type" : "type-4534",
+   "referenced_type" : "type-4542",
+   "self_type" : "type-4541",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23847,8 +23850,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4561",
-   "self_type" : "type-4560",
+   "referenced_type" : "type-4567",
+   "self_type" : "type-4566",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23856,8 +23859,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4711",
-   "self_type" : "type-4710",
+   "referenced_type" : "type-4718",
+   "self_type" : "type-4717",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23865,8 +23868,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4842",
-   "self_type" : "type-4841",
+   "referenced_type" : "type-4848",
+   "self_type" : "type-4847",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23874,8 +23877,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4991",
-   "self_type" : "type-4990",
+   "referenced_type" : "type-4997",
+   "self_type" : "type-4996",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23883,8 +23886,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5106",
-   "self_type" : "type-5105",
+   "referenced_type" : "type-5122",
+   "self_type" : "type-5121",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23892,8 +23895,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5143",
-   "self_type" : "type-5142",
+   "referenced_type" : "type-5161",
+   "self_type" : "type-5160",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23910,8 +23913,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5520",
-   "self_type" : "type-5519",
+   "referenced_type" : "type-5537",
+   "self_type" : "type-5536",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23919,8 +23922,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5586",
-   "self_type" : "type-5585",
+   "referenced_type" : "type-5603",
+   "self_type" : "type-5602",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23928,8 +23931,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5688",
-   "self_type" : "type-5687",
+   "referenced_type" : "type-5705",
+   "self_type" : "type-5704",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23937,8 +23940,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5750",
-   "self_type" : "type-5749",
+   "referenced_type" : "type-5770",
+   "self_type" : "type-5769",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23946,8 +23949,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5842",
-   "self_type" : "type-5841",
+   "referenced_type" : "type-5862",
+   "self_type" : "type-5861",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23955,8 +23958,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5903",
-   "self_type" : "type-5902",
+   "referenced_type" : "type-5923",
+   "self_type" : "type-5922",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23964,8 +23967,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5965",
-   "self_type" : "type-5964",
+   "referenced_type" : "type-5985",
+   "self_type" : "type-5984",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23973,8 +23976,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6025",
-   "self_type" : "type-6024",
+   "referenced_type" : "type-6045",
+   "self_type" : "type-6044",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23982,8 +23985,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6121",
-   "self_type" : "type-6120",
+   "referenced_type" : "type-6141",
+   "self_type" : "type-6140",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23991,8 +23994,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6173",
-   "self_type" : "type-6172",
+   "referenced_type" : "type-6193",
+   "self_type" : "type-6192",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24000,8 +24003,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6262",
-   "self_type" : "type-6261",
+   "referenced_type" : "type-6282",
+   "self_type" : "type-6281",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24009,8 +24012,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6311",
-   "self_type" : "type-6310",
+   "referenced_type" : "type-6334",
+   "self_type" : "type-6333",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24018,8 +24021,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6391",
-   "self_type" : "type-6390",
+   "referenced_type" : "type-6414",
+   "self_type" : "type-6413",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24027,8 +24030,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6484",
-   "self_type" : "type-6483",
+   "referenced_type" : "type-6507",
+   "self_type" : "type-6506",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24036,8 +24039,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6510",
-   "self_type" : "type-6509",
+   "referenced_type" : "type-6533",
+   "self_type" : "type-6532",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24045,8 +24048,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6526",
-   "self_type" : "type-6525",
+   "referenced_type" : "type-6550",
+   "self_type" : "type-6549",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24054,8 +24057,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6548",
-   "self_type" : "type-6547",
+   "referenced_type" : "type-6571",
+   "self_type" : "type-6570",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24063,8 +24066,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6580",
-   "self_type" : "type-6579",
+   "referenced_type" : "type-6603",
+   "self_type" : "type-6602",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24072,8 +24075,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6658",
-   "self_type" : "type-6657",
+   "referenced_type" : "type-6683",
+   "self_type" : "type-6682",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24081,8 +24084,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6877",
-   "self_type" : "type-6876",
+   "referenced_type" : "type-6900",
+   "self_type" : "type-6899",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24090,8 +24093,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7061",
-   "self_type" : "type-7060",
+   "referenced_type" : "type-7085",
+   "self_type" : "type-7084",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24099,8 +24102,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7123",
-   "self_type" : "type-7122",
+   "referenced_type" : "type-7147",
+   "self_type" : "type-7146",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24108,8 +24111,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7138",
-   "self_type" : "type-7137",
+   "referenced_type" : "type-7162",
+   "self_type" : "type-7161",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24117,8 +24120,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7175",
-   "self_type" : "type-7174",
+   "referenced_type" : "type-7198",
+   "self_type" : "type-7197",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24126,8 +24129,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7324",
-   "self_type" : "type-7323",
+   "referenced_type" : "type-7348",
+   "self_type" : "type-7347",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24144,8 +24147,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7426",
-   "self_type" : "type-7425",
+   "referenced_type" : "type-7449",
+   "self_type" : "type-7448",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24153,8 +24156,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7461",
-   "self_type" : "type-7460",
+   "referenced_type" : "type-7486",
+   "self_type" : "type-7485",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24162,8 +24165,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7517",
-   "self_type" : "type-7516",
+   "referenced_type" : "type-7540",
+   "self_type" : "type-7539",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24171,8 +24174,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7577",
-   "self_type" : "type-7576",
+   "referenced_type" : "type-7592",
+   "self_type" : "type-7591",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24180,8 +24183,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7595",
-   "self_type" : "type-7594",
+   "referenced_type" : "type-7620",
+   "self_type" : "type-7619",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24189,8 +24192,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7658",
-   "self_type" : "type-7657",
+   "referenced_type" : "type-7682",
+   "self_type" : "type-7681",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24225,8 +24228,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ReferenceRenamer *",
    "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-1166",
-   "self_type" : "type-1212",
+   "referenced_type" : "type-1167",
+   "self_type" : "type-1211",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24234,8 +24237,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> > *",
    "name" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> > *",
-   "referenced_type" : "type-1563",
-   "self_type" : "type-1564",
+   "referenced_type" : "type-1568",
+   "self_type" : "type-1569",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24243,8 +24246,8 @@
    "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",
+   "referenced_type" : "type-1572",
+   "self_type" : "type-1573",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24252,132 +24255,6 @@
    "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,
@@ -24385,8 +24262,17 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long> > *",
-   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long> > *",
+   "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-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<android_dataspace_t> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<android_dataspace_t> > *",
    "referenced_type" : "type-2091",
    "self_type" : "type-2092",
    "size" : 4,
@@ -24394,116 +24280,125 @@
   },
   {
    "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-2111",
+   "self_type" : "type-2112",
+   "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-2097",
+   "self_type" : "type-2098",
+   "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-2116",
+   "self_type" : "type-2117",
+   "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-2086",
+   "self_type" : "type-2087",
+   "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-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<int *, const sp<GraphicBuffer> &> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int *, const sp<GraphicBuffer> &> > *",
+   "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, unsigned long long, const sp<Fence> &> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int, unsigned long long, const sp<Fence> &> > *",
+   "referenced_type" : "type-2064",
+   "self_type" : "type-2065",
+   "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-2055",
+   "self_type" : "type-2056",
+   "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-2107",
+   "self_type" : "type-2108",
+   "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-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<unsigned int> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned int> > *",
+   "referenced_type" : "type-2103",
+   "self_type" : "type-2104",
+   "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-2077",
+   "self_type" : "type-2078",
+   "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-2095",
+   "self_type" : "type-2096",
+   "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,
@@ -24511,17 +24406,62 @@
   },
   {
    "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",
+   "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-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<unsigned long long *> > *",
-   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long *> > *",
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<android_dataspace_t> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<android_dataspace_t> > *",
+   "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<bool, vector<Segment, allocator<Segment> > *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool, vector<Segment, allocator<Segment> > *> > *",
+   "referenced_type" : "type-2169",
+   "self_type" : "type-2170",
+   "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-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<const String8 &, String8 *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &, String8 *> > *",
+   "referenced_type" : "type-2171",
+   "self_type" : "type-2172",
+   "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-2155",
+   "self_type" : "type-2156",
+   "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-2147",
    "self_type" : "type-2148",
    "size" : 4,
@@ -24529,10 +24469,73 @@
   },
   {
    "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-2142",
+   "self_type" : "type-2143",
+   "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-2144",
+   "self_type" : "type-2145",
+   "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-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<sp<NativeHandle> *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<sp<NativeHandle> *> > *",
+   "referenced_type" : "type-2166",
+   "self_type" : "type-2167",
+   "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-2153",
+   "self_type" : "type-2154",
+   "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-2164",
+   "self_type" : "type-2165",
+   "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-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<unsigned long long> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long> > *",
-   "referenced_type" : "type-2156",
-   "self_type" : "type-2157",
+   "referenced_type" : "type-2160",
+   "self_type" : "type-2161",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24540,8 +24543,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::SafeBnInterface<android::IConsumerListener> *",
    "name" : "android::SafeBnInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-1287",
-   "self_type" : "type-1292",
+   "referenced_type" : "type-1290",
+   "self_type" : "type-1295",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24549,8 +24552,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
    "name" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-1276",
-   "self_type" : "type-1286",
+   "referenced_type" : "type-1279",
+   "self_type" : "type-1289",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24558,8 +24561,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::SafeBnInterface<android::ITransactionCompletedListener> *",
    "name" : "android::SafeBnInterface<android::ITransactionCompletedListener> *",
-   "referenced_type" : "type-1102",
-   "self_type" : "type-1105",
+   "referenced_type" : "type-1105",
+   "self_type" : "type-1108",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24567,8 +24570,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::SafeBpInterface<android::IConsumerListener> *",
    "name" : "android::SafeBpInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-1537",
-   "self_type" : "type-1539",
+   "referenced_type" : "type-1541",
+   "self_type" : "type-1543",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24576,8 +24579,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::SafeBpInterface<android::IGraphicBufferConsumer> *",
    "name" : "android::SafeBpInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-1716",
-   "self_type" : "type-1718",
+   "referenced_type" : "type-1720",
+   "self_type" : "type-1723",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24585,8 +24588,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::SafeInterface::ParcelHandler *",
    "name" : "android::SafeInterface::ParcelHandler *",
-   "referenced_type" : "type-1235",
-   "self_type" : "type-1245",
+   "referenced_type" : "type-1238",
+   "self_type" : "type-1247",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24604,7 +24607,7 @@
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > > *",
    "name" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > > *",
    "referenced_type" : "type-159",
-   "self_type" : "type-2674",
+   "self_type" : "type-2677",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -24613,7 +24616,7 @@
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > > *",
    "name" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > > *",
    "referenced_type" : "type-146",
-   "self_type" : "type-2669",
+   "self_type" : "type-2672",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -24622,7 +24625,7 @@
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
    "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
    "referenced_type" : "type-139",
-   "self_type" : "type-2666",
+   "self_type" : "type-2669",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -24630,8 +24633,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 *",
    "name" : "android::String16 *",
-   "referenced_type" : "type-1239",
-   "self_type" : "type-2661",
+   "referenced_type" : "type-1242",
+   "self_type" : "type-2664",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -24640,7 +24643,7 @@
    "linker_set_key" : "android::String8 *",
    "name" : "android::String8 *",
    "referenced_type" : "type-121",
-   "self_type" : "type-1885",
+   "self_type" : "type-1889",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -24648,8 +24651,8 @@
    "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",
+   "referenced_type" : "type-2470",
+   "self_type" : "type-2469",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24657,8 +24660,8 @@
    "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",
+   "referenced_type" : "type-4895",
+   "self_type" : "type-4894",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24666,8 +24669,8 @@
    "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",
+   "referenced_type" : "type-6003",
+   "self_type" : "type-6002",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24675,8 +24678,8 @@
    "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",
+   "referenced_type" : "type-7039",
+   "self_type" : "type-7038",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24694,7 +24697,7 @@
    "linker_set_key" : "android::Vector<android::BufferItem> *",
    "name" : "android::Vector<android::BufferItem> *",
    "referenced_type" : "type-837",
-   "self_type" : "type-976",
+   "self_type" : "type-978",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -24702,8 +24705,8 @@
    "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",
+   "referenced_type" : "type-1228",
+   "self_type" : "type-1230",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -24711,8 +24714,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<int> *",
    "name" : "android::Vector<int> *",
-   "referenced_type" : "type-2686",
-   "self_type" : "type-2687",
+   "referenced_type" : "type-2689",
+   "self_type" : "type-2690",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -24720,8 +24723,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<long long> *",
    "name" : "android::Vector<long long> *",
-   "referenced_type" : "type-1081",
-   "self_type" : "type-1082",
+   "referenced_type" : "type-1084",
+   "self_type" : "type-1085",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -24729,8 +24732,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::VirtualLightRefBase *",
    "name" : "android::VirtualLightRefBase *",
-   "referenced_type" : "type-2354",
-   "self_type" : "type-2392",
+   "referenced_type" : "type-2357",
+   "self_type" : "type-2395",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -24738,8 +24741,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::base::EagerEvaluator<char *, char *> *",
    "name" : "android::base::EagerEvaluator<char *, char *> *",
-   "referenced_type" : "type-4699",
-   "self_type" : "type-4701",
+   "referenced_type" : "type-4705",
+   "self_type" : "type-4708",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24747,8 +24750,8 @@
    "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",
+   "referenced_type" : "type-4702",
+   "self_type" : "type-4703",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24756,8 +24759,8 @@
    "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",
+   "referenced_type" : "type-4689",
+   "self_type" : "type-4692",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24765,8 +24768,8 @@
    "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",
+   "referenced_type" : "type-4672",
+   "self_type" : "type-4687",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24774,8 +24777,8 @@
    "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",
+   "referenced_type" : "type-4729",
+   "self_type" : "type-4735",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24783,8 +24786,8 @@
    "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",
+   "referenced_type" : "type-4736",
+   "self_type" : "type-4739",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24792,8 +24795,8 @@
    "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",
+   "referenced_type" : "type-4710",
+   "self_type" : "type-4712",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24801,8 +24804,8 @@
    "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",
+   "referenced_type" : "type-4713",
+   "self_type" : "type-4714",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24810,8 +24813,8 @@
    "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",
+   "referenced_type" : "type-4740",
+   "self_type" : "type-4746",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24819,8 +24822,8 @@
    "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",
+   "referenced_type" : "type-4747",
+   "self_type" : "type-4753",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24828,8 +24831,8 @@
    "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",
+   "referenced_type" : "type-4716",
+   "self_type" : "type-4721",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24837,8 +24840,8 @@
    "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",
+   "referenced_type" : "type-4722",
+   "self_type" : "type-4727",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24846,8 +24849,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::base::ErrnoRestorer *",
    "name" : "android::base::ErrnoRestorer *",
-   "referenced_type" : "type-4656",
-   "self_type" : "type-4822",
+   "referenced_type" : "type-4663",
+   "self_type" : "type-4828",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24855,8 +24858,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
    "name" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
-   "referenced_type" : "type-2553",
-   "self_type" : "type-2565",
+   "referenced_type" : "type-2556",
+   "self_type" : "type-2568",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -24873,8 +24876,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1362",
-   "self_type" : "type-1361",
+   "referenced_type" : "type-1365",
+   "self_type" : "type-1364",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24891,8 +24894,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1359",
-   "self_type" : "type-1358",
+   "referenced_type" : "type-1362",
+   "self_type" : "type-1361",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24900,8 +24903,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1377",
-   "self_type" : "type-1381",
+   "referenced_type" : "type-1380",
+   "self_type" : "type-1384",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -24909,8 +24912,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1396",
-   "self_type" : "type-1395",
+   "referenced_type" : "type-1399",
+   "self_type" : "type-1398",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24918,8 +24921,8 @@
    "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",
+   "referenced_type" : "type-7528",
+   "self_type" : "type-7531",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24927,24 +24930,6 @@
    "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,
@@ -24952,8 +24937,8 @@
   },
   {
    "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> > *",
+   "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-4494",
    "self_type" : "type-4495",
    "size" : 4,
@@ -24961,10 +24946,28 @@
   },
   {
    "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-4371",
+   "self_type" : "type-4372",
+   "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-4500",
+   "self_type" : "type-4501",
+   "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",
+   "referenced_type" : "type-4359",
+   "self_type" : "type-4360",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24981,8 +24984,8 @@
    "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",
+   "referenced_type" : "type-7534",
+   "self_type" : "type-7535",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -25045,7 +25048,7 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> > *",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> > *",
    "referenced_type" : "type-381",
-   "self_type" : "type-7621",
+   "self_type" : "type-7645",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -25054,7 +25057,7 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect> *",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect> *",
    "referenced_type" : "type-372",
-   "self_type" : "type-4595",
+   "self_type" : "type-4601",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -25063,7 +25066,7 @@
    "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",
+   "self_type" : "type-4352",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -25081,7 +25084,7 @@
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
    "referenced_type" : "type-595",
-   "self_type" : "type-2464",
+   "self_type" : "type-2467",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25098,8 +25101,8 @@
    "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",
+   "referenced_type" : "type-2459",
+   "self_type" : "type-2458",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25107,8 +25110,8 @@
    "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",
+   "referenced_type" : "type-4691",
+   "self_type" : "type-4690",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25116,8 +25119,8 @@
    "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",
+   "referenced_type" : "type-7331",
+   "self_type" : "type-7330",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25125,8 +25128,8 @@
    "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",
+   "referenced_type" : "type-4248",
+   "self_type" : "type-4247",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25134,8 +25137,8 @@
    "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",
+   "referenced_type" : "type-6862",
+   "self_type" : "type-6861",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25143,8 +25146,8 @@
    "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",
+   "referenced_type" : "type-4471",
+   "self_type" : "type-4470",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25152,8 +25155,8 @@
    "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",
+   "referenced_type" : "type-7076",
+   "self_type" : "type-7075",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25162,7 +25165,7 @@
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
    "referenced_type" : "type-677",
-   "self_type" : "type-2477",
+   "self_type" : "type-2480",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25171,7 +25174,7 @@
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
    "referenced_type" : "type-604",
-   "self_type" : "type-2471",
+   "self_type" : "type-2474",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25179,8 +25182,8 @@
    "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",
+   "referenced_type" : "type-2483",
+   "self_type" : "type-2482",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25188,8 +25191,8 @@
    "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",
+   "referenced_type" : "type-4903",
+   "self_type" : "type-4902",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25197,8 +25200,8 @@
    "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",
+   "referenced_type" : "type-6006",
+   "self_type" : "type-6005",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25206,8 +25209,8 @@
    "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",
+   "referenced_type" : "type-7093",
+   "self_type" : "type-7092",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25215,8 +25218,8 @@
    "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",
+   "referenced_type" : "type-7661",
+   "self_type" : "type-7660",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25224,8 +25227,8 @@
    "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",
+   "referenced_type" : "type-4242",
+   "self_type" : "type-4241",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25233,8 +25236,8 @@
    "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",
+   "referenced_type" : "type-6858",
+   "self_type" : "type-6857",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25242,8 +25245,8 @@
    "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",
+   "referenced_type" : "type-4463",
+   "self_type" : "type-4462",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25251,8 +25254,8 @@
    "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",
+   "referenced_type" : "type-7072",
+   "self_type" : "type-7071",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25260,8 +25263,8 @@
    "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",
+   "referenced_type" : "type-7519",
+   "self_type" : "type-7518",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25324,7 +25327,7 @@
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > *",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > *",
    "referenced_type" : "type-462",
-   "self_type" : "type-7668",
+   "self_type" : "type-7690",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -25333,7 +25336,7 @@
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::media::V1_0::Rect> *",
    "name" : "android::hardware::hidl_vec<android::hardware::media::V1_0::Rect> *",
    "referenced_type" : "type-453",
-   "self_type" : "type-4567",
+   "self_type" : "type-4573",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -25342,7 +25345,7 @@
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> *",
    "name" : "android::hardware::hidl_vec<unsigned char> *",
    "referenced_type" : "type-452",
-   "self_type" : "type-4374",
+   "self_type" : "type-4381",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -25369,7 +25372,7 @@
    "linker_set_key" : "android::hidl::base::V1_0::IBase *",
    "name" : "android::hidl::base::V1_0::IBase *",
    "referenced_type" : "type-530",
-   "self_type" : "type-2445",
+   "self_type" : "type-2448",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25378,7 +25381,7 @@
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "android::hidl::manager::V1_0::IServiceNotification *",
    "referenced_type" : "type-533",
-   "self_type" : "type-2449",
+   "self_type" : "type-2452",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25387,7 +25390,7 @@
    "linker_set_key" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
    "name" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
    "referenced_type" : "type-160",
-   "self_type" : "type-2623",
+   "self_type" : "type-2626",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -25396,7 +25399,7 @@
    "linker_set_key" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
    "name" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
    "referenced_type" : "type-147",
-   "self_type" : "type-2622",
+   "self_type" : "type-2625",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -25405,7 +25408,7 @@
    "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int> *",
    "name" : "android::key_value_pair_t<unsigned int, unsigned int> *",
    "referenced_type" : "type-143",
-   "self_type" : "type-2621",
+   "self_type" : "type-2624",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -25413,8 +25416,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::AHandler> *",
    "name" : "android::sp<android::AHandler> *",
-   "referenced_type" : "type-1188",
-   "self_type" : "type-1243",
+   "referenced_type" : "type-1191",
+   "self_type" : "type-1246",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25423,7 +25426,7 @@
    "linker_set_key" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
    "name" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
    "referenced_type" : "type-581",
-   "self_type" : "type-2511",
+   "self_type" : "type-2514",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25432,7 +25435,7 @@
    "linker_set_key" : "android::sp<android::ALooper> *",
    "name" : "android::sp<android::ALooper> *",
    "referenced_type" : "type-321",
-   "self_type" : "type-2244",
+   "self_type" : "type-2247",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25441,7 +25444,7 @@
    "linker_set_key" : "android::sp<android::AMessage> *",
    "name" : "android::sp<android::AMessage> *",
    "referenced_type" : "type-259",
-   "self_type" : "type-1956",
+   "self_type" : "type-1947",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25449,8 +25452,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::BpGraphicBufferProducer> *",
    "name" : "android::sp<android::BpGraphicBufferProducer> *",
-   "referenced_type" : "type-4228",
-   "self_type" : "type-4274",
+   "referenced_type" : "type-4234",
+   "self_type" : "type-4280",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25458,8 +25461,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::BpProducerListener> *",
    "name" : "android::sp<android::BpProducerListener> *",
-   "referenced_type" : "type-4454",
-   "self_type" : "type-4453",
+   "referenced_type" : "type-4460",
+   "self_type" : "type-4459",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25477,7 +25480,7 @@
    "linker_set_key" : "android::sp<android::ComponentWrapper> *",
    "name" : "android::sp<android::ComponentWrapper> *",
    "referenced_type" : "type-567",
-   "self_type" : "type-2488",
+   "self_type" : "type-2491",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25494,8 +25497,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::Fence> *",
    "name" : "android::sp<android::Fence> *",
-   "referenced_type" : "type-1864",
-   "self_type" : "type-2522",
+   "referenced_type" : "type-1868",
+   "self_type" : "type-2525",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25504,7 +25507,7 @@
    "linker_set_key" : "android::sp<android::FrameDropper> *",
    "name" : "android::sp<android::FrameDropper> *",
    "referenced_type" : "type-578",
-   "self_type" : "type-2504",
+   "self_type" : "type-2507",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25512,8 +25515,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::GLConsumer::EglImage> *",
    "name" : "android::sp<android::GLConsumer::EglImage> *",
-   "referenced_type" : "type-1173",
-   "self_type" : "type-1177",
+   "referenced_type" : "type-1176",
+   "self_type" : "type-1181",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25522,7 +25525,7 @@
    "linker_set_key" : "android::sp<android::GraphicBuffer> *",
    "name" : "android::sp<android::GraphicBuffer> *",
    "referenced_type" : "type-733",
-   "self_type" : "type-1194",
+   "self_type" : "type-1198",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25531,7 +25534,7 @@
    "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy> *",
    "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy> *",
    "referenced_type" : "type-473",
-   "self_type" : "type-2496",
+   "self_type" : "type-2499",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25539,8 +25542,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::GraphicBufferSource> *",
    "name" : "android::sp<android::GraphicBufferSource> *",
-   "referenced_type" : "type-2542",
-   "self_type" : "type-2541",
+   "referenced_type" : "type-2545",
+   "self_type" : "type-2544",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25548,8 +25551,8 @@
    "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",
+   "referenced_type" : "type-4265",
+   "self_type" : "type-4264",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25557,8 +25560,8 @@
    "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",
+   "referenced_type" : "type-4274",
+   "self_type" : "type-4273",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25566,8 +25569,8 @@
    "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",
+   "referenced_type" : "type-4833",
+   "self_type" : "type-4842",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25575,8 +25578,8 @@
    "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",
+   "referenced_type" : "type-5112",
+   "self_type" : "type-5117",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25585,7 +25588,7 @@
    "linker_set_key" : "android::sp<android::IBinder::DeathRecipient> *",
    "name" : "android::sp<android::IBinder::DeathRecipient> *",
    "referenced_type" : "type-843",
-   "self_type" : "type-1274",
+   "self_type" : "type-1278",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25594,7 +25597,7 @@
    "linker_set_key" : "android::sp<android::IBinder> *",
    "name" : "android::sp<android::IBinder> *",
    "referenced_type" : "type-795",
-   "self_type" : "type-1035",
+   "self_type" : "type-1039",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25603,7 +25606,7 @@
    "linker_set_key" : "android::sp<android::IConsumerListener> *",
    "name" : "android::sp<android::IConsumerListener> *",
    "referenced_type" : "type-939",
-   "self_type" : "type-2534",
+   "self_type" : "type-2537",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25612,7 +25615,7 @@
    "linker_set_key" : "android::sp<android::IGraphicBufferConsumer> *",
    "name" : "android::sp<android::IGraphicBufferConsumer> *",
    "referenced_type" : "type-574",
-   "self_type" : "type-2498",
+   "self_type" : "type-2501",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25621,7 +25624,7 @@
    "linker_set_key" : "android::sp<android::IGraphicBufferProducer> *",
    "name" : "android::sp<android::IGraphicBufferProducer> *",
    "referenced_type" : "type-570",
-   "self_type" : "type-2484",
+   "self_type" : "type-2487",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25639,7 +25642,7 @@
    "linker_set_key" : "android::sp<android::IProducerListener> *",
    "name" : "android::sp<android::IProducerListener> *",
    "referenced_type" : "type-957",
-   "self_type" : "type-2537",
+   "self_type" : "type-2540",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25647,8 +25650,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::ITransactionCompletedListener> *",
    "name" : "android::sp<android::ITransactionCompletedListener> *",
-   "referenced_type" : "type-1040",
-   "self_type" : "type-1045",
+   "referenced_type" : "type-1044",
+   "self_type" : "type-1048",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25657,7 +25660,7 @@
    "linker_set_key" : "android::sp<android::NativeHandle> *",
    "name" : "android::sp<android::NativeHandle> *",
    "referenced_type" : "type-932",
-   "self_type" : "type-1880",
+   "self_type" : "type-1884",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25665,8 +25668,8 @@
    "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",
+   "referenced_type" : "type-2466",
+   "self_type" : "type-2468",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25674,8 +25677,8 @@
    "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",
+   "referenced_type" : "type-2457",
+   "self_type" : "type-2460",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25683,8 +25686,8 @@
    "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",
+   "referenced_type" : "type-4246",
+   "self_type" : "type-4283",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25692,8 +25695,8 @@
    "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",
+   "referenced_type" : "type-4473",
+   "self_type" : "type-4472",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25701,8 +25704,8 @@
    "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",
+   "referenced_type" : "type-2479",
+   "self_type" : "type-2481",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25710,8 +25713,8 @@
    "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",
+   "referenced_type" : "type-2473",
+   "self_type" : "type-2476",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25719,8 +25722,8 @@
    "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",
+   "referenced_type" : "type-4240",
+   "self_type" : "type-4281",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25728,8 +25731,8 @@
    "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",
+   "referenced_type" : "type-4466",
+   "self_type" : "type-4465",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25738,7 +25741,7 @@
    "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",
+   "self_type" : "type-4395",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25746,8 +25749,8 @@
    "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",
+   "referenced_type" : "type-2447",
+   "self_type" : "type-4227",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25755,8 +25758,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "referenced_type" : "type-2448",
-   "self_type" : "type-2450",
+   "referenced_type" : "type-2451",
+   "self_type" : "type-2453",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25764,8 +25767,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<const android::AHandler> *",
    "name" : "android::sp<const android::AHandler> *",
-   "referenced_type" : "type-2516",
-   "self_type" : "type-2519",
+   "referenced_type" : "type-2519",
+   "self_type" : "type-2522",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25810,7 +25813,7 @@
    "linker_set_key" : "android::wp<android::IBinder::DeathRecipient> *",
    "name" : "android::wp<android::IBinder::DeathRecipient> *",
    "referenced_type" : "type-172",
-   "self_type" : "type-1244",
+   "self_type" : "type-1248",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -25819,7 +25822,7 @@
    "linker_set_key" : "android::wp<android::IBinder> *",
    "name" : "android::wp<android::IBinder> *",
    "referenced_type" : "type-130",
-   "self_type" : "type-4279",
+   "self_type" : "type-4285",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -25828,7 +25831,7 @@
    "linker_set_key" : "android_dataspace_t *",
    "name" : "android_dataspace_t *",
    "referenced_type" : "type-170",
-   "self_type" : "type-1667",
+   "self_type" : "type-1672",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -25845,8 +25848,8 @@
    "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",
+   "referenced_type" : "type-1249",
+   "self_type" : "type-1252",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h"
   },
@@ -25854,8 +25857,8 @@
    "alignment" : 4,
    "linker_set_key" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
    "name" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
-   "referenced_type" : "type-1387",
-   "self_type" : "type-1390",
+   "referenced_type" : "type-1390",
+   "self_type" : "type-1393",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -25864,7 +25867,7 @@
    "linker_set_key" : "bool *",
    "name" : "bool *",
    "referenced_type" : "type-93",
-   "self_type" : "type-1272",
+   "self_type" : "type-1274",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -25881,8 +25884,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AHandler *",
    "name" : "const android::AHandler *",
-   "referenced_type" : "type-2518",
-   "self_type" : "type-2517",
+   "referenced_type" : "type-2521",
+   "self_type" : "type-2520",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25890,8 +25893,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AHandlerReflector<android::GraphicBufferSource> *",
    "name" : "const android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-2514",
-   "self_type" : "type-2515",
+   "referenced_type" : "type-2517",
+   "self_type" : "type-2518",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25899,8 +25902,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ALooper *",
    "name" : "const android::ALooper *",
-   "referenced_type" : "type-2289",
-   "self_type" : "type-2301",
+   "referenced_type" : "type-2292",
+   "self_type" : "type-2304",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25908,8 +25911,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AReplyToken *",
    "name" : "const android::AReplyToken *",
-   "referenced_type" : "type-1167",
-   "self_type" : "type-1170",
+   "referenced_type" : "type-1168",
+   "self_type" : "type-1173",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -25917,8 +25920,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AString *",
    "name" : "const android::AString *",
-   "referenced_type" : "type-2110",
-   "self_type" : "type-2230",
+   "referenced_type" : "type-2101",
+   "self_type" : "type-2233",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -25944,8 +25947,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BnInterface<android::IGraphicBufferProducer> *",
    "name" : "const android::BnInterface<android::IGraphicBufferProducer> *",
-   "referenced_type" : "type-1232",
-   "self_type" : "type-1233",
+   "referenced_type" : "type-1236",
+   "self_type" : "type-1237",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -25953,8 +25956,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BnInterface<android::IProducerListener> *",
    "name" : "const android::BnInterface<android::IProducerListener> *",
-   "referenced_type" : "type-4477",
-   "self_type" : "type-4478",
+   "referenced_type" : "type-4483",
+   "self_type" : "type-4484",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -25962,8 +25965,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BnInterface<android::ITransactionCompletedListener> *",
    "name" : "const android::BnInterface<android::ITransactionCompletedListener> *",
-   "referenced_type" : "type-1093",
-   "self_type" : "type-1094",
+   "referenced_type" : "type-1096",
+   "self_type" : "type-1097",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -25980,8 +25983,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-1069",
-   "self_type" : "type-1071",
+   "referenced_type" : "type-1072",
+   "self_type" : "type-1074",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -25989,8 +25992,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-1219",
-   "self_type" : "type-1218",
+   "referenced_type" : "type-1223",
+   "self_type" : "type-1222",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -25998,8 +26001,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-3633",
-   "self_type" : "type-3632",
+   "referenced_type" : "type-3636",
+   "self_type" : "type-3635",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26007,8 +26010,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-3682",
-   "self_type" : "type-3684",
+   "referenced_type" : "type-3688",
+   "self_type" : "type-3690",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -26016,8 +26019,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-3791",
-   "self_type" : "type-3790",
+   "referenced_type" : "type-3798",
+   "self_type" : "type-3797",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26025,8 +26028,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-5694",
-   "self_type" : "type-5693",
+   "referenced_type" : "type-5711",
+   "self_type" : "type-5710",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26034,8 +26037,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-5743",
-   "self_type" : "type-5745",
+   "referenced_type" : "type-5763",
+   "self_type" : "type-5765",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -26043,8 +26046,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-5852",
-   "self_type" : "type-5851",
+   "referenced_type" : "type-5873",
+   "self_type" : "type-5872",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26052,8 +26055,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-6265",
-   "self_type" : "type-6264",
+   "referenced_type" : "type-6285",
+   "self_type" : "type-6284",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26061,8 +26064,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-6307",
-   "self_type" : "type-6309",
+   "referenced_type" : "type-6330",
+   "self_type" : "type-6332",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -26070,8 +26073,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-6398",
-   "self_type" : "type-6397",
+   "referenced_type" : "type-6421",
+   "self_type" : "type-6420",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26088,8 +26091,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferQueueCore *",
    "name" : "const android::BufferQueueCore *",
-   "referenced_type" : "type-3521",
-   "self_type" : "type-3523",
+   "referenced_type" : "type-3524",
+   "self_type" : "type-3526",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26097,8 +26100,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferQueueCore *",
    "name" : "const android::BufferQueueCore *",
-   "referenced_type" : "type-5582",
-   "self_type" : "type-5584",
+   "referenced_type" : "type-5599",
+   "self_type" : "type-5601",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26106,8 +26109,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferQueueCore *",
    "name" : "const android::BufferQueueCore *",
-   "referenced_type" : "type-6168",
-   "self_type" : "type-6170",
+   "referenced_type" : "type-6188",
+   "self_type" : "type-6190",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26124,8 +26127,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ComponentWrapper *",
    "name" : "const android::ComponentWrapper *",
-   "referenced_type" : "type-2494",
-   "self_type" : "type-2495",
+   "referenced_type" : "type-2497",
+   "self_type" : "type-2498",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26133,8 +26136,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ConsumerListener *",
    "name" : "const android::ConsumerListener *",
-   "referenced_type" : "type-3513",
-   "self_type" : "type-3515",
+   "referenced_type" : "type-3516",
+   "self_type" : "type-3518",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26142,8 +26145,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ConsumerListener *",
    "name" : "const android::ConsumerListener *",
-   "referenced_type" : "type-5574",
-   "self_type" : "type-5576",
+   "referenced_type" : "type-5591",
+   "self_type" : "type-5593",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26151,8 +26154,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ConsumerListener *",
    "name" : "const android::ConsumerListener *",
-   "referenced_type" : "type-6163",
-   "self_type" : "type-6165",
+   "referenced_type" : "type-6183",
+   "self_type" : "type-6185",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26169,8 +26172,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-1309",
-   "self_type" : "type-1315",
+   "referenced_type" : "type-1312",
+   "self_type" : "type-1316",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26178,8 +26181,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-2530",
-   "self_type" : "type-2532",
+   "referenced_type" : "type-2533",
+   "self_type" : "type-2535",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26187,8 +26190,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-3448",
-   "self_type" : "type-3450",
+   "referenced_type" : "type-3451",
+   "self_type" : "type-3453",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26196,8 +26199,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-3593",
-   "self_type" : "type-3595",
+   "referenced_type" : "type-3596",
+   "self_type" : "type-3598",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26205,8 +26208,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-3859",
-   "self_type" : "type-3865",
+   "referenced_type" : "type-3865",
+   "self_type" : "type-3869",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26214,8 +26217,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-4422",
-   "self_type" : "type-4430",
+   "referenced_type" : "type-4428",
+   "self_type" : "type-4432",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26223,8 +26226,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-4672",
-   "self_type" : "type-4674",
+   "referenced_type" : "type-4679",
+   "self_type" : "type-4681",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26232,8 +26235,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-4941",
-   "self_type" : "type-4943",
+   "referenced_type" : "type-4947",
+   "self_type" : "type-4949",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26241,8 +26244,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-5509",
-   "self_type" : "type-5511",
+   "referenced_type" : "type-5526",
+   "self_type" : "type-5528",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26250,8 +26253,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-5654",
-   "self_type" : "type-5656",
+   "referenced_type" : "type-5671",
+   "self_type" : "type-5673",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26259,8 +26262,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-5920",
-   "self_type" : "type-5926",
+   "referenced_type" : "type-5940",
+   "self_type" : "type-5944",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26268,8 +26271,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-6000",
-   "self_type" : "type-6002",
+   "referenced_type" : "type-6020",
+   "self_type" : "type-6022",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26277,8 +26280,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-6111",
-   "self_type" : "type-6114",
+   "referenced_type" : "type-6132",
+   "self_type" : "type-6134",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26286,8 +26289,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-6239",
-   "self_type" : "type-6241",
+   "referenced_type" : "type-6259",
+   "self_type" : "type-6261",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26295,8 +26298,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-6440",
-   "self_type" : "type-6446",
+   "referenced_type" : "type-6463",
+   "self_type" : "type-6467",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26304,8 +26307,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-7012",
-   "self_type" : "type-7021",
+   "referenced_type" : "type-7036",
+   "self_type" : "type-7042",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26313,8 +26316,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-7189",
-   "self_type" : "type-7195",
+   "referenced_type" : "type-7212",
+   "self_type" : "type-7214",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26331,8 +26334,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-7299",
-   "self_type" : "type-7301",
+   "referenced_type" : "type-7322",
+   "self_type" : "type-7324",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26350,7 +26353,7 @@
    "linker_set_key" : "const android::FileDescriptor::Autoclose *",
    "name" : "const android::FileDescriptor::Autoclose *",
    "referenced_type" : "type-1221",
-   "self_type" : "type-1230",
+   "self_type" : "type-1229",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h"
   },
@@ -26358,8 +26361,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Flattenable<android::BufferItem> *",
    "name" : "const android::Flattenable<android::BufferItem> *",
-   "referenced_type" : "type-1506",
-   "self_type" : "type-1507",
+   "referenced_type" : "type-1509",
+   "self_type" : "type-1510",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -26367,24 +26370,6 @@
    "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,
@@ -26392,17 +26377,8 @@
   },
   {
    "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> *",
+   "linker_set_key" : "const android::Flattenable<android::FrameEventHistoryDelta> *",
+   "name" : "const android::Flattenable<android::FrameEventHistoryDelta> *",
    "referenced_type" : "type-4312",
    "self_type" : "type-4313",
    "size" : 4,
@@ -26410,10 +26386,37 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::GraphicBuffer> *",
+   "name" : "const android::Flattenable<android::GraphicBuffer> *",
+   "referenced_type" : "type-1643",
+   "self_type" : "type-1644",
+   "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-4315",
+   "self_type" : "type-4316",
+   "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-4318",
+   "self_type" : "type-4319",
+   "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",
+   "referenced_type" : "type-2511",
+   "self_type" : "type-2513",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26421,8 +26424,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-1346",
-   "self_type" : "type-1348",
+   "referenced_type" : "type-1349",
+   "self_type" : "type-1351",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26430,8 +26433,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-1461",
-   "self_type" : "type-1463",
+   "referenced_type" : "type-1465",
+   "self_type" : "type-1467",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26439,8 +26442,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-2403",
-   "self_type" : "type-2425",
+   "referenced_type" : "type-2406",
+   "self_type" : "type-2428",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26448,8 +26451,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-3454",
-   "self_type" : "type-3456",
+   "referenced_type" : "type-3457",
+   "self_type" : "type-3459",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26457,8 +26460,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-3598",
-   "self_type" : "type-3600",
+   "referenced_type" : "type-3601",
+   "self_type" : "type-3603",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26466,8 +26469,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-3898",
-   "self_type" : "type-3900",
+   "referenced_type" : "type-3904",
+   "self_type" : "type-3906",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26475,8 +26478,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-3991",
-   "self_type" : "type-3993",
+   "referenced_type" : "type-3997",
+   "self_type" : "type-3999",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26484,8 +26487,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-4218",
-   "self_type" : "type-4220",
+   "referenced_type" : "type-4224",
+   "self_type" : "type-4226",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26493,8 +26496,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-4838",
-   "self_type" : "type-4870",
+   "referenced_type" : "type-4840",
+   "self_type" : "type-4876",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26502,8 +26505,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-5515",
-   "self_type" : "type-5517",
+   "referenced_type" : "type-5532",
+   "self_type" : "type-5534",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26511,8 +26514,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-5659",
-   "self_type" : "type-5661",
+   "referenced_type" : "type-5676",
+   "self_type" : "type-5678",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26520,16 +26523,7 @@
    "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",
+   "referenced_type" : "type-5979",
    "self_type" : "type-5981",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
@@ -26538,8 +26532,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-6117",
-   "self_type" : "type-6119",
+   "referenced_type" : "type-5996",
+   "self_type" : "type-6001",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26547,8 +26541,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-6244",
-   "self_type" : "type-6246",
+   "referenced_type" : "type-6137",
+   "self_type" : "type-6139",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26556,8 +26550,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-6477",
-   "self_type" : "type-6479",
+   "referenced_type" : "type-6264",
+   "self_type" : "type-6266",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26565,8 +26559,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-6565",
-   "self_type" : "type-6567",
+   "referenced_type" : "type-6500",
+   "self_type" : "type-6503",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26574,8 +26568,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-6809",
-   "self_type" : "type-6819",
+   "referenced_type" : "type-6588",
+   "self_type" : "type-6590",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26583,8 +26577,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-6820",
-   "self_type" : "type-6822",
+   "referenced_type" : "type-6832",
+   "self_type" : "type-6840",
+   "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-6843",
+   "self_type" : "type-6845",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26610,8 +26613,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBufferSource *",
    "name" : "const android::GraphicBufferSource *",
-   "referenced_type" : "type-2546",
-   "self_type" : "type-2547",
+   "referenced_type" : "type-2549",
+   "self_type" : "type-2550",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26619,8 +26622,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IBinder *",
    "name" : "const android::IBinder *",
-   "referenced_type" : "type-1520",
-   "self_type" : "type-1525",
+   "referenced_type" : "type-1524",
+   "self_type" : "type-1530",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26628,8 +26631,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IBinder::DeathRecipient *",
    "name" : "const android::IBinder::DeathRecipient *",
-   "referenced_type" : "type-4315",
-   "self_type" : "type-4316",
+   "referenced_type" : "type-4321",
+   "self_type" : "type-4322",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26637,8 +26640,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-1155",
-   "self_type" : "type-1157",
+   "referenced_type" : "type-1158",
+   "self_type" : "type-1160",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26646,8 +26649,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-1580",
-   "self_type" : "type-1582",
+   "referenced_type" : "type-1584",
+   "self_type" : "type-1586",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26655,8 +26658,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-3611",
-   "self_type" : "type-3613",
+   "referenced_type" : "type-3614",
+   "self_type" : "type-3616",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26664,8 +26667,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-3760",
-   "self_type" : "type-3762",
+   "referenced_type" : "type-3766",
+   "self_type" : "type-3768",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26673,8 +26676,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-4060",
-   "self_type" : "type-4062",
+   "referenced_type" : "type-4066",
+   "self_type" : "type-4068",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26682,8 +26685,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-5672",
-   "self_type" : "type-5674",
+   "referenced_type" : "type-5689",
+   "self_type" : "type-5691",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26691,8 +26694,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-5821",
-   "self_type" : "type-5823",
+   "referenced_type" : "type-5841",
+   "self_type" : "type-5843",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26700,8 +26703,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-6250",
-   "self_type" : "type-6252",
+   "referenced_type" : "type-6270",
+   "self_type" : "type-6272",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26709,8 +26712,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-6374",
-   "self_type" : "type-6376",
+   "referenced_type" : "type-6397",
+   "self_type" : "type-6399",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26718,8 +26721,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-6633",
-   "self_type" : "type-6635",
+   "referenced_type" : "type-6656",
+   "self_type" : "type-6658",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26736,8 +26739,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-1604",
-   "self_type" : "type-1606",
+   "referenced_type" : "type-1608",
+   "self_type" : "type-1610",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26745,8 +26748,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-2501",
-   "self_type" : "type-2503",
+   "referenced_type" : "type-2504",
+   "self_type" : "type-2506",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26754,8 +26757,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-3494",
-   "self_type" : "type-3496",
+   "referenced_type" : "type-3497",
+   "self_type" : "type-3499",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26763,8 +26766,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-4077",
-   "self_type" : "type-4079",
+   "referenced_type" : "type-4083",
+   "self_type" : "type-4085",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26772,8 +26775,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-4914",
-   "self_type" : "type-4916",
+   "referenced_type" : "type-4920",
+   "self_type" : "type-4922",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26781,8 +26784,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-5555",
-   "self_type" : "type-5557",
+   "referenced_type" : "type-5572",
+   "self_type" : "type-5574",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26790,8 +26793,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-5993",
-   "self_type" : "type-5995",
+   "referenced_type" : "type-6013",
+   "self_type" : "type-6015",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26799,8 +26802,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6149",
-   "self_type" : "type-6151",
+   "referenced_type" : "type-6169",
+   "self_type" : "type-6171",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26808,8 +26811,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6648",
-   "self_type" : "type-6650",
+   "referenced_type" : "type-6671",
+   "self_type" : "type-6673",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26817,8 +26820,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-7134",
-   "self_type" : "type-7136",
+   "referenced_type" : "type-7157",
+   "self_type" : "type-7159",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26835,8 +26838,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferProducer *",
    "name" : "const android::IGraphicBufferProducer *",
-   "referenced_type" : "type-3504",
-   "self_type" : "type-3506",
+   "referenced_type" : "type-3507",
+   "self_type" : "type-3509",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26844,8 +26847,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferProducer *",
    "name" : "const android::IGraphicBufferProducer *",
-   "referenced_type" : "type-4247",
-   "self_type" : "type-4249",
+   "referenced_type" : "type-4253",
+   "self_type" : "type-4255",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26853,8 +26856,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferProducer *",
    "name" : "const android::IGraphicBufferProducer *",
-   "referenced_type" : "type-5565",
-   "self_type" : "type-5567",
+   "referenced_type" : "type-5582",
+   "self_type" : "type-5584",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26862,8 +26865,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferProducer *",
    "name" : "const android::IGraphicBufferProducer *",
-   "referenced_type" : "type-6158",
-   "self_type" : "type-6160",
+   "referenced_type" : "type-6178",
+   "self_type" : "type-6180",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26871,8 +26874,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferProducer *",
    "name" : "const android::IGraphicBufferProducer *",
-   "referenced_type" : "type-6843",
-   "self_type" : "type-6845",
+   "referenced_type" : "type-6866",
+   "self_type" : "type-6868",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26889,8 +26892,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-1160",
-   "self_type" : "type-1162",
+   "referenced_type" : "type-1031",
+   "self_type" : "type-1033",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26898,8 +26901,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-3623",
-   "self_type" : "type-3625",
+   "referenced_type" : "type-1163",
+   "self_type" : "type-1165",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26907,8 +26910,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-3765",
-   "self_type" : "type-3767",
+   "referenced_type" : "type-3626",
+   "self_type" : "type-3628",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26916,8 +26919,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-4253",
-   "self_type" : "type-4255",
+   "referenced_type" : "type-3670",
+   "self_type" : "type-3672",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26925,8 +26928,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-4449",
-   "self_type" : "type-4448",
+   "referenced_type" : "type-3771",
+   "self_type" : "type-3773",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26934,8 +26937,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-4689",
-   "self_type" : "type-4691",
+   "referenced_type" : "type-4259",
+   "self_type" : "type-4261",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26943,8 +26946,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-5684",
-   "self_type" : "type-5686",
+   "referenced_type" : "type-4455",
+   "self_type" : "type-4454",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26952,8 +26955,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-5826",
-   "self_type" : "type-5828",
+   "referenced_type" : "type-4696",
+   "self_type" : "type-4698",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26961,8 +26964,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-6257",
-   "self_type" : "type-6259",
+   "referenced_type" : "type-5701",
+   "self_type" : "type-5703",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26970,8 +26973,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-6379",
-   "self_type" : "type-6381",
+   "referenced_type" : "type-5745",
+   "self_type" : "type-5747",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26979,8 +26982,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-6849",
-   "self_type" : "type-6851",
+   "referenced_type" : "type-5846",
+   "self_type" : "type-5848",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26988,8 +26991,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-7042",
-   "self_type" : "type-7041",
+   "referenced_type" : "type-6277",
+   "self_type" : "type-6279",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26997,8 +27000,44 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-7312",
-   "self_type" : "type-7314",
+   "referenced_type" : "type-6321",
+   "self_type" : "type-6323",
+   "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-6402",
+   "self_type" : "type-6404",
+   "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-6872",
+   "self_type" : "type-6874",
+   "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-7066",
+   "self_type" : "type-7065",
+   "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-7335",
+   "self_type" : "type-7337",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27033,8 +27072,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect> *",
    "name" : "const android::LightFlattenablePod<android::Rect> *",
-   "referenced_type" : "type-4587",
-   "self_type" : "type-4588",
+   "referenced_type" : "type-4593",
+   "self_type" : "type-4594",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -27051,8 +27090,8 @@
    "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",
+   "referenced_type" : "type-1233",
+   "self_type" : "type-1234",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -27060,8 +27099,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::LightRefBase<android::NativeHandle> *",
    "name" : "const android::LightRefBase<android::NativeHandle> *",
-   "referenced_type" : "type-2663",
-   "self_type" : "type-2672",
+   "referenced_type" : "type-2666",
+   "self_type" : "type-2675",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -27178,7 +27217,7 @@
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
    "referenced_type" : "type-118",
-   "self_type" : "type-1513",
+   "self_type" : "type-1517",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -27195,8 +27234,8 @@
    "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",
+   "referenced_type" : "type-1523",
+   "self_type" : "type-1525",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -27204,8 +27243,8 @@
    "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",
+   "referenced_type" : "type-1666",
+   "self_type" : "type-1667",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -27213,8 +27252,8 @@
    "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",
+   "referenced_type" : "type-4337",
+   "self_type" : "type-4338",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -27222,8 +27261,8 @@
    "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",
+   "referenced_type" : "type-1660",
+   "self_type" : "type-1661",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -27231,8 +27270,8 @@
    "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",
+   "referenced_type" : "type-4343",
+   "self_type" : "type-4344",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -27240,8 +27279,8 @@
    "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",
+   "referenced_type" : "type-4348",
+   "self_type" : "type-4349",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -27258,8 +27297,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1215",
-   "self_type" : "type-1214",
+   "referenced_type" : "type-1218",
+   "self_type" : "type-1217",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27267,8 +27306,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1490",
-   "self_type" : "type-1489",
+   "referenced_type" : "type-1493",
+   "self_type" : "type-1492",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27276,8 +27315,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1621",
-   "self_type" : "type-1620",
+   "referenced_type" : "type-1624",
+   "self_type" : "type-1623",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27285,8 +27324,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-2683",
-   "self_type" : "type-2682",
+   "referenced_type" : "type-2686",
+   "self_type" : "type-2685",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27294,8 +27333,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-3787",
-   "self_type" : "type-3786",
+   "referenced_type" : "type-3793",
+   "self_type" : "type-3792",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27303,8 +27342,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4011",
-   "self_type" : "type-4010",
+   "referenced_type" : "type-4017",
+   "self_type" : "type-4016",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27312,8 +27351,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4090",
-   "self_type" : "type-4089",
+   "referenced_type" : "type-4096",
+   "self_type" : "type-4095",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27321,8 +27360,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4292",
-   "self_type" : "type-4291",
+   "referenced_type" : "type-4298",
+   "self_type" : "type-4297",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27330,8 +27369,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4572",
-   "self_type" : "type-4571",
+   "referenced_type" : "type-4578",
+   "self_type" : "type-4577",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27339,8 +27378,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4736",
-   "self_type" : "type-4735",
+   "referenced_type" : "type-4743",
+   "self_type" : "type-4742",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27348,8 +27387,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-5019",
-   "self_type" : "type-5018",
+   "referenced_type" : "type-5025",
+   "self_type" : "type-5024",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27357,8 +27396,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-5063",
-   "self_type" : "type-5062",
+   "referenced_type" : "type-5080",
+   "self_type" : "type-5079",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27366,8 +27405,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-5848",
-   "self_type" : "type-5847",
+   "referenced_type" : "type-5868",
+   "self_type" : "type-5867",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27375,8 +27414,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-6030",
-   "self_type" : "type-6029",
+   "referenced_type" : "type-6050",
+   "self_type" : "type-6049",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27384,8 +27423,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-6394",
-   "self_type" : "type-6393",
+   "referenced_type" : "type-6417",
+   "self_type" : "type-6416",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27393,8 +27432,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-6584",
-   "self_type" : "type-6583",
+   "referenced_type" : "type-6608",
+   "self_type" : "type-6607",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27402,8 +27441,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-6663",
-   "self_type" : "type-6662",
+   "referenced_type" : "type-6686",
+   "self_type" : "type-6685",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27411,8 +27450,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-6881",
-   "self_type" : "type-6880",
+   "referenced_type" : "type-6905",
+   "self_type" : "type-6904",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27420,8 +27459,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-7192",
-   "self_type" : "type-7191",
+   "referenced_type" : "type-7216",
+   "self_type" : "type-7215",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27429,8 +27468,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-7339",
-   "self_type" : "type-7338",
+   "referenced_type" : "type-7362",
+   "self_type" : "type-7361",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27438,8 +27477,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-7565",
-   "self_type" : "type-7564",
+   "referenced_type" : "type-7588",
+   "self_type" : "type-7587",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27447,8 +27486,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-7666",
-   "self_type" : "type-7665",
+   "referenced_type" : "type-7685",
+   "self_type" : "type-7684",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27456,8 +27495,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::RefBase *",
    "name" : "const android::RefBase *",
-   "referenced_type" : "type-1449",
-   "self_type" : "type-1480",
+   "referenced_type" : "type-1452",
+   "self_type" : "type-1483",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27465,8 +27504,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SafeBpInterface<android::IConsumerListener> *",
    "name" : "const android::SafeBpInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-1551",
-   "self_type" : "type-1552",
+   "referenced_type" : "type-1554",
+   "self_type" : "type-1555",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -27474,8 +27513,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SafeBpInterface<android::IGraphicBufferConsumer> *",
    "name" : "const android::SafeBpInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-1886",
-   "self_type" : "type-1887",
+   "referenced_type" : "type-1890",
+   "self_type" : "type-1891",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -27483,8 +27522,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SafeInterface::ParcelHandler *",
    "name" : "const android::SafeInterface::ParcelHandler *",
-   "referenced_type" : "type-1256",
-   "self_type" : "type-1266",
+   "referenced_type" : "type-1254",
+   "self_type" : "type-1269",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -27492,8 +27531,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-2675",
-   "self_type" : "type-2676",
+   "referenced_type" : "type-2678",
+   "self_type" : "type-2679",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27501,8 +27540,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-2671",
-   "self_type" : "type-2673",
+   "referenced_type" : "type-2674",
+   "self_type" : "type-2676",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27510,8 +27549,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-2667",
-   "self_type" : "type-2668",
+   "referenced_type" : "type-2670",
+   "self_type" : "type-2671",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27519,8 +27558,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 *",
    "name" : "const android::String16 *",
-   "referenced_type" : "type-1248",
-   "self_type" : "type-2658",
+   "referenced_type" : "type-1251",
+   "self_type" : "type-2661",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -27528,8 +27567,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 *",
    "name" : "const android::String8 *",
-   "referenced_type" : "type-1875",
-   "self_type" : "type-2653",
+   "referenced_type" : "type-1879",
+   "self_type" : "type-2656",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -27537,8 +27576,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::BufferItem> *",
    "name" : "const android::Vector<android::BufferItem> *",
-   "referenced_type" : "type-977",
-   "self_type" : "type-978",
+   "referenced_type" : "type-979",
+   "self_type" : "type-980",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27546,8 +27585,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::Rect> *",
    "name" : "const android::Vector<android::Rect> *",
-   "referenced_type" : "type-2679",
-   "self_type" : "type-2680",
+   "referenced_type" : "type-2682",
+   "self_type" : "type-2683",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27555,8 +27594,8 @@
    "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",
+   "referenced_type" : "type-1231",
+   "self_type" : "type-1232",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27564,8 +27603,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<int> *",
    "name" : "const android::Vector<int> *",
-   "referenced_type" : "type-2688",
-   "self_type" : "type-2689",
+   "referenced_type" : "type-2691",
+   "self_type" : "type-2692",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27573,8 +27612,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<long long> *",
    "name" : "const android::Vector<long long> *",
-   "referenced_type" : "type-1083",
-   "self_type" : "type-1084",
+   "referenced_type" : "type-1086",
+   "self_type" : "type-1087",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27582,8 +27621,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::VectorImpl *",
    "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-2664",
-   "self_type" : "type-2665",
+   "referenced_type" : "type-2667",
+   "self_type" : "type-2668",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -27591,8 +27630,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::base::ErrnoRestorer *",
    "name" : "const android::base::ErrnoRestorer *",
-   "referenced_type" : "type-4655",
-   "self_type" : "type-4661",
+   "referenced_type" : "type-4662",
+   "self_type" : "type-4668",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27600,8 +27639,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser> *",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser> *",
-   "referenced_type" : "type-2580",
-   "self_type" : "type-2595",
+   "referenced_type" : "type-2583",
+   "self_type" : "type-2598",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -27618,8 +27657,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::BpHwRefBase *",
    "name" : "const android::hardware::BpHwRefBase *",
-   "referenced_type" : "type-1374",
-   "self_type" : "type-1375",
+   "referenced_type" : "type-1377",
+   "self_type" : "type-1378",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -27627,8 +27666,8 @@
    "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",
+   "referenced_type" : "type-7674",
+   "self_type" : "type-7676",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27636,24 +27675,6 @@
    "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,
@@ -27661,8 +27682,8 @@
   },
   {
    "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> > *",
+   "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-4498",
    "self_type" : "type-4499",
    "size" : 4,
@@ -27670,10 +27691,28 @@
   },
   {
    "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-4375",
+   "self_type" : "type-4376",
+   "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-4504",
+   "self_type" : "type-4505",
+   "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-4357",
-   "self_type" : "type-4358",
+   "referenced_type" : "type-4363",
+   "self_type" : "type-4364",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27681,8 +27720,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<int> *",
    "name" : "const android::hardware::Return<int> *",
-   "referenced_type" : "type-4698",
-   "self_type" : "type-4700",
+   "referenced_type" : "type-4704",
+   "self_type" : "type-4706",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27690,8 +27729,8 @@
    "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",
+   "referenced_type" : "type-7677",
+   "self_type" : "type-7678",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27753,8 +27792,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-4348",
-   "self_type" : "type-4349",
+   "referenced_type" : "type-4354",
+   "self_type" : "type-4355",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -27780,8 +27819,8 @@
    "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-2460",
-   "self_type" : "type-2461",
+   "referenced_type" : "type-2463",
+   "self_type" : "type-2464",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27807,8 +27846,8 @@
    "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",
+   "referenced_type" : "type-4732",
+   "self_type" : "type-4733",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -27870,8 +27909,8 @@
    "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",
+   "referenced_type" : "type-4386",
+   "self_type" : "type-4387",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -27906,8 +27945,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-2619",
-   "self_type" : "type-2627",
+   "referenced_type" : "type-2622",
+   "self_type" : "type-2630",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27915,8 +27954,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-2617",
-   "self_type" : "type-2626",
+   "referenced_type" : "type-2620",
+   "self_type" : "type-2629",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27924,8 +27963,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-2613",
-   "self_type" : "type-2625",
+   "referenced_type" : "type-2616",
+   "self_type" : "type-2628",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27933,8 +27972,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
    "name" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
-   "referenced_type" : "type-1304",
-   "self_type" : "type-2513",
+   "referenced_type" : "type-1301",
+   "self_type" : "type-2516",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27943,7 +27982,7 @@
    "linker_set_key" : "const android::sp<android::ALooper> *",
    "name" : "const android::sp<android::ALooper> *",
    "referenced_type" : "type-320",
-   "self_type" : "type-2277",
+   "self_type" : "type-2280",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27951,8 +27990,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::AMessage> *",
    "name" : "const android::sp<android::AMessage> *",
-   "referenced_type" : "type-2175",
-   "self_type" : "type-2203",
+   "referenced_type" : "type-2174",
+   "self_type" : "type-2206",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27969,8 +28008,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::ComponentWrapper> *",
    "name" : "const android::sp<android::ComponentWrapper> *",
-   "referenced_type" : "type-2491",
-   "self_type" : "type-2493",
+   "referenced_type" : "type-2494",
+   "self_type" : "type-2496",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27987,8 +28026,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::Fence> *",
    "name" : "const android::sp<android::Fence> *",
-   "referenced_type" : "type-1863",
-   "self_type" : "type-2529",
+   "referenced_type" : "type-1867",
+   "self_type" : "type-2532",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27996,8 +28035,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::FrameDropper> *",
    "name" : "const android::sp<android::FrameDropper> *",
-   "referenced_type" : "type-2506",
-   "self_type" : "type-2507",
+   "referenced_type" : "type-2509",
+   "self_type" : "type-2510",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28005,8 +28044,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::GraphicBuffer> *",
    "name" : "const android::sp<android::GraphicBuffer> *",
-   "referenced_type" : "type-1196",
-   "self_type" : "type-1195",
+   "referenced_type" : "type-1200",
+   "self_type" : "type-1199",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28014,8 +28053,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::GraphicBufferSource> *",
    "name" : "const android::sp<android::GraphicBufferSource> *",
-   "referenced_type" : "type-2544",
-   "self_type" : "type-2545",
+   "referenced_type" : "type-2547",
+   "self_type" : "type-2548",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28023,8 +28062,8 @@
    "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",
+   "referenced_type" : "type-4270",
+   "self_type" : "type-4269",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28032,8 +28071,8 @@
    "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",
+   "referenced_type" : "type-4279",
+   "self_type" : "type-4278",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28041,8 +28080,8 @@
    "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",
+   "referenced_type" : "type-4832",
+   "self_type" : "type-4845",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28050,8 +28089,8 @@
    "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",
+   "referenced_type" : "type-5111",
+   "self_type" : "type-5120",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28059,8 +28098,8 @@
    "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",
+   "referenced_type" : "type-4306",
+   "self_type" : "type-4390",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28068,8 +28107,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IBinder> *",
    "name" : "const android::sp<android::IBinder> *",
-   "referenced_type" : "type-1036",
-   "self_type" : "type-1273",
+   "referenced_type" : "type-1040",
+   "self_type" : "type-1277",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28087,7 +28126,7 @@
    "linker_set_key" : "const android::sp<android::IGraphicBufferConsumer> *",
    "name" : "const android::sp<android::IGraphicBufferConsumer> *",
    "referenced_type" : "type-789",
-   "self_type" : "type-2500",
+   "self_type" : "type-2503",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28095,8 +28134,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer> *",
    "name" : "const android::sp<android::IGraphicBufferProducer> *",
-   "referenced_type" : "type-2485",
-   "self_type" : "type-2487",
+   "referenced_type" : "type-2488",
+   "self_type" : "type-2490",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28104,8 +28143,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IInterface> *",
    "name" : "const android::sp<android::IInterface> *",
-   "referenced_type" : "type-1487",
-   "self_type" : "type-1493",
+   "referenced_type" : "type-1491",
+   "self_type" : "type-1497",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28123,7 +28162,7 @@
    "linker_set_key" : "const android::sp<android::NativeHandle> *",
    "name" : "const android::sp<android::NativeHandle> *",
    "referenced_type" : "type-934",
-   "self_type" : "type-1597",
+   "self_type" : "type-1601",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28131,8 +28170,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-2468",
-   "self_type" : "type-2469",
+   "referenced_type" : "type-2471",
+   "self_type" : "type-2472",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28140,8 +28179,8 @@
    "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-2458",
-   "self_type" : "type-2459",
+   "referenced_type" : "type-2461",
+   "self_type" : "type-2462",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28149,8 +28188,8 @@
    "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",
+   "referenced_type" : "type-4245",
+   "self_type" : "type-4284",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28158,8 +28197,8 @@
    "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",
+   "referenced_type" : "type-4476",
+   "self_type" : "type-4475",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28167,8 +28206,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-2482",
-   "self_type" : "type-2483",
+   "referenced_type" : "type-2485",
+   "self_type" : "type-2486",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28176,8 +28215,8 @@
    "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-2475",
+   "referenced_type" : "type-2477",
+   "self_type" : "type-2478",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28185,8 +28224,8 @@
    "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",
+   "referenced_type" : "type-4239",
+   "self_type" : "type-4282",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28194,8 +28233,8 @@
    "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",
+   "referenced_type" : "type-4469",
+   "self_type" : "type-4468",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28204,7 +28243,7 @@
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient> *",
    "name" : "const android::sp<android::hardware::hidl_death_recipient> *",
    "referenced_type" : "type-513",
-   "self_type" : "type-2442",
+   "self_type" : "type-2445",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28212,8 +28251,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-2446",
-   "self_type" : "type-2447",
+   "referenced_type" : "type-2449",
+   "self_type" : "type-2450",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28221,8 +28260,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "referenced_type" : "type-2451",
-   "self_type" : "type-2453",
+   "referenced_type" : "type-2454",
+   "self_type" : "type-2456",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28257,8 +28296,8 @@
    "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",
+   "referenced_type" : "type-4296",
+   "self_type" : "type-4311",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28275,8 +28314,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-1241",
-   "self_type" : "type-1240",
+   "referenced_type" : "type-1244",
+   "self_type" : "type-1243",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -28302,8 +28341,8 @@
    "alignment" : 4,
    "linker_set_key" : "const log_msg *",
    "name" : "const log_msg *",
-   "referenced_type" : "type-2313",
-   "self_type" : "type-2320",
+   "referenced_type" : "type-2316",
+   "self_type" : "type-2323",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -28312,7 +28351,7 @@
    "linker_set_key" : "const long long *",
    "name" : "const long long *",
    "referenced_type" : "type-560",
-   "self_type" : "type-1068",
+   "self_type" : "type-1071",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28330,7 +28369,7 @@
    "linker_set_key" : "const signed char *",
    "name" : "const signed char *",
    "referenced_type" : "type-437",
-   "self_type" : "type-4723",
+   "self_type" : "type-4730",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28338,8 +28377,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-4759",
-   "self_type" : "type-4761",
+   "referenced_type" : "type-4766",
+   "self_type" : "type-4768",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28347,8 +28386,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-4863",
-   "self_type" : "type-4865",
+   "referenced_type" : "type-4869",
+   "self_type" : "type-4871",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28356,8 +28395,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-5070",
-   "self_type" : "type-5076",
+   "referenced_type" : "type-5086",
+   "self_type" : "type-5092",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28365,8 +28404,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-5123",
-   "self_type" : "type-5125",
+   "referenced_type" : "type-5139",
+   "self_type" : "type-5141",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28374,8 +28413,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-7357",
-   "self_type" : "type-7359",
+   "referenced_type" : "type-7380",
+   "self_type" : "type-7382",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28383,8 +28422,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-7450",
-   "self_type" : "type-7452",
+   "referenced_type" : "type-7475",
+   "self_type" : "type-7477",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28392,8 +28431,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-7578",
-   "self_type" : "type-7580",
+   "referenced_type" : "type-7602",
+   "self_type" : "type-7604",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28438,7 +28477,7 @@
    "linker_set_key" : "float *",
    "name" : "float *",
    "referenced_type" : "type-268",
-   "self_type" : "type-1275",
+   "self_type" : "type-1276",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28456,7 +28495,7 @@
    "linker_set_key" : "int *",
    "name" : "int *",
    "referenced_type" : "type-4",
-   "self_type" : "type-1509",
+   "self_type" : "type-1512",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28464,8 +28503,8 @@
    "alignment" : 4,
    "linker_set_key" : "log_msg *",
    "name" : "log_msg *",
-   "referenced_type" : "type-2177",
-   "self_type" : "type-2342",
+   "referenced_type" : "type-2180",
+   "self_type" : "type-2345",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -28492,7 +28531,7 @@
    "linker_set_key" : "signed char *",
    "name" : "signed char *",
    "referenced_type" : "type-438",
-   "self_type" : "type-4731",
+   "self_type" : "type-4737",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28500,8 +28539,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::tuple<> *",
    "name" : "std::tuple<> *",
-   "referenced_type" : "type-1566",
-   "self_type" : "type-1565",
+   "referenced_type" : "type-1571",
+   "self_type" : "type-1570",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28509,429 +28548,6 @@
    "alignment" : 4,
    "linker_set_key" : "std::tuple<> *",
    "name" : "std::tuple<> *",
-   "referenced_type" : "type-2072",
-   "self_type" : "type-2071",
-   "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-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,
@@ -28939,10 +28555,415 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "std::tuple<unsigned long long> *",
-   "name" : "std::tuple<unsigned long long> *",
-   "referenced_type" : "type-4162",
-   "self_type" : "type-4161",
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-4056",
+   "self_type" : "type-4055",
+   "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-4166",
+   "self_type" : "type-4165",
+   "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-6647",
+   "self_type" : "type-6646",
+   "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-6769",
+   "self_type" : "type-6768",
+   "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-2054",
+   "self_type" : "type-2053",
+   "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-4150",
+   "self_type" : "type-4149",
+   "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-6753",
+   "self_type" : "type-6752",
+   "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-1575",
+   "self_type" : "type-1574",
+   "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-4059",
+   "self_type" : "type-4058",
+   "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-6650",
+   "self_type" : "type-6649",
+   "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-2119",
+   "self_type" : "type-2118",
+   "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-4195",
+   "self_type" : "type-4194",
+   "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-6799",
+   "self_type" : "type-6798",
+   "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-2089",
+   "self_type" : "type-2088",
+   "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-4175",
+   "self_type" : "type-4174",
+   "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-6778",
+   "self_type" : "type-6777",
+   "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-2094",
+   "self_type" : "type-2093",
+   "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-4178",
+   "self_type" : "type-4177",
+   "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-6781",
+   "self_type" : "type-6780",
+   "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-2115",
+   "self_type" : "type-2114",
+   "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-4192",
+   "self_type" : "type-4191",
+   "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-6796",
+   "self_type" : "type-6795",
+   "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-2100",
+   "self_type" : "type-2099",
+   "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-4182",
+   "self_type" : "type-4181",
+   "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-6786",
+   "self_type" : "type-6785",
+   "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-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, sp<GraphicBuffer> > *",
+   "name" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "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<int, sp<GraphicBuffer> > *",
+   "name" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "referenced_type" : "type-6759",
+   "self_type" : "type-6758",
+   "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-2067",
+   "self_type" : "type-2066",
+   "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-4159",
+   "self_type" : "type-4158",
+   "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-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> *",
+   "name" : "std::tuple<int> *",
+   "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> *",
+   "name" : "std::tuple<int> *",
+   "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> *",
+   "name" : "std::tuple<int> *",
+   "referenced_type" : "type-6756",
+   "self_type" : "type-6755",
+   "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-2072",
+   "self_type" : "type-2071",
+   "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-4163",
+   "self_type" : "type-4162",
+   "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-6765",
+   "self_type" : "type-6764",
+   "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-2110",
+   "self_type" : "type-2109",
+   "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-4189",
+   "self_type" : "type-4188",
+   "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-6793",
+   "self_type" : "type-6792",
+   "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-2085",
+   "self_type" : "type-2084",
+   "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-4172",
+   "self_type" : "type-4171",
+   "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-6775",
+   "self_type" : "type-6774",
+   "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-2106",
+   "self_type" : "type-2105",
+   "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-4186",
+   "self_type" : "type-4185",
+   "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-6789",
+   "self_type" : "type-6788",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28950,8 +28971,26 @@
    "alignment" : 4,
    "linker_set_key" : "std::tuple<unsigned long long> *",
    "name" : "std::tuple<unsigned long long> *",
-   "referenced_type" : "type-6748",
-   "self_type" : "type-6747",
+   "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 long long> *",
+   "name" : "std::tuple<unsigned long long> *",
+   "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<unsigned long long> *",
+   "name" : "std::tuple<unsigned long long> *",
+   "referenced_type" : "type-6772",
+   "self_type" : "type-6771",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28959,8 +28998,8 @@
    "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",
+   "referenced_type" : "type-1653",
+   "self_type" : "type-1652",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -28968,8 +29007,8 @@
    "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",
+   "referenced_type" : "type-4117",
+   "self_type" : "type-4116",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -28977,8 +29016,8 @@
    "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",
+   "referenced_type" : "type-6706",
+   "self_type" : "type-6705",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -28987,7 +29026,7 @@
    "linker_set_key" : "unsigned char (*)[128]",
    "name" : "unsigned char (*)[128]",
    "referenced_type" : "type-1527",
-   "self_type" : "type-2360",
+   "self_type" : "type-2363",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -29005,7 +29044,7 @@
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
    "referenced_type" : "type-2",
-   "self_type" : "type-1680",
+   "self_type" : "type-1684",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -29031,8 +29070,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
    "name" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
-   "referenced_type" : "type-1380",
-   "self_type" : "type-1379",
+   "referenced_type" : "type-1383",
+   "self_type" : "type-1382",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -29072,8 +29111,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1078",
-   "self_type" : "type-1080",
+   "referenced_type" : "type-1081",
+   "self_type" : "type-1083",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29082,8 +29121,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1190",
-   "self_type" : "type-1192",
+   "referenced_type" : "type-1193",
+   "self_type" : "type-1196",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29092,8 +29131,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1351",
-   "self_type" : "type-1353",
+   "referenced_type" : "type-1354",
+   "self_type" : "type-1356",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29102,8 +29141,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1403",
-   "self_type" : "type-1405",
+   "referenced_type" : "type-1406",
+   "self_type" : "type-1408",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29112,8 +29151,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1419",
-   "self_type" : "type-1421",
+   "referenced_type" : "type-1422",
+   "self_type" : "type-1424",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29122,8 +29161,8 @@
    "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",
+   "referenced_type" : "type-1443",
+   "self_type" : "type-1445",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29132,8 +29171,8 @@
    "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",
+   "referenced_type" : "type-1485",
+   "self_type" : "type-1487",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29142,8 +29181,8 @@
    "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",
+   "referenced_type" : "type-1619",
+   "self_type" : "type-1622",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29152,8 +29191,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2648",
-   "self_type" : "type-2651",
+   "referenced_type" : "type-2651",
+   "self_type" : "type-2654",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29162,8 +29201,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",
+   "referenced_type" : "type-3461",
+   "self_type" : "type-3463",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29172,8 +29211,8 @@
    "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",
+   "referenced_type" : "type-3527",
+   "self_type" : "type-3529",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29182,8 +29221,8 @@
    "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",
+   "referenced_type" : "type-3629",
+   "self_type" : "type-3631",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29192,8 +29231,8 @@
    "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",
+   "referenced_type" : "type-3694",
+   "self_type" : "type-3696",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29202,8 +29241,8 @@
    "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",
+   "referenced_type" : "type-3786",
+   "self_type" : "type-3788",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29212,8 +29251,8 @@
    "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",
+   "referenced_type" : "type-3847",
+   "self_type" : "type-3846",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29222,8 +29261,8 @@
    "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",
+   "referenced_type" : "type-3911",
+   "self_type" : "type-3913",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29232,8 +29271,8 @@
    "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",
+   "referenced_type" : "type-3937",
+   "self_type" : "type-3939",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29242,8 +29281,8 @@
    "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",
+   "referenced_type" : "type-3953",
+   "self_type" : "type-3955",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29252,8 +29291,8 @@
    "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",
+   "referenced_type" : "type-3978",
+   "self_type" : "type-3980",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29262,8 +29301,8 @@
    "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",
+   "referenced_type" : "type-4011",
+   "self_type" : "type-4013",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29272,8 +29311,8 @@
    "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",
+   "referenced_type" : "type-4092",
+   "self_type" : "type-4094",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29282,8 +29321,8 @@
    "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",
+   "referenced_type" : "type-4292",
+   "self_type" : "type-4294",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29292,8 +29331,8 @@
    "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",
+   "referenced_type" : "type-4479",
+   "self_type" : "type-4481",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29302,8 +29341,8 @@
    "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",
+   "referenced_type" : "type-4532",
+   "self_type" : "type-4534",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29312,8 +29351,8 @@
    "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",
+   "referenced_type" : "type-4541",
+   "self_type" : "type-4543",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29322,8 +29361,8 @@
    "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",
+   "referenced_type" : "type-4566",
+   "self_type" : "type-4568",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29332,8 +29371,8 @@
    "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",
+   "referenced_type" : "type-4717",
+   "self_type" : "type-4720",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29342,8 +29381,8 @@
    "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",
+   "referenced_type" : "type-4847",
+   "self_type" : "type-4849",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29352,8 +29391,8 @@
    "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",
+   "referenced_type" : "type-4996",
+   "self_type" : "type-4998",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29362,8 +29401,8 @@
    "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",
+   "referenced_type" : "type-5121",
+   "self_type" : "type-5123",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29372,8 +29411,8 @@
    "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",
+   "referenced_type" : "type-5160",
+   "self_type" : "type-5162",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29392,8 +29431,8 @@
    "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",
+   "referenced_type" : "type-5536",
+   "self_type" : "type-5538",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29402,8 +29441,8 @@
    "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",
+   "referenced_type" : "type-5602",
+   "self_type" : "type-5604",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29412,8 +29451,8 @@
    "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",
+   "referenced_type" : "type-5704",
+   "self_type" : "type-5706",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29422,8 +29461,8 @@
    "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",
+   "referenced_type" : "type-5769",
+   "self_type" : "type-5771",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29432,8 +29471,8 @@
    "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",
+   "referenced_type" : "type-5861",
+   "self_type" : "type-5863",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29442,8 +29481,8 @@
    "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",
+   "referenced_type" : "type-5922",
+   "self_type" : "type-5921",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29452,8 +29491,8 @@
    "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",
+   "referenced_type" : "type-5984",
+   "self_type" : "type-5986",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29462,8 +29501,8 @@
    "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",
+   "referenced_type" : "type-6044",
+   "self_type" : "type-6046",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29472,8 +29511,8 @@
    "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",
+   "referenced_type" : "type-6140",
+   "self_type" : "type-6142",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29482,8 +29521,8 @@
    "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",
+   "referenced_type" : "type-6192",
+   "self_type" : "type-6194",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29492,8 +29531,8 @@
    "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",
+   "referenced_type" : "type-6281",
+   "self_type" : "type-6283",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29502,8 +29541,8 @@
    "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",
+   "referenced_type" : "type-6333",
+   "self_type" : "type-6335",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29512,8 +29551,8 @@
    "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",
+   "referenced_type" : "type-6413",
+   "self_type" : "type-6415",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29522,8 +29561,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-6483",
-   "self_type" : "type-6485",
+   "referenced_type" : "type-6506",
+   "self_type" : "type-6508",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29532,8 +29571,8 @@
    "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",
+   "referenced_type" : "type-6532",
+   "self_type" : "type-6534",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29542,8 +29581,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",
+   "referenced_type" : "type-6549",
+   "self_type" : "type-6551",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29552,8 +29591,8 @@
    "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",
+   "referenced_type" : "type-6570",
+   "self_type" : "type-6572",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29562,8 +29601,8 @@
    "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",
+   "referenced_type" : "type-6602",
+   "self_type" : "type-6604",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29572,8 +29611,8 @@
    "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",
+   "referenced_type" : "type-6682",
+   "self_type" : "type-6684",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29582,8 +29621,8 @@
    "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",
+   "referenced_type" : "type-6899",
+   "self_type" : "type-6901",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29592,8 +29631,8 @@
    "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",
+   "referenced_type" : "type-7084",
+   "self_type" : "type-7086",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29602,8 +29641,8 @@
    "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",
+   "referenced_type" : "type-7146",
+   "self_type" : "type-7149",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29612,8 +29651,8 @@
    "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",
+   "referenced_type" : "type-7161",
+   "self_type" : "type-7164",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29622,8 +29661,8 @@
    "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",
+   "referenced_type" : "type-7197",
+   "self_type" : "type-7199",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29632,8 +29671,8 @@
    "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",
+   "referenced_type" : "type-7347",
+   "self_type" : "type-7349",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29652,8 +29691,8 @@
    "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",
+   "referenced_type" : "type-7448",
+   "self_type" : "type-7450",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29662,8 +29701,8 @@
    "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",
+   "referenced_type" : "type-7485",
+   "self_type" : "type-7487",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29672,8 +29711,8 @@
    "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",
+   "referenced_type" : "type-7539",
+   "self_type" : "type-7541",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29682,8 +29721,8 @@
    "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",
+   "referenced_type" : "type-7591",
+   "self_type" : "type-7601",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29692,8 +29731,8 @@
    "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",
+   "referenced_type" : "type-7619",
+   "self_type" : "type-7621",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29702,8 +29741,8 @@
    "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",
+   "referenced_type" : "type-7681",
+   "self_type" : "type-7683",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29732,8 +29771,8 @@
    "is_const" : true,
    "linker_set_key" : "android::hardware::IBinder *const",
    "name" : "android::hardware::IBinder *const",
-   "referenced_type" : "type-1358",
-   "self_type" : "type-1372",
+   "referenced_type" : "type-1361",
+   "self_type" : "type-1375",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -29743,7 +29782,7 @@
    "linker_set_key" : "const android::AHandler",
    "name" : "const android::AHandler",
    "referenced_type" : "type-264",
-   "self_type" : "type-2518",
+   "self_type" : "type-2521",
    "size" : 48,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29753,7 +29792,7 @@
    "linker_set_key" : "const android::AHandlerReflector<android::GraphicBufferSource>",
    "name" : "const android::AHandlerReflector<android::GraphicBufferSource>",
    "referenced_type" : "type-583",
-   "self_type" : "type-2514",
+   "self_type" : "type-2517",
    "size" : 56,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29763,7 +29802,7 @@
    "linker_set_key" : "const android::ALooper",
    "name" : "const android::ALooper",
    "referenced_type" : "type-248",
-   "self_type" : "type-2289",
+   "self_type" : "type-2292",
    "size" : 52,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29772,8 +29811,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AReplyToken",
    "name" : "const android::AReplyToken",
-   "referenced_type" : "type-1044",
-   "self_type" : "type-1167",
+   "referenced_type" : "type-1043",
+   "self_type" : "type-1168",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -29783,7 +29822,7 @@
    "linker_set_key" : "const android::AString",
    "name" : "const android::AString",
    "referenced_type" : "type-253",
-   "self_type" : "type-2110",
+   "self_type" : "type-2101",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -29813,7 +29852,7 @@
    "linker_set_key" : "const android::BnInterface<android::IGraphicBufferProducer>",
    "name" : "const android::BnInterface<android::IGraphicBufferProducer>",
    "referenced_type" : "type-71",
-   "self_type" : "type-1232",
+   "self_type" : "type-1236",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -29823,7 +29862,7 @@
    "linker_set_key" : "const android::BnInterface<android::IProducerListener>",
    "name" : "const android::BnInterface<android::IProducerListener>",
    "referenced_type" : "type-80",
-   "self_type" : "type-4477",
+   "self_type" : "type-4483",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -29832,8 +29871,8 @@
    "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",
+   "referenced_type" : "type-1034",
+   "self_type" : "type-1096",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -29852,8 +29891,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-1070",
-   "self_type" : "type-1069",
+   "referenced_type" : "type-1073",
+   "self_type" : "type-1072",
    "size" : 164,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -29862,8 +29901,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-1220",
-   "self_type" : "type-1219",
+   "referenced_type" : "type-1224",
+   "self_type" : "type-1223",
    "size" : 164,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -29872,8 +29911,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-1531",
-   "self_type" : "type-1530",
+   "referenced_type" : "type-1534",
+   "self_type" : "type-1533",
    "size" : 164,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -29882,8 +29921,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-1672",
-   "self_type" : "type-1671",
+   "referenced_type" : "type-1676",
+   "self_type" : "type-1675",
    "size" : 164,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -29892,8 +29931,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-3442",
-   "self_type" : "type-3441",
+   "referenced_type" : "type-3445",
+   "self_type" : "type-3444",
    "size" : 164,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -29902,8 +29941,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-3634",
-   "self_type" : "type-3633",
+   "referenced_type" : "type-3637",
+   "self_type" : "type-3636",
    "size" : 164,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -29912,8 +29951,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-3683",
-   "self_type" : "type-3682",
+   "referenced_type" : "type-3689",
+   "self_type" : "type-3688",
    "size" : 164,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -29922,8 +29961,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-3792",
-   "self_type" : "type-3791",
+   "referenced_type" : "type-3799",
+   "self_type" : "type-3798",
    "size" : 164,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -29932,8 +29971,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-4041",
-   "self_type" : "type-4040",
+   "referenced_type" : "type-4048",
+   "self_type" : "type-4047",
    "size" : 164,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -29942,8 +29981,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-4127",
-   "self_type" : "type-4126",
+   "referenced_type" : "type-4133",
+   "self_type" : "type-4132",
    "size" : 164,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -29952,8 +29991,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-5503",
-   "self_type" : "type-5502",
+   "referenced_type" : "type-5520",
+   "self_type" : "type-5519",
    "size" : 164,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -29962,8 +30001,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-5695",
-   "self_type" : "type-5694",
+   "referenced_type" : "type-5712",
+   "self_type" : "type-5711",
    "size" : 164,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -29972,8 +30011,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-5744",
-   "self_type" : "type-5743",
+   "referenced_type" : "type-5764",
+   "self_type" : "type-5763",
    "size" : 164,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -29982,8 +30021,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-5853",
-   "self_type" : "type-5852",
+   "referenced_type" : "type-5874",
+   "self_type" : "type-5873",
    "size" : 164,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -29992,8 +30031,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-6107",
-   "self_type" : "type-6106",
+   "referenced_type" : "type-6127",
+   "self_type" : "type-6126",
    "size" : 164,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -30002,8 +30041,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-6266",
-   "self_type" : "type-6265",
+   "referenced_type" : "type-6286",
+   "self_type" : "type-6285",
    "size" : 164,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30012,8 +30051,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-6308",
-   "self_type" : "type-6307",
+   "referenced_type" : "type-6331",
+   "self_type" : "type-6330",
    "size" : 164,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -30022,8 +30061,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-6399",
-   "self_type" : "type-6398",
+   "referenced_type" : "type-6422",
+   "self_type" : "type-6421",
    "size" : 164,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30032,8 +30071,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-6617",
-   "self_type" : "type-6616",
+   "referenced_type" : "type-6640",
+   "self_type" : "type-6639",
    "size" : 164,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -30042,8 +30081,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-6699",
-   "self_type" : "type-6698",
+   "referenced_type" : "type-6722",
+   "self_type" : "type-6721",
    "size" : 164,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -30072,9 +30111,9 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferQueueCore",
    "name" : "const android::BufferQueueCore",
-   "referenced_type" : "type-3522",
-   "self_type" : "type-3521",
-   "size" : 3392,
+   "referenced_type" : "type-3525",
+   "self_type" : "type-3524",
+   "size" : 3396,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -30082,9 +30121,9 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferQueueCore",
    "name" : "const android::BufferQueueCore",
-   "referenced_type" : "type-5583",
-   "self_type" : "type-5582",
-   "size" : 3392,
+   "referenced_type" : "type-5600",
+   "self_type" : "type-5599",
+   "size" : 3396,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -30092,9 +30131,9 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferQueueCore",
    "name" : "const android::BufferQueueCore",
-   "referenced_type" : "type-6169",
-   "self_type" : "type-6168",
-   "size" : 3392,
+   "referenced_type" : "type-6189",
+   "self_type" : "type-6188",
+   "size" : 3396,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -30104,7 +30143,7 @@
    "name" : "const android::BufferQueueCore",
    "referenced_type" : "type-832",
    "self_type" : "type-831",
-   "size" : 3392,
+   "size" : 3396,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -30113,7 +30152,7 @@
    "linker_set_key" : "const android::ComponentWrapper",
    "name" : "const android::ComponentWrapper",
    "referenced_type" : "type-569",
-   "self_type" : "type-2494",
+   "self_type" : "type-2497",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30122,8 +30161,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::CompositorTiming",
    "name" : "const android::CompositorTiming",
-   "referenced_type" : "type-1425",
-   "self_type" : "type-1424",
+   "referenced_type" : "type-1428",
+   "self_type" : "type-1427",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30132,8 +30171,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::CompositorTiming",
    "name" : "const android::CompositorTiming",
-   "referenced_type" : "type-3953",
-   "self_type" : "type-3952",
+   "referenced_type" : "type-3961",
+   "self_type" : "type-3960",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30142,8 +30181,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::CompositorTiming",
    "name" : "const android::CompositorTiming",
-   "referenced_type" : "type-6532",
-   "self_type" : "type-6531",
+   "referenced_type" : "type-6555",
+   "self_type" : "type-6554",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30152,8 +30191,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ConsumerListener",
    "name" : "const android::ConsumerListener",
-   "referenced_type" : "type-3514",
-   "self_type" : "type-3513",
+   "referenced_type" : "type-3517",
+   "self_type" : "type-3516",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30162,8 +30201,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ConsumerListener",
    "name" : "const android::ConsumerListener",
-   "referenced_type" : "type-5575",
-   "self_type" : "type-5574",
+   "referenced_type" : "type-5592",
+   "self_type" : "type-5591",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30172,8 +30211,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ConsumerListener",
    "name" : "const android::ConsumerListener",
-   "referenced_type" : "type-6164",
-   "self_type" : "type-6163",
+   "referenced_type" : "type-6184",
+   "self_type" : "type-6183",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30192,8 +30231,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-1310",
-   "self_type" : "type-1309",
+   "referenced_type" : "type-1313",
+   "self_type" : "type-1312",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30202,8 +30241,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-2531",
-   "self_type" : "type-2530",
+   "referenced_type" : "type-2534",
+   "self_type" : "type-2533",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30212,8 +30251,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-3449",
-   "self_type" : "type-3448",
+   "referenced_type" : "type-3452",
+   "self_type" : "type-3451",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30222,8 +30261,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-3594",
-   "self_type" : "type-3593",
+   "referenced_type" : "type-3597",
+   "self_type" : "type-3596",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30232,8 +30271,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-3860",
-   "self_type" : "type-3859",
+   "referenced_type" : "type-3866",
+   "self_type" : "type-3865",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30242,8 +30281,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-4423",
-   "self_type" : "type-4422",
+   "referenced_type" : "type-4429",
+   "self_type" : "type-4428",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30252,8 +30291,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-4673",
-   "self_type" : "type-4672",
+   "referenced_type" : "type-4680",
+   "self_type" : "type-4679",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30262,8 +30301,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-4942",
-   "self_type" : "type-4941",
+   "referenced_type" : "type-4948",
+   "self_type" : "type-4947",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30272,8 +30311,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-5510",
-   "self_type" : "type-5509",
+   "referenced_type" : "type-5527",
+   "self_type" : "type-5526",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30282,8 +30321,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-5655",
-   "self_type" : "type-5654",
+   "referenced_type" : "type-5672",
+   "self_type" : "type-5671",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30292,8 +30331,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-5921",
-   "self_type" : "type-5920",
+   "referenced_type" : "type-5941",
+   "self_type" : "type-5940",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30302,8 +30341,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-6001",
-   "self_type" : "type-6000",
+   "referenced_type" : "type-6021",
+   "self_type" : "type-6020",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30312,8 +30351,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-6112",
-   "self_type" : "type-6111",
+   "referenced_type" : "type-6133",
+   "self_type" : "type-6132",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30322,8 +30361,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-6240",
-   "self_type" : "type-6239",
+   "referenced_type" : "type-6260",
+   "self_type" : "type-6259",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30332,8 +30371,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-6441",
-   "self_type" : "type-6440",
+   "referenced_type" : "type-6464",
+   "self_type" : "type-6463",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30342,8 +30381,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-7013",
-   "self_type" : "type-7012",
+   "referenced_type" : "type-7037",
+   "self_type" : "type-7036",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30352,8 +30391,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-7190",
-   "self_type" : "type-7189",
+   "referenced_type" : "type-7213",
+   "self_type" : "type-7212",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30372,8 +30411,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-7300",
-   "self_type" : "type-7299",
+   "referenced_type" : "type-7323",
+   "self_type" : "type-7322",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30392,8 +30431,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot::State",
    "name" : "const android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-4580",
-   "self_type" : "type-4579",
+   "referenced_type" : "type-4586",
+   "self_type" : "type-4585",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30402,8 +30441,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot::State",
    "name" : "const android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-4748",
-   "self_type" : "type-4747",
+   "referenced_type" : "type-4755",
+   "self_type" : "type-4754",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30412,8 +30451,8 @@
    "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",
+   "referenced_type" : "type-7226",
+   "self_type" : "type-7225",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30422,8 +30461,8 @@
    "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",
+   "referenced_type" : "type-7372",
+   "self_type" : "type-7371",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30432,7 +30471,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::FileDescriptor::Autoclose",
    "name" : "const android::FileDescriptor::Autoclose",
-   "referenced_type" : "type-1204",
+   "referenced_type" : "type-1203",
    "self_type" : "type-1221",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h"
@@ -30443,7 +30482,7 @@
    "linker_set_key" : "const android::Flattenable<android::BufferItem>",
    "name" : "const android::Flattenable<android::BufferItem>",
    "referenced_type" : "type-21",
-   "self_type" : "type-1506",
+   "self_type" : "type-1509",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30453,7 +30492,7 @@
    "linker_set_key" : "const android::Flattenable<android::Fence>",
    "name" : "const android::Flattenable<android::Fence>",
    "referenced_type" : "type-16",
-   "self_type" : "type-1634",
+   "self_type" : "type-1638",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30463,7 +30502,7 @@
    "linker_set_key" : "const android::Flattenable<android::FrameEventHistoryDelta>",
    "name" : "const android::Flattenable<android::FrameEventHistoryDelta>",
    "referenced_type" : "type-25",
-   "self_type" : "type-4306",
+   "self_type" : "type-4312",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30473,7 +30512,7 @@
    "linker_set_key" : "const android::Flattenable<android::GraphicBuffer>",
    "name" : "const android::Flattenable<android::GraphicBuffer>",
    "referenced_type" : "type-14",
-   "self_type" : "type-1638",
+   "self_type" : "type-1643",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30483,7 +30522,7 @@
    "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
    "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
    "referenced_type" : "type-32",
-   "self_type" : "type-4309",
+   "self_type" : "type-4315",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30493,7 +30532,7 @@
    "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
    "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
    "referenced_type" : "type-34",
-   "self_type" : "type-4312",
+   "self_type" : "type-4318",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30503,7 +30542,7 @@
    "linker_set_key" : "const android::FrameDropper",
    "name" : "const android::FrameDropper",
    "referenced_type" : "type-580",
-   "self_type" : "type-2508",
+   "self_type" : "type-2511",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30512,8 +30551,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-1347",
-   "self_type" : "type-1346",
+   "referenced_type" : "type-1350",
+   "self_type" : "type-1349",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30522,8 +30561,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-1462",
-   "self_type" : "type-1461",
+   "referenced_type" : "type-1466",
+   "self_type" : "type-1465",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30532,8 +30571,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-2404",
-   "self_type" : "type-2403",
+   "referenced_type" : "type-2407",
+   "self_type" : "type-2406",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30542,8 +30581,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-3455",
-   "self_type" : "type-3454",
+   "referenced_type" : "type-3458",
+   "self_type" : "type-3457",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30552,8 +30591,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-3599",
-   "self_type" : "type-3598",
+   "referenced_type" : "type-3602",
+   "self_type" : "type-3601",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30562,8 +30601,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-3899",
-   "self_type" : "type-3898",
+   "referenced_type" : "type-3905",
+   "self_type" : "type-3904",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30572,8 +30611,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-3992",
-   "self_type" : "type-3991",
+   "referenced_type" : "type-3998",
+   "self_type" : "type-3997",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30582,8 +30621,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-4219",
-   "self_type" : "type-4218",
+   "referenced_type" : "type-4225",
+   "self_type" : "type-4224",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30592,8 +30631,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-4839",
-   "self_type" : "type-4838",
+   "referenced_type" : "type-4841",
+   "self_type" : "type-4840",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30602,8 +30641,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-5516",
-   "self_type" : "type-5515",
+   "referenced_type" : "type-5533",
+   "self_type" : "type-5532",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30612,8 +30651,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-5660",
-   "self_type" : "type-5659",
+   "referenced_type" : "type-5677",
+   "self_type" : "type-5676",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30622,8 +30661,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-5960",
-   "self_type" : "type-5959",
+   "referenced_type" : "type-5980",
+   "self_type" : "type-5979",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30632,8 +30671,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-5977",
-   "self_type" : "type-5976",
+   "referenced_type" : "type-5997",
+   "self_type" : "type-5996",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30642,8 +30681,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-6118",
-   "self_type" : "type-6117",
+   "referenced_type" : "type-6138",
+   "self_type" : "type-6137",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30652,8 +30691,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-6245",
-   "self_type" : "type-6244",
+   "referenced_type" : "type-6265",
+   "self_type" : "type-6264",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30662,8 +30701,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-6478",
-   "self_type" : "type-6477",
+   "referenced_type" : "type-6501",
+   "self_type" : "type-6500",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30672,8 +30711,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-6566",
-   "self_type" : "type-6565",
+   "referenced_type" : "type-6589",
+   "self_type" : "type-6588",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30682,8 +30721,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-6810",
-   "self_type" : "type-6809",
+   "referenced_type" : "type-6833",
+   "self_type" : "type-6832",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30692,8 +30731,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-6821",
-   "self_type" : "type-6820",
+   "referenced_type" : "type-6844",
+   "self_type" : "type-6843",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30723,7 +30762,7 @@
    "linker_set_key" : "const android::GraphicBufferSource",
    "name" : "const android::GraphicBufferSource",
    "referenced_type" : "type-566",
-   "self_type" : "type-2546",
+   "self_type" : "type-2549",
    "size" : 268,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30753,7 +30792,7 @@
    "linker_set_key" : "const android::IBinder",
    "name" : "const android::IBinder",
    "referenced_type" : "type-51",
-   "self_type" : "type-1520",
+   "self_type" : "type-1524",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30763,7 +30802,7 @@
    "linker_set_key" : "const android::IBinder::DeathRecipient",
    "name" : "const android::IBinder::DeathRecipient",
    "referenced_type" : "type-174",
-   "self_type" : "type-4315",
+   "self_type" : "type-4321",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -30772,8 +30811,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-1156",
-   "self_type" : "type-1155",
+   "referenced_type" : "type-1159",
+   "self_type" : "type-1158",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30782,8 +30821,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-1581",
-   "self_type" : "type-1580",
+   "referenced_type" : "type-1585",
+   "self_type" : "type-1584",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30792,8 +30831,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-3612",
-   "self_type" : "type-3611",
+   "referenced_type" : "type-3615",
+   "self_type" : "type-3614",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30802,8 +30841,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-3761",
-   "self_type" : "type-3760",
+   "referenced_type" : "type-3767",
+   "self_type" : "type-3766",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30812,8 +30851,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-4061",
-   "self_type" : "type-4060",
+   "referenced_type" : "type-4067",
+   "self_type" : "type-4066",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30822,8 +30861,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-5673",
-   "self_type" : "type-5672",
+   "referenced_type" : "type-5690",
+   "self_type" : "type-5689",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30832,8 +30871,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-5822",
-   "self_type" : "type-5821",
+   "referenced_type" : "type-5842",
+   "self_type" : "type-5841",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30842,8 +30881,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-6251",
-   "self_type" : "type-6250",
+   "referenced_type" : "type-6271",
+   "self_type" : "type-6270",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30852,8 +30891,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-6375",
-   "self_type" : "type-6374",
+   "referenced_type" : "type-6398",
+   "self_type" : "type-6397",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30862,8 +30901,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-6634",
-   "self_type" : "type-6633",
+   "referenced_type" : "type-6657",
+   "self_type" : "type-6656",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30882,8 +30921,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-1605",
-   "self_type" : "type-1604",
+   "referenced_type" : "type-1609",
+   "self_type" : "type-1608",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30892,8 +30931,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-2502",
-   "self_type" : "type-2501",
+   "referenced_type" : "type-2505",
+   "self_type" : "type-2504",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30902,8 +30941,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-3495",
-   "self_type" : "type-3494",
+   "referenced_type" : "type-3498",
+   "self_type" : "type-3497",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30912,8 +30951,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-4078",
-   "self_type" : "type-4077",
+   "referenced_type" : "type-4084",
+   "self_type" : "type-4083",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30922,8 +30961,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-4915",
-   "self_type" : "type-4914",
+   "referenced_type" : "type-4921",
+   "self_type" : "type-4920",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30932,8 +30971,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-5556",
-   "self_type" : "type-5555",
+   "referenced_type" : "type-5573",
+   "self_type" : "type-5572",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30942,8 +30981,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-5994",
-   "self_type" : "type-5993",
+   "referenced_type" : "type-6014",
+   "self_type" : "type-6013",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30952,8 +30991,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-6150",
-   "self_type" : "type-6149",
+   "referenced_type" : "type-6170",
+   "self_type" : "type-6169",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30962,8 +31001,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-6649",
-   "self_type" : "type-6648",
+   "referenced_type" : "type-6672",
+   "self_type" : "type-6671",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30972,8 +31011,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-7135",
-   "self_type" : "type-7134",
+   "referenced_type" : "type-7158",
+   "self_type" : "type-7157",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30992,8 +31031,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferProducer",
    "name" : "const android::IGraphicBufferProducer",
-   "referenced_type" : "type-3505",
-   "self_type" : "type-3504",
+   "referenced_type" : "type-3508",
+   "self_type" : "type-3507",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31002,8 +31041,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferProducer",
    "name" : "const android::IGraphicBufferProducer",
-   "referenced_type" : "type-4248",
-   "self_type" : "type-4247",
+   "referenced_type" : "type-4254",
+   "self_type" : "type-4253",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31012,8 +31051,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferProducer",
    "name" : "const android::IGraphicBufferProducer",
-   "referenced_type" : "type-5566",
-   "self_type" : "type-5565",
+   "referenced_type" : "type-5583",
+   "self_type" : "type-5582",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31022,8 +31061,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferProducer",
    "name" : "const android::IGraphicBufferProducer",
-   "referenced_type" : "type-6159",
-   "self_type" : "type-6158",
+   "referenced_type" : "type-6179",
+   "self_type" : "type-6178",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31032,8 +31071,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferProducer",
    "name" : "const android::IGraphicBufferProducer",
-   "referenced_type" : "type-6844",
-   "self_type" : "type-6843",
+   "referenced_type" : "type-6867",
+   "self_type" : "type-6866",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31052,8 +31091,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-1161",
-   "self_type" : "type-1160",
+   "referenced_type" : "type-1032",
+   "self_type" : "type-1031",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31062,8 +31101,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-3624",
-   "self_type" : "type-3623",
+   "referenced_type" : "type-1164",
+   "self_type" : "type-1163",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31072,8 +31111,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-3766",
-   "self_type" : "type-3765",
+   "referenced_type" : "type-3627",
+   "self_type" : "type-3626",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31082,8 +31121,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-4254",
-   "self_type" : "type-4253",
+   "referenced_type" : "type-3671",
+   "self_type" : "type-3670",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31092,8 +31131,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-4450",
-   "self_type" : "type-4449",
+   "referenced_type" : "type-3772",
+   "self_type" : "type-3771",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31102,8 +31141,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-4690",
-   "self_type" : "type-4689",
+   "referenced_type" : "type-4260",
+   "self_type" : "type-4259",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31112,8 +31151,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-5685",
-   "self_type" : "type-5684",
+   "referenced_type" : "type-4456",
+   "self_type" : "type-4455",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31122,8 +31161,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-5827",
-   "self_type" : "type-5826",
+   "referenced_type" : "type-4697",
+   "self_type" : "type-4696",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31132,8 +31171,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-6258",
-   "self_type" : "type-6257",
+   "referenced_type" : "type-5702",
+   "self_type" : "type-5701",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31142,8 +31181,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-6380",
-   "self_type" : "type-6379",
+   "referenced_type" : "type-5746",
+   "self_type" : "type-5745",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31152,8 +31191,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-6850",
-   "self_type" : "type-6849",
+   "referenced_type" : "type-5847",
+   "self_type" : "type-5846",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31162,8 +31201,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-7043",
-   "self_type" : "type-7042",
+   "referenced_type" : "type-6278",
+   "self_type" : "type-6277",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31172,8 +31211,48 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-7313",
-   "self_type" : "type-7312",
+   "referenced_type" : "type-6322",
+   "self_type" : "type-6321",
+   "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-6403",
+   "self_type" : "type-6402",
+   "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-6873",
+   "self_type" : "type-6872",
+   "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-7067",
+   "self_type" : "type-7066",
+   "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-7336",
+   "self_type" : "type-7335",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31213,7 +31292,7 @@
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect>",
    "name" : "const android::LightFlattenablePod<android::Rect>",
    "referenced_type" : "type-46",
-   "self_type" : "type-4587",
+   "self_type" : "type-4593",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -31232,8 +31311,8 @@
    "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",
+   "referenced_type" : "type-1214",
+   "self_type" : "type-1233",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -31243,7 +31322,7 @@
    "linker_set_key" : "const android::LightRefBase<android::NativeHandle>",
    "name" : "const android::LightRefBase<android::NativeHandle>",
    "referenced_type" : "type-521",
-   "self_type" : "type-2663",
+   "self_type" : "type-2666",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -31392,8 +31471,8 @@
    "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",
+   "referenced_type" : "type-1520",
+   "self_type" : "type-1523",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -31402,8 +31481,8 @@
    "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",
+   "referenced_type" : "type-1662",
+   "self_type" : "type-1666",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -31412,8 +31491,8 @@
    "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",
+   "referenced_type" : "type-4334",
+   "self_type" : "type-4337",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -31422,8 +31501,8 @@
    "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",
+   "referenced_type" : "type-1657",
+   "self_type" : "type-1660",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -31432,8 +31511,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-4333",
-   "self_type" : "type-4336",
+   "referenced_type" : "type-4339",
+   "self_type" : "type-4343",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -31442,8 +31521,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-4338",
-   "self_type" : "type-4341",
+   "referenced_type" : "type-4345",
+   "self_type" : "type-4348",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -31472,8 +31551,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-1216",
-   "self_type" : "type-1215",
+   "referenced_type" : "type-1219",
+   "self_type" : "type-1218",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31482,8 +31561,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-1491",
-   "self_type" : "type-1490",
+   "referenced_type" : "type-1494",
+   "self_type" : "type-1493",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31492,8 +31571,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-1622",
-   "self_type" : "type-1621",
+   "referenced_type" : "type-1625",
+   "self_type" : "type-1624",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31502,8 +31581,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-2684",
-   "self_type" : "type-2683",
+   "referenced_type" : "type-2687",
+   "self_type" : "type-2686",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31512,8 +31591,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-3467",
-   "self_type" : "type-3466",
+   "referenced_type" : "type-3470",
+   "self_type" : "type-3469",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -31522,8 +31601,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-3788",
-   "self_type" : "type-3787",
+   "referenced_type" : "type-3794",
+   "self_type" : "type-3793",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31532,8 +31611,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4012",
-   "self_type" : "type-4011",
+   "referenced_type" : "type-4018",
+   "self_type" : "type-4017",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31542,8 +31621,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4091",
-   "self_type" : "type-4090",
+   "referenced_type" : "type-4097",
+   "self_type" : "type-4096",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31552,8 +31631,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4293",
-   "self_type" : "type-4292",
+   "referenced_type" : "type-4299",
+   "self_type" : "type-4298",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31562,8 +31641,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4573",
-   "self_type" : "type-4572",
+   "referenced_type" : "type-4579",
+   "self_type" : "type-4578",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31572,8 +31651,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4737",
-   "self_type" : "type-4736",
+   "referenced_type" : "type-4744",
+   "self_type" : "type-4743",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31582,8 +31661,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-5020",
-   "self_type" : "type-5019",
+   "referenced_type" : "type-5026",
+   "self_type" : "type-5025",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31592,8 +31671,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-5064",
-   "self_type" : "type-5063",
+   "referenced_type" : "type-5081",
+   "self_type" : "type-5080",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31602,8 +31681,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-5528",
-   "self_type" : "type-5527",
+   "referenced_type" : "type-5545",
+   "self_type" : "type-5544",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -31612,8 +31691,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-5849",
-   "self_type" : "type-5848",
+   "referenced_type" : "type-5869",
+   "self_type" : "type-5868",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31622,8 +31701,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-6031",
-   "self_type" : "type-6030",
+   "referenced_type" : "type-6051",
+   "self_type" : "type-6050",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31632,8 +31711,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-6130",
-   "self_type" : "type-6129",
+   "referenced_type" : "type-6150",
+   "self_type" : "type-6149",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -31642,8 +31721,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-6395",
-   "self_type" : "type-6394",
+   "referenced_type" : "type-6418",
+   "self_type" : "type-6417",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31652,8 +31731,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-6585",
-   "self_type" : "type-6584",
+   "referenced_type" : "type-6609",
+   "self_type" : "type-6608",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31662,8 +31741,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-6664",
-   "self_type" : "type-6663",
+   "referenced_type" : "type-6687",
+   "self_type" : "type-6686",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31672,8 +31751,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-6882",
-   "self_type" : "type-6881",
+   "referenced_type" : "type-6906",
+   "self_type" : "type-6905",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31682,8 +31761,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-7193",
-   "self_type" : "type-7192",
+   "referenced_type" : "type-7217",
+   "self_type" : "type-7216",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31692,8 +31771,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-7340",
-   "self_type" : "type-7339",
+   "referenced_type" : "type-7363",
+   "self_type" : "type-7362",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31702,8 +31781,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-7566",
-   "self_type" : "type-7565",
+   "referenced_type" : "type-7589",
+   "self_type" : "type-7588",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31722,8 +31801,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-7667",
-   "self_type" : "type-7666",
+   "referenced_type" : "type-7686",
+   "self_type" : "type-7685",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31733,7 +31812,7 @@
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
    "referenced_type" : "type-52",
-   "self_type" : "type-1449",
+   "self_type" : "type-1452",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -31742,8 +31821,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SafeBpInterface<android::IConsumerListener>",
    "name" : "const android::SafeBpInterface<android::IConsumerListener>",
-   "referenced_type" : "type-1537",
-   "self_type" : "type-1551",
+   "referenced_type" : "type-1541",
+   "self_type" : "type-1554",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -31752,8 +31831,8 @@
    "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",
+   "referenced_type" : "type-1720",
+   "self_type" : "type-1890",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -31762,8 +31841,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SafeInterface::ParcelHandler",
    "name" : "const android::SafeInterface::ParcelHandler",
-   "referenced_type" : "type-1235",
-   "self_type" : "type-1256",
+   "referenced_type" : "type-1238",
+   "self_type" : "type-1254",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -31773,7 +31852,7 @@
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
    "name" : "const android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
    "referenced_type" : "type-159",
-   "self_type" : "type-2675",
+   "self_type" : "type-2678",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -31783,7 +31862,7 @@
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "const android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "referenced_type" : "type-146",
-   "self_type" : "type-2671",
+   "self_type" : "type-2674",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -31793,7 +31872,7 @@
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "const android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
    "referenced_type" : "type-139",
-   "self_type" : "type-2667",
+   "self_type" : "type-2670",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -31802,8 +31881,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-1239",
-   "self_type" : "type-1248",
+   "referenced_type" : "type-1242",
+   "self_type" : "type-1251",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -31813,7 +31892,7 @@
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
    "referenced_type" : "type-121",
-   "self_type" : "type-1875",
+   "self_type" : "type-1879",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -31823,7 +31902,7 @@
    "linker_set_key" : "const android::Vector<android::BufferItem>",
    "name" : "const android::Vector<android::BufferItem>",
    "referenced_type" : "type-837",
-   "self_type" : "type-977",
+   "self_type" : "type-979",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31832,8 +31911,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<android::Rect>",
    "name" : "const android::Vector<android::Rect>",
-   "referenced_type" : "type-2677",
-   "self_type" : "type-2679",
+   "referenced_type" : "type-2680",
+   "self_type" : "type-2682",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31842,8 +31921,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",
+   "referenced_type" : "type-1228",
+   "self_type" : "type-1231",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31852,8 +31931,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<int>",
    "name" : "const android::Vector<int>",
-   "referenced_type" : "type-2686",
-   "self_type" : "type-2688",
+   "referenced_type" : "type-2689",
+   "self_type" : "type-2691",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31862,8 +31941,8 @@
    "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",
+   "referenced_type" : "type-1084",
+   "self_type" : "type-1086",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31873,7 +31952,7 @@
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
    "referenced_type" : "type-141",
-   "self_type" : "type-2664",
+   "self_type" : "type-2667",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -31882,8 +31961,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::base::ErrnoRestorer",
    "name" : "const android::base::ErrnoRestorer",
-   "referenced_type" : "type-4656",
-   "self_type" : "type-4655",
+   "referenced_type" : "type-4663",
+   "self_type" : "type-4662",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -31892,8 +31971,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
-   "referenced_type" : "type-2553",
-   "self_type" : "type-2580",
+   "referenced_type" : "type-2556",
+   "self_type" : "type-2583",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -31912,8 +31991,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::BpHwRefBase",
    "name" : "const android::hardware::BpHwRefBase",
-   "referenced_type" : "type-1371",
-   "self_type" : "type-1374",
+   "referenced_type" : "type-1374",
+   "self_type" : "type-1377",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -31922,8 +32001,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1377",
-   "self_type" : "type-1385",
+   "referenced_type" : "type-1380",
+   "self_type" : "type-1388",
    "size" : 68,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -31932,8 +32011,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-7504",
-   "self_type" : "type-7651",
+   "referenced_type" : "type-7528",
+   "self_type" : "type-7674",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -31942,26 +32021,6 @@
    "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,
@@ -31970,8 +32029,8 @@
   {
    "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> >",
+   "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-4494",
    "self_type" : "type-4498",
    "size" : 28,
@@ -31980,10 +32039,30 @@
   {
    "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-4371",
+   "self_type" : "type-4375",
+   "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-4500",
+   "self_type" : "type-4504",
+   "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-4353",
-   "self_type" : "type-4357",
+   "referenced_type" : "type-4359",
+   "self_type" : "type-4363",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -31993,7 +32072,7 @@
    "linker_set_key" : "const android::hardware::Return<int>",
    "name" : "const android::hardware::Return<int>",
    "referenced_type" : "type-413",
-   "self_type" : "type-4698",
+   "self_type" : "type-4704",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32002,8 +32081,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-7508",
-   "self_type" : "type-7653",
+   "referenced_type" : "type-7534",
+   "self_type" : "type-7677",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32073,7 +32152,7 @@
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned char>",
    "name" : "const android::hardware::details::hidl_pointer<unsigned char>",
    "referenced_type" : "type-390",
-   "self_type" : "type-4348",
+   "self_type" : "type-4354",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -32103,7 +32182,7 @@
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming",
    "referenced_type" : "type-588",
-   "self_type" : "type-4582",
+   "self_type" : "type-4588",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -32142,8 +32221,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-2456",
-   "self_type" : "type-2460",
+   "referenced_type" : "type-2459",
+   "self_type" : "type-2463",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32373,7 +32452,7 @@
    "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",
+   "self_type" : "type-4732",
    "size" : 64,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -32463,7 +32542,7 @@
    "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",
+   "self_type" : "type-4386",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -32523,7 +32602,7 @@
    "linker_set_key" : "const android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "const android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "referenced_type" : "type-160",
-   "self_type" : "type-2619",
+   "self_type" : "type-2622",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32533,7 +32612,7 @@
    "linker_set_key" : "const android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "name" : "const android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "referenced_type" : "type-147",
-   "self_type" : "type-2617",
+   "self_type" : "type-2620",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32543,7 +32622,7 @@
    "linker_set_key" : "const android::key_value_pair_t<unsigned int, unsigned int>",
    "name" : "const android::key_value_pair_t<unsigned int, unsigned int>",
    "referenced_type" : "type-143",
-   "self_type" : "type-2613",
+   "self_type" : "type-2616",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32551,32 +32630,32 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer>",
    "name" : "const android::sp<ANativeWindowBuffer>",
-   "referenced_type" : "type-2410",
-   "self_type" : "type-2409",
+   "referenced_type" : "type-2413",
+   "self_type" : "type-2412",
    "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",
+   "referenced_type" : "type-4852",
+   "self_type" : "type-4851",
    "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",
+   "referenced_type" : "type-5999",
+   "self_type" : "type-5998",
    "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",
+   "referenced_type" : "type-6837",
+   "self_type" : "type-6836",
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
   {
@@ -32585,7 +32664,7 @@
    "linker_set_key" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
    "name" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
    "referenced_type" : "type-581",
-   "self_type" : "type-1304",
+   "self_type" : "type-1301",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32605,7 +32684,7 @@
    "linker_set_key" : "const android::sp<android::AMessage>",
    "name" : "const android::sp<android::AMessage>",
    "referenced_type" : "type-259",
-   "self_type" : "type-2175",
+   "self_type" : "type-2174",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32614,8 +32693,8 @@
    "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",
+   "referenced_type" : "type-4234",
+   "self_type" : "type-4233",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32624,8 +32703,8 @@
    "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",
+   "referenced_type" : "type-4460",
+   "self_type" : "type-4522",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32645,7 +32724,7 @@
    "linker_set_key" : "const android::sp<android::ComponentWrapper>",
    "name" : "const android::sp<android::ComponentWrapper>",
    "referenced_type" : "type-567",
-   "self_type" : "type-2491",
+   "self_type" : "type-2494",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32664,8 +32743,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::Fence>",
    "name" : "const android::sp<android::Fence>",
-   "referenced_type" : "type-1864",
-   "self_type" : "type-1863",
+   "referenced_type" : "type-1868",
+   "self_type" : "type-1867",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32675,7 +32754,7 @@
    "linker_set_key" : "const android::sp<android::FrameDropper>",
    "name" : "const android::sp<android::FrameDropper>",
    "referenced_type" : "type-578",
-   "self_type" : "type-2506",
+   "self_type" : "type-2509",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32685,7 +32764,7 @@
    "linker_set_key" : "const android::sp<android::GraphicBuffer>",
    "name" : "const android::sp<android::GraphicBuffer>",
    "referenced_type" : "type-733",
-   "self_type" : "type-1196",
+   "self_type" : "type-1200",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32704,8 +32783,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::GraphicBufferSource>",
    "name" : "const android::sp<android::GraphicBufferSource>",
-   "referenced_type" : "type-2542",
-   "self_type" : "type-2544",
+   "referenced_type" : "type-2545",
+   "self_type" : "type-2547",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32714,8 +32793,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-4259",
-   "self_type" : "type-4264",
+   "referenced_type" : "type-4265",
+   "self_type" : "type-4270",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32724,8 +32803,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-4268",
-   "self_type" : "type-4273",
+   "referenced_type" : "type-4274",
+   "self_type" : "type-4279",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32734,8 +32813,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-4827",
-   "self_type" : "type-4826",
+   "referenced_type" : "type-4833",
+   "self_type" : "type-4832",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32744,8 +32823,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-5096",
-   "self_type" : "type-5095",
+   "referenced_type" : "type-5112",
+   "self_type" : "type-5111",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32755,7 +32834,7 @@
    "linker_set_key" : "const android::sp<android::IBinder::DeathRecipient>",
    "name" : "const android::sp<android::IBinder::DeathRecipient>",
    "referenced_type" : "type-843",
-   "self_type" : "type-4300",
+   "self_type" : "type-4306",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32765,7 +32844,7 @@
    "linker_set_key" : "const android::sp<android::IBinder>",
    "name" : "const android::sp<android::IBinder>",
    "referenced_type" : "type-795",
-   "self_type" : "type-1036",
+   "self_type" : "type-1040",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32795,7 +32874,7 @@
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer>",
    "name" : "const android::sp<android::IGraphicBufferProducer>",
    "referenced_type" : "type-570",
-   "self_type" : "type-2485",
+   "self_type" : "type-2488",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32805,7 +32884,7 @@
    "linker_set_key" : "const android::sp<android::IInterface>",
    "name" : "const android::sp<android::IInterface>",
    "referenced_type" : "type-646",
-   "self_type" : "type-1487",
+   "self_type" : "type-1491",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32824,8 +32903,8 @@
    "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",
+   "referenced_type" : "type-1044",
+   "self_type" : "type-1049",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32844,8 +32923,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",
+   "referenced_type" : "type-1262",
+   "self_type" : "type-1261",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -32854,8 +32933,8 @@
    "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",
+   "referenced_type" : "type-1370",
+   "self_type" : "type-1392",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -32864,8 +32943,8 @@
    "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",
+   "referenced_type" : "type-1397",
+   "self_type" : "type-1396",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -32874,8 +32953,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-2463",
-   "self_type" : "type-2468",
+   "referenced_type" : "type-2466",
+   "self_type" : "type-2471",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32884,8 +32963,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener>",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener>",
-   "referenced_type" : "type-2454",
-   "self_type" : "type-2458",
+   "referenced_type" : "type-2457",
+   "self_type" : "type-2461",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32894,8 +32973,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-4240",
-   "self_type" : "type-4239",
+   "referenced_type" : "type-4246",
+   "self_type" : "type-4245",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32904,8 +32983,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-4466",
-   "self_type" : "type-4469",
+   "referenced_type" : "type-4473",
+   "self_type" : "type-4476",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32914,8 +32993,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-2476",
-   "self_type" : "type-2482",
+   "referenced_type" : "type-2479",
+   "self_type" : "type-2485",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32924,8 +33003,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener>",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener>",
-   "referenced_type" : "type-2470",
-   "self_type" : "type-2474",
+   "referenced_type" : "type-2473",
+   "self_type" : "type-2477",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32934,8 +33013,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-4234",
-   "self_type" : "type-4233",
+   "referenced_type" : "type-4240",
+   "self_type" : "type-4239",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32944,8 +33023,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-4459",
-   "self_type" : "type-4462",
+   "referenced_type" : "type-4466",
+   "self_type" : "type-4469",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32964,8 +33043,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-2444",
-   "self_type" : "type-2446",
+   "referenced_type" : "type-2447",
+   "self_type" : "type-2449",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32974,8 +33053,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification>",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification>",
-   "referenced_type" : "type-2448",
-   "self_type" : "type-2451",
+   "referenced_type" : "type-2451",
+   "self_type" : "type-2454",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33015,7 +33094,7 @@
    "linker_set_key" : "const android::wp<android::IBinder::DeathRecipient>",
    "name" : "const android::wp<android::IBinder::DeathRecipient>",
    "referenced_type" : "type-172",
-   "self_type" : "type-4289",
+   "self_type" : "type-4296",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33025,7 +33104,7 @@
    "linker_set_key" : "const android::wp<android::IBinder>",
    "name" : "const android::wp<android::IBinder>",
    "referenced_type" : "type-130",
-   "self_type" : "type-4280",
+   "self_type" : "type-4286",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33035,7 +33114,7 @@
    "linker_set_key" : "const android_cta861_3_metadata",
    "name" : "const android_cta861_3_metadata",
    "referenced_type" : "type-305",
-   "self_type" : "type-1473",
+   "self_type" : "type-1477",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -33055,7 +33134,7 @@
    "linker_set_key" : "const android_smpte2086_metadata",
    "name" : "const android_smpte2086_metadata",
    "referenced_type" : "type-304",
-   "self_type" : "type-1471",
+   "self_type" : "type-1474",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -33085,7 +33164,7 @@
    "linker_set_key" : "const char *const",
    "name" : "const char *const",
    "referenced_type" : "type-122",
-   "self_type" : "type-1103",
+   "self_type" : "type-1106",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -33094,8 +33173,8 @@
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-1242",
-   "self_type" : "type-1241",
+   "referenced_type" : "type-1245",
+   "self_type" : "type-1244",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -33105,7 +33184,7 @@
    "linker_set_key" : "const double",
    "name" : "const double",
    "referenced_type" : "type-269",
-   "self_type" : "type-1077",
+   "self_type" : "type-1080",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -33141,64 +33220,64 @@
    "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-1113",
+   "self_type" : "type-1112",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1282",
-   "self_type" : "type-1281",
+   "referenced_type" : "type-1285",
+   "self_type" : "type-1284",
    "source_file" : "/system/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",
+   "referenced_type" : "type-3310",
+   "self_type" : "type-3309",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3539",
-   "self_type" : "type-3538",
+   "referenced_type" : "type-3542",
+   "self_type" : "type-3541",
    "source_file" : "/system/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",
+   "referenced_type" : "type-3651",
+   "self_type" : "type-3650",
    "source_file" : "/system/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",
+   "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-3833",
-   "self_type" : "type-3832",
+   "referenced_type" : "type-3839",
+   "self_type" : "type-3838",
    "source_file" : "/system/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",
+   "referenced_type" : "type-4379",
+   "self_type" : "type-4378",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -33213,216 +33292,216 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-4502",
-   "self_type" : "type-4501",
+   "referenced_type" : "type-4508",
+   "self_type" : "type-4507",
    "source_file" : "/system/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",
+   "referenced_type" : "type-4545",
+   "self_type" : "type-4544",
    "source_file" : "/system/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",
+   "referenced_type" : "type-4570",
+   "self_type" : "type-4569",
    "source_file" : "/system/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",
+   "referenced_type" : "type-4724",
+   "self_type" : "type-4723",
    "source_file" : "/system/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",
+   "referenced_type" : "type-4854",
+   "self_type" : "type-4853",
    "source_file" : "/system/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",
+   "referenced_type" : "type-5125",
+   "self_type" : "type-5124",
    "source_file" : "/system/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",
+   "referenced_type" : "type-5178",
+   "self_type" : "type-5177",
    "source_file" : "/system/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",
+   "referenced_type" : "type-5385",
+   "self_type" : "type-5384",
    "source_file" : "/system/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",
+   "referenced_type" : "type-5617",
+   "self_type" : "type-5616",
    "source_file" : "/system/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",
+   "referenced_type" : "type-5726",
+   "self_type" : "type-5725",
    "source_file" : "/system/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",
+   "referenced_type" : "type-5792",
+   "self_type" : "type-5791",
    "source_file" : "/system/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",
+   "referenced_type" : "type-5914",
+   "self_type" : "type-5913",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6070",
+   "self_type" : "type-6069",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6206",
+   "self_type" : "type-6205",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6302",
+   "self_type" : "type-6301",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6349",
+   "self_type" : "type-6348",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6441",
+   "self_type" : "type-6440",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6980",
+   "self_type" : "type-6979",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7114",
+   "self_type" : "type-7113",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7167",
+   "self_type" : "type-7166",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7203",
+   "self_type" : "type-7202",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7352",
+   "self_type" : "type-7351",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7452",
+   "self_type" : "type-7451",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7490",
+   "self_type" : "type-7489",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7543",
+   "self_type" : "type-7542",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7623",
+   "self_type" : "type-7622",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7688",
+   "self_type" : "type-7687",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -33438,8 +33517,8 @@
    "is_const" : true,
    "linker_set_key" : "const log_msg",
    "name" : "const log_msg",
-   "referenced_type" : "type-2177",
-   "self_type" : "type-2313",
+   "referenced_type" : "type-2180",
+   "self_type" : "type-2316",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -33488,8 +33567,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-1314",
-   "self_type" : "type-1313",
+   "referenced_type" : "type-1318",
+   "self_type" : "type-1317",
    "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"
   },
@@ -33498,8 +33577,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-3392",
-   "self_type" : "type-3391",
+   "referenced_type" : "type-3395",
+   "self_type" : "type-3394",
    "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"
   },
@@ -33508,8 +33587,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-3562",
-   "self_type" : "type-3561",
+   "referenced_type" : "type-3565",
+   "self_type" : "type-3564",
    "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"
   },
@@ -33518,8 +33597,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-3864",
-   "self_type" : "type-3863",
+   "referenced_type" : "type-3871",
+   "self_type" : "type-3870",
    "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"
   },
@@ -33528,8 +33607,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-4413",
-   "self_type" : "type-4412",
+   "referenced_type" : "type-4421",
+   "self_type" : "type-4420",
    "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"
   },
@@ -33538,8 +33617,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-4624",
-   "self_type" : "type-4623",
+   "referenced_type" : "type-4630",
+   "self_type" : "type-4629",
    "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"
   },
@@ -33548,8 +33627,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-4794",
-   "self_type" : "type-4793",
+   "referenced_type" : "type-4800",
+   "self_type" : "type-4799",
    "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"
   },
@@ -33558,8 +33637,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-5086",
-   "self_type" : "type-5085",
+   "referenced_type" : "type-5102",
+   "self_type" : "type-5101",
    "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"
   },
@@ -33568,8 +33647,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-5186",
-   "self_type" : "type-5185",
+   "referenced_type" : "type-5204",
+   "self_type" : "type-5203",
    "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"
   },
@@ -33578,8 +33657,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-5453",
-   "self_type" : "type-5452",
+   "referenced_type" : "type-5470",
+   "self_type" : "type-5469",
    "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"
   },
@@ -33588,8 +33667,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-5623",
-   "self_type" : "type-5622",
+   "referenced_type" : "type-5640",
+   "self_type" : "type-5639",
    "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"
   },
@@ -33598,8 +33677,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-5925",
-   "self_type" : "type-5924",
+   "referenced_type" : "type-5946",
+   "self_type" : "type-5945",
    "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"
   },
@@ -33618,8 +33697,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-6077",
-   "self_type" : "type-6076",
+   "referenced_type" : "type-6097",
+   "self_type" : "type-6096",
    "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"
   },
@@ -33628,8 +33707,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-6209",
-   "self_type" : "type-6208",
+   "referenced_type" : "type-6229",
+   "self_type" : "type-6228",
    "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"
   },
@@ -33638,8 +33717,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-6445",
-   "self_type" : "type-6444",
+   "referenced_type" : "type-6469",
+   "self_type" : "type-6468",
    "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"
   },
@@ -33648,8 +33727,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-7002",
-   "self_type" : "type-7001",
+   "referenced_type" : "type-7028",
+   "self_type" : "type-7027",
    "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"
   },
@@ -33658,8 +33737,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-7251",
-   "self_type" : "type-7250",
+   "referenced_type" : "type-7276",
+   "self_type" : "type-7275",
    "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"
   },
@@ -33668,8 +33747,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-7386",
-   "self_type" : "type-7385",
+   "referenced_type" : "type-7409",
+   "self_type" : "type-7408",
    "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"
   },
@@ -33678,8 +33757,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-7591",
-   "self_type" : "type-7590",
+   "referenced_type" : "type-7614",
+   "self_type" : "type-7613",
    "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"
   },
@@ -33698,8 +33777,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-1312",
-   "self_type" : "type-1311",
+   "referenced_type" : "type-1315",
+   "self_type" : "type-1314",
    "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"
   },
@@ -33708,8 +33787,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-3390",
-   "self_type" : "type-3389",
+   "referenced_type" : "type-3393",
+   "self_type" : "type-3392",
    "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"
   },
@@ -33718,8 +33797,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-3560",
-   "self_type" : "type-3559",
+   "referenced_type" : "type-3563",
+   "self_type" : "type-3562",
    "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"
   },
@@ -33728,8 +33807,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-3862",
-   "self_type" : "type-3861",
+   "referenced_type" : "type-3868",
+   "self_type" : "type-3867",
    "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"
   },
@@ -33738,8 +33817,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-4411",
-   "self_type" : "type-4410",
+   "referenced_type" : "type-4419",
+   "self_type" : "type-4418",
    "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"
   },
@@ -33748,8 +33827,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-4622",
-   "self_type" : "type-4621",
+   "referenced_type" : "type-4628",
+   "self_type" : "type-4627",
    "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"
   },
@@ -33758,8 +33837,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-4792",
-   "self_type" : "type-4791",
+   "referenced_type" : "type-4798",
+   "self_type" : "type-4797",
    "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"
   },
@@ -33768,8 +33847,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-5084",
-   "self_type" : "type-5083",
+   "referenced_type" : "type-5100",
+   "self_type" : "type-5099",
    "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"
   },
@@ -33778,8 +33857,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-5184",
-   "self_type" : "type-5183",
+   "referenced_type" : "type-5202",
+   "self_type" : "type-5201",
    "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"
   },
@@ -33788,8 +33867,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-5451",
-   "self_type" : "type-5450",
+   "referenced_type" : "type-5468",
+   "self_type" : "type-5467",
    "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"
   },
@@ -33798,8 +33877,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-5621",
-   "self_type" : "type-5620",
+   "referenced_type" : "type-5638",
+   "self_type" : "type-5637",
    "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"
   },
@@ -33808,8 +33887,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-5923",
-   "self_type" : "type-5922",
+   "referenced_type" : "type-5943",
+   "self_type" : "type-5942",
    "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"
   },
@@ -33828,8 +33907,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-6075",
-   "self_type" : "type-6074",
+   "referenced_type" : "type-6095",
+   "self_type" : "type-6094",
    "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"
   },
@@ -33838,8 +33917,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-6207",
-   "self_type" : "type-6206",
+   "referenced_type" : "type-6227",
+   "self_type" : "type-6226",
    "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"
   },
@@ -33848,8 +33927,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-6443",
-   "self_type" : "type-6442",
+   "referenced_type" : "type-6466",
+   "self_type" : "type-6465",
    "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"
   },
@@ -33858,8 +33937,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-7000",
-   "self_type" : "type-6999",
+   "referenced_type" : "type-7026",
+   "self_type" : "type-7025",
    "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"
   },
@@ -33868,8 +33947,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-7248",
-   "self_type" : "type-7247",
+   "referenced_type" : "type-7274",
+   "self_type" : "type-7273",
    "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"
   },
@@ -33878,8 +33957,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-7384",
-   "self_type" : "type-7383",
+   "referenced_type" : "type-7407",
+   "self_type" : "type-7406",
    "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"
   },
@@ -33888,8 +33967,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-7589",
-   "self_type" : "type-7588",
+   "referenced_type" : "type-7612",
+   "self_type" : "type-7611",
    "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"
   },
@@ -33908,8 +33987,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-1321",
-   "self_type" : "type-1320",
+   "referenced_type" : "type-1324",
+   "self_type" : "type-1323",
    "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"
   },
@@ -33918,8 +33997,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-3404",
-   "self_type" : "type-3403",
+   "referenced_type" : "type-3407",
+   "self_type" : "type-3406",
    "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"
   },
@@ -33928,8 +34007,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-3568",
-   "self_type" : "type-3567",
+   "referenced_type" : "type-3571",
+   "self_type" : "type-3570",
    "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"
   },
@@ -33938,8 +34017,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-3872",
-   "self_type" : "type-3871",
+   "referenced_type" : "type-3878",
+   "self_type" : "type-3877",
    "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"
   },
@@ -33948,8 +34027,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-4421",
-   "self_type" : "type-4420",
+   "referenced_type" : "type-4427",
+   "self_type" : "type-4426",
    "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"
   },
@@ -33958,8 +34037,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-4630",
-   "self_type" : "type-4629",
+   "referenced_type" : "type-4636",
+   "self_type" : "type-4635",
    "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"
   },
@@ -33968,8 +34047,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-4800",
-   "self_type" : "type-4799",
+   "referenced_type" : "type-4806",
+   "self_type" : "type-4805",
    "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"
   },
@@ -33978,8 +34057,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-5092",
-   "self_type" : "type-5091",
+   "referenced_type" : "type-5108",
+   "self_type" : "type-5107",
    "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"
   },
@@ -33988,8 +34067,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-5193",
-   "self_type" : "type-5192",
+   "referenced_type" : "type-5212",
+   "self_type" : "type-5211",
    "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"
   },
@@ -33998,8 +34077,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-5465",
-   "self_type" : "type-5464",
+   "referenced_type" : "type-5482",
+   "self_type" : "type-5481",
    "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"
   },
@@ -34008,8 +34087,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-5629",
-   "self_type" : "type-5628",
+   "referenced_type" : "type-5646",
+   "self_type" : "type-5645",
    "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"
   },
@@ -34018,8 +34097,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-5933",
-   "self_type" : "type-5932",
+   "referenced_type" : "type-5953",
+   "self_type" : "type-5952",
    "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"
   },
@@ -34028,8 +34107,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-6083",
-   "self_type" : "type-6082",
+   "referenced_type" : "type-6104",
+   "self_type" : "type-6103",
    "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"
   },
@@ -34048,8 +34127,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-6215",
-   "self_type" : "type-6214",
+   "referenced_type" : "type-6235",
+   "self_type" : "type-6234",
    "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"
   },
@@ -34058,8 +34137,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-6452",
-   "self_type" : "type-6451",
+   "referenced_type" : "type-6475",
+   "self_type" : "type-6474",
    "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"
   },
@@ -34068,8 +34147,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-7011",
-   "self_type" : "type-7010",
+   "referenced_type" : "type-7035",
+   "self_type" : "type-7034",
    "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"
   },
@@ -34078,8 +34157,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-7259",
-   "self_type" : "type-7258",
+   "referenced_type" : "type-7282",
+   "self_type" : "type-7281",
    "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"
   },
@@ -34088,8 +34167,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-7392",
-   "self_type" : "type-7391",
+   "referenced_type" : "type-7415",
+   "self_type" : "type-7414",
    "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"
   },
@@ -34098,8 +34177,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-7527",
-   "self_type" : "type-7526",
+   "referenced_type" : "type-7550",
+   "self_type" : "type-7549",
    "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"
   },
@@ -34118,8 +34197,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-1319",
-   "self_type" : "type-1318",
+   "referenced_type" : "type-1322",
+   "self_type" : "type-1321",
    "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"
   },
@@ -34128,8 +34207,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-3402",
-   "self_type" : "type-3401",
+   "referenced_type" : "type-3405",
+   "self_type" : "type-3404",
    "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"
   },
@@ -34138,8 +34217,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-3566",
-   "self_type" : "type-3565",
+   "referenced_type" : "type-3569",
+   "self_type" : "type-3568",
    "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"
   },
@@ -34148,8 +34227,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-3870",
-   "self_type" : "type-3869",
+   "referenced_type" : "type-3876",
+   "self_type" : "type-3875",
    "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"
   },
@@ -34158,8 +34237,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-4419",
-   "self_type" : "type-4418",
+   "referenced_type" : "type-4425",
+   "self_type" : "type-4424",
    "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"
   },
@@ -34168,8 +34247,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-4628",
-   "self_type" : "type-4627",
+   "referenced_type" : "type-4634",
+   "self_type" : "type-4633",
    "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"
   },
@@ -34178,8 +34257,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-4798",
-   "self_type" : "type-4797",
+   "referenced_type" : "type-4804",
+   "self_type" : "type-4803",
    "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"
   },
@@ -34188,8 +34267,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-5090",
-   "self_type" : "type-5089",
+   "referenced_type" : "type-5106",
+   "self_type" : "type-5105",
    "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"
   },
@@ -34198,8 +34277,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-5191",
-   "self_type" : "type-5190",
+   "referenced_type" : "type-5209",
+   "self_type" : "type-5208",
    "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"
   },
@@ -34208,8 +34287,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-5463",
-   "self_type" : "type-5462",
+   "referenced_type" : "type-5480",
+   "self_type" : "type-5479",
    "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"
   },
@@ -34218,8 +34297,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-5627",
-   "self_type" : "type-5626",
+   "referenced_type" : "type-5644",
+   "self_type" : "type-5643",
    "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"
   },
@@ -34228,8 +34307,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-5931",
-   "self_type" : "type-5930",
+   "referenced_type" : "type-5951",
+   "self_type" : "type-5950",
    "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"
   },
@@ -34238,8 +34317,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-6081",
-   "self_type" : "type-6080",
+   "referenced_type" : "type-6102",
+   "self_type" : "type-6101",
    "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"
   },
@@ -34258,8 +34337,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-6213",
-   "self_type" : "type-6212",
+   "referenced_type" : "type-6233",
+   "self_type" : "type-6232",
    "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"
   },
@@ -34268,8 +34347,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-6450",
-   "self_type" : "type-6449",
+   "referenced_type" : "type-6473",
+   "self_type" : "type-6472",
    "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"
   },
@@ -34278,8 +34357,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-7009",
-   "self_type" : "type-7008",
+   "referenced_type" : "type-7033",
+   "self_type" : "type-7032",
    "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"
   },
@@ -34288,8 +34367,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-7257",
-   "self_type" : "type-7256",
+   "referenced_type" : "type-7280",
+   "self_type" : "type-7279",
    "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"
   },
@@ -34298,8 +34377,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-7390",
-   "self_type" : "type-7389",
+   "referenced_type" : "type-7413",
+   "self_type" : "type-7412",
    "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"
   },
@@ -34308,8 +34387,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-7525",
-   "self_type" : "type-7524",
+   "referenced_type" : "type-7548",
+   "self_type" : "type-7547",
    "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"
   },
@@ -34328,8 +34407,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-1317",
-   "self_type" : "type-1316",
+   "referenced_type" : "type-1320",
+   "self_type" : "type-1319",
    "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"
   },
@@ -34338,8 +34417,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-3400",
-   "self_type" : "type-3399",
+   "referenced_type" : "type-3403",
+   "self_type" : "type-3402",
    "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"
   },
@@ -34348,8 +34427,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-3564",
-   "self_type" : "type-3563",
+   "referenced_type" : "type-3567",
+   "self_type" : "type-3566",
    "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"
   },
@@ -34358,8 +34437,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-3868",
-   "self_type" : "type-3867",
+   "referenced_type" : "type-3874",
+   "self_type" : "type-3873",
    "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"
   },
@@ -34368,8 +34447,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-4417",
-   "self_type" : "type-4416",
+   "referenced_type" : "type-4423",
+   "self_type" : "type-4422",
    "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"
   },
@@ -34378,8 +34457,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-4626",
-   "self_type" : "type-4625",
+   "referenced_type" : "type-4632",
+   "self_type" : "type-4631",
    "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"
   },
@@ -34388,8 +34467,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-4796",
-   "self_type" : "type-4795",
+   "referenced_type" : "type-4802",
+   "self_type" : "type-4801",
    "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"
   },
@@ -34398,8 +34477,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-5088",
-   "self_type" : "type-5087",
+   "referenced_type" : "type-5104",
+   "self_type" : "type-5103",
    "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"
   },
@@ -34408,8 +34487,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-5189",
-   "self_type" : "type-5188",
+   "referenced_type" : "type-5207",
+   "self_type" : "type-5206",
    "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"
   },
@@ -34418,8 +34497,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-5461",
-   "self_type" : "type-5460",
+   "referenced_type" : "type-5478",
+   "self_type" : "type-5477",
    "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"
   },
@@ -34428,8 +34507,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-5625",
-   "self_type" : "type-5624",
+   "referenced_type" : "type-5642",
+   "self_type" : "type-5641",
    "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"
   },
@@ -34438,8 +34517,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-5929",
-   "self_type" : "type-5928",
+   "referenced_type" : "type-5949",
+   "self_type" : "type-5948",
    "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"
   },
@@ -34448,8 +34527,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-6079",
-   "self_type" : "type-6078",
+   "referenced_type" : "type-6099",
+   "self_type" : "type-6098",
    "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"
   },
@@ -34468,8 +34547,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-6211",
-   "self_type" : "type-6210",
+   "referenced_type" : "type-6231",
+   "self_type" : "type-6230",
    "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"
   },
@@ -34478,8 +34557,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-6448",
-   "self_type" : "type-6447",
+   "referenced_type" : "type-6471",
+   "self_type" : "type-6470",
    "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"
   },
@@ -34488,8 +34567,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-7007",
-   "self_type" : "type-7006",
+   "referenced_type" : "type-7030",
+   "self_type" : "type-7029",
    "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"
   },
@@ -34498,8 +34577,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-7253",
-   "self_type" : "type-7252",
+   "referenced_type" : "type-7278",
+   "self_type" : "type-7277",
    "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"
   },
@@ -34508,8 +34587,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-7388",
-   "self_type" : "type-7387",
+   "referenced_type" : "type-7411",
+   "self_type" : "type-7410",
    "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"
   },
@@ -34518,8 +34597,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-7523",
-   "self_type" : "type-7522",
+   "referenced_type" : "type-7546",
+   "self_type" : "type-7545",
    "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"
   },
@@ -34538,8 +34617,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1119",
-   "self_type" : "type-1118",
+   "referenced_type" : "type-1122",
+   "self_type" : "type-1121",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34548,8 +34627,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1297",
-   "self_type" : "type-1296",
+   "referenced_type" : "type-1300",
+   "self_type" : "type-1299",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34558,8 +34637,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3374",
+   "self_type" : "type-3373",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34568,8 +34647,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3551",
+   "self_type" : "type-3550",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34578,8 +34657,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3728",
+   "self_type" : "type-3727",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34588,8 +34667,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3853",
+   "self_type" : "type-3852",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34598,8 +34677,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4405",
+   "self_type" : "type-4404",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34608,8 +34687,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4613",
+   "self_type" : "type-4612",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34618,8 +34697,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4786",
+   "self_type" : "type-4785",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34628,8 +34707,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5189",
+   "self_type" : "type-5188",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34638,8 +34717,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5449",
+   "self_type" : "type-5448",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34658,8 +34737,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5626",
+   "self_type" : "type-5625",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34668,8 +34747,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5803",
+   "self_type" : "type-5802",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34678,8 +34757,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5928",
+   "self_type" : "type-5927",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34688,8 +34767,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6082",
+   "self_type" : "type-6081",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34698,8 +34777,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6215",
+   "self_type" : "type-6214",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34708,8 +34787,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6362",
+   "self_type" : "type-6361",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34718,8 +34797,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6452",
+   "self_type" : "type-6451",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34728,8 +34807,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7011",
+   "self_type" : "type-7010",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34738,8 +34817,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7256",
+   "self_type" : "type-7255",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34748,8 +34827,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7395",
+   "self_type" : "type-7394",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34758,8 +34837,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7554",
+   "self_type" : "type-7553",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34768,8 +34847,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7696",
+   "self_type" : "type-7695",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34778,8 +34857,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-872",
+   "self_type" : "type-871",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34788,8 +34867,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-1126",
-   "self_type" : "type-1125",
+   "referenced_type" : "type-1129",
+   "self_type" : "type-1128",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34798,8 +34877,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-1303",
-   "self_type" : "type-1302",
+   "referenced_type" : "type-1307",
+   "self_type" : "type-1306",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34808,8 +34887,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-3377",
-   "self_type" : "type-3376",
+   "referenced_type" : "type-3380",
+   "self_type" : "type-3379",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34818,8 +34897,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-3554",
-   "self_type" : "type-3553",
+   "referenced_type" : "type-3557",
+   "self_type" : "type-3556",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34828,8 +34907,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-3729",
-   "self_type" : "type-3728",
+   "referenced_type" : "type-3735",
+   "self_type" : "type-3734",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34838,8 +34917,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-3853",
-   "self_type" : "type-3852",
+   "referenced_type" : "type-3860",
+   "self_type" : "type-3859",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34848,8 +34927,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-4405",
-   "self_type" : "type-4404",
+   "referenced_type" : "type-4411",
+   "self_type" : "type-4410",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34858,8 +34937,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-4613",
-   "self_type" : "type-4612",
+   "referenced_type" : "type-4619",
+   "self_type" : "type-4618",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34868,8 +34947,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-4785",
-   "self_type" : "type-4784",
+   "referenced_type" : "type-4792",
+   "self_type" : "type-4791",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34878,8 +34957,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-5178",
-   "self_type" : "type-5177",
+   "referenced_type" : "type-5195",
+   "self_type" : "type-5194",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34888,8 +34967,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-5438",
-   "self_type" : "type-5437",
+   "referenced_type" : "type-5455",
+   "self_type" : "type-5454",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34908,8 +34987,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-5615",
-   "self_type" : "type-5614",
+   "referenced_type" : "type-5632",
+   "self_type" : "type-5631",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34918,8 +34997,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-5790",
-   "self_type" : "type-5789",
+   "referenced_type" : "type-5810",
+   "self_type" : "type-5809",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34928,8 +35007,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-5914",
-   "self_type" : "type-5913",
+   "referenced_type" : "type-5935",
+   "self_type" : "type-5934",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34938,8 +35017,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-6068",
-   "self_type" : "type-6067",
+   "referenced_type" : "type-6088",
+   "self_type" : "type-6087",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34948,8 +35027,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-6201",
-   "self_type" : "type-6200",
+   "referenced_type" : "type-6221",
+   "self_type" : "type-6220",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34958,8 +35037,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-6345",
-   "self_type" : "type-6344",
+   "referenced_type" : "type-6368",
+   "self_type" : "type-6367",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34968,8 +35047,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-6435",
-   "self_type" : "type-6434",
+   "referenced_type" : "type-6458",
+   "self_type" : "type-6457",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34978,8 +35057,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-6993",
-   "self_type" : "type-6992",
+   "referenced_type" : "type-7017",
+   "self_type" : "type-7016",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34988,8 +35067,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-7239",
-   "self_type" : "type-7238",
+   "referenced_type" : "type-7263",
+   "self_type" : "type-7262",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34998,8 +35077,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-7378",
-   "self_type" : "type-7377",
+   "referenced_type" : "type-7401",
+   "self_type" : "type-7400",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35008,8 +35087,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-7537",
-   "self_type" : "type-7536",
+   "referenced_type" : "type-7560",
+   "self_type" : "type-7559",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35018,8 +35097,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-7679",
-   "self_type" : "type-7678",
+   "referenced_type" : "type-7702",
+   "self_type" : "type-7701",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35038,8 +35117,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-1128",
-   "self_type" : "type-1127",
+   "referenced_type" : "type-1131",
+   "self_type" : "type-1130",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35048,8 +35127,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-1306",
-   "self_type" : "type-1305",
+   "referenced_type" : "type-1309",
+   "self_type" : "type-1308",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35058,8 +35137,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-3380",
-   "self_type" : "type-3379",
+   "referenced_type" : "type-3383",
+   "self_type" : "type-3382",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35068,8 +35147,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-3556",
-   "self_type" : "type-3555",
+   "referenced_type" : "type-3559",
+   "self_type" : "type-3558",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35078,8 +35157,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-3731",
-   "self_type" : "type-3730",
+   "referenced_type" : "type-3737",
+   "self_type" : "type-3736",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35088,8 +35167,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-3856",
-   "self_type" : "type-3855",
+   "referenced_type" : "type-3862",
+   "self_type" : "type-3861",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35098,8 +35177,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-4407",
-   "self_type" : "type-4406",
+   "referenced_type" : "type-4413",
+   "self_type" : "type-4412",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35108,8 +35187,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-4615",
-   "self_type" : "type-4614",
+   "referenced_type" : "type-4621",
+   "self_type" : "type-4620",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35118,8 +35197,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-4787",
-   "self_type" : "type-4786",
+   "referenced_type" : "type-4794",
+   "self_type" : "type-4793",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35128,8 +35207,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-5180",
-   "self_type" : "type-5179",
+   "referenced_type" : "type-5197",
+   "self_type" : "type-5196",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35138,18 +35217,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-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",
+   "referenced_type" : "type-5458",
+   "self_type" : "type-5457",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35168,8 +35237,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-5792",
-   "self_type" : "type-5791",
+   "referenced_type" : "type-5634",
+   "self_type" : "type-5633",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35178,8 +35247,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-5917",
-   "self_type" : "type-5916",
+   "referenced_type" : "type-5812",
+   "self_type" : "type-5811",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35188,8 +35257,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-6070",
-   "self_type" : "type-6069",
+   "referenced_type" : "type-5937",
+   "self_type" : "type-5936",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35198,8 +35267,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-6203",
-   "self_type" : "type-6202",
+   "referenced_type" : "type-6090",
+   "self_type" : "type-6089",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35208,8 +35277,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-6347",
-   "self_type" : "type-6346",
+   "referenced_type" : "type-6223",
+   "self_type" : "type-6222",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35218,8 +35287,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-6437",
-   "self_type" : "type-6436",
+   "referenced_type" : "type-6370",
+   "self_type" : "type-6369",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35228,8 +35297,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-6996",
-   "self_type" : "type-6995",
+   "referenced_type" : "type-6460",
+   "self_type" : "type-6459",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35238,8 +35307,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-7241",
-   "self_type" : "type-7240",
+   "referenced_type" : "type-7019",
+   "self_type" : "type-7018",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35248,8 +35317,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-7380",
-   "self_type" : "type-7379",
+   "referenced_type" : "type-7265",
+   "self_type" : "type-7264",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35258,8 +35327,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-7539",
-   "self_type" : "type-7538",
+   "referenced_type" : "type-7403",
+   "self_type" : "type-7402",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35268,8 +35337,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7562",
+   "self_type" : "type-7561",
+   "size" : 28,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/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-7705",
+   "self_type" : "type-7704",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35288,8 +35367,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-1123",
-   "self_type" : "type-1122",
+   "referenced_type" : "type-1127",
+   "self_type" : "type-1126",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35298,8 +35377,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-1301",
-   "self_type" : "type-1300",
+   "referenced_type" : "type-1305",
+   "self_type" : "type-1304",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35308,8 +35387,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-3375",
-   "self_type" : "type-3374",
+   "referenced_type" : "type-3378",
+   "self_type" : "type-3377",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35318,8 +35397,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-3552",
-   "self_type" : "type-3551",
+   "referenced_type" : "type-3555",
+   "self_type" : "type-3554",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35328,8 +35407,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-3726",
-   "self_type" : "type-3725",
+   "referenced_type" : "type-3733",
+   "self_type" : "type-3732",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35338,8 +35417,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-3851",
-   "self_type" : "type-3850",
+   "referenced_type" : "type-3858",
+   "self_type" : "type-3857",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35348,8 +35427,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-4403",
-   "self_type" : "type-4402",
+   "referenced_type" : "type-4409",
+   "self_type" : "type-4408",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35358,8 +35437,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-4611",
-   "self_type" : "type-4610",
+   "referenced_type" : "type-4617",
+   "self_type" : "type-4616",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35368,8 +35447,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-4783",
-   "self_type" : "type-4782",
+   "referenced_type" : "type-4790",
+   "self_type" : "type-4789",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35378,8 +35457,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-5176",
-   "self_type" : "type-5175",
+   "referenced_type" : "type-5193",
+   "self_type" : "type-5192",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35388,8 +35467,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-5436",
-   "self_type" : "type-5435",
+   "referenced_type" : "type-5453",
+   "self_type" : "type-5452",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35408,8 +35487,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-5613",
-   "self_type" : "type-5612",
+   "referenced_type" : "type-5630",
+   "self_type" : "type-5629",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35418,8 +35497,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-5787",
-   "self_type" : "type-5786",
+   "referenced_type" : "type-5808",
+   "self_type" : "type-5807",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35428,8 +35507,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-5912",
-   "self_type" : "type-5911",
+   "referenced_type" : "type-5933",
+   "self_type" : "type-5932",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35438,8 +35517,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-6065",
-   "self_type" : "type-6064",
+   "referenced_type" : "type-6086",
+   "self_type" : "type-6085",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35448,8 +35527,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-6199",
-   "self_type" : "type-6198",
+   "referenced_type" : "type-6219",
+   "self_type" : "type-6218",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35458,8 +35537,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-6343",
-   "self_type" : "type-6342",
+   "referenced_type" : "type-6366",
+   "self_type" : "type-6365",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35468,8 +35547,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-6432",
-   "self_type" : "type-6431",
+   "referenced_type" : "type-6456",
+   "self_type" : "type-6455",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35478,8 +35557,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-6991",
-   "self_type" : "type-6990",
+   "referenced_type" : "type-7015",
+   "self_type" : "type-7014",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35488,8 +35567,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-7237",
-   "self_type" : "type-7236",
+   "referenced_type" : "type-7260",
+   "self_type" : "type-7259",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35498,8 +35577,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-7376",
-   "self_type" : "type-7375",
+   "referenced_type" : "type-7399",
+   "self_type" : "type-7398",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35508,8 +35587,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-7535",
-   "self_type" : "type-7534",
+   "referenced_type" : "type-7558",
+   "self_type" : "type-7557",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35518,8 +35597,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-7677",
-   "self_type" : "type-7676",
+   "referenced_type" : "type-7700",
+   "self_type" : "type-7699",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35538,8 +35617,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-1130",
-   "self_type" : "type-1129",
+   "referenced_type" : "type-1133",
+   "self_type" : "type-1132",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35548,8 +35627,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-1308",
-   "self_type" : "type-1307",
+   "referenced_type" : "type-1311",
+   "self_type" : "type-1310",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35558,8 +35637,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-3383",
-   "self_type" : "type-3382",
+   "referenced_type" : "type-3386",
+   "self_type" : "type-3385",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35568,8 +35647,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-3558",
-   "self_type" : "type-3557",
+   "referenced_type" : "type-3561",
+   "self_type" : "type-3560",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35578,8 +35657,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-3733",
-   "self_type" : "type-3732",
+   "referenced_type" : "type-3739",
+   "self_type" : "type-3738",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35588,8 +35667,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-3858",
-   "self_type" : "type-3857",
+   "referenced_type" : "type-3864",
+   "self_type" : "type-3863",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35598,8 +35677,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-4409",
-   "self_type" : "type-4408",
+   "referenced_type" : "type-4415",
+   "self_type" : "type-4414",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35608,8 +35687,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-4617",
-   "self_type" : "type-4616",
+   "referenced_type" : "type-4626",
+   "self_type" : "type-4625",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35618,8 +35697,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-4789",
-   "self_type" : "type-4788",
+   "referenced_type" : "type-4796",
+   "self_type" : "type-4795",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35628,8 +35707,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-5182",
-   "self_type" : "type-5181",
+   "referenced_type" : "type-5200",
+   "self_type" : "type-5199",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35638,8 +35717,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-5444",
-   "self_type" : "type-5443",
+   "referenced_type" : "type-5461",
+   "self_type" : "type-5460",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35648,8 +35727,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-5619",
-   "self_type" : "type-5618",
+   "referenced_type" : "type-5636",
+   "self_type" : "type-5635",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35658,8 +35737,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-5794",
-   "self_type" : "type-5793",
+   "referenced_type" : "type-5814",
+   "self_type" : "type-5813",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35678,8 +35757,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-5919",
-   "self_type" : "type-5918",
+   "referenced_type" : "type-5939",
+   "self_type" : "type-5938",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35688,8 +35767,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-6072",
-   "self_type" : "type-6071",
+   "referenced_type" : "type-6093",
+   "self_type" : "type-6092",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35698,8 +35777,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-6205",
-   "self_type" : "type-6204",
+   "referenced_type" : "type-6225",
+   "self_type" : "type-6224",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35708,8 +35787,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-6349",
-   "self_type" : "type-6348",
+   "referenced_type" : "type-6372",
+   "self_type" : "type-6371",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35718,8 +35797,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-6439",
-   "self_type" : "type-6438",
+   "referenced_type" : "type-6462",
+   "self_type" : "type-6461",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35728,8 +35807,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-6998",
-   "self_type" : "type-6997",
+   "referenced_type" : "type-7021",
+   "self_type" : "type-7020",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35738,8 +35817,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-7243",
-   "self_type" : "type-7242",
+   "referenced_type" : "type-7270",
+   "self_type" : "type-7269",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35748,8 +35827,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-7382",
-   "self_type" : "type-7381",
+   "referenced_type" : "type-7405",
+   "self_type" : "type-7404",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35758,8 +35837,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-7541",
-   "self_type" : "type-7540",
+   "referenced_type" : "type-7564",
+   "self_type" : "type-7563",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35768,8 +35847,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-7683",
-   "self_type" : "type-7682",
+   "referenced_type" : "type-7707",
+   "self_type" : "type-7706",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35788,8 +35867,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-1117",
-   "self_type" : "type-1116",
+   "referenced_type" : "type-1120",
+   "self_type" : "type-1119",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35798,8 +35877,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-1295",
-   "self_type" : "type-1294",
+   "referenced_type" : "type-1298",
+   "self_type" : "type-1297",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35808,8 +35887,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-3369",
-   "self_type" : "type-3368",
+   "referenced_type" : "type-3372",
+   "self_type" : "type-3371",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35818,8 +35897,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-3544",
-   "self_type" : "type-3543",
+   "referenced_type" : "type-3549",
+   "self_type" : "type-3548",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35828,8 +35907,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-3720",
-   "self_type" : "type-3719",
+   "referenced_type" : "type-3726",
+   "self_type" : "type-3725",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35838,8 +35917,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-3845",
-   "self_type" : "type-3844",
+   "referenced_type" : "type-3851",
+   "self_type" : "type-3850",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35848,8 +35927,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-4397",
-   "self_type" : "type-4396",
+   "referenced_type" : "type-4403",
+   "self_type" : "type-4402",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35858,8 +35937,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-4605",
-   "self_type" : "type-4604",
+   "referenced_type" : "type-4611",
+   "self_type" : "type-4610",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35868,8 +35947,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-4776",
-   "self_type" : "type-4775",
+   "referenced_type" : "type-4783",
+   "self_type" : "type-4782",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35878,8 +35957,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-5169",
-   "self_type" : "type-5168",
+   "referenced_type" : "type-5187",
+   "self_type" : "type-5186",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35888,8 +35967,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-5430",
-   "self_type" : "type-5429",
+   "referenced_type" : "type-5447",
+   "self_type" : "type-5446",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35908,8 +35987,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-5605",
-   "self_type" : "type-5604",
+   "referenced_type" : "type-5624",
+   "self_type" : "type-5623",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35918,8 +35997,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-5781",
-   "self_type" : "type-5780",
+   "referenced_type" : "type-5801",
+   "self_type" : "type-5800",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35928,8 +36007,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-5906",
-   "self_type" : "type-5905",
+   "referenced_type" : "type-5926",
+   "self_type" : "type-5925",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35938,8 +36017,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-6059",
-   "self_type" : "type-6058",
+   "referenced_type" : "type-6079",
+   "self_type" : "type-6078",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35948,8 +36027,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-6191",
-   "self_type" : "type-6190",
+   "referenced_type" : "type-6213",
+   "self_type" : "type-6212",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35958,8 +36037,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-6337",
-   "self_type" : "type-6336",
+   "referenced_type" : "type-6360",
+   "self_type" : "type-6359",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35968,8 +36047,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-6426",
-   "self_type" : "type-6425",
+   "referenced_type" : "type-6450",
+   "self_type" : "type-6449",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35978,8 +36057,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-6985",
-   "self_type" : "type-6984",
+   "referenced_type" : "type-7009",
+   "self_type" : "type-7008",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35988,8 +36067,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-7231",
-   "self_type" : "type-7230",
+   "referenced_type" : "type-7254",
+   "self_type" : "type-7253",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35998,8 +36077,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-7370",
-   "self_type" : "type-7369",
+   "referenced_type" : "type-7393",
+   "self_type" : "type-7392",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36008,8 +36087,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-7529",
-   "self_type" : "type-7528",
+   "referenced_type" : "type-7552",
+   "self_type" : "type-7551",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36018,8 +36097,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-7671",
-   "self_type" : "type-7670",
+   "referenced_type" : "type-7694",
+   "self_type" : "type-7693",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36028,8 +36107,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-868",
-   "self_type" : "type-867",
+   "referenced_type" : "type-870",
+   "self_type" : "type-869",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36038,8 +36117,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-1121",
-   "self_type" : "type-1120",
+   "referenced_type" : "type-1125",
+   "self_type" : "type-1124",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36048,8 +36127,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-1299",
-   "self_type" : "type-1298",
+   "referenced_type" : "type-1303",
+   "self_type" : "type-1302",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36058,8 +36137,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-3373",
-   "self_type" : "type-3372",
+   "referenced_type" : "type-3376",
+   "self_type" : "type-3375",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36068,8 +36147,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-3550",
-   "self_type" : "type-3549",
+   "referenced_type" : "type-3553",
+   "self_type" : "type-3552",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36078,8 +36157,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-3724",
-   "self_type" : "type-3723",
+   "referenced_type" : "type-3731",
+   "self_type" : "type-3730",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36088,8 +36167,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-3849",
-   "self_type" : "type-3848",
+   "referenced_type" : "type-3856",
+   "self_type" : "type-3855",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36098,8 +36177,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-4401",
-   "self_type" : "type-4400",
+   "referenced_type" : "type-4407",
+   "self_type" : "type-4406",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36108,8 +36187,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-4609",
-   "self_type" : "type-4608",
+   "referenced_type" : "type-4615",
+   "self_type" : "type-4614",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36118,8 +36197,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-4781",
-   "self_type" : "type-4780",
+   "referenced_type" : "type-4788",
+   "self_type" : "type-4787",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36128,8 +36207,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-5173",
-   "self_type" : "type-5172",
+   "referenced_type" : "type-5191",
+   "self_type" : "type-5190",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36138,8 +36217,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-5434",
-   "self_type" : "type-5433",
+   "referenced_type" : "type-5451",
+   "self_type" : "type-5450",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36158,8 +36237,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-5611",
-   "self_type" : "type-5610",
+   "referenced_type" : "type-5628",
+   "self_type" : "type-5627",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36168,8 +36247,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-5785",
-   "self_type" : "type-5784",
+   "referenced_type" : "type-5806",
+   "self_type" : "type-5805",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36178,8 +36257,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-5910",
-   "self_type" : "type-5909",
+   "referenced_type" : "type-5931",
+   "self_type" : "type-5930",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36188,8 +36267,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-6063",
-   "self_type" : "type-6062",
+   "referenced_type" : "type-6084",
+   "self_type" : "type-6083",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36198,8 +36277,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-6197",
-   "self_type" : "type-6196",
+   "referenced_type" : "type-6217",
+   "self_type" : "type-6216",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36208,8 +36287,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-6341",
-   "self_type" : "type-6340",
+   "referenced_type" : "type-6364",
+   "self_type" : "type-6363",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36218,8 +36297,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-6430",
-   "self_type" : "type-6429",
+   "referenced_type" : "type-6454",
+   "self_type" : "type-6453",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36228,8 +36307,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-6989",
-   "self_type" : "type-6988",
+   "referenced_type" : "type-7013",
+   "self_type" : "type-7012",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36238,8 +36317,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-7235",
-   "self_type" : "type-7234",
+   "referenced_type" : "type-7258",
+   "self_type" : "type-7257",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36248,8 +36327,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-7374",
-   "self_type" : "type-7373",
+   "referenced_type" : "type-7397",
+   "self_type" : "type-7396",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36258,8 +36337,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-7533",
-   "self_type" : "type-7532",
+   "referenced_type" : "type-7556",
+   "self_type" : "type-7555",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36268,8 +36347,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-7675",
-   "self_type" : "type-7674",
+   "referenced_type" : "type-7698",
+   "self_type" : "type-7697",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36288,8 +36367,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-1139",
+   "self_type" : "type-1138",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36298,8 +36377,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-1328",
+   "self_type" : "type-1327",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36308,8 +36387,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3417",
+   "self_type" : "type-3416",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36318,8 +36397,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3576",
+   "self_type" : "type-3575",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36328,8 +36407,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3745",
+   "self_type" : "type-3744",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36338,8 +36417,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3882",
+   "self_type" : "type-3881",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36348,8 +36427,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4435",
+   "self_type" : "type-4434",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36358,8 +36437,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4640",
+   "self_type" : "type-4639",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36368,8 +36447,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4811",
+   "self_type" : "type-4810",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36378,8 +36457,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5216",
+   "self_type" : "type-5215",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36388,8 +36467,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5492",
+   "self_type" : "type-5491",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36398,8 +36477,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5651",
+   "self_type" : "type-5650",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36408,8 +36487,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5820",
+   "self_type" : "type-5819",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36418,8 +36497,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5957",
+   "self_type" : "type-5956",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36428,8 +36507,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6108",
+   "self_type" : "type-6107",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36438,8 +36517,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6240",
+   "self_type" : "type-6239",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36448,8 +36527,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6378",
+   "self_type" : "type-6377",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36468,8 +36547,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6479",
+   "self_type" : "type-6478",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36478,8 +36557,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7044",
+   "self_type" : "type-7043",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36488,8 +36567,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7287",
+   "self_type" : "type-7286",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36498,8 +36577,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7419",
+   "self_type" : "type-7418",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36508,8 +36587,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7568",
+   "self_type" : "type-7567",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36518,8 +36597,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7712",
+   "self_type" : "type-7711",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36538,8 +36617,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-1138",
-   "self_type" : "type-1137",
+   "referenced_type" : "type-1143",
+   "self_type" : "type-1142",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36548,8 +36627,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-1329",
-   "self_type" : "type-1328",
+   "referenced_type" : "type-1334",
+   "self_type" : "type-1333",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36558,8 +36637,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-3418",
-   "self_type" : "type-3417",
+   "referenced_type" : "type-3421",
+   "self_type" : "type-3420",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36568,8 +36647,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-3577",
-   "self_type" : "type-3576",
+   "referenced_type" : "type-3582",
+   "self_type" : "type-3581",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36578,8 +36657,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-3741",
-   "self_type" : "type-3740",
+   "referenced_type" : "type-3749",
+   "self_type" : "type-3748",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36588,8 +36667,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-3880",
-   "self_type" : "type-3879",
+   "referenced_type" : "type-3888",
+   "self_type" : "type-3887",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36598,8 +36677,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-4432",
-   "self_type" : "type-4431",
+   "referenced_type" : "type-4439",
+   "self_type" : "type-4438",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36608,8 +36687,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-4638",
-   "self_type" : "type-4637",
+   "referenced_type" : "type-4644",
+   "self_type" : "type-4643",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36618,8 +36697,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-4808",
-   "self_type" : "type-4807",
+   "referenced_type" : "type-4815",
+   "self_type" : "type-4814",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36628,8 +36707,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-5203",
-   "self_type" : "type-5202",
+   "referenced_type" : "type-5220",
+   "self_type" : "type-5219",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36638,8 +36717,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-5479",
-   "self_type" : "type-5478",
+   "referenced_type" : "type-5496",
+   "self_type" : "type-5495",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36648,8 +36727,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-5638",
-   "self_type" : "type-5637",
+   "referenced_type" : "type-5657",
+   "self_type" : "type-5656",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36658,8 +36737,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-5802",
-   "self_type" : "type-5801",
+   "referenced_type" : "type-5824",
+   "self_type" : "type-5823",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36668,8 +36747,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-5941",
-   "self_type" : "type-5940",
+   "referenced_type" : "type-5963",
+   "self_type" : "type-5962",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36678,8 +36757,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-6092",
-   "self_type" : "type-6091",
+   "referenced_type" : "type-6112",
+   "self_type" : "type-6111",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36688,8 +36767,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-6224",
-   "self_type" : "type-6223",
+   "referenced_type" : "type-6246",
+   "self_type" : "type-6245",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36698,8 +36777,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-6357",
-   "self_type" : "type-6356",
+   "referenced_type" : "type-6382",
+   "self_type" : "type-6381",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36718,8 +36797,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-6460",
-   "self_type" : "type-6459",
+   "referenced_type" : "type-6485",
+   "self_type" : "type-6484",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36728,8 +36807,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-7023",
-   "self_type" : "type-7022",
+   "referenced_type" : "type-7048",
+   "self_type" : "type-7047",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36738,8 +36817,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-7267",
-   "self_type" : "type-7266",
+   "referenced_type" : "type-7291",
+   "self_type" : "type-7290",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36748,8 +36827,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-7400",
-   "self_type" : "type-7399",
+   "referenced_type" : "type-7423",
+   "self_type" : "type-7422",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36758,8 +36837,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-7549",
-   "self_type" : "type-7548",
+   "referenced_type" : "type-7572",
+   "self_type" : "type-7571",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36768,8 +36847,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-7693",
-   "self_type" : "type-7692",
+   "referenced_type" : "type-7716",
+   "self_type" : "type-7715",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36778,8 +36857,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-906",
-   "self_type" : "type-905",
+   "referenced_type" : "type-908",
+   "self_type" : "type-907",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36788,8 +36867,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-1136",
-   "self_type" : "type-1135",
+   "referenced_type" : "type-1141",
+   "self_type" : "type-1140",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36798,8 +36877,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-1327",
-   "self_type" : "type-1326",
+   "referenced_type" : "type-1332",
+   "self_type" : "type-1331",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36808,8 +36887,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-3416",
-   "self_type" : "type-3415",
+   "referenced_type" : "type-3419",
+   "self_type" : "type-3418",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36818,8 +36897,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-3575",
-   "self_type" : "type-3574",
+   "referenced_type" : "type-3580",
+   "self_type" : "type-3579",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36828,8 +36907,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-3739",
-   "self_type" : "type-3738",
+   "referenced_type" : "type-3747",
+   "self_type" : "type-3746",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36838,8 +36917,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-3878",
-   "self_type" : "type-3877",
+   "referenced_type" : "type-3886",
+   "self_type" : "type-3885",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36848,8 +36927,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-4429",
-   "self_type" : "type-4428",
+   "referenced_type" : "type-4437",
+   "self_type" : "type-4436",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36858,8 +36937,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-4636",
-   "self_type" : "type-4635",
+   "referenced_type" : "type-4642",
+   "self_type" : "type-4641",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36868,8 +36947,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-4806",
-   "self_type" : "type-4805",
+   "referenced_type" : "type-4813",
+   "self_type" : "type-4812",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36878,8 +36957,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-5200",
-   "self_type" : "type-5199",
+   "referenced_type" : "type-5218",
+   "self_type" : "type-5217",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36888,8 +36967,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-5477",
-   "self_type" : "type-5476",
+   "referenced_type" : "type-5494",
+   "self_type" : "type-5493",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36898,8 +36977,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-5636",
-   "self_type" : "type-5635",
+   "referenced_type" : "type-5655",
+   "self_type" : "type-5654",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36908,8 +36987,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-5800",
-   "self_type" : "type-5799",
+   "referenced_type" : "type-5822",
+   "self_type" : "type-5821",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36918,8 +36997,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-5939",
-   "self_type" : "type-5938",
+   "referenced_type" : "type-5961",
+   "self_type" : "type-5960",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36928,8 +37007,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-6090",
-   "self_type" : "type-6089",
+   "referenced_type" : "type-6110",
+   "self_type" : "type-6109",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36938,8 +37017,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-6221",
-   "self_type" : "type-6220",
+   "referenced_type" : "type-6244",
+   "self_type" : "type-6243",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36948,8 +37027,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-6355",
-   "self_type" : "type-6354",
+   "referenced_type" : "type-6380",
+   "self_type" : "type-6379",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36968,8 +37047,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-6458",
-   "self_type" : "type-6457",
+   "referenced_type" : "type-6483",
+   "self_type" : "type-6482",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36978,8 +37057,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-7019",
-   "self_type" : "type-7018",
+   "referenced_type" : "type-7046",
+   "self_type" : "type-7045",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36988,8 +37067,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-7265",
-   "self_type" : "type-7264",
+   "referenced_type" : "type-7289",
+   "self_type" : "type-7288",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36998,8 +37077,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-7398",
-   "self_type" : "type-7397",
+   "referenced_type" : "type-7421",
+   "self_type" : "type-7420",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37008,8 +37087,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-7547",
-   "self_type" : "type-7546",
+   "referenced_type" : "type-7570",
+   "self_type" : "type-7569",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37018,8 +37097,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-7691",
-   "self_type" : "type-7690",
+   "referenced_type" : "type-7714",
+   "self_type" : "type-7713",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37028,8 +37107,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-904",
-   "self_type" : "type-903",
+   "referenced_type" : "type-906",
+   "self_type" : "type-905",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37038,8 +37117,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-1132",
-   "self_type" : "type-1131",
+   "referenced_type" : "type-1135",
+   "self_type" : "type-1134",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37048,8 +37127,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-1323",
-   "self_type" : "type-1322",
+   "referenced_type" : "type-1326",
+   "self_type" : "type-1325",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37058,8 +37137,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-3412",
-   "self_type" : "type-3411",
+   "referenced_type" : "type-3415",
+   "self_type" : "type-3414",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37068,8 +37147,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-3571",
-   "self_type" : "type-3570",
+   "referenced_type" : "type-3574",
+   "self_type" : "type-3573",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37078,8 +37157,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-3735",
-   "self_type" : "type-3734",
+   "referenced_type" : "type-3741",
+   "self_type" : "type-3740",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37088,8 +37167,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-3874",
-   "self_type" : "type-3873",
+   "referenced_type" : "type-3880",
+   "self_type" : "type-3879",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37098,8 +37177,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-4425",
-   "self_type" : "type-4424",
+   "referenced_type" : "type-4431",
+   "self_type" : "type-4430",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37108,8 +37187,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-4632",
-   "self_type" : "type-4631",
+   "referenced_type" : "type-4638",
+   "self_type" : "type-4637",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37118,8 +37197,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-4802",
-   "self_type" : "type-4801",
+   "referenced_type" : "type-4809",
+   "self_type" : "type-4808",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37128,8 +37207,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-5196",
-   "self_type" : "type-5195",
+   "referenced_type" : "type-5214",
+   "self_type" : "type-5213",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37138,8 +37217,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-5473",
-   "self_type" : "type-5472",
+   "referenced_type" : "type-5490",
+   "self_type" : "type-5489",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37148,8 +37227,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-5632",
-   "self_type" : "type-5631",
+   "referenced_type" : "type-5649",
+   "self_type" : "type-5648",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37158,8 +37237,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-5796",
-   "self_type" : "type-5795",
+   "referenced_type" : "type-5816",
+   "self_type" : "type-5815",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37168,8 +37247,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-5935",
-   "self_type" : "type-5934",
+   "referenced_type" : "type-5955",
+   "self_type" : "type-5954",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37178,8 +37257,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-6086",
-   "self_type" : "type-6085",
+   "referenced_type" : "type-6106",
+   "self_type" : "type-6105",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37188,8 +37267,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-6217",
-   "self_type" : "type-6216",
+   "referenced_type" : "type-6238",
+   "self_type" : "type-6237",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37198,8 +37277,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-6351",
-   "self_type" : "type-6350",
+   "referenced_type" : "type-6374",
+   "self_type" : "type-6373",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37218,8 +37297,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-6454",
-   "self_type" : "type-6453",
+   "referenced_type" : "type-6477",
+   "self_type" : "type-6476",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37228,8 +37307,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-7015",
-   "self_type" : "type-7014",
+   "referenced_type" : "type-7041",
+   "self_type" : "type-7040",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37238,8 +37317,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-7261",
-   "self_type" : "type-7260",
+   "referenced_type" : "type-7285",
+   "self_type" : "type-7284",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37248,8 +37327,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-7394",
-   "self_type" : "type-7393",
+   "referenced_type" : "type-7417",
+   "self_type" : "type-7416",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37258,8 +37337,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-7543",
-   "self_type" : "type-7542",
+   "referenced_type" : "type-7566",
+   "self_type" : "type-7565",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37268,8 +37347,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-7686",
-   "self_type" : "type-7685",
+   "referenced_type" : "type-7710",
+   "self_type" : "type-7709",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37288,8 +37367,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-1140",
-   "self_type" : "type-1139",
+   "referenced_type" : "type-1145",
+   "self_type" : "type-1144",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37298,8 +37377,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-1333",
-   "self_type" : "type-1332",
+   "referenced_type" : "type-1336",
+   "self_type" : "type-1335",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37308,8 +37387,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-3421",
-   "self_type" : "type-3420",
+   "referenced_type" : "type-3424",
+   "self_type" : "type-3423",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37318,8 +37397,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-3581",
-   "self_type" : "type-3580",
+   "referenced_type" : "type-3584",
+   "self_type" : "type-3583",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37328,8 +37407,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-3743",
-   "self_type" : "type-3742",
+   "referenced_type" : "type-3751",
+   "self_type" : "type-3750",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37338,8 +37417,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-3884",
-   "self_type" : "type-3883",
+   "referenced_type" : "type-3890",
+   "self_type" : "type-3889",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37348,8 +37427,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-4434",
-   "self_type" : "type-4433",
+   "referenced_type" : "type-4441",
+   "self_type" : "type-4440",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37358,8 +37437,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-4640",
-   "self_type" : "type-4639",
+   "referenced_type" : "type-4646",
+   "self_type" : "type-4645",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37368,8 +37447,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-4810",
-   "self_type" : "type-4809",
+   "referenced_type" : "type-4817",
+   "self_type" : "type-4816",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37378,8 +37457,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-5205",
-   "self_type" : "type-5204",
+   "referenced_type" : "type-5222",
+   "self_type" : "type-5221",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37388,8 +37467,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-5482",
-   "self_type" : "type-5481",
+   "referenced_type" : "type-5499",
+   "self_type" : "type-5498",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37398,8 +37477,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-5642",
-   "self_type" : "type-5641",
+   "referenced_type" : "type-5659",
+   "self_type" : "type-5658",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37408,8 +37487,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-5804",
-   "self_type" : "type-5803",
+   "referenced_type" : "type-5826",
+   "self_type" : "type-5825",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37418,8 +37497,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-5945",
-   "self_type" : "type-5944",
+   "referenced_type" : "type-5965",
+   "self_type" : "type-5964",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37428,8 +37507,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-6094",
-   "self_type" : "type-6093",
+   "referenced_type" : "type-6114",
+   "self_type" : "type-6113",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37438,8 +37517,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-6228",
-   "self_type" : "type-6227",
+   "referenced_type" : "type-6248",
+   "self_type" : "type-6247",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37448,8 +37527,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-6359",
-   "self_type" : "type-6358",
+   "referenced_type" : "type-6384",
+   "self_type" : "type-6383",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37458,8 +37537,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-6464",
-   "self_type" : "type-6463",
+   "referenced_type" : "type-6487",
+   "self_type" : "type-6486",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37478,8 +37557,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-7025",
-   "self_type" : "type-7024",
+   "referenced_type" : "type-7050",
+   "self_type" : "type-7049",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37488,8 +37567,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-7269",
-   "self_type" : "type-7268",
+   "referenced_type" : "type-7293",
+   "self_type" : "type-7292",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37498,8 +37577,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-7402",
-   "self_type" : "type-7401",
+   "referenced_type" : "type-7425",
+   "self_type" : "type-7424",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37508,8 +37587,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-7551",
-   "self_type" : "type-7550",
+   "referenced_type" : "type-7574",
+   "self_type" : "type-7573",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37518,8 +37597,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-7695",
-   "self_type" : "type-7694",
+   "referenced_type" : "type-7718",
+   "self_type" : "type-7717",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37538,8 +37617,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-1153",
+   "self_type" : "type-1152",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37548,8 +37627,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-1346",
+   "self_type" : "type-1345",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37558,8 +37637,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3437",
+   "self_type" : "type-3436",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37568,8 +37647,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3592",
+   "self_type" : "type-3591",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37578,8 +37657,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3759",
+   "self_type" : "type-3758",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37588,8 +37667,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3901",
+   "self_type" : "type-3900",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37598,8 +37677,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4449",
+   "self_type" : "type-4448",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37608,8 +37687,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4655",
+   "self_type" : "type-4654",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37618,8 +37697,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4825",
+   "self_type" : "type-4824",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37628,8 +37707,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "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"
   },
@@ -37638,8 +37717,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5234",
+   "self_type" : "type-5233",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37648,8 +37727,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5512",
+   "self_type" : "type-5511",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37658,8 +37737,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5667",
+   "self_type" : "type-5666",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37668,8 +37747,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5834",
+   "self_type" : "type-5833",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37678,8 +37757,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5976",
+   "self_type" : "type-5975",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37688,8 +37767,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6123",
+   "self_type" : "type-6122",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37698,8 +37777,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6256",
+   "self_type" : "type-6255",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37708,8 +37787,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6392",
+   "self_type" : "type-6391",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/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-6497",
+   "self_type" : "type-6496",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37728,8 +37817,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7058",
+   "self_type" : "type-7057",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37738,8 +37827,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7302",
+   "self_type" : "type-7301",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37748,8 +37837,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7433",
+   "self_type" : "type-7432",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37758,18 +37847,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7582",
+   "self_type" : "type-7581",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37788,8 +37867,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-1148",
-   "self_type" : "type-1147",
+   "referenced_type" : "type-1151",
+   "self_type" : "type-1150",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37798,8 +37877,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-1341",
-   "self_type" : "type-1340",
+   "referenced_type" : "type-1344",
+   "self_type" : "type-1343",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37808,8 +37887,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-3432",
-   "self_type" : "type-3431",
+   "referenced_type" : "type-3435",
+   "self_type" : "type-3434",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37818,8 +37897,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-3587",
-   "self_type" : "type-3586",
+   "referenced_type" : "type-3590",
+   "self_type" : "type-3589",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37828,8 +37907,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-3751",
-   "self_type" : "type-3750",
+   "referenced_type" : "type-3757",
+   "self_type" : "type-3756",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37838,8 +37917,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-3893",
-   "self_type" : "type-3892",
+   "referenced_type" : "type-3899",
+   "self_type" : "type-3898",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37848,8 +37927,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-4441",
-   "self_type" : "type-4440",
+   "referenced_type" : "type-4447",
+   "self_type" : "type-4446",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37858,8 +37937,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-4646",
-   "self_type" : "type-4645",
+   "referenced_type" : "type-4653",
+   "self_type" : "type-4652",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37868,8 +37947,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-4817",
-   "self_type" : "type-4816",
+   "referenced_type" : "type-4823",
+   "self_type" : "type-4822",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37878,8 +37957,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-5213",
-   "self_type" : "type-5212",
+   "referenced_type" : "type-5067",
+   "self_type" : "type-5066",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37888,8 +37967,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-5493",
-   "self_type" : "type-5492",
+   "referenced_type" : "type-5232",
+   "self_type" : "type-5231",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37898,8 +37977,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-5648",
-   "self_type" : "type-5647",
+   "referenced_type" : "type-5510",
+   "self_type" : "type-5509",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37908,8 +37987,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-5812",
-   "self_type" : "type-5811",
+   "referenced_type" : "type-5665",
+   "self_type" : "type-5664",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37918,8 +37997,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-5954",
-   "self_type" : "type-5953",
+   "referenced_type" : "type-5832",
+   "self_type" : "type-5831",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37928,8 +38007,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-6101",
-   "self_type" : "type-6100",
+   "referenced_type" : "type-5974",
+   "self_type" : "type-5973",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37938,8 +38017,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-6234",
-   "self_type" : "type-6233",
+   "referenced_type" : "type-6121",
+   "self_type" : "type-6120",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37948,8 +38027,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-6367",
-   "self_type" : "type-6366",
+   "referenced_type" : "type-6254",
+   "self_type" : "type-6253",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37958,8 +38037,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6390",
+   "self_type" : "type-6389",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-6495",
+   "self_type" : "type-6494",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37978,8 +38067,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-7033",
-   "self_type" : "type-7032",
+   "referenced_type" : "type-7056",
+   "self_type" : "type-7055",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37988,8 +38077,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-7276",
-   "self_type" : "type-7275",
+   "referenced_type" : "type-7300",
+   "self_type" : "type-7299",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37998,8 +38087,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-7408",
-   "self_type" : "type-7407",
+   "referenced_type" : "type-7431",
+   "self_type" : "type-7430",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38008,18 +38097,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-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",
+   "referenced_type" : "type-7580",
+   "self_type" : "type-7579",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38038,8 +38117,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-1146",
-   "self_type" : "type-1145",
+   "referenced_type" : "type-1149",
+   "self_type" : "type-1148",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38048,8 +38127,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-1339",
-   "self_type" : "type-1338",
+   "referenced_type" : "type-1342",
+   "self_type" : "type-1341",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38058,8 +38137,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-3430",
-   "self_type" : "type-3429",
+   "referenced_type" : "type-3433",
+   "self_type" : "type-3432",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38068,8 +38147,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-3585",
-   "self_type" : "type-3584",
+   "referenced_type" : "type-3588",
+   "self_type" : "type-3587",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38078,8 +38157,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-3749",
-   "self_type" : "type-3748",
+   "referenced_type" : "type-3755",
+   "self_type" : "type-3754",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38088,8 +38167,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-3891",
-   "self_type" : "type-3890",
+   "referenced_type" : "type-3897",
+   "self_type" : "type-3896",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38098,8 +38177,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-4439",
-   "self_type" : "type-4438",
+   "referenced_type" : "type-4445",
+   "self_type" : "type-4444",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38108,8 +38187,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-4644",
-   "self_type" : "type-4643",
+   "referenced_type" : "type-4650",
+   "self_type" : "type-4649",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38118,8 +38197,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-4815",
-   "self_type" : "type-4814",
+   "referenced_type" : "type-4821",
+   "self_type" : "type-4820",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38128,8 +38207,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-5211",
-   "self_type" : "type-5210",
+   "referenced_type" : "type-5065",
+   "self_type" : "type-5064",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38138,8 +38217,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-5491",
-   "self_type" : "type-5490",
+   "referenced_type" : "type-5229",
+   "self_type" : "type-5228",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38148,8 +38227,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-5646",
-   "self_type" : "type-5645",
+   "referenced_type" : "type-5508",
+   "self_type" : "type-5507",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38158,8 +38237,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-5810",
-   "self_type" : "type-5809",
+   "referenced_type" : "type-5663",
+   "self_type" : "type-5662",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38168,8 +38247,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-5952",
-   "self_type" : "type-5951",
+   "referenced_type" : "type-5830",
+   "self_type" : "type-5829",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38178,8 +38257,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-6099",
-   "self_type" : "type-6098",
+   "referenced_type" : "type-5972",
+   "self_type" : "type-5971",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38188,8 +38267,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-6232",
-   "self_type" : "type-6231",
+   "referenced_type" : "type-6119",
+   "self_type" : "type-6118",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38198,8 +38277,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-6365",
-   "self_type" : "type-6364",
+   "referenced_type" : "type-6252",
+   "self_type" : "type-6251",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38208,8 +38287,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6388",
+   "self_type" : "type-6387",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-6493",
+   "self_type" : "type-6492",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38228,8 +38317,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-7031",
-   "self_type" : "type-7030",
+   "referenced_type" : "type-7054",
+   "self_type" : "type-7053",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38238,8 +38327,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-7274",
-   "self_type" : "type-7273",
+   "referenced_type" : "type-7298",
+   "self_type" : "type-7297",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38248,8 +38337,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-7406",
-   "self_type" : "type-7405",
+   "referenced_type" : "type-7429",
+   "self_type" : "type-7428",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38258,18 +38347,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-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",
+   "referenced_type" : "type-7578",
+   "self_type" : "type-7577",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38288,8 +38367,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-1144",
-   "self_type" : "type-1143",
+   "referenced_type" : "type-1147",
+   "self_type" : "type-1146",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38298,8 +38377,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-1337",
-   "self_type" : "type-1336",
+   "referenced_type" : "type-1340",
+   "self_type" : "type-1339",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38308,8 +38387,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-3428",
-   "self_type" : "type-3427",
+   "referenced_type" : "type-3431",
+   "self_type" : "type-3430",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38318,8 +38397,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-3583",
-   "self_type" : "type-3582",
+   "referenced_type" : "type-3586",
+   "self_type" : "type-3585",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38328,8 +38407,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-3747",
-   "self_type" : "type-3746",
+   "referenced_type" : "type-3753",
+   "self_type" : "type-3752",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38338,8 +38417,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-3889",
-   "self_type" : "type-3888",
+   "referenced_type" : "type-3895",
+   "self_type" : "type-3894",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38348,8 +38427,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-4437",
-   "self_type" : "type-4436",
+   "referenced_type" : "type-4443",
+   "self_type" : "type-4442",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38358,8 +38437,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-4642",
-   "self_type" : "type-4641",
+   "referenced_type" : "type-4648",
+   "self_type" : "type-4647",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38368,8 +38447,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-4813",
-   "self_type" : "type-4812",
+   "referenced_type" : "type-4819",
+   "self_type" : "type-4818",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38378,8 +38457,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-5209",
-   "self_type" : "type-5208",
+   "referenced_type" : "type-5227",
+   "self_type" : "type-5226",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38388,8 +38467,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-5489",
-   "self_type" : "type-5488",
+   "referenced_type" : "type-5506",
+   "self_type" : "type-5505",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38398,8 +38477,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-5644",
-   "self_type" : "type-5643",
+   "referenced_type" : "type-5661",
+   "self_type" : "type-5660",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38408,8 +38487,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-5808",
-   "self_type" : "type-5807",
+   "referenced_type" : "type-5828",
+   "self_type" : "type-5827",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38418,8 +38497,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-5950",
-   "self_type" : "type-5949",
+   "referenced_type" : "type-5970",
+   "self_type" : "type-5969",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38428,8 +38507,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-6097",
-   "self_type" : "type-6096",
+   "referenced_type" : "type-6117",
+   "self_type" : "type-6116",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38438,8 +38517,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-6230",
-   "self_type" : "type-6229",
+   "referenced_type" : "type-6250",
+   "self_type" : "type-6249",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38448,8 +38527,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-6363",
-   "self_type" : "type-6362",
+   "referenced_type" : "type-6386",
+   "self_type" : "type-6385",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38458,8 +38537,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-6468",
-   "self_type" : "type-6467",
+   "referenced_type" : "type-6491",
+   "self_type" : "type-6490",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38478,8 +38557,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-7029",
-   "self_type" : "type-7028",
+   "referenced_type" : "type-7052",
+   "self_type" : "type-7051",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38488,8 +38567,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-7272",
-   "self_type" : "type-7271",
+   "referenced_type" : "type-7296",
+   "self_type" : "type-7295",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38498,8 +38577,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-7404",
-   "self_type" : "type-7403",
+   "referenced_type" : "type-7427",
+   "self_type" : "type-7426",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38508,8 +38587,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-7553",
-   "self_type" : "type-7552",
+   "referenced_type" : "type-7576",
+   "self_type" : "type-7575",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38518,8 +38597,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-7698",
-   "self_type" : "type-7697",
+   "referenced_type" : "type-7720",
+   "self_type" : "type-7719",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38538,8 +38617,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-1152",
-   "self_type" : "type-1151",
+   "referenced_type" : "type-1155",
+   "self_type" : "type-1154",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38548,8 +38627,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-1345",
-   "self_type" : "type-1344",
+   "referenced_type" : "type-1348",
+   "self_type" : "type-1347",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38558,8 +38637,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-3436",
-   "self_type" : "type-3435",
+   "referenced_type" : "type-3439",
+   "self_type" : "type-3438",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38568,8 +38647,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-3591",
-   "self_type" : "type-3590",
+   "referenced_type" : "type-3594",
+   "self_type" : "type-3593",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38578,8 +38657,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-3755",
-   "self_type" : "type-3754",
+   "referenced_type" : "type-3761",
+   "self_type" : "type-3760",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38588,8 +38667,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-3897",
-   "self_type" : "type-3896",
+   "referenced_type" : "type-3903",
+   "self_type" : "type-3902",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38598,8 +38677,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-4445",
-   "self_type" : "type-4444",
+   "referenced_type" : "type-4451",
+   "self_type" : "type-4450",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38608,8 +38687,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-4650",
-   "self_type" : "type-4649",
+   "referenced_type" : "type-4657",
+   "self_type" : "type-4656",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38618,8 +38697,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-4821",
-   "self_type" : "type-4820",
+   "referenced_type" : "type-4827",
+   "self_type" : "type-4826",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38628,8 +38707,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-5218",
-   "self_type" : "type-5217",
+   "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"
   },
@@ -38638,8 +38717,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-5497",
-   "self_type" : "type-5496",
+   "referenced_type" : "type-5236",
+   "self_type" : "type-5235",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38648,8 +38727,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-5652",
-   "self_type" : "type-5651",
+   "referenced_type" : "type-5514",
+   "self_type" : "type-5513",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38658,8 +38737,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-5816",
-   "self_type" : "type-5815",
+   "referenced_type" : "type-5669",
+   "self_type" : "type-5668",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38668,8 +38747,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-5958",
-   "self_type" : "type-5957",
+   "referenced_type" : "type-5836",
+   "self_type" : "type-5835",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38678,8 +38757,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-6105",
-   "self_type" : "type-6104",
+   "referenced_type" : "type-5978",
+   "self_type" : "type-5977",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38688,8 +38767,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-6238",
-   "self_type" : "type-6237",
+   "referenced_type" : "type-6125",
+   "self_type" : "type-6124",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38698,8 +38777,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-6371",
-   "self_type" : "type-6370",
+   "referenced_type" : "type-6258",
+   "self_type" : "type-6257",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38708,8 +38787,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6394",
+   "self_type" : "type-6393",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/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-6499",
+   "self_type" : "type-6498",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38728,8 +38817,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-7037",
-   "self_type" : "type-7036",
+   "referenced_type" : "type-7060",
+   "self_type" : "type-7059",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38738,8 +38827,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-7280",
-   "self_type" : "type-7279",
+   "referenced_type" : "type-7304",
+   "self_type" : "type-7303",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38748,8 +38837,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-7412",
-   "self_type" : "type-7411",
+   "referenced_type" : "type-7435",
+   "self_type" : "type-7434",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38758,18 +38847,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-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",
+   "referenced_type" : "type-7584",
+   "self_type" : "type-7583",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38798,8 +38877,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-1113",
-   "self_type" : "type-1112",
+   "referenced_type" : "type-1116",
+   "self_type" : "type-1115",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38808,8 +38887,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-1290",
-   "self_type" : "type-1289",
+   "referenced_type" : "type-1293",
+   "self_type" : "type-1292",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38818,8 +38897,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-3355",
-   "self_type" : "type-3354",
+   "referenced_type" : "type-3358",
+   "self_type" : "type-3357",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38828,8 +38907,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-3542",
-   "self_type" : "type-3541",
+   "referenced_type" : "type-3545",
+   "self_type" : "type-3544",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38838,8 +38917,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-3651",
-   "self_type" : "type-3650",
+   "referenced_type" : "type-3654",
+   "self_type" : "type-3653",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38848,8 +38927,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-3715",
-   "self_type" : "type-3714",
+   "referenced_type" : "type-3722",
+   "self_type" : "type-3721",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38858,8 +38937,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-3839",
-   "self_type" : "type-3838",
+   "referenced_type" : "type-3845",
+   "self_type" : "type-3844",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38868,8 +38947,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-4393",
-   "self_type" : "type-4392",
+   "referenced_type" : "type-4401",
+   "self_type" : "type-4400",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38878,8 +38957,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-4508",
-   "self_type" : "type-4507",
+   "referenced_type" : "type-4515",
+   "self_type" : "type-4514",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38888,8 +38967,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-4544",
-   "self_type" : "type-4543",
+   "referenced_type" : "type-4553",
+   "self_type" : "type-4552",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38898,8 +38977,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-4603",
-   "self_type" : "type-4602",
+   "referenced_type" : "type-4609",
+   "self_type" : "type-4608",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38908,8 +38987,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-4773",
-   "self_type" : "type-4772",
+   "referenced_type" : "type-4780",
+   "self_type" : "type-4779",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38918,8 +38997,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-4851",
-   "self_type" : "type-4850",
+   "referenced_type" : "type-4857",
+   "self_type" : "type-4856",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38928,8 +39007,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-5112",
-   "self_type" : "type-5111",
+   "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"
   },
@@ -38938,8 +39017,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5128",
+   "self_type" : "type-5127",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-5184",
+   "self_type" : "type-5183",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38958,8 +39047,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-5416",
-   "self_type" : "type-5415",
+   "referenced_type" : "type-5433",
+   "self_type" : "type-5432",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38968,8 +39057,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-5603",
-   "self_type" : "type-5602",
+   "referenced_type" : "type-5620",
+   "self_type" : "type-5619",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38978,8 +39067,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-5712",
-   "self_type" : "type-5711",
+   "referenced_type" : "type-5729",
+   "self_type" : "type-5728",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38988,8 +39077,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-5776",
-   "self_type" : "type-5775",
+   "referenced_type" : "type-5797",
+   "self_type" : "type-5796",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38998,8 +39087,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-5900",
-   "self_type" : "type-5899",
+   "referenced_type" : "type-5920",
+   "self_type" : "type-5919",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39008,8 +39097,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-6056",
-   "self_type" : "type-6055",
+   "referenced_type" : "type-6077",
+   "self_type" : "type-6076",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39018,8 +39107,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-6189",
-   "self_type" : "type-6188",
+   "referenced_type" : "type-6209",
+   "self_type" : "type-6208",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39028,8 +39117,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-6285",
-   "self_type" : "type-6284",
+   "referenced_type" : "type-6305",
+   "self_type" : "type-6304",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39038,8 +39127,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-6331",
-   "self_type" : "type-6330",
+   "referenced_type" : "type-6355",
+   "self_type" : "type-6354",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39048,8 +39137,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-6423",
-   "self_type" : "type-6422",
+   "referenced_type" : "type-6447",
+   "self_type" : "type-6446",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39058,8 +39147,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-6979",
-   "self_type" : "type-6978",
+   "referenced_type" : "type-7005",
+   "self_type" : "type-7004",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39068,8 +39157,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-7098",
-   "self_type" : "type-7097",
+   "referenced_type" : "type-7123",
+   "self_type" : "type-7122",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39078,8 +39167,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-7149",
-   "self_type" : "type-7148",
+   "referenced_type" : "type-7174",
+   "self_type" : "type-7173",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39088,8 +39177,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-7227",
-   "self_type" : "type-7226",
+   "referenced_type" : "type-7252",
+   "self_type" : "type-7251",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39098,8 +39187,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-7368",
-   "self_type" : "type-7367",
+   "referenced_type" : "type-7391",
+   "self_type" : "type-7390",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39108,8 +39197,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-7432",
-   "self_type" : "type-7431",
+   "referenced_type" : "type-7457",
+   "self_type" : "type-7456",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39118,8 +39207,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-7472",
-   "self_type" : "type-7471",
+   "referenced_type" : "type-7496",
+   "self_type" : "type-7495",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39128,8 +39217,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-7563",
-   "self_type" : "type-7562",
+   "referenced_type" : "type-7586",
+   "self_type" : "type-7585",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39138,18 +39227,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-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",
+   "referenced_type" : "type-7626",
+   "self_type" : "type-7625",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39168,8 +39247,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-4760",
-   "self_type" : "type-4759",
+   "referenced_type" : "type-4767",
+   "self_type" : "type-4766",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39178,8 +39257,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-4864",
-   "self_type" : "type-4863",
+   "referenced_type" : "type-4870",
+   "self_type" : "type-4869",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39188,8 +39267,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-5071",
-   "self_type" : "type-5070",
+   "referenced_type" : "type-5087",
+   "self_type" : "type-5086",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39198,8 +39277,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-5124",
-   "self_type" : "type-5123",
+   "referenced_type" : "type-5140",
+   "self_type" : "type-5139",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39208,8 +39287,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-7358",
-   "self_type" : "type-7357",
+   "referenced_type" : "type-7381",
+   "self_type" : "type-7380",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39218,8 +39297,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-7451",
-   "self_type" : "type-7450",
+   "referenced_type" : "type-7476",
+   "self_type" : "type-7475",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39228,8 +39307,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-7579",
-   "self_type" : "type-7578",
+   "referenced_type" : "type-7603",
+   "self_type" : "type-7602",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39238,8 +39317,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-2644",
-   "self_type" : "type-2643",
+   "referenced_type" : "type-2647",
+   "self_type" : "type-2646",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39248,8 +39327,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-4988",
-   "self_type" : "type-4987",
+   "referenced_type" : "type-4994",
+   "self_type" : "type-4993",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39258,8 +39337,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-6020",
-   "self_type" : "type-6019",
+   "referenced_type" : "type-6042",
+   "self_type" : "type-6041",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39268,8 +39347,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-7514",
-   "self_type" : "type-7513",
+   "referenced_type" : "type-7530",
+   "self_type" : "type-7529",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39278,8 +39357,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-2640",
-   "self_type" : "type-2639",
+   "referenced_type" : "type-2643",
+   "self_type" : "type-2642",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39288,8 +39367,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-4984",
-   "self_type" : "type-4983",
+   "referenced_type" : "type-4990",
+   "self_type" : "type-4989",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39298,8 +39377,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-6017",
-   "self_type" : "type-6016",
+   "referenced_type" : "type-6037",
+   "self_type" : "type-6036",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39308,8 +39387,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-7498",
-   "self_type" : "type-7497",
+   "referenced_type" : "type-7517",
+   "self_type" : "type-7516",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39318,8 +39397,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-4753",
-   "self_type" : "type-4752",
+   "referenced_type" : "type-4759",
+   "self_type" : "type-4758",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39328,8 +39407,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-4860",
-   "self_type" : "type-4859",
+   "referenced_type" : "type-4866",
+   "self_type" : "type-4865",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39338,8 +39417,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-5060",
-   "self_type" : "type-5059",
+   "referenced_type" : "type-5077",
+   "self_type" : "type-5076",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39348,8 +39427,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-5120",
-   "self_type" : "type-5119",
+   "referenced_type" : "type-5136",
+   "self_type" : "type-5135",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39358,8 +39437,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-7352",
-   "self_type" : "type-7351",
+   "referenced_type" : "type-7375",
+   "self_type" : "type-7374",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39368,8 +39447,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-7447",
-   "self_type" : "type-7446",
+   "referenced_type" : "type-7470",
+   "self_type" : "type-7469",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39378,8 +39457,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-7569",
-   "self_type" : "type-7568",
+   "referenced_type" : "type-7594",
+   "self_type" : "type-7593",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39388,8 +39467,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-1644",
-   "self_type" : "type-1643",
+   "referenced_type" : "type-1647",
+   "self_type" : "type-1646",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -39398,8 +39477,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-4105",
-   "self_type" : "type-4104",
+   "referenced_type" : "type-4112",
+   "self_type" : "type-4111",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -39408,8 +39487,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-6678",
-   "self_type" : "type-6677",
+   "referenced_type" : "type-6701",
+   "self_type" : "type-6700",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -39428,8 +39507,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1108",
-   "self_type" : "type-1107",
+   "referenced_type" : "type-1111",
+   "self_type" : "type-1110",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39438,8 +39517,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1280",
-   "self_type" : "type-1279",
+   "referenced_type" : "type-1283",
+   "self_type" : "type-1282",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39448,8 +39527,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-3275",
+   "self_type" : "type-3274",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39458,8 +39537,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-3539",
+   "self_type" : "type-3538",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39468,8 +39547,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-3649",
+   "self_type" : "type-3648",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39478,8 +39557,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-3715",
+   "self_type" : "type-3714",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39488,8 +39567,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-3837",
+   "self_type" : "type-3836",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39508,8 +39587,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-4358",
+   "self_type" : "type-4357",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39518,8 +39597,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-4493",
+   "self_type" : "type-4492",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39528,8 +39607,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-4562",
+   "self_type" : "type-4561",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39538,8 +39617,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-4624",
+   "self_type" : "type-4623",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39548,8 +39627,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-4667",
+   "self_type" : "type-4666",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39558,8 +39637,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-4874",
+   "self_type" : "type-4873",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39568,8 +39647,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-5144",
+   "self_type" : "type-5143",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39578,8 +39657,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-5174",
+   "self_type" : "type-5173",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39588,8 +39667,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-5350",
+   "self_type" : "type-5349",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39598,8 +39677,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-5614",
+   "self_type" : "type-5613",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39608,8 +39687,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-5724",
+   "self_type" : "type-5723",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39618,8 +39697,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-5790",
+   "self_type" : "type-5789",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39628,8 +39707,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-5912",
+   "self_type" : "type-5911",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39638,8 +39717,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6067",
+   "self_type" : "type-6066",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39648,8 +39727,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6204",
+   "self_type" : "type-6203",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39658,8 +39737,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6300",
+   "self_type" : "type-6299",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39668,8 +39747,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6347",
+   "self_type" : "type-6346",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39678,8 +39757,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6439",
+   "self_type" : "type-6438",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39688,8 +39767,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6960",
+   "self_type" : "type-6959",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39698,8 +39777,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7098",
+   "self_type" : "type-7097",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39708,8 +39787,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7187",
+   "self_type" : "type-7186",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39718,8 +39797,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7268",
+   "self_type" : "type-7267",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39728,8 +39807,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7313",
+   "self_type" : "type-7312",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39738,8 +39817,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7481",
+   "self_type" : "type-7480",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39748,8 +39827,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7506",
+   "self_type" : "type-7505",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39758,8 +39837,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7511",
+   "self_type" : "type-7510",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39768,8 +39847,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7639",
+   "self_type" : "type-7638",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39778,8 +39857,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7650",
+   "self_type" : "type-7649",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39798,8 +39877,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-4376",
-   "self_type" : "type-4375",
+   "referenced_type" : "type-4383",
+   "self_type" : "type-4382",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -39808,8 +39887,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-4505",
-   "self_type" : "type-4504",
+   "referenced_type" : "type-4511",
+   "self_type" : "type-4510",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -39818,8 +39897,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-6960",
-   "self_type" : "type-6959",
+   "referenced_type" : "type-6984",
+   "self_type" : "type-6983",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -39828,8 +39907,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-7093",
-   "self_type" : "type-7092",
+   "referenced_type" : "type-7118",
+   "self_type" : "type-7117",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -39869,7 +39948,7 @@
    "linker_set_key" : "const unsigned short",
    "name" : "const unsigned short",
    "referenced_type" : "type-497",
-   "self_type" : "type-2520",
+   "self_type" : "type-2523",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39897,7 +39976,7 @@
    "linker_set_key" : "volatile int",
    "name" : "volatile int",
    "referenced_type" : "type-4",
-   "self_type" : "type-1250",
+   "self_type" : "type-1253",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h"
   }
@@ -39915,7 +39994,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -39930,8 +40009,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_BALANCETYPE",
    "name" : "OMX_AUDIO_CONFIG_BALANCETYPE",
-   "referenced_type" : "type-2184",
-   "self_type" : "type-2184",
+   "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_BALANCETYPE"
@@ -39947,7 +40026,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -39957,7 +40036,7 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nBass",
@@ -39967,8 +40046,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_BASSTYPE",
    "name" : "OMX_AUDIO_CONFIG_BASSTYPE",
-   "referenced_type" : "type-2188",
-   "self_type" : "type-2188",
+   "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_BASSTYPE"
@@ -39984,7 +40063,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -39999,18 +40078,18 @@
     {
      "field_name" : "bMute",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bIsMIDI",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
    "name" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
-   "referenced_type" : "type-2186",
-   "self_type" : "type-2186",
+   "referenced_type" : "type-2189",
+   "self_type" : "type-2189",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE"
@@ -40026,7 +40105,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40041,23 +40120,23 @@
     {
      "field_name" : "bLinear",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "sVolume",
      "field_offset" : 160,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     },
     {
      "field_name" : "bIsMIDI",
      "field_offset" : 256,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
    "name" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
-   "referenced_type" : "type-2183",
-   "self_type" : "type-2183",
+   "referenced_type" : "type-2186",
+   "self_type" : "type-2186",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE"
@@ -40073,7 +40152,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40083,17 +40162,17 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "sDelay",
      "field_offset" : 128,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "sModulationRate",
      "field_offset" : 224,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "nModulationDepth",
@@ -40103,13 +40182,13 @@
     {
      "field_name" : "nFeedback",
      "field_offset" : 352,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
    "name" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
-   "referenced_type" : "type-2194",
-   "self_type" : "type-2194",
+   "referenced_type" : "type-2197",
+   "self_type" : "type-2197",
    "size" : 56,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHORUSTYPE"
@@ -40125,7 +40204,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40135,13 +40214,13 @@
     {
      "field_name" : "eEchoCancelation",
      "field_offset" : 96,
-     "referenced_type" : "type-2196"
+     "referenced_type" : "type-2199"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
-   "referenced_type" : "type-2197",
-   "self_type" : "type-2197",
+   "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_ECHOCANCELATIONTYPE"
@@ -40157,7 +40236,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40167,28 +40246,28 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "sBandIndex",
      "field_offset" : 128,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "sCenterFreq",
      "field_offset" : 224,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "sBandLevel",
      "field_offset" : 320,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
    "name" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
-   "referenced_type" : "type-2191",
-   "self_type" : "type-2191",
+   "referenced_type" : "type-2194",
+   "self_type" : "type-2194",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE"
@@ -40204,7 +40283,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40214,13 +40293,13 @@
     {
      "field_name" : "bLoudness",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
    "name" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
-   "referenced_type" : "type-2187",
-   "self_type" : "type-2187",
+   "referenced_type" : "type-2190",
+   "self_type" : "type-2190",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE"
@@ -40236,7 +40315,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40246,17 +40325,17 @@
     {
      "field_name" : "sPitchTransposition",
      "field_offset" : 96,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     },
     {
      "field_name" : "sPlayBackRate",
      "field_offset" : 192,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "sTempo",
      "field_offset" : 288,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "nMaxPolyphony",
@@ -40306,8 +40385,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
-   "referenced_type" : "type-2165",
-   "self_type" : "type-2165",
+   "referenced_type" : "type-2157",
+   "self_type" : "type-2157",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE"
@@ -40323,7 +40402,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40338,13 +40417,13 @@
     {
      "field_name" : "nMidiEvents",
      "field_offset" : 128,
-     "referenced_type" : "type-1572"
+     "referenced_type" : "type-1567"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
-   "referenced_type" : "type-2143",
-   "self_type" : "type-2143",
+   "referenced_type" : "type-2135",
+   "self_type" : "type-2135",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE"
@@ -40360,7 +40439,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40380,13 +40459,13 @@
     {
      "field_name" : "nData",
      "field_offset" : 160,
-     "referenced_type" : "type-1572"
+     "referenced_type" : "type-1567"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
-   "referenced_type" : "type-2181",
-   "self_type" : "type-2181",
+   "referenced_type" : "type-2184",
+   "self_type" : "type-2184",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE"
@@ -40402,7 +40481,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40437,8 +40516,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
-   "referenced_type" : "type-2176",
-   "self_type" : "type-2176",
+   "referenced_type" : "type-2179",
+   "self_type" : "type-2179",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE"
@@ -40454,7 +40533,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40484,8 +40563,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
-   "referenced_type" : "type-2154",
-   "self_type" : "type-2154",
+   "referenced_type" : "type-2146",
+   "self_type" : "type-2146",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE"
@@ -40501,7 +40580,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40526,7 +40605,7 @@
     {
      "field_name" : "bVibra",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nNumMetaEvents",
@@ -40541,13 +40620,13 @@
     {
      "field_name" : "eMIDIPlayBackState",
      "field_offset" : 288,
-     "referenced_type" : "type-2169"
+     "referenced_type" : "type-2168"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
-   "referenced_type" : "type-2170",
-   "self_type" : "type-2170",
+   "referenced_type" : "type-2173",
+   "self_type" : "type-2173",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE"
@@ -40563,7 +40642,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40573,13 +40652,13 @@
     {
      "field_name" : "bMute",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MUTETYPE",
    "name" : "OMX_AUDIO_CONFIG_MUTETYPE",
-   "referenced_type" : "type-2185",
-   "self_type" : "type-2185",
+   "referenced_type" : "type-2188",
+   "self_type" : "type-2188",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MUTETYPE"
@@ -40595,7 +40674,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40605,13 +40684,13 @@
     {
      "field_name" : "bNoiseReduction",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
-   "referenced_type" : "type-2198",
-   "self_type" : "type-2198",
+   "referenced_type" : "type-2201",
+   "self_type" : "type-2201",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE"
@@ -40627,7 +40706,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40637,47 +40716,47 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "sRoomLevel",
      "field_offset" : 128,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     },
     {
      "field_name" : "sRoomHighFreqLevel",
      "field_offset" : 224,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     },
     {
      "field_name" : "sReflectionsLevel",
      "field_offset" : 320,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     },
     {
      "field_name" : "sReflectionsDelay",
      "field_offset" : 416,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "sReverbLevel",
      "field_offset" : 512,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     },
     {
      "field_name" : "sReverbDelay",
      "field_offset" : 608,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "sDecayTime",
      "field_offset" : 704,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "nDecayHighFreqRatio",
      "field_offset" : 800,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "nDensity",
@@ -40692,13 +40771,13 @@
     {
      "field_name" : "sReferenceHighFreq",
      "field_offset" : 960,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
-   "referenced_type" : "type-2195",
-   "self_type" : "type-2195",
+   "referenced_type" : "type-2198",
+   "self_type" : "type-2198",
    "size" : 132,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE"
@@ -40714,7 +40793,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40724,12 +40803,12 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eWideningType",
      "field_offset" : 128,
-     "referenced_type" : "type-2192"
+     "referenced_type" : "type-2195"
     },
     {
      "field_name" : "nStereoWidening",
@@ -40739,8 +40818,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
    "name" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-2193",
-   "self_type" : "type-2193",
+   "referenced_type" : "type-2196",
+   "self_type" : "type-2196",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE"
@@ -40756,7 +40835,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40766,7 +40845,7 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nTreble",
@@ -40776,8 +40855,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_TREBLETYPE",
    "name" : "OMX_AUDIO_CONFIG_TREBLETYPE",
-   "referenced_type" : "type-2189",
-   "self_type" : "type-2189",
+   "referenced_type" : "type-2192",
+   "self_type" : "type-2192",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_TREBLETYPE"
@@ -40793,7 +40872,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40803,18 +40882,18 @@
     {
      "field_name" : "bLinear",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "sVolume",
      "field_offset" : 128,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
    "name" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
-   "referenced_type" : "type-2182",
-   "self_type" : "type-2182",
+   "referenced_type" : "type-2185",
+   "self_type" : "type-2185",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_VOLUMETYPE"
@@ -40830,7 +40909,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40875,23 +40954,23 @@
     {
      "field_name" : "eAACProfile",
      "field_offset" : 320,
-     "referenced_type" : "type-1676"
+     "referenced_type" : "type-1671"
     },
     {
      "field_name" : "eAACStreamFormat",
      "field_offset" : 352,
-     "referenced_type" : "type-1668"
+     "referenced_type" : "type-1670"
     },
     {
      "field_name" : "eChannelMode",
      "field_offset" : 384,
-     "referenced_type" : "type-1652"
+     "referenced_type" : "type-1651"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
    "name" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
-   "referenced_type" : "type-1687",
-   "self_type" : "type-1687",
+   "referenced_type" : "type-1679",
+   "self_type" : "type-1679",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_AACPROFILETYPE"
@@ -40907,7 +40986,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40932,8 +41011,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_ADPCMTYPE",
    "name" : "OMX_AUDIO_PARAM_ADPCMTYPE",
-   "referenced_type" : "type-1798",
-   "self_type" : "type-1798",
+   "referenced_type" : "type-1789",
+   "self_type" : "type-1789",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_ADPCMTYPE"
@@ -40949,7 +41028,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40969,23 +41048,23 @@
     {
      "field_name" : "eAMRBandMode",
      "field_offset" : 160,
-     "referenced_type" : "type-1890"
+     "referenced_type" : "type-1881"
     },
     {
      "field_name" : "eAMRDTXMode",
      "field_offset" : 192,
-     "referenced_type" : "type-1901"
+     "referenced_type" : "type-1892"
     },
     {
      "field_name" : "eAMRFrameFormat",
      "field_offset" : 224,
-     "referenced_type" : "type-1877"
+     "referenced_type" : "type-1862"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_AMRTYPE",
    "name" : "OMX_AUDIO_PARAM_AMRTYPE",
-   "referenced_type" : "type-1912",
-   "self_type" : "type-1912",
+   "referenced_type" : "type-1903",
+   "self_type" : "type-1903",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_AMRTYPE"
@@ -41001,7 +41080,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41016,12 +41095,12 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-2021"
+     "referenced_type" : "type-2013"
     },
     {
      "field_name" : "bRATE_REDUCon",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nMinBitRate",
@@ -41036,23 +41115,23 @@
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 256,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bNoiseSuppressor",
      "field_offset" : 288,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_EVRCTYPE",
    "name" : "OMX_AUDIO_PARAM_EVRCTYPE",
-   "referenced_type" : "type-2055",
-   "self_type" : "type-2055",
+   "referenced_type" : "type-2046",
+   "self_type" : "type-2046",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_EVRCTYPE"
@@ -41068,7 +41147,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41093,8 +41172,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_FLACTYPE",
    "name" : "OMX_AUDIO_PARAM_FLACTYPE",
-   "referenced_type" : "type-1709",
-   "self_type" : "type-1709",
+   "referenced_type" : "type-1700",
+   "self_type" : "type-1700",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_FLACTYPE"
@@ -41110,7 +41189,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41125,28 +41204,28 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eBitRate",
      "field_offset" : 160,
-     "referenced_type" : "type-1808"
+     "referenced_type" : "type-1799"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G723TYPE",
    "name" : "OMX_AUDIO_PARAM_G723TYPE",
-   "referenced_type" : "type-1818",
-   "self_type" : "type-1818",
+   "referenced_type" : "type-1812",
+   "self_type" : "type-1812",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G723TYPE"
@@ -41162,7 +41241,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41177,13 +41256,13 @@
     {
      "field_name" : "eG726Mode",
      "field_offset" : 128,
-     "referenced_type" : "type-1831"
+     "referenced_type" : "type-1822"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G726TYPE",
    "name" : "OMX_AUDIO_PARAM_G726TYPE",
-   "referenced_type" : "type-1841",
-   "self_type" : "type-1841",
+   "referenced_type" : "type-1832",
+   "self_type" : "type-1832",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G726TYPE"
@@ -41199,7 +41278,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41214,18 +41293,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eBitType",
      "field_offset" : 160,
-     "referenced_type" : "type-1851"
+     "referenced_type" : "type-1845"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G729TYPE",
    "name" : "OMX_AUDIO_PARAM_G729TYPE",
-   "referenced_type" : "type-1860",
-   "self_type" : "type-1860",
+   "referenced_type" : "type-1855",
+   "self_type" : "type-1855",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G729TYPE"
@@ -41241,7 +41320,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41251,18 +41330,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
-   "referenced_type" : "type-1945",
-   "self_type" : "type-1945",
+   "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_GSMEFRTYPE"
@@ -41278,7 +41357,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41288,18 +41367,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMFRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMFRTYPE",
-   "referenced_type" : "type-1923",
-   "self_type" : "type-1923",
+   "referenced_type" : "type-1914",
+   "self_type" : "type-1914",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_GSMFRTYPE"
@@ -41315,7 +41394,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41325,18 +41404,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMHRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMHRTYPE",
-   "referenced_type" : "type-1934",
-   "self_type" : "type-1934",
+   "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_GSMHRTYPE"
@@ -41352,7 +41431,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41377,18 +41456,18 @@
     {
      "field_name" : "eMidiSoundBank",
      "field_offset" : 192,
-     "referenced_type" : "type-2111"
+     "referenced_type" : "type-2102"
     },
     {
      "field_name" : "eMidiSoundBankLayout",
      "field_offset" : 224,
-     "referenced_type" : "type-2121"
+     "referenced_type" : "type-2113"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
    "name" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
-   "referenced_type" : "type-2132",
-   "self_type" : "type-2132",
+   "referenced_type" : "type-2124",
+   "self_type" : "type-2124",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE"
@@ -41404,7 +41483,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41419,23 +41498,23 @@
     {
      "field_name" : "sMaxPolyphony",
      "field_offset" : 128,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "bLoadDefaultSound",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eMidiFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-2087"
+     "referenced_type" : "type-2079"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MIDITYPE",
    "name" : "OMX_AUDIO_PARAM_MIDITYPE",
-   "referenced_type" : "type-2098",
-   "self_type" : "type-2098",
+   "referenced_type" : "type-2090",
+   "self_type" : "type-2090",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MIDITYPE"
@@ -41451,7 +41530,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41481,18 +41560,18 @@
     {
      "field_name" : "eChannelMode",
      "field_offset" : 224,
-     "referenced_type" : "type-1652"
+     "referenced_type" : "type-1651"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-1660"
+     "referenced_type" : "type-1656"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MP3TYPE",
    "name" : "OMX_AUDIO_PARAM_MP3TYPE",
-   "referenced_type" : "type-1666",
-   "self_type" : "type-1666",
+   "referenced_type" : "type-1664",
+   "self_type" : "type-1664",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MP3TYPE"
@@ -41508,7 +41587,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41528,12 +41607,12 @@
     {
      "field_name" : "eEndian",
      "field_offset" : 160,
-     "referenced_type" : "type-1460"
+     "referenced_type" : "type-1459"
     },
     {
      "field_name" : "bInterleaved",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nBitPerSample",
@@ -41548,18 +41627,18 @@
     {
      "field_name" : "ePCMMode",
      "field_offset" : 288,
-     "referenced_type" : "type-1633"
+     "referenced_type" : "type-1628"
     },
     {
      "field_name" : "eChannelMapping",
      "field_offset" : 320,
-     "referenced_type" : "type-1642"
+     "referenced_type" : "type-1641"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PCMMODETYPE",
    "name" : "OMX_AUDIO_PARAM_PCMMODETYPE",
-   "referenced_type" : "type-1641",
-   "self_type" : "type-1641",
+   "referenced_type" : "type-1640",
+   "self_type" : "type-1640",
    "size" : 104,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PCMMODETYPE"
@@ -41575,7 +41654,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41590,18 +41669,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
-   "referenced_type" : "type-2000",
-   "self_type" : "type-2000",
+   "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_PDCEFRTYPE"
@@ -41617,7 +41696,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41632,18 +41711,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCFRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCFRTYPE",
-   "referenced_type" : "type-1989",
-   "self_type" : "type-1989",
+   "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_PDCFRTYPE"
@@ -41659,7 +41738,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41674,18 +41753,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCHRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCHRTYPE",
-   "referenced_type" : "type-2011",
-   "self_type" : "type-2011",
+   "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_PDCHRTYPE"
@@ -41701,7 +41780,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41716,7 +41795,7 @@
     {
      "field_name" : "eEncoding",
      "field_offset" : 128,
-     "referenced_type" : "type-1618"
+     "referenced_type" : "type-1616"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PORTFORMATTYPE",
@@ -41738,7 +41817,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41753,7 +41832,7 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-2021"
+     "referenced_type" : "type-2013"
     },
     {
      "field_name" : "nMinBitRate",
@@ -41768,8 +41847,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_QCELP13TYPE",
    "name" : "OMX_AUDIO_PARAM_QCELP13TYPE",
-   "referenced_type" : "type-2043",
-   "self_type" : "type-2043",
+   "referenced_type" : "type-2035",
+   "self_type" : "type-2035",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_QCELP13TYPE"
@@ -41785,7 +41864,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41805,7 +41884,7 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 160,
-     "referenced_type" : "type-2021"
+     "referenced_type" : "type-2013"
     },
     {
      "field_name" : "nMinBitRate",
@@ -41820,8 +41899,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_QCELP8TYPE",
    "name" : "OMX_AUDIO_PARAM_QCELP8TYPE",
-   "referenced_type" : "type-2032",
-   "self_type" : "type-2032",
+   "referenced_type" : "type-2024",
+   "self_type" : "type-2024",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_QCELP8TYPE"
@@ -41837,7 +41916,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41882,13 +41961,13 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 320,
-     "referenced_type" : "type-1752"
+     "referenced_type" : "type-1746"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_RATYPE",
    "name" : "OMX_AUDIO_PARAM_RATYPE",
-   "referenced_type" : "type-1765",
-   "self_type" : "type-1765",
+   "referenced_type" : "type-1756",
+   "self_type" : "type-1756",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_RATYPE"
@@ -41904,7 +41983,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41944,23 +42023,23 @@
     {
      "field_name" : "bEnableBitrate",
      "field_offset" : 288,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eChannelMode",
      "field_offset" : 320,
-     "referenced_type" : "type-1652"
+     "referenced_type" : "type-1651"
     },
     {
      "field_name" : "eSBCAllocType",
      "field_offset" : 352,
-     "referenced_type" : "type-1775"
+     "referenced_type" : "type-1766"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_SBCTYPE",
    "name" : "OMX_AUDIO_PARAM_SBCTYPE",
-   "referenced_type" : "type-1785",
-   "self_type" : "type-1785",
+   "referenced_type" : "type-1779",
+   "self_type" : "type-1779",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_SBCTYPE"
@@ -41976,7 +42055,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41991,12 +42070,12 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-2021"
+     "referenced_type" : "type-2013"
     },
     {
      "field_name" : "bRATE_REDUCon",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nMinBitRate",
@@ -42011,23 +42090,23 @@
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 256,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bNoiseSuppressor",
      "field_offset" : 288,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_SMVTYPE",
    "name" : "OMX_AUDIO_PARAM_SMVTYPE",
-   "referenced_type" : "type-2065",
-   "self_type" : "type-2065",
+   "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_SMVTYPE"
@@ -42043,7 +42122,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -42058,18 +42137,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
-   "referenced_type" : "type-1978",
-   "self_type" : "type-1978",
+   "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_TDMAEFRTYPE"
@@ -42085,7 +42164,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -42100,18 +42179,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
    "name" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
-   "referenced_type" : "type-1967",
-   "self_type" : "type-1967",
+   "referenced_type" : "type-1958",
+   "self_type" : "type-1958",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_TDMAFRTYPE"
@@ -42127,7 +42206,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -42172,18 +42251,18 @@
     {
      "field_name" : "bManaged",
      "field_offset" : 320,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bDownmix",
      "field_offset" : 352,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_VORBISTYPE",
    "name" : "OMX_AUDIO_PARAM_VORBISTYPE",
-   "referenced_type" : "type-1698",
-   "self_type" : "type-1698",
+   "referenced_type" : "type-1689",
+   "self_type" : "type-1689",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_VORBISTYPE"
@@ -42199,7 +42278,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -42219,12 +42298,12 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-1719"
+     "referenced_type" : "type-1711"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 192,
-     "referenced_type" : "type-1732"
+     "referenced_type" : "type-1722"
     },
     {
      "field_name" : "nSamplingRate",
@@ -42249,8 +42328,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_WMATYPE",
    "name" : "OMX_AUDIO_PARAM_WMATYPE",
-   "referenced_type" : "type-1742",
-   "self_type" : "type-1742",
+   "referenced_type" : "type-1733",
+   "self_type" : "type-1733",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_WMATYPE"
@@ -42271,18 +42350,18 @@
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 64,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eEncoding",
      "field_offset" : 96,
-     "referenced_type" : "type-1618"
+     "referenced_type" : "type-1616"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PORTDEFINITIONTYPE",
    "name" : "OMX_AUDIO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-1619",
-   "self_type" : "type-1619",
+   "referenced_type" : "type-1621",
+   "self_type" : "type-1621",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PORTDEFINITIONTYPE"
@@ -42308,8 +42387,8 @@
    ],
    "linker_set_key" : "OMX_BS32",
    "name" : "OMX_BS32",
-   "referenced_type" : "type-1470",
-   "self_type" : "type-1470",
+   "referenced_type" : "type-1473",
+   "self_type" : "type-1473",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_BS32"
@@ -42335,8 +42414,8 @@
    ],
    "linker_set_key" : "OMX_BU32",
    "name" : "OMX_BU32",
-   "referenced_type" : "type-1469",
-   "self_type" : "type-1469",
+   "referenced_type" : "type-1468",
+   "self_type" : "type-1468",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_BU32"
@@ -42352,7 +42431,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "pBuffer",
@@ -42432,8 +42511,8 @@
    ],
    "linker_set_key" : "OMX_BUFFERHEADERTYPE",
    "name" : "OMX_BUFFERHEADERTYPE",
-   "referenced_type" : "type-1540",
-   "self_type" : "type-1540",
+   "referenced_type" : "type-1536",
+   "self_type" : "type-1536",
    "size" : 72,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_BUFFERHEADERTYPE"
@@ -42444,23 +42523,23 @@
    [
     {
      "field_name" : "EventHandler",
-     "referenced_type" : "type-1591"
+     "referenced_type" : "type-1594"
     },
     {
      "field_name" : "EmptyBufferDone",
      "field_offset" : 32,
-     "referenced_type" : "type-1593"
+     "referenced_type" : "type-1596"
     },
     {
      "field_name" : "FillBufferDone",
      "field_offset" : 64,
-     "referenced_type" : "type-1593"
+     "referenced_type" : "type-1596"
     }
    ],
    "linker_set_key" : "OMX_CALLBACKTYPE",
    "name" : "OMX_CALLBACKTYPE",
-   "referenced_type" : "type-1590",
-   "self_type" : "type-1590",
+   "referenced_type" : "type-1593",
+   "self_type" : "type-1593",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_CALLBACKTYPE"
@@ -42476,13 +42555,13 @@
     {
      "field_name" : "pInitialize",
      "field_offset" : 32,
-     "referenced_type" : "type-1500"
+     "referenced_type" : "type-1499"
     }
    ],
    "linker_set_key" : "OMX_COMPONENTREGISTERTYPE",
    "name" : "OMX_COMPONENTREGISTERTYPE",
-   "referenced_type" : "type-1499",
-   "self_type" : "type-1499",
+   "referenced_type" : "type-1498",
+   "self_type" : "type-1498",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_COMPONENTREGISTERTYPE"
@@ -42498,7 +42577,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "pComponentPrivate",
@@ -42513,98 +42592,98 @@
     {
      "field_name" : "GetComponentVersion",
      "field_offset" : 128,
-     "referenced_type" : "type-2357"
+     "referenced_type" : "type-2360"
     },
     {
      "field_name" : "SendCommand",
      "field_offset" : 160,
-     "referenced_type" : "type-2361"
+     "referenced_type" : "type-2364"
     },
     {
      "field_name" : "GetParameter",
      "field_offset" : 192,
-     "referenced_type" : "type-2363"
+     "referenced_type" : "type-2366"
     },
     {
      "field_name" : "SetParameter",
      "field_offset" : 224,
-     "referenced_type" : "type-2363"
+     "referenced_type" : "type-2366"
     },
     {
      "field_name" : "GetConfig",
      "field_offset" : 256,
-     "referenced_type" : "type-2363"
+     "referenced_type" : "type-2366"
     },
     {
      "field_name" : "SetConfig",
      "field_offset" : 288,
-     "referenced_type" : "type-2363"
+     "referenced_type" : "type-2366"
     },
     {
      "field_name" : "GetExtensionIndex",
      "field_offset" : 320,
-     "referenced_type" : "type-2365"
+     "referenced_type" : "type-2368"
     },
     {
      "field_name" : "GetState",
      "field_offset" : 352,
-     "referenced_type" : "type-2368"
+     "referenced_type" : "type-2371"
     },
     {
      "field_name" : "ComponentTunnelRequest",
      "field_offset" : 384,
-     "referenced_type" : "type-2371"
+     "referenced_type" : "type-2374"
     },
     {
      "field_name" : "UseBuffer",
      "field_offset" : 416,
-     "referenced_type" : "type-2374"
+     "referenced_type" : "type-2377"
     },
     {
      "field_name" : "AllocateBuffer",
      "field_offset" : 448,
-     "referenced_type" : "type-2377"
+     "referenced_type" : "type-2380"
     },
     {
      "field_name" : "FreeBuffer",
      "field_offset" : 480,
-     "referenced_type" : "type-2379"
+     "referenced_type" : "type-2382"
     },
     {
      "field_name" : "EmptyThisBuffer",
      "field_offset" : 512,
-     "referenced_type" : "type-2381"
+     "referenced_type" : "type-2384"
     },
     {
      "field_name" : "FillThisBuffer",
      "field_offset" : 544,
-     "referenced_type" : "type-2381"
+     "referenced_type" : "type-2384"
     },
     {
      "field_name" : "SetCallbacks",
      "field_offset" : 576,
-     "referenced_type" : "type-2383"
+     "referenced_type" : "type-2386"
     },
     {
      "field_name" : "ComponentDeInit",
      "field_offset" : 608,
-     "referenced_type" : "type-1500"
+     "referenced_type" : "type-1499"
     },
     {
      "field_name" : "UseEGLImage",
      "field_offset" : 640,
-     "referenced_type" : "type-2386"
+     "referenced_type" : "type-2389"
     },
     {
      "field_name" : "ComponentRoleEnum",
      "field_offset" : 672,
-     "referenced_type" : "type-2388"
+     "referenced_type" : "type-2391"
     }
    ],
    "linker_set_key" : "OMX_COMPONENTTYPE",
    "name" : "OMX_COMPONENTTYPE",
-   "referenced_type" : "type-2356",
-   "self_type" : "type-2356",
+   "referenced_type" : "type-2359",
+   "self_type" : "type-2359",
    "size" : 88,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_COMPONENTTYPE"
@@ -42620,7 +42699,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -42640,8 +42719,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_BACKLIGHTTYPE",
    "name" : "OMX_CONFIG_BACKLIGHTTYPE",
-   "referenced_type" : "type-2226",
-   "self_type" : "type-2226",
+   "referenced_type" : "type-2229",
+   "self_type" : "type-2229",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_BACKLIGHTTYPE"
@@ -42657,18 +42736,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "bEnabled",
      "field_offset" : 64,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_BOOLEANTYPE",
    "name" : "OMX_CONFIG_BOOLEANTYPE",
-   "referenced_type" : "type-2340",
-   "self_type" : "type-2340",
+   "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_CONFIG_BOOLEANTYPE"
@@ -42684,7 +42763,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -42699,8 +42778,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_BRIGHTNESSTYPE",
    "name" : "OMX_CONFIG_BRIGHTNESSTYPE",
-   "referenced_type" : "type-2225",
-   "self_type" : "type-2225",
+   "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_BRIGHTNESSTYPE"
@@ -42716,7 +42795,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -42726,12 +42805,12 @@
     {
      "field_name" : "bContinuous",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bFrameLimited",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nFrameLimit",
@@ -42741,8 +42820,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_CAPTUREMODETYPE",
    "name" : "OMX_CONFIG_CAPTUREMODETYPE",
-   "referenced_type" : "type-2240",
-   "self_type" : "type-2240",
+   "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"
@@ -42758,7 +42837,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -42773,13 +42852,13 @@
     {
      "field_name" : "eColorBlend",
      "field_offset" : 128,
-     "referenced_type" : "type-2209"
+     "referenced_type" : "type-2212"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_COLORBLENDTYPE",
    "name" : "OMX_CONFIG_COLORBLENDTYPE",
-   "referenced_type" : "type-2210",
-   "self_type" : "type-2210",
+   "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_CONFIG_COLORBLENDTYPE"
@@ -42795,7 +42874,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -42805,7 +42884,7 @@
     {
      "field_name" : "xColorMatrix",
      "field_offset" : 96,
-     "referenced_type" : "type-2201"
+     "referenced_type" : "type-2204"
     },
     {
      "field_name" : "xColorOffset",
@@ -42815,8 +42894,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_COLORCONVERSIONTYPE",
    "name" : "OMX_CONFIG_COLORCONVERSIONTYPE",
-   "referenced_type" : "type-2200",
-   "self_type" : "type-2200",
+   "referenced_type" : "type-2203",
+   "self_type" : "type-2203",
    "size" : 64,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORCONVERSIONTYPE"
@@ -42832,7 +42911,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -42842,7 +42921,7 @@
     {
      "field_name" : "bColorEnhancement",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nCustomizedU",
@@ -42857,8 +42936,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
    "name" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
-   "referenced_type" : "type-2207",
-   "self_type" : "type-2207",
+   "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_COLORENHANCEMENTTYPE"
@@ -42874,7 +42953,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -42894,8 +42973,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_COLORKEYTYPE",
    "name" : "OMX_CONFIG_COLORKEYTYPE",
-   "referenced_type" : "type-2208",
-   "self_type" : "type-2208",
+   "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_CONFIG_COLORKEYTYPE"
@@ -42911,12 +42990,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nParentNodeID",
@@ -42931,8 +43010,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
    "name" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
-   "referenced_type" : "type-2350",
-   "self_type" : "type-2350",
+   "referenced_type" : "type-2353",
+   "self_type" : "type-2353",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE"
@@ -42948,12 +43027,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nParentNodeID",
@@ -42978,13 +43057,13 @@
     {
      "field_name" : "bIsLeafType",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
    "name" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
-   "referenced_type" : "type-2351",
-   "self_type" : "type-2351",
+   "referenced_type" : "type-2354",
+   "self_type" : "type-2354",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_CONTAINERNODEIDTYPE"
@@ -43000,7 +43079,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43015,8 +43094,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_CONTRASTTYPE",
    "name" : "OMX_CONFIG_CONTRASTTYPE",
-   "referenced_type" : "type-2224",
-   "self_type" : "type-2224",
+   "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_CONTRASTTYPE"
@@ -43032,7 +43111,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43042,13 +43121,13 @@
     {
      "field_name" : "eDither",
      "field_offset" : 96,
-     "referenced_type" : "type-2238"
+     "referenced_type" : "type-2241"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_DITHERTYPE",
    "name" : "OMX_CONFIG_DITHERTYPE",
-   "referenced_type" : "type-2239",
-   "self_type" : "type-2239",
+   "referenced_type" : "type-2242",
+   "self_type" : "type-2242",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_DITHERTYPE"
@@ -43064,7 +43143,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43074,13 +43153,13 @@
     {
      "field_name" : "eExposureControl",
      "field_offset" : 96,
-     "referenced_type" : "type-2221"
+     "referenced_type" : "type-2224"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
    "name" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-2222",
-   "self_type" : "type-2222",
+   "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_EXPOSURECONTROLTYPE"
@@ -43096,7 +43175,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43106,7 +43185,7 @@
     {
      "field_name" : "eMetering",
      "field_offset" : 96,
-     "referenced_type" : "type-2242"
+     "referenced_type" : "type-2245"
     },
     {
      "field_name" : "xEVCompensation",
@@ -43121,7 +43200,7 @@
     {
      "field_name" : "bAutoAperture",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nShutterSpeedMsec",
@@ -43131,7 +43210,7 @@
     {
      "field_name" : "bAutoShutterSpeed",
      "field_offset" : 256,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nSensitivity",
@@ -43141,13 +43220,13 @@
     {
      "field_name" : "bAutoSensitivity",
      "field_offset" : 320,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_EXPOSUREVALUETYPE",
    "name" : "OMX_CONFIG_EXPOSUREVALUETYPE",
-   "referenced_type" : "type-2243",
-   "self_type" : "type-2243",
+   "referenced_type" : "type-2246",
+   "self_type" : "type-2246",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_EXPOSUREVALUETYPE"
@@ -43163,7 +43242,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43173,53 +43252,53 @@
     {
      "field_name" : "bCenter",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bLeft",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bRight",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bTop",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bBottom",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bTopLeft",
      "field_offset" : 256,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bTopRight",
      "field_offset" : 288,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bBottomLeft",
      "field_offset" : 320,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bBottomRight",
      "field_offset" : 352,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_FOCUSREGIONTYPE",
    "name" : "OMX_CONFIG_FOCUSREGIONTYPE",
-   "referenced_type" : "type-2245",
-   "self_type" : "type-2245",
+   "referenced_type" : "type-2248",
+   "self_type" : "type-2248",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_FOCUSREGIONTYPE"
@@ -43235,7 +43314,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43250,8 +43329,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_FRAMERATETYPE",
    "name" : "OMX_CONFIG_FRAMERATETYPE",
-   "referenced_type" : "type-2286",
-   "self_type" : "type-2286",
+   "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_FRAMERATETYPE"
@@ -43267,7 +43346,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43277,13 +43356,13 @@
     {
      "field_name" : "bStab",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_FRAMESTABTYPE",
    "name" : "OMX_CONFIG_FRAMESTABTYPE",
-   "referenced_type" : "type-2218",
-   "self_type" : "type-2218",
+   "referenced_type" : "type-2221",
+   "self_type" : "type-2221",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_FRAMESTABTYPE"
@@ -43299,7 +43378,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43314,8 +43393,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_GAMMATYPE",
    "name" : "OMX_CONFIG_GAMMATYPE",
-   "referenced_type" : "type-2227",
-   "self_type" : "type-2227",
+   "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_GAMMATYPE"
@@ -43331,7 +43410,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43341,13 +43420,13 @@
     {
      "field_name" : "eImageFilter",
      "field_offset" : 96,
-     "referenced_type" : "type-2205"
+     "referenced_type" : "type-2208"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_IMAGEFILTERTYPE",
    "name" : "OMX_CONFIG_IMAGEFILTERTYPE",
-   "referenced_type" : "type-2206",
-   "self_type" : "type-2206",
+   "referenced_type" : "type-2209",
+   "self_type" : "type-2209",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_IMAGEFILTERTYPE"
@@ -43363,7 +43442,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43373,13 +43452,13 @@
     {
      "field_name" : "IntraRefreshVOP",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
    "name" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
-   "referenced_type" : "type-2287",
-   "self_type" : "type-2287",
+   "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_INTRAREFRESHVOPTYPE"
@@ -43395,7 +43474,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43410,8 +43489,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_LIGHTNESSTYPE",
    "name" : "OMX_CONFIG_LIGHTNESSTYPE",
-   "referenced_type" : "type-2229",
-   "self_type" : "type-2229",
+   "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"
@@ -43427,7 +43506,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43442,13 +43521,13 @@
     {
      "field_name" : "ErrMap",
      "field_offset" : 128,
-     "referenced_type" : "type-1572"
+     "referenced_type" : "type-1567"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
    "name" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
-   "referenced_type" : "type-2288",
-   "self_type" : "type-2288",
+   "referenced_type" : "type-2291",
+   "self_type" : "type-2291",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE"
@@ -43464,7 +43543,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43474,13 +43553,13 @@
     {
      "field_name" : "bEnabled",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
    "name" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
-   "referenced_type" : "type-2290",
-   "self_type" : "type-2290",
+   "referenced_type" : "type-2293",
+   "self_type" : "type-2293",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_MBERRORREPORTINGTYPE"
@@ -43496,12 +43575,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "eScopeMode",
      "field_offset" : 64,
-     "referenced_type" : "type-2346"
+     "referenced_type" : "type-2349"
     },
     {
      "field_name" : "nScopeSpecifier",
@@ -43516,8 +43595,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
    "name" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
-   "referenced_type" : "type-2348",
-   "self_type" : "type-2348",
+   "referenced_type" : "type-2351",
+   "self_type" : "type-2351",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_METADATAITEMCOUNTTYPE"
@@ -43533,12 +43612,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "eScopeMode",
      "field_offset" : 64,
-     "referenced_type" : "type-2346"
+     "referenced_type" : "type-2349"
     },
     {
      "field_name" : "nScopeSpecifier",
@@ -43553,12 +43632,12 @@
     {
      "field_name" : "eSearchMode",
      "field_offset" : 160,
-     "referenced_type" : "type-2347"
+     "referenced_type" : "type-2350"
     },
     {
      "field_name" : "eKeyCharset",
      "field_offset" : 192,
-     "referenced_type" : "type-2345"
+     "referenced_type" : "type-2348"
     },
     {
      "field_name" : "nKeySizeUsed",
@@ -43573,7 +43652,7 @@
     {
      "field_name" : "eValueCharset",
      "field_offset" : 1280,
-     "referenced_type" : "type-2345"
+     "referenced_type" : "type-2348"
     },
     {
      "field_name" : "sLanguageCountry",
@@ -43593,13 +43672,13 @@
     {
      "field_name" : "nValue",
      "field_offset" : 1408,
-     "referenced_type" : "type-1572"
+     "referenced_type" : "type-1567"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_METADATAITEMTYPE",
    "name" : "OMX_CONFIG_METADATAITEMTYPE",
-   "referenced_type" : "type-2349",
-   "self_type" : "type-2349",
+   "referenced_type" : "type-2352",
+   "self_type" : "type-2352",
    "size" : 180,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_METADATAITEMTYPE"
@@ -43615,7 +43694,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43625,13 +43704,13 @@
     {
      "field_name" : "eMirror",
      "field_offset" : 96,
-     "referenced_type" : "type-2213"
+     "referenced_type" : "type-2216"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MIRRORTYPE",
    "name" : "OMX_CONFIG_MIRRORTYPE",
-   "referenced_type" : "type-2214",
-   "self_type" : "type-2214",
+   "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_CONFIG_MIRRORTYPE"
@@ -43647,7 +43726,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43667,8 +43746,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_PLANEBLENDTYPE",
    "name" : "OMX_CONFIG_PLANEBLENDTYPE",
-   "referenced_type" : "type-2231",
-   "self_type" : "type-2231",
+   "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_CONFIG_PLANEBLENDTYPE"
@@ -43684,7 +43763,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43704,8 +43783,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_POINTTYPE",
    "name" : "OMX_CONFIG_POINTTYPE",
-   "referenced_type" : "type-2215",
-   "self_type" : "type-2215",
+   "referenced_type" : "type-2218",
+   "self_type" : "type-2218",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_POINTTYPE"
@@ -43721,7 +43800,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43751,8 +43830,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_RECTTYPE",
    "name" : "OMX_CONFIG_RECTTYPE",
-   "referenced_type" : "type-2216",
-   "self_type" : "type-2216",
+   "referenced_type" : "type-2219",
+   "self_type" : "type-2219",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_RECTTYPE"
@@ -43768,7 +43847,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43783,8 +43862,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_ROTATIONTYPE",
    "name" : "OMX_CONFIG_ROTATIONTYPE",
-   "referenced_type" : "type-2212",
-   "self_type" : "type-2212",
+   "referenced_type" : "type-2215",
+   "self_type" : "type-2215",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_ROTATIONTYPE"
@@ -43800,7 +43879,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43815,8 +43894,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_SATURATIONTYPE",
    "name" : "OMX_CONFIG_SATURATIONTYPE",
-   "referenced_type" : "type-2228",
-   "self_type" : "type-2228",
+   "referenced_type" : "type-2231",
+   "self_type" : "type-2231",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_SATURATIONTYPE"
@@ -43832,7 +43911,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43852,8 +43931,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_SCALEFACTORTYPE",
    "name" : "OMX_CONFIG_SCALEFACTORTYPE",
-   "referenced_type" : "type-2204",
-   "self_type" : "type-2204",
+   "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_SCALEFACTORTYPE"
@@ -43869,7 +43948,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43879,13 +43958,13 @@
     {
      "field_name" : "eEffect",
      "field_offset" : 96,
-     "referenced_type" : "type-2233"
+     "referenced_type" : "type-2236"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
    "name" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-2234",
-   "self_type" : "type-2234",
+   "referenced_type" : "type-2237",
+   "self_type" : "type-2237",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_TRANSITIONEFFECTTYPE"
@@ -43901,7 +43980,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43911,13 +43990,13 @@
     {
      "field_name" : "eWhiteBalControl",
      "field_offset" : 96,
-     "referenced_type" : "type-2219"
+     "referenced_type" : "type-2222"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
    "name" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-2220",
-   "self_type" : "type-2220",
+   "referenced_type" : "type-2223",
+   "self_type" : "type-2223",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_WHITEBALCONTROLTYPE"
@@ -43933,7 +44012,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43953,8 +44032,8 @@
    ],
    "linker_set_key" : "OMX_FRAMESIZETYPE",
    "name" : "OMX_FRAMESIZETYPE",
-   "referenced_type" : "type-2211",
-   "self_type" : "type-2211",
+   "referenced_type" : "type-2214",
+   "self_type" : "type-2214",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_FRAMESIZETYPE"
@@ -43970,7 +44049,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43980,7 +44059,7 @@
     {
      "field_name" : "eFocusControl",
      "field_offset" : 96,
-     "referenced_type" : "type-2303"
+     "referenced_type" : "type-2306"
     },
     {
      "field_name" : "nFocusSteps",
@@ -43995,8 +44074,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
    "name" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-2304",
-   "self_type" : "type-2304",
+   "referenced_type" : "type-2307",
+   "self_type" : "type-2307",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE"
@@ -44012,7 +44091,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -44022,13 +44101,13 @@
     {
      "field_name" : "eFlashControl",
      "field_offset" : 96,
-     "referenced_type" : "type-2300"
+     "referenced_type" : "type-2303"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
    "name" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
-   "referenced_type" : "type-2302",
-   "self_type" : "type-2302",
+   "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_FLASHCONTROLTYPE"
@@ -44044,7 +44123,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -44054,23 +44133,23 @@
     {
      "field_name" : "eHuffmanTable",
      "field_offset" : 96,
-     "referenced_type" : "type-2309"
+     "referenced_type" : "type-2312"
     },
     {
      "field_name" : "nNumberOfHuffmanCodeOfLength",
      "field_offset" : 128,
-     "referenced_type" : "type-2311"
+     "referenced_type" : "type-2314"
     },
     {
      "field_name" : "nHuffmanTable",
      "field_offset" : 256,
-     "referenced_type" : "type-2312"
+     "referenced_type" : "type-2315"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
    "name" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
-   "referenced_type" : "type-2310",
-   "self_type" : "type-2310",
+   "referenced_type" : "type-2313",
+   "self_type" : "type-2313",
    "size" : 288,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE"
@@ -44086,7 +44165,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -44101,18 +44180,18 @@
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-2297"
+     "referenced_type" : "type-2300"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-2199"
+     "referenced_type" : "type-2202"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
    "name" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-2299",
-   "self_type" : "type-2299",
+   "referenced_type" : "type-2302",
+   "self_type" : "type-2302",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_PORTFORMATTYPE"
@@ -44128,7 +44207,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -44143,8 +44222,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_QFACTORTYPE",
    "name" : "OMX_IMAGE_PARAM_QFACTORTYPE",
-   "referenced_type" : "type-2305",
-   "self_type" : "type-2305",
+   "referenced_type" : "type-2308",
+   "self_type" : "type-2308",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_QFACTORTYPE"
@@ -44160,7 +44239,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -44170,18 +44249,18 @@
     {
      "field_name" : "eQuantizationTable",
      "field_offset" : 96,
-     "referenced_type" : "type-2306"
+     "referenced_type" : "type-2309"
     },
     {
      "field_name" : "nQuantizationMatrix",
      "field_offset" : 128,
-     "referenced_type" : "type-2308"
+     "referenced_type" : "type-2311"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
    "name" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-2307",
-   "self_type" : "type-2307",
+   "referenced_type" : "type-2310",
+   "self_type" : "type-2310",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE"
@@ -44222,17 +44301,17 @@
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 224,
-     "referenced_type" : "type-2297"
+     "referenced_type" : "type-2300"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-2199"
+     "referenced_type" : "type-2202"
     },
     {
      "field_name" : "pNativeWindow",
@@ -44242,8 +44321,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_PORTDEFINITIONTYPE",
    "name" : "OMX_IMAGE_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-2298",
-   "self_type" : "type-2298",
+   "referenced_type" : "type-2301",
+   "self_type" : "type-2301",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PORTDEFINITIONTYPE"
@@ -44264,8 +44343,8 @@
    ],
    "linker_set_key" : "OMX_MARKTYPE",
    "name" : "OMX_MARKTYPE",
-   "referenced_type" : "type-1477",
-   "self_type" : "type-1477",
+   "referenced_type" : "type-1475",
+   "self_type" : "type-1475",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_MARKTYPE"
@@ -44281,18 +44360,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "bEnablePM",
      "field_offset" : 64,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_OTHER_CONFIG_POWERTYPE",
    "name" : "OMX_OTHER_CONFIG_POWERTYPE",
-   "referenced_type" : "type-2327",
-   "self_type" : "type-2327",
+   "referenced_type" : "type-2330",
+   "self_type" : "type-2330",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_CONFIG_POWERTYPE"
@@ -44308,13 +44387,13 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     }
    ],
    "linker_set_key" : "OMX_OTHER_CONFIG_STATSTYPE",
    "name" : "OMX_OTHER_CONFIG_STATSTYPE",
-   "referenced_type" : "type-2328",
-   "self_type" : "type-2328",
+   "referenced_type" : "type-2331",
+   "self_type" : "type-2331",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_CONFIG_STATSTYPE"
@@ -44330,7 +44409,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -44340,7 +44419,7 @@
     {
      "field_name" : "eType",
      "field_offset" : 96,
-     "referenced_type" : "type-1561"
+     "referenced_type" : "type-1556"
     },
     {
      "field_name" : "nDataSize",
@@ -44350,13 +44429,13 @@
     {
      "field_name" : "data",
      "field_offset" : 160,
-     "referenced_type" : "type-1572"
+     "referenced_type" : "type-1567"
     }
    ],
    "linker_set_key" : "OMX_OTHER_EXTRADATATYPE",
    "name" : "OMX_OTHER_EXTRADATATYPE",
-   "referenced_type" : "type-1571",
-   "self_type" : "type-1571",
+   "referenced_type" : "type-1566",
+   "self_type" : "type-1566",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_OTHER_EXTRADATATYPE"
@@ -44372,7 +44451,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -44387,13 +44466,13 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-2314"
+     "referenced_type" : "type-2317"
     }
    ],
    "linker_set_key" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
    "name" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-2330",
-   "self_type" : "type-2330",
+   "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"
@@ -44404,13 +44483,13 @@
    [
     {
      "field_name" : "eFormat",
-     "referenced_type" : "type-2314"
+     "referenced_type" : "type-2317"
     }
    ],
    "linker_set_key" : "OMX_OTHER_PORTDEFINITIONTYPE",
    "name" : "OMX_OTHER_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-2329",
-   "self_type" : "type-2329",
+   "referenced_type" : "type-2332",
+   "self_type" : "type-2332",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_PORTDEFINITIONTYPE"
@@ -44426,7 +44505,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -44436,13 +44515,13 @@
     {
      "field_name" : "eBufferSupplier",
      "field_offset" : 96,
-     "referenced_type" : "type-1601"
+     "referenced_type" : "type-1599"
     }
    ],
    "linker_set_key" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
    "name" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-1609",
-   "self_type" : "type-1609",
+   "referenced_type" : "type-1605",
+   "self_type" : "type-1605",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PARAM_BUFFERSUPPLIERTYPE"
@@ -44458,7 +44537,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "cRole",
@@ -44485,7 +44564,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "hPipe",
@@ -44495,8 +44574,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_CONTENTPIPETYPE",
    "name" : "OMX_PARAM_CONTENTPIPETYPE",
-   "referenced_type" : "type-2343",
-   "self_type" : "type-2343",
+   "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_PARAM_CONTENTPIPETYPE"
@@ -44512,18 +44591,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "contentURI",
      "field_offset" : 64,
-     "referenced_type" : "type-1572"
+     "referenced_type" : "type-1567"
     }
    ],
    "linker_set_key" : "OMX_PARAM_CONTENTURITYPE",
    "name" : "OMX_PARAM_CONTENTURITYPE",
-   "referenced_type" : "type-2341",
-   "self_type" : "type-2341",
+   "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"
@@ -44539,7 +44618,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -44549,18 +44628,18 @@
     {
      "field_name" : "eUnitType",
      "field_offset" : 96,
-     "referenced_type" : "type-2235"
+     "referenced_type" : "type-2238"
     },
     {
      "field_name" : "eEncapsulationType",
      "field_offset" : 128,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2239"
     }
    ],
    "linker_set_key" : "OMX_PARAM_DATAUNITTYPE",
    "name" : "OMX_PARAM_DATAUNITTYPE",
-   "referenced_type" : "type-2237",
-   "self_type" : "type-2237",
+   "referenced_type" : "type-2240",
+   "self_type" : "type-2240",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_DATAUNITTYPE"
@@ -44576,7 +44655,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -44586,13 +44665,13 @@
     {
      "field_name" : "bDeblocking",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_PARAM_DEBLOCKINGTYPE",
    "name" : "OMX_PARAM_DEBLOCKINGTYPE",
-   "referenced_type" : "type-2217",
-   "self_type" : "type-2217",
+   "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_PARAM_DEBLOCKINGTYPE"
@@ -44608,7 +44687,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -44618,58 +44697,58 @@
     {
      "field_name" : "eFocusStatus",
      "field_offset" : 96,
-     "referenced_type" : "type-2246"
+     "referenced_type" : "type-2249"
     },
     {
      "field_name" : "bCenterStatus",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bLeftStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bRightStatus",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bTopStatus",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bBottomStatus",
      "field_offset" : 256,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bTopLeftStatus",
      "field_offset" : 288,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bTopRightStatus",
      "field_offset" : 320,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bBottomLeftStatus",
      "field_offset" : 352,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bBottomRightStatus",
      "field_offset" : 384,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_PARAM_FOCUSSTATUSTYPE",
    "name" : "OMX_PARAM_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-2247",
-   "self_type" : "type-2247",
+   "referenced_type" : "type-2250",
+   "self_type" : "type-2250",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_FOCUSSTATUSTYPE"
@@ -44685,7 +44764,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -44695,7 +44774,7 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nInterleavePortIndex",
@@ -44705,8 +44784,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_INTERLEAVETYPE",
    "name" : "OMX_PARAM_INTERLEAVETYPE",
-   "referenced_type" : "type-2232",
-   "self_type" : "type-2232",
+   "referenced_type" : "type-2235",
+   "self_type" : "type-2235",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_INTERLEAVETYPE"
@@ -44722,7 +44801,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -44737,8 +44816,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_MACROBLOCKSTYPE",
    "name" : "OMX_PARAM_MACROBLOCKSTYPE",
-   "referenced_type" : "type-2291",
-   "self_type" : "type-2291",
+   "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"
@@ -44754,17 +44833,17 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eKeyCharset",
      "field_offset" : 96,
-     "referenced_type" : "type-2345"
+     "referenced_type" : "type-2348"
     },
     {
      "field_name" : "nKeySizeUsed",
@@ -44789,13 +44868,13 @@
     {
      "field_name" : "bEnabled",
      "field_offset" : 2240,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_PARAM_METADATAFILTERTYPE",
    "name" : "OMX_PARAM_METADATAFILTERTYPE",
-   "referenced_type" : "type-2355",
-   "self_type" : "type-2355",
+   "referenced_type" : "type-2358",
+   "self_type" : "type-2358",
    "size" : 284,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_METADATAFILTERTYPE"
@@ -44811,7 +44890,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -44821,7 +44900,7 @@
     {
      "field_name" : "eDir",
      "field_offset" : 96,
-     "referenced_type" : "type-1452"
+     "referenced_type" : "type-1455"
     },
     {
      "field_name" : "nBufferCountActual",
@@ -44841,27 +44920,27 @@
     {
      "field_name" : "bEnabled",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bPopulated",
      "field_offset" : 256,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eDomain",
      "field_offset" : 288,
-     "referenced_type" : "type-2332"
+     "referenced_type" : "type-2335"
     },
     {
      "field_name" : "format",
      "field_offset" : 320,
-     "referenced_type" : "type-2334"
+     "referenced_type" : "type-2337"
     },
     {
      "field_name" : "bBuffersContiguous",
      "field_offset" : 704,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nBufferAlignment",
@@ -44871,8 +44950,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_PORTDEFINITIONTYPE",
    "name" : "OMX_PARAM_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-2333",
-   "self_type" : "type-2333",
+   "referenced_type" : "type-2336",
+   "self_type" : "type-2336",
    "size" : 96,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_PORTDEFINITIONTYPE"
@@ -44883,27 +44962,27 @@
    [
     {
      "field_name" : "audio",
-     "referenced_type" : "type-1619"
+     "referenced_type" : "type-1621"
     },
     {
      "field_name" : "video",
-     "referenced_type" : "type-2249"
+     "referenced_type" : "type-2252"
     },
     {
      "field_name" : "image",
-     "referenced_type" : "type-2298"
+     "referenced_type" : "type-2301"
     },
     {
      "field_name" : "other",
-     "referenced_type" : "type-2329"
+     "referenced_type" : "type-2332"
     }
    ],
    "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-2334",
-   "self_type" : "type-2334",
+   "referenced_type" : "type-2337",
+   "self_type" : "type-2337",
    "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)"
@@ -44919,7 +44998,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -44934,18 +45013,18 @@
     {
      "field_name" : "bOneShot",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "sFrameSize",
      "field_offset" : 160,
-     "referenced_type" : "type-2211"
+     "referenced_type" : "type-2214"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SENSORMODETYPE",
    "name" : "OMX_PARAM_SENSORMODETYPE",
-   "referenced_type" : "type-2223",
-   "self_type" : "type-2223",
+   "referenced_type" : "type-2226",
+   "self_type" : "type-2226",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_SENSORMODETYPE"
@@ -44961,18 +45040,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "ePolicy",
      "field_offset" : 64,
-     "referenced_type" : "type-2336"
+     "referenced_type" : "type-2339"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
    "name" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-2337",
-   "self_type" : "type-2337",
+   "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_PARAM_SUSPENSIONPOLICYTYPE"
@@ -44988,18 +45067,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "eType",
      "field_offset" : 64,
-     "referenced_type" : "type-2338"
+     "referenced_type" : "type-2341"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SUSPENSIONTYPE",
    "name" : "OMX_PARAM_SUSPENSIONTYPE",
-   "referenced_type" : "type-2339",
-   "self_type" : "type-2339",
+   "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_PARAM_SUSPENSIONTYPE"
@@ -45015,7 +45094,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -45030,8 +45109,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_U32TYPE",
    "name" : "OMX_PARAM_U32TYPE",
-   "referenced_type" : "type-2335",
-   "self_type" : "type-2335",
+   "referenced_type" : "type-2338",
+   "self_type" : "type-2338",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_U32TYPE"
@@ -45047,7 +45126,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPorts",
@@ -45062,8 +45141,8 @@
    ],
    "linker_set_key" : "OMX_PORT_PARAM_TYPE",
    "name" : "OMX_PORT_PARAM_TYPE",
-   "referenced_type" : "type-1585",
-   "self_type" : "type-1585",
+   "referenced_type" : "type-1581",
+   "self_type" : "type-1581",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PORT_PARAM_TYPE"
@@ -45079,7 +45158,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nGroupPriority",
@@ -45094,8 +45173,8 @@
    ],
    "linker_set_key" : "OMX_PRIORITYMGMTTYPE",
    "name" : "OMX_PRIORITYMGMTTYPE",
-   "referenced_type" : "type-1522",
-   "self_type" : "type-1522",
+   "referenced_type" : "type-1519",
+   "self_type" : "type-1519",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PRIORITYMGMTTYPE"
@@ -45111,18 +45190,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "bResourceConcealmentForbidden",
      "field_offset" : 64,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_RESOURCECONCEALMENTTYPE",
    "name" : "OMX_RESOURCECONCEALMENTTYPE",
-   "referenced_type" : "type-2344",
-   "self_type" : "type-2344",
+   "referenced_type" : "type-2347",
+   "self_type" : "type-2347",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_RESOURCECONCEALMENTTYPE"
@@ -45138,18 +45217,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "eClock",
      "field_offset" : 64,
-     "referenced_type" : "type-2319"
+     "referenced_type" : "type-2322"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
    "name" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
-   "referenced_type" : "type-2326",
-   "self_type" : "type-2326",
+   "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_TIME_CONFIG_ACTIVEREFCLOCKTYPE"
@@ -45165,12 +45244,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "eState",
      "field_offset" : 64,
-     "referenced_type" : "type-2321"
+     "referenced_type" : "type-2324"
     },
     {
      "field_name" : "nStartTime",
@@ -45190,8 +45269,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
    "name" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
-   "referenced_type" : "type-2325",
-   "self_type" : "type-2325",
+   "referenced_type" : "type-2328",
+   "self_type" : "type-2328",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_CLOCKSTATETYPE"
@@ -45207,7 +45286,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -45232,8 +45311,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
    "name" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
-   "referenced_type" : "type-2322",
-   "self_type" : "type-2322",
+   "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_MEDIATIMEREQUESTTYPE"
@@ -45249,7 +45328,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "xScale",
@@ -45259,8 +45338,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_SCALETYPE",
    "name" : "OMX_TIME_CONFIG_SCALETYPE",
-   "referenced_type" : "type-2324",
-   "self_type" : "type-2324",
+   "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_TIME_CONFIG_SCALETYPE"
@@ -45276,18 +45355,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "eType",
      "field_offset" : 64,
-     "referenced_type" : "type-2315"
+     "referenced_type" : "type-2318"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_SEEKMODETYPE",
    "name" : "OMX_TIME_CONFIG_SEEKMODETYPE",
-   "referenced_type" : "type-2316",
-   "self_type" : "type-2316",
+   "referenced_type" : "type-2319",
+   "self_type" : "type-2319",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_SEEKMODETYPE"
@@ -45303,7 +45382,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -45318,8 +45397,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
    "name" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
-   "referenced_type" : "type-2317",
-   "self_type" : "type-2317",
+   "referenced_type" : "type-2320",
+   "self_type" : "type-2320",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_TIMESTAMPTYPE"
@@ -45335,7 +45414,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nClientPrivate",
@@ -45345,7 +45424,7 @@
     {
      "field_name" : "eUpdateType",
      "field_offset" : 96,
-     "referenced_type" : "type-2318"
+     "referenced_type" : "type-2321"
     },
     {
      "field_name" : "nMediaTimestamp",
@@ -45370,13 +45449,13 @@
     {
      "field_name" : "eState",
      "field_offset" : 352,
-     "referenced_type" : "type-2321"
+     "referenced_type" : "type-2324"
     }
    ],
    "linker_set_key" : "OMX_TIME_MEDIATIMETYPE",
    "name" : "OMX_TIME_MEDIATIMETYPE",
-   "referenced_type" : "type-2323",
-   "self_type" : "type-2323",
+   "referenced_type" : "type-2326",
+   "self_type" : "type-2326",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_MEDIATIMETYPE"
@@ -45392,13 +45471,13 @@
     {
      "field_name" : "eSupplier",
      "field_offset" : 32,
-     "referenced_type" : "type-1601"
+     "referenced_type" : "type-1599"
     }
    ],
    "linker_set_key" : "OMX_TUNNELSETUPTYPE",
    "name" : "OMX_TUNNELSETUPTYPE",
-   "referenced_type" : "type-1612",
-   "self_type" : "type-1612",
+   "referenced_type" : "type-1613",
+   "self_type" : "type-1613",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_TUNNELSETUPTYPE"
@@ -45409,7 +45488,7 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-1479"
+     "referenced_type" : "type-1482"
     },
     {
      "field_name" : "nVersion",
@@ -45419,8 +45498,8 @@
    "linker_set_key" : "OMX_VERSIONTYPE",
    "name" : "OMX_VERSIONTYPE",
    "record_kind" : "union",
-   "referenced_type" : "type-1478",
-   "self_type" : "type-1478",
+   "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"
@@ -45452,8 +45531,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "OMX_VERSIONTYPE::(anonymous struct at frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h:376:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h:376:5",
    "name" : "OMX_VERSIONTYPE::(anonymous struct at frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h:376:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h:376:5",
-   "referenced_type" : "type-1479",
-   "self_type" : "type-1479",
+   "referenced_type" : "type-1482",
+   "self_type" : "type-1482",
    "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)"
@@ -45469,7 +45548,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -45489,8 +45568,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
    "name" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
-   "referenced_type" : "type-2295",
-   "self_type" : "type-2295",
+   "referenced_type" : "type-2298",
+   "self_type" : "type-2298",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD"
@@ -45506,7 +45585,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -45521,8 +45600,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_BITRATETYPE",
    "name" : "OMX_VIDEO_CONFIG_BITRATETYPE",
-   "referenced_type" : "type-2285",
-   "self_type" : "type-2285",
+   "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_VIDEO_CONFIG_BITRATETYPE"
@@ -45538,7 +45617,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -45553,8 +45632,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_NALSIZE",
    "name" : "OMX_VIDEO_CONFIG_NALSIZE",
-   "referenced_type" : "type-2296",
-   "self_type" : "type-2296",
+   "referenced_type" : "type-2299",
+   "self_type" : "type-2299",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_NALSIZE"
@@ -45570,7 +45649,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -45590,13 +45669,13 @@
     {
      "field_name" : "eSliceMode",
      "field_offset" : 128,
-     "referenced_type" : "type-2293"
+     "referenced_type" : "type-2296"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
    "name" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
-   "referenced_type" : "type-2294",
-   "self_type" : "type-2294",
+   "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_PARAM_AVCSLICEFMO"
@@ -45612,7 +45691,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -45637,7 +45716,7 @@
     {
      "field_name" : "bUseHadamard",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nRefFrames",
@@ -45657,32 +45736,32 @@
     {
      "field_name" : "bEnableUEP",
      "field_offset" : 320,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bEnableFMO",
      "field_offset" : 352,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bEnableASO",
      "field_offset" : 384,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bEnableRS",
      "field_offset" : 416,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 448,
-     "referenced_type" : "type-2279"
+     "referenced_type" : "type-2282"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 480,
-     "referenced_type" : "type-2280"
+     "referenced_type" : "type-2283"
     },
     {
      "field_name" : "nAllowedPictureTypes",
@@ -45692,22 +45771,22 @@
     {
      "field_name" : "bFrameMBsOnly",
      "field_offset" : 544,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bMBAFF",
      "field_offset" : 576,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bEntropyCodingCABAC",
      "field_offset" : 608,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bWeightedPPrediction",
      "field_offset" : 640,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nWeightedBipredicitonMode",
@@ -45717,17 +45796,17 @@
     {
      "field_name" : "bconstIpred",
      "field_offset" : 704,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bDirect8x8Inference",
      "field_offset" : 736,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bDirectSpatialTemporal",
      "field_offset" : 768,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nCabacInitIdc",
@@ -45737,13 +45816,13 @@
     {
      "field_name" : "eLoopFilterMode",
      "field_offset" : 832,
-     "referenced_type" : "type-2282"
+     "referenced_type" : "type-2285"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_AVCTYPE",
    "name" : "OMX_VIDEO_PARAM_AVCTYPE",
-   "referenced_type" : "type-2283",
-   "self_type" : "type-2283",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2286",
    "size" : 108,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_AVCTYPE"
@@ -45759,7 +45838,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -45769,17 +45848,17 @@
     {
      "field_name" : "eControlRate",
      "field_offset" : 96,
-     "referenced_type" : "type-2253"
+     "referenced_type" : "type-2256"
     },
     {
      "field_offset" : 128,
-     "referenced_type" : "type-2255"
+     "referenced_type" : "type-2258"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_BITRATETYPE",
    "name" : "OMX_VIDEO_PARAM_BITRATETYPE",
-   "referenced_type" : "type-2254",
-   "self_type" : "type-2254",
+   "referenced_type" : "type-2257",
+   "self_type" : "type-2257",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_BITRATETYPE"
@@ -45801,8 +45880,8 @@
    "linker_set_key" : "OMX_VIDEO_PARAM_BITRATETYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5",
    "name" : "OMX_VIDEO_PARAM_BITRATETYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5",
    "record_kind" : "union",
-   "referenced_type" : "type-2255",
-   "self_type" : "type-2255",
+   "referenced_type" : "type-2258",
+   "self_type" : "type-2258",
    "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)"
@@ -45818,7 +45897,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -45828,12 +45907,12 @@
     {
      "field_name" : "bEnableHEC",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bEnableResync",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nResynchMarkerSpacing",
@@ -45843,18 +45922,18 @@
     {
      "field_name" : "bEnableDataPartitioning",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bEnableRVLC",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE",
    "name" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE",
-   "referenced_type" : "type-2261",
-   "self_type" : "type-2261",
+   "referenced_type" : "type-2264",
+   "self_type" : "type-2264",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE"
@@ -45870,7 +45949,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -45890,17 +45969,17 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 160,
-     "referenced_type" : "type-2263"
+     "referenced_type" : "type-2266"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 192,
-     "referenced_type" : "type-2264"
+     "referenced_type" : "type-2267"
     },
     {
      "field_name" : "bPLUSPTYPEAllowed",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nAllowedPictureTypes",
@@ -45910,7 +45989,7 @@
     {
      "field_name" : "bForceRoundingTypeToZero",
      "field_offset" : 288,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nPictureHeaderRepetition",
@@ -45925,8 +46004,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_H263TYPE",
    "name" : "OMX_VIDEO_PARAM_H263TYPE",
-   "referenced_type" : "type-2267",
-   "self_type" : "type-2267",
+   "referenced_type" : "type-2270",
+   "self_type" : "type-2270",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_H263TYPE"
@@ -45942,7 +46021,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -45952,7 +46031,7 @@
     {
      "field_name" : "eRefreshMode",
      "field_offset" : 96,
-     "referenced_type" : "type-2259"
+     "referenced_type" : "type-2262"
     },
     {
      "field_name" : "nAirMBs",
@@ -45972,8 +46051,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
    "name" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
-   "referenced_type" : "type-2260",
-   "self_type" : "type-2260",
+   "referenced_type" : "type-2263",
+   "self_type" : "type-2263",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE"
@@ -45989,7 +46068,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -45999,17 +46078,17 @@
     {
      "field_name" : "eAccuracy",
      "field_offset" : 96,
-     "referenced_type" : "type-2257"
+     "referenced_type" : "type-2260"
     },
     {
      "field_name" : "bUnrestrictedMVs",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bFourMV",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "sXSearchRange",
@@ -46024,8 +46103,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
    "name" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
-   "referenced_type" : "type-2258",
-   "self_type" : "type-2258",
+   "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_MOTIONVECTORTYPE"
@@ -46041,7 +46120,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -46061,18 +46140,18 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 160,
-     "referenced_type" : "type-2268"
+     "referenced_type" : "type-2271"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 192,
-     "referenced_type" : "type-2269"
+     "referenced_type" : "type-2272"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MPEG2TYPE",
    "name" : "OMX_VIDEO_PARAM_MPEG2TYPE",
-   "referenced_type" : "type-2270",
-   "self_type" : "type-2270",
+   "referenced_type" : "type-2273",
+   "self_type" : "type-2273",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MPEG2TYPE"
@@ -46088,7 +46167,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -46103,12 +46182,12 @@
     {
      "field_name" : "bSVH",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bGov",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nPFrames",
@@ -46128,7 +46207,7 @@
     {
      "field_name" : "bACPred",
      "field_offset" : 288,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nMaxPacketSize",
@@ -46143,12 +46222,12 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 384,
-     "referenced_type" : "type-2271"
+     "referenced_type" : "type-2274"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 416,
-     "referenced_type" : "type-2272"
+     "referenced_type" : "type-2275"
     },
     {
      "field_name" : "nAllowedPictureTypes",
@@ -46163,13 +46242,13 @@
     {
      "field_name" : "bReversibleVLC",
      "field_offset" : 512,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MPEG4TYPE",
    "name" : "OMX_VIDEO_PARAM_MPEG4TYPE",
-   "referenced_type" : "type-2273",
-   "self_type" : "type-2273",
+   "referenced_type" : "type-2276",
+   "self_type" : "type-2276",
    "size" : 68,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MPEG4TYPE"
@@ -46185,7 +46264,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -46200,12 +46279,12 @@
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-2248"
+     "referenced_type" : "type-2251"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-2199"
+     "referenced_type" : "type-2202"
     },
     {
      "field_name" : "xFramerate",
@@ -46215,8 +46294,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
    "name" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-2250",
-   "self_type" : "type-2250",
+   "referenced_type" : "type-2253",
+   "self_type" : "type-2253",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_PORTFORMATTYPE"
@@ -46232,7 +46311,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -46257,8 +46336,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
    "name" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
-   "referenced_type" : "type-2284",
-   "self_type" : "type-2284",
+   "referenced_type" : "type-2287",
+   "self_type" : "type-2287",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE"
@@ -46274,7 +46353,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -46299,8 +46378,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
    "name" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
-   "referenced_type" : "type-2251",
-   "self_type" : "type-2251",
+   "referenced_type" : "type-2254",
+   "self_type" : "type-2254",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE"
@@ -46316,7 +46395,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -46326,7 +46405,7 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 96,
-     "referenced_type" : "type-2276"
+     "referenced_type" : "type-2279"
     },
     {
      "field_name" : "nBitsPerPixel",
@@ -46366,23 +46445,23 @@
     {
      "field_name" : "bEnablePostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bEnableTemporalInterpolation",
      "field_offset" : 352,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bEnableLatencyMode",
      "field_offset" : 384,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_RVTYPE",
    "name" : "OMX_VIDEO_PARAM_RVTYPE",
-   "referenced_type" : "type-2278",
-   "self_type" : "type-2278",
+   "referenced_type" : "type-2281",
+   "self_type" : "type-2281",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_RVTYPE"
@@ -46398,7 +46477,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -46408,43 +46487,43 @@
     {
      "field_name" : "b16x16",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "b16x8",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "b8x16",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "b8x8",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "b8x4",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "b4x8",
      "field_offset" : 256,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "b4x4",
      "field_offset" : 288,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VBSMCTYPE",
    "name" : "OMX_VIDEO_PARAM_VBSMCTYPE",
-   "referenced_type" : "type-2262",
-   "self_type" : "type-2262",
+   "referenced_type" : "type-2265",
+   "self_type" : "type-2265",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_VBSMCTYPE"
@@ -46460,7 +46539,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -46470,7 +46549,7 @@
     {
      "field_name" : "bEnableVFU",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nFirstGOB",
@@ -46490,8 +46569,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
    "name" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
-   "referenced_type" : "type-2252",
-   "self_type" : "type-2252",
+   "referenced_type" : "type-2255",
+   "self_type" : "type-2255",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE"
@@ -46507,7 +46586,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -46517,13 +46596,13 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 96,
-     "referenced_type" : "type-2274"
+     "referenced_type" : "type-2277"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_WMVTYPE",
    "name" : "OMX_VIDEO_PARAM_WMVTYPE",
-   "referenced_type" : "type-2275",
-   "self_type" : "type-2275",
+   "referenced_type" : "type-2278",
+   "self_type" : "type-2278",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_WMVTYPE"
@@ -46574,17 +46653,17 @@
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 256,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 288,
-     "referenced_type" : "type-2248"
+     "referenced_type" : "type-2251"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 320,
-     "referenced_type" : "type-2199"
+     "referenced_type" : "type-2202"
     },
     {
      "field_name" : "pNativeWindow",
@@ -46594,8 +46673,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PORTDEFINITIONTYPE",
    "name" : "OMX_VIDEO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-2249",
-   "self_type" : "type-2249",
+   "referenced_type" : "type-2252",
+   "self_type" : "type-2252",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PORTDEFINITIONTYPE"
@@ -46605,7 +46684,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1166"
+     "referenced_type" : "type-1167"
     }
    ],
    "fields" :
@@ -46614,20 +46693,20 @@
      "access" : "private",
      "field_name" : "d_",
      "field_offset" : 32,
-     "referenced_type" : "type-1194"
+     "referenced_type" : "type-1198"
     },
     {
      "access" : "private",
      "field_name" : "s_",
      "field_offset" : 64,
-     "referenced_type" : "type-1195"
+     "referenced_type" : "type-1199"
     }
    ],
    "linker_set_key" : "Renamer",
    "name" : "Renamer",
    "record_kind" : "class",
-   "referenced_type" : "type-1193",
-   "self_type" : "type-1193",
+   "referenced_type" : "type-1197",
+   "self_type" : "type-1197",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSZN7android14ReferenceMover15move_referencesINS_13GraphicBufferEEEvPNS_2spIT_EEPKS5_jE7Renamer",
@@ -46657,8 +46736,8 @@
    "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-1039",
-   "self_type" : "type-1039",
+   "referenced_type" : "type-1042",
+   "self_type" : "type-1042",
    "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"
@@ -46667,8 +46746,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::ADebug",
    "name" : "android::ADebug",
-   "referenced_type" : "type-2281",
-   "self_type" : "type-2281",
+   "referenced_type" : "type-2284",
+   "self_type" : "type-2284",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
    "unique_id" : "_ZTSN7android6ADebugE"
@@ -47167,8 +47246,8 @@
    ],
    "linker_set_key" : "android::AReplyToken",
    "name" : "android::AReplyToken",
-   "referenced_type" : "type-1044",
-   "self_type" : "type-1044",
+   "referenced_type" : "type-1043",
+   "self_type" : "type-1043",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android11AReplyTokenE",
@@ -48137,6 +48216,10 @@
      "mangled_component_name" : "_ZN7android16ProducerListener18needsReleaseNotifyEv"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ProducerListener18onBuffersDiscardedERKNSt3__16vectorIiNS1_9allocatorIiEEEE"
+    },
+    {
      "mangled_component_name" : "_ZNK7android17IProducerListener13getHalVariantEv"
     },
     {
@@ -48287,7 +48370,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1096"
+     "referenced_type" : "type-1099"
     },
     {
      "referenced_type" : "type-67"
@@ -48296,11 +48379,11 @@
    "linker_set_key" : "android::BnInterface<android::ISurfaceComposer>",
    "name" : "android::BnInterface<android::ISurfaceComposer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1095",
-   "self_type" : "type-1095",
+   "referenced_type" : "type-1098",
+   "self_type" : "type-1098",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-1097" ],
+   "template_args" : [ "type-1100" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_16ISurfaceComposerEEE",
    "vtable_components" :
    [
@@ -48335,7 +48418,7 @@
     },
     {
      "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ISurfaceComposer28createDisplayEventConnectionENS0_11VsyncSourceE"
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer28createDisplayEventConnectionENS0_11VsyncSourceENS0_13ConfigChangedE"
     },
     {
      "is_pure" : true,
@@ -48414,6 +48497,10 @@
     },
     {
      "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer13captureScreenEyPNS_8hardware8graphics6common4V1_29DataspaceEPNS_2spINS_13GraphicBufferEEE"
+    },
+    {
+     "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"
     },
     {
@@ -48493,6 +48580,10 @@
      "mangled_component_name" : "_ZNK7android16ISurfaceComposer20setDisplayBrightnessERKNS_2spINS_7IBinderEEEf"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer15notifyPowerHintEi"
+    },
+    {
      "mangled_component_name" : "_ZN7android11BnInterfaceINS_16ISurfaceComposerEE19queryLocalInterfaceERKNS_8String16E"
     },
     {
@@ -48611,7 +48702,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1032"
+     "referenced_type" : "type-1035"
     },
     {
      "referenced_type" : "type-67"
@@ -48620,11 +48711,11 @@
    "linker_set_key" : "android::BnInterface<android::ITransactionCompletedListener>",
    "name" : "android::BnInterface<android::ITransactionCompletedListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1031",
-   "self_type" : "type-1031",
+   "referenced_type" : "type-1034",
+   "self_type" : "type-1034",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-1033" ],
+   "template_args" : [ "type-1036" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_29ITransactionCompletedListenerEEE",
    "vtable_components" :
    [
@@ -48776,7 +48867,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1496"
+     "referenced_type" : "type-1502"
     },
     {
      "referenced_type" : "type-48"
@@ -48785,11 +48876,11 @@
    "linker_set_key" : "android::BpInterface<android::IConsumerListener>",
    "name" : "android::BpInterface<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1495",
-   "self_type" : "type-1495",
+   "referenced_type" : "type-1501",
+   "self_type" : "type-1501",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-1497" ],
+   "template_args" : [ "type-1503" ],
    "unique_id" : "_ZTSN7android11BpInterfaceINS_17IConsumerListenerEEE",
    "vtable_components" :
    [
@@ -48945,7 +49036,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1625"
+     "referenced_type" : "type-1630"
     },
     {
      "referenced_type" : "type-48"
@@ -48954,11 +49045,11 @@
    "linker_set_key" : "android::BpInterface<android::IGraphicBufferConsumer>",
    "name" : "android::BpInterface<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1624",
-   "self_type" : "type-1624",
+   "referenced_type" : "type-1629",
+   "self_type" : "type-1629",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-1626" ],
+   "template_args" : [ "type-1631" ],
    "unique_id" : "_ZTSN7android11BpInterfaceINS_22IGraphicBufferConsumerEEE",
    "vtable_components" :
    [
@@ -49150,7 +49241,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-4318"
+     "referenced_type" : "type-4324"
     },
     {
      "referenced_type" : "type-48"
@@ -49159,11 +49250,11 @@
    "linker_set_key" : "android::BpInterface<android::IGraphicBufferProducer>",
    "name" : "android::BpInterface<android::IGraphicBufferProducer>",
    "record_kind" : "class",
-   "referenced_type" : "type-4317",
-   "self_type" : "type-4317",
+   "referenced_type" : "type-4323",
+   "self_type" : "type-4323",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-4319" ],
+   "template_args" : [ "type-4325" ],
    "unique_id" : "_ZTSN7android11BpInterfaceINS_22IGraphicBufferProducerEEE",
    "vtable_components" :
    [
@@ -49379,7 +49470,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-4480"
+     "referenced_type" : "type-4486"
     },
     {
      "referenced_type" : "type-48"
@@ -49388,11 +49479,11 @@
    "linker_set_key" : "android::BpInterface<android::IProducerListener>",
    "name" : "android::BpInterface<android::IProducerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-4479",
-   "self_type" : "type-4479",
+   "referenced_type" : "type-4485",
+   "self_type" : "type-4485",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-4481" ],
+   "template_args" : [ "type-4487" ],
    "unique_id" : "_ZTSN7android11BpInterfaceINS_17IProducerListenerEEE",
    "vtable_components" :
    [
@@ -49424,6 +49515,10 @@
      "mangled_component_name" : "_ZN7android16ProducerListener18needsReleaseNotifyEv"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ProducerListener18onBuffersDiscardedERKNSt3__16vectorIiNS1_9allocatorIiEEEE"
+    },
+    {
      "mangled_component_name" : "_ZNK7android17IProducerListener13getHalVariantEv"
     },
     {
@@ -49656,28 +49751,28 @@
    [
     {
      "field_name" : "mRange",
-     "referenced_type" : "type-2429"
+     "referenced_type" : "type-2432"
     },
     {
      "field_name" : "mPrimaries",
      "field_offset" : 32,
-     "referenced_type" : "type-2430"
+     "referenced_type" : "type-2433"
     },
     {
      "field_name" : "mTransfer",
      "field_offset" : 64,
-     "referenced_type" : "type-2431"
+     "referenced_type" : "type-2434"
     },
     {
      "field_name" : "mMatrixCoeffs",
      "field_offset" : 96,
-     "referenced_type" : "type-2432"
+     "referenced_type" : "type-2435"
     }
    ],
    "linker_set_key" : "android::ColorAspects",
    "name" : "android::ColorAspects",
-   "referenced_type" : "type-2428",
-   "self_type" : "type-2428",
+   "referenced_type" : "type-2431",
+   "self_type" : "type-2431",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android12ColorAspectsE"
@@ -49686,8 +49781,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::ColorUtils",
    "name" : "android::ColorUtils",
-   "referenced_type" : "type-1181",
-   "self_type" : "type-1181",
+   "referenced_type" : "type-1180",
+   "self_type" : "type-1180",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
    "unique_id" : "_ZTSN7android10ColorUtilsE"
@@ -49696,8 +49791,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::CompileTimeAssert<true>",
    "name" : "android::CompileTimeAssert<true>",
-   "referenced_type" : "type-2690",
-   "self_type" : "type-2690",
+   "referenced_type" : "type-2693",
+   "self_type" : "type-2693",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Debug.h",
    "unique_id" : "_ZTSN7android17CompileTimeAssertILb1EEE"
@@ -49790,7 +49885,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -49800,7 +49895,7 @@
     {
      "field_name" : "bTunneled",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nAudioHwSync",
@@ -49815,8 +49910,8 @@
    ],
    "linker_set_key" : "android::ConfigureVideoTunnelModeParams",
    "name" : "android::ConfigureVideoTunnelModeParams",
-   "referenced_type" : "type-2426",
-   "self_type" : "type-2426",
+   "referenced_type" : "type-2429",
+   "self_type" : "type-2429",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android30ConfigureVideoTunnelModeParamsE"
@@ -49832,7 +49927,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -49842,12 +49937,12 @@
     {
      "field_name" : "bRequestingDataSpace",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bDataSpaceChanged",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nPixelFormat",
@@ -49862,13 +49957,13 @@
     {
      "field_name" : "sAspects",
      "field_offset" : 224,
-     "referenced_type" : "type-2428"
+     "referenced_type" : "type-2431"
     }
    ],
    "linker_set_key" : "android::DescribeColorAspectsParams",
    "name" : "android::DescribeColorAspectsParams",
-   "referenced_type" : "type-2427",
-   "self_type" : "type-2427",
+   "referenced_type" : "type-2430",
+   "self_type" : "type-2430",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26DescribeColorAspectsParamsE"
@@ -49884,12 +49979,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 64,
-     "referenced_type" : "type-2199"
+     "referenced_type" : "type-2202"
     },
     {
      "field_name" : "nFrameWidth",
@@ -49914,18 +50009,18 @@
     {
      "field_name" : "bUsingNativeBuffers",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "sMediaImage",
      "field_offset" : 256,
-     "referenced_type" : "type-2420"
+     "referenced_type" : "type-2423"
     }
    ],
    "linker_set_key" : "android::DescribeColorFormat2Params",
    "name" : "android::DescribeColorFormat2Params",
-   "referenced_type" : "type-2419",
-   "self_type" : "type-2419",
+   "referenced_type" : "type-2422",
+   "self_type" : "type-2422",
    "size" : 136,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26DescribeColorFormat2ParamsE"
@@ -49941,12 +50036,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 64,
-     "referenced_type" : "type-2199"
+     "referenced_type" : "type-2202"
     },
     {
      "field_name" : "nFrameWidth",
@@ -49971,18 +50066,18 @@
     {
      "field_name" : "bUsingNativeBuffers",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "sMediaImage",
      "field_offset" : 256,
-     "referenced_type" : "type-2415"
+     "referenced_type" : "type-2418"
     }
    ],
    "linker_set_key" : "android::DescribeColorFormatParams",
    "name" : "android::DescribeColorFormatParams",
-   "referenced_type" : "type-2414",
-   "self_type" : "type-2414",
+   "referenced_type" : "type-2417",
+   "self_type" : "type-2417",
    "size" : 112,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android25DescribeColorFormatParamsE"
@@ -49998,7 +50093,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50018,13 +50113,13 @@
     {
      "field_name" : "nValue",
      "field_offset" : 160,
-     "referenced_type" : "type-1572"
+     "referenced_type" : "type-1567"
     }
    ],
    "linker_set_key" : "android::DescribeHDR10PlusInfoParams",
    "name" : "android::DescribeHDR10PlusInfoParams",
-   "referenced_type" : "type-2440",
-   "self_type" : "type-2440",
+   "referenced_type" : "type-2443",
+   "self_type" : "type-2443",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android27DescribeHDR10PlusInfoParamsE"
@@ -50040,7 +50135,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50050,13 +50145,13 @@
     {
      "field_name" : "sInfo",
      "field_offset" : 96,
-     "referenced_type" : "type-2435"
+     "referenced_type" : "type-2438"
     }
    ],
    "linker_set_key" : "android::DescribeHDRStaticInfoParams",
    "name" : "android::DescribeHDRStaticInfoParams",
-   "referenced_type" : "type-2434",
-   "self_type" : "type-2434",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2437",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android27DescribeHDRStaticInfoParamsE"
@@ -50072,7 +50167,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50082,13 +50177,13 @@
     {
      "field_name" : "enable",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "android::EnableAndroidNativeBuffersParams",
    "name" : "android::EnableAndroidNativeBuffersParams",
-   "referenced_type" : "type-2395",
-   "self_type" : "type-2395",
+   "referenced_type" : "type-2398",
+   "self_type" : "type-2398",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android32EnableAndroidNativeBuffersParamsE"
@@ -50100,13 +50195,13 @@
     {
      "access" : "private",
      "field_name" : "mSharedFd",
-     "referenced_type" : "type-1199"
+     "referenced_type" : "type-1202"
     }
    ],
    "linker_set_key" : "android::FileDescriptor",
    "name" : "android::FileDescriptor",
-   "referenced_type" : "type-1198",
-   "self_type" : "type-1198",
+   "referenced_type" : "type-1201",
+   "self_type" : "type-1201",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h",
    "unique_id" : "_ZTSN7android14FileDescriptorE"
@@ -50123,8 +50218,8 @@
    ],
    "linker_set_key" : "android::FileDescriptor::Autoclose",
    "name" : "android::FileDescriptor::Autoclose",
-   "referenced_type" : "type-1204",
-   "self_type" : "type-1204",
+   "referenced_type" : "type-1203",
+   "self_type" : "type-1203",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h",
    "unique_id" : "_ZTSN7android14FileDescriptor9AutocloseE"
@@ -50308,7 +50403,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50323,8 +50418,8 @@
    ],
    "linker_set_key" : "android::GetAndroidNativeBufferUsageParams",
    "name" : "android::GetAndroidNativeBufferUsageParams",
-   "referenced_type" : "type-2412",
-   "self_type" : "type-2412",
+   "referenced_type" : "type-2415",
+   "self_type" : "type-2415",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android33GetAndroidNativeBufferUsageParamsE"
@@ -50670,17 +50765,17 @@
    [
     {
      "field_name" : "mID",
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2439"
     },
     {
      "field_offset" : 8,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2440"
     }
    ],
    "linker_set_key" : "android::HDRStaticInfo",
    "name" : "android::HDRStaticInfo",
-   "referenced_type" : "type-2435",
-   "self_type" : "type-2435",
+   "referenced_type" : "type-2438",
+   "self_type" : "type-2438",
    "size" : 25,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfoE"
@@ -50691,15 +50786,15 @@
    [
     {
      "field_name" : "sType1",
-     "referenced_type" : "type-2438"
+     "referenced_type" : "type-2441"
     }
    ],
    "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-2437",
-   "self_type" : "type-2437",
+   "referenced_type" : "type-2440",
+   "self_type" : "type-2440",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfoUt_E"
@@ -50720,8 +50815,8 @@
    ],
    "linker_set_key" : "android::HDRStaticInfo::Primaries1",
    "name" : "android::HDRStaticInfo::Primaries1",
-   "referenced_type" : "type-2439",
-   "self_type" : "type-2439",
+   "referenced_type" : "type-2442",
+   "self_type" : "type-2442",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfo10Primaries1E"
@@ -50732,22 +50827,22 @@
    [
     {
      "field_name" : "mR",
-     "referenced_type" : "type-2439"
+     "referenced_type" : "type-2442"
     },
     {
      "field_name" : "mG",
      "field_offset" : 32,
-     "referenced_type" : "type-2439"
+     "referenced_type" : "type-2442"
     },
     {
      "field_name" : "mB",
      "field_offset" : 64,
-     "referenced_type" : "type-2439"
+     "referenced_type" : "type-2442"
     },
     {
      "field_name" : "mW",
      "field_offset" : 96,
-     "referenced_type" : "type-2439"
+     "referenced_type" : "type-2442"
     },
     {
      "field_name" : "mMaxDisplayLuminance",
@@ -50772,8 +50867,8 @@
    ],
    "linker_set_key" : "android::HDRStaticInfo::Type1",
    "name" : "android::HDRStaticInfo::Type1",
-   "referenced_type" : "type-2438",
-   "self_type" : "type-2438",
+   "referenced_type" : "type-2441",
+   "self_type" : "type-2441",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfo5Type1E"
@@ -51097,31 +51192,31 @@
     {
      "access" : "private",
      "field_name" : "mProcess",
-     "referenced_type" : "type-1258"
+     "referenced_type" : "type-1261"
     },
     {
      "access" : "private",
      "field_name" : "mPendingStrongDerefs",
      "field_offset" : 32,
-     "referenced_type" : "type-1205"
+     "referenced_type" : "type-1208"
     },
     {
      "access" : "private",
      "field_name" : "mPendingWeakDerefs",
      "field_offset" : 192,
-     "referenced_type" : "type-1207"
+     "referenced_type" : "type-1210"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteStrongDerefs",
      "field_offset" : 352,
-     "referenced_type" : "type-1208"
+     "referenced_type" : "type-1213"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteWeakDerefs",
      "field_offset" : 512,
-     "referenced_type" : "type-1207"
+     "referenced_type" : "type-1210"
     },
     {
      "access" : "private",
@@ -51187,20 +51282,20 @@
      "access" : "private",
      "field_name" : "mIPCThreadStateBase",
      "field_offset" : 1888,
-     "referenced_type" : "type-1264"
+     "referenced_type" : "type-1267"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 1920,
-     "referenced_type" : "type-1255"
+     "referenced_type" : "type-1259"
     }
    ],
    "linker_set_key" : "android::IPCThreadState",
    "name" : "android::IPCThreadState",
    "record_kind" : "class",
-   "referenced_type" : "type-1257",
-   "self_type" : "type-1257",
+   "referenced_type" : "type-1260",
+   "self_type" : "type-1260",
    "size" : 244,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h",
    "unique_id" : "_ZTSN7android14IPCThreadStateE"
@@ -51212,17 +51307,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-1200"
+     "referenced_type" : "type-1204"
     }
    ],
    "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",
+   "referenced_type" : "type-1241",
+   "self_type" : "type-1241",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-1239", "type-795" ],
+   "template_args" : [ "type-1242", "type-795" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_7IBinderEEEEE"
   },
   {
@@ -51232,17 +51327,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-1354"
+     "referenced_type" : "type-1357"
     }
    ],
    "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",
+   "referenced_type" : "type-1369",
+   "self_type" : "type-1369",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-1239", "type-1367" ],
+   "template_args" : [ "type-1242", "type-1370" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
   },
   {
@@ -51310,11 +51405,11 @@
    "linker_set_key" : "android::LightFlattenable<android::FrameStats>",
    "name" : "android::LightFlattenable<android::FrameStats>",
    "record_kind" : "class",
-   "referenced_type" : "type-1098",
-   "self_type" : "type-1098",
+   "referenced_type" : "type-1101",
+   "self_type" : "type-1101",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1099" ],
+   "template_args" : [ "type-1102" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_10FrameStatsEEE"
   },
   {
@@ -51428,17 +51523,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-1210"
+     "referenced_type" : "type-1215"
     }
    ],
    "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",
+   "referenced_type" : "type-1214",
+   "self_type" : "type-1214",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-1211" ],
+   "template_args" : [ "type-1216" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_10GLConsumer8EglImageEEE"
   },
   {
@@ -51468,17 +51563,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-2353"
+     "referenced_type" : "type-2356"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
    "name" : "android::LightRefBase<android::VirtualLightRefBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-2352",
-   "self_type" : "type-2352",
+   "referenced_type" : "type-2355",
+   "self_type" : "type-2355",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-2354" ],
+   "template_args" : [ "type-2357" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
   },
   {
@@ -51889,7 +51984,7 @@
    [
     {
      "field_name" : "mType",
-     "referenced_type" : "type-2416"
+     "referenced_type" : "type-2419"
     },
     {
      "field_name" : "mNumPlanes",
@@ -51914,13 +52009,13 @@
     {
      "field_name" : "mPlane",
      "field_offset" : 160,
-     "referenced_type" : "type-2417"
+     "referenced_type" : "type-2420"
     }
    ],
    "linker_set_key" : "android::MediaImage",
    "name" : "android::MediaImage",
-   "referenced_type" : "type-2415",
-   "self_type" : "type-2415",
+   "referenced_type" : "type-2418",
+   "self_type" : "type-2418",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android10MediaImageE"
@@ -51931,7 +52026,7 @@
    [
     {
      "field_name" : "mType",
-     "referenced_type" : "type-2421"
+     "referenced_type" : "type-2424"
     },
     {
      "field_name" : "mNumPlanes",
@@ -51961,13 +52056,13 @@
     {
      "field_name" : "mPlane",
      "field_offset" : 192,
-     "referenced_type" : "type-2422"
+     "referenced_type" : "type-2425"
     }
    ],
    "linker_set_key" : "android::MediaImage2",
    "name" : "android::MediaImage2",
-   "referenced_type" : "type-2420",
-   "self_type" : "type-2420",
+   "referenced_type" : "type-2423",
+   "self_type" : "type-2423",
    "size" : 104,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android11MediaImage2E"
@@ -52003,8 +52098,8 @@
    ],
    "linker_set_key" : "android::MediaImage2::PlaneInfo",
    "name" : "android::MediaImage2::PlaneInfo",
-   "referenced_type" : "type-2423",
-   "self_type" : "type-2423",
+   "referenced_type" : "type-2426",
+   "self_type" : "type-2426",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android11MediaImage29PlaneInfoE"
@@ -52040,8 +52135,8 @@
    ],
    "linker_set_key" : "android::MediaImage::PlaneInfo",
    "name" : "android::MediaImage::PlaneInfo",
-   "referenced_type" : "type-2418",
-   "self_type" : "type-2418",
+   "referenced_type" : "type-2421",
+   "self_type" : "type-2421",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android10MediaImage9PlaneInfoE"
@@ -52120,8 +52215,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::OMXPluginBase",
    "name" : "android::OMXPluginBase",
-   "referenced_type" : "type-2393",
-   "self_type" : "type-2393",
+   "referenced_type" : "type-2396",
+   "self_type" : "type-2396",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h",
    "unique_id" : "_ZTSN7android13OMXPluginBaseE",
@@ -52333,17 +52428,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 32,
-     "referenced_type" : "type-1512"
+     "referenced_type" : "type-1516"
     }
    ],
    "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",
+   "referenced_type" : "type-1520",
+   "self_type" : "type-1520",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-1517" ],
+   "template_args" : [ "type-1521" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_10BufferItemEEE",
    "vtable_components" :
    [
@@ -52382,17 +52477,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 32,
-     "referenced_type" : "type-1647"
+     "referenced_type" : "type-1650"
     }
    ],
    "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",
+   "referenced_type" : "type-1662",
+   "self_type" : "type-1662",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-1659" ],
+   "template_args" : [ "type-1663" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_5FenceEEE",
    "vtable_components" :
    [
@@ -52431,17 +52526,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 32,
-     "referenced_type" : "type-4322"
+     "referenced_type" : "type-4328"
     }
    ],
    "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",
+   "referenced_type" : "type-4334",
+   "self_type" : "type-4334",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-4329" ],
+   "template_args" : [ "type-4335" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEEE",
    "vtable_components" :
    [
@@ -52480,17 +52575,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 32,
-     "referenced_type" : "type-1646"
+     "referenced_type" : "type-1649"
     }
    ],
    "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",
+   "referenced_type" : "type-1657",
+   "self_type" : "type-1657",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-1654" ],
+   "template_args" : [ "type-1658" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_13GraphicBufferEEE",
    "vtable_components" :
    [
@@ -52529,17 +52624,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 32,
-     "referenced_type" : "type-4321"
+     "referenced_type" : "type-4327"
     }
    ],
    "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",
+   "referenced_type" : "type-4339",
+   "self_type" : "type-4339",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-4334" ],
+   "template_args" : [ "type-4340" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEEE",
    "vtable_components" :
    [
@@ -52578,17 +52673,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 32,
-     "referenced_type" : "type-4323"
+     "referenced_type" : "type-4329"
     }
    ],
    "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",
+   "referenced_type" : "type-4345",
+   "self_type" : "type-4345",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-4339" ],
+   "template_args" : [ "type-4346" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEEE",
    "vtable_components" :
    [
@@ -52733,7 +52828,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -52743,7 +52838,7 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nMaxFrameWidth",
@@ -52758,8 +52853,8 @@
    ],
    "linker_set_key" : "android::PrepareForAdaptivePlaybackParams",
    "name" : "android::PrepareForAdaptivePlaybackParams",
-   "referenced_type" : "type-2406",
-   "self_type" : "type-2406",
+   "referenced_type" : "type-2409",
+   "self_type" : "type-2409",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android32PrepareForAdaptivePlaybackParamsE"
@@ -52775,18 +52870,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 64,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "android::PrependSPSPPSToIDRFramesParams",
    "name" : "android::PrependSPSPPSToIDRFramesParams",
-   "referenced_type" : "type-2413",
-   "self_type" : "type-2413",
+   "referenced_type" : "type-2416",
+   "self_type" : "type-2416",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android30PrependSPSPPSToIDRFramesParamsE"
@@ -52824,13 +52919,13 @@
      "access" : "private",
      "field_name" : "mThreadCountLock",
      "field_offset" : 128,
-     "referenced_type" : "type-1262"
+     "referenced_type" : "type-1265"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountDecrement",
      "field_offset" : 160,
-     "referenced_type" : "type-1263"
+     "referenced_type" : "type-1266"
     },
     {
      "access" : "private",
@@ -52860,7 +52955,7 @@
      "access" : "private",
      "field_name" : "mHandleToObject",
      "field_offset" : 352,
-     "referenced_type" : "type-1202"
+     "referenced_type" : "type-1206"
     },
     {
      "access" : "private",
@@ -52872,7 +52967,7 @@
      "access" : "private",
      "field_name" : "mBinderContextCheckFunc",
      "field_offset" : 544,
-     "referenced_type" : "type-1249"
+     "referenced_type" : "type-1252"
     },
     {
      "access" : "private",
@@ -52884,7 +52979,7 @@
      "access" : "private",
      "field_name" : "mContexts",
      "field_offset" : 608,
-     "referenced_type" : "type-1238"
+     "referenced_type" : "type-1241"
     },
     {
      "access" : "private",
@@ -52902,20 +52997,20 @@
      "access" : "private",
      "field_name" : "mThreadPoolSeq",
      "field_offset" : 832,
-     "referenced_type" : "type-1250"
+     "referenced_type" : "type-1253"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 864,
-     "referenced_type" : "type-1255"
+     "referenced_type" : "type-1259"
     }
    ],
    "linker_set_key" : "android::ProcessState",
    "name" : "android::ProcessState",
    "record_kind" : "class",
-   "referenced_type" : "type-1261",
-   "self_type" : "type-1261",
+   "referenced_type" : "type-1264",
+   "self_type" : "type-1264",
    "size" : 120,
    "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h",
    "unique_id" : "_ZTSN7android12ProcessStateE",
@@ -53003,8 +53098,8 @@
    ],
    "linker_set_key" : "android::ProcessState::handle_entry",
    "name" : "android::ProcessState::handle_entry",
-   "referenced_type" : "type-1203",
-   "self_type" : "type-1203",
+   "referenced_type" : "type-1207",
+   "self_type" : "type-1207",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h",
    "unique_id" : "_ZTSN7android12ProcessState12handle_entryE"
@@ -53132,8 +53227,8 @@
    "linker_set_key" : "android::ReferenceMover",
    "name" : "android::ReferenceMover",
    "record_kind" : "class",
-   "referenced_type" : "type-1589",
-   "self_type" : "type-1589",
+   "referenced_type" : "type-1592",
+   "self_type" : "type-1592",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android14ReferenceMoverE"
@@ -53143,8 +53238,8 @@
    "linker_set_key" : "android::ReferenceRenamer",
    "name" : "android::ReferenceRenamer",
    "record_kind" : "class",
-   "referenced_type" : "type-1166",
-   "self_type" : "type-1166",
+   "referenced_type" : "type-1167",
+   "self_type" : "type-1167",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android16ReferenceRenamerE",
@@ -53167,8 +53262,8 @@
    "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",
+   "referenced_type" : "type-1565",
+   "self_type" : "type-1565",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE16ElementIsPointerILj0EJRKNS_10BufferItemEEEE"
@@ -53180,14 +53275,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> >",
    "name" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> >",
    "record_kind" : "class",
-   "referenced_type" : "type-1563",
-   "self_type" : "type-1563",
+   "referenced_type" : "type-1568",
+   "self_type" : "type-1568",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE11InputReaderIJNSt3__15tupleIJEEEEEE"
@@ -53199,14 +53294,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-1572",
+   "self_type" : "type-1572",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE11InputReaderIJNSt3__15tupleIJRKNS_10BufferItemEEEEEEE"
@@ -53215,8 +53310,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::MethodCaller<tuple<> >",
    "name" : "android::SafeBnInterface<IConsumerListener>::MethodCaller<tuple<> >",
-   "referenced_type" : "type-1573",
-   "self_type" : "type-1573",
+   "referenced_type" : "type-1576",
+   "self_type" : "type-1576",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE12MethodCallerIJNSt3__15tupleIJEEEEEE"
@@ -53225,8 +53320,8 @@
    "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",
+   "referenced_type" : "type-1577",
+   "self_type" : "type-1577",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE12MethodCallerIJNSt3__15tupleIJRKNS_10BufferItemEEEEEEE"
@@ -53235,52 +53330,52 @@
    "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",
+   "referenced_type" : "type-1559",
+   "self_type" : "type-1559",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1556" ],
+   "template_args" : [ "type-1560" ],
    "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",
+   "referenced_type" : "type-1561",
+   "self_type" : "type-1561",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1558" ],
+   "template_args" : [ "type-1562" ],
    "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",
+   "referenced_type" : "type-1563",
+   "self_type" : "type-1563",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1560" ],
+   "template_args" : [ "type-1564" ],
    "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",
+   "referenced_type" : "type-1557",
+   "self_type" : "type-1557",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1554" ],
+   "template_args" : [ "type-1558" ],
    "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",
+   "referenced_type" : "type-2025",
+   "self_type" : "type-2025",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJPNS_10BufferItemExyEEE"
@@ -53289,8 +53384,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, android_dataspace_t>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, android_dataspace_t>",
-   "referenced_type" : "type-2037",
-   "self_type" : "type-2037",
+   "referenced_type" : "type-2041",
+   "self_type" : "type-2041",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJ19android_dataspace_tEEE"
@@ -53299,8 +53394,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, bool, vector<Segment, allocator<Segment> > *>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, bool, vector<Segment, allocator<Segment> > *>",
-   "referenced_type" : "type-2042",
-   "self_type" : "type-2042",
+   "referenced_type" : "type-2047",
+   "self_type" : "type-2047",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS7_EEEEEEE"
@@ -53309,8 +53404,8 @@
    "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",
+   "referenced_type" : "type-2043",
+   "self_type" : "type-2043",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJbEEE"
@@ -53319,8 +53414,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, const String8 &, String8 *>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, const String8 &, String8 *>",
-   "referenced_type" : "type-2045",
-   "self_type" : "type-2045",
+   "referenced_type" : "type-2049",
+   "self_type" : "type-2049",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJRKNS_7String8EPS4_EEE"
@@ -53329,8 +53424,8 @@
    "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",
+   "referenced_type" : "type-2040",
+   "self_type" : "type-2040",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJRKNS_7String8EEEE"
@@ -53339,8 +53434,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, const sp<IConsumerListener> &, bool>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, const sp<IConsumerListener> &, bool>",
-   "referenced_type" : "type-2030",
-   "self_type" : "type-2030",
+   "referenced_type" : "type-2034",
+   "self_type" : "type-2034",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJRKNS_2spINS_17IConsumerListenerEEEbEEE"
@@ -53349,8 +53444,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, int *, const sp<GraphicBuffer> &>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, int *, const sp<GraphicBuffer> &>",
-   "referenced_type" : "type-2025",
-   "self_type" : "type-2025",
+   "referenced_type" : "type-2029",
+   "self_type" : "type-2029",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJPiRKNS_2spINS_13GraphicBufferEEEEEE"
@@ -53359,8 +53454,8 @@
    "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",
+   "referenced_type" : "type-2031",
+   "self_type" : "type-2031",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJiyRKNS_2spINS_5FenceEEEEEE"
@@ -53369,8 +53464,8 @@
    "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",
+   "referenced_type" : "type-2028",
+   "self_type" : "type-2028",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJiEEE"
@@ -53379,8 +53474,8 @@
    "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",
+   "referenced_type" : "type-2045",
+   "self_type" : "type-2045",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJPNS_2spINS_12NativeHandleEEEEEE"
@@ -53389,8 +53484,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned int, unsigned int>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned int, unsigned int>",
-   "referenced_type" : "type-2034",
-   "self_type" : "type-2034",
+   "referenced_type" : "type-2038",
+   "self_type" : "type-2038",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJjjEEE"
@@ -53399,8 +53494,8 @@
    "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",
+   "referenced_type" : "type-2044",
+   "self_type" : "type-2044",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJjEEE"
@@ -53409,8 +53504,8 @@
    "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",
+   "referenced_type" : "type-2037",
+   "self_type" : "type-2037",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJPyEEE"
@@ -53419,8 +53514,8 @@
    "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",
+   "referenced_type" : "type-2042",
+   "self_type" : "type-2042",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJyEEE"
@@ -53429,8 +53524,8 @@
    "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",
+   "referenced_type" : "type-2026",
+   "self_type" : "type-2026",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJPNS_10BufferItemExyEEE"
@@ -53439,8 +53534,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, bool, vector<Segment, allocator<Segment> > *>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, bool, vector<Segment, allocator<Segment> > *>",
-   "referenced_type" : "type-2044",
-   "self_type" : "type-2044",
+   "referenced_type" : "type-2048",
+   "self_type" : "type-2048",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS7_EEEEEEE"
@@ -53449,8 +53544,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, const String8 &, String8 *>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, const String8 &, String8 *>",
-   "referenced_type" : "type-2046",
-   "self_type" : "type-2046",
+   "referenced_type" : "type-2050",
+   "self_type" : "type-2050",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJRKNS_7String8EPS4_EEE"
@@ -53459,8 +53554,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, const sp<IConsumerListener> &, bool>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, const sp<IConsumerListener> &, bool>",
-   "referenced_type" : "type-2031",
-   "self_type" : "type-2031",
+   "referenced_type" : "type-2036",
+   "self_type" : "type-2036",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJRKNS_2spINS_17IConsumerListenerEEEbEEE"
@@ -53469,8 +53564,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, int *, const sp<GraphicBuffer> &>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, int *, const sp<GraphicBuffer> &>",
-   "referenced_type" : "type-2026",
-   "self_type" : "type-2026",
+   "referenced_type" : "type-2030",
+   "self_type" : "type-2030",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJPiRKNS_2spINS_13GraphicBufferEEEEEE"
@@ -53479,8 +53574,8 @@
    "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",
+   "referenced_type" : "type-2032",
+   "self_type" : "type-2032",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJiyRKNS_2spINS_5FenceEEEEEE"
@@ -53489,8 +53584,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, unsigned int, unsigned int>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, unsigned int, unsigned int>",
-   "referenced_type" : "type-2035",
-   "self_type" : "type-2035",
+   "referenced_type" : "type-2039",
+   "self_type" : "type-2039",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJjjEEE"
@@ -53499,8 +53594,8 @@
    "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",
+   "referenced_type" : "type-2027",
+   "self_type" : "type-2027",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj2EJPNS_10BufferItemExyEEE"
@@ -53509,8 +53604,8 @@
    "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",
+   "referenced_type" : "type-2033",
+   "self_type" : "type-2033",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj2EJiyRKNS_2spINS_5FenceEEEEEE"
@@ -53522,14 +53617,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2073",
+   "self_type" : "type-2073",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJEEEEEE"
@@ -53541,14 +53636,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2051",
+   "self_type" : "type-2051",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPNS_10BufferItemExyEEEEEE"
@@ -53560,14 +53655,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2091",
+   "self_type" : "type-2091",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJ19android_dataspace_tEEEEEE"
@@ -53579,14 +53674,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2111",
+   "self_type" : "type-2111",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJbPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEEEE"
@@ -53598,14 +53693,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2097",
+   "self_type" : "type-2097",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJbEEEEEE"
@@ -53617,14 +53712,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2116",
+   "self_type" : "type-2116",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJRKNS_7String8EPS6_EEEEEE"
@@ -53636,14 +53731,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2086",
+   "self_type" : "type-2086",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJRKNS_7String8EEEEEEE"
@@ -53655,14 +53750,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2069",
+   "self_type" : "type-2069",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEEbEEEEEE"
@@ -53674,14 +53769,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2060",
+   "self_type" : "type-2060",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
@@ -53693,14 +53788,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2064",
+   "self_type" : "type-2064",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJiyRKNS_2spINS_5FenceEEEEEEEEE"
@@ -53712,14 +53807,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2055",
+   "self_type" : "type-2055",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJiEEEEEE"
@@ -53731,14 +53826,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2107",
+   "self_type" : "type-2107",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPNS_2spINS_12NativeHandleEEEEEEEEE"
@@ -53750,14 +53845,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2082",
+   "self_type" : "type-2082",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJjjEEEEEE"
@@ -53769,14 +53864,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2103",
+   "self_type" : "type-2103",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJjEEEEEE"
@@ -53788,14 +53883,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2077",
+   "self_type" : "type-2077",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPyEEEEEE"
@@ -53807,14 +53902,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2095",
+   "self_type" : "type-2095",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJyEEEEEE"
@@ -53823,8 +53918,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<> >",
-   "referenced_type" : "type-2122",
-   "self_type" : "type-2122",
+   "referenced_type" : "type-2126",
+   "self_type" : "type-2126",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJEEEEEE"
@@ -53833,8 +53928,8 @@
    "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",
+   "referenced_type" : "type-2120",
+   "self_type" : "type-2120",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPNS_10BufferItemExyEEEEEE"
@@ -53843,8 +53938,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<android_dataspace_t> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<android_dataspace_t> >",
-   "referenced_type" : "type-2126",
-   "self_type" : "type-2126",
+   "referenced_type" : "type-2130",
+   "self_type" : "type-2130",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJ19android_dataspace_tEEEEEE"
@@ -53853,8 +53948,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<bool, vector<Segment, allocator<Segment> > *> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<bool, vector<Segment, allocator<Segment> > *> >",
-   "referenced_type" : "type-2131",
-   "self_type" : "type-2131",
+   "referenced_type" : "type-2136",
+   "self_type" : "type-2136",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJbPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEEEE"
@@ -53863,8 +53958,8 @@
    "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",
+   "referenced_type" : "type-2132",
+   "self_type" : "type-2132",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJbEEEEEE"
@@ -53873,8 +53968,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<const String8 &, String8 *> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<const String8 &, String8 *> >",
-   "referenced_type" : "type-2133",
-   "self_type" : "type-2133",
+   "referenced_type" : "type-2137",
+   "self_type" : "type-2137",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJRKNS_7String8EPS6_EEEEEE"
@@ -53883,8 +53978,8 @@
    "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",
+   "referenced_type" : "type-2129",
+   "self_type" : "type-2129",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJRKNS_7String8EEEEEEE"
@@ -53893,8 +53988,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<const sp<IConsumerListener> &, bool> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<const sp<IConsumerListener> &, bool> >",
-   "referenced_type" : "type-2120",
-   "self_type" : "type-2120",
+   "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_2spINS_17IConsumerListenerEEEbEEEEEE"
@@ -53903,8 +53998,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<int *, const sp<GraphicBuffer> &> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<int *, const sp<GraphicBuffer> &> >",
-   "referenced_type" : "type-2118",
-   "self_type" : "type-2118",
+   "referenced_type" : "type-2122",
+   "self_type" : "type-2122",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
@@ -53913,8 +54008,8 @@
    "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",
+   "referenced_type" : "type-2123",
+   "self_type" : "type-2123",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJiyRKNS_2spINS_5FenceEEEEEEEEE"
@@ -53923,8 +54018,8 @@
    "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",
+   "referenced_type" : "type-2121",
+   "self_type" : "type-2121",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJiEEEEEE"
@@ -53933,8 +54028,8 @@
    "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",
+   "referenced_type" : "type-2134",
+   "self_type" : "type-2134",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPNS_2spINS_12NativeHandleEEEEEEEEE"
@@ -53943,8 +54038,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned int, unsigned int> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned int, unsigned int> >",
-   "referenced_type" : "type-2124",
-   "self_type" : "type-2124",
+   "referenced_type" : "type-2128",
+   "self_type" : "type-2128",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJjjEEEEEE"
@@ -53953,8 +54048,8 @@
    "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",
+   "referenced_type" : "type-2133",
+   "self_type" : "type-2133",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJjEEEEEE"
@@ -53963,8 +54058,8 @@
    "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",
+   "referenced_type" : "type-2127",
+   "self_type" : "type-2127",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPyEEEEEE"
@@ -53973,8 +54068,8 @@
    "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",
+   "referenced_type" : "type-2131",
+   "self_type" : "type-2131",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJyEEEEEE"
@@ -53986,13 +54081,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<> >",
-   "referenced_type" : "type-2145",
-   "self_type" : "type-2145",
+   "referenced_type" : "type-2149",
+   "self_type" : "type-2149",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJEEEEEE"
@@ -54004,13 +54099,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2138",
+   "self_type" : "type-2138",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPNS_10BufferItemExyEEEEEE"
@@ -54022,13 +54117,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2158",
+   "self_type" : "type-2158",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJ19android_dataspace_tEEEEEE"
@@ -54040,13 +54135,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2169",
+   "self_type" : "type-2169",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJbPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEEEE"
@@ -54058,13 +54153,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool> >",
-   "referenced_type" : "type-2158",
-   "self_type" : "type-2158",
+   "referenced_type" : "type-2162",
+   "self_type" : "type-2162",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJbEEEEEE"
@@ -54076,13 +54171,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2171",
+   "self_type" : "type-2171",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJRKNS_7String8EPS6_EEEEEE"
@@ -54094,13 +54189,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2155",
+   "self_type" : "type-2155",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJRKNS_7String8EEEEEEE"
@@ -54112,13 +54207,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2147",
+   "self_type" : "type-2147",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEEbEEEEEE"
@@ -54130,13 +54225,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2142",
+   "self_type" : "type-2142",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
@@ -54148,13 +54243,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2144",
+   "self_type" : "type-2144",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJiyRKNS_2spINS_5FenceEEEEEEEEE"
@@ -54166,13 +54261,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int> >",
-   "referenced_type" : "type-2136",
-   "self_type" : "type-2136",
+   "referenced_type" : "type-2140",
+   "self_type" : "type-2140",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJiEEEEEE"
@@ -54184,13 +54279,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2166",
+   "self_type" : "type-2166",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPNS_2spINS_12NativeHandleEEEEEEEEE"
@@ -54202,13 +54297,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2153",
+   "self_type" : "type-2153",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJjjEEEEEE"
@@ -54220,13 +54315,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2164",
+   "self_type" : "type-2164",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJjEEEEEE"
@@ -54238,13 +54333,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2151",
+   "self_type" : "type-2151",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPyEEEEEE"
@@ -54256,13 +54351,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2160",
+   "self_type" : "type-2160",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJyEEEEEE"
@@ -54271,660 +54366,660 @@
    "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",
+   "referenced_type" : "type-1974",
+   "self_type" : "type-1974",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1971" ],
+   "template_args" : [ "type-1975" ],
    "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",
+   "referenced_type" : "type-1939",
+   "self_type" : "type-1939",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1936" ],
+   "template_args" : [ "type-1940" ],
    "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",
+   "referenced_type" : "type-1992",
+   "self_type" : "type-1992",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1988" ],
+   "template_args" : [ "type-1993" ],
    "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",
+   "referenced_type" : "type-2011",
+   "self_type" : "type-2011",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2008" ],
+   "template_args" : [ "type-2012" ],
    "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",
+   "referenced_type" : "type-1998",
+   "self_type" : "type-1998",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1995" ],
+   "template_args" : [ "type-1999" ],
    "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",
+   "referenced_type" : "type-2018",
+   "self_type" : "type-2018",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2015" ],
+   "template_args" : [ "type-2019" ],
    "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",
+   "referenced_type" : "type-1987",
+   "self_type" : "type-1987",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1984" ],
+   "template_args" : [ "type-1988" ],
    "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",
+   "referenced_type" : "type-1967",
+   "self_type" : "type-1967",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1964" ],
+   "template_args" : [ "type-1968" ],
    "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",
+   "referenced_type" : "type-1952",
+   "self_type" : "type-1952",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1949" ],
+   "template_args" : [ "type-1953" ],
    "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",
+   "referenced_type" : "type-1959",
+   "self_type" : "type-1959",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1955" ],
+   "template_args" : [ "type-1960" ],
    "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",
+   "referenced_type" : "type-1948",
+   "self_type" : "type-1948",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1944" ],
+   "template_args" : [ "type-1949" ],
    "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",
+   "referenced_type" : "type-2007",
+   "self_type" : "type-2007",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2004" ],
+   "template_args" : [ "type-2008" ],
    "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",
+   "referenced_type" : "type-1981",
+   "self_type" : "type-1981",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1977" ],
+   "template_args" : [ "type-1982" ],
    "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",
+   "referenced_type" : "type-2003",
+   "self_type" : "type-2003",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1999" ],
+   "template_args" : [ "type-2004" ],
    "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",
+   "referenced_type" : "type-1976",
+   "self_type" : "type-1976",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1973" ],
+   "template_args" : [ "type-1977" ],
    "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",
+   "referenced_type" : "type-1996",
+   "self_type" : "type-1996",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1993" ],
+   "template_args" : [ "type-1997" ],
    "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",
+   "referenced_type" : "type-1945",
+   "self_type" : "type-1945",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1942" ],
+   "template_args" : [ "type-1946" ],
    "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",
+   "referenced_type" : "type-1943",
+   "self_type" : "type-1943",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1940" ],
+   "template_args" : [ "type-1944" ],
    "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",
+   "referenced_type" : "type-1941",
+   "self_type" : "type-1941",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1938" ],
+   "template_args" : [ "type-1942" ],
    "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",
+   "referenced_type" : "type-2022",
+   "self_type" : "type-2022",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2019" ],
+   "template_args" : [ "type-2023" ],
    "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",
+   "referenced_type" : "type-1989",
+   "self_type" : "type-1989",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1986" ],
+   "template_args" : [ "type-1990" ],
    "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",
+   "referenced_type" : "type-2020",
+   "self_type" : "type-2020",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2017" ],
+   "template_args" : [ "type-2021" ],
    "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",
+   "referenced_type" : "type-1994",
+   "self_type" : "type-1994",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1991" ],
+   "template_args" : [ "type-1995" ],
    "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",
+   "referenced_type" : "type-2016",
+   "self_type" : "type-2016",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2013" ],
+   "template_args" : [ "type-2017" ],
    "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",
+   "referenced_type" : "type-2000",
+   "self_type" : "type-2000",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1997" ],
+   "template_args" : [ "type-2001" ],
    "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",
+   "referenced_type" : "type-2014",
+   "self_type" : "type-2014",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2010" ],
+   "template_args" : [ "type-2015" ],
    "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",
+   "referenced_type" : "type-1956",
+   "self_type" : "type-1956",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1953" ],
+   "template_args" : [ "type-1957" ],
    "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",
+   "referenced_type" : "type-1965",
+   "self_type" : "type-1965",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1962" ],
+   "template_args" : [ "type-1966" ],
    "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",
+   "referenced_type" : "type-1963",
+   "self_type" : "type-1963",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1960" ],
+   "template_args" : [ "type-1964" ],
    "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",
+   "referenced_type" : "type-1950",
+   "self_type" : "type-1950",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1947" ],
+   "template_args" : [ "type-1951" ],
    "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",
+   "referenced_type" : "type-1954",
+   "self_type" : "type-1954",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1951" ],
+   "template_args" : [ "type-1955" ],
    "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",
+   "referenced_type" : "type-1961",
+   "self_type" : "type-1961",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1958" ],
+   "template_args" : [ "type-1962" ],
    "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",
+   "referenced_type" : "type-1970",
+   "self_type" : "type-1970",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1966" ],
+   "template_args" : [ "type-1971" ],
    "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",
+   "referenced_type" : "type-1972",
+   "self_type" : "type-1972",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1969" ],
+   "template_args" : [ "type-1973" ],
    "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",
+   "referenced_type" : "type-2009",
+   "self_type" : "type-2009",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2006" ],
+   "template_args" : [ "type-2010" ],
    "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",
+   "referenced_type" : "type-1985",
+   "self_type" : "type-1985",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1982" ],
+   "template_args" : [ "type-1986" ],
    "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",
+   "referenced_type" : "type-2005",
+   "self_type" : "type-2005",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2002" ],
+   "template_args" : [ "type-2006" ],
    "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",
+   "referenced_type" : "type-1983",
+   "self_type" : "type-1983",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1980" ],
+   "template_args" : [ "type-1984" ],
    "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",
+   "referenced_type" : "type-1978",
+   "self_type" : "type-1978",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1975" ],
+   "template_args" : [ "type-1979" ],
    "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",
+   "referenced_type" : "type-1893",
+   "self_type" : "type-1893",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1889" ],
+   "template_args" : [ "type-1894" ],
    "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",
+   "referenced_type" : "type-1937",
+   "self_type" : "type-1937",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1933" ],
+   "template_args" : [ "type-1938" ],
    "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",
+   "referenced_type" : "type-1926",
+   "self_type" : "type-1926",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1922" ],
+   "template_args" : [ "type-1927" ],
    "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",
+   "referenced_type" : "type-1930",
+   "self_type" : "type-1930",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1927" ],
+   "template_args" : [ "type-1931" ],
    "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",
+   "referenced_type" : "type-1915",
+   "self_type" : "type-1915",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1911" ],
+   "template_args" : [ "type-1916" ],
    "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",
+   "referenced_type" : "type-1934",
+   "self_type" : "type-1934",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1931" ],
+   "template_args" : [ "type-1935" ],
    "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",
+   "referenced_type" : "type-1923",
+   "self_type" : "type-1923",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1920" ],
+   "template_args" : [ "type-1924" ],
    "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",
+   "referenced_type" : "type-1910",
+   "self_type" : "type-1910",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1907" ],
+   "template_args" : [ "type-1911" ],
    "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",
+   "referenced_type" : "type-1904",
+   "self_type" : "type-1904",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1900" ],
+   "template_args" : [ "type-1905" ],
    "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",
+   "referenced_type" : "type-1912",
+   "self_type" : "type-1912",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1909" ],
+   "template_args" : [ "type-1913" ],
    "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",
+   "referenced_type" : "type-1901",
+   "self_type" : "type-1901",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1898" ],
+   "template_args" : [ "type-1902" ],
    "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",
+   "referenced_type" : "type-1906",
+   "self_type" : "type-1906",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1903" ],
+   "template_args" : [ "type-1907" ],
    "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",
+   "referenced_type" : "type-1899",
+   "self_type" : "type-1899",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1896" ],
+   "template_args" : [ "type-1900" ],
    "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",
+   "referenced_type" : "type-1895",
+   "self_type" : "type-1895",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1892" ],
+   "template_args" : [ "type-1896" ],
    "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",
+   "referenced_type" : "type-1928",
+   "self_type" : "type-1928",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1925" ],
+   "template_args" : [ "type-1929" ],
    "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",
+   "referenced_type" : "type-1919",
+   "self_type" : "type-1919",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1916" ],
+   "template_args" : [ "type-1920" ],
    "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",
+   "referenced_type" : "type-1921",
+   "self_type" : "type-1921",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1918" ],
+   "template_args" : [ "type-1922" ],
    "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",
+   "referenced_type" : "type-1917",
+   "self_type" : "type-1917",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1914" ],
+   "template_args" : [ "type-1918" ],
    "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",
+   "referenced_type" : "type-1908",
+   "self_type" : "type-1908",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1905" ],
+   "template_args" : [ "type-1909" ],
    "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",
+   "referenced_type" : "type-1897",
+   "self_type" : "type-1897",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1894" ],
+   "template_args" : [ "type-1898" ],
    "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",
+   "referenced_type" : "type-1932",
+   "self_type" : "type-1932",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1929" ],
+   "template_args" : [ "type-1933" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEJEEE"
   },
   {
@@ -54941,17 +55036,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 160,
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<android::IConsumerListener>",
    "name" : "android::SafeBnInterface<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1287",
-   "self_type" : "type-1287",
+   "referenced_type" : "type-1290",
+   "self_type" : "type-1290",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1288" ],
+   "template_args" : [ "type-1291" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEEE",
    "vtable_components" :
    [
@@ -55152,17 +55247,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 128,
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<android::IGraphicBufferConsumer>",
    "name" : "android::SafeBnInterface<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1276",
-   "self_type" : "type-1276",
+   "referenced_type" : "type-1279",
+   "self_type" : "type-1279",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1277" ],
+   "template_args" : [ "type-1280" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEEE",
    "vtable_components" :
    [
@@ -55390,7 +55485,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1031"
+     "referenced_type" : "type-1034"
     }
    ],
    "fields" :
@@ -55399,17 +55494,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 128,
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<android::ITransactionCompletedListener>",
    "name" : "android::SafeBnInterface<android::ITransactionCompletedListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1102",
-   "self_type" : "type-1102",
+   "referenced_type" : "type-1105",
+   "self_type" : "type-1105",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1104" ],
+   "template_args" : [ "type-1107" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEEE",
    "vtable_components" :
    [
@@ -55560,525 +55655,525 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IConsumerListener>::ArgsMatchParams<std::tuple<>, std::tuple<> >",
    "name" : "android::SafeBpInterface<IConsumerListener>::ArgsMatchParams<std::tuple<>, std::tuple<> >",
-   "referenced_type" : "type-1544",
-   "self_type" : "type-1544",
+   "referenced_type" : "type-1547",
+   "self_type" : "type-1547",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1545", "type-1546" ],
+   "template_args" : [ "type-1548", "type-1549" ],
    "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",
+   "referenced_type" : "type-1550",
+   "self_type" : "type-1550",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1548", "type-1549" ],
+   "template_args" : [ "type-1551", "type-1552" ],
    "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",
+   "referenced_type" : "type-1544",
+   "self_type" : "type-1544",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1542", "type-1543" ],
+   "template_args" : [ "type-1545", "type-1546" ],
    "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",
+   "referenced_type" : "type-1553",
+   "self_type" : "type-1553",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1532" ],
+   "template_args" : [ "type-1535" ],
    "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",
+   "referenced_type" : "type-1819",
+   "self_type" : "type-1819",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1816", "type-1817" ],
+   "template_args" : [ "type-1820", "type-1821" ],
    "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",
+   "referenced_type" : "type-1803",
+   "self_type" : "type-1803",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1800", "type-1801" ],
+   "template_args" : [ "type-1804", "type-1805" ],
    "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",
+   "referenced_type" : "type-1833",
+   "self_type" : "type-1833",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1829", "type-1830" ],
+   "template_args" : [ "type-1834", "type-1835" ],
    "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",
+   "referenced_type" : "type-1849",
+   "self_type" : "type-1849",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1846", "type-1847" ],
+   "template_args" : [ "type-1850", "type-1851" ],
    "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",
+   "referenced_type" : "type-1839",
+   "self_type" : "type-1839",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1836", "type-1837" ],
+   "template_args" : [ "type-1840", "type-1841" ],
    "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",
+   "referenced_type" : "type-1852",
+   "self_type" : "type-1852",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1849", "type-1850" ],
+   "template_args" : [ "type-1853", "type-1854" ],
    "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",
+   "referenced_type" : "type-1829",
+   "self_type" : "type-1829",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1826", "type-1827" ],
+   "template_args" : [ "type-1830", "type-1831" ],
    "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",
+   "referenced_type" : "type-1816",
+   "self_type" : "type-1816",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1813", "type-1814" ],
+   "template_args" : [ "type-1817", "type-1818" ],
    "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",
+   "referenced_type" : "type-1813",
+   "self_type" : "type-1813",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1810", "type-1811" ],
+   "template_args" : [ "type-1814", "type-1815" ],
    "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",
+   "referenced_type" : "type-1806",
+   "self_type" : "type-1806",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1803", "type-1804" ],
+   "template_args" : [ "type-1807", "type-1808" ],
    "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",
+   "referenced_type" : "type-1809",
+   "self_type" : "type-1809",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1806", "type-1807" ],
+   "template_args" : [ "type-1810", "type-1811" ],
    "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",
+   "referenced_type" : "type-1846",
+   "self_type" : "type-1846",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1843", "type-1844" ],
+   "template_args" : [ "type-1847", "type-1848" ],
    "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",
+   "referenced_type" : "type-1826",
+   "self_type" : "type-1826",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1823", "type-1824" ],
+   "template_args" : [ "type-1827", "type-1828" ],
    "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",
+   "referenced_type" : "type-1842",
+   "self_type" : "type-1842",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1839", "type-1840" ],
+   "template_args" : [ "type-1843", "type-1844" ],
    "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",
+   "referenced_type" : "type-1836",
+   "self_type" : "type-1836",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1833", "type-1834" ],
+   "template_args" : [ "type-1837", "type-1838" ],
    "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",
+   "referenced_type" : "type-1823",
+   "self_type" : "type-1823",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1820", "type-1821" ],
+   "template_args" : [ "type-1824", "type-1825" ],
    "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",
+   "referenced_type" : "type-1724",
+   "self_type" : "type-1724",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1721", "type-1722" ],
+   "template_args" : [ "type-1725", "type-1726" ],
    "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",
+   "referenced_type" : "type-1773",
+   "self_type" : "type-1773",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1770", "type-1771" ],
+   "template_args" : [ "type-1774", "type-1775" ],
    "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",
+   "referenced_type" : "type-1790",
+   "self_type" : "type-1790",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1787", "type-1788" ],
+   "template_args" : [ "type-1791", "type-1792" ],
    "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",
+   "referenced_type" : "type-1780",
+   "self_type" : "type-1780",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1777", "type-1778" ],
+   "template_args" : [ "type-1781", "type-1782" ],
    "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",
+   "referenced_type" : "type-1796",
+   "self_type" : "type-1796",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1793", "type-1794" ],
+   "template_args" : [ "type-1797", "type-1798" ],
    "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",
+   "referenced_type" : "type-1770",
+   "self_type" : "type-1770",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1767", "type-1768" ],
+   "template_args" : [ "type-1771", "type-1772" ],
    "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",
+   "referenced_type" : "type-1753",
+   "self_type" : "type-1753",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1750", "type-1751" ],
+   "template_args" : [ "type-1754", "type-1755" ],
    "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",
+   "referenced_type" : "type-1743",
+   "self_type" : "type-1743",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1740", "type-1741" ],
+   "template_args" : [ "type-1744", "type-1745" ],
    "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",
+   "referenced_type" : "type-1734",
+   "self_type" : "type-1734",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1730", "type-1731" ],
+   "template_args" : [ "type-1735", "type-1736" ],
    "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",
+   "referenced_type" : "type-1737",
+   "self_type" : "type-1737",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1734", "type-1735" ],
+   "template_args" : [ "type-1738", "type-1739" ],
    "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",
+   "referenced_type" : "type-1786",
+   "self_type" : "type-1786",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1783", "type-1784" ],
+   "template_args" : [ "type-1787", "type-1788" ],
    "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",
+   "referenced_type" : "type-1763",
+   "self_type" : "type-1763",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1760", "type-1761" ],
+   "template_args" : [ "type-1764", "type-1765" ],
    "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",
+   "referenced_type" : "type-1783",
+   "self_type" : "type-1783",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1780", "type-1781" ],
+   "template_args" : [ "type-1784", "type-1785" ],
    "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",
+   "referenced_type" : "type-1776",
+   "self_type" : "type-1776",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1773", "type-1774" ],
+   "template_args" : [ "type-1777", "type-1778" ],
    "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",
+   "referenced_type" : "type-1760",
+   "self_type" : "type-1760",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1757", "type-1758" ],
+   "template_args" : [ "type-1761", "type-1762" ],
    "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",
+   "referenced_type" : "type-1727",
+   "self_type" : "type-1727",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1724", "type-1725" ],
+   "template_args" : [ "type-1728", "type-1729" ],
    "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",
+   "referenced_type" : "type-1793",
+   "self_type" : "type-1793",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1790", "type-1791" ],
+   "template_args" : [ "type-1794", "type-1795" ],
    "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",
+   "referenced_type" : "type-1800",
+   "self_type" : "type-1800",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1796", "type-1797" ],
+   "template_args" : [ "type-1801", "type-1802" ],
    "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",
+   "referenced_type" : "type-1757",
+   "self_type" : "type-1757",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1754", "type-1755" ],
+   "template_args" : [ "type-1758", "type-1759" ],
    "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",
+   "referenced_type" : "type-1747",
+   "self_type" : "type-1747",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1744", "type-1745" ],
+   "template_args" : [ "type-1748", "type-1749" ],
    "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",
+   "referenced_type" : "type-1740",
+   "self_type" : "type-1740",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1737", "type-1738" ],
+   "template_args" : [ "type-1741", "type-1742" ],
    "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",
+   "referenced_type" : "type-1767",
+   "self_type" : "type-1767",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1763", "type-1764" ],
+   "template_args" : [ "type-1768", "type-1769" ],
    "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",
+   "referenced_type" : "type-1730",
+   "self_type" : "type-1730",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1727", "type-1728" ],
+   "template_args" : [ "type-1731", "type-1732" ],
    "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",
+   "referenced_type" : "type-1750",
+   "self_type" : "type-1750",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1747", "type-1748" ],
+   "template_args" : [ "type-1751", "type-1752" ],
    "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",
+   "referenced_type" : "type-1856",
+   "self_type" : "type-1856",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1853" ],
+   "template_args" : [ "type-1857" ],
    "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",
+   "referenced_type" : "type-1887",
+   "self_type" : "type-1887",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1884" ],
+   "template_args" : [ "type-1888" ],
    "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",
+   "referenced_type" : "type-1882",
+   "self_type" : "type-1882",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1879" ],
+   "template_args" : [ "type-1883" ],
    "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",
+   "referenced_type" : "type-1880",
+   "self_type" : "type-1880",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-767" ],
@@ -56088,8 +56183,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<bool &>",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<bool &>",
-   "referenced_type" : "type-1869",
-   "self_type" : "type-1869",
+   "referenced_type" : "type-1873",
+   "self_type" : "type-1873",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-766" ],
@@ -56099,41 +56194,41 @@
    "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",
+   "referenced_type" : "type-1877",
+   "self_type" : "type-1877",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1874" ],
+   "template_args" : [ "type-1878" ],
    "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",
+   "referenced_type" : "type-1865",
+   "self_type" : "type-1865",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1862" ],
+   "template_args" : [ "type-1866" ],
    "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",
+   "referenced_type" : "type-1863",
+   "self_type" : "type-1863",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1859" ],
+   "template_args" : [ "type-1864" ],
    "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",
+   "referenced_type" : "type-1872",
+   "self_type" : "type-1872",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-944" ],
@@ -56143,8 +56238,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int &>",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int &>",
-   "referenced_type" : "type-1856",
-   "self_type" : "type-1856",
+   "referenced_type" : "type-1860",
+   "self_type" : "type-1860",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-198" ],
@@ -56154,41 +56249,41 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int *&>",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int *&>",
-   "referenced_type" : "type-1857",
-   "self_type" : "type-1857",
+   "referenced_type" : "type-1861",
+   "self_type" : "type-1861",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1508" ],
+   "template_args" : [ "type-1511" ],
    "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",
+   "referenced_type" : "type-1858",
+   "self_type" : "type-1858",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1429" ],
+   "template_args" : [ "type-1432" ],
    "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",
+   "referenced_type" : "type-1885",
+   "self_type" : "type-1885",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1882" ],
+   "template_args" : [ "type-1886" ],
    "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",
+   "referenced_type" : "type-1876",
+   "self_type" : "type-1876",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-10" ],
@@ -56198,8 +56293,8 @@
    "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",
+   "referenced_type" : "type-1859",
+   "self_type" : "type-1859",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-544" ],
@@ -56209,11 +56304,11 @@
    "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",
+   "referenced_type" : "type-1874",
+   "self_type" : "type-1874",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1871" ],
+   "template_args" : [ "type-1875" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRPyEE"
   },
   {
@@ -56221,7 +56316,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1495"
+     "referenced_type" : "type-1501"
     }
    ],
    "fields" :
@@ -56230,17 +56325,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 192,
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeBpInterface<android::IConsumerListener>",
    "name" : "android::SafeBpInterface<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1537",
-   "self_type" : "type-1537",
+   "referenced_type" : "type-1541",
+   "self_type" : "type-1541",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1538" ],
+   "template_args" : [ "type-1542" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_17IConsumerListenerEEE",
    "vtable_components" :
    [
@@ -56396,7 +56491,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1624"
+     "referenced_type" : "type-1629"
     }
    ],
    "fields" :
@@ -56405,17 +56500,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 160,
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeBpInterface<android::IGraphicBufferConsumer>",
    "name" : "android::SafeBpInterface<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1716",
-   "self_type" : "type-1716",
+   "referenced_type" : "type-1720",
+   "self_type" : "type-1720",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1717" ],
+   "template_args" : [ "type-1721" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEEE",
    "vtable_components" :
    [
@@ -56606,198 +56701,198 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)()>",
    "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)()>",
-   "referenced_type" : "type-1692",
-   "self_type" : "type-1692",
+   "referenced_type" : "type-1696",
+   "self_type" : "type-1696",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1693" ],
+   "template_args" : [ "type-1697" ],
    "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",
+   "referenced_type" : "type-1685",
+   "self_type" : "type-1685",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1682" ],
+   "template_args" : [ "type-1686" ],
    "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",
+   "referenced_type" : "type-1705",
+   "self_type" : "type-1705",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1702" ],
+   "template_args" : [ "type-1706" ],
    "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",
+   "referenced_type" : "type-1709",
+   "self_type" : "type-1709",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1706" ],
+   "template_args" : [ "type-1710" ],
    "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",
+   "referenced_type" : "type-1716",
+   "self_type" : "type-1716",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1713" ],
+   "template_args" : [ "type-1717" ],
    "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",
+   "referenced_type" : "type-1703",
+   "self_type" : "type-1703",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1700" ],
+   "template_args" : [ "type-1704" ],
    "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",
+   "referenced_type" : "type-1718",
+   "self_type" : "type-1718",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1715" ],
+   "template_args" : [ "type-1719" ],
    "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",
+   "referenced_type" : "type-1694",
+   "self_type" : "type-1694",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1691" ],
+   "template_args" : [ "type-1695" ],
    "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",
+   "referenced_type" : "type-1690",
+   "self_type" : "type-1690",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1686" ],
+   "template_args" : [ "type-1691" ],
    "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",
+   "referenced_type" : "type-1687",
+   "self_type" : "type-1687",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1684" ],
+   "template_args" : [ "type-1688" ],
    "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",
+   "referenced_type" : "type-1692",
+   "self_type" : "type-1692",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1689" ],
+   "template_args" : [ "type-1693" ],
    "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",
+   "referenced_type" : "type-1714",
+   "self_type" : "type-1714",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1711" ],
+   "template_args" : [ "type-1715" ],
    "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",
+   "referenced_type" : "type-1712",
+   "self_type" : "type-1712",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1708" ],
+   "template_args" : [ "type-1713" ],
    "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",
+   "referenced_type" : "type-1701",
+   "self_type" : "type-1701",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1697" ],
+   "template_args" : [ "type-1702" ],
    "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",
+   "referenced_type" : "type-1698",
+   "self_type" : "type-1698",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1695" ],
+   "template_args" : [ "type-1699" ],
    "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",
+   "referenced_type" : "type-1707",
+   "self_type" : "type-1707",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1704" ],
+   "template_args" : [ "type-1708" ],
    "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",
+   "referenced_type" : "type-1537",
+   "self_type" : "type-1537",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1534" ],
+   "template_args" : [ "type-1538" ],
    "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",
+   "referenced_type" : "type-1539",
+   "self_type" : "type-1539",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1536" ],
+   "template_args" : [ "type-1540" ],
    "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_16ConsumerListenerEFvRKNS_10BufferItemEEEE"
   },
   {
@@ -56807,14 +56902,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeInterface::ParcelHandler",
    "name" : "android::SafeInterface::ParcelHandler",
    "record_kind" : "class",
-   "referenced_type" : "type-1235",
-   "self_type" : "type-1235",
+   "referenced_type" : "type-1238",
+   "self_type" : "type-1238",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android13SafeInterface13ParcelHandlerE"
@@ -56823,8 +56918,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParcelHandler::HandleInt<false, 4, unsigned int>",
    "name" : "android::SafeInterface::ParcelHandler::HandleInt<false, 4, unsigned int>",
-   "referenced_type" : "type-1679",
-   "self_type" : "type-1679",
+   "referenced_type" : "type-1683",
+   "self_type" : "type-1683",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-2" ],
@@ -56834,8 +56929,8 @@
    "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",
+   "referenced_type" : "type-1681",
+   "self_type" : "type-1681",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-92" ],
@@ -56845,8 +56940,8 @@
    "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",
+   "referenced_type" : "type-1682",
+   "self_type" : "type-1682",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-4" ],
@@ -56856,8 +56951,8 @@
    "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",
+   "referenced_type" : "type-1678",
+   "self_type" : "type-1678",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-169" ],
@@ -56887,11 +56982,11 @@
    "linker_set_key" : "android::Singleton<android::ComposerService>",
    "name" : "android::Singleton<android::ComposerService>",
    "record_kind" : "class",
-   "referenced_type" : "type-1089",
-   "self_type" : "type-1089",
+   "referenced_type" : "type-1092",
+   "self_type" : "type-1092",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-1090" ],
+   "template_args" : [ "type-1093" ],
    "unique_id" : "_ZTSN7android9SingletonINS_15ComposerServiceEEE"
   },
   {
@@ -56918,11 +57013,11 @@
    "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",
+   "referenced_type" : "type-1204",
+   "self_type" : "type-1204",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-1201" ],
+   "template_args" : [ "type-1205" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEEE",
    "vtable_components" :
    [
@@ -56976,11 +57071,11 @@
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
    "name" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-1354",
-   "self_type" : "type-1354",
+   "referenced_type" : "type-1357",
+   "self_type" : "type-1357",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-1355" ],
+   "template_args" : [ "type-1358" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
    "vtable_components" :
    [
@@ -57270,7 +57365,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -57280,13 +57375,13 @@
     {
      "field_name" : "bStoreMetaData",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "android::StoreMetaDataInBuffersParams",
    "name" : "android::StoreMetaDataInBuffersParams",
-   "referenced_type" : "type-2396",
-   "self_type" : "type-2396",
+   "referenced_type" : "type-2399",
+   "self_type" : "type-2399",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android28StoreMetaDataInBuffersParamsE"
@@ -57298,14 +57393,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-1240"
+     "referenced_type" : "type-1243"
     }
    ],
    "linker_set_key" : "android::String16",
    "name" : "android::String16",
    "record_kind" : "class",
-   "referenced_type" : "type-1239",
-   "self_type" : "type-1239",
+   "referenced_type" : "type-1242",
+   "self_type" : "type-1242",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "unique_id" : "_ZTSN7android8String16E"
@@ -57494,7 +57589,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -57509,18 +57604,18 @@
     {
      "field_name" : "bufferHeader",
      "field_offset" : 128,
-     "referenced_type" : "type-2376"
+     "referenced_type" : "type-2379"
     },
     {
      "field_name" : "nativeBuffer",
      "field_offset" : 160,
-     "referenced_type" : "type-2408"
+     "referenced_type" : "type-2411"
     }
    ],
    "linker_set_key" : "android::UseAndroidNativeBufferParams",
    "name" : "android::UseAndroidNativeBufferParams",
-   "referenced_type" : "type-2407",
-   "self_type" : "type-2407",
+   "referenced_type" : "type-2410",
+   "self_type" : "type-2410",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android28UseAndroidNativeBufferParamsE"
@@ -57537,11 +57632,11 @@
    "linker_set_key" : "android::Vector<android::BBinder *>",
    "name" : "android::Vector<android::BBinder *>",
    "record_kind" : "class",
-   "referenced_type" : "type-1205",
-   "self_type" : "type-1205",
+   "referenced_type" : "type-1208",
+   "self_type" : "type-1208",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-1206" ],
+   "template_args" : [ "type-1209" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7BBinderEEE",
    "vtable_components" :
    [
@@ -57647,11 +57742,11 @@
    "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",
+   "referenced_type" : "type-1206",
+   "self_type" : "type-1206",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-1203" ],
+   "template_args" : [ "type-1207" ],
    "unique_id" : "_ZTSN7android6VectorINS_12ProcessState12handle_entryEEE",
    "vtable_components" :
    [
@@ -57702,11 +57797,11 @@
    "linker_set_key" : "android::Vector<android::Rect>",
    "name" : "android::Vector<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-2677",
-   "self_type" : "type-2677",
+   "referenced_type" : "type-2680",
+   "self_type" : "type-2680",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-2678" ],
+   "template_args" : [ "type-2681" ],
    "unique_id" : "_ZTSN7android6VectorINS_4RectEEE",
    "vtable_components" :
    [
@@ -57757,8 +57852,8 @@
    "linker_set_key" : "android::Vector<android::RefBase *>",
    "name" : "android::Vector<android::RefBase *>",
    "record_kind" : "class",
-   "referenced_type" : "type-1208",
-   "self_type" : "type-1208",
+   "referenced_type" : "type-1213",
+   "self_type" : "type-1213",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-270" ],
@@ -57812,8 +57907,8 @@
    "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",
+   "referenced_type" : "type-1210",
+   "self_type" : "type-1210",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-56" ],
@@ -57867,11 +57962,11 @@
    "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",
+   "referenced_type" : "type-1363",
+   "self_type" : "type-1363",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-1361" ],
+   "template_args" : [ "type-1364" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_8hardware9BHwBinderEEE",
    "vtable_components" :
    [
@@ -57922,11 +58017,11 @@
    "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "record_kind" : "class",
-   "referenced_type" : "type-1356",
-   "self_type" : "type-1356",
+   "referenced_type" : "type-1359",
+   "self_type" : "type-1359",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-1357" ],
+   "template_args" : [ "type-1360" ],
    "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
    "vtable_components" :
    [
@@ -57977,8 +58072,8 @@
    "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",
+   "referenced_type" : "type-1228",
+   "self_type" : "type-1228",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-733" ],
@@ -58032,8 +58127,8 @@
    "linker_set_key" : "android::Vector<int>",
    "name" : "android::Vector<int>",
    "record_kind" : "class",
-   "referenced_type" : "type-2686",
-   "self_type" : "type-2686",
+   "referenced_type" : "type-2689",
+   "self_type" : "type-2689",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-4" ],
@@ -58087,8 +58182,8 @@
    "linker_set_key" : "android::Vector<long long>",
    "name" : "android::Vector<long long>",
    "record_kind" : "class",
-   "referenced_type" : "type-1081",
-   "self_type" : "type-1081",
+   "referenced_type" : "type-1084",
+   "self_type" : "type-1084",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-169" ],
@@ -58215,13 +58310,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2397"
+     "referenced_type" : "type-2400"
     }
    ],
    "linker_set_key" : "android::VideoDecoderOutputMetaData",
    "name" : "android::VideoDecoderOutputMetaData",
-   "referenced_type" : "type-2398",
-   "self_type" : "type-2398",
+   "referenced_type" : "type-2401",
+   "self_type" : "type-2401",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26VideoDecoderOutputMetaDataE"
@@ -58232,7 +58327,7 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-1234"
+     "referenced_type" : "type-1235"
     },
     {
      "field_name" : "pHandle",
@@ -58242,8 +58337,8 @@
    ],
    "linker_set_key" : "android::VideoGrallocMetadata",
    "name" : "android::VideoGrallocMetadata",
-   "referenced_type" : "type-2397",
-   "self_type" : "type-2397",
+   "referenced_type" : "type-2400",
+   "self_type" : "type-2400",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android20VideoGrallocMetadataE"
@@ -58254,7 +58349,7 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-1234"
+     "referenced_type" : "type-1235"
     },
     {
      "field_name" : "pHandle",
@@ -58264,8 +58359,8 @@
    ],
    "linker_set_key" : "android::VideoNativeHandleMetadata",
    "name" : "android::VideoNativeHandleMetadata",
-   "referenced_type" : "type-2405",
-   "self_type" : "type-2405",
+   "referenced_type" : "type-2408",
+   "self_type" : "type-2408",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android25VideoNativeHandleMetadataE"
@@ -58276,12 +58371,12 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-1234"
+     "referenced_type" : "type-1235"
     },
     {
      "field_name" : "pBuffer",
      "field_offset" : 32,
-     "referenced_type" : "type-2401"
+     "referenced_type" : "type-2404"
     },
     {
      "field_name" : "nFenceFd",
@@ -58291,8 +58386,8 @@
    ],
    "linker_set_key" : "android::VideoNativeMetadata",
    "name" : "android::VideoNativeMetadata",
-   "referenced_type" : "type-2400",
-   "self_type" : "type-2400",
+   "referenced_type" : "type-2403",
+   "self_type" : "type-2403",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android19VideoNativeMetadataE"
@@ -58302,14 +58397,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2352"
+     "referenced_type" : "type-2355"
     }
    ],
    "linker_set_key" : "android::VirtualLightRefBase",
    "name" : "android::VirtualLightRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-2354",
-   "self_type" : "type-2354",
+   "referenced_type" : "type-2357",
+   "self_type" : "type-2357",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
    "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
@@ -58356,30 +58451,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::aggregate_traits<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-2606",
-   "self_type" : "type-2606",
+   "referenced_type" : "type-2609",
+   "self_type" : "type-2609",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-4", "type-2607" ],
+   "template_args" : [ "type-4", "type-2610" ],
    "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-2603",
-   "self_type" : "type-2603",
+   "referenced_type" : "type-2606",
+   "self_type" : "type-2606",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-4", "type-2604" ],
+   "template_args" : [ "type-4", "type-2607" ],
    "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-2602",
-   "self_type" : "type-2602",
+   "referenced_type" : "type-2605",
+   "self_type" : "type-2605",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2", "type-2" ],
@@ -58438,13 +58533,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-980"
+     "referenced_type" : "type-977"
     }
    ],
    "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-979",
-   "self_type" : "type-979",
+   "referenced_type" : "type-976",
+   "self_type" : "type-976",
    "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"
@@ -58581,8 +58676,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::base::DefaultCloser",
    "name" : "android::base::DefaultCloser",
-   "referenced_type" : "type-2523",
-   "self_type" : "type-2523",
+   "referenced_type" : "type-2526",
+   "self_type" : "type-2526",
    "size" : 1,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "unique_id" : "_ZTSN7android4base13DefaultCloserE"
@@ -58603,8 +58698,8 @@
    ],
    "linker_set_key" : "android::base::EagerEvaluator<char *, char *>",
    "name" : "android::base::EagerEvaluator<char *, char *>",
-   "referenced_type" : "type-4699",
-   "self_type" : "type-4699",
+   "referenced_type" : "type-4705",
+   "self_type" : "type-4705",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-254", "type-254" ],
@@ -58626,8 +58721,8 @@
    ],
    "linker_set_key" : "android::base::EagerEvaluator<char *, const char *>",
    "name" : "android::base::EagerEvaluator<char *, const char *>",
-   "referenced_type" : "type-4695",
-   "self_type" : "type-4695",
+   "referenced_type" : "type-4702",
+   "self_type" : "type-4702",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-254", "type-122" ],
@@ -58649,8 +58744,8 @@
    ],
    "linker_set_key" : "android::base::EagerEvaluator<const char *, char *>",
    "name" : "android::base::EagerEvaluator<const char *, char *>",
-   "referenced_type" : "type-4681",
-   "self_type" : "type-4681",
+   "referenced_type" : "type-4689",
+   "self_type" : "type-4689",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-122", "type-254" ],
@@ -58672,8 +58767,8 @@
    ],
    "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",
+   "referenced_type" : "type-4672",
+   "self_type" : "type-4672",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-122", "type-122" ],
@@ -58695,11 +58790,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",
+   "referenced_type" : "type-4729",
+   "self_type" : "type-4729",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-4723", "type-4723" ],
+   "template_args" : [ "type-4730", "type-4730" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaS3_EE"
   },
   {
@@ -58718,11 +58813,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",
+   "referenced_type" : "type-4736",
+   "self_type" : "type-4736",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-4723", "type-4731" ],
+   "template_args" : [ "type-4730", "type-4737" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaPaEE"
   },
   {
@@ -58741,8 +58836,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-4703",
-   "self_type" : "type-4703",
+   "referenced_type" : "type-4710",
+   "self_type" : "type-4710",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-97", "type-97" ],
@@ -58764,8 +58859,8 @@
    ],
    "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",
+   "referenced_type" : "type-4713",
+   "self_type" : "type-4713",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-97", "type-89" ],
@@ -58787,11 +58882,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",
+   "referenced_type" : "type-4740",
+   "self_type" : "type-4740",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-4731", "type-4723" ],
+   "template_args" : [ "type-4737", "type-4730" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaPKaEE"
   },
   {
@@ -58810,11 +58905,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",
+   "referenced_type" : "type-4747",
+   "self_type" : "type-4747",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-4731", "type-4731" ],
+   "template_args" : [ "type-4737", "type-4737" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaS2_EE"
   },
   {
@@ -58833,8 +58928,8 @@
    ],
    "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",
+   "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-97" ],
@@ -58856,8 +58951,8 @@
    ],
    "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",
+   "referenced_type" : "type-4722",
+   "self_type" : "type-4722",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-89", "type-89" ],
@@ -58876,8 +58971,8 @@
    "linker_set_key" : "android::base::ErrnoRestorer",
    "name" : "android::base::ErrnoRestorer",
    "record_kind" : "class",
-   "referenced_type" : "type-4656",
-   "self_type" : "type-4656",
+   "referenced_type" : "type-4663",
+   "self_type" : "type-4663",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base13ErrnoRestorerE"
@@ -58889,14 +58984,14 @@
     {
      "access" : "private",
      "field_name" : "data_",
-     "referenced_type" : "type-4752"
+     "referenced_type" : "type-4758"
     }
    ],
    "linker_set_key" : "android::base::LogMessage",
    "name" : "android::base::LogMessage",
    "record_kind" : "class",
-   "referenced_type" : "type-4751",
-   "self_type" : "type-4751",
+   "referenced_type" : "type-4757",
+   "self_type" : "type-4757",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base10LogMessageE"
@@ -58908,14 +59003,14 @@
     {
      "access" : "private",
      "field_name" : "default_log_id_",
-     "referenced_type" : "type-4704"
+     "referenced_type" : "type-4711"
     }
    ],
    "linker_set_key" : "android::base::LogdLogger",
    "name" : "android::base::LogdLogger",
    "record_kind" : "class",
-   "referenced_type" : "type-4721",
-   "self_type" : "type-4721",
+   "referenced_type" : "type-4728",
+   "self_type" : "type-4728",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base10LogdLoggerE"
@@ -58927,14 +59022,14 @@
     {
      "access" : "private",
      "field_name" : "old_",
-     "referenced_type" : "type-4654"
+     "referenced_type" : "type-4661"
     }
    ],
    "linker_set_key" : "android::base::ScopedLogSeverity",
    "name" : "android::base::ScopedLogSeverity",
    "record_kind" : "class",
-   "referenced_type" : "type-4756",
-   "self_type" : "type-4756",
+   "referenced_type" : "type-4763",
+   "self_type" : "type-4763",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base17ScopedLogSeverityE"
@@ -58952,11 +59047,11 @@
    "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser>",
    "name" : "android::base::unique_fd_impl<android::base::DefaultCloser>",
    "record_kind" : "class",
-   "referenced_type" : "type-2553",
-   "self_type" : "type-2553",
+   "referenced_type" : "type-2556",
+   "self_type" : "type-2556",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h",
-   "template_args" : [ "type-2523" ],
+   "template_args" : [ "type-2526" ],
    "unique_id" : "_ZTSN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
   },
   {
@@ -58995,7 +59090,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1362"
     }
    ],
    "fields" :
@@ -59016,7 +59111,7 @@
      "access" : "private",
      "field_name" : "mExtras",
      "field_offset" : 96,
-     "referenced_type" : "type-1363"
+     "referenced_type" : "type-1366"
     },
     {
      "access" : "private",
@@ -59028,8 +59123,8 @@
    "linker_set_key" : "android::hardware::BHwBinder",
    "name" : "android::hardware::BHwBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-1362",
-   "self_type" : "type-1362",
+   "referenced_type" : "type-1365",
+   "self_type" : "type-1365",
    "size" : 28,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware9BHwBinderE",
@@ -59145,7 +59240,7 @@
      "access" : "private",
      "field_name" : "mRemote",
      "field_offset" : 32,
-     "referenced_type" : "type-1372"
+     "referenced_type" : "type-1375"
     },
     {
      "access" : "private",
@@ -59157,14 +59252,14 @@
      "access" : "private",
      "field_name" : "mState",
      "field_offset" : 96,
-     "referenced_type" : "type-1373"
+     "referenced_type" : "type-1376"
     }
    ],
    "linker_set_key" : "android::hardware::BpHwRefBase",
    "name" : "android::hardware::BpHwRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-1371",
-   "self_type" : "type-1371",
+   "referenced_type" : "type-1374",
+   "self_type" : "type-1374",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE",
@@ -59383,8 +59478,8 @@
    "linker_set_key" : "android::hardware::IBinder",
    "name" : "android::hardware::IBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-1359",
-   "self_type" : "type-1359",
+   "referenced_type" : "type-1362",
+   "self_type" : "type-1362",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinderE",
@@ -59500,8 +59595,8 @@
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient",
    "name" : "android::hardware::IBinder::DeathRecipient",
    "record_kind" : "class",
-   "referenced_type" : "type-1370",
-   "self_type" : "type-1370",
+   "referenced_type" : "type-1373",
+   "self_type" : "type-1373",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinder14DeathRecipientE",
@@ -59588,8 +59683,8 @@
    "linker_set_key" : "android::hardware::IInterface",
    "name" : "android::hardware::IInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1376",
+   "referenced_type" : "type-1379",
+   "self_type" : "type-1379",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
    "unique_id" : "_ZTSN7android8hardware10IInterfaceE",
@@ -59671,43 +59766,43 @@
     {
      "access" : "private",
      "field_name" : "mProcess",
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1396"
     },
     {
      "access" : "private",
      "field_name" : "mPendingStrongDerefs",
      "field_offset" : 32,
-     "referenced_type" : "type-1360"
+     "referenced_type" : "type-1363"
     },
     {
      "access" : "private",
      "field_name" : "mPendingWeakDerefs",
      "field_offset" : 192,
-     "referenced_type" : "type-1207"
+     "referenced_type" : "type-1210"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteStrongDerefs",
      "field_offset" : 352,
-     "referenced_type" : "type-1208"
+     "referenced_type" : "type-1213"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteWeakDerefs",
      "field_offset" : 512,
-     "referenced_type" : "type-1207"
+     "referenced_type" : "type-1210"
     },
     {
      "access" : "private",
      "field_name" : "mIn",
      "field_offset" : 672,
-     "referenced_type" : "type-1377"
+     "referenced_type" : "type-1380"
     },
     {
      "access" : "private",
      "field_name" : "mOut",
      "field_offset" : 1216,
-     "referenced_type" : "type-1377"
+     "referenced_type" : "type-1380"
     },
     {
      "access" : "private",
@@ -59749,7 +59844,7 @@
      "access" : "private",
      "field_name" : "mContextObject",
      "field_offset" : 1952,
-     "referenced_type" : "type-1399"
+     "referenced_type" : "type-1402"
     },
     {
      "access" : "private",
@@ -59767,26 +59862,26 @@
      "access" : "private",
      "field_name" : "mPostCommandTasks",
      "field_offset" : 2016,
-     "referenced_type" : "type-1400"
+     "referenced_type" : "type-1403"
     },
     {
      "access" : "private",
      "field_name" : "mIPCThreadStateBase",
      "field_offset" : 2112,
-     "referenced_type" : "type-1368"
+     "referenced_type" : "type-1371"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 2144,
-     "referenced_type" : "type-1391"
+     "referenced_type" : "type-1394"
     }
    ],
    "linker_set_key" : "android::hardware::IPCThreadState",
    "name" : "android::hardware::IPCThreadState",
    "record_kind" : "class",
-   "referenced_type" : "type-1392",
-   "self_type" : "type-1392",
+   "referenced_type" : "type-1395",
+   "self_type" : "type-1395",
    "size" : 272,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h",
    "unique_id" : "_ZTSN7android8hardware14IPCThreadStateE"
@@ -59804,7 +59899,7 @@
      "access" : "private",
      "field_name" : "mBufCache",
      "field_offset" : 32,
-     "referenced_type" : "type-1378"
+     "referenced_type" : "type-1381"
     },
     {
      "access" : "private",
@@ -59888,7 +59983,7 @@
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 480,
-     "referenced_type" : "type-1379"
+     "referenced_type" : "type-1382"
     },
     {
      "access" : "private",
@@ -59900,8 +59995,8 @@
    "linker_set_key" : "android::hardware::Parcel",
    "name" : "android::hardware::Parcel",
    "record_kind" : "class",
-   "referenced_type" : "type-1377",
-   "self_type" : "type-1377",
+   "referenced_type" : "type-1380",
+   "self_type" : "type-1380",
    "size" : 68,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6ParcelE"
@@ -59928,8 +60023,8 @@
    ],
    "linker_set_key" : "android::hardware::Parcel::BufferInfo",
    "name" : "android::hardware::Parcel::BufferInfo",
-   "referenced_type" : "type-1382",
-   "self_type" : "type-1382",
+   "referenced_type" : "type-1385",
+   "self_type" : "type-1385",
    "size" : 20,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE"
@@ -59961,13 +60056,13 @@
      "access" : "private",
      "field_name" : "mThreadCountLock",
      "field_offset" : 96,
-     "referenced_type" : "type-1397"
+     "referenced_type" : "type-1400"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountDecrement",
      "field_offset" : 128,
-     "referenced_type" : "type-1398"
+     "referenced_type" : "type-1401"
     },
     {
      "access" : "private",
@@ -59997,7 +60092,7 @@
      "access" : "private",
      "field_name" : "mHandleToObject",
      "field_offset" : 320,
-     "referenced_type" : "type-1356"
+     "referenced_type" : "type-1359"
     },
     {
      "access" : "private",
@@ -60009,7 +60104,7 @@
      "access" : "private",
      "field_name" : "mBinderContextCheckFunc",
      "field_offset" : 512,
-     "referenced_type" : "type-1390"
+     "referenced_type" : "type-1393"
     },
     {
      "access" : "private",
@@ -60021,7 +60116,7 @@
      "access" : "private",
      "field_name" : "mContexts",
      "field_offset" : 576,
-     "referenced_type" : "type-1366"
+     "referenced_type" : "type-1369"
     },
     {
      "access" : "private",
@@ -60045,7 +60140,7 @@
      "access" : "private",
      "field_name" : "mThreadPoolSeq",
      "field_offset" : 800,
-     "referenced_type" : "type-1250"
+     "referenced_type" : "type-1253"
     },
     {
      "access" : "private",
@@ -60057,14 +60152,14 @@
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 864,
-     "referenced_type" : "type-1391"
+     "referenced_type" : "type-1394"
     }
    ],
    "linker_set_key" : "android::hardware::ProcessState",
    "name" : "android::hardware::ProcessState",
    "record_kind" : "class",
-   "referenced_type" : "type-1396",
-   "self_type" : "type-1396",
+   "referenced_type" : "type-1399",
+   "self_type" : "type-1399",
    "size" : 120,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessStateE",
@@ -60142,7 +60237,7 @@
    [
     {
      "field_name" : "binder",
-     "referenced_type" : "type-1358"
+     "referenced_type" : "type-1361"
     },
     {
      "field_name" : "refs",
@@ -60152,8 +60247,8 @@
    ],
    "linker_set_key" : "android::hardware::ProcessState::handle_entry",
    "name" : "android::hardware::ProcessState::handle_entry",
-   "referenced_type" : "type-1357",
-   "self_type" : "type-1357",
+   "referenced_type" : "type-1360",
+   "self_type" : "type-1360",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE"
@@ -60178,8 +60273,8 @@
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::bufferqueue::V2_0::Status>",
    "name" : "android::hardware::Return<android::hardware::graphics::bufferqueue::V2_0::Status>",
    "record_kind" : "class",
-   "referenced_type" : "type-7504",
-   "self_type" : "type-7504",
+   "referenced_type" : "type-7528",
+   "self_type" : "type-7528",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "template_args" : [ "type-607" ],
@@ -60199,17 +60294,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-2463"
+     "referenced_type" : "type-2466"
     }
    ],
    "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",
+   "referenced_type" : "type-4365",
+   "self_type" : "type-4365",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-2463" ],
+   "template_args" : [ "type-2466" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducerEEEEE"
   },
   {
@@ -60226,17 +60321,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-2454"
+     "referenced_type" : "type-2457"
     }
    ],
    "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",
+   "referenced_type" : "type-4494",
+   "self_type" : "type-4494",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-2454" ],
+   "template_args" : [ "type-2457" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V1_017IProducerListenerEEEEE"
   },
   {
@@ -60253,17 +60348,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-2476"
+     "referenced_type" : "type-2479"
     }
    ],
    "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",
+   "referenced_type" : "type-4371",
+   "self_type" : "type-4371",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-2476" ],
+   "template_args" : [ "type-2479" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V2_022IGraphicBufferProducerEEEEE"
   },
   {
@@ -60280,17 +60375,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-2470"
+     "referenced_type" : "type-2473"
     }
    ],
    "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",
+   "referenced_type" : "type-4500",
+   "self_type" : "type-4500",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-2470" ],
+   "template_args" : [ "type-2473" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V2_017IProducerListenerEEEEE"
   },
   {
@@ -60313,8 +60408,8 @@
    "linker_set_key" : "android::hardware::Return<bool>",
    "name" : "android::hardware::Return<bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-4353",
-   "self_type" : "type-4353",
+   "referenced_type" : "type-4359",
+   "self_type" : "type-4359",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "template_args" : [ "type-93" ],
@@ -60367,8 +60462,8 @@
    "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",
+   "referenced_type" : "type-7534",
+   "self_type" : "type-7534",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "template_args" : [ "type-92" ],
@@ -61439,8 +61534,8 @@
    ],
    "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-2456",
+   "referenced_type" : "type-2459",
+   "self_type" : "type-2459",
    "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",
@@ -64017,8 +64112,8 @@
    "linker_set_key" : "android::sp<android::AHandler>",
    "name" : "android::sp<android::AHandler>",
    "record_kind" : "class",
-   "referenced_type" : "type-1188",
-   "self_type" : "type-1188",
+   "referenced_type" : "type-1191",
+   "self_type" : "type-1191",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-264" ],
@@ -64111,17 +64206,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4229"
+     "referenced_type" : "type-4235"
     }
    ],
    "linker_set_key" : "android::sp<android::BpGraphicBufferProducer>",
    "name" : "android::sp<android::BpGraphicBufferProducer>",
    "record_kind" : "class",
-   "referenced_type" : "type-4228",
-   "self_type" : "type-4228",
+   "referenced_type" : "type-4234",
+   "self_type" : "type-4234",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4231" ],
+   "template_args" : [ "type-4237" ],
    "unique_id" : "_ZTSN7android2spINS_23BpGraphicBufferProducerEEE"
   },
   {
@@ -64131,17 +64226,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4451"
+     "referenced_type" : "type-4457"
     }
    ],
    "linker_set_key" : "android::sp<android::BpProducerListener>",
    "name" : "android::sp<android::BpProducerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-4454",
-   "self_type" : "type-4454",
+   "referenced_type" : "type-4460",
+   "self_type" : "type-4460",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4455" ],
+   "template_args" : [ "type-4461" ],
    "unique_id" : "_ZTSN7android2spINS_18BpProducerListenerEEE"
   },
   {
@@ -64211,17 +64306,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1865"
+     "referenced_type" : "type-1869"
     }
    ],
    "linker_set_key" : "android::sp<android::Fence>",
    "name" : "android::sp<android::Fence>",
    "record_kind" : "class",
-   "referenced_type" : "type-1864",
-   "self_type" : "type-1864",
+   "referenced_type" : "type-1868",
+   "self_type" : "type-1868",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1867" ],
+   "template_args" : [ "type-1871" ],
    "unique_id" : "_ZTSN7android2spINS_5FenceEEE"
   },
   {
@@ -64251,17 +64346,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1174"
+     "referenced_type" : "type-1177"
     }
    ],
    "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",
+   "referenced_type" : "type-1176",
+   "self_type" : "type-1176",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1176" ],
+   "template_args" : [ "type-1179" ],
    "unique_id" : "_ZTSN7android2spINS_10GLConsumer8EglImageEEE"
   },
   {
@@ -64317,8 +64412,8 @@
    "linker_set_key" : "android::sp<android::GraphicBufferSource>",
    "name" : "android::sp<android::GraphicBufferSource>",
    "record_kind" : "class",
-   "referenced_type" : "type-2542",
-   "self_type" : "type-2542",
+   "referenced_type" : "type-2545",
+   "self_type" : "type-2545",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-566" ],
@@ -64331,17 +64426,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4256"
+     "referenced_type" : "type-4262"
     }
    ],
    "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",
+   "referenced_type" : "type-4265",
+   "self_type" : "type-4265",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4260" ],
+   "template_args" : [ "type-4266" ],
    "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE8ObituaryEEE"
   },
   {
@@ -64351,17 +64446,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4265"
+     "referenced_type" : "type-4271"
     }
    ],
    "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",
+   "referenced_type" : "type-4274",
+   "self_type" : "type-4274",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4269" ],
+   "template_args" : [ "type-4275" ],
    "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE8ObituaryEEE"
   },
   {
@@ -64371,17 +64466,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4828"
+     "referenced_type" : "type-4834"
     }
    ],
    "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",
+   "referenced_type" : "type-4833",
+   "self_type" : "type-4833",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4830" ],
+   "template_args" : [ "type-4836" ],
    "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE8ObituaryEEE"
   },
   {
@@ -64391,17 +64486,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-5097"
+     "referenced_type" : "type-5113"
     }
    ],
    "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",
+   "referenced_type" : "type-5112",
+   "self_type" : "type-5112",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-5099" ],
+   "template_args" : [ "type-5115" ],
    "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE8ObituaryEEE"
   },
   {
@@ -64551,17 +64646,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1049"
+     "referenced_type" : "type-1052"
     }
    ],
    "linker_set_key" : "android::sp<android::ISurfaceComposer>",
    "name" : "android::sp<android::ISurfaceComposer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1048",
-   "self_type" : "type-1048",
+   "referenced_type" : "type-1051",
+   "self_type" : "type-1051",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1051" ],
+   "template_args" : [ "type-1054" ],
    "unique_id" : "_ZTSN7android2spINS_16ISurfaceComposerEEE"
   },
   {
@@ -64571,17 +64666,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1041"
+     "referenced_type" : "type-1045"
     }
    ],
    "linker_set_key" : "android::sp<android::ITransactionCompletedListener>",
    "name" : "android::sp<android::ITransactionCompletedListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1040",
-   "self_type" : "type-1040",
+   "referenced_type" : "type-1044",
+   "self_type" : "type-1044",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1043" ],
+   "template_args" : [ "type-1047" ],
    "unique_id" : "_ZTSN7android2spINS_29ITransactionCompletedListenerEEE"
   },
   {
@@ -64611,17 +64706,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1260"
+     "referenced_type" : "type-1263"
     }
    ],
    "linker_set_key" : "android::sp<android::ProcessState>",
    "name" : "android::sp<android::ProcessState>",
    "record_kind" : "class",
-   "referenced_type" : "type-1259",
-   "self_type" : "type-1259",
+   "referenced_type" : "type-1262",
+   "self_type" : "type-1262",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1261" ],
+   "template_args" : [ "type-1264" ],
    "unique_id" : "_ZTSN7android2spINS_12ProcessStateEEE"
   },
   {
@@ -64651,17 +64746,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1361"
+     "referenced_type" : "type-1364"
     }
    ],
    "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",
+   "referenced_type" : "type-1402",
+   "self_type" : "type-1402",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1362" ],
+   "template_args" : [ "type-1365" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
   },
   {
@@ -64671,17 +64766,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1358"
+     "referenced_type" : "type-1361"
     }
    ],
    "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",
+   "referenced_type" : "type-1370",
+   "self_type" : "type-1370",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1359" ],
+   "template_args" : [ "type-1362" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
   },
   {
@@ -64691,17 +64786,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1395"
+     "referenced_type" : "type-1398"
     }
    ],
    "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",
+   "referenced_type" : "type-1397",
+   "self_type" : "type-1397",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1396" ],
+   "template_args" : [ "type-1399" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
   },
   {
@@ -64711,14 +64806,14 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2464"
+     "referenced_type" : "type-2467"
     }
    ],
    "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-2463",
-   "self_type" : "type-2463",
+   "referenced_type" : "type-2466",
+   "self_type" : "type-2466",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-595" ],
@@ -64731,17 +64826,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2455"
+     "referenced_type" : "type-2458"
     }
    ],
    "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-2454",
-   "self_type" : "type-2454",
+   "referenced_type" : "type-2457",
+   "self_type" : "type-2457",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-2456" ],
+   "template_args" : [ "type-2459" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerEEE"
   },
   {
@@ -64751,17 +64846,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4241"
+     "referenced_type" : "type-4247"
     }
    ],
    "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",
+   "referenced_type" : "type-4246",
+   "self_type" : "type-4246",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4243" ],
+   "template_args" : [ "type-4249" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerEEE"
   },
   {
@@ -64771,17 +64866,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4463"
+     "referenced_type" : "type-4470"
     }
    ],
    "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",
+   "referenced_type" : "type-4473",
+   "self_type" : "type-4473",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4467" ],
+   "template_args" : [ "type-4474" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerEEE"
   },
   {
@@ -64791,14 +64886,14 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2477"
+     "referenced_type" : "type-2480"
     }
    ],
    "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-2476",
-   "self_type" : "type-2476",
+   "referenced_type" : "type-2479",
+   "self_type" : "type-2479",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-677" ],
@@ -64811,14 +64906,14 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2471"
+     "referenced_type" : "type-2474"
     }
    ],
    "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-2470",
-   "self_type" : "type-2470",
+   "referenced_type" : "type-2473",
+   "self_type" : "type-2473",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-604" ],
@@ -64831,17 +64926,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4235"
+     "referenced_type" : "type-4241"
     }
    ],
    "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",
+   "referenced_type" : "type-4240",
+   "self_type" : "type-4240",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4237" ],
+   "template_args" : [ "type-4243" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerEEE"
   },
   {
@@ -64851,17 +64946,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4456"
+     "referenced_type" : "type-4462"
     }
    ],
    "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",
+   "referenced_type" : "type-4466",
+   "self_type" : "type-4466",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4460" ],
+   "template_args" : [ "type-4467" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerEEE"
   },
   {
@@ -64891,14 +64986,14 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2445"
+     "referenced_type" : "type-2448"
     }
    ],
    "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-2444",
-   "self_type" : "type-2444",
+   "referenced_type" : "type-2447",
+   "self_type" : "type-2447",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-530" ],
@@ -64911,14 +65006,14 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2449"
+     "referenced_type" : "type-2452"
     }
    ],
    "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-2448",
-   "self_type" : "type-2448",
+   "referenced_type" : "type-2451",
+   "self_type" : "type-2451",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-533" ],
@@ -64931,36 +65026,36 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2517"
+     "referenced_type" : "type-2520"
     }
    ],
    "linker_set_key" : "android::sp<const android::AHandler>",
    "name" : "android::sp<const android::AHandler>",
    "record_kind" : "class",
-   "referenced_type" : "type-2516",
-   "self_type" : "type-2516",
+   "referenced_type" : "type-2519",
+   "self_type" : "type-2519",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-2518" ],
+   "template_args" : [ "type-2521" ],
    "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",
+   "referenced_type" : "type-1064",
+   "self_type" : "type-1064",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1062" ],
+   "template_args" : [ "type-1065" ],
    "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-2588",
-   "self_type" : "type-2588",
+   "referenced_type" : "type-2591",
+   "self_type" : "type-2591",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-160" ],
@@ -64970,8 +65065,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::trait_pointer<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-2585",
-   "self_type" : "type-2585",
+   "referenced_type" : "type-2588",
+   "self_type" : "type-2588",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-147" ],
@@ -64981,8 +65076,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::trait_pointer<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-2581",
-   "self_type" : "type-2581",
+   "referenced_type" : "type-2584",
+   "self_type" : "type-2584",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-143" ],
@@ -64992,8 +65087,8 @@
    "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",
+   "referenced_type" : "type-1186",
+   "self_type" : "type-1186",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-733" ],
@@ -65003,8 +65098,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<int>",
    "name" : "android::trait_pointer<int>",
-   "referenced_type" : "type-2584",
-   "self_type" : "type-2584",
+   "referenced_type" : "type-2587",
+   "self_type" : "type-2587",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -65014,8 +65109,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<long long>",
    "name" : "android::trait_pointer<long long>",
-   "referenced_type" : "type-1060",
-   "self_type" : "type-1060",
+   "referenced_type" : "type-1063",
+   "self_type" : "type-1063",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-169" ],
@@ -65025,30 +65120,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::trait_pointer<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-2589",
-   "self_type" : "type-2589",
+   "referenced_type" : "type-2592",
+   "self_type" : "type-2592",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2590" ],
+   "template_args" : [ "type-2593" ],
    "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-2586",
-   "self_type" : "type-2586",
+   "referenced_type" : "type-2589",
+   "self_type" : "type-2589",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2587" ],
+   "template_args" : [ "type-2590" ],
    "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-2582",
-   "self_type" : "type-2582",
+   "referenced_type" : "type-2585",
+   "self_type" : "type-2585",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -65058,19 +65153,19 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::BufferItem>",
    "name" : "android::trait_trivial_copy<android::BufferItem>",
-   "referenced_type" : "type-1056",
-   "self_type" : "type-1056",
+   "referenced_type" : "type-1059",
+   "self_type" : "type-1059",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1057" ],
+   "template_args" : [ "type-1060" ],
    "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-2572",
-   "self_type" : "type-2572",
+   "referenced_type" : "type-2575",
+   "self_type" : "type-2575",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-160" ],
@@ -65080,8 +65175,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-2569",
-   "self_type" : "type-2569",
+   "referenced_type" : "type-2572",
+   "self_type" : "type-2572",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-147" ],
@@ -65091,8 +65186,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-2566",
-   "self_type" : "type-2566",
+   "referenced_type" : "type-2569",
+   "self_type" : "type-2569",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-143" ],
@@ -65102,8 +65197,8 @@
    "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",
+   "referenced_type" : "type-1184",
+   "self_type" : "type-1184",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-733" ],
@@ -65113,8 +65208,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-2462",
-   "self_type" : "type-2462",
+   "referenced_type" : "type-2465",
+   "self_type" : "type-2465",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-93" ],
@@ -65124,8 +65219,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-2499",
-   "self_type" : "type-2499",
+   "referenced_type" : "type-2502",
+   "self_type" : "type-2502",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-124" ],
@@ -65157,8 +65252,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-2655",
-   "self_type" : "type-2655",
+   "referenced_type" : "type-2658",
+   "self_type" : "type-2658",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -65190,8 +65285,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<short>",
    "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-2594",
-   "self_type" : "type-2594",
+   "referenced_type" : "type-2597",
+   "self_type" : "type-2597",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-499" ],
@@ -65201,30 +65296,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::trait_trivial_copy<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-2570",
-   "self_type" : "type-2570",
+   "referenced_type" : "type-2573",
+   "self_type" : "type-2573",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2571" ],
+   "template_args" : [ "type-2574" ],
    "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-2567",
-   "self_type" : "type-2567",
+   "referenced_type" : "type-2570",
+   "self_type" : "type-2570",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2568" ],
+   "template_args" : [ "type-2571" ],
    "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-2540",
-   "self_type" : "type-2540",
+   "referenced_type" : "type-2543",
+   "self_type" : "type-2543",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-90" ],
@@ -65267,8 +65362,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
    "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-2634",
-   "self_type" : "type-2634",
+   "referenced_type" : "type-2637",
+   "self_type" : "type-2637",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-497" ],
@@ -65278,8 +65373,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-2433",
-   "self_type" : "type-2433",
+   "referenced_type" : "type-2436",
+   "self_type" : "type-2436",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-9" ],
@@ -65289,19 +65384,19 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::BufferItem>",
    "name" : "android::trait_trivial_ctor<android::BufferItem>",
-   "referenced_type" : "type-1052",
-   "self_type" : "type-1052",
+   "referenced_type" : "type-1055",
+   "self_type" : "type-1055",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1053" ],
+   "template_args" : [ "type-1056" ],
    "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-2554",
-   "self_type" : "type-2554",
+   "referenced_type" : "type-2557",
+   "self_type" : "type-2557",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-160" ],
@@ -65311,8 +65406,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-2549",
-   "self_type" : "type-2549",
+   "referenced_type" : "type-2552",
+   "self_type" : "type-2552",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-147" ],
@@ -65322,8 +65417,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-2548",
-   "self_type" : "type-2548",
+   "referenced_type" : "type-2551",
+   "self_type" : "type-2551",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-143" ],
@@ -65333,8 +65428,8 @@
    "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",
+   "referenced_type" : "type-1182",
+   "self_type" : "type-1182",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-733" ],
@@ -65344,8 +65439,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-2443",
-   "self_type" : "type-2443",
+   "referenced_type" : "type-2446",
+   "self_type" : "type-2446",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-93" ],
@@ -65355,8 +65450,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-2481",
-   "self_type" : "type-2481",
+   "referenced_type" : "type-2484",
+   "self_type" : "type-2484",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-124" ],
@@ -65388,8 +65483,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-2647",
-   "self_type" : "type-2647",
+   "referenced_type" : "type-2650",
+   "self_type" : "type-2650",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -65421,8 +65516,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<short>",
    "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-2563",
-   "self_type" : "type-2563",
+   "referenced_type" : "type-2566",
+   "self_type" : "type-2566",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-499" ],
@@ -65432,30 +65527,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::trait_trivial_ctor<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-2555",
-   "self_type" : "type-2555",
+   "referenced_type" : "type-2558",
+   "self_type" : "type-2558",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2556" ],
+   "template_args" : [ "type-2559" ],
    "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-2550",
-   "self_type" : "type-2550",
+   "referenced_type" : "type-2553",
+   "self_type" : "type-2553",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2551" ],
+   "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-2526",
-   "self_type" : "type-2526",
+   "referenced_type" : "type-2529",
+   "self_type" : "type-2529",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-90" ],
@@ -65465,8 +65560,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
    "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-2670",
-   "self_type" : "type-2670",
+   "referenced_type" : "type-2673",
+   "self_type" : "type-2673",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -65498,8 +65593,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned short>",
    "name" : "android::trait_trivial_ctor<unsigned short>",
-   "referenced_type" : "type-2616",
-   "self_type" : "type-2616",
+   "referenced_type" : "type-2619",
+   "self_type" : "type-2619",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-497" ],
@@ -65509,8 +65604,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-2399",
-   "self_type" : "type-2399",
+   "referenced_type" : "type-2402",
+   "self_type" : "type-2402",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-9" ],
@@ -65520,19 +65615,19 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::BufferItem>",
    "name" : "android::trait_trivial_dtor<android::BufferItem>",
-   "referenced_type" : "type-1054",
-   "self_type" : "type-1054",
+   "referenced_type" : "type-1057",
+   "self_type" : "type-1057",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1055" ],
+   "template_args" : [ "type-1058" ],
    "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-2564",
-   "self_type" : "type-2564",
+   "referenced_type" : "type-2567",
+   "self_type" : "type-2567",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-160" ],
@@ -65542,8 +65637,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-2560",
-   "self_type" : "type-2560",
+   "referenced_type" : "type-2563",
+   "self_type" : "type-2563",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-147" ],
@@ -65553,8 +65648,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-2557",
-   "self_type" : "type-2557",
+   "referenced_type" : "type-2560",
+   "self_type" : "type-2560",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-143" ],
@@ -65564,8 +65659,8 @@
    "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",
+   "referenced_type" : "type-1183",
+   "self_type" : "type-1183",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-733" ],
@@ -65575,8 +65670,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<bool>",
    "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-2452",
-   "self_type" : "type-2452",
+   "referenced_type" : "type-2455",
+   "self_type" : "type-2455",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-93" ],
@@ -65586,8 +65681,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-2489",
-   "self_type" : "type-2489",
+   "referenced_type" : "type-2492",
+   "self_type" : "type-2492",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-124" ],
@@ -65619,8 +65714,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<int>",
    "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-2650",
-   "self_type" : "type-2650",
+   "referenced_type" : "type-2653",
+   "self_type" : "type-2653",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -65652,8 +65747,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<short>",
    "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-2583",
-   "self_type" : "type-2583",
+   "referenced_type" : "type-2586",
+   "self_type" : "type-2586",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-499" ],
@@ -65663,30 +65758,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::trait_trivial_dtor<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-2561",
-   "self_type" : "type-2561",
+   "referenced_type" : "type-2564",
+   "self_type" : "type-2564",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2562" ],
+   "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-2558",
-   "self_type" : "type-2558",
+   "referenced_type" : "type-2561",
+   "self_type" : "type-2561",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2559" ],
+   "template_args" : [ "type-2562" ],
    "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-2533",
-   "self_type" : "type-2533",
+   "referenced_type" : "type-2536",
+   "self_type" : "type-2536",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-90" ],
@@ -65696,8 +65791,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
    "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-2681",
-   "self_type" : "type-2681",
+   "referenced_type" : "type-2684",
+   "self_type" : "type-2684",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -65729,8 +65824,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned short>",
    "name" : "android::trait_trivial_dtor<unsigned short>",
-   "referenced_type" : "type-2624",
-   "self_type" : "type-2624",
+   "referenced_type" : "type-2627",
+   "self_type" : "type-2627",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-497" ],
@@ -65740,8 +65835,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-2424",
-   "self_type" : "type-2424",
+   "referenced_type" : "type-2427",
+   "self_type" : "type-2427",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-9" ],
@@ -65751,30 +65846,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::BufferItem>",
    "name" : "android::trait_trivial_move<android::BufferItem>",
-   "referenced_type" : "type-1058",
-   "self_type" : "type-1058",
+   "referenced_type" : "type-1061",
+   "self_type" : "type-1061",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1059" ],
+   "template_args" : [ "type-1062" ],
    "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-2662",
-   "self_type" : "type-2662",
+   "referenced_type" : "type-2665",
+   "self_type" : "type-2665",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-1239" ],
+   "template_args" : [ "type-1242" ],
    "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-2656",
-   "self_type" : "type-2656",
+   "referenced_type" : "type-2659",
+   "self_type" : "type-2659",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "template_args" : [ "type-121" ],
@@ -65784,8 +65879,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
-   "referenced_type" : "type-2579",
-   "self_type" : "type-2579",
+   "referenced_type" : "type-2582",
+   "self_type" : "type-2582",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-160" ],
@@ -65795,8 +65890,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-2576",
-   "self_type" : "type-2576",
+   "referenced_type" : "type-2579",
+   "self_type" : "type-2579",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-147" ],
@@ -65806,8 +65901,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-2573",
-   "self_type" : "type-2573",
+   "referenced_type" : "type-2576",
+   "self_type" : "type-2576",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-143" ],
@@ -65817,8 +65912,8 @@
    "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",
+   "referenced_type" : "type-1185",
+   "self_type" : "type-1185",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-733" ],
@@ -65828,8 +65923,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<bool>",
    "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-2472",
-   "self_type" : "type-2472",
+   "referenced_type" : "type-2475",
+   "self_type" : "type-2475",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-93" ],
@@ -65839,8 +65934,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-2521",
-   "self_type" : "type-2521",
+   "referenced_type" : "type-2524",
+   "self_type" : "type-2524",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-124" ],
@@ -65872,8 +65967,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-2659",
-   "self_type" : "type-2659",
+   "referenced_type" : "type-2662",
+   "self_type" : "type-2662",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -65905,8 +66000,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<short>",
    "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-2605",
-   "self_type" : "type-2605",
+   "referenced_type" : "type-2608",
+   "self_type" : "type-2608",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-499" ],
@@ -65916,30 +66011,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::trait_trivial_move<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-2577",
-   "self_type" : "type-2577",
+   "referenced_type" : "type-2580",
+   "self_type" : "type-2580",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2578" ],
+   "template_args" : [ "type-2581" ],
    "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-2574",
-   "self_type" : "type-2574",
+   "referenced_type" : "type-2577",
+   "self_type" : "type-2577",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2575" ],
+   "template_args" : [ "type-2578" ],
    "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-2552",
-   "self_type" : "type-2552",
+   "referenced_type" : "type-2555",
+   "self_type" : "type-2555",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-90" ],
@@ -65982,8 +66077,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned short>",
    "name" : "android::trait_trivial_move<unsigned short>",
-   "referenced_type" : "type-2645",
-   "self_type" : "type-2645",
+   "referenced_type" : "type-2648",
+   "self_type" : "type-2648",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-497" ],
@@ -65993,8 +66088,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-2441",
-   "self_type" : "type-2441",
+   "referenced_type" : "type-2444",
+   "self_type" : "type-2444",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-9" ],
@@ -66004,19 +66099,19 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::BufferItem>",
    "name" : "android::traits<android::BufferItem>",
-   "referenced_type" : "type-1064",
-   "self_type" : "type-1064",
+   "referenced_type" : "type-1067",
+   "self_type" : "type-1067",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1065" ],
+   "template_args" : [ "type-1068" ],
    "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-2599",
-   "self_type" : "type-2599",
+   "referenced_type" : "type-2602",
+   "self_type" : "type-2602",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-160" ],
@@ -66026,8 +66121,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::traits<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-2596",
-   "self_type" : "type-2596",
+   "referenced_type" : "type-2599",
+   "self_type" : "type-2599",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-147" ],
@@ -66037,8 +66132,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::traits<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-2591",
-   "self_type" : "type-2591",
+   "referenced_type" : "type-2594",
+   "self_type" : "type-2594",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-143" ],
@@ -66048,8 +66143,8 @@
    "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",
+   "referenced_type" : "type-1187",
+   "self_type" : "type-1187",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-733" ],
@@ -66059,8 +66154,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<int>",
    "name" : "android::traits<int>",
-   "referenced_type" : "type-2593",
-   "self_type" : "type-2593",
+   "referenced_type" : "type-2596",
+   "self_type" : "type-2596",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -66070,8 +66165,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<long long>",
    "name" : "android::traits<long long>",
-   "referenced_type" : "type-1063",
-   "self_type" : "type-1063",
+   "referenced_type" : "type-1066",
+   "self_type" : "type-1066",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-169" ],
@@ -66081,30 +66176,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::traits<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-2600",
-   "self_type" : "type-2600",
+   "referenced_type" : "type-2603",
+   "self_type" : "type-2603",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2601" ],
+   "template_args" : [ "type-2604" ],
    "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-2597",
-   "self_type" : "type-2597",
+   "referenced_type" : "type-2600",
+   "self_type" : "type-2600",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2598" ],
+   "template_args" : [ "type-2601" ],
    "unique_id" : "_ZTSN7android6traitsINSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<unsigned int>",
    "name" : "android::traits<unsigned int>",
-   "referenced_type" : "type-2592",
-   "self_type" : "type-2592",
+   "referenced_type" : "type-2595",
+   "self_type" : "type-2595",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -66115,16 +66210,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1075"
+     "referenced_type" : "type-1078"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::BufferItem>",
    "name" : "android::use_trivial_move<android::BufferItem>",
-   "referenced_type" : "type-1074",
-   "self_type" : "type-1074",
+   "referenced_type" : "type-1077",
+   "self_type" : "type-1077",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1076" ],
+   "template_args" : [ "type-1079" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_10BufferItemEEE"
   },
   {
@@ -66132,13 +66227,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2636"
+     "referenced_type" : "type-2639"
     }
    ],
    "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-2635",
-   "self_type" : "type-2635",
+   "referenced_type" : "type-2638",
+   "self_type" : "type-2638",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-160" ],
@@ -66149,13 +66244,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2633"
+     "referenced_type" : "type-2636"
     }
    ],
    "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-2632",
-   "self_type" : "type-2632",
+   "referenced_type" : "type-2635",
+   "self_type" : "type-2635",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-147" ],
@@ -66166,13 +66261,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2629"
+     "referenced_type" : "type-2632"
     }
    ],
    "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-2628",
-   "self_type" : "type-2628",
+   "referenced_type" : "type-2631",
+   "self_type" : "type-2631",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-143" ],
@@ -66183,13 +66278,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1186"
+     "referenced_type" : "type-1190"
     }
    ],
    "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",
+   "referenced_type" : "type-1189",
+   "self_type" : "type-1189",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-733" ],
@@ -66200,13 +66295,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2631"
+     "referenced_type" : "type-2634"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<int>",
    "name" : "android::use_trivial_move<int>",
-   "referenced_type" : "type-2630",
-   "self_type" : "type-2630",
+   "referenced_type" : "type-2633",
+   "self_type" : "type-2633",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -66217,13 +66312,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1073"
+     "referenced_type" : "type-1076"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<long long>",
    "name" : "android::use_trivial_move<long long>",
-   "referenced_type" : "type-1072",
-   "self_type" : "type-1072",
+   "referenced_type" : "type-1075",
+   "self_type" : "type-1075",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-169" ],
@@ -66288,7 +66383,7 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1252"
+     "referenced_type" : "type-1256"
     },
     {
      "access" : "private",
@@ -66300,11 +66395,11 @@
    "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",
+   "referenced_type" : "type-1255",
+   "self_type" : "type-1255",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-1254" ],
+   "template_args" : [ "type-1258" ],
    "unique_id" : "_ZTSN7android2wpINS_12ConsumerBase22FrameAvailableListenerEEE"
   },
   {
@@ -66655,13 +66750,13 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-2178"
+     "referenced_type" : "type-2181"
     }
    ],
    "linker_set_key" : "log_msg",
    "name" : "log_msg",
-   "referenced_type" : "type-2177",
-   "self_type" : "type-2177",
+   "referenced_type" : "type-2180",
+   "self_type" : "type-2180",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
@@ -66672,15 +66767,15 @@
    [
     {
      "field_name" : "buf",
-     "referenced_type" : "type-2179"
+     "referenced_type" : "type-2182"
     },
     {
      "field_name" : "entry",
-     "referenced_type" : "type-1408"
+     "referenced_type" : "type-1411"
     },
     {
      "field_name" : "entry_v4",
-     "referenced_type" : "type-1408"
+     "referenced_type" : "type-1411"
     },
     {
      "field_name" : "entry_v3",
@@ -66688,19 +66783,19 @@
     },
     {
      "field_name" : "entry_v2",
-     "referenced_type" : "type-1291"
+     "referenced_type" : "type-1294"
     },
     {
      "field_name" : "entry_v1",
-     "referenced_type" : "type-2180"
+     "referenced_type" : "type-2183"
     }
    ],
    "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-2178",
-   "self_type" : "type-2178",
+   "referenced_type" : "type-2181",
+   "self_type" : "type-2181",
    "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)"
@@ -66721,8 +66816,8 @@
    ],
    "linker_set_key" : "log_time",
    "name" : "log_time",
-   "referenced_type" : "type-2509",
-   "self_type" : "type-2509",
+   "referenced_type" : "type-2512",
+   "self_type" : "type-2512",
    "size" : 8,
    "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
    "unique_id" : "_ZTS8log_time"
@@ -66768,8 +66863,8 @@
    ],
    "linker_set_key" : "logger_entry",
    "name" : "logger_entry",
-   "referenced_type" : "type-2180",
-   "self_type" : "type-2180",
+   "referenced_type" : "type-2183",
+   "self_type" : "type-2183",
    "size" : 20,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
@@ -66820,8 +66915,8 @@
    ],
    "linker_set_key" : "logger_entry_v2",
    "name" : "logger_entry_v2",
-   "referenced_type" : "type-1291",
-   "self_type" : "type-1291",
+   "referenced_type" : "type-1294",
+   "self_type" : "type-1294",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
@@ -66929,8 +67024,8 @@
    ],
    "linker_set_key" : "logger_entry_v4",
    "name" : "logger_entry_v4",
-   "referenced_type" : "type-1408",
-   "self_type" : "type-1408",
+   "referenced_type" : "type-1411",
+   "self_type" : "type-1411",
    "size" : 28,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
@@ -66974,8 +67069,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser> &&",
    "name" : "android::base::unique_fd_impl<android::base::DefaultCloser> &&",
-   "referenced_type" : "type-2553",
-   "self_type" : "type-2610",
+   "referenced_type" : "type-2556",
+   "self_type" : "type-2613",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -66992,8 +67087,8 @@
    "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",
+   "referenced_type" : "type-7528",
+   "self_type" : "type-7532",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -67001,24 +67096,6 @@
    "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,
@@ -67026,8 +67103,8 @@
   },
   {
    "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> > &&",
+   "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-4494",
    "self_type" : "type-4496",
    "size" : 4,
@@ -67035,10 +67112,28 @@
   },
   {
    "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-4371",
+   "self_type" : "type-4373",
+   "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-4500",
+   "self_type" : "type-4502",
+   "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-4355",
+   "referenced_type" : "type-4359",
+   "self_type" : "type-4361",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -67055,8 +67150,8 @@
    "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",
+   "referenced_type" : "type-7534",
+   "self_type" : "type-7536",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -67110,7 +67205,7 @@
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> &&",
    "name" : "android::hardware::hidl_vec<unsigned char> &&",
    "referenced_type" : "type-452",
-   "self_type" : "type-4566",
+   "self_type" : "type-4572",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -67119,7 +67214,7 @@
    "linker_set_key" : "android::sp<android::ALooper> &&",
    "name" : "android::sp<android::ALooper> &&",
    "referenced_type" : "type-321",
-   "self_type" : "type-2256",
+   "self_type" : "type-2259",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67136,8 +67231,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::Fence> &&",
    "name" : "android::sp<android::Fence> &&",
-   "referenced_type" : "type-1864",
-   "self_type" : "type-2524",
+   "referenced_type" : "type-1868",
+   "self_type" : "type-2527",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67145,8 +67240,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::GraphicBufferSource> &&",
    "name" : "android::sp<android::GraphicBufferSource> &&",
-   "referenced_type" : "type-2542",
-   "self_type" : "type-2543",
+   "referenced_type" : "type-2545",
+   "self_type" : "type-2546",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67154,8 +67249,8 @@
    "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-4261",
+   "referenced_type" : "type-4265",
+   "self_type" : "type-4267",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67163,8 +67258,8 @@
    "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",
+   "referenced_type" : "type-4274",
+   "self_type" : "type-4276",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67172,8 +67267,8 @@
    "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",
+   "referenced_type" : "type-4833",
+   "self_type" : "type-4843",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67181,8 +67276,8 @@
    "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",
+   "referenced_type" : "type-5112",
+   "self_type" : "type-5118",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67191,7 +67286,7 @@
    "linker_set_key" : "android::sp<android::IBinder::DeathRecipient> &&",
    "name" : "android::sp<android::IBinder::DeathRecipient> &&",
    "referenced_type" : "type-843",
-   "self_type" : "type-4383",
+   "self_type" : "type-4389",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67200,7 +67295,7 @@
    "linker_set_key" : "android::sp<android::IConsumerListener> &&",
    "name" : "android::sp<android::IConsumerListener> &&",
    "referenced_type" : "type-939",
-   "self_type" : "type-1577",
+   "self_type" : "type-1580",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67209,7 +67304,7 @@
    "linker_set_key" : "android::sp<android::IGraphicBufferConsumer> &&",
    "name" : "android::sp<android::IGraphicBufferConsumer> &&",
    "referenced_type" : "type-574",
-   "self_type" : "type-1600",
+   "self_type" : "type-1604",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67218,7 +67313,7 @@
    "linker_set_key" : "android::sp<android::IGraphicBufferProducer> &&",
    "name" : "android::sp<android::IGraphicBufferProducer> &&",
    "referenced_type" : "type-570",
-   "self_type" : "type-4226",
+   "self_type" : "type-4232",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67227,7 +67322,7 @@
    "linker_set_key" : "android::sp<android::IProducerListener> &&",
    "name" : "android::sp<android::IProducerListener> &&",
    "referenced_type" : "type-957",
-   "self_type" : "type-4252",
+   "self_type" : "type-4258",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67236,7 +67331,7 @@
    "linker_set_key" : "android::sp<android::NativeHandle> &&",
    "name" : "android::sp<android::NativeHandle> &&",
    "referenced_type" : "type-932",
-   "self_type" : "type-1596",
+   "self_type" : "type-1600",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   }
diff --git a/29/32/x86/source-based/libui.so.lsdump b/29/32/x86/source-based/libui.so.lsdump
index ba6360c..8848d82 100644
--- a/29/32/x86/source-based/libui.so.lsdump
+++ b/29/32/x86/source-based/libui.so.lsdump
@@ -5,8 +5,8 @@
    "alignment" : 4,
    "linker_set_key" : "AHardwareBuffer_Plane [4]",
    "name" : "AHardwareBuffer_Plane [4]",
-   "referenced_type" : "type-509",
-   "self_type" : "type-508",
+   "referenced_type" : "type-506",
+   "self_type" : "type-505",
    "size" : 48,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h"
   },
@@ -14,7 +14,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<float> [3]",
    "name" : "android::details::TVec3<float> [3]",
-   "referenced_type" : "type-17",
+   "referenced_type" : "type-18",
    "self_type" : "type-904",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
@@ -23,8 +23,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<float> [4]",
    "name" : "android::details::TVec4<float> [4]",
-   "referenced_type" : "type-200",
-   "self_type" : "type-2428",
+   "referenced_type" : "type-192",
+   "self_type" : "type-2430",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -32,7 +32,7 @@
    "alignment" : 1,
    "linker_set_key" : "char [0]",
    "name" : "char [0]",
-   "referenced_type" : "type-288",
+   "referenced_type" : "type-285",
    "self_type" : "type-1261",
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -47,16 +47,16 @@
    "alignment" : 4,
    "linker_set_key" : "int [0]",
    "name" : "int [0]",
-   "referenced_type" : "type-103",
-   "self_type" : "type-145",
+   "referenced_type" : "type-105",
+   "self_type" : "type-148",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int [7]",
    "name" : "int [7]",
-   "referenced_type" : "type-103",
-   "self_type" : "type-564",
+   "referenced_type" : "type-105",
+   "self_type" : "type-561",
    "size" : 28,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -64,7 +64,7 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
-   "referenced_type" : "type-218",
+   "referenced_type" : "type-220",
    "self_type" : "type-1270",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
@@ -73,7 +73,7 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [10]",
    "name" : "unsigned int [10]",
-   "referenced_type" : "type-123",
+   "referenced_type" : "type-125",
    "self_type" : "type-1109",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -82,8 +82,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [12]",
    "name" : "unsigned int [12]",
-   "referenced_type" : "type-123",
-   "self_type" : "type-559",
+   "referenced_type" : "type-125",
+   "self_type" : "type-556",
    "size" : 48,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -91,8 +91,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [25]",
    "name" : "unsigned int [25]",
-   "referenced_type" : "type-123",
-   "self_type" : "type-558",
+   "referenced_type" : "type-125",
+   "self_type" : "type-555",
    "size" : 100,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -100,8 +100,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [3]",
    "name" : "unsigned int [3]",
-   "referenced_type" : "type-123",
-   "self_type" : "type-941",
+   "referenced_type" : "type-125",
+   "self_type" : "type-935",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -109,8 +109,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [8]",
    "name" : "unsigned int [8]",
-   "referenced_type" : "type-123",
-   "self_type" : "type-349",
+   "referenced_type" : "type-125",
+   "self_type" : "type-346",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -118,26 +118,17 @@
    "alignment" : 4,
    "linker_set_key" : "void *[1]",
    "name" : "void *[1]",
-   "referenced_type" : "type-227",
-   "self_type" : "type-523",
+   "referenced_type" : "type-229",
+   "self_type" : "type-521",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void *[3]",
-   "name" : "void *[3]",
-   "referenced_type" : "type-227",
-   "self_type" : "type-596",
-   "size" : 12,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "void *[4]",
    "name" : "void *[4]",
-   "referenced_type" : "type-227",
-   "self_type" : "type-519",
+   "referenced_type" : "type-229",
+   "self_type" : "type-517",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -145,8 +136,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *[6]",
    "name" : "void *[6]",
-   "referenced_type" : "type-227",
-   "self_type" : "type-524",
+   "referenced_type" : "type-229",
+   "self_type" : "type-522",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -154,7 +145,7 @@
    "alignment" : 4,
    "linker_set_key" : "void *[7]",
    "name" : "void *[7]",
-   "referenced_type" : "type-227",
+   "referenced_type" : "type-229",
    "self_type" : "type-609",
    "size" : 28,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
@@ -177,8 +168,8 @@
    "is_integral" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-288",
-   "self_type" : "type-288",
+   "referenced_type" : "type-285",
+   "self_type" : "type-285",
    "size" : 1
   },
   {
@@ -187,16 +178,16 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-182",
-   "self_type" : "type-182",
+   "referenced_type" : "type-185",
+   "self_type" : "type-185",
    "size" : 2
   },
   {
    "alignment" : 4,
    "linker_set_key" : "double",
    "name" : "double",
-   "referenced_type" : "type-41",
-   "self_type" : "type-41",
+   "referenced_type" : "type-43",
+   "self_type" : "type-43",
    "size" : 8
   },
   {
@@ -212,8 +203,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-103",
-   "self_type" : "type-103",
+   "referenced_type" : "type-105",
+   "self_type" : "type-105",
    "size" : 4
   },
   {
@@ -221,16 +212,16 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-687",
-   "self_type" : "type-687",
+   "referenced_type" : "type-684",
+   "self_type" : "type-684",
    "size" : 4
   },
   {
    "alignment" : 4,
    "linker_set_key" : "long double",
    "name" : "long double",
-   "referenced_type" : "type-298",
-   "self_type" : "type-298",
+   "referenced_type" : "type-295",
+   "self_type" : "type-295",
    "size" : 8
   },
   {
@@ -238,8 +229,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-284",
-   "self_type" : "type-284",
+   "referenced_type" : "type-12",
+   "self_type" : "type-12",
    "size" : 8
   },
   {
@@ -266,8 +257,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned char",
    "name" : "unsigned char",
-   "referenced_type" : "type-218",
-   "self_type" : "type-218",
+   "referenced_type" : "type-220",
+   "self_type" : "type-220",
    "size" : 1
   },
   {
@@ -276,8 +267,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned int",
    "name" : "unsigned int",
-   "referenced_type" : "type-123",
-   "self_type" : "type-123",
+   "referenced_type" : "type-125",
+   "self_type" : "type-125",
    "size" : 4
   },
   {
@@ -296,8 +287,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-124",
-   "self_type" : "type-124",
+   "referenced_type" : "type-126",
+   "self_type" : "type-126",
    "size" : 8
   },
   {
@@ -313,8 +304,8 @@
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-151",
-   "self_type" : "type-151"
+   "referenced_type" : "type-154",
+   "self_type" : "type-154"
   }
  ],
  "elf_functions" :
@@ -1805,11 +1796,11 @@
    ],
    "linker_set_key" : "AHardwareBuffer_Format",
    "name" : "AHardwareBuffer_Format",
-   "referenced_type" : "type-616",
-   "self_type" : "type-616",
+   "referenced_type" : "type-617",
+   "self_type" : "type-617",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "AHardwareBuffer_Format"
   },
   {
@@ -1971,11 +1962,11 @@
    ],
    "linker_set_key" : "AHardwareBuffer_UsageFlags",
    "name" : "AHardwareBuffer_UsageFlags",
-   "referenced_type" : "type-678",
-   "self_type" : "type-678",
+   "referenced_type" : "type-676",
+   "self_type" : "type-676",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "AHardwareBuffer_UsageFlags"
   },
   {
@@ -1993,11 +1984,11 @@
    ],
    "linker_set_key" : "android::Condition::WakeUpType",
    "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-260",
-   "self_type" : "type-260",
+   "referenced_type" : "type-256",
+   "self_type" : "type-256",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android9Condition10WakeUpTypeE"
   },
   {
@@ -2023,7 +2014,7 @@
    "self_type" : "type-1346",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android5Fence6StatusE"
   },
   {
@@ -2045,11 +2036,11 @@
    ],
    "linker_set_key" : "android::FenceTime::Snapshot::State",
    "name" : "android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1384",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1388",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android9FenceTime8Snapshot5StateE"
   },
   {
@@ -2072,11 +2063,11 @@
    ],
    "linker_set_key" : "android::FenceTime::State",
    "name" : "android::FenceTime::State",
-   "referenced_type" : "type-1378",
-   "self_type" : "type-1378",
+   "referenced_type" : "type-1383",
+   "self_type" : "type-1383",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android9FenceTime5StateE"
   },
   {
@@ -2102,11 +2093,11 @@
    ],
    "linker_set_key" : "android::GraphicBuffer::HandleWrapMethod",
    "name" : "android::GraphicBuffer::HandleWrapMethod",
-   "referenced_type" : "type-629",
-   "self_type" : "type-629",
+   "referenced_type" : "type-630",
+   "self_type" : "type-630",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h",
-   "underlying_type" : "type-218",
+   "underlying_type" : "type-220",
    "unique_id" : "_ZTSN7android13GraphicBuffer16HandleWrapMethodE"
   },
   {
@@ -2124,11 +2115,11 @@
    ],
    "linker_set_key" : "android::GraphicBufferMapper::Version",
    "name" : "android::GraphicBufferMapper::Version",
-   "referenced_type" : "type-529",
-   "self_type" : "type-529",
+   "referenced_type" : "type-527",
+   "self_type" : "type-527",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android19GraphicBufferMapper7VersionE"
   },
   {
@@ -2142,11 +2133,11 @@
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-183",
-   "self_type" : "type-183",
+   "referenced_type" : "type-186",
+   "self_type" : "type-186",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android8String1613StaticLinkageE"
   },
   {
@@ -2160,11 +2151,11 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-864",
-   "self_type" : "type-864",
+   "referenced_type" : "type-862",
+   "self_type" : "type-862",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7String813StaticLinkageE"
   },
   {
@@ -2182,7 +2173,7 @@
    "self_type" : "type-975",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details6TMat33IfE7no_initE"
   },
   {
@@ -2196,11 +2187,11 @@
    ],
    "linker_set_key" : "android::details::TMat44<float>::no_init",
    "name" : "android::details::TMat44<float>::no_init",
-   "referenced_type" : "type-2429",
-   "self_type" : "type-2429",
+   "referenced_type" : "type-2431",
+   "self_type" : "type-2431",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details6TMat44IfE7no_initE"
   },
   {
@@ -2214,11 +2205,11 @@
    ],
    "linker_set_key" : "android::details::TQuaternion<double>::no_init",
    "name" : "android::details::TQuaternion<double>::no_init",
-   "referenced_type" : "type-389",
-   "self_type" : "type-389",
+   "referenced_type" : "type-386",
+   "self_type" : "type-386",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details11TQuaternionIdE7no_initE"
   },
   {
@@ -2232,11 +2223,11 @@
    ],
    "linker_set_key" : "android::details::TQuaternion<float>::no_init",
    "name" : "android::details::TQuaternion<float>::no_init",
-   "referenced_type" : "type-428",
-   "self_type" : "type-428",
+   "referenced_type" : "type-425",
+   "self_type" : "type-425",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details11TQuaternionIfE7no_initE"
   },
   {
@@ -2254,7 +2245,7 @@
    "self_type" : "type-1255",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec2IbE7no_initE"
   },
   {
@@ -2272,7 +2263,7 @@
    "self_type" : "type-1068",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec2IdE7no_initE"
   },
   {
@@ -2290,7 +2281,7 @@
    "self_type" : "type-1135",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec2IfE7no_initE"
   },
   {
@@ -2308,7 +2299,7 @@
    "self_type" : "type-1365",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec3IdE7no_initE"
   },
   {
@@ -2322,11 +2313,11 @@
    ],
    "linker_set_key" : "android::details::TVec3<float>::no_init",
    "name" : "android::details::TVec3<float>::no_init",
-   "referenced_type" : "type-1412",
-   "self_type" : "type-1412",
+   "referenced_type" : "type-1414",
+   "self_type" : "type-1414",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec3IfE7no_initE"
   },
   {
@@ -2340,11 +2331,11 @@
    ],
    "linker_set_key" : "android::details::TVec4<double>::no_init",
    "name" : "android::details::TVec4<double>::no_init",
-   "referenced_type" : "type-148",
-   "self_type" : "type-148",
+   "referenced_type" : "type-137",
+   "self_type" : "type-137",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec4IdE7no_initE"
   },
   {
@@ -2358,11 +2349,11 @@
    ],
    "linker_set_key" : "android::details::TVec4<float>::no_init",
    "name" : "android::details::TVec4<float>::no_init",
-   "referenced_type" : "type-309",
-   "self_type" : "type-309",
+   "referenced_type" : "type-304",
+   "self_type" : "type-304",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec4IfE7no_initE"
   },
   {
@@ -2377,11 +2368,11 @@
    ],
    "linker_set_key" : "android::half::Binary",
    "name" : "android::half::Binary",
-   "referenced_type" : "type-403",
-   "self_type" : "type-403",
+   "referenced_type" : "type-399",
+   "self_type" : "type-399",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android4half6BinaryE"
   },
   {
@@ -2407,7 +2398,7 @@
    "self_type" : "type-1321",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware21HidlReturnRestrictionE"
   },
   {
@@ -2429,7 +2420,7 @@
    "self_type" : "type-1129",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android8hardware8MQFlavorE"
   },
   {
@@ -2451,11 +2442,11 @@
    ],
    "linker_set_key" : "android::hardware::ProcessState::CallRestriction",
    "name" : "android::hardware::ProcessState::CallRestriction",
-   "referenced_type" : "type-276",
-   "self_type" : "type-276",
+   "referenced_type" : "type-272",
+   "self_type" : "type-272",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware12ProcessState15CallRestrictionE"
   },
   {
@@ -2509,7 +2500,7 @@
    "self_type" : "type-1308",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware6Status9ExceptionE"
   },
   {
@@ -2563,7 +2554,7 @@
    "self_type" : "type-1223",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentor20InstrumentationEventE"
   },
   {
@@ -2665,11 +2656,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_0::BufferUsage",
-   "referenced_type" : "type-150",
-   "self_type" : "type-150",
+   "referenced_type" : "type-153",
+   "self_type" : "type-153",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_011BufferUsageE"
   },
   {
@@ -2723,7 +2714,7 @@
    "self_type" : "type-1140",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09ColorModeE"
   },
   {
@@ -2765,7 +2756,7 @@
    "self_type" : "type-1141",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_014ColorTransformE"
   },
   {
@@ -3007,7 +2998,7 @@
    "self_type" : "type-1139",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09DataspaceE"
   },
   {
@@ -3033,7 +3024,7 @@
    "self_type" : "type-1143",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_03HdrE"
   },
   {
@@ -3127,7 +3118,7 @@
    "self_type" : "type-1137",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_011PixelFormatE"
   },
   {
@@ -3161,7 +3152,7 @@
    "self_type" : "type-1138",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09TransformE"
   },
   {
@@ -3271,11 +3262,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_1::BufferUsage",
-   "referenced_type" : "type-158",
-   "self_type" : "type-158",
+   "referenced_type" : "type-160",
+   "self_type" : "type-160",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_111BufferUsageE"
   },
   {
@@ -3341,7 +3332,7 @@
    "self_type" : "type-1170",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_19ColorModeE"
   },
   {
@@ -3599,7 +3590,7 @@
    "self_type" : "type-1169",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_19DataspaceE"
   },
   {
@@ -3721,7 +3712,7 @@
    "self_type" : "type-1168",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_111PixelFormatE"
   },
   {
@@ -3751,7 +3742,7 @@
    "self_type" : "type-1171",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_112RenderIntentE"
   },
   {
@@ -3865,11 +3856,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_2::BufferUsage",
-   "referenced_type" : "type-420",
-   "self_type" : "type-420",
+   "referenced_type" : "type-417",
+   "self_type" : "type-417",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_211BufferUsageE"
   },
   {
@@ -3939,7 +3930,7 @@
    "self_type" : "type-1192",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_29ColorModeE"
   },
   {
@@ -4213,7 +4204,7 @@
    "self_type" : "type-1191",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_29DataspaceE"
   },
   {
@@ -4243,7 +4234,7 @@
    "self_type" : "type-1190",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_23HdrE"
   },
   {
@@ -4369,7 +4360,7 @@
    "self_type" : "type-1194",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_211PixelFormatE"
   },
   {
@@ -4391,11 +4382,11 @@
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-164",
-   "self_type" : "type-164",
+   "referenced_type" : "type-167",
+   "self_type" : "type-167",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfo12ArchitectureE"
   },
   {
@@ -4433,11 +4424,11 @@
    ],
    "linker_set_key" : "android::ui::Transform::orientation_flags",
    "name" : "android::ui::Transform::orientation_flags",
-   "referenced_type" : "type-2439",
-   "self_type" : "type-2439",
+   "referenced_type" : "type-2441",
+   "self_type" : "type-2441",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android2ui9Transform17orientation_flagsE"
   },
   {
@@ -4467,11 +4458,11 @@
    ],
    "linker_set_key" : "android::ui::Transform::type_mask",
    "name" : "android::ui::Transform::type_mask",
-   "referenced_type" : "type-2440",
-   "self_type" : "type-2440",
+   "referenced_type" : "type-2442",
+   "self_type" : "type-2442",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android2ui9Transform9type_maskE"
   },
   {
@@ -4521,7 +4512,7 @@
    "self_type" : "type-1257",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_LogPriority"
   },
   {
@@ -4575,7 +4566,7 @@
    "self_type" : "type-1212",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_color_mode_t"
   },
   {
@@ -4601,7 +4592,7 @@
    "self_type" : "type-1217",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_color_mode_v1_1_t"
   },
   {
@@ -4643,7 +4634,7 @@
    "self_type" : "type-1213",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_color_transform_t"
   },
   {
@@ -4885,7 +4876,7 @@
    "self_type" : "type-1211",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_dataspace_t"
   },
   {
@@ -4915,7 +4906,7 @@
    "self_type" : "type-1216",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_dataspace_v1_1_t"
   },
   {
@@ -4945,7 +4936,7 @@
    "self_type" : "type-1221",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_dataspace_v1_2_t"
   },
   {
@@ -4987,7 +4978,7 @@
    "self_type" : "type-1225",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_flex_component"
   },
   {
@@ -5025,7 +5016,7 @@
    "self_type" : "type-1227",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_flex_format"
   },
   {
@@ -5051,7 +5042,7 @@
    "self_type" : "type-1214",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_hdr_t"
   },
   {
@@ -5069,7 +5060,7 @@
    "self_type" : "type-1220",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_hdr_v1_2_t"
   },
   {
@@ -5099,7 +5090,7 @@
    "self_type" : "type-1224",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTS25android_pixel_format_sw_t"
   },
   {
@@ -5193,7 +5184,7 @@
    "self_type" : "type-1209",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_pixel_format_t"
   },
   {
@@ -5235,7 +5226,7 @@
    "self_type" : "type-1215",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_pixel_format_v1_1_t"
   },
   {
@@ -5253,7 +5244,7 @@
    "self_type" : "type-1222",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_pixel_format_v1_2_t"
   },
   {
@@ -5283,7 +5274,7 @@
    "self_type" : "type-1219",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_render_intent_v1_1_t"
   },
   {
@@ -5317,7 +5308,7 @@
    "self_type" : "type-1210",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_transform_t"
   },
   {
@@ -5371,7 +5362,7 @@
    "self_type" : "type-1258",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "log_id"
   }
  ],
@@ -5384,18 +5375,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-272"
+     "referenced_type" : "type-268"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
-   "referenced_type" : "type-271",
+   "referenced_type" : "type-267",
    "return_type" : "type-6",
-   "self_type" : "type-271",
+   "self_type" : "type-267",
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
   {
@@ -5408,11 +5399,11 @@
      "referenced_type" : "type-604"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
    "referenced_type" : "type-606",
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "self_type" : "type-606",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -5426,26 +5417,26 @@
      "referenced_type" : "type-604"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-343"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
    "referenced_type" : "type-603",
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "self_type" : "type-603",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -5456,15 +5447,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "referenced_type" : "type-580",
-   "return_type" : "type-103",
-   "self_type" : "type-580",
+   "referenced_type" : "type-578",
+   "return_type" : "type-105",
+   "self_type" : "type-578",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5474,18 +5465,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "referenced_type" : "type-592",
-   "return_type" : "type-103",
-   "self_type" : "type-592",
+   "referenced_type" : "type-590",
+   "return_type" : "type-105",
+   "self_type" : "type-590",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5495,33 +5486,33 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "referenced_type" : "type-588",
-   "return_type" : "type-103",
-   "self_type" : "type-588",
+   "referenced_type" : "type-586",
+   "return_type" : "type-105",
+   "self_type" : "type-586",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5531,36 +5522,36 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-595",
-   "return_type" : "type-103",
-   "self_type" : "type-595",
+   "referenced_type" : "type-593",
+   "return_type" : "type-105",
+   "self_type" : "type-593",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5570,33 +5561,33 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     }
    ],
-   "referenced_type" : "type-584",
-   "return_type" : "type-103",
-   "self_type" : "type-584",
+   "referenced_type" : "type-582",
+   "return_type" : "type-105",
+   "self_type" : "type-582",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5606,36 +5597,93 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-590",
-   "return_type" : "type-103",
-   "self_type" : "type-590",
+   "referenced_type" : "type-588",
+   "return_type" : "type-105",
+   "self_type" : "type-588",
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "name" : "int (const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-579"
+    },
+    {
+     "referenced_type" : "type-145"
+    },
+    {
+     "referenced_type" : "type-124"
+    },
+    {
+     "referenced_type" : "type-124"
+    }
+   ],
+   "referenced_type" : "type-595",
+   "return_type" : "type-105",
+   "self_type" : "type-595",
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "name" : "int (const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-579"
+    },
+    {
+     "referenced_type" : "type-145"
+    },
+    {
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-105"
+    },
+    {
+     "referenced_type" : "type-105"
+    },
+    {
+     "referenced_type" : "type-125"
+    }
+   ],
+   "referenced_type" : "type-597",
+   "return_type" : "type-105",
+   "self_type" : "type-597",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5645,15 +5693,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-586",
-   "return_type" : "type-103",
-   "self_type" : "type-586",
+   "referenced_type" : "type-584",
+   "return_type" : "type-105",
+   "self_type" : "type-584",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5663,18 +5711,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-554"
+     "referenced_type" : "type-551"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
-     "referenced_type" : "type-556"
+     "referenced_type" : "type-553"
     }
    ],
-   "referenced_type" : "type-553",
-   "return_type" : "type-103",
-   "self_type" : "type-553",
+   "referenced_type" : "type-550",
+   "return_type" : "type-105",
+   "self_type" : "type-550",
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
   {
@@ -5684,12 +5732,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     }
    ],
-   "referenced_type" : "type-573",
-   "return_type" : "type-103",
-   "self_type" : "type-573",
+   "referenced_type" : "type-570",
+   "return_type" : "type-105",
+   "self_type" : "type-570",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5699,15 +5747,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "referenced_type" : "type-571",
-   "return_type" : "type-103",
-   "self_type" : "type-571",
+   "referenced_type" : "type-568",
+   "return_type" : "type-105",
+   "self_type" : "type-568",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5717,15 +5765,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-566",
-   "return_type" : "type-103",
-   "self_type" : "type-566",
+   "referenced_type" : "type-563",
+   "return_type" : "type-105",
+   "self_type" : "type-563",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5735,24 +5783,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-569",
-   "return_type" : "type-103",
-   "self_type" : "type-569",
+   "referenced_type" : "type-566",
+   "return_type" : "type-105",
+   "self_type" : "type-566",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5762,12 +5810,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-557"
+     "referenced_type" : "type-554"
     }
    ],
-   "referenced_type" : "type-561",
-   "return_type" : "type-103",
-   "self_type" : "type-561",
+   "referenced_type" : "type-558",
+   "return_type" : "type-105",
+   "self_type" : "type-558",
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
   {
@@ -5777,12 +5825,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
-   "referenced_type" : "type-249",
-   "return_type" : "type-103",
-   "self_type" : "type-249",
+   "referenced_type" : "type-251",
+   "return_type" : "type-105",
+   "self_type" : "type-251",
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
   {
@@ -5795,14 +5843,14 @@
      "referenced_type" : "type-604"
     },
     {
-     "referenced_type" : "type-576"
+     "referenced_type" : "type-573"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "referenced_type" : "type-608",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "self_type" : "type-608",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -5813,27 +5861,27 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-222"
-    },
-    {
-     "referenced_type" : "type-223"
-    },
-    {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-224"
     },
     {
      "referenced_type" : "type-225"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-227"
+    },
+    {
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-229"
     }
    ],
-   "referenced_type" : "type-221",
-   "return_type" : "type-151",
-   "self_type" : "type-221",
+   "referenced_type" : "type-223",
+   "return_type" : "type-154",
+   "self_type" : "type-223",
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
   {
@@ -5843,12 +5891,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-522"
+     "referenced_type" : "type-520"
     }
    ],
-   "referenced_type" : "type-521",
-   "return_type" : "type-151",
-   "self_type" : "type-521",
+   "referenced_type" : "type-519",
+   "return_type" : "type-154",
+   "self_type" : "type-519",
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
   {
@@ -5858,18 +5906,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     },
     {
-     "referenced_type" : "type-576"
+     "referenced_type" : "type-573"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-575",
-   "return_type" : "type-151",
-   "self_type" : "type-575",
+   "referenced_type" : "type-572",
+   "return_type" : "type-154",
+   "self_type" : "type-572",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   }
  ],
@@ -5884,7 +5932,7 @@
      "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-1433",
+   "return_type" : "type-1436",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5896,7 +5944,7 @@
      "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-1434",
+   "return_type" : "type-1437",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5908,7 +5956,7 @@
      "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-1435",
+   "return_type" : "type-1438",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5920,7 +5968,7 @@
      "referenced_type" : "type-1192"
     }
    ],
-   "return_type" : "type-1436",
+   "return_type" : "type-1439",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5932,7 +5980,7 @@
      "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-1437",
+   "return_type" : "type-1440",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5941,10 +5989,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-1438",
+   "return_type" : "type-1441",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5956,7 +6004,7 @@
      "referenced_type" : "type-1171"
     }
    ],
-   "return_type" : "type-1439",
+   "return_type" : "type-1442",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5968,7 +6016,7 @@
      "referenced_type" : "type-1213"
     }
    ],
-   "return_type" : "type-1440",
+   "return_type" : "type-1443",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5980,7 +6028,7 @@
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-1441",
+   "return_type" : "type-1444",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -6067,7 +6115,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1042"
@@ -6076,7 +6124,7 @@
      "referenced_type" : "type-1042"
     }
    ],
-   "return_type" : "type-1442",
+   "return_type" : "type-1445",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6086,10 +6134,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6098,14 +6146,14 @@
      "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-1030"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1443"
+     "referenced_type" : "type-1446"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6115,10 +6163,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6128,18 +6176,18 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1444"
+     "referenced_type" : "type-1447"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1445"
+     "referenced_type" : "type-1448"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1446"
+     "referenced_type" : "type-1449"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6149,10 +6197,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6165,10 +6213,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1447"
+     "referenced_type" : "type-1450"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6178,23 +6226,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-1030"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1448"
+     "referenced_type" : "type-1451"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6204,28 +6252,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1449"
+     "referenced_type" : "type-1452"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1450"
+     "referenced_type" : "type-1453"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1451"
+     "referenced_type" : "type-1454"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6235,23 +6283,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
      "referenced_type" : "type-10"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1452"
+     "referenced_type" : "type-1455"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6261,10 +6309,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6273,14 +6321,14 @@
      "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-1030"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1453"
+     "referenced_type" : "type-1456"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6290,10 +6338,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6303,18 +6351,18 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1454"
+     "referenced_type" : "type-1457"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1455"
+     "referenced_type" : "type-1458"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1456"
+     "referenced_type" : "type-1459"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6324,10 +6372,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6340,10 +6388,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1457"
+     "referenced_type" : "type-1460"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6353,23 +6401,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-1030"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1458"
+     "referenced_type" : "type-1461"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6379,28 +6427,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1459"
+     "referenced_type" : "type-1462"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1460"
+     "referenced_type" : "type-1463"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1464"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6410,23 +6458,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
      "referenced_type" : "type-10"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1462"
+     "referenced_type" : "type-1465"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6436,16 +6484,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1427"
+     "referenced_type" : "type-1431"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
   {
@@ -6454,10 +6502,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/PixelFormat.h"
   },
   {
@@ -6467,10 +6515,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1400"
+     "referenced_type" : "type-1404"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -6480,13 +6528,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1400"
+     "referenced_type" : "type-1404"
     },
     {
-     "referenced_type" : "type-1401"
+     "referenced_type" : "type-1405"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -6496,25 +6544,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6525,10 +6573,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6538,13 +6586,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6555,28 +6603,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-1463"
+     "referenced_type" : "type-1466"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6587,34 +6635,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-629"
+     "referenced_type" : "type-630"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6624,19 +6672,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6646,22 +6694,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6671,16 +6719,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-1464"
+     "referenced_type" : "type-1467"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6690,22 +6738,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "return_type" : "type-6",
@@ -6718,10 +6766,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-621",
+   "return_type" : "type-622",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6730,10 +6778,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-621"
+     "referenced_type" : "type-622"
     }
    ],
-   "return_type" : "type-680",
+   "return_type" : "type-679",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6745,13 +6793,13 @@
      "referenced_type" : "type-628"
     }
    ],
-   "return_type" : "type-623",
+   "return_type" : "type-624",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
    "function_name" : "android::GraphicBuffer::dumpAllocationsToSystemLog",
    "linker_set_key" : "_ZN7android13GraphicBuffer26dumpAllocationsToSystemLogEv",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6763,7 +6811,7 @@
      "referenced_type" : "type-636"
     }
    ],
-   "return_type" : "type-679",
+   "return_type" : "type-678",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6773,24 +6821,24 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6800,27 +6848,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6830,10 +6878,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6843,27 +6891,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6873,30 +6921,30 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6906,33 +6954,33 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6942,16 +6990,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6961,19 +7009,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6983,7 +7031,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
      "referenced_type" : "type-1251"
@@ -6998,7 +7046,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7008,34 +7056,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-629"
+     "referenced_type" : "type-630"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7045,26 +7093,26 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1465"
+     "referenced_type" : "type-1468"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7074,25 +7122,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1132"
@@ -7101,7 +7149,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7111,29 +7159,29 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1466"
+     "referenced_type" : "type-1469"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7143,10 +7191,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7156,34 +7204,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-629"
+     "referenced_type" : "type-630"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7193,26 +7241,26 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1467"
+     "referenced_type" : "type-1470"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7222,25 +7270,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1132"
@@ -7249,7 +7297,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7259,29 +7307,29 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1468"
+     "referenced_type" : "type-1471"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7291,10 +7339,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7305,10 +7353,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7319,10 +7367,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7333,10 +7381,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7345,16 +7393,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/PixelFormat.h"
   },
   {
    "function_name" : "android::Gralloc2Mapper::preload",
    "linker_set_key" : "_ZN7android14Gralloc2Mapper7preloadEv",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7364,10 +7412,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-343"
+     "referenced_type" : "type-340"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7377,10 +7425,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-343"
+     "referenced_type" : "type-340"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7396,10 +7444,10 @@
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7415,7 +7463,7 @@
      "referenced_type" : "type-970"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7431,7 +7479,7 @@
      "referenced_type" : "type-970"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7444,7 +7492,7 @@
      "referenced_type" : "type-966"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7457,7 +7505,7 @@
      "referenced_type" : "type-966"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7483,13 +7531,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-360"
+     "referenced_type" : "type-357"
     },
     {
-     "referenced_type" : "type-354"
+     "referenced_type" : "type-351"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7499,13 +7547,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-360"
+     "referenced_type" : "type-357"
     },
     {
-     "referenced_type" : "type-354"
+     "referenced_type" : "type-351"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7524,7 +7572,7 @@
      "referenced_type" : "type-1042"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -7543,7 +7591,7 @@
      "referenced_type" : "type-1042"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -7553,16 +7601,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1405"
+     "referenced_type" : "type-1409"
     },
     {
      "referenced_type" : "type-1361"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -7573,10 +7621,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1405"
+     "referenced_type" : "type-1409"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -7586,13 +7634,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1405"
+     "referenced_type" : "type-1409"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-1469",
+   "return_type" : "type-1472",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -7602,19 +7650,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
    "function_name" : "android::GraphicBufferMapper::preloadHal",
    "linker_set_key" : "_ZN7android19GraphicBufferMapper10preloadHalEv",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7624,28 +7672,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-350"
+     "referenced_type" : "type-347"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7655,16 +7703,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7674,34 +7722,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-343"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7711,25 +7759,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7739,19 +7787,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7761,30 +7809,30 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7794,13 +7842,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7810,33 +7858,33 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7846,36 +7894,36 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7885,22 +7933,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7911,10 +7959,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7925,10 +7973,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7937,16 +7985,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2448"
+     "referenced_type" : "type-2450"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/UiConfig.h"
   },
   {
    "function_name" : "android::GraphicBufferAllocator::dumpToSystemLog",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocator15dumpToSystemLogEv",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -7956,13 +8004,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -7972,93 +8020,93 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-126"
+    },
+    {
+     "referenced_type" : "type-343"
     },
     {
      "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-122"
-    },
-    {
-     "referenced_type" : "type-124"
-    },
-    {
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorC1Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorC2Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::~GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorD1Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::~GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorD2Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -8071,7 +8119,7 @@
      "referenced_type" : "type-1359"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -8084,7 +8132,7 @@
      "referenced_type" : "type-1359"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -8094,7 +8142,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     },
     {
      "referenced_type" : "type-10"
@@ -8103,7 +8151,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8113,7 +8161,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     },
     {
      "referenced_type" : "type-10"
@@ -8128,7 +8176,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8138,10 +8186,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-10"
@@ -8150,7 +8198,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8160,10 +8208,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8199,13 +8247,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     },
     {
-     "referenced_type" : "type-2438"
+     "referenced_type" : "type-2440"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8215,13 +8263,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8231,10 +8279,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8244,13 +8292,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     },
     {
-     "referenced_type" : "type-2438"
+     "referenced_type" : "type-2440"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8260,13 +8308,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8276,10 +8324,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8289,10 +8337,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8302,10 +8350,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8315,13 +8363,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     },
     {
-     "referenced_type" : "type-2438"
+     "referenced_type" : "type-2440"
     }
    ],
-   "return_type" : "type-2442",
+   "return_type" : "type-2444",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8334,7 +8382,7 @@
      "referenced_type" : "type-1296"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
   },
   {
@@ -8347,16 +8395,16 @@
      "referenced_type" : "type-1296"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1300",
@@ -8372,10 +8420,10 @@
      "referenced_type" : "type-1296"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1300",
@@ -8391,10 +8439,10 @@
      "referenced_type" : "type-1296"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1300",
@@ -8410,10 +8458,10 @@
      "referenced_type" : "type-1358"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8426,10 +8474,10 @@
      "referenced_type" : "type-1358"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8438,7 +8486,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "referenced_type" : "type-1361"
@@ -8456,7 +8504,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-889"
+     "referenced_type" : "type-879"
     },
     {
      "referenced_type" : "type-1361"
@@ -8490,7 +8538,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8506,7 +8554,7 @@
      "referenced_type" : "type-1341"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8519,10 +8567,10 @@
      "referenced_type" : "type-1358"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8538,7 +8586,7 @@
      "referenced_type" : "type-1341"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8551,10 +8599,10 @@
      "referenced_type" : "type-1358"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8564,13 +8612,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8580,13 +8628,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8596,19 +8644,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8619,16 +8667,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8639,22 +8687,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8665,16 +8713,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8684,16 +8732,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8703,10 +8751,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8716,22 +8764,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8741,19 +8789,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8763,25 +8811,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8791,19 +8839,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8813,25 +8861,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8840,10 +8888,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8853,13 +8901,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8869,16 +8917,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8888,16 +8936,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8907,10 +8955,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8920,13 +8968,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8936,13 +8984,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8952,19 +9000,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8974,13 +9022,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8990,13 +9038,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9006,19 +9054,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9028,13 +9076,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9044,13 +9092,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9060,19 +9108,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9082,10 +9130,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "default_arg" : true,
@@ -9102,7 +9150,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-10"
@@ -9111,7 +9159,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9121,19 +9169,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9143,16 +9191,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9162,16 +9210,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9181,13 +9229,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9197,13 +9245,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9213,10 +9261,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9226,13 +9274,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9242,13 +9290,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9258,10 +9306,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9271,10 +9319,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9284,10 +9332,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9297,13 +9345,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9313,10 +9361,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     }
    ],
-   "return_type" : "type-284",
+   "return_type" : "type-12",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9326,13 +9374,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9342,13 +9390,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-1394"
+     "referenced_type" : "type-1398"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9358,7 +9406,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
      "referenced_type" : "type-1251"
@@ -9373,7 +9421,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9383,13 +9431,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9399,13 +9447,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9415,13 +9463,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9431,13 +9479,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9447,13 +9495,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-1410"
+     "referenced_type" : "type-1415"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9463,13 +9511,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9480,7 +9528,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
      "referenced_type" : "type-1361"
@@ -9489,7 +9537,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9499,13 +9547,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9515,13 +9563,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-1410"
+     "referenced_type" : "type-1415"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9531,13 +9579,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9548,7 +9596,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
      "referenced_type" : "type-1361"
@@ -9557,7 +9605,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9567,25 +9615,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
    "function_name" : "android::Singleton<android::GraphicBufferMapper>::getInstance",
    "linker_set_key" : "_ZN7android9SingletonINS_19GraphicBufferMapperEE11getInstanceEv",
-   "return_type" : "type-526",
+   "return_type" : "type-524",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "function_name" : "android::Singleton<android::GraphicBufferAllocator>::getInstance",
    "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11getInstanceEv",
-   "return_type" : "type-544",
+   "return_type" : "type-541",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
@@ -9595,7 +9643,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1429"
+     "referenced_type" : "type-1433"
     }
    ],
    "return_type" : "type-6",
@@ -9608,10 +9656,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1429"
+     "referenced_type" : "type-1433"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
   {
@@ -9621,16 +9669,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1429"
+     "referenced_type" : "type-1433"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
   {
@@ -9650,7 +9698,7 @@
      "referenced_type" : "type-1119"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9664,13 +9712,13 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9684,13 +9732,13 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9704,16 +9752,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9727,16 +9775,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9750,16 +9798,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9773,16 +9821,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9792,10 +9840,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9805,28 +9853,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-350"
+     "referenced_type" : "type-347"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9836,7 +9884,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
    "return_type" : "type-636",
@@ -9849,10 +9897,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9862,7 +9910,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
    "return_type" : "type-628",
@@ -9875,7 +9923,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     },
     {
      "referenced_type" : "type-1249"
@@ -9890,7 +9938,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9900,10 +9948,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9913,13 +9961,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -9929,28 +9977,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-350"
+     "referenced_type" : "type-347"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -9960,16 +10008,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
      "referenced_type" : "type-1122"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-343"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -9979,16 +10027,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -9998,19 +10046,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10020,31 +10068,31 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10055,13 +10103,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-351"
+     "referenced_type" : "type-348"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10071,25 +10119,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10099,31 +10147,31 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10133,13 +10181,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10149,7 +10197,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     }
    ],
    "return_type" : "type-6",
@@ -10162,10 +10210,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-973"
+     "referenced_type" : "type-974"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -10175,16 +10223,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-973"
+     "referenced_type" : "type-974"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -10194,10 +10242,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-362"
+     "referenced_type" : "type-359"
     }
    ],
-   "return_type" : "type-1566",
+   "return_type" : "type-1569",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10207,34 +10255,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-362"
+     "referenced_type" : "type-359"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-126"
+    },
+    {
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-123"
-    },
-    {
-     "referenced_type" : "type-122"
-    },
-    {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-343"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10244,7 +10292,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-362"
+     "referenced_type" : "type-359"
     }
    ],
    "return_type" : "type-6",
@@ -10257,10 +10305,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-721"
+     "referenced_type" : "type-722"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -10270,13 +10318,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-721"
+     "referenced_type" : "type-722"
     },
     {
      "referenced_type" : "type-723"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -10286,13 +10334,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1241",
@@ -10305,7 +10353,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
    "return_type" : "type-6",
@@ -10318,10 +10366,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10331,7 +10379,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
    "return_type" : "type-10",
@@ -10344,7 +10392,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
    "return_type" : "type-10",
@@ -10357,7 +10405,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
    "return_type" : "type-10",
@@ -10370,7 +10418,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
    "return_type" : "type-10",
@@ -10383,13 +10431,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10399,16 +10447,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
-    },
-    {
      "referenced_type" : "type-2443"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-2445"
+    },
+    {
+     "referenced_type" : "type-283"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10419,10 +10467,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10432,10 +10480,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10445,10 +10493,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
-   "return_type" : "type-2434",
+   "return_type" : "type-2436",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10458,10 +10506,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
-   "return_type" : "type-2427",
+   "return_type" : "type-2429",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10471,7 +10519,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
      "referenced_type" : "type-1246"
@@ -10491,13 +10539,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10507,13 +10555,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
      "referenced_type" : "type-1050"
     }
    ],
-   "return_type" : "type-22",
+   "return_type" : "type-23",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10523,13 +10571,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
      "referenced_type" : "type-1054"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-18",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10539,7 +10587,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
      "referenced_type" : "type-1280"
@@ -10555,16 +10603,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-22",
+   "return_type" : "type-23",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10574,10 +10622,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "return_type" : "type-1054",
@@ -10590,13 +10638,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
-     "referenced_type" : "type-2438"
+     "referenced_type" : "type-2440"
     }
    ],
-   "return_type" : "type-2434",
+   "return_type" : "type-2436",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10644,13 +10692,13 @@
      "referenced_type" : "type-1299"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1241",
@@ -10714,7 +10762,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10727,7 +10775,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-284",
+   "return_type" : "type-12",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10740,7 +10788,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10753,7 +10801,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10778,7 +10826,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10788,13 +10836,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10804,13 +10852,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10820,19 +10868,19 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2396"
+    },
+    {
      "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10842,10 +10890,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10855,10 +10903,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
    "return_type" : "type-6",
@@ -10871,7 +10919,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     }
    ],
    "return_type" : "type-1299",
@@ -10884,17 +10932,17 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10904,20 +10952,20 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10927,7 +10975,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     }
    ],
    "return_type" : "type-1299",
@@ -10940,13 +10988,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10956,13 +11004,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10972,19 +11020,19 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2396"
+    },
+    {
      "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10994,16 +11042,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11013,7 +11061,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
      "referenced_type" : "type-1284"
@@ -11029,13 +11077,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-6",
@@ -11048,10 +11096,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     }
    ],
    "return_type" : "type-1299",
@@ -11064,13 +11112,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11080,13 +11128,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11096,19 +11144,19 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2396"
+    },
+    {
      "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11118,13 +11166,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11134,13 +11182,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11150,19 +11198,19 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2396"
+    },
+    {
      "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11173,16 +11221,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11193,22 +11241,22 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2396"
+    },
+    {
      "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11219,16 +11267,16 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2396"
+    },
+    {
      "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2392"
-    },
-    {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11238,16 +11286,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11258,16 +11306,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2387"
+     "referenced_type" : "type-2389"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11278,16 +11326,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2387"
+     "referenced_type" : "type-2389"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11298,19 +11346,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2387"
+     "referenced_type" : "type-2389"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11321,19 +11369,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2387"
+     "referenced_type" : "type-2389"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11344,19 +11392,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2387"
+     "referenced_type" : "type-2389"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11367,19 +11415,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2387"
+     "referenced_type" : "type-2389"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11389,10 +11437,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1396"
+     "referenced_type" : "type-1400"
     }
    ],
-   "return_type" : "type-1383",
+   "return_type" : "type-1387",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11402,10 +11450,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1396"
+     "referenced_type" : "type-1400"
     }
    ],
-   "return_type" : "type-284",
+   "return_type" : "type-12",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11415,7 +11463,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1396"
+     "referenced_type" : "type-1400"
     }
    ],
    "return_type" : "type-6",
@@ -11428,10 +11476,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1394"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11441,10 +11489,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1394"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11454,7 +11502,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1394"
     },
     {
      "referenced_type" : "type-1249"
@@ -11469,24 +11517,24 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   }
  ],
  "global_vars" :
  [
   {
-   "access" : "private",
+   "access" : "protected",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocator10sAllocListE",
    "name" : "android::GraphicBufferAllocator::sAllocList",
-   "referenced_type" : "type-1570",
+   "referenced_type" : "type-1573",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocator5sLockE",
    "name" : "android::GraphicBufferAllocator::sLock",
-   "referenced_type" : "type-252",
+   "referenced_type" : "type-280",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -11522,41 +11570,41 @@
   {
    "linker_set_key" : "_ZN7android6Region14INVALID_REGIONE",
    "name" : "android::Region::INVALID_REGION",
-   "referenced_type" : "type-2388",
+   "referenced_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
    "linker_set_key" : "_ZN7android9FenceTime8NO_FENCEE",
    "name" : "android::FenceTime::NO_FENCE",
-   "referenced_type" : "type-1391",
+   "referenced_type" : "type-1395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_19GraphicBufferMapperEE5sLockE",
    "name" : "android::Singleton<android::GraphicBufferMapper>::sLock",
-   "referenced_type" : "type-252",
+   "referenced_type" : "type-280",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_19GraphicBufferMapperEE9sInstanceE",
    "name" : "android::Singleton<android::GraphicBufferMapper>::sInstance",
-   "referenced_type" : "type-539",
+   "referenced_type" : "type-537",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE5sLockE",
    "name" : "android::Singleton<android::GraphicBufferAllocator>::sLock",
-   "referenced_type" : "type-252",
+   "referenced_type" : "type-280",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE9sInstanceE",
    "name" : "android::Singleton<android::GraphicBufferAllocator>::sInstance",
-   "referenced_type" : "type-545",
+   "referenced_type" : "type-542",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   }
  ],
@@ -11566,8 +11614,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot &",
    "name" : "android::FenceTime::Snapshot &",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1387",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1392",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -11575,8 +11623,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot::State &",
    "name" : "android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1408",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1412",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -11584,8 +11632,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferAllocator &",
    "name" : "android::GraphicBufferAllocator &",
-   "referenced_type" : "type-542",
-   "self_type" : "type-544",
+   "referenced_type" : "type-539",
+   "self_type" : "type-541",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -11593,8 +11641,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-527",
-   "self_type" : "type-526",
+   "referenced_type" : "type-525",
+   "self_type" : "type-524",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -11611,8 +11659,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex &",
    "name" : "android::Mutex &",
-   "referenced_type" : "type-252",
-   "self_type" : "type-256",
+   "referenced_type" : "type-280",
+   "self_type" : "type-1379",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -11629,8 +11677,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock &",
    "name" : "android::RWLock &",
-   "referenced_type" : "type-262",
-   "self_type" : "type-266",
+   "referenced_type" : "type-258",
+   "self_type" : "type-262",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -11647,8 +11695,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Region &",
    "name" : "android::Region &",
-   "referenced_type" : "type-2389",
-   "self_type" : "type-2393",
+   "referenced_type" : "type-2391",
+   "self_type" : "type-2395",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -11656,8 +11704,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
-   "referenced_type" : "type-179",
-   "self_type" : "type-188",
+   "referenced_type" : "type-182",
+   "self_type" : "type-190",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -11665,8 +11713,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
-   "referenced_type" : "type-285",
-   "self_type" : "type-890",
+   "referenced_type" : "type-282",
+   "self_type" : "type-888",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -11674,8 +11722,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<android::Rect> &",
    "name" : "android::Vector<android::Rect> &",
-   "referenced_type" : "type-2382",
-   "self_type" : "type-2386",
+   "referenced_type" : "type-2384",
+   "self_type" : "type-2388",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -11692,8 +11740,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TMat44<float> &",
    "name" : "android::details::TMat44<float> &",
-   "referenced_type" : "type-2427",
-   "self_type" : "type-2433",
+   "referenced_type" : "type-2429",
+   "self_type" : "type-2435",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -11701,8 +11749,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TQuaternion<double> &",
    "name" : "android::details::TQuaternion<double> &",
-   "referenced_type" : "type-331",
-   "self_type" : "type-406",
+   "referenced_type" : "type-328",
+   "self_type" : "type-403",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -11710,8 +11758,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TQuaternion<float> &",
    "name" : "android::details::TQuaternion<float> &",
-   "referenced_type" : "type-410",
-   "self_type" : "type-438",
+   "referenced_type" : "type-407",
+   "self_type" : "type-435",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -11728,7 +11776,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec2<double> &",
    "name" : "android::details::TVec2<double> &",
-   "referenced_type" : "type-55",
+   "referenced_type" : "type-57",
    "self_type" : "type-1081",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -11737,7 +11785,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec2<float> &",
    "name" : "android::details::TVec2<float> &",
-   "referenced_type" : "type-22",
+   "referenced_type" : "type-23",
    "self_type" : "type-1048",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -11746,7 +11794,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<double> &",
    "name" : "android::details::TVec3<double> &",
-   "referenced_type" : "type-66",
+   "referenced_type" : "type-68",
    "self_type" : "type-1390",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
@@ -11755,7 +11803,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<float> &",
    "name" : "android::details::TVec3<float> &",
-   "referenced_type" : "type-17",
+   "referenced_type" : "type-18",
    "self_type" : "type-1052",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -11764,8 +11812,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<double> &",
    "name" : "android::details::TVec4<double> &",
-   "referenced_type" : "type-50",
-   "self_type" : "type-185",
+   "referenced_type" : "type-52",
+   "self_type" : "type-181",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -11773,8 +11821,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<float> &",
    "name" : "android::details::TVec4<float> &",
-   "referenced_type" : "type-200",
-   "self_type" : "type-330",
+   "referenced_type" : "type-192",
+   "self_type" : "type-327",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -11782,8 +11830,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &",
-   "referenced_type" : "type-99",
-   "self_type" : "type-108",
+   "referenced_type" : "type-101",
+   "self_type" : "type-110",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11791,8 +11839,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &",
-   "referenced_type" : "type-393",
-   "self_type" : "type-400",
+   "referenced_type" : "type-392",
+   "self_type" : "type-397",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11800,8 +11848,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &",
-   "referenced_type" : "type-111",
-   "self_type" : "type-114",
+   "referenced_type" : "type-113",
+   "self_type" : "type-116",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11818,7 +11866,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status &",
    "name" : "android::hardware::Status &",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1313",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -11827,8 +11875,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1658",
-   "self_type" : "type-1657",
+   "referenced_type" : "type-1662",
+   "self_type" : "type-1661",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11836,8 +11884,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1872",
-   "self_type" : "type-1871",
+   "referenced_type" : "type-1873",
+   "self_type" : "type-1872",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11845,8 +11893,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1948",
-   "self_type" : "type-1947",
+   "referenced_type" : "type-1950",
+   "self_type" : "type-1949",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11854,8 +11902,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-230",
-   "self_type" : "type-229",
+   "referenced_type" : "type-232",
+   "self_type" : "type-231",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11863,8 +11911,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-431",
-   "self_type" : "type-430",
+   "referenced_type" : "type-428",
+   "self_type" : "type-427",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11872,8 +11920,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int> &",
    "name" : "android::hardware::details::hidl_pointer<unsigned int> &",
-   "referenced_type" : "type-120",
-   "self_type" : "type-178",
+   "referenced_type" : "type-122",
+   "self_type" : "type-180",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11890,8 +11938,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned int> &",
    "name" : "android::hardware::hidl_vec<unsigned int> &",
-   "referenced_type" : "type-128",
-   "self_type" : "type-131",
+   "referenced_type" : "type-131",
+   "self_type" : "type-133",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11909,7 +11957,7 @@
    "linker_set_key" : "android::sp<android::Fence> &",
    "name" : "android::sp<android::Fence> &",
    "referenced_type" : "type-1357",
-   "self_type" : "type-1411",
+   "self_type" : "type-1416",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11917,8 +11965,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &",
-   "referenced_type" : "type-355",
-   "self_type" : "type-377",
+   "referenced_type" : "type-352",
+   "self_type" : "type-374",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11926,8 +11974,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &",
-   "referenced_type" : "type-484",
-   "self_type" : "type-489",
+   "referenced_type" : "type-481",
+   "self_type" : "type-487",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11935,8 +11983,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &",
-   "referenced_type" : "type-338",
-   "self_type" : "type-385",
+   "referenced_type" : "type-335",
+   "self_type" : "type-382",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11944,8 +11992,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
-   "referenced_type" : "type-86",
-   "self_type" : "type-93",
+   "referenced_type" : "type-88",
+   "self_type" : "type-95",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11953,8 +12001,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &",
-   "referenced_type" : "type-497",
-   "self_type" : "type-503",
+   "referenced_type" : "type-494",
+   "self_type" : "type-500",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11962,8 +12010,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ui::Transform &",
    "name" : "android::ui::Transform &",
-   "referenced_type" : "type-2434",
-   "self_type" : "type-2442",
+   "referenced_type" : "type-2436",
+   "self_type" : "type-2444",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -11986,50 +12034,50 @@
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-1771",
-   "self_type" : "type-1773",
+   "referenced_type" : "type-1772",
+   "self_type" : "type-1774",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-2133",
-   "self_type" : "type-2165",
+   "referenced_type" : "type-2132",
+   "self_type" : "type-2167",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-2406",
-   "self_type" : "type-2408",
+   "referenced_type" : "type-2408",
+   "self_type" : "type-2410",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-1762",
-   "self_type" : "type-1764",
+   "referenced_type" : "type-1763",
+   "self_type" : "type-1765",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-2046",
-   "self_type" : "type-2056",
+   "referenced_type" : "type-2044",
+   "self_type" : "type-2054",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-2424",
-   "self_type" : "type-2426",
+   "referenced_type" : "type-2426",
+   "self_type" : "type-2428",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-961",
-   "self_type" : "type-974",
+   "referenced_type" : "type-958",
+   "self_type" : "type-972",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
@@ -12045,7 +12093,7 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ColorSpace::TransferParameters &",
    "name" : "const android::ColorSpace::TransferParameters &",
-   "referenced_type" : "type-1033",
+   "referenced_type" : "type-1030",
    "self_type" : "type-1041",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
@@ -12054,8 +12102,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot &",
    "name" : "const android::FenceTime::Snapshot &",
-   "referenced_type" : "type-1388",
-   "self_type" : "type-1394",
+   "referenced_type" : "type-1393",
+   "self_type" : "type-1398",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -12063,8 +12111,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-1406",
-   "self_type" : "type-1407",
+   "referenced_type" : "type-1410",
+   "self_type" : "type-1411",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -12081,8 +12129,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Gralloc2Mapper &",
    "name" : "const android::Gralloc2Mapper &",
-   "referenced_type" : "type-344",
-   "self_type" : "type-354",
+   "referenced_type" : "type-341",
+   "self_type" : "type-351",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -12090,8 +12138,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-2059",
-   "self_type" : "type-2058",
+   "referenced_type" : "type-2061",
+   "self_type" : "type-2060",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12099,8 +12147,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-2225",
-   "self_type" : "type-2224",
+   "referenced_type" : "type-2228",
+   "self_type" : "type-2227",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12108,8 +12156,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-2229",
-   "self_type" : "type-2228",
+   "referenced_type" : "type-2231",
+   "self_type" : "type-2230",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12126,8 +12174,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-802",
-   "self_type" : "type-801",
+   "referenced_type" : "type-803",
+   "self_type" : "type-802",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12135,8 +12183,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-827",
-   "self_type" : "type-826",
+   "referenced_type" : "type-828",
+   "self_type" : "type-827",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12145,7 +12193,7 @@
    "linker_set_key" : "const android::GraphicBufferAllocator::alloc_rec_t &",
    "name" : "const android::GraphicBufferAllocator::alloc_rec_t &",
    "referenced_type" : "type-706",
-   "self_type" : "type-707",
+   "self_type" : "type-708",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12153,8 +12201,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBufferMapper &",
    "name" : "const android::GraphicBufferMapper &",
-   "referenced_type" : "type-614",
-   "self_type" : "type-630",
+   "referenced_type" : "type-615",
+   "self_type" : "type-631",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -12180,8 +12228,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Region &",
    "name" : "const android::Region &",
-   "referenced_type" : "type-2388",
-   "self_type" : "type-2392",
+   "referenced_type" : "type-2390",
+   "self_type" : "type-2394",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -12189,8 +12237,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-184",
-   "self_type" : "type-187",
+   "referenced_type" : "type-187",
+   "self_type" : "type-189",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -12198,8 +12246,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 &",
    "name" : "const android::String8 &",
-   "referenced_type" : "type-873",
-   "self_type" : "type-889",
+   "referenced_type" : "type-863",
+   "self_type" : "type-879",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -12207,8 +12255,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::Rect> &",
    "name" : "const android::Vector<android::Rect> &",
-   "referenced_type" : "type-2384",
-   "self_type" : "type-2385",
+   "referenced_type" : "type-2386",
+   "self_type" : "type-2387",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -12216,8 +12264,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TMat33<float> &",
    "name" : "const android::details::TMat33<float> &",
-   "referenced_type" : "type-925",
-   "self_type" : "type-934",
+   "referenced_type" : "type-919",
+   "self_type" : "type-926",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -12225,8 +12273,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TMat44<float> &",
    "name" : "const android::details::TMat44<float> &",
-   "referenced_type" : "type-2431",
-   "self_type" : "type-2432",
+   "referenced_type" : "type-2433",
+   "self_type" : "type-2434",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -12234,8 +12282,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TQuaternion<double> &",
    "name" : "const android::details::TQuaternion<double> &",
-   "referenced_type" : "type-404",
-   "self_type" : "type-405",
+   "referenced_type" : "type-401",
+   "self_type" : "type-402",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -12243,8 +12291,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TQuaternion<float> &",
    "name" : "const android::details::TQuaternion<float> &",
-   "referenced_type" : "type-432",
-   "self_type" : "type-433",
+   "referenced_type" : "type-429",
+   "self_type" : "type-430",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -12297,8 +12345,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TVec4<double> &",
    "name" : "const android::details::TVec4<double> &",
-   "referenced_type" : "type-166",
-   "self_type" : "type-177",
+   "referenced_type" : "type-164",
+   "self_type" : "type-171",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -12306,8 +12354,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TVec4<float> &",
    "name" : "const android::details::TVec4<float> &",
-   "referenced_type" : "type-325",
-   "self_type" : "type-326",
+   "referenced_type" : "type-322",
+   "self_type" : "type-323",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -12315,8 +12363,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-231",
-   "self_type" : "type-232",
+   "referenced_type" : "type-233",
+   "self_type" : "type-234",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -12378,8 +12426,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned int> &",
    "name" : "const android::hardware::hidl_vec<unsigned int> &",
-   "referenced_type" : "type-132",
-   "self_type" : "type-133",
+   "referenced_type" : "type-134",
+   "self_type" : "type-135",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12397,7 +12445,7 @@
    "linker_set_key" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> &",
    "name" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> &",
    "referenced_type" : "type-693",
-   "self_type" : "type-695",
+   "self_type" : "type-698",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12414,8 +12462,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
    "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-273",
-   "self_type" : "type-272",
+   "referenced_type" : "type-269",
+   "self_type" : "type-268",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -12423,8 +12471,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
-   "referenced_type" : "type-91",
-   "self_type" : "type-92",
+   "referenced_type" : "type-93",
+   "self_type" : "type-94",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12450,8 +12498,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ui::Transform &",
    "name" : "const android::ui::Transform &",
-   "referenced_type" : "type-2437",
-   "self_type" : "type-2438",
+   "referenced_type" : "type-2439",
+   "self_type" : "type-2440",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -12459,7 +12507,7 @@
    "alignment" : 4,
    "linker_set_key" : "const bool &",
    "name" : "const bool &",
-   "referenced_type" : "type-370",
+   "referenced_type" : "type-367",
    "self_type" : "type-1276",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -12468,7 +12516,7 @@
    "alignment" : 4,
    "linker_set_key" : "const double &",
    "name" : "const double &",
-   "referenced_type" : "type-853",
+   "referenced_type" : "type-850",
    "self_type" : "type-859",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -12477,7 +12525,7 @@
    "alignment" : 4,
    "linker_set_key" : "const float &",
    "name" : "const float &",
-   "referenced_type" : "type-563",
+   "referenced_type" : "type-560",
    "self_type" : "type-1218",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -12492,30 +12540,30 @@
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-1774",
-   "self_type" : "type-1776",
+   "referenced_type" : "type-1775",
+   "self_type" : "type-1777",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-2209",
+   "referenced_type" : "type-2207",
    "self_type" : "type-2221",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-2412",
-   "self_type" : "type-2414",
+   "referenced_type" : "type-2414",
+   "self_type" : "type-2416",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const int &",
    "name" : "const int &",
-   "referenced_type" : "type-562",
-   "self_type" : "type-837",
+   "referenced_type" : "type-559",
+   "self_type" : "type-835",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12538,106 +12586,106 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-125",
-   "self_type" : "type-127",
+   "referenced_type" : "type-128",
+   "self_type" : "type-130",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1576",
-   "self_type" : "type-1578",
+   "referenced_type" : "type-1580",
+   "self_type" : "type-1582",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1611",
-   "self_type" : "type-1613",
+   "referenced_type" : "type-1616",
+   "self_type" : "type-1618",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1786",
-   "self_type" : "type-1788",
+   "referenced_type" : "type-1787",
+   "self_type" : "type-1789",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1847",
-   "self_type" : "type-1849",
+   "referenced_type" : "type-1848",
+   "self_type" : "type-1850",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1866",
-   "self_type" : "type-1868",
+   "referenced_type" : "type-1867",
+   "self_type" : "type-1869",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1933",
-   "self_type" : "type-1935",
+   "referenced_type" : "type-1935",
+   "self_type" : "type-1937",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2079",
-   "self_type" : "type-2081",
+   "referenced_type" : "type-2081",
+   "self_type" : "type-2083",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2170",
-   "self_type" : "type-2173",
+   "referenced_type" : "type-2173",
+   "self_type" : "type-2176",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2247",
-   "self_type" : "type-2249",
+   "referenced_type" : "type-2249",
+   "self_type" : "type-2251",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2289",
-   "self_type" : "type-2291",
+   "referenced_type" : "type-2291",
+   "self_type" : "type-2293",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2340",
-   "self_type" : "type-2342",
+   "referenced_type" : "type-2342",
+   "self_type" : "type-2344",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2471",
-   "self_type" : "type-2473",
+   "referenced_type" : "type-2473",
+   "self_type" : "type-2475",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-36",
-   "self_type" : "type-39",
+   "referenced_type" : "type-39",
+   "self_type" : "type-41",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-416",
-   "self_type" : "type-418",
+   "referenced_type" : "type-413",
+   "self_type" : "type-415",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12650,15 +12698,15 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-747",
+   "referenced_type" : "type-748",
    "self_type" : "type-750",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-854",
-   "self_type" : "type-856",
+   "referenced_type" : "type-856",
+   "self_type" : "type-858",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12697,8 +12745,8 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle *const &",
    "name" : "const native_handle *const &",
-   "referenced_type" : "type-696",
-   "self_type" : "type-697",
+   "referenced_type" : "type-699",
+   "self_type" : "type-700",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12706,8 +12754,8 @@
    "alignment" : 4,
    "linker_set_key" : "const short &",
    "name" : "const short &",
-   "referenced_type" : "type-825",
-   "self_type" : "type-829",
+   "referenced_type" : "type-823",
+   "self_type" : "type-826",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12716,7 +12764,7 @@
    "linker_set_key" : "const signed char &",
    "name" : "const signed char &",
    "referenced_type" : "type-799",
-   "self_type" : "type-804",
+   "self_type" : "type-801",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12733,8 +12781,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3> &",
    "name" : "const std::array<android::details::TVec2<float>, 3> &",
-   "referenced_type" : "type-1768",
-   "self_type" : "type-1770",
+   "referenced_type" : "type-1769",
+   "self_type" : "type-1771",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12742,8 +12790,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3> &",
    "name" : "const std::array<android::details::TVec2<float>, 3> &",
-   "referenced_type" : "type-2121",
-   "self_type" : "type-2129",
+   "referenced_type" : "type-2119",
+   "self_type" : "type-2125",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12751,8 +12799,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1015",
-   "self_type" : "type-1029",
+   "referenced_type" : "type-1007",
+   "self_type" : "type-1021",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12760,8 +12808,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1765",
-   "self_type" : "type-1767",
+   "referenced_type" : "type-1766",
+   "self_type" : "type-1768",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12769,7 +12817,7 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2103",
+   "referenced_type" : "type-2099",
    "self_type" : "type-2113",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
@@ -12787,8 +12835,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<float (float)> &",
    "name" : "const std::function<float (float)> &",
-   "referenced_type" : "type-1777",
-   "self_type" : "type-1779",
+   "referenced_type" : "type-1778",
+   "self_type" : "type-1780",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -12796,8 +12844,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<float (float)> &",
    "name" : "const std::function<float (float)> &",
-   "referenced_type" : "type-2222",
-   "self_type" : "type-2227",
+   "referenced_type" : "type-2224",
+   "self_type" : "type-2226",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -12805,8 +12853,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-1391",
-   "self_type" : "type-1401",
+   "referenced_type" : "type-1395",
+   "self_type" : "type-1405",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -12814,8 +12862,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-1839",
-   "self_type" : "type-1841",
+   "referenced_type" : "type-1840",
+   "self_type" : "type-1842",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -12823,8 +12871,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-2662",
-   "self_type" : "type-2669",
+   "referenced_type" : "type-2667",
+   "self_type" : "type-2674",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -12832,8 +12880,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> > &",
    "name" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> > &",
-   "referenced_type" : "type-2330",
-   "self_type" : "type-2332",
+   "referenced_type" : "type-2332",
+   "self_type" : "type-2334",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -12850,8 +12898,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1031",
-   "self_type" : "type-1030",
+   "referenced_type" : "type-1032",
+   "self_type" : "type-1031",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12868,8 +12916,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1581",
-   "self_type" : "type-1580",
+   "referenced_type" : "type-1585",
+   "self_type" : "type-1584",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12877,8 +12925,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1712",
-   "self_type" : "type-1711",
+   "referenced_type" : "type-1713",
+   "self_type" : "type-1712",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12886,8 +12934,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1825",
-   "self_type" : "type-1824",
+   "referenced_type" : "type-1826",
+   "self_type" : "type-1825",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12895,8 +12943,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1851",
-   "self_type" : "type-1850",
+   "referenced_type" : "type-1852",
+   "self_type" : "type-1851",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12904,8 +12952,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1902",
-   "self_type" : "type-1901",
+   "referenced_type" : "type-1903",
+   "self_type" : "type-1902",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12913,8 +12961,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1993",
-   "self_type" : "type-1992",
+   "referenced_type" : "type-1994",
+   "self_type" : "type-1993",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12922,8 +12970,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2074",
-   "self_type" : "type-2073",
+   "referenced_type" : "type-2076",
+   "self_type" : "type-2075",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12931,8 +12979,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2149",
-   "self_type" : "type-2148",
+   "referenced_type" : "type-2152",
+   "self_type" : "type-2151",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12940,8 +12988,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2232",
-   "self_type" : "type-2231",
+   "referenced_type" : "type-2234",
+   "self_type" : "type-2233",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12949,8 +12997,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2327",
-   "self_type" : "type-2326",
+   "referenced_type" : "type-2329",
+   "self_type" : "type-2328",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12958,8 +13006,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2378",
-   "self_type" : "type-2377",
+   "referenced_type" : "type-2380",
+   "self_type" : "type-2379",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12967,8 +13015,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2565",
-   "self_type" : "type-2564",
+   "referenced_type" : "type-2567",
+   "self_type" : "type-2566",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12976,8 +13024,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-328",
-   "self_type" : "type-327",
+   "referenced_type" : "type-325",
+   "self_type" : "type-324",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12985,8 +13033,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-45",
-   "self_type" : "type-44",
+   "referenced_type" : "type-47",
+   "self_type" : "type-46",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12994,8 +13042,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-478",
-   "self_type" : "type-477",
+   "referenced_type" : "type-475",
+   "self_type" : "type-474",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13012,8 +13060,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-726",
-   "self_type" : "type-725",
+   "referenced_type" : "type-727",
+   "self_type" : "type-726",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13021,8 +13069,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-832",
-   "self_type" : "type-831",
+   "referenced_type" : "type-833",
+   "self_type" : "type-832",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13030,8 +13078,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-959",
-   "self_type" : "type-958",
+   "referenced_type" : "type-961",
+   "self_type" : "type-960",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13039,8 +13087,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned char &",
    "name" : "const unsigned char &",
-   "referenced_type" : "type-224",
-   "self_type" : "type-821",
+   "referenced_type" : "type-226",
+   "self_type" : "type-812",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13048,8 +13096,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned int &",
    "name" : "const unsigned int &",
-   "referenced_type" : "type-236",
-   "self_type" : "type-846",
+   "referenced_type" : "type-238",
+   "self_type" : "type-842",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13057,7 +13105,7 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long &",
    "name" : "const unsigned long long &",
-   "referenced_type" : "type-226",
+   "referenced_type" : "type-228",
    "self_type" : "type-849",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -13067,7 +13115,7 @@
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
    "referenced_type" : "type-830",
-   "self_type" : "type-834",
+   "self_type" : "type-831",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13093,7 +13141,7 @@
    "alignment" : 4,
    "linker_set_key" : "int &",
    "name" : "int &",
-   "referenced_type" : "type-103",
+   "referenced_type" : "type-105",
    "self_type" : "type-1145",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
@@ -13102,7 +13150,7 @@
    "alignment" : 4,
    "linker_set_key" : "int *&",
    "name" : "int *&",
-   "referenced_type" : "type-593",
+   "referenced_type" : "type-591",
    "self_type" : "type-1347",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
@@ -13111,8 +13159,8 @@
    "alignment" : 4,
    "linker_set_key" : "long long &",
    "name" : "long long &",
-   "referenced_type" : "type-284",
-   "self_type" : "type-1409",
+   "referenced_type" : "type-12",
+   "self_type" : "type-1413",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -13120,8 +13168,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-1753",
-   "self_type" : "type-1752",
+   "referenced_type" : "type-1754",
+   "self_type" : "type-1753",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13129,8 +13177,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-1854",
-   "self_type" : "type-1853",
+   "referenced_type" : "type-1855",
+   "self_type" : "type-1854",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13138,8 +13186,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-2416",
-   "self_type" : "type-2415",
+   "referenced_type" : "type-2418",
+   "self_type" : "type-2417",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13147,8 +13195,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-703",
-   "self_type" : "type-702",
+   "referenced_type" : "type-696",
+   "self_type" : "type-695",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13156,8 +13204,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2147",
-   "self_type" : "type-2146",
+   "referenced_type" : "type-2150",
+   "self_type" : "type-2149",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -13165,8 +13213,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2396",
-   "self_type" : "type-2395",
+   "referenced_type" : "type-2398",
+   "self_type" : "type-2397",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -13174,8 +13222,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2444",
-   "self_type" : "type-2443",
+   "referenced_type" : "type-2446",
+   "self_type" : "type-2445",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -13183,8 +13231,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2449",
-   "self_type" : "type-2448",
+   "referenced_type" : "type-2451",
+   "self_type" : "type-2450",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/UiConfig.h"
   },
@@ -13201,7 +13249,7 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int &",
    "name" : "unsigned int &",
-   "referenced_type" : "type-123",
+   "referenced_type" : "type-125",
    "self_type" : "type-1250",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
@@ -13210,7 +13258,7 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned long long &",
    "name" : "unsigned long long &",
-   "referenced_type" : "type-124",
+   "referenced_type" : "type-126",
    "self_type" : "type-1146",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
@@ -13219,7 +13267,7 @@
    "alignment" : 4,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-227",
+   "referenced_type" : "type-229",
    "self_type" : "type-1249",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
@@ -13231,8 +13279,8 @@
    "alignment" : 4,
    "linker_set_key" : "AHardwareBuffer *",
    "name" : "AHardwareBuffer *",
-   "referenced_type" : "type-2066",
-   "self_type" : "type-2065",
+   "referenced_type" : "type-2069",
+   "self_type" : "type-2068",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -13240,8 +13288,8 @@
    "alignment" : 4,
    "linker_set_key" : "AHardwareBuffer *",
    "name" : "AHardwareBuffer *",
-   "referenced_type" : "type-622",
-   "self_type" : "type-621",
+   "referenced_type" : "type-623",
+   "self_type" : "type-622",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -13249,7 +13297,7 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-517",
+   "referenced_type" : "type-515",
    "self_type" : "type-636",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
@@ -13276,8 +13324,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1833",
-   "self_type" : "type-1832",
+   "referenced_type" : "type-1834",
+   "self_type" : "type-1833",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13285,8 +13333,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1838",
-   "self_type" : "type-1837",
+   "referenced_type" : "type-1839",
+   "self_type" : "type-1838",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13294,8 +13342,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2631",
-   "self_type" : "type-2630",
+   "referenced_type" : "type-2633",
+   "self_type" : "type-2632",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13303,8 +13351,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2653",
-   "self_type" : "type-2652",
+   "referenced_type" : "type-2655",
+   "self_type" : "type-2654",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13321,8 +13369,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1414",
-   "self_type" : "type-1413",
+   "referenced_type" : "type-1418",
+   "self_type" : "type-1417",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13330,8 +13378,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1828",
-   "self_type" : "type-1827",
+   "referenced_type" : "type-1829",
+   "self_type" : "type-1828",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13339,8 +13387,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1843",
-   "self_type" : "type-1842",
+   "referenced_type" : "type-1844",
+   "self_type" : "type-1843",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13348,8 +13396,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2621",
-   "self_type" : "type-2620",
+   "referenced_type" : "type-2623",
+   "self_type" : "type-2622",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13357,8 +13405,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2678",
-   "self_type" : "type-2677",
+   "referenced_type" : "type-2683",
+   "self_type" : "type-2682",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13375,8 +13423,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
    "name" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
-   "referenced_type" : "type-516",
-   "self_type" : "type-537",
+   "referenced_type" : "type-514",
+   "self_type" : "type-534",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
   },
@@ -13385,7 +13433,7 @@
    "linker_set_key" : "android::ColorSpace *",
    "name" : "android::ColorSpace *",
    "referenced_type" : "type-979",
-   "self_type" : "type-1006",
+   "self_type" : "type-1000",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -13402,8 +13450,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Condition *",
    "name" : "android::Condition *",
-   "referenced_type" : "type-258",
-   "self_type" : "type-261",
+   "referenced_type" : "type-254",
+   "self_type" : "type-257",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h"
   },
@@ -13420,8 +13468,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime *",
    "name" : "android::FenceTime *",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1393",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1397",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13429,8 +13477,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot *",
    "name" : "android::FenceTime::Snapshot *",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1382",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1386",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13438,8 +13486,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTimeline *",
    "name" : "android::FenceTimeline *",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1400",
+   "referenced_type" : "type-1401",
+   "self_type" : "type-1404",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13447,8 +13495,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceToFenceTimeMap *",
    "name" : "android::FenceToFenceTimeMap *",
-   "referenced_type" : "type-1402",
-   "self_type" : "type-1405",
+   "referenced_type" : "type-1406",
+   "self_type" : "type-1409",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13465,8 +13513,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FrameStats *",
    "name" : "android::FrameStats *",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1427",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1431",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
@@ -13474,8 +13522,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Gralloc2Allocator *",
    "name" : "android::Gralloc2Allocator *",
-   "referenced_type" : "type-353",
-   "self_type" : "type-360",
+   "referenced_type" : "type-350",
+   "self_type" : "type-357",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -13483,8 +13531,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Gralloc2Mapper *",
    "name" : "android::Gralloc2Mapper *",
-   "referenced_type" : "type-337",
-   "self_type" : "type-343",
+   "referenced_type" : "type-334",
+   "self_type" : "type-340",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -13492,8 +13540,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-525",
-   "self_type" : "type-680",
+   "referenced_type" : "type-523",
+   "self_type" : "type-679",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13501,8 +13549,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferAllocator *",
    "name" : "android::GraphicBufferAllocator *",
-   "referenced_type" : "type-542",
-   "self_type" : "type-545",
+   "referenced_type" : "type-539",
+   "self_type" : "type-542",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -13510,8 +13558,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-527",
-   "self_type" : "type-539",
+   "referenced_type" : "type-525",
+   "self_type" : "type-537",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -13528,8 +13576,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1679",
-   "self_type" : "type-1678",
+   "referenced_type" : "type-1680",
+   "self_type" : "type-1679",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13537,8 +13585,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1874",
-   "self_type" : "type-1873",
+   "referenced_type" : "type-1875",
+   "self_type" : "type-1874",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13546,8 +13594,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1952",
-   "self_type" : "type-1951",
+   "referenced_type" : "type-1953",
+   "self_type" : "type-1952",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13555,8 +13603,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-292",
-   "self_type" : "type-291",
+   "referenced_type" : "type-289",
+   "self_type" : "type-288",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13564,8 +13612,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-437",
-   "self_type" : "type-436",
+   "referenced_type" : "type-434",
+   "self_type" : "type-433",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13573,8 +13621,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
-   "referenced_type" : "type-715",
-   "self_type" : "type-716",
+   "referenced_type" : "type-716",
+   "self_type" : "type-717",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -13583,7 +13631,7 @@
    "linker_set_key" : "android::LightFlattenablePod<android::Rect> *",
    "name" : "android::LightFlattenablePod<android::Rect> *",
    "referenced_type" : "type-1243",
-   "self_type" : "type-2399",
+   "self_type" : "type-2401",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -13600,8 +13648,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex *",
    "name" : "android::Mutex *",
-   "referenced_type" : "type-252",
-   "self_type" : "type-254",
+   "referenced_type" : "type-280",
+   "self_type" : "type-1376",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -13609,8 +13657,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex::Autolock *",
    "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-255",
-   "self_type" : "type-257",
+   "referenced_type" : "type-1378",
+   "self_type" : "type-1380",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -13627,8 +13675,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock *",
    "name" : "android::RWLock *",
-   "referenced_type" : "type-262",
-   "self_type" : "type-264",
+   "referenced_type" : "type-258",
+   "self_type" : "type-260",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -13636,8 +13684,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock::AutoRLock *",
    "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-265",
-   "self_type" : "type-267",
+   "referenced_type" : "type-261",
+   "self_type" : "type-263",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -13645,8 +13693,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock::AutoWLock *",
    "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-268",
-   "self_type" : "type-269",
+   "referenced_type" : "type-264",
+   "self_type" : "type-265",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -13663,8 +13711,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase *",
    "name" : "android::RefBase *",
-   "referenced_type" : "type-172",
-   "self_type" : "type-246",
+   "referenced_type" : "type-175",
+   "self_type" : "type-248",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13672,8 +13720,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-118",
-   "self_type" : "type-117",
+   "referenced_type" : "type-120",
+   "self_type" : "type-119",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13699,8 +13747,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-14",
-   "self_type" : "type-13",
+   "referenced_type" : "type-1577",
+   "self_type" : "type-1576",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13708,8 +13756,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1573",
-   "self_type" : "type-1572",
+   "referenced_type" : "type-16",
+   "self_type" : "type-15",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13717,8 +13765,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1608",
-   "self_type" : "type-1607",
+   "referenced_type" : "type-1612",
+   "self_type" : "type-1611",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13726,8 +13774,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-175",
-   "self_type" : "type-174",
+   "referenced_type" : "type-178",
+   "self_type" : "type-177",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13735,8 +13783,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1783",
-   "self_type" : "type-1782",
+   "referenced_type" : "type-1784",
+   "self_type" : "type-1783",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13744,8 +13792,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1830",
-   "self_type" : "type-1829",
+   "referenced_type" : "type-1831",
+   "self_type" : "type-1830",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13753,8 +13801,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1835",
-   "self_type" : "type-1834",
+   "referenced_type" : "type-1836",
+   "self_type" : "type-1835",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13762,8 +13810,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1845",
-   "self_type" : "type-1844",
+   "referenced_type" : "type-1846",
+   "self_type" : "type-1845",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13771,8 +13819,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1864",
-   "self_type" : "type-1863",
+   "referenced_type" : "type-1865",
+   "self_type" : "type-1864",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13780,8 +13828,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1930",
-   "self_type" : "type-1929",
+   "referenced_type" : "type-1931",
+   "self_type" : "type-1930",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13789,8 +13837,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2015",
-   "self_type" : "type-2014",
+   "referenced_type" : "type-2016",
+   "self_type" : "type-2015",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13798,8 +13846,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2167",
-   "self_type" : "type-2166",
+   "referenced_type" : "type-2170",
+   "self_type" : "type-2169",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13807,8 +13855,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2245",
-   "self_type" : "type-2244",
+   "referenced_type" : "type-2247",
+   "self_type" : "type-2246",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13816,8 +13864,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2287",
-   "self_type" : "type-2286",
+   "referenced_type" : "type-2289",
+   "self_type" : "type-2288",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13825,8 +13873,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2338",
-   "self_type" : "type-2337",
+   "referenced_type" : "type-2340",
+   "self_type" : "type-2339",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13834,8 +13882,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2457",
-   "self_type" : "type-2456",
+   "referenced_type" : "type-2459",
+   "self_type" : "type-2458",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13843,8 +13891,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2623",
-   "self_type" : "type-2622",
+   "referenced_type" : "type-2625",
+   "self_type" : "type-2624",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13852,8 +13900,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2649",
-   "self_type" : "type-2648",
+   "referenced_type" : "type-2651",
+   "self_type" : "type-2650",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13861,8 +13909,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-408",
-   "self_type" : "type-407",
+   "referenced_type" : "type-405",
+   "self_type" : "type-404",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13870,8 +13918,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-514",
-   "self_type" : "type-513",
+   "referenced_type" : "type-511",
+   "self_type" : "type-510",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13879,8 +13927,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-744",
-   "self_type" : "type-743",
+   "referenced_type" : "type-745",
+   "self_type" : "type-744",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13888,8 +13936,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-851",
-   "self_type" : "type-850",
+   "referenced_type" : "type-852",
+   "self_type" : "type-851",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13915,8 +13963,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_type *",
    "name" : "android::RefBase::weakref_type *",
-   "referenced_type" : "type-198",
-   "self_type" : "type-197",
+   "referenced_type" : "type-211",
+   "self_type" : "type-210",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -13933,8 +13981,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Region *",
    "name" : "android::Region *",
-   "referenced_type" : "type-2389",
-   "self_type" : "type-2391",
+   "referenced_type" : "type-2391",
+   "self_type" : "type-2393",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -13960,8 +14008,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 *",
    "name" : "android::String16 *",
-   "referenced_type" : "type-179",
-   "self_type" : "type-189",
+   "referenced_type" : "type-182",
+   "self_type" : "type-191",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -13969,8 +14017,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 *",
    "name" : "android::String8 *",
-   "referenced_type" : "type-285",
-   "self_type" : "type-901",
+   "referenced_type" : "type-282",
+   "self_type" : "type-891",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -13978,8 +14026,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Thread *",
    "name" : "android::Thread *",
-   "referenced_type" : "type-369",
-   "self_type" : "type-368",
+   "referenced_type" : "type-366",
+   "self_type" : "type-365",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13987,8 +14035,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<android::Rect> *",
    "name" : "android::Vector<android::Rect> *",
-   "referenced_type" : "type-2382",
-   "self_type" : "type-2383",
+   "referenced_type" : "type-2384",
+   "self_type" : "type-2385",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -13996,8 +14044,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<long long> *",
    "name" : "android::Vector<long long> *",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1424",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1428",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14032,8 +14080,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TMat44<float> *",
    "name" : "android::details::TMat44<float> *",
-   "referenced_type" : "type-2427",
-   "self_type" : "type-2430",
+   "referenced_type" : "type-2429",
+   "self_type" : "type-2432",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -14042,7 +14090,7 @@
    "linker_set_key" : "android::details::TMatTransform<android::details::TMat33, float> *",
    "name" : "android::details::TMatTransform<android::details::TMat33, float> *",
    "referenced_type" : "type-910",
-   "self_type" : "type-957",
+   "self_type" : "type-949",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -14050,8 +14098,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TMatTransform<android::details::TMat44, float> *",
    "name" : "android::details::TMatTransform<android::details::TMat44, float> *",
-   "referenced_type" : "type-2421",
-   "self_type" : "type-2422",
+   "referenced_type" : "type-2423",
+   "self_type" : "type-2424",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -14059,8 +14107,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TQuaternion<double> *",
    "name" : "android::details::TQuaternion<double> *",
-   "referenced_type" : "type-331",
-   "self_type" : "type-397",
+   "referenced_type" : "type-328",
+   "self_type" : "type-391",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -14068,8 +14116,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TQuaternion<float> *",
    "name" : "android::details::TQuaternion<float> *",
-   "referenced_type" : "type-410",
-   "self_type" : "type-429",
+   "referenced_type" : "type-407",
+   "self_type" : "type-426",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -14086,7 +14134,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec2<double> *",
    "name" : "android::details::TVec2<double> *",
-   "referenced_type" : "type-55",
+   "referenced_type" : "type-57",
    "self_type" : "type-1069",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -14095,7 +14143,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec2<float> *",
    "name" : "android::details::TVec2<float> *",
-   "referenced_type" : "type-22",
+   "referenced_type" : "type-23",
    "self_type" : "type-1245",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -14104,7 +14152,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<double> *",
    "name" : "android::details::TVec3<double> *",
-   "referenced_type" : "type-66",
+   "referenced_type" : "type-68",
    "self_type" : "type-1368",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
@@ -14113,8 +14161,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<float> *",
    "name" : "android::details::TVec3<float> *",
-   "referenced_type" : "type-17",
-   "self_type" : "type-16",
+   "referenced_type" : "type-18",
+   "self_type" : "type-17",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
   },
@@ -14122,8 +14170,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<double> *",
    "name" : "android::details::TVec4<double> *",
-   "referenced_type" : "type-50",
-   "self_type" : "type-155",
+   "referenced_type" : "type-52",
+   "self_type" : "type-151",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -14131,8 +14179,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<float> *",
    "name" : "android::details::TVec4<float> *",
-   "referenced_type" : "type-200",
-   "self_type" : "type-316",
+   "referenced_type" : "type-192",
+   "self_type" : "type-311",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -14140,7 +14188,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec2, float> *",
    "name" : "android::details::TVecAddOperators<android::details::TVec2, float> *",
-   "referenced_type" : "type-28",
+   "referenced_type" : "type-29",
    "self_type" : "type-1049",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -14149,7 +14197,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec3, float> *",
    "name" : "android::details::TVecAddOperators<android::details::TVec3, float> *",
-   "referenced_type" : "type-34",
+   "referenced_type" : "type-35",
    "self_type" : "type-1053",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -14158,7 +14206,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec2, float> *",
    "name" : "android::details::TVecProductOperators<android::details::TVec2, float> *",
-   "referenced_type" : "type-27",
+   "referenced_type" : "type-28",
    "self_type" : "type-1057",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -14167,7 +14215,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec3, float> *",
    "name" : "android::details::TVecProductOperators<android::details::TVec3, float> *",
-   "referenced_type" : "type-33",
+   "referenced_type" : "type-34",
    "self_type" : "type-1058",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -14177,7 +14225,7 @@
    "linker_set_key" : "android::half *",
    "name" : "android::half *",
    "referenced_type" : "type-1",
-   "self_type" : "type-1381",
+   "self_type" : "type-1377",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -14203,8 +14251,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-242",
-   "self_type" : "type-241",
+   "referenced_type" : "type-244",
+   "self_type" : "type-243",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14221,8 +14269,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-196",
-   "self_type" : "type-195",
+   "referenced_type" : "type-209",
+   "self_type" : "type-208",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14230,8 +14278,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-215",
-   "self_type" : "type-222",
+   "referenced_type" : "type-217",
+   "self_type" : "type-224",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -14239,8 +14287,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-281",
-   "self_type" : "type-280",
+   "referenced_type" : "type-277",
+   "self_type" : "type-276",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14248,8 +14296,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
-   "referenced_type" : "type-99",
-   "self_type" : "type-106",
+   "referenced_type" : "type-101",
+   "self_type" : "type-108",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14257,8 +14305,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
-   "referenced_type" : "type-393",
-   "self_type" : "type-398",
+   "referenced_type" : "type-392",
+   "self_type" : "type-395",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14266,8 +14314,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
-   "referenced_type" : "type-111",
-   "self_type" : "type-112",
+   "referenced_type" : "type-113",
+   "self_type" : "type-114",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14284,7 +14332,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status *",
    "name" : "android::hardware::Status *",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1309",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -14311,8 +14359,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int> *",
    "name" : "android::hardware::details::hidl_pointer<unsigned int> *",
-   "referenced_type" : "type-120",
-   "self_type" : "type-169",
+   "referenced_type" : "type-122",
+   "self_type" : "type-172",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14320,7 +14368,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status *",
    "name" : "android::hardware::details::return_status *",
-   "referenced_type" : "type-101",
+   "referenced_type" : "type-103",
    "self_type" : "type-1315",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -14329,8 +14377,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1727",
-   "self_type" : "type-1726",
+   "referenced_type" : "type-1728",
+   "self_type" : "type-1727",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14338,8 +14386,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1909",
-   "self_type" : "type-1908",
+   "referenced_type" : "type-1910",
+   "self_type" : "type-1909",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14347,8 +14395,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2115",
-   "self_type" : "type-2114",
+   "referenced_type" : "type-2118",
+   "self_type" : "type-2117",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14356,8 +14404,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2153",
-   "self_type" : "type-2152",
+   "referenced_type" : "type-2156",
+   "self_type" : "type-2155",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14365,8 +14413,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2235",
-   "self_type" : "type-2234",
+   "referenced_type" : "type-2237",
+   "self_type" : "type-2236",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14374,8 +14422,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-357",
-   "self_type" : "type-356",
+   "referenced_type" : "type-354",
+   "self_type" : "type-353",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14383,8 +14431,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-685",
-   "self_type" : "type-684",
+   "referenced_type" : "type-687",
+   "self_type" : "type-686",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14401,8 +14449,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-836",
-   "self_type" : "type-835",
+   "referenced_type" : "type-837",
+   "self_type" : "type-836",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14410,8 +14458,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-1997",
-   "self_type" : "type-1996",
+   "referenced_type" : "type-1998",
+   "self_type" : "type-1997",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14419,8 +14467,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-2160",
-   "self_type" : "type-2159",
+   "referenced_type" : "type-2163",
+   "self_type" : "type-2162",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14428,8 +14476,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-2241",
-   "self_type" : "type-2240",
+   "referenced_type" : "type-2243",
+   "self_type" : "type-2242",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14437,8 +14485,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-486",
-   "self_type" : "type-485",
+   "referenced_type" : "type-483",
+   "self_type" : "type-482",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14446,8 +14494,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-737",
-   "self_type" : "type-736",
+   "referenced_type" : "type-738",
+   "self_type" : "type-737",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14455,8 +14503,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-843",
-   "self_type" : "type-842",
+   "referenced_type" : "type-844",
+   "self_type" : "type-843",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14464,8 +14512,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1716",
-   "self_type" : "type-1715",
+   "referenced_type" : "type-1717",
+   "self_type" : "type-1716",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14473,8 +14521,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1915",
-   "self_type" : "type-1914",
+   "referenced_type" : "type-1916",
+   "self_type" : "type-1915",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14482,8 +14530,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2118",
-   "self_type" : "type-2117",
+   "referenced_type" : "type-2122",
+   "self_type" : "type-2121",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14491,8 +14539,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2155",
-   "self_type" : "type-2154",
+   "referenced_type" : "type-2158",
+   "self_type" : "type-2157",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14500,8 +14548,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2237",
-   "self_type" : "type-2236",
+   "referenced_type" : "type-2239",
+   "self_type" : "type-2238",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14509,8 +14557,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-340",
-   "self_type" : "type-339",
+   "referenced_type" : "type-337",
+   "self_type" : "type-336",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14545,8 +14593,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1587",
-   "self_type" : "type-1586",
+   "referenced_type" : "type-1591",
+   "self_type" : "type-1590",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14554,8 +14602,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1859",
-   "self_type" : "type-1858",
+   "referenced_type" : "type-1860",
+   "self_type" : "type-1859",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14563,8 +14611,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2120",
-   "self_type" : "type-2119",
+   "referenced_type" : "type-2124",
+   "self_type" : "type-2123",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14572,8 +14620,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2158",
-   "self_type" : "type-2157",
+   "referenced_type" : "type-2161",
+   "self_type" : "type-2160",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14581,8 +14629,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2239",
-   "self_type" : "type-2238",
+   "referenced_type" : "type-2241",
+   "self_type" : "type-2240",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14617,8 +14665,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-88",
-   "self_type" : "type-87",
+   "referenced_type" : "type-90",
+   "self_type" : "type-89",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14626,8 +14674,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
-   "referenced_type" : "type-1724",
-   "self_type" : "type-1723",
+   "referenced_type" : "type-1725",
+   "self_type" : "type-1724",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -14635,8 +14683,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
-   "referenced_type" : "type-1906",
-   "self_type" : "type-1905",
+   "referenced_type" : "type-1908",
+   "self_type" : "type-1907",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -14644,8 +14692,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
-   "referenced_type" : "type-352",
-   "self_type" : "type-351",
+   "referenced_type" : "type-349",
+   "self_type" : "type-348",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -14653,8 +14701,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-2007",
-   "self_type" : "type-2006",
+   "referenced_type" : "type-2008",
+   "self_type" : "type-2007",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14662,8 +14710,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-2163",
-   "self_type" : "type-2162",
+   "referenced_type" : "type-2166",
+   "self_type" : "type-2165",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14671,8 +14719,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-2243",
-   "self_type" : "type-2242",
+   "referenced_type" : "type-2245",
+   "self_type" : "type-2244",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14680,8 +14728,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-499",
-   "self_type" : "type-498",
+   "referenced_type" : "type-496",
+   "self_type" : "type-495",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14698,8 +14746,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-845",
-   "self_type" : "type-844",
+   "referenced_type" : "type-846",
+   "self_type" : "type-845",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14725,8 +14773,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_handle *",
    "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-139",
-   "self_type" : "type-138",
+   "referenced_type" : "type-142",
+   "self_type" : "type-141",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14743,8 +14791,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned int> *",
    "name" : "android::hardware::hidl_vec<unsigned int> *",
-   "referenced_type" : "type-128",
-   "self_type" : "type-129",
+   "referenced_type" : "type-131",
+   "self_type" : "type-132",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14761,8 +14809,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::base::V1_0::IBase *",
    "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-171",
-   "self_type" : "type-364",
+   "referenced_type" : "type-174",
+   "self_type" : "type-361",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14770,8 +14818,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-295",
-   "self_type" : "type-372",
+   "referenced_type" : "type-292",
+   "self_type" : "type-369",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14780,7 +14828,7 @@
    "linker_set_key" : "android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "referenced_type" : "type-694",
-   "self_type" : "type-698",
+   "self_type" : "type-701",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14797,8 +14845,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::GraphicBuffer> *",
    "name" : "android::sp<android::GraphicBuffer> *",
-   "referenced_type" : "type-679",
-   "self_type" : "type-681",
+   "referenced_type" : "type-678",
+   "self_type" : "type-682",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14806,8 +14854,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
-   "referenced_type" : "type-355",
-   "self_type" : "type-376",
+   "referenced_type" : "type-352",
+   "self_type" : "type-373",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14815,8 +14863,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
-   "referenced_type" : "type-484",
-   "self_type" : "type-488",
+   "referenced_type" : "type-481",
+   "self_type" : "type-486",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14824,8 +14872,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
-   "referenced_type" : "type-338",
-   "self_type" : "type-384",
+   "referenced_type" : "type-335",
+   "self_type" : "type-381",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14833,8 +14881,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
-   "referenced_type" : "type-86",
-   "self_type" : "type-90",
+   "referenced_type" : "type-88",
+   "self_type" : "type-92",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14842,8 +14890,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
-   "referenced_type" : "type-497",
-   "self_type" : "type-502",
+   "referenced_type" : "type-494",
+   "self_type" : "type-499",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14851,8 +14899,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "referenced_type" : "type-371",
-   "self_type" : "type-373",
+   "referenced_type" : "type-368",
+   "self_type" : "type-370",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14869,8 +14917,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ui::Transform *",
    "name" : "android::ui::Transform *",
-   "referenced_type" : "type-2434",
-   "self_type" : "type-2436",
+   "referenced_type" : "type-2436",
+   "self_type" : "type-2438",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -14878,8 +14926,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ui::Transform::mat33 *",
    "name" : "android::ui::Transform::mat33 *",
-   "referenced_type" : "type-2435",
-   "self_type" : "type-2447",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2449",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -14896,8 +14944,8 @@
    "alignment" : 4,
    "linker_set_key" : "android_native_base_t *",
    "name" : "android_native_base_t *",
-   "referenced_type" : "type-518",
-   "self_type" : "type-522",
+   "referenced_type" : "type-516",
+   "self_type" : "type-520",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -14905,8 +14953,8 @@
    "alignment" : 4,
    "linker_set_key" : "android_ycbcr *",
    "name" : "android_ycbcr *",
-   "referenced_type" : "type-348",
-   "self_type" : "type-347",
+   "referenced_type" : "type-345",
+   "self_type" : "type-344",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -14914,8 +14962,8 @@
    "alignment" : 4,
    "linker_set_key" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
    "name" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
-   "referenced_type" : "type-271",
-   "self_type" : "type-274",
+   "referenced_type" : "type-267",
+   "self_type" : "type-270",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -14924,7 +14972,7 @@
    "linker_set_key" : "bool *",
    "name" : "bool *",
    "referenced_type" : "type-6",
-   "self_type" : "type-350",
+   "self_type" : "type-347",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -14932,8 +14980,8 @@
    "alignment" : 4,
    "linker_set_key" : "char *",
    "name" : "char *",
-   "referenced_type" : "type-288",
-   "self_type" : "type-576",
+   "referenced_type" : "type-285",
+   "self_type" : "type-573",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -14941,8 +14989,8 @@
    "alignment" : 4,
    "linker_set_key" : "const AHardwareBuffer *",
    "name" : "const AHardwareBuffer *",
-   "referenced_type" : "type-2069",
-   "self_type" : "type-2071",
+   "referenced_type" : "type-2071",
+   "self_type" : "type-2073",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -14959,7 +15007,7 @@
    "alignment" : 4,
    "linker_set_key" : "const ANativeWindowBuffer *",
    "name" : "const ANativeWindowBuffer *",
-   "referenced_type" : "type-637",
+   "referenced_type" : "type-638",
    "self_type" : "type-639",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
@@ -14968,8 +15016,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
    "name" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
-   "referenced_type" : "type-535",
-   "self_type" : "type-536",
+   "referenced_type" : "type-532",
+   "self_type" : "type-533",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
   },
@@ -15004,8 +15052,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime *",
    "name" : "const android::FenceTime *",
-   "referenced_type" : "type-1395",
-   "self_type" : "type-1396",
+   "referenced_type" : "type-1399",
+   "self_type" : "type-1400",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -15013,8 +15061,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot *",
    "name" : "const android::FenceTime::Snapshot *",
-   "referenced_type" : "type-1388",
-   "self_type" : "type-1389",
+   "referenced_type" : "type-1393",
+   "self_type" : "type-1394",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -15031,8 +15079,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FrameStats *",
    "name" : "const android::FrameStats *",
-   "referenced_type" : "type-1428",
-   "self_type" : "type-1429",
+   "referenced_type" : "type-1432",
+   "self_type" : "type-1433",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
@@ -15040,8 +15088,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Gralloc2Allocator *",
    "name" : "const android::Gralloc2Allocator *",
-   "referenced_type" : "type-361",
-   "self_type" : "type-362",
+   "referenced_type" : "type-358",
+   "self_type" : "type-359",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15049,8 +15097,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Gralloc2Mapper *",
    "name" : "const android::Gralloc2Mapper *",
-   "referenced_type" : "type-344",
-   "self_type" : "type-345",
+   "referenced_type" : "type-341",
+   "self_type" : "type-342",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15058,8 +15106,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-624",
-   "self_type" : "type-623",
+   "referenced_type" : "type-625",
+   "self_type" : "type-624",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -15067,8 +15115,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBufferAllocator *",
    "name" : "const android::GraphicBufferAllocator *",
-   "referenced_type" : "type-720",
-   "self_type" : "type-721",
+   "referenced_type" : "type-721",
+   "self_type" : "type-722",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -15076,8 +15124,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBufferMapper *",
    "name" : "const android::GraphicBufferMapper *",
-   "referenced_type" : "type-614",
-   "self_type" : "type-615",
+   "referenced_type" : "type-615",
+   "self_type" : "type-616",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -15085,8 +15133,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::HdrCapabilities *",
    "name" : "const android::HdrCapabilities *",
-   "referenced_type" : "type-972",
-   "self_type" : "type-973",
+   "referenced_type" : "type-973",
+   "self_type" : "type-974",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -15094,8 +15142,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
-   "referenced_type" : "type-717",
-   "self_type" : "type-718",
+   "referenced_type" : "type-718",
+   "self_type" : "type-719",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -15103,8 +15151,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect> *",
    "name" : "const android::LightFlattenablePod<android::Rect> *",
-   "referenced_type" : "type-2397",
-   "self_type" : "type-2398",
+   "referenced_type" : "type-2399",
+   "self_type" : "type-2400",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15157,8 +15205,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Region *",
    "name" : "const android::Region *",
-   "referenced_type" : "type-2388",
-   "self_type" : "type-2394",
+   "referenced_type" : "type-2390",
+   "self_type" : "type-2396",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -15175,8 +15223,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 *",
    "name" : "const android::String16 *",
-   "referenced_type" : "type-184",
-   "self_type" : "type-186",
+   "referenced_type" : "type-187",
+   "self_type" : "type-188",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -15184,8 +15232,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 *",
    "name" : "const android::String8 *",
-   "referenced_type" : "type-873",
-   "self_type" : "type-878",
+   "referenced_type" : "type-863",
+   "self_type" : "type-874",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -15193,8 +15241,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::Rect> *",
    "name" : "const android::Vector<android::Rect> *",
-   "referenced_type" : "type-2384",
-   "self_type" : "type-2387",
+   "referenced_type" : "type-2386",
+   "self_type" : "type-2389",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -15202,8 +15250,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<long long> *",
    "name" : "const android::Vector<long long> *",
-   "referenced_type" : "type-1425",
-   "self_type" : "type-1426",
+   "referenced_type" : "type-1429",
+   "self_type" : "type-1430",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -15211,8 +15259,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::VectorImpl *",
    "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-1422",
-   "self_type" : "type-1423",
+   "referenced_type" : "type-1426",
+   "self_type" : "type-1427",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -15229,7 +15277,7 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TMat33<float> *",
    "name" : "const android::details::TMat33<float> *",
-   "referenced_type" : "type-925",
+   "referenced_type" : "type-919",
    "self_type" : "type-976",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
@@ -15257,7 +15305,7 @@
    "linker_set_key" : "const android::details::TVec3<float> *",
    "name" : "const android::details::TVec3<float> *",
    "referenced_type" : "type-1055",
-   "self_type" : "type-1418",
+   "self_type" : "type-1419",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
   },
@@ -15265,8 +15313,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::half *",
    "name" : "const android::half *",
-   "referenced_type" : "type-42",
-   "self_type" : "type-130",
+   "referenced_type" : "type-44",
+   "self_type" : "type-127",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -15292,8 +15340,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::BpHwRefBase *",
    "name" : "const android::hardware::BpHwRefBase *",
-   "referenced_type" : "type-211",
-   "self_type" : "type-212",
+   "referenced_type" : "type-213",
+   "self_type" : "type-214",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -15301,8 +15349,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
-   "referenced_type" : "type-109",
-   "self_type" : "type-110",
+   "referenced_type" : "type-111",
+   "self_type" : "type-112",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15310,8 +15358,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
-   "referenced_type" : "type-401",
-   "self_type" : "type-402",
+   "referenced_type" : "type-398",
+   "self_type" : "type-400",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15319,8 +15367,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
-   "referenced_type" : "type-115",
-   "self_type" : "type-116",
+   "referenced_type" : "type-117",
+   "self_type" : "type-118",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15346,8 +15394,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle> *",
-   "referenced_type" : "type-293",
-   "self_type" : "type-297",
+   "referenced_type" : "type-290",
+   "self_type" : "type-294",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15355,8 +15403,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned int> *",
    "name" : "const android::hardware::details::hidl_pointer<unsigned int> *",
-   "referenced_type" : "type-190",
-   "self_type" : "type-214",
+   "referenced_type" : "type-203",
+   "self_type" : "type-216",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15373,8 +15421,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1744",
-   "self_type" : "type-1746",
+   "referenced_type" : "type-1745",
+   "self_type" : "type-1747",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15382,8 +15430,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1910",
-   "self_type" : "type-1913",
+   "referenced_type" : "type-1912",
+   "self_type" : "type-1914",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15391,8 +15439,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-381",
-   "self_type" : "type-383",
+   "referenced_type" : "type-378",
+   "self_type" : "type-380",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15400,8 +15448,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-2003",
-   "self_type" : "type-2005",
+   "referenced_type" : "type-2004",
+   "self_type" : "type-2006",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15409,8 +15457,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-494",
-   "self_type" : "type-496",
+   "referenced_type" : "type-491",
+   "self_type" : "type-493",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15418,8 +15466,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::BufferUsage *",
    "name" : "const android::hardware::graphics::common::V1_0::BufferUsage *",
-   "referenced_type" : "type-153",
-   "self_type" : "type-152",
+   "referenced_type" : "type-156",
+   "self_type" : "type-155",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15427,8 +15475,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::BufferUsage *",
    "name" : "const android::hardware::graphics::common::V1_1::BufferUsage *",
-   "referenced_type" : "type-160",
-   "self_type" : "type-159",
+   "referenced_type" : "type-162",
+   "self_type" : "type-161",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15436,8 +15484,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::BufferUsage *",
    "name" : "const android::hardware::graphics::common::V1_2::BufferUsage *",
-   "referenced_type" : "type-422",
-   "self_type" : "type-421",
+   "referenced_type" : "type-419",
+   "self_type" : "type-418",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15445,8 +15493,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1584",
-   "self_type" : "type-1583",
+   "referenced_type" : "type-1588",
+   "self_type" : "type-1587",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15454,8 +15502,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1856",
-   "self_type" : "type-1855",
+   "referenced_type" : "type-1857",
+   "self_type" : "type-1856",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15463,8 +15511,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-84",
-   "self_type" : "type-83",
+   "referenced_type" : "type-86",
+   "self_type" : "type-85",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15472,8 +15520,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1594",
-   "self_type" : "type-1596",
+   "referenced_type" : "type-1598",
+   "self_type" : "type-1600",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15481,8 +15529,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1860",
-   "self_type" : "type-1862",
+   "referenced_type" : "type-1861",
+   "self_type" : "type-1863",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15490,8 +15538,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-96",
-   "self_type" : "type-98",
+   "referenced_type" : "type-98",
+   "self_type" : "type-100",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15499,8 +15547,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-1918",
-   "self_type" : "type-1917",
+   "referenced_type" : "type-1919",
+   "self_type" : "type-1918",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15508,8 +15556,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-391",
-   "self_type" : "type-390",
+   "referenced_type" : "type-388",
+   "self_type" : "type-387",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15526,8 +15574,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void> *",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void> *",
-   "referenced_type" : "type-154",
-   "self_type" : "type-156",
+   "referenced_type" : "type-157",
+   "self_type" : "type-158",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15535,8 +15583,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void> *",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void> *",
-   "referenced_type" : "type-161",
-   "self_type" : "type-162",
+   "referenced_type" : "type-163",
+   "self_type" : "type-165",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15544,8 +15592,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void> *",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void> *",
-   "referenced_type" : "type-423",
-   "self_type" : "type-424",
+   "referenced_type" : "type-420",
+   "self_type" : "type-421",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15562,8 +15610,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_handle> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_handle> *",
-   "referenced_type" : "type-146",
-   "self_type" : "type-147",
+   "referenced_type" : "type-149",
+   "self_type" : "type-150",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15571,8 +15619,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned int> *",
    "name" : "const android::hardware::hidl_vec<unsigned int> *",
-   "referenced_type" : "type-132",
-   "self_type" : "type-134",
+   "referenced_type" : "type-134",
+   "self_type" : "type-136",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15589,8 +15637,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
    "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-170",
-   "self_type" : "type-176",
+   "referenced_type" : "type-173",
+   "self_type" : "type-179",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
@@ -15598,8 +15646,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-294",
-   "self_type" : "type-296",
+   "referenced_type" : "type-291",
+   "self_type" : "type-293",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
@@ -15608,7 +15656,7 @@
    "linker_set_key" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "referenced_type" : "type-693",
-   "self_type" : "type-699",
+   "self_type" : "type-702",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15625,8 +15673,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
    "name" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
-   "referenced_type" : "type-379",
-   "self_type" : "type-380",
+   "referenced_type" : "type-376",
+   "self_type" : "type-377",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15634,8 +15682,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
    "name" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
-   "referenced_type" : "type-492",
-   "self_type" : "type-493",
+   "referenced_type" : "type-489",
+   "self_type" : "type-490",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15643,8 +15691,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
-   "referenced_type" : "type-387",
-   "self_type" : "type-388",
+   "referenced_type" : "type-384",
+   "self_type" : "type-385",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15652,8 +15700,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
-   "referenced_type" : "type-91",
-   "self_type" : "type-95",
+   "referenced_type" : "type-93",
+   "self_type" : "type-97",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15661,8 +15709,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
    "name" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
-   "referenced_type" : "type-505",
-   "self_type" : "type-506",
+   "referenced_type" : "type-502",
+   "self_type" : "type-503",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15679,8 +15727,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::base::V1_0::IBase> *",
    "name" : "const android::sp<android::hidl::base::V1_0::IBase> *",
-   "referenced_type" : "type-365",
-   "self_type" : "type-366",
+   "referenced_type" : "type-362",
+   "self_type" : "type-363",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15688,8 +15736,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "referenced_type" : "type-374",
-   "self_type" : "type-375",
+   "referenced_type" : "type-371",
+   "self_type" : "type-372",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15706,8 +15754,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ui::Transform *",
    "name" : "const android::ui::Transform *",
-   "referenced_type" : "type-2437",
-   "self_type" : "type-2441",
+   "referenced_type" : "type-2439",
+   "self_type" : "type-2443",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -15715,8 +15763,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ui::Transform::mat33 *",
    "name" : "const android::ui::Transform::mat33 *",
-   "referenced_type" : "type-2445",
-   "self_type" : "type-2446",
+   "referenced_type" : "type-2447",
+   "self_type" : "type-2448",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -15724,8 +15772,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-287",
-   "self_type" : "type-286",
+   "referenced_type" : "type-284",
+   "self_type" : "type-283",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -15733,8 +15781,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-181",
-   "self_type" : "type-180",
+   "referenced_type" : "type-184",
+   "self_type" : "type-183",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -15742,8 +15790,8 @@
    "alignment" : 4,
    "linker_set_key" : "const gralloc_module_t *",
    "name" : "const gralloc_module_t *",
-   "referenced_type" : "type-582",
-   "self_type" : "type-581",
+   "referenced_type" : "type-580",
+   "self_type" : "type-579",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -15751,8 +15799,8 @@
    "alignment" : 4,
    "linker_set_key" : "const hw_module_t *",
    "name" : "const hw_module_t *",
-   "referenced_type" : "type-555",
-   "self_type" : "type-554",
+   "referenced_type" : "type-552",
+   "self_type" : "type-551",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15760,7 +15808,7 @@
    "alignment" : 4,
    "linker_set_key" : "const int *",
    "name" : "const int *",
-   "referenced_type" : "type-562",
+   "referenced_type" : "type-559",
    "self_type" : "type-1348",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
@@ -15779,7 +15827,7 @@
    "linker_set_key" : "const long long *",
    "name" : "const long long *",
    "referenced_type" : "type-847",
-   "self_type" : "type-1415",
+   "self_type" : "type-1420",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15787,8 +15835,8 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle *",
    "name" : "const native_handle *",
-   "referenced_type" : "type-143",
-   "self_type" : "type-142",
+   "referenced_type" : "type-146",
+   "self_type" : "type-145",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15796,8 +15844,8 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle **",
    "name" : "const native_handle **",
-   "referenced_type" : "type-142",
-   "self_type" : "type-346",
+   "referenced_type" : "type-145",
+   "self_type" : "type-343",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15805,8 +15853,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned char *",
    "name" : "const unsigned char *",
-   "referenced_type" : "type-224",
-   "self_type" : "type-223",
+   "referenced_type" : "type-226",
+   "self_type" : "type-225",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -15814,7 +15862,7 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned int *",
    "name" : "const unsigned int *",
-   "referenced_type" : "type-236",
+   "referenced_type" : "type-238",
    "self_type" : "type-1104",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -15823,8 +15871,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long *",
    "name" : "const unsigned long long *",
-   "referenced_type" : "type-226",
-   "self_type" : "type-225",
+   "referenced_type" : "type-228",
+   "self_type" : "type-227",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -15841,8 +15889,8 @@
    "alignment" : 4,
    "linker_set_key" : "framebuffer_device_t *",
    "name" : "framebuffer_device_t *",
-   "referenced_type" : "type-546",
-   "self_type" : "type-567",
+   "referenced_type" : "type-543",
+   "self_type" : "type-564",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -15850,8 +15898,8 @@
    "alignment" : 4,
    "linker_set_key" : "hw_device_t *",
    "name" : "hw_device_t *",
-   "referenced_type" : "type-547",
-   "self_type" : "type-557",
+   "referenced_type" : "type-544",
+   "self_type" : "type-554",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15859,8 +15907,8 @@
    "alignment" : 4,
    "linker_set_key" : "hw_device_t **",
    "name" : "hw_device_t **",
-   "referenced_type" : "type-557",
-   "self_type" : "type-556",
+   "referenced_type" : "type-554",
+   "self_type" : "type-553",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15868,8 +15916,8 @@
    "alignment" : 4,
    "linker_set_key" : "hw_module_methods_t *",
    "name" : "hw_module_methods_t *",
-   "referenced_type" : "type-551",
-   "self_type" : "type-550",
+   "referenced_type" : "type-548",
+   "self_type" : "type-547",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15877,8 +15925,8 @@
    "alignment" : 4,
    "linker_set_key" : "hw_module_t *",
    "name" : "hw_module_t *",
-   "referenced_type" : "type-549",
-   "self_type" : "type-548",
+   "referenced_type" : "type-546",
+   "self_type" : "type-545",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15904,8 +15952,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *)",
    "name" : "int (*)(const gralloc_module_t *, const native_handle *)",
-   "referenced_type" : "type-580",
-   "self_type" : "type-579",
+   "referenced_type" : "type-578",
+   "self_type" : "type-577",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -15913,42 +15961,6 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int *)",
    "name" : "int (*)(const gralloc_module_t *, const native_handle *, int *)",
-   "referenced_type" : "type-592",
-   "self_type" : "type-591",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "referenced_type" : "type-588",
-   "self_type" : "type-587",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "referenced_type" : "type-595",
-   "self_type" : "type-594",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "referenced_type" : "type-584",
-   "self_type" : "type-583",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
    "referenced_type" : "type-590",
    "self_type" : "type-589",
    "size" : 4,
@@ -15956,8 +15968,8 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, int, ...)",
-   "name" : "int (*)(const gralloc_module_t *, int, ...)",
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
    "referenced_type" : "type-586",
    "self_type" : "type-585",
    "size" : 4,
@@ -15965,10 +15977,64 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
+   "referenced_type" : "type-593",
+   "self_type" : "type-592",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
+   "referenced_type" : "type-582",
+   "self_type" : "type-581",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
+   "referenced_type" : "type-588",
+   "self_type" : "type-587",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "referenced_type" : "type-595",
+   "self_type" : "type-594",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "referenced_type" : "type-597",
+   "self_type" : "type-596",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, int, ...)",
+   "name" : "int (*)(const gralloc_module_t *, int, ...)",
+   "referenced_type" : "type-584",
+   "self_type" : "type-583",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "int (*)(const hw_module_t *, const char *, hw_device_t **)",
    "name" : "int (*)(const hw_module_t *, const char *, hw_device_t **)",
-   "referenced_type" : "type-553",
-   "self_type" : "type-552",
+   "referenced_type" : "type-550",
+   "self_type" : "type-549",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15976,8 +16042,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(framebuffer_device_t *)",
    "name" : "int (*)(framebuffer_device_t *)",
-   "referenced_type" : "type-573",
-   "self_type" : "type-572",
+   "referenced_type" : "type-570",
+   "self_type" : "type-569",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -15985,8 +16051,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(framebuffer_device_t *, const native_handle *)",
    "name" : "int (*)(framebuffer_device_t *, const native_handle *)",
-   "referenced_type" : "type-571",
-   "self_type" : "type-570",
+   "referenced_type" : "type-568",
+   "self_type" : "type-567",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -15994,8 +16060,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(framebuffer_device_t *, int)",
    "name" : "int (*)(framebuffer_device_t *, int)",
-   "referenced_type" : "type-566",
-   "self_type" : "type-565",
+   "referenced_type" : "type-563",
+   "self_type" : "type-562",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16003,8 +16069,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(framebuffer_device_t *, int, int, int, int)",
    "name" : "int (*)(framebuffer_device_t *, int, int, int, int)",
-   "referenced_type" : "type-569",
-   "self_type" : "type-568",
+   "referenced_type" : "type-566",
+   "self_type" : "type-565",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16012,8 +16078,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(hw_device_t *)",
    "name" : "int (*)(hw_device_t *)",
-   "referenced_type" : "type-561",
-   "self_type" : "type-560",
+   "referenced_type" : "type-558",
+   "self_type" : "type-557",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -16021,8 +16087,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
-   "referenced_type" : "type-249",
-   "self_type" : "type-250",
+   "referenced_type" : "type-251",
+   "self_type" : "type-252",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
@@ -16030,8 +16096,8 @@
    "alignment" : 4,
    "linker_set_key" : "int *",
    "name" : "int *",
-   "referenced_type" : "type-103",
-   "self_type" : "type-593",
+   "referenced_type" : "type-105",
+   "self_type" : "type-591",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
@@ -16048,8 +16114,8 @@
    "alignment" : 4,
    "linker_set_key" : "long long *",
    "name" : "long long *",
-   "referenced_type" : "type-284",
-   "self_type" : "type-1432",
+   "referenced_type" : "type-12",
+   "self_type" : "type-11",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16057,7 +16123,7 @@
    "alignment" : 4,
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
-   "referenced_type" : "type-144",
+   "referenced_type" : "type-147",
    "self_type" : "type-1132",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
@@ -16066,8 +16132,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned char *",
    "name" : "unsigned char *",
-   "referenced_type" : "type-218",
-   "self_type" : "type-217",
+   "referenced_type" : "type-220",
+   "self_type" : "type-219",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -16075,8 +16141,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
-   "referenced_type" : "type-123",
-   "self_type" : "type-122",
+   "referenced_type" : "type-125",
+   "self_type" : "type-124",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16084,8 +16150,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned long long *",
    "name" : "unsigned long long *",
-   "referenced_type" : "type-124",
-   "self_type" : "type-219",
+   "referenced_type" : "type-126",
+   "self_type" : "type-221",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16102,8 +16168,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
    "name" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
-   "referenced_type" : "type-221",
-   "self_type" : "type-220",
+   "referenced_type" : "type-223",
+   "self_type" : "type-222",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16111,8 +16177,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(android_native_base_t *)",
    "name" : "void (*)(android_native_base_t *)",
-   "referenced_type" : "type-521",
-   "self_type" : "type-520",
+   "referenced_type" : "type-519",
+   "self_type" : "type-518",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -16120,8 +16186,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(framebuffer_device_t *, char *, int)",
    "name" : "void (*)(framebuffer_device_t *, char *, int)",
-   "referenced_type" : "type-575",
-   "self_type" : "type-574",
+   "referenced_type" : "type-572",
+   "self_type" : "type-571",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16129,8 +16195,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *",
    "name" : "void *",
-   "referenced_type" : "type-151",
-   "self_type" : "type-227",
+   "referenced_type" : "type-154",
+   "self_type" : "type-229",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -16138,8 +16204,8 @@
    "alignment" : 4,
    "linker_set_key" : "void **",
    "name" : "void **",
-   "referenced_type" : "type-227",
-   "self_type" : "type-251",
+   "referenced_type" : "type-229",
+   "self_type" : "type-253",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   }
@@ -16151,8 +16217,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-117",
-   "self_type" : "type-119",
+   "referenced_type" : "type-119",
+   "self_type" : "type-121",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16181,8 +16247,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-13",
-   "self_type" : "type-15",
+   "referenced_type" : "type-1576",
+   "self_type" : "type-1579",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16191,8 +16257,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1572",
-   "self_type" : "type-1574",
+   "referenced_type" : "type-15",
+   "self_type" : "type-37",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16201,8 +16267,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1607",
-   "self_type" : "type-1609",
+   "referenced_type" : "type-1611",
+   "self_type" : "type-1613",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16211,8 +16277,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-174",
-   "self_type" : "type-173",
+   "referenced_type" : "type-177",
+   "self_type" : "type-176",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16221,8 +16287,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1782",
-   "self_type" : "type-1784",
+   "referenced_type" : "type-1783",
+   "self_type" : "type-1785",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16231,8 +16297,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1829",
-   "self_type" : "type-1831",
+   "referenced_type" : "type-1830",
+   "self_type" : "type-1832",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16241,8 +16307,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1834",
-   "self_type" : "type-1836",
+   "referenced_type" : "type-1835",
+   "self_type" : "type-1837",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16251,8 +16317,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1844",
-   "self_type" : "type-1846",
+   "referenced_type" : "type-1845",
+   "self_type" : "type-1847",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16261,8 +16327,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1863",
-   "self_type" : "type-1865",
+   "referenced_type" : "type-1864",
+   "self_type" : "type-1866",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16271,8 +16337,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1929",
-   "self_type" : "type-1931",
+   "referenced_type" : "type-1930",
+   "self_type" : "type-1932",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16281,8 +16347,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2014",
-   "self_type" : "type-2016",
+   "referenced_type" : "type-2015",
+   "self_type" : "type-2017",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16291,8 +16357,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2166",
-   "self_type" : "type-2168",
+   "referenced_type" : "type-2169",
+   "self_type" : "type-2171",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16301,8 +16367,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2244",
-   "self_type" : "type-2246",
+   "referenced_type" : "type-2246",
+   "self_type" : "type-2248",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16311,8 +16377,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2286",
-   "self_type" : "type-2288",
+   "referenced_type" : "type-2288",
+   "self_type" : "type-2290",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16321,8 +16387,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2337",
-   "self_type" : "type-2339",
+   "referenced_type" : "type-2339",
+   "self_type" : "type-2341",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16331,8 +16397,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2456",
-   "self_type" : "type-2455",
+   "referenced_type" : "type-2458",
+   "self_type" : "type-2457",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16341,8 +16407,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2622",
-   "self_type" : "type-2624",
+   "referenced_type" : "type-2624",
+   "self_type" : "type-2626",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16351,8 +16417,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2648",
-   "self_type" : "type-2650",
+   "referenced_type" : "type-2650",
+   "self_type" : "type-2652",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16361,8 +16427,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-407",
-   "self_type" : "type-409",
+   "referenced_type" : "type-404",
+   "self_type" : "type-406",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16371,8 +16437,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-513",
-   "self_type" : "type-515",
+   "referenced_type" : "type-510",
+   "self_type" : "type-512",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16381,8 +16447,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-743",
-   "self_type" : "type-745",
+   "referenced_type" : "type-744",
+   "self_type" : "type-746",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16391,8 +16457,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-850",
-   "self_type" : "type-852",
+   "referenced_type" : "type-851",
+   "self_type" : "type-853",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16421,8 +16487,8 @@
    "is_const" : true,
    "linker_set_key" : "android::hardware::IBinder *const",
    "name" : "android::hardware::IBinder *const",
-   "referenced_type" : "type-195",
-   "self_type" : "type-194",
+   "referenced_type" : "type-208",
+   "self_type" : "type-207",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -16438,32 +16504,32 @@
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-1772",
-   "self_type" : "type-1771",
+   "referenced_type" : "type-1773",
+   "self_type" : "type-1772",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-2134",
-   "self_type" : "type-2133",
+   "referenced_type" : "type-2133",
+   "self_type" : "type-2132",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-2407",
-   "self_type" : "type-2406",
+   "referenced_type" : "type-2409",
+   "self_type" : "type-2408",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const AHardwareBuffer",
    "name" : "const AHardwareBuffer",
-   "referenced_type" : "type-2070",
-   "self_type" : "type-2069",
+   "referenced_type" : "type-2072",
+   "self_type" : "type-2071",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -16479,8 +16545,8 @@
    "is_const" : true,
    "linker_set_key" : "const ANativeWindowBuffer",
    "name" : "const ANativeWindowBuffer",
-   "referenced_type" : "type-517",
-   "self_type" : "type-637",
+   "referenced_type" : "type-515",
+   "self_type" : "type-638",
    "size" : 96,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -16488,32 +16554,32 @@
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-1763",
-   "self_type" : "type-1762",
+   "referenced_type" : "type-1764",
+   "self_type" : "type-1763",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-2047",
-   "self_type" : "type-2046",
+   "referenced_type" : "type-2045",
+   "self_type" : "type-2044",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-2425",
-   "self_type" : "type-2424",
+   "referenced_type" : "type-2427",
+   "self_type" : "type-2426",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-962",
-   "self_type" : "type-961",
+   "referenced_type" : "type-959",
+   "self_type" : "type-958",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
@@ -16521,8 +16587,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
    "name" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
-   "referenced_type" : "type-516",
-   "self_type" : "type-535",
+   "referenced_type" : "type-514",
+   "self_type" : "type-532",
    "size" : 104,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
   },
@@ -16542,7 +16608,7 @@
    "linker_set_key" : "const android::ColorSpace::TransferParameters",
    "name" : "const android::ColorSpace::TransferParameters",
    "referenced_type" : "type-981",
-   "self_type" : "type-1033",
+   "self_type" : "type-1030",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -16571,8 +16637,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime",
    "name" : "const android::FenceTime",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1395",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1399",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -16581,8 +16647,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot",
    "name" : "const android::FenceTime::Snapshot",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1388",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1393",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -16591,8 +16657,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot::State",
    "name" : "const android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1406",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1410",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16601,8 +16667,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::State",
    "name" : "const android::FenceTime::State",
-   "referenced_type" : "type-1378",
-   "self_type" : "type-1377",
+   "referenced_type" : "type-1383",
+   "self_type" : "type-1382",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -16621,8 +16687,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FrameStats",
    "name" : "const android::FrameStats",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1428",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1432",
    "size" : 68,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
@@ -16631,8 +16697,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Gralloc2Allocator",
    "name" : "const android::Gralloc2Allocator",
-   "referenced_type" : "type-353",
-   "self_type" : "type-361",
+   "referenced_type" : "type-350",
+   "self_type" : "type-358",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -16641,8 +16707,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Gralloc2Mapper",
    "name" : "const android::Gralloc2Mapper",
-   "referenced_type" : "type-337",
-   "self_type" : "type-344",
+   "referenced_type" : "type-334",
+   "self_type" : "type-341",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -16651,8 +16717,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-2060",
-   "self_type" : "type-2059",
+   "referenced_type" : "type-2062",
+   "self_type" : "type-2061",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -16661,8 +16727,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-2226",
-   "self_type" : "type-2225",
+   "referenced_type" : "type-2229",
+   "self_type" : "type-2228",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -16671,8 +16737,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-2230",
-   "self_type" : "type-2229",
+   "referenced_type" : "type-2232",
+   "self_type" : "type-2231",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -16691,8 +16757,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-803",
-   "self_type" : "type-802",
+   "referenced_type" : "type-804",
+   "self_type" : "type-803",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -16701,8 +16767,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-828",
-   "self_type" : "type-827",
+   "referenced_type" : "type-829",
+   "self_type" : "type-828",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -16711,8 +16777,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-525",
-   "self_type" : "type-624",
+   "referenced_type" : "type-523",
+   "self_type" : "type-625",
    "size" : 152,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -16721,8 +16787,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferAllocator",
    "name" : "const android::GraphicBufferAllocator",
-   "referenced_type" : "type-542",
-   "self_type" : "type-720",
+   "referenced_type" : "type-539",
+   "self_type" : "type-721",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -16731,7 +16797,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferAllocator::alloc_rec_t",
    "name" : "const android::GraphicBufferAllocator::alloc_rec_t",
-   "referenced_type" : "type-676",
+   "referenced_type" : "type-680",
    "self_type" : "type-706",
    "size" : 44,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -16741,8 +16807,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferMapper",
    "name" : "const android::GraphicBufferMapper",
-   "referenced_type" : "type-527",
-   "self_type" : "type-614",
+   "referenced_type" : "type-525",
+   "self_type" : "type-615",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -16752,7 +16818,7 @@
    "linker_set_key" : "const android::HdrCapabilities",
    "name" : "const android::HdrCapabilities",
    "referenced_type" : "type-964",
-   "self_type" : "type-972",
+   "self_type" : "type-973",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -16761,8 +16827,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-715",
-   "self_type" : "type-717",
+   "referenced_type" : "type-716",
+   "self_type" : "type-718",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -16772,7 +16838,7 @@
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect>",
    "name" : "const android::LightFlattenablePod<android::Rect>",
    "referenced_type" : "type-1243",
-   "self_type" : "type-2397",
+   "self_type" : "type-2399",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16821,7 +16887,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
-   "referenced_type" : "type-172",
+   "referenced_type" : "type-175",
    "self_type" : "type-1078",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
@@ -16831,8 +16897,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Region",
    "name" : "const android::Region",
-   "referenced_type" : "type-2389",
-   "self_type" : "type-2388",
+   "referenced_type" : "type-2391",
+   "self_type" : "type-2390",
    "size" : 20,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -16851,8 +16917,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-179",
-   "self_type" : "type-184",
+   "referenced_type" : "type-182",
+   "self_type" : "type-187",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -16861,8 +16927,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
-   "referenced_type" : "type-285",
-   "self_type" : "type-873",
+   "referenced_type" : "type-282",
+   "self_type" : "type-863",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -16871,8 +16937,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<android::Rect>",
    "name" : "const android::Vector<android::Rect>",
-   "referenced_type" : "type-2382",
-   "self_type" : "type-2384",
+   "referenced_type" : "type-2384",
+   "self_type" : "type-2386",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16881,8 +16947,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<long long>",
    "name" : "const android::Vector<long long>",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1425",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1429",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16891,8 +16957,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
-   "referenced_type" : "type-235",
-   "self_type" : "type-1422",
+   "referenced_type" : "type-237",
+   "self_type" : "type-1426",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -16912,7 +16978,7 @@
    "linker_set_key" : "const android::details::TMat33<float>",
    "name" : "const android::details::TMat33<float>",
    "referenced_type" : "type-903",
-   "self_type" : "type-925",
+   "self_type" : "type-919",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -16921,8 +16987,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TMat44<float>",
    "name" : "const android::details::TMat44<float>",
-   "referenced_type" : "type-2427",
-   "self_type" : "type-2431",
+   "referenced_type" : "type-2429",
+   "self_type" : "type-2433",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -16931,8 +16997,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TQuaternion<double>",
    "name" : "const android::details::TQuaternion<double>",
-   "referenced_type" : "type-331",
-   "self_type" : "type-404",
+   "referenced_type" : "type-328",
+   "self_type" : "type-401",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -16941,8 +17007,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TQuaternion<float>",
    "name" : "const android::details::TQuaternion<float>",
-   "referenced_type" : "type-410",
-   "self_type" : "type-432",
+   "referenced_type" : "type-407",
+   "self_type" : "type-429",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -16961,7 +17027,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec2<double>",
    "name" : "const android::details::TVec2<double>",
-   "referenced_type" : "type-55",
+   "referenced_type" : "type-57",
    "self_type" : "type-1070",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -16971,7 +17037,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec2<float>",
    "name" : "const android::details::TVec2<float>",
-   "referenced_type" : "type-22",
+   "referenced_type" : "type-23",
    "self_type" : "type-1051",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -16981,7 +17047,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec3<double>",
    "name" : "const android::details::TVec3<double>",
-   "referenced_type" : "type-66",
+   "referenced_type" : "type-68",
    "self_type" : "type-1369",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
@@ -16991,7 +17057,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec3<float>",
    "name" : "const android::details::TVec3<float>",
-   "referenced_type" : "type-17",
+   "referenced_type" : "type-18",
    "self_type" : "type-1055",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -17001,8 +17067,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec4<double>",
    "name" : "const android::details::TVec4<double>",
-   "referenced_type" : "type-50",
-   "self_type" : "type-166",
+   "referenced_type" : "type-52",
+   "self_type" : "type-164",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -17011,8 +17077,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec4<float>",
    "name" : "const android::details::TVec4<float>",
-   "referenced_type" : "type-200",
-   "self_type" : "type-325",
+   "referenced_type" : "type-192",
+   "self_type" : "type-322",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -17022,7 +17088,7 @@
    "linker_set_key" : "const android::half",
    "name" : "const android::half",
    "referenced_type" : "type-1",
-   "self_type" : "type-42",
+   "self_type" : "type-44",
    "size" : 2,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -17051,8 +17117,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::BpHwRefBase",
    "name" : "const android::hardware::BpHwRefBase",
-   "referenced_type" : "type-193",
-   "self_type" : "type-211",
+   "referenced_type" : "type-206",
+   "self_type" : "type-213",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -17061,8 +17127,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-215",
-   "self_type" : "type-231",
+   "referenced_type" : "type-217",
+   "self_type" : "type-233",
    "size" : 68,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -17071,8 +17137,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
-   "referenced_type" : "type-99",
-   "self_type" : "type-109",
+   "referenced_type" : "type-101",
+   "self_type" : "type-111",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17081,8 +17147,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
-   "referenced_type" : "type-393",
-   "self_type" : "type-401",
+   "referenced_type" : "type-392",
+   "self_type" : "type-398",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17091,8 +17157,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
-   "referenced_type" : "type-111",
-   "self_type" : "type-115",
+   "referenced_type" : "type-113",
+   "self_type" : "type-117",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17101,7 +17167,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Status",
    "name" : "const android::hardware::Status",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1310",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -17121,8 +17187,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
-   "referenced_type" : "type-136",
-   "self_type" : "type-293",
+   "referenced_type" : "type-139",
+   "self_type" : "type-290",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17131,8 +17197,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned int>",
    "name" : "const android::hardware::details::hidl_pointer<unsigned int>",
-   "referenced_type" : "type-120",
-   "self_type" : "type-190",
+   "referenced_type" : "type-122",
+   "self_type" : "type-203",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17141,7 +17207,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::return_status",
    "name" : "const android::hardware::details::return_status",
-   "referenced_type" : "type-101",
+   "referenced_type" : "type-103",
    "self_type" : "type-1319",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -17151,8 +17217,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
-   "referenced_type" : "type-1745",
-   "self_type" : "type-1744",
+   "referenced_type" : "type-1746",
+   "self_type" : "type-1745",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17161,8 +17227,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
-   "referenced_type" : "type-1911",
-   "self_type" : "type-1910",
+   "referenced_type" : "type-1913",
+   "self_type" : "type-1912",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17171,8 +17237,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
-   "referenced_type" : "type-382",
-   "self_type" : "type-381",
+   "referenced_type" : "type-379",
+   "self_type" : "type-378",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17181,8 +17247,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
-   "referenced_type" : "type-2004",
-   "self_type" : "type-2003",
+   "referenced_type" : "type-2005",
+   "self_type" : "type-2004",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17191,8 +17257,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
-   "referenced_type" : "type-495",
-   "self_type" : "type-494",
+   "referenced_type" : "type-492",
+   "self_type" : "type-491",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17201,8 +17267,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_0::BufferUsage",
-   "referenced_type" : "type-150",
-   "self_type" : "type-153",
+   "referenced_type" : "type-153",
+   "self_type" : "type-156",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -17271,8 +17337,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_1::BufferUsage",
-   "referenced_type" : "type-158",
-   "self_type" : "type-160",
+   "referenced_type" : "type-160",
+   "self_type" : "type-162",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -17321,8 +17387,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_2::BufferUsage",
-   "referenced_type" : "type-420",
-   "self_type" : "type-422",
+   "referenced_type" : "type-417",
+   "self_type" : "type-419",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -17371,8 +17437,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper",
-   "referenced_type" : "type-1585",
-   "self_type" : "type-1584",
+   "referenced_type" : "type-1589",
+   "self_type" : "type-1588",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17381,8 +17447,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper",
-   "referenced_type" : "type-1857",
-   "self_type" : "type-1856",
+   "referenced_type" : "type-1858",
+   "self_type" : "type-1857",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17391,8 +17457,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper",
-   "referenced_type" : "type-85",
-   "self_type" : "type-84",
+   "referenced_type" : "type-87",
+   "self_type" : "type-86",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17401,8 +17467,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper",
-   "referenced_type" : "type-1595",
-   "self_type" : "type-1594",
+   "referenced_type" : "type-1599",
+   "self_type" : "type-1598",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17411,8 +17477,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper",
-   "referenced_type" : "type-1861",
-   "self_type" : "type-1860",
+   "referenced_type" : "type-1862",
+   "self_type" : "type-1861",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17421,8 +17487,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper",
-   "referenced_type" : "type-97",
-   "self_type" : "type-96",
+   "referenced_type" : "type-99",
+   "self_type" : "type-98",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17431,8 +17497,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper",
-   "referenced_type" : "type-1919",
-   "self_type" : "type-1918",
+   "referenced_type" : "type-1920",
+   "self_type" : "type-1919",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17441,8 +17507,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper",
-   "referenced_type" : "type-392",
-   "self_type" : "type-391",
+   "referenced_type" : "type-389",
+   "self_type" : "type-388",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17461,8 +17527,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
-   "referenced_type" : "type-149",
-   "self_type" : "type-154",
+   "referenced_type" : "type-152",
+   "self_type" : "type-157",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17471,8 +17537,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
-   "referenced_type" : "type-157",
-   "self_type" : "type-161",
+   "referenced_type" : "type-159",
+   "self_type" : "type-163",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17481,8 +17547,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
-   "referenced_type" : "type-419",
-   "self_type" : "type-423",
+   "referenced_type" : "type-416",
+   "self_type" : "type-420",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17491,7 +17557,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-139",
+   "referenced_type" : "type-142",
    "self_type" : "type-1121",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -17521,8 +17587,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_handle>",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_handle>",
-   "referenced_type" : "type-135",
-   "self_type" : "type-146",
+   "referenced_type" : "type-138",
+   "self_type" : "type-149",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17531,8 +17597,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned int>",
    "name" : "const android::hardware::hidl_vec<unsigned int>",
-   "referenced_type" : "type-128",
-   "self_type" : "type-132",
+   "referenced_type" : "type-131",
+   "self_type" : "type-134",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17551,8 +17617,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "const android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-164",
-   "self_type" : "type-165",
+   "referenced_type" : "type-167",
+   "self_type" : "type-168",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -17561,8 +17627,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase",
    "name" : "const android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-171",
-   "self_type" : "type-170",
+   "referenced_type" : "type-174",
+   "self_type" : "type-173",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
@@ -17571,8 +17637,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-295",
-   "self_type" : "type-294",
+   "referenced_type" : "type-292",
+   "self_type" : "type-291",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
@@ -17601,8 +17667,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::IBinder>",
    "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-248",
-   "self_type" : "type-273",
+   "referenced_type" : "type-250",
+   "self_type" : "type-269",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -17611,8 +17677,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::ProcessState>",
    "name" : "const android::sp<android::hardware::ProcessState>",
-   "referenced_type" : "type-279",
-   "self_type" : "type-278",
+   "referenced_type" : "type-275",
+   "self_type" : "type-274",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -17621,8 +17687,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
    "name" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
-   "referenced_type" : "type-355",
-   "self_type" : "type-379",
+   "referenced_type" : "type-352",
+   "self_type" : "type-376",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17631,8 +17697,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
    "name" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
-   "referenced_type" : "type-484",
-   "self_type" : "type-492",
+   "referenced_type" : "type-481",
+   "self_type" : "type-489",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17641,8 +17707,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
-   "referenced_type" : "type-338",
-   "self_type" : "type-387",
+   "referenced_type" : "type-335",
+   "self_type" : "type-384",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17651,8 +17717,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
-   "referenced_type" : "type-86",
-   "self_type" : "type-91",
+   "referenced_type" : "type-88",
+   "self_type" : "type-93",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17661,8 +17727,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
    "name" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
-   "referenced_type" : "type-497",
-   "self_type" : "type-505",
+   "referenced_type" : "type-494",
+   "self_type" : "type-502",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17681,8 +17747,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::base::V1_0::IBase>",
    "name" : "const android::sp<android::hidl::base::V1_0::IBase>",
-   "referenced_type" : "type-363",
-   "self_type" : "type-365",
+   "referenced_type" : "type-360",
+   "self_type" : "type-362",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17691,8 +17757,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification>",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification>",
-   "referenced_type" : "type-371",
-   "self_type" : "type-374",
+   "referenced_type" : "type-368",
+   "self_type" : "type-371",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17711,8 +17777,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ui::Transform",
    "name" : "const android::ui::Transform",
-   "referenced_type" : "type-2434",
-   "self_type" : "type-2437",
+   "referenced_type" : "type-2436",
+   "self_type" : "type-2439",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -17721,8 +17787,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ui::Transform::mat33",
    "name" : "const android::ui::Transform::mat33",
-   "referenced_type" : "type-2435",
-   "self_type" : "type-2445",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2447",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -17732,7 +17798,7 @@
    "linker_set_key" : "const bool",
    "name" : "const bool",
    "referenced_type" : "type-6",
-   "self_type" : "type-370",
+   "self_type" : "type-367",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -17741,8 +17807,8 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-288",
-   "self_type" : "type-287",
+   "referenced_type" : "type-285",
+   "self_type" : "type-284",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -17751,8 +17817,8 @@
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-182",
-   "self_type" : "type-181",
+   "referenced_type" : "type-185",
+   "self_type" : "type-184",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -17761,8 +17827,8 @@
    "is_const" : true,
    "linker_set_key" : "const double",
    "name" : "const double",
-   "referenced_type" : "type-41",
-   "self_type" : "type-853",
+   "referenced_type" : "type-43",
+   "self_type" : "type-850",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17772,7 +17838,7 @@
    "linker_set_key" : "const float",
    "name" : "const float",
    "referenced_type" : "type-10",
-   "self_type" : "type-563",
+   "self_type" : "type-560",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
   },
@@ -17788,24 +17854,24 @@
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-1775",
-   "self_type" : "type-1774",
+   "referenced_type" : "type-1776",
+   "self_type" : "type-1775",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-2210",
-   "self_type" : "type-2209",
+   "referenced_type" : "type-2208",
+   "self_type" : "type-2207",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-2413",
-   "self_type" : "type-2412",
+   "referenced_type" : "type-2415",
+   "self_type" : "type-2414",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
@@ -17813,8 +17879,8 @@
    "is_const" : true,
    "linker_set_key" : "const gralloc_module_t",
    "name" : "const gralloc_module_t",
-   "referenced_type" : "type-578",
-   "self_type" : "type-582",
+   "referenced_type" : "type-576",
+   "self_type" : "type-580",
    "size" : 176,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -17823,8 +17889,8 @@
    "is_const" : true,
    "linker_set_key" : "const hw_module_t",
    "name" : "const hw_module_t",
-   "referenced_type" : "type-549",
-   "self_type" : "type-555",
+   "referenced_type" : "type-546",
+   "self_type" : "type-552",
    "size" : 128,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -17833,8 +17899,8 @@
    "is_const" : true,
    "linker_set_key" : "const int",
    "name" : "const int",
-   "referenced_type" : "type-103",
-   "self_type" : "type-562",
+   "referenced_type" : "type-105",
+   "self_type" : "type-559",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -17850,120 +17916,120 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-126",
-   "self_type" : "type-125",
+   "referenced_type" : "type-129",
+   "self_type" : "type-128",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1577",
-   "self_type" : "type-1576",
+   "referenced_type" : "type-1581",
+   "self_type" : "type-1580",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1612",
-   "self_type" : "type-1611",
+   "referenced_type" : "type-1617",
+   "self_type" : "type-1616",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1787",
-   "self_type" : "type-1786",
+   "referenced_type" : "type-1788",
+   "self_type" : "type-1787",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1848",
-   "self_type" : "type-1847",
+   "referenced_type" : "type-1849",
+   "self_type" : "type-1848",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1867",
-   "self_type" : "type-1866",
+   "referenced_type" : "type-1868",
+   "self_type" : "type-1867",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1934",
-   "self_type" : "type-1933",
+   "referenced_type" : "type-1936",
+   "self_type" : "type-1935",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2080",
-   "self_type" : "type-2079",
+   "referenced_type" : "type-2082",
+   "self_type" : "type-2081",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2171",
-   "self_type" : "type-2170",
+   "referenced_type" : "type-2174",
+   "self_type" : "type-2173",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2248",
-   "self_type" : "type-2247",
+   "referenced_type" : "type-2250",
+   "self_type" : "type-2249",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2290",
-   "self_type" : "type-2289",
+   "referenced_type" : "type-2292",
+   "self_type" : "type-2291",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2341",
-   "self_type" : "type-2340",
+   "referenced_type" : "type-2343",
+   "self_type" : "type-2342",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2472",
-   "self_type" : "type-2471",
+   "referenced_type" : "type-2474",
+   "self_type" : "type-2473",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-37",
-   "self_type" : "type-36",
+   "referenced_type" : "type-40",
+   "self_type" : "type-39",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-417",
-   "self_type" : "type-416",
+   "referenced_type" : "type-414",
+   "self_type" : "type-413",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -17978,16 +18044,16 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-748",
-   "self_type" : "type-747",
+   "referenced_type" : "type-749",
+   "self_type" : "type-748",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-855",
-   "self_type" : "type-854",
+   "referenced_type" : "type-857",
+   "self_type" : "type-856",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -18021,7 +18087,7 @@
    "is_const" : true,
    "linker_set_key" : "const long long",
    "name" : "const long long",
-   "referenced_type" : "type-284",
+   "referenced_type" : "type-12",
    "self_type" : "type-847",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -18031,8 +18097,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle",
    "name" : "const native_handle",
-   "referenced_type" : "type-144",
-   "self_type" : "type-143",
+   "referenced_type" : "type-147",
+   "self_type" : "type-146",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18041,8 +18107,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle *const",
    "name" : "const native_handle *const",
-   "referenced_type" : "type-142",
-   "self_type" : "type-696",
+   "referenced_type" : "type-145",
+   "self_type" : "type-699",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18052,7 +18118,7 @@
    "linker_set_key" : "const short",
    "name" : "const short",
    "referenced_type" : "type-599",
-   "self_type" : "type-825",
+   "self_type" : "type-823",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18081,8 +18147,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3>",
    "name" : "const std::array<android::details::TVec2<float>, 3>",
-   "referenced_type" : "type-1769",
-   "self_type" : "type-1768",
+   "referenced_type" : "type-1770",
+   "self_type" : "type-1769",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -18091,8 +18157,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3>",
    "name" : "const std::array<android::details::TVec2<float>, 3>",
-   "referenced_type" : "type-2122",
-   "self_type" : "type-2121",
+   "referenced_type" : "type-2120",
+   "self_type" : "type-2119",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -18111,8 +18177,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1687",
-   "self_type" : "type-1686",
+   "referenced_type" : "type-1688",
+   "self_type" : "type-1687",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18121,8 +18187,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1793",
-   "self_type" : "type-1792",
+   "referenced_type" : "type-1794",
+   "self_type" : "type-1793",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18131,8 +18197,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1880",
-   "self_type" : "type-1879",
+   "referenced_type" : "type-1881",
+   "self_type" : "type-1880",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18141,8 +18207,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1956",
-   "self_type" : "type-1955",
+   "referenced_type" : "type-1958",
+   "self_type" : "type-1957",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18151,8 +18217,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2087",
-   "self_type" : "type-2086",
+   "referenced_type" : "type-2090",
+   "self_type" : "type-2089",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18161,8 +18227,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2185",
-   "self_type" : "type-2184",
+   "referenced_type" : "type-2188",
+   "self_type" : "type-2187",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18171,8 +18237,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2255",
-   "self_type" : "type-2254",
+   "referenced_type" : "type-2257",
+   "self_type" : "type-2256",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18181,8 +18247,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2295",
-   "self_type" : "type-2294",
+   "referenced_type" : "type-2297",
+   "self_type" : "type-2296",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18191,8 +18257,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2346",
-   "self_type" : "type-2345",
+   "referenced_type" : "type-2348",
+   "self_type" : "type-2347",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18201,8 +18267,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2510",
-   "self_type" : "type-2509",
+   "referenced_type" : "type-2512",
+   "self_type" : "type-2511",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18211,8 +18277,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-302",
-   "self_type" : "type-301",
+   "referenced_type" : "type-299",
+   "self_type" : "type-298",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18221,8 +18287,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-442",
-   "self_type" : "type-441",
+   "referenced_type" : "type-439",
+   "self_type" : "type-438",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18241,8 +18307,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-762",
-   "self_type" : "type-761",
+   "referenced_type" : "type-764",
+   "self_type" : "type-763",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18251,8 +18317,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-866",
-   "self_type" : "type-865",
+   "referenced_type" : "type-867",
+   "self_type" : "type-866",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18261,8 +18327,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-922",
-   "self_type" : "type-921",
+   "referenced_type" : "type-923",
+   "self_type" : "type-922",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18281,8 +18347,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1001",
-   "self_type" : "type-1000",
+   "referenced_type" : "type-1002",
+   "self_type" : "type-1001",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18301,8 +18367,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1693",
-   "self_type" : "type-1692",
+   "referenced_type" : "type-1694",
+   "self_type" : "type-1693",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18311,8 +18377,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1799",
-   "self_type" : "type-1798",
+   "referenced_type" : "type-1800",
+   "self_type" : "type-1799",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18321,8 +18387,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1886",
-   "self_type" : "type-1885",
+   "referenced_type" : "type-1887",
+   "self_type" : "type-1886",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18331,8 +18397,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1963",
-   "self_type" : "type-1962",
+   "referenced_type" : "type-1964",
+   "self_type" : "type-1963",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18341,8 +18407,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2093",
-   "self_type" : "type-2092",
+   "referenced_type" : "type-2096",
+   "self_type" : "type-2095",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18351,8 +18417,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2192",
-   "self_type" : "type-2191",
+   "referenced_type" : "type-2195",
+   "self_type" : "type-2194",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18361,8 +18427,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2261",
-   "self_type" : "type-2260",
+   "referenced_type" : "type-2263",
+   "self_type" : "type-2262",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18371,8 +18437,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2301",
-   "self_type" : "type-2300",
+   "referenced_type" : "type-2303",
+   "self_type" : "type-2302",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18381,8 +18447,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2352",
-   "self_type" : "type-2351",
+   "referenced_type" : "type-2354",
+   "self_type" : "type-2353",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18391,8 +18457,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2516",
-   "self_type" : "type-2515",
+   "referenced_type" : "type-2518",
+   "self_type" : "type-2517",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18401,8 +18467,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-308",
-   "self_type" : "type-307",
+   "referenced_type" : "type-306",
+   "self_type" : "type-305",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18411,8 +18477,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-448",
-   "self_type" : "type-447",
+   "referenced_type" : "type-445",
+   "self_type" : "type-444",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18421,8 +18487,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-658",
-   "self_type" : "type-657",
+   "referenced_type" : "type-659",
+   "self_type" : "type-658",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18441,8 +18507,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-872",
-   "self_type" : "type-871",
+   "referenced_type" : "type-873",
+   "self_type" : "type-872",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18451,8 +18517,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-929",
-   "self_type" : "type-928",
+   "referenced_type" : "type-930",
+   "self_type" : "type-929",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18461,8 +18527,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1003",
-   "self_type" : "type-1002",
+   "referenced_type" : "type-1004",
+   "self_type" : "type-1003",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18481,8 +18547,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1695",
-   "self_type" : "type-1694",
+   "referenced_type" : "type-1696",
+   "self_type" : "type-1695",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18491,8 +18557,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1801",
-   "self_type" : "type-1800",
+   "referenced_type" : "type-1802",
+   "self_type" : "type-1801",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18501,8 +18567,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1888",
-   "self_type" : "type-1887",
+   "referenced_type" : "type-1889",
+   "self_type" : "type-1888",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18511,8 +18577,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1965",
-   "self_type" : "type-1964",
+   "referenced_type" : "type-1967",
+   "self_type" : "type-1966",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18521,8 +18587,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2095",
-   "self_type" : "type-2094",
+   "referenced_type" : "type-2098",
+   "self_type" : "type-2097",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18531,8 +18597,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2194",
-   "self_type" : "type-2193",
+   "referenced_type" : "type-2197",
+   "self_type" : "type-2196",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18541,8 +18607,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2263",
-   "self_type" : "type-2262",
+   "referenced_type" : "type-2265",
+   "self_type" : "type-2264",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18551,8 +18617,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2303",
-   "self_type" : "type-2302",
+   "referenced_type" : "type-2305",
+   "self_type" : "type-2304",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18561,8 +18627,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2354",
-   "self_type" : "type-2353",
+   "referenced_type" : "type-2356",
+   "self_type" : "type-2355",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18571,8 +18637,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2518",
-   "self_type" : "type-2517",
+   "referenced_type" : "type-2520",
+   "self_type" : "type-2519",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18581,8 +18647,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-311",
-   "self_type" : "type-310",
+   "referenced_type" : "type-308",
+   "self_type" : "type-307",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18591,8 +18657,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-450",
-   "self_type" : "type-449",
+   "referenced_type" : "type-447",
+   "self_type" : "type-446",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18601,8 +18667,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-660",
-   "self_type" : "type-659",
+   "referenced_type" : "type-661",
+   "self_type" : "type-660",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18621,8 +18687,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-875",
-   "self_type" : "type-874",
+   "referenced_type" : "type-876",
+   "self_type" : "type-875",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18631,8 +18697,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-931",
-   "self_type" : "type-930",
+   "referenced_type" : "type-932",
+   "self_type" : "type-931",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18651,8 +18717,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1691",
-   "self_type" : "type-1690",
+   "referenced_type" : "type-1692",
+   "self_type" : "type-1691",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18661,8 +18727,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1797",
-   "self_type" : "type-1796",
+   "referenced_type" : "type-1798",
+   "self_type" : "type-1797",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18671,8 +18737,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1884",
-   "self_type" : "type-1883",
+   "referenced_type" : "type-1885",
+   "self_type" : "type-1884",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18681,8 +18747,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1961",
-   "self_type" : "type-1960",
+   "referenced_type" : "type-1962",
+   "self_type" : "type-1961",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18691,8 +18757,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2091",
-   "self_type" : "type-2090",
+   "referenced_type" : "type-2094",
+   "self_type" : "type-2093",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18701,8 +18767,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2189",
-   "self_type" : "type-2188",
+   "referenced_type" : "type-2192",
+   "self_type" : "type-2191",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18711,8 +18777,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2259",
-   "self_type" : "type-2258",
+   "referenced_type" : "type-2261",
+   "self_type" : "type-2260",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18721,8 +18787,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2299",
-   "self_type" : "type-2298",
+   "referenced_type" : "type-2301",
+   "self_type" : "type-2300",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18731,8 +18797,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2350",
-   "self_type" : "type-2349",
+   "referenced_type" : "type-2352",
+   "self_type" : "type-2351",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18741,8 +18807,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2514",
-   "self_type" : "type-2513",
+   "referenced_type" : "type-2516",
+   "self_type" : "type-2515",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18751,8 +18817,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-306",
-   "self_type" : "type-305",
+   "referenced_type" : "type-303",
+   "self_type" : "type-302",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18761,8 +18827,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-446",
-   "self_type" : "type-445",
+   "referenced_type" : "type-443",
+   "self_type" : "type-442",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18771,8 +18837,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-656",
-   "self_type" : "type-655",
+   "referenced_type" : "type-657",
+   "self_type" : "type-656",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18781,8 +18847,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-766",
-   "self_type" : "type-765",
+   "referenced_type" : "type-768",
+   "self_type" : "type-767",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18791,8 +18857,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-870",
-   "self_type" : "type-869",
+   "referenced_type" : "type-871",
+   "self_type" : "type-870",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18801,8 +18867,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-927",
-   "self_type" : "type-926",
+   "referenced_type" : "type-928",
+   "self_type" : "type-927",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18821,8 +18887,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1005",
-   "self_type" : "type-1004",
+   "referenced_type" : "type-1006",
+   "self_type" : "type-1005",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18841,8 +18907,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1697",
-   "self_type" : "type-1696",
+   "referenced_type" : "type-1698",
+   "self_type" : "type-1697",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18851,8 +18917,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1803",
-   "self_type" : "type-1802",
+   "referenced_type" : "type-1804",
+   "self_type" : "type-1803",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18861,8 +18927,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1890",
-   "self_type" : "type-1889",
+   "referenced_type" : "type-1891",
+   "self_type" : "type-1890",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18871,8 +18937,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1967",
-   "self_type" : "type-1966",
+   "referenced_type" : "type-1969",
+   "self_type" : "type-1968",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18881,8 +18947,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2098",
-   "self_type" : "type-2097",
+   "referenced_type" : "type-2102",
+   "self_type" : "type-2101",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18891,8 +18957,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2196",
-   "self_type" : "type-2195",
+   "referenced_type" : "type-2199",
+   "self_type" : "type-2198",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18901,8 +18967,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2265",
-   "self_type" : "type-2264",
+   "referenced_type" : "type-2267",
+   "self_type" : "type-2266",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18911,8 +18977,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2305",
-   "self_type" : "type-2304",
+   "referenced_type" : "type-2307",
+   "self_type" : "type-2306",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18921,8 +18987,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2356",
-   "self_type" : "type-2355",
+   "referenced_type" : "type-2358",
+   "self_type" : "type-2357",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18931,8 +18997,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2520",
-   "self_type" : "type-2519",
+   "referenced_type" : "type-2522",
+   "self_type" : "type-2521",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18941,8 +19007,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-313",
-   "self_type" : "type-312",
+   "referenced_type" : "type-310",
+   "self_type" : "type-309",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18951,8 +19017,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-452",
-   "self_type" : "type-451",
+   "referenced_type" : "type-449",
+   "self_type" : "type-448",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18981,8 +19047,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-877",
-   "self_type" : "type-876",
+   "referenced_type" : "type-878",
+   "self_type" : "type-877",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18991,8 +19057,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-933",
-   "self_type" : "type-932",
+   "referenced_type" : "type-934",
+   "self_type" : "type-933",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19011,8 +19077,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1685",
-   "self_type" : "type-1684",
+   "referenced_type" : "type-1686",
+   "self_type" : "type-1685",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19021,8 +19087,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1791",
-   "self_type" : "type-1790",
+   "referenced_type" : "type-1792",
+   "self_type" : "type-1791",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19031,8 +19097,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1878",
-   "self_type" : "type-1877",
+   "referenced_type" : "type-1879",
+   "self_type" : "type-1878",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19041,8 +19107,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1954",
-   "self_type" : "type-1953",
+   "referenced_type" : "type-1955",
+   "self_type" : "type-1954",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19051,8 +19117,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2085",
-   "self_type" : "type-2084",
+   "referenced_type" : "type-2087",
+   "self_type" : "type-2086",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19061,8 +19127,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2183",
-   "self_type" : "type-2182",
+   "referenced_type" : "type-2186",
+   "self_type" : "type-2185",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19071,8 +19137,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2253",
-   "self_type" : "type-2252",
+   "referenced_type" : "type-2255",
+   "self_type" : "type-2254",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19081,8 +19147,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2293",
-   "self_type" : "type-2292",
+   "referenced_type" : "type-2295",
+   "self_type" : "type-2294",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19091,8 +19157,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2344",
-   "self_type" : "type-2343",
+   "referenced_type" : "type-2346",
+   "self_type" : "type-2345",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19101,8 +19167,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2508",
-   "self_type" : "type-2507",
+   "referenced_type" : "type-2510",
+   "self_type" : "type-2509",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19111,8 +19177,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-300",
-   "self_type" : "type-299",
+   "referenced_type" : "type-297",
+   "self_type" : "type-296",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19121,8 +19187,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-440",
-   "self_type" : "type-439",
+   "referenced_type" : "type-437",
+   "self_type" : "type-436",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19131,8 +19197,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-649",
-   "self_type" : "type-648",
+   "referenced_type" : "type-650",
+   "self_type" : "type-649",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19151,8 +19217,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-863",
-   "self_type" : "type-862",
+   "referenced_type" : "type-865",
+   "self_type" : "type-864",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19161,8 +19227,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-920",
-   "self_type" : "type-919",
+   "referenced_type" : "type-921",
+   "self_type" : "type-920",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19191,8 +19257,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1689",
-   "self_type" : "type-1688",
+   "referenced_type" : "type-1690",
+   "self_type" : "type-1689",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19201,8 +19267,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1795",
-   "self_type" : "type-1794",
+   "referenced_type" : "type-1796",
+   "self_type" : "type-1795",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19211,8 +19277,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1882",
-   "self_type" : "type-1881",
+   "referenced_type" : "type-1883",
+   "self_type" : "type-1882",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19221,8 +19287,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1958",
-   "self_type" : "type-1957",
+   "referenced_type" : "type-1960",
+   "self_type" : "type-1959",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19231,8 +19297,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2089",
-   "self_type" : "type-2088",
+   "referenced_type" : "type-2092",
+   "self_type" : "type-2091",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19241,8 +19307,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2187",
-   "self_type" : "type-2186",
+   "referenced_type" : "type-2190",
+   "self_type" : "type-2189",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19251,8 +19317,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2257",
-   "self_type" : "type-2256",
+   "referenced_type" : "type-2259",
+   "self_type" : "type-2258",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19261,8 +19327,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2297",
-   "self_type" : "type-2296",
+   "referenced_type" : "type-2299",
+   "self_type" : "type-2298",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19271,8 +19337,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2348",
-   "self_type" : "type-2347",
+   "referenced_type" : "type-2350",
+   "self_type" : "type-2349",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19281,8 +19347,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2512",
-   "self_type" : "type-2511",
+   "referenced_type" : "type-2514",
+   "self_type" : "type-2513",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19291,8 +19357,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-304",
-   "self_type" : "type-303",
+   "referenced_type" : "type-301",
+   "self_type" : "type-300",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19301,8 +19367,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-444",
-   "self_type" : "type-443",
+   "referenced_type" : "type-441",
+   "self_type" : "type-440",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19321,8 +19387,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-764",
-   "self_type" : "type-763",
+   "referenced_type" : "type-766",
+   "self_type" : "type-765",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19331,8 +19397,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-868",
-   "self_type" : "type-867",
+   "referenced_type" : "type-869",
+   "self_type" : "type-868",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19341,8 +19407,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-924",
-   "self_type" : "type-923",
+   "referenced_type" : "type-925",
+   "self_type" : "type-924",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19361,8 +19427,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1010",
-   "self_type" : "type-1009",
+   "referenced_type" : "type-1012",
+   "self_type" : "type-1011",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19381,8 +19447,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1702",
-   "self_type" : "type-1701",
+   "referenced_type" : "type-1703",
+   "self_type" : "type-1702",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19391,8 +19457,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1807",
-   "self_type" : "type-1806",
+   "referenced_type" : "type-1808",
+   "self_type" : "type-1807",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19401,8 +19467,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1894",
-   "self_type" : "type-1893",
+   "referenced_type" : "type-1895",
+   "self_type" : "type-1894",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19411,8 +19477,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1972",
-   "self_type" : "type-1971",
+   "referenced_type" : "type-1974",
+   "self_type" : "type-1973",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19421,8 +19487,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2102",
-   "self_type" : "type-2101",
+   "referenced_type" : "type-2106",
+   "self_type" : "type-2105",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19431,8 +19497,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2201",
-   "self_type" : "type-2200",
+   "referenced_type" : "type-2204",
+   "self_type" : "type-2203",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19441,8 +19507,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2269",
-   "self_type" : "type-2268",
+   "referenced_type" : "type-2271",
+   "self_type" : "type-2270",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19451,8 +19517,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2309",
-   "self_type" : "type-2308",
+   "referenced_type" : "type-2311",
+   "self_type" : "type-2310",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19461,8 +19527,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2360",
-   "self_type" : "type-2359",
+   "referenced_type" : "type-2362",
+   "self_type" : "type-2361",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19471,8 +19537,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2528",
-   "self_type" : "type-2527",
+   "referenced_type" : "type-2530",
+   "self_type" : "type-2529",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19481,8 +19547,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-318",
-   "self_type" : "type-317",
+   "referenced_type" : "type-315",
+   "self_type" : "type-314",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19491,8 +19557,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-457",
-   "self_type" : "type-456",
+   "referenced_type" : "type-454",
+   "self_type" : "type-453",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19501,8 +19567,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-667",
-   "self_type" : "type-666",
+   "referenced_type" : "type-668",
+   "self_type" : "type-667",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19511,8 +19577,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-778",
-   "self_type" : "type-777",
+   "referenced_type" : "type-779",
+   "self_type" : "type-778",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19521,8 +19587,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-882",
-   "self_type" : "type-881",
+   "referenced_type" : "type-883",
+   "self_type" : "type-882",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19531,8 +19597,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-938",
-   "self_type" : "type-937",
+   "referenced_type" : "type-939",
+   "self_type" : "type-938",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19541,8 +19607,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1013",
+   "referenced_type" : "type-1016",
+   "self_type" : "type-1015",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19561,8 +19627,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1706",
-   "self_type" : "type-1705",
+   "referenced_type" : "type-1707",
+   "self_type" : "type-1706",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19571,8 +19637,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1811",
-   "self_type" : "type-1810",
+   "referenced_type" : "type-1812",
+   "self_type" : "type-1811",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19581,8 +19647,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1898",
-   "self_type" : "type-1897",
+   "referenced_type" : "type-1899",
+   "self_type" : "type-1898",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19591,8 +19657,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1976",
-   "self_type" : "type-1975",
+   "referenced_type" : "type-1978",
+   "self_type" : "type-1977",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19601,8 +19667,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2108",
-   "self_type" : "type-2107",
+   "referenced_type" : "type-2110",
+   "self_type" : "type-2109",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19611,8 +19677,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2206",
-   "self_type" : "type-2205",
+   "referenced_type" : "type-2210",
+   "self_type" : "type-2209",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19621,8 +19687,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2273",
-   "self_type" : "type-2272",
+   "referenced_type" : "type-2275",
+   "self_type" : "type-2274",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19631,8 +19697,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2313",
-   "self_type" : "type-2312",
+   "referenced_type" : "type-2315",
+   "self_type" : "type-2314",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19641,8 +19707,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2364",
-   "self_type" : "type-2363",
+   "referenced_type" : "type-2366",
+   "self_type" : "type-2365",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19651,8 +19717,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2532",
-   "self_type" : "type-2531",
+   "referenced_type" : "type-2534",
+   "self_type" : "type-2533",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19661,8 +19727,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-322",
-   "self_type" : "type-321",
+   "referenced_type" : "type-319",
+   "self_type" : "type-318",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19671,8 +19737,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-461",
-   "self_type" : "type-460",
+   "referenced_type" : "type-459",
+   "self_type" : "type-458",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19681,8 +19747,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-672",
-   "self_type" : "type-671",
+   "referenced_type" : "type-673",
+   "self_type" : "type-672",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19701,8 +19767,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-886",
-   "self_type" : "type-885",
+   "referenced_type" : "type-887",
+   "self_type" : "type-886",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19711,8 +19777,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-943",
-   "self_type" : "type-942",
+   "referenced_type" : "type-944",
+   "self_type" : "type-943",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19721,8 +19787,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1012",
-   "self_type" : "type-1011",
+   "referenced_type" : "type-1014",
+   "self_type" : "type-1013",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19741,8 +19807,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1704",
-   "self_type" : "type-1703",
+   "referenced_type" : "type-1705",
+   "self_type" : "type-1704",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19751,8 +19817,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1809",
-   "self_type" : "type-1808",
+   "referenced_type" : "type-1810",
+   "self_type" : "type-1809",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19761,8 +19827,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1896",
-   "self_type" : "type-1895",
+   "referenced_type" : "type-1897",
+   "self_type" : "type-1896",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19771,8 +19837,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1974",
-   "self_type" : "type-1973",
+   "referenced_type" : "type-1976",
+   "self_type" : "type-1975",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19781,8 +19847,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2106",
-   "self_type" : "type-2105",
+   "referenced_type" : "type-2108",
+   "self_type" : "type-2107",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19791,8 +19857,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2203",
-   "self_type" : "type-2202",
+   "referenced_type" : "type-2206",
+   "self_type" : "type-2205",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19801,8 +19867,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2271",
-   "self_type" : "type-2270",
+   "referenced_type" : "type-2273",
+   "self_type" : "type-2272",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19811,8 +19877,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2311",
-   "self_type" : "type-2310",
+   "referenced_type" : "type-2313",
+   "self_type" : "type-2312",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19821,8 +19887,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2362",
-   "self_type" : "type-2361",
+   "referenced_type" : "type-2364",
+   "self_type" : "type-2363",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19831,8 +19897,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2530",
-   "self_type" : "type-2529",
+   "referenced_type" : "type-2532",
+   "self_type" : "type-2531",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19841,8 +19907,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-320",
-   "self_type" : "type-319",
+   "referenced_type" : "type-317",
+   "self_type" : "type-316",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19851,8 +19917,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-459",
-   "self_type" : "type-458",
+   "referenced_type" : "type-457",
+   "self_type" : "type-456",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19871,8 +19937,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-780",
-   "self_type" : "type-779",
+   "referenced_type" : "type-781",
+   "self_type" : "type-780",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19881,8 +19947,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-884",
-   "self_type" : "type-883",
+   "referenced_type" : "type-885",
+   "self_type" : "type-884",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19891,8 +19957,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-940",
-   "self_type" : "type-939",
+   "referenced_type" : "type-941",
+   "self_type" : "type-940",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19901,8 +19967,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1008",
-   "self_type" : "type-1007",
+   "referenced_type" : "type-1010",
+   "self_type" : "type-1009",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19921,8 +19987,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1699",
-   "self_type" : "type-1698",
+   "referenced_type" : "type-1701",
+   "self_type" : "type-1700",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19931,8 +19997,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1805",
-   "self_type" : "type-1804",
+   "referenced_type" : "type-1806",
+   "self_type" : "type-1805",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19941,8 +20007,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1892",
-   "self_type" : "type-1891",
+   "referenced_type" : "type-1893",
+   "self_type" : "type-1892",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19951,8 +20017,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1970",
-   "self_type" : "type-1969",
+   "referenced_type" : "type-1971",
+   "self_type" : "type-1970",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19961,8 +20027,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2100",
-   "self_type" : "type-2099",
+   "referenced_type" : "type-2104",
+   "self_type" : "type-2103",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19971,8 +20037,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2199",
-   "self_type" : "type-2198",
+   "referenced_type" : "type-2202",
+   "self_type" : "type-2201",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19981,8 +20047,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2267",
-   "self_type" : "type-2266",
+   "referenced_type" : "type-2269",
+   "self_type" : "type-2268",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19991,8 +20057,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2307",
-   "self_type" : "type-2306",
+   "referenced_type" : "type-2309",
+   "self_type" : "type-2308",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20001,8 +20067,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2358",
-   "self_type" : "type-2357",
+   "referenced_type" : "type-2360",
+   "self_type" : "type-2359",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20011,8 +20077,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2526",
-   "self_type" : "type-2525",
+   "referenced_type" : "type-2528",
+   "self_type" : "type-2527",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20021,8 +20087,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-315",
-   "self_type" : "type-314",
+   "referenced_type" : "type-313",
+   "self_type" : "type-312",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20031,8 +20097,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-455",
-   "self_type" : "type-454",
+   "referenced_type" : "type-452",
+   "self_type" : "type-451",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20041,8 +20107,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-665",
-   "self_type" : "type-664",
+   "referenced_type" : "type-666",
+   "self_type" : "type-665",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20051,8 +20117,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-776",
-   "self_type" : "type-775",
+   "referenced_type" : "type-777",
+   "self_type" : "type-776",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20061,8 +20127,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-880",
-   "self_type" : "type-879",
+   "referenced_type" : "type-881",
+   "self_type" : "type-880",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20071,8 +20137,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-936",
-   "self_type" : "type-935",
+   "referenced_type" : "type-937",
+   "self_type" : "type-936",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20101,8 +20167,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1708",
-   "self_type" : "type-1707",
+   "referenced_type" : "type-1709",
+   "self_type" : "type-1708",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20111,8 +20177,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1813",
-   "self_type" : "type-1812",
+   "referenced_type" : "type-1814",
+   "self_type" : "type-1813",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20121,8 +20187,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1900",
-   "self_type" : "type-1899",
+   "referenced_type" : "type-1901",
+   "self_type" : "type-1900",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20131,8 +20197,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1979",
-   "self_type" : "type-1978",
+   "referenced_type" : "type-1980",
+   "self_type" : "type-1979",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20141,8 +20207,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2110",
-   "self_type" : "type-2109",
+   "referenced_type" : "type-2112",
+   "self_type" : "type-2111",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20151,8 +20217,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2208",
-   "self_type" : "type-2207",
+   "referenced_type" : "type-2212",
+   "self_type" : "type-2211",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20161,8 +20227,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2275",
-   "self_type" : "type-2274",
+   "referenced_type" : "type-2277",
+   "self_type" : "type-2276",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20171,8 +20237,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2315",
-   "self_type" : "type-2314",
+   "referenced_type" : "type-2317",
+   "self_type" : "type-2316",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20181,8 +20247,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2366",
-   "self_type" : "type-2365",
+   "referenced_type" : "type-2368",
+   "self_type" : "type-2367",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20191,8 +20257,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2534",
-   "self_type" : "type-2533",
+   "referenced_type" : "type-2536",
+   "self_type" : "type-2535",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20201,8 +20267,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-324",
-   "self_type" : "type-323",
+   "referenced_type" : "type-321",
+   "self_type" : "type-320",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20211,8 +20277,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-464",
-   "self_type" : "type-463",
+   "referenced_type" : "type-461",
+   "self_type" : "type-460",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20221,8 +20287,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-674",
-   "self_type" : "type-673",
+   "referenced_type" : "type-675",
+   "self_type" : "type-674",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20241,8 +20307,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-888",
-   "self_type" : "type-887",
+   "referenced_type" : "type-890",
+   "self_type" : "type-889",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20251,8 +20317,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-945",
-   "self_type" : "type-944",
+   "referenced_type" : "type-946",
+   "self_type" : "type-945",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20261,8 +20327,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1026",
-   "self_type" : "type-1025",
+   "referenced_type" : "type-1027",
+   "self_type" : "type-1026",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20281,8 +20347,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1821",
-   "self_type" : "type-1820",
+   "referenced_type" : "type-1822",
+   "self_type" : "type-1821",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20291,8 +20357,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1988",
-   "self_type" : "type-1987",
+   "referenced_type" : "type-1989",
+   "self_type" : "type-1988",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20301,8 +20367,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2218",
-   "self_type" : "type-2217",
+   "referenced_type" : "type-2220",
+   "self_type" : "type-2219",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20311,8 +20377,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2283",
-   "self_type" : "type-2282",
+   "referenced_type" : "type-2285",
+   "self_type" : "type-2284",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20321,8 +20387,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2323",
-   "self_type" : "type-2322",
+   "referenced_type" : "type-2325",
+   "self_type" : "type-2324",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20331,8 +20397,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2374",
-   "self_type" : "type-2373",
+   "referenced_type" : "type-2376",
+   "self_type" : "type-2375",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20341,8 +20407,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2546",
-   "self_type" : "type-2545",
+   "referenced_type" : "type-2548",
+   "self_type" : "type-2547",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20351,8 +20417,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-473",
-   "self_type" : "type-472",
+   "referenced_type" : "type-470",
+   "self_type" : "type-469",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20361,8 +20427,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-794",
-   "self_type" : "type-793",
+   "referenced_type" : "type-795",
+   "self_type" : "type-794",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20371,8 +20437,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-898",
-   "self_type" : "type-897",
+   "referenced_type" : "type-899",
+   "self_type" : "type-898",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20381,8 +20447,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-954",
-   "self_type" : "type-953",
+   "referenced_type" : "type-955",
+   "self_type" : "type-954",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20391,8 +20457,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-1024",
-   "self_type" : "type-1023",
+   "referenced_type" : "type-1025",
+   "self_type" : "type-1024",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20411,8 +20477,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-1819",
-   "self_type" : "type-1818",
+   "referenced_type" : "type-1820",
+   "self_type" : "type-1819",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20421,8 +20487,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-1986",
-   "self_type" : "type-1985",
+   "referenced_type" : "type-1987",
+   "self_type" : "type-1986",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20431,8 +20497,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2216",
-   "self_type" : "type-2215",
+   "referenced_type" : "type-2218",
+   "self_type" : "type-2217",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20441,8 +20507,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2281",
-   "self_type" : "type-2280",
+   "referenced_type" : "type-2283",
+   "self_type" : "type-2282",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20451,8 +20517,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2321",
-   "self_type" : "type-2320",
+   "referenced_type" : "type-2323",
+   "self_type" : "type-2322",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20461,8 +20527,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2372",
-   "self_type" : "type-2371",
+   "referenced_type" : "type-2374",
+   "self_type" : "type-2373",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20471,8 +20537,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2544",
-   "self_type" : "type-2543",
+   "referenced_type" : "type-2546",
+   "self_type" : "type-2545",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20481,8 +20547,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-471",
-   "self_type" : "type-470",
+   "referenced_type" : "type-468",
+   "self_type" : "type-467",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20491,8 +20557,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-792",
-   "self_type" : "type-791",
+   "referenced_type" : "type-793",
+   "self_type" : "type-792",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20501,8 +20567,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-896",
-   "self_type" : "type-895",
+   "referenced_type" : "type-897",
+   "self_type" : "type-896",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20511,8 +20577,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-952",
-   "self_type" : "type-951",
+   "referenced_type" : "type-953",
+   "self_type" : "type-952",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20521,8 +20587,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-1022",
-   "self_type" : "type-1021",
+   "referenced_type" : "type-1023",
+   "self_type" : "type-1022",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20541,8 +20607,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-1817",
-   "self_type" : "type-1816",
+   "referenced_type" : "type-1818",
+   "self_type" : "type-1817",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20551,8 +20617,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-1983",
-   "self_type" : "type-1982",
+   "referenced_type" : "type-1985",
+   "self_type" : "type-1984",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20561,8 +20627,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2214",
-   "self_type" : "type-2213",
+   "referenced_type" : "type-2216",
+   "self_type" : "type-2215",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20571,8 +20637,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2279",
-   "self_type" : "type-2278",
+   "referenced_type" : "type-2281",
+   "self_type" : "type-2280",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20581,8 +20647,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2319",
-   "self_type" : "type-2318",
+   "referenced_type" : "type-2321",
+   "self_type" : "type-2320",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20591,8 +20657,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2370",
-   "self_type" : "type-2369",
+   "referenced_type" : "type-2372",
+   "self_type" : "type-2371",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20601,8 +20667,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2542",
-   "self_type" : "type-2541",
+   "referenced_type" : "type-2544",
+   "self_type" : "type-2543",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20611,8 +20677,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-468",
-   "self_type" : "type-467",
+   "referenced_type" : "type-466",
+   "self_type" : "type-465",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20621,8 +20687,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-790",
-   "self_type" : "type-789",
+   "referenced_type" : "type-791",
+   "self_type" : "type-790",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20631,8 +20697,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-894",
-   "self_type" : "type-893",
+   "referenced_type" : "type-895",
+   "self_type" : "type-894",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20641,8 +20707,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-950",
-   "self_type" : "type-949",
+   "referenced_type" : "type-951",
+   "self_type" : "type-950",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20671,8 +20737,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-1815",
-   "self_type" : "type-1814",
+   "referenced_type" : "type-1816",
+   "self_type" : "type-1815",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20681,8 +20747,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-1981",
-   "self_type" : "type-1980",
+   "referenced_type" : "type-1983",
+   "self_type" : "type-1982",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20691,8 +20757,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2212",
-   "self_type" : "type-2211",
+   "referenced_type" : "type-2214",
+   "self_type" : "type-2213",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20701,8 +20767,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2277",
-   "self_type" : "type-2276",
+   "referenced_type" : "type-2279",
+   "self_type" : "type-2278",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20711,8 +20777,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2317",
-   "self_type" : "type-2316",
+   "referenced_type" : "type-2319",
+   "self_type" : "type-2318",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20721,8 +20787,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2368",
-   "self_type" : "type-2367",
+   "referenced_type" : "type-2370",
+   "self_type" : "type-2369",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20731,8 +20797,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2540",
-   "self_type" : "type-2539",
+   "referenced_type" : "type-2542",
+   "self_type" : "type-2541",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20741,8 +20807,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-466",
-   "self_type" : "type-465",
+   "referenced_type" : "type-464",
+   "self_type" : "type-463",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20751,8 +20817,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-788",
-   "self_type" : "type-787",
+   "referenced_type" : "type-789",
+   "self_type" : "type-788",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20761,8 +20827,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-892",
-   "self_type" : "type-891",
+   "referenced_type" : "type-893",
+   "self_type" : "type-892",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20771,8 +20837,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-947",
-   "self_type" : "type-946",
+   "referenced_type" : "type-948",
+   "self_type" : "type-947",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20781,8 +20847,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1028",
-   "self_type" : "type-1027",
+   "referenced_type" : "type-1029",
+   "self_type" : "type-1028",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20801,8 +20867,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1823",
-   "self_type" : "type-1822",
+   "referenced_type" : "type-1824",
+   "self_type" : "type-1823",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20811,8 +20877,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1990",
-   "self_type" : "type-1989",
+   "referenced_type" : "type-1992",
+   "self_type" : "type-1991",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20821,8 +20887,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2220",
-   "self_type" : "type-2219",
+   "referenced_type" : "type-2223",
+   "self_type" : "type-2222",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20831,8 +20897,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2285",
-   "self_type" : "type-2284",
+   "referenced_type" : "type-2287",
+   "self_type" : "type-2286",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20841,8 +20907,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2325",
-   "self_type" : "type-2324",
+   "referenced_type" : "type-2327",
+   "self_type" : "type-2326",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20851,8 +20917,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2376",
-   "self_type" : "type-2375",
+   "referenced_type" : "type-2378",
+   "self_type" : "type-2377",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20861,8 +20927,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2548",
-   "self_type" : "type-2547",
+   "referenced_type" : "type-2550",
+   "self_type" : "type-2549",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20871,8 +20937,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-475",
-   "self_type" : "type-474",
+   "referenced_type" : "type-472",
+   "self_type" : "type-471",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20891,8 +20957,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-900",
-   "self_type" : "type-899",
+   "referenced_type" : "type-901",
+   "self_type" : "type-900",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20901,8 +20967,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-956",
-   "self_type" : "type-955",
+   "referenced_type" : "type-957",
+   "self_type" : "type-956",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20911,8 +20977,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1633",
-   "self_type" : "type-1632",
+   "referenced_type" : "type-1637",
+   "self_type" : "type-1636",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20921,8 +20987,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-168",
-   "self_type" : "type-167",
+   "referenced_type" : "type-170",
+   "self_type" : "type-169",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20931,8 +20997,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1870",
-   "self_type" : "type-1869",
+   "referenced_type" : "type-1871",
+   "self_type" : "type-1870",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20941,8 +21007,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1943",
-   "self_type" : "type-1942",
+   "referenced_type" : "type-1944",
+   "self_type" : "type-1943",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20951,8 +21017,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2083",
-   "self_type" : "type-2082",
+   "referenced_type" : "type-2085",
+   "self_type" : "type-2084",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20961,8 +21027,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2179",
-   "self_type" : "type-2178",
+   "referenced_type" : "type-2182",
+   "self_type" : "type-2181",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20971,8 +21037,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2251",
-   "self_type" : "type-2250",
+   "referenced_type" : "type-2253",
+   "self_type" : "type-2252",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20981,8 +21047,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-426",
-   "self_type" : "type-425",
+   "referenced_type" : "type-423",
+   "self_type" : "type-422",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20991,8 +21057,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-646",
-   "self_type" : "type-645",
+   "referenced_type" : "type-647",
+   "self_type" : "type-646",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -21001,8 +21067,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-756",
-   "self_type" : "type-755",
+   "referenced_type" : "type-757",
+   "self_type" : "type-756",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -21021,8 +21087,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1016",
-   "self_type" : "type-1015",
+   "referenced_type" : "type-1008",
+   "self_type" : "type-1007",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -21031,8 +21097,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1766",
-   "self_type" : "type-1765",
+   "referenced_type" : "type-1767",
+   "self_type" : "type-1766",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -21041,8 +21107,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2104",
-   "self_type" : "type-2103",
+   "referenced_type" : "type-2100",
+   "self_type" : "type-2099",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -21051,8 +21117,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-1758",
-   "self_type" : "type-1757",
+   "referenced_type" : "type-1759",
+   "self_type" : "type-1758",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -21061,8 +21127,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-1876",
-   "self_type" : "type-1875",
+   "referenced_type" : "type-1877",
+   "self_type" : "type-1876",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -21071,46 +21137,6 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-2403",
-   "self_type" : "type-2402",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::float_denorm_style",
-   "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-768",
-   "self_type" : "type-767",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::float_round_style",
-   "name" : "const std::float_round_style",
-   "referenced_type" : "type-1761",
-   "self_type" : "type-1760",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::float_round_style",
-   "name" : "const std::float_round_style",
-   "referenced_type" : "type-1946",
-   "self_type" : "type-1945",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::float_round_style",
-   "name" : "const std::float_round_style",
    "referenced_type" : "type-2405",
    "self_type" : "type-2404",
    "size" : 4,
@@ -21119,10 +21145,50 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const std::float_denorm_style",
+   "name" : "const std::float_denorm_style",
+   "referenced_type" : "type-762",
+   "self_type" : "type-761",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const std::float_round_style",
    "name" : "const std::float_round_style",
-   "referenced_type" : "type-858",
-   "self_type" : "type-857",
+   "referenced_type" : "type-1762",
+   "self_type" : "type-1761",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::float_round_style",
+   "name" : "const std::float_round_style",
+   "referenced_type" : "type-1947",
+   "self_type" : "type-1946",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::float_round_style",
+   "name" : "const std::float_round_style",
+   "referenced_type" : "type-2407",
+   "self_type" : "type-2406",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::float_round_style",
+   "name" : "const std::float_round_style",
+   "referenced_type" : "type-855",
+   "self_type" : "type-854",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -21141,8 +21207,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<float (float)>",
    "name" : "const std::function<float (float)>",
-   "referenced_type" : "type-1778",
-   "self_type" : "type-1777",
+   "referenced_type" : "type-1779",
+   "self_type" : "type-1778",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -21151,8 +21217,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<float (float)>",
    "name" : "const std::function<float (float)>",
-   "referenced_type" : "type-2223",
-   "self_type" : "type-2222",
+   "referenced_type" : "type-2225",
+   "self_type" : "type-2224",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -21161,8 +21227,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-1392",
-   "self_type" : "type-1391",
+   "referenced_type" : "type-1396",
+   "self_type" : "type-1395",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -21171,8 +21237,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-1840",
-   "self_type" : "type-1839",
+   "referenced_type" : "type-1841",
+   "self_type" : "type-1840",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -21181,8 +21247,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-2663",
-   "self_type" : "type-2662",
+   "referenced_type" : "type-2668",
+   "self_type" : "type-2667",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -21191,8 +21257,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> >",
    "name" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> >",
-   "referenced_type" : "type-2331",
-   "self_type" : "type-2330",
+   "referenced_type" : "type-2333",
+   "self_type" : "type-2332",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -21211,8 +21277,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1032",
-   "self_type" : "type-1031",
+   "referenced_type" : "type-1033",
+   "self_type" : "type-1032",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21231,8 +21297,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1582",
-   "self_type" : "type-1581",
+   "referenced_type" : "type-1586",
+   "self_type" : "type-1585",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21241,8 +21307,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1713",
-   "self_type" : "type-1712",
+   "referenced_type" : "type-1714",
+   "self_type" : "type-1713",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21251,8 +21317,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1826",
-   "self_type" : "type-1825",
+   "referenced_type" : "type-1827",
+   "self_type" : "type-1826",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21261,8 +21327,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1852",
-   "self_type" : "type-1851",
+   "referenced_type" : "type-1853",
+   "self_type" : "type-1852",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21271,8 +21337,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1903",
-   "self_type" : "type-1902",
+   "referenced_type" : "type-1904",
+   "self_type" : "type-1903",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21281,8 +21347,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1994",
-   "self_type" : "type-1993",
+   "referenced_type" : "type-1995",
+   "self_type" : "type-1994",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21291,8 +21357,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2075",
-   "self_type" : "type-2074",
+   "referenced_type" : "type-2077",
+   "self_type" : "type-2076",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21301,8 +21367,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2150",
-   "self_type" : "type-2149",
+   "referenced_type" : "type-2153",
+   "self_type" : "type-2152",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21311,8 +21377,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2233",
-   "self_type" : "type-2232",
+   "referenced_type" : "type-2235",
+   "self_type" : "type-2234",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21321,8 +21387,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2328",
-   "self_type" : "type-2327",
+   "referenced_type" : "type-2330",
+   "self_type" : "type-2329",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21331,8 +21397,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2379",
-   "self_type" : "type-2378",
+   "referenced_type" : "type-2381",
+   "self_type" : "type-2380",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21341,8 +21407,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2566",
-   "self_type" : "type-2565",
+   "referenced_type" : "type-2568",
+   "self_type" : "type-2567",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21351,8 +21417,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-329",
-   "self_type" : "type-328",
+   "referenced_type" : "type-326",
+   "self_type" : "type-325",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21361,8 +21427,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-46",
-   "self_type" : "type-45",
+   "referenced_type" : "type-476",
+   "self_type" : "type-475",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21371,8 +21437,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-479",
-   "self_type" : "type-478",
+   "referenced_type" : "type-48",
+   "self_type" : "type-47",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21391,8 +21457,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-727",
-   "self_type" : "type-726",
+   "referenced_type" : "type-728",
+   "self_type" : "type-727",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21401,8 +21467,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-833",
-   "self_type" : "type-832",
+   "referenced_type" : "type-834",
+   "self_type" : "type-833",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21411,8 +21477,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-960",
-   "self_type" : "type-959",
+   "referenced_type" : "type-962",
+   "self_type" : "type-961",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21421,8 +21487,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned char",
    "name" : "const unsigned char",
-   "referenced_type" : "type-218",
-   "self_type" : "type-224",
+   "referenced_type" : "type-220",
+   "self_type" : "type-226",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -21431,8 +21497,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned int",
    "name" : "const unsigned int",
-   "referenced_type" : "type-123",
-   "self_type" : "type-236",
+   "referenced_type" : "type-125",
+   "self_type" : "type-238",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
   },
@@ -21441,8 +21507,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned long long",
    "name" : "const unsigned long long",
-   "referenced_type" : "type-124",
-   "self_type" : "type-226",
+   "referenced_type" : "type-126",
+   "self_type" : "type-228",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -21460,7 +21526,7 @@
    "is_const" : true,
    "linker_set_key" : "const void",
    "name" : "const void",
-   "referenced_type" : "type-151",
+   "referenced_type" : "type-154",
    "self_type" : "type-1118",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -21469,8 +21535,8 @@
    "is_const" : true,
    "linker_set_key" : "unsigned int const[3]",
    "name" : "unsigned int const[3]",
-   "referenced_type" : "type-941",
-   "self_type" : "type-948",
+   "referenced_type" : "type-935",
+   "self_type" : "type-942",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -21480,7 +21546,7 @@
    "linker_set_key" : "volatile bool",
    "name" : "volatile bool",
    "referenced_type" : "type-6",
-   "self_type" : "type-270",
+   "self_type" : "type-266",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Thread.h"
   },
@@ -21489,8 +21555,8 @@
    "is_volatile" : true,
    "linker_set_key" : "volatile int",
    "name" : "volatile int",
-   "referenced_type" : "type-103",
-   "self_type" : "type-275",
+   "referenced_type" : "type-105",
+   "self_type" : "type-271",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   }
@@ -21503,48 +21569,48 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "layers",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "format",
      "field_offset" : 96,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "usage",
      "field_offset" : 128,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "stride",
      "field_offset" : 192,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "rfu0",
      "field_offset" : 224,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "rfu1",
      "field_offset" : 256,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "AHardwareBuffer_Desc",
    "name" : "AHardwareBuffer_Desc",
-   "referenced_type" : "type-683",
-   "self_type" : "type-683",
+   "referenced_type" : "type-685",
+   "self_type" : "type-685",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
    "unique_id" : "AHardwareBuffer_Desc"
@@ -21555,23 +21621,23 @@
    [
     {
      "field_name" : "data",
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "pixelStride",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "rowStride",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "linker_set_key" : "AHardwareBuffer_Plane",
    "name" : "AHardwareBuffer_Plane",
-   "referenced_type" : "type-509",
-   "self_type" : "type-509",
+   "referenced_type" : "type-506",
+   "self_type" : "type-506",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
    "unique_id" : "AHardwareBuffer_Plane"
@@ -21582,18 +21648,18 @@
    [
     {
      "field_name" : "planeCount",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "planes",
      "field_offset" : 32,
-     "referenced_type" : "type-508"
+     "referenced_type" : "type-505"
     }
    ],
    "linker_set_key" : "AHardwareBuffer_Planes",
    "name" : "AHardwareBuffer_Planes",
-   "referenced_type" : "type-507",
-   "self_type" : "type-507",
+   "referenced_type" : "type-504",
+   "self_type" : "type-504",
    "size" : 52,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
    "unique_id" : "AHardwareBuffer_Planes"
@@ -21604,63 +21670,63 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-518"
+     "referenced_type" : "type-516"
     },
     {
      "field_name" : "width",
      "field_offset" : 256,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "height",
      "field_offset" : 288,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "stride",
      "field_offset" : 320,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "format",
      "field_offset" : 352,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "usage_deprecated",
      "field_offset" : 384,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "layerCount",
      "field_offset" : 416,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 448,
-     "referenced_type" : "type-523"
+     "referenced_type" : "type-521"
     },
     {
      "field_name" : "handle",
      "field_offset" : 480,
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
      "field_name" : "usage",
      "field_offset" : 512,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "reserved_proc",
      "field_offset" : 576,
-     "referenced_type" : "type-524"
+     "referenced_type" : "type-522"
     }
    ],
    "linker_set_key" : "ANativeWindowBuffer",
    "name" : "ANativeWindowBuffer",
-   "referenced_type" : "type-517",
-   "self_type" : "type-517",
+   "referenced_type" : "type-515",
+   "self_type" : "type-515",
    "size" : 96,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
    "unique_id" : "ANativeWindowBuffer"
@@ -21671,22 +21737,22 @@
    [
     {
      "field_name" : "left",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "top",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "right",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "bottom",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "ARect",
@@ -21703,7 +21769,7 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-547"
+     "referenced_type" : "type-544"
     },
     {
      "field_name" : "alloc",
@@ -21739,20 +21805,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-517"
+     "referenced_type" : "type-515"
     },
     {
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
    "name" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
    "record_kind" : "class",
-   "referenced_type" : "type-516",
-   "self_type" : "type-516",
+   "referenced_type" : "type-514",
+   "self_type" : "type-514",
    "size" : 104,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h",
-   "template_args" : [ "type-517", "type-525", "type-172", "type-518" ],
+   "template_args" : [ "type-515", "type-523", "type-175", "type-516" ],
    "unique_id" : "_ZTSN7android17ANativeObjectBaseI19ANativeWindowBufferNS_13GraphicBufferENS_7RefBaseE21android_native_base_tEE",
    "vtable_components" :
    [
@@ -21840,7 +21906,7 @@
      "access" : "private",
      "field_name" : "mWhitePoint",
      "field_offset" : 1664,
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     }
    ],
    "linker_set_key" : "android::ColorSpace",
@@ -21947,14 +22013,14 @@
     {
      "access" : "private",
      "field_name" : "mCond",
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-255"
     }
    ],
    "linker_set_key" : "android::Condition",
    "name" : "android::Condition",
    "record_kind" : "class",
-   "referenced_type" : "type-258",
-   "self_type" : "type-258",
+   "referenced_type" : "type-254",
+   "self_type" : "type-254",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "unique_id" : "_ZTSN7android9ConditionE"
@@ -21995,13 +22061,13 @@
     {
      "access" : "private",
      "field_name" : "mState",
-     "referenced_type" : "type-1377"
+     "referenced_type" : "type-1382"
     },
     {
      "access" : "private",
      "field_name" : "mMutex",
      "field_offset" : 32,
-     "referenced_type" : "type-1379"
+     "referenced_type" : "type-1384"
     },
     {
      "access" : "private",
@@ -22013,14 +22079,14 @@
      "access" : "private",
      "field_name" : "mSignalTime",
      "field_offset" : 128,
-     "referenced_type" : "type-1380"
+     "referenced_type" : "type-1385"
     }
    ],
    "linker_set_key" : "android::FenceTime",
    "name" : "android::FenceTime",
    "record_kind" : "class",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1376",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1381",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android9FenceTimeE"
@@ -22030,14 +22096,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1385"
+     "referenced_type" : "type-1389"
     }
    ],
    "fields" :
    [
     {
      "field_name" : "state",
-     "referenced_type" : "type-1384"
+     "referenced_type" : "type-1388"
     },
     {
      "field_name" : "fence",
@@ -22047,13 +22113,13 @@
     {
      "field_name" : "signalTime",
      "field_offset" : 64,
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
    "linker_set_key" : "android::FenceTime::Snapshot",
    "name" : "android::FenceTime::Snapshot",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1383",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1387",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android9FenceTime8SnapshotE"
@@ -22065,20 +22131,20 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-1398"
+     "referenced_type" : "type-1402"
     },
     {
      "access" : "private",
      "field_name" : "mQueue",
      "field_offset" : 32,
-     "referenced_type" : "type-1399"
+     "referenced_type" : "type-1403"
     }
    ],
    "linker_set_key" : "android::FenceTimeline",
    "name" : "android::FenceTimeline",
    "record_kind" : "class",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1397",
+   "referenced_type" : "type-1401",
+   "self_type" : "type-1401",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android13FenceTimelineE"
@@ -22090,20 +22156,20 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-1403"
+     "referenced_type" : "type-1407"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-1404"
+     "referenced_type" : "type-1408"
     }
    ],
    "linker_set_key" : "android::FenceToFenceTimeMap",
    "name" : "android::FenceToFenceTimeMap",
    "record_kind" : "class",
-   "referenced_type" : "type-1402",
-   "self_type" : "type-1402",
+   "referenced_type" : "type-1406",
+   "self_type" : "type-1406",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android19FenceToFenceTimeMapE"
@@ -22125,11 +22191,11 @@
    "linker_set_key" : "android::Flattenable<android::FenceTime::Snapshot>",
    "name" : "android::Flattenable<android::FenceTime::Snapshot>",
    "record_kind" : "class",
-   "referenced_type" : "type-1385",
-   "self_type" : "type-1385",
+   "referenced_type" : "type-1389",
+   "self_type" : "type-1389",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1383" ],
+   "template_args" : [ "type-1387" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_9FenceTime8SnapshotEEE"
   },
   {
@@ -22137,11 +22203,11 @@
    "linker_set_key" : "android::Flattenable<android::GraphicBuffer>",
    "name" : "android::Flattenable<android::GraphicBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-532",
-   "self_type" : "type-532",
+   "referenced_type" : "type-530",
+   "self_type" : "type-530",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-525" ],
+   "template_args" : [ "type-523" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_13GraphicBufferEEE"
   },
   {
@@ -22193,36 +22259,36 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1419"
+     "referenced_type" : "type-1423"
     }
    ],
    "fields" :
    [
     {
      "field_name" : "refreshPeriodNano",
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     },
     {
      "field_name" : "desiredPresentTimesNano",
      "field_offset" : 64,
-     "referenced_type" : "type-1421"
+     "referenced_type" : "type-1425"
     },
     {
      "field_name" : "actualPresentTimesNano",
      "field_offset" : 224,
-     "referenced_type" : "type-1421"
+     "referenced_type" : "type-1425"
     },
     {
      "field_name" : "frameReadyTimesNano",
      "field_offset" : 384,
-     "referenced_type" : "type-1421"
+     "referenced_type" : "type-1425"
     }
    ],
    "linker_set_key" : "android::FrameStats",
    "name" : "android::FrameStats",
    "record_kind" : "class",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1420",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1424",
    "size" : 68,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h",
    "unique_id" : "_ZTSN7android10FrameStatsE"
@@ -22232,7 +22298,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-359"
+     "referenced_type" : "type-356"
     }
    ],
    "fields" :
@@ -22241,20 +22307,20 @@
      "access" : "private",
      "field_name" : "mMapper",
      "field_offset" : 32,
-     "referenced_type" : "type-354"
+     "referenced_type" : "type-351"
     },
     {
      "access" : "private",
      "field_name" : "mAllocator",
      "field_offset" : 64,
-     "referenced_type" : "type-355"
+     "referenced_type" : "type-352"
     }
    ],
    "linker_set_key" : "android::Gralloc2Allocator",
    "name" : "android::Gralloc2Allocator",
    "record_kind" : "class",
-   "referenced_type" : "type-353",
-   "self_type" : "type-353",
+   "referenced_type" : "type-350",
+   "self_type" : "type-350",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h",
    "unique_id" : "_ZTSN7android17Gralloc2AllocatorE",
@@ -22291,7 +22357,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-342"
+     "referenced_type" : "type-339"
     }
    ],
    "fields" :
@@ -22300,20 +22366,20 @@
      "access" : "private",
      "field_name" : "mMapper",
      "field_offset" : 32,
-     "referenced_type" : "type-338"
+     "referenced_type" : "type-335"
     },
     {
      "access" : "private",
      "field_name" : "mMapperV2_1",
      "field_offset" : 64,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-88"
     }
    ],
    "linker_set_key" : "android::Gralloc2Mapper",
    "name" : "android::Gralloc2Mapper",
    "record_kind" : "class",
-   "referenced_type" : "type-337",
-   "self_type" : "type-337",
+   "referenced_type" : "type-334",
+   "self_type" : "type-334",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h",
    "unique_id" : "_ZTSN7android14Gralloc2MapperE",
@@ -22371,10 +22437,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-516"
+     "referenced_type" : "type-514"
     },
     {
-     "referenced_type" : "type-532"
+     "referenced_type" : "type-530"
     }
    ],
    "fields" :
@@ -22383,62 +22449,62 @@
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 832,
-     "referenced_type" : "type-218"
+     "referenced_type" : "type-220"
     },
     {
      "access" : "private",
      "field_name" : "mBufferMapper",
      "field_offset" : 864,
-     "referenced_type" : "type-526"
+     "referenced_type" : "type-524"
     },
     {
      "access" : "private",
      "field_name" : "mInitCheck",
      "field_offset" : 896,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mTransportNumFds",
      "field_offset" : 928,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mTransportNumInts",
      "field_offset" : 960,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mId",
      "field_offset" : 992,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
      "field_name" : "mBufferId",
      "field_offset" : 1056,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mGenerationNumber",
      "field_offset" : 1088,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mDeathCallbacks",
      "field_offset" : 1120,
-     "referenced_type" : "type-531"
+     "referenced_type" : "type-529"
     }
    ],
    "linker_set_key" : "android::GraphicBuffer",
    "name" : "android::GraphicBuffer",
    "record_kind" : "class",
-   "referenced_type" : "type-525",
-   "self_type" : "type-525",
+   "referenced_type" : "type-523",
+   "self_type" : "type-523",
    "size" : 152,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h",
    "unique_id" : "_ZTSN7android13GraphicBufferE",
@@ -22478,7 +22544,91 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "protected",
+     "field_name" : "mMapper",
+     "referenced_type" : "type-524"
+    },
+    {
+     "access" : "protected",
+     "field_name" : "mAllocator",
+     "field_offset" : 32,
+     "referenced_type" : "type-540"
+    }
+   ],
+   "linker_set_key" : "android::GraphicBufferAllocator",
+   "name" : "android::GraphicBufferAllocator",
+   "record_kind" : "class",
+   "referenced_type" : "type-539",
+   "self_type" : "type-539",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h",
+   "unique_id" : "_ZTSN7android22GraphicBufferAllocatorE"
+  },
+  {
+   "access" : "protected",
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "width",
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "height",
+     "field_offset" : 32,
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "stride",
+     "field_offset" : 64,
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "format",
+     "field_offset" : 96,
+     "referenced_type" : "type-105"
+    },
+    {
+     "field_name" : "layerCount",
+     "field_offset" : 128,
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "usage",
+     "field_offset" : 160,
+     "referenced_type" : "type-126"
+    },
+    {
+     "field_name" : "size",
+     "field_offset" : 224,
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "requestorName",
+     "field_offset" : 256,
+     "referenced_type" : "type-681"
+    }
+   ],
+   "linker_set_key" : "android::GraphicBufferAllocator::alloc_rec_t",
+   "name" : "android::GraphicBufferAllocator::alloc_rec_t",
+   "referenced_type" : "type-680",
+   "self_type" : "type-680",
+   "size" : 44,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h",
+   "unique_id" : "_ZTSN7android22GraphicBufferAllocator11alloc_rec_tE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-528"
     }
    ],
    "fields" :
@@ -22490,100 +22640,16 @@
     },
     {
      "access" : "private",
-     "field_name" : "mAllocator",
-     "field_offset" : 32,
-     "referenced_type" : "type-543"
-    }
-   ],
-   "linker_set_key" : "android::GraphicBufferAllocator",
-   "name" : "android::GraphicBufferAllocator",
-   "record_kind" : "class",
-   "referenced_type" : "type-542",
-   "self_type" : "type-542",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h",
-   "unique_id" : "_ZTSN7android22GraphicBufferAllocatorE"
-  },
-  {
-   "access" : "private",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "width",
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "height",
-     "field_offset" : 32,
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "stride",
-     "field_offset" : 64,
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "format",
-     "field_offset" : 96,
-     "referenced_type" : "type-103"
-    },
-    {
-     "field_name" : "layerCount",
-     "field_offset" : 128,
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "usage",
-     "field_offset" : 160,
-     "referenced_type" : "type-124"
-    },
-    {
-     "field_name" : "size",
-     "field_offset" : 224,
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "requestorName",
-     "field_offset" : 256,
-     "referenced_type" : "type-677"
-    }
-   ],
-   "linker_set_key" : "android::GraphicBufferAllocator::alloc_rec_t",
-   "name" : "android::GraphicBufferAllocator::alloc_rec_t",
-   "referenced_type" : "type-676",
-   "self_type" : "type-676",
-   "size" : 44,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h",
-   "unique_id" : "_ZTSN7android22GraphicBufferAllocator11alloc_rec_tE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-530"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMapper",
-     "referenced_type" : "type-528"
-    },
-    {
-     "access" : "private",
      "field_name" : "mMapperVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-529"
+     "referenced_type" : "type-527"
     }
    ],
    "linker_set_key" : "android::GraphicBufferMapper",
    "name" : "android::GraphicBufferMapper",
    "record_kind" : "class",
-   "referenced_type" : "type-527",
-   "self_type" : "type-527",
+   "referenced_type" : "type-525",
+   "self_type" : "type-525",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h",
    "unique_id" : "_ZTSN7android19GraphicBufferMapperE"
@@ -22638,17 +22704,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-235"
     }
    ],
    "linker_set_key" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
    "name" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
    "record_kind" : "class",
-   "referenced_type" : "type-247",
-   "self_type" : "type-247",
+   "referenced_type" : "type-249",
+   "self_type" : "type-249",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-179", "type-248" ],
+   "template_args" : [ "type-182", "type-250" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
   },
   {
@@ -22664,11 +22730,11 @@
    "linker_set_key" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "record_kind" : "class",
-   "referenced_type" : "type-715",
-   "self_type" : "type-715",
+   "referenced_type" : "type-716",
+   "self_type" : "type-716",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-142", "type-676" ],
+   "template_args" : [ "type-145", "type-680" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -22676,11 +22742,11 @@
    "linker_set_key" : "android::LightFlattenable<android::FrameStats>",
    "name" : "android::LightFlattenable<android::FrameStats>",
    "record_kind" : "class",
-   "referenced_type" : "type-1419",
-   "self_type" : "type-1419",
+   "referenced_type" : "type-1423",
+   "self_type" : "type-1423",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1420" ],
+   "template_args" : [ "type-1424" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_10FrameStatsEEE"
   },
   {
@@ -22724,11 +22790,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Region>",
    "name" : "android::LightFlattenable<android::Region>",
    "record_kind" : "class",
-   "referenced_type" : "type-2390",
-   "self_type" : "type-2390",
+   "referenced_type" : "type-2392",
+   "self_type" : "type-2392",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-2389" ],
+   "template_args" : [ "type-2391" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_6RegionEEE"
   },
   {
@@ -22834,14 +22900,14 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-281"
     }
    ],
    "linker_set_key" : "android::Mutex",
    "name" : "android::Mutex",
    "record_kind" : "class",
-   "referenced_type" : "type-252",
-   "self_type" : "type-252",
+   "referenced_type" : "type-280",
+   "self_type" : "type-280",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5MutexE"
@@ -22853,14 +22919,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-256"
+     "referenced_type" : "type-1379"
     }
    ],
    "linker_set_key" : "android::Mutex::Autolock",
    "name" : "android::Mutex::Autolock",
    "record_kind" : "class",
-   "referenced_type" : "type-255",
-   "self_type" : "type-255",
+   "referenced_type" : "type-1378",
+   "self_type" : "type-1378",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5Mutex8AutolockE"
@@ -22909,12 +22975,12 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "y",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::Point",
@@ -22933,14 +22999,14 @@
     {
      "access" : "private",
      "field_name" : "mRWLock",
-     "referenced_type" : "type-263"
+     "referenced_type" : "type-259"
     }
    ],
    "linker_set_key" : "android::RWLock",
    "name" : "android::RWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-262",
-   "self_type" : "type-262",
+   "referenced_type" : "type-258",
+   "self_type" : "type-258",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLockE"
@@ -22952,14 +23018,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-262"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoRLock",
    "name" : "android::RWLock::AutoRLock",
    "record_kind" : "class",
-   "referenced_type" : "type-265",
-   "self_type" : "type-265",
+   "referenced_type" : "type-261",
+   "self_type" : "type-261",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
@@ -22971,14 +23037,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-262"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoWLock",
    "name" : "android::RWLock::AutoWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-268",
-   "self_type" : "type-268",
+   "referenced_type" : "type-264",
+   "self_type" : "type-264",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
@@ -23011,14 +23077,14 @@
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 32,
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-176"
     }
    ],
    "linker_set_key" : "android::RefBase",
    "name" : "android::RefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-172",
-   "self_type" : "type-172",
+   "referenced_type" : "type-175",
+   "self_type" : "type-175",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBaseE",
@@ -23058,8 +23124,8 @@
    "linker_set_key" : "android::RefBase::weakref_type",
    "name" : "android::RefBase::weakref_type",
    "record_kind" : "class",
-   "referenced_type" : "type-198",
-   "self_type" : "type-198",
+   "referenced_type" : "type-211",
+   "self_type" : "type-211",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBase12weakref_typeE"
@@ -23105,7 +23171,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2390"
+     "referenced_type" : "type-2392"
     }
    ],
    "fields" :
@@ -23113,14 +23179,14 @@
     {
      "access" : "private",
      "field_name" : "mStorage",
-     "referenced_type" : "type-2382"
+     "referenced_type" : "type-2384"
     }
    ],
    "linker_set_key" : "android::Region",
    "name" : "android::Region",
    "record_kind" : "class",
-   "referenced_type" : "type-2389",
-   "self_type" : "type-2389",
+   "referenced_type" : "type-2391",
+   "self_type" : "type-2391",
    "size" : 20,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h",
    "unique_id" : "_ZTSN7android6RegionE"
@@ -23132,7 +23198,7 @@
     {
      "access" : "private",
      "field_name" : "mTag",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "android::ScopedTrace",
@@ -23149,11 +23215,11 @@
    "linker_set_key" : "android::Singleton<android::GraphicBufferAllocator>",
    "name" : "android::Singleton<android::GraphicBufferAllocator>",
    "record_kind" : "class",
-   "referenced_type" : "type-541",
-   "self_type" : "type-541",
+   "referenced_type" : "type-538",
+   "self_type" : "type-538",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-542" ],
+   "template_args" : [ "type-539" ],
    "unique_id" : "_ZTSN7android9SingletonINS_22GraphicBufferAllocatorEEE"
   },
   {
@@ -23161,11 +23227,11 @@
    "linker_set_key" : "android::Singleton<android::GraphicBufferMapper>",
    "name" : "android::Singleton<android::GraphicBufferMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-530",
-   "self_type" : "type-530",
+   "referenced_type" : "type-528",
+   "self_type" : "type-528",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-527" ],
+   "template_args" : [ "type-525" ],
    "unique_id" : "_ZTSN7android9SingletonINS_19GraphicBufferMapperEEE"
   },
   {
@@ -23174,17 +23240,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-234"
+     "referenced_type" : "type-236"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
    "name" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-233",
-   "self_type" : "type-233",
+   "referenced_type" : "type-235",
+   "self_type" : "type-235",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-237" ],
+   "template_args" : [ "type-239" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
    "vtable_components" :
    [
@@ -23232,7 +23298,7 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-234"
+     "referenced_type" : "type-236"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
@@ -23289,14 +23355,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::SortedVectorImpl",
    "name" : "android::SortedVectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-234",
-   "self_type" : "type-234",
+   "referenced_type" : "type-236",
+   "self_type" : "type-236",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android16SortedVectorImplE",
@@ -23354,14 +23420,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-180"
+     "referenced_type" : "type-183"
     }
    ],
    "linker_set_key" : "android::String16",
    "name" : "android::String16",
    "record_kind" : "class",
-   "referenced_type" : "type-179",
-   "self_type" : "type-179",
+   "referenced_type" : "type-182",
+   "self_type" : "type-182",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "unique_id" : "_ZTSN7android8String16E"
@@ -23373,14 +23439,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     }
    ],
    "linker_set_key" : "android::String8",
    "name" : "android::String8",
    "record_kind" : "class",
-   "referenced_type" : "type-285",
-   "self_type" : "type-285",
+   "referenced_type" : "type-282",
+   "self_type" : "type-282",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "unique_id" : "_ZTSN7android7String8E"
@@ -23391,7 +23457,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "fields" :
@@ -23400,62 +23466,62 @@
      "access" : "private",
      "field_name" : "mCanCallJava",
      "field_offset" : 32,
-     "referenced_type" : "type-370"
+     "referenced_type" : "type-367"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 64,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 96,
-     "referenced_type" : "type-252"
+     "referenced_type" : "type-280"
     },
     {
      "access" : "private",
      "field_name" : "mThreadExitedCondition",
      "field_offset" : 128,
-     "referenced_type" : "type-258"
+     "referenced_type" : "type-254"
     },
     {
      "access" : "private",
      "field_name" : "mStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mExitPending",
      "field_offset" : 192,
-     "referenced_type" : "type-270"
+     "referenced_type" : "type-266"
     },
     {
      "access" : "private",
      "field_name" : "mRunning",
      "field_offset" : 200,
-     "referenced_type" : "type-270"
+     "referenced_type" : "type-266"
     },
     {
      "access" : "private",
      "field_name" : "mHoldSelf",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-364"
     },
     {
      "access" : "private",
      "field_name" : "mTid",
      "field_offset" : 256,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::Thread",
    "name" : "android::Thread",
    "record_kind" : "class",
-   "referenced_type" : "type-369",
-   "self_type" : "type-369",
+   "referenced_type" : "type-366",
+   "self_type" : "type-366",
    "size" : 44,
    "source_file" : "/system/core/libutils/include/utils/Thread.h",
    "unique_id" : "_ZTSN7android6ThreadE",
@@ -23545,14 +23611,14 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::Rect>",
    "name" : "android::Vector<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-2382",
-   "self_type" : "type-2382",
+   "referenced_type" : "type-2384",
+   "self_type" : "type-2384",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-1241" ],
@@ -23600,17 +23666,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::RefBase *>",
    "name" : "android::Vector<android::RefBase *>",
    "record_kind" : "class",
-   "referenced_type" : "type-245",
-   "self_type" : "type-245",
+   "referenced_type" : "type-247",
+   "self_type" : "type-247",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-246" ],
+   "template_args" : [ "type-248" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7RefBaseEEE",
    "vtable_components" :
    [
@@ -23655,17 +23721,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::RefBase::weakref_type *>",
    "name" : "android::Vector<android::RefBase::weakref_type *>",
    "record_kind" : "class",
-   "referenced_type" : "type-244",
-   "self_type" : "type-244",
+   "referenced_type" : "type-246",
+   "self_type" : "type-246",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-197" ],
+   "template_args" : [ "type-210" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7RefBase12weakref_typeEEE",
    "vtable_components" :
    [
@@ -23710,17 +23776,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::BHwBinder *>",
    "name" : "android::Vector<android::hardware::BHwBinder *>",
    "record_kind" : "class",
-   "referenced_type" : "type-240",
-   "self_type" : "type-240",
+   "referenced_type" : "type-242",
+   "self_type" : "type-242",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-241" ],
+   "template_args" : [ "type-243" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_8hardware9BHwBinderEEE",
    "vtable_components" :
    [
@@ -23765,17 +23831,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "record_kind" : "class",
-   "referenced_type" : "type-238",
-   "self_type" : "type-238",
+   "referenced_type" : "type-240",
+   "self_type" : "type-240",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-239" ],
+   "template_args" : [ "type-241" ],
    "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
    "vtable_components" :
    [
@@ -23820,17 +23886,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<long long>",
    "name" : "android::Vector<long long>",
    "record_kind" : "class",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1421",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1425",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android6VectorIxEE",
    "vtable_components" :
    [
@@ -23877,32 +23943,32 @@
      "access" : "private",
      "field_name" : "mStorage",
      "field_offset" : 32,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "access" : "private",
      "field_name" : "mCount",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mFlags",
      "field_offset" : 96,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "access" : "private",
      "field_name" : "mItemSize",
      "field_offset" : 128,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     }
    ],
    "linker_set_key" : "android::VectorImpl",
    "name" : "android::VectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-235",
-   "self_type" : "type-235",
+   "referenced_type" : "type-237",
+   "self_type" : "type-237",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android10VectorImplE",
@@ -23988,11 +24054,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::aggregate_traits<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-824",
-   "self_type" : "type-824",
+   "referenced_type" : "type-825",
+   "self_type" : "type-825",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142", "type-676" ],
+   "template_args" : [ "type-145", "type-680" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -24012,7 +24078,7 @@
     {
      "access" : "private",
      "field_name" : "fd_",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser>",
@@ -24077,28 +24143,28 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2410"
+     "referenced_type" : "type-2412"
+    },
+    {
+     "referenced_type" : "type-2413"
     },
     {
      "referenced_type" : "type-2411"
     },
     {
-     "referenced_type" : "type-2409"
-    },
-    {
-     "referenced_type" : "type-2417"
-    },
-    {
-     "referenced_type" : "type-2419"
+     "referenced_type" : "type-2420"
     },
     {
      "referenced_type" : "type-2421"
     },
     {
-     "referenced_type" : "type-2420"
+     "referenced_type" : "type-2423"
     },
     {
-     "referenced_type" : "type-2423"
+     "referenced_type" : "type-2422"
+    },
+    {
+     "referenced_type" : "type-2425"
     }
    ],
    "fields" :
@@ -24106,14 +24172,14 @@
     {
      "access" : "private",
      "field_name" : "m_value",
-     "referenced_type" : "type-2428"
+     "referenced_type" : "type-2430"
     }
    ],
    "linker_set_key" : "android::details::TMat44<float>",
    "name" : "android::details::TMat44<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2427",
-   "self_type" : "type-2427",
+   "referenced_type" : "type-2429",
+   "self_type" : "type-2429",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h",
    "template_args" : [ "type-10" ],
@@ -24136,8 +24202,8 @@
    "linker_set_key" : "android::details::TMatDebug<android::details::TMat44, float>",
    "name" : "android::details::TMatDebug<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2423",
-   "self_type" : "type-2423",
+   "referenced_type" : "type-2425",
+   "self_type" : "type-2425",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24160,8 +24226,8 @@
    "linker_set_key" : "android::details::TMatHelpers<android::details::TMat44, float>",
    "name" : "android::details::TMatHelpers<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2420",
-   "self_type" : "type-2420",
+   "referenced_type" : "type-2422",
+   "self_type" : "type-2422",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24184,8 +24250,8 @@
    "linker_set_key" : "android::details::TMatProductOperators<android::details::TMat44, float>",
    "name" : "android::details::TMatProductOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2417",
-   "self_type" : "type-2417",
+   "referenced_type" : "type-2420",
+   "self_type" : "type-2420",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24208,8 +24274,8 @@
    "linker_set_key" : "android::details::TMatSquareFunctions<android::details::TMat44, float>",
    "name" : "android::details::TMatSquareFunctions<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2419",
-   "self_type" : "type-2419",
+   "referenced_type" : "type-2421",
+   "self_type" : "type-2421",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24232,8 +24298,8 @@
    "linker_set_key" : "android::details::TMatTransform<android::details::TMat44, float>",
    "name" : "android::details::TMatTransform<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2421",
-   "self_type" : "type-2421",
+   "referenced_type" : "type-2423",
+   "self_type" : "type-2423",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24244,11 +24310,11 @@
    "linker_set_key" : "android::details::TQuatDebug<android::details::TQuaternion, double>",
    "name" : "android::details::TQuatDebug<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-49",
-   "self_type" : "type-49",
+   "referenced_type" : "type-51",
+   "self_type" : "type-51",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details10TQuatDebugINS0_11TQuaternionEdEE"
   },
   {
@@ -24256,8 +24322,8 @@
    "linker_set_key" : "android::details::TQuatDebug<android::details::TQuaternion, float>",
    "name" : "android::details::TQuatDebug<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-48",
-   "self_type" : "type-48",
+   "referenced_type" : "type-50",
+   "self_type" : "type-50",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24268,11 +24334,11 @@
    "linker_set_key" : "android::details::TQuatFunctions<android::details::TQuaternion, double>",
    "name" : "android::details::TQuatFunctions<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-47",
-   "self_type" : "type-47",
+   "referenced_type" : "type-49",
+   "self_type" : "type-49",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details14TQuatFunctionsINS0_11TQuaternionEdEE"
   },
   {
@@ -24280,8 +24346,8 @@
    "linker_set_key" : "android::details::TQuatFunctions<android::details::TQuaternion, float>",
    "name" : "android::details::TQuatFunctions<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-43",
-   "self_type" : "type-43",
+   "referenced_type" : "type-45",
+   "self_type" : "type-45",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24292,11 +24358,11 @@
    "linker_set_key" : "android::details::TQuatProductOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TQuatProductOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-40",
-   "self_type" : "type-40",
+   "referenced_type" : "type-42",
+   "self_type" : "type-42",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details21TQuatProductOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -24316,38 +24382,38 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-334"
+     "referenced_type" : "type-331"
     },
     {
-     "referenced_type" : "type-335"
+     "referenced_type" : "type-332"
     },
     {
-     "referenced_type" : "type-336"
+     "referenced_type" : "type-333"
     },
     {
-     "referenced_type" : "type-40"
-    },
-    {
-     "referenced_type" : "type-47"
+     "referenced_type" : "type-42"
     },
     {
      "referenced_type" : "type-49"
+    },
+    {
+     "referenced_type" : "type-51"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-332"
+     "referenced_type" : "type-329"
     }
    ],
    "linker_set_key" : "android::details::TQuaternion<double>",
    "name" : "android::details::TQuaternion<double>",
    "record_kind" : "class",
-   "referenced_type" : "type-331",
-   "self_type" : "type-331",
+   "referenced_type" : "type-328",
+   "self_type" : "type-328",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details11TQuaternionIdEE"
   },
   {
@@ -24355,27 +24421,27 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-330"
     },
     {
      "field_name" : "xyzw",
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-52"
     },
     {
      "field_name" : "xyz",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-68"
     },
     {
      "field_name" : "xy",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "name" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "record_kind" : "union",
-   "referenced_type" : "type-332",
-   "self_type" : "type-332",
+   "referenced_type" : "type-329",
+   "self_type" : "type-329",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIdEUt_E"
@@ -24386,29 +24452,29 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "z",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "w",
      "field_offset" : 192,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
    "name" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
-   "referenced_type" : "type-333",
-   "self_type" : "type-333",
+   "referenced_type" : "type-330",
+   "self_type" : "type-330",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIdEUt_Ut_E"
@@ -24418,35 +24484,35 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-413"
+     "referenced_type" : "type-410"
     },
     {
-     "referenced_type" : "type-414"
+     "referenced_type" : "type-411"
     },
     {
-     "referenced_type" : "type-415"
+     "referenced_type" : "type-412"
     },
     {
      "referenced_type" : "type-38"
     },
     {
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-50"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-411"
+     "referenced_type" : "type-408"
     }
    ],
    "linker_set_key" : "android::details::TQuaternion<float>",
    "name" : "android::details::TQuaternion<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-410",
-   "self_type" : "type-410",
+   "referenced_type" : "type-407",
+   "self_type" : "type-407",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "template_args" : [ "type-10" ],
@@ -24457,27 +24523,27 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-412"
+     "referenced_type" : "type-409"
     },
     {
      "field_name" : "xyzw",
-     "referenced_type" : "type-200"
+     "referenced_type" : "type-192"
     },
     {
      "field_name" : "xyz",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-18"
     },
     {
      "field_name" : "xy",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "name" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "record_kind" : "union",
-   "referenced_type" : "type-411",
-   "self_type" : "type-411",
+   "referenced_type" : "type-408",
+   "self_type" : "type-408",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIfEUt_E"
@@ -24509,8 +24575,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
    "name" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
-   "referenced_type" : "type-412",
-   "self_type" : "type-412",
+   "referenced_type" : "type-409",
+   "self_type" : "type-409",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIfEUt_Ut_E"
@@ -24520,16 +24586,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-396"
+     "referenced_type" : "type-390"
     },
     {
-     "referenced_type" : "type-427"
+     "referenced_type" : "type-424"
     },
     {
-     "referenced_type" : "type-462"
+     "referenced_type" : "type-455"
     },
     {
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-507"
     },
     {
      "referenced_type" : "type-600"
@@ -24652,12 +24718,6 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-61"
-    },
-    {
      "referenced_type" : "type-62"
     },
     {
@@ -24668,22 +24728,28 @@
     },
     {
      "referenced_type" : "type-65"
+    },
+    {
+     "referenced_type" : "type-66"
+    },
+    {
+     "referenced_type" : "type-67"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-58"
     }
    ],
    "linker_set_key" : "android::details::TVec2<double>",
    "name" : "android::details::TVec2<double>",
    "record_kind" : "class",
-   "referenced_type" : "type-55",
-   "self_type" : "type-55",
+   "referenced_type" : "type-57",
+   "self_type" : "type-57",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details5TVec2IdEE"
   },
   {
@@ -24691,21 +24757,21 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-57"
-    },
-    {
-     "referenced_type" : "type-58"
-    },
-    {
      "referenced_type" : "type-59"
+    },
+    {
+     "referenced_type" : "type-60"
+    },
+    {
+     "referenced_type" : "type-61"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5) at frameworks/native/libs/math/include/math/vec2.h:49:5",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5) at frameworks/native/libs/math/include/math/vec2.h:49:5",
    "record_kind" : "union",
-   "referenced_type" : "type-56",
-   "self_type" : "type-56",
+   "referenced_type" : "type-58",
+   "self_type" : "type-58",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_E"
@@ -24716,19 +24782,19 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:50:9) at frameworks/native/libs/math/include/math/vec2.h:50:9",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:50:9) at frameworks/native/libs/math/include/math/vec2.h:50:9",
-   "referenced_type" : "type-57",
-   "self_type" : "type-57",
+   "referenced_type" : "type-59",
+   "self_type" : "type-59",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_Ut_E"
@@ -24739,19 +24805,19 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "t",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:51:9) at frameworks/native/libs/math/include/math/vec2.h:51:9",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:51:9) at frameworks/native/libs/math/include/math/vec2.h:51:9",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
+   "referenced_type" : "type-60",
+   "self_type" : "type-60",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_Ut0_E"
@@ -24762,19 +24828,19 @@
    [
     {
      "field_name" : "r",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "g",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:52:9) at frameworks/native/libs/math/include/math/vec2.h:52:9",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:52:9) at frameworks/native/libs/math/include/math/vec2.h:52:9",
-   "referenced_type" : "type-59",
-   "self_type" : "type-59",
+   "referenced_type" : "type-61",
+   "self_type" : "type-61",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_Ut1_E"
@@ -24784,9 +24850,6 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-27"
-    },
-    {
      "referenced_type" : "type-28"
     },
     {
@@ -24800,19 +24863,22 @@
     },
     {
      "referenced_type" : "type-32"
+    },
+    {
+     "referenced_type" : "type-33"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-24"
     }
    ],
    "linker_set_key" : "android::details::TVec2<float>",
    "name" : "android::details::TVec2<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-22",
-   "self_type" : "type-22",
+   "referenced_type" : "type-23",
+   "self_type" : "type-23",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "template_args" : [ "type-10" ],
@@ -24823,21 +24889,21 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-24"
-    },
-    {
      "referenced_type" : "type-25"
     },
     {
      "referenced_type" : "type-26"
+    },
+    {
+     "referenced_type" : "type-27"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5) at frameworks/native/libs/math/include/math/vec2.h:49:5",
    "name" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5) at frameworks/native/libs/math/include/math/vec2.h:49:5",
    "record_kind" : "union",
-   "referenced_type" : "type-23",
-   "self_type" : "type-23",
+   "referenced_type" : "type-24",
+   "self_type" : "type-24",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IfEUt_E"
@@ -24859,8 +24925,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:50:9) at frameworks/native/libs/math/include/math/vec2.h:50:9",
    "name" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:50:9) at frameworks/native/libs/math/include/math/vec2.h:50:9",
-   "referenced_type" : "type-24",
-   "self_type" : "type-24",
+   "referenced_type" : "type-25",
+   "self_type" : "type-25",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IfEUt_Ut_E"
@@ -24882,8 +24948,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:51:9) at frameworks/native/libs/math/include/math/vec2.h:51:9",
    "name" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:51:9) at frameworks/native/libs/math/include/math/vec2.h:51:9",
-   "referenced_type" : "type-25",
-   "self_type" : "type-25",
+   "referenced_type" : "type-26",
+   "self_type" : "type-26",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IfEUt_Ut0_E"
@@ -24905,8 +24971,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:52:9) at frameworks/native/libs/math/include/math/vec2.h:52:9",
    "name" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:52:9) at frameworks/native/libs/math/include/math/vec2.h:52:9",
-   "referenced_type" : "type-26",
-   "self_type" : "type-26",
+   "referenced_type" : "type-27",
+   "self_type" : "type-27",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IfEUt_Ut1_E"
@@ -24916,12 +24982,6 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-72"
-    },
-    {
      "referenced_type" : "type-73"
     },
     {
@@ -24932,22 +24992,28 @@
     },
     {
      "referenced_type" : "type-76"
+    },
+    {
+     "referenced_type" : "type-77"
+    },
+    {
+     "referenced_type" : "type-78"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-69"
     }
    ],
    "linker_set_key" : "android::details::TVec3<double>",
    "name" : "android::details::TVec3<double>",
    "record_kind" : "class",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
+   "referenced_type" : "type-68",
+   "self_type" : "type-68",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details5TVec3IdEE"
   },
   {
@@ -24955,33 +25021,33 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-68"
-    },
-    {
-     "referenced_type" : "type-69"
-    },
-    {
      "referenced_type" : "type-70"
     },
     {
+     "referenced_type" : "type-71"
+    },
+    {
+     "referenced_type" : "type-72"
+    },
+    {
      "field_name" : "xy",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "st",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "rg",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5) at frameworks/native/libs/math/include/math/vec3.h:47:5",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5) at frameworks/native/libs/math/include/math/vec3.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-67",
-   "self_type" : "type-67",
+   "referenced_type" : "type-69",
+   "self_type" : "type-69",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_E"
@@ -24992,24 +25058,24 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "z",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:48:9) at frameworks/native/libs/math/include/math/vec3.h:48:9",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:48:9) at frameworks/native/libs/math/include/math/vec3.h:48:9",
-   "referenced_type" : "type-68",
-   "self_type" : "type-68",
+   "referenced_type" : "type-70",
+   "self_type" : "type-70",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_Ut_E"
@@ -25020,24 +25086,24 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "t",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "p",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:49:9) at frameworks/native/libs/math/include/math/vec3.h:49:9",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:49:9) at frameworks/native/libs/math/include/math/vec3.h:49:9",
-   "referenced_type" : "type-69",
-   "self_type" : "type-69",
+   "referenced_type" : "type-71",
+   "self_type" : "type-71",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_Ut0_E"
@@ -25048,24 +25114,24 @@
    [
     {
      "field_name" : "r",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "g",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "b",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:50:9) at frameworks/native/libs/math/include/math/vec3.h:50:9",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:50:9) at frameworks/native/libs/math/include/math/vec3.h:50:9",
-   "referenced_type" : "type-70",
-   "self_type" : "type-70",
+   "referenced_type" : "type-72",
+   "self_type" : "type-72",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_Ut1_E"
@@ -25075,35 +25141,35 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-33"
+     "referenced_type" : "type-34"
     },
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-35"
     },
     {
      "referenced_type" : "type-9"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-13"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "type-36"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-19"
     }
    ],
    "linker_set_key" : "android::details::TVec3<float>",
    "name" : "android::details::TVec3<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-17",
-   "self_type" : "type-17",
+   "referenced_type" : "type-18",
+   "self_type" : "type-18",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "template_args" : [ "type-10" ],
@@ -25114,33 +25180,33 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-19"
-    },
-    {
      "referenced_type" : "type-20"
     },
     {
      "referenced_type" : "type-21"
     },
     {
-     "field_name" : "xy",
      "referenced_type" : "type-22"
     },
     {
+     "field_name" : "xy",
+     "referenced_type" : "type-23"
+    },
+    {
      "field_name" : "st",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "rg",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5) at frameworks/native/libs/math/include/math/vec3.h:47:5",
    "name" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5) at frameworks/native/libs/math/include/math/vec3.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-18",
-   "self_type" : "type-18",
+   "referenced_type" : "type-19",
+   "self_type" : "type-19",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IfEUt_E"
@@ -25167,8 +25233,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:48:9) at frameworks/native/libs/math/include/math/vec3.h:48:9",
    "name" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:48:9) at frameworks/native/libs/math/include/math/vec3.h:48:9",
-   "referenced_type" : "type-19",
-   "self_type" : "type-19",
+   "referenced_type" : "type-20",
+   "self_type" : "type-20",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IfEUt_Ut_E"
@@ -25195,8 +25261,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:49:9) at frameworks/native/libs/math/include/math/vec3.h:49:9",
    "name" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:49:9) at frameworks/native/libs/math/include/math/vec3.h:49:9",
-   "referenced_type" : "type-20",
-   "self_type" : "type-20",
+   "referenced_type" : "type-21",
+   "self_type" : "type-21",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IfEUt_Ut0_E"
@@ -25223,8 +25289,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:50:9) at frameworks/native/libs/math/include/math/vec3.h:50:9",
    "name" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:50:9) at frameworks/native/libs/math/include/math/vec3.h:50:9",
-   "referenced_type" : "type-21",
-   "self_type" : "type-21",
+   "referenced_type" : "type-22",
+   "self_type" : "type-22",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IfEUt_Ut1_E"
@@ -25234,12 +25300,6 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-78"
-    },
-    {
      "referenced_type" : "type-79"
     },
     {
@@ -25250,22 +25310,28 @@
     },
     {
      "referenced_type" : "type-82"
+    },
+    {
+     "referenced_type" : "type-83"
+    },
+    {
+     "referenced_type" : "type-84"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-53"
     }
    ],
    "linker_set_key" : "android::details::TVec4<double>",
    "name" : "android::details::TVec4<double>",
    "record_kind" : "class",
-   "referenced_type" : "type-50",
-   "self_type" : "type-50",
+   "referenced_type" : "type-52",
+   "self_type" : "type-52",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details5TVec4IdEE"
   },
   {
@@ -25273,45 +25339,45 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-52"
-    },
-    {
-     "referenced_type" : "type-53"
-    },
-    {
      "referenced_type" : "type-54"
     },
     {
-     "field_name" : "xy",
      "referenced_type" : "type-55"
     },
     {
+     "referenced_type" : "type-56"
+    },
+    {
+     "field_name" : "xy",
+     "referenced_type" : "type-57"
+    },
+    {
      "field_name" : "st",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "rg",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "xyz",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-68"
     },
     {
      "field_name" : "stp",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-68"
     },
     {
      "field_name" : "rgb",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-68"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-51",
-   "self_type" : "type-51",
+   "referenced_type" : "type-53",
+   "self_type" : "type-53",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_E"
@@ -25322,29 +25388,29 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "z",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "w",
      "field_offset" : 192,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
-   "referenced_type" : "type-52",
-   "self_type" : "type-52",
+   "referenced_type" : "type-54",
+   "self_type" : "type-54",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_Ut_E"
@@ -25355,29 +25421,29 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "t",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "p",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "q",
      "field_offset" : 192,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
-   "referenced_type" : "type-53",
-   "self_type" : "type-53",
+   "referenced_type" : "type-55",
+   "self_type" : "type-55",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_Ut0_E"
@@ -25388,29 +25454,29 @@
    [
     {
      "field_name" : "r",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "g",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "b",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "a",
      "field_offset" : 192,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
-   "referenced_type" : "type-54",
-   "self_type" : "type-54",
+   "referenced_type" : "type-56",
+   "self_type" : "type-56",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_Ut1_E"
@@ -25420,35 +25486,35 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-205"
+     "referenced_type" : "type-197"
     },
     {
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-198"
     },
     {
-     "referenced_type" : "type-207"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-200"
     },
     {
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-201"
     },
     {
-     "referenced_type" : "type-210"
+     "referenced_type" : "type-202"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-193"
     }
    ],
    "linker_set_key" : "android::details::TVec4<float>",
    "name" : "android::details::TVec4<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-200",
-   "self_type" : "type-200",
+   "referenced_type" : "type-192",
+   "self_type" : "type-192",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "template_args" : [ "type-10" ],
@@ -25459,45 +25525,45 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-202"
+     "referenced_type" : "type-194"
     },
     {
-     "referenced_type" : "type-203"
+     "referenced_type" : "type-195"
     },
     {
-     "referenced_type" : "type-204"
+     "referenced_type" : "type-196"
     },
     {
      "field_name" : "xy",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "st",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "rg",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "xyz",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-18"
     },
     {
      "field_name" : "stp",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-18"
     },
     {
      "field_name" : "rgb",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-18"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-201",
-   "self_type" : "type-201",
+   "referenced_type" : "type-193",
+   "self_type" : "type-193",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_E"
@@ -25529,8 +25595,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
-   "referenced_type" : "type-202",
-   "self_type" : "type-202",
+   "referenced_type" : "type-194",
+   "self_type" : "type-194",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_Ut_E"
@@ -25562,8 +25628,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
-   "referenced_type" : "type-203",
-   "self_type" : "type-203",
+   "referenced_type" : "type-195",
+   "self_type" : "type-195",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_Ut0_E"
@@ -25595,8 +25661,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
-   "referenced_type" : "type-204",
-   "self_type" : "type-204",
+   "referenced_type" : "type-196",
+   "self_type" : "type-196",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_Ut1_E"
@@ -25618,8 +25684,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TMat44, float>",
    "name" : "android::details::TVecAddOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2409",
-   "self_type" : "type-2409",
+   "referenced_type" : "type-2411",
+   "self_type" : "type-2411",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25630,11 +25696,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TVecAddOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-334",
-   "self_type" : "type-334",
+   "referenced_type" : "type-331",
+   "self_type" : "type-331",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -25642,8 +25708,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TQuaternion, float>",
    "name" : "android::details::TVecAddOperators<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-413",
-   "self_type" : "type-413",
+   "referenced_type" : "type-410",
+   "self_type" : "type-410",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25654,8 +25720,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecAddOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-427",
-   "self_type" : "type-427",
+   "referenced_type" : "type-424",
+   "self_type" : "type-424",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -25666,11 +25732,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecAddOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-61",
-   "self_type" : "type-61",
+   "referenced_type" : "type-63",
+   "self_type" : "type-63",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -25678,8 +25744,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec2, float>",
    "name" : "android::details::TVecAddOperators<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-28",
-   "self_type" : "type-28",
+   "referenced_type" : "type-29",
+   "self_type" : "type-29",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25690,11 +25756,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecAddOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-72",
-   "self_type" : "type-72",
+   "referenced_type" : "type-74",
+   "self_type" : "type-74",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -25702,8 +25768,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec3, float>",
    "name" : "android::details::TVecAddOperators<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-34",
-   "self_type" : "type-34",
+   "referenced_type" : "type-35",
+   "self_type" : "type-35",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25714,11 +25780,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecAddOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-78",
-   "self_type" : "type-78",
+   "referenced_type" : "type-80",
+   "self_type" : "type-80",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -25726,8 +25792,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecAddOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-206",
-   "self_type" : "type-206",
+   "referenced_type" : "type-198",
+   "self_type" : "type-198",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25750,8 +25816,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TMat44, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2411",
-   "self_type" : "type-2411",
+   "referenced_type" : "type-2413",
+   "self_type" : "type-2413",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25762,11 +25828,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-336",
-   "self_type" : "type-336",
+   "referenced_type" : "type-333",
+   "self_type" : "type-333",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -25774,8 +25840,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TQuaternion, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-415",
-   "self_type" : "type-415",
+   "referenced_type" : "type-412",
+   "self_type" : "type-412",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25786,8 +25852,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-510",
-   "self_type" : "type-510",
+   "referenced_type" : "type-507",
+   "self_type" : "type-507",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -25798,11 +25864,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-63",
-   "self_type" : "type-63",
+   "referenced_type" : "type-65",
+   "self_type" : "type-65",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -25810,8 +25876,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec2, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-30",
-   "self_type" : "type-30",
+   "referenced_type" : "type-31",
+   "self_type" : "type-31",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25822,11 +25888,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-74",
-   "self_type" : "type-74",
+   "referenced_type" : "type-76",
+   "self_type" : "type-76",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -25834,8 +25900,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec3, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-11",
-   "self_type" : "type-11",
+   "referenced_type" : "type-13",
+   "self_type" : "type-13",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25846,11 +25912,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-80",
-   "self_type" : "type-80",
+   "referenced_type" : "type-82",
+   "self_type" : "type-82",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -25858,8 +25924,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-208",
-   "self_type" : "type-208",
+   "referenced_type" : "type-200",
+   "self_type" : "type-200",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25882,11 +25948,11 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec2, double>",
    "name" : "android::details::TVecDebug<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-65",
-   "self_type" : "type-65",
+   "referenced_type" : "type-67",
+   "self_type" : "type-67",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details9TVecDebugINS0_5TVec2EdEE"
   },
   {
@@ -25894,8 +25960,8 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec2, float>",
    "name" : "android::details::TVecDebug<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-32",
-   "self_type" : "type-32",
+   "referenced_type" : "type-33",
+   "self_type" : "type-33",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25906,11 +25972,11 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec3, double>",
    "name" : "android::details::TVecDebug<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-76",
-   "self_type" : "type-76",
+   "referenced_type" : "type-78",
+   "self_type" : "type-78",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details9TVecDebugINS0_5TVec3EdEE"
   },
   {
@@ -25918,8 +25984,8 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec3, float>",
    "name" : "android::details::TVecDebug<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-35",
-   "self_type" : "type-35",
+   "referenced_type" : "type-36",
+   "self_type" : "type-36",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25930,11 +25996,11 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec4, double>",
    "name" : "android::details::TVecDebug<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-82",
-   "self_type" : "type-82",
+   "referenced_type" : "type-84",
+   "self_type" : "type-84",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details9TVecDebugINS0_5TVec4EdEE"
   },
   {
@@ -25942,8 +26008,8 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec4, float>",
    "name" : "android::details::TVecDebug<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-210",
-   "self_type" : "type-210",
+   "referenced_type" : "type-202",
+   "self_type" : "type-202",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25966,11 +26032,11 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec2, double>",
    "name" : "android::details::TVecFunctions<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-64",
-   "self_type" : "type-64",
+   "referenced_type" : "type-66",
+   "self_type" : "type-66",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details13TVecFunctionsINS0_5TVec2EdEE"
   },
   {
@@ -25978,8 +26044,8 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec2, float>",
    "name" : "android::details::TVecFunctions<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-31",
-   "self_type" : "type-31",
+   "referenced_type" : "type-32",
+   "self_type" : "type-32",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25990,11 +26056,11 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec3, double>",
    "name" : "android::details::TVecFunctions<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-75",
-   "self_type" : "type-75",
+   "referenced_type" : "type-77",
+   "self_type" : "type-77",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details13TVecFunctionsINS0_5TVec3EdEE"
   },
   {
@@ -26002,8 +26068,8 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec3, float>",
    "name" : "android::details::TVecFunctions<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-12",
-   "self_type" : "type-12",
+   "referenced_type" : "type-14",
+   "self_type" : "type-14",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26014,11 +26080,11 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec4, double>",
    "name" : "android::details::TVecFunctions<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-81",
-   "self_type" : "type-81",
+   "referenced_type" : "type-83",
+   "self_type" : "type-83",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details13TVecFunctionsINS0_5TVec4EdEE"
   },
   {
@@ -26026,8 +26092,8 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec4, float>",
    "name" : "android::details::TVecFunctions<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-209",
-   "self_type" : "type-209",
+   "referenced_type" : "type-201",
+   "self_type" : "type-201",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26038,8 +26104,8 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecProductOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-396",
-   "self_type" : "type-396",
+   "referenced_type" : "type-390",
+   "self_type" : "type-390",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -26050,11 +26116,11 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecProductOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-60",
-   "self_type" : "type-60",
+   "referenced_type" : "type-62",
+   "self_type" : "type-62",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details20TVecProductOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -26062,8 +26128,8 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec2, float>",
    "name" : "android::details::TVecProductOperators<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-27",
-   "self_type" : "type-27",
+   "referenced_type" : "type-28",
+   "self_type" : "type-28",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26074,11 +26140,11 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecProductOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-71",
-   "self_type" : "type-71",
+   "referenced_type" : "type-73",
+   "self_type" : "type-73",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details20TVecProductOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -26086,8 +26152,8 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec3, float>",
    "name" : "android::details::TVecProductOperators<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-33",
-   "self_type" : "type-33",
+   "referenced_type" : "type-34",
+   "self_type" : "type-34",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26098,11 +26164,11 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecProductOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-77",
-   "self_type" : "type-77",
+   "referenced_type" : "type-79",
+   "self_type" : "type-79",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details20TVecProductOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -26110,8 +26176,8 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecProductOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-205",
-   "self_type" : "type-205",
+   "referenced_type" : "type-197",
+   "self_type" : "type-197",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26134,8 +26200,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TMat44, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2410",
-   "self_type" : "type-2410",
+   "referenced_type" : "type-2412",
+   "self_type" : "type-2412",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26146,11 +26212,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-335",
-   "self_type" : "type-335",
+   "referenced_type" : "type-332",
+   "self_type" : "type-332",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -26158,8 +26224,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TQuaternion, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-414",
-   "self_type" : "type-414",
+   "referenced_type" : "type-411",
+   "self_type" : "type-411",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26170,8 +26236,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-462",
-   "self_type" : "type-462",
+   "referenced_type" : "type-455",
+   "self_type" : "type-455",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -26182,11 +26248,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-62",
-   "self_type" : "type-62",
+   "referenced_type" : "type-64",
+   "self_type" : "type-64",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -26194,8 +26260,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec2, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-29",
-   "self_type" : "type-29",
+   "referenced_type" : "type-30",
+   "self_type" : "type-30",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26206,11 +26272,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-73",
-   "self_type" : "type-73",
+   "referenced_type" : "type-75",
+   "self_type" : "type-75",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -26230,11 +26296,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-79",
-   "self_type" : "type-79",
+   "referenced_type" : "type-81",
+   "self_type" : "type-81",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -26242,8 +26308,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-207",
-   "self_type" : "type-207",
+   "referenced_type" : "type-199",
+   "self_type" : "type-199",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26309,7 +26375,7 @@
    [
     {
      "field_name" : "bits",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "fp",
@@ -26331,7 +26397,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-196"
+     "referenced_type" : "type-209"
     }
    ],
    "fields" :
@@ -26340,32 +26406,32 @@
      "access" : "protected",
      "field_name" : "mSchedPolicy",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "protected",
      "field_name" : "mSchedPriority",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mExtras",
      "field_offset" : 96,
-     "referenced_type" : "type-243"
+     "referenced_type" : "type-245"
     },
     {
      "access" : "private",
      "field_name" : "mReserved0",
      "field_offset" : 128,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
    "linker_set_key" : "android::hardware::BHwBinder",
    "name" : "android::hardware::BHwBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-242",
-   "self_type" : "type-242",
+   "referenced_type" : "type-244",
+   "self_type" : "type-244",
    "size" : 28,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware9BHwBinderE",
@@ -26472,7 +26538,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "fields" :
@@ -26481,26 +26547,26 @@
      "access" : "private",
      "field_name" : "mRemote",
      "field_offset" : 32,
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-207"
     },
     {
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 64,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-210"
     },
     {
      "access" : "private",
      "field_name" : "mState",
      "field_offset" : 96,
-     "referenced_type" : "type-199"
+     "referenced_type" : "type-212"
     }
    ],
    "linker_set_key" : "android::hardware::BpHwRefBase",
    "name" : "android::hardware::BpHwRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-193",
-   "self_type" : "type-193",
+   "referenced_type" : "type-206",
+   "self_type" : "type-206",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE",
@@ -26589,22 +26655,22 @@
    [
     {
      "field_name" : "flags",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "fdIndex",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "offset",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "extent",
      "field_offset" : 128,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "android::hardware::GrantorDescriptor",
@@ -26625,7 +26691,7 @@
     },
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::HidlMemory",
@@ -26713,14 +26779,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::IBinder",
    "name" : "android::hardware::IBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-196",
-   "self_type" : "type-196",
+   "referenced_type" : "type-209",
+   "self_type" : "type-209",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinderE",
@@ -26830,14 +26896,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient",
    "name" : "android::hardware::IBinder::DeathRecipient",
    "record_kind" : "class",
-   "referenced_type" : "type-192",
-   "self_type" : "type-192",
+   "referenced_type" : "type-205",
+   "self_type" : "type-205",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinder14DeathRecipientE",
@@ -26918,14 +26984,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::IInterface",
    "name" : "android::hardware::IInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-213",
-   "self_type" : "type-213",
+   "referenced_type" : "type-215",
+   "self_type" : "type-215",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
    "unique_id" : "_ZTSN7android8hardware10IInterfaceE",
@@ -27007,85 +27073,85 @@
     {
      "access" : "private",
      "field_name" : "mProcess",
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-274"
     },
     {
      "access" : "private",
      "field_name" : "mPendingStrongDerefs",
      "field_offset" : 32,
-     "referenced_type" : "type-240"
+     "referenced_type" : "type-242"
     },
     {
      "access" : "private",
      "field_name" : "mPendingWeakDerefs",
      "field_offset" : 192,
-     "referenced_type" : "type-244"
+     "referenced_type" : "type-246"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteStrongDerefs",
      "field_offset" : 352,
-     "referenced_type" : "type-245"
+     "referenced_type" : "type-247"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteWeakDerefs",
      "field_offset" : 512,
-     "referenced_type" : "type-244"
+     "referenced_type" : "type-246"
     },
     {
      "access" : "private",
      "field_name" : "mIn",
      "field_offset" : 672,
-     "referenced_type" : "type-215"
+     "referenced_type" : "type-217"
     },
     {
      "access" : "private",
      "field_name" : "mOut",
      "field_offset" : 1216,
-     "referenced_type" : "type-215"
+     "referenced_type" : "type-217"
     },
     {
      "access" : "private",
      "field_name" : "mLastError",
      "field_offset" : 1760,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mCallingPid",
      "field_offset" : 1792,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mCallingSid",
      "field_offset" : 1824,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "access" : "private",
      "field_name" : "mCallingUid",
      "field_offset" : 1856,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mStrictModePolicy",
      "field_offset" : 1888,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mLastTransactionBinderFlags",
      "field_offset" : 1920,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mContextObject",
      "field_offset" : 1952,
-     "referenced_type" : "type-289"
+     "referenced_type" : "type-286"
     },
     {
      "access" : "private",
@@ -27103,26 +27169,26 @@
      "access" : "private",
      "field_name" : "mPostCommandTasks",
      "field_offset" : 2016,
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-287"
     },
     {
      "access" : "private",
      "field_name" : "mIPCThreadStateBase",
      "field_offset" : 2112,
-     "referenced_type" : "type-291"
+     "referenced_type" : "type-288"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 2144,
-     "referenced_type" : "type-276"
+     "referenced_type" : "type-272"
     }
    ],
    "linker_set_key" : "android::hardware::IPCThreadState",
    "name" : "android::hardware::IPCThreadState",
    "record_kind" : "class",
-   "referenced_type" : "type-277",
-   "self_type" : "type-277",
+   "referenced_type" : "type-273",
+   "self_type" : "type-273",
    "size" : 272,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h",
    "unique_id" : "_ZTSN7android8hardware14IPCThreadStateE"
@@ -27134,73 +27200,73 @@
     {
      "access" : "private",
      "field_name" : "mBufCachePos",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mBufCache",
      "field_offset" : 32,
-     "referenced_type" : "type-216"
+     "referenced_type" : "type-218"
     },
     {
      "access" : "private",
      "field_name" : "mError",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mData",
      "field_offset" : 160,
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-219"
     },
     {
      "access" : "private",
      "field_name" : "mDataSize",
      "field_offset" : 192,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mDataCapacity",
      "field_offset" : 224,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mDataPos",
      "field_offset" : 256,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mObjects",
      "field_offset" : 288,
-     "referenced_type" : "type-219"
+     "referenced_type" : "type-221"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsSize",
      "field_offset" : 320,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsCapacity",
      "field_offset" : 352,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mNextObjectHint",
      "field_offset" : 384,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mNumRef",
      "field_offset" : 416,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -27224,20 +27290,20 @@
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 480,
-     "referenced_type" : "type-220"
+     "referenced_type" : "type-222"
     },
     {
      "access" : "private",
      "field_name" : "mOwnerCookie",
      "field_offset" : 512,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
    "linker_set_key" : "android::hardware::Parcel",
    "name" : "android::hardware::Parcel",
    "record_kind" : "class",
-   "referenced_type" : "type-215",
-   "self_type" : "type-215",
+   "referenced_type" : "type-217",
+   "self_type" : "type-217",
    "size" : 68,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6ParcelE"
@@ -27249,23 +27315,23 @@
    [
     {
      "field_name" : "index",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "buffer",
      "field_offset" : 32,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "bufend",
      "field_offset" : 96,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "android::hardware::Parcel::BufferInfo",
    "name" : "android::hardware::Parcel::BufferInfo",
-   "referenced_type" : "type-228",
-   "self_type" : "type-228",
+   "referenced_type" : "type-230",
+   "self_type" : "type-230",
    "size" : 20,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE"
@@ -27276,7 +27342,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "fields" :
@@ -27285,55 +27351,55 @@
      "access" : "private",
      "field_name" : "mDriverFD",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mVMStart",
      "field_offset" : 64,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountLock",
      "field_offset" : 96,
-     "referenced_type" : "type-282"
+     "referenced_type" : "type-278"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountDecrement",
      "field_offset" : 128,
-     "referenced_type" : "type-283"
+     "referenced_type" : "type-279"
     },
     {
      "access" : "private",
      "field_name" : "mExecutingThreadsCount",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mMaxThreads",
      "field_offset" : 192,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mStarvationStartTimeMs",
      "field_offset" : 224,
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 288,
-     "referenced_type" : "type-252"
+     "referenced_type" : "type-280"
     },
     {
      "access" : "private",
      "field_name" : "mHandleToObject",
      "field_offset" : 320,
-     "referenced_type" : "type-238"
+     "referenced_type" : "type-240"
     },
     {
      "access" : "private",
@@ -27345,25 +27411,25 @@
      "access" : "private",
      "field_name" : "mBinderContextCheckFunc",
      "field_offset" : 512,
-     "referenced_type" : "type-274"
+     "referenced_type" : "type-270"
     },
     {
      "access" : "private",
      "field_name" : "mBinderContextUserData",
      "field_offset" : 544,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "access" : "private",
      "field_name" : "mContexts",
      "field_offset" : 576,
-     "referenced_type" : "type-247"
+     "referenced_type" : "type-249"
     },
     {
      "access" : "private",
      "field_name" : "mRootDir",
      "field_offset" : 736,
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-282"
     },
     {
      "access" : "private",
@@ -27381,26 +27447,26 @@
      "access" : "private",
      "field_name" : "mThreadPoolSeq",
      "field_offset" : 800,
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-271"
     },
     {
      "access" : "private",
      "field_name" : "mMmapSize",
      "field_offset" : 832,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 864,
-     "referenced_type" : "type-276"
+     "referenced_type" : "type-272"
     }
    ],
    "linker_set_key" : "android::hardware::ProcessState",
    "name" : "android::hardware::ProcessState",
    "record_kind" : "class",
-   "referenced_type" : "type-281",
-   "self_type" : "type-281",
+   "referenced_type" : "type-277",
+   "self_type" : "type-277",
    "size" : 120,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessStateE",
@@ -27478,18 +27544,18 @@
    [
     {
      "field_name" : "binder",
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-208"
     },
     {
      "field_name" : "refs",
      "field_offset" : 32,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-210"
     }
    ],
    "linker_set_key" : "android::hardware::ProcessState::handle_entry",
    "name" : "android::hardware::ProcessState::handle_entry",
-   "referenced_type" : "type-239",
-   "self_type" : "type-239",
+   "referenced_type" : "type-241",
+   "self_type" : "type-241",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE"
@@ -27499,7 +27565,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "fields" :
@@ -27508,17 +27574,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-102"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
    "record_kind" : "class",
-   "referenced_type" : "type-99",
-   "self_type" : "type-99",
+   "referenced_type" : "type-101",
+   "self_type" : "type-101",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-105" ],
+   "template_args" : [ "type-107" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS0_8graphics6mapper4V2_05ErrorEEE"
   },
   {
@@ -27526,7 +27592,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "fields" :
@@ -27535,17 +27601,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-393"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
    "record_kind" : "class",
-   "referenced_type" : "type-393",
-   "self_type" : "type-393",
+   "referenced_type" : "type-392",
+   "self_type" : "type-392",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-395" ],
+   "template_args" : [ "type-394" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS0_8graphics6mapper4V3_05ErrorEEE"
   },
   {
@@ -27553,7 +27619,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "fields" :
@@ -27562,17 +27628,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-88"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
    "record_kind" : "class",
-   "referenced_type" : "type-111",
-   "self_type" : "type-111",
+   "referenced_type" : "type-113",
+   "self_type" : "type-113",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-88" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics6mapper4V2_17IMapperEEEEE"
   },
   {
@@ -27580,7 +27646,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "linker_set_key" : "android::hardware::Return<void>",
@@ -27590,7 +27656,7 @@
    "self_type" : "type-1322",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIvEE"
   },
   {
@@ -27600,26 +27666,26 @@
     {
      "access" : "private",
      "field_name" : "mException",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mErrorCode",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-106"
     }
    ],
    "linker_set_key" : "android::hardware::Status",
    "name" : "android::hardware::Status",
    "record_kind" : "class",
-   "referenced_type" : "type-102",
-   "self_type" : "type-102",
+   "referenced_type" : "type-104",
+   "self_type" : "type-104",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware6StatusE"
@@ -27725,7 +27791,7 @@
    "self_type" : "type-1103",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware7details14const_accessorIjLj10EJEEE"
   },
   {
@@ -27739,12 +27805,12 @@
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-1099",
    "self_type" : "type-1099",
@@ -27776,16 +27842,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-137"
+     "referenced_type" : "type-140"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
-   "referenced_type" : "type-136",
-   "self_type" : "type-136",
+   "referenced_type" : "type-139",
+   "self_type" : "type-139",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-139" ],
+   "template_args" : [ "type-142" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_handleEEE"
   },
   {
@@ -27803,7 +27869,7 @@
    "self_type" : "type-1071",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-287" ],
+   "template_args" : [ "type-284" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEE"
   },
   {
@@ -27813,16 +27879,16 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-1072",
    "self_type" : "type-1072",
@@ -27836,16 +27902,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-144"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>",
-   "referenced_type" : "type-140",
-   "self_type" : "type-140",
+   "referenced_type" : "type-143",
+   "self_type" : "type-143",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-143" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEE"
   },
   {
@@ -27855,19 +27921,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-141",
-   "self_type" : "type-141",
+   "referenced_type" : "type-144",
+   "self_type" : "type-144",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEUt_E"
@@ -27879,19 +27945,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-141"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<hidl_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<hidl_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-137",
-   "self_type" : "type-137",
+   "referenced_type" : "type-140",
+   "self_type" : "type-140",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_handleEEUt_E"
@@ -27911,7 +27977,7 @@
    "self_type" : "type-1150",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-144" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEE"
   },
   {
@@ -27925,12 +27991,12 @@
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-1151",
    "self_type" : "type-1151",
@@ -27944,16 +28010,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-121"
+     "referenced_type" : "type-123"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int>",
    "name" : "android::hardware::details::hidl_pointer<unsigned int>",
-   "referenced_type" : "type-120",
-   "self_type" : "type-120",
+   "referenced_type" : "type-122",
+   "self_type" : "type-122",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIjEE"
   },
   {
@@ -27963,19 +28029,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<unsigned int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<unsigned int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-121",
-   "self_type" : "type-121",
+   "referenced_type" : "type-123",
+   "self_type" : "type-123",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIjEUt_E"
@@ -27997,7 +28063,7 @@
     {
      "access" : "private",
      "field_name" : "mStatus",
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-104"
     },
     {
      "access" : "private",
@@ -28009,8 +28075,8 @@
    "linker_set_key" : "android::hardware::details::return_status",
    "name" : "android::hardware::details::return_status",
    "record_kind" : "class",
-   "referenced_type" : "type-101",
-   "self_type" : "type-101",
+   "referenced_type" : "type-103",
+   "self_type" : "type-103",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware7details13return_statusE"
@@ -28023,7 +28089,7 @@
    "self_type" : "type-1102",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware7details9std_arrayIjLj10EJEEE"
   },
   {
@@ -28037,7 +28103,7 @@
     {
      "field_name" : "nativeHandle",
      "field_offset" : 320,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-142"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::HardwareBuffer",
@@ -28064,7 +28130,7 @@
    "self_type" : "type-1108",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware10hidl_arrayIjLj10EJEEE"
   },
   {
@@ -28073,7 +28139,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_death_recipient",
@@ -28158,33 +28224,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
    "name" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
-   "referenced_type" : "type-149",
-   "self_type" : "type-149",
+   "referenced_type" : "type-152",
+   "self_type" : "type-152",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-150", "type-151" ],
+   "template_args" : [ "type-153", "type-154" ],
    "unique_id" : "_ZTSN7android8hardware15hidl_enum_rangeINS0_8graphics6common4V1_011BufferUsageEvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
    "name" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
-   "referenced_type" : "type-157",
-   "self_type" : "type-157",
+   "referenced_type" : "type-159",
+   "self_type" : "type-159",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-158", "type-151" ],
+   "template_args" : [ "type-160", "type-154" ],
    "unique_id" : "_ZTSN7android8hardware15hidl_enum_rangeINS0_8graphics6common4V1_111BufferUsageEvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
    "name" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
-   "referenced_type" : "type-419",
-   "self_type" : "type-419",
+   "referenced_type" : "type-416",
+   "self_type" : "type-416",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-420", "type-151" ],
+   "template_args" : [ "type-417", "type-154" ],
    "unique_id" : "_ZTSN7android8hardware15hidl_enum_rangeINS0_8graphics6common4V1_211BufferUsageEvEE"
   },
   {
@@ -28194,7 +28260,7 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-140"
+     "referenced_type" : "type-143"
     },
     {
      "access" : "private",
@@ -28205,8 +28271,8 @@
    ],
    "linker_set_key" : "android::hardware::hidl_handle",
    "name" : "android::hardware::hidl_handle",
-   "referenced_type" : "type-139",
-   "self_type" : "type-139",
+   "referenced_type" : "type-142",
+   "self_type" : "type-142",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_handleE"
@@ -28218,13 +28284,13 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-142"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 128,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
@@ -28254,7 +28320,7 @@
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -28284,7 +28350,7 @@
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -28309,13 +28375,13 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-136"
+     "referenced_type" : "type-139"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -28326,11 +28392,11 @@
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_handle>",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_handle>",
-   "referenced_type" : "type-135",
-   "self_type" : "type-135",
+   "referenced_type" : "type-138",
+   "self_type" : "type-138",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-139" ],
+   "template_args" : [ "type-142" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_11hidl_handleEEE"
   },
   {
@@ -28340,13 +28406,13 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-120"
+     "referenced_type" : "type-122"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -28357,11 +28423,11 @@
    ],
    "linker_set_key" : "android::hardware::hidl_vec<unsigned int>",
    "name" : "android::hardware::hidl_vec<unsigned int>",
-   "referenced_type" : "type-128",
-   "self_type" : "type-128",
+   "referenced_type" : "type-131",
+   "self_type" : "type-131",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecIjEE"
   },
   {
@@ -28394,23 +28460,23 @@
    [
     {
      "field_name" : "pid",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "ptr",
      "field_offset" : 64,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "arch",
      "field_offset" : 128,
-     "referenced_type" : "type-164"
+     "referenced_type" : "type-167"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo",
    "name" : "android::hidl::base::V1_0::DebugInfo",
-   "referenced_type" : "type-163",
-   "self_type" : "type-163",
+   "referenced_type" : "type-166",
+   "self_type" : "type-166",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfoE"
@@ -28421,13 +28487,13 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::IBase",
    "name" : "android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-171",
-   "self_type" : "type-171",
+   "referenced_type" : "type-174",
+   "self_type" : "type-174",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_05IBaseE",
@@ -28536,13 +28602,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-174"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification",
    "name" : "android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-295",
-   "self_type" : "type-295",
+   "referenced_type" : "type-292",
+   "self_type" : "type-292",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_020IServiceNotificationE",
@@ -28656,12 +28722,12 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
      "field_name" : "value",
      "field_offset" : 32,
-     "referenced_type" : "type-676"
+     "referenced_type" : "type-680"
     }
    ],
    "linker_set_key" : "android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
@@ -28670,7 +28736,7 @@
    "self_type" : "type-694",
    "size" : 48,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142", "type-676" ],
+   "template_args" : [ "type-145", "type-680" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -28700,17 +28766,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
    "linker_set_key" : "android::sp<android::GraphicBuffer>",
    "name" : "android::sp<android::GraphicBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-679",
-   "self_type" : "type-679",
+   "referenced_type" : "type-678",
+   "self_type" : "type-678",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-525" ],
+   "template_args" : [ "type-523" ],
    "unique_id" : "_ZTSN7android2spINS_13GraphicBufferEEE"
   },
   {
@@ -28720,17 +28786,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-365"
     }
    ],
    "linker_set_key" : "android::sp<android::Thread>",
    "name" : "android::sp<android::Thread>",
    "record_kind" : "class",
-   "referenced_type" : "type-367",
-   "self_type" : "type-367",
+   "referenced_type" : "type-364",
+   "self_type" : "type-364",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-369" ],
+   "template_args" : [ "type-366" ],
    "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
   },
   {
@@ -28740,17 +28806,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-241"
+     "referenced_type" : "type-243"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::BHwBinder>",
    "name" : "android::sp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-289",
-   "self_type" : "type-289",
+   "referenced_type" : "type-286",
+   "self_type" : "type-286",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-242" ],
+   "template_args" : [ "type-244" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
   },
   {
@@ -28760,17 +28826,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-208"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IBinder>",
    "name" : "android::sp<android::hardware::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-248",
-   "self_type" : "type-248",
+   "referenced_type" : "type-250",
+   "self_type" : "type-250",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-196" ],
+   "template_args" : [ "type-209" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
   },
   {
@@ -28780,17 +28846,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-280"
+     "referenced_type" : "type-276"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::ProcessState>",
    "name" : "android::sp<android::hardware::ProcessState>",
    "record_kind" : "class",
-   "referenced_type" : "type-279",
-   "self_type" : "type-279",
+   "referenced_type" : "type-275",
+   "self_type" : "type-275",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-281" ],
+   "template_args" : [ "type-277" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
   },
   {
@@ -28800,17 +28866,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-356"
+     "referenced_type" : "type-353"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
    "record_kind" : "class",
-   "referenced_type" : "type-355",
-   "self_type" : "type-355",
+   "referenced_type" : "type-352",
+   "self_type" : "type-352",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-358" ],
+   "template_args" : [ "type-355" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics9allocator4V2_010IAllocatorEEE"
   },
   {
@@ -28820,17 +28886,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-485"
+     "referenced_type" : "type-482"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
    "record_kind" : "class",
-   "referenced_type" : "type-484",
-   "self_type" : "type-484",
+   "referenced_type" : "type-481",
+   "self_type" : "type-481",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-487" ],
+   "template_args" : [ "type-484" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics9allocator4V3_010IAllocatorEEE"
   },
   {
@@ -28840,17 +28906,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-339"
+     "referenced_type" : "type-336"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-338",
-   "self_type" : "type-338",
+   "referenced_type" : "type-335",
+   "self_type" : "type-335",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-341" ],
+   "template_args" : [ "type-338" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics6mapper4V2_07IMapperEEE"
   },
   {
@@ -28860,17 +28926,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-87"
+     "referenced_type" : "type-89"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-86",
-   "self_type" : "type-86",
+   "referenced_type" : "type-88",
+   "self_type" : "type-88",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-89" ],
+   "template_args" : [ "type-91" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics6mapper4V2_17IMapperEEE"
   },
   {
@@ -28880,17 +28946,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-498"
+     "referenced_type" : "type-495"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-497",
-   "self_type" : "type-497",
+   "referenced_type" : "type-494",
+   "self_type" : "type-494",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-500" ],
+   "template_args" : [ "type-497" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics6mapper4V3_07IMapperEEE"
   },
   {
@@ -28920,17 +28986,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-364"
+     "referenced_type" : "type-361"
     }
    ],
    "linker_set_key" : "android::sp<android::hidl::base::V1_0::IBase>",
    "name" : "android::sp<android::hidl::base::V1_0::IBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-363",
-   "self_type" : "type-363",
+   "referenced_type" : "type-360",
+   "self_type" : "type-360",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-171" ],
+   "template_args" : [ "type-174" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl4base4V1_05IBaseEEE"
   },
   {
@@ -28940,36 +29006,36 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-369"
     }
    ],
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceNotification>",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification>",
    "record_kind" : "class",
-   "referenced_type" : "type-371",
-   "self_type" : "type-371",
+   "referenced_type" : "type-368",
+   "self_type" : "type-368",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-295" ],
+   "template_args" : [ "type-292" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::trait_pointer<android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-819",
-   "self_type" : "type-819",
+   "referenced_type" : "type-820",
+   "self_type" : "type-820",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::Rect>",
    "name" : "android::trait_pointer<android::Rect>",
-   "referenced_type" : "type-2400",
-   "self_type" : "type-2400",
+   "referenced_type" : "type-2402",
+   "self_type" : "type-2402",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -28979,8 +29045,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::trait_pointer<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-817",
-   "self_type" : "type-817",
+   "referenced_type" : "type-818",
+   "self_type" : "type-818",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -28990,33 +29056,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<const native_handle *>",
    "name" : "android::trait_pointer<const native_handle *>",
-   "referenced_type" : "type-818",
-   "self_type" : "type-818",
+   "referenced_type" : "type-819",
+   "self_type" : "type-819",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android13trait_pointerIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<long long>",
    "name" : "android::trait_pointer<long long>",
-   "referenced_type" : "type-1430",
-   "self_type" : "type-1430",
+   "referenced_type" : "type-1434",
+   "self_type" : "type-1434",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android13trait_pointerIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::trait_trivial_copy<android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-812",
-   "self_type" : "type-812",
+   "referenced_type" : "type-813",
+   "self_type" : "type-813",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -29045,8 +29111,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-813",
-   "self_type" : "type-813",
+   "referenced_type" : "type-814",
+   "self_type" : "type-814",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -29056,8 +29122,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-483",
-   "self_type" : "type-483",
+   "referenced_type" : "type-480",
+   "self_type" : "type-480",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -29067,11 +29133,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-512",
-   "self_type" : "type-512",
+   "referenced_type" : "type-509",
+   "self_type" : "type-509",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-288" ],
+   "template_args" : [ "type-285" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
   },
   {
@@ -29082,26 +29148,26 @@
    "self_type" : "type-811",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<double>",
    "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-795",
-   "self_type" : "type-795",
+   "referenced_type" : "type-787",
+   "self_type" : "type-787",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<float>",
    "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-757",
-   "self_type" : "type-757",
+   "referenced_type" : "type-755",
+   "self_type" : "type-755",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-10" ],
@@ -29111,11 +29177,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-647",
-   "self_type" : "type-647",
+   "referenced_type" : "type-645",
+   "self_type" : "type-645",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIiEE"
   },
   {
@@ -29126,26 +29192,26 @@
    "self_type" : "type-741",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long>",
    "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-704",
-   "self_type" : "type-704",
+   "referenced_type" : "type-697",
+   "self_type" : "type-697",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-687" ],
+   "template_args" : [ "type-684" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<short>",
    "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-617",
-   "self_type" : "type-617",
+   "referenced_type" : "type-614",
+   "self_type" : "type-614",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-599" ],
@@ -29155,22 +29221,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned char>",
    "name" : "android::trait_trivial_copy<unsigned char>",
-   "referenced_type" : "type-540",
-   "self_type" : "type-540",
+   "referenced_type" : "type-536",
+   "self_type" : "type-536",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-218" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned int>",
    "name" : "android::trait_trivial_copy<unsigned int>",
-   "referenced_type" : "type-675",
-   "self_type" : "type-675",
+   "referenced_type" : "type-671",
+   "self_type" : "type-671",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIjEE"
   },
   {
@@ -29181,15 +29247,15 @@
    "self_type" : "type-751",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long>",
    "name" : "android::trait_trivial_copy<unsigned long>",
-   "referenced_type" : "type-722",
-   "self_type" : "type-722",
+   "referenced_type" : "type-720",
+   "self_type" : "type-720",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-710" ],
@@ -29199,8 +29265,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
    "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-631",
-   "self_type" : "type-631",
+   "referenced_type" : "type-629",
+   "self_type" : "type-629",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-3" ],
@@ -29210,11 +29276,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-476",
-   "self_type" : "type-476",
+   "referenced_type" : "type-473",
+   "self_type" : "type-473",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
   },
   {
@@ -29225,7 +29291,7 @@
    "self_type" : "type-807",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -29265,8 +29331,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-481",
-   "self_type" : "type-481",
+   "referenced_type" : "type-478",
+   "self_type" : "type-478",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -29276,11 +29342,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-501",
-   "self_type" : "type-501",
+   "referenced_type" : "type-498",
+   "self_type" : "type-498",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-288" ],
+   "template_args" : [ "type-285" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
   },
   {
@@ -29291,18 +29357,18 @@
    "self_type" : "type-806",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<double>",
    "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-781",
-   "self_type" : "type-781",
+   "referenced_type" : "type-775",
+   "self_type" : "type-775",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIdEE"
   },
   {
@@ -29320,11 +29386,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-638",
-   "self_type" : "type-638",
+   "referenced_type" : "type-637",
+   "self_type" : "type-637",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIiEE"
   },
   {
@@ -29335,18 +29401,18 @@
    "self_type" : "type-729",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long>",
    "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-686",
-   "self_type" : "type-686",
+   "referenced_type" : "type-683",
+   "self_type" : "type-683",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-687" ],
+   "template_args" : [ "type-684" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
   },
   {
@@ -29364,33 +29430,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned char>",
    "name" : "android::trait_trivial_ctor<unsigned char>",
-   "referenced_type" : "type-534",
-   "self_type" : "type-534",
+   "referenced_type" : "type-531",
+   "self_type" : "type-531",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-218" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
    "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-661",
-   "self_type" : "type-661",
+   "referenced_type" : "type-655",
+   "self_type" : "type-655",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
    "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-746",
-   "self_type" : "type-746",
+   "referenced_type" : "type-743",
+   "self_type" : "type-743",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIyEE"
   },
   {
@@ -29408,8 +29474,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned short>",
    "name" : "android::trait_trivial_ctor<unsigned short>",
-   "referenced_type" : "type-620",
-   "self_type" : "type-620",
+   "referenced_type" : "type-619",
+   "self_type" : "type-619",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-3" ],
@@ -29419,11 +29485,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-453",
-   "self_type" : "type-453",
+   "referenced_type" : "type-450",
+   "self_type" : "type-450",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
   },
   {
@@ -29434,7 +29500,7 @@
    "self_type" : "type-809",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -29474,8 +29540,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<bool>",
    "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-482",
-   "self_type" : "type-482",
+   "referenced_type" : "type-479",
+   "self_type" : "type-479",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -29485,11 +29551,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-511",
-   "self_type" : "type-511",
+   "referenced_type" : "type-508",
+   "self_type" : "type-508",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-288" ],
+   "template_args" : [ "type-285" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
   },
   {
@@ -29500,7 +29566,7 @@
    "self_type" : "type-808",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIPK13native_handleEE"
   },
   {
@@ -29511,7 +29577,7 @@
    "self_type" : "type-786",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIdEE"
   },
   {
@@ -29533,18 +29599,18 @@
    "self_type" : "type-644",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long long>",
    "name" : "android::trait_trivial_dtor<long long>",
-   "referenced_type" : "type-738",
-   "self_type" : "type-738",
+   "referenced_type" : "type-736",
+   "self_type" : "type-736",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
   },
   {
@@ -29555,7 +29621,7 @@
    "self_type" : "type-692",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-687" ],
+   "template_args" : [ "type-684" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
   },
   {
@@ -29573,41 +29639,41 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned char>",
    "name" : "android::trait_trivial_dtor<unsigned char>",
-   "referenced_type" : "type-538",
-   "self_type" : "type-538",
+   "referenced_type" : "type-535",
+   "self_type" : "type-535",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-218" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
    "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-668",
-   "self_type" : "type-668",
+   "referenced_type" : "type-664",
+   "self_type" : "type-664",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
    "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-749",
-   "self_type" : "type-749",
+   "referenced_type" : "type-747",
+   "self_type" : "type-747",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long>",
    "name" : "android::trait_trivial_dtor<unsigned long>",
-   "referenced_type" : "type-719",
-   "self_type" : "type-719",
+   "referenced_type" : "type-715",
+   "self_type" : "type-715",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-710" ],
@@ -29617,8 +29683,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned short>",
    "name" : "android::trait_trivial_dtor<unsigned short>",
-   "referenced_type" : "type-625",
-   "self_type" : "type-625",
+   "referenced_type" : "type-621",
+   "self_type" : "type-621",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-3" ],
@@ -29628,22 +29694,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-469",
-   "self_type" : "type-469",
+   "referenced_type" : "type-462",
+   "self_type" : "type-462",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::trait_trivial_move<android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-815",
-   "self_type" : "type-815",
+   "referenced_type" : "type-816",
+   "self_type" : "type-816",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -29672,11 +29738,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String16>",
    "name" : "android::trait_trivial_move<android::String16>",
-   "referenced_type" : "type-191",
-   "self_type" : "type-191",
+   "referenced_type" : "type-204",
+   "self_type" : "type-204",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-179" ],
+   "template_args" : [ "type-182" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8String16EEE"
   },
   {
@@ -29687,15 +29753,15 @@
    "self_type" : "type-902",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-285" ],
+   "template_args" : [ "type-282" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-816",
-   "self_type" : "type-816",
+   "referenced_type" : "type-817",
+   "self_type" : "type-817",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -29705,8 +29771,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<bool>",
    "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-490",
-   "self_type" : "type-490",
+   "referenced_type" : "type-485",
+   "self_type" : "type-485",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -29716,22 +29782,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-533",
-   "self_type" : "type-533",
+   "referenced_type" : "type-513",
+   "self_type" : "type-513",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-288" ],
+   "template_args" : [ "type-285" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<const native_handle *>",
    "name" : "android::trait_trivial_move<const native_handle *>",
-   "referenced_type" : "type-814",
-   "self_type" : "type-814",
+   "referenced_type" : "type-815",
+   "self_type" : "type-815",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIPK13native_handleEE"
   },
   {
@@ -29742,7 +29808,7 @@
    "self_type" : "type-798",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIdEE"
   },
   {
@@ -29760,11 +29826,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-650",
-   "self_type" : "type-650",
+   "referenced_type" : "type-648",
+   "self_type" : "type-648",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIiEE"
   },
   {
@@ -29775,18 +29841,18 @@
    "self_type" : "type-742",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long>",
    "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-708",
-   "self_type" : "type-708",
+   "referenced_type" : "type-707",
+   "self_type" : "type-707",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-687" ],
+   "template_args" : [ "type-684" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
   },
   {
@@ -29804,22 +29870,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned char>",
    "name" : "android::trait_trivial_move<unsigned char>",
-   "referenced_type" : "type-577",
-   "self_type" : "type-577",
+   "referenced_type" : "type-574",
+   "self_type" : "type-574",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-218" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned int>",
    "name" : "android::trait_trivial_move<unsigned int>",
-   "referenced_type" : "type-682",
-   "self_type" : "type-682",
+   "referenced_type" : "type-677",
+   "self_type" : "type-677",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIjEE"
   },
   {
@@ -29830,15 +29896,15 @@
    "self_type" : "type-752",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long>",
    "name" : "android::trait_trivial_move<unsigned long>",
-   "referenced_type" : "type-728",
-   "self_type" : "type-728",
+   "referenced_type" : "type-725",
+   "self_type" : "type-725",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-710" ],
@@ -29859,30 +29925,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-480",
-   "self_type" : "type-480",
+   "referenced_type" : "type-477",
+   "self_type" : "type-477",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::traits<android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-823",
-   "self_type" : "type-823",
+   "referenced_type" : "type-824",
+   "self_type" : "type-824",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android6traitsINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::Rect>",
    "name" : "android::traits<android::Rect>",
-   "referenced_type" : "type-2401",
-   "self_type" : "type-2401",
+   "referenced_type" : "type-2403",
+   "self_type" : "type-2403",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -29892,8 +29958,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::traits<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-820",
-   "self_type" : "type-820",
+   "referenced_type" : "type-821",
+   "self_type" : "type-821",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -29907,18 +29973,18 @@
    "self_type" : "type-822",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android6traitsIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<long long>",
    "name" : "android::traits<long long>",
-   "referenced_type" : "type-1431",
-   "self_type" : "type-1431",
+   "referenced_type" : "type-1435",
+   "self_type" : "type-1435",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android6traitsIxEE"
   },
   {
@@ -29927,12 +29993,12 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::ui::Size",
@@ -29950,20 +30016,20 @@
     {
      "access" : "private",
      "field_name" : "mMatrix",
-     "referenced_type" : "type-2435"
+     "referenced_type" : "type-2437"
     },
     {
      "access" : "private",
      "field_name" : "mType",
      "field_offset" : 288,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "linker_set_key" : "android::ui::Transform",
    "name" : "android::ui::Transform",
    "record_kind" : "class",
-   "referenced_type" : "type-2434",
-   "self_type" : "type-2434",
+   "referenced_type" : "type-2436",
+   "self_type" : "type-2436",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "unique_id" : "_ZTSN7android2ui9TransformE"
@@ -29980,8 +30046,8 @@
    ],
    "linker_set_key" : "android::ui::Transform::mat33",
    "name" : "android::ui::Transform::mat33",
-   "referenced_type" : "type-2435",
-   "self_type" : "type-2435",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2437",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "unique_id" : "_ZTSN7android2ui9Transform5mat33E"
@@ -29991,13 +30057,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2381"
+     "referenced_type" : "type-2383"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::Rect>",
    "name" : "android::use_trivial_move<android::Rect>",
-   "referenced_type" : "type-2380",
-   "self_type" : "type-2380",
+   "referenced_type" : "type-2382",
+   "self_type" : "type-2382",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -30008,13 +30074,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-701"
+     "referenced_type" : "type-704"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-700",
-   "self_type" : "type-700",
+   "referenced_type" : "type-703",
+   "self_type" : "type-703",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -30025,16 +30091,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1417"
+     "referenced_type" : "type-1422"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<long long>",
    "name" : "android::use_trivial_move<long long>",
-   "referenced_type" : "type-1416",
-   "self_type" : "type-1416",
+   "referenced_type" : "type-1421",
+   "self_type" : "type-1421",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveIxEE"
   },
   {
@@ -30065,12 +30131,12 @@
    [
     {
      "field_name" : "num_points",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 32,
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     },
     {
      "field_name" : "xyzc_points",
@@ -30097,7 +30163,7 @@
     {
      "field_name" : "num_planes",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "planes",
@@ -30119,7 +30185,7 @@
    [
     {
      "field_name" : "top_left",
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-219"
     },
     {
      "field_name" : "component",
@@ -30129,32 +30195,32 @@
     {
      "field_name" : "bits_per_component",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "bits_used",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "h_increment",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "v_increment",
      "field_offset" : 160,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "h_subsampling",
      "field_offset" : 192,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "v_subsampling",
      "field_offset" : 224,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android_flex_plane",
@@ -30171,33 +30237,33 @@
    [
     {
      "field_name" : "magic",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "version",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 64,
-     "referenced_type" : "type-519"
+     "referenced_type" : "type-517"
     },
     {
      "field_name" : "incRef",
      "field_offset" : 192,
-     "referenced_type" : "type-520"
+     "referenced_type" : "type-518"
     },
     {
      "field_name" : "decRef",
      "field_offset" : 224,
-     "referenced_type" : "type-520"
+     "referenced_type" : "type-518"
     }
    ],
    "linker_set_key" : "android_native_base_t",
    "name" : "android_native_base_t",
-   "referenced_type" : "type-518",
-   "self_type" : "type-518",
+   "referenced_type" : "type-516",
+   "self_type" : "type-516",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
    "unique_id" : "android_native_base_t"
@@ -30208,28 +30274,28 @@
    [
     {
      "field_name" : "left",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "top",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "right",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "bottom",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android_native_rect_t",
    "name" : "android_native_rect_t",
-   "referenced_type" : "type-619",
-   "self_type" : "type-619",
+   "referenced_type" : "type-620",
+   "self_type" : "type-620",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
    "unique_id" : "android_native_rect_t"
@@ -30304,43 +30370,43 @@
    [
     {
      "field_name" : "y",
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "cb",
      "field_offset" : 32,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "cr",
      "field_offset" : 64,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "ystride",
      "field_offset" : 96,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "cstride",
      "field_offset" : 128,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "chroma_step",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 192,
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     }
    ],
    "linker_set_key" : "android_ycbcr",
    "name" : "android_ycbcr",
-   "referenced_type" : "type-348",
-   "self_type" : "type-348",
+   "referenced_type" : "type-345",
+   "self_type" : "type-345",
    "size" : 56,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_ycbcr"
@@ -30351,108 +30417,108 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-547"
+     "referenced_type" : "type-544"
     },
     {
      "field_name" : "flags",
      "field_offset" : 512,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "field_name" : "width",
      "field_offset" : 544,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "field_name" : "height",
      "field_offset" : 576,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "field_name" : "stride",
      "field_offset" : 608,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "format",
      "field_offset" : 640,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "xdpi",
      "field_offset" : 672,
-     "referenced_type" : "type-563"
+     "referenced_type" : "type-560"
     },
     {
      "field_name" : "ydpi",
      "field_offset" : 704,
-     "referenced_type" : "type-563"
+     "referenced_type" : "type-560"
     },
     {
      "field_name" : "fps",
      "field_offset" : 736,
-     "referenced_type" : "type-563"
+     "referenced_type" : "type-560"
     },
     {
      "field_name" : "minSwapInterval",
      "field_offset" : 768,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "maxSwapInterval",
      "field_offset" : 800,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "numFramebuffers",
      "field_offset" : 832,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 864,
-     "referenced_type" : "type-564"
+     "referenced_type" : "type-561"
     },
     {
      "field_name" : "setSwapInterval",
      "field_offset" : 1088,
-     "referenced_type" : "type-565"
+     "referenced_type" : "type-562"
     },
     {
      "field_name" : "setUpdateRect",
      "field_offset" : 1120,
-     "referenced_type" : "type-568"
+     "referenced_type" : "type-565"
     },
     {
      "field_name" : "post",
      "field_offset" : 1152,
-     "referenced_type" : "type-570"
+     "referenced_type" : "type-567"
     },
     {
      "field_name" : "compositionComplete",
      "field_offset" : 1184,
-     "referenced_type" : "type-572"
+     "referenced_type" : "type-569"
     },
     {
      "field_name" : "dump",
      "field_offset" : 1216,
-     "referenced_type" : "type-574"
+     "referenced_type" : "type-571"
     },
     {
      "field_name" : "enableScreen",
      "field_offset" : 1248,
-     "referenced_type" : "type-565"
+     "referenced_type" : "type-562"
     },
     {
      "field_name" : "reserved_proc",
      "field_offset" : 1280,
-     "referenced_type" : "type-524"
+     "referenced_type" : "type-522"
     }
    ],
    "linker_set_key" : "framebuffer_device_t",
    "name" : "framebuffer_device_t",
-   "referenced_type" : "type-546",
-   "self_type" : "type-546",
+   "referenced_type" : "type-543",
+   "self_type" : "type-543",
    "size" : 184,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h",
    "unique_id" : "framebuffer_device_t"
@@ -30463,63 +30529,73 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-549"
+     "referenced_type" : "type-546"
     },
     {
      "field_name" : "registerBuffer",
      "field_offset" : 1024,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-577"
     },
     {
      "field_name" : "unregisterBuffer",
      "field_offset" : 1056,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-577"
     },
     {
      "field_name" : "lock",
      "field_offset" : 1088,
-     "referenced_type" : "type-583"
+     "referenced_type" : "type-581"
     },
     {
      "field_name" : "unlock",
      "field_offset" : 1120,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-577"
     },
     {
      "field_name" : "perform",
      "field_offset" : 1152,
-     "referenced_type" : "type-585"
+     "referenced_type" : "type-583"
     },
     {
      "field_name" : "lock_ycbcr",
      "field_offset" : 1184,
-     "referenced_type" : "type-587"
+     "referenced_type" : "type-585"
     },
     {
      "field_name" : "lockAsync",
      "field_offset" : 1216,
-     "referenced_type" : "type-589"
+     "referenced_type" : "type-587"
     },
     {
      "field_name" : "unlockAsync",
      "field_offset" : 1248,
-     "referenced_type" : "type-591"
+     "referenced_type" : "type-589"
     },
     {
      "field_name" : "lockAsync_ycbcr",
      "field_offset" : 1280,
+     "referenced_type" : "type-592"
+    },
+    {
+     "field_name" : "getTransportSize",
+     "field_offset" : 1312,
      "referenced_type" : "type-594"
     },
     {
-     "field_name" : "reserved_proc",
-     "field_offset" : 1312,
+     "field_name" : "validateBufferSize",
+     "field_offset" : 1344,
      "referenced_type" : "type-596"
+    },
+    {
+     "field_name" : "reserved_proc",
+     "field_offset" : 1376,
+     "referenced_type" : "type-521"
     }
    ],
    "linker_set_key" : "gralloc_module_t",
    "name" : "gralloc_module_t",
-   "referenced_type" : "type-578",
-   "self_type" : "type-578",
+   "referenced_type" : "type-576",
+   "self_type" : "type-576",
    "size" : 176,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h",
    "unique_id" : "gralloc_module_t"
@@ -30530,33 +30606,33 @@
    [
     {
      "field_name" : "tag",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "version",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "module",
      "field_offset" : 64,
-     "referenced_type" : "type-548"
+     "referenced_type" : "type-545"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 96,
-     "referenced_type" : "type-559"
+     "referenced_type" : "type-556"
     },
     {
      "field_name" : "close",
      "field_offset" : 480,
-     "referenced_type" : "type-560"
+     "referenced_type" : "type-557"
     }
    ],
    "linker_set_key" : "hw_device_t",
    "name" : "hw_device_t",
-   "referenced_type" : "type-547",
-   "self_type" : "type-547",
+   "referenced_type" : "type-544",
+   "self_type" : "type-544",
    "size" : 64,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
    "unique_id" : "hw_device_t"
@@ -30567,13 +30643,13 @@
    [
     {
      "field_name" : "open",
-     "referenced_type" : "type-552"
+     "referenced_type" : "type-549"
     }
    ],
    "linker_set_key" : "hw_module_methods_t",
    "name" : "hw_module_methods_t",
-   "referenced_type" : "type-551",
-   "self_type" : "type-551",
+   "referenced_type" : "type-548",
+   "self_type" : "type-548",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
    "unique_id" : "hw_module_methods_t"
@@ -30584,7 +30660,7 @@
    [
     {
      "field_name" : "tag",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "module_api_version",
@@ -30599,38 +30675,38 @@
     {
      "field_name" : "id",
      "field_offset" : 64,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "field_name" : "name",
      "field_offset" : 96,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "field_name" : "author",
      "field_offset" : 128,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "field_name" : "methods",
      "field_offset" : 160,
-     "referenced_type" : "type-550"
+     "referenced_type" : "type-547"
     },
     {
      "field_name" : "dso",
      "field_offset" : 192,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 224,
-     "referenced_type" : "type-558"
+     "referenced_type" : "type-555"
     }
    ],
    "linker_set_key" : "hw_module_t",
    "name" : "hw_module_t",
-   "referenced_type" : "type-549",
-   "self_type" : "type-549",
+   "referenced_type" : "type-546",
+   "self_type" : "type-546",
    "size" : 128,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
    "unique_id" : "hw_module_t"
@@ -30696,12 +30772,12 @@
    [
     {
      "field_name" : "tv_sec",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "tv_nsec",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "linker_set_key" : "log_time",
@@ -30728,22 +30804,22 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "msg",
@@ -30775,27 +30851,27 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "euid",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "msg",
@@ -30827,27 +30903,27 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "lid",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "msg",
@@ -30879,32 +30955,32 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "lid",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "uid",
      "field_offset" : 192,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "msg",
@@ -30926,28 +31002,28 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "numFds",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "numInts",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "data",
      "field_offset" : 96,
-     "referenced_type" : "type-145"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "native_handle",
    "name" : "native_handle",
-   "referenced_type" : "type-144",
-   "self_type" : "type-144",
+   "referenced_type" : "type-147",
+   "self_type" : "type-147",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
    "unique_id" : "native_handle"
@@ -30957,13 +31033,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-435"
+     "referenced_type" : "type-432"
     }
    ],
    "linker_set_key" : "std::is_floating_point<android::half>",
    "name" : "std::is_floating_point<android::half>",
-   "referenced_type" : "type-434",
-   "self_type" : "type-434",
+   "referenced_type" : "type-431",
+   "self_type" : "type-431",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h",
    "template_args" : [ "type-1" ],
@@ -30974,8 +31050,8 @@
    "linker_set_key" : "std::numeric_limits<android::half>",
    "name" : "std::numeric_limits<android::half>",
    "record_kind" : "class",
-   "referenced_type" : "type-597",
-   "self_type" : "type-597",
+   "referenced_type" : "type-575",
+   "self_type" : "type-575",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h",
    "template_args" : [ "type-1" ],
@@ -30988,8 +31064,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot &&",
    "name" : "android::FenceTime::Snapshot &&",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1386",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1391",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -31015,8 +31091,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &&",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &&",
-   "referenced_type" : "type-99",
-   "self_type" : "type-107",
+   "referenced_type" : "type-101",
+   "self_type" : "type-109",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -31024,8 +31100,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &&",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &&",
-   "referenced_type" : "type-393",
-   "self_type" : "type-399",
+   "referenced_type" : "type-392",
+   "self_type" : "type-396",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -31033,8 +31109,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &&",
-   "referenced_type" : "type-111",
-   "self_type" : "type-113",
+   "referenced_type" : "type-113",
+   "self_type" : "type-115",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -31051,7 +31127,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status &&",
    "name" : "android::hardware::Status &&",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1312",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -31060,7 +31136,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status &&",
    "name" : "android::hardware::details::return_status &&",
-   "referenced_type" : "type-101",
+   "referenced_type" : "type-103",
    "self_type" : "type-1318",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -31069,7 +31145,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_handle &&",
    "name" : "android::hardware::hidl_handle &&",
-   "referenced_type" : "type-139",
+   "referenced_type" : "type-142",
    "self_type" : "type-1087",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -31088,7 +31164,7 @@
    "linker_set_key" : "android::sp<android::Fence> &&",
    "name" : "android::sp<android::Fence> &&",
    "referenced_type" : "type-1357",
-   "self_type" : "type-1410",
+   "self_type" : "type-1415",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31096,8 +31172,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &&",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &&",
-   "referenced_type" : "type-355",
-   "self_type" : "type-378",
+   "referenced_type" : "type-352",
+   "self_type" : "type-375",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31105,8 +31181,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &&",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &&",
-   "referenced_type" : "type-484",
-   "self_type" : "type-491",
+   "referenced_type" : "type-481",
+   "self_type" : "type-488",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31114,8 +31190,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &&",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &&",
-   "referenced_type" : "type-338",
-   "self_type" : "type-386",
+   "referenced_type" : "type-335",
+   "self_type" : "type-383",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31123,8 +31199,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &&",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &&",
-   "referenced_type" : "type-86",
-   "self_type" : "type-94",
+   "referenced_type" : "type-88",
+   "self_type" : "type-96",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31132,8 +31208,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &&",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &&",
-   "referenced_type" : "type-497",
-   "self_type" : "type-504",
+   "referenced_type" : "type-494",
+   "self_type" : "type-501",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31141,7 +31217,7 @@
    "alignment" : 4,
    "linker_set_key" : "int &&",
    "name" : "int &&",
-   "referenced_type" : "type-103",
+   "referenced_type" : "type-105",
    "self_type" : "type-1294",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
diff --git a/29/64/arm64_armv8-a/source-based/libstagefright_bufferqueue_helper.so.lsdump b/29/64/arm64_armv8-a/source-based/libstagefright_bufferqueue_helper.so.lsdump
index 3806daf..1ead354 100644
--- a/29/64/arm64_armv8-a/source-based/libstagefright_bufferqueue_helper.so.lsdump
+++ b/29/64/arm64_armv8-a/source-based/libstagefright_bufferqueue_helper.so.lsdump
@@ -13,7 +13,7 @@
   {
    "linker_set_key" : "OMX_COMPONENTREGISTERTYPE []",
    "name" : "OMX_COMPONENTREGISTERTYPE []",
-   "referenced_type" : "type-1504",
+   "referenced_type" : "type-1503",
    "self_type" : "type-1516",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -30,8 +30,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::MediaImage2::PlaneInfo [4]",
    "name" : "android::MediaImage2::PlaneInfo [4]",
-   "referenced_type" : "type-2426",
-   "self_type" : "type-2425",
+   "referenced_type" : "type-2429",
+   "self_type" : "type-2428",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
@@ -39,8 +39,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::MediaImage::PlaneInfo [3]",
    "name" : "android::MediaImage::PlaneInfo [3]",
-   "referenced_type" : "type-2420",
-   "self_type" : "type-2419",
+   "referenced_type" : "type-2423",
+   "self_type" : "type-2422",
    "size" : 60,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
@@ -81,7 +81,7 @@
    "linker_set_key" : "int [3]",
    "name" : "int [3]",
    "referenced_type" : "type-4",
-   "self_type" : "type-2204",
+   "self_type" : "type-2207",
    "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-2204",
-   "self_type" : "type-2203",
+   "referenced_type" : "type-2207",
+   "self_type" : "type-2206",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
   },
@@ -108,7 +108,7 @@
    "linker_set_key" : "unsigned char [128]",
    "name" : "unsigned char [128]",
    "referenced_type" : "type-92",
-   "self_type" : "type-1528",
+   "self_type" : "type-1530",
    "size" : 128,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -117,7 +117,7 @@
    "linker_set_key" : "unsigned char [16]",
    "name" : "unsigned char [16]",
    "referenced_type" : "type-92",
-   "self_type" : "type-2313",
+   "self_type" : "type-2316",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -126,7 +126,7 @@
    "linker_set_key" : "unsigned char [1]",
    "name" : "unsigned char [1]",
    "referenced_type" : "type-92",
-   "self_type" : "type-1577",
+   "self_type" : "type-1572",
    "size" : 1,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -135,7 +135,7 @@
    "linker_set_key" : "unsigned char [256]",
    "name" : "unsigned char [256]",
    "referenced_type" : "type-92",
-   "self_type" : "type-2314",
+   "self_type" : "type-2317",
    "size" : 256,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -144,7 +144,7 @@
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
    "referenced_type" : "type-92",
-   "self_type" : "type-2180",
+   "self_type" : "type-2183",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -153,7 +153,7 @@
    "linker_set_key" : "unsigned char [64]",
    "name" : "unsigned char [64]",
    "referenced_type" : "type-92",
-   "self_type" : "type-2310",
+   "self_type" : "type-2313",
    "size" : 64,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -204,8 +204,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-1243",
-   "self_type" : "type-1243",
+   "referenced_type" : "type-1246",
+   "self_type" : "type-1246",
    "size" : 2
   },
   {
@@ -246,8 +246,8 @@
    "alignment" : 16,
    "linker_set_key" : "long double",
    "name" : "long double",
-   "referenced_type" : "type-1453",
-   "self_type" : "type-1453",
+   "referenced_type" : "type-1457",
+   "self_type" : "type-1457",
    "size" : 16
   },
   {
@@ -760,6 +760,9 @@
    "name" : "_ZN7android18BnProducerListener18needsReleaseNotifyEv"
   },
   {
+   "name" : "_ZN7android18BnProducerListener18onBuffersDiscardedERKNSt3__16vectorIiNS1_9allocatorIiEEEE"
+  },
+  {
    "name" : "_ZN7android18BpConsumerListenerD0Ev"
   },
   {
@@ -3152,8 +3155,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AACPROFILETYPE",
    "name" : "OMX_AUDIO_AACPROFILETYPE",
-   "referenced_type" : "type-1678",
-   "self_type" : "type-1678",
+   "referenced_type" : "type-1675",
+   "self_type" : "type-1675",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3304,8 +3307,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRBANDMODETYPE",
    "name" : "OMX_AUDIO_AMRBANDMODETYPE",
-   "referenced_type" : "type-1892",
-   "self_type" : "type-1892",
+   "referenced_type" : "type-1883",
+   "self_type" : "type-1883",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3350,8 +3353,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRDTXMODETYPE",
    "name" : "OMX_AUDIO_AMRDTXMODETYPE",
-   "referenced_type" : "type-1903",
-   "self_type" : "type-1903",
+   "referenced_type" : "type-1896",
+   "self_type" : "type-1896",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3400,8 +3403,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
    "name" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
-   "referenced_type" : "type-1882",
-   "self_type" : "type-1882",
+   "referenced_type" : "type-1873",
+   "self_type" : "type-1873",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3450,8 +3453,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CDMARATETYPE",
    "name" : "OMX_AUDIO_CDMARATETYPE",
-   "referenced_type" : "type-2024",
-   "self_type" : "type-2024",
+   "referenced_type" : "type-2017",
+   "self_type" : "type-2017",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3492,8 +3495,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CHANNELMODETYPE",
    "name" : "OMX_AUDIO_CHANNELMODETYPE",
-   "referenced_type" : "type-1653",
-   "self_type" : "type-1653",
+   "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-2",
@@ -3742,8 +3745,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_ECHOCANTYPE",
    "name" : "OMX_AUDIO_ECHOCANTYPE",
-   "referenced_type" : "type-2198",
-   "self_type" : "type-2198",
+   "referenced_type" : "type-2201",
+   "self_type" : "type-2201",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3780,8 +3783,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G723RATE",
    "name" : "OMX_AUDIO_G723RATE",
-   "referenced_type" : "type-1810",
-   "self_type" : "type-1810",
+   "referenced_type" : "type-1804",
+   "self_type" : "type-1804",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3826,8 +3829,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G726MODE",
    "name" : "OMX_AUDIO_G726MODE",
-   "referenced_type" : "type-1833",
-   "self_type" : "type-1833",
+   "referenced_type" : "type-1824",
+   "self_type" : "type-1824",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3868,8 +3871,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G729TYPE",
    "name" : "OMX_AUDIO_G729TYPE",
-   "referenced_type" : "type-1855",
-   "self_type" : "type-1855",
+   "referenced_type" : "type-1847",
+   "self_type" : "type-1847",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3926,8 +3929,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDIFORMATTYPE",
    "name" : "OMX_AUDIO_MIDIFORMATTYPE",
-   "referenced_type" : "type-2090",
-   "self_type" : "type-2090",
+   "referenced_type" : "type-2083",
+   "self_type" : "type-2083",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3980,8 +3983,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
    "name" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
-   "referenced_type" : "type-2171",
-   "self_type" : "type-2171",
+   "referenced_type" : "type-2170",
+   "self_type" : "type-2170",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4022,8 +4025,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
    "name" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
-   "referenced_type" : "type-2124",
-   "self_type" : "type-2124",
+   "referenced_type" : "type-2117",
+   "self_type" : "type-2117",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4068,8 +4071,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
    "name" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
-   "referenced_type" : "type-2113",
-   "self_type" : "type-2113",
+   "referenced_type" : "type-2105",
+   "self_type" : "type-2105",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4106,8 +4109,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
    "name" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
-   "referenced_type" : "type-1663",
-   "self_type" : "type-1663",
+   "referenced_type" : "type-1657",
+   "self_type" : "type-1657",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4144,8 +4147,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PCMMODETYPE",
    "name" : "OMX_AUDIO_PCMMODETYPE",
-   "referenced_type" : "type-1634",
-   "self_type" : "type-1634",
+   "referenced_type" : "type-1632",
+   "self_type" : "type-1632",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4202,8 +4205,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_RAFORMATTYPE",
    "name" : "OMX_AUDIO_RAFORMATTYPE",
-   "referenced_type" : "type-1757",
-   "self_type" : "type-1757",
+   "referenced_type" : "type-1748",
+   "self_type" : "type-1748",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4236,8 +4239,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
    "name" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
-   "referenced_type" : "type-1777",
-   "self_type" : "type-1777",
+   "referenced_type" : "type-1771",
+   "self_type" : "type-1771",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4270,8 +4273,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_STEREOWIDENINGTYPE",
    "name" : "OMX_AUDIO_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-2194",
-   "self_type" : "type-2194",
+   "referenced_type" : "type-2197",
+   "self_type" : "type-2197",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4312,8 +4315,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_WMAFORMATTYPE",
    "name" : "OMX_AUDIO_WMAFORMATTYPE",
-   "referenced_type" : "type-1724",
-   "self_type" : "type-1724",
+   "referenced_type" : "type-1715",
+   "self_type" : "type-1715",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4354,8 +4357,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_WMAPROFILETYPE",
    "name" : "OMX_AUDIO_WMAPROFILETYPE",
-   "referenced_type" : "type-1734",
-   "self_type" : "type-1734",
+   "referenced_type" : "type-1725",
+   "self_type" : "type-1725",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4380,8 +4383,8 @@
    ],
    "linker_set_key" : "OMX_BOOL",
    "name" : "OMX_BOOL",
-   "referenced_type" : "type-1302",
-   "self_type" : "type-1302",
+   "referenced_type" : "type-1301",
+   "self_type" : "type-1301",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "underlying_type" : "type-2",
@@ -4418,8 +4421,8 @@
    ],
    "linker_set_key" : "OMX_BUFFERSUPPLIERTYPE",
    "name" : "OMX_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-1604",
-   "self_type" : "type-1604",
+   "referenced_type" : "type-1600",
+   "self_type" : "type-1600",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -4472,8 +4475,8 @@
    ],
    "linker_set_key" : "OMX_COLORBLENDTYPE",
    "name" : "OMX_COLORBLENDTYPE",
-   "referenced_type" : "type-2211",
-   "self_type" : "type-2211",
+   "referenced_type" : "type-2214",
+   "self_type" : "type-2214",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4714,8 +4717,8 @@
    ],
    "linker_set_key" : "OMX_COLOR_FORMATTYPE",
    "name" : "OMX_COLOR_FORMATTYPE",
-   "referenced_type" : "type-2201",
-   "self_type" : "type-2201",
+   "referenced_type" : "type-2204",
+   "self_type" : "type-2204",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4760,8 +4763,8 @@
    ],
    "linker_set_key" : "OMX_COMMANDTYPE",
    "name" : "OMX_COMMANDTYPE",
-   "referenced_type" : "type-1486",
-   "self_type" : "type-1486",
+   "referenced_type" : "type-1489",
+   "self_type" : "type-1489",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -4798,8 +4801,8 @@
    ],
    "linker_set_key" : "OMX_DATAUNITENCAPSULATIONTYPE",
    "name" : "OMX_DATAUNITENCAPSULATIONTYPE",
-   "referenced_type" : "type-2238",
-   "self_type" : "type-2238",
+   "referenced_type" : "type-2241",
+   "self_type" : "type-2241",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4840,8 +4843,8 @@
    ],
    "linker_set_key" : "OMX_DATAUNITTYPE",
    "name" : "OMX_DATAUNITTYPE",
-   "referenced_type" : "type-2237",
-   "self_type" : "type-2237",
+   "referenced_type" : "type-2240",
+   "self_type" : "type-2240",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4866,8 +4869,8 @@
    ],
    "linker_set_key" : "OMX_DIRTYPE",
    "name" : "OMX_DIRTYPE",
-   "referenced_type" : "type-1458",
-   "self_type" : "type-1458",
+   "referenced_type" : "type-1456",
+   "self_type" : "type-1456",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "underlying_type" : "type-2",
@@ -4908,8 +4911,8 @@
    ],
    "linker_set_key" : "OMX_DITHERTYPE",
    "name" : "OMX_DITHERTYPE",
-   "referenced_type" : "type-2240",
-   "self_type" : "type-2240",
+   "referenced_type" : "type-2243",
+   "self_type" : "type-2243",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4934,8 +4937,8 @@
    ],
    "linker_set_key" : "OMX_ENDIANTYPE",
    "name" : "OMX_ENDIANTYPE",
-   "referenced_type" : "type-1463",
-   "self_type" : "type-1463",
+   "referenced_type" : "type-1462",
+   "self_type" : "type-1462",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "underlying_type" : "type-2",
@@ -5112,8 +5115,8 @@
    ],
    "linker_set_key" : "OMX_ERRORTYPE",
    "name" : "OMX_ERRORTYPE",
-   "referenced_type" : "type-1498",
-   "self_type" : "type-1498",
+   "referenced_type" : "type-1497",
+   "self_type" : "type-1497",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-4",
@@ -5186,8 +5189,8 @@
    ],
    "linker_set_key" : "OMX_EVENTTYPE",
    "name" : "OMX_EVENTTYPE",
-   "referenced_type" : "type-1590",
-   "self_type" : "type-1590",
+   "referenced_type" : "type-1591",
+   "self_type" : "type-1591",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -5252,8 +5255,8 @@
    ],
    "linker_set_key" : "OMX_EXPOSURECONTROLTYPE",
    "name" : "OMX_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-2223",
-   "self_type" : "type-2223",
+   "referenced_type" : "type-2226",
+   "self_type" : "type-2226",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -5286,8 +5289,8 @@
    ],
    "linker_set_key" : "OMX_EXTRADATATYPE",
    "name" : "OMX_EXTRADATATYPE",
-   "referenced_type" : "type-1564",
-   "self_type" : "type-1564",
+   "referenced_type" : "type-1559",
+   "self_type" : "type-1559",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -5332,8 +5335,8 @@
    ],
    "linker_set_key" : "OMX_FOCUSSTATUSTYPE",
    "name" : "OMX_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-2248",
-   "self_type" : "type-2248",
+   "referenced_type" : "type-2251",
+   "self_type" : "type-2251",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -5402,8 +5405,8 @@
    ],
    "linker_set_key" : "OMX_IMAGEFILTERTYPE",
    "name" : "OMX_IMAGEFILTERTYPE",
-   "referenced_type" : "type-2207",
-   "self_type" : "type-2207",
+   "referenced_type" : "type-2210",
+   "self_type" : "type-2210",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -5468,8 +5471,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_CODINGTYPE",
    "name" : "OMX_IMAGE_CODINGTYPE",
-   "referenced_type" : "type-2299",
-   "self_type" : "type-2299",
+   "referenced_type" : "type-2302",
+   "self_type" : "type-2302",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "underlying_type" : "type-2",
@@ -5518,8 +5521,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_FLASHCONTROLTYPE",
    "name" : "OMX_IMAGE_FLASHCONTROLTYPE",
-   "referenced_type" : "type-2302",
-   "self_type" : "type-2302",
+   "referenced_type" : "type-2305",
+   "self_type" : "type-2305",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "underlying_type" : "type-2",
@@ -5560,8 +5563,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_FOCUSCONTROLTYPE",
    "name" : "OMX_IMAGE_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-2305",
-   "self_type" : "type-2305",
+   "referenced_type" : "type-2308",
+   "self_type" : "type-2308",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "underlying_type" : "type-2",
@@ -5610,8 +5613,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_HUFFMANTABLETYPE",
    "name" : "OMX_IMAGE_HUFFMANTABLETYPE",
-   "referenced_type" : "type-2311",
-   "self_type" : "type-2311",
+   "referenced_type" : "type-2314",
+   "self_type" : "type-2314",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "underlying_type" : "type-2",
@@ -5652,8 +5655,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
    "name" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-2308",
-   "self_type" : "type-2308",
+   "referenced_type" : "type-2311",
+   "self_type" : "type-2311",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "underlying_type" : "type-2",
@@ -6350,8 +6353,8 @@
    ],
    "linker_set_key" : "OMX_INDEXTYPE",
    "name" : "OMX_INDEXTYPE",
-   "referenced_type" : "type-1485",
-   "self_type" : "type-1485",
+   "referenced_type" : "type-1487",
+   "self_type" : "type-1487",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Index.h",
    "underlying_type" : "type-2",
@@ -6512,8 +6515,8 @@
    ],
    "linker_set_key" : "OMX_METADATACHARSETTYPE",
    "name" : "OMX_METADATACHARSETTYPE",
-   "referenced_type" : "type-2347",
-   "self_type" : "type-2347",
+   "referenced_type" : "type-2350",
+   "self_type" : "type-2350",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6554,8 +6557,8 @@
    ],
    "linker_set_key" : "OMX_METADATASCOPETYPE",
    "name" : "OMX_METADATASCOPETYPE",
-   "referenced_type" : "type-2348",
-   "self_type" : "type-2348",
+   "referenced_type" : "type-2351",
+   "self_type" : "type-2351",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6592,8 +6595,8 @@
    ],
    "linker_set_key" : "OMX_METADATASEARCHMODETYPE",
    "name" : "OMX_METADATASEARCHMODETYPE",
-   "referenced_type" : "type-2349",
-   "self_type" : "type-2349",
+   "referenced_type" : "type-2352",
+   "self_type" : "type-2352",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6630,8 +6633,8 @@
    ],
    "linker_set_key" : "OMX_METERINGTYPE",
    "name" : "OMX_METERINGTYPE",
-   "referenced_type" : "type-2244",
-   "self_type" : "type-2244",
+   "referenced_type" : "type-2247",
+   "self_type" : "type-2247",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -6672,8 +6675,8 @@
    ],
    "linker_set_key" : "OMX_MIRRORTYPE",
    "name" : "OMX_MIRRORTYPE",
-   "referenced_type" : "type-2215",
-   "self_type" : "type-2215",
+   "referenced_type" : "type-2218",
+   "self_type" : "type-2218",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -6702,8 +6705,8 @@
    ],
    "linker_set_key" : "OMX_NUMERICALDATATYPE",
    "name" : "OMX_NUMERICALDATATYPE",
-   "referenced_type" : "type-1467",
-   "self_type" : "type-1467",
+   "referenced_type" : "type-1468",
+   "self_type" : "type-1468",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "underlying_type" : "type-2",
@@ -6748,8 +6751,8 @@
    ],
    "linker_set_key" : "OMX_OTHER_FORMATTYPE",
    "name" : "OMX_OTHER_FORMATTYPE",
-   "referenced_type" : "type-2316",
-   "self_type" : "type-2316",
+   "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-2",
@@ -6790,8 +6793,8 @@
    ],
    "linker_set_key" : "OMX_PORTDOMAINTYPE",
    "name" : "OMX_PORTDOMAINTYPE",
-   "referenced_type" : "type-2334",
-   "self_type" : "type-2334",
+   "referenced_type" : "type-2337",
+   "self_type" : "type-2337",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6840,8 +6843,8 @@
    ],
    "linker_set_key" : "OMX_STATETYPE",
    "name" : "OMX_STATETYPE",
-   "referenced_type" : "type-1493",
-   "self_type" : "type-1493",
+   "referenced_type" : "type-1491",
+   "self_type" : "type-1491",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -6874,8 +6877,8 @@
    ],
    "linker_set_key" : "OMX_SUSPENSIONPOLICYTYPE",
    "name" : "OMX_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-2338",
-   "self_type" : "type-2338",
+   "referenced_type" : "type-2341",
+   "self_type" : "type-2341",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6908,8 +6911,8 @@
    ],
    "linker_set_key" : "OMX_SUSPENSIONTYPE",
    "name" : "OMX_SUSPENSIONTYPE",
-   "referenced_type" : "type-2340",
-   "self_type" : "type-2340",
+   "referenced_type" : "type-2343",
+   "self_type" : "type-2343",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6946,8 +6949,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CLOCKSTATE",
    "name" : "OMX_TIME_CLOCKSTATE",
-   "referenced_type" : "type-2323",
-   "self_type" : "type-2323",
+   "referenced_type" : "type-2326",
+   "self_type" : "type-2326",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -6984,8 +6987,8 @@
    ],
    "linker_set_key" : "OMX_TIME_REFCLOCKTYPE",
    "name" : "OMX_TIME_REFCLOCKTYPE",
-   "referenced_type" : "type-2322",
-   "self_type" : "type-2322",
+   "referenced_type" : "type-2325",
+   "self_type" : "type-2325",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -7018,8 +7021,8 @@
    ],
    "linker_set_key" : "OMX_TIME_SEEKMODETYPE",
    "name" : "OMX_TIME_SEEKMODETYPE",
-   "referenced_type" : "type-2317",
-   "self_type" : "type-2317",
+   "referenced_type" : "type-2320",
+   "self_type" : "type-2320",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -7056,8 +7059,8 @@
    ],
    "linker_set_key" : "OMX_TIME_UPDATETYPE",
    "name" : "OMX_TIME_UPDATETYPE",
-   "referenced_type" : "type-2320",
-   "self_type" : "type-2320",
+   "referenced_type" : "type-2323",
+   "self_type" : "type-2323",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -7110,8 +7113,8 @@
    ],
    "linker_set_key" : "OMX_TRANSITIONEFFECTTYPE",
    "name" : "OMX_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-2235",
-   "self_type" : "type-2235",
+   "referenced_type" : "type-2238",
+   "self_type" : "type-2238",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -7216,8 +7219,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCLEVELTYPE",
    "name" : "OMX_VIDEO_AVCLEVELTYPE",
-   "referenced_type" : "type-2283",
-   "self_type" : "type-2283",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2286",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7254,8 +7257,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
    "name" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
-   "referenced_type" : "type-2284",
-   "self_type" : "type-2284",
+   "referenced_type" : "type-2287",
+   "self_type" : "type-2287",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7308,8 +7311,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCPROFILETYPE",
    "name" : "OMX_VIDEO_AVCPROFILETYPE",
-   "referenced_type" : "type-2281",
-   "self_type" : "type-2281",
+   "referenced_type" : "type-2284",
+   "self_type" : "type-2284",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7346,8 +7349,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCSLICEMODETYPE",
    "name" : "OMX_VIDEO_AVCSLICEMODETYPE",
-   "referenced_type" : "type-2295",
-   "self_type" : "type-2295",
+   "referenced_type" : "type-2298",
+   "self_type" : "type-2298",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7428,8 +7431,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CODINGTYPE",
    "name" : "OMX_VIDEO_CODINGTYPE",
-   "referenced_type" : "type-2250",
-   "self_type" : "type-2250",
+   "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-2",
@@ -7478,8 +7481,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONTROLRATETYPE",
    "name" : "OMX_VIDEO_CONTROLRATETYPE",
-   "referenced_type" : "type-2255",
-   "self_type" : "type-2255",
+   "referenced_type" : "type-2258",
+   "self_type" : "type-2258",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7536,8 +7539,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_H263LEVELTYPE",
    "name" : "OMX_VIDEO_H263LEVELTYPE",
-   "referenced_type" : "type-2266",
-   "self_type" : "type-2266",
+   "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-2",
@@ -7598,8 +7601,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_H263PROFILETYPE",
    "name" : "OMX_VIDEO_H263PROFILETYPE",
-   "referenced_type" : "type-2265",
-   "self_type" : "type-2265",
+   "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-2",
@@ -7636,8 +7639,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_INTRAREFRESHTYPE",
    "name" : "OMX_VIDEO_INTRAREFRESHTYPE",
-   "referenced_type" : "type-2261",
-   "self_type" : "type-2261",
+   "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-2",
@@ -7678,8 +7681,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MOTIONVECTORTYPE",
    "name" : "OMX_VIDEO_MOTIONVECTORTYPE",
-   "referenced_type" : "type-2259",
-   "self_type" : "type-2259",
+   "referenced_type" : "type-2262",
+   "self_type" : "type-2262",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7724,8 +7727,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG2LEVELTYPE",
    "name" : "OMX_VIDEO_MPEG2LEVELTYPE",
-   "referenced_type" : "type-2271",
-   "self_type" : "type-2271",
+   "referenced_type" : "type-2274",
+   "self_type" : "type-2274",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7774,8 +7777,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG2PROFILETYPE",
    "name" : "OMX_VIDEO_MPEG2PROFILETYPE",
-   "referenced_type" : "type-2270",
-   "self_type" : "type-2270",
+   "referenced_type" : "type-2273",
+   "self_type" : "type-2273",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7840,8 +7843,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG4LEVELTYPE",
    "name" : "OMX_VIDEO_MPEG4LEVELTYPE",
-   "referenced_type" : "type-2274",
-   "self_type" : "type-2274",
+   "referenced_type" : "type-2277",
+   "self_type" : "type-2277",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7930,8 +7933,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG4PROFILETYPE",
    "name" : "OMX_VIDEO_MPEG4PROFILETYPE",
-   "referenced_type" : "type-2273",
-   "self_type" : "type-2273",
+   "referenced_type" : "type-2276",
+   "self_type" : "type-2276",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7988,8 +7991,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PICTURETYPE",
    "name" : "OMX_VIDEO_PICTURETYPE",
-   "referenced_type" : "type-2267",
-   "self_type" : "type-2267",
+   "referenced_type" : "type-2270",
+   "self_type" : "type-2270",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -8030,8 +8033,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_RVFORMATTYPE",
    "name" : "OMX_VIDEO_RVFORMATTYPE",
-   "referenced_type" : "type-2278",
-   "self_type" : "type-2278",
+   "referenced_type" : "type-2281",
+   "self_type" : "type-2281",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -8072,8 +8075,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_WMVFORMATTYPE",
    "name" : "OMX_VIDEO_WMVFORMATTYPE",
-   "referenced_type" : "type-2276",
-   "self_type" : "type-2276",
+   "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-2",
@@ -8138,8 +8141,8 @@
    ],
    "linker_set_key" : "OMX_WHITEBALCONTROLTYPE",
    "name" : "OMX_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-2221",
-   "self_type" : "type-2221",
+   "referenced_type" : "type-2224",
+   "self_type" : "type-2224",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -8180,8 +8183,8 @@
    ],
    "linker_set_key" : "android::ADebug::Level",
    "name" : "android::ADebug::Level",
-   "referenced_type" : "type-2293",
-   "self_type" : "type-2293",
+   "referenced_type" : "type-2296",
+   "self_type" : "type-2296",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
    "underlying_type" : "type-2",
@@ -8284,8 +8287,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::MatrixCoeffs",
    "name" : "android::ColorAspects::MatrixCoeffs",
-   "referenced_type" : "type-2434",
-   "self_type" : "type-2434",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2437",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8330,8 +8333,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::Primaries",
    "name" : "android::ColorAspects::Primaries",
-   "referenced_type" : "type-2432",
-   "self_type" : "type-2432",
+   "referenced_type" : "type-2435",
+   "self_type" : "type-2435",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8360,8 +8363,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::Range",
    "name" : "android::ColorAspects::Range",
-   "referenced_type" : "type-2431",
-   "self_type" : "type-2431",
+   "referenced_type" : "type-2434",
+   "self_type" : "type-2434",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8484,8 +8487,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::Transfer",
    "name" : "android::ColorAspects::Transfer",
-   "referenced_type" : "type-2433",
-   "self_type" : "type-2433",
+   "referenced_type" : "type-2436",
+   "self_type" : "type-2436",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8518,8 +8521,8 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorRange",
    "name" : "android::ColorUtils::ColorRange",
-   "referenced_type" : "type-1198",
-   "self_type" : "type-1198",
+   "referenced_type" : "type-1201",
+   "self_type" : "type-1201",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
    "underlying_type" : "type-2",
@@ -8584,8 +8587,8 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorStandard",
    "name" : "android::ColorUtils::ColorStandard",
-   "referenced_type" : "type-1188",
-   "self_type" : "type-1188",
+   "referenced_type" : "type-1191",
+   "self_type" : "type-1191",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
    "underlying_type" : "type-2",
@@ -8642,8 +8645,8 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorTransfer",
    "name" : "android::ColorUtils::ColorTransfer",
-   "referenced_type" : "type-1193",
-   "self_type" : "type-1193",
+   "referenced_type" : "type-1195",
+   "self_type" : "type-1195",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
    "underlying_type" : "type-2",
@@ -8708,8 +8711,8 @@
    ],
    "linker_set_key" : "android::HDRStaticInfo::ID",
    "name" : "android::HDRStaticInfo::ID",
-   "referenced_type" : "type-2438",
-   "self_type" : "type-2438",
+   "referenced_type" : "type-2441",
+   "self_type" : "type-2441",
    "size" : 1,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-92",
@@ -8792,8 +8795,8 @@
    ],
    "linker_set_key" : "android::MediaImage2::Type",
    "name" : "android::MediaImage2::Type",
-   "referenced_type" : "type-2424",
-   "self_type" : "type-2424",
+   "referenced_type" : "type-2427",
+   "self_type" : "type-2427",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8844,8 +8847,8 @@
    ],
    "linker_set_key" : "android::MediaImage::Type",
    "name" : "android::MediaImage::Type",
-   "referenced_type" : "type-2418",
-   "self_type" : "type-2418",
+   "referenced_type" : "type-2421",
+   "self_type" : "type-2421",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8878,8 +8881,8 @@
    ],
    "linker_set_key" : "android::MetadataBufferType",
    "name" : "android::MetadataBufferType",
-   "referenced_type" : "type-1235",
-   "self_type" : "type-1235",
+   "referenced_type" : "type-1238",
+   "self_type" : "type-1238",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/MetadataBufferType.h",
    "underlying_type" : "type-4",
@@ -8904,8 +8907,8 @@
    ],
    "linker_set_key" : "android::ProcessState::CallRestriction",
    "name" : "android::ProcessState::CallRestriction",
-   "referenced_type" : "type-1256",
-   "self_type" : "type-1256",
+   "referenced_type" : "type-1259",
+   "self_type" : "type-1259",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h",
    "underlying_type" : "type-4",
@@ -8922,8 +8925,8 @@
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-2659",
-   "self_type" : "type-2659",
+   "referenced_type" : "type-2662",
+   "self_type" : "type-2662",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "underlying_type" : "type-2",
@@ -8940,8 +8943,8 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-2654",
-   "self_type" : "type-2654",
+   "referenced_type" : "type-2657",
+   "self_type" : "type-2657",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "underlying_type" : "type-2",
@@ -8966,8 +8969,8 @@
    ],
    "linker_set_key" : "android::base::LogId",
    "name" : "android::base::LogId",
-   "referenced_type" : "type-4707",
-   "self_type" : "type-4707",
+   "referenced_type" : "type-4714",
+   "self_type" : "type-4714",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "type-2",
@@ -9008,8 +9011,8 @@
    ],
    "linker_set_key" : "android::base::LogSeverity",
    "name" : "android::base::LogSeverity",
-   "referenced_type" : "type-4657",
-   "self_type" : "type-4657",
+   "referenced_type" : "type-4664",
+   "self_type" : "type-4664",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "type-2",
@@ -9144,8 +9147,8 @@
    ],
    "linker_set_key" : "android::hardware::ProcessState::CallRestriction",
    "name" : "android::hardware::ProcessState::CallRestriction",
-   "referenced_type" : "type-1392",
-   "self_type" : "type-1392",
+   "referenced_type" : "type-1395",
+   "self_type" : "type-1395",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "underlying_type" : "type-4",
@@ -12138,8 +12141,8 @@
    ],
    "linker_set_key" : "log_id",
    "name" : "log_id",
-   "referenced_type" : "type-2413",
-   "self_type" : "type-2413",
+   "referenced_type" : "type-2416",
+   "self_type" : "type-2416",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
@@ -12158,9 +12161,9 @@
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1506",
-   "return_type" : "type-1498",
-   "self_type" : "type-1506",
+   "referenced_type" : "type-1505",
+   "return_type" : "type-1497",
+   "self_type" : "type-1505",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -12173,12 +12176,12 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1596"
+     "referenced_type" : "type-1599"
     }
    ],
-   "referenced_type" : "type-2384",
-   "return_type" : "type-1498",
-   "self_type" : "type-2384",
+   "referenced_type" : "type-2387",
+   "return_type" : "type-1497",
+   "self_type" : "type-2387",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12191,7 +12194,7 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-2378"
+     "referenced_type" : "type-2381"
     },
     {
      "referenced_type" : "type-2"
@@ -12203,9 +12206,9 @@
      "referenced_type" : "type-2"
     }
    ],
-   "referenced_type" : "type-2380",
-   "return_type" : "type-1498",
-   "self_type" : "type-2380",
+   "referenced_type" : "type-2383",
+   "return_type" : "type-1497",
+   "self_type" : "type-2383",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12218,7 +12221,7 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-2378"
+     "referenced_type" : "type-2381"
     },
     {
      "referenced_type" : "type-2"
@@ -12233,9 +12236,9 @@
      "referenced_type" : "type-91"
     }
    ],
-   "referenced_type" : "type-2377",
-   "return_type" : "type-1498",
-   "self_type" : "type-2377",
+   "referenced_type" : "type-2380",
+   "return_type" : "type-1497",
+   "self_type" : "type-2380",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12248,7 +12251,7 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-2378"
+     "referenced_type" : "type-2381"
     },
     {
      "referenced_type" : "type-2"
@@ -12260,9 +12263,9 @@
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-2389",
-   "return_type" : "type-1498",
-   "self_type" : "type-2389",
+   "referenced_type" : "type-2392",
+   "return_type" : "type-1497",
+   "self_type" : "type-2392",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12275,15 +12278,15 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-2387"
+     "referenced_type" : "type-2390"
     },
     {
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-2386",
-   "return_type" : "type-1498",
-   "self_type" : "type-2386",
+   "referenced_type" : "type-2389",
+   "return_type" : "type-1497",
+   "self_type" : "type-2389",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12296,7 +12299,7 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1486"
+     "referenced_type" : "type-1489"
     },
     {
      "referenced_type" : "type-2"
@@ -12305,9 +12308,9 @@
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-2364",
-   "return_type" : "type-1498",
-   "self_type" : "type-2364",
+   "referenced_type" : "type-2367",
+   "return_type" : "type-1497",
+   "self_type" : "type-2367",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12320,15 +12323,15 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-1487"
     },
     {
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-2366",
-   "return_type" : "type-1498",
-   "self_type" : "type-2366",
+   "referenced_type" : "type-2369",
+   "return_type" : "type-1497",
+   "self_type" : "type-2369",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12341,12 +12344,12 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-2372"
+     "referenced_type" : "type-2375"
     }
    ],
-   "referenced_type" : "type-2371",
-   "return_type" : "type-1498",
-   "self_type" : "type-2371",
+   "referenced_type" : "type-2374",
+   "return_type" : "type-1497",
+   "self_type" : "type-2374",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12362,12 +12365,12 @@
      "referenced_type" : "type-254"
     },
     {
-     "referenced_type" : "type-2369"
+     "referenced_type" : "type-2372"
     }
    ],
-   "referenced_type" : "type-2368",
-   "return_type" : "type-1498",
-   "self_type" : "type-2368",
+   "referenced_type" : "type-2371",
+   "return_type" : "type-1497",
+   "self_type" : "type-2371",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12383,18 +12386,18 @@
      "referenced_type" : "type-254"
     },
     {
-     "referenced_type" : "type-2361"
+     "referenced_type" : "type-2364"
     },
     {
-     "referenced_type" : "type-2361"
+     "referenced_type" : "type-2364"
     },
     {
-     "referenced_type" : "type-2362"
+     "referenced_type" : "type-2365"
     }
    ],
-   "referenced_type" : "type-2360",
-   "return_type" : "type-1498",
-   "self_type" : "type-2360",
+   "referenced_type" : "type-2363",
+   "return_type" : "type-1497",
+   "self_type" : "type-2363",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12413,9 +12416,9 @@
      "referenced_type" : "type-2"
     }
    ],
-   "referenced_type" : "type-2391",
-   "return_type" : "type-1498",
-   "self_type" : "type-2391",
+   "referenced_type" : "type-2394",
+   "return_type" : "type-1497",
+   "self_type" : "type-2394",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12431,12 +12434,12 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1596"
+     "referenced_type" : "type-1599"
     }
    ],
-   "referenced_type" : "type-2382",
-   "return_type" : "type-1498",
-   "self_type" : "type-2382",
+   "referenced_type" : "type-2385",
+   "return_type" : "type-1497",
+   "self_type" : "type-2385",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12458,12 +12461,12 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-2375"
+     "referenced_type" : "type-2378"
     }
    ],
-   "referenced_type" : "type-2374",
-   "return_type" : "type-1498",
-   "self_type" : "type-2374",
+   "referenced_type" : "type-2377",
+   "return_type" : "type-1497",
+   "self_type" : "type-2377",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12479,12 +12482,12 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1596"
+     "referenced_type" : "type-1599"
     }
    ],
-   "referenced_type" : "type-1595",
-   "return_type" : "type-1498",
-   "self_type" : "type-1595",
+   "referenced_type" : "type-1598",
+   "return_type" : "type-1497",
+   "self_type" : "type-1598",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -12500,7 +12503,7 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1590"
+     "referenced_type" : "type-1591"
     },
     {
      "referenced_type" : "type-2"
@@ -12512,9 +12515,9 @@
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1593",
-   "return_type" : "type-1498",
-   "self_type" : "type-1593",
+   "referenced_type" : "type-1596",
+   "return_type" : "type-1497",
+   "self_type" : "type-1596",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -12524,18 +12527,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1247"
+     "referenced_type" : "type-1250"
     },
     {
-     "referenced_type" : "type-1038"
+     "referenced_type" : "type-1042"
     },
     {
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1246",
+   "referenced_type" : "type-1249",
    "return_type" : "type-95",
-   "self_type" : "type-1246",
+   "self_type" : "type-1249",
    "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h"
   },
   {
@@ -12545,18 +12548,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1247"
+     "referenced_type" : "type-1250"
     },
     {
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1392"
     },
     {
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1388",
+   "referenced_type" : "type-1391",
    "return_type" : "type-95",
-   "self_type" : "type-1388",
+   "self_type" : "type-1391",
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
   {
@@ -12611,7 +12614,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1385"
     },
     {
      "referenced_type" : "type-99"
@@ -12629,9 +12632,9 @@
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1381",
+   "referenced_type" : "type-1384",
    "return_type" : "type-9",
-   "self_type" : "type-1381",
+   "self_type" : "type-1384",
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   }
  ],
@@ -12659,7 +12662,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-4503"
+     "referenced_type" : "type-4509"
     }
    ],
    "return_type" : "type-52",
@@ -12687,7 +12690,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1271"
+     "referenced_type" : "type-1275"
     }
    ],
    "return_type" : "type-52",
@@ -12966,7 +12969,7 @@
      "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-2192"
+     "referenced_type" : "type-2195"
     }
    ],
    "return_type" : "type-9",
@@ -13312,7 +13315,7 @@
      "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-2494"
+     "referenced_type" : "type-2497"
     },
     {
      "referenced_type" : "type-4"
@@ -13421,13 +13424,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2524"
+     "referenced_type" : "type-2527"
     },
     {
      "referenced_type" : "type-725"
     }
    ],
-   "return_type" : "type-2528",
+   "return_type" : "type-2531",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -13437,13 +13440,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2524"
+     "referenced_type" : "type-2527"
     },
     {
-     "referenced_type" : "type-1863"
+     "referenced_type" : "type-1867"
     }
    ],
-   "return_type" : "type-2528",
+   "return_type" : "type-2531",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -13454,7 +13457,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2675"
+     "referenced_type" : "type-2678"
     },
     {
      "referenced_type" : "type-12"
@@ -13474,7 +13477,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2675"
+     "referenced_type" : "type-2678"
     },
     {
      "referenced_type" : "type-8"
@@ -13494,7 +13497,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2675"
+     "referenced_type" : "type-2678"
     },
     {
      "referenced_type" : "type-8"
@@ -13514,7 +13517,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2675"
+     "referenced_type" : "type-2678"
     },
     {
      "referenced_type" : "type-8"
@@ -13537,7 +13540,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2675"
+     "referenced_type" : "type-2678"
     },
     {
      "referenced_type" : "type-8"
@@ -13560,7 +13563,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2675"
+     "referenced_type" : "type-2678"
     },
     {
      "referenced_type" : "type-8"
@@ -13583,7 +13586,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2675"
+     "referenced_type" : "type-2678"
     },
     {
      "referenced_type" : "type-8"
@@ -13606,7 +13609,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2678"
+     "referenced_type" : "type-2681"
     },
     {
      "referenced_type" : "type-12"
@@ -13626,7 +13629,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2678"
+     "referenced_type" : "type-2681"
     },
     {
      "referenced_type" : "type-8"
@@ -13646,7 +13649,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2678"
+     "referenced_type" : "type-2681"
     },
     {
      "referenced_type" : "type-8"
@@ -13666,7 +13669,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2678"
+     "referenced_type" : "type-2681"
     },
     {
      "referenced_type" : "type-8"
@@ -13689,7 +13692,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2678"
+     "referenced_type" : "type-2681"
     },
     {
      "referenced_type" : "type-8"
@@ -13712,7 +13715,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2678"
+     "referenced_type" : "type-2681"
     },
     {
      "referenced_type" : "type-8"
@@ -13735,7 +13738,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2678"
+     "referenced_type" : "type-2681"
     },
     {
      "referenced_type" : "type-8"
@@ -13758,7 +13761,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2670"
+     "referenced_type" : "type-2673"
     },
     {
      "referenced_type" : "type-12"
@@ -13778,7 +13781,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2670"
+     "referenced_type" : "type-2673"
     },
     {
      "referenced_type" : "type-8"
@@ -13798,7 +13801,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2670"
+     "referenced_type" : "type-2673"
     },
     {
      "referenced_type" : "type-8"
@@ -13818,7 +13821,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2670"
+     "referenced_type" : "type-2673"
     },
     {
      "referenced_type" : "type-8"
@@ -13841,7 +13844,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2670"
+     "referenced_type" : "type-2673"
     },
     {
      "referenced_type" : "type-8"
@@ -13864,7 +13867,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2670"
+     "referenced_type" : "type-2673"
     },
     {
      "referenced_type" : "type-8"
@@ -13887,7 +13890,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2670"
+     "referenced_type" : "type-2673"
     },
     {
      "referenced_type" : "type-8"
@@ -13909,10 +13912,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2549"
+     "referenced_type" : "type-2552"
     }
    ],
-   "return_type" : "type-2478",
+   "return_type" : "type-2481",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -13922,7 +13925,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2549"
+     "referenced_type" : "type-2552"
     }
    ],
    "return_type" : "type-570",
@@ -13935,10 +13938,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2549"
+     "referenced_type" : "type-2552"
     }
    ],
-   "return_type" : "type-2465",
+   "return_type" : "type-2468",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -13948,15 +13951,15 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1514"
+     "referenced_type" : "type-1518"
     },
     {
-     "referenced_type" : "type-1649"
+     "referenced_type" : "type-1653"
     }
    ],
    "return_type" : "type-4",
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-3128" ]
+   "template_args" : [ "type-3131" ]
   },
   {
    "function_name" : "android::Parcel::readNullableStrongBinder",
@@ -13965,15 +13968,15 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1514"
+     "referenced_type" : "type-1518"
     },
     {
-     "referenced_type" : "type-2536"
+     "referenced_type" : "type-2539"
     }
    ],
    "return_type" : "type-4",
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-3131" ]
+   "template_args" : [ "type-3134" ]
   },
   {
    "access" : "protected",
@@ -14115,7 +14118,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1228"
+     "referenced_type" : "type-1232"
     },
     {
      "referenced_type" : "type-8"
@@ -14135,7 +14138,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1228"
+     "referenced_type" : "type-1232"
     },
     {
      "referenced_type" : "type-8"
@@ -14155,7 +14158,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1228"
+     "referenced_type" : "type-1232"
     },
     {
      "referenced_type" : "type-8"
@@ -14178,7 +14181,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1228"
+     "referenced_type" : "type-1232"
     },
     {
      "referenced_type" : "type-8"
@@ -14201,7 +14204,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1228"
+     "referenced_type" : "type-1232"
     },
     {
      "referenced_type" : "type-8"
@@ -14224,7 +14227,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1228"
+     "referenced_type" : "type-1232"
     },
     {
      "referenced_type" : "type-8"
@@ -14247,7 +14250,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2691"
+     "referenced_type" : "type-2694"
     },
     {
      "referenced_type" : "type-8"
@@ -14267,7 +14270,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2691"
+     "referenced_type" : "type-2694"
     },
     {
      "referenced_type" : "type-8"
@@ -14287,7 +14290,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2691"
+     "referenced_type" : "type-2694"
     },
     {
      "referenced_type" : "type-8"
@@ -14310,7 +14313,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2691"
+     "referenced_type" : "type-2694"
     },
     {
      "referenced_type" : "type-8"
@@ -14333,7 +14336,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2691"
+     "referenced_type" : "type-2694"
     },
     {
      "referenced_type" : "type-8"
@@ -14356,7 +14359,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2691"
+     "referenced_type" : "type-2694"
     },
     {
      "referenced_type" : "type-8"
@@ -14393,7 +14396,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-4503"
+     "referenced_type" : "type-4509"
     }
    ],
    "return_type" : "type-52",
@@ -14407,8 +14410,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem &",
    "name" : "android::BufferItem &",
-   "referenced_type" : "type-1224",
-   "self_type" : "type-1223",
+   "referenced_type" : "type-1227",
+   "self_type" : "type-1226",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14416,8 +14419,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem &",
    "name" : "android::BufferItem &",
-   "referenced_type" : "type-3797",
-   "self_type" : "type-3796",
+   "referenced_type" : "type-3803",
+   "self_type" : "type-3802",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14425,8 +14428,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem &",
    "name" : "android::BufferItem &",
-   "referenced_type" : "type-5872",
-   "self_type" : "type-5871",
+   "referenced_type" : "type-5892",
+   "self_type" : "type-5891",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14434,8 +14437,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem &",
    "name" : "android::BufferItem &",
-   "referenced_type" : "type-6418",
-   "self_type" : "type-6417",
+   "referenced_type" : "type-6441",
+   "self_type" : "type-6440",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14443,8 +14446,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *&",
    "name" : "android::BufferItem *&",
-   "referenced_type" : "type-1669",
-   "self_type" : "type-1854",
+   "referenced_type" : "type-1673",
+   "self_type" : "type-1859",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -14452,8 +14455,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *&",
    "name" : "android::BufferItem *&",
-   "referenced_type" : "type-4126",
-   "self_type" : "type-4135",
+   "referenced_type" : "type-4132",
+   "self_type" : "type-4141",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -14461,8 +14464,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *&",
    "name" : "android::BufferItem *&",
-   "referenced_type" : "type-6712",
-   "self_type" : "type-6726",
+   "referenced_type" : "type-6735",
+   "self_type" : "type-6750",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -14470,8 +14473,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::CompositorTiming &",
    "name" : "android::CompositorTiming &",
-   "referenced_type" : "type-1432",
-   "self_type" : "type-1431",
+   "referenced_type" : "type-1435",
+   "self_type" : "type-1434",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14479,8 +14482,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::CompositorTiming &",
    "name" : "android::CompositorTiming &",
-   "referenced_type" : "type-3961",
-   "self_type" : "type-3960",
+   "referenced_type" : "type-3969",
+   "self_type" : "type-3968",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14488,8 +14491,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::CompositorTiming &",
    "name" : "android::CompositorTiming &",
-   "referenced_type" : "type-6554",
-   "self_type" : "type-6553",
+   "referenced_type" : "type-6577",
+   "self_type" : "type-6576",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14497,8 +14500,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-2530",
-   "self_type" : "type-2529",
+   "referenced_type" : "type-2533",
+   "self_type" : "type-2532",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14506,8 +14509,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-4416",
-   "self_type" : "type-4415",
+   "referenced_type" : "type-4420",
+   "self_type" : "type-4419",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14515,8 +14518,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-4674",
-   "self_type" : "type-4673",
+   "referenced_type" : "type-4681",
+   "self_type" : "type-4680",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14524,8 +14527,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-4942",
-   "self_type" : "type-4941",
+   "referenced_type" : "type-4948",
+   "self_type" : "type-4947",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14533,8 +14536,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-6015",
-   "self_type" : "type-6014",
+   "referenced_type" : "type-6035",
+   "self_type" : "type-6034",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14542,8 +14545,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-7019",
-   "self_type" : "type-7018",
+   "referenced_type" : "type-7041",
+   "self_type" : "type-7040",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14551,8 +14554,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-7203",
-   "self_type" : "type-7202",
+   "referenced_type" : "type-7226",
+   "self_type" : "type-7225",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14560,8 +14563,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-7315",
-   "self_type" : "type-7314",
+   "referenced_type" : "type-7338",
+   "self_type" : "type-7337",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14569,8 +14572,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::FenceTime::Snapshot::State &",
    "name" : "android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-4588",
-   "self_type" : "type-4587",
+   "referenced_type" : "type-4594",
+   "self_type" : "type-4593",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14578,8 +14581,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::FenceTime::Snapshot::State &",
    "name" : "android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-7225",
-   "self_type" : "type-7224",
+   "referenced_type" : "type-7248",
+   "self_type" : "type-7247",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14588,7 +14591,7 @@
    "linker_set_key" : "android::Flattenable<android::BufferItem> &",
    "name" : "android::Flattenable<android::BufferItem> &",
    "referenced_type" : "type-22",
-   "self_type" : "type-1515",
+   "self_type" : "type-1519",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14597,7 +14600,7 @@
    "linker_set_key" : "android::Flattenable<android::Fence> &",
    "name" : "android::Flattenable<android::Fence> &",
    "referenced_type" : "type-17",
-   "self_type" : "type-1652",
+   "self_type" : "type-1656",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14606,7 +14609,7 @@
    "linker_set_key" : "android::Flattenable<android::FrameEventHistoryDelta> &",
    "name" : "android::Flattenable<android::FrameEventHistoryDelta> &",
    "referenced_type" : "type-26",
-   "self_type" : "type-4328",
+   "self_type" : "type-4334",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14615,7 +14618,7 @@
    "linker_set_key" : "android::Flattenable<android::GraphicBuffer> &",
    "name" : "android::Flattenable<android::GraphicBuffer> &",
    "referenced_type" : "type-15",
-   "self_type" : "type-1651",
+   "self_type" : "type-1655",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14624,7 +14627,7 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> &",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> &",
    "referenced_type" : "type-33",
-   "self_type" : "type-4330",
+   "self_type" : "type-4336",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14633,7 +14636,7 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> &",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> &",
    "referenced_type" : "type-35",
-   "self_type" : "type-4329",
+   "self_type" : "type-4335",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14641,8 +14644,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-2393",
-   "self_type" : "type-2392",
+   "referenced_type" : "type-2396",
+   "self_type" : "type-2395",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14650,8 +14653,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-4220",
-   "self_type" : "type-4219",
+   "referenced_type" : "type-4226",
+   "self_type" : "type-4225",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14659,8 +14662,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-4682",
-   "self_type" : "type-4681",
+   "referenced_type" : "type-4688",
+   "self_type" : "type-4687",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14668,8 +14671,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-4772",
-   "self_type" : "type-4771",
+   "referenced_type" : "type-4774",
+   "self_type" : "type-4773",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14677,8 +14680,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-5989",
-   "self_type" : "type-5988",
+   "referenced_type" : "type-6009",
+   "self_type" : "type-6008",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14686,8 +14689,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-6814",
-   "self_type" : "type-6813",
+   "referenced_type" : "type-6837",
+   "self_type" : "type-6836",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14695,8 +14698,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-6835",
-   "self_type" : "type-6834",
+   "referenced_type" : "type-6859",
+   "self_type" : "type-6858",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14704,8 +14707,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-7322",
-   "self_type" : "type-7321",
+   "referenced_type" : "type-7345",
+   "self_type" : "type-7344",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14713,8 +14716,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1087",
-   "self_type" : "type-1086",
+   "referenced_type" : "type-1090",
+   "self_type" : "type-1089",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14722,8 +14725,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1268",
-   "self_type" : "type-1267",
+   "referenced_type" : "type-1271",
+   "self_type" : "type-1270",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14731,8 +14734,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1411",
-   "self_type" : "type-1410",
+   "referenced_type" : "type-1414",
+   "self_type" : "type-1413",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14740,8 +14743,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1447",
-   "self_type" : "type-1446",
+   "referenced_type" : "type-1450",
+   "self_type" : "type-1449",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14749,8 +14752,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-2174",
-   "self_type" : "type-2173",
+   "referenced_type" : "type-2178",
+   "self_type" : "type-2177",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14758,8 +14761,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3251",
-   "self_type" : "type-3250",
+   "referenced_type" : "type-3254",
+   "self_type" : "type-3253",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14776,8 +14779,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3463",
-   "self_type" : "type-3462",
+   "referenced_type" : "type-3466",
+   "self_type" : "type-3465",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14785,8 +14788,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3530",
-   "self_type" : "type-3529",
+   "referenced_type" : "type-3533",
+   "self_type" : "type-3532",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14794,8 +14797,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3641",
-   "self_type" : "type-3640",
+   "referenced_type" : "type-3644",
+   "self_type" : "type-3643",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14803,8 +14806,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3698",
-   "self_type" : "type-3697",
+   "referenced_type" : "type-3704",
+   "self_type" : "type-3703",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14812,8 +14815,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3822",
-   "self_type" : "type-3821",
+   "referenced_type" : "type-3828",
+   "self_type" : "type-3827",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14821,8 +14824,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3939",
-   "self_type" : "type-3938",
+   "referenced_type" : "type-3945",
+   "self_type" : "type-3944",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14830,8 +14833,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3980",
-   "self_type" : "type-3979",
+   "referenced_type" : "type-3986",
+   "self_type" : "type-3985",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14839,8 +14842,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-4210",
-   "self_type" : "type-4209",
+   "referenced_type" : "type-4217",
+   "self_type" : "type-4216",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14848,8 +14851,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-4389",
-   "self_type" : "type-4388",
+   "referenced_type" : "type-4395",
+   "self_type" : "type-4394",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14857,8 +14860,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-4601",
-   "self_type" : "type-4600",
+   "referenced_type" : "type-4608",
+   "self_type" : "type-4607",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14866,8 +14869,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-4768",
-   "self_type" : "type-4767",
+   "referenced_type" : "type-4776",
+   "self_type" : "type-4775",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14875,8 +14878,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5095",
-   "self_type" : "type-5094",
+   "referenced_type" : "type-5111",
+   "self_type" : "type-5110",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14884,8 +14887,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5163",
-   "self_type" : "type-5162",
+   "referenced_type" : "type-5181",
+   "self_type" : "type-5180",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14893,8 +14896,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5326",
-   "self_type" : "type-5325",
+   "referenced_type" : "type-5343",
+   "self_type" : "type-5342",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14902,8 +14905,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5538",
-   "self_type" : "type-5537",
+   "referenced_type" : "type-5555",
+   "self_type" : "type-5554",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14911,8 +14914,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5605",
-   "self_type" : "type-5604",
+   "referenced_type" : "type-5622",
+   "self_type" : "type-5621",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14920,8 +14923,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5716",
-   "self_type" : "type-5715",
+   "referenced_type" : "type-5733",
+   "self_type" : "type-5732",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14929,8 +14932,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5773",
-   "self_type" : "type-5772",
+   "referenced_type" : "type-5793",
+   "self_type" : "type-5792",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14938,8 +14941,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5897",
-   "self_type" : "type-5896",
+   "referenced_type" : "type-5917",
+   "self_type" : "type-5916",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14947,8 +14950,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6058",
-   "self_type" : "type-6057",
+   "referenced_type" : "type-6078",
+   "self_type" : "type-6077",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14956,8 +14959,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6141",
-   "self_type" : "type-6140",
+   "referenced_type" : "type-6161",
+   "self_type" : "type-6160",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14965,8 +14968,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6193",
-   "self_type" : "type-6192",
+   "referenced_type" : "type-6213",
+   "self_type" : "type-6212",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14974,8 +14977,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6287",
-   "self_type" : "type-6286",
+   "referenced_type" : "type-6307",
+   "self_type" : "type-6306",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14983,8 +14986,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6331",
-   "self_type" : "type-6330",
+   "referenced_type" : "type-6354",
+   "self_type" : "type-6353",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14992,8 +14995,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6426",
-   "self_type" : "type-6425",
+   "referenced_type" : "type-6450",
+   "self_type" : "type-6449",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15001,8 +15004,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6532",
-   "self_type" : "type-6531",
+   "referenced_type" : "type-6555",
+   "self_type" : "type-6554",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15010,8 +15013,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6569",
-   "self_type" : "type-6568",
+   "referenced_type" : "type-6592",
+   "self_type" : "type-6591",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15019,8 +15022,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6816",
-   "self_type" : "type-6815",
+   "referenced_type" : "type-6839",
+   "self_type" : "type-6838",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15028,8 +15031,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6988",
-   "self_type" : "type-6987",
+   "referenced_type" : "type-7012",
+   "self_type" : "type-7011",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15037,8 +15040,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-7240",
-   "self_type" : "type-7239",
+   "referenced_type" : "type-7265",
+   "self_type" : "type-7264",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15046,8 +15049,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-7378",
-   "self_type" : "type-7377",
+   "referenced_type" : "type-7402",
+   "self_type" : "type-7401",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15064,8 +15067,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-7602",
-   "self_type" : "type-7601",
+   "referenced_type" : "type-7625",
+   "self_type" : "type-7624",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15154,8 +15157,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-3473",
-   "self_type" : "type-3472",
+   "referenced_type" : "type-3476",
+   "self_type" : "type-3475",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15163,8 +15166,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-4306",
-   "self_type" : "type-4305",
+   "referenced_type" : "type-4312",
+   "self_type" : "type-4311",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15172,8 +15175,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-4758",
-   "self_type" : "type-4757",
+   "referenced_type" : "type-4765",
+   "self_type" : "type-4764",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15181,8 +15184,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-5548",
-   "self_type" : "type-5547",
+   "referenced_type" : "type-5565",
+   "self_type" : "type-5564",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15190,8 +15193,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-6149",
-   "self_type" : "type-6148",
+   "referenced_type" : "type-6169",
+   "self_type" : "type-6168",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15199,8 +15202,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-6911",
-   "self_type" : "type-6910",
+   "referenced_type" : "type-6934",
+   "self_type" : "type-6933",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15208,8 +15211,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-7371",
-   "self_type" : "type-7370",
+   "referenced_type" : "type-7394",
+   "self_type" : "type-7393",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15226,8 +15229,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
-   "referenced_type" : "type-1240",
-   "self_type" : "type-2662",
+   "referenced_type" : "type-1243",
+   "self_type" : "type-2665",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -15236,7 +15239,7 @@
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
    "referenced_type" : "type-123",
-   "self_type" : "type-2656",
+   "self_type" : "type-2659",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -15244,8 +15247,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::String8 *&",
    "name" : "android::String8 *&",
-   "referenced_type" : "type-1887",
-   "self_type" : "type-1886",
+   "referenced_type" : "type-1891",
+   "self_type" : "type-1890",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -15253,8 +15256,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1100",
-   "self_type" : "type-1099",
+   "referenced_type" : "type-1105",
+   "self_type" : "type-1104",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15271,8 +15274,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1238",
-   "self_type" : "type-1237",
+   "referenced_type" : "type-1241",
+   "self_type" : "type-1240",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15280,8 +15283,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1366",
-   "self_type" : "type-1365",
+   "referenced_type" : "type-1369",
+   "self_type" : "type-1368",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15289,8 +15292,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1452",
-   "self_type" : "type-1451",
+   "referenced_type" : "type-1455",
+   "self_type" : "type-1454",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15298,8 +15301,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1525",
-   "self_type" : "type-1524",
+   "referenced_type" : "type-1528",
+   "self_type" : "type-1527",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15307,8 +15310,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1666",
-   "self_type" : "type-1665",
+   "referenced_type" : "type-1670",
+   "self_type" : "type-1669",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15316,8 +15319,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3169",
-   "self_type" : "type-3168",
+   "referenced_type" : "type-3172",
+   "self_type" : "type-3171",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15325,8 +15328,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3535",
-   "self_type" : "type-3534",
+   "referenced_type" : "type-3538",
+   "self_type" : "type-3537",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15334,8 +15337,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3645",
-   "self_type" : "type-3644",
+   "referenced_type" : "type-3648",
+   "self_type" : "type-3647",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15343,8 +15346,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3707",
-   "self_type" : "type-3706",
+   "referenced_type" : "type-3713",
+   "self_type" : "type-3712",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15352,8 +15355,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3808",
-   "self_type" : "type-3807",
+   "referenced_type" : "type-3814",
+   "self_type" : "type-3813",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15361,8 +15364,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3913",
-   "self_type" : "type-3912",
+   "referenced_type" : "type-3919",
+   "self_type" : "type-3918",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15370,8 +15373,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3986",
-   "self_type" : "type-3985",
+   "referenced_type" : "type-3992",
+   "self_type" : "type-3991",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15379,8 +15382,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4038",
-   "self_type" : "type-4037",
+   "referenced_type" : "type-4044",
+   "self_type" : "type-4043",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15388,8 +15391,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4123",
-   "self_type" : "type-4122",
+   "referenced_type" : "type-4130",
+   "self_type" : "type-4129",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15397,8 +15400,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4348",
-   "self_type" : "type-4347",
+   "referenced_type" : "type-4354",
+   "self_type" : "type-4353",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15406,8 +15409,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4487",
-   "self_type" : "type-4486",
+   "referenced_type" : "type-4493",
+   "self_type" : "type-4492",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15415,8 +15418,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4534",
-   "self_type" : "type-4533",
+   "referenced_type" : "type-4540",
+   "self_type" : "type-4539",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15424,8 +15427,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4556",
-   "self_type" : "type-4555",
+   "referenced_type" : "type-4562",
+   "self_type" : "type-4561",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15433,8 +15436,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4596",
-   "self_type" : "type-4595",
+   "referenced_type" : "type-4602",
+   "self_type" : "type-4601",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15442,8 +15445,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4774",
-   "self_type" : "type-4773",
+   "referenced_type" : "type-4782",
+   "self_type" : "type-4781",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15451,8 +15454,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4861",
-   "self_type" : "type-4860",
+   "referenced_type" : "type-4867",
+   "self_type" : "type-4866",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15460,8 +15463,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5093",
-   "self_type" : "type-5092",
+   "referenced_type" : "type-5109",
+   "self_type" : "type-5108",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15469,8 +15472,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5133",
-   "self_type" : "type-5132",
+   "referenced_type" : "type-5149",
+   "self_type" : "type-5148",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15478,8 +15481,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5169",
-   "self_type" : "type-5168",
+   "referenced_type" : "type-5185",
+   "self_type" : "type-5184",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15487,8 +15490,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5244",
-   "self_type" : "type-5243",
+   "referenced_type" : "type-5261",
+   "self_type" : "type-5260",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15496,8 +15499,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5610",
-   "self_type" : "type-5609",
+   "referenced_type" : "type-5627",
+   "self_type" : "type-5626",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15505,8 +15508,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5720",
-   "self_type" : "type-5719",
+   "referenced_type" : "type-5737",
+   "self_type" : "type-5736",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15514,8 +15517,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5782",
-   "self_type" : "type-5781",
+   "referenced_type" : "type-5802",
+   "self_type" : "type-5801",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15523,8 +15526,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5883",
-   "self_type" : "type-5882",
+   "referenced_type" : "type-5903",
+   "self_type" : "type-5902",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15532,8 +15535,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6051",
-   "self_type" : "type-6050",
+   "referenced_type" : "type-6071",
+   "self_type" : "type-6070",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15541,8 +15544,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6197",
-   "self_type" : "type-6196",
+   "referenced_type" : "type-6217",
+   "self_type" : "type-6216",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15550,8 +15553,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6293",
-   "self_type" : "type-6292",
+   "referenced_type" : "type-6313",
+   "self_type" : "type-6312",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15559,8 +15562,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6337",
-   "self_type" : "type-6336",
+   "referenced_type" : "type-6360",
+   "self_type" : "type-6359",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15568,8 +15571,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6420",
-   "self_type" : "type-6419",
+   "referenced_type" : "type-6443",
+   "self_type" : "type-6442",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15577,8 +15580,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6506",
-   "self_type" : "type-6505",
+   "referenced_type" : "type-6529",
+   "self_type" : "type-6528",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15586,8 +15589,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6574",
-   "self_type" : "type-6573",
+   "referenced_type" : "type-6597",
+   "self_type" : "type-6596",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15595,8 +15598,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6626",
-   "self_type" : "type-6625",
+   "referenced_type" : "type-6651",
+   "self_type" : "type-6650",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15604,8 +15607,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6709",
-   "self_type" : "type-6708",
+   "referenced_type" : "type-6733",
+   "self_type" : "type-6732",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15613,8 +15616,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6944",
-   "self_type" : "type-6943",
+   "referenced_type" : "type-6969",
+   "self_type" : "type-6968",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15622,8 +15625,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7089",
-   "self_type" : "type-7088",
+   "referenced_type" : "type-7112",
+   "self_type" : "type-7111",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15631,8 +15634,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7147",
-   "self_type" : "type-7146",
+   "referenced_type" : "type-7171",
+   "self_type" : "type-7170",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15640,8 +15643,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7177",
-   "self_type" : "type-7176",
+   "referenced_type" : "type-7201",
+   "self_type" : "type-7200",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15649,8 +15652,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7233",
-   "self_type" : "type-7232",
+   "referenced_type" : "type-7258",
+   "self_type" : "type-7257",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15658,8 +15661,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7383",
-   "self_type" : "type-7382",
+   "referenced_type" : "type-7406",
+   "self_type" : "type-7405",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15667,8 +15670,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7462",
-   "self_type" : "type-7461",
+   "referenced_type" : "type-7486",
+   "self_type" : "type-7485",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15676,8 +15679,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7497",
-   "self_type" : "type-7496",
+   "referenced_type" : "type-7520",
+   "self_type" : "type-7519",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15685,8 +15688,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7600",
-   "self_type" : "type-7599",
+   "referenced_type" : "type-7623",
+   "self_type" : "type-7622",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15694,8 +15697,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7630",
-   "self_type" : "type-7629",
+   "referenced_type" : "type-7655",
+   "self_type" : "type-7654",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15730,8 +15733,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::bufferqueue::V2_0::Status> &",
    "name" : "android::hardware::Return<android::hardware::graphics::bufferqueue::V2_0::Status> &",
-   "referenced_type" : "type-7522",
-   "self_type" : "type-7525",
+   "referenced_type" : "type-7547",
+   "self_type" : "type-7550",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15739,24 +15742,6 @@
    "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,
@@ -15764,8 +15749,8 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> > &",
-   "name" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> > &",
+   "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-4497",
    "self_type" : "type-4500",
    "size" : 8,
@@ -15773,10 +15758,28 @@
   },
   {
    "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-4374",
+   "self_type" : "type-4377",
+   "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-4503",
+   "self_type" : "type-4506",
+   "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-4356",
-   "self_type" : "type-4359",
+   "referenced_type" : "type-4362",
+   "self_type" : "type-4365",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15793,8 +15796,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<unsigned long> &",
    "name" : "android::hardware::Return<unsigned long> &",
-   "referenced_type" : "type-7526",
-   "self_type" : "type-7531",
+   "referenced_type" : "type-7551",
+   "self_type" : "type-7554",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15820,8 +15823,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1385",
-   "self_type" : "type-1384",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1387",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -15829,8 +15832,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-3923",
-   "self_type" : "type-3922",
+   "referenced_type" : "type-3929",
+   "self_type" : "type-3928",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -15838,8 +15841,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-6515",
-   "self_type" : "type-6514",
+   "referenced_type" : "type-6538",
+   "self_type" : "type-6537",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -15857,7 +15860,7 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> > &",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> > &",
    "referenced_type" : "type-382",
-   "self_type" : "type-7641",
+   "self_type" : "type-7665",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15866,7 +15869,7 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect> &",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect> &",
    "referenced_type" : "type-373",
-   "self_type" : "type-4597",
+   "self_type" : "type-4604",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15875,7 +15878,7 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char> &",
    "name" : "android::hardware::details::hidl_pointer<unsigned char> &",
    "referenced_type" : "type-391",
-   "self_type" : "type-4350",
+   "self_type" : "type-4356",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15884,7 +15887,7 @@
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming &",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming &",
    "referenced_type" : "type-588",
-   "self_type" : "type-4589",
+   "self_type" : "type-4595",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15893,7 +15896,7 @@
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta &",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta &",
    "referenced_type" : "type-360",
-   "self_type" : "type-4593",
+   "self_type" : "type-4600",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15902,7 +15905,7 @@
    "linker_set_key" : "android::hardware::hidl_array<int, 4> &",
    "name" : "android::hardware::hidl_array<int, 4> &",
    "referenced_type" : "type-385",
-   "self_type" : "type-7642",
+   "self_type" : "type-5188",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15920,7 +15923,7 @@
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> &",
    "name" : "android::hardware::hidl_vec<unsigned char> &",
    "referenced_type" : "type-453",
-   "self_type" : "type-4382",
+   "self_type" : "type-4388",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15929,7 +15932,7 @@
    "linker_set_key" : "android::hardware::media::V1_0::Rect &",
    "name" : "android::hardware::media::V1_0::Rect &",
    "referenced_type" : "type-376",
-   "self_type" : "type-4599",
+   "self_type" : "type-4606",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15938,7 +15941,7 @@
    "linker_set_key" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > &",
    "name" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > &",
    "referenced_type" : "type-164",
-   "self_type" : "type-2644",
+   "self_type" : "type-2647",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15947,7 +15950,7 @@
    "linker_set_key" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > &",
    "name" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > &",
    "referenced_type" : "type-150",
-   "self_type" : "type-2640",
+   "self_type" : "type-2643",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15956,7 +15959,7 @@
    "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int> &",
    "name" : "android::key_value_pair_t<unsigned int, unsigned int> &",
    "referenced_type" : "type-146",
-   "self_type" : "type-2639",
+   "self_type" : "type-2642",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15965,7 +15968,7 @@
    "linker_set_key" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > &",
    "name" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > &",
    "referenced_type" : "type-581",
-   "self_type" : "type-2514",
+   "self_type" : "type-2517",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15974,7 +15977,7 @@
    "linker_set_key" : "android::sp<android::ALooper> &",
    "name" : "android::sp<android::ALooper> &",
    "referenced_type" : "type-322",
-   "self_type" : "type-2268",
+   "self_type" : "type-2271",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15983,7 +15986,7 @@
    "linker_set_key" : "android::sp<android::AMessage> &",
    "name" : "android::sp<android::AMessage> &",
    "referenced_type" : "type-259",
-   "self_type" : "type-2079",
+   "self_type" : "type-2071",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15992,7 +15995,7 @@
    "linker_set_key" : "android::sp<android::ComponentWrapper> &",
    "name" : "android::sp<android::ComponentWrapper> &",
    "referenced_type" : "type-567",
-   "self_type" : "type-2492",
+   "self_type" : "type-2495",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16000,8 +16003,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::Fence> &",
    "name" : "android::sp<android::Fence> &",
-   "referenced_type" : "type-1865",
-   "self_type" : "type-2528",
+   "referenced_type" : "type-1869",
+   "self_type" : "type-2531",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16010,7 +16013,7 @@
    "linker_set_key" : "android::sp<android::FrameDropper> &",
    "name" : "android::sp<android::FrameDropper> &",
    "referenced_type" : "type-578",
-   "self_type" : "type-2507",
+   "self_type" : "type-2510",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16028,7 +16031,7 @@
    "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy> &",
    "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy> &",
    "referenced_type" : "type-473",
-   "self_type" : "type-2499",
+   "self_type" : "type-2502",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16036,8 +16039,8 @@
    "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",
+   "referenced_type" : "type-4268",
+   "self_type" : "type-4271",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16045,8 +16048,8 @@
    "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",
+   "referenced_type" : "type-4277",
+   "self_type" : "type-4280",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16054,8 +16057,8 @@
    "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",
+   "referenced_type" : "type-4838",
+   "self_type" : "type-4847",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16063,8 +16066,8 @@
    "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",
+   "referenced_type" : "type-5127",
+   "self_type" : "type-5134",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16117,8 +16120,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::NativeHandle> *&",
    "name" : "android::sp<android::NativeHandle> *&",
-   "referenced_type" : "type-1881",
-   "self_type" : "type-1880",
+   "referenced_type" : "type-1886",
+   "self_type" : "type-1885",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16126,8 +16129,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> &",
    "name" : "android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> &",
-   "referenced_type" : "type-2472",
-   "self_type" : "type-7654",
+   "referenced_type" : "type-2475",
+   "self_type" : "type-7678",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16145,7 +16148,7 @@
    "linker_set_key" : "android::wp<android::IBinder::DeathRecipient> &",
    "name" : "android::wp<android::IBinder::DeathRecipient> &",
    "referenced_type" : "type-174",
-   "self_type" : "type-4307",
+   "self_type" : "type-4313",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16154,7 +16157,7 @@
    "linker_set_key" : "android_cta861_3_metadata &",
    "name" : "android_cta861_3_metadata &",
    "referenced_type" : "type-306",
-   "self_type" : "type-1477",
+   "self_type" : "type-1481",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16172,7 +16175,7 @@
    "linker_set_key" : "android_smpte2086_metadata &",
    "name" : "android_smpte2086_metadata &",
    "referenced_type" : "type-305",
-   "self_type" : "type-1476",
+   "self_type" : "type-1479",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16189,8 +16192,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::AString &",
    "name" : "const android::AString &",
-   "referenced_type" : "type-2101",
-   "self_type" : "type-2242",
+   "referenced_type" : "type-2093",
+   "self_type" : "type-2245",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -16198,8 +16201,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-1219",
-   "self_type" : "type-1222",
+   "referenced_type" : "type-1223",
+   "self_type" : "type-1225",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16207,8 +16210,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-1531",
-   "self_type" : "type-1533",
+   "referenced_type" : "type-1534",
+   "self_type" : "type-1536",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16216,8 +16219,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-1672",
-   "self_type" : "type-1674",
+   "referenced_type" : "type-1676",
+   "self_type" : "type-1678",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16225,8 +16228,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-3441",
-   "self_type" : "type-3443",
+   "referenced_type" : "type-3444",
+   "self_type" : "type-3446",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -16234,8 +16237,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-3635",
-   "self_type" : "type-3639",
+   "referenced_type" : "type-3638",
+   "self_type" : "type-3642",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16243,8 +16246,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-3792",
-   "self_type" : "type-3795",
+   "referenced_type" : "type-3799",
+   "self_type" : "type-3801",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16252,8 +16255,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-4042",
-   "self_type" : "type-4044",
+   "referenced_type" : "type-4049",
+   "self_type" : "type-4051",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16261,8 +16264,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-4128",
-   "self_type" : "type-4130",
+   "referenced_type" : "type-4134",
+   "self_type" : "type-4136",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16270,8 +16273,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-5516",
-   "self_type" : "type-5518",
+   "referenced_type" : "type-5533",
+   "self_type" : "type-5535",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -16279,8 +16282,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-5710",
-   "self_type" : "type-5714",
+   "referenced_type" : "type-5727",
+   "self_type" : "type-5731",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16288,8 +16291,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-5867",
-   "self_type" : "type-5870",
+   "referenced_type" : "type-5888",
+   "self_type" : "type-5890",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16297,8 +16300,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-6122",
-   "self_type" : "type-6124",
+   "referenced_type" : "type-6142",
+   "self_type" : "type-6144",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -16306,8 +16309,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-6281",
-   "self_type" : "type-6285",
+   "referenced_type" : "type-6301",
+   "self_type" : "type-6305",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16315,8 +16318,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-6414",
-   "self_type" : "type-6416",
+   "referenced_type" : "type-6437",
+   "self_type" : "type-6439",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16324,8 +16327,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-6632",
-   "self_type" : "type-6634",
+   "referenced_type" : "type-6655",
+   "self_type" : "type-6657",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16333,8 +16336,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-6714",
-   "self_type" : "type-6716",
+   "referenced_type" : "type-6737",
+   "self_type" : "type-6739",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16360,8 +16363,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::CompositorTiming &",
    "name" : "const android::CompositorTiming &",
-   "referenced_type" : "type-1425",
-   "self_type" : "type-1427",
+   "referenced_type" : "type-1428",
+   "self_type" : "type-1430",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16369,8 +16372,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::CompositorTiming &",
    "name" : "const android::CompositorTiming &",
-   "referenced_type" : "type-3954",
-   "self_type" : "type-3956",
+   "referenced_type" : "type-3960",
+   "self_type" : "type-3962",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16378,8 +16381,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::CompositorTiming &",
    "name" : "const android::CompositorTiming &",
-   "referenced_type" : "type-6547",
-   "self_type" : "type-6549",
+   "referenced_type" : "type-6570",
+   "self_type" : "type-6572",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16387,8 +16390,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-4582",
-   "self_type" : "type-4584",
+   "referenced_type" : "type-4588",
+   "self_type" : "type-4590",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16396,8 +16399,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-4751",
-   "self_type" : "type-4753",
+   "referenced_type" : "type-4757",
+   "self_type" : "type-4759",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16405,8 +16408,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-7217",
-   "self_type" : "type-7219",
+   "referenced_type" : "type-7242",
+   "self_type" : "type-7244",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16414,8 +16417,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-7365",
-   "self_type" : "type-7367",
+   "referenced_type" : "type-7388",
+   "self_type" : "type-7390",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16423,8 +16426,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Flattenable<android::BufferItem> &",
    "name" : "const android::Flattenable<android::BufferItem> &",
-   "referenced_type" : "type-1507",
-   "self_type" : "type-1513",
+   "referenced_type" : "type-1510",
+   "self_type" : "type-1517",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16432,8 +16435,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Flattenable<android::Fence> &",
    "name" : "const android::Flattenable<android::Fence> &",
-   "referenced_type" : "type-1635",
-   "self_type" : "type-1648",
+   "referenced_type" : "type-1639",
+   "self_type" : "type-1651",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16441,8 +16444,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Flattenable<android::FrameEventHistoryDelta> &",
    "name" : "const android::Flattenable<android::FrameEventHistoryDelta> &",
-   "referenced_type" : "type-4309",
-   "self_type" : "type-4325",
+   "referenced_type" : "type-4315",
+   "self_type" : "type-4332",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16450,8 +16453,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Flattenable<android::GraphicBuffer> &",
    "name" : "const android::Flattenable<android::GraphicBuffer> &",
-   "referenced_type" : "type-1639",
-   "self_type" : "type-1647",
+   "referenced_type" : "type-1644",
+   "self_type" : "type-1650",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16459,8 +16462,8 @@
    "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",
+   "referenced_type" : "type-4318",
+   "self_type" : "type-4331",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16468,8 +16471,8 @@
    "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",
+   "referenced_type" : "type-4321",
+   "self_type" : "type-4333",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16531,8 +16534,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Parcel &",
    "name" : "const android::Parcel &",
-   "referenced_type" : "type-4536",
-   "self_type" : "type-4535",
+   "referenced_type" : "type-4542",
+   "self_type" : "type-4541",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16540,8 +16543,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Parcel &",
    "name" : "const android::Parcel &",
-   "referenced_type" : "type-7149",
-   "self_type" : "type-7148",
+   "referenced_type" : "type-7173",
+   "self_type" : "type-7172",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16558,8 +16561,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-1215",
-   "self_type" : "type-1217",
+   "referenced_type" : "type-1218",
+   "self_type" : "type-1221",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16567,8 +16570,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-1490",
-   "self_type" : "type-1492",
+   "referenced_type" : "type-1494",
+   "self_type" : "type-1496",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16576,8 +16579,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-1622",
-   "self_type" : "type-1624",
+   "referenced_type" : "type-1625",
+   "self_type" : "type-1627",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16585,8 +16588,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-2685",
-   "self_type" : "type-2687",
+   "referenced_type" : "type-2688",
+   "self_type" : "type-2690",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16594,8 +16597,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-3466",
-   "self_type" : "type-3468",
+   "referenced_type" : "type-3469",
+   "self_type" : "type-3471",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16603,8 +16606,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-3788",
-   "self_type" : "type-3790",
+   "referenced_type" : "type-3794",
+   "self_type" : "type-3797",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16612,8 +16615,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-4013",
-   "self_type" : "type-4015",
+   "referenced_type" : "type-4019",
+   "self_type" : "type-4021",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16621,8 +16624,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-4092",
-   "self_type" : "type-4094",
+   "referenced_type" : "type-4098",
+   "self_type" : "type-4100",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16630,8 +16633,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-4295",
-   "self_type" : "type-4297",
+   "referenced_type" : "type-4301",
+   "self_type" : "type-4303",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16639,8 +16642,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-4575",
-   "self_type" : "type-4577",
+   "referenced_type" : "type-4581",
+   "self_type" : "type-4583",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16648,8 +16651,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-4739",
-   "self_type" : "type-4742",
+   "referenced_type" : "type-4746",
+   "self_type" : "type-4748",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16657,8 +16660,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-5022",
-   "self_type" : "type-5024",
+   "referenced_type" : "type-5028",
+   "self_type" : "type-5030",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16666,8 +16669,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-5080",
-   "self_type" : "type-5082",
+   "referenced_type" : "type-5096",
+   "self_type" : "type-5098",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16675,8 +16678,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-5541",
-   "self_type" : "type-5543",
+   "referenced_type" : "type-5558",
+   "self_type" : "type-5560",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16684,8 +16687,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-5863",
-   "self_type" : "type-5865",
+   "referenced_type" : "type-5883",
+   "self_type" : "type-5886",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16693,8 +16696,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-6046",
-   "self_type" : "type-6048",
+   "referenced_type" : "type-6066",
+   "self_type" : "type-6068",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16702,8 +16705,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-6144",
-   "self_type" : "type-6146",
+   "referenced_type" : "type-6164",
+   "self_type" : "type-6167",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16711,8 +16714,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-6410",
-   "self_type" : "type-6412",
+   "referenced_type" : "type-6433",
+   "self_type" : "type-6435",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16720,8 +16723,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-6600",
-   "self_type" : "type-6602",
+   "referenced_type" : "type-6624",
+   "self_type" : "type-6626",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16729,8 +16732,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-6679",
-   "self_type" : "type-6681",
+   "referenced_type" : "type-6702",
+   "self_type" : "type-6704",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16738,8 +16741,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-6899",
-   "self_type" : "type-6901",
+   "referenced_type" : "type-6922",
+   "self_type" : "type-6924",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16747,8 +16750,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-7209",
-   "self_type" : "type-7211",
+   "referenced_type" : "type-7233",
+   "self_type" : "type-7235",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16756,17 +16759,8 @@
    "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",
+   "referenced_type" : "type-7379",
+   "self_type" : "type-7381",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16783,8 +16777,17 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-7679",
-   "self_type" : "type-7686",
+   "referenced_type" : "type-7607",
+   "self_type" : "type-7609",
+   "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-7699",
+   "self_type" : "type-7707",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16792,8 +16795,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::SafeInterface::ParcelHandler &",
    "name" : "const android::SafeInterface::ParcelHandler &",
-   "referenced_type" : "type-1266",
-   "self_type" : "type-1676",
+   "referenced_type" : "type-1269",
+   "self_type" : "type-1680",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16801,8 +16804,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-1248",
-   "self_type" : "type-1247",
+   "referenced_type" : "type-1251",
+   "self_type" : "type-1250",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -16810,8 +16813,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::String8 &",
    "name" : "const android::String8 &",
-   "referenced_type" : "type-1877",
-   "self_type" : "type-1876",
+   "referenced_type" : "type-1881",
+   "self_type" : "type-1880",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -16828,8 +16831,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1386",
-   "self_type" : "type-1387",
+   "referenced_type" : "type-1389",
+   "self_type" : "type-1390",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16864,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-4351",
-   "self_type" : "type-4573",
+   "referenced_type" : "type-4357",
+   "self_type" : "type-4579",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16873,8 +16876,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming &",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming &",
-   "referenced_type" : "type-4585",
-   "self_type" : "type-4586",
+   "referenced_type" : "type-4591",
+   "self_type" : "type-4592",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16981,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-2621",
-   "self_type" : "type-2622",
+   "referenced_type" : "type-2624",
+   "self_type" : "type-2625",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16990,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-2619",
-   "self_type" : "type-2620",
+   "referenced_type" : "type-2622",
+   "self_type" : "type-2623",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16999,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-2615",
-   "self_type" : "type-2616",
+   "referenced_type" : "type-2618",
+   "self_type" : "type-2619",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17008,8 +17011,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-2411",
-   "self_type" : "type-2410",
+   "referenced_type" : "type-2414",
+   "self_type" : "type-2413",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -17017,8 +17020,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-4848",
-   "self_type" : "type-4847",
+   "referenced_type" : "type-4851",
+   "self_type" : "type-4850",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -17026,8 +17029,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-5994",
-   "self_type" : "type-5996",
+   "referenced_type" : "type-6014",
+   "self_type" : "type-6016",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -17035,8 +17038,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-6830",
-   "self_type" : "type-6829",
+   "referenced_type" : "type-6853",
+   "self_type" : "type-6852",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -17044,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-1311",
-   "self_type" : "type-1487",
+   "referenced_type" : "type-1312",
+   "self_type" : "type-1490",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17062,8 +17065,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::AMessage> &",
    "name" : "const android::sp<android::AMessage> &",
-   "referenced_type" : "type-2177",
-   "self_type" : "type-2192",
+   "referenced_type" : "type-2176",
+   "self_type" : "type-2195",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17071,8 +17074,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::BpGraphicBufferProducer> &",
    "name" : "const android::sp<android::BpGraphicBufferProducer> &",
-   "referenced_type" : "type-4230",
-   "self_type" : "type-4235",
+   "referenced_type" : "type-4236",
+   "self_type" : "type-4241",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17080,8 +17083,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::BpProducerListener> &",
    "name" : "const android::sp<android::BpProducerListener> &",
-   "referenced_type" : "type-4519",
-   "self_type" : "type-4520",
+   "referenced_type" : "type-4525",
+   "self_type" : "type-4526",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17098,8 +17101,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::ComponentWrapper> &",
    "name" : "const android::sp<android::ComponentWrapper> &",
-   "referenced_type" : "type-2493",
-   "self_type" : "type-2494",
+   "referenced_type" : "type-2496",
+   "self_type" : "type-2497",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17107,8 +17110,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::Fence> &",
    "name" : "const android::sp<android::Fence> &",
-   "referenced_type" : "type-1864",
-   "self_type" : "type-1863",
+   "referenced_type" : "type-1868",
+   "self_type" : "type-1867",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17116,8 +17119,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::GraphicBuffer> &",
    "name" : "const android::sp<android::GraphicBuffer> &",
-   "referenced_type" : "type-1197",
-   "self_type" : "type-1861",
+   "referenced_type" : "type-1200",
+   "self_type" : "type-1865",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17134,8 +17137,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
    "name" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
-   "referenced_type" : "type-4267",
-   "self_type" : "type-4393",
+   "referenced_type" : "type-4273",
+   "self_type" : "type-4399",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17143,8 +17146,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
    "name" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
-   "referenced_type" : "type-4276",
-   "self_type" : "type-4394",
+   "referenced_type" : "type-4282",
+   "self_type" : "type-4400",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17152,8 +17155,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
    "name" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
-   "referenced_type" : "type-4829",
-   "self_type" : "type-4834",
+   "referenced_type" : "type-4837",
+   "self_type" : "type-4842",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17161,8 +17164,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
    "name" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
-   "referenced_type" : "type-5110",
-   "self_type" : "type-5115",
+   "referenced_type" : "type-5126",
+   "self_type" : "type-5131",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17170,8 +17173,8 @@
    "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",
+   "referenced_type" : "type-4309",
+   "self_type" : "type-4310",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17179,8 +17182,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::IBinder> &",
    "name" : "const android::sp<android::IBinder> &",
-   "referenced_type" : "type-1037",
-   "self_type" : "type-1038",
+   "referenced_type" : "type-1041",
+   "self_type" : "type-1042",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17206,8 +17209,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer> &",
    "name" : "const android::sp<android::IGraphicBufferProducer> &",
-   "referenced_type" : "type-2487",
-   "self_type" : "type-2488",
+   "referenced_type" : "type-2490",
+   "self_type" : "type-2491",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17224,8 +17227,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::ITransactionCompletedListener> &",
    "name" : "const android::sp<android::ITransactionCompletedListener> &",
-   "referenced_type" : "type-1047",
-   "self_type" : "type-1048",
+   "referenced_type" : "type-1050",
+   "self_type" : "type-1051",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17242,8 +17245,8 @@
    "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",
+   "referenced_type" : "type-1393",
+   "self_type" : "type-1392",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -17251,8 +17254,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-2470",
-   "self_type" : "type-4225",
+   "referenced_type" : "type-2473",
+   "self_type" : "type-4231",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17260,8 +17263,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> &",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> &",
-   "referenced_type" : "type-2460",
-   "self_type" : "type-4513",
+   "referenced_type" : "type-2463",
+   "self_type" : "type-4519",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17269,8 +17272,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer> &",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer> &",
-   "referenced_type" : "type-4242",
-   "self_type" : "type-4247",
+   "referenced_type" : "type-4248",
+   "self_type" : "type-4253",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17278,8 +17281,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener> &",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener> &",
-   "referenced_type" : "type-4473",
-   "self_type" : "type-4522",
+   "referenced_type" : "type-4479",
+   "self_type" : "type-4528",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17287,8 +17290,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-2484",
-   "self_type" : "type-4226",
+   "referenced_type" : "type-2487",
+   "self_type" : "type-4232",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17296,8 +17299,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> &",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> &",
-   "referenced_type" : "type-2476",
-   "self_type" : "type-4516",
+   "referenced_type" : "type-2479",
+   "self_type" : "type-4522",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17305,8 +17308,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer> &",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer> &",
-   "referenced_type" : "type-4236",
-   "self_type" : "type-4241",
+   "referenced_type" : "type-4242",
+   "self_type" : "type-4247",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17314,8 +17317,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener> &",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener> &",
-   "referenced_type" : "type-4466",
-   "self_type" : "type-4521",
+   "referenced_type" : "type-4472",
+   "self_type" : "type-4527",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17359,8 +17362,8 @@
    "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",
+   "referenced_type" : "type-4299",
+   "self_type" : "type-4304",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17368,8 +17371,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::wp<android::IBinder> &",
    "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "type-4283",
-   "self_type" : "type-4284",
+   "referenced_type" : "type-4289",
+   "self_type" : "type-4290",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17377,8 +17380,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android_cta861_3_metadata &",
    "name" : "const android_cta861_3_metadata &",
-   "referenced_type" : "type-1473",
-   "self_type" : "type-1474",
+   "referenced_type" : "type-1477",
+   "self_type" : "type-1478",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17395,8 +17398,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android_smpte2086_metadata &",
    "name" : "const android_smpte2086_metadata &",
-   "referenced_type" : "type-1471",
-   "self_type" : "type-1472",
+   "referenced_type" : "type-1475",
+   "self_type" : "type-1476",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17414,7 +17417,7 @@
    "linker_set_key" : "const double &",
    "name" : "const double &",
    "referenced_type" : "type-1078",
-   "self_type" : "type-1125",
+   "self_type" : "type-1122",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17441,7 +17444,7 @@
    "linker_set_key" : "const int *&",
    "name" : "const int *&",
    "referenced_type" : "type-480",
-   "self_type" : "type-1512",
+   "self_type" : "type-1515",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17455,57 +17458,57 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1110",
-   "self_type" : "type-1112",
+   "referenced_type" : "type-1113",
+   "self_type" : "type-1115",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1282",
-   "self_type" : "type-1284",
+   "referenced_type" : "type-1285",
+   "self_type" : "type-1287",
    "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",
+   "referenced_type" : "type-3310",
+   "self_type" : "type-3312",
    "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",
+   "referenced_type" : "type-3543",
+   "self_type" : "type-3545",
    "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",
+   "referenced_type" : "type-3652",
+   "self_type" : "type-3654",
    "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",
+   "referenced_type" : "type-3718",
+   "self_type" : "type-3720",
    "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",
+   "referenced_type" : "type-3840",
+   "self_type" : "type-3842",
    "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",
+   "referenced_type" : "type-4381",
+   "self_type" : "type-4383",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -17518,190 +17521,190 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-4504",
-   "self_type" : "type-4506",
+   "referenced_type" : "type-4510",
+   "self_type" : "type-4512",
    "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",
+   "referenced_type" : "type-4547",
+   "self_type" : "type-4549",
    "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",
+   "referenced_type" : "type-4572",
+   "self_type" : "type-4574",
    "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",
+   "referenced_type" : "type-4727",
+   "self_type" : "type-4729",
    "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",
+   "referenced_type" : "type-4856",
+   "self_type" : "type-4858",
    "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",
+   "referenced_type" : "type-5139",
+   "self_type" : "type-5141",
    "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",
+   "referenced_type" : "type-5194",
+   "self_type" : "type-5196",
    "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",
+   "referenced_type" : "type-5399",
+   "self_type" : "type-5401",
    "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",
+   "referenced_type" : "type-5632",
+   "self_type" : "type-5634",
    "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",
+   "referenced_type" : "type-5741",
+   "self_type" : "type-5743",
    "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",
+   "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-5909",
-   "self_type" : "type-5911",
+   "referenced_type" : "type-5929",
+   "self_type" : "type-5931",
    "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",
+   "referenced_type" : "type-6087",
+   "self_type" : "type-6089",
    "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",
+   "referenced_type" : "type-6221",
+   "self_type" : "type-6223",
    "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",
+   "referenced_type" : "type-6317",
+   "self_type" : "type-6319",
    "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",
+   "referenced_type" : "type-6365",
+   "self_type" : "type-6367",
    "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",
+   "referenced_type" : "type-6456",
+   "self_type" : "type-6458",
    "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",
+   "referenced_type" : "type-6996",
+   "self_type" : "type-6998",
    "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",
+   "referenced_type" : "type-7131",
+   "self_type" : "type-7133",
    "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",
+   "referenced_type" : "type-7184",
+   "self_type" : "type-7186",
    "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",
+   "referenced_type" : "type-7219",
+   "self_type" : "type-7222",
    "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",
+   "referenced_type" : "type-7368",
+   "self_type" : "type-7370",
    "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",
+   "referenced_type" : "type-7468",
+   "self_type" : "type-7470",
    "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",
+   "referenced_type" : "type-7507",
+   "self_type" : "type-7509",
    "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",
+   "referenced_type" : "type-7559",
+   "self_type" : "type-7561",
    "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",
+   "referenced_type" : "type-7640",
+   "self_type" : "type-7642",
    "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",
+   "referenced_type" : "type-7704",
+   "self_type" : "type-7706",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -17715,8 +17718,8 @@
    "alignment" : 8,
    "linker_set_key" : "const log_msg &",
    "name" : "const log_msg &",
-   "referenced_type" : "type-2315",
-   "self_type" : "type-2332",
+   "referenced_type" : "type-2318",
+   "self_type" : "type-2335",
    "size" : 8,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -17751,8 +17754,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
-   "referenced_type" : "type-2645",
-   "self_type" : "type-2648",
+   "referenced_type" : "type-2648",
+   "self_type" : "type-2651",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17760,8 +17763,8 @@
    "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",
+   "referenced_type" : "type-4996",
+   "self_type" : "type-4998",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17769,8 +17772,8 @@
    "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",
+   "referenced_type" : "type-6055",
+   "self_type" : "type-6057",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17778,8 +17781,8 @@
    "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",
+   "referenced_type" : "type-7545",
+   "self_type" : "type-7555",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17787,8 +17790,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
-   "referenced_type" : "type-2641",
-   "self_type" : "type-2643",
+   "referenced_type" : "type-2644",
+   "self_type" : "type-2646",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17796,8 +17799,8 @@
    "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",
+   "referenced_type" : "type-4992",
+   "self_type" : "type-4994",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17805,8 +17808,8 @@
    "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",
+   "referenced_type" : "type-6052",
+   "self_type" : "type-6054",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17814,8 +17817,8 @@
    "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",
+   "referenced_type" : "type-7531",
+   "self_type" : "type-7537",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17823,8 +17826,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > &",
    "name" : "const std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > &",
-   "referenced_type" : "type-1644",
-   "self_type" : "type-1646",
+   "referenced_type" : "type-1647",
+   "self_type" : "type-1649",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17832,8 +17835,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > &",
    "name" : "const std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > &",
-   "referenced_type" : "type-4106",
-   "self_type" : "type-4108",
+   "referenced_type" : "type-4113",
+   "self_type" : "type-4115",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17841,8 +17844,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > &",
    "name" : "const std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > &",
-   "referenced_type" : "type-6693",
-   "self_type" : "type-6695",
+   "referenced_type" : "type-6716",
+   "self_type" : "type-6718",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17859,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-1108",
-   "self_type" : "type-1107",
+   "referenced_type" : "type-1111",
+   "self_type" : "type-1110",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17868,8 +17871,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-1278",
-   "self_type" : "type-1277",
+   "referenced_type" : "type-1281",
+   "self_type" : "type-1280",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17877,8 +17880,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-3272",
-   "self_type" : "type-3271",
+   "referenced_type" : "type-3275",
+   "self_type" : "type-3274",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17886,8 +17889,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-3537",
-   "self_type" : "type-3536",
+   "referenced_type" : "type-3540",
+   "self_type" : "type-3539",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17895,8 +17898,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-3647",
-   "self_type" : "type-3646",
+   "referenced_type" : "type-3650",
+   "self_type" : "type-3649",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17904,8 +17907,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-3710",
-   "self_type" : "type-3709",
+   "referenced_type" : "type-3716",
+   "self_type" : "type-3715",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17913,8 +17916,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-3832",
-   "self_type" : "type-3831",
+   "referenced_type" : "type-3838",
+   "self_type" : "type-3837",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17931,8 +17934,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-4354",
-   "self_type" : "type-4353",
+   "referenced_type" : "type-4360",
+   "self_type" : "type-4359",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17940,8 +17943,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-4489",
-   "self_type" : "type-4488",
+   "referenced_type" : "type-4495",
+   "self_type" : "type-4494",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17949,8 +17952,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-4558",
-   "self_type" : "type-4557",
+   "referenced_type" : "type-4564",
+   "self_type" : "type-4563",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17958,8 +17961,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-4622",
-   "self_type" : "type-4621",
+   "referenced_type" : "type-4626",
+   "self_type" : "type-4625",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17967,8 +17970,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-4662",
-   "self_type" : "type-4661",
+   "referenced_type" : "type-4670",
+   "self_type" : "type-4669",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17976,8 +17979,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-4870",
-   "self_type" : "type-4869",
+   "referenced_type" : "type-4876",
+   "self_type" : "type-4875",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17985,8 +17988,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-5142",
-   "self_type" : "type-5141",
+   "referenced_type" : "type-5159",
+   "self_type" : "type-5158",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17994,8 +17997,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-5171",
-   "self_type" : "type-5170",
+   "referenced_type" : "type-5190",
+   "self_type" : "type-5189",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18003,8 +18006,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-5347",
-   "self_type" : "type-5346",
+   "referenced_type" : "type-5364",
+   "self_type" : "type-5363",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18012,8 +18015,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-5612",
-   "self_type" : "type-5611",
+   "referenced_type" : "type-5629",
+   "self_type" : "type-5628",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18021,8 +18024,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-5722",
-   "self_type" : "type-5721",
+   "referenced_type" : "type-5739",
+   "self_type" : "type-5738",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18030,8 +18033,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-5785",
-   "self_type" : "type-5784",
+   "referenced_type" : "type-5805",
+   "self_type" : "type-5804",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18039,8 +18042,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-5907",
-   "self_type" : "type-5906",
+   "referenced_type" : "type-5927",
+   "self_type" : "type-5926",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18048,8 +18051,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-6062",
-   "self_type" : "type-6061",
+   "referenced_type" : "type-6082",
+   "self_type" : "type-6081",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18057,8 +18060,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-6199",
-   "self_type" : "type-6198",
+   "referenced_type" : "type-6219",
+   "self_type" : "type-6218",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18066,8 +18069,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-6295",
-   "self_type" : "type-6294",
+   "referenced_type" : "type-6315",
+   "self_type" : "type-6314",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18075,8 +18078,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-6339",
-   "self_type" : "type-6338",
+   "referenced_type" : "type-6362",
+   "self_type" : "type-6361",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18084,8 +18087,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-6431",
-   "self_type" : "type-6430",
+   "referenced_type" : "type-6454",
+   "self_type" : "type-6453",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18093,8 +18096,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-6952",
-   "self_type" : "type-6951",
+   "referenced_type" : "type-6976",
+   "self_type" : "type-6975",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18102,8 +18105,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-7091",
-   "self_type" : "type-7090",
+   "referenced_type" : "type-7115",
+   "self_type" : "type-7114",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18111,8 +18114,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-7179",
-   "self_type" : "type-7178",
+   "referenced_type" : "type-7203",
+   "self_type" : "type-7202",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18120,8 +18123,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-7262",
-   "self_type" : "type-7261",
+   "referenced_type" : "type-7286",
+   "self_type" : "type-7285",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18129,8 +18132,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-7306",
-   "self_type" : "type-7305",
+   "referenced_type" : "type-7330",
+   "self_type" : "type-7329",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18138,8 +18141,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-7473",
-   "self_type" : "type-7472",
+   "referenced_type" : "type-7497",
+   "self_type" : "type-7496",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18147,8 +18150,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-7499",
-   "self_type" : "type-7498",
+   "referenced_type" : "type-7522",
+   "self_type" : "type-7521",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18156,8 +18159,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-7504",
-   "self_type" : "type-7503",
+   "referenced_type" : "type-7528",
+   "self_type" : "type-7527",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18165,8 +18168,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-7632",
-   "self_type" : "type-7631",
+   "referenced_type" : "type-7657",
+   "self_type" : "type-7656",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18174,8 +18177,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-7644",
-   "self_type" : "type-7643",
+   "referenced_type" : "type-7668",
+   "self_type" : "type-7667",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18192,8 +18195,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
    "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
-   "referenced_type" : "type-4379",
-   "self_type" : "type-4381",
+   "referenced_type" : "type-4385",
+   "self_type" : "type-4387",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18201,8 +18204,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
    "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
-   "referenced_type" : "type-4507",
-   "self_type" : "type-4509",
+   "referenced_type" : "type-4513",
+   "self_type" : "type-4515",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18210,8 +18213,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
    "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
-   "referenced_type" : "type-6976",
-   "self_type" : "type-6979",
+   "referenced_type" : "type-7000",
+   "self_type" : "type-7002",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18219,8 +18222,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
    "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
-   "referenced_type" : "type-7110",
-   "self_type" : "type-7112",
+   "referenced_type" : "type-7134",
+   "self_type" : "type-7137",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18255,8 +18258,8 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
-   "referenced_type" : "type-2521",
-   "self_type" : "type-2617",
+   "referenced_type" : "type-2524",
+   "self_type" : "type-2620",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18282,8 +18285,8 @@
    "alignment" : 8,
    "linker_set_key" : "int *&",
    "name" : "int *&",
-   "referenced_type" : "type-1510",
-   "self_type" : "type-1509",
+   "referenced_type" : "type-1513",
+   "self_type" : "type-1512",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18292,7 +18295,7 @@
    "linker_set_key" : "long &",
    "name" : "long &",
    "referenced_type" : "type-32",
-   "self_type" : "type-1430",
+   "self_type" : "type-1433",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18300,8 +18303,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-4761",
-   "self_type" : "type-4760",
+   "referenced_type" : "type-4769",
+   "self_type" : "type-4768",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18309,8 +18312,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-4865",
-   "self_type" : "type-4864",
+   "referenced_type" : "type-4871",
+   "self_type" : "type-4870",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18318,8 +18321,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-5084",
-   "self_type" : "type-5083",
+   "referenced_type" : "type-5100",
+   "self_type" : "type-5099",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18327,8 +18330,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-5137",
-   "self_type" : "type-5136",
+   "referenced_type" : "type-5153",
+   "self_type" : "type-5152",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18336,8 +18339,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-7373",
-   "self_type" : "type-7372",
+   "referenced_type" : "type-7396",
+   "self_type" : "type-7395",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18345,8 +18348,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-7467",
-   "self_type" : "type-7466",
+   "referenced_type" : "type-7491",
+   "self_type" : "type-7490",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18354,8 +18357,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-7594",
-   "self_type" : "type-7593",
+   "referenced_type" : "type-7618",
+   "self_type" : "type-7617",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18372,8 +18375,8 @@
    "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",
+   "referenced_type" : "type-3187",
+   "self_type" : "type-3186",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -18381,8 +18384,8 @@
    "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",
+   "referenced_type" : "type-5276",
+   "self_type" : "type-5275",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -18390,8 +18393,8 @@
    "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",
+   "referenced_type" : "type-6073",
+   "self_type" : "type-6072",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -18399,8 +18402,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > *&",
    "name" : "std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > *&",
-   "referenced_type" : "type-1649",
-   "self_type" : "type-1884",
+   "referenced_type" : "type-1653",
+   "self_type" : "type-1888",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -18408,8 +18411,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > *&",
    "name" : "std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > *&",
-   "referenced_type" : "type-4112",
-   "self_type" : "type-4139",
+   "referenced_type" : "type-4118",
+   "self_type" : "type-4145",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -18417,8 +18420,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > *&",
    "name" : "std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > *&",
-   "referenced_type" : "type-6698",
-   "self_type" : "type-6730",
+   "referenced_type" : "type-6721",
+   "self_type" : "type-6754",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -18427,7 +18430,7 @@
    "linker_set_key" : "unsigned char &",
    "name" : "unsigned char &",
    "referenced_type" : "type-92",
-   "self_type" : "type-1429",
+   "self_type" : "type-1432",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18453,8 +18456,8 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned long *&",
    "name" : "unsigned long *&",
-   "referenced_type" : "type-1679",
-   "self_type" : "type-1873",
+   "referenced_type" : "type-1683",
+   "self_type" : "type-1877",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -18463,7 +18466,7 @@
    "linker_set_key" : "unsigned short &",
    "name" : "unsigned short &",
    "referenced_type" : "type-500",
-   "self_type" : "type-1428",
+   "self_type" : "type-1431",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18471,8 +18474,8 @@
    "alignment" : 8,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-1445",
-   "self_type" : "type-1444",
+   "referenced_type" : "type-1448",
+   "self_type" : "type-1447",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18480,8 +18483,8 @@
    "alignment" : 8,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-3978",
-   "self_type" : "type-3977",
+   "referenced_type" : "type-3984",
+   "self_type" : "type-3983",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18489,8 +18492,8 @@
    "alignment" : 8,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-6567",
-   "self_type" : "type-6566",
+   "referenced_type" : "type-6590",
+   "self_type" : "type-6589",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18510,8 +18513,8 @@
    "alignment" : 8,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-2404",
-   "self_type" : "type-2403",
+   "referenced_type" : "type-2407",
+   "self_type" : "type-2406",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -18528,8 +18531,8 @@
    "alignment" : 8,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-5991",
-   "self_type" : "type-5990",
+   "referenced_type" : "type-6011",
+   "self_type" : "type-6010",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -18537,8 +18540,8 @@
    "alignment" : 8,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-6825",
-   "self_type" : "type-6824",
+   "referenced_type" : "type-6848",
+   "self_type" : "type-6847",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -18555,8 +18558,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1143",
-   "self_type" : "type-1142",
+   "referenced_type" : "type-1146",
+   "self_type" : "type-1145",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18564,8 +18567,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1165",
-   "self_type" : "type-1164",
+   "referenced_type" : "type-1170",
+   "self_type" : "type-1169",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18573,8 +18576,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1351",
-   "self_type" : "type-1350",
+   "referenced_type" : "type-1354",
+   "self_type" : "type-1353",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18582,8 +18585,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1408",
-   "self_type" : "type-1407",
+   "referenced_type" : "type-1411",
+   "self_type" : "type-1410",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18591,8 +18594,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1424",
-   "self_type" : "type-1423",
+   "referenced_type" : "type-1427",
+   "self_type" : "type-1426",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18600,8 +18603,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1440",
-   "self_type" : "type-1439",
+   "referenced_type" : "type-1443",
+   "self_type" : "type-1442",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18609,8 +18612,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1503",
-   "self_type" : "type-1502",
+   "referenced_type" : "type-1509",
+   "self_type" : "type-1508",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18618,8 +18621,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1633",
-   "self_type" : "type-1632",
+   "referenced_type" : "type-1637",
+   "self_type" : "type-1636",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18627,8 +18630,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2614",
-   "self_type" : "type-2613",
+   "referenced_type" : "type-2617",
+   "self_type" : "type-2616",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18636,8 +18639,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3479",
-   "self_type" : "type-3478",
+   "referenced_type" : "type-3482",
+   "self_type" : "type-3481",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18645,8 +18648,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3583",
-   "self_type" : "type-3582",
+   "referenced_type" : "type-3586",
+   "self_type" : "type-3585",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18654,8 +18657,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3657",
-   "self_type" : "type-3656",
+   "referenced_type" : "type-3660",
+   "self_type" : "type-3659",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18663,8 +18666,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3747",
-   "self_type" : "type-3746",
+   "referenced_type" : "type-3753",
+   "self_type" : "type-3752",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18672,8 +18675,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3771",
-   "self_type" : "type-3770",
+   "referenced_type" : "type-3778",
+   "self_type" : "type-3777",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18681,8 +18684,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3906",
-   "self_type" : "type-3905",
+   "referenced_type" : "type-3912",
+   "self_type" : "type-3911",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18690,8 +18693,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3937",
-   "self_type" : "type-3936",
+   "referenced_type" : "type-3943",
+   "self_type" : "type-3942",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18699,8 +18702,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3952",
-   "self_type" : "type-3951",
+   "referenced_type" : "type-3958",
+   "self_type" : "type-3957",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18708,8 +18711,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3973",
-   "self_type" : "type-3972",
+   "referenced_type" : "type-3979",
+   "self_type" : "type-3978",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18717,8 +18720,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4021",
-   "self_type" : "type-4020",
+   "referenced_type" : "type-4027",
+   "self_type" : "type-4026",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18726,8 +18729,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4099",
-   "self_type" : "type-4098",
+   "referenced_type" : "type-4105",
+   "self_type" : "type-4104",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18735,8 +18738,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4302",
-   "self_type" : "type-4301",
+   "referenced_type" : "type-4308",
+   "self_type" : "type-4307",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18744,8 +18747,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4475",
-   "self_type" : "type-4474",
+   "referenced_type" : "type-4481",
+   "self_type" : "type-4480",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18753,8 +18756,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4528",
-   "self_type" : "type-4527",
+   "referenced_type" : "type-4534",
+   "self_type" : "type-4533",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18762,8 +18765,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4554",
-   "self_type" : "type-4553",
+   "referenced_type" : "type-4560",
+   "self_type" : "type-4559",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18771,8 +18774,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4581",
-   "self_type" : "type-4580",
+   "referenced_type" : "type-4587",
+   "self_type" : "type-4586",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18780,8 +18783,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4748",
-   "self_type" : "type-4747",
+   "referenced_type" : "type-4755",
+   "self_type" : "type-4754",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18789,8 +18792,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4858",
-   "self_type" : "type-4857",
+   "referenced_type" : "type-4865",
+   "self_type" : "type-4864",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18798,8 +18801,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4970",
-   "self_type" : "type-4969",
+   "referenced_type" : "type-4976",
+   "self_type" : "type-4975",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18807,8 +18810,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5090",
-   "self_type" : "type-5089",
+   "referenced_type" : "type-5106",
+   "self_type" : "type-5105",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18816,8 +18819,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5131",
-   "self_type" : "type-5130",
+   "referenced_type" : "type-5147",
+   "self_type" : "type-5146",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18825,8 +18828,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5237",
-   "self_type" : "type-5236",
+   "referenced_type" : "type-5254",
+   "self_type" : "type-5253",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18834,8 +18837,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5554",
-   "self_type" : "type-5553",
+   "referenced_type" : "type-5571",
+   "self_type" : "type-5570",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18843,8 +18846,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5658",
-   "self_type" : "type-5657",
+   "referenced_type" : "type-5675",
+   "self_type" : "type-5674",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18852,8 +18855,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5732",
-   "self_type" : "type-5731",
+   "referenced_type" : "type-5749",
+   "self_type" : "type-5748",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18861,8 +18864,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5822",
-   "self_type" : "type-5821",
+   "referenced_type" : "type-5842",
+   "self_type" : "type-5841",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18870,8 +18873,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5846",
-   "self_type" : "type-5845",
+   "referenced_type" : "type-5867",
+   "self_type" : "type-5866",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18879,8 +18882,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6030",
-   "self_type" : "type-6029",
+   "referenced_type" : "type-6050",
+   "self_type" : "type-6049",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18888,8 +18891,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6153",
-   "self_type" : "type-6152",
+   "referenced_type" : "type-6174",
+   "self_type" : "type-6173",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18897,8 +18900,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6244",
-   "self_type" : "type-6243",
+   "referenced_type" : "type-6264",
+   "self_type" : "type-6263",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18906,8 +18909,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6305",
-   "self_type" : "type-6304",
+   "referenced_type" : "type-6325",
+   "self_type" : "type-6324",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18915,8 +18918,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6377",
-   "self_type" : "type-6376",
+   "referenced_type" : "type-6400",
+   "self_type" : "type-6399",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18924,8 +18927,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6399",
-   "self_type" : "type-6398",
+   "referenced_type" : "type-6422",
+   "self_type" : "type-6421",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18933,8 +18936,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6498",
-   "self_type" : "type-6497",
+   "referenced_type" : "type-6521",
+   "self_type" : "type-6520",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18942,8 +18945,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6529",
-   "self_type" : "type-6528",
+   "referenced_type" : "type-6553",
+   "self_type" : "type-6552",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18951,8 +18954,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6545",
-   "self_type" : "type-6544",
+   "referenced_type" : "type-6569",
+   "self_type" : "type-6568",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18960,8 +18963,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6562",
-   "self_type" : "type-6561",
+   "referenced_type" : "type-6585",
+   "self_type" : "type-6584",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18969,8 +18972,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6609",
-   "self_type" : "type-6608",
+   "referenced_type" : "type-6632",
+   "self_type" : "type-6631",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18978,8 +18981,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6686",
-   "self_type" : "type-6685",
+   "referenced_type" : "type-6709",
+   "self_type" : "type-6708",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18987,8 +18990,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6906",
-   "self_type" : "type-6905",
+   "referenced_type" : "type-6929",
+   "self_type" : "type-6928",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18996,8 +18999,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7074",
-   "self_type" : "type-7073",
+   "referenced_type" : "type-7099",
+   "self_type" : "type-7098",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19005,8 +19008,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7138",
-   "self_type" : "type-7137",
+   "referenced_type" : "type-7162",
+   "self_type" : "type-7161",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19014,8 +19017,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7173",
-   "self_type" : "type-7172",
+   "referenced_type" : "type-7197",
+   "self_type" : "type-7196",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19023,8 +19026,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7216",
-   "self_type" : "type-7215",
+   "referenced_type" : "type-7241",
+   "self_type" : "type-7240",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19032,8 +19035,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7363",
-   "self_type" : "type-7362",
+   "referenced_type" : "type-7386",
+   "self_type" : "type-7385",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19041,8 +19044,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7454",
-   "self_type" : "type-7453",
+   "referenced_type" : "type-7477",
+   "self_type" : "type-7476",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19050,8 +19053,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7458",
-   "self_type" : "type-7457",
+   "referenced_type" : "type-7482",
+   "self_type" : "type-7481",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19059,8 +19062,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7495",
-   "self_type" : "type-7494",
+   "referenced_type" : "type-7518",
+   "self_type" : "type-7517",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19068,8 +19071,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7592",
-   "self_type" : "type-7591",
+   "referenced_type" : "type-7616",
+   "self_type" : "type-7615",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19077,8 +19080,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7626",
-   "self_type" : "type-7625",
+   "referenced_type" : "type-7650",
+   "self_type" : "type-7649",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19104,8 +19107,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE *",
    "name" : "OMX_BUFFERHEADERTYPE *",
-   "referenced_type" : "type-1544",
-   "self_type" : "type-1596",
+   "referenced_type" : "type-1541",
+   "self_type" : "type-1599",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -19113,8 +19116,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE **",
    "name" : "OMX_BUFFERHEADERTYPE **",
-   "referenced_type" : "type-1596",
-   "self_type" : "type-2378",
+   "referenced_type" : "type-1599",
+   "self_type" : "type-2381",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19122,8 +19125,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_CALLBACKTYPE *",
    "name" : "OMX_CALLBACKTYPE *",
-   "referenced_type" : "type-1591",
-   "self_type" : "type-2387",
+   "referenced_type" : "type-1594",
+   "self_type" : "type-2390",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19131,8 +19134,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *)",
    "name" : "OMX_ERRORTYPE (*)(void *)",
-   "referenced_type" : "type-1506",
-   "self_type" : "type-1505",
+   "referenced_type" : "type-1505",
+   "self_type" : "type-1504",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -19140,8 +19143,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-2384",
-   "self_type" : "type-2383",
+   "referenced_type" : "type-2387",
+   "self_type" : "type-2386",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19149,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-2380",
-   "self_type" : "type-2379",
+   "referenced_type" : "type-2383",
+   "self_type" : "type-2382",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19158,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-2377",
-   "self_type" : "type-2376",
+   "referenced_type" : "type-2380",
+   "self_type" : "type-2379",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19167,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-2389",
-   "self_type" : "type-2388",
+   "referenced_type" : "type-2392",
+   "self_type" : "type-2391",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19176,8 +19179,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
-   "referenced_type" : "type-2386",
-   "self_type" : "type-2385",
+   "referenced_type" : "type-2389",
+   "self_type" : "type-2388",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19185,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-2364",
-   "self_type" : "type-2363",
+   "referenced_type" : "type-2367",
+   "self_type" : "type-2366",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19194,8 +19197,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
-   "referenced_type" : "type-2366",
-   "self_type" : "type-2365",
+   "referenced_type" : "type-2369",
+   "self_type" : "type-2368",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19203,51 +19206,6 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
-   "referenced_type" : "type-2371",
-   "self_type" : "type-2370",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, char *, OMX_INDEXTYPE *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, char *, OMX_INDEXTYPE *)",
-   "referenced_type" : "type-2368",
-   "self_type" : "type-2367",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-2360",
-   "self_type" : "type-2359",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, unsigned char *, unsigned int)",
-   "name" : "OMX_ERRORTYPE (*)(void *, unsigned char *, unsigned int)",
-   "referenced_type" : "type-2391",
-   "self_type" : "type-2390",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, unsigned int, OMX_BUFFERHEADERTYPE *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, unsigned int, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-2382",
-   "self_type" : "type-2381",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-2374",
    "self_type" : "type-2373",
    "size" : 8,
@@ -19255,10 +19213,55 @@
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, char *, OMX_INDEXTYPE *)",
+   "name" : "OMX_ERRORTYPE (*)(void *, char *, OMX_INDEXTYPE *)",
+   "referenced_type" : "type-2371",
+   "self_type" : "type-2370",
+   "size" : 8,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "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-2363",
+   "self_type" : "type-2362",
+   "size" : 8,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, unsigned char *, unsigned int)",
+   "name" : "OMX_ERRORTYPE (*)(void *, unsigned char *, unsigned int)",
+   "referenced_type" : "type-2394",
+   "self_type" : "type-2393",
+   "size" : 8,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, unsigned int, OMX_BUFFERHEADERTYPE *)",
+   "name" : "OMX_ERRORTYPE (*)(void *, unsigned int, OMX_BUFFERHEADERTYPE *)",
+   "referenced_type" : "type-2385",
+   "self_type" : "type-2384",
+   "size" : 8,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "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-2377",
+   "self_type" : "type-2376",
+   "size" : 8,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, void *, OMX_BUFFERHEADERTYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, void *, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-1595",
-   "self_type" : "type-1594",
+   "referenced_type" : "type-1598",
+   "self_type" : "type-1597",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -19266,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-1593",
-   "self_type" : "type-1592",
+   "referenced_type" : "type-1596",
+   "self_type" : "type-1595",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -19275,8 +19278,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_INDEXTYPE *",
    "name" : "OMX_INDEXTYPE *",
-   "referenced_type" : "type-1485",
-   "self_type" : "type-2369",
+   "referenced_type" : "type-1487",
+   "self_type" : "type-2372",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19284,8 +19287,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_STATETYPE *",
    "name" : "OMX_STATETYPE *",
-   "referenced_type" : "type-1493",
-   "self_type" : "type-2372",
+   "referenced_type" : "type-1491",
+   "self_type" : "type-2375",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19293,8 +19296,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_TUNNELSETUPTYPE *",
    "name" : "OMX_TUNNELSETUPTYPE *",
-   "referenced_type" : "type-1615",
-   "self_type" : "type-2375",
+   "referenced_type" : "type-1614",
+   "self_type" : "type-2378",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19302,8 +19305,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_VERSIONTYPE *",
    "name" : "OMX_VERSIONTYPE *",
-   "referenced_type" : "type-1480",
-   "self_type" : "type-2361",
+   "referenced_type" : "type-1483",
+   "self_type" : "type-2364",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19320,8 +19323,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1116",
-   "self_type" : "type-1115",
+   "referenced_type" : "type-1119",
+   "self_type" : "type-1118",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19329,8 +19332,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1336",
-   "self_type" : "type-1335",
+   "referenced_type" : "type-1339",
+   "self_type" : "type-1338",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19338,8 +19341,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1403",
-   "self_type" : "type-1402",
+   "referenced_type" : "type-1406",
+   "self_type" : "type-1405",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19347,8 +19350,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1419",
-   "self_type" : "type-1418",
+   "referenced_type" : "type-1422",
+   "self_type" : "type-1421",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19356,8 +19359,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1436",
-   "self_type" : "type-1435",
+   "referenced_type" : "type-1439",
+   "self_type" : "type-1438",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19365,8 +19368,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1438",
-   "self_type" : "type-1437",
+   "referenced_type" : "type-1441",
+   "self_type" : "type-1440",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19374,8 +19377,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1501",
-   "self_type" : "type-1500",
+   "referenced_type" : "type-1507",
+   "self_type" : "type-1506",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19383,8 +19386,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1631",
-   "self_type" : "type-1630",
+   "referenced_type" : "type-1635",
+   "self_type" : "type-1634",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19392,8 +19395,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2611",
-   "self_type" : "type-2610",
+   "referenced_type" : "type-2614",
+   "self_type" : "type-2613",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19401,8 +19404,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3477",
-   "self_type" : "type-3476",
+   "referenced_type" : "type-3480",
+   "self_type" : "type-3479",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19410,8 +19413,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3560",
-   "self_type" : "type-3559",
+   "referenced_type" : "type-3559",
+   "self_type" : "type-3558",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19419,8 +19422,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3655",
-   "self_type" : "type-3654",
+   "referenced_type" : "type-3658",
+   "self_type" : "type-3657",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19428,8 +19431,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3720",
-   "self_type" : "type-3719",
+   "referenced_type" : "type-3726",
+   "self_type" : "type-3725",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19437,8 +19440,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3888",
-   "self_type" : "type-3887",
+   "referenced_type" : "type-3894",
+   "self_type" : "type-3893",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19446,8 +19449,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3931",
-   "self_type" : "type-3930",
+   "referenced_type" : "type-3937",
+   "self_type" : "type-3936",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19455,8 +19458,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3947",
-   "self_type" : "type-3946",
+   "referenced_type" : "type-3953",
+   "self_type" : "type-3952",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19464,8 +19467,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3967",
-   "self_type" : "type-3966",
+   "referenced_type" : "type-3973",
+   "self_type" : "type-3972",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19473,8 +19476,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3969",
-   "self_type" : "type-3968",
+   "referenced_type" : "type-3975",
+   "self_type" : "type-3974",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19482,8 +19485,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4019",
-   "self_type" : "type-4018",
+   "referenced_type" : "type-4025",
+   "self_type" : "type-4024",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19491,8 +19494,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4097",
-   "self_type" : "type-4096",
+   "referenced_type" : "type-4103",
+   "self_type" : "type-4102",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19500,8 +19503,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4300",
-   "self_type" : "type-4299",
+   "referenced_type" : "type-4306",
+   "self_type" : "type-4305",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19509,8 +19512,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4515",
-   "self_type" : "type-4514",
+   "referenced_type" : "type-4521",
+   "self_type" : "type-4520",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19518,8 +19521,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4526",
-   "self_type" : "type-4525",
+   "referenced_type" : "type-4532",
+   "self_type" : "type-4531",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19527,8 +19530,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4552",
-   "self_type" : "type-4551",
+   "referenced_type" : "type-4558",
+   "self_type" : "type-4557",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19536,8 +19539,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4579",
-   "self_type" : "type-4578",
+   "referenced_type" : "type-4585",
+   "self_type" : "type-4584",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19545,8 +19548,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4746",
-   "self_type" : "type-4745",
+   "referenced_type" : "type-4753",
+   "self_type" : "type-4752",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19554,8 +19557,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4856",
-   "self_type" : "type-4855",
+   "referenced_type" : "type-4862",
+   "self_type" : "type-4861",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19563,8 +19566,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4967",
-   "self_type" : "type-4966",
+   "referenced_type" : "type-4973",
+   "self_type" : "type-4972",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19572,8 +19575,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5088",
-   "self_type" : "type-5087",
+   "referenced_type" : "type-5104",
+   "self_type" : "type-5103",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19581,8 +19584,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5129",
-   "self_type" : "type-5128",
+   "referenced_type" : "type-5145",
+   "self_type" : "type-5144",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19590,8 +19593,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5230",
-   "self_type" : "type-5229",
+   "referenced_type" : "type-5246",
+   "self_type" : "type-5245",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19599,8 +19602,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5552",
-   "self_type" : "type-5551",
+   "referenced_type" : "type-5569",
+   "self_type" : "type-5568",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19608,8 +19611,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5635",
-   "self_type" : "type-5634",
+   "referenced_type" : "type-5648",
+   "self_type" : "type-5647",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19617,8 +19620,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5730",
-   "self_type" : "type-5729",
+   "referenced_type" : "type-5747",
+   "self_type" : "type-5746",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19626,8 +19629,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5795",
-   "self_type" : "type-5794",
+   "referenced_type" : "type-5815",
+   "self_type" : "type-5814",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19635,8 +19638,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5963",
-   "self_type" : "type-5962",
+   "referenced_type" : "type-5983",
+   "self_type" : "type-5982",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19644,8 +19647,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6028",
-   "self_type" : "type-6027",
+   "referenced_type" : "type-6048",
+   "self_type" : "type-6047",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19653,8 +19656,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6151",
-   "self_type" : "type-6150",
+   "referenced_type" : "type-6171",
+   "self_type" : "type-6170",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19662,8 +19665,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6221",
-   "self_type" : "type-6220",
+   "referenced_type" : "type-6237",
+   "self_type" : "type-6236",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19671,8 +19674,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6303",
-   "self_type" : "type-6302",
+   "referenced_type" : "type-6323",
+   "self_type" : "type-6322",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19680,8 +19683,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6349",
-   "self_type" : "type-6348",
+   "referenced_type" : "type-6373",
+   "self_type" : "type-6372",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19689,8 +19692,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6482",
-   "self_type" : "type-6481",
+   "referenced_type" : "type-6505",
+   "self_type" : "type-6504",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19698,8 +19701,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6524",
-   "self_type" : "type-6523",
+   "referenced_type" : "type-6547",
+   "self_type" : "type-6546",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19707,8 +19710,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6540",
-   "self_type" : "type-6539",
+   "referenced_type" : "type-6563",
+   "self_type" : "type-6562",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19716,8 +19719,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6558",
-   "self_type" : "type-6557",
+   "referenced_type" : "type-6581",
+   "self_type" : "type-6580",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19725,8 +19728,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6560",
-   "self_type" : "type-6559",
+   "referenced_type" : "type-6583",
+   "self_type" : "type-6582",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19734,8 +19737,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6607",
-   "self_type" : "type-6606",
+   "referenced_type" : "type-6630",
+   "self_type" : "type-6629",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19743,8 +19746,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6684",
-   "self_type" : "type-6683",
+   "referenced_type" : "type-6707",
+   "self_type" : "type-6706",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19752,8 +19755,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6904",
-   "self_type" : "type-6903",
+   "referenced_type" : "type-6927",
+   "self_type" : "type-6926",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19761,8 +19764,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7120",
-   "self_type" : "type-7119",
+   "referenced_type" : "type-7145",
+   "self_type" : "type-7144",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19770,8 +19773,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7135",
-   "self_type" : "type-7134",
+   "referenced_type" : "type-7160",
+   "self_type" : "type-7159",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19779,8 +19782,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7171",
-   "self_type" : "type-7170",
+   "referenced_type" : "type-7195",
+   "self_type" : "type-7194",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19788,8 +19791,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7214",
-   "self_type" : "type-7213",
+   "referenced_type" : "type-7239",
+   "self_type" : "type-7238",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19797,8 +19800,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7361",
-   "self_type" : "type-7360",
+   "referenced_type" : "type-7384",
+   "self_type" : "type-7383",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19806,8 +19809,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7451",
-   "self_type" : "type-7450",
+   "referenced_type" : "type-7472",
+   "self_type" : "type-7471",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19815,8 +19818,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7456",
-   "self_type" : "type-7455",
+   "referenced_type" : "type-7480",
+   "self_type" : "type-7479",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19824,8 +19827,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7493",
-   "self_type" : "type-7492",
+   "referenced_type" : "type-7516",
+   "self_type" : "type-7515",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19833,8 +19836,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7590",
-   "self_type" : "type-7589",
+   "referenced_type" : "type-7614",
+   "self_type" : "type-7613",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19842,8 +19845,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7624",
-   "self_type" : "type-7623",
+   "referenced_type" : "type-7648",
+   "self_type" : "type-7647",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19860,8 +19863,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-883",
-   "self_type" : "type-882",
+   "referenced_type" : "type-879",
+   "self_type" : "type-878",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19905,8 +19908,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ALooper::LooperThread *",
    "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-3766",
-   "self_type" : "type-3765",
+   "referenced_type" : "type-3769",
+   "self_type" : "type-3768",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19914,8 +19917,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ALooper::LooperThread *",
    "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-5841",
-   "self_type" : "type-5840",
+   "referenced_type" : "type-5858",
+   "self_type" : "type-5857",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19923,8 +19926,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ALooper::LooperThread *",
    "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-5984",
-   "self_type" : "type-5983",
+   "referenced_type" : "type-6004",
+   "self_type" : "type-6003",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19941,8 +19944,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::AReplyToken *",
    "name" : "android::AReplyToken *",
-   "referenced_type" : "type-1045",
-   "self_type" : "type-1167",
+   "referenced_type" : "type-1044",
+   "self_type" : "type-1168",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -19960,7 +19963,7 @@
    "linker_set_key" : "android::BBinder *",
    "name" : "android::BBinder *",
    "referenced_type" : "type-69",
-   "self_type" : "type-1206",
+   "self_type" : "type-1209",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -19987,7 +19990,7 @@
    "linker_set_key" : "android::BnInterface<android::IGraphicBufferProducer> *",
    "name" : "android::BnInterface<android::IGraphicBufferProducer> *",
    "referenced_type" : "type-73",
-   "self_type" : "type-1271",
+   "self_type" : "type-1275",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19996,7 +19999,7 @@
    "linker_set_key" : "android::BnInterface<android::IProducerListener> *",
    "name" : "android::BnInterface<android::IProducerListener> *",
    "referenced_type" : "type-82",
-   "self_type" : "type-4503",
+   "self_type" : "type-4509",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20004,8 +20007,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BnInterface<android::ITransactionCompletedListener> *",
    "name" : "android::BnInterface<android::ITransactionCompletedListener> *",
-   "referenced_type" : "type-1032",
-   "self_type" : "type-1035",
+   "referenced_type" : "type-1035",
+   "self_type" : "type-1039",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20013,8 +20016,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BpConsumerListener *",
    "name" : "android::BpConsumerListener *",
-   "referenced_type" : "type-1580",
-   "self_type" : "type-1579",
+   "referenced_type" : "type-1583",
+   "self_type" : "type-1582",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20022,8 +20025,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BpConsumerListener *",
    "name" : "android::BpConsumerListener *",
-   "referenced_type" : "type-4060",
-   "self_type" : "type-4059",
+   "referenced_type" : "type-4067",
+   "self_type" : "type-4066",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20031,8 +20034,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BpConsumerListener *",
    "name" : "android::BpConsumerListener *",
-   "referenced_type" : "type-6648",
-   "self_type" : "type-6647",
+   "referenced_type" : "type-6671",
+   "self_type" : "type-6670",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20040,8 +20043,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BpGraphicBufferConsumer *",
    "name" : "android::BpGraphicBufferConsumer *",
-   "referenced_type" : "type-1603",
-   "self_type" : "type-1602",
+   "referenced_type" : "type-1607",
+   "self_type" : "type-1606",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20049,8 +20052,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BpGraphicBufferConsumer *",
    "name" : "android::BpGraphicBufferConsumer *",
-   "referenced_type" : "type-4078",
-   "self_type" : "type-4077",
+   "referenced_type" : "type-4084",
+   "self_type" : "type-4083",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20058,8 +20061,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BpGraphicBufferConsumer *",
    "name" : "android::BpGraphicBufferConsumer *",
-   "referenced_type" : "type-6663",
-   "self_type" : "type-6662",
+   "referenced_type" : "type-6686",
+   "self_type" : "type-6685",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20067,8 +20070,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BpGraphicBufferProducer *",
    "name" : "android::BpGraphicBufferProducer *",
-   "referenced_type" : "type-4233",
-   "self_type" : "type-4232",
+   "referenced_type" : "type-4239",
+   "self_type" : "type-4238",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20076,8 +20079,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BpGraphicBufferProducer *",
    "name" : "android::BpGraphicBufferProducer *",
-   "referenced_type" : "type-6848",
-   "self_type" : "type-6847",
+   "referenced_type" : "type-6871",
+   "self_type" : "type-6870",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20085,8 +20088,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BpInterface<android::IConsumerListener> *",
    "name" : "android::BpInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-1495",
-   "self_type" : "type-1499",
+   "referenced_type" : "type-1499",
+   "self_type" : "type-1502",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -20094,8 +20097,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BpInterface<android::IGraphicBufferConsumer> *",
    "name" : "android::BpInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-1625",
-   "self_type" : "type-1628",
+   "referenced_type" : "type-1629",
+   "self_type" : "type-1633",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -20103,8 +20106,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BpInterface<android::IGraphicBufferProducer> *",
    "name" : "android::BpInterface<android::IGraphicBufferProducer> *",
-   "referenced_type" : "type-4320",
-   "self_type" : "type-4323",
+   "referenced_type" : "type-4326",
+   "self_type" : "type-4329",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -20112,8 +20115,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BpInterface<android::IProducerListener> *",
    "name" : "android::BpInterface<android::IProducerListener> *",
-   "referenced_type" : "type-4482",
-   "self_type" : "type-4485",
+   "referenced_type" : "type-4488",
+   "self_type" : "type-4491",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -20121,8 +20124,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BpProducerListener *",
    "name" : "android::BpProducerListener *",
-   "referenced_type" : "type-4455",
-   "self_type" : "type-4454",
+   "referenced_type" : "type-4462",
+   "self_type" : "type-4461",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20130,8 +20133,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BpProducerListener *",
    "name" : "android::BpProducerListener *",
-   "referenced_type" : "type-7062",
-   "self_type" : "type-7061",
+   "referenced_type" : "type-7086",
+   "self_type" : "type-7085",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20148,8 +20151,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-1068",
-   "self_type" : "type-1067",
+   "referenced_type" : "type-1071",
+   "self_type" : "type-1070",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20157,8 +20160,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-1530",
-   "self_type" : "type-1529",
+   "referenced_type" : "type-1533",
+   "self_type" : "type-1532",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -20166,8 +20169,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-1670",
-   "self_type" : "type-1669",
+   "referenced_type" : "type-1674",
+   "self_type" : "type-1673",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -20175,8 +20178,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-3638",
-   "self_type" : "type-3637",
+   "referenced_type" : "type-3641",
+   "self_type" : "type-3640",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -20184,8 +20187,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-3682",
-   "self_type" : "type-3681",
+   "referenced_type" : "type-3688",
+   "self_type" : "type-3687",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20193,8 +20196,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-4041",
-   "self_type" : "type-4040",
+   "referenced_type" : "type-4048",
+   "self_type" : "type-4047",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -20202,8 +20205,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-4127",
-   "self_type" : "type-4126",
+   "referenced_type" : "type-4133",
+   "self_type" : "type-4132",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -20211,8 +20214,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-5713",
-   "self_type" : "type-5712",
+   "referenced_type" : "type-5730",
+   "self_type" : "type-5729",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -20220,8 +20223,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-5757",
-   "self_type" : "type-5756",
+   "referenced_type" : "type-5777",
+   "self_type" : "type-5776",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20229,8 +20232,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-6284",
-   "self_type" : "type-6283",
+   "referenced_type" : "type-6304",
+   "self_type" : "type-6303",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -20238,8 +20241,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-6322",
-   "self_type" : "type-6321",
+   "referenced_type" : "type-6345",
+   "self_type" : "type-6344",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20247,8 +20250,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-6631",
-   "self_type" : "type-6630",
+   "referenced_type" : "type-6654",
+   "self_type" : "type-6653",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -20256,8 +20259,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-6713",
-   "self_type" : "type-6712",
+   "referenced_type" : "type-6736",
+   "self_type" : "type-6735",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -20274,8 +20277,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
    "name" : "android::BufferQueue::ProxyConsumerListener *",
-   "referenced_type" : "type-2538",
-   "self_type" : "type-2537",
+   "referenced_type" : "type-2541",
+   "self_type" : "type-2540",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20283,8 +20286,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
    "name" : "android::BufferQueue::ProxyConsumerListener *",
-   "referenced_type" : "type-4951",
-   "self_type" : "type-4950",
+   "referenced_type" : "type-4957",
+   "self_type" : "type-4956",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20292,8 +20295,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
    "name" : "android::BufferQueue::ProxyConsumerListener *",
-   "referenced_type" : "type-6022",
-   "self_type" : "type-6021",
+   "referenced_type" : "type-6042",
+   "self_type" : "type-6041",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20301,8 +20304,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
    "name" : "android::BufferQueue::ProxyConsumerListener *",
-   "referenced_type" : "type-7235",
-   "self_type" : "type-7234",
+   "referenced_type" : "type-7256",
+   "self_type" : "type-7255",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20310,8 +20313,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueConsumer *",
    "name" : "android::BufferQueueConsumer *",
-   "referenced_type" : "type-3492",
-   "self_type" : "type-3491",
+   "referenced_type" : "type-3495",
+   "self_type" : "type-3494",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20319,8 +20322,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueConsumer *",
    "name" : "android::BufferQueueConsumer *",
-   "referenced_type" : "type-5567",
-   "self_type" : "type-5566",
+   "referenced_type" : "type-5584",
+   "self_type" : "type-5583",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20328,8 +20331,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueConsumer *",
    "name" : "android::BufferQueueConsumer *",
-   "referenced_type" : "type-6164",
-   "self_type" : "type-6163",
+   "referenced_type" : "type-6184",
+   "self_type" : "type-6183",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20346,8 +20349,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-1169",
-   "self_type" : "type-1168",
+   "referenced_type" : "type-1173",
+   "self_type" : "type-1172",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20355,8 +20358,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-3519",
-   "self_type" : "type-3518",
+   "referenced_type" : "type-3522",
+   "self_type" : "type-3521",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20364,8 +20367,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-3617",
-   "self_type" : "type-3616",
+   "referenced_type" : "type-3620",
+   "self_type" : "type-3619",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20373,8 +20376,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-3774",
-   "self_type" : "type-3773",
+   "referenced_type" : "type-3781",
+   "self_type" : "type-3780",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20382,8 +20385,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-5594",
-   "self_type" : "type-5593",
+   "referenced_type" : "type-5611",
+   "self_type" : "type-5610",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20391,8 +20394,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-5692",
-   "self_type" : "type-5691",
+   "referenced_type" : "type-5709",
+   "self_type" : "type-5708",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20400,8 +20403,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-5849",
-   "self_type" : "type-5848",
+   "referenced_type" : "type-5870",
+   "self_type" : "type-5869",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20409,8 +20412,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-6183",
-   "self_type" : "type-6182",
+   "referenced_type" : "type-6203",
+   "self_type" : "type-6202",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20418,8 +20421,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-6269",
-   "self_type" : "type-6268",
+   "referenced_type" : "type-6290",
+   "self_type" : "type-6289",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20427,8 +20430,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-6401",
-   "self_type" : "type-6400",
+   "referenced_type" : "type-6424",
+   "self_type" : "type-6423",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20454,8 +20457,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueProducer *",
    "name" : "android::BufferQueueProducer *",
-   "referenced_type" : "type-3504",
-   "self_type" : "type-3503",
+   "referenced_type" : "type-3507",
+   "self_type" : "type-3506",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20463,8 +20466,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueProducer *",
    "name" : "android::BufferQueueProducer *",
-   "referenced_type" : "type-5579",
-   "self_type" : "type-5578",
+   "referenced_type" : "type-5596",
+   "self_type" : "type-5595",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20472,8 +20475,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueProducer *",
    "name" : "android::BufferQueueProducer *",
-   "referenced_type" : "type-6173",
-   "self_type" : "type-6172",
+   "referenced_type" : "type-6193",
+   "self_type" : "type-6192",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20499,8 +20502,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ComposerService *",
    "name" : "android::ComposerService *",
-   "referenced_type" : "type-1093",
-   "self_type" : "type-1092",
+   "referenced_type" : "type-1096",
+   "self_type" : "type-1095",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -20508,8 +20511,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ComposerService *",
    "name" : "android::ComposerService *",
-   "referenced_type" : "type-3702",
-   "self_type" : "type-3701",
+   "referenced_type" : "type-3708",
+   "self_type" : "type-3707",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -20517,8 +20520,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ComposerService *",
    "name" : "android::ComposerService *",
-   "referenced_type" : "type-5777",
-   "self_type" : "type-5776",
+   "referenced_type" : "type-5797",
+   "self_type" : "type-5796",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -20526,8 +20529,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ComposerService *",
    "name" : "android::ComposerService *",
-   "referenced_type" : "type-6335",
-   "self_type" : "type-6334",
+   "referenced_type" : "type-6358",
+   "self_type" : "type-6357",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -20544,8 +20547,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-1252",
-   "self_type" : "type-1251",
+   "referenced_type" : "type-1256",
+   "self_type" : "type-1255",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20553,8 +20556,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-1455",
-   "self_type" : "type-1454",
+   "referenced_type" : "type-1459",
+   "self_type" : "type-1458",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20562,8 +20565,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-3813",
-   "self_type" : "type-3812",
+   "referenced_type" : "type-3820",
+   "self_type" : "type-3819",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20571,8 +20574,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-3988",
-   "self_type" : "type-3987",
+   "referenced_type" : "type-3994",
+   "self_type" : "type-3993",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20580,8 +20583,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-5888",
-   "self_type" : "type-5887",
+   "referenced_type" : "type-5909",
+   "self_type" : "type-5908",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20589,8 +20592,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-6424",
-   "self_type" : "type-6423",
+   "referenced_type" : "type-6448",
+   "self_type" : "type-6447",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20598,8 +20601,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-6576",
-   "self_type" : "type-6575",
+   "referenced_type" : "type-6599",
+   "self_type" : "type-6598",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20607,8 +20610,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-3292",
-   "self_type" : "type-3291",
+   "referenced_type" : "type-3295",
+   "self_type" : "type-3294",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20616,8 +20619,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-3481",
-   "self_type" : "type-3480",
+   "referenced_type" : "type-3484",
+   "self_type" : "type-3483",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20634,8 +20637,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-5367",
-   "self_type" : "type-5366",
+   "referenced_type" : "type-5384",
+   "self_type" : "type-5383",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20643,8 +20646,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-5556",
-   "self_type" : "type-5555",
+   "referenced_type" : "type-5573",
+   "self_type" : "type-5572",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20652,8 +20655,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-6066",
-   "self_type" : "type-6065",
+   "referenced_type" : "type-6086",
+   "self_type" : "type-6085",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20661,8 +20664,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-6156",
-   "self_type" : "type-6155",
+   "referenced_type" : "type-6176",
+   "self_type" : "type-6175",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20697,8 +20700,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-1286",
-   "self_type" : "type-1285",
+   "referenced_type" : "type-1289",
+   "self_type" : "type-1288",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20706,8 +20709,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-1415",
-   "self_type" : "type-1414",
+   "referenced_type" : "type-1418",
+   "self_type" : "type-1417",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20715,8 +20718,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-1434",
-   "self_type" : "type-1433",
+   "referenced_type" : "type-1437",
+   "self_type" : "type-1436",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20724,8 +20727,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-1457",
-   "self_type" : "type-1456",
+   "referenced_type" : "type-1461",
+   "self_type" : "type-1460",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20733,8 +20736,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-1585",
-   "self_type" : "type-1584",
+   "referenced_type" : "type-1589",
+   "self_type" : "type-1588",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20742,8 +20745,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-1612",
-   "self_type" : "type-1611",
+   "referenced_type" : "type-1616",
+   "self_type" : "type-1615",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20751,8 +20754,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-1867",
-   "self_type" : "type-1866",
+   "referenced_type" : "type-1871",
+   "self_type" : "type-1870",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20760,8 +20763,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3447",
-   "self_type" : "type-3446",
+   "referenced_type" : "type-3450",
+   "self_type" : "type-3449",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20769,8 +20772,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3486",
-   "self_type" : "type-3485",
+   "referenced_type" : "type-3489",
+   "self_type" : "type-3488",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20778,8 +20781,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3660",
-   "self_type" : "type-3659",
+   "referenced_type" : "type-3663",
+   "self_type" : "type-3662",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20787,8 +20790,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3662",
-   "self_type" : "type-3661",
+   "referenced_type" : "type-3665",
+   "self_type" : "type-3664",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20796,8 +20799,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3838",
-   "self_type" : "type-3837",
+   "referenced_type" : "type-3844",
+   "self_type" : "type-3843",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20805,8 +20808,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3943",
-   "self_type" : "type-3942",
+   "referenced_type" : "type-3949",
+   "self_type" : "type-3948",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20814,8 +20817,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3965",
-   "self_type" : "type-3964",
+   "referenced_type" : "type-3971",
+   "self_type" : "type-3970",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20823,8 +20826,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3990",
-   "self_type" : "type-3989",
+   "referenced_type" : "type-3996",
+   "self_type" : "type-3995",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20832,8 +20835,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-4066",
-   "self_type" : "type-4065",
+   "referenced_type" : "type-4072",
+   "self_type" : "type-4071",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20841,8 +20844,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-4085",
-   "self_type" : "type-4084",
+   "referenced_type" : "type-4091",
+   "self_type" : "type-4090",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20850,8 +20853,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-4398",
-   "self_type" : "type-4397",
+   "referenced_type" : "type-4402",
+   "self_type" : "type-4401",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20859,8 +20862,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-4656",
-   "self_type" : "type-4655",
+   "referenced_type" : "type-4662",
+   "self_type" : "type-4661",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20868,8 +20871,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-4672",
-   "self_type" : "type-4671",
+   "referenced_type" : "type-4678",
+   "self_type" : "type-4677",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20877,8 +20880,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-4935",
-   "self_type" : "type-4934",
+   "referenced_type" : "type-4941",
+   "self_type" : "type-4940",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20886,8 +20889,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5146",
-   "self_type" : "type-5145",
+   "referenced_type" : "type-5163",
+   "self_type" : "type-5162",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20895,8 +20898,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5522",
-   "self_type" : "type-5521",
+   "referenced_type" : "type-5539",
+   "self_type" : "type-5538",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20904,8 +20907,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5561",
-   "self_type" : "type-5560",
+   "referenced_type" : "type-5578",
+   "self_type" : "type-5577",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20913,8 +20916,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5735",
-   "self_type" : "type-5734",
+   "referenced_type" : "type-5752",
+   "self_type" : "type-5751",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20922,8 +20925,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5737",
-   "self_type" : "type-5736",
+   "referenced_type" : "type-5754",
+   "self_type" : "type-5753",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20931,8 +20934,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5913",
-   "self_type" : "type-5912",
+   "referenced_type" : "type-5933",
+   "self_type" : "type-5932",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20940,8 +20943,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6013",
-   "self_type" : "type-6012",
+   "referenced_type" : "type-6033",
+   "self_type" : "type-6032",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20949,8 +20952,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6126",
-   "self_type" : "type-6125",
+   "referenced_type" : "type-6146",
+   "self_type" : "type-6145",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20958,8 +20961,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6158",
-   "self_type" : "type-6157",
+   "referenced_type" : "type-6178",
+   "self_type" : "type-6177",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20967,8 +20970,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6307",
-   "self_type" : "type-6306",
+   "referenced_type" : "type-6328",
+   "self_type" : "type-6327",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20976,8 +20979,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6309",
-   "self_type" : "type-6308",
+   "referenced_type" : "type-6330",
+   "self_type" : "type-6329",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20985,8 +20988,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6437",
-   "self_type" : "type-6436",
+   "referenced_type" : "type-6460",
+   "self_type" : "type-6459",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20994,8 +20997,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6536",
-   "self_type" : "type-6535",
+   "referenced_type" : "type-6559",
+   "self_type" : "type-6558",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21003,8 +21006,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6556",
-   "self_type" : "type-6555",
+   "referenced_type" : "type-6579",
+   "self_type" : "type-6578",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21012,8 +21015,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6578",
-   "self_type" : "type-6577",
+   "referenced_type" : "type-6601",
+   "self_type" : "type-6600",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21021,8 +21024,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6653",
-   "self_type" : "type-6652",
+   "referenced_type" : "type-6677",
+   "self_type" : "type-6676",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21030,8 +21033,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6670",
-   "self_type" : "type-6669",
+   "referenced_type" : "type-6693",
+   "self_type" : "type-6692",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21039,8 +21042,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6998",
-   "self_type" : "type-6997",
+   "referenced_type" : "type-7020",
+   "self_type" : "type-7019",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21048,8 +21051,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-7188",
-   "self_type" : "type-7187",
+   "referenced_type" : "type-7211",
+   "self_type" : "type-7210",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21066,8 +21069,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-7300",
-   "self_type" : "type-7299",
+   "referenced_type" : "type-7325",
+   "self_type" : "type-7324",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21075,8 +21078,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-7313",
-   "self_type" : "type-7312",
+   "referenced_type" : "type-7336",
+   "self_type" : "type-7335",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21084,8 +21087,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-7515",
-   "self_type" : "type-7514",
+   "referenced_type" : "type-7539",
+   "self_type" : "type-7538",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21093,8 +21096,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-7661",
-   "self_type" : "type-7660",
+   "referenced_type" : "type-7685",
+   "self_type" : "type-7684",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21111,8 +21114,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::FileDescriptor::Autoclose *",
    "name" : "android::FileDescriptor::Autoclose *",
-   "referenced_type" : "type-1213",
-   "self_type" : "type-1221",
+   "referenced_type" : "type-1211",
+   "self_type" : "type-1220",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h"
   },
@@ -21121,7 +21124,7 @@
    "linker_set_key" : "android::Flattenable<android::BufferItem> *",
    "name" : "android::Flattenable<android::BufferItem> *",
    "referenced_type" : "type-22",
-   "self_type" : "type-1511",
+   "self_type" : "type-1514",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -21130,7 +21133,7 @@
    "linker_set_key" : "android::Flattenable<android::Fence> *",
    "name" : "android::Flattenable<android::Fence> *",
    "referenced_type" : "type-17",
-   "self_type" : "type-1637",
+   "self_type" : "type-1641",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -21139,7 +21142,7 @@
    "linker_set_key" : "android::Flattenable<android::FrameEventHistoryDelta> *",
    "name" : "android::Flattenable<android::FrameEventHistoryDelta> *",
    "referenced_type" : "type-26",
-   "self_type" : "type-4311",
+   "self_type" : "type-4317",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -21148,7 +21151,7 @@
    "linker_set_key" : "android::Flattenable<android::GraphicBuffer> *",
    "name" : "android::Flattenable<android::GraphicBuffer> *",
    "referenced_type" : "type-15",
-   "self_type" : "type-1641",
+   "self_type" : "type-1646",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -21157,7 +21160,7 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> *",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> *",
    "referenced_type" : "type-33",
-   "self_type" : "type-4314",
+   "self_type" : "type-4320",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -21166,7 +21169,7 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> *",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> *",
    "referenced_type" : "type-35",
-   "self_type" : "type-4317",
+   "self_type" : "type-4323",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -21183,8 +21186,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-1175",
-   "self_type" : "type-1174",
+   "referenced_type" : "type-1178",
+   "self_type" : "type-1177",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21192,8 +21195,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-1469",
-   "self_type" : "type-1468",
+   "referenced_type" : "type-1472",
+   "self_type" : "type-1471",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21201,8 +21204,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-3779",
-   "self_type" : "type-3778",
+   "referenced_type" : "type-3785",
+   "self_type" : "type-3784",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21210,8 +21213,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-3999",
-   "self_type" : "type-3998",
+   "referenced_type" : "type-4005",
+   "self_type" : "type-4004",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21219,8 +21222,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-5854",
-   "self_type" : "type-5853",
+   "referenced_type" : "type-5874",
+   "self_type" : "type-5873",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21228,8 +21231,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-6405",
-   "self_type" : "type-6404",
+   "referenced_type" : "type-6428",
+   "self_type" : "type-6427",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21237,8 +21240,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-6587",
-   "self_type" : "type-6586",
+   "referenced_type" : "type-6610",
+   "self_type" : "type-6609",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21255,8 +21258,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1332",
-   "self_type" : "type-1331",
+   "referenced_type" : "type-1331",
+   "self_type" : "type-1330",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21264,8 +21267,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1417",
-   "self_type" : "type-1416",
+   "referenced_type" : "type-1420",
+   "self_type" : "type-1419",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21273,8 +21276,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1460",
-   "self_type" : "type-1459",
+   "referenced_type" : "type-1464",
+   "self_type" : "type-1463",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21282,8 +21285,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1587",
-   "self_type" : "type-1586",
+   "referenced_type" : "type-1593",
+   "self_type" : "type-1592",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21291,8 +21294,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1609",
-   "self_type" : "type-1608",
+   "referenced_type" : "type-1613",
+   "self_type" : "type-1612",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21300,8 +21303,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3452",
-   "self_type" : "type-3451",
+   "referenced_type" : "type-3455",
+   "self_type" : "type-3454",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21309,8 +21312,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3488",
-   "self_type" : "type-3487",
+   "referenced_type" : "type-3491",
+   "self_type" : "type-3490",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21318,8 +21321,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3599",
-   "self_type" : "type-3598",
+   "referenced_type" : "type-3602",
+   "self_type" : "type-3601",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21327,8 +21330,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3664",
-   "self_type" : "type-3663",
+   "referenced_type" : "type-3667",
+   "self_type" : "type-3666",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21336,8 +21339,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3884",
-   "self_type" : "type-3883",
+   "referenced_type" : "type-3886",
+   "self_type" : "type-3885",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21345,8 +21348,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3945",
-   "self_type" : "type-3944",
+   "referenced_type" : "type-3951",
+   "self_type" : "type-3950",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21354,8 +21357,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3992",
-   "self_type" : "type-3991",
+   "referenced_type" : "type-3998",
+   "self_type" : "type-3997",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21363,8 +21366,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-4068",
-   "self_type" : "type-4067",
+   "referenced_type" : "type-4074",
+   "self_type" : "type-4073",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21372,8 +21375,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-4083",
-   "self_type" : "type-4082",
+   "referenced_type" : "type-4089",
+   "self_type" : "type-4088",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21381,8 +21384,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-4450",
-   "self_type" : "type-4449",
+   "referenced_type" : "type-4456",
+   "self_type" : "type-4455",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21390,8 +21393,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-4550",
-   "self_type" : "type-4549",
+   "referenced_type" : "type-4554",
+   "self_type" : "type-4553",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21399,8 +21402,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-4679",
-   "self_type" : "type-4678",
+   "referenced_type" : "type-4686",
+   "self_type" : "type-4685",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21408,8 +21411,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5148",
-   "self_type" : "type-5147",
+   "referenced_type" : "type-5166",
+   "self_type" : "type-5165",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21417,8 +21420,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5527",
-   "self_type" : "type-5526",
+   "referenced_type" : "type-5544",
+   "self_type" : "type-5543",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21426,8 +21429,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5563",
-   "self_type" : "type-5562",
+   "referenced_type" : "type-5580",
+   "self_type" : "type-5579",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21435,8 +21438,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5674",
-   "self_type" : "type-5673",
+   "referenced_type" : "type-5691",
+   "self_type" : "type-5690",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21444,8 +21447,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5739",
-   "self_type" : "type-5738",
+   "referenced_type" : "type-5756",
+   "self_type" : "type-5755",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21453,8 +21456,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5959",
-   "self_type" : "type-5958",
+   "referenced_type" : "type-5975",
+   "self_type" : "type-5974",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21462,8 +21465,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5986",
-   "self_type" : "type-5985",
+   "referenced_type" : "type-6006",
+   "self_type" : "type-6005",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21471,8 +21474,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6131",
-   "self_type" : "type-6130",
+   "referenced_type" : "type-6151",
+   "self_type" : "type-6150",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21480,8 +21483,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6160",
-   "self_type" : "type-6159",
+   "referenced_type" : "type-6180",
+   "self_type" : "type-6179",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21489,8 +21492,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6259",
-   "self_type" : "type-6258",
+   "referenced_type" : "type-6279",
+   "self_type" : "type-6278",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21498,8 +21501,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6312",
-   "self_type" : "type-6311",
+   "referenced_type" : "type-6332",
+   "self_type" : "type-6331",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21507,8 +21510,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6478",
-   "self_type" : "type-6477",
+   "referenced_type" : "type-6497",
+   "self_type" : "type-6496",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21516,8 +21519,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6538",
-   "self_type" : "type-6537",
+   "referenced_type" : "type-6561",
+   "self_type" : "type-6560",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21525,8 +21528,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6580",
-   "self_type" : "type-6579",
+   "referenced_type" : "type-6603",
+   "self_type" : "type-6602",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21534,8 +21537,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6629",
-   "self_type" : "type-6628",
+   "referenced_type" : "type-6649",
+   "self_type" : "type-6648",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21543,8 +21546,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6655",
-   "self_type" : "type-6654",
+   "referenced_type" : "type-6679",
+   "self_type" : "type-6678",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21552,8 +21555,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6668",
-   "self_type" : "type-6667",
+   "referenced_type" : "type-6691",
+   "self_type" : "type-6690",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21561,8 +21564,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-7056",
-   "self_type" : "type-7055",
+   "referenced_type" : "type-7080",
+   "self_type" : "type-7079",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21579,8 +21582,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-7320",
-   "self_type" : "type-7319",
+   "referenced_type" : "type-7343",
+   "self_type" : "type-7342",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21597,8 +21600,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-7517",
-   "self_type" : "type-7516",
+   "referenced_type" : "type-7541",
+   "self_type" : "type-7540",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21606,8 +21609,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-7664",
-   "self_type" : "type-7663",
+   "referenced_type" : "type-7687",
+   "self_type" : "type-7686",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21633,8 +21636,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1089",
-   "self_type" : "type-1088",
+   "referenced_type" : "type-1092",
+   "self_type" : "type-1091",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21642,8 +21645,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1270",
-   "self_type" : "type-1269",
+   "referenced_type" : "type-1274",
+   "self_type" : "type-1273",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21651,8 +21654,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1413",
-   "self_type" : "type-1412",
+   "referenced_type" : "type-1416",
+   "self_type" : "type-1415",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21660,8 +21663,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1449",
-   "self_type" : "type-1448",
+   "referenced_type" : "type-1452",
+   "self_type" : "type-1451",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21669,8 +21672,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-2176",
-   "self_type" : "type-2175",
+   "referenced_type" : "type-2180",
+   "self_type" : "type-2179",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21678,8 +21681,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3253",
-   "self_type" : "type-3252",
+   "referenced_type" : "type-3256",
+   "self_type" : "type-3255",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21696,8 +21699,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3465",
-   "self_type" : "type-3464",
+   "referenced_type" : "type-3468",
+   "self_type" : "type-3467",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21705,8 +21708,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3532",
-   "self_type" : "type-3531",
+   "referenced_type" : "type-3535",
+   "self_type" : "type-3534",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21714,8 +21717,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3643",
-   "self_type" : "type-3642",
+   "referenced_type" : "type-3646",
+   "self_type" : "type-3645",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21723,8 +21726,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3700",
-   "self_type" : "type-3699",
+   "referenced_type" : "type-3706",
+   "self_type" : "type-3705",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21732,8 +21735,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3824",
-   "self_type" : "type-3823",
+   "referenced_type" : "type-3831",
+   "self_type" : "type-3830",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21741,8 +21744,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3941",
-   "self_type" : "type-3940",
+   "referenced_type" : "type-3947",
+   "self_type" : "type-3946",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21750,8 +21753,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3982",
-   "self_type" : "type-3981",
+   "referenced_type" : "type-3988",
+   "self_type" : "type-3987",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21759,8 +21762,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-4212",
-   "self_type" : "type-4211",
+   "referenced_type" : "type-4219",
+   "self_type" : "type-4218",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21768,8 +21771,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-4391",
-   "self_type" : "type-4390",
+   "referenced_type" : "type-4397",
+   "self_type" : "type-4396",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21777,8 +21780,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-4604",
-   "self_type" : "type-4603",
+   "referenced_type" : "type-4610",
+   "self_type" : "type-4609",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21786,8 +21789,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-4770",
-   "self_type" : "type-4769",
+   "referenced_type" : "type-4778",
+   "self_type" : "type-4777",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21795,8 +21798,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5097",
-   "self_type" : "type-5096",
+   "referenced_type" : "type-5113",
+   "self_type" : "type-5112",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21804,8 +21807,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5165",
-   "self_type" : "type-5164",
+   "referenced_type" : "type-5183",
+   "self_type" : "type-5182",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21813,8 +21816,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5328",
-   "self_type" : "type-5327",
+   "referenced_type" : "type-5345",
+   "self_type" : "type-5344",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21822,8 +21825,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5540",
-   "self_type" : "type-5539",
+   "referenced_type" : "type-5557",
+   "self_type" : "type-5556",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21831,8 +21834,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5607",
-   "self_type" : "type-5606",
+   "referenced_type" : "type-5624",
+   "self_type" : "type-5623",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21840,8 +21843,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5718",
-   "self_type" : "type-5717",
+   "referenced_type" : "type-5735",
+   "self_type" : "type-5734",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21849,8 +21852,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5775",
-   "self_type" : "type-5774",
+   "referenced_type" : "type-5795",
+   "self_type" : "type-5794",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21858,8 +21861,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5899",
-   "self_type" : "type-5898",
+   "referenced_type" : "type-5920",
+   "self_type" : "type-5919",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21867,8 +21870,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6060",
-   "self_type" : "type-6059",
+   "referenced_type" : "type-6080",
+   "self_type" : "type-6079",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21876,8 +21879,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6143",
-   "self_type" : "type-6142",
+   "referenced_type" : "type-6163",
+   "self_type" : "type-6162",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21885,8 +21888,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6195",
-   "self_type" : "type-6194",
+   "referenced_type" : "type-6215",
+   "self_type" : "type-6214",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21894,8 +21897,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6289",
-   "self_type" : "type-6288",
+   "referenced_type" : "type-6309",
+   "self_type" : "type-6308",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21903,8 +21906,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6333",
-   "self_type" : "type-6332",
+   "referenced_type" : "type-6356",
+   "self_type" : "type-6355",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21912,8 +21915,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6428",
-   "self_type" : "type-6427",
+   "referenced_type" : "type-6452",
+   "self_type" : "type-6451",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21921,8 +21924,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6534",
-   "self_type" : "type-6533",
+   "referenced_type" : "type-6557",
+   "self_type" : "type-6556",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21930,8 +21933,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6571",
-   "self_type" : "type-6570",
+   "referenced_type" : "type-6594",
+   "self_type" : "type-6593",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21939,8 +21942,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6818",
-   "self_type" : "type-6817",
+   "referenced_type" : "type-6843",
+   "self_type" : "type-6842",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21948,8 +21951,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6990",
-   "self_type" : "type-6989",
+   "referenced_type" : "type-7015",
+   "self_type" : "type-7014",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21957,8 +21960,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-7242",
-   "self_type" : "type-7241",
+   "referenced_type" : "type-7267",
+   "self_type" : "type-7266",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21966,8 +21969,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-7380",
-   "self_type" : "type-7379",
+   "referenced_type" : "type-7404",
+   "self_type" : "type-7403",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21984,8 +21987,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-7604",
-   "self_type" : "type-7603",
+   "referenced_type" : "type-7627",
+   "self_type" : "type-7626",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -22029,8 +22032,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
    "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-3904",
-   "self_type" : "type-3903",
+   "referenced_type" : "type-3910",
+   "self_type" : "type-3909",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22047,8 +22050,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
    "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-5979",
-   "self_type" : "type-5978",
+   "referenced_type" : "type-5999",
+   "self_type" : "type-5998",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22056,8 +22059,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
    "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-6006",
-   "self_type" : "type-6005",
+   "referenced_type" : "type-6026",
+   "self_type" : "type-6025",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22074,8 +22077,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-4260",
-   "self_type" : "type-4259",
+   "referenced_type" : "type-4266",
+   "self_type" : "type-4265",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22083,8 +22086,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-4269",
-   "self_type" : "type-4268",
+   "referenced_type" : "type-4275",
+   "self_type" : "type-4274",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22092,8 +22095,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-4697",
-   "self_type" : "type-4696",
+   "referenced_type" : "type-4704",
+   "self_type" : "type-4703",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22101,8 +22104,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-6870",
-   "self_type" : "type-6869",
+   "referenced_type" : "type-6893",
+   "self_type" : "type-6892",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22110,8 +22113,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-6876",
-   "self_type" : "type-6875",
+   "referenced_type" : "type-6899",
+   "self_type" : "type-6898",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22119,8 +22122,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-7333",
-   "self_type" : "type-7332",
+   "referenced_type" : "type-7356",
+   "self_type" : "type-7355",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22128,8 +22131,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-7667",
-   "self_type" : "type-7666",
+   "referenced_type" : "type-7690",
+   "self_type" : "type-7689",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22137,8 +22140,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
    "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
-   "referenced_type" : "type-4832",
-   "self_type" : "type-4831",
+   "referenced_type" : "type-4840",
+   "self_type" : "type-4839",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22146,8 +22149,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
    "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
-   "referenced_type" : "type-5113",
-   "self_type" : "type-5112",
+   "referenced_type" : "type-5129",
+   "self_type" : "type-5128",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22155,8 +22158,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
    "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
-   "referenced_type" : "type-7436",
-   "self_type" : "type-7435",
+   "referenced_type" : "type-7459",
+   "self_type" : "type-7458",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22164,8 +22167,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, android::BnGraphicBufferProducer> *",
    "name" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, android::BnGraphicBufferProducer> *",
-   "referenced_type" : "type-4286",
-   "self_type" : "type-4285",
+   "referenced_type" : "type-4292",
+   "self_type" : "type-4291",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22173,8 +22176,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, android::BnGraphicBufferProducer> *",
    "name" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, android::BnGraphicBufferProducer> *",
-   "referenced_type" : "type-4667",
-   "self_type" : "type-4666",
+   "referenced_type" : "type-4674",
+   "self_type" : "type-4673",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22182,8 +22185,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, android::BnGraphicBufferProducer> *",
    "name" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, android::BnGraphicBufferProducer> *",
-   "referenced_type" : "type-6890",
-   "self_type" : "type-6889",
+   "referenced_type" : "type-6913",
+   "self_type" : "type-6912",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22191,8 +22194,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, android::BnGraphicBufferProducer> *",
    "name" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, android::BnGraphicBufferProducer> *",
-   "referenced_type" : "type-7311",
-   "self_type" : "type-7310",
+   "referenced_type" : "type-7334",
+   "self_type" : "type-7333",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22200,8 +22203,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V1_0::IProducerListener, android::BnProducerListener> *",
    "name" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V1_0::IProducerListener, android::BnProducerListener> *",
-   "referenced_type" : "type-4828",
-   "self_type" : "type-4827",
+   "referenced_type" : "type-4834",
+   "self_type" : "type-4833",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22209,8 +22212,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V1_0::IProducerListener, android::BnProducerListener> *",
    "name" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V1_0::IProducerListener, android::BnProducerListener> *",
-   "referenced_type" : "type-7432",
-   "self_type" : "type-7431",
+   "referenced_type" : "type-7456",
+   "self_type" : "type-7455",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22218,8 +22221,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer, android::BnGraphicBufferProducer> *",
    "name" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer, android::BnGraphicBufferProducer> *",
-   "referenced_type" : "type-4288",
-   "self_type" : "type-4287",
+   "referenced_type" : "type-4294",
+   "self_type" : "type-4293",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22227,8 +22230,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer, android::BnGraphicBufferProducer> *",
    "name" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer, android::BnGraphicBufferProducer> *",
-   "referenced_type" : "type-6892",
-   "self_type" : "type-6891",
+   "referenced_type" : "type-6915",
+   "self_type" : "type-6914",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22236,8 +22239,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer, android::BnGraphicBufferProducer> *",
    "name" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer, android::BnGraphicBufferProducer> *",
-   "referenced_type" : "type-7648",
-   "self_type" : "type-7647",
+   "referenced_type" : "type-7672",
+   "self_type" : "type-7671",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22245,8 +22248,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V2_0::IProducerListener, android::BnProducerListener> *",
    "name" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V2_0::IProducerListener, android::BnProducerListener> *",
-   "referenced_type" : "type-5109",
-   "self_type" : "type-5108",
+   "referenced_type" : "type-5125",
+   "self_type" : "type-5124",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22254,8 +22257,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::HpGraphicBufferProducer *",
    "name" : "android::HpGraphicBufferProducer *",
-   "referenced_type" : "type-4249",
-   "self_type" : "type-4248",
+   "referenced_type" : "type-4255",
+   "self_type" : "type-4254",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22263,8 +22266,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::HpGraphicBufferProducer *",
    "name" : "android::HpGraphicBufferProducer *",
-   "referenced_type" : "type-6859",
-   "self_type" : "type-6858",
+   "referenced_type" : "type-6882",
+   "self_type" : "type-6881",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22272,8 +22275,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::HpProducerListener *",
    "name" : "android::HpProducerListener *",
-   "referenced_type" : "type-4524",
-   "self_type" : "type-4523",
+   "referenced_type" : "type-4530",
+   "self_type" : "type-4529",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22281,8 +22284,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::HpProducerListener *",
    "name" : "android::HpProducerListener *",
-   "referenced_type" : "type-7131",
-   "self_type" : "type-7130",
+   "referenced_type" : "type-7156",
+   "self_type" : "type-7155",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22317,8 +22320,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-1155",
-   "self_type" : "type-1154",
+   "referenced_type" : "type-1158",
+   "self_type" : "type-1157",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22326,8 +22329,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-1575",
-   "self_type" : "type-1574",
+   "referenced_type" : "type-1580",
+   "self_type" : "type-1579",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22335,8 +22338,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-1614",
-   "self_type" : "type-1613",
+   "referenced_type" : "type-1618",
+   "self_type" : "type-1617",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22344,8 +22347,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-3500",
-   "self_type" : "type-3499",
+   "referenced_type" : "type-3503",
+   "self_type" : "type-3502",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22353,8 +22356,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-3607",
-   "self_type" : "type-3606",
+   "referenced_type" : "type-3610",
+   "self_type" : "type-3609",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22362,8 +22365,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-3666",
-   "self_type" : "type-3665",
+   "referenced_type" : "type-3669",
+   "self_type" : "type-3668",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22371,8 +22374,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-3759",
-   "self_type" : "type-3758",
+   "referenced_type" : "type-3765",
+   "self_type" : "type-3764",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22380,8 +22383,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-4057",
-   "self_type" : "type-4056",
+   "referenced_type" : "type-4063",
+   "self_type" : "type-4062",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22389,8 +22392,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-4087",
-   "self_type" : "type-4086",
+   "referenced_type" : "type-4093",
+   "self_type" : "type-4092",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22398,8 +22401,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-4948",
-   "self_type" : "type-4947",
+   "referenced_type" : "type-4954",
+   "self_type" : "type-4953",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22407,8 +22410,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-5151",
-   "self_type" : "type-5150",
+   "referenced_type" : "type-5168",
+   "self_type" : "type-5167",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22416,8 +22419,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-5575",
-   "self_type" : "type-5574",
+   "referenced_type" : "type-5592",
+   "self_type" : "type-5591",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22425,8 +22428,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-5682",
-   "self_type" : "type-5681",
+   "referenced_type" : "type-5699",
+   "self_type" : "type-5698",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22434,8 +22437,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-5741",
-   "self_type" : "type-5740",
+   "referenced_type" : "type-5758",
+   "self_type" : "type-5757",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22443,8 +22446,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-5834",
-   "self_type" : "type-5833",
+   "referenced_type" : "type-5854",
+   "self_type" : "type-5853",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22452,8 +22455,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-6020",
-   "self_type" : "type-6019",
+   "referenced_type" : "type-6040",
+   "self_type" : "type-6039",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22461,8 +22464,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-6169",
-   "self_type" : "type-6168",
+   "referenced_type" : "type-6189",
+   "self_type" : "type-6188",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22470,8 +22473,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-6264",
-   "self_type" : "type-6263",
+   "referenced_type" : "type-6284",
+   "self_type" : "type-6283",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22479,8 +22482,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-6314",
-   "self_type" : "type-6313",
+   "referenced_type" : "type-6334",
+   "self_type" : "type-6333",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22488,8 +22491,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-6389",
-   "self_type" : "type-6388",
+   "referenced_type" : "type-6412",
+   "self_type" : "type-6411",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22497,8 +22500,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-6645",
-   "self_type" : "type-6644",
+   "referenced_type" : "type-6668",
+   "self_type" : "type-6667",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22506,8 +22509,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-6672",
-   "self_type" : "type-6671",
+   "referenced_type" : "type-6697",
+   "self_type" : "type-6696",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22515,8 +22518,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-7221",
-   "self_type" : "type-7220",
+   "referenced_type" : "type-7237",
+   "self_type" : "type-7236",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22551,8 +22554,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-1172",
-   "self_type" : "type-1171",
+   "referenced_type" : "type-1175",
+   "self_type" : "type-1174",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22560,8 +22563,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-1466",
-   "self_type" : "type-1465",
+   "referenced_type" : "type-1470",
+   "self_type" : "type-1469",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22569,8 +22572,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-1600",
-   "self_type" : "type-1599",
+   "referenced_type" : "type-1604",
+   "self_type" : "type-1603",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22578,8 +22581,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-3490",
-   "self_type" : "type-3489",
+   "referenced_type" : "type-3493",
+   "self_type" : "type-3492",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22587,8 +22590,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-3777",
-   "self_type" : "type-3776",
+   "referenced_type" : "type-3783",
+   "self_type" : "type-3782",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22596,8 +22599,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-3971",
-   "self_type" : "type-3970",
+   "referenced_type" : "type-3977",
+   "self_type" : "type-3976",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22605,8 +22608,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-3997",
-   "self_type" : "type-3996",
+   "referenced_type" : "type-4003",
+   "self_type" : "type-4002",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22614,8 +22617,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-4075",
-   "self_type" : "type-4074",
+   "referenced_type" : "type-4081",
+   "self_type" : "type-4080",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22623,8 +22626,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-5565",
-   "self_type" : "type-5564",
+   "referenced_type" : "type-5582",
+   "self_type" : "type-5581",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22641,8 +22644,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-5852",
-   "self_type" : "type-5851",
+   "referenced_type" : "type-5872",
+   "self_type" : "type-5871",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22650,8 +22653,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6008",
-   "self_type" : "type-6007",
+   "referenced_type" : "type-6028",
+   "self_type" : "type-6027",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22659,8 +22662,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6044",
-   "self_type" : "type-6043",
+   "referenced_type" : "type-6064",
+   "self_type" : "type-6063",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22668,8 +22671,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6162",
-   "self_type" : "type-6161",
+   "referenced_type" : "type-6182",
+   "self_type" : "type-6181",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22677,8 +22680,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6403",
-   "self_type" : "type-6402",
+   "referenced_type" : "type-6426",
+   "self_type" : "type-6425",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22686,8 +22689,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6585",
-   "self_type" : "type-6584",
+   "referenced_type" : "type-6608",
+   "self_type" : "type-6607",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22695,8 +22698,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6660",
-   "self_type" : "type-6659",
+   "referenced_type" : "type-6683",
+   "self_type" : "type-6682",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22713,8 +22716,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-3502",
-   "self_type" : "type-3501",
+   "referenced_type" : "type-3505",
+   "self_type" : "type-3504",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22722,8 +22725,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-3963",
-   "self_type" : "type-3962",
+   "referenced_type" : "type-3964",
+   "self_type" : "type-3963",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22731,8 +22734,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-4228",
-   "self_type" : "type-4227",
+   "referenced_type" : "type-4234",
+   "self_type" : "type-4233",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22740,8 +22743,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-5577",
-   "self_type" : "type-5576",
+   "referenced_type" : "type-5594",
+   "self_type" : "type-5593",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22758,8 +22761,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-6003",
-   "self_type" : "type-6002",
+   "referenced_type" : "type-6024",
+   "self_type" : "type-6023",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22767,8 +22770,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-6039",
-   "self_type" : "type-6038",
+   "referenced_type" : "type-6059",
+   "self_type" : "type-6058",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22776,8 +22779,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-6171",
-   "self_type" : "type-6170",
+   "referenced_type" : "type-6191",
+   "self_type" : "type-6190",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22785,8 +22788,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-6844",
-   "self_type" : "type-6843",
+   "referenced_type" : "type-6867",
+   "self_type" : "type-6866",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22794,8 +22797,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-7520",
-   "self_type" : "type-7519",
+   "referenced_type" : "type-7544",
+   "self_type" : "type-7543",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22821,8 +22824,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1265",
-   "self_type" : "type-1264",
+   "referenced_type" : "type-1268",
+   "self_type" : "type-1267",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -22830,8 +22833,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1370",
-   "self_type" : "type-1369",
+   "referenced_type" : "type-1373",
+   "self_type" : "type-1372",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -22839,8 +22842,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-3819",
-   "self_type" : "type-3818",
+   "referenced_type" : "type-3826",
+   "self_type" : "type-3825",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -22848,8 +22851,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-3916",
-   "self_type" : "type-3915",
+   "referenced_type" : "type-3922",
+   "self_type" : "type-3921",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -22857,8 +22860,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-5894",
-   "self_type" : "type-5893",
+   "referenced_type" : "type-5915",
+   "self_type" : "type-5914",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -22866,8 +22869,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-6422",
-   "self_type" : "type-6421",
+   "referenced_type" : "type-6445",
+   "self_type" : "type-6444",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -22875,8 +22878,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-6508",
-   "self_type" : "type-6507",
+   "referenced_type" : "type-6531",
+   "self_type" : "type-6530",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -22893,8 +22896,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-1160",
-   "self_type" : "type-1159",
+   "referenced_type" : "type-1163",
+   "self_type" : "type-1162",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22902,8 +22905,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-3510",
-   "self_type" : "type-3509",
+   "referenced_type" : "type-3513",
+   "self_type" : "type-3512",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22911,8 +22914,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-3620",
-   "self_type" : "type-3619",
+   "referenced_type" : "type-3623",
+   "self_type" : "type-3622",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22920,8 +22923,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-3668",
-   "self_type" : "type-3667",
+   "referenced_type" : "type-3671",
+   "self_type" : "type-3670",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22929,8 +22932,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-3764",
-   "self_type" : "type-3763",
+   "referenced_type" : "type-3772",
+   "self_type" : "type-3771",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22938,8 +22941,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-4254",
-   "self_type" : "type-4253",
+   "referenced_type" : "type-4260",
+   "self_type" : "type-4259",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22947,8 +22950,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-4518",
-   "self_type" : "type-4517",
+   "referenced_type" : "type-4524",
+   "self_type" : "type-4523",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22956,8 +22959,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-4561",
-   "self_type" : "type-4560",
+   "referenced_type" : "type-4567",
+   "self_type" : "type-4566",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22965,8 +22968,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-4691",
-   "self_type" : "type-4690",
+   "referenced_type" : "type-4698",
+   "self_type" : "type-4697",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22974,8 +22977,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-4953",
-   "self_type" : "type-4952",
+   "referenced_type" : "type-4959",
+   "self_type" : "type-4958",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22983,8 +22986,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-5153",
-   "self_type" : "type-5152",
+   "referenced_type" : "type-5171",
+   "self_type" : "type-5170",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22992,8 +22995,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-5585",
-   "self_type" : "type-5584",
+   "referenced_type" : "type-5602",
+   "self_type" : "type-5601",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23001,8 +23004,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-5695",
-   "self_type" : "type-5694",
+   "referenced_type" : "type-5712",
+   "self_type" : "type-5711",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23010,8 +23013,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-5743",
-   "self_type" : "type-5742",
+   "referenced_type" : "type-5760",
+   "self_type" : "type-5759",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23019,8 +23022,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-5839",
-   "self_type" : "type-5838",
+   "referenced_type" : "type-5861",
+   "self_type" : "type-5860",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23028,8 +23031,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6024",
-   "self_type" : "type-6023",
+   "referenced_type" : "type-6044",
+   "self_type" : "type-6043",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23037,8 +23040,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6178",
-   "self_type" : "type-6177",
+   "referenced_type" : "type-6198",
+   "self_type" : "type-6197",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23046,8 +23049,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6272",
-   "self_type" : "type-6271",
+   "referenced_type" : "type-6292",
+   "self_type" : "type-6291",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23055,8 +23058,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6316",
-   "self_type" : "type-6315",
+   "referenced_type" : "type-6336",
+   "self_type" : "type-6335",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23064,8 +23067,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6394",
-   "self_type" : "type-6393",
+   "referenced_type" : "type-6417",
+   "self_type" : "type-6416",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23073,8 +23076,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6864",
-   "self_type" : "type-6863",
+   "referenced_type" : "type-6887",
+   "self_type" : "type-6886",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23082,8 +23085,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7124",
-   "self_type" : "type-7123",
+   "referenced_type" : "type-7149",
+   "self_type" : "type-7148",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23091,8 +23094,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7184",
-   "self_type" : "type-7183",
+   "referenced_type" : "type-7207",
+   "self_type" : "type-7206",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23100,8 +23103,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7244",
-   "self_type" : "type-7243",
+   "referenced_type" : "type-7262",
+   "self_type" : "type-7261",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23109,8 +23112,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7328",
-   "self_type" : "type-7327",
+   "referenced_type" : "type-7351",
+   "self_type" : "type-7350",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23118,8 +23121,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7502",
-   "self_type" : "type-7501",
+   "referenced_type" : "type-7525",
+   "self_type" : "type-7524",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23127,8 +23130,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7509",
-   "self_type" : "type-7508",
+   "referenced_type" : "type-7534",
+   "self_type" : "type-7533",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23136,8 +23139,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7637",
-   "self_type" : "type-7636",
+   "referenced_type" : "type-7661",
+   "self_type" : "type-7660",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23145,8 +23148,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7659",
-   "self_type" : "type-7658",
+   "referenced_type" : "type-7682",
+   "self_type" : "type-7681",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23181,8 +23184,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ISurfaceComposer *",
    "name" : "android::ISurfaceComposer *",
-   "referenced_type" : "type-1051",
-   "self_type" : "type-1050",
+   "referenced_type" : "type-1054",
+   "self_type" : "type-1053",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23190,8 +23193,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ISurfaceComposer *",
    "name" : "android::ISurfaceComposer *",
-   "referenced_type" : "type-3679",
-   "self_type" : "type-3678",
+   "referenced_type" : "type-3685",
+   "self_type" : "type-3684",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23199,8 +23202,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ISurfaceComposer *",
    "name" : "android::ISurfaceComposer *",
-   "referenced_type" : "type-5754",
-   "self_type" : "type-5753",
+   "referenced_type" : "type-5774",
+   "self_type" : "type-5773",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23208,8 +23211,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ISurfaceComposer *",
    "name" : "android::ISurfaceComposer *",
-   "referenced_type" : "type-6320",
-   "self_type" : "type-6319",
+   "referenced_type" : "type-6343",
+   "self_type" : "type-6342",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23217,8 +23220,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ITransactionCompletedListener *",
    "name" : "android::ITransactionCompletedListener *",
-   "referenced_type" : "type-1043",
-   "self_type" : "type-1042",
+   "referenced_type" : "type-1047",
+   "self_type" : "type-1046",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23226,8 +23229,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ITransactionCompletedListener *",
    "name" : "android::ITransactionCompletedListener *",
-   "referenced_type" : "type-3674",
-   "self_type" : "type-3673",
+   "referenced_type" : "type-3680",
+   "self_type" : "type-3679",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23235,8 +23238,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ITransactionCompletedListener *",
    "name" : "android::ITransactionCompletedListener *",
-   "referenced_type" : "type-5749",
-   "self_type" : "type-5748",
+   "referenced_type" : "type-5769",
+   "self_type" : "type-5768",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23244,8 +23247,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ITransactionCompletedListener *",
    "name" : "android::ITransactionCompletedListener *",
-   "referenced_type" : "type-6318",
-   "self_type" : "type-6317",
+   "referenced_type" : "type-6341",
+   "self_type" : "type-6340",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23280,8 +23283,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::LWProducerListener *",
    "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-2541",
-   "self_type" : "type-2540",
+   "referenced_type" : "type-2544",
+   "self_type" : "type-2543",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23289,8 +23292,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::LWProducerListener *",
    "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-4956",
-   "self_type" : "type-4955",
+   "referenced_type" : "type-4962",
+   "self_type" : "type-4961",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23298,8 +23301,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::LWProducerListener *",
    "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-6026",
-   "self_type" : "type-6025",
+   "referenced_type" : "type-6046",
+   "self_type" : "type-6045",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23307,8 +23310,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::LWProducerListener *",
    "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-7270",
-   "self_type" : "type-7269",
+   "referenced_type" : "type-7282",
+   "self_type" : "type-7281",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23317,7 +23320,7 @@
    "linker_set_key" : "android::LightFlattenablePod<android::Rect> *",
    "name" : "android::LightFlattenablePod<android::Rect> *",
    "referenced_type" : "type-48",
-   "self_type" : "type-4592",
+   "self_type" : "type-4599",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -23361,8 +23364,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::List<Event>::_Node *",
    "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-3689",
-   "self_type" : "type-3688",
+   "referenced_type" : "type-3695",
+   "self_type" : "type-3694",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -23370,8 +23373,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::List<Event>::_Node *",
    "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-5764",
-   "self_type" : "type-5763",
+   "referenced_type" : "type-5784",
+   "self_type" : "type-5783",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -23379,8 +23382,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::List<Event>::_Node *",
    "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-6055",
-   "self_type" : "type-6054",
+   "referenced_type" : "type-6076",
+   "self_type" : "type-6075",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -23496,8 +23499,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::OMXPluginBase *",
    "name" : "android::OMXPluginBase *",
-   "referenced_type" : "type-2395",
-   "self_type" : "type-2396",
+   "referenced_type" : "type-2398",
+   "self_type" : "type-2399",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h"
   },
@@ -23514,8 +23517,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Parcel::FlattenableHelper<android::BufferItem> *",
    "name" : "android::Parcel::FlattenableHelper<android::BufferItem> *",
-   "referenced_type" : "type-1517",
-   "self_type" : "type-1519",
+   "referenced_type" : "type-1520",
+   "self_type" : "type-1523",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -23523,8 +23526,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Parcel::FlattenableHelper<android::Fence> *",
    "name" : "android::Parcel::FlattenableHelper<android::Fence> *",
-   "referenced_type" : "type-1659",
-   "self_type" : "type-1661",
+   "referenced_type" : "type-1663",
+   "self_type" : "type-1665",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -23532,8 +23535,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta> *",
    "name" : "android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta> *",
-   "referenced_type" : "type-4331",
-   "self_type" : "type-4333",
+   "referenced_type" : "type-4337",
+   "self_type" : "type-4339",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -23541,8 +23544,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Parcel::FlattenableHelper<android::GraphicBuffer> *",
    "name" : "android::Parcel::FlattenableHelper<android::GraphicBuffer> *",
-   "referenced_type" : "type-1654",
-   "self_type" : "type-1656",
+   "referenced_type" : "type-1658",
+   "self_type" : "type-1660",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -23550,8 +23553,8 @@
    "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",
+   "referenced_type" : "type-4343",
+   "self_type" : "type-4345",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -23559,8 +23562,8 @@
    "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",
+   "referenced_type" : "type-4348",
+   "self_type" : "type-4350",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -23604,8 +23607,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ProcessState *",
    "name" : "android::ProcessState *",
-   "referenced_type" : "type-1261",
-   "self_type" : "type-1260",
+   "referenced_type" : "type-1264",
+   "self_type" : "type-1263",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23649,8 +23652,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1080",
-   "self_type" : "type-1079",
+   "referenced_type" : "type-1083",
+   "self_type" : "type-1082",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23658,8 +23661,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1191",
-   "self_type" : "type-1190",
+   "referenced_type" : "type-1194",
+   "self_type" : "type-1193",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23667,8 +23670,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1353",
-   "self_type" : "type-1352",
+   "referenced_type" : "type-1356",
+   "self_type" : "type-1355",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23676,8 +23679,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1405",
-   "self_type" : "type-1404",
+   "referenced_type" : "type-1408",
+   "self_type" : "type-1407",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23685,8 +23688,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1420",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1423",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23694,8 +23697,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1442",
-   "self_type" : "type-1441",
+   "referenced_type" : "type-1445",
+   "self_type" : "type-1444",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23703,8 +23706,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1483",
-   "self_type" : "type-1482",
+   "referenced_type" : "type-1486",
+   "self_type" : "type-1485",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23712,8 +23715,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1617",
-   "self_type" : "type-1616",
+   "referenced_type" : "type-1621",
+   "self_type" : "type-1620",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23721,8 +23724,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2651",
-   "self_type" : "type-2650",
+   "referenced_type" : "type-2654",
+   "self_type" : "type-2653",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23730,8 +23733,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3459",
-   "self_type" : "type-3458",
+   "referenced_type" : "type-3462",
+   "self_type" : "type-3461",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23739,8 +23742,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3527",
-   "self_type" : "type-3526",
+   "referenced_type" : "type-3530",
+   "self_type" : "type-3529",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23748,8 +23751,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3629",
-   "self_type" : "type-3628",
+   "referenced_type" : "type-3632",
+   "self_type" : "type-3631",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23757,8 +23760,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3691",
-   "self_type" : "type-3690",
+   "referenced_type" : "type-3697",
+   "self_type" : "type-3696",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23766,8 +23769,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3783",
-   "self_type" : "type-3782",
+   "referenced_type" : "type-3789",
+   "self_type" : "type-3788",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23775,8 +23778,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3844",
-   "self_type" : "type-3843",
+   "referenced_type" : "type-3848",
+   "self_type" : "type-3847",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23784,8 +23787,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3908",
-   "self_type" : "type-3907",
+   "referenced_type" : "type-3914",
+   "self_type" : "type-3913",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23793,8 +23796,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3934",
-   "self_type" : "type-3933",
+   "referenced_type" : "type-3940",
+   "self_type" : "type-3939",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23802,8 +23805,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3949",
-   "self_type" : "type-3948",
+   "referenced_type" : "type-3955",
+   "self_type" : "type-3954",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23811,8 +23814,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3975",
-   "self_type" : "type-3974",
+   "referenced_type" : "type-3981",
+   "self_type" : "type-3980",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23820,8 +23823,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4008",
-   "self_type" : "type-4007",
+   "referenced_type" : "type-4014",
+   "self_type" : "type-4013",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23829,8 +23832,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4089",
-   "self_type" : "type-4088",
+   "referenced_type" : "type-4095",
+   "self_type" : "type-4094",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23838,8 +23841,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4290",
-   "self_type" : "type-4289",
+   "referenced_type" : "type-4296",
+   "self_type" : "type-4295",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23847,8 +23850,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4477",
-   "self_type" : "type-4476",
+   "referenced_type" : "type-4483",
+   "self_type" : "type-4482",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23856,8 +23859,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4530",
-   "self_type" : "type-4529",
+   "referenced_type" : "type-4536",
+   "self_type" : "type-4535",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23865,8 +23868,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4538",
-   "self_type" : "type-4537",
+   "referenced_type" : "type-4545",
+   "self_type" : "type-4544",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23874,8 +23877,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4564",
-   "self_type" : "type-4563",
+   "referenced_type" : "type-4570",
+   "self_type" : "type-4569",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23883,8 +23886,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4715",
-   "self_type" : "type-4714",
+   "referenced_type" : "type-4722",
+   "self_type" : "type-4721",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23892,8 +23895,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4845",
-   "self_type" : "type-4844",
+   "referenced_type" : "type-4854",
+   "self_type" : "type-4853",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23901,8 +23904,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4994",
-   "self_type" : "type-4993",
+   "referenced_type" : "type-5000",
+   "self_type" : "type-4999",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23910,8 +23913,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5121",
-   "self_type" : "type-5120",
+   "referenced_type" : "type-5137",
+   "self_type" : "type-5136",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23919,8 +23922,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5160",
-   "self_type" : "type-5159",
+   "referenced_type" : "type-5176",
+   "self_type" : "type-5175",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23928,8 +23931,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5534",
-   "self_type" : "type-5533",
+   "referenced_type" : "type-5551",
+   "self_type" : "type-5550",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23937,8 +23940,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5602",
-   "self_type" : "type-5601",
+   "referenced_type" : "type-5619",
+   "self_type" : "type-5618",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23955,8 +23958,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5704",
-   "self_type" : "type-5703",
+   "referenced_type" : "type-5721",
+   "self_type" : "type-5720",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23964,8 +23967,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5766",
-   "self_type" : "type-5765",
+   "referenced_type" : "type-5786",
+   "self_type" : "type-5785",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23973,8 +23976,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5858",
-   "self_type" : "type-5857",
+   "referenced_type" : "type-5878",
+   "self_type" : "type-5877",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23982,8 +23985,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5919",
-   "self_type" : "type-5918",
+   "referenced_type" : "type-5937",
+   "self_type" : "type-5936",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23991,8 +23994,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5981",
-   "self_type" : "type-5980",
+   "referenced_type" : "type-6001",
+   "self_type" : "type-6000",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24000,8 +24003,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6041",
-   "self_type" : "type-6040",
+   "referenced_type" : "type-6061",
+   "self_type" : "type-6060",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24009,8 +24012,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6137",
-   "self_type" : "type-6136",
+   "referenced_type" : "type-6157",
+   "self_type" : "type-6156",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24018,8 +24021,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6189",
-   "self_type" : "type-6188",
+   "referenced_type" : "type-6209",
+   "self_type" : "type-6208",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24027,8 +24030,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6278",
-   "self_type" : "type-6277",
+   "referenced_type" : "type-6298",
+   "self_type" : "type-6297",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24036,8 +24039,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6327",
-   "self_type" : "type-6326",
+   "referenced_type" : "type-6350",
+   "self_type" : "type-6349",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24045,8 +24048,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6407",
-   "self_type" : "type-6406",
+   "referenced_type" : "type-6430",
+   "self_type" : "type-6429",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24054,8 +24057,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6500",
-   "self_type" : "type-6499",
+   "referenced_type" : "type-6523",
+   "self_type" : "type-6522",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24063,8 +24066,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6526",
-   "self_type" : "type-6525",
+   "referenced_type" : "type-6549",
+   "self_type" : "type-6548",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24072,8 +24075,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6542",
-   "self_type" : "type-6541",
+   "referenced_type" : "type-6566",
+   "self_type" : "type-6565",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24081,8 +24084,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6564",
-   "self_type" : "type-6563",
+   "referenced_type" : "type-6587",
+   "self_type" : "type-6586",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24090,8 +24093,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6596",
-   "self_type" : "type-6595",
+   "referenced_type" : "type-6619",
+   "self_type" : "type-6618",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24099,8 +24102,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6674",
-   "self_type" : "type-6673",
+   "referenced_type" : "type-6699",
+   "self_type" : "type-6698",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24108,8 +24111,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6894",
-   "self_type" : "type-6893",
+   "referenced_type" : "type-6917",
+   "self_type" : "type-6916",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24117,8 +24120,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7078",
-   "self_type" : "type-7077",
+   "referenced_type" : "type-7102",
+   "self_type" : "type-7101",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24126,8 +24129,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7140",
-   "self_type" : "type-7139",
+   "referenced_type" : "type-7165",
+   "self_type" : "type-7164",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24135,8 +24138,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7155",
-   "self_type" : "type-7154",
+   "referenced_type" : "type-7180",
+   "self_type" : "type-7179",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24144,8 +24147,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7192",
-   "self_type" : "type-7191",
+   "referenced_type" : "type-7216",
+   "self_type" : "type-7215",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24153,8 +24156,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7341",
-   "self_type" : "type-7340",
+   "referenced_type" : "type-7365",
+   "self_type" : "type-7364",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24171,8 +24174,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7443",
-   "self_type" : "type-7442",
+   "referenced_type" : "type-7466",
+   "self_type" : "type-7465",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24180,8 +24183,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7479",
-   "self_type" : "type-7478",
+   "referenced_type" : "type-7503",
+   "self_type" : "type-7502",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24189,8 +24192,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7534",
-   "self_type" : "type-7533",
+   "referenced_type" : "type-7557",
+   "self_type" : "type-7556",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24198,8 +24201,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7585",
-   "self_type" : "type-7584",
+   "referenced_type" : "type-7605",
+   "self_type" : "type-7604",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24207,8 +24210,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7614",
-   "self_type" : "type-7613",
+   "referenced_type" : "type-7637",
+   "self_type" : "type-7636",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24216,8 +24219,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7677",
-   "self_type" : "type-7676",
+   "referenced_type" : "type-7702",
+   "self_type" : "type-7701",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24252,8 +24255,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ReferenceRenamer *",
    "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-1166",
-   "self_type" : "type-1212",
+   "referenced_type" : "type-1167",
+   "self_type" : "type-1210",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24261,8 +24264,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> > *",
    "name" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> > *",
-   "referenced_type" : "type-1563",
-   "self_type" : "type-1565",
+   "referenced_type" : "type-1567",
+   "self_type" : "type-1568",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24270,8 +24273,8 @@
    "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",
+   "referenced_type" : "type-1573",
+   "self_type" : "type-1574",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24279,132 +24282,6 @@
    "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,
@@ -24412,10 +24289,136 @@
   },
   {
    "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-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<android_dataspace_t> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<android_dataspace_t> > *",
+   "referenced_type" : "type-2092",
+   "self_type" : "type-2095",
+   "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-2113",
+   "self_type" : "type-2114",
+   "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-2100",
+   "self_type" : "type-2101",
+   "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-2118",
+   "self_type" : "type-2119",
+   "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-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<const sp<IConsumerListener> &, bool> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const sp<IConsumerListener> &, bool> > *",
+   "referenced_type" : "type-2070",
+   "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<int *, const sp<GraphicBuffer> &> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int *, const sp<GraphicBuffer> &> > *",
+   "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, unsigned long, const sp<Fence> &> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int, unsigned long, const sp<Fence> &> > *",
+   "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> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int> > *",
+   "referenced_type" : "type-2057",
+   "self_type" : "type-2058",
+   "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-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<unsigned int, unsigned int> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned int, unsigned int> > *",
+   "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<unsigned int> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned int> > *",
+   "referenced_type" : "type-2104",
+   "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 long *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long *> > *",
+   "referenced_type" : "type-2079",
+   "self_type" : "type-2080",
+   "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",
+   "referenced_type" : "type-2098",
+   "self_type" : "type-2099",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24423,114 +24426,6 @@
    "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,
@@ -24538,10 +24433,118 @@
   },
   {
    "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-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<android_dataspace_t> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<android_dataspace_t> > *",
+   "referenced_type" : "type-2159",
+   "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<bool, vector<Segment, allocator<Segment> > *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool, vector<Segment, allocator<Segment> > *> > *",
+   "referenced_type" : "type-2171",
+   "self_type" : "type-2172",
+   "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-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<const String8 &, String8 *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &, String8 *> > *",
+   "referenced_type" : "type-2173",
+   "self_type" : "type-2174",
+   "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-2157",
+   "self_type" : "type-2158",
+   "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-2148",
+   "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<int *, const sp<GraphicBuffer> &> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int *, const sp<GraphicBuffer> &> > *",
+   "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, unsigned long, const sp<Fence> &> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int, unsigned long, const sp<Fence> &> > *",
+   "referenced_type" : "type-2146",
+   "self_type" : "type-2147",
+   "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-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<sp<NativeHandle> *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<sp<NativeHandle> *> > *",
+   "referenced_type" : "type-2168",
+   "self_type" : "type-2169",
+   "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-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<unsigned int> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned int> > *",
-   "referenced_type" : "type-2162",
-   "self_type" : "type-2163",
+   "referenced_type" : "type-2166",
+   "self_type" : "type-2167",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24549,8 +24552,8 @@
    "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",
+   "referenced_type" : "type-2153",
+   "self_type" : "type-2154",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24558,8 +24561,8 @@
    "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",
+   "referenced_type" : "type-2162",
+   "self_type" : "type-2163",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24567,8 +24570,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<android::IConsumerListener> *",
    "name" : "android::SafeBnInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-1288",
-   "self_type" : "type-1293",
+   "referenced_type" : "type-1291",
+   "self_type" : "type-1296",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24576,8 +24579,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
    "name" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-1280",
-   "self_type" : "type-1287",
+   "referenced_type" : "type-1283",
+   "self_type" : "type-1290",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24585,8 +24588,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<android::ITransactionCompletedListener> *",
    "name" : "android::SafeBnInterface<android::ITransactionCompletedListener> *",
-   "referenced_type" : "type-1103",
-   "self_type" : "type-1106",
+   "referenced_type" : "type-1106",
+   "self_type" : "type-1109",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24594,8 +24597,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBpInterface<android::IConsumerListener> *",
    "name" : "android::SafeBpInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-1538",
-   "self_type" : "type-1540",
+   "referenced_type" : "type-1542",
+   "self_type" : "type-1544",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24603,8 +24606,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBpInterface<android::IGraphicBufferConsumer> *",
    "name" : "android::SafeBpInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-1718",
-   "self_type" : "type-1720",
+   "referenced_type" : "type-1722",
+   "self_type" : "type-1724",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24612,8 +24615,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeInterface::ParcelHandler *",
    "name" : "android::SafeInterface::ParcelHandler *",
-   "referenced_type" : "type-1236",
-   "self_type" : "type-1254",
+   "referenced_type" : "type-1239",
+   "self_type" : "type-1252",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24631,7 +24634,7 @@
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > > *",
    "name" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > > *",
    "referenced_type" : "type-163",
-   "self_type" : "type-2676",
+   "self_type" : "type-2679",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -24640,7 +24643,7 @@
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > > *",
    "name" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > > *",
    "referenced_type" : "type-149",
-   "self_type" : "type-2671",
+   "self_type" : "type-2674",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -24649,7 +24652,7 @@
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
    "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
    "referenced_type" : "type-141",
-   "self_type" : "type-2668",
+   "self_type" : "type-2671",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -24657,8 +24660,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::String16 *",
    "name" : "android::String16 *",
-   "referenced_type" : "type-1240",
-   "self_type" : "type-2663",
+   "referenced_type" : "type-1243",
+   "self_type" : "type-2666",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -24667,7 +24670,7 @@
    "linker_set_key" : "android::String8 *",
    "name" : "android::String8 *",
    "referenced_type" : "type-123",
-   "self_type" : "type-1887",
+   "self_type" : "type-1891",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -24675,8 +24678,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
    "name" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
-   "referenced_type" : "type-2469",
-   "self_type" : "type-2468",
+   "referenced_type" : "type-2472",
+   "self_type" : "type-2471",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24684,8 +24687,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
    "name" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
-   "referenced_type" : "type-4892",
-   "self_type" : "type-4891",
+   "referenced_type" : "type-4898",
+   "self_type" : "type-4897",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24693,8 +24696,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
    "name" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
-   "referenced_type" : "type-5999",
-   "self_type" : "type-5998",
+   "referenced_type" : "type-6019",
+   "self_type" : "type-6018",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24702,8 +24705,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
    "name" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
-   "referenced_type" : "type-7044",
-   "self_type" : "type-7043",
+   "referenced_type" : "type-7056",
+   "self_type" : "type-7055",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24721,7 +24724,7 @@
    "linker_set_key" : "android::Vector<android::BufferItem> *",
    "name" : "android::Vector<android::BufferItem> *",
    "referenced_type" : "type-838",
-   "self_type" : "type-977",
+   "self_type" : "type-979",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -24729,8 +24732,8 @@
    "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",
+   "referenced_type" : "type-1229",
+   "self_type" : "type-1230",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -24738,8 +24741,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Vector<int> *",
    "name" : "android::Vector<int> *",
-   "referenced_type" : "type-2688",
-   "self_type" : "type-2689",
+   "referenced_type" : "type-2691",
+   "self_type" : "type-2692",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -24747,8 +24750,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Vector<long> *",
    "name" : "android::Vector<long> *",
-   "referenced_type" : "type-1082",
-   "self_type" : "type-1083",
+   "referenced_type" : "type-1085",
+   "self_type" : "type-1086",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -24756,8 +24759,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::VirtualLightRefBase *",
    "name" : "android::VirtualLightRefBase *",
-   "referenced_type" : "type-2355",
-   "self_type" : "type-2394",
+   "referenced_type" : "type-2358",
+   "self_type" : "type-2397",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -24765,8 +24768,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::base::EagerEvaluator<char *, char *> *",
    "name" : "android::base::EagerEvaluator<char *, char *> *",
-   "referenced_type" : "type-4702",
-   "self_type" : "type-4705",
+   "referenced_type" : "type-4709",
+   "self_type" : "type-4712",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24774,8 +24777,8 @@
    "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",
+   "referenced_type" : "type-4705",
+   "self_type" : "type-4706",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24783,8 +24786,8 @@
    "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",
+   "referenced_type" : "type-4692",
+   "self_type" : "type-4696",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24792,8 +24795,8 @@
    "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",
+   "referenced_type" : "type-4676",
+   "self_type" : "type-4690",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24801,8 +24804,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::base::EagerEvaluator<const signed char *, const signed char *> *",
    "name" : "android::base::EagerEvaluator<const signed char *, const signed char *> *",
-   "referenced_type" : "type-4726",
-   "self_type" : "type-4731",
+   "referenced_type" : "type-4732",
+   "self_type" : "type-4738",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24810,8 +24813,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::base::EagerEvaluator<const signed char *, signed char *> *",
    "name" : "android::base::EagerEvaluator<const signed char *, signed char *> *",
-   "referenced_type" : "type-4733",
-   "self_type" : "type-4735",
+   "referenced_type" : "type-4739",
+   "self_type" : "type-4742",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24819,8 +24822,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::base::EagerEvaluator<const unsigned char *, const unsigned char *> *",
    "name" : "android::base::EagerEvaluator<const unsigned char *, const unsigned char *> *",
-   "referenced_type" : "type-4706",
-   "self_type" : "type-4709",
+   "referenced_type" : "type-4713",
+   "self_type" : "type-4715",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24828,8 +24831,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *> *",
    "name" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *> *",
-   "referenced_type" : "type-4710",
-   "self_type" : "type-4711",
+   "referenced_type" : "type-4716",
+   "self_type" : "type-4718",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24837,15 +24840,6 @@
    "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,
@@ -24853,10 +24847,19 @@
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::base::EagerEvaluator<signed char *, signed char *> *",
+   "name" : "android::base::EagerEvaluator<signed char *, signed char *> *",
+   "referenced_type" : "type-4751",
+   "self_type" : "type-4756",
+   "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",
+   "referenced_type" : "type-4720",
+   "self_type" : "type-4724",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24864,8 +24867,8 @@
    "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",
+   "referenced_type" : "type-4725",
+   "self_type" : "type-4730",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24873,8 +24876,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::base::ErrnoRestorer *",
    "name" : "android::base::ErrnoRestorer *",
-   "referenced_type" : "type-4660",
-   "self_type" : "type-4825",
+   "referenced_type" : "type-4667",
+   "self_type" : "type-4832",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24882,8 +24885,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
    "name" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
-   "referenced_type" : "type-2555",
-   "self_type" : "type-2567",
+   "referenced_type" : "type-2558",
+   "self_type" : "type-2570",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -24900,8 +24903,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1363",
-   "self_type" : "type-1362",
+   "referenced_type" : "type-1366",
+   "self_type" : "type-1365",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24918,8 +24921,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1360",
-   "self_type" : "type-1359",
+   "referenced_type" : "type-1363",
+   "self_type" : "type-1362",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24927,8 +24930,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1378",
-   "self_type" : "type-1382",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1385",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -24936,8 +24939,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1396",
+   "referenced_type" : "type-1400",
+   "self_type" : "type-1399",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24945,8 +24948,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::bufferqueue::V2_0::Status> *",
    "name" : "android::hardware::Return<android::hardware::graphics::bufferqueue::V2_0::Status> *",
-   "referenced_type" : "type-7522",
-   "self_type" : "type-7523",
+   "referenced_type" : "type-7547",
+   "self_type" : "type-7548",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24954,24 +24957,6 @@
    "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,
@@ -24979,8 +24964,8 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> > *",
-   "name" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> > *",
+   "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-4497",
    "self_type" : "type-4498",
    "size" : 8,
@@ -24988,10 +24973,28 @@
   },
   {
    "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-4374",
+   "self_type" : "type-4375",
+   "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-4503",
+   "self_type" : "type-4504",
+   "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-4356",
-   "self_type" : "type-4357",
+   "referenced_type" : "type-4362",
+   "self_type" : "type-4363",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -25008,8 +25011,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<unsigned long> *",
    "name" : "android::hardware::Return<unsigned long> *",
-   "referenced_type" : "type-7526",
-   "self_type" : "type-7527",
+   "referenced_type" : "type-7551",
+   "self_type" : "type-7552",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -25072,7 +25075,7 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> > *",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> > *",
    "referenced_type" : "type-382",
-   "self_type" : "type-7640",
+   "self_type" : "type-7664",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -25081,7 +25084,7 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect> *",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect> *",
    "referenced_type" : "type-373",
-   "self_type" : "type-4598",
+   "self_type" : "type-4605",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -25090,7 +25093,7 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char> *",
    "name" : "android::hardware::details::hidl_pointer<unsigned char> *",
    "referenced_type" : "type-391",
-   "self_type" : "type-4349",
+   "self_type" : "type-4355",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -25108,7 +25111,7 @@
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
    "referenced_type" : "type-595",
-   "self_type" : "type-2466",
+   "self_type" : "type-2469",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25125,8 +25128,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-2458",
-   "self_type" : "type-2457",
+   "referenced_type" : "type-2461",
+   "self_type" : "type-2460",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25134,8 +25137,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::B2HProducerListener *",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::B2HProducerListener *",
-   "referenced_type" : "type-4687",
-   "self_type" : "type-4686",
+   "referenced_type" : "type-4694",
+   "self_type" : "type-4693",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25143,8 +25146,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::B2HProducerListener *",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::B2HProducerListener *",
-   "referenced_type" : "type-7325",
-   "self_type" : "type-7324",
+   "referenced_type" : "type-7348",
+   "self_type" : "type-7347",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25152,8 +25155,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer *",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer *",
-   "referenced_type" : "type-4245",
-   "self_type" : "type-4244",
+   "referenced_type" : "type-4251",
+   "self_type" : "type-4250",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25161,8 +25164,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer *",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer *",
-   "referenced_type" : "type-6856",
-   "self_type" : "type-6855",
+   "referenced_type" : "type-6879",
+   "self_type" : "type-6878",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25170,8 +25173,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener *",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener *",
-   "referenced_type" : "type-4468",
-   "self_type" : "type-4467",
+   "referenced_type" : "type-4474",
+   "self_type" : "type-4473",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25179,8 +25182,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener *",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener *",
-   "referenced_type" : "type-7070",
-   "self_type" : "type-7069",
+   "referenced_type" : "type-7094",
+   "self_type" : "type-7093",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25189,7 +25192,7 @@
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
    "referenced_type" : "type-677",
-   "self_type" : "type-2479",
+   "self_type" : "type-2482",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25198,7 +25201,7 @@
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
    "referenced_type" : "type-604",
-   "self_type" : "type-2473",
+   "self_type" : "type-2476",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25206,8 +25209,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
-   "referenced_type" : "type-2483",
-   "self_type" : "type-2482",
+   "referenced_type" : "type-2486",
+   "self_type" : "type-2485",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25215,8 +25218,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
-   "referenced_type" : "type-4900",
-   "self_type" : "type-4899",
+   "referenced_type" : "type-4906",
+   "self_type" : "type-4905",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25224,8 +25227,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
-   "referenced_type" : "type-6001",
-   "self_type" : "type-6000",
+   "referenced_type" : "type-6021",
+   "self_type" : "type-6020",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25233,8 +25236,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
-   "referenced_type" : "type-7087",
-   "self_type" : "type-7086",
+   "referenced_type" : "type-7110",
+   "self_type" : "type-7109",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25242,8 +25245,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HProducerListener *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HProducerListener *",
-   "referenced_type" : "type-7656",
-   "self_type" : "type-7655",
+   "referenced_type" : "type-7680",
+   "self_type" : "type-7679",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25251,8 +25254,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer *",
-   "referenced_type" : "type-4239",
-   "self_type" : "type-4238",
+   "referenced_type" : "type-4245",
+   "self_type" : "type-4244",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25260,8 +25263,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer *",
-   "referenced_type" : "type-6852",
-   "self_type" : "type-6851",
+   "referenced_type" : "type-6875",
+   "self_type" : "type-6874",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25269,8 +25272,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
-   "referenced_type" : "type-4460",
-   "self_type" : "type-4459",
+   "referenced_type" : "type-4467",
+   "self_type" : "type-4466",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25278,8 +25281,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
-   "referenced_type" : "type-7065",
-   "self_type" : "type-7064",
+   "referenced_type" : "type-7089",
+   "self_type" : "type-7088",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25287,8 +25290,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
-   "referenced_type" : "type-7511",
-   "self_type" : "type-7510",
+   "referenced_type" : "type-7536",
+   "self_type" : "type-7535",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25351,7 +25354,7 @@
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > *",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > *",
    "referenced_type" : "type-463",
-   "self_type" : "type-7685",
+   "self_type" : "type-7708",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -25360,7 +25363,7 @@
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::media::V1_0::Rect> *",
    "name" : "android::hardware::hidl_vec<android::hardware::media::V1_0::Rect> *",
    "referenced_type" : "type-454",
-   "self_type" : "type-4570",
+   "self_type" : "type-4578",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -25369,7 +25372,7 @@
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> *",
    "name" : "android::hardware::hidl_vec<unsigned char> *",
    "referenced_type" : "type-453",
-   "self_type" : "type-4378",
+   "self_type" : "type-4384",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -25396,7 +25399,7 @@
    "linker_set_key" : "android::hidl::base::V1_0::IBase *",
    "name" : "android::hidl::base::V1_0::IBase *",
    "referenced_type" : "type-531",
-   "self_type" : "type-2447",
+   "self_type" : "type-2450",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25405,7 +25408,7 @@
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "android::hidl::manager::V1_0::IServiceNotification *",
    "referenced_type" : "type-534",
-   "self_type" : "type-2451",
+   "self_type" : "type-2454",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25414,7 +25417,7 @@
    "linker_set_key" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
    "name" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
    "referenced_type" : "type-164",
-   "self_type" : "type-2626",
+   "self_type" : "type-2629",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -25423,7 +25426,7 @@
    "linker_set_key" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
    "name" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
    "referenced_type" : "type-150",
-   "self_type" : "type-2624",
+   "self_type" : "type-2627",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -25432,7 +25435,7 @@
    "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int> *",
    "name" : "android::key_value_pair_t<unsigned int, unsigned int> *",
    "referenced_type" : "type-146",
-   "self_type" : "type-2623",
+   "self_type" : "type-2626",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -25440,8 +25443,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::AHandler> *",
    "name" : "android::sp<android::AHandler> *",
-   "referenced_type" : "type-1189",
-   "self_type" : "type-1245",
+   "referenced_type" : "type-1192",
+   "self_type" : "type-1247",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25450,7 +25453,7 @@
    "linker_set_key" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
    "name" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
    "referenced_type" : "type-581",
-   "self_type" : "type-2513",
+   "self_type" : "type-2516",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25459,7 +25462,7 @@
    "linker_set_key" : "android::sp<android::ALooper> *",
    "name" : "android::sp<android::ALooper> *",
    "referenced_type" : "type-322",
-   "self_type" : "type-2246",
+   "self_type" : "type-2249",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25468,7 +25471,7 @@
    "linker_set_key" : "android::sp<android::AMessage> *",
    "name" : "android::sp<android::AMessage> *",
    "referenced_type" : "type-259",
-   "self_type" : "type-1958",
+   "self_type" : "type-1951",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25476,8 +25479,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::BpGraphicBufferProducer> *",
    "name" : "android::sp<android::BpGraphicBufferProducer> *",
-   "referenced_type" : "type-4231",
-   "self_type" : "type-4277",
+   "referenced_type" : "type-4237",
+   "self_type" : "type-4283",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25485,8 +25488,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::BpProducerListener> *",
    "name" : "android::sp<android::BpProducerListener> *",
-   "referenced_type" : "type-4457",
-   "self_type" : "type-4456",
+   "referenced_type" : "type-4464",
+   "self_type" : "type-4463",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25504,7 +25507,7 @@
    "linker_set_key" : "android::sp<android::ComponentWrapper> *",
    "name" : "android::sp<android::ComponentWrapper> *",
    "referenced_type" : "type-567",
-   "self_type" : "type-2490",
+   "self_type" : "type-2493",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25521,8 +25524,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::Fence> *",
    "name" : "android::sp<android::Fence> *",
-   "referenced_type" : "type-1865",
-   "self_type" : "type-2524",
+   "referenced_type" : "type-1869",
+   "self_type" : "type-2527",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25531,7 +25534,7 @@
    "linker_set_key" : "android::sp<android::FrameDropper> *",
    "name" : "android::sp<android::FrameDropper> *",
    "referenced_type" : "type-578",
-   "self_type" : "type-2506",
+   "self_type" : "type-2509",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25539,8 +25542,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::GLConsumer::EglImage> *",
    "name" : "android::sp<android::GLConsumer::EglImage> *",
-   "referenced_type" : "type-1173",
-   "self_type" : "type-1177",
+   "referenced_type" : "type-1176",
+   "self_type" : "type-1181",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25549,7 +25552,7 @@
    "linker_set_key" : "android::sp<android::GraphicBuffer> *",
    "name" : "android::sp<android::GraphicBuffer> *",
    "referenced_type" : "type-733",
-   "self_type" : "type-1195",
+   "self_type" : "type-1198",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25558,7 +25561,7 @@
    "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy> *",
    "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy> *",
    "referenced_type" : "type-473",
-   "self_type" : "type-2498",
+   "self_type" : "type-2501",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25566,8 +25569,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::GraphicBufferSource> *",
    "name" : "android::sp<android::GraphicBufferSource> *",
-   "referenced_type" : "type-2544",
-   "self_type" : "type-2543",
+   "referenced_type" : "type-2547",
+   "self_type" : "type-2546",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25575,8 +25578,8 @@
    "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",
+   "referenced_type" : "type-4268",
+   "self_type" : "type-4267",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25584,8 +25587,8 @@
    "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",
+   "referenced_type" : "type-4277",
+   "self_type" : "type-4276",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25593,8 +25596,8 @@
    "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",
+   "referenced_type" : "type-4838",
+   "self_type" : "type-4845",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25602,8 +25605,8 @@
    "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",
+   "referenced_type" : "type-5127",
+   "self_type" : "type-5132",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25612,7 +25615,7 @@
    "linker_set_key" : "android::sp<android::IBinder::DeathRecipient> *",
    "name" : "android::sp<android::IBinder::DeathRecipient> *",
    "referenced_type" : "type-844",
-   "self_type" : "type-1274",
+   "self_type" : "type-1278",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25621,7 +25624,7 @@
    "linker_set_key" : "android::sp<android::IBinder> *",
    "name" : "android::sp<android::IBinder> *",
    "referenced_type" : "type-796",
-   "self_type" : "type-1036",
+   "self_type" : "type-1040",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25630,7 +25633,7 @@
    "linker_set_key" : "android::sp<android::IConsumerListener> *",
    "name" : "android::sp<android::IConsumerListener> *",
    "referenced_type" : "type-940",
-   "self_type" : "type-2536",
+   "self_type" : "type-2539",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25639,7 +25642,7 @@
    "linker_set_key" : "android::sp<android::IGraphicBufferConsumer> *",
    "name" : "android::sp<android::IGraphicBufferConsumer> *",
    "referenced_type" : "type-574",
-   "self_type" : "type-2500",
+   "self_type" : "type-2503",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25648,7 +25651,7 @@
    "linker_set_key" : "android::sp<android::IGraphicBufferProducer> *",
    "name" : "android::sp<android::IGraphicBufferProducer> *",
    "referenced_type" : "type-570",
-   "self_type" : "type-2486",
+   "self_type" : "type-2489",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25666,7 +25669,7 @@
    "linker_set_key" : "android::sp<android::IProducerListener> *",
    "name" : "android::sp<android::IProducerListener> *",
    "referenced_type" : "type-958",
-   "self_type" : "type-2539",
+   "self_type" : "type-2542",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25674,8 +25677,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::ITransactionCompletedListener> *",
    "name" : "android::sp<android::ITransactionCompletedListener> *",
-   "referenced_type" : "type-1041",
-   "self_type" : "type-1046",
+   "referenced_type" : "type-1045",
+   "self_type" : "type-1049",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25684,7 +25687,7 @@
    "linker_set_key" : "android::sp<android::NativeHandle> *",
    "name" : "android::sp<android::NativeHandle> *",
    "referenced_type" : "type-933",
-   "self_type" : "type-1881",
+   "self_type" : "type-1886",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25692,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-2465",
-   "self_type" : "type-2467",
+   "referenced_type" : "type-2468",
+   "self_type" : "type-2470",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25701,8 +25704,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> *",
    "name" : "android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> *",
-   "referenced_type" : "type-2456",
-   "self_type" : "type-2459",
+   "referenced_type" : "type-2459",
+   "self_type" : "type-2462",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25710,8 +25713,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer> *",
    "name" : "android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer> *",
-   "referenced_type" : "type-4243",
-   "self_type" : "type-4280",
+   "referenced_type" : "type-4249",
+   "self_type" : "type-4286",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25719,8 +25722,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener> *",
    "name" : "android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener> *",
-   "referenced_type" : "type-4470",
-   "self_type" : "type-4469",
+   "referenced_type" : "type-4476",
+   "self_type" : "type-4475",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25728,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-2478",
-   "self_type" : "type-2480",
+   "referenced_type" : "type-2481",
+   "self_type" : "type-2483",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25737,8 +25740,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> *",
    "name" : "android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> *",
-   "referenced_type" : "type-2472",
-   "self_type" : "type-2475",
+   "referenced_type" : "type-2475",
+   "self_type" : "type-2478",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25746,8 +25749,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer> *",
    "name" : "android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer> *",
-   "referenced_type" : "type-4237",
-   "self_type" : "type-4278",
+   "referenced_type" : "type-4243",
+   "self_type" : "type-4284",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25755,8 +25758,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener> *",
    "name" : "android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener> *",
-   "referenced_type" : "type-4463",
-   "self_type" : "type-4462",
+   "referenced_type" : "type-4469",
+   "self_type" : "type-4468",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25765,7 +25768,7 @@
    "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient> *",
    "name" : "android::sp<android::hardware::hidl_death_recipient> *",
    "referenced_type" : "type-515",
-   "self_type" : "type-4392",
+   "self_type" : "type-4398",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25773,8 +25776,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hidl::base::V1_0::IBase> *",
    "name" : "android::sp<android::hidl::base::V1_0::IBase> *",
-   "referenced_type" : "type-2446",
-   "self_type" : "type-4224",
+   "referenced_type" : "type-2449",
+   "self_type" : "type-4230",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25782,8 +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-2450",
-   "self_type" : "type-2452",
+   "referenced_type" : "type-2453",
+   "self_type" : "type-2455",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25791,8 +25794,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<const android::AHandler> *",
    "name" : "android::sp<const android::AHandler> *",
-   "referenced_type" : "type-2518",
-   "self_type" : "type-2523",
+   "referenced_type" : "type-2521",
+   "self_type" : "type-2526",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25837,7 +25840,7 @@
    "linker_set_key" : "android::wp<android::IBinder::DeathRecipient> *",
    "name" : "android::wp<android::IBinder::DeathRecipient> *",
    "referenced_type" : "type-174",
-   "self_type" : "type-1244",
+   "self_type" : "type-1248",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -25846,7 +25849,7 @@
    "linker_set_key" : "android::wp<android::IBinder> *",
    "name" : "android::wp<android::IBinder> *",
    "referenced_type" : "type-131",
-   "self_type" : "type-4282",
+   "self_type" : "type-4288",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -25855,7 +25858,7 @@
    "linker_set_key" : "android_dataspace_t *",
    "name" : "android_dataspace_t *",
    "referenced_type" : "type-173",
-   "self_type" : "type-1668",
+   "self_type" : "type-1672",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -25872,8 +25875,8 @@
    "alignment" : 8,
    "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",
+   "referenced_type" : "type-1249",
+   "self_type" : "type-1253",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h"
   },
@@ -25881,8 +25884,8 @@
    "alignment" : 8,
    "linker_set_key" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
    "name" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
-   "referenced_type" : "type-1388",
-   "self_type" : "type-1391",
+   "referenced_type" : "type-1391",
+   "self_type" : "type-1394",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -25891,7 +25894,7 @@
    "linker_set_key" : "bool *",
    "name" : "bool *",
    "referenced_type" : "type-95",
-   "self_type" : "type-1275",
+   "self_type" : "type-1276",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -25908,8 +25911,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::AHandler *",
    "name" : "const android::AHandler *",
-   "referenced_type" : "type-2520",
-   "self_type" : "type-2519",
+   "referenced_type" : "type-2523",
+   "self_type" : "type-2522",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25917,8 +25920,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::AHandlerReflector<android::GraphicBufferSource> *",
    "name" : "const android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-2516",
-   "self_type" : "type-2517",
+   "referenced_type" : "type-2519",
+   "self_type" : "type-2520",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25926,8 +25929,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::ALooper *",
    "name" : "const android::ALooper *",
-   "referenced_type" : "type-2291",
-   "self_type" : "type-2303",
+   "referenced_type" : "type-2294",
+   "self_type" : "type-2306",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25935,7 +25938,7 @@
    "alignment" : 8,
    "linker_set_key" : "const android::AReplyToken *",
    "name" : "const android::AReplyToken *",
-   "referenced_type" : "type-1170",
+   "referenced_type" : "type-1171",
    "self_type" : "type-1180",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
@@ -25944,8 +25947,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::AString *",
    "name" : "const android::AString *",
-   "referenced_type" : "type-2101",
-   "self_type" : "type-2231",
+   "referenced_type" : "type-2093",
+   "self_type" : "type-2234",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -25971,8 +25974,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BnInterface<android::IGraphicBufferProducer> *",
    "name" : "const android::BnInterface<android::IGraphicBufferProducer> *",
-   "referenced_type" : "type-1232",
-   "self_type" : "type-1234",
+   "referenced_type" : "type-1236",
+   "self_type" : "type-1237",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -25980,8 +25983,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BnInterface<android::IProducerListener> *",
    "name" : "const android::BnInterface<android::IProducerListener> *",
-   "referenced_type" : "type-4480",
-   "self_type" : "type-4481",
+   "referenced_type" : "type-4486",
+   "self_type" : "type-4487",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -25989,8 +25992,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BnInterface<android::ITransactionCompletedListener> *",
    "name" : "const android::BnInterface<android::ITransactionCompletedListener> *",
-   "referenced_type" : "type-1094",
-   "self_type" : "type-1095",
+   "referenced_type" : "type-1097",
+   "self_type" : "type-1098",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -26007,8 +26010,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-1070",
-   "self_type" : "type-1072",
+   "referenced_type" : "type-1073",
+   "self_type" : "type-1075",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -26016,8 +26019,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-1219",
-   "self_type" : "type-1218",
+   "referenced_type" : "type-1223",
+   "self_type" : "type-1222",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26025,8 +26028,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-3635",
-   "self_type" : "type-3634",
+   "referenced_type" : "type-3638",
+   "self_type" : "type-3637",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26034,8 +26037,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-3684",
-   "self_type" : "type-3686",
+   "referenced_type" : "type-3690",
+   "self_type" : "type-3692",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -26043,8 +26046,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-3792",
-   "self_type" : "type-3791",
+   "referenced_type" : "type-3799",
+   "self_type" : "type-3798",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26052,8 +26055,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-5710",
-   "self_type" : "type-5709",
+   "referenced_type" : "type-5727",
+   "self_type" : "type-5726",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26061,8 +26064,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-5759",
-   "self_type" : "type-5761",
+   "referenced_type" : "type-5779",
+   "self_type" : "type-5781",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -26070,8 +26073,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-5867",
-   "self_type" : "type-5866",
+   "referenced_type" : "type-5888",
+   "self_type" : "type-5887",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26079,8 +26082,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-6281",
-   "self_type" : "type-6280",
+   "referenced_type" : "type-6301",
+   "self_type" : "type-6300",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26088,8 +26091,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-6323",
-   "self_type" : "type-6325",
+   "referenced_type" : "type-6346",
+   "self_type" : "type-6348",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -26097,8 +26100,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-6414",
-   "self_type" : "type-6413",
+   "referenced_type" : "type-6437",
+   "self_type" : "type-6436",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26115,8 +26118,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferQueueCore *",
    "name" : "const android::BufferQueueCore *",
-   "referenced_type" : "type-3523",
-   "self_type" : "type-3525",
+   "referenced_type" : "type-3526",
+   "self_type" : "type-3528",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26124,8 +26127,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferQueueCore *",
    "name" : "const android::BufferQueueCore *",
-   "referenced_type" : "type-5598",
-   "self_type" : "type-5600",
+   "referenced_type" : "type-5615",
+   "self_type" : "type-5617",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26133,8 +26136,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferQueueCore *",
    "name" : "const android::BufferQueueCore *",
-   "referenced_type" : "type-6184",
-   "self_type" : "type-6186",
+   "referenced_type" : "type-6204",
+   "self_type" : "type-6206",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26151,8 +26154,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::ComponentWrapper *",
    "name" : "const android::ComponentWrapper *",
-   "referenced_type" : "type-2496",
-   "self_type" : "type-2497",
+   "referenced_type" : "type-2499",
+   "self_type" : "type-2500",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26160,8 +26163,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::ConsumerListener *",
    "name" : "const android::ConsumerListener *",
-   "referenced_type" : "type-3515",
-   "self_type" : "type-3517",
+   "referenced_type" : "type-3518",
+   "self_type" : "type-3520",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26169,8 +26172,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::ConsumerListener *",
    "name" : "const android::ConsumerListener *",
-   "referenced_type" : "type-5590",
-   "self_type" : "type-5592",
+   "referenced_type" : "type-5607",
+   "self_type" : "type-5609",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26178,8 +26181,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::ConsumerListener *",
    "name" : "const android::ConsumerListener *",
-   "referenced_type" : "type-6179",
-   "self_type" : "type-6181",
+   "referenced_type" : "type-6199",
+   "self_type" : "type-6201",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26196,8 +26199,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-1309",
-   "self_type" : "type-1316",
+   "referenced_type" : "type-1313",
+   "self_type" : "type-1317",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26205,8 +26208,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-2532",
-   "self_type" : "type-2534",
+   "referenced_type" : "type-2535",
+   "self_type" : "type-2537",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26214,8 +26217,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-3448",
-   "self_type" : "type-3450",
+   "referenced_type" : "type-3451",
+   "self_type" : "type-3453",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26223,8 +26226,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-3595",
-   "self_type" : "type-3597",
+   "referenced_type" : "type-3598",
+   "self_type" : "type-3600",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26232,8 +26235,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-3860",
-   "self_type" : "type-3867",
+   "referenced_type" : "type-3867",
+   "self_type" : "type-3871",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26241,8 +26244,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-4425",
-   "self_type" : "type-4431",
+   "referenced_type" : "type-4431",
+   "self_type" : "type-4433",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26250,8 +26253,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-4675",
-   "self_type" : "type-4677",
+   "referenced_type" : "type-4682",
+   "self_type" : "type-4684",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26259,8 +26262,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-4944",
-   "self_type" : "type-4946",
+   "referenced_type" : "type-4950",
+   "self_type" : "type-4952",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26268,8 +26271,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-5523",
-   "self_type" : "type-5525",
+   "referenced_type" : "type-5540",
+   "self_type" : "type-5542",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26277,8 +26280,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-5670",
-   "self_type" : "type-5672",
+   "referenced_type" : "type-5687",
+   "self_type" : "type-5689",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26286,8 +26289,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-5935",
-   "self_type" : "type-5942",
+   "referenced_type" : "type-5956",
+   "self_type" : "type-5960",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26295,8 +26298,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-6016",
-   "self_type" : "type-6018",
+   "referenced_type" : "type-6036",
+   "self_type" : "type-6038",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26304,8 +26307,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-6127",
-   "self_type" : "type-6129",
+   "referenced_type" : "type-6147",
+   "self_type" : "type-6149",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26313,8 +26316,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-6255",
-   "self_type" : "type-6257",
+   "referenced_type" : "type-6275",
+   "self_type" : "type-6277",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26322,8 +26325,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-6455",
-   "self_type" : "type-6462",
+   "referenced_type" : "type-6479",
+   "self_type" : "type-6483",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26331,8 +26334,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-7029",
-   "self_type" : "type-7036",
+   "referenced_type" : "type-7053",
+   "self_type" : "type-7057",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26340,8 +26343,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-7206",
-   "self_type" : "type-7212",
+   "referenced_type" : "type-7228",
+   "self_type" : "type-7231",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26358,8 +26361,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-7316",
-   "self_type" : "type-7318",
+   "referenced_type" : "type-7339",
+   "self_type" : "type-7341",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26376,8 +26379,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::FileDescriptor::Autoclose *",
    "name" : "const android::FileDescriptor::Autoclose *",
-   "referenced_type" : "type-1230",
-   "self_type" : "type-1233",
+   "referenced_type" : "type-1228",
+   "self_type" : "type-1235",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h"
   },
@@ -26385,8 +26388,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Flattenable<android::BufferItem> *",
    "name" : "const android::Flattenable<android::BufferItem> *",
-   "referenced_type" : "type-1507",
-   "self_type" : "type-1508",
+   "referenced_type" : "type-1510",
+   "self_type" : "type-1511",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -26394,24 +26397,6 @@
    "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,
@@ -26419,17 +26404,8 @@
   },
   {
    "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> *",
+   "linker_set_key" : "const android::Flattenable<android::FrameEventHistoryDelta> *",
+   "name" : "const android::Flattenable<android::FrameEventHistoryDelta> *",
    "referenced_type" : "type-4315",
    "self_type" : "type-4316",
    "size" : 8,
@@ -26437,10 +26413,37 @@
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const android::Flattenable<android::GraphicBuffer> *",
+   "name" : "const android::Flattenable<android::GraphicBuffer> *",
+   "referenced_type" : "type-1644",
+   "self_type" : "type-1645",
+   "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-4318",
+   "self_type" : "type-4319",
+   "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-4321",
+   "self_type" : "type-4322",
+   "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-2511",
-   "self_type" : "type-2512",
+   "referenced_type" : "type-2514",
+   "self_type" : "type-2515",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26448,8 +26451,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-1347",
-   "self_type" : "type-1349",
+   "referenced_type" : "type-1350",
+   "self_type" : "type-1352",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26457,8 +26460,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-1461",
-   "self_type" : "type-1464",
+   "referenced_type" : "type-1465",
+   "self_type" : "type-1467",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26466,8 +26469,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-2405",
-   "self_type" : "type-2427",
+   "referenced_type" : "type-2408",
+   "self_type" : "type-2430",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26475,8 +26478,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-3454",
-   "self_type" : "type-3456",
+   "referenced_type" : "type-3457",
+   "self_type" : "type-3459",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26484,8 +26487,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-3600",
-   "self_type" : "type-3602",
+   "referenced_type" : "type-3603",
+   "self_type" : "type-3605",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26493,8 +26496,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-3900",
-   "self_type" : "type-3902",
+   "referenced_type" : "type-3906",
+   "self_type" : "type-3908",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26502,8 +26505,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-3993",
-   "self_type" : "type-3995",
+   "referenced_type" : "type-3999",
+   "self_type" : "type-4001",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26511,8 +26514,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-4221",
-   "self_type" : "type-4223",
+   "referenced_type" : "type-4227",
+   "self_type" : "type-4229",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26520,8 +26523,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-4837",
-   "self_type" : "type-4873",
+   "referenced_type" : "type-4843",
+   "self_type" : "type-4879",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26529,8 +26532,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-5529",
-   "self_type" : "type-5531",
+   "referenced_type" : "type-5546",
+   "self_type" : "type-5548",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26538,8 +26541,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-5675",
-   "self_type" : "type-5677",
+   "referenced_type" : "type-5692",
+   "self_type" : "type-5694",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26547,16 +26550,7 @@
    "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",
+   "referenced_type" : "type-5995",
    "self_type" : "type-5997",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
@@ -26565,8 +26559,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-6132",
-   "self_type" : "type-6135",
+   "referenced_type" : "type-6012",
+   "self_type" : "type-6017",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26574,8 +26568,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-6260",
-   "self_type" : "type-6262",
+   "referenced_type" : "type-6153",
+   "self_type" : "type-6155",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26583,8 +26577,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-6493",
-   "self_type" : "type-6496",
+   "referenced_type" : "type-6280",
+   "self_type" : "type-6282",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26592,8 +26586,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-6581",
-   "self_type" : "type-6583",
+   "referenced_type" : "type-6517",
+   "self_type" : "type-6519",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26601,8 +26595,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-6826",
-   "self_type" : "type-6836",
+   "referenced_type" : "type-6604",
+   "self_type" : "type-6606",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26610,8 +26604,17 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-6837",
-   "self_type" : "type-6839",
+   "referenced_type" : "type-6849",
+   "self_type" : "type-6857",
+   "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-6860",
+   "self_type" : "type-6862",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26637,8 +26640,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBufferSource *",
    "name" : "const android::GraphicBufferSource *",
-   "referenced_type" : "type-2548",
-   "self_type" : "type-2549",
+   "referenced_type" : "type-2551",
+   "self_type" : "type-2552",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26646,8 +26649,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IBinder *",
    "name" : "const android::IBinder *",
-   "referenced_type" : "type-1520",
-   "self_type" : "type-1526",
+   "referenced_type" : "type-1524",
+   "self_type" : "type-1531",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26655,8 +26658,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IBinder::DeathRecipient *",
    "name" : "const android::IBinder::DeathRecipient *",
-   "referenced_type" : "type-4318",
-   "self_type" : "type-4319",
+   "referenced_type" : "type-4324",
+   "self_type" : "type-4325",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26664,8 +26667,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-1156",
-   "self_type" : "type-1158",
+   "referenced_type" : "type-1159",
+   "self_type" : "type-1161",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26673,8 +26676,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-1581",
-   "self_type" : "type-1583",
+   "referenced_type" : "type-1585",
+   "self_type" : "type-1587",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26682,8 +26685,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-3613",
-   "self_type" : "type-3615",
+   "referenced_type" : "type-3616",
+   "self_type" : "type-3618",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26691,8 +26694,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-3760",
-   "self_type" : "type-3762",
+   "referenced_type" : "type-3766",
+   "self_type" : "type-3770",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26700,8 +26703,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-4062",
-   "self_type" : "type-4064",
+   "referenced_type" : "type-4068",
+   "self_type" : "type-4070",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26709,8 +26712,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-5688",
-   "self_type" : "type-5690",
+   "referenced_type" : "type-5705",
+   "self_type" : "type-5707",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26718,8 +26721,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-5835",
-   "self_type" : "type-5837",
+   "referenced_type" : "type-5855",
+   "self_type" : "type-5859",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26727,8 +26730,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-6265",
-   "self_type" : "type-6267",
+   "referenced_type" : "type-6286",
+   "self_type" : "type-6288",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26736,8 +26739,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-6390",
-   "self_type" : "type-6392",
+   "referenced_type" : "type-6413",
+   "self_type" : "type-6415",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26745,8 +26748,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-6649",
-   "self_type" : "type-6651",
+   "referenced_type" : "type-6672",
+   "self_type" : "type-6675",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26763,8 +26766,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-1605",
-   "self_type" : "type-1607",
+   "referenced_type" : "type-1609",
+   "self_type" : "type-1611",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26772,8 +26775,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-2503",
-   "self_type" : "type-2505",
+   "referenced_type" : "type-2506",
+   "self_type" : "type-2508",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26781,8 +26784,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-3496",
-   "self_type" : "type-3498",
+   "referenced_type" : "type-3499",
+   "self_type" : "type-3501",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26790,8 +26793,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-4079",
-   "self_type" : "type-4081",
+   "referenced_type" : "type-4085",
+   "self_type" : "type-4087",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26799,8 +26802,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-4917",
-   "self_type" : "type-4919",
+   "referenced_type" : "type-4923",
+   "self_type" : "type-4925",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26808,8 +26811,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-5571",
-   "self_type" : "type-5573",
+   "referenced_type" : "type-5588",
+   "self_type" : "type-5590",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26817,8 +26820,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6009",
-   "self_type" : "type-6011",
+   "referenced_type" : "type-6029",
+   "self_type" : "type-6031",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26826,8 +26829,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6165",
-   "self_type" : "type-6167",
+   "referenced_type" : "type-6185",
+   "self_type" : "type-6187",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26835,8 +26838,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6664",
-   "self_type" : "type-6666",
+   "referenced_type" : "type-6687",
+   "self_type" : "type-6689",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26844,8 +26847,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-7151",
-   "self_type" : "type-7153",
+   "referenced_type" : "type-7174",
+   "self_type" : "type-7176",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26862,8 +26865,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferProducer *",
    "name" : "const android::IGraphicBufferProducer *",
-   "referenced_type" : "type-3506",
-   "self_type" : "type-3508",
+   "referenced_type" : "type-3509",
+   "self_type" : "type-3511",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26871,8 +26874,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferProducer *",
    "name" : "const android::IGraphicBufferProducer *",
-   "referenced_type" : "type-4250",
-   "self_type" : "type-4252",
+   "referenced_type" : "type-4256",
+   "self_type" : "type-4258",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26880,8 +26883,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferProducer *",
    "name" : "const android::IGraphicBufferProducer *",
-   "referenced_type" : "type-5581",
-   "self_type" : "type-5583",
+   "referenced_type" : "type-5598",
+   "self_type" : "type-5600",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26889,8 +26892,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferProducer *",
    "name" : "const android::IGraphicBufferProducer *",
-   "referenced_type" : "type-6174",
-   "self_type" : "type-6176",
+   "referenced_type" : "type-6194",
+   "self_type" : "type-6196",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26898,8 +26901,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferProducer *",
    "name" : "const android::IGraphicBufferProducer *",
-   "referenced_type" : "type-6860",
-   "self_type" : "type-6862",
+   "referenced_type" : "type-6883",
+   "self_type" : "type-6885",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26916,8 +26919,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-1161",
-   "self_type" : "type-1163",
+   "referenced_type" : "type-1032",
+   "self_type" : "type-1034",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26925,8 +26928,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-3625",
-   "self_type" : "type-3627",
+   "referenced_type" : "type-1164",
+   "self_type" : "type-1166",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26934,8 +26937,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-3767",
-   "self_type" : "type-3769",
+   "referenced_type" : "type-3628",
+   "self_type" : "type-3630",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26943,8 +26946,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-4256",
-   "self_type" : "type-4258",
+   "referenced_type" : "type-3672",
+   "self_type" : "type-3674",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26952,8 +26955,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-4452",
-   "self_type" : "type-4451",
+   "referenced_type" : "type-3773",
+   "self_type" : "type-3775",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26961,8 +26964,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-4692",
-   "self_type" : "type-4694",
+   "referenced_type" : "type-4262",
+   "self_type" : "type-4264",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26970,8 +26973,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-5700",
-   "self_type" : "type-5702",
+   "referenced_type" : "type-4459",
+   "self_type" : "type-4458",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26979,8 +26982,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-5842",
-   "self_type" : "type-5844",
+   "referenced_type" : "type-4699",
+   "self_type" : "type-4702",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26988,8 +26991,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-6273",
-   "self_type" : "type-6275",
+   "referenced_type" : "type-5717",
+   "self_type" : "type-5719",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26997,8 +27000,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-6395",
-   "self_type" : "type-6397",
+   "referenced_type" : "type-5761",
+   "self_type" : "type-5763",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27006,8 +27009,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-6866",
-   "self_type" : "type-6868",
+   "referenced_type" : "type-5862",
+   "self_type" : "type-5864",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27015,8 +27018,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-7059",
-   "self_type" : "type-7058",
+   "referenced_type" : "type-6293",
+   "self_type" : "type-6295",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27024,8 +27027,44 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-7329",
-   "self_type" : "type-7331",
+   "referenced_type" : "type-6337",
+   "self_type" : "type-6339",
+   "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-6418",
+   "self_type" : "type-6420",
+   "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-6889",
+   "self_type" : "type-6891",
+   "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-7083",
+   "self_type" : "type-7082",
+   "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-7352",
+   "self_type" : "type-7354",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27060,8 +27099,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect> *",
    "name" : "const android::LightFlattenablePod<android::Rect> *",
-   "referenced_type" : "type-4590",
-   "self_type" : "type-4591",
+   "referenced_type" : "type-4597",
+   "self_type" : "type-4598",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -27078,8 +27117,8 @@
    "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",
+   "referenced_type" : "type-1233",
+   "self_type" : "type-1234",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -27087,8 +27126,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::LightRefBase<android::NativeHandle> *",
    "name" : "const android::LightRefBase<android::NativeHandle> *",
-   "referenced_type" : "type-2665",
-   "self_type" : "type-2674",
+   "referenced_type" : "type-2668",
+   "self_type" : "type-2677",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -27205,7 +27244,7 @@
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
    "referenced_type" : "type-120",
-   "self_type" : "type-1514",
+   "self_type" : "type-1518",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -27222,8 +27261,8 @@
    "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",
+   "referenced_type" : "type-1525",
+   "self_type" : "type-1526",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -27231,8 +27270,8 @@
    "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",
+   "referenced_type" : "type-1667",
+   "self_type" : "type-1668",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -27240,8 +27279,8 @@
    "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",
+   "referenced_type" : "type-4340",
+   "self_type" : "type-4341",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -27249,8 +27288,8 @@
    "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",
+   "referenced_type" : "type-1661",
+   "self_type" : "type-1662",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -27258,8 +27297,8 @@
    "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",
+   "referenced_type" : "type-4346",
+   "self_type" : "type-4347",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -27267,8 +27306,8 @@
    "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",
+   "referenced_type" : "type-4351",
+   "self_type" : "type-4352",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -27285,8 +27324,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1215",
-   "self_type" : "type-1214",
+   "referenced_type" : "type-1218",
+   "self_type" : "type-1217",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27294,8 +27333,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1490",
-   "self_type" : "type-1489",
+   "referenced_type" : "type-1494",
+   "self_type" : "type-1493",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27303,8 +27342,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1622",
-   "self_type" : "type-1621",
+   "referenced_type" : "type-1625",
+   "self_type" : "type-1624",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27312,8 +27351,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-2685",
-   "self_type" : "type-2684",
+   "referenced_type" : "type-2688",
+   "self_type" : "type-2687",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27321,8 +27360,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-3788",
-   "self_type" : "type-3787",
+   "referenced_type" : "type-3794",
+   "self_type" : "type-3793",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27330,8 +27369,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4013",
-   "self_type" : "type-4012",
+   "referenced_type" : "type-4019",
+   "self_type" : "type-4018",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27339,8 +27378,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4092",
-   "self_type" : "type-4091",
+   "referenced_type" : "type-4098",
+   "self_type" : "type-4097",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27348,8 +27387,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4295",
-   "self_type" : "type-4294",
+   "referenced_type" : "type-4301",
+   "self_type" : "type-4300",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27357,8 +27396,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4575",
-   "self_type" : "type-4574",
+   "referenced_type" : "type-4581",
+   "self_type" : "type-4580",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27366,8 +27405,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4739",
-   "self_type" : "type-4738",
+   "referenced_type" : "type-4746",
+   "self_type" : "type-4745",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27375,8 +27414,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-5022",
-   "self_type" : "type-5021",
+   "referenced_type" : "type-5028",
+   "self_type" : "type-5027",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27384,8 +27423,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-5080",
-   "self_type" : "type-5079",
+   "referenced_type" : "type-5096",
+   "self_type" : "type-5095",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27393,8 +27432,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-5863",
-   "self_type" : "type-5862",
+   "referenced_type" : "type-5883",
+   "self_type" : "type-5882",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27402,8 +27441,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-6046",
-   "self_type" : "type-6045",
+   "referenced_type" : "type-6066",
+   "self_type" : "type-6065",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27411,8 +27450,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-6410",
-   "self_type" : "type-6409",
+   "referenced_type" : "type-6433",
+   "self_type" : "type-6432",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27420,8 +27459,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-6600",
-   "self_type" : "type-6599",
+   "referenced_type" : "type-6624",
+   "self_type" : "type-6623",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27429,8 +27468,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-6679",
-   "self_type" : "type-6678",
+   "referenced_type" : "type-6702",
+   "self_type" : "type-6701",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27438,8 +27477,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-6899",
-   "self_type" : "type-6898",
+   "referenced_type" : "type-6922",
+   "self_type" : "type-6921",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27447,8 +27486,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-7209",
-   "self_type" : "type-7208",
+   "referenced_type" : "type-7233",
+   "self_type" : "type-7232",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27456,8 +27495,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-7356",
-   "self_type" : "type-7355",
+   "referenced_type" : "type-7379",
+   "self_type" : "type-7378",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27465,8 +27504,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-7582",
-   "self_type" : "type-7581",
+   "referenced_type" : "type-7607",
+   "self_type" : "type-7606",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27474,8 +27513,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-7679",
-   "self_type" : "type-7678",
+   "referenced_type" : "type-7699",
+   "self_type" : "type-7698",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27483,8 +27522,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::RefBase *",
    "name" : "const android::RefBase *",
-   "referenced_type" : "type-1450",
-   "self_type" : "type-1479",
+   "referenced_type" : "type-1453",
+   "self_type" : "type-1482",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27492,8 +27531,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::SafeBpInterface<android::IConsumerListener> *",
    "name" : "const android::SafeBpInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-1552",
-   "self_type" : "type-1553",
+   "referenced_type" : "type-1555",
+   "self_type" : "type-1556",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -27501,8 +27540,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::SafeBpInterface<android::IGraphicBufferConsumer> *",
    "name" : "const android::SafeBpInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-1888",
-   "self_type" : "type-1889",
+   "referenced_type" : "type-1892",
+   "self_type" : "type-1893",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -27510,7 +27549,7 @@
    "alignment" : 8,
    "linker_set_key" : "const android::SafeInterface::ParcelHandler *",
    "name" : "const android::SafeInterface::ParcelHandler *",
-   "referenced_type" : "type-1266",
+   "referenced_type" : "type-1269",
    "self_type" : "type-1272",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
@@ -27519,8 +27558,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-2677",
-   "self_type" : "type-2678",
+   "referenced_type" : "type-2680",
+   "self_type" : "type-2681",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27528,8 +27567,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-2673",
-   "self_type" : "type-2675",
+   "referenced_type" : "type-2676",
+   "self_type" : "type-2678",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27537,8 +27576,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-2669",
-   "self_type" : "type-2670",
+   "referenced_type" : "type-2672",
+   "self_type" : "type-2673",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27546,8 +27585,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::String16 *",
    "name" : "const android::String16 *",
-   "referenced_type" : "type-1248",
-   "self_type" : "type-2660",
+   "referenced_type" : "type-1251",
+   "self_type" : "type-2663",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -27555,8 +27594,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::String8 *",
    "name" : "const android::String8 *",
-   "referenced_type" : "type-1877",
-   "self_type" : "type-2655",
+   "referenced_type" : "type-1881",
+   "self_type" : "type-2658",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -27564,7 +27603,7 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Vector<android::BufferItem> *",
    "name" : "const android::Vector<android::BufferItem> *",
-   "referenced_type" : "type-978",
+   "referenced_type" : "type-980",
    "self_type" : "type-981",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
@@ -27573,8 +27612,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Vector<android::Rect> *",
    "name" : "const android::Vector<android::Rect> *",
-   "referenced_type" : "type-2681",
-   "self_type" : "type-2682",
+   "referenced_type" : "type-2684",
+   "self_type" : "type-2685",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27582,8 +27621,8 @@
    "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",
+   "referenced_type" : "type-1231",
+   "self_type" : "type-1232",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27591,8 +27630,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Vector<int> *",
    "name" : "const android::Vector<int> *",
-   "referenced_type" : "type-2690",
-   "self_type" : "type-2691",
+   "referenced_type" : "type-2693",
+   "self_type" : "type-2694",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27600,8 +27639,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Vector<long> *",
    "name" : "const android::Vector<long> *",
-   "referenced_type" : "type-1084",
-   "self_type" : "type-1085",
+   "referenced_type" : "type-1087",
+   "self_type" : "type-1088",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27609,8 +27648,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::VectorImpl *",
    "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-2666",
-   "self_type" : "type-2667",
+   "referenced_type" : "type-2669",
+   "self_type" : "type-2670",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -27618,8 +27657,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::base::ErrnoRestorer *",
    "name" : "const android::base::ErrnoRestorer *",
-   "referenced_type" : "type-4659",
-   "self_type" : "type-4665",
+   "referenced_type" : "type-4666",
+   "self_type" : "type-4672",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27627,8 +27666,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser> *",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser> *",
-   "referenced_type" : "type-2582",
-   "self_type" : "type-2597",
+   "referenced_type" : "type-2585",
+   "self_type" : "type-2600",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -27645,8 +27684,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::BpHwRefBase *",
    "name" : "const android::hardware::BpHwRefBase *",
-   "referenced_type" : "type-1375",
-   "self_type" : "type-1376",
+   "referenced_type" : "type-1378",
+   "self_type" : "type-1379",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -27654,8 +27693,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::bufferqueue::V2_0::Status> *",
    "name" : "const android::hardware::Return<android::hardware::graphics::bufferqueue::V2_0::Status> *",
-   "referenced_type" : "type-7670",
-   "self_type" : "type-7671",
+   "referenced_type" : "type-7692",
+   "self_type" : "type-7693",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27663,24 +27702,6 @@
    "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,
@@ -27688,8 +27709,8 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> > *",
-   "name" : "const android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> > *",
+   "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-4501",
    "self_type" : "type-4502",
    "size" : 8,
@@ -27697,10 +27718,28 @@
   },
   {
    "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-4378",
+   "self_type" : "type-4379",
+   "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-4507",
+   "self_type" : "type-4508",
+   "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-4360",
-   "self_type" : "type-4361",
+   "referenced_type" : "type-4366",
+   "self_type" : "type-4367",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27708,8 +27747,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<int> *",
    "name" : "const android::hardware::Return<int> *",
-   "referenced_type" : "type-4701",
-   "self_type" : "type-4703",
+   "referenced_type" : "type-4708",
+   "self_type" : "type-4710",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27717,8 +27756,8 @@
    "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",
+   "referenced_type" : "type-7694",
+   "self_type" : "type-7695",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27780,8 +27819,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-4351",
-   "self_type" : "type-4352",
+   "referenced_type" : "type-4357",
+   "self_type" : "type-4358",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -27807,8 +27846,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-2462",
-   "self_type" : "type-2464",
+   "referenced_type" : "type-2465",
+   "self_type" : "type-2467",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27834,8 +27873,8 @@
    "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",
+   "referenced_type" : "type-4735",
+   "self_type" : "type-4736",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -27897,8 +27936,8 @@
    "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",
+   "referenced_type" : "type-4389",
+   "self_type" : "type-4390",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -27933,8 +27972,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-2621",
-   "self_type" : "type-2629",
+   "referenced_type" : "type-2624",
+   "self_type" : "type-2632",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27942,8 +27981,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-2619",
-   "self_type" : "type-2628",
+   "referenced_type" : "type-2622",
+   "self_type" : "type-2631",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27951,8 +27990,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-2615",
-   "self_type" : "type-2627",
+   "referenced_type" : "type-2618",
+   "self_type" : "type-2630",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27960,8 +27999,8 @@
    "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-2515",
+   "referenced_type" : "type-1312",
+   "self_type" : "type-2518",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27970,7 +28009,7 @@
    "linker_set_key" : "const android::sp<android::ALooper> *",
    "name" : "const android::sp<android::ALooper> *",
    "referenced_type" : "type-321",
-   "self_type" : "type-2279",
+   "self_type" : "type-2282",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27978,8 +28017,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::AMessage> *",
    "name" : "const android::sp<android::AMessage> *",
-   "referenced_type" : "type-2177",
-   "self_type" : "type-2205",
+   "referenced_type" : "type-2176",
+   "self_type" : "type-2208",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27996,8 +28035,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::ComponentWrapper> *",
    "name" : "const android::sp<android::ComponentWrapper> *",
-   "referenced_type" : "type-2493",
-   "self_type" : "type-2495",
+   "referenced_type" : "type-2496",
+   "self_type" : "type-2498",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28014,8 +28053,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::Fence> *",
    "name" : "const android::sp<android::Fence> *",
-   "referenced_type" : "type-1864",
-   "self_type" : "type-2531",
+   "referenced_type" : "type-1868",
+   "self_type" : "type-2534",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28023,8 +28062,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::FrameDropper> *",
    "name" : "const android::sp<android::FrameDropper> *",
-   "referenced_type" : "type-2508",
-   "self_type" : "type-2509",
+   "referenced_type" : "type-2511",
+   "self_type" : "type-2512",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28032,8 +28071,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::GraphicBuffer> *",
    "name" : "const android::sp<android::GraphicBuffer> *",
-   "referenced_type" : "type-1197",
-   "self_type" : "type-1196",
+   "referenced_type" : "type-1200",
+   "self_type" : "type-1199",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28041,8 +28080,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::GraphicBufferSource> *",
    "name" : "const android::sp<android::GraphicBufferSource> *",
-   "referenced_type" : "type-2546",
-   "self_type" : "type-2547",
+   "referenced_type" : "type-2549",
+   "self_type" : "type-2550",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28050,8 +28089,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
    "name" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
-   "referenced_type" : "type-4267",
-   "self_type" : "type-4266",
+   "referenced_type" : "type-4273",
+   "self_type" : "type-4272",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28059,8 +28098,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
    "name" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
-   "referenced_type" : "type-4276",
-   "self_type" : "type-4275",
+   "referenced_type" : "type-4282",
+   "self_type" : "type-4281",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28068,8 +28107,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
    "name" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
-   "referenced_type" : "type-4829",
-   "self_type" : "type-4842",
+   "referenced_type" : "type-4837",
+   "self_type" : "type-4848",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28077,8 +28116,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
    "name" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
-   "referenced_type" : "type-5110",
-   "self_type" : "type-5119",
+   "referenced_type" : "type-5126",
+   "self_type" : "type-5135",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28086,8 +28125,8 @@
    "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",
+   "referenced_type" : "type-4309",
+   "self_type" : "type-4393",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28095,8 +28134,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::IBinder> *",
    "name" : "const android::sp<android::IBinder> *",
-   "referenced_type" : "type-1037",
-   "self_type" : "type-1273",
+   "referenced_type" : "type-1041",
+   "self_type" : "type-1277",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28114,7 +28153,7 @@
    "linker_set_key" : "const android::sp<android::IGraphicBufferConsumer> *",
    "name" : "const android::sp<android::IGraphicBufferConsumer> *",
    "referenced_type" : "type-790",
-   "self_type" : "type-2502",
+   "self_type" : "type-2505",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28122,8 +28161,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer> *",
    "name" : "const android::sp<android::IGraphicBufferProducer> *",
-   "referenced_type" : "type-2487",
-   "self_type" : "type-2489",
+   "referenced_type" : "type-2490",
+   "self_type" : "type-2492",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28131,8 +28170,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::IInterface> *",
    "name" : "const android::sp<android::IInterface> *",
-   "referenced_type" : "type-1488",
-   "self_type" : "type-1494",
+   "referenced_type" : "type-1492",
+   "self_type" : "type-1498",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28150,7 +28189,7 @@
    "linker_set_key" : "const android::sp<android::NativeHandle> *",
    "name" : "const android::sp<android::NativeHandle> *",
    "referenced_type" : "type-935",
-   "self_type" : "type-1598",
+   "self_type" : "type-1602",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28158,8 +28197,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-2470",
-   "self_type" : "type-2471",
+   "referenced_type" : "type-2473",
+   "self_type" : "type-2474",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28167,8 +28206,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> *",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> *",
-   "referenced_type" : "type-2460",
-   "self_type" : "type-2461",
+   "referenced_type" : "type-2463",
+   "self_type" : "type-2464",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28176,8 +28215,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer> *",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer> *",
-   "referenced_type" : "type-4242",
-   "self_type" : "type-4281",
+   "referenced_type" : "type-4248",
+   "self_type" : "type-4287",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28185,8 +28224,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener> *",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener> *",
-   "referenced_type" : "type-4473",
-   "self_type" : "type-4472",
+   "referenced_type" : "type-4479",
+   "self_type" : "type-4478",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28194,8 +28233,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-2484",
-   "self_type" : "type-2485",
+   "referenced_type" : "type-2487",
+   "self_type" : "type-2488",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28203,8 +28242,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> *",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> *",
-   "referenced_type" : "type-2476",
-   "self_type" : "type-2477",
+   "referenced_type" : "type-2479",
+   "self_type" : "type-2480",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28212,8 +28251,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer> *",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer> *",
-   "referenced_type" : "type-4236",
-   "self_type" : "type-4279",
+   "referenced_type" : "type-4242",
+   "self_type" : "type-4285",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28221,8 +28260,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener> *",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener> *",
-   "referenced_type" : "type-4466",
-   "self_type" : "type-4465",
+   "referenced_type" : "type-4472",
+   "self_type" : "type-4471",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28231,7 +28270,7 @@
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient> *",
    "name" : "const android::sp<android::hardware::hidl_death_recipient> *",
    "referenced_type" : "type-514",
-   "self_type" : "type-2444",
+   "self_type" : "type-2447",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28239,8 +28278,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-2448",
-   "self_type" : "type-2449",
+   "referenced_type" : "type-2451",
+   "self_type" : "type-2452",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28248,8 +28287,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "referenced_type" : "type-2454",
-   "self_type" : "type-2455",
+   "referenced_type" : "type-2457",
+   "self_type" : "type-2458",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28284,8 +28323,8 @@
    "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",
+   "referenced_type" : "type-4299",
+   "self_type" : "type-4314",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28302,8 +28341,8 @@
    "alignment" : 8,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-1242",
-   "self_type" : "type-1241",
+   "referenced_type" : "type-1245",
+   "self_type" : "type-1244",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -28329,8 +28368,8 @@
    "alignment" : 8,
    "linker_set_key" : "const log_msg *",
    "name" : "const log_msg *",
-   "referenced_type" : "type-2315",
-   "self_type" : "type-2321",
+   "referenced_type" : "type-2318",
+   "self_type" : "type-2324",
    "size" : 8,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -28339,7 +28378,7 @@
    "linker_set_key" : "const long *",
    "name" : "const long *",
    "referenced_type" : "type-560",
-   "self_type" : "type-1069",
+   "self_type" : "type-1072",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28357,7 +28396,7 @@
    "linker_set_key" : "const signed char *",
    "name" : "const signed char *",
    "referenced_type" : "type-437",
-   "self_type" : "type-4727",
+   "self_type" : "type-4733",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28365,8 +28404,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-4763",
-   "self_type" : "type-4765",
+   "referenced_type" : "type-4770",
+   "self_type" : "type-4772",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28374,8 +28413,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-4866",
-   "self_type" : "type-4868",
+   "referenced_type" : "type-4872",
+   "self_type" : "type-4874",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28383,8 +28422,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-5085",
-   "self_type" : "type-5091",
+   "referenced_type" : "type-5101",
+   "self_type" : "type-5107",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28392,8 +28431,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-5138",
-   "self_type" : "type-5140",
+   "referenced_type" : "type-5154",
+   "self_type" : "type-5157",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28401,8 +28440,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-7374",
-   "self_type" : "type-7376",
+   "referenced_type" : "type-7397",
+   "self_type" : "type-7400",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28410,8 +28449,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-7468",
-   "self_type" : "type-7470",
+   "referenced_type" : "type-7493",
+   "self_type" : "type-7495",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28419,8 +28458,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-7596",
-   "self_type" : "type-7598",
+   "referenced_type" : "type-7619",
+   "self_type" : "type-7621",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28465,7 +28504,7 @@
    "linker_set_key" : "float *",
    "name" : "float *",
    "referenced_type" : "type-268",
-   "self_type" : "type-1276",
+   "self_type" : "type-1279",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28483,7 +28522,7 @@
    "linker_set_key" : "int *",
    "name" : "int *",
    "referenced_type" : "type-4",
-   "self_type" : "type-1510",
+   "self_type" : "type-1513",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28491,8 +28530,8 @@
    "alignment" : 8,
    "linker_set_key" : "log_msg *",
    "name" : "log_msg *",
-   "referenced_type" : "type-2178",
-   "self_type" : "type-2343",
+   "referenced_type" : "type-2181",
+   "self_type" : "type-2346",
    "size" : 8,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -28519,7 +28558,7 @@
    "linker_set_key" : "signed char *",
    "name" : "signed char *",
    "referenced_type" : "type-438",
-   "self_type" : "type-4734",
+   "self_type" : "type-4740",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28527,8 +28566,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<> *",
    "name" : "std::tuple<> *",
-   "referenced_type" : "type-1567",
-   "self_type" : "type-1566",
+   "referenced_type" : "type-1570",
+   "self_type" : "type-1569",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28536,429 +28575,6 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<> *",
    "name" : "std::tuple<> *",
-   "referenced_type" : "type-2074",
-   "self_type" : "type-2073",
-   "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-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,
@@ -28966,10 +28582,415 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "std::tuple<unsigned long> *",
-   "name" : "std::tuple<unsigned long> *",
-   "referenced_type" : "type-4165",
-   "self_type" : "type-4164",
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-4058",
+   "self_type" : "type-4057",
+   "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-4169",
+   "self_type" : "type-4168",
+   "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-6663",
+   "self_type" : "type-6662",
+   "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-6786",
+   "self_type" : "type-6785",
+   "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-2056",
+   "self_type" : "type-2055",
+   "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-4153",
+   "self_type" : "type-4152",
+   "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-6770",
+   "self_type" : "type-6769",
+   "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-1576",
+   "self_type" : "type-1575",
+   "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-4061",
+   "self_type" : "type-4060",
+   "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-6666",
+   "self_type" : "type-6665",
+   "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-2121",
+   "self_type" : "type-2120",
+   "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-4198",
+   "self_type" : "type-4197",
+   "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-6816",
+   "self_type" : "type-6815",
+   "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-2091",
+   "self_type" : "type-2090",
+   "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-4178",
+   "self_type" : "type-4177",
+   "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-6795",
+   "self_type" : "type-6794",
+   "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-2097",
+   "self_type" : "type-2096",
+   "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-4182",
+   "self_type" : "type-4181",
+   "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-6798",
+   "self_type" : "type-6797",
+   "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-2116",
+   "self_type" : "type-2115",
+   "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-4195",
+   "self_type" : "type-4194",
+   "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-6813",
+   "self_type" : "type-6812",
+   "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-2103",
+   "self_type" : "type-2102",
+   "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-4186",
+   "self_type" : "type-4185",
+   "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-6803",
+   "self_type" : "type-6802",
+   "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-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, sp<GraphicBuffer> > *",
+   "name" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "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<int, sp<GraphicBuffer> > *",
+   "name" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "referenced_type" : "type-6776",
+   "self_type" : "type-6775",
+   "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-2069",
+   "self_type" : "type-2068",
+   "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-4162",
+   "self_type" : "type-4161",
+   "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-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> *",
+   "name" : "std::tuple<int> *",
+   "referenced_type" : "type-2060",
+   "self_type" : "type-2059",
+   "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-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> *",
+   "name" : "std::tuple<int> *",
+   "referenced_type" : "type-6773",
+   "self_type" : "type-6772",
+   "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-2074",
+   "self_type" : "type-2073",
+   "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-4166",
+   "self_type" : "type-4165",
+   "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-6782",
+   "self_type" : "type-6781",
+   "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-2112",
+   "self_type" : "type-2111",
+   "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-4192",
+   "self_type" : "type-4191",
+   "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-6810",
+   "self_type" : "type-6809",
+   "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-2087",
+   "self_type" : "type-2086",
+   "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-4175",
+   "self_type" : "type-4174",
+   "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-6792",
+   "self_type" : "type-6791",
+   "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-2108",
+   "self_type" : "type-2107",
+   "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-4189",
+   "self_type" : "type-4188",
+   "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-6806",
+   "self_type" : "type-6805",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28977,8 +28998,26 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<unsigned long> *",
    "name" : "std::tuple<unsigned long> *",
-   "referenced_type" : "type-6765",
-   "self_type" : "type-6764",
+   "referenced_type" : "type-2082",
+   "self_type" : "type-2081",
+   "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-4172",
+   "self_type" : "type-4171",
+   "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-6789",
+   "self_type" : "type-6788",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28986,8 +29025,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > *",
    "name" : "std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > *",
-   "referenced_type" : "type-1650",
-   "self_type" : "type-1649",
+   "referenced_type" : "type-1654",
+   "self_type" : "type-1653",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -28995,8 +29034,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > *",
    "name" : "std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > *",
-   "referenced_type" : "type-4113",
-   "self_type" : "type-4112",
+   "referenced_type" : "type-4119",
+   "self_type" : "type-4118",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -29004,8 +29043,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > *",
    "name" : "std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > *",
-   "referenced_type" : "type-6699",
-   "self_type" : "type-6698",
+   "referenced_type" : "type-6722",
+   "self_type" : "type-6721",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -29013,8 +29052,8 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned char (*)[128]",
    "name" : "unsigned char (*)[128]",
-   "referenced_type" : "type-1528",
-   "self_type" : "type-2362",
+   "referenced_type" : "type-1530",
+   "self_type" : "type-2365",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -29032,7 +29071,7 @@
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
    "referenced_type" : "type-2",
-   "self_type" : "type-1682",
+   "self_type" : "type-1686",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -29041,7 +29080,7 @@
    "linker_set_key" : "unsigned long *",
    "name" : "unsigned long *",
    "referenced_type" : "type-11",
-   "self_type" : "type-1679",
+   "self_type" : "type-1683",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -29067,8 +29106,8 @@
    "alignment" : 8,
    "linker_set_key" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned long, const unsigned long long *, unsigned long, void *)",
    "name" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned long, const unsigned long long *, unsigned long, void *)",
-   "referenced_type" : "type-1381",
-   "self_type" : "type-1380",
+   "referenced_type" : "type-1384",
+   "self_type" : "type-1383",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -29108,8 +29147,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1079",
-   "self_type" : "type-1081",
+   "referenced_type" : "type-1082",
+   "self_type" : "type-1084",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29118,8 +29157,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1190",
-   "self_type" : "type-1192",
+   "referenced_type" : "type-1193",
+   "self_type" : "type-1196",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29128,8 +29167,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1352",
-   "self_type" : "type-1354",
+   "referenced_type" : "type-1355",
+   "self_type" : "type-1357",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29138,8 +29177,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1404",
-   "self_type" : "type-1406",
+   "referenced_type" : "type-1407",
+   "self_type" : "type-1409",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29148,8 +29187,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1422",
+   "referenced_type" : "type-1423",
+   "self_type" : "type-1425",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29158,8 +29197,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",
+   "referenced_type" : "type-1444",
+   "self_type" : "type-1446",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29168,8 +29207,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",
+   "referenced_type" : "type-1485",
+   "self_type" : "type-1488",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29178,8 +29217,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",
+   "referenced_type" : "type-1620",
+   "self_type" : "type-1622",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29188,8 +29227,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",
+   "referenced_type" : "type-2653",
+   "self_type" : "type-2656",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29198,8 +29237,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",
+   "referenced_type" : "type-3461",
+   "self_type" : "type-3463",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29208,8 +29247,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",
+   "referenced_type" : "type-3529",
+   "self_type" : "type-3531",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29218,8 +29257,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",
+   "referenced_type" : "type-3631",
+   "self_type" : "type-3633",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29228,8 +29267,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",
+   "referenced_type" : "type-3696",
+   "self_type" : "type-3698",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29238,8 +29277,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",
+   "referenced_type" : "type-3788",
+   "self_type" : "type-3790",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29248,8 +29287,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",
+   "referenced_type" : "type-3847",
+   "self_type" : "type-3846",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29258,8 +29297,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",
+   "referenced_type" : "type-3913",
+   "self_type" : "type-3915",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29268,8 +29307,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",
+   "referenced_type" : "type-3939",
+   "self_type" : "type-3941",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29278,8 +29317,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",
+   "referenced_type" : "type-3954",
+   "self_type" : "type-3956",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29288,8 +29327,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",
+   "referenced_type" : "type-3980",
+   "self_type" : "type-3982",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29298,8 +29337,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",
+   "referenced_type" : "type-4013",
+   "self_type" : "type-4015",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29308,8 +29347,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",
+   "referenced_type" : "type-4094",
+   "self_type" : "type-4096",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29318,8 +29357,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",
+   "referenced_type" : "type-4295",
+   "self_type" : "type-4297",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29328,8 +29367,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",
+   "referenced_type" : "type-4482",
+   "self_type" : "type-4484",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29338,8 +29377,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",
+   "referenced_type" : "type-4535",
+   "self_type" : "type-4537",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29348,8 +29387,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",
+   "referenced_type" : "type-4544",
+   "self_type" : "type-4546",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29358,8 +29397,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",
+   "referenced_type" : "type-4569",
+   "self_type" : "type-4571",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29368,8 +29407,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",
+   "referenced_type" : "type-4721",
+   "self_type" : "type-4723",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29378,8 +29417,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",
+   "referenced_type" : "type-4853",
+   "self_type" : "type-4855",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29388,8 +29427,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",
+   "referenced_type" : "type-4999",
+   "self_type" : "type-5001",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29398,8 +29437,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",
+   "referenced_type" : "type-5136",
+   "self_type" : "type-5138",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29408,8 +29447,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",
+   "referenced_type" : "type-5175",
+   "self_type" : "type-5177",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29418,8 +29457,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",
+   "referenced_type" : "type-5550",
+   "self_type" : "type-5552",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29428,8 +29467,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",
+   "referenced_type" : "type-5618",
+   "self_type" : "type-5620",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29448,8 +29487,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",
+   "referenced_type" : "type-5720",
+   "self_type" : "type-5722",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29458,8 +29497,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",
+   "referenced_type" : "type-5785",
+   "self_type" : "type-5787",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29468,8 +29507,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",
+   "referenced_type" : "type-5877",
+   "self_type" : "type-5879",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29478,8 +29517,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",
+   "referenced_type" : "type-5936",
+   "self_type" : "type-5935",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29488,8 +29527,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",
+   "referenced_type" : "type-6000",
+   "self_type" : "type-6002",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29498,8 +29537,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",
+   "referenced_type" : "type-6060",
+   "self_type" : "type-6062",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29508,8 +29547,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",
+   "referenced_type" : "type-6156",
+   "self_type" : "type-6158",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29518,8 +29557,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",
+   "referenced_type" : "type-6208",
+   "self_type" : "type-6210",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29528,8 +29567,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",
+   "referenced_type" : "type-6297",
+   "self_type" : "type-6299",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29538,8 +29577,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",
+   "referenced_type" : "type-6349",
+   "self_type" : "type-6351",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29548,8 +29587,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",
+   "referenced_type" : "type-6429",
+   "self_type" : "type-6431",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29558,8 +29597,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",
+   "referenced_type" : "type-6522",
+   "self_type" : "type-6524",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29568,8 +29607,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",
+   "referenced_type" : "type-6548",
+   "self_type" : "type-6551",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29578,8 +29617,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",
+   "referenced_type" : "type-6565",
+   "self_type" : "type-6567",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29588,8 +29627,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",
+   "referenced_type" : "type-6586",
+   "self_type" : "type-6588",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29598,8 +29637,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",
+   "referenced_type" : "type-6618",
+   "self_type" : "type-6620",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29608,8 +29647,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",
+   "referenced_type" : "type-6698",
+   "self_type" : "type-6700",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29618,8 +29657,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",
+   "referenced_type" : "type-6916",
+   "self_type" : "type-6918",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29628,8 +29667,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",
+   "referenced_type" : "type-7101",
+   "self_type" : "type-7103",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29638,8 +29677,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",
+   "referenced_type" : "type-7164",
+   "self_type" : "type-7166",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29648,8 +29687,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",
+   "referenced_type" : "type-7179",
+   "self_type" : "type-7181",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29658,8 +29697,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",
+   "referenced_type" : "type-7215",
+   "self_type" : "type-7217",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29668,8 +29707,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",
+   "referenced_type" : "type-7364",
+   "self_type" : "type-7366",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29688,8 +29727,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",
+   "referenced_type" : "type-7465",
+   "self_type" : "type-7467",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29698,8 +29737,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",
+   "referenced_type" : "type-7502",
+   "self_type" : "type-7504",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29708,8 +29747,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",
+   "referenced_type" : "type-7556",
+   "self_type" : "type-7558",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29718,8 +29757,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",
+   "referenced_type" : "type-7604",
+   "self_type" : "type-7610",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29728,8 +29767,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",
+   "referenced_type" : "type-7636",
+   "self_type" : "type-7638",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29738,8 +29777,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",
+   "referenced_type" : "type-7701",
+   "self_type" : "type-7703",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29768,8 +29807,8 @@
    "is_const" : true,
    "linker_set_key" : "android::hardware::IBinder *const",
    "name" : "android::hardware::IBinder *const",
-   "referenced_type" : "type-1359",
-   "self_type" : "type-1373",
+   "referenced_type" : "type-1362",
+   "self_type" : "type-1376",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -29779,7 +29818,7 @@
    "linker_set_key" : "const android::AHandler",
    "name" : "const android::AHandler",
    "referenced_type" : "type-264",
-   "self_type" : "type-2520",
+   "self_type" : "type-2523",
    "size" : 88,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29789,7 +29828,7 @@
    "linker_set_key" : "const android::AHandlerReflector<android::GraphicBufferSource>",
    "name" : "const android::AHandlerReflector<android::GraphicBufferSource>",
    "referenced_type" : "type-583",
-   "self_type" : "type-2516",
+   "self_type" : "type-2519",
    "size" : 104,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29799,7 +29838,7 @@
    "linker_set_key" : "const android::ALooper",
    "name" : "const android::ALooper",
    "referenced_type" : "type-248",
-   "self_type" : "type-2291",
+   "self_type" : "type-2294",
    "size" : 248,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29808,8 +29847,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AReplyToken",
    "name" : "const android::AReplyToken",
-   "referenced_type" : "type-1045",
-   "self_type" : "type-1170",
+   "referenced_type" : "type-1044",
+   "self_type" : "type-1171",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -29819,7 +29858,7 @@
    "linker_set_key" : "const android::AString",
    "name" : "const android::AString",
    "referenced_type" : "type-253",
-   "self_type" : "type-2101",
+   "self_type" : "type-2093",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -29849,7 +29888,7 @@
    "linker_set_key" : "const android::BnInterface<android::IGraphicBufferProducer>",
    "name" : "const android::BnInterface<android::IGraphicBufferProducer>",
    "referenced_type" : "type-73",
-   "self_type" : "type-1232",
+   "self_type" : "type-1236",
    "size" : 48,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -29859,7 +29898,7 @@
    "linker_set_key" : "const android::BnInterface<android::IProducerListener>",
    "name" : "const android::BnInterface<android::IProducerListener>",
    "referenced_type" : "type-82",
-   "self_type" : "type-4480",
+   "self_type" : "type-4486",
    "size" : 56,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -29868,8 +29907,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",
+   "referenced_type" : "type-1035",
+   "self_type" : "type-1097",
    "size" : 48,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -29888,8 +29927,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-1071",
-   "self_type" : "type-1070",
+   "referenced_type" : "type-1074",
+   "self_type" : "type-1073",
    "size" : 216,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -29898,8 +29937,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-1220",
-   "self_type" : "type-1219",
+   "referenced_type" : "type-1224",
+   "self_type" : "type-1223",
    "size" : 216,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -29908,8 +29947,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-1532",
-   "self_type" : "type-1531",
+   "referenced_type" : "type-1535",
+   "self_type" : "type-1534",
    "size" : 216,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -29918,8 +29957,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-1673",
-   "self_type" : "type-1672",
+   "referenced_type" : "type-1677",
+   "self_type" : "type-1676",
    "size" : 216,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -29928,8 +29967,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-3442",
-   "self_type" : "type-3441",
+   "referenced_type" : "type-3445",
+   "self_type" : "type-3444",
    "size" : 216,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -29938,8 +29977,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-3636",
-   "self_type" : "type-3635",
+   "referenced_type" : "type-3639",
+   "self_type" : "type-3638",
    "size" : 216,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -29948,8 +29987,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-3685",
-   "self_type" : "type-3684",
+   "referenced_type" : "type-3691",
+   "self_type" : "type-3690",
    "size" : 216,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -29958,8 +29997,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-3793",
-   "self_type" : "type-3792",
+   "referenced_type" : "type-3800",
+   "self_type" : "type-3799",
    "size" : 216,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -29968,8 +30007,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-4043",
-   "self_type" : "type-4042",
+   "referenced_type" : "type-4050",
+   "self_type" : "type-4049",
    "size" : 216,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -29978,8 +30017,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-4129",
-   "self_type" : "type-4128",
+   "referenced_type" : "type-4135",
+   "self_type" : "type-4134",
    "size" : 216,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -29988,8 +30027,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-5517",
-   "self_type" : "type-5516",
+   "referenced_type" : "type-5534",
+   "self_type" : "type-5533",
    "size" : 216,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -29998,8 +30037,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-5711",
-   "self_type" : "type-5710",
+   "referenced_type" : "type-5728",
+   "self_type" : "type-5727",
    "size" : 216,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30008,8 +30047,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-5760",
-   "self_type" : "type-5759",
+   "referenced_type" : "type-5780",
+   "self_type" : "type-5779",
    "size" : 216,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -30018,8 +30057,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-5868",
-   "self_type" : "type-5867",
+   "referenced_type" : "type-5889",
+   "self_type" : "type-5888",
    "size" : 216,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30028,8 +30067,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-6123",
-   "self_type" : "type-6122",
+   "referenced_type" : "type-6143",
+   "self_type" : "type-6142",
    "size" : 216,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -30038,8 +30077,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-6282",
-   "self_type" : "type-6281",
+   "referenced_type" : "type-6302",
+   "self_type" : "type-6301",
    "size" : 216,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30048,8 +30087,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-6324",
-   "self_type" : "type-6323",
+   "referenced_type" : "type-6347",
+   "self_type" : "type-6346",
    "size" : 216,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -30058,8 +30097,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-6415",
-   "self_type" : "type-6414",
+   "referenced_type" : "type-6438",
+   "self_type" : "type-6437",
    "size" : 216,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30068,8 +30107,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-6633",
-   "self_type" : "type-6632",
+   "referenced_type" : "type-6656",
+   "self_type" : "type-6655",
    "size" : 216,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -30078,8 +30117,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-6715",
-   "self_type" : "type-6714",
+   "referenced_type" : "type-6738",
+   "self_type" : "type-6737",
    "size" : 216,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -30108,9 +30147,9 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferQueueCore",
    "name" : "const android::BufferQueueCore",
-   "referenced_type" : "type-3524",
-   "self_type" : "type-3523",
-   "size" : 5224,
+   "referenced_type" : "type-3527",
+   "self_type" : "type-3526",
+   "size" : 5232,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -30118,9 +30157,9 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferQueueCore",
    "name" : "const android::BufferQueueCore",
-   "referenced_type" : "type-5599",
-   "self_type" : "type-5598",
-   "size" : 5224,
+   "referenced_type" : "type-5616",
+   "self_type" : "type-5615",
+   "size" : 5232,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -30128,9 +30167,9 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferQueueCore",
    "name" : "const android::BufferQueueCore",
-   "referenced_type" : "type-6185",
-   "self_type" : "type-6184",
-   "size" : 5224,
+   "referenced_type" : "type-6205",
+   "self_type" : "type-6204",
+   "size" : 5232,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -30140,7 +30179,7 @@
    "name" : "const android::BufferQueueCore",
    "referenced_type" : "type-833",
    "self_type" : "type-832",
-   "size" : 5224,
+   "size" : 5232,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -30149,7 +30188,7 @@
    "linker_set_key" : "const android::ComponentWrapper",
    "name" : "const android::ComponentWrapper",
    "referenced_type" : "type-569",
-   "self_type" : "type-2496",
+   "self_type" : "type-2499",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30158,8 +30197,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::CompositorTiming",
    "name" : "const android::CompositorTiming",
-   "referenced_type" : "type-1426",
-   "self_type" : "type-1425",
+   "referenced_type" : "type-1429",
+   "self_type" : "type-1428",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30168,8 +30207,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::CompositorTiming",
    "name" : "const android::CompositorTiming",
-   "referenced_type" : "type-3955",
-   "self_type" : "type-3954",
+   "referenced_type" : "type-3961",
+   "self_type" : "type-3960",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30178,8 +30217,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::CompositorTiming",
    "name" : "const android::CompositorTiming",
-   "referenced_type" : "type-6548",
-   "self_type" : "type-6547",
+   "referenced_type" : "type-6571",
+   "self_type" : "type-6570",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30188,8 +30227,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ConsumerListener",
    "name" : "const android::ConsumerListener",
-   "referenced_type" : "type-3516",
-   "self_type" : "type-3515",
+   "referenced_type" : "type-3519",
+   "self_type" : "type-3518",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30198,8 +30237,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ConsumerListener",
    "name" : "const android::ConsumerListener",
-   "referenced_type" : "type-5591",
-   "self_type" : "type-5590",
+   "referenced_type" : "type-5608",
+   "self_type" : "type-5607",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30208,8 +30247,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ConsumerListener",
    "name" : "const android::ConsumerListener",
-   "referenced_type" : "type-6180",
-   "self_type" : "type-6179",
+   "referenced_type" : "type-6200",
+   "self_type" : "type-6199",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30228,8 +30267,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-1310",
-   "self_type" : "type-1309",
+   "referenced_type" : "type-1314",
+   "self_type" : "type-1313",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30238,8 +30277,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-2533",
-   "self_type" : "type-2532",
+   "referenced_type" : "type-2536",
+   "self_type" : "type-2535",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30248,8 +30287,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-3449",
-   "self_type" : "type-3448",
+   "referenced_type" : "type-3452",
+   "self_type" : "type-3451",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30258,8 +30297,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-3596",
-   "self_type" : "type-3595",
+   "referenced_type" : "type-3599",
+   "self_type" : "type-3598",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30268,8 +30307,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-3861",
-   "self_type" : "type-3860",
+   "referenced_type" : "type-3868",
+   "self_type" : "type-3867",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30278,8 +30317,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-4426",
-   "self_type" : "type-4425",
+   "referenced_type" : "type-4432",
+   "self_type" : "type-4431",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30288,8 +30327,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-4676",
-   "self_type" : "type-4675",
+   "referenced_type" : "type-4683",
+   "self_type" : "type-4682",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30298,8 +30337,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-4945",
-   "self_type" : "type-4944",
+   "referenced_type" : "type-4951",
+   "self_type" : "type-4950",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30308,8 +30347,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-5524",
-   "self_type" : "type-5523",
+   "referenced_type" : "type-5541",
+   "self_type" : "type-5540",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30318,8 +30357,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-5671",
-   "self_type" : "type-5670",
+   "referenced_type" : "type-5688",
+   "self_type" : "type-5687",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30328,8 +30367,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-5936",
-   "self_type" : "type-5935",
+   "referenced_type" : "type-5957",
+   "self_type" : "type-5956",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30338,8 +30377,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-6017",
-   "self_type" : "type-6016",
+   "referenced_type" : "type-6037",
+   "self_type" : "type-6036",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30348,8 +30387,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-6128",
-   "self_type" : "type-6127",
+   "referenced_type" : "type-6148",
+   "self_type" : "type-6147",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30358,8 +30397,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-6256",
-   "self_type" : "type-6255",
+   "referenced_type" : "type-6276",
+   "self_type" : "type-6275",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30368,8 +30407,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-6456",
-   "self_type" : "type-6455",
+   "referenced_type" : "type-6480",
+   "self_type" : "type-6479",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30378,8 +30417,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-7030",
-   "self_type" : "type-7029",
+   "referenced_type" : "type-7054",
+   "self_type" : "type-7053",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30388,8 +30427,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-7207",
-   "self_type" : "type-7206",
+   "referenced_type" : "type-7229",
+   "self_type" : "type-7228",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30408,8 +30447,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-7317",
-   "self_type" : "type-7316",
+   "referenced_type" : "type-7340",
+   "self_type" : "type-7339",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30428,8 +30467,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot::State",
    "name" : "const android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-4583",
-   "self_type" : "type-4582",
+   "referenced_type" : "type-4589",
+   "self_type" : "type-4588",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30438,8 +30477,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot::State",
    "name" : "const android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-4752",
-   "self_type" : "type-4751",
+   "referenced_type" : "type-4758",
+   "self_type" : "type-4757",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30448,8 +30487,8 @@
    "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",
+   "referenced_type" : "type-7243",
+   "self_type" : "type-7242",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30458,8 +30497,8 @@
    "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",
+   "referenced_type" : "type-7389",
+   "self_type" : "type-7388",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30468,8 +30507,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FileDescriptor::Autoclose",
    "name" : "const android::FileDescriptor::Autoclose",
-   "referenced_type" : "type-1213",
-   "self_type" : "type-1230",
+   "referenced_type" : "type-1211",
+   "self_type" : "type-1228",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h"
   },
@@ -30479,7 +30518,7 @@
    "linker_set_key" : "const android::Flattenable<android::BufferItem>",
    "name" : "const android::Flattenable<android::BufferItem>",
    "referenced_type" : "type-22",
-   "self_type" : "type-1507",
+   "self_type" : "type-1510",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30489,7 +30528,7 @@
    "linker_set_key" : "const android::Flattenable<android::Fence>",
    "name" : "const android::Flattenable<android::Fence>",
    "referenced_type" : "type-17",
-   "self_type" : "type-1635",
+   "self_type" : "type-1639",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30499,7 +30538,7 @@
    "linker_set_key" : "const android::Flattenable<android::FrameEventHistoryDelta>",
    "name" : "const android::Flattenable<android::FrameEventHistoryDelta>",
    "referenced_type" : "type-26",
-   "self_type" : "type-4309",
+   "self_type" : "type-4315",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30509,7 +30548,7 @@
    "linker_set_key" : "const android::Flattenable<android::GraphicBuffer>",
    "name" : "const android::Flattenable<android::GraphicBuffer>",
    "referenced_type" : "type-15",
-   "self_type" : "type-1639",
+   "self_type" : "type-1644",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30519,7 +30558,7 @@
    "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
    "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
    "referenced_type" : "type-33",
-   "self_type" : "type-4312",
+   "self_type" : "type-4318",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30529,7 +30568,7 @@
    "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
    "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
    "referenced_type" : "type-35",
-   "self_type" : "type-4315",
+   "self_type" : "type-4321",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30539,7 +30578,7 @@
    "linker_set_key" : "const android::FrameDropper",
    "name" : "const android::FrameDropper",
    "referenced_type" : "type-580",
-   "self_type" : "type-2511",
+   "self_type" : "type-2514",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30548,8 +30587,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-1348",
-   "self_type" : "type-1347",
+   "referenced_type" : "type-1351",
+   "self_type" : "type-1350",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30558,8 +30597,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-1462",
-   "self_type" : "type-1461",
+   "referenced_type" : "type-1466",
+   "self_type" : "type-1465",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30568,8 +30607,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-2406",
-   "self_type" : "type-2405",
+   "referenced_type" : "type-2409",
+   "self_type" : "type-2408",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30578,8 +30617,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-3455",
-   "self_type" : "type-3454",
+   "referenced_type" : "type-3458",
+   "self_type" : "type-3457",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30588,8 +30627,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-3601",
-   "self_type" : "type-3600",
+   "referenced_type" : "type-3604",
+   "self_type" : "type-3603",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30598,8 +30637,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-3901",
-   "self_type" : "type-3900",
+   "referenced_type" : "type-3907",
+   "self_type" : "type-3906",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30608,8 +30647,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-3994",
-   "self_type" : "type-3993",
+   "referenced_type" : "type-4000",
+   "self_type" : "type-3999",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30618,8 +30657,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-4222",
-   "self_type" : "type-4221",
+   "referenced_type" : "type-4228",
+   "self_type" : "type-4227",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30628,8 +30667,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-4838",
-   "self_type" : "type-4837",
+   "referenced_type" : "type-4844",
+   "self_type" : "type-4843",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30638,8 +30677,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-5530",
-   "self_type" : "type-5529",
+   "referenced_type" : "type-5547",
+   "self_type" : "type-5546",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30648,8 +30687,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-5676",
-   "self_type" : "type-5675",
+   "referenced_type" : "type-5693",
+   "self_type" : "type-5692",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30658,8 +30697,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-5976",
-   "self_type" : "type-5975",
+   "referenced_type" : "type-5996",
+   "self_type" : "type-5995",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30668,8 +30707,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-5993",
-   "self_type" : "type-5992",
+   "referenced_type" : "type-6013",
+   "self_type" : "type-6012",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30678,8 +30717,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-6133",
-   "self_type" : "type-6132",
+   "referenced_type" : "type-6154",
+   "self_type" : "type-6153",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30688,8 +30727,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-6261",
-   "self_type" : "type-6260",
+   "referenced_type" : "type-6281",
+   "self_type" : "type-6280",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30698,8 +30737,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-6494",
-   "self_type" : "type-6493",
+   "referenced_type" : "type-6518",
+   "self_type" : "type-6517",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30708,8 +30747,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-6582",
-   "self_type" : "type-6581",
+   "referenced_type" : "type-6605",
+   "self_type" : "type-6604",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30718,8 +30757,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-6827",
-   "self_type" : "type-6826",
+   "referenced_type" : "type-6850",
+   "self_type" : "type-6849",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30728,8 +30767,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-6838",
-   "self_type" : "type-6837",
+   "referenced_type" : "type-6861",
+   "self_type" : "type-6860",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30759,7 +30798,7 @@
    "linker_set_key" : "const android::GraphicBufferSource",
    "name" : "const android::GraphicBufferSource",
    "referenced_type" : "type-566",
-   "self_type" : "type-2548",
+   "self_type" : "type-2551",
    "size" : 432,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30789,7 +30828,7 @@
    "linker_set_key" : "const android::IBinder",
    "name" : "const android::IBinder",
    "referenced_type" : "type-53",
-   "self_type" : "type-1520",
+   "self_type" : "type-1524",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30799,7 +30838,7 @@
    "linker_set_key" : "const android::IBinder::DeathRecipient",
    "name" : "const android::IBinder::DeathRecipient",
    "referenced_type" : "type-176",
-   "self_type" : "type-4318",
+   "self_type" : "type-4324",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -30808,8 +30847,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-1157",
-   "self_type" : "type-1156",
+   "referenced_type" : "type-1160",
+   "self_type" : "type-1159",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30818,8 +30857,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-1582",
-   "self_type" : "type-1581",
+   "referenced_type" : "type-1586",
+   "self_type" : "type-1585",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30828,8 +30867,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-3614",
-   "self_type" : "type-3613",
+   "referenced_type" : "type-3617",
+   "self_type" : "type-3616",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30838,8 +30877,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-3761",
-   "self_type" : "type-3760",
+   "referenced_type" : "type-3767",
+   "self_type" : "type-3766",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30848,8 +30887,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-4063",
-   "self_type" : "type-4062",
+   "referenced_type" : "type-4069",
+   "self_type" : "type-4068",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30858,8 +30897,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-5689",
-   "self_type" : "type-5688",
+   "referenced_type" : "type-5706",
+   "self_type" : "type-5705",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30868,8 +30907,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-5836",
-   "self_type" : "type-5835",
+   "referenced_type" : "type-5856",
+   "self_type" : "type-5855",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30878,8 +30917,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-6266",
-   "self_type" : "type-6265",
+   "referenced_type" : "type-6287",
+   "self_type" : "type-6286",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30888,8 +30927,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-6391",
-   "self_type" : "type-6390",
+   "referenced_type" : "type-6414",
+   "self_type" : "type-6413",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30898,8 +30937,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-6650",
-   "self_type" : "type-6649",
+   "referenced_type" : "type-6673",
+   "self_type" : "type-6672",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30918,8 +30957,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-1606",
-   "self_type" : "type-1605",
+   "referenced_type" : "type-1610",
+   "self_type" : "type-1609",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30928,8 +30967,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-2504",
-   "self_type" : "type-2503",
+   "referenced_type" : "type-2507",
+   "self_type" : "type-2506",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30938,8 +30977,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-3497",
-   "self_type" : "type-3496",
+   "referenced_type" : "type-3500",
+   "self_type" : "type-3499",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30948,8 +30987,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-4080",
-   "self_type" : "type-4079",
+   "referenced_type" : "type-4086",
+   "self_type" : "type-4085",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30958,8 +30997,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-4918",
-   "self_type" : "type-4917",
+   "referenced_type" : "type-4924",
+   "self_type" : "type-4923",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30968,8 +31007,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-5572",
-   "self_type" : "type-5571",
+   "referenced_type" : "type-5589",
+   "self_type" : "type-5588",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30978,8 +31017,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-6010",
-   "self_type" : "type-6009",
+   "referenced_type" : "type-6030",
+   "self_type" : "type-6029",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30988,8 +31027,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-6166",
-   "self_type" : "type-6165",
+   "referenced_type" : "type-6186",
+   "self_type" : "type-6185",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30998,8 +31037,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-6665",
-   "self_type" : "type-6664",
+   "referenced_type" : "type-6688",
+   "self_type" : "type-6687",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31008,8 +31047,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-7152",
-   "self_type" : "type-7151",
+   "referenced_type" : "type-7175",
+   "self_type" : "type-7174",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31028,8 +31067,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferProducer",
    "name" : "const android::IGraphicBufferProducer",
-   "referenced_type" : "type-3507",
-   "self_type" : "type-3506",
+   "referenced_type" : "type-3510",
+   "self_type" : "type-3509",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31038,8 +31077,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferProducer",
    "name" : "const android::IGraphicBufferProducer",
-   "referenced_type" : "type-4251",
-   "self_type" : "type-4250",
+   "referenced_type" : "type-4257",
+   "self_type" : "type-4256",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31048,8 +31087,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferProducer",
    "name" : "const android::IGraphicBufferProducer",
-   "referenced_type" : "type-5582",
-   "self_type" : "type-5581",
+   "referenced_type" : "type-5599",
+   "self_type" : "type-5598",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31058,8 +31097,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferProducer",
    "name" : "const android::IGraphicBufferProducer",
-   "referenced_type" : "type-6175",
-   "self_type" : "type-6174",
+   "referenced_type" : "type-6195",
+   "self_type" : "type-6194",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31068,8 +31107,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferProducer",
    "name" : "const android::IGraphicBufferProducer",
-   "referenced_type" : "type-6861",
-   "self_type" : "type-6860",
+   "referenced_type" : "type-6884",
+   "self_type" : "type-6883",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31088,8 +31127,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-1162",
-   "self_type" : "type-1161",
+   "referenced_type" : "type-1033",
+   "self_type" : "type-1032",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31098,8 +31137,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-3626",
-   "self_type" : "type-3625",
+   "referenced_type" : "type-1165",
+   "self_type" : "type-1164",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31108,8 +31147,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-3768",
-   "self_type" : "type-3767",
+   "referenced_type" : "type-3629",
+   "self_type" : "type-3628",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31118,8 +31157,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-4257",
-   "self_type" : "type-4256",
+   "referenced_type" : "type-3673",
+   "self_type" : "type-3672",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31128,8 +31167,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-4453",
-   "self_type" : "type-4452",
+   "referenced_type" : "type-3774",
+   "self_type" : "type-3773",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31138,8 +31177,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-4693",
-   "self_type" : "type-4692",
+   "referenced_type" : "type-4263",
+   "self_type" : "type-4262",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31148,8 +31187,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-5701",
-   "self_type" : "type-5700",
+   "referenced_type" : "type-4460",
+   "self_type" : "type-4459",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31158,8 +31197,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-5843",
-   "self_type" : "type-5842",
+   "referenced_type" : "type-4700",
+   "self_type" : "type-4699",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31168,8 +31207,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-6274",
-   "self_type" : "type-6273",
+   "referenced_type" : "type-5718",
+   "self_type" : "type-5717",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31178,8 +31217,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-6396",
-   "self_type" : "type-6395",
+   "referenced_type" : "type-5762",
+   "self_type" : "type-5761",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31188,8 +31227,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-6867",
-   "self_type" : "type-6866",
+   "referenced_type" : "type-5863",
+   "self_type" : "type-5862",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31198,8 +31237,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-7060",
-   "self_type" : "type-7059",
+   "referenced_type" : "type-6294",
+   "self_type" : "type-6293",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31208,8 +31247,48 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-7330",
-   "self_type" : "type-7329",
+   "referenced_type" : "type-6338",
+   "self_type" : "type-6337",
+   "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-6419",
+   "self_type" : "type-6418",
+   "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-6890",
+   "self_type" : "type-6889",
+   "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-7084",
+   "self_type" : "type-7083",
+   "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-7353",
+   "self_type" : "type-7352",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31249,7 +31328,7 @@
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect>",
    "name" : "const android::LightFlattenablePod<android::Rect>",
    "referenced_type" : "type-48",
-   "self_type" : "type-4590",
+   "self_type" : "type-4597",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -31268,8 +31347,8 @@
    "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",
+   "referenced_type" : "type-1214",
+   "self_type" : "type-1233",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -31279,7 +31358,7 @@
    "linker_set_key" : "const android::LightRefBase<android::NativeHandle>",
    "name" : "const android::LightRefBase<android::NativeHandle>",
    "referenced_type" : "type-522",
-   "self_type" : "type-2665",
+   "self_type" : "type-2668",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -31428,8 +31507,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",
+   "referenced_type" : "type-1520",
+   "self_type" : "type-1525",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -31438,8 +31517,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",
+   "referenced_type" : "type-1663",
+   "self_type" : "type-1667",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -31448,8 +31527,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",
+   "referenced_type" : "type-4337",
+   "self_type" : "type-4340",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -31458,8 +31537,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",
+   "referenced_type" : "type-1658",
+   "self_type" : "type-1661",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -31468,8 +31547,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",
+   "referenced_type" : "type-4343",
+   "self_type" : "type-4346",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -31478,8 +31557,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",
+   "referenced_type" : "type-4348",
+   "self_type" : "type-4351",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -31508,8 +31587,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-1216",
-   "self_type" : "type-1215",
+   "referenced_type" : "type-1219",
+   "self_type" : "type-1218",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31518,8 +31597,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-1491",
-   "self_type" : "type-1490",
+   "referenced_type" : "type-1495",
+   "self_type" : "type-1494",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31528,8 +31607,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-1623",
-   "self_type" : "type-1622",
+   "referenced_type" : "type-1626",
+   "self_type" : "type-1625",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31538,8 +31617,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-2686",
-   "self_type" : "type-2685",
+   "referenced_type" : "type-2689",
+   "self_type" : "type-2688",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31548,8 +31627,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-3467",
-   "self_type" : "type-3466",
+   "referenced_type" : "type-3470",
+   "self_type" : "type-3469",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -31558,8 +31637,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-3789",
-   "self_type" : "type-3788",
+   "referenced_type" : "type-3795",
+   "self_type" : "type-3794",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31568,8 +31647,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4014",
-   "self_type" : "type-4013",
+   "referenced_type" : "type-4020",
+   "self_type" : "type-4019",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31578,8 +31657,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4093",
-   "self_type" : "type-4092",
+   "referenced_type" : "type-4099",
+   "self_type" : "type-4098",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31588,8 +31667,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4296",
-   "self_type" : "type-4295",
+   "referenced_type" : "type-4302",
+   "self_type" : "type-4301",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31598,8 +31677,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4576",
-   "self_type" : "type-4575",
+   "referenced_type" : "type-4582",
+   "self_type" : "type-4581",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31608,8 +31687,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4740",
-   "self_type" : "type-4739",
+   "referenced_type" : "type-4747",
+   "self_type" : "type-4746",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31618,8 +31697,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-5023",
-   "self_type" : "type-5022",
+   "referenced_type" : "type-5029",
+   "self_type" : "type-5028",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31628,8 +31707,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-5081",
-   "self_type" : "type-5080",
+   "referenced_type" : "type-5097",
+   "self_type" : "type-5096",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31638,8 +31717,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-5542",
-   "self_type" : "type-5541",
+   "referenced_type" : "type-5559",
+   "self_type" : "type-5558",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -31648,8 +31727,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-5864",
-   "self_type" : "type-5863",
+   "referenced_type" : "type-5884",
+   "self_type" : "type-5883",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31658,8 +31737,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-6047",
-   "self_type" : "type-6046",
+   "referenced_type" : "type-6067",
+   "self_type" : "type-6066",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31668,8 +31747,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-6145",
-   "self_type" : "type-6144",
+   "referenced_type" : "type-6165",
+   "self_type" : "type-6164",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -31678,8 +31757,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-6411",
-   "self_type" : "type-6410",
+   "referenced_type" : "type-6434",
+   "self_type" : "type-6433",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31688,8 +31767,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-6601",
-   "self_type" : "type-6600",
+   "referenced_type" : "type-6625",
+   "self_type" : "type-6624",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31698,8 +31777,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-6680",
-   "self_type" : "type-6679",
+   "referenced_type" : "type-6703",
+   "self_type" : "type-6702",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31708,8 +31787,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-6900",
-   "self_type" : "type-6899",
+   "referenced_type" : "type-6923",
+   "self_type" : "type-6922",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31718,8 +31797,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-7210",
-   "self_type" : "type-7209",
+   "referenced_type" : "type-7234",
+   "self_type" : "type-7233",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31728,8 +31807,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-7357",
-   "self_type" : "type-7356",
+   "referenced_type" : "type-7380",
+   "self_type" : "type-7379",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31738,8 +31817,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-7583",
-   "self_type" : "type-7582",
+   "referenced_type" : "type-7608",
+   "self_type" : "type-7607",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31758,8 +31837,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-7680",
-   "self_type" : "type-7679",
+   "referenced_type" : "type-7700",
+   "self_type" : "type-7699",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31769,7 +31848,7 @@
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
    "referenced_type" : "type-54",
-   "self_type" : "type-1450",
+   "self_type" : "type-1453",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -31778,8 +31857,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SafeBpInterface<android::IConsumerListener>",
    "name" : "const android::SafeBpInterface<android::IConsumerListener>",
-   "referenced_type" : "type-1538",
-   "self_type" : "type-1552",
+   "referenced_type" : "type-1542",
+   "self_type" : "type-1555",
    "size" : 72,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -31788,8 +31867,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",
+   "referenced_type" : "type-1722",
+   "self_type" : "type-1892",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -31798,8 +31877,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SafeInterface::ParcelHandler",
    "name" : "const android::SafeInterface::ParcelHandler",
-   "referenced_type" : "type-1236",
-   "self_type" : "type-1266",
+   "referenced_type" : "type-1239",
+   "self_type" : "type-1269",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -31809,7 +31888,7 @@
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
    "name" : "const android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
    "referenced_type" : "type-163",
-   "self_type" : "type-2677",
+   "self_type" : "type-2680",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -31819,7 +31898,7 @@
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "const android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "referenced_type" : "type-149",
-   "self_type" : "type-2673",
+   "self_type" : "type-2676",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -31829,7 +31908,7 @@
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "const android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
    "referenced_type" : "type-141",
-   "self_type" : "type-2669",
+   "self_type" : "type-2672",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -31838,8 +31917,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-1240",
-   "self_type" : "type-1248",
+   "referenced_type" : "type-1243",
+   "self_type" : "type-1251",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -31849,7 +31928,7 @@
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
    "referenced_type" : "type-123",
-   "self_type" : "type-1877",
+   "self_type" : "type-1881",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -31859,7 +31938,7 @@
    "linker_set_key" : "const android::Vector<android::BufferItem>",
    "name" : "const android::Vector<android::BufferItem>",
    "referenced_type" : "type-838",
-   "self_type" : "type-978",
+   "self_type" : "type-980",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31868,8 +31947,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<android::Rect>",
    "name" : "const android::Vector<android::Rect>",
-   "referenced_type" : "type-2679",
-   "self_type" : "type-2681",
+   "referenced_type" : "type-2682",
+   "self_type" : "type-2684",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31878,8 +31957,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",
+   "referenced_type" : "type-1229",
+   "self_type" : "type-1231",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31888,8 +31967,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<int>",
    "name" : "const android::Vector<int>",
-   "referenced_type" : "type-2688",
-   "self_type" : "type-2690",
+   "referenced_type" : "type-2691",
+   "self_type" : "type-2693",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31898,8 +31977,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<long>",
    "name" : "const android::Vector<long>",
-   "referenced_type" : "type-1082",
-   "self_type" : "type-1084",
+   "referenced_type" : "type-1085",
+   "self_type" : "type-1087",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31909,7 +31988,7 @@
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
    "referenced_type" : "type-143",
-   "self_type" : "type-2666",
+   "self_type" : "type-2669",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -31918,8 +31997,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::base::ErrnoRestorer",
    "name" : "const android::base::ErrnoRestorer",
-   "referenced_type" : "type-4660",
-   "self_type" : "type-4659",
+   "referenced_type" : "type-4667",
+   "self_type" : "type-4666",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -31928,8 +32007,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
-   "referenced_type" : "type-2555",
-   "self_type" : "type-2582",
+   "referenced_type" : "type-2558",
+   "self_type" : "type-2585",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -31948,8 +32027,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::BpHwRefBase",
    "name" : "const android::hardware::BpHwRefBase",
-   "referenced_type" : "type-1372",
-   "self_type" : "type-1375",
+   "referenced_type" : "type-1375",
+   "self_type" : "type-1378",
    "size" : 48,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -31958,8 +32037,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1378",
-   "self_type" : "type-1386",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1389",
    "size" : 136,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -31968,8 +32047,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",
+   "referenced_type" : "type-7547",
+   "self_type" : "type-7692",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -31978,26 +32057,6 @@
    "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-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,
@@ -32006,8 +32065,8 @@
   {
    "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> >",
+   "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-4497",
    "self_type" : "type-4501",
    "size" : 48,
@@ -32016,10 +32075,30 @@
   {
    "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-4374",
+   "self_type" : "type-4378",
+   "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-4503",
+   "self_type" : "type-4507",
+   "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",
+   "referenced_type" : "type-4362",
+   "self_type" : "type-4366",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32029,7 +32108,7 @@
    "linker_set_key" : "const android::hardware::Return<int>",
    "name" : "const android::hardware::Return<int>",
    "referenced_type" : "type-415",
-   "self_type" : "type-4701",
+   "self_type" : "type-4708",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32038,8 +32117,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",
+   "referenced_type" : "type-7551",
+   "self_type" : "type-7694",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32109,7 +32188,7 @@
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned char>",
    "name" : "const android::hardware::details::hidl_pointer<unsigned char>",
    "referenced_type" : "type-391",
-   "self_type" : "type-4351",
+   "self_type" : "type-4357",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -32139,7 +32218,7 @@
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming",
    "referenced_type" : "type-588",
-   "self_type" : "type-4585",
+   "self_type" : "type-4591",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -32178,8 +32257,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-2458",
-   "self_type" : "type-2462",
+   "referenced_type" : "type-2461",
+   "self_type" : "type-2465",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32409,7 +32488,7 @@
    "linker_set_key" : "const android::hardware::hidl_array<float, 16>",
    "name" : "const android::hardware::hidl_array<float, 16>",
    "referenced_type" : "type-484",
-   "self_type" : "type-4728",
+   "self_type" : "type-4735",
    "size" : 64,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -32499,7 +32578,7 @@
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned char>",
    "name" : "const android::hardware::hidl_vec<unsigned char>",
    "referenced_type" : "type-453",
-   "self_type" : "type-4383",
+   "self_type" : "type-4389",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -32559,7 +32638,7 @@
    "linker_set_key" : "const android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "const android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "referenced_type" : "type-164",
-   "self_type" : "type-2621",
+   "self_type" : "type-2624",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32569,7 +32648,7 @@
    "linker_set_key" : "const android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "name" : "const android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "referenced_type" : "type-150",
-   "self_type" : "type-2619",
+   "self_type" : "type-2622",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32579,7 +32658,7 @@
    "linker_set_key" : "const android::key_value_pair_t<unsigned int, unsigned int>",
    "name" : "const android::key_value_pair_t<unsigned int, unsigned int>",
    "referenced_type" : "type-146",
-   "self_type" : "type-2615",
+   "self_type" : "type-2618",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32587,32 +32666,32 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer>",
    "name" : "const android::sp<ANativeWindowBuffer>",
-   "referenced_type" : "type-2412",
-   "self_type" : "type-2411",
+   "referenced_type" : "type-2415",
+   "self_type" : "type-2414",
    "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",
+   "referenced_type" : "type-4852",
+   "self_type" : "type-4851",
    "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",
+   "referenced_type" : "type-6015",
+   "self_type" : "type-6014",
    "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",
+   "referenced_type" : "type-6854",
+   "self_type" : "type-6853",
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
   {
@@ -32621,7 +32700,7 @@
    "linker_set_key" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
    "name" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
    "referenced_type" : "type-581",
-   "self_type" : "type-1311",
+   "self_type" : "type-1312",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32641,7 +32720,7 @@
    "linker_set_key" : "const android::sp<android::AMessage>",
    "name" : "const android::sp<android::AMessage>",
    "referenced_type" : "type-259",
-   "self_type" : "type-2177",
+   "self_type" : "type-2176",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32650,8 +32729,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",
+   "referenced_type" : "type-4237",
+   "self_type" : "type-4236",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32660,8 +32739,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",
+   "referenced_type" : "type-4464",
+   "self_type" : "type-4525",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32681,7 +32760,7 @@
    "linker_set_key" : "const android::sp<android::ComponentWrapper>",
    "name" : "const android::sp<android::ComponentWrapper>",
    "referenced_type" : "type-567",
-   "self_type" : "type-2493",
+   "self_type" : "type-2496",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32700,8 +32779,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::Fence>",
    "name" : "const android::sp<android::Fence>",
-   "referenced_type" : "type-1865",
-   "self_type" : "type-1864",
+   "referenced_type" : "type-1869",
+   "self_type" : "type-1868",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32711,7 +32790,7 @@
    "linker_set_key" : "const android::sp<android::FrameDropper>",
    "name" : "const android::sp<android::FrameDropper>",
    "referenced_type" : "type-578",
-   "self_type" : "type-2508",
+   "self_type" : "type-2511",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32721,7 +32800,7 @@
    "linker_set_key" : "const android::sp<android::GraphicBuffer>",
    "name" : "const android::sp<android::GraphicBuffer>",
    "referenced_type" : "type-733",
-   "self_type" : "type-1197",
+   "self_type" : "type-1200",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32740,8 +32819,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::GraphicBufferSource>",
    "name" : "const android::sp<android::GraphicBufferSource>",
-   "referenced_type" : "type-2544",
-   "self_type" : "type-2546",
+   "referenced_type" : "type-2547",
+   "self_type" : "type-2549",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32750,8 +32829,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",
+   "referenced_type" : "type-4268",
+   "self_type" : "type-4273",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32760,8 +32839,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",
+   "referenced_type" : "type-4277",
+   "self_type" : "type-4282",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32770,8 +32849,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",
+   "referenced_type" : "type-4838",
+   "self_type" : "type-4837",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32780,8 +32859,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",
+   "referenced_type" : "type-5127",
+   "self_type" : "type-5126",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32791,7 +32870,7 @@
    "linker_set_key" : "const android::sp<android::IBinder::DeathRecipient>",
    "name" : "const android::sp<android::IBinder::DeathRecipient>",
    "referenced_type" : "type-844",
-   "self_type" : "type-4303",
+   "self_type" : "type-4309",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32801,7 +32880,7 @@
    "linker_set_key" : "const android::sp<android::IBinder>",
    "name" : "const android::sp<android::IBinder>",
    "referenced_type" : "type-796",
-   "self_type" : "type-1037",
+   "self_type" : "type-1041",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32831,7 +32910,7 @@
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer>",
    "name" : "const android::sp<android::IGraphicBufferProducer>",
    "referenced_type" : "type-570",
-   "self_type" : "type-2487",
+   "self_type" : "type-2490",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32841,7 +32920,7 @@
    "linker_set_key" : "const android::sp<android::IInterface>",
    "name" : "const android::sp<android::IInterface>",
    "referenced_type" : "type-646",
-   "self_type" : "type-1488",
+   "self_type" : "type-1492",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32860,8 +32939,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",
+   "referenced_type" : "type-1045",
+   "self_type" : "type-1050",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32880,8 +32959,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",
+   "referenced_type" : "type-1262",
+   "self_type" : "type-1261",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -32890,8 +32969,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",
+   "referenced_type" : "type-1371",
+   "self_type" : "type-1393",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -32900,8 +32979,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",
+   "referenced_type" : "type-1398",
+   "self_type" : "type-1397",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -32910,8 +32989,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-2465",
-   "self_type" : "type-2470",
+   "referenced_type" : "type-2468",
+   "self_type" : "type-2473",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32920,8 +32999,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener>",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener>",
-   "referenced_type" : "type-2456",
-   "self_type" : "type-2460",
+   "referenced_type" : "type-2459",
+   "self_type" : "type-2463",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32930,8 +33009,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",
+   "referenced_type" : "type-4249",
+   "self_type" : "type-4248",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32940,8 +33019,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",
+   "referenced_type" : "type-4476",
+   "self_type" : "type-4479",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32950,8 +33029,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-2478",
-   "self_type" : "type-2484",
+   "referenced_type" : "type-2481",
+   "self_type" : "type-2487",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32960,8 +33039,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener>",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener>",
-   "referenced_type" : "type-2472",
-   "self_type" : "type-2476",
+   "referenced_type" : "type-2475",
+   "self_type" : "type-2479",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32970,8 +33049,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",
+   "referenced_type" : "type-4243",
+   "self_type" : "type-4242",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32980,8 +33059,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",
+   "referenced_type" : "type-4469",
+   "self_type" : "type-4472",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33000,8 +33079,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-2446",
-   "self_type" : "type-2448",
+   "referenced_type" : "type-2449",
+   "self_type" : "type-2451",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33010,8 +33089,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification>",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification>",
-   "referenced_type" : "type-2450",
-   "self_type" : "type-2454",
+   "referenced_type" : "type-2453",
+   "self_type" : "type-2457",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33051,7 +33130,7 @@
    "linker_set_key" : "const android::wp<android::IBinder::DeathRecipient>",
    "name" : "const android::wp<android::IBinder::DeathRecipient>",
    "referenced_type" : "type-174",
-   "self_type" : "type-4293",
+   "self_type" : "type-4299",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33061,7 +33140,7 @@
    "linker_set_key" : "const android::wp<android::IBinder>",
    "name" : "const android::wp<android::IBinder>",
    "referenced_type" : "type-131",
-   "self_type" : "type-4283",
+   "self_type" : "type-4289",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33071,7 +33150,7 @@
    "linker_set_key" : "const android_cta861_3_metadata",
    "name" : "const android_cta861_3_metadata",
    "referenced_type" : "type-306",
-   "self_type" : "type-1473",
+   "self_type" : "type-1477",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -33091,7 +33170,7 @@
    "linker_set_key" : "const android_smpte2086_metadata",
    "name" : "const android_smpte2086_metadata",
    "referenced_type" : "type-305",
-   "self_type" : "type-1471",
+   "self_type" : "type-1475",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -33121,7 +33200,7 @@
    "linker_set_key" : "const char *const",
    "name" : "const char *const",
    "referenced_type" : "type-124",
-   "self_type" : "type-1104",
+   "self_type" : "type-1107",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -33130,8 +33209,8 @@
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-1243",
-   "self_type" : "type-1242",
+   "referenced_type" : "type-1246",
+   "self_type" : "type-1245",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -33177,72 +33256,64 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1111",
-   "self_type" : "type-1110",
+   "referenced_type" : "type-1114",
+   "self_type" : "type-1113",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1283",
-   "self_type" : "type-1282",
+   "referenced_type" : "type-1286",
+   "self_type" : "type-1285",
    "source_file" : "/system/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",
+   "referenced_type" : "type-3311",
+   "self_type" : "type-3310",
    "source_file" : "/system/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",
+   "referenced_type" : "type-3544",
+   "self_type" : "type-3543",
    "source_file" : "/system/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",
+   "referenced_type" : "type-3653",
+   "self_type" : "type-3652",
    "source_file" : "/system/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",
+   "referenced_type" : "type-3719",
+   "self_type" : "type-3718",
    "source_file" : "/system/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",
+   "referenced_type" : "type-3841",
+   "self_type" : "type-3840",
    "source_file" : "/system/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",
+   "referenced_type" : "type-4382",
+   "self_type" : "type-4381",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -33257,208 +33328,216 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-4542",
-   "self_type" : "type-4541",
+   "referenced_type" : "type-4511",
+   "self_type" : "type-4510",
    "source_file" : "/system/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",
+   "referenced_type" : "type-4548",
+   "self_type" : "type-4547",
    "source_file" : "/system/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",
+   "referenced_type" : "type-4573",
+   "self_type" : "type-4572",
    "source_file" : "/system/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",
+   "referenced_type" : "type-4728",
+   "self_type" : "type-4727",
    "source_file" : "/system/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",
+   "referenced_type" : "type-4857",
+   "self_type" : "type-4856",
    "source_file" : "/system/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",
+   "referenced_type" : "type-5140",
+   "self_type" : "type-5139",
    "source_file" : "/system/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",
+   "referenced_type" : "type-5195",
+   "self_type" : "type-5194",
    "source_file" : "/system/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",
+   "referenced_type" : "type-5400",
+   "self_type" : "type-5399",
    "source_file" : "/system/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",
+   "referenced_type" : "type-5633",
+   "self_type" : "type-5632",
    "source_file" : "/system/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",
+   "referenced_type" : "type-5742",
+   "self_type" : "type-5741",
    "source_file" : "/system/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",
+   "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-6068",
-   "self_type" : "type-6067",
+   "referenced_type" : "type-5930",
+   "self_type" : "type-5929",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6088",
+   "self_type" : "type-6087",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6222",
+   "self_type" : "type-6221",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6318",
+   "self_type" : "type-6317",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6366",
+   "self_type" : "type-6365",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6457",
+   "self_type" : "type-6456",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6997",
+   "self_type" : "type-6996",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7132",
+   "self_type" : "type-7131",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7185",
+   "self_type" : "type-7184",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7220",
+   "self_type" : "type-7219",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7369",
+   "self_type" : "type-7368",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7469",
+   "self_type" : "type-7468",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7508",
+   "self_type" : "type-7507",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7560",
+   "self_type" : "type-7559",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7641",
+   "self_type" : "type-7640",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7705",
+   "self_type" : "type-7704",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -33474,8 +33553,8 @@
    "is_const" : true,
    "linker_set_key" : "const log_msg",
    "name" : "const log_msg",
-   "referenced_type" : "type-2178",
-   "self_type" : "type-2315",
+   "referenced_type" : "type-2181",
+   "self_type" : "type-2318",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -33524,8 +33603,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-1315",
-   "self_type" : "type-1314",
+   "referenced_type" : "type-1319",
+   "self_type" : "type-1318",
    "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"
   },
@@ -33534,8 +33613,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-3392",
-   "self_type" : "type-3391",
+   "referenced_type" : "type-3395",
+   "self_type" : "type-3394",
    "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"
   },
@@ -33544,8 +33623,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-3564",
-   "self_type" : "type-3563",
+   "referenced_type" : "type-3567",
+   "self_type" : "type-3566",
    "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"
   },
@@ -33554,8 +33633,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-3866",
-   "self_type" : "type-3865",
+   "referenced_type" : "type-3873",
+   "self_type" : "type-3872",
    "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"
   },
@@ -33564,8 +33643,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-4418",
-   "self_type" : "type-4417",
+   "referenced_type" : "type-4424",
+   "self_type" : "type-4423",
    "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"
   },
@@ -33574,8 +33653,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-4627",
-   "self_type" : "type-4626",
+   "referenced_type" : "type-4633",
+   "self_type" : "type-4632",
    "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"
   },
@@ -33584,8 +33663,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-4797",
-   "self_type" : "type-4796",
+   "referenced_type" : "type-4803",
+   "self_type" : "type-4802",
    "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"
   },
@@ -33594,8 +33673,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-5101",
-   "self_type" : "type-5100",
+   "referenced_type" : "type-5117",
+   "self_type" : "type-5116",
    "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"
   },
@@ -33604,8 +33683,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-5203",
-   "self_type" : "type-5202",
+   "referenced_type" : "type-5221",
+   "self_type" : "type-5220",
    "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"
   },
@@ -33614,8 +33693,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-5467",
-   "self_type" : "type-5466",
+   "referenced_type" : "type-5484",
+   "self_type" : "type-5483",
    "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"
   },
@@ -33624,8 +33703,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-5639",
-   "self_type" : "type-5638",
+   "referenced_type" : "type-5656",
+   "self_type" : "type-5655",
    "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"
   },
@@ -33634,8 +33713,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-5941",
-   "self_type" : "type-5940",
+   "referenced_type" : "type-5962",
+   "self_type" : "type-5961",
    "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"
   },
@@ -33654,8 +33733,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-6093",
-   "self_type" : "type-6092",
+   "referenced_type" : "type-6113",
+   "self_type" : "type-6112",
    "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"
   },
@@ -33664,8 +33743,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-6225",
-   "self_type" : "type-6224",
+   "referenced_type" : "type-6245",
+   "self_type" : "type-6244",
    "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"
   },
@@ -33674,8 +33753,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-6461",
-   "self_type" : "type-6460",
+   "referenced_type" : "type-6485",
+   "self_type" : "type-6484",
    "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"
   },
@@ -33684,8 +33763,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-7021",
-   "self_type" : "type-7020",
+   "referenced_type" : "type-7045",
+   "self_type" : "type-7044",
    "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"
   },
@@ -33694,8 +33773,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-7268",
-   "self_type" : "type-7267",
+   "referenced_type" : "type-7293",
+   "self_type" : "type-7292",
    "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"
   },
@@ -33704,8 +33783,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-7403",
-   "self_type" : "type-7402",
+   "referenced_type" : "type-7426",
+   "self_type" : "type-7425",
    "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"
   },
@@ -33714,8 +33793,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-7608",
-   "self_type" : "type-7607",
+   "referenced_type" : "type-7633",
+   "self_type" : "type-7632",
    "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"
   },
@@ -33734,8 +33813,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-1313",
-   "self_type" : "type-1312",
+   "referenced_type" : "type-1316",
+   "self_type" : "type-1315",
    "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"
   },
@@ -33744,8 +33823,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-3390",
-   "self_type" : "type-3389",
+   "referenced_type" : "type-3393",
+   "self_type" : "type-3392",
    "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"
   },
@@ -33754,8 +33833,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-3562",
-   "self_type" : "type-3561",
+   "referenced_type" : "type-3565",
+   "self_type" : "type-3564",
    "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"
   },
@@ -33764,8 +33843,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-3864",
-   "self_type" : "type-3863",
+   "referenced_type" : "type-3870",
+   "self_type" : "type-3869",
    "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"
   },
@@ -33774,8 +33853,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-4414",
-   "self_type" : "type-4413",
+   "referenced_type" : "type-4422",
+   "self_type" : "type-4421",
    "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"
   },
@@ -33784,8 +33863,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-4625",
-   "self_type" : "type-4624",
+   "referenced_type" : "type-4631",
+   "self_type" : "type-4630",
    "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"
   },
@@ -33794,8 +33873,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-4795",
-   "self_type" : "type-4794",
+   "referenced_type" : "type-4801",
+   "self_type" : "type-4800",
    "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"
   },
@@ -33804,8 +33883,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-5099",
-   "self_type" : "type-5098",
+   "referenced_type" : "type-5115",
+   "self_type" : "type-5114",
    "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"
   },
@@ -33814,8 +33893,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-5201",
-   "self_type" : "type-5200",
+   "referenced_type" : "type-5219",
+   "self_type" : "type-5218",
    "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"
   },
@@ -33824,8 +33903,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-5465",
-   "self_type" : "type-5464",
+   "referenced_type" : "type-5482",
+   "self_type" : "type-5481",
    "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"
   },
@@ -33834,8 +33913,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-5637",
-   "self_type" : "type-5636",
+   "referenced_type" : "type-5654",
+   "self_type" : "type-5653",
    "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"
   },
@@ -33844,8 +33923,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-5939",
-   "self_type" : "type-5938",
+   "referenced_type" : "type-5959",
+   "self_type" : "type-5958",
    "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"
   },
@@ -33864,8 +33943,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-6091",
-   "self_type" : "type-6090",
+   "referenced_type" : "type-6111",
+   "self_type" : "type-6110",
    "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"
   },
@@ -33874,8 +33953,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-6223",
-   "self_type" : "type-6222",
+   "referenced_type" : "type-6243",
+   "self_type" : "type-6242",
    "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"
   },
@@ -33884,8 +33963,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-6459",
-   "self_type" : "type-6458",
+   "referenced_type" : "type-6482",
+   "self_type" : "type-6481",
    "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"
   },
@@ -33894,8 +33973,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-7017",
-   "self_type" : "type-7016",
+   "referenced_type" : "type-7043",
+   "self_type" : "type-7042",
    "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"
   },
@@ -33904,8 +33983,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-7266",
-   "self_type" : "type-7265",
+   "referenced_type" : "type-7291",
+   "self_type" : "type-7290",
    "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"
   },
@@ -33914,8 +33993,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-7401",
-   "self_type" : "type-7400",
+   "referenced_type" : "type-7424",
+   "self_type" : "type-7423",
    "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"
   },
@@ -33924,8 +34003,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-7606",
-   "self_type" : "type-7605",
+   "referenced_type" : "type-7630",
+   "self_type" : "type-7629",
    "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"
   },
@@ -33944,8 +34023,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-1322",
-   "self_type" : "type-1321",
+   "referenced_type" : "type-1325",
+   "self_type" : "type-1324",
    "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"
   },
@@ -33954,8 +34033,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-3404",
-   "self_type" : "type-3403",
+   "referenced_type" : "type-3407",
+   "self_type" : "type-3406",
    "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"
   },
@@ -33964,8 +34043,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-3570",
-   "self_type" : "type-3569",
+   "referenced_type" : "type-3573",
+   "self_type" : "type-3572",
    "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"
   },
@@ -33974,8 +34053,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-3873",
-   "self_type" : "type-3872",
+   "referenced_type" : "type-3880",
+   "self_type" : "type-3879",
    "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"
   },
@@ -33984,8 +34063,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-4424",
-   "self_type" : "type-4423",
+   "referenced_type" : "type-4430",
+   "self_type" : "type-4429",
    "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"
   },
@@ -33994,8 +34073,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-4633",
-   "self_type" : "type-4632",
+   "referenced_type" : "type-4639",
+   "self_type" : "type-4638",
    "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"
   },
@@ -34004,8 +34083,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-4803",
-   "self_type" : "type-4802",
+   "referenced_type" : "type-4809",
+   "self_type" : "type-4808",
    "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"
   },
@@ -34014,8 +34093,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-5107",
-   "self_type" : "type-5106",
+   "referenced_type" : "type-5123",
+   "self_type" : "type-5122",
    "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"
   },
@@ -34024,8 +34103,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-5210",
-   "self_type" : "type-5209",
+   "referenced_type" : "type-5228",
+   "self_type" : "type-5227",
    "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"
   },
@@ -34034,8 +34113,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-5479",
-   "self_type" : "type-5478",
+   "referenced_type" : "type-5496",
+   "self_type" : "type-5495",
    "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"
   },
@@ -34044,8 +34123,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-5645",
-   "self_type" : "type-5644",
+   "referenced_type" : "type-5662",
+   "self_type" : "type-5661",
    "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"
   },
@@ -34054,8 +34133,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-5948",
-   "self_type" : "type-5947",
+   "referenced_type" : "type-5969",
+   "self_type" : "type-5968",
    "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"
   },
@@ -34064,8 +34143,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-6099",
-   "self_type" : "type-6098",
+   "referenced_type" : "type-6119",
+   "self_type" : "type-6118",
    "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"
   },
@@ -34084,8 +34163,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-6231",
-   "self_type" : "type-6230",
+   "referenced_type" : "type-6251",
+   "self_type" : "type-6250",
    "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"
   },
@@ -34094,8 +34173,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-6468",
-   "self_type" : "type-6467",
+   "referenced_type" : "type-6491",
+   "self_type" : "type-6490",
    "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"
   },
@@ -34104,8 +34183,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-7028",
-   "self_type" : "type-7027",
+   "referenced_type" : "type-7052",
+   "self_type" : "type-7051",
    "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"
   },
@@ -34114,8 +34193,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-7276",
-   "self_type" : "type-7275",
+   "referenced_type" : "type-7300",
+   "self_type" : "type-7299",
    "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"
   },
@@ -34124,8 +34203,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-7409",
-   "self_type" : "type-7408",
+   "referenced_type" : "type-7432",
+   "self_type" : "type-7431",
    "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"
   },
@@ -34134,8 +34213,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-7544",
-   "self_type" : "type-7543",
+   "referenced_type" : "type-7567",
+   "self_type" : "type-7566",
    "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"
   },
@@ -34154,8 +34233,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-1320",
-   "self_type" : "type-1319",
+   "referenced_type" : "type-1323",
+   "self_type" : "type-1322",
    "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"
   },
@@ -34164,8 +34243,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-3402",
-   "self_type" : "type-3401",
+   "referenced_type" : "type-3405",
+   "self_type" : "type-3404",
    "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"
   },
@@ -34174,8 +34253,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-3568",
-   "self_type" : "type-3567",
+   "referenced_type" : "type-3571",
+   "self_type" : "type-3570",
    "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"
   },
@@ -34184,8 +34263,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-3871",
-   "self_type" : "type-3870",
+   "referenced_type" : "type-3877",
+   "self_type" : "type-3876",
    "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"
   },
@@ -34194,8 +34273,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-4422",
-   "self_type" : "type-4421",
+   "referenced_type" : "type-4428",
+   "self_type" : "type-4427",
    "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"
   },
@@ -34204,8 +34283,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-4631",
-   "self_type" : "type-4630",
+   "referenced_type" : "type-4637",
+   "self_type" : "type-4636",
    "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"
   },
@@ -34214,8 +34293,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-4801",
-   "self_type" : "type-4800",
+   "referenced_type" : "type-4807",
+   "self_type" : "type-4806",
    "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"
   },
@@ -34224,8 +34303,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-5105",
-   "self_type" : "type-5104",
+   "referenced_type" : "type-5121",
+   "self_type" : "type-5120",
    "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"
   },
@@ -34234,8 +34313,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-5208",
-   "self_type" : "type-5207",
+   "referenced_type" : "type-5226",
+   "self_type" : "type-5225",
    "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"
   },
@@ -34244,8 +34323,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-5477",
-   "self_type" : "type-5476",
+   "referenced_type" : "type-5494",
+   "self_type" : "type-5493",
    "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"
   },
@@ -34254,8 +34333,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-5643",
-   "self_type" : "type-5642",
+   "referenced_type" : "type-5660",
+   "self_type" : "type-5659",
    "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"
   },
@@ -34264,8 +34343,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-5946",
-   "self_type" : "type-5945",
+   "referenced_type" : "type-5966",
+   "self_type" : "type-5965",
    "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"
   },
@@ -34274,8 +34353,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-6097",
-   "self_type" : "type-6096",
+   "referenced_type" : "type-6117",
+   "self_type" : "type-6116",
    "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"
   },
@@ -34294,8 +34373,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-6229",
-   "self_type" : "type-6228",
+   "referenced_type" : "type-6249",
+   "self_type" : "type-6248",
    "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"
   },
@@ -34304,8 +34383,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-6466",
-   "self_type" : "type-6465",
+   "referenced_type" : "type-6489",
+   "self_type" : "type-6488",
    "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"
   },
@@ -34314,8 +34393,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-7026",
-   "self_type" : "type-7025",
+   "referenced_type" : "type-7050",
+   "self_type" : "type-7049",
    "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"
   },
@@ -34324,8 +34403,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-7274",
-   "self_type" : "type-7273",
+   "referenced_type" : "type-7298",
+   "self_type" : "type-7297",
    "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"
   },
@@ -34334,8 +34413,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-7407",
-   "self_type" : "type-7406",
+   "referenced_type" : "type-7430",
+   "self_type" : "type-7429",
    "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"
   },
@@ -34344,8 +34423,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-7542",
-   "self_type" : "type-7541",
+   "referenced_type" : "type-7565",
+   "self_type" : "type-7564",
    "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"
   },
@@ -34364,8 +34443,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-1318",
-   "self_type" : "type-1317",
+   "referenced_type" : "type-1321",
+   "self_type" : "type-1320",
    "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"
   },
@@ -34374,8 +34453,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-3400",
-   "self_type" : "type-3399",
+   "referenced_type" : "type-3403",
+   "self_type" : "type-3402",
    "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"
   },
@@ -34384,8 +34463,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-3566",
-   "self_type" : "type-3565",
+   "referenced_type" : "type-3569",
+   "self_type" : "type-3568",
    "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"
   },
@@ -34394,8 +34473,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-3869",
-   "self_type" : "type-3868",
+   "referenced_type" : "type-3875",
+   "self_type" : "type-3874",
    "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"
   },
@@ -34404,8 +34483,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-4420",
-   "self_type" : "type-4419",
+   "referenced_type" : "type-4426",
+   "self_type" : "type-4425",
    "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"
   },
@@ -34414,8 +34493,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-4629",
-   "self_type" : "type-4628",
+   "referenced_type" : "type-4635",
+   "self_type" : "type-4634",
    "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"
   },
@@ -34424,8 +34503,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-4799",
-   "self_type" : "type-4798",
+   "referenced_type" : "type-4805",
+   "self_type" : "type-4804",
    "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"
   },
@@ -34434,8 +34513,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-5103",
-   "self_type" : "type-5102",
+   "referenced_type" : "type-5119",
+   "self_type" : "type-5118",
    "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"
   },
@@ -34444,8 +34523,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-5206",
-   "self_type" : "type-5205",
+   "referenced_type" : "type-5224",
+   "self_type" : "type-5223",
    "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"
   },
@@ -34454,8 +34533,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-5475",
-   "self_type" : "type-5474",
+   "referenced_type" : "type-5492",
+   "self_type" : "type-5491",
    "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"
   },
@@ -34464,8 +34543,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-5641",
-   "self_type" : "type-5640",
+   "referenced_type" : "type-5658",
+   "self_type" : "type-5657",
    "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"
   },
@@ -34474,8 +34553,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-5944",
-   "self_type" : "type-5943",
+   "referenced_type" : "type-5964",
+   "self_type" : "type-5963",
    "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"
   },
@@ -34484,8 +34563,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-6095",
-   "self_type" : "type-6094",
+   "referenced_type" : "type-6115",
+   "self_type" : "type-6114",
    "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"
   },
@@ -34504,8 +34583,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-6227",
-   "self_type" : "type-6226",
+   "referenced_type" : "type-6247",
+   "self_type" : "type-6246",
    "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"
   },
@@ -34514,8 +34593,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-6464",
-   "self_type" : "type-6463",
+   "referenced_type" : "type-6487",
+   "self_type" : "type-6486",
    "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"
   },
@@ -34524,8 +34603,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-7024",
-   "self_type" : "type-7023",
+   "referenced_type" : "type-7048",
+   "self_type" : "type-7047",
    "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"
   },
@@ -34534,8 +34613,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-7272",
-   "self_type" : "type-7271",
+   "referenced_type" : "type-7296",
+   "self_type" : "type-7295",
    "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"
   },
@@ -34544,8 +34623,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-7405",
-   "self_type" : "type-7404",
+   "referenced_type" : "type-7428",
+   "self_type" : "type-7427",
    "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"
   },
@@ -34554,8 +34633,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-7540",
-   "self_type" : "type-7539",
+   "referenced_type" : "type-7563",
+   "self_type" : "type-7562",
    "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"
   },
@@ -34574,8 +34653,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1120",
-   "self_type" : "type-1119",
+   "referenced_type" : "type-1124",
+   "self_type" : "type-1123",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34584,8 +34663,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1297",
-   "self_type" : "type-1296",
+   "referenced_type" : "type-1300",
+   "self_type" : "type-1299",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34594,8 +34673,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3374",
+   "self_type" : "type-3373",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34604,8 +34683,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3551",
+   "self_type" : "type-3550",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34614,8 +34693,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3731",
+   "self_type" : "type-3730",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34624,8 +34703,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3855",
+   "self_type" : "type-3854",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34634,8 +34713,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4408",
+   "self_type" : "type-4407",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34644,8 +34723,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4616",
+   "self_type" : "type-4615",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34654,8 +34733,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4789",
+   "self_type" : "type-4788",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34664,8 +34743,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5206",
+   "self_type" : "type-5205",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34674,8 +34753,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5463",
+   "self_type" : "type-5462",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34694,8 +34773,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5640",
+   "self_type" : "type-5639",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34704,8 +34783,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5820",
+   "self_type" : "type-5819",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34714,8 +34793,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5944",
+   "self_type" : "type-5943",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34724,8 +34803,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6097",
+   "self_type" : "type-6096",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34734,8 +34813,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6229",
+   "self_type" : "type-6228",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34744,8 +34823,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6378",
+   "self_type" : "type-6377",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34754,8 +34833,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6467",
+   "self_type" : "type-6466",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34764,8 +34843,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7028",
+   "self_type" : "type-7027",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34774,8 +34853,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7274",
+   "self_type" : "type-7273",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34784,8 +34863,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7412",
+   "self_type" : "type-7411",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34794,8 +34873,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7571",
+   "self_type" : "type-7570",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34804,8 +34883,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7715",
+   "self_type" : "type-7714",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34824,8 +34903,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-1127",
-   "self_type" : "type-1126",
+   "referenced_type" : "type-1130",
+   "self_type" : "type-1129",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34834,8 +34913,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-1304",
-   "self_type" : "type-1303",
+   "referenced_type" : "type-1307",
+   "self_type" : "type-1306",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34844,8 +34923,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-3377",
-   "self_type" : "type-3376",
+   "referenced_type" : "type-3380",
+   "self_type" : "type-3379",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34854,8 +34933,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-3554",
-   "self_type" : "type-3553",
+   "referenced_type" : "type-3557",
+   "self_type" : "type-3556",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34864,8 +34943,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-3731",
-   "self_type" : "type-3730",
+   "referenced_type" : "type-3737",
+   "self_type" : "type-3736",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34874,8 +34953,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-3855",
-   "self_type" : "type-3854",
+   "referenced_type" : "type-3861",
+   "self_type" : "type-3860",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34884,8 +34963,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-4408",
-   "self_type" : "type-4407",
+   "referenced_type" : "type-4414",
+   "self_type" : "type-4413",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34894,8 +34973,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-4616",
-   "self_type" : "type-4615",
+   "referenced_type" : "type-4622",
+   "self_type" : "type-4621",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34904,8 +34983,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-4789",
-   "self_type" : "type-4788",
+   "referenced_type" : "type-4795",
+   "self_type" : "type-4794",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34914,8 +34993,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-5194",
-   "self_type" : "type-5193",
+   "referenced_type" : "type-5213",
+   "self_type" : "type-5212",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34924,8 +35003,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-5452",
-   "self_type" : "type-5451",
+   "referenced_type" : "type-5469",
+   "self_type" : "type-5468",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34944,8 +35023,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-5629",
-   "self_type" : "type-5628",
+   "referenced_type" : "type-5646",
+   "self_type" : "type-5645",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34954,8 +35033,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-5806",
-   "self_type" : "type-5805",
+   "referenced_type" : "type-5826",
+   "self_type" : "type-5825",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34964,8 +35043,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-5930",
-   "self_type" : "type-5929",
+   "referenced_type" : "type-5950",
+   "self_type" : "type-5949",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34974,8 +35053,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-6083",
-   "self_type" : "type-6082",
+   "referenced_type" : "type-6103",
+   "self_type" : "type-6102",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34984,8 +35063,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-6215",
-   "self_type" : "type-6214",
+   "referenced_type" : "type-6235",
+   "self_type" : "type-6234",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34994,8 +35073,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-6361",
-   "self_type" : "type-6360",
+   "referenced_type" : "type-6384",
+   "self_type" : "type-6383",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35004,8 +35083,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-6450",
-   "self_type" : "type-6449",
+   "referenced_type" : "type-6474",
+   "self_type" : "type-6473",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35014,8 +35093,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-7011",
-   "self_type" : "type-7010",
+   "referenced_type" : "type-7034",
+   "self_type" : "type-7033",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35024,8 +35103,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-7256",
-   "self_type" : "type-7255",
+   "referenced_type" : "type-7280",
+   "self_type" : "type-7279",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35034,8 +35113,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-7395",
-   "self_type" : "type-7394",
+   "referenced_type" : "type-7418",
+   "self_type" : "type-7417",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35044,8 +35123,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-7554",
-   "self_type" : "type-7553",
+   "referenced_type" : "type-7577",
+   "self_type" : "type-7576",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35054,8 +35133,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-7698",
-   "self_type" : "type-7697",
+   "referenced_type" : "type-7721",
+   "self_type" : "type-7720",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35074,8 +35153,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-1129",
-   "self_type" : "type-1128",
+   "referenced_type" : "type-1132",
+   "self_type" : "type-1131",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35084,8 +35163,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-1306",
-   "self_type" : "type-1305",
+   "referenced_type" : "type-1309",
+   "self_type" : "type-1308",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35094,8 +35173,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-3380",
-   "self_type" : "type-3379",
+   "referenced_type" : "type-3383",
+   "self_type" : "type-3382",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35104,8 +35183,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-3556",
-   "self_type" : "type-3555",
+   "referenced_type" : "type-3561",
+   "self_type" : "type-3560",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35114,8 +35193,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-3733",
-   "self_type" : "type-3732",
+   "referenced_type" : "type-3739",
+   "self_type" : "type-3738",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35124,8 +35203,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-3857",
-   "self_type" : "type-3856",
+   "referenced_type" : "type-3863",
+   "self_type" : "type-3862",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35134,8 +35213,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-4410",
-   "self_type" : "type-4409",
+   "referenced_type" : "type-4416",
+   "self_type" : "type-4415",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35144,8 +35223,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-4618",
-   "self_type" : "type-4617",
+   "referenced_type" : "type-4624",
+   "self_type" : "type-4623",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35154,8 +35233,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-4791",
-   "self_type" : "type-4790",
+   "referenced_type" : "type-4797",
+   "self_type" : "type-4796",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35164,8 +35243,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-5196",
-   "self_type" : "type-5195",
+   "referenced_type" : "type-5215",
+   "self_type" : "type-5214",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35174,8 +35253,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-5455",
-   "self_type" : "type-5454",
+   "referenced_type" : "type-5472",
+   "self_type" : "type-5471",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35194,8 +35273,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-5631",
-   "self_type" : "type-5630",
+   "referenced_type" : "type-5650",
+   "self_type" : "type-5649",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35204,8 +35283,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-5808",
-   "self_type" : "type-5807",
+   "referenced_type" : "type-5828",
+   "self_type" : "type-5827",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35214,8 +35293,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-5932",
-   "self_type" : "type-5931",
+   "referenced_type" : "type-5952",
+   "self_type" : "type-5951",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35224,8 +35303,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-6085",
-   "self_type" : "type-6084",
+   "referenced_type" : "type-6105",
+   "self_type" : "type-6104",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35234,8 +35313,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-6217",
-   "self_type" : "type-6216",
+   "referenced_type" : "type-6239",
+   "self_type" : "type-6238",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35244,8 +35323,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-6363",
-   "self_type" : "type-6362",
+   "referenced_type" : "type-6386",
+   "self_type" : "type-6385",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35254,8 +35333,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-6452",
-   "self_type" : "type-6451",
+   "referenced_type" : "type-6476",
+   "self_type" : "type-6475",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35264,8 +35343,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-7013",
-   "self_type" : "type-7012",
+   "referenced_type" : "type-7037",
+   "self_type" : "type-7036",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35274,8 +35353,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-7258",
-   "self_type" : "type-7257",
+   "referenced_type" : "type-7284",
+   "self_type" : "type-7283",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35284,8 +35363,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-7397",
-   "self_type" : "type-7396",
+   "referenced_type" : "type-7420",
+   "self_type" : "type-7419",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35294,8 +35373,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-7556",
-   "self_type" : "type-7555",
+   "referenced_type" : "type-7579",
+   "self_type" : "type-7578",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35304,8 +35383,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-7700",
-   "self_type" : "type-7699",
+   "referenced_type" : "type-7723",
+   "self_type" : "type-7722",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35314,8 +35393,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-879",
-   "self_type" : "type-878",
+   "referenced_type" : "type-881",
+   "self_type" : "type-880",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35324,8 +35403,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-1124",
-   "self_type" : "type-1123",
+   "referenced_type" : "type-1128",
+   "self_type" : "type-1127",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35334,8 +35413,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-1301",
-   "self_type" : "type-1300",
+   "referenced_type" : "type-1305",
+   "self_type" : "type-1304",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35344,8 +35423,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-3375",
-   "self_type" : "type-3374",
+   "referenced_type" : "type-3378",
+   "self_type" : "type-3377",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35354,8 +35433,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-3552",
-   "self_type" : "type-3551",
+   "referenced_type" : "type-3555",
+   "self_type" : "type-3554",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35364,8 +35443,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-3728",
-   "self_type" : "type-3727",
+   "referenced_type" : "type-3735",
+   "self_type" : "type-3734",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35374,8 +35453,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-3853",
-   "self_type" : "type-3852",
+   "referenced_type" : "type-3859",
+   "self_type" : "type-3858",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35384,8 +35463,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-4406",
-   "self_type" : "type-4405",
+   "referenced_type" : "type-4412",
+   "self_type" : "type-4411",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35394,8 +35473,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-4614",
-   "self_type" : "type-4613",
+   "referenced_type" : "type-4620",
+   "self_type" : "type-4619",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35404,8 +35483,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-4787",
-   "self_type" : "type-4786",
+   "referenced_type" : "type-4793",
+   "self_type" : "type-4792",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35414,8 +35493,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-5192",
-   "self_type" : "type-5191",
+   "referenced_type" : "type-5210",
+   "self_type" : "type-5209",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35424,8 +35503,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-5450",
-   "self_type" : "type-5449",
+   "referenced_type" : "type-5467",
+   "self_type" : "type-5466",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35444,8 +35523,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-5627",
-   "self_type" : "type-5626",
+   "referenced_type" : "type-5644",
+   "self_type" : "type-5643",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35454,8 +35533,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-5803",
-   "self_type" : "type-5802",
+   "referenced_type" : "type-5824",
+   "self_type" : "type-5823",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35464,8 +35543,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-5928",
-   "self_type" : "type-5927",
+   "referenced_type" : "type-5948",
+   "self_type" : "type-5947",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35474,8 +35553,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-6081",
-   "self_type" : "type-6080",
+   "referenced_type" : "type-6101",
+   "self_type" : "type-6100",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35484,8 +35563,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-6213",
-   "self_type" : "type-6212",
+   "referenced_type" : "type-6233",
+   "self_type" : "type-6232",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35494,8 +35573,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-6359",
-   "self_type" : "type-6358",
+   "referenced_type" : "type-6382",
+   "self_type" : "type-6381",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35504,8 +35583,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-6448",
-   "self_type" : "type-6447",
+   "referenced_type" : "type-6472",
+   "self_type" : "type-6471",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35514,8 +35593,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-7008",
-   "self_type" : "type-7007",
+   "referenced_type" : "type-7032",
+   "self_type" : "type-7031",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35524,8 +35603,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-7254",
-   "self_type" : "type-7253",
+   "referenced_type" : "type-7278",
+   "self_type" : "type-7277",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35534,8 +35613,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-7393",
-   "self_type" : "type-7392",
+   "referenced_type" : "type-7416",
+   "self_type" : "type-7415",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35544,8 +35623,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-7552",
-   "self_type" : "type-7551",
+   "referenced_type" : "type-7575",
+   "self_type" : "type-7574",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35554,8 +35633,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-7696",
-   "self_type" : "type-7695",
+   "referenced_type" : "type-7719",
+   "self_type" : "type-7718",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35574,8 +35653,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-1131",
-   "self_type" : "type-1130",
+   "referenced_type" : "type-1134",
+   "self_type" : "type-1133",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35584,8 +35663,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-1308",
-   "self_type" : "type-1307",
+   "referenced_type" : "type-1311",
+   "self_type" : "type-1310",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35594,8 +35673,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-3383",
-   "self_type" : "type-3382",
+   "referenced_type" : "type-3386",
+   "self_type" : "type-3385",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35604,8 +35683,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-3558",
-   "self_type" : "type-3557",
+   "referenced_type" : "type-3563",
+   "self_type" : "type-3562",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35614,8 +35693,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-3735",
-   "self_type" : "type-3734",
+   "referenced_type" : "type-3741",
+   "self_type" : "type-3740",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35624,8 +35703,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-3859",
-   "self_type" : "type-3858",
+   "referenced_type" : "type-3865",
+   "self_type" : "type-3864",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35634,8 +35713,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-4412",
-   "self_type" : "type-4411",
+   "referenced_type" : "type-4418",
+   "self_type" : "type-4417",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35644,8 +35723,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-4620",
-   "self_type" : "type-4619",
+   "referenced_type" : "type-4629",
+   "self_type" : "type-4628",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35654,8 +35733,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-4793",
-   "self_type" : "type-4792",
+   "referenced_type" : "type-4799",
+   "self_type" : "type-4798",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35664,8 +35743,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-5199",
-   "self_type" : "type-5198",
+   "referenced_type" : "type-5217",
+   "self_type" : "type-5216",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35674,8 +35753,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-5458",
-   "self_type" : "type-5457",
+   "referenced_type" : "type-5475",
+   "self_type" : "type-5474",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35684,8 +35763,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-5633",
-   "self_type" : "type-5632",
+   "referenced_type" : "type-5652",
+   "self_type" : "type-5651",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35694,8 +35773,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-5810",
-   "self_type" : "type-5809",
+   "referenced_type" : "type-5830",
+   "self_type" : "type-5829",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35714,8 +35793,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-5934",
-   "self_type" : "type-5933",
+   "referenced_type" : "type-5954",
+   "self_type" : "type-5953",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35724,8 +35803,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-6087",
-   "self_type" : "type-6086",
+   "referenced_type" : "type-6109",
+   "self_type" : "type-6108",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35734,8 +35813,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-6219",
-   "self_type" : "type-6218",
+   "referenced_type" : "type-6241",
+   "self_type" : "type-6240",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35744,8 +35823,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-6365",
-   "self_type" : "type-6364",
+   "referenced_type" : "type-6388",
+   "self_type" : "type-6387",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35754,8 +35833,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-6454",
-   "self_type" : "type-6453",
+   "referenced_type" : "type-6478",
+   "self_type" : "type-6477",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35764,8 +35843,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-7015",
-   "self_type" : "type-7014",
+   "referenced_type" : "type-7039",
+   "self_type" : "type-7038",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35774,8 +35853,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-7260",
-   "self_type" : "type-7259",
+   "referenced_type" : "type-7289",
+   "self_type" : "type-7288",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35784,8 +35863,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-7399",
-   "self_type" : "type-7398",
+   "referenced_type" : "type-7422",
+   "self_type" : "type-7421",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35794,8 +35873,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-7558",
-   "self_type" : "type-7557",
+   "referenced_type" : "type-7581",
+   "self_type" : "type-7580",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35804,8 +35883,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-7703",
-   "self_type" : "type-7702",
+   "referenced_type" : "type-7725",
+   "self_type" : "type-7724",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35814,8 +35893,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-881",
-   "self_type" : "type-880",
+   "referenced_type" : "type-883",
+   "self_type" : "type-882",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35824,8 +35903,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-1118",
-   "self_type" : "type-1117",
+   "referenced_type" : "type-1121",
+   "self_type" : "type-1120",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35834,8 +35913,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-1295",
-   "self_type" : "type-1294",
+   "referenced_type" : "type-1298",
+   "self_type" : "type-1297",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35844,8 +35923,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-3369",
-   "self_type" : "type-3368",
+   "referenced_type" : "type-3372",
+   "self_type" : "type-3371",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35854,8 +35933,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-3546",
-   "self_type" : "type-3545",
+   "referenced_type" : "type-3549",
+   "self_type" : "type-3548",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35864,8 +35943,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-3722",
-   "self_type" : "type-3721",
+   "referenced_type" : "type-3728",
+   "self_type" : "type-3727",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35874,8 +35953,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-3847",
-   "self_type" : "type-3846",
+   "referenced_type" : "type-3853",
+   "self_type" : "type-3852",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35884,8 +35963,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-4400",
-   "self_type" : "type-4399",
+   "referenced_type" : "type-4406",
+   "self_type" : "type-4405",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35894,8 +35973,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-4608",
-   "self_type" : "type-4607",
+   "referenced_type" : "type-4614",
+   "self_type" : "type-4613",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35904,8 +35983,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-4780",
-   "self_type" : "type-4779",
+   "referenced_type" : "type-4787",
+   "self_type" : "type-4786",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35914,8 +35993,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-5185",
-   "self_type" : "type-5184",
+   "referenced_type" : "type-5204",
+   "self_type" : "type-5203",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35924,8 +36003,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-5444",
-   "self_type" : "type-5443",
+   "referenced_type" : "type-5461",
+   "self_type" : "type-5460",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35944,8 +36023,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-5621",
-   "self_type" : "type-5620",
+   "referenced_type" : "type-5638",
+   "self_type" : "type-5637",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35954,8 +36033,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-5797",
-   "self_type" : "type-5796",
+   "referenced_type" : "type-5817",
+   "self_type" : "type-5816",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35964,8 +36043,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-5922",
-   "self_type" : "type-5921",
+   "referenced_type" : "type-5942",
+   "self_type" : "type-5941",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35974,8 +36053,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-6075",
-   "self_type" : "type-6074",
+   "referenced_type" : "type-6095",
+   "self_type" : "type-6094",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35984,8 +36063,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-6207",
-   "self_type" : "type-6206",
+   "referenced_type" : "type-6227",
+   "self_type" : "type-6226",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35994,8 +36073,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-6352",
-   "self_type" : "type-6351",
+   "referenced_type" : "type-6376",
+   "self_type" : "type-6375",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36004,8 +36083,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-6442",
-   "self_type" : "type-6441",
+   "referenced_type" : "type-6465",
+   "self_type" : "type-6464",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36014,8 +36093,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-7002",
-   "self_type" : "type-7001",
+   "referenced_type" : "type-7026",
+   "self_type" : "type-7025",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36024,8 +36103,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-7248",
-   "self_type" : "type-7247",
+   "referenced_type" : "type-7272",
+   "self_type" : "type-7271",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36034,8 +36113,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-7387",
-   "self_type" : "type-7386",
+   "referenced_type" : "type-7410",
+   "self_type" : "type-7409",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36044,8 +36123,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-7546",
-   "self_type" : "type-7545",
+   "referenced_type" : "type-7569",
+   "self_type" : "type-7568",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36054,8 +36133,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-7689",
-   "self_type" : "type-7688",
+   "referenced_type" : "type-7713",
+   "self_type" : "type-7712",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36074,8 +36153,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-1122",
-   "self_type" : "type-1121",
+   "referenced_type" : "type-1126",
+   "self_type" : "type-1125",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36084,8 +36163,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-1299",
-   "self_type" : "type-1298",
+   "referenced_type" : "type-1303",
+   "self_type" : "type-1302",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36094,8 +36173,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-3373",
-   "self_type" : "type-3372",
+   "referenced_type" : "type-3376",
+   "self_type" : "type-3375",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36104,8 +36183,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-3550",
-   "self_type" : "type-3549",
+   "referenced_type" : "type-3553",
+   "self_type" : "type-3552",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36114,8 +36193,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-3726",
-   "self_type" : "type-3725",
+   "referenced_type" : "type-3733",
+   "self_type" : "type-3732",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36124,8 +36203,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-3851",
-   "self_type" : "type-3850",
+   "referenced_type" : "type-3857",
+   "self_type" : "type-3856",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36134,8 +36213,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-4404",
-   "self_type" : "type-4403",
+   "referenced_type" : "type-4410",
+   "self_type" : "type-4409",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36144,8 +36223,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-4612",
-   "self_type" : "type-4611",
+   "referenced_type" : "type-4618",
+   "self_type" : "type-4617",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36154,8 +36233,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-4784",
-   "self_type" : "type-4783",
+   "referenced_type" : "type-4791",
+   "self_type" : "type-4790",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36164,8 +36243,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-5190",
-   "self_type" : "type-5189",
+   "referenced_type" : "type-5208",
+   "self_type" : "type-5207",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36174,8 +36253,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-5448",
-   "self_type" : "type-5447",
+   "referenced_type" : "type-5465",
+   "self_type" : "type-5464",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36194,8 +36273,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-5625",
-   "self_type" : "type-5624",
+   "referenced_type" : "type-5642",
+   "self_type" : "type-5641",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36204,8 +36283,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-5801",
-   "self_type" : "type-5800",
+   "referenced_type" : "type-5822",
+   "self_type" : "type-5821",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36214,8 +36293,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-5926",
-   "self_type" : "type-5925",
+   "referenced_type" : "type-5946",
+   "self_type" : "type-5945",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36224,8 +36303,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-6079",
-   "self_type" : "type-6078",
+   "referenced_type" : "type-6099",
+   "self_type" : "type-6098",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36234,8 +36313,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-6211",
-   "self_type" : "type-6210",
+   "referenced_type" : "type-6231",
+   "self_type" : "type-6230",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36244,8 +36323,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-6357",
-   "self_type" : "type-6356",
+   "referenced_type" : "type-6380",
+   "self_type" : "type-6379",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36254,8 +36333,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-6446",
-   "self_type" : "type-6445",
+   "referenced_type" : "type-6469",
+   "self_type" : "type-6468",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36264,8 +36343,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-7006",
-   "self_type" : "type-7005",
+   "referenced_type" : "type-7030",
+   "self_type" : "type-7029",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36274,8 +36353,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-7252",
-   "self_type" : "type-7251",
+   "referenced_type" : "type-7276",
+   "self_type" : "type-7275",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36284,8 +36363,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-7391",
-   "self_type" : "type-7390",
+   "referenced_type" : "type-7414",
+   "self_type" : "type-7413",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36294,8 +36373,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-7550",
-   "self_type" : "type-7549",
+   "referenced_type" : "type-7573",
+   "self_type" : "type-7572",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36304,8 +36383,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-7694",
-   "self_type" : "type-7693",
+   "referenced_type" : "type-7717",
+   "self_type" : "type-7716",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36324,8 +36403,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1135",
-   "self_type" : "type-1134",
+   "referenced_type" : "type-1138",
+   "self_type" : "type-1137",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36334,8 +36413,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1326",
-   "self_type" : "type-1325",
+   "referenced_type" : "type-1329",
+   "self_type" : "type-1328",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36344,8 +36423,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3417",
+   "self_type" : "type-3416",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36354,8 +36433,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3578",
+   "self_type" : "type-3577",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36364,8 +36443,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3745",
+   "self_type" : "type-3744",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36374,8 +36453,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3884",
+   "self_type" : "type-3883",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36384,8 +36463,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4438",
+   "self_type" : "type-4437",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36394,8 +36473,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4643",
+   "self_type" : "type-4642",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36404,8 +36483,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4814",
+   "self_type" : "type-4813",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36414,8 +36493,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5070",
+   "self_type" : "type-5069",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36424,8 +36503,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5232",
+   "self_type" : "type-5231",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36434,8 +36513,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5506",
+   "self_type" : "type-5505",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36444,8 +36523,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5667",
+   "self_type" : "type-5666",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36454,8 +36533,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5834",
+   "self_type" : "type-5833",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36464,8 +36543,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5973",
+   "self_type" : "type-5972",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36474,8 +36553,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6124",
+   "self_type" : "type-6123",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36484,8 +36563,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-6369",
-   "self_type" : "type-6368",
+   "referenced_type" : "type-6256",
+   "self_type" : "type-6255",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/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-6392",
+   "self_type" : "type-6391",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36504,8 +36593,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6495",
+   "self_type" : "type-6494",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36514,8 +36603,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7061",
+   "self_type" : "type-7060",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36524,8 +36613,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7304",
+   "self_type" : "type-7303",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36534,8 +36623,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7436",
+   "self_type" : "type-7435",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36544,18 +36633,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7585",
+   "self_type" : "type-7584",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36574,8 +36653,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-1139",
-   "self_type" : "type-1138",
+   "referenced_type" : "type-1142",
+   "self_type" : "type-1141",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36584,8 +36663,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-1330",
-   "self_type" : "type-1329",
+   "referenced_type" : "type-1335",
+   "self_type" : "type-1334",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36594,8 +36673,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-3418",
-   "self_type" : "type-3417",
+   "referenced_type" : "type-3421",
+   "self_type" : "type-3420",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36604,8 +36683,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-3579",
-   "self_type" : "type-3578",
+   "referenced_type" : "type-3582",
+   "self_type" : "type-3581",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36614,8 +36693,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-3743",
-   "self_type" : "type-3742",
+   "referenced_type" : "type-3749",
+   "self_type" : "type-3748",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36624,8 +36703,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-3882",
-   "self_type" : "type-3881",
+   "referenced_type" : "type-3890",
+   "self_type" : "type-3889",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36634,8 +36713,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-4435",
-   "self_type" : "type-4434",
+   "referenced_type" : "type-4442",
+   "self_type" : "type-4441",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36644,8 +36723,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-4641",
-   "self_type" : "type-4640",
+   "referenced_type" : "type-4647",
+   "self_type" : "type-4646",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36654,8 +36733,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-4812",
-   "self_type" : "type-4811",
+   "referenced_type" : "type-4818",
+   "self_type" : "type-4817",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36664,8 +36743,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-5219",
-   "self_type" : "type-5218",
+   "referenced_type" : "type-5075",
+   "self_type" : "type-5074",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36674,8 +36753,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-5493",
-   "self_type" : "type-5492",
+   "referenced_type" : "type-5236",
+   "self_type" : "type-5235",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36684,8 +36763,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-5654",
-   "self_type" : "type-5653",
+   "referenced_type" : "type-5510",
+   "self_type" : "type-5509",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36694,8 +36773,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-5818",
-   "self_type" : "type-5817",
+   "referenced_type" : "type-5671",
+   "self_type" : "type-5670",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36704,8 +36783,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-5957",
-   "self_type" : "type-5956",
+   "referenced_type" : "type-5838",
+   "self_type" : "type-5837",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36714,8 +36793,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-6108",
-   "self_type" : "type-6107",
+   "referenced_type" : "type-5979",
+   "self_type" : "type-5978",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36724,8 +36803,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-6240",
-   "self_type" : "type-6239",
+   "referenced_type" : "type-6128",
+   "self_type" : "type-6127",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36734,8 +36813,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-6373",
-   "self_type" : "type-6372",
+   "referenced_type" : "type-6260",
+   "self_type" : "type-6259",
+   "size" : 52,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/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-6396",
+   "self_type" : "type-6395",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36754,8 +36843,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-6476",
-   "self_type" : "type-6475",
+   "referenced_type" : "type-6501",
+   "self_type" : "type-6500",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36764,8 +36853,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-7040",
-   "self_type" : "type-7039",
+   "referenced_type" : "type-7065",
+   "self_type" : "type-7064",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36774,8 +36863,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-7285",
-   "self_type" : "type-7284",
+   "referenced_type" : "type-7308",
+   "self_type" : "type-7307",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36784,8 +36873,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-7417",
-   "self_type" : "type-7416",
+   "referenced_type" : "type-7440",
+   "self_type" : "type-7439",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36794,18 +36883,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-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",
+   "referenced_type" : "type-7589",
+   "self_type" : "type-7588",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36824,8 +36903,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-1137",
-   "self_type" : "type-1136",
+   "referenced_type" : "type-1140",
+   "self_type" : "type-1139",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36834,8 +36913,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-1328",
-   "self_type" : "type-1327",
+   "referenced_type" : "type-1333",
+   "self_type" : "type-1332",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36844,8 +36923,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-3416",
-   "self_type" : "type-3415",
+   "referenced_type" : "type-3419",
+   "self_type" : "type-3418",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36854,8 +36933,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-3577",
-   "self_type" : "type-3576",
+   "referenced_type" : "type-3580",
+   "self_type" : "type-3579",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36864,8 +36943,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-3741",
-   "self_type" : "type-3740",
+   "referenced_type" : "type-3747",
+   "self_type" : "type-3746",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36874,8 +36953,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-3880",
-   "self_type" : "type-3879",
+   "referenced_type" : "type-3888",
+   "self_type" : "type-3887",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36884,8 +36963,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-4433",
-   "self_type" : "type-4432",
+   "referenced_type" : "type-4440",
+   "self_type" : "type-4439",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36894,8 +36973,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-4639",
-   "self_type" : "type-4638",
+   "referenced_type" : "type-4645",
+   "self_type" : "type-4644",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36904,8 +36983,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-4810",
-   "self_type" : "type-4809",
+   "referenced_type" : "type-4816",
+   "self_type" : "type-4815",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36914,8 +36993,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-5217",
-   "self_type" : "type-5216",
+   "referenced_type" : "type-5072",
+   "self_type" : "type-5071",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36924,8 +37003,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-5491",
-   "self_type" : "type-5490",
+   "referenced_type" : "type-5234",
+   "self_type" : "type-5233",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36934,8 +37013,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-5652",
-   "self_type" : "type-5651",
+   "referenced_type" : "type-5508",
+   "self_type" : "type-5507",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36944,8 +37023,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-5816",
-   "self_type" : "type-5815",
+   "referenced_type" : "type-5669",
+   "self_type" : "type-5668",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36954,8 +37033,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-5955",
-   "self_type" : "type-5954",
+   "referenced_type" : "type-5836",
+   "self_type" : "type-5835",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36964,8 +37043,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-6106",
-   "self_type" : "type-6105",
+   "referenced_type" : "type-5977",
+   "self_type" : "type-5976",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36974,8 +37053,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-6238",
-   "self_type" : "type-6237",
+   "referenced_type" : "type-6126",
+   "self_type" : "type-6125",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36984,8 +37063,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6258",
+   "self_type" : "type-6257",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/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-6394",
+   "self_type" : "type-6393",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37004,8 +37093,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-6474",
-   "self_type" : "type-6473",
+   "referenced_type" : "type-6499",
+   "self_type" : "type-6498",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37014,8 +37103,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-7038",
-   "self_type" : "type-7037",
+   "referenced_type" : "type-7063",
+   "self_type" : "type-7062",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37024,8 +37113,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-7283",
-   "self_type" : "type-7282",
+   "referenced_type" : "type-7306",
+   "self_type" : "type-7305",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37034,8 +37123,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-7415",
-   "self_type" : "type-7414",
+   "referenced_type" : "type-7438",
+   "self_type" : "type-7437",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37044,18 +37133,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-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",
+   "referenced_type" : "type-7587",
+   "self_type" : "type-7586",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37074,8 +37153,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-1133",
-   "self_type" : "type-1132",
+   "referenced_type" : "type-1136",
+   "self_type" : "type-1135",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37084,8 +37163,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-1324",
-   "self_type" : "type-1323",
+   "referenced_type" : "type-1327",
+   "self_type" : "type-1326",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37094,8 +37173,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-3412",
-   "self_type" : "type-3411",
+   "referenced_type" : "type-3415",
+   "self_type" : "type-3414",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37104,8 +37183,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-3573",
-   "self_type" : "type-3572",
+   "referenced_type" : "type-3576",
+   "self_type" : "type-3575",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37114,8 +37193,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-3737",
-   "self_type" : "type-3736",
+   "referenced_type" : "type-3743",
+   "self_type" : "type-3742",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37124,8 +37203,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-3876",
-   "self_type" : "type-3875",
+   "referenced_type" : "type-3882",
+   "self_type" : "type-3881",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37134,8 +37213,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-4428",
-   "self_type" : "type-4427",
+   "referenced_type" : "type-4435",
+   "self_type" : "type-4434",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37144,8 +37223,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-4635",
-   "self_type" : "type-4634",
+   "referenced_type" : "type-4641",
+   "self_type" : "type-4640",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37154,8 +37233,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-4805",
-   "self_type" : "type-4804",
+   "referenced_type" : "type-4812",
+   "self_type" : "type-4811",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37164,8 +37243,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-5212",
-   "self_type" : "type-5211",
+   "referenced_type" : "type-5068",
+   "self_type" : "type-5067",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37174,8 +37253,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-5487",
-   "self_type" : "type-5486",
+   "referenced_type" : "type-5230",
+   "self_type" : "type-5229",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37184,8 +37263,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-5648",
-   "self_type" : "type-5647",
+   "referenced_type" : "type-5504",
+   "self_type" : "type-5503",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37194,8 +37273,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-5812",
-   "self_type" : "type-5811",
+   "referenced_type" : "type-5665",
+   "self_type" : "type-5664",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37204,8 +37283,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-5951",
-   "self_type" : "type-5950",
+   "referenced_type" : "type-5832",
+   "self_type" : "type-5831",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37214,8 +37293,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-6101",
-   "self_type" : "type-6100",
+   "referenced_type" : "type-5971",
+   "self_type" : "type-5970",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37224,8 +37303,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-6233",
-   "self_type" : "type-6232",
+   "referenced_type" : "type-6122",
+   "self_type" : "type-6121",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37234,8 +37313,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6254",
+   "self_type" : "type-6253",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/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-6390",
+   "self_type" : "type-6389",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37254,8 +37343,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-6470",
-   "self_type" : "type-6469",
+   "referenced_type" : "type-6493",
+   "self_type" : "type-6492",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37264,8 +37353,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-7032",
-   "self_type" : "type-7031",
+   "referenced_type" : "type-7059",
+   "self_type" : "type-7058",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37274,8 +37363,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-7278",
-   "self_type" : "type-7277",
+   "referenced_type" : "type-7302",
+   "self_type" : "type-7301",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37284,8 +37373,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-7411",
-   "self_type" : "type-7410",
+   "referenced_type" : "type-7434",
+   "self_type" : "type-7433",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37294,18 +37383,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-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",
+   "referenced_type" : "type-7583",
+   "self_type" : "type-7582",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37324,8 +37403,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-1141",
-   "self_type" : "type-1140",
+   "referenced_type" : "type-1144",
+   "self_type" : "type-1143",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37334,8 +37413,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-1334",
-   "self_type" : "type-1333",
+   "referenced_type" : "type-1337",
+   "self_type" : "type-1336",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37344,8 +37423,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-3421",
-   "self_type" : "type-3420",
+   "referenced_type" : "type-3424",
+   "self_type" : "type-3423",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37354,8 +37433,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-3581",
-   "self_type" : "type-3580",
+   "referenced_type" : "type-3584",
+   "self_type" : "type-3583",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37364,8 +37443,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-3745",
-   "self_type" : "type-3744",
+   "referenced_type" : "type-3751",
+   "self_type" : "type-3750",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37374,8 +37453,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-3886",
-   "self_type" : "type-3885",
+   "referenced_type" : "type-3892",
+   "self_type" : "type-3891",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37384,8 +37463,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-4437",
-   "self_type" : "type-4436",
+   "referenced_type" : "type-4444",
+   "self_type" : "type-4443",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37394,8 +37473,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-4643",
-   "self_type" : "type-4642",
+   "referenced_type" : "type-4649",
+   "self_type" : "type-4648",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37404,8 +37483,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-4814",
-   "self_type" : "type-4813",
+   "referenced_type" : "type-4820",
+   "self_type" : "type-4819",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37414,8 +37493,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-5221",
-   "self_type" : "type-5220",
+   "referenced_type" : "type-5077",
+   "self_type" : "type-5076",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37424,8 +37503,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-5496",
-   "self_type" : "type-5495",
+   "referenced_type" : "type-5239",
+   "self_type" : "type-5238",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37434,8 +37513,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-5656",
-   "self_type" : "type-5655",
+   "referenced_type" : "type-5513",
+   "self_type" : "type-5512",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37444,8 +37523,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-5820",
-   "self_type" : "type-5819",
+   "referenced_type" : "type-5673",
+   "self_type" : "type-5672",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37454,8 +37533,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-5961",
-   "self_type" : "type-5960",
+   "referenced_type" : "type-5840",
+   "self_type" : "type-5839",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37464,8 +37543,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-6110",
-   "self_type" : "type-6109",
+   "referenced_type" : "type-5981",
+   "self_type" : "type-5980",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37474,8 +37553,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-6242",
-   "self_type" : "type-6241",
+   "referenced_type" : "type-6130",
+   "self_type" : "type-6129",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37484,8 +37563,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-6375",
-   "self_type" : "type-6374",
+   "referenced_type" : "type-6262",
+   "self_type" : "type-6261",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37494,8 +37573,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-6480",
-   "self_type" : "type-6479",
+   "referenced_type" : "type-6398",
+   "self_type" : "type-6397",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/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-6503",
+   "self_type" : "type-6502",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37514,8 +37603,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-7042",
-   "self_type" : "type-7041",
+   "referenced_type" : "type-7067",
+   "self_type" : "type-7066",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37524,8 +37613,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-7287",
-   "self_type" : "type-7286",
+   "referenced_type" : "type-7311",
+   "self_type" : "type-7310",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37534,8 +37623,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-7419",
-   "self_type" : "type-7418",
+   "referenced_type" : "type-7442",
+   "self_type" : "type-7441",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37544,18 +37633,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-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",
+   "referenced_type" : "type-7591",
+   "self_type" : "type-7590",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37574,8 +37653,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1151",
-   "self_type" : "type-1150",
+   "referenced_type" : "type-1154",
+   "self_type" : "type-1153",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37584,8 +37663,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1344",
-   "self_type" : "type-1343",
+   "referenced_type" : "type-1347",
+   "self_type" : "type-1346",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37594,8 +37673,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3437",
+   "self_type" : "type-3436",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37604,8 +37683,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3594",
+   "self_type" : "type-3593",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37614,8 +37693,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3761",
+   "self_type" : "type-3760",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37624,8 +37703,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3903",
+   "self_type" : "type-3902",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37634,8 +37713,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4452",
+   "self_type" : "type-4451",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37644,8 +37723,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4658",
+   "self_type" : "type-4657",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37654,8 +37733,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4828",
+   "self_type" : "type-4827",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37664,8 +37743,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5086",
+   "self_type" : "type-5085",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37674,8 +37753,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5250",
+   "self_type" : "type-5249",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37684,8 +37763,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5526",
+   "self_type" : "type-5525",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37694,8 +37773,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5683",
+   "self_type" : "type-5682",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37704,8 +37783,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5850",
+   "self_type" : "type-5849",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37714,8 +37793,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5992",
+   "self_type" : "type-5991",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37724,8 +37803,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6139",
+   "self_type" : "type-6138",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37734,8 +37813,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6272",
+   "self_type" : "type-6271",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37744,8 +37823,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6408",
+   "self_type" : "type-6407",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37754,8 +37833,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6513",
+   "self_type" : "type-6512",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37774,8 +37853,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7075",
+   "self_type" : "type-7074",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37784,8 +37863,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7320",
+   "self_type" : "type-7319",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37794,8 +37873,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7450",
+   "self_type" : "type-7449",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37804,8 +37883,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7599",
+   "self_type" : "type-7598",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37824,8 +37903,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-1149",
-   "self_type" : "type-1148",
+   "referenced_type" : "type-1152",
+   "self_type" : "type-1151",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37834,8 +37913,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-1342",
-   "self_type" : "type-1341",
+   "referenced_type" : "type-1345",
+   "self_type" : "type-1344",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37844,8 +37923,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-3432",
-   "self_type" : "type-3431",
+   "referenced_type" : "type-3435",
+   "self_type" : "type-3434",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37854,8 +37933,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-3589",
-   "self_type" : "type-3588",
+   "referenced_type" : "type-3592",
+   "self_type" : "type-3591",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37864,8 +37943,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-3753",
-   "self_type" : "type-3752",
+   "referenced_type" : "type-3759",
+   "self_type" : "type-3758",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37874,8 +37953,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-3894",
-   "self_type" : "type-3893",
+   "referenced_type" : "type-3901",
+   "self_type" : "type-3900",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37884,8 +37963,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-4444",
-   "self_type" : "type-4443",
+   "referenced_type" : "type-4450",
+   "self_type" : "type-4449",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37894,8 +37973,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-4649",
-   "self_type" : "type-4648",
+   "referenced_type" : "type-4656",
+   "self_type" : "type-4655",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37904,8 +37983,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-4820",
-   "self_type" : "type-4819",
+   "referenced_type" : "type-4826",
+   "self_type" : "type-4825",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37914,8 +37993,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-5066",
-   "self_type" : "type-5065",
+   "referenced_type" : "type-5084",
+   "self_type" : "type-5083",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37924,8 +38003,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-5227",
-   "self_type" : "type-5226",
+   "referenced_type" : "type-5248",
+   "self_type" : "type-5247",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37934,8 +38013,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-5507",
-   "self_type" : "type-5506",
+   "referenced_type" : "type-5524",
+   "self_type" : "type-5523",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37944,8 +38023,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-5664",
-   "self_type" : "type-5663",
+   "referenced_type" : "type-5681",
+   "self_type" : "type-5680",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37954,8 +38033,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-5828",
-   "self_type" : "type-5827",
+   "referenced_type" : "type-5848",
+   "self_type" : "type-5847",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37964,8 +38043,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-5969",
-   "self_type" : "type-5968",
+   "referenced_type" : "type-5990",
+   "self_type" : "type-5989",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37974,8 +38053,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-6116",
-   "self_type" : "type-6115",
+   "referenced_type" : "type-6137",
+   "self_type" : "type-6136",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37984,8 +38063,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-6250",
-   "self_type" : "type-6249",
+   "referenced_type" : "type-6270",
+   "self_type" : "type-6269",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37994,8 +38073,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-6383",
-   "self_type" : "type-6382",
+   "referenced_type" : "type-6406",
+   "self_type" : "type-6405",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38004,8 +38083,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-6488",
-   "self_type" : "type-6487",
+   "referenced_type" : "type-6511",
+   "self_type" : "type-6510",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38024,8 +38103,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-7050",
-   "self_type" : "type-7049",
+   "referenced_type" : "type-7073",
+   "self_type" : "type-7072",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38034,8 +38113,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-7293",
-   "self_type" : "type-7292",
+   "referenced_type" : "type-7318",
+   "self_type" : "type-7317",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38044,8 +38123,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-7425",
-   "self_type" : "type-7424",
+   "referenced_type" : "type-7448",
+   "self_type" : "type-7447",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38054,8 +38133,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-7574",
-   "self_type" : "type-7573",
+   "referenced_type" : "type-7597",
+   "self_type" : "type-7596",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38074,8 +38153,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-1147",
-   "self_type" : "type-1146",
+   "referenced_type" : "type-1150",
+   "self_type" : "type-1149",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38084,8 +38163,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-1340",
-   "self_type" : "type-1339",
+   "referenced_type" : "type-1343",
+   "self_type" : "type-1342",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38094,8 +38173,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-3430",
-   "self_type" : "type-3429",
+   "referenced_type" : "type-3433",
+   "self_type" : "type-3432",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38104,8 +38183,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-3587",
-   "self_type" : "type-3586",
+   "referenced_type" : "type-3590",
+   "self_type" : "type-3589",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38114,8 +38193,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-3751",
-   "self_type" : "type-3750",
+   "referenced_type" : "type-3757",
+   "self_type" : "type-3756",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38124,8 +38203,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-3892",
-   "self_type" : "type-3891",
+   "referenced_type" : "type-3898",
+   "self_type" : "type-3897",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38134,8 +38213,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-4442",
-   "self_type" : "type-4441",
+   "referenced_type" : "type-4448",
+   "self_type" : "type-4447",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38144,8 +38223,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-4647",
-   "self_type" : "type-4646",
+   "referenced_type" : "type-4654",
+   "self_type" : "type-4653",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38154,8 +38233,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-4818",
-   "self_type" : "type-4817",
+   "referenced_type" : "type-4824",
+   "self_type" : "type-4823",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38164,8 +38243,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-5064",
-   "self_type" : "type-5063",
+   "referenced_type" : "type-5082",
+   "self_type" : "type-5081",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38174,8 +38253,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-5225",
-   "self_type" : "type-5224",
+   "referenced_type" : "type-5244",
+   "self_type" : "type-5243",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38184,8 +38263,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-5505",
-   "self_type" : "type-5504",
+   "referenced_type" : "type-5522",
+   "self_type" : "type-5521",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38194,8 +38273,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-5662",
-   "self_type" : "type-5661",
+   "referenced_type" : "type-5679",
+   "self_type" : "type-5678",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38204,8 +38283,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-5826",
-   "self_type" : "type-5825",
+   "referenced_type" : "type-5846",
+   "self_type" : "type-5845",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38214,8 +38293,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-5967",
-   "self_type" : "type-5966",
+   "referenced_type" : "type-5987",
+   "self_type" : "type-5986",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38224,8 +38303,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-6114",
-   "self_type" : "type-6113",
+   "referenced_type" : "type-6134",
+   "self_type" : "type-6133",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38234,8 +38313,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-6248",
-   "self_type" : "type-6247",
+   "referenced_type" : "type-6268",
+   "self_type" : "type-6267",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38244,8 +38323,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-6381",
-   "self_type" : "type-6380",
+   "referenced_type" : "type-6404",
+   "self_type" : "type-6403",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38254,8 +38333,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-6486",
-   "self_type" : "type-6485",
+   "referenced_type" : "type-6509",
+   "self_type" : "type-6508",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38274,8 +38353,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-7048",
-   "self_type" : "type-7047",
+   "referenced_type" : "type-7071",
+   "self_type" : "type-7070",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38284,8 +38363,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-7291",
-   "self_type" : "type-7290",
+   "referenced_type" : "type-7316",
+   "self_type" : "type-7315",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38294,8 +38373,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-7423",
-   "self_type" : "type-7422",
+   "referenced_type" : "type-7446",
+   "self_type" : "type-7445",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38304,8 +38383,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-7572",
-   "self_type" : "type-7571",
+   "referenced_type" : "type-7595",
+   "self_type" : "type-7594",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38324,8 +38403,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-1145",
-   "self_type" : "type-1144",
+   "referenced_type" : "type-1148",
+   "self_type" : "type-1147",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38334,8 +38413,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-1338",
-   "self_type" : "type-1337",
+   "referenced_type" : "type-1341",
+   "self_type" : "type-1340",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38344,8 +38423,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-3428",
-   "self_type" : "type-3427",
+   "referenced_type" : "type-3431",
+   "self_type" : "type-3430",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38354,8 +38433,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-3585",
-   "self_type" : "type-3584",
+   "referenced_type" : "type-3588",
+   "self_type" : "type-3587",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38364,8 +38443,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-3749",
-   "self_type" : "type-3748",
+   "referenced_type" : "type-3755",
+   "self_type" : "type-3754",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38374,8 +38453,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-3890",
-   "self_type" : "type-3889",
+   "referenced_type" : "type-3896",
+   "self_type" : "type-3895",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38384,8 +38463,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-4440",
-   "self_type" : "type-4439",
+   "referenced_type" : "type-4446",
+   "self_type" : "type-4445",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38394,8 +38473,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-4645",
-   "self_type" : "type-4644",
+   "referenced_type" : "type-4652",
+   "self_type" : "type-4651",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38404,8 +38483,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-4816",
-   "self_type" : "type-4815",
+   "referenced_type" : "type-4822",
+   "self_type" : "type-4821",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38414,8 +38493,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-5062",
-   "self_type" : "type-5061",
+   "referenced_type" : "type-5080",
+   "self_type" : "type-5079",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38424,8 +38503,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-5223",
-   "self_type" : "type-5222",
+   "referenced_type" : "type-5241",
+   "self_type" : "type-5240",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38434,8 +38513,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-5503",
-   "self_type" : "type-5502",
+   "referenced_type" : "type-5520",
+   "self_type" : "type-5519",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38444,8 +38523,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-5660",
-   "self_type" : "type-5659",
+   "referenced_type" : "type-5677",
+   "self_type" : "type-5676",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38454,8 +38533,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-5824",
-   "self_type" : "type-5823",
+   "referenced_type" : "type-5844",
+   "self_type" : "type-5843",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38464,8 +38543,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-5965",
-   "self_type" : "type-5964",
+   "referenced_type" : "type-5985",
+   "self_type" : "type-5984",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38474,8 +38553,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-6112",
-   "self_type" : "type-6111",
+   "referenced_type" : "type-6132",
+   "self_type" : "type-6131",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38484,8 +38563,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-6246",
-   "self_type" : "type-6245",
+   "referenced_type" : "type-6266",
+   "self_type" : "type-6265",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38494,8 +38573,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-6379",
-   "self_type" : "type-6378",
+   "referenced_type" : "type-6402",
+   "self_type" : "type-6401",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38504,8 +38583,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-6484",
-   "self_type" : "type-6483",
+   "referenced_type" : "type-6507",
+   "self_type" : "type-6506",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38524,8 +38603,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-7046",
-   "self_type" : "type-7045",
+   "referenced_type" : "type-7069",
+   "self_type" : "type-7068",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38534,8 +38613,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-7289",
-   "self_type" : "type-7288",
+   "referenced_type" : "type-7313",
+   "self_type" : "type-7312",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38544,8 +38623,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-7421",
-   "self_type" : "type-7420",
+   "referenced_type" : "type-7444",
+   "self_type" : "type-7443",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38554,8 +38633,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-7570",
-   "self_type" : "type-7569",
+   "referenced_type" : "type-7593",
+   "self_type" : "type-7592",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38574,8 +38653,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-1153",
-   "self_type" : "type-1152",
+   "referenced_type" : "type-1156",
+   "self_type" : "type-1155",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38584,8 +38663,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-1346",
-   "self_type" : "type-1345",
+   "referenced_type" : "type-1349",
+   "self_type" : "type-1348",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38594,8 +38673,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-3436",
-   "self_type" : "type-3435",
+   "referenced_type" : "type-3439",
+   "self_type" : "type-3438",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38604,8 +38683,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-3593",
-   "self_type" : "type-3592",
+   "referenced_type" : "type-3596",
+   "self_type" : "type-3595",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38614,8 +38693,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-3757",
-   "self_type" : "type-3756",
+   "referenced_type" : "type-3763",
+   "self_type" : "type-3762",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38624,8 +38703,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-3899",
-   "self_type" : "type-3898",
+   "referenced_type" : "type-3905",
+   "self_type" : "type-3904",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38634,8 +38713,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-4448",
-   "self_type" : "type-4447",
+   "referenced_type" : "type-4454",
+   "self_type" : "type-4453",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38644,8 +38723,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-4653",
-   "self_type" : "type-4652",
+   "referenced_type" : "type-4660",
+   "self_type" : "type-4659",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38654,8 +38733,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-4824",
-   "self_type" : "type-4823",
+   "referenced_type" : "type-4831",
+   "self_type" : "type-4830",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38664,8 +38743,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-5071",
-   "self_type" : "type-5070",
+   "referenced_type" : "type-5088",
+   "self_type" : "type-5087",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38674,8 +38753,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-5234",
-   "self_type" : "type-5233",
+   "referenced_type" : "type-5252",
+   "self_type" : "type-5251",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38684,8 +38763,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-5511",
-   "self_type" : "type-5510",
+   "referenced_type" : "type-5528",
+   "self_type" : "type-5527",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38694,8 +38773,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-5668",
-   "self_type" : "type-5667",
+   "referenced_type" : "type-5685",
+   "self_type" : "type-5684",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38704,8 +38783,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-5832",
-   "self_type" : "type-5831",
+   "referenced_type" : "type-5852",
+   "self_type" : "type-5851",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38714,8 +38793,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-5974",
-   "self_type" : "type-5973",
+   "referenced_type" : "type-5994",
+   "self_type" : "type-5993",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38724,8 +38803,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-6121",
-   "self_type" : "type-6120",
+   "referenced_type" : "type-6141",
+   "self_type" : "type-6140",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38734,8 +38813,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-6254",
-   "self_type" : "type-6253",
+   "referenced_type" : "type-6274",
+   "self_type" : "type-6273",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38744,8 +38823,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-6387",
-   "self_type" : "type-6386",
+   "referenced_type" : "type-6410",
+   "self_type" : "type-6409",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38754,8 +38833,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-6492",
-   "self_type" : "type-6491",
+   "referenced_type" : "type-6515",
+   "self_type" : "type-6514",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38774,8 +38853,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-7054",
-   "self_type" : "type-7053",
+   "referenced_type" : "type-7077",
+   "self_type" : "type-7076",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38784,8 +38863,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-7298",
-   "self_type" : "type-7297",
+   "referenced_type" : "type-7322",
+   "self_type" : "type-7321",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38794,8 +38873,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-7429",
-   "self_type" : "type-7428",
+   "referenced_type" : "type-7452",
+   "self_type" : "type-7451",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38804,8 +38883,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-7578",
-   "self_type" : "type-7577",
+   "referenced_type" : "type-7601",
+   "self_type" : "type-7600",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38834,8 +38913,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-1114",
-   "self_type" : "type-1113",
+   "referenced_type" : "type-1117",
+   "self_type" : "type-1116",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38844,8 +38923,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-1291",
-   "self_type" : "type-1290",
+   "referenced_type" : "type-1295",
+   "self_type" : "type-1294",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38854,8 +38933,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-3356",
-   "self_type" : "type-3355",
+   "referenced_type" : "type-3359",
+   "self_type" : "type-3358",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38864,8 +38943,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-3544",
-   "self_type" : "type-3543",
+   "referenced_type" : "type-3547",
+   "self_type" : "type-3546",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38874,8 +38953,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-3653",
-   "self_type" : "type-3652",
+   "referenced_type" : "type-3656",
+   "self_type" : "type-3655",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38884,8 +38963,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-3717",
-   "self_type" : "type-3716",
+   "referenced_type" : "type-3723",
+   "self_type" : "type-3722",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38894,8 +38973,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-3841",
-   "self_type" : "type-3840",
+   "referenced_type" : "type-3850",
+   "self_type" : "type-3849",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38904,8 +38983,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-4396",
-   "self_type" : "type-4395",
+   "referenced_type" : "type-4404",
+   "self_type" : "type-4403",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38914,8 +38993,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-4511",
-   "self_type" : "type-4510",
+   "referenced_type" : "type-4518",
+   "self_type" : "type-4517",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38924,8 +39003,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-4548",
-   "self_type" : "type-4547",
+   "referenced_type" : "type-4556",
+   "self_type" : "type-4555",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38934,8 +39013,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-4606",
-   "self_type" : "type-4605",
+   "referenced_type" : "type-4612",
+   "self_type" : "type-4611",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38944,8 +39023,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-4776",
-   "self_type" : "type-4775",
+   "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"
   },
@@ -38954,8 +39033,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-4854",
-   "self_type" : "type-4853",
+   "referenced_type" : "type-4860",
+   "self_type" : "type-4859",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38964,8 +39043,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-5073",
-   "self_type" : "type-5072",
+   "referenced_type" : "type-5091",
+   "self_type" : "type-5090",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38974,8 +39053,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-5127",
-   "self_type" : "type-5126",
+   "referenced_type" : "type-5143",
+   "self_type" : "type-5142",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38984,8 +39063,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-5183",
-   "self_type" : "type-5182",
+   "referenced_type" : "type-5200",
+   "self_type" : "type-5199",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39004,8 +39083,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-5431",
-   "self_type" : "type-5430",
+   "referenced_type" : "type-5448",
+   "self_type" : "type-5447",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39014,8 +39093,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-5619",
-   "self_type" : "type-5618",
+   "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"
   },
@@ -39024,8 +39103,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-5728",
-   "self_type" : "type-5727",
+   "referenced_type" : "type-5745",
+   "self_type" : "type-5744",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39034,8 +39113,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-5792",
-   "self_type" : "type-5791",
+   "referenced_type" : "type-5812",
+   "self_type" : "type-5811",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39044,8 +39123,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-5916",
-   "self_type" : "type-5915",
+   "referenced_type" : "type-5939",
+   "self_type" : "type-5938",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39054,8 +39133,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-6072",
-   "self_type" : "type-6071",
+   "referenced_type" : "type-6092",
+   "self_type" : "type-6091",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39064,8 +39143,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-6205",
-   "self_type" : "type-6204",
+   "referenced_type" : "type-6225",
+   "self_type" : "type-6224",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39074,8 +39153,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-6301",
-   "self_type" : "type-6300",
+   "referenced_type" : "type-6321",
+   "self_type" : "type-6320",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39084,8 +39163,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-6347",
-   "self_type" : "type-6346",
+   "referenced_type" : "type-6370",
+   "self_type" : "type-6369",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39094,8 +39173,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-6439",
-   "self_type" : "type-6438",
+   "referenced_type" : "type-6463",
+   "self_type" : "type-6462",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39104,8 +39183,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-6996",
-   "self_type" : "type-6995",
+   "referenced_type" : "type-7023",
+   "self_type" : "type-7022",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39114,8 +39193,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-7115",
-   "self_type" : "type-7114",
+   "referenced_type" : "type-7140",
+   "self_type" : "type-7139",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39124,8 +39203,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-7167",
-   "self_type" : "type-7166",
+   "referenced_type" : "type-7192",
+   "self_type" : "type-7191",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39134,8 +39213,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-7246",
-   "self_type" : "type-7245",
+   "referenced_type" : "type-7269",
+   "self_type" : "type-7268",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39144,8 +39223,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-7385",
-   "self_type" : "type-7384",
+   "referenced_type" : "type-7408",
+   "self_type" : "type-7407",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39154,8 +39233,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-7449",
-   "self_type" : "type-7448",
+   "referenced_type" : "type-7474",
+   "self_type" : "type-7473",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39164,8 +39243,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-7489",
-   "self_type" : "type-7488",
+   "referenced_type" : "type-7514",
+   "self_type" : "type-7513",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39174,8 +39253,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-7580",
-   "self_type" : "type-7579",
+   "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"
   },
@@ -39184,8 +39263,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-7621",
-   "self_type" : "type-7620",
+   "referenced_type" : "type-7644",
+   "self_type" : "type-7643",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39204,8 +39283,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-4764",
-   "self_type" : "type-4763",
+   "referenced_type" : "type-4771",
+   "self_type" : "type-4770",
    "size" : 24,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39214,8 +39293,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-4867",
-   "self_type" : "type-4866",
+   "referenced_type" : "type-4873",
+   "self_type" : "type-4872",
    "size" : 24,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39224,8 +39303,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",
+   "referenced_type" : "type-5102",
+   "self_type" : "type-5101",
    "size" : 24,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39234,8 +39313,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",
+   "referenced_type" : "type-5155",
+   "self_type" : "type-5154",
    "size" : 24,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39244,8 +39323,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",
+   "referenced_type" : "type-7398",
+   "self_type" : "type-7397",
    "size" : 24,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39254,8 +39333,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",
+   "referenced_type" : "type-7494",
+   "self_type" : "type-7493",
    "size" : 24,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39264,8 +39343,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",
+   "referenced_type" : "type-7620",
+   "self_type" : "type-7619",
    "size" : 24,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39274,8 +39353,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-2646",
-   "self_type" : "type-2645",
+   "referenced_type" : "type-2649",
+   "self_type" : "type-2648",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39284,8 +39363,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",
+   "referenced_type" : "type-4997",
+   "self_type" : "type-4996",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39294,8 +39373,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",
+   "referenced_type" : "type-6056",
+   "self_type" : "type-6055",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39304,8 +39383,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",
+   "referenced_type" : "type-7546",
+   "self_type" : "type-7545",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39314,8 +39393,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-2642",
-   "self_type" : "type-2641",
+   "referenced_type" : "type-2645",
+   "self_type" : "type-2644",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39324,8 +39403,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",
+   "referenced_type" : "type-4993",
+   "self_type" : "type-4992",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39334,8 +39413,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",
+   "referenced_type" : "type-6053",
+   "self_type" : "type-6052",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39344,8 +39423,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",
+   "referenced_type" : "type-7532",
+   "self_type" : "type-7531",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39354,8 +39433,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",
+   "referenced_type" : "type-4762",
+   "self_type" : "type-4761",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39364,8 +39443,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",
+   "referenced_type" : "type-4869",
+   "self_type" : "type-4868",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39374,8 +39453,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",
+   "referenced_type" : "type-5094",
+   "self_type" : "type-5093",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39384,8 +39463,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",
+   "referenced_type" : "type-5151",
+   "self_type" : "type-5150",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39394,8 +39473,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",
+   "referenced_type" : "type-7392",
+   "self_type" : "type-7391",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39404,8 +39483,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",
+   "referenced_type" : "type-7489",
+   "self_type" : "type-7488",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39414,8 +39493,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",
+   "referenced_type" : "type-7612",
+   "self_type" : "type-7611",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39424,8 +39503,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",
+   "referenced_type" : "type-1648",
+   "self_type" : "type-1647",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -39434,8 +39513,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",
+   "referenced_type" : "type-4114",
+   "self_type" : "type-4113",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -39444,8 +39523,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",
+   "referenced_type" : "type-6717",
+   "self_type" : "type-6716",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -39464,8 +39543,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1109",
-   "self_type" : "type-1108",
+   "referenced_type" : "type-1112",
+   "self_type" : "type-1111",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39474,8 +39553,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1279",
-   "self_type" : "type-1278",
+   "referenced_type" : "type-1282",
+   "self_type" : "type-1281",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39484,8 +39563,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-3276",
+   "self_type" : "type-3275",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39494,8 +39573,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-3541",
+   "self_type" : "type-3540",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39504,8 +39583,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-3651",
+   "self_type" : "type-3650",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39514,8 +39593,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-3717",
+   "self_type" : "type-3716",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39524,8 +39603,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-3839",
+   "self_type" : "type-3838",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39544,8 +39623,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-4361",
+   "self_type" : "type-4360",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39554,8 +39633,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-4496",
+   "self_type" : "type-4495",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39564,8 +39643,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-4565",
+   "self_type" : "type-4564",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39574,8 +39653,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-4627",
+   "self_type" : "type-4626",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39584,8 +39663,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-4671",
+   "self_type" : "type-4670",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39594,8 +39673,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-4877",
+   "self_type" : "type-4876",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39604,8 +39683,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-5160",
+   "self_type" : "type-5159",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39614,8 +39693,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-5191",
+   "self_type" : "type-5190",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39624,8 +39703,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-5365",
+   "self_type" : "type-5364",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39634,8 +39713,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-5630",
+   "self_type" : "type-5629",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39644,8 +39723,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-5740",
+   "self_type" : "type-5739",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39654,8 +39733,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-5806",
+   "self_type" : "type-5805",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39664,8 +39743,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-5928",
+   "self_type" : "type-5927",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39674,8 +39753,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6083",
+   "self_type" : "type-6082",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39684,8 +39763,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6220",
+   "self_type" : "type-6219",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39694,8 +39773,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6316",
+   "self_type" : "type-6315",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39704,8 +39783,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6363",
+   "self_type" : "type-6362",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39714,8 +39793,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6455",
+   "self_type" : "type-6454",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39724,8 +39803,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6977",
+   "self_type" : "type-6976",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39734,8 +39813,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7116",
+   "self_type" : "type-7115",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39744,8 +39823,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7204",
+   "self_type" : "type-7203",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39754,8 +39833,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7287",
+   "self_type" : "type-7286",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39764,8 +39843,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7331",
+   "self_type" : "type-7330",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39774,8 +39853,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7498",
+   "self_type" : "type-7497",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39784,8 +39863,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7523",
+   "self_type" : "type-7522",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39794,8 +39873,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7529",
+   "self_type" : "type-7528",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39804,8 +39883,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7658",
+   "self_type" : "type-7657",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39814,8 +39893,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7669",
+   "self_type" : "type-7668",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39834,8 +39913,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",
+   "referenced_type" : "type-4386",
+   "self_type" : "type-4385",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -39844,8 +39923,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",
+   "referenced_type" : "type-4514",
+   "self_type" : "type-4513",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -39854,8 +39933,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",
+   "referenced_type" : "type-7001",
+   "self_type" : "type-7000",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -39864,8 +39943,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",
+   "referenced_type" : "type-7135",
+   "self_type" : "type-7134",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -39915,7 +39994,7 @@
    "linker_set_key" : "const unsigned short",
    "name" : "const unsigned short",
    "referenced_type" : "type-500",
-   "self_type" : "type-2521",
+   "self_type" : "type-2524",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39943,7 +40022,7 @@
    "linker_set_key" : "volatile int",
    "name" : "volatile int",
    "referenced_type" : "type-4",
-   "self_type" : "type-1255",
+   "self_type" : "type-1258",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h"
   }
@@ -39961,7 +40040,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -39976,8 +40055,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_BALANCETYPE",
    "name" : "OMX_AUDIO_CONFIG_BALANCETYPE",
-   "referenced_type" : "type-2186",
-   "self_type" : "type-2186",
+   "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_BALANCETYPE"
@@ -39993,7 +40072,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -40003,7 +40082,7 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "nBass",
@@ -40013,8 +40092,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_BASSTYPE",
    "name" : "OMX_AUDIO_CONFIG_BASSTYPE",
-   "referenced_type" : "type-2190",
-   "self_type" : "type-2190",
+   "referenced_type" : "type-2193",
+   "self_type" : "type-2193",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_BASSTYPE"
@@ -40030,7 +40109,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -40045,18 +40124,18 @@
     {
      "field_name" : "bMute",
      "field_offset" : 128,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bIsMIDI",
      "field_offset" : 160,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
    "name" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
-   "referenced_type" : "type-2188",
-   "self_type" : "type-2188",
+   "referenced_type" : "type-2191",
+   "self_type" : "type-2191",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE"
@@ -40072,7 +40151,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -40087,23 +40166,23 @@
     {
      "field_name" : "bLinear",
      "field_offset" : 128,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "sVolume",
      "field_offset" : 160,
-     "referenced_type" : "type-1475"
+     "referenced_type" : "type-1474"
     },
     {
      "field_name" : "bIsMIDI",
      "field_offset" : 256,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
    "name" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
-   "referenced_type" : "type-2185",
-   "self_type" : "type-2185",
+   "referenced_type" : "type-2188",
+   "self_type" : "type-2188",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE"
@@ -40119,7 +40198,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -40129,17 +40208,17 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "sDelay",
      "field_offset" : 128,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     },
     {
      "field_name" : "sModulationRate",
      "field_offset" : 224,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     },
     {
      "field_name" : "nModulationDepth",
@@ -40149,13 +40228,13 @@
     {
      "field_name" : "nFeedback",
      "field_offset" : 352,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
    "name" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
-   "referenced_type" : "type-2196",
-   "self_type" : "type-2196",
+   "referenced_type" : "type-2199",
+   "self_type" : "type-2199",
    "size" : 56,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHORUSTYPE"
@@ -40171,7 +40250,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -40181,13 +40260,13 @@
     {
      "field_name" : "eEchoCancelation",
      "field_offset" : 96,
-     "referenced_type" : "type-2198"
+     "referenced_type" : "type-2201"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
-   "referenced_type" : "type-2199",
-   "self_type" : "type-2199",
+   "referenced_type" : "type-2202",
+   "self_type" : "type-2202",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE"
@@ -40203,7 +40282,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -40213,28 +40292,28 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "sBandIndex",
      "field_offset" : 128,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     },
     {
      "field_name" : "sCenterFreq",
      "field_offset" : 224,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     },
     {
      "field_name" : "sBandLevel",
      "field_offset" : 320,
-     "referenced_type" : "type-1475"
+     "referenced_type" : "type-1474"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
    "name" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
-   "referenced_type" : "type-2193",
-   "self_type" : "type-2193",
+   "referenced_type" : "type-2196",
+   "self_type" : "type-2196",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE"
@@ -40250,7 +40329,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -40260,13 +40339,13 @@
     {
      "field_name" : "bLoudness",
      "field_offset" : 96,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
    "name" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
-   "referenced_type" : "type-2189",
-   "self_type" : "type-2189",
+   "referenced_type" : "type-2192",
+   "self_type" : "type-2192",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE"
@@ -40282,7 +40361,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -40292,17 +40371,17 @@
     {
      "field_name" : "sPitchTransposition",
      "field_offset" : 96,
-     "referenced_type" : "type-1475"
+     "referenced_type" : "type-1474"
     },
     {
      "field_name" : "sPlayBackRate",
      "field_offset" : 192,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     },
     {
      "field_name" : "sTempo",
      "field_offset" : 288,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     },
     {
      "field_name" : "nMaxPolyphony",
@@ -40352,8 +40431,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
-   "referenced_type" : "type-2167",
-   "self_type" : "type-2167",
+   "referenced_type" : "type-2160",
+   "self_type" : "type-2160",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE"
@@ -40369,7 +40448,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -40384,13 +40463,13 @@
     {
      "field_name" : "nMidiEvents",
      "field_offset" : 128,
-     "referenced_type" : "type-1577"
+     "referenced_type" : "type-1572"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
-   "referenced_type" : "type-2146",
-   "self_type" : "type-2146",
+   "referenced_type" : "type-2138",
+   "self_type" : "type-2138",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE"
@@ -40406,7 +40485,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -40426,13 +40505,13 @@
     {
      "field_name" : "nData",
      "field_offset" : 160,
-     "referenced_type" : "type-1577"
+     "referenced_type" : "type-1572"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
-   "referenced_type" : "type-2183",
-   "self_type" : "type-2183",
+   "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_MIDIMETAEVENTDATATYPE"
@@ -40448,7 +40527,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -40483,8 +40562,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
-   "referenced_type" : "type-2182",
-   "self_type" : "type-2182",
+   "referenced_type" : "type-2185",
+   "self_type" : "type-2185",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE"
@@ -40500,7 +40579,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -40530,8 +40609,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
-   "referenced_type" : "type-2157",
-   "self_type" : "type-2157",
+   "referenced_type" : "type-2149",
+   "self_type" : "type-2149",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE"
@@ -40547,7 +40626,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -40572,7 +40651,7 @@
     {
      "field_name" : "bVibra",
      "field_offset" : 192,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "nNumMetaEvents",
@@ -40587,13 +40666,13 @@
     {
      "field_name" : "eMIDIPlayBackState",
      "field_offset" : 288,
-     "referenced_type" : "type-2171"
+     "referenced_type" : "type-2170"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
-   "referenced_type" : "type-2172",
-   "self_type" : "type-2172",
+   "referenced_type" : "type-2175",
+   "self_type" : "type-2175",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE"
@@ -40609,7 +40688,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -40619,13 +40698,13 @@
     {
      "field_name" : "bMute",
      "field_offset" : 96,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MUTETYPE",
    "name" : "OMX_AUDIO_CONFIG_MUTETYPE",
-   "referenced_type" : "type-2187",
-   "self_type" : "type-2187",
+   "referenced_type" : "type-2190",
+   "self_type" : "type-2190",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MUTETYPE"
@@ -40641,7 +40720,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -40651,13 +40730,13 @@
     {
      "field_name" : "bNoiseReduction",
      "field_offset" : 96,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
-   "referenced_type" : "type-2200",
-   "self_type" : "type-2200",
+   "referenced_type" : "type-2203",
+   "self_type" : "type-2203",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE"
@@ -40673,7 +40752,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -40683,47 +40762,47 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "sRoomLevel",
      "field_offset" : 128,
-     "referenced_type" : "type-1475"
+     "referenced_type" : "type-1474"
     },
     {
      "field_name" : "sRoomHighFreqLevel",
      "field_offset" : 224,
-     "referenced_type" : "type-1475"
+     "referenced_type" : "type-1474"
     },
     {
      "field_name" : "sReflectionsLevel",
      "field_offset" : 320,
-     "referenced_type" : "type-1475"
+     "referenced_type" : "type-1474"
     },
     {
      "field_name" : "sReflectionsDelay",
      "field_offset" : 416,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     },
     {
      "field_name" : "sReverbLevel",
      "field_offset" : 512,
-     "referenced_type" : "type-1475"
+     "referenced_type" : "type-1474"
     },
     {
      "field_name" : "sReverbDelay",
      "field_offset" : 608,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     },
     {
      "field_name" : "sDecayTime",
      "field_offset" : 704,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     },
     {
      "field_name" : "nDecayHighFreqRatio",
      "field_offset" : 800,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     },
     {
      "field_name" : "nDensity",
@@ -40738,13 +40817,13 @@
     {
      "field_name" : "sReferenceHighFreq",
      "field_offset" : 960,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
-   "referenced_type" : "type-2197",
-   "self_type" : "type-2197",
+   "referenced_type" : "type-2200",
+   "self_type" : "type-2200",
    "size" : 132,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE"
@@ -40760,7 +40839,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -40770,12 +40849,12 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "eWideningType",
      "field_offset" : 128,
-     "referenced_type" : "type-2194"
+     "referenced_type" : "type-2197"
     },
     {
      "field_name" : "nStereoWidening",
@@ -40785,8 +40864,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
    "name" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-2195",
-   "self_type" : "type-2195",
+   "referenced_type" : "type-2198",
+   "self_type" : "type-2198",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE"
@@ -40802,7 +40881,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -40812,7 +40891,7 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "nTreble",
@@ -40822,8 +40901,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_TREBLETYPE",
    "name" : "OMX_AUDIO_CONFIG_TREBLETYPE",
-   "referenced_type" : "type-2191",
-   "self_type" : "type-2191",
+   "referenced_type" : "type-2194",
+   "self_type" : "type-2194",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_TREBLETYPE"
@@ -40839,7 +40918,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -40849,18 +40928,18 @@
     {
      "field_name" : "bLinear",
      "field_offset" : 96,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "sVolume",
      "field_offset" : 128,
-     "referenced_type" : "type-1475"
+     "referenced_type" : "type-1474"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
    "name" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
-   "referenced_type" : "type-2184",
-   "self_type" : "type-2184",
+   "referenced_type" : "type-2187",
+   "self_type" : "type-2187",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_VOLUMETYPE"
@@ -40876,7 +40955,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -40921,7 +41000,7 @@
     {
      "field_name" : "eAACProfile",
      "field_offset" : 320,
-     "referenced_type" : "type-1678"
+     "referenced_type" : "type-1675"
     },
     {
      "field_name" : "eAACStreamFormat",
@@ -40931,13 +41010,13 @@
     {
      "field_name" : "eChannelMode",
      "field_offset" : 384,
-     "referenced_type" : "type-1653"
+     "referenced_type" : "type-1652"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
    "name" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
-   "referenced_type" : "type-1689",
-   "self_type" : "type-1689",
+   "referenced_type" : "type-1681",
+   "self_type" : "type-1681",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_AACPROFILETYPE"
@@ -40953,7 +41032,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -40978,8 +41057,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_ADPCMTYPE",
    "name" : "OMX_AUDIO_PARAM_ADPCMTYPE",
-   "referenced_type" : "type-1800",
-   "self_type" : "type-1800",
+   "referenced_type" : "type-1791",
+   "self_type" : "type-1791",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_ADPCMTYPE"
@@ -40995,7 +41074,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -41015,23 +41094,23 @@
     {
      "field_name" : "eAMRBandMode",
      "field_offset" : 160,
-     "referenced_type" : "type-1892"
+     "referenced_type" : "type-1883"
     },
     {
      "field_name" : "eAMRDTXMode",
      "field_offset" : 192,
-     "referenced_type" : "type-1903"
+     "referenced_type" : "type-1896"
     },
     {
      "field_name" : "eAMRFrameFormat",
      "field_offset" : 224,
-     "referenced_type" : "type-1882"
+     "referenced_type" : "type-1873"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_AMRTYPE",
    "name" : "OMX_AUDIO_PARAM_AMRTYPE",
-   "referenced_type" : "type-1914",
-   "self_type" : "type-1914",
+   "referenced_type" : "type-1907",
+   "self_type" : "type-1907",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_AMRTYPE"
@@ -41047,7 +41126,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -41062,12 +41141,12 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-2024"
+     "referenced_type" : "type-2017"
     },
     {
      "field_name" : "bRATE_REDUCon",
      "field_offset" : 160,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "nMinBitRate",
@@ -41082,23 +41161,23 @@
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 256,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bNoiseSuppressor",
      "field_offset" : 288,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_EVRCTYPE",
    "name" : "OMX_AUDIO_PARAM_EVRCTYPE",
-   "referenced_type" : "type-2057",
-   "self_type" : "type-2057",
+   "referenced_type" : "type-2049",
+   "self_type" : "type-2049",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_EVRCTYPE"
@@ -41114,7 +41193,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -41139,8 +41218,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_FLACTYPE",
    "name" : "OMX_AUDIO_PARAM_FLACTYPE",
-   "referenced_type" : "type-1711",
-   "self_type" : "type-1711",
+   "referenced_type" : "type-1704",
+   "self_type" : "type-1704",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_FLACTYPE"
@@ -41156,7 +41235,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -41171,28 +41250,28 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "eBitRate",
      "field_offset" : 160,
-     "referenced_type" : "type-1810"
+     "referenced_type" : "type-1804"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 192,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 224,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G723TYPE",
    "name" : "OMX_AUDIO_PARAM_G723TYPE",
-   "referenced_type" : "type-1823",
-   "self_type" : "type-1823",
+   "referenced_type" : "type-1814",
+   "self_type" : "type-1814",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G723TYPE"
@@ -41208,7 +41287,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -41223,13 +41302,13 @@
     {
      "field_name" : "eG726Mode",
      "field_offset" : 128,
-     "referenced_type" : "type-1833"
+     "referenced_type" : "type-1824"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G726TYPE",
    "name" : "OMX_AUDIO_PARAM_G726TYPE",
-   "referenced_type" : "type-1843",
-   "self_type" : "type-1843",
+   "referenced_type" : "type-1837",
+   "self_type" : "type-1837",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G726TYPE"
@@ -41245,7 +41324,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -41260,18 +41339,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "eBitType",
      "field_offset" : 160,
-     "referenced_type" : "type-1855"
+     "referenced_type" : "type-1847"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G729TYPE",
    "name" : "OMX_AUDIO_PARAM_G729TYPE",
-   "referenced_type" : "type-1870",
-   "self_type" : "type-1870",
+   "referenced_type" : "type-1857",
+   "self_type" : "type-1857",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G729TYPE"
@@ -41287,7 +41366,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -41297,18 +41376,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
-   "referenced_type" : "type-1947",
-   "self_type" : "type-1947",
+   "referenced_type" : "type-1940",
+   "self_type" : "type-1940",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_GSMEFRTYPE"
@@ -41324,7 +41403,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -41334,18 +41413,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMFRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMFRTYPE",
-   "referenced_type" : "type-1925",
-   "self_type" : "type-1925",
+   "referenced_type" : "type-1918",
+   "self_type" : "type-1918",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_GSMFRTYPE"
@@ -41361,7 +41440,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -41371,18 +41450,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMHRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMHRTYPE",
-   "referenced_type" : "type-1936",
-   "self_type" : "type-1936",
+   "referenced_type" : "type-1929",
+   "self_type" : "type-1929",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_GSMHRTYPE"
@@ -41398,7 +41477,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -41423,18 +41502,18 @@
     {
      "field_name" : "eMidiSoundBank",
      "field_offset" : 256,
-     "referenced_type" : "type-2113"
+     "referenced_type" : "type-2105"
     },
     {
      "field_name" : "eMidiSoundBankLayout",
      "field_offset" : 288,
-     "referenced_type" : "type-2124"
+     "referenced_type" : "type-2117"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
    "name" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
-   "referenced_type" : "type-2135",
-   "self_type" : "type-2135",
+   "referenced_type" : "type-2127",
+   "self_type" : "type-2127",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE"
@@ -41450,7 +41529,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -41465,23 +41544,23 @@
     {
      "field_name" : "sMaxPolyphony",
      "field_offset" : 128,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     },
     {
      "field_name" : "bLoadDefaultSound",
      "field_offset" : 224,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "eMidiFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-2090"
+     "referenced_type" : "type-2083"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MIDITYPE",
    "name" : "OMX_AUDIO_PARAM_MIDITYPE",
-   "referenced_type" : "type-2102",
-   "self_type" : "type-2102",
+   "referenced_type" : "type-2094",
+   "self_type" : "type-2094",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MIDITYPE"
@@ -41497,7 +41576,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -41527,18 +41606,18 @@
     {
      "field_name" : "eChannelMode",
      "field_offset" : 224,
-     "referenced_type" : "type-1653"
+     "referenced_type" : "type-1652"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-1663"
+     "referenced_type" : "type-1657"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MP3TYPE",
    "name" : "OMX_AUDIO_PARAM_MP3TYPE",
-   "referenced_type" : "type-1667",
-   "self_type" : "type-1667",
+   "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"
@@ -41554,7 +41633,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -41569,17 +41648,17 @@
     {
      "field_name" : "eNumData",
      "field_offset" : 128,
-     "referenced_type" : "type-1467"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "eEndian",
      "field_offset" : 160,
-     "referenced_type" : "type-1463"
+     "referenced_type" : "type-1462"
     },
     {
      "field_name" : "bInterleaved",
      "field_offset" : 192,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "nBitPerSample",
@@ -41594,7 +41673,7 @@
     {
      "field_name" : "ePCMMode",
      "field_offset" : 288,
-     "referenced_type" : "type-1634"
+     "referenced_type" : "type-1632"
     },
     {
      "field_name" : "eChannelMapping",
@@ -41621,7 +41700,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -41636,18 +41715,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
-   "referenced_type" : "type-2002",
-   "self_type" : "type-2002",
+   "referenced_type" : "type-1995",
+   "self_type" : "type-1995",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PDCEFRTYPE"
@@ -41663,7 +41742,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -41678,18 +41757,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCFRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCFRTYPE",
-   "referenced_type" : "type-1991",
-   "self_type" : "type-1991",
+   "referenced_type" : "type-1984",
+   "self_type" : "type-1984",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PDCFRTYPE"
@@ -41705,7 +41784,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -41720,18 +41799,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCHRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCHRTYPE",
-   "referenced_type" : "type-2013",
-   "self_type" : "type-2013",
+   "referenced_type" : "type-2006",
+   "self_type" : "type-2006",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PDCHRTYPE"
@@ -41747,7 +41826,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -41767,8 +41846,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PORTFORMATTYPE",
    "name" : "OMX_AUDIO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-1629",
-   "self_type" : "type-1629",
+   "referenced_type" : "type-1628",
+   "self_type" : "type-1628",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PORTFORMATTYPE"
@@ -41784,7 +41863,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -41799,7 +41878,7 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-2024"
+     "referenced_type" : "type-2017"
     },
     {
      "field_name" : "nMinBitRate",
@@ -41814,8 +41893,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_QCELP13TYPE",
    "name" : "OMX_AUDIO_PARAM_QCELP13TYPE",
-   "referenced_type" : "type-2046",
-   "self_type" : "type-2046",
+   "referenced_type" : "type-2038",
+   "self_type" : "type-2038",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_QCELP13TYPE"
@@ -41831,7 +41910,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -41851,7 +41930,7 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 160,
-     "referenced_type" : "type-2024"
+     "referenced_type" : "type-2017"
     },
     {
      "field_name" : "nMinBitRate",
@@ -41866,8 +41945,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_QCELP8TYPE",
    "name" : "OMX_AUDIO_PARAM_QCELP8TYPE",
-   "referenced_type" : "type-2035",
-   "self_type" : "type-2035",
+   "referenced_type" : "type-2027",
+   "self_type" : "type-2027",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_QCELP8TYPE"
@@ -41883,7 +41962,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -41928,13 +42007,13 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 320,
-     "referenced_type" : "type-1757"
+     "referenced_type" : "type-1748"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_RATYPE",
    "name" : "OMX_AUDIO_PARAM_RATYPE",
-   "referenced_type" : "type-1767",
-   "self_type" : "type-1767",
+   "referenced_type" : "type-1758",
+   "self_type" : "type-1758",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_RATYPE"
@@ -41950,7 +42029,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -41990,23 +42069,23 @@
     {
      "field_name" : "bEnableBitrate",
      "field_offset" : 288,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "eChannelMode",
      "field_offset" : 320,
-     "referenced_type" : "type-1653"
+     "referenced_type" : "type-1652"
     },
     {
      "field_name" : "eSBCAllocType",
      "field_offset" : 352,
-     "referenced_type" : "type-1777"
+     "referenced_type" : "type-1771"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_SBCTYPE",
    "name" : "OMX_AUDIO_PARAM_SBCTYPE",
-   "referenced_type" : "type-1790",
-   "self_type" : "type-1790",
+   "referenced_type" : "type-1781",
+   "self_type" : "type-1781",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_SBCTYPE"
@@ -42022,7 +42101,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -42037,12 +42116,12 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-2024"
+     "referenced_type" : "type-2017"
     },
     {
      "field_name" : "bRATE_REDUCon",
      "field_offset" : 160,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "nMinBitRate",
@@ -42057,23 +42136,23 @@
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 256,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bNoiseSuppressor",
      "field_offset" : 288,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_SMVTYPE",
    "name" : "OMX_AUDIO_PARAM_SMVTYPE",
-   "referenced_type" : "type-2068",
-   "self_type" : "type-2068",
+   "referenced_type" : "type-2061",
+   "self_type" : "type-2061",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_SMVTYPE"
@@ -42089,7 +42168,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -42104,18 +42183,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
-   "referenced_type" : "type-1980",
-   "self_type" : "type-1980",
+   "referenced_type" : "type-1973",
+   "self_type" : "type-1973",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_TDMAEFRTYPE"
@@ -42131,7 +42210,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -42146,18 +42225,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
    "name" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
-   "referenced_type" : "type-1969",
-   "self_type" : "type-1969",
+   "referenced_type" : "type-1962",
+   "self_type" : "type-1962",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_TDMAFRTYPE"
@@ -42173,7 +42252,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -42218,18 +42297,18 @@
     {
      "field_name" : "bManaged",
      "field_offset" : 320,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bDownmix",
      "field_offset" : 352,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_VORBISTYPE",
    "name" : "OMX_AUDIO_PARAM_VORBISTYPE",
-   "referenced_type" : "type-1700",
-   "self_type" : "type-1700",
+   "referenced_type" : "type-1693",
+   "self_type" : "type-1693",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_VORBISTYPE"
@@ -42245,7 +42324,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -42265,12 +42344,12 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-1724"
+     "referenced_type" : "type-1715"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 192,
-     "referenced_type" : "type-1734"
+     "referenced_type" : "type-1725"
     },
     {
      "field_name" : "nSamplingRate",
@@ -42295,8 +42374,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_WMATYPE",
    "name" : "OMX_AUDIO_PARAM_WMATYPE",
-   "referenced_type" : "type-1744",
-   "self_type" : "type-1744",
+   "referenced_type" : "type-1738",
+   "self_type" : "type-1738",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_WMATYPE"
@@ -42317,7 +42396,7 @@
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 128,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "eEncoding",
@@ -42327,8 +42406,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PORTDEFINITIONTYPE",
    "name" : "OMX_AUDIO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-1620",
-   "self_type" : "type-1620",
+   "referenced_type" : "type-1623",
+   "self_type" : "type-1623",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PORTDEFINITIONTYPE"
@@ -42354,8 +42433,8 @@
    ],
    "linker_set_key" : "OMX_BS32",
    "name" : "OMX_BS32",
-   "referenced_type" : "type-1475",
-   "self_type" : "type-1475",
+   "referenced_type" : "type-1474",
+   "self_type" : "type-1474",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_BS32"
@@ -42381,8 +42460,8 @@
    ],
    "linker_set_key" : "OMX_BU32",
    "name" : "OMX_BU32",
-   "referenced_type" : "type-1470",
-   "self_type" : "type-1470",
+   "referenced_type" : "type-1473",
+   "self_type" : "type-1473",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_BU32"
@@ -42398,7 +42477,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "pBuffer",
@@ -42478,8 +42557,8 @@
    ],
    "linker_set_key" : "OMX_BUFFERHEADERTYPE",
    "name" : "OMX_BUFFERHEADERTYPE",
-   "referenced_type" : "type-1544",
-   "self_type" : "type-1544",
+   "referenced_type" : "type-1541",
+   "self_type" : "type-1541",
    "size" : 112,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_BUFFERHEADERTYPE"
@@ -42490,23 +42569,23 @@
    [
     {
      "field_name" : "EventHandler",
-     "referenced_type" : "type-1592"
+     "referenced_type" : "type-1595"
     },
     {
      "field_name" : "EmptyBufferDone",
      "field_offset" : 64,
-     "referenced_type" : "type-1594"
+     "referenced_type" : "type-1597"
     },
     {
      "field_name" : "FillBufferDone",
      "field_offset" : 128,
-     "referenced_type" : "type-1594"
+     "referenced_type" : "type-1597"
     }
    ],
    "linker_set_key" : "OMX_CALLBACKTYPE",
    "name" : "OMX_CALLBACKTYPE",
-   "referenced_type" : "type-1591",
-   "self_type" : "type-1591",
+   "referenced_type" : "type-1594",
+   "self_type" : "type-1594",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_CALLBACKTYPE"
@@ -42522,13 +42601,13 @@
     {
      "field_name" : "pInitialize",
      "field_offset" : 64,
-     "referenced_type" : "type-1505"
+     "referenced_type" : "type-1504"
     }
    ],
    "linker_set_key" : "OMX_COMPONENTREGISTERTYPE",
    "name" : "OMX_COMPONENTREGISTERTYPE",
-   "referenced_type" : "type-1504",
-   "self_type" : "type-1504",
+   "referenced_type" : "type-1503",
+   "self_type" : "type-1503",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_COMPONENTREGISTERTYPE"
@@ -42544,7 +42623,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "pComponentPrivate",
@@ -42559,98 +42638,98 @@
     {
      "field_name" : "GetComponentVersion",
      "field_offset" : 192,
-     "referenced_type" : "type-2359"
+     "referenced_type" : "type-2362"
     },
     {
      "field_name" : "SendCommand",
      "field_offset" : 256,
-     "referenced_type" : "type-2363"
+     "referenced_type" : "type-2366"
     },
     {
      "field_name" : "GetParameter",
      "field_offset" : 320,
-     "referenced_type" : "type-2365"
+     "referenced_type" : "type-2368"
     },
     {
      "field_name" : "SetParameter",
      "field_offset" : 384,
-     "referenced_type" : "type-2365"
+     "referenced_type" : "type-2368"
     },
     {
      "field_name" : "GetConfig",
      "field_offset" : 448,
-     "referenced_type" : "type-2365"
+     "referenced_type" : "type-2368"
     },
     {
      "field_name" : "SetConfig",
      "field_offset" : 512,
-     "referenced_type" : "type-2365"
+     "referenced_type" : "type-2368"
     },
     {
      "field_name" : "GetExtensionIndex",
      "field_offset" : 576,
-     "referenced_type" : "type-2367"
+     "referenced_type" : "type-2370"
     },
     {
      "field_name" : "GetState",
      "field_offset" : 640,
-     "referenced_type" : "type-2370"
+     "referenced_type" : "type-2373"
     },
     {
      "field_name" : "ComponentTunnelRequest",
      "field_offset" : 704,
-     "referenced_type" : "type-2373"
+     "referenced_type" : "type-2376"
     },
     {
      "field_name" : "UseBuffer",
      "field_offset" : 768,
-     "referenced_type" : "type-2376"
+     "referenced_type" : "type-2379"
     },
     {
      "field_name" : "AllocateBuffer",
      "field_offset" : 832,
-     "referenced_type" : "type-2379"
+     "referenced_type" : "type-2382"
     },
     {
      "field_name" : "FreeBuffer",
      "field_offset" : 896,
-     "referenced_type" : "type-2381"
+     "referenced_type" : "type-2384"
     },
     {
      "field_name" : "EmptyThisBuffer",
      "field_offset" : 960,
-     "referenced_type" : "type-2383"
+     "referenced_type" : "type-2386"
     },
     {
      "field_name" : "FillThisBuffer",
      "field_offset" : 1024,
-     "referenced_type" : "type-2383"
+     "referenced_type" : "type-2386"
     },
     {
      "field_name" : "SetCallbacks",
      "field_offset" : 1088,
-     "referenced_type" : "type-2385"
+     "referenced_type" : "type-2388"
     },
     {
      "field_name" : "ComponentDeInit",
      "field_offset" : 1152,
-     "referenced_type" : "type-1505"
+     "referenced_type" : "type-1504"
     },
     {
      "field_name" : "UseEGLImage",
      "field_offset" : 1216,
-     "referenced_type" : "type-2388"
+     "referenced_type" : "type-2391"
     },
     {
      "field_name" : "ComponentRoleEnum",
      "field_offset" : 1280,
-     "referenced_type" : "type-2390"
+     "referenced_type" : "type-2393"
     }
    ],
    "linker_set_key" : "OMX_COMPONENTTYPE",
    "name" : "OMX_COMPONENTTYPE",
-   "referenced_type" : "type-2358",
-   "self_type" : "type-2358",
+   "referenced_type" : "type-2361",
+   "self_type" : "type-2361",
    "size" : 168,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_COMPONENTTYPE"
@@ -42666,7 +42745,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -42686,8 +42765,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_BACKLIGHTTYPE",
    "name" : "OMX_CONFIG_BACKLIGHTTYPE",
-   "referenced_type" : "type-2228",
-   "self_type" : "type-2228",
+   "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_BACKLIGHTTYPE"
@@ -42703,18 +42782,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "bEnabled",
      "field_offset" : 64,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_BOOLEANTYPE",
    "name" : "OMX_CONFIG_BOOLEANTYPE",
-   "referenced_type" : "type-2342",
-   "self_type" : "type-2342",
+   "referenced_type" : "type-2345",
+   "self_type" : "type-2345",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_BOOLEANTYPE"
@@ -42730,7 +42809,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -42745,8 +42824,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_BRIGHTNESSTYPE",
    "name" : "OMX_CONFIG_BRIGHTNESSTYPE",
-   "referenced_type" : "type-2227",
-   "self_type" : "type-2227",
+   "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_BRIGHTNESSTYPE"
@@ -42762,7 +42841,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -42772,12 +42851,12 @@
     {
      "field_name" : "bContinuous",
      "field_offset" : 96,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bFrameLimited",
      "field_offset" : 128,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "nFrameLimit",
@@ -42787,8 +42866,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_CAPTUREMODETYPE",
    "name" : "OMX_CONFIG_CAPTUREMODETYPE",
-   "referenced_type" : "type-2243",
-   "self_type" : "type-2243",
+   "referenced_type" : "type-2246",
+   "self_type" : "type-2246",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_CAPTUREMODETYPE"
@@ -42804,7 +42883,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -42819,13 +42898,13 @@
     {
      "field_name" : "eColorBlend",
      "field_offset" : 128,
-     "referenced_type" : "type-2211"
+     "referenced_type" : "type-2214"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_COLORBLENDTYPE",
    "name" : "OMX_CONFIG_COLORBLENDTYPE",
-   "referenced_type" : "type-2212",
-   "self_type" : "type-2212",
+   "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_COLORBLENDTYPE"
@@ -42841,7 +42920,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -42851,7 +42930,7 @@
     {
      "field_name" : "xColorMatrix",
      "field_offset" : 96,
-     "referenced_type" : "type-2203"
+     "referenced_type" : "type-2206"
     },
     {
      "field_name" : "xColorOffset",
@@ -42861,8 +42940,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_COLORCONVERSIONTYPE",
    "name" : "OMX_CONFIG_COLORCONVERSIONTYPE",
-   "referenced_type" : "type-2202",
-   "self_type" : "type-2202",
+   "referenced_type" : "type-2205",
+   "self_type" : "type-2205",
    "size" : 64,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORCONVERSIONTYPE"
@@ -42878,7 +42957,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -42888,7 +42967,7 @@
     {
      "field_name" : "bColorEnhancement",
      "field_offset" : 96,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "nCustomizedU",
@@ -42903,8 +42982,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
    "name" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
-   "referenced_type" : "type-2209",
-   "self_type" : "type-2209",
+   "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_COLORENHANCEMENTTYPE"
@@ -42920,7 +42999,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -42940,8 +43019,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_COLORKEYTYPE",
    "name" : "OMX_CONFIG_COLORKEYTYPE",
-   "referenced_type" : "type-2210",
-   "self_type" : "type-2210",
+   "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_CONFIG_COLORKEYTYPE"
@@ -42957,12 +43036,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "nParentNodeID",
@@ -42977,8 +43056,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
    "name" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
-   "referenced_type" : "type-2352",
-   "self_type" : "type-2352",
+   "referenced_type" : "type-2355",
+   "self_type" : "type-2355",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE"
@@ -42994,12 +43073,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "nParentNodeID",
@@ -43024,13 +43103,13 @@
     {
      "field_name" : "bIsLeafType",
      "field_offset" : 256,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
    "name" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
-   "referenced_type" : "type-2356",
-   "self_type" : "type-2356",
+   "referenced_type" : "type-2359",
+   "self_type" : "type-2359",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_CONTAINERNODEIDTYPE"
@@ -43046,7 +43125,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -43061,8 +43140,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_CONTRASTTYPE",
    "name" : "OMX_CONFIG_CONTRASTTYPE",
-   "referenced_type" : "type-2226",
-   "self_type" : "type-2226",
+   "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_CONTRASTTYPE"
@@ -43078,7 +43157,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -43088,13 +43167,13 @@
     {
      "field_name" : "eDither",
      "field_offset" : 96,
-     "referenced_type" : "type-2240"
+     "referenced_type" : "type-2243"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_DITHERTYPE",
    "name" : "OMX_CONFIG_DITHERTYPE",
-   "referenced_type" : "type-2241",
-   "self_type" : "type-2241",
+   "referenced_type" : "type-2244",
+   "self_type" : "type-2244",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_DITHERTYPE"
@@ -43110,7 +43189,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -43120,13 +43199,13 @@
     {
      "field_name" : "eExposureControl",
      "field_offset" : 96,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
    "name" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-2224",
-   "self_type" : "type-2224",
+   "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_EXPOSURECONTROLTYPE"
@@ -43142,7 +43221,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -43152,7 +43231,7 @@
     {
      "field_name" : "eMetering",
      "field_offset" : 96,
-     "referenced_type" : "type-2244"
+     "referenced_type" : "type-2247"
     },
     {
      "field_name" : "xEVCompensation",
@@ -43167,7 +43246,7 @@
     {
      "field_name" : "bAutoAperture",
      "field_offset" : 192,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "nShutterSpeedMsec",
@@ -43177,7 +43256,7 @@
     {
      "field_name" : "bAutoShutterSpeed",
      "field_offset" : 256,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "nSensitivity",
@@ -43187,13 +43266,13 @@
     {
      "field_name" : "bAutoSensitivity",
      "field_offset" : 320,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_EXPOSUREVALUETYPE",
    "name" : "OMX_CONFIG_EXPOSUREVALUETYPE",
-   "referenced_type" : "type-2245",
-   "self_type" : "type-2245",
+   "referenced_type" : "type-2248",
+   "self_type" : "type-2248",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_EXPOSUREVALUETYPE"
@@ -43209,7 +43288,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -43219,53 +43298,53 @@
     {
      "field_name" : "bCenter",
      "field_offset" : 96,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bLeft",
      "field_offset" : 128,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bRight",
      "field_offset" : 160,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bTop",
      "field_offset" : 192,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bBottom",
      "field_offset" : 224,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bTopLeft",
      "field_offset" : 256,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bTopRight",
      "field_offset" : 288,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bBottomLeft",
      "field_offset" : 320,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bBottomRight",
      "field_offset" : 352,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_FOCUSREGIONTYPE",
    "name" : "OMX_CONFIG_FOCUSREGIONTYPE",
-   "referenced_type" : "type-2247",
-   "self_type" : "type-2247",
+   "referenced_type" : "type-2250",
+   "self_type" : "type-2250",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_FOCUSREGIONTYPE"
@@ -43281,7 +43360,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -43296,8 +43375,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_FRAMERATETYPE",
    "name" : "OMX_CONFIG_FRAMERATETYPE",
-   "referenced_type" : "type-2288",
-   "self_type" : "type-2288",
+   "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_CONFIG_FRAMERATETYPE"
@@ -43313,7 +43392,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -43323,13 +43402,13 @@
     {
      "field_name" : "bStab",
      "field_offset" : 96,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_FRAMESTABTYPE",
    "name" : "OMX_CONFIG_FRAMESTABTYPE",
-   "referenced_type" : "type-2220",
-   "self_type" : "type-2220",
+   "referenced_type" : "type-2223",
+   "self_type" : "type-2223",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_FRAMESTABTYPE"
@@ -43345,7 +43424,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -43360,8 +43439,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_GAMMATYPE",
    "name" : "OMX_CONFIG_GAMMATYPE",
-   "referenced_type" : "type-2229",
-   "self_type" : "type-2229",
+   "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_GAMMATYPE"
@@ -43377,7 +43456,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -43387,13 +43466,13 @@
     {
      "field_name" : "eImageFilter",
      "field_offset" : 96,
-     "referenced_type" : "type-2207"
+     "referenced_type" : "type-2210"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_IMAGEFILTERTYPE",
    "name" : "OMX_CONFIG_IMAGEFILTERTYPE",
-   "referenced_type" : "type-2208",
-   "self_type" : "type-2208",
+   "referenced_type" : "type-2211",
+   "self_type" : "type-2211",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_IMAGEFILTERTYPE"
@@ -43409,7 +43488,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -43419,13 +43498,13 @@
     {
      "field_name" : "IntraRefreshVOP",
      "field_offset" : 96,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
    "name" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
-   "referenced_type" : "type-2289",
-   "self_type" : "type-2289",
+   "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_INTRAREFRESHVOPTYPE"
@@ -43441,7 +43520,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -43456,8 +43535,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_LIGHTNESSTYPE",
    "name" : "OMX_CONFIG_LIGHTNESSTYPE",
-   "referenced_type" : "type-2232",
-   "self_type" : "type-2232",
+   "referenced_type" : "type-2235",
+   "self_type" : "type-2235",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_LIGHTNESSTYPE"
@@ -43473,7 +43552,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -43488,13 +43567,13 @@
     {
      "field_name" : "ErrMap",
      "field_offset" : 128,
-     "referenced_type" : "type-1577"
+     "referenced_type" : "type-1572"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
    "name" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
-   "referenced_type" : "type-2290",
-   "self_type" : "type-2290",
+   "referenced_type" : "type-2293",
+   "self_type" : "type-2293",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE"
@@ -43510,7 +43589,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -43520,13 +43599,13 @@
     {
      "field_name" : "bEnabled",
      "field_offset" : 96,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
    "name" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
-   "referenced_type" : "type-2292",
-   "self_type" : "type-2292",
+   "referenced_type" : "type-2295",
+   "self_type" : "type-2295",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_MBERRORREPORTINGTYPE"
@@ -43542,12 +43621,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "eScopeMode",
      "field_offset" : 64,
-     "referenced_type" : "type-2348"
+     "referenced_type" : "type-2351"
     },
     {
      "field_name" : "nScopeSpecifier",
@@ -43562,8 +43641,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
    "name" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
-   "referenced_type" : "type-2350",
-   "self_type" : "type-2350",
+   "referenced_type" : "type-2353",
+   "self_type" : "type-2353",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_METADATAITEMCOUNTTYPE"
@@ -43579,12 +43658,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "eScopeMode",
      "field_offset" : 64,
-     "referenced_type" : "type-2348"
+     "referenced_type" : "type-2351"
     },
     {
      "field_name" : "nScopeSpecifier",
@@ -43599,12 +43678,12 @@
     {
      "field_name" : "eSearchMode",
      "field_offset" : 160,
-     "referenced_type" : "type-2349"
+     "referenced_type" : "type-2352"
     },
     {
      "field_name" : "eKeyCharset",
      "field_offset" : 192,
-     "referenced_type" : "type-2347"
+     "referenced_type" : "type-2350"
     },
     {
      "field_name" : "nKeySizeUsed",
@@ -43614,12 +43693,12 @@
     {
      "field_name" : "nKey",
      "field_offset" : 232,
-     "referenced_type" : "type-1528"
+     "referenced_type" : "type-1530"
     },
     {
      "field_name" : "eValueCharset",
      "field_offset" : 1280,
-     "referenced_type" : "type-2347"
+     "referenced_type" : "type-2350"
     },
     {
      "field_name" : "sLanguageCountry",
@@ -43639,13 +43718,13 @@
     {
      "field_name" : "nValue",
      "field_offset" : 1472,
-     "referenced_type" : "type-1577"
+     "referenced_type" : "type-1572"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_METADATAITEMTYPE",
    "name" : "OMX_CONFIG_METADATAITEMTYPE",
-   "referenced_type" : "type-2351",
-   "self_type" : "type-2351",
+   "referenced_type" : "type-2354",
+   "self_type" : "type-2354",
    "size" : 192,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_METADATAITEMTYPE"
@@ -43661,7 +43740,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -43671,13 +43750,13 @@
     {
      "field_name" : "eMirror",
      "field_offset" : 96,
-     "referenced_type" : "type-2215"
+     "referenced_type" : "type-2218"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MIRRORTYPE",
    "name" : "OMX_CONFIG_MIRRORTYPE",
-   "referenced_type" : "type-2216",
-   "self_type" : "type-2216",
+   "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_CONFIG_MIRRORTYPE"
@@ -43693,7 +43772,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -43713,8 +43792,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_PLANEBLENDTYPE",
    "name" : "OMX_CONFIG_PLANEBLENDTYPE",
-   "referenced_type" : "type-2233",
-   "self_type" : "type-2233",
+   "referenced_type" : "type-2236",
+   "self_type" : "type-2236",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_PLANEBLENDTYPE"
@@ -43730,7 +43809,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -43750,8 +43829,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_POINTTYPE",
    "name" : "OMX_CONFIG_POINTTYPE",
-   "referenced_type" : "type-2217",
-   "self_type" : "type-2217",
+   "referenced_type" : "type-2220",
+   "self_type" : "type-2220",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_POINTTYPE"
@@ -43767,7 +43846,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -43797,8 +43876,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_RECTTYPE",
    "name" : "OMX_CONFIG_RECTTYPE",
-   "referenced_type" : "type-2218",
-   "self_type" : "type-2218",
+   "referenced_type" : "type-2221",
+   "self_type" : "type-2221",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_RECTTYPE"
@@ -43814,7 +43893,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -43829,8 +43908,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_ROTATIONTYPE",
    "name" : "OMX_CONFIG_ROTATIONTYPE",
-   "referenced_type" : "type-2214",
-   "self_type" : "type-2214",
+   "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_CONFIG_ROTATIONTYPE"
@@ -43846,7 +43925,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -43861,8 +43940,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_SATURATIONTYPE",
    "name" : "OMX_CONFIG_SATURATIONTYPE",
-   "referenced_type" : "type-2230",
-   "self_type" : "type-2230",
+   "referenced_type" : "type-2233",
+   "self_type" : "type-2233",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_SATURATIONTYPE"
@@ -43878,7 +43957,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -43898,8 +43977,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_SCALEFACTORTYPE",
    "name" : "OMX_CONFIG_SCALEFACTORTYPE",
-   "referenced_type" : "type-2206",
-   "self_type" : "type-2206",
+   "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_SCALEFACTORTYPE"
@@ -43915,7 +43994,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -43925,13 +44004,13 @@
     {
      "field_name" : "eEffect",
      "field_offset" : 96,
-     "referenced_type" : "type-2235"
+     "referenced_type" : "type-2238"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
    "name" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-2236",
-   "self_type" : "type-2236",
+   "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_TRANSITIONEFFECTTYPE"
@@ -43947,7 +44026,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -43957,13 +44036,13 @@
     {
      "field_name" : "eWhiteBalControl",
      "field_offset" : 96,
-     "referenced_type" : "type-2221"
+     "referenced_type" : "type-2224"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
    "name" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-2222",
-   "self_type" : "type-2222",
+   "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_WHITEBALCONTROLTYPE"
@@ -43979,7 +44058,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -43999,8 +44078,8 @@
    ],
    "linker_set_key" : "OMX_FRAMESIZETYPE",
    "name" : "OMX_FRAMESIZETYPE",
-   "referenced_type" : "type-2213",
-   "self_type" : "type-2213",
+   "referenced_type" : "type-2216",
+   "self_type" : "type-2216",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_FRAMESIZETYPE"
@@ -44016,7 +44095,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -44026,7 +44105,7 @@
     {
      "field_name" : "eFocusControl",
      "field_offset" : 96,
-     "referenced_type" : "type-2305"
+     "referenced_type" : "type-2308"
     },
     {
      "field_name" : "nFocusSteps",
@@ -44041,8 +44120,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
    "name" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-2306",
-   "self_type" : "type-2306",
+   "referenced_type" : "type-2309",
+   "self_type" : "type-2309",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE"
@@ -44058,7 +44137,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -44068,13 +44147,13 @@
     {
      "field_name" : "eFlashControl",
      "field_offset" : 96,
-     "referenced_type" : "type-2302"
+     "referenced_type" : "type-2305"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
    "name" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
-   "referenced_type" : "type-2304",
-   "self_type" : "type-2304",
+   "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_FLASHCONTROLTYPE"
@@ -44090,7 +44169,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -44100,23 +44179,23 @@
     {
      "field_name" : "eHuffmanTable",
      "field_offset" : 96,
-     "referenced_type" : "type-2311"
+     "referenced_type" : "type-2314"
     },
     {
      "field_name" : "nNumberOfHuffmanCodeOfLength",
      "field_offset" : 128,
-     "referenced_type" : "type-2313"
+     "referenced_type" : "type-2316"
     },
     {
      "field_name" : "nHuffmanTable",
      "field_offset" : 256,
-     "referenced_type" : "type-2314"
+     "referenced_type" : "type-2317"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
    "name" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
-   "referenced_type" : "type-2312",
-   "self_type" : "type-2312",
+   "referenced_type" : "type-2315",
+   "self_type" : "type-2315",
    "size" : 288,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE"
@@ -44132,7 +44211,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -44147,18 +44226,18 @@
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-2299"
+     "referenced_type" : "type-2302"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-2201"
+     "referenced_type" : "type-2204"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
    "name" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-2301",
-   "self_type" : "type-2301",
+   "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_PARAM_PORTFORMATTYPE"
@@ -44174,7 +44253,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -44189,8 +44268,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_QFACTORTYPE",
    "name" : "OMX_IMAGE_PARAM_QFACTORTYPE",
-   "referenced_type" : "type-2307",
-   "self_type" : "type-2307",
+   "referenced_type" : "type-2310",
+   "self_type" : "type-2310",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_QFACTORTYPE"
@@ -44206,7 +44285,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -44216,18 +44295,18 @@
     {
      "field_name" : "eQuantizationTable",
      "field_offset" : 96,
-     "referenced_type" : "type-2308"
+     "referenced_type" : "type-2311"
     },
     {
      "field_name" : "nQuantizationMatrix",
      "field_offset" : 128,
-     "referenced_type" : "type-2310"
+     "referenced_type" : "type-2313"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
    "name" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-2309",
-   "self_type" : "type-2309",
+   "referenced_type" : "type-2312",
+   "self_type" : "type-2312",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE"
@@ -44268,17 +44347,17 @@
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 256,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 288,
-     "referenced_type" : "type-2299"
+     "referenced_type" : "type-2302"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 320,
-     "referenced_type" : "type-2201"
+     "referenced_type" : "type-2204"
     },
     {
      "field_name" : "pNativeWindow",
@@ -44288,8 +44367,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_PORTDEFINITIONTYPE",
    "name" : "OMX_IMAGE_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-2300",
-   "self_type" : "type-2300",
+   "referenced_type" : "type-2303",
+   "self_type" : "type-2303",
    "size" : 56,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PORTDEFINITIONTYPE"
@@ -44310,8 +44389,8 @@
    ],
    "linker_set_key" : "OMX_MARKTYPE",
    "name" : "OMX_MARKTYPE",
-   "referenced_type" : "type-1478",
-   "self_type" : "type-1478",
+   "referenced_type" : "type-1480",
+   "self_type" : "type-1480",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_MARKTYPE"
@@ -44327,18 +44406,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "bEnablePM",
      "field_offset" : 64,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_OTHER_CONFIG_POWERTYPE",
    "name" : "OMX_OTHER_CONFIG_POWERTYPE",
-   "referenced_type" : "type-2329",
-   "self_type" : "type-2329",
+   "referenced_type" : "type-2332",
+   "self_type" : "type-2332",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_CONFIG_POWERTYPE"
@@ -44354,13 +44433,13 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     }
    ],
    "linker_set_key" : "OMX_OTHER_CONFIG_STATSTYPE",
    "name" : "OMX_OTHER_CONFIG_STATSTYPE",
-   "referenced_type" : "type-2330",
-   "self_type" : "type-2330",
+   "referenced_type" : "type-2333",
+   "self_type" : "type-2333",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_CONFIG_STATSTYPE"
@@ -44376,7 +44455,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -44386,7 +44465,7 @@
     {
      "field_name" : "eType",
      "field_offset" : 96,
-     "referenced_type" : "type-1564"
+     "referenced_type" : "type-1559"
     },
     {
      "field_name" : "nDataSize",
@@ -44396,13 +44475,13 @@
     {
      "field_name" : "data",
      "field_offset" : 160,
-     "referenced_type" : "type-1577"
+     "referenced_type" : "type-1572"
     }
    ],
    "linker_set_key" : "OMX_OTHER_EXTRADATATYPE",
    "name" : "OMX_OTHER_EXTRADATATYPE",
-   "referenced_type" : "type-1576",
-   "self_type" : "type-1576",
+   "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"
@@ -44418,7 +44497,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -44433,13 +44512,13 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-2316"
+     "referenced_type" : "type-2319"
     }
    ],
    "linker_set_key" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
    "name" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-2333",
-   "self_type" : "type-2333",
+   "referenced_type" : "type-2336",
+   "self_type" : "type-2336",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_PARAM_PORTFORMATTYPE"
@@ -44450,13 +44529,13 @@
    [
     {
      "field_name" : "eFormat",
-     "referenced_type" : "type-2316"
+     "referenced_type" : "type-2319"
     }
    ],
    "linker_set_key" : "OMX_OTHER_PORTDEFINITIONTYPE",
    "name" : "OMX_OTHER_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-2331",
-   "self_type" : "type-2331",
+   "referenced_type" : "type-2334",
+   "self_type" : "type-2334",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_PORTDEFINITIONTYPE"
@@ -44472,7 +44551,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -44482,13 +44561,13 @@
     {
      "field_name" : "eBufferSupplier",
      "field_offset" : 96,
-     "referenced_type" : "type-1604"
+     "referenced_type" : "type-1600"
     }
    ],
    "linker_set_key" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
    "name" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-1610",
-   "self_type" : "type-1610",
+   "referenced_type" : "type-1608",
+   "self_type" : "type-1608",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PARAM_BUFFERSUPPLIERTYPE"
@@ -44504,18 +44583,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "cRole",
      "field_offset" : 64,
-     "referenced_type" : "type-1528"
+     "referenced_type" : "type-1530"
     }
    ],
    "linker_set_key" : "OMX_PARAM_COMPONENTROLETYPE",
    "name" : "OMX_PARAM_COMPONENTROLETYPE",
-   "referenced_type" : "type-1527",
-   "self_type" : "type-1527",
+   "referenced_type" : "type-1529",
+   "self_type" : "type-1529",
    "size" : 136,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PARAM_COMPONENTROLETYPE"
@@ -44531,7 +44610,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "hPipe",
@@ -44541,8 +44620,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_CONTENTPIPETYPE",
    "name" : "OMX_PARAM_CONTENTPIPETYPE",
-   "referenced_type" : "type-2345",
-   "self_type" : "type-2345",
+   "referenced_type" : "type-2348",
+   "self_type" : "type-2348",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_CONTENTPIPETYPE"
@@ -44558,18 +44637,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "contentURI",
      "field_offset" : 64,
-     "referenced_type" : "type-1577"
+     "referenced_type" : "type-1572"
     }
    ],
    "linker_set_key" : "OMX_PARAM_CONTENTURITYPE",
    "name" : "OMX_PARAM_CONTENTURITYPE",
-   "referenced_type" : "type-2344",
-   "self_type" : "type-2344",
+   "referenced_type" : "type-2347",
+   "self_type" : "type-2347",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_CONTENTURITYPE"
@@ -44585,7 +44664,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -44595,18 +44674,18 @@
     {
      "field_name" : "eUnitType",
      "field_offset" : 96,
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2240"
     },
     {
      "field_name" : "eEncapsulationType",
      "field_offset" : 128,
-     "referenced_type" : "type-2238"
+     "referenced_type" : "type-2241"
     }
    ],
    "linker_set_key" : "OMX_PARAM_DATAUNITTYPE",
    "name" : "OMX_PARAM_DATAUNITTYPE",
-   "referenced_type" : "type-2239",
-   "self_type" : "type-2239",
+   "referenced_type" : "type-2242",
+   "self_type" : "type-2242",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_DATAUNITTYPE"
@@ -44622,7 +44701,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -44632,13 +44711,13 @@
     {
      "field_name" : "bDeblocking",
      "field_offset" : 96,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_PARAM_DEBLOCKINGTYPE",
    "name" : "OMX_PARAM_DEBLOCKINGTYPE",
-   "referenced_type" : "type-2219",
-   "self_type" : "type-2219",
+   "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_PARAM_DEBLOCKINGTYPE"
@@ -44654,7 +44733,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -44664,58 +44743,58 @@
     {
      "field_name" : "eFocusStatus",
      "field_offset" : 96,
-     "referenced_type" : "type-2248"
+     "referenced_type" : "type-2251"
     },
     {
      "field_name" : "bCenterStatus",
      "field_offset" : 128,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bLeftStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bRightStatus",
      "field_offset" : 192,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bTopStatus",
      "field_offset" : 224,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bBottomStatus",
      "field_offset" : 256,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bTopLeftStatus",
      "field_offset" : 288,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bTopRightStatus",
      "field_offset" : 320,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bBottomLeftStatus",
      "field_offset" : 352,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bBottomRightStatus",
      "field_offset" : 384,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_PARAM_FOCUSSTATUSTYPE",
    "name" : "OMX_PARAM_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-2249",
-   "self_type" : "type-2249",
+   "referenced_type" : "type-2252",
+   "self_type" : "type-2252",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_FOCUSSTATUSTYPE"
@@ -44731,7 +44810,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -44741,7 +44820,7 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "nInterleavePortIndex",
@@ -44751,8 +44830,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_INTERLEAVETYPE",
    "name" : "OMX_PARAM_INTERLEAVETYPE",
-   "referenced_type" : "type-2234",
-   "self_type" : "type-2234",
+   "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_INTERLEAVETYPE"
@@ -44768,7 +44847,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -44783,8 +44862,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_MACROBLOCKSTYPE",
    "name" : "OMX_PARAM_MACROBLOCKSTYPE",
-   "referenced_type" : "type-2294",
-   "self_type" : "type-2294",
+   "referenced_type" : "type-2297",
+   "self_type" : "type-2297",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_PARAM_MACROBLOCKSTYPE"
@@ -44800,17 +44879,17 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "eKeyCharset",
      "field_offset" : 96,
-     "referenced_type" : "type-2347"
+     "referenced_type" : "type-2350"
     },
     {
      "field_name" : "nKeySizeUsed",
@@ -44820,7 +44899,7 @@
     {
      "field_name" : "nKey",
      "field_offset" : 160,
-     "referenced_type" : "type-1528"
+     "referenced_type" : "type-1530"
     },
     {
      "field_name" : "nLanguageCountrySizeUsed",
@@ -44830,18 +44909,18 @@
     {
      "field_name" : "nLanguageCountry",
      "field_offset" : 1216,
-     "referenced_type" : "type-1528"
+     "referenced_type" : "type-1530"
     },
     {
      "field_name" : "bEnabled",
      "field_offset" : 2240,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_PARAM_METADATAFILTERTYPE",
    "name" : "OMX_PARAM_METADATAFILTERTYPE",
-   "referenced_type" : "type-2357",
-   "self_type" : "type-2357",
+   "referenced_type" : "type-2360",
+   "self_type" : "type-2360",
    "size" : 284,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_METADATAFILTERTYPE"
@@ -44857,7 +44936,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -44867,7 +44946,7 @@
     {
      "field_name" : "eDir",
      "field_offset" : 96,
-     "referenced_type" : "type-1458"
+     "referenced_type" : "type-1456"
     },
     {
      "field_name" : "nBufferCountActual",
@@ -44887,27 +44966,27 @@
     {
      "field_name" : "bEnabled",
      "field_offset" : 224,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bPopulated",
      "field_offset" : 256,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "eDomain",
      "field_offset" : 288,
-     "referenced_type" : "type-2334"
+     "referenced_type" : "type-2337"
     },
     {
      "field_name" : "format",
      "field_offset" : 320,
-     "referenced_type" : "type-2336"
+     "referenced_type" : "type-2339"
     },
     {
      "field_name" : "bBuffersContiguous",
      "field_offset" : 832,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "nBufferAlignment",
@@ -44917,8 +44996,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_PORTDEFINITIONTYPE",
    "name" : "OMX_PARAM_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-2335",
-   "self_type" : "type-2335",
+   "referenced_type" : "type-2338",
+   "self_type" : "type-2338",
    "size" : 112,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_PORTDEFINITIONTYPE"
@@ -44929,27 +45008,27 @@
    [
     {
      "field_name" : "audio",
-     "referenced_type" : "type-1620"
+     "referenced_type" : "type-1623"
     },
     {
      "field_name" : "video",
-     "referenced_type" : "type-2251"
+     "referenced_type" : "type-2254"
     },
     {
      "field_name" : "image",
-     "referenced_type" : "type-2300"
+     "referenced_type" : "type-2303"
     },
     {
      "field_name" : "other",
-     "referenced_type" : "type-2331"
+     "referenced_type" : "type-2334"
     }
    ],
    "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-2336",
-   "self_type" : "type-2336",
+   "referenced_type" : "type-2339",
+   "self_type" : "type-2339",
    "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)"
@@ -44965,7 +45044,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -44980,18 +45059,18 @@
     {
      "field_name" : "bOneShot",
      "field_offset" : 128,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "sFrameSize",
      "field_offset" : 160,
-     "referenced_type" : "type-2213"
+     "referenced_type" : "type-2216"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SENSORMODETYPE",
    "name" : "OMX_PARAM_SENSORMODETYPE",
-   "referenced_type" : "type-2225",
-   "self_type" : "type-2225",
+   "referenced_type" : "type-2228",
+   "self_type" : "type-2228",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_SENSORMODETYPE"
@@ -45007,18 +45086,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "ePolicy",
      "field_offset" : 64,
-     "referenced_type" : "type-2338"
+     "referenced_type" : "type-2341"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
    "name" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-2339",
-   "self_type" : "type-2339",
+   "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_PARAM_SUSPENSIONPOLICYTYPE"
@@ -45034,18 +45113,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "eType",
      "field_offset" : 64,
-     "referenced_type" : "type-2340"
+     "referenced_type" : "type-2343"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SUSPENSIONTYPE",
    "name" : "OMX_PARAM_SUSPENSIONTYPE",
-   "referenced_type" : "type-2341",
-   "self_type" : "type-2341",
+   "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_SUSPENSIONTYPE"
@@ -45061,7 +45140,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -45076,8 +45155,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_U32TYPE",
    "name" : "OMX_PARAM_U32TYPE",
-   "referenced_type" : "type-2337",
-   "self_type" : "type-2337",
+   "referenced_type" : "type-2340",
+   "self_type" : "type-2340",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_U32TYPE"
@@ -45093,7 +45172,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPorts",
@@ -45108,8 +45187,8 @@
    ],
    "linker_set_key" : "OMX_PORT_PARAM_TYPE",
    "name" : "OMX_PORT_PARAM_TYPE",
-   "referenced_type" : "type-1588",
-   "self_type" : "type-1588",
+   "referenced_type" : "type-1584",
+   "self_type" : "type-1584",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PORT_PARAM_TYPE"
@@ -45125,7 +45204,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nGroupPriority",
@@ -45140,8 +45219,8 @@
    ],
    "linker_set_key" : "OMX_PRIORITYMGMTTYPE",
    "name" : "OMX_PRIORITYMGMTTYPE",
-   "referenced_type" : "type-1523",
-   "self_type" : "type-1523",
+   "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"
@@ -45157,18 +45236,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "bResourceConcealmentForbidden",
      "field_offset" : 64,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_RESOURCECONCEALMENTTYPE",
    "name" : "OMX_RESOURCECONCEALMENTTYPE",
-   "referenced_type" : "type-2346",
-   "self_type" : "type-2346",
+   "referenced_type" : "type-2349",
+   "self_type" : "type-2349",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_RESOURCECONCEALMENTTYPE"
@@ -45184,18 +45263,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "eClock",
      "field_offset" : 64,
-     "referenced_type" : "type-2322"
+     "referenced_type" : "type-2325"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
    "name" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
-   "referenced_type" : "type-2328",
-   "self_type" : "type-2328",
+   "referenced_type" : "type-2331",
+   "self_type" : "type-2331",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE"
@@ -45211,12 +45290,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "eState",
      "field_offset" : 64,
-     "referenced_type" : "type-2323"
+     "referenced_type" : "type-2326"
     },
     {
      "field_name" : "nStartTime",
@@ -45236,8 +45315,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
    "name" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
-   "referenced_type" : "type-2327",
-   "self_type" : "type-2327",
+   "referenced_type" : "type-2330",
+   "self_type" : "type-2330",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_CLOCKSTATETYPE"
@@ -45253,7 +45332,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -45278,8 +45357,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
    "name" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
-   "referenced_type" : "type-2324",
-   "self_type" : "type-2324",
+   "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_MEDIATIMEREQUESTTYPE"
@@ -45295,7 +45374,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "xScale",
@@ -45305,8 +45384,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_SCALETYPE",
    "name" : "OMX_TIME_CONFIG_SCALETYPE",
-   "referenced_type" : "type-2326",
-   "self_type" : "type-2326",
+   "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_TIME_CONFIG_SCALETYPE"
@@ -45322,18 +45401,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "eType",
      "field_offset" : 64,
-     "referenced_type" : "type-2317"
+     "referenced_type" : "type-2320"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_SEEKMODETYPE",
    "name" : "OMX_TIME_CONFIG_SEEKMODETYPE",
-   "referenced_type" : "type-2318",
-   "self_type" : "type-2318",
+   "referenced_type" : "type-2321",
+   "self_type" : "type-2321",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_SEEKMODETYPE"
@@ -45349,7 +45428,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -45364,8 +45443,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
    "name" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
-   "referenced_type" : "type-2319",
-   "self_type" : "type-2319",
+   "referenced_type" : "type-2322",
+   "self_type" : "type-2322",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_TIMESTAMPTYPE"
@@ -45381,7 +45460,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nClientPrivate",
@@ -45391,7 +45470,7 @@
     {
      "field_name" : "eUpdateType",
      "field_offset" : 96,
-     "referenced_type" : "type-2320"
+     "referenced_type" : "type-2323"
     },
     {
      "field_name" : "nMediaTimestamp",
@@ -45416,13 +45495,13 @@
     {
      "field_name" : "eState",
      "field_offset" : 352,
-     "referenced_type" : "type-2323"
+     "referenced_type" : "type-2326"
     }
    ],
    "linker_set_key" : "OMX_TIME_MEDIATIMETYPE",
    "name" : "OMX_TIME_MEDIATIMETYPE",
-   "referenced_type" : "type-2325",
-   "self_type" : "type-2325",
+   "referenced_type" : "type-2328",
+   "self_type" : "type-2328",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_MEDIATIMETYPE"
@@ -45438,13 +45517,13 @@
     {
      "field_name" : "eSupplier",
      "field_offset" : 32,
-     "referenced_type" : "type-1604"
+     "referenced_type" : "type-1600"
     }
    ],
    "linker_set_key" : "OMX_TUNNELSETUPTYPE",
    "name" : "OMX_TUNNELSETUPTYPE",
-   "referenced_type" : "type-1615",
-   "self_type" : "type-1615",
+   "referenced_type" : "type-1614",
+   "self_type" : "type-1614",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_TUNNELSETUPTYPE"
@@ -45455,7 +45534,7 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-1481"
+     "referenced_type" : "type-1484"
     },
     {
      "field_name" : "nVersion",
@@ -45465,8 +45544,8 @@
    "linker_set_key" : "OMX_VERSIONTYPE",
    "name" : "OMX_VERSIONTYPE",
    "record_kind" : "union",
-   "referenced_type" : "type-1480",
-   "self_type" : "type-1480",
+   "referenced_type" : "type-1483",
+   "self_type" : "type-1483",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_VERSIONTYPE"
@@ -45498,8 +45577,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "OMX_VERSIONTYPE::(anonymous struct at frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h:376:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h:376:5",
    "name" : "OMX_VERSIONTYPE::(anonymous struct at frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h:376:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h:376:5",
-   "referenced_type" : "type-1481",
-   "self_type" : "type-1481",
+   "referenced_type" : "type-1484",
+   "self_type" : "type-1484",
    "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)"
@@ -45515,7 +45594,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -45535,8 +45614,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
    "name" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
-   "referenced_type" : "type-2297",
-   "self_type" : "type-2297",
+   "referenced_type" : "type-2300",
+   "self_type" : "type-2300",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD"
@@ -45552,7 +45631,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -45567,8 +45646,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_BITRATETYPE",
    "name" : "OMX_VIDEO_CONFIG_BITRATETYPE",
-   "referenced_type" : "type-2287",
-   "self_type" : "type-2287",
+   "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_VIDEO_CONFIG_BITRATETYPE"
@@ -45584,7 +45663,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -45599,8 +45678,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_NALSIZE",
    "name" : "OMX_VIDEO_CONFIG_NALSIZE",
-   "referenced_type" : "type-2298",
-   "self_type" : "type-2298",
+   "referenced_type" : "type-2301",
+   "self_type" : "type-2301",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_NALSIZE"
@@ -45616,7 +45695,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -45636,13 +45715,13 @@
     {
      "field_name" : "eSliceMode",
      "field_offset" : 128,
-     "referenced_type" : "type-2295"
+     "referenced_type" : "type-2298"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
    "name" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
-   "referenced_type" : "type-2296",
-   "self_type" : "type-2296",
+   "referenced_type" : "type-2299",
+   "self_type" : "type-2299",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_AVCSLICEFMO"
@@ -45658,7 +45737,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -45683,7 +45762,7 @@
     {
      "field_name" : "bUseHadamard",
      "field_offset" : 192,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "nRefFrames",
@@ -45703,32 +45782,32 @@
     {
      "field_name" : "bEnableUEP",
      "field_offset" : 320,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bEnableFMO",
      "field_offset" : 352,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bEnableASO",
      "field_offset" : 384,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bEnableRS",
      "field_offset" : 416,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 448,
-     "referenced_type" : "type-2281"
+     "referenced_type" : "type-2284"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 480,
-     "referenced_type" : "type-2283"
+     "referenced_type" : "type-2286"
     },
     {
      "field_name" : "nAllowedPictureTypes",
@@ -45738,22 +45817,22 @@
     {
      "field_name" : "bFrameMBsOnly",
      "field_offset" : 544,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bMBAFF",
      "field_offset" : 576,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bEntropyCodingCABAC",
      "field_offset" : 608,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bWeightedPPrediction",
      "field_offset" : 640,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "nWeightedBipredicitonMode",
@@ -45763,17 +45842,17 @@
     {
      "field_name" : "bconstIpred",
      "field_offset" : 704,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bDirect8x8Inference",
      "field_offset" : 736,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bDirectSpatialTemporal",
      "field_offset" : 768,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "nCabacInitIdc",
@@ -45783,13 +45862,13 @@
     {
      "field_name" : "eLoopFilterMode",
      "field_offset" : 832,
-     "referenced_type" : "type-2284"
+     "referenced_type" : "type-2287"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_AVCTYPE",
    "name" : "OMX_VIDEO_PARAM_AVCTYPE",
-   "referenced_type" : "type-2285",
-   "self_type" : "type-2285",
+   "referenced_type" : "type-2288",
+   "self_type" : "type-2288",
    "size" : 108,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_AVCTYPE"
@@ -45805,7 +45884,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -45815,17 +45894,17 @@
     {
      "field_name" : "eControlRate",
      "field_offset" : 96,
-     "referenced_type" : "type-2255"
+     "referenced_type" : "type-2258"
     },
     {
      "field_offset" : 128,
-     "referenced_type" : "type-2257"
+     "referenced_type" : "type-2260"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_BITRATETYPE",
    "name" : "OMX_VIDEO_PARAM_BITRATETYPE",
-   "referenced_type" : "type-2256",
-   "self_type" : "type-2256",
+   "referenced_type" : "type-2259",
+   "self_type" : "type-2259",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_BITRATETYPE"
@@ -45847,8 +45926,8 @@
    "linker_set_key" : "OMX_VIDEO_PARAM_BITRATETYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5",
    "name" : "OMX_VIDEO_PARAM_BITRATETYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5",
    "record_kind" : "union",
-   "referenced_type" : "type-2257",
-   "self_type" : "type-2257",
+   "referenced_type" : "type-2260",
+   "self_type" : "type-2260",
    "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)"
@@ -45864,7 +45943,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -45874,12 +45953,12 @@
     {
      "field_name" : "bEnableHEC",
      "field_offset" : 96,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bEnableResync",
      "field_offset" : 128,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "nResynchMarkerSpacing",
@@ -45889,18 +45968,18 @@
     {
      "field_name" : "bEnableDataPartitioning",
      "field_offset" : 192,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bEnableRVLC",
      "field_offset" : 224,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE",
    "name" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE",
-   "referenced_type" : "type-2263",
-   "self_type" : "type-2263",
+   "referenced_type" : "type-2266",
+   "self_type" : "type-2266",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE"
@@ -45916,7 +45995,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -45936,17 +46015,17 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 160,
-     "referenced_type" : "type-2265"
+     "referenced_type" : "type-2268"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 192,
-     "referenced_type" : "type-2266"
+     "referenced_type" : "type-2269"
     },
     {
      "field_name" : "bPLUSPTYPEAllowed",
      "field_offset" : 224,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "nAllowedPictureTypes",
@@ -45956,7 +46035,7 @@
     {
      "field_name" : "bForceRoundingTypeToZero",
      "field_offset" : 288,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "nPictureHeaderRepetition",
@@ -45971,8 +46050,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_H263TYPE",
    "name" : "OMX_VIDEO_PARAM_H263TYPE",
-   "referenced_type" : "type-2269",
-   "self_type" : "type-2269",
+   "referenced_type" : "type-2272",
+   "self_type" : "type-2272",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_H263TYPE"
@@ -45988,7 +46067,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -45998,7 +46077,7 @@
     {
      "field_name" : "eRefreshMode",
      "field_offset" : 96,
-     "referenced_type" : "type-2261"
+     "referenced_type" : "type-2264"
     },
     {
      "field_name" : "nAirMBs",
@@ -46018,8 +46097,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
    "name" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
-   "referenced_type" : "type-2262",
-   "self_type" : "type-2262",
+   "referenced_type" : "type-2265",
+   "self_type" : "type-2265",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE"
@@ -46035,7 +46114,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -46045,17 +46124,17 @@
     {
      "field_name" : "eAccuracy",
      "field_offset" : 96,
-     "referenced_type" : "type-2259"
+     "referenced_type" : "type-2262"
     },
     {
      "field_name" : "bUnrestrictedMVs",
      "field_offset" : 128,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bFourMV",
      "field_offset" : 160,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "sXSearchRange",
@@ -46070,8 +46149,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
    "name" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
-   "referenced_type" : "type-2260",
-   "self_type" : "type-2260",
+   "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_MOTIONVECTORTYPE"
@@ -46087,7 +46166,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -46107,18 +46186,18 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 160,
-     "referenced_type" : "type-2270"
+     "referenced_type" : "type-2273"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 192,
-     "referenced_type" : "type-2271"
+     "referenced_type" : "type-2274"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MPEG2TYPE",
    "name" : "OMX_VIDEO_PARAM_MPEG2TYPE",
-   "referenced_type" : "type-2272",
-   "self_type" : "type-2272",
+   "referenced_type" : "type-2275",
+   "self_type" : "type-2275",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MPEG2TYPE"
@@ -46134,7 +46213,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -46149,12 +46228,12 @@
     {
      "field_name" : "bSVH",
      "field_offset" : 128,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bGov",
      "field_offset" : 160,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "nPFrames",
@@ -46174,7 +46253,7 @@
     {
      "field_name" : "bACPred",
      "field_offset" : 288,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "nMaxPacketSize",
@@ -46189,12 +46268,12 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 384,
-     "referenced_type" : "type-2273"
+     "referenced_type" : "type-2276"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 416,
-     "referenced_type" : "type-2274"
+     "referenced_type" : "type-2277"
     },
     {
      "field_name" : "nAllowedPictureTypes",
@@ -46209,13 +46288,13 @@
     {
      "field_name" : "bReversibleVLC",
      "field_offset" : 512,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MPEG4TYPE",
    "name" : "OMX_VIDEO_PARAM_MPEG4TYPE",
-   "referenced_type" : "type-2275",
-   "self_type" : "type-2275",
+   "referenced_type" : "type-2278",
+   "self_type" : "type-2278",
    "size" : 68,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MPEG4TYPE"
@@ -46231,7 +46310,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -46246,12 +46325,12 @@
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-2250"
+     "referenced_type" : "type-2253"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-2201"
+     "referenced_type" : "type-2204"
     },
     {
      "field_name" : "xFramerate",
@@ -46261,8 +46340,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
    "name" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-2252",
-   "self_type" : "type-2252",
+   "referenced_type" : "type-2255",
+   "self_type" : "type-2255",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_PORTFORMATTYPE"
@@ -46278,7 +46357,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -46303,8 +46382,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
    "name" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
-   "referenced_type" : "type-2286",
-   "self_type" : "type-2286",
+   "referenced_type" : "type-2289",
+   "self_type" : "type-2289",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE"
@@ -46320,7 +46399,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -46345,8 +46424,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
    "name" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
-   "referenced_type" : "type-2253",
-   "self_type" : "type-2253",
+   "referenced_type" : "type-2256",
+   "self_type" : "type-2256",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE"
@@ -46362,7 +46441,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -46372,7 +46451,7 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 96,
-     "referenced_type" : "type-2278"
+     "referenced_type" : "type-2281"
     },
     {
      "field_name" : "nBitsPerPixel",
@@ -46412,23 +46491,23 @@
     {
      "field_name" : "bEnablePostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bEnableTemporalInterpolation",
      "field_offset" : 352,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bEnableLatencyMode",
      "field_offset" : 384,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_RVTYPE",
    "name" : "OMX_VIDEO_PARAM_RVTYPE",
-   "referenced_type" : "type-2280",
-   "self_type" : "type-2280",
+   "referenced_type" : "type-2283",
+   "self_type" : "type-2283",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_RVTYPE"
@@ -46444,7 +46523,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -46454,43 +46533,43 @@
     {
      "field_name" : "b16x16",
      "field_offset" : 96,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "b16x8",
      "field_offset" : 128,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "b8x16",
      "field_offset" : 160,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "b8x8",
      "field_offset" : 192,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "b8x4",
      "field_offset" : 224,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "b4x8",
      "field_offset" : 256,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "b4x4",
      "field_offset" : 288,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VBSMCTYPE",
    "name" : "OMX_VIDEO_PARAM_VBSMCTYPE",
-   "referenced_type" : "type-2264",
-   "self_type" : "type-2264",
+   "referenced_type" : "type-2267",
+   "self_type" : "type-2267",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_VBSMCTYPE"
@@ -46506,7 +46585,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -46516,7 +46595,7 @@
     {
      "field_name" : "bEnableVFU",
      "field_offset" : 96,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "nFirstGOB",
@@ -46536,8 +46615,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
    "name" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
-   "referenced_type" : "type-2254",
-   "self_type" : "type-2254",
+   "referenced_type" : "type-2257",
+   "self_type" : "type-2257",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE"
@@ -46553,7 +46632,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -46563,13 +46642,13 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 96,
-     "referenced_type" : "type-2276"
+     "referenced_type" : "type-2279"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_WMVTYPE",
    "name" : "OMX_VIDEO_PARAM_WMVTYPE",
-   "referenced_type" : "type-2277",
-   "self_type" : "type-2277",
+   "referenced_type" : "type-2280",
+   "self_type" : "type-2280",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_WMVTYPE"
@@ -46620,17 +46699,17 @@
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 320,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 352,
-     "referenced_type" : "type-2250"
+     "referenced_type" : "type-2253"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 384,
-     "referenced_type" : "type-2201"
+     "referenced_type" : "type-2204"
     },
     {
      "field_name" : "pNativeWindow",
@@ -46640,8 +46719,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PORTDEFINITIONTYPE",
    "name" : "OMX_VIDEO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-2251",
-   "self_type" : "type-2251",
+   "referenced_type" : "type-2254",
+   "self_type" : "type-2254",
    "size" : 64,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PORTDEFINITIONTYPE"
@@ -46651,7 +46730,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1166"
+     "referenced_type" : "type-1167"
     }
    ],
    "fields" :
@@ -46660,20 +46739,20 @@
      "access" : "private",
      "field_name" : "d_",
      "field_offset" : 64,
-     "referenced_type" : "type-1195"
+     "referenced_type" : "type-1198"
     },
     {
      "access" : "private",
      "field_name" : "s_",
      "field_offset" : 128,
-     "referenced_type" : "type-1196"
+     "referenced_type" : "type-1199"
     }
    ],
    "linker_set_key" : "Renamer",
    "name" : "Renamer",
    "record_kind" : "class",
-   "referenced_type" : "type-1194",
-   "self_type" : "type-1194",
+   "referenced_type" : "type-1197",
+   "self_type" : "type-1197",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSZN7android14ReferenceMover15move_referencesINS_13GraphicBufferEEEvPNS_2spIT_EEPKS5_mE7Renamer",
@@ -46703,8 +46782,8 @@
    "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-1040",
-   "self_type" : "type-1040",
+   "referenced_type" : "type-1043",
+   "self_type" : "type-1043",
    "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"
@@ -46713,8 +46792,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::ADebug",
    "name" : "android::ADebug",
-   "referenced_type" : "type-2282",
-   "self_type" : "type-2282",
+   "referenced_type" : "type-2285",
+   "self_type" : "type-2285",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
    "unique_id" : "_ZTSN7android6ADebugE"
@@ -47213,8 +47292,8 @@
    ],
    "linker_set_key" : "android::AReplyToken",
    "name" : "android::AReplyToken",
-   "referenced_type" : "type-1045",
-   "self_type" : "type-1045",
+   "referenced_type" : "type-1044",
+   "self_type" : "type-1044",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android11AReplyTokenE",
@@ -48183,6 +48262,10 @@
      "mangled_component_name" : "_ZN7android16ProducerListener18needsReleaseNotifyEv"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ProducerListener18onBuffersDiscardedERKNSt3__16vectorIiNS1_9allocatorIiEEEE"
+    },
+    {
      "mangled_component_name" : "_ZNK7android17IProducerListener13getHalVariantEv"
     },
     {
@@ -48333,7 +48416,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1097"
+     "referenced_type" : "type-1100"
     },
     {
      "referenced_type" : "type-69"
@@ -48342,11 +48425,11 @@
    "linker_set_key" : "android::BnInterface<android::ISurfaceComposer>",
    "name" : "android::BnInterface<android::ISurfaceComposer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1096",
-   "self_type" : "type-1096",
+   "referenced_type" : "type-1099",
+   "self_type" : "type-1099",
    "size" : 48,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-1098" ],
+   "template_args" : [ "type-1101" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_16ISurfaceComposerEEE",
    "vtable_components" :
    [
@@ -48381,7 +48464,7 @@
     },
     {
      "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ISurfaceComposer28createDisplayEventConnectionENS0_11VsyncSourceE"
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer28createDisplayEventConnectionENS0_11VsyncSourceENS0_13ConfigChangedE"
     },
     {
      "is_pure" : true,
@@ -48460,6 +48543,10 @@
     },
     {
      "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer13captureScreenEmPNS_8hardware8graphics6common4V1_29DataspaceEPNS_2spINS_13GraphicBufferEEE"
+    },
+    {
+     "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"
     },
     {
@@ -48539,6 +48626,10 @@
      "mangled_component_name" : "_ZNK7android16ISurfaceComposer20setDisplayBrightnessERKNS_2spINS_7IBinderEEEf"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer15notifyPowerHintEi"
+    },
+    {
      "mangled_component_name" : "_ZN7android11BnInterfaceINS_16ISurfaceComposerEE19queryLocalInterfaceERKNS_8String16E"
     },
     {
@@ -48657,7 +48748,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-1036"
     },
     {
      "referenced_type" : "type-69"
@@ -48666,11 +48757,11 @@
    "linker_set_key" : "android::BnInterface<android::ITransactionCompletedListener>",
    "name" : "android::BnInterface<android::ITransactionCompletedListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1032",
-   "self_type" : "type-1032",
+   "referenced_type" : "type-1035",
+   "self_type" : "type-1035",
    "size" : 48,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-1034" ],
+   "template_args" : [ "type-1037" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_29ITransactionCompletedListenerEEE",
    "vtable_components" :
    [
@@ -48822,7 +48913,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1496"
+     "referenced_type" : "type-1500"
     },
     {
      "referenced_type" : "type-50"
@@ -48831,11 +48922,11 @@
    "linker_set_key" : "android::BpInterface<android::IConsumerListener>",
    "name" : "android::BpInterface<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1495",
-   "self_type" : "type-1495",
+   "referenced_type" : "type-1499",
+   "self_type" : "type-1499",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-1497" ],
+   "template_args" : [ "type-1501" ],
    "unique_id" : "_ZTSN7android11BpInterfaceINS_17IConsumerListenerEEE",
    "vtable_components" :
    [
@@ -48991,7 +49082,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1626"
+     "referenced_type" : "type-1630"
     },
     {
      "referenced_type" : "type-50"
@@ -49000,11 +49091,11 @@
    "linker_set_key" : "android::BpInterface<android::IGraphicBufferConsumer>",
    "name" : "android::BpInterface<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1625",
-   "self_type" : "type-1625",
+   "referenced_type" : "type-1629",
+   "self_type" : "type-1629",
    "size" : 56,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-1627" ],
+   "template_args" : [ "type-1631" ],
    "unique_id" : "_ZTSN7android11BpInterfaceINS_22IGraphicBufferConsumerEEE",
    "vtable_components" :
    [
@@ -49196,7 +49287,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-4321"
+     "referenced_type" : "type-4327"
     },
     {
      "referenced_type" : "type-50"
@@ -49205,11 +49296,11 @@
    "linker_set_key" : "android::BpInterface<android::IGraphicBufferProducer>",
    "name" : "android::BpInterface<android::IGraphicBufferProducer>",
    "record_kind" : "class",
-   "referenced_type" : "type-4320",
-   "self_type" : "type-4320",
+   "referenced_type" : "type-4326",
+   "self_type" : "type-4326",
    "size" : 56,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-4322" ],
+   "template_args" : [ "type-4328" ],
    "unique_id" : "_ZTSN7android11BpInterfaceINS_22IGraphicBufferProducerEEE",
    "vtable_components" :
    [
@@ -49425,7 +49516,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-4483"
+     "referenced_type" : "type-4489"
     },
     {
      "referenced_type" : "type-50"
@@ -49434,11 +49525,11 @@
    "linker_set_key" : "android::BpInterface<android::IProducerListener>",
    "name" : "android::BpInterface<android::IProducerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-4482",
-   "self_type" : "type-4482",
+   "referenced_type" : "type-4488",
+   "self_type" : "type-4488",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-4484" ],
+   "template_args" : [ "type-4490" ],
    "unique_id" : "_ZTSN7android11BpInterfaceINS_17IProducerListenerEEE",
    "vtable_components" :
    [
@@ -49470,6 +49561,10 @@
      "mangled_component_name" : "_ZN7android16ProducerListener18needsReleaseNotifyEv"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ProducerListener18onBuffersDiscardedERKNSt3__16vectorIiNS1_9allocatorIiEEEE"
+    },
+    {
      "mangled_component_name" : "_ZNK7android17IProducerListener13getHalVariantEv"
     },
     {
@@ -49702,28 +49797,28 @@
    [
     {
      "field_name" : "mRange",
-     "referenced_type" : "type-2431"
+     "referenced_type" : "type-2434"
     },
     {
      "field_name" : "mPrimaries",
      "field_offset" : 32,
-     "referenced_type" : "type-2432"
+     "referenced_type" : "type-2435"
     },
     {
      "field_name" : "mTransfer",
      "field_offset" : 64,
-     "referenced_type" : "type-2433"
+     "referenced_type" : "type-2436"
     },
     {
      "field_name" : "mMatrixCoeffs",
      "field_offset" : 96,
-     "referenced_type" : "type-2434"
+     "referenced_type" : "type-2437"
     }
    ],
    "linker_set_key" : "android::ColorAspects",
    "name" : "android::ColorAspects",
-   "referenced_type" : "type-2430",
-   "self_type" : "type-2430",
+   "referenced_type" : "type-2433",
+   "self_type" : "type-2433",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android12ColorAspectsE"
@@ -49732,8 +49827,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::ColorUtils",
    "name" : "android::ColorUtils",
-   "referenced_type" : "type-1187",
-   "self_type" : "type-1187",
+   "referenced_type" : "type-1188",
+   "self_type" : "type-1188",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
    "unique_id" : "_ZTSN7android10ColorUtilsE"
@@ -49742,8 +49837,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::CompileTimeAssert<true>",
    "name" : "android::CompileTimeAssert<true>",
-   "referenced_type" : "type-2692",
-   "self_type" : "type-2692",
+   "referenced_type" : "type-2695",
+   "self_type" : "type-2695",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Debug.h",
    "unique_id" : "_ZTSN7android17CompileTimeAssertILb1EEE"
@@ -49836,7 +49931,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -49846,7 +49941,7 @@
     {
      "field_name" : "bTunneled",
      "field_offset" : 96,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "nAudioHwSync",
@@ -49861,8 +49956,8 @@
    ],
    "linker_set_key" : "android::ConfigureVideoTunnelModeParams",
    "name" : "android::ConfigureVideoTunnelModeParams",
-   "referenced_type" : "type-2428",
-   "self_type" : "type-2428",
+   "referenced_type" : "type-2431",
+   "self_type" : "type-2431",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android30ConfigureVideoTunnelModeParamsE"
@@ -49878,7 +49973,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -49888,12 +49983,12 @@
     {
      "field_name" : "bRequestingDataSpace",
      "field_offset" : 96,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bDataSpaceChanged",
      "field_offset" : 128,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "nPixelFormat",
@@ -49908,13 +50003,13 @@
     {
      "field_name" : "sAspects",
      "field_offset" : 224,
-     "referenced_type" : "type-2430"
+     "referenced_type" : "type-2433"
     }
    ],
    "linker_set_key" : "android::DescribeColorAspectsParams",
    "name" : "android::DescribeColorAspectsParams",
-   "referenced_type" : "type-2429",
-   "self_type" : "type-2429",
+   "referenced_type" : "type-2432",
+   "self_type" : "type-2432",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26DescribeColorAspectsParamsE"
@@ -49930,12 +50025,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 64,
-     "referenced_type" : "type-2201"
+     "referenced_type" : "type-2204"
     },
     {
      "field_name" : "nFrameWidth",
@@ -49960,18 +50055,18 @@
     {
      "field_name" : "bUsingNativeBuffers",
      "field_offset" : 224,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "sMediaImage",
      "field_offset" : 256,
-     "referenced_type" : "type-2423"
+     "referenced_type" : "type-2426"
     }
    ],
    "linker_set_key" : "android::DescribeColorFormat2Params",
    "name" : "android::DescribeColorFormat2Params",
-   "referenced_type" : "type-2422",
-   "self_type" : "type-2422",
+   "referenced_type" : "type-2425",
+   "self_type" : "type-2425",
    "size" : 136,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26DescribeColorFormat2ParamsE"
@@ -49987,12 +50082,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 64,
-     "referenced_type" : "type-2201"
+     "referenced_type" : "type-2204"
     },
     {
      "field_name" : "nFrameWidth",
@@ -50017,18 +50112,18 @@
     {
      "field_name" : "bUsingNativeBuffers",
      "field_offset" : 224,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "sMediaImage",
      "field_offset" : 256,
-     "referenced_type" : "type-2417"
+     "referenced_type" : "type-2420"
     }
    ],
    "linker_set_key" : "android::DescribeColorFormatParams",
    "name" : "android::DescribeColorFormatParams",
-   "referenced_type" : "type-2416",
-   "self_type" : "type-2416",
+   "referenced_type" : "type-2419",
+   "self_type" : "type-2419",
    "size" : 112,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android25DescribeColorFormatParamsE"
@@ -50044,7 +50139,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -50064,13 +50159,13 @@
     {
      "field_name" : "nValue",
      "field_offset" : 160,
-     "referenced_type" : "type-1577"
+     "referenced_type" : "type-1572"
     }
    ],
    "linker_set_key" : "android::DescribeHDR10PlusInfoParams",
    "name" : "android::DescribeHDR10PlusInfoParams",
-   "referenced_type" : "type-2442",
-   "self_type" : "type-2442",
+   "referenced_type" : "type-2445",
+   "self_type" : "type-2445",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android27DescribeHDR10PlusInfoParamsE"
@@ -50086,7 +50181,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -50096,13 +50191,13 @@
     {
      "field_name" : "sInfo",
      "field_offset" : 96,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2440"
     }
    ],
    "linker_set_key" : "android::DescribeHDRStaticInfoParams",
    "name" : "android::DescribeHDRStaticInfoParams",
-   "referenced_type" : "type-2436",
-   "self_type" : "type-2436",
+   "referenced_type" : "type-2439",
+   "self_type" : "type-2439",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android27DescribeHDRStaticInfoParamsE"
@@ -50118,7 +50213,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -50128,13 +50223,13 @@
     {
      "field_name" : "enable",
      "field_offset" : 96,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "android::EnableAndroidNativeBuffersParams",
    "name" : "android::EnableAndroidNativeBuffersParams",
-   "referenced_type" : "type-2397",
-   "self_type" : "type-2397",
+   "referenced_type" : "type-2400",
+   "self_type" : "type-2400",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android32EnableAndroidNativeBuffersParamsE"
@@ -50146,13 +50241,13 @@
     {
      "access" : "private",
      "field_name" : "mSharedFd",
-     "referenced_type" : "type-1200"
+     "referenced_type" : "type-1203"
     }
    ],
    "linker_set_key" : "android::FileDescriptor",
    "name" : "android::FileDescriptor",
-   "referenced_type" : "type-1199",
-   "self_type" : "type-1199",
+   "referenced_type" : "type-1202",
+   "self_type" : "type-1202",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h",
    "unique_id" : "_ZTSN7android14FileDescriptorE"
@@ -50169,8 +50264,8 @@
    ],
    "linker_set_key" : "android::FileDescriptor::Autoclose",
    "name" : "android::FileDescriptor::Autoclose",
-   "referenced_type" : "type-1213",
-   "self_type" : "type-1213",
+   "referenced_type" : "type-1211",
+   "self_type" : "type-1211",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h",
    "unique_id" : "_ZTSN7android14FileDescriptor9AutocloseE"
@@ -50354,7 +50449,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -50369,8 +50464,8 @@
    ],
    "linker_set_key" : "android::GetAndroidNativeBufferUsageParams",
    "name" : "android::GetAndroidNativeBufferUsageParams",
-   "referenced_type" : "type-2414",
-   "self_type" : "type-2414",
+   "referenced_type" : "type-2417",
+   "self_type" : "type-2417",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android33GetAndroidNativeBufferUsageParamsE"
@@ -50716,17 +50811,17 @@
    [
     {
      "field_name" : "mID",
-     "referenced_type" : "type-2438"
+     "referenced_type" : "type-2441"
     },
     {
      "field_offset" : 8,
-     "referenced_type" : "type-2439"
+     "referenced_type" : "type-2442"
     }
    ],
    "linker_set_key" : "android::HDRStaticInfo",
    "name" : "android::HDRStaticInfo",
-   "referenced_type" : "type-2437",
-   "self_type" : "type-2437",
+   "referenced_type" : "type-2440",
+   "self_type" : "type-2440",
    "size" : 25,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfoE"
@@ -50737,15 +50832,15 @@
    [
     {
      "field_name" : "sType1",
-     "referenced_type" : "type-2440"
+     "referenced_type" : "type-2443"
     }
    ],
    "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-2439",
-   "self_type" : "type-2439",
+   "referenced_type" : "type-2442",
+   "self_type" : "type-2442",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfoUt_E"
@@ -50766,8 +50861,8 @@
    ],
    "linker_set_key" : "android::HDRStaticInfo::Primaries1",
    "name" : "android::HDRStaticInfo::Primaries1",
-   "referenced_type" : "type-2441",
-   "self_type" : "type-2441",
+   "referenced_type" : "type-2444",
+   "self_type" : "type-2444",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfo10Primaries1E"
@@ -50778,22 +50873,22 @@
    [
     {
      "field_name" : "mR",
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2444"
     },
     {
      "field_name" : "mG",
      "field_offset" : 32,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2444"
     },
     {
      "field_name" : "mB",
      "field_offset" : 64,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2444"
     },
     {
      "field_name" : "mW",
      "field_offset" : 96,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2444"
     },
     {
      "field_name" : "mMaxDisplayLuminance",
@@ -50818,8 +50913,8 @@
    ],
    "linker_set_key" : "android::HDRStaticInfo::Type1",
    "name" : "android::HDRStaticInfo::Type1",
-   "referenced_type" : "type-2440",
-   "self_type" : "type-2440",
+   "referenced_type" : "type-2443",
+   "self_type" : "type-2443",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfo5Type1E"
@@ -51143,31 +51238,31 @@
     {
      "access" : "private",
      "field_name" : "mProcess",
-     "referenced_type" : "type-1258"
+     "referenced_type" : "type-1261"
     },
     {
      "access" : "private",
      "field_name" : "mPendingStrongDerefs",
      "field_offset" : 64,
-     "referenced_type" : "type-1205"
+     "referenced_type" : "type-1208"
     },
     {
      "access" : "private",
      "field_name" : "mPendingWeakDerefs",
      "field_offset" : 384,
-     "referenced_type" : "type-1207"
+     "referenced_type" : "type-1212"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteStrongDerefs",
      "field_offset" : 704,
-     "referenced_type" : "type-1208"
+     "referenced_type" : "type-1213"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteWeakDerefs",
      "field_offset" : 1024,
-     "referenced_type" : "type-1207"
+     "referenced_type" : "type-1212"
     },
     {
      "access" : "private",
@@ -51233,20 +51328,20 @@
      "access" : "private",
      "field_name" : "mIPCThreadStateBase",
      "field_offset" : 3584,
-     "referenced_type" : "type-1264"
+     "referenced_type" : "type-1267"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 3648,
-     "referenced_type" : "type-1256"
+     "referenced_type" : "type-1259"
     }
    ],
    "linker_set_key" : "android::IPCThreadState",
    "name" : "android::IPCThreadState",
    "record_kind" : "class",
-   "referenced_type" : "type-1257",
-   "self_type" : "type-1257",
+   "referenced_type" : "type-1260",
+   "self_type" : "type-1260",
    "size" : 464,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h",
    "unique_id" : "_ZTSN7android14IPCThreadStateE"
@@ -51258,17 +51353,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-1201"
+     "referenced_type" : "type-1204"
     }
    ],
    "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",
+   "referenced_type" : "type-1242",
+   "self_type" : "type-1242",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-1240", "type-796" ],
+   "template_args" : [ "type-1243", "type-796" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_7IBinderEEEEE"
   },
   {
@@ -51278,17 +51373,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-1355"
+     "referenced_type" : "type-1358"
     }
    ],
    "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",
+   "referenced_type" : "type-1370",
+   "self_type" : "type-1370",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-1240", "type-1368" ],
+   "template_args" : [ "type-1243", "type-1371" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
   },
   {
@@ -51356,11 +51451,11 @@
    "linker_set_key" : "android::LightFlattenable<android::FrameStats>",
    "name" : "android::LightFlattenable<android::FrameStats>",
    "record_kind" : "class",
-   "referenced_type" : "type-1101",
-   "self_type" : "type-1101",
+   "referenced_type" : "type-1102",
+   "self_type" : "type-1102",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1102" ],
+   "template_args" : [ "type-1103" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_10FrameStatsEEE"
   },
   {
@@ -51474,17 +51569,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-1210"
+     "referenced_type" : "type-1215"
     }
    ],
    "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",
+   "referenced_type" : "type-1214",
+   "self_type" : "type-1214",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-1211" ],
+   "template_args" : [ "type-1216" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_10GLConsumer8EglImageEEE"
   },
   {
@@ -51514,17 +51609,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-2354"
+     "referenced_type" : "type-2357"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
    "name" : "android::LightRefBase<android::VirtualLightRefBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-2353",
-   "self_type" : "type-2353",
+   "referenced_type" : "type-2356",
+   "self_type" : "type-2356",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-2355" ],
+   "template_args" : [ "type-2358" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
   },
   {
@@ -51935,7 +52030,7 @@
    [
     {
      "field_name" : "mType",
-     "referenced_type" : "type-2418"
+     "referenced_type" : "type-2421"
     },
     {
      "field_name" : "mNumPlanes",
@@ -51960,13 +52055,13 @@
     {
      "field_name" : "mPlane",
      "field_offset" : 160,
-     "referenced_type" : "type-2419"
+     "referenced_type" : "type-2422"
     }
    ],
    "linker_set_key" : "android::MediaImage",
    "name" : "android::MediaImage",
-   "referenced_type" : "type-2417",
-   "self_type" : "type-2417",
+   "referenced_type" : "type-2420",
+   "self_type" : "type-2420",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android10MediaImageE"
@@ -51977,7 +52072,7 @@
    [
     {
      "field_name" : "mType",
-     "referenced_type" : "type-2424"
+     "referenced_type" : "type-2427"
     },
     {
      "field_name" : "mNumPlanes",
@@ -52007,13 +52102,13 @@
     {
      "field_name" : "mPlane",
      "field_offset" : 192,
-     "referenced_type" : "type-2425"
+     "referenced_type" : "type-2428"
     }
    ],
    "linker_set_key" : "android::MediaImage2",
    "name" : "android::MediaImage2",
-   "referenced_type" : "type-2423",
-   "self_type" : "type-2423",
+   "referenced_type" : "type-2426",
+   "self_type" : "type-2426",
    "size" : 104,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android11MediaImage2E"
@@ -52049,8 +52144,8 @@
    ],
    "linker_set_key" : "android::MediaImage2::PlaneInfo",
    "name" : "android::MediaImage2::PlaneInfo",
-   "referenced_type" : "type-2426",
-   "self_type" : "type-2426",
+   "referenced_type" : "type-2429",
+   "self_type" : "type-2429",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android11MediaImage29PlaneInfoE"
@@ -52086,8 +52181,8 @@
    ],
    "linker_set_key" : "android::MediaImage::PlaneInfo",
    "name" : "android::MediaImage::PlaneInfo",
-   "referenced_type" : "type-2420",
-   "self_type" : "type-2420",
+   "referenced_type" : "type-2423",
+   "self_type" : "type-2423",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android10MediaImage9PlaneInfoE"
@@ -52166,8 +52261,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::OMXPluginBase",
    "name" : "android::OMXPluginBase",
-   "referenced_type" : "type-2395",
-   "self_type" : "type-2395",
+   "referenced_type" : "type-2398",
+   "self_type" : "type-2398",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h",
    "unique_id" : "_ZTSN7android13OMXPluginBaseE",
@@ -52379,17 +52474,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 64,
-     "referenced_type" : "type-1513"
+     "referenced_type" : "type-1517"
     }
    ],
    "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",
+   "referenced_type" : "type-1520",
+   "self_type" : "type-1520",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-1518" ],
+   "template_args" : [ "type-1521" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_10BufferItemEEE",
    "vtable_components" :
    [
@@ -52428,17 +52523,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 64,
-     "referenced_type" : "type-1648"
+     "referenced_type" : "type-1651"
     }
    ],
    "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",
+   "referenced_type" : "type-1663",
+   "self_type" : "type-1663",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-1660" ],
+   "template_args" : [ "type-1664" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_5FenceEEE",
    "vtable_components" :
    [
@@ -52477,17 +52572,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 64,
-     "referenced_type" : "type-4325"
+     "referenced_type" : "type-4332"
     }
    ],
    "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",
+   "referenced_type" : "type-4337",
+   "self_type" : "type-4337",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-4332" ],
+   "template_args" : [ "type-4338" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEEE",
    "vtable_components" :
    [
@@ -52526,17 +52621,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 64,
-     "referenced_type" : "type-1647"
+     "referenced_type" : "type-1650"
     }
    ],
    "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",
+   "referenced_type" : "type-1658",
+   "self_type" : "type-1658",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-1655" ],
+   "template_args" : [ "type-1659" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_13GraphicBufferEEE",
    "vtable_components" :
    [
@@ -52575,17 +52670,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 64,
-     "referenced_type" : "type-4324"
+     "referenced_type" : "type-4331"
     }
    ],
    "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",
+   "referenced_type" : "type-4343",
+   "self_type" : "type-4343",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-4337" ],
+   "template_args" : [ "type-4344" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEEE",
    "vtable_components" :
    [
@@ -52624,17 +52719,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 64,
-     "referenced_type" : "type-4326"
+     "referenced_type" : "type-4333"
     }
    ],
    "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",
+   "referenced_type" : "type-4348",
+   "self_type" : "type-4348",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-4342" ],
+   "template_args" : [ "type-4349" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEEE",
    "vtable_components" :
    [
@@ -52779,7 +52874,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -52789,7 +52884,7 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "nMaxFrameWidth",
@@ -52804,8 +52899,8 @@
    ],
    "linker_set_key" : "android::PrepareForAdaptivePlaybackParams",
    "name" : "android::PrepareForAdaptivePlaybackParams",
-   "referenced_type" : "type-2408",
-   "self_type" : "type-2408",
+   "referenced_type" : "type-2411",
+   "self_type" : "type-2411",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android32PrepareForAdaptivePlaybackParamsE"
@@ -52821,18 +52916,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 64,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "android::PrependSPSPPSToIDRFramesParams",
    "name" : "android::PrependSPSPPSToIDRFramesParams",
-   "referenced_type" : "type-2415",
-   "self_type" : "type-2415",
+   "referenced_type" : "type-2418",
+   "self_type" : "type-2418",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android30PrependSPSPPSToIDRFramesParamsE"
@@ -52870,13 +52965,13 @@
      "access" : "private",
      "field_name" : "mThreadCountLock",
      "field_offset" : 256,
-     "referenced_type" : "type-1262"
+     "referenced_type" : "type-1265"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountDecrement",
      "field_offset" : 576,
-     "referenced_type" : "type-1263"
+     "referenced_type" : "type-1266"
     },
     {
      "access" : "private",
@@ -52906,7 +53001,7 @@
      "access" : "private",
      "field_name" : "mHandleToObject",
      "field_offset" : 1472,
-     "referenced_type" : "type-1203"
+     "referenced_type" : "type-1206"
     },
     {
      "access" : "private",
@@ -52918,7 +53013,7 @@
      "access" : "private",
      "field_name" : "mBinderContextCheckFunc",
      "field_offset" : 1856,
-     "referenced_type" : "type-1249"
+     "referenced_type" : "type-1253"
     },
     {
      "access" : "private",
@@ -52930,7 +53025,7 @@
      "access" : "private",
      "field_name" : "mContexts",
      "field_offset" : 1984,
-     "referenced_type" : "type-1239"
+     "referenced_type" : "type-1242"
     },
     {
      "access" : "private",
@@ -52948,20 +53043,20 @@
      "access" : "private",
      "field_name" : "mThreadPoolSeq",
      "field_offset" : 2400,
-     "referenced_type" : "type-1255"
+     "referenced_type" : "type-1258"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 2432,
-     "referenced_type" : "type-1256"
+     "referenced_type" : "type-1259"
     }
    ],
    "linker_set_key" : "android::ProcessState",
    "name" : "android::ProcessState",
    "record_kind" : "class",
-   "referenced_type" : "type-1261",
-   "self_type" : "type-1261",
+   "referenced_type" : "type-1264",
+   "self_type" : "type-1264",
    "size" : 328,
    "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h",
    "unique_id" : "_ZTSN7android12ProcessStateE",
@@ -53049,8 +53144,8 @@
    ],
    "linker_set_key" : "android::ProcessState::handle_entry",
    "name" : "android::ProcessState::handle_entry",
-   "referenced_type" : "type-1204",
-   "self_type" : "type-1204",
+   "referenced_type" : "type-1207",
+   "self_type" : "type-1207",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h",
    "unique_id" : "_ZTSN7android12ProcessState12handle_entryE"
@@ -53178,8 +53273,8 @@
    "linker_set_key" : "android::ReferenceMover",
    "name" : "android::ReferenceMover",
    "record_kind" : "class",
-   "referenced_type" : "type-1589",
-   "self_type" : "type-1589",
+   "referenced_type" : "type-1590",
+   "self_type" : "type-1590",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android14ReferenceMoverE"
@@ -53189,8 +53284,8 @@
    "linker_set_key" : "android::ReferenceRenamer",
    "name" : "android::ReferenceRenamer",
    "record_kind" : "class",
-   "referenced_type" : "type-1166",
-   "self_type" : "type-1166",
+   "referenced_type" : "type-1167",
+   "self_type" : "type-1167",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android16ReferenceRenamerE",
@@ -53213,8 +53308,8 @@
    "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",
+   "referenced_type" : "type-1566",
+   "self_type" : "type-1566",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE16ElementIsPointerILm0EJRKNS_10BufferItemEEEE"
@@ -53226,14 +53321,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> >",
    "name" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> >",
    "record_kind" : "class",
-   "referenced_type" : "type-1563",
-   "self_type" : "type-1563",
+   "referenced_type" : "type-1567",
+   "self_type" : "type-1567",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE11InputReaderIJNSt3__15tupleIJEEEEEE"
@@ -53245,14 +53340,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-1573",
+   "self_type" : "type-1573",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE11InputReaderIJNSt3__15tupleIJRKNS_10BufferItemEEEEEEE"
@@ -53261,8 +53356,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::MethodCaller<tuple<> >",
    "name" : "android::SafeBnInterface<IConsumerListener>::MethodCaller<tuple<> >",
-   "referenced_type" : "type-1572",
-   "self_type" : "type-1572",
+   "referenced_type" : "type-1577",
+   "self_type" : "type-1577",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE12MethodCallerIJNSt3__15tupleIJEEEEEE"
@@ -53271,8 +53366,8 @@
    "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",
+   "referenced_type" : "type-1578",
+   "self_type" : "type-1578",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE12MethodCallerIJNSt3__15tupleIJRKNS_10BufferItemEEEEEEE"
@@ -53281,52 +53376,52 @@
    "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",
+   "referenced_type" : "type-1560",
+   "self_type" : "type-1560",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1557" ],
+   "template_args" : [ "type-1561" ],
    "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",
+   "referenced_type" : "type-1562",
+   "self_type" : "type-1562",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1559" ],
+   "template_args" : [ "type-1563" ],
    "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",
+   "referenced_type" : "type-1564",
+   "self_type" : "type-1564",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1561" ],
+   "template_args" : [ "type-1565" ],
    "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",
+   "referenced_type" : "type-1557",
+   "self_type" : "type-1557",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1555" ],
+   "template_args" : [ "type-1558" ],
    "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",
+   "referenced_type" : "type-2026",
+   "self_type" : "type-2026",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJPNS_10BufferItemElmEEE"
@@ -53335,8 +53430,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, android_dataspace_t>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, android_dataspace_t>",
-   "referenced_type" : "type-2039",
-   "self_type" : "type-2039",
+   "referenced_type" : "type-2043",
+   "self_type" : "type-2043",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJ19android_dataspace_tEEE"
@@ -53345,8 +53440,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, bool, vector<Segment, allocator<Segment> > *>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, bool, vector<Segment, allocator<Segment> > *>",
-   "referenced_type" : "type-2044",
-   "self_type" : "type-2044",
+   "referenced_type" : "type-2048",
+   "self_type" : "type-2048",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS7_EEEEEEE"
@@ -53355,8 +53450,8 @@
    "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",
+   "referenced_type" : "type-2045",
+   "self_type" : "type-2045",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJbEEE"
@@ -53365,8 +53460,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, const String8 &, String8 *>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, const String8 &, String8 *>",
-   "referenced_type" : "type-2047",
-   "self_type" : "type-2047",
+   "referenced_type" : "type-2051",
+   "self_type" : "type-2051",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJRKNS_7String8EPS4_EEE"
@@ -53375,8 +53470,8 @@
    "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",
+   "referenced_type" : "type-2042",
+   "self_type" : "type-2042",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJRKNS_7String8EEEE"
@@ -53385,8 +53480,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, const sp<IConsumerListener> &, bool>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, const sp<IConsumerListener> &, bool>",
-   "referenced_type" : "type-2032",
-   "self_type" : "type-2032",
+   "referenced_type" : "type-2036",
+   "self_type" : "type-2036",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJRKNS_2spINS_17IConsumerListenerEEEbEEE"
@@ -53395,8 +53490,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, int *, const sp<GraphicBuffer> &>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, int *, const sp<GraphicBuffer> &>",
-   "referenced_type" : "type-2027",
-   "self_type" : "type-2027",
+   "referenced_type" : "type-2031",
+   "self_type" : "type-2031",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJPiRKNS_2spINS_13GraphicBufferEEEEEE"
@@ -53405,8 +53500,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, int, unsigned long, const sp<Fence> &>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, int, unsigned long, const sp<Fence> &>",
-   "referenced_type" : "type-2029",
-   "self_type" : "type-2029",
+   "referenced_type" : "type-2033",
+   "self_type" : "type-2033",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJimRKNS_2spINS_5FenceEEEEEE"
@@ -53415,8 +53510,8 @@
    "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",
+   "referenced_type" : "type-2030",
+   "self_type" : "type-2030",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJiEEE"
@@ -53425,8 +53520,8 @@
    "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",
+   "referenced_type" : "type-2047",
+   "self_type" : "type-2047",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJPNS_2spINS_12NativeHandleEEEEEE"
@@ -53435,8 +53530,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned int, unsigned int>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned int, unsigned int>",
-   "referenced_type" : "type-2036",
-   "self_type" : "type-2036",
+   "referenced_type" : "type-2040",
+   "self_type" : "type-2040",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJjjEEE"
@@ -53445,8 +53540,8 @@
    "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",
+   "referenced_type" : "type-2046",
+   "self_type" : "type-2046",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJjEEE"
@@ -53455,8 +53550,8 @@
    "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",
+   "referenced_type" : "type-2039",
+   "self_type" : "type-2039",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJPmEEE"
@@ -53465,8 +53560,8 @@
    "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",
+   "referenced_type" : "type-2044",
+   "self_type" : "type-2044",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJmEEE"
@@ -53475,8 +53570,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, BufferItem *, long, unsigned long>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, BufferItem *, long, unsigned long>",
-   "referenced_type" : "type-2023",
-   "self_type" : "type-2023",
+   "referenced_type" : "type-2028",
+   "self_type" : "type-2028",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm1EJPNS_10BufferItemElmEEE"
@@ -53485,8 +53580,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, bool, vector<Segment, allocator<Segment> > *>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, bool, vector<Segment, allocator<Segment> > *>",
-   "referenced_type" : "type-2045",
-   "self_type" : "type-2045",
+   "referenced_type" : "type-2050",
+   "self_type" : "type-2050",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm1EJbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS7_EEEEEEE"
@@ -53495,8 +53590,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, const String8 &, String8 *>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, const String8 &, String8 *>",
-   "referenced_type" : "type-2048",
-   "self_type" : "type-2048",
+   "referenced_type" : "type-2052",
+   "self_type" : "type-2052",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm1EJRKNS_7String8EPS4_EEE"
@@ -53505,8 +53600,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, const sp<IConsumerListener> &, bool>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, const sp<IConsumerListener> &, bool>",
-   "referenced_type" : "type-2033",
-   "self_type" : "type-2033",
+   "referenced_type" : "type-2037",
+   "self_type" : "type-2037",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm1EJRKNS_2spINS_17IConsumerListenerEEEbEEE"
@@ -53515,8 +53610,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, int *, const sp<GraphicBuffer> &>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, int *, const sp<GraphicBuffer> &>",
-   "referenced_type" : "type-2028",
-   "self_type" : "type-2028",
+   "referenced_type" : "type-2032",
+   "self_type" : "type-2032",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm1EJPiRKNS_2spINS_13GraphicBufferEEEEEE"
@@ -53525,8 +53620,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, int, unsigned long, const sp<Fence> &>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, int, unsigned long, const sp<Fence> &>",
-   "referenced_type" : "type-2030",
-   "self_type" : "type-2030",
+   "referenced_type" : "type-2034",
+   "self_type" : "type-2034",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm1EJimRKNS_2spINS_5FenceEEEEEE"
@@ -53535,8 +53630,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, unsigned int, unsigned int>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, unsigned int, unsigned int>",
-   "referenced_type" : "type-2037",
-   "self_type" : "type-2037",
+   "referenced_type" : "type-2041",
+   "self_type" : "type-2041",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm1EJjjEEE"
@@ -53545,8 +53640,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<2, BufferItem *, long, unsigned long>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<2, BufferItem *, long, unsigned long>",
-   "referenced_type" : "type-2025",
-   "self_type" : "type-2025",
+   "referenced_type" : "type-2029",
+   "self_type" : "type-2029",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm2EJPNS_10BufferItemElmEEE"
@@ -53555,8 +53650,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<2, int, unsigned long, const sp<Fence> &>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<2, int, unsigned long, const sp<Fence> &>",
-   "referenced_type" : "type-2031",
-   "self_type" : "type-2031",
+   "referenced_type" : "type-2035",
+   "self_type" : "type-2035",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm2EJimRKNS_2spINS_5FenceEEEEEE"
@@ -53568,14 +53663,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-2075",
+   "self_type" : "type-2075",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJEEEEEE"
@@ -53587,14 +53682,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-2053",
+   "self_type" : "type-2053",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPNS_10BufferItemElmEEEEEE"
@@ -53606,14 +53701,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-2092",
+   "self_type" : "type-2092",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJ19android_dataspace_tEEEEEE"
@@ -53625,14 +53720,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-2113",
+   "self_type" : "type-2113",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJbPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEEEE"
@@ -53644,14 +53739,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-2100",
+   "self_type" : "type-2100",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJbEEEEEE"
@@ -53663,14 +53758,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-2118",
+   "self_type" : "type-2118",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJRKNS_7String8EPS6_EEEEEE"
@@ -53682,14 +53777,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-2088",
+   "self_type" : "type-2088",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJRKNS_7String8EEEEEEE"
@@ -53701,14 +53796,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-2070",
+   "self_type" : "type-2070",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEEbEEEEEE"
@@ -53720,14 +53815,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-2062",
+   "self_type" : "type-2062",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
@@ -53739,14 +53834,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-2066",
+   "self_type" : "type-2066",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJimRKNS_2spINS_5FenceEEEEEEEEE"
@@ -53758,14 +53853,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-2057",
+   "self_type" : "type-2057",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJiEEEEEE"
@@ -53777,14 +53872,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-2109",
+   "self_type" : "type-2109",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPNS_2spINS_12NativeHandleEEEEEEEEE"
@@ -53796,14 +53891,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-2084",
+   "self_type" : "type-2084",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJjjEEEEEE"
@@ -53815,14 +53910,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-2104",
+   "self_type" : "type-2104",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJjEEEEEE"
@@ -53834,14 +53929,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-2079",
+   "self_type" : "type-2079",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPmEEEEEE"
@@ -53853,14 +53948,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-2098",
+   "self_type" : "type-2098",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJmEEEEEE"
@@ -53869,8 +53964,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<> >",
-   "referenced_type" : "type-2123",
-   "self_type" : "type-2123",
+   "referenced_type" : "type-2128",
+   "self_type" : "type-2128",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJEEEEEE"
@@ -53879,8 +53974,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<BufferItem *, long, unsigned long> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<BufferItem *, long, unsigned long> >",
-   "referenced_type" : "type-2118",
-   "self_type" : "type-2118",
+   "referenced_type" : "type-2122",
+   "self_type" : "type-2122",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPNS_10BufferItemElmEEEEEE"
@@ -53889,8 +53984,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<android_dataspace_t> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<android_dataspace_t> >",
-   "referenced_type" : "type-2128",
-   "self_type" : "type-2128",
+   "referenced_type" : "type-2132",
+   "self_type" : "type-2132",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJ19android_dataspace_tEEEEEE"
@@ -53899,8 +53994,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<bool, vector<Segment, allocator<Segment> > *> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<bool, vector<Segment, allocator<Segment> > *> >",
-   "referenced_type" : "type-2133",
-   "self_type" : "type-2133",
+   "referenced_type" : "type-2137",
+   "self_type" : "type-2137",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJbPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEEEE"
@@ -53909,8 +54004,8 @@
    "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",
+   "referenced_type" : "type-2134",
+   "self_type" : "type-2134",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJbEEEEEE"
@@ -53919,8 +54014,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<const String8 &, String8 *> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<const String8 &, String8 *> >",
-   "referenced_type" : "type-2134",
-   "self_type" : "type-2134",
+   "referenced_type" : "type-2139",
+   "self_type" : "type-2139",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJRKNS_7String8EPS6_EEEEEE"
@@ -53929,8 +54024,8 @@
    "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",
+   "referenced_type" : "type-2131",
+   "self_type" : "type-2131",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJRKNS_7String8EEEEEEE"
@@ -53939,8 +54034,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<const sp<IConsumerListener> &, bool> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<const sp<IConsumerListener> &, bool> >",
-   "referenced_type" : "type-2122",
-   "self_type" : "type-2122",
+   "referenced_type" : "type-2126",
+   "self_type" : "type-2126",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEEbEEEEEE"
@@ -53949,8 +54044,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<int *, const sp<GraphicBuffer> &> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<int *, const sp<GraphicBuffer> &> >",
-   "referenced_type" : "type-2120",
-   "self_type" : "type-2120",
+   "referenced_type" : "type-2124",
+   "self_type" : "type-2124",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
@@ -53959,8 +54054,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<int, unsigned long, const sp<Fence> &> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<int, unsigned long, const sp<Fence> &> >",
-   "referenced_type" : "type-2121",
-   "self_type" : "type-2121",
+   "referenced_type" : "type-2125",
+   "self_type" : "type-2125",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJimRKNS_2spINS_5FenceEEEEEEEEE"
@@ -53969,8 +54064,8 @@
    "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",
+   "referenced_type" : "type-2123",
+   "self_type" : "type-2123",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJiEEEEEE"
@@ -53979,8 +54074,8 @@
    "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",
+   "referenced_type" : "type-2136",
+   "self_type" : "type-2136",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPNS_2spINS_12NativeHandleEEEEEEEEE"
@@ -53989,8 +54084,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned int, unsigned int> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned int, unsigned int> >",
-   "referenced_type" : "type-2126",
-   "self_type" : "type-2126",
+   "referenced_type" : "type-2130",
+   "self_type" : "type-2130",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJjjEEEEEE"
@@ -53999,8 +54094,8 @@
    "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",
+   "referenced_type" : "type-2135",
+   "self_type" : "type-2135",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJjEEEEEE"
@@ -54009,8 +54104,8 @@
    "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",
+   "referenced_type" : "type-2129",
+   "self_type" : "type-2129",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPmEEEEEE"
@@ -54019,8 +54114,8 @@
    "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",
+   "referenced_type" : "type-2133",
+   "self_type" : "type-2133",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJmEEEEEE"
@@ -54032,13 +54127,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<> >",
-   "referenced_type" : "type-2147",
-   "self_type" : "type-2147",
+   "referenced_type" : "type-2151",
+   "self_type" : "type-2151",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJEEEEEE"
@@ -54050,13 +54145,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-2140",
+   "self_type" : "type-2140",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPNS_10BufferItemElmEEEEEE"
@@ -54068,13 +54163,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-2159",
+   "self_type" : "type-2159",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJ19android_dataspace_tEEEEEE"
@@ -54086,13 +54181,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-2171",
+   "self_type" : "type-2171",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJbPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEEEE"
@@ -54104,13 +54199,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool> >",
-   "referenced_type" : "type-2160",
-   "self_type" : "type-2160",
+   "referenced_type" : "type-2164",
+   "self_type" : "type-2164",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJbEEEEEE"
@@ -54122,13 +54217,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-2173",
+   "self_type" : "type-2173",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJRKNS_7String8EPS6_EEEEEE"
@@ -54140,13 +54235,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-2157",
+   "self_type" : "type-2157",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJRKNS_7String8EEEEEEE"
@@ -54158,13 +54253,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-2148",
+   "self_type" : "type-2148",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEEbEEEEEE"
@@ -54176,13 +54271,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-2144",
+   "self_type" : "type-2144",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
@@ -54194,13 +54289,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-2146",
+   "self_type" : "type-2146",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJimRKNS_2spINS_5FenceEEEEEEEEE"
@@ -54212,13 +54307,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int> >",
-   "referenced_type" : "type-2138",
-   "self_type" : "type-2138",
+   "referenced_type" : "type-2142",
+   "self_type" : "type-2142",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJiEEEEEE"
@@ -54230,13 +54325,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-2168",
+   "self_type" : "type-2168",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPNS_2spINS_12NativeHandleEEEEEEEEE"
@@ -54248,13 +54343,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-2155",
+   "self_type" : "type-2155",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJjjEEEEEE"
@@ -54266,13 +54361,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-2166",
+   "self_type" : "type-2166",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJjEEEEEE"
@@ -54284,13 +54379,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-2153",
+   "self_type" : "type-2153",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPmEEEEEE"
@@ -54302,13 +54397,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-2162",
+   "self_type" : "type-2162",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJmEEEEEE"
@@ -54317,660 +54412,660 @@
    "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",
+   "referenced_type" : "type-1976",
+   "self_type" : "type-1976",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1973" ],
+   "template_args" : [ "type-1977" ],
    "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",
+   "referenced_type" : "type-1941",
+   "self_type" : "type-1941",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1938" ],
+   "template_args" : [ "type-1942" ],
    "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",
+   "referenced_type" : "type-1993",
+   "self_type" : "type-1993",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1990" ],
+   "template_args" : [ "type-1994" ],
    "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",
+   "referenced_type" : "type-2013",
+   "self_type" : "type-2013",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2010" ],
+   "template_args" : [ "type-2014" ],
    "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",
+   "referenced_type" : "type-2000",
+   "self_type" : "type-2000",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1997" ],
+   "template_args" : [ "type-2001" ],
    "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",
+   "referenced_type" : "type-2020",
+   "self_type" : "type-2020",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2017" ],
+   "template_args" : [ "type-2021" ],
    "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",
+   "referenced_type" : "type-1989",
+   "self_type" : "type-1989",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1986" ],
+   "template_args" : [ "type-1990" ],
    "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",
+   "referenced_type" : "type-1969",
+   "self_type" : "type-1969",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1966" ],
+   "template_args" : [ "type-1970" ],
    "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",
+   "referenced_type" : "type-1954",
+   "self_type" : "type-1954",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1951" ],
+   "template_args" : [ "type-1955" ],
    "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",
+   "referenced_type" : "type-1960",
+   "self_type" : "type-1960",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1957" ],
+   "template_args" : [ "type-1961" ],
    "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",
+   "referenced_type" : "type-1949",
+   "self_type" : "type-1949",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1946" ],
+   "template_args" : [ "type-1950" ],
    "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",
+   "referenced_type" : "type-2009",
+   "self_type" : "type-2009",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2006" ],
+   "template_args" : [ "type-2010" ],
    "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",
+   "referenced_type" : "type-1982",
+   "self_type" : "type-1982",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1979" ],
+   "template_args" : [ "type-1983" ],
    "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",
+   "referenced_type" : "type-2004",
+   "self_type" : "type-2004",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2001" ],
+   "template_args" : [ "type-2005" ],
    "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",
+   "referenced_type" : "type-1978",
+   "self_type" : "type-1978",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1975" ],
+   "template_args" : [ "type-1979" ],
    "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",
+   "referenced_type" : "type-1998",
+   "self_type" : "type-1998",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1995" ],
+   "template_args" : [ "type-1999" ],
    "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",
+   "referenced_type" : "type-1947",
+   "self_type" : "type-1947",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1944" ],
+   "template_args" : [ "type-1948" ],
    "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",
+   "referenced_type" : "type-1945",
+   "self_type" : "type-1945",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1942" ],
+   "template_args" : [ "type-1946" ],
    "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",
+   "referenced_type" : "type-1943",
+   "self_type" : "type-1943",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1940" ],
+   "template_args" : [ "type-1944" ],
    "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",
+   "referenced_type" : "type-2024",
+   "self_type" : "type-2024",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2021" ],
+   "template_args" : [ "type-2025" ],
    "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",
+   "referenced_type" : "type-1991",
+   "self_type" : "type-1991",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1988" ],
+   "template_args" : [ "type-1992" ],
    "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",
+   "referenced_type" : "type-2022",
+   "self_type" : "type-2022",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2019" ],
+   "template_args" : [ "type-2023" ],
    "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",
+   "referenced_type" : "type-1996",
+   "self_type" : "type-1996",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1993" ],
+   "template_args" : [ "type-1997" ],
    "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",
+   "referenced_type" : "type-2018",
+   "self_type" : "type-2018",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2015" ],
+   "template_args" : [ "type-2019" ],
    "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",
+   "referenced_type" : "type-2002",
+   "self_type" : "type-2002",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1999" ],
+   "template_args" : [ "type-2003" ],
    "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",
+   "referenced_type" : "type-2015",
+   "self_type" : "type-2015",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2012" ],
+   "template_args" : [ "type-2016" ],
    "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",
+   "referenced_type" : "type-1958",
+   "self_type" : "type-1958",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1955" ],
+   "template_args" : [ "type-1959" ],
    "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",
+   "referenced_type" : "type-1967",
+   "self_type" : "type-1967",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1964" ],
+   "template_args" : [ "type-1968" ],
    "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",
+   "referenced_type" : "type-1965",
+   "self_type" : "type-1965",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1962" ],
+   "template_args" : [ "type-1966" ],
    "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",
+   "referenced_type" : "type-1952",
+   "self_type" : "type-1952",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1949" ],
+   "template_args" : [ "type-1953" ],
    "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",
+   "referenced_type" : "type-1956",
+   "self_type" : "type-1956",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1953" ],
+   "template_args" : [ "type-1957" ],
    "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",
+   "referenced_type" : "type-1963",
+   "self_type" : "type-1963",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1960" ],
+   "template_args" : [ "type-1964" ],
    "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",
+   "referenced_type" : "type-1971",
+   "self_type" : "type-1971",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1968" ],
+   "template_args" : [ "type-1972" ],
    "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",
+   "referenced_type" : "type-1974",
+   "self_type" : "type-1974",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1971" ],
+   "template_args" : [ "type-1975" ],
    "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",
+   "referenced_type" : "type-2011",
+   "self_type" : "type-2011",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2008" ],
+   "template_args" : [ "type-2012" ],
    "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",
+   "referenced_type" : "type-1987",
+   "self_type" : "type-1987",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1984" ],
+   "template_args" : [ "type-1988" ],
    "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",
+   "referenced_type" : "type-2007",
+   "self_type" : "type-2007",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2004" ],
+   "template_args" : [ "type-2008" ],
    "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",
+   "referenced_type" : "type-1985",
+   "self_type" : "type-1985",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1982" ],
+   "template_args" : [ "type-1986" ],
    "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",
+   "referenced_type" : "type-1980",
+   "self_type" : "type-1980",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1977" ],
+   "template_args" : [ "type-1981" ],
    "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",
+   "referenced_type" : "type-1894",
+   "self_type" : "type-1894",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1891" ],
+   "template_args" : [ "type-1895" ],
    "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",
+   "referenced_type" : "type-1938",
+   "self_type" : "type-1938",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1935" ],
+   "template_args" : [ "type-1939" ],
    "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",
+   "referenced_type" : "type-1927",
+   "self_type" : "type-1927",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1924" ],
+   "template_args" : [ "type-1928" ],
    "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",
+   "referenced_type" : "type-1932",
+   "self_type" : "type-1932",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1929" ],
+   "template_args" : [ "type-1933" ],
    "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",
+   "referenced_type" : "type-1916",
+   "self_type" : "type-1916",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1913" ],
+   "template_args" : [ "type-1917" ],
    "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",
+   "referenced_type" : "type-1936",
+   "self_type" : "type-1936",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1933" ],
+   "template_args" : [ "type-1937" ],
    "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",
+   "referenced_type" : "type-1925",
+   "self_type" : "type-1925",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1922" ],
+   "template_args" : [ "type-1926" ],
    "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",
+   "referenced_type" : "type-1912",
+   "self_type" : "type-1912",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1909" ],
+   "template_args" : [ "type-1913" ],
    "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",
+   "referenced_type" : "type-1905",
+   "self_type" : "type-1905",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1902" ],
+   "template_args" : [ "type-1906" ],
    "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",
+   "referenced_type" : "type-1914",
+   "self_type" : "type-1914",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1911" ],
+   "template_args" : [ "type-1915" ],
    "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",
+   "referenced_type" : "type-1903",
+   "self_type" : "type-1903",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1900" ],
+   "template_args" : [ "type-1904" ],
    "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",
+   "referenced_type" : "type-1908",
+   "self_type" : "type-1908",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1905" ],
+   "template_args" : [ "type-1909" ],
    "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",
+   "referenced_type" : "type-1901",
+   "self_type" : "type-1901",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1898" ],
+   "template_args" : [ "type-1902" ],
    "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",
+   "referenced_type" : "type-1897",
+   "self_type" : "type-1897",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1894" ],
+   "template_args" : [ "type-1898" ],
    "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",
+   "referenced_type" : "type-1930",
+   "self_type" : "type-1930",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1927" ],
+   "template_args" : [ "type-1931" ],
    "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",
+   "referenced_type" : "type-1921",
+   "self_type" : "type-1921",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1918" ],
+   "template_args" : [ "type-1922" ],
    "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",
+   "referenced_type" : "type-1923",
+   "self_type" : "type-1923",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1920" ],
+   "template_args" : [ "type-1924" ],
    "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",
+   "referenced_type" : "type-1919",
+   "self_type" : "type-1919",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1916" ],
+   "template_args" : [ "type-1920" ],
    "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",
+   "referenced_type" : "type-1910",
+   "self_type" : "type-1910",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1907" ],
+   "template_args" : [ "type-1911" ],
    "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",
+   "referenced_type" : "type-1899",
+   "self_type" : "type-1899",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1896" ],
+   "template_args" : [ "type-1900" ],
    "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",
+   "referenced_type" : "type-1934",
+   "self_type" : "type-1934",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1931" ],
+   "template_args" : [ "type-1935" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEJEEE"
   },
   {
@@ -54987,17 +55082,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 320,
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<android::IConsumerListener>",
    "name" : "android::SafeBnInterface<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1288",
-   "self_type" : "type-1288",
+   "referenced_type" : "type-1291",
+   "self_type" : "type-1291",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1289" ],
+   "template_args" : [ "type-1292" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEEE",
    "vtable_components" :
    [
@@ -55198,17 +55293,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 256,
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<android::IGraphicBufferConsumer>",
    "name" : "android::SafeBnInterface<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1280",
-   "self_type" : "type-1280",
+   "referenced_type" : "type-1283",
+   "self_type" : "type-1283",
    "size" : 56,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1281" ],
+   "template_args" : [ "type-1284" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEEE",
    "vtable_components" :
    [
@@ -55436,7 +55531,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1032"
+     "referenced_type" : "type-1035"
     }
    ],
    "fields" :
@@ -55445,17 +55540,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 256,
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<android::ITransactionCompletedListener>",
    "name" : "android::SafeBnInterface<android::ITransactionCompletedListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1103",
-   "self_type" : "type-1103",
+   "referenced_type" : "type-1106",
+   "self_type" : "type-1106",
    "size" : 56,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1105" ],
+   "template_args" : [ "type-1108" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEEE",
    "vtable_components" :
    [
@@ -55606,525 +55701,525 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IConsumerListener>::ArgsMatchParams<std::tuple<>, std::tuple<> >",
    "name" : "android::SafeBpInterface<IConsumerListener>::ArgsMatchParams<std::tuple<>, std::tuple<> >",
-   "referenced_type" : "type-1545",
-   "self_type" : "type-1545",
+   "referenced_type" : "type-1548",
+   "self_type" : "type-1548",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1546", "type-1547" ],
+   "template_args" : [ "type-1549", "type-1550" ],
    "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",
+   "referenced_type" : "type-1551",
+   "self_type" : "type-1551",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1549", "type-1550" ],
+   "template_args" : [ "type-1552", "type-1553" ],
    "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",
+   "referenced_type" : "type-1545",
+   "self_type" : "type-1545",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1542", "type-1543" ],
+   "template_args" : [ "type-1546", "type-1547" ],
    "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",
+   "referenced_type" : "type-1554",
+   "self_type" : "type-1554",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1533" ],
+   "template_args" : [ "type-1536" ],
    "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",
+   "referenced_type" : "type-1821",
+   "self_type" : "type-1821",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1818", "type-1819" ],
+   "template_args" : [ "type-1822", "type-1823" ],
    "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",
+   "referenced_type" : "type-1805",
+   "self_type" : "type-1805",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1802", "type-1803" ],
+   "template_args" : [ "type-1806", "type-1807" ],
    "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",
+   "referenced_type" : "type-1834",
+   "self_type" : "type-1834",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1831", "type-1832" ],
+   "template_args" : [ "type-1835", "type-1836" ],
    "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",
+   "referenced_type" : "type-1851",
+   "self_type" : "type-1851",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1848", "type-1849" ],
+   "template_args" : [ "type-1852", "type-1853" ],
    "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",
+   "referenced_type" : "type-1841",
+   "self_type" : "type-1841",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1838", "type-1839" ],
+   "template_args" : [ "type-1842", "type-1843" ],
    "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",
+   "referenced_type" : "type-1854",
+   "self_type" : "type-1854",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1851", "type-1852" ],
+   "template_args" : [ "type-1855", "type-1856" ],
    "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",
+   "referenced_type" : "type-1831",
+   "self_type" : "type-1831",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1828", "type-1829" ],
+   "template_args" : [ "type-1832", "type-1833" ],
    "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",
+   "referenced_type" : "type-1818",
+   "self_type" : "type-1818",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1815", "type-1816" ],
+   "template_args" : [ "type-1819", "type-1820" ],
    "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",
+   "referenced_type" : "type-1815",
+   "self_type" : "type-1815",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1812", "type-1813" ],
+   "template_args" : [ "type-1816", "type-1817" ],
    "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",
+   "referenced_type" : "type-1808",
+   "self_type" : "type-1808",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1805", "type-1806" ],
+   "template_args" : [ "type-1809", "type-1810" ],
    "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",
+   "referenced_type" : "type-1811",
+   "self_type" : "type-1811",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1808", "type-1809" ],
+   "template_args" : [ "type-1812", "type-1813" ],
    "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",
+   "referenced_type" : "type-1848",
+   "self_type" : "type-1848",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1845", "type-1846" ],
+   "template_args" : [ "type-1849", "type-1850" ],
    "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",
+   "referenced_type" : "type-1828",
+   "self_type" : "type-1828",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1825", "type-1826" ],
+   "template_args" : [ "type-1829", "type-1830" ],
    "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",
+   "referenced_type" : "type-1844",
+   "self_type" : "type-1844",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1841", "type-1842" ],
+   "template_args" : [ "type-1845", "type-1846" ],
    "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",
+   "referenced_type" : "type-1838",
+   "self_type" : "type-1838",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1835", "type-1836" ],
+   "template_args" : [ "type-1839", "type-1840" ],
    "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",
+   "referenced_type" : "type-1825",
+   "self_type" : "type-1825",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1821", "type-1822" ],
+   "template_args" : [ "type-1826", "type-1827" ],
    "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",
+   "referenced_type" : "type-1726",
+   "self_type" : "type-1726",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1722", "type-1723" ],
+   "template_args" : [ "type-1727", "type-1728" ],
    "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",
+   "referenced_type" : "type-1775",
+   "self_type" : "type-1775",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1772", "type-1773" ],
+   "template_args" : [ "type-1776", "type-1777" ],
    "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",
+   "referenced_type" : "type-1792",
+   "self_type" : "type-1792",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1788", "type-1789" ],
+   "template_args" : [ "type-1793", "type-1794" ],
    "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",
+   "referenced_type" : "type-1782",
+   "self_type" : "type-1782",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1779", "type-1780" ],
+   "template_args" : [ "type-1783", "type-1784" ],
    "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",
+   "referenced_type" : "type-1798",
+   "self_type" : "type-1798",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1795", "type-1796" ],
+   "template_args" : [ "type-1799", "type-1800" ],
    "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",
+   "referenced_type" : "type-1772",
+   "self_type" : "type-1772",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1769", "type-1770" ],
+   "template_args" : [ "type-1773", "type-1774" ],
    "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",
+   "referenced_type" : "type-1755",
+   "self_type" : "type-1755",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1752", "type-1753" ],
+   "template_args" : [ "type-1756", "type-1757" ],
    "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",
+   "referenced_type" : "type-1745",
+   "self_type" : "type-1745",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1742", "type-1743" ],
+   "template_args" : [ "type-1746", "type-1747" ],
    "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",
+   "referenced_type" : "type-1735",
+   "self_type" : "type-1735",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1732", "type-1733" ],
+   "template_args" : [ "type-1736", "type-1737" ],
    "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",
+   "referenced_type" : "type-1739",
+   "self_type" : "type-1739",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1736", "type-1737" ],
+   "template_args" : [ "type-1740", "type-1741" ],
    "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",
+   "referenced_type" : "type-1788",
+   "self_type" : "type-1788",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1785", "type-1786" ],
+   "template_args" : [ "type-1789", "type-1790" ],
    "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",
+   "referenced_type" : "type-1765",
+   "self_type" : "type-1765",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1762", "type-1763" ],
+   "template_args" : [ "type-1766", "type-1767" ],
    "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",
+   "referenced_type" : "type-1785",
+   "self_type" : "type-1785",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1782", "type-1783" ],
+   "template_args" : [ "type-1786", "type-1787" ],
    "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",
+   "referenced_type" : "type-1778",
+   "self_type" : "type-1778",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1775", "type-1776" ],
+   "template_args" : [ "type-1779", "type-1780" ],
    "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",
+   "referenced_type" : "type-1762",
+   "self_type" : "type-1762",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1759", "type-1760" ],
+   "template_args" : [ "type-1763", "type-1764" ],
    "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",
+   "referenced_type" : "type-1729",
+   "self_type" : "type-1729",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1726", "type-1727" ],
+   "template_args" : [ "type-1730", "type-1731" ],
    "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",
+   "referenced_type" : "type-1795",
+   "self_type" : "type-1795",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1792", "type-1793" ],
+   "template_args" : [ "type-1796", "type-1797" ],
    "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",
+   "referenced_type" : "type-1801",
+   "self_type" : "type-1801",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1798", "type-1799" ],
+   "template_args" : [ "type-1802", "type-1803" ],
    "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",
+   "referenced_type" : "type-1759",
+   "self_type" : "type-1759",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1755", "type-1756" ],
+   "template_args" : [ "type-1760", "type-1761" ],
    "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",
+   "referenced_type" : "type-1749",
+   "self_type" : "type-1749",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1746", "type-1747" ],
+   "template_args" : [ "type-1750", "type-1751" ],
    "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",
+   "referenced_type" : "type-1742",
+   "self_type" : "type-1742",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1739", "type-1740" ],
+   "template_args" : [ "type-1743", "type-1744" ],
    "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",
+   "referenced_type" : "type-1768",
+   "self_type" : "type-1768",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1765", "type-1766" ],
+   "template_args" : [ "type-1769", "type-1770" ],
    "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",
+   "referenced_type" : "type-1732",
+   "self_type" : "type-1732",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1729", "type-1730" ],
+   "template_args" : [ "type-1733", "type-1734" ],
    "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",
+   "referenced_type" : "type-1752",
+   "self_type" : "type-1752",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1749", "type-1750" ],
+   "template_args" : [ "type-1753", "type-1754" ],
    "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",
+   "referenced_type" : "type-1858",
+   "self_type" : "type-1858",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1854" ],
+   "template_args" : [ "type-1859" ],
    "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",
+   "referenced_type" : "type-1889",
+   "self_type" : "type-1889",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1886" ],
+   "template_args" : [ "type-1890" ],
    "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",
+   "referenced_type" : "type-1884",
+   "self_type" : "type-1884",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1880" ],
+   "template_args" : [ "type-1885" ],
    "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",
+   "referenced_type" : "type-1882",
+   "self_type" : "type-1882",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-768" ],
@@ -56134,8 +56229,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<bool &>",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<bool &>",
-   "referenced_type" : "type-1871",
-   "self_type" : "type-1871",
+   "referenced_type" : "type-1875",
+   "self_type" : "type-1875",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-767" ],
@@ -56145,41 +56240,41 @@
    "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",
+   "referenced_type" : "type-1879",
+   "self_type" : "type-1879",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1876" ],
+   "template_args" : [ "type-1880" ],
    "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",
+   "referenced_type" : "type-1866",
+   "self_type" : "type-1866",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1863" ],
+   "template_args" : [ "type-1867" ],
    "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",
+   "referenced_type" : "type-1864",
+   "self_type" : "type-1864",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1861" ],
+   "template_args" : [ "type-1865" ],
    "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",
+   "referenced_type" : "type-1874",
+   "self_type" : "type-1874",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-945" ],
@@ -56189,8 +56284,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int &>",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int &>",
-   "referenced_type" : "type-1858",
-   "self_type" : "type-1858",
+   "referenced_type" : "type-1862",
+   "self_type" : "type-1862",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-200" ],
@@ -56200,41 +56295,41 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int *&>",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int *&>",
-   "referenced_type" : "type-1859",
-   "self_type" : "type-1859",
+   "referenced_type" : "type-1863",
+   "self_type" : "type-1863",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1509" ],
+   "template_args" : [ "type-1512" ],
    "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",
+   "referenced_type" : "type-1860",
+   "self_type" : "type-1860",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1430" ],
+   "template_args" : [ "type-1433" ],
    "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",
+   "referenced_type" : "type-1887",
+   "self_type" : "type-1887",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1884" ],
+   "template_args" : [ "type-1888" ],
    "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",
+   "referenced_type" : "type-1878",
+   "self_type" : "type-1878",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-764" ],
@@ -56244,8 +56339,8 @@
    "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",
+   "referenced_type" : "type-1861",
+   "self_type" : "type-1861",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-10" ],
@@ -56255,11 +56350,11 @@
    "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",
+   "referenced_type" : "type-1876",
+   "self_type" : "type-1876",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1873" ],
+   "template_args" : [ "type-1877" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRPmEE"
   },
   {
@@ -56267,7 +56362,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1495"
+     "referenced_type" : "type-1499"
     }
    ],
    "fields" :
@@ -56276,17 +56371,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 384,
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "linker_set_key" : "android::SafeBpInterface<android::IConsumerListener>",
    "name" : "android::SafeBpInterface<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1538",
-   "self_type" : "type-1538",
+   "referenced_type" : "type-1542",
+   "self_type" : "type-1542",
    "size" : 72,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1539" ],
+   "template_args" : [ "type-1543" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_17IConsumerListenerEEE",
    "vtable_components" :
    [
@@ -56442,7 +56537,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1625"
+     "referenced_type" : "type-1629"
     }
    ],
    "fields" :
@@ -56451,17 +56546,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 320,
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "linker_set_key" : "android::SafeBpInterface<android::IGraphicBufferConsumer>",
    "name" : "android::SafeBpInterface<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1718",
-   "self_type" : "type-1718",
+   "referenced_type" : "type-1722",
+   "self_type" : "type-1722",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1719" ],
+   "template_args" : [ "type-1723" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEEE",
    "vtable_components" :
    [
@@ -56652,198 +56747,198 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)()>",
    "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)()>",
-   "referenced_type" : "type-1694",
-   "self_type" : "type-1694",
+   "referenced_type" : "type-1698",
+   "self_type" : "type-1698",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1695" ],
+   "template_args" : [ "type-1699" ],
    "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",
+   "referenced_type" : "type-1687",
+   "self_type" : "type-1687",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1684" ],
+   "template_args" : [ "type-1688" ],
    "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",
+   "referenced_type" : "type-1707",
+   "self_type" : "type-1707",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1704" ],
+   "template_args" : [ "type-1708" ],
    "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",
+   "referenced_type" : "type-1711",
+   "self_type" : "type-1711",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1708" ],
+   "template_args" : [ "type-1712" ],
    "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",
+   "referenced_type" : "type-1718",
+   "self_type" : "type-1718",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1715" ],
+   "template_args" : [ "type-1719" ],
    "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",
+   "referenced_type" : "type-1705",
+   "self_type" : "type-1705",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1702" ],
+   "template_args" : [ "type-1706" ],
    "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",
+   "referenced_type" : "type-1720",
+   "self_type" : "type-1720",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1717" ],
+   "template_args" : [ "type-1721" ],
    "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",
+   "referenced_type" : "type-1696",
+   "self_type" : "type-1696",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1693" ],
+   "template_args" : [ "type-1697" ],
    "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",
+   "referenced_type" : "type-1691",
+   "self_type" : "type-1691",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1688" ],
+   "template_args" : [ "type-1692" ],
    "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",
+   "referenced_type" : "type-1689",
+   "self_type" : "type-1689",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1686" ],
+   "template_args" : [ "type-1690" ],
    "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",
+   "referenced_type" : "type-1694",
+   "self_type" : "type-1694",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1691" ],
+   "template_args" : [ "type-1695" ],
    "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",
+   "referenced_type" : "type-1716",
+   "self_type" : "type-1716",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1713" ],
+   "template_args" : [ "type-1717" ],
    "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",
+   "referenced_type" : "type-1713",
+   "self_type" : "type-1713",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1710" ],
+   "template_args" : [ "type-1714" ],
    "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",
+   "referenced_type" : "type-1702",
+   "self_type" : "type-1702",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1699" ],
+   "template_args" : [ "type-1703" ],
    "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",
+   "referenced_type" : "type-1700",
+   "self_type" : "type-1700",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1697" ],
+   "template_args" : [ "type-1701" ],
    "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",
+   "referenced_type" : "type-1709",
+   "self_type" : "type-1709",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1706" ],
+   "template_args" : [ "type-1710" ],
    "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",
+   "referenced_type" : "type-1537",
+   "self_type" : "type-1537",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1535" ],
+   "template_args" : [ "type-1538" ],
    "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",
+   "referenced_type" : "type-1539",
+   "self_type" : "type-1539",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1537" ],
+   "template_args" : [ "type-1540" ],
    "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_16ConsumerListenerEFvRKNS_10BufferItemEEEE"
   },
   {
@@ -56853,14 +56948,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "linker_set_key" : "android::SafeInterface::ParcelHandler",
    "name" : "android::SafeInterface::ParcelHandler",
    "record_kind" : "class",
-   "referenced_type" : "type-1236",
-   "self_type" : "type-1236",
+   "referenced_type" : "type-1239",
+   "self_type" : "type-1239",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android13SafeInterface13ParcelHandlerE"
@@ -56869,8 +56964,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParcelHandler::HandleInt<false, 4, unsigned int>",
    "name" : "android::SafeInterface::ParcelHandler::HandleInt<false, 4, unsigned int>",
-   "referenced_type" : "type-1681",
-   "self_type" : "type-1681",
+   "referenced_type" : "type-1685",
+   "self_type" : "type-1685",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-2" ],
@@ -56880,8 +56975,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParcelHandler::HandleInt<false, 8, unsigned long>",
    "name" : "android::SafeInterface::ParcelHandler::HandleInt<false, 8, unsigned long>",
-   "referenced_type" : "type-1677",
-   "self_type" : "type-1677",
+   "referenced_type" : "type-1682",
+   "self_type" : "type-1682",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-11" ],
@@ -56891,8 +56986,8 @@
    "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",
+   "referenced_type" : "type-1684",
+   "self_type" : "type-1684",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-4" ],
@@ -56902,8 +56997,8 @@
    "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",
+   "referenced_type" : "type-1679",
+   "self_type" : "type-1679",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-32" ],
@@ -56933,11 +57028,11 @@
    "linker_set_key" : "android::Singleton<android::ComposerService>",
    "name" : "android::Singleton<android::ComposerService>",
    "record_kind" : "class",
-   "referenced_type" : "type-1090",
-   "self_type" : "type-1090",
+   "referenced_type" : "type-1093",
+   "self_type" : "type-1093",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-1091" ],
+   "template_args" : [ "type-1094" ],
    "unique_id" : "_ZTSN7android9SingletonINS_15ComposerServiceEEE"
   },
   {
@@ -56964,11 +57059,11 @@
    "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",
+   "referenced_type" : "type-1204",
+   "self_type" : "type-1204",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-1202" ],
+   "template_args" : [ "type-1205" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEEE",
    "vtable_components" :
    [
@@ -57022,11 +57117,11 @@
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
    "name" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-1355",
-   "self_type" : "type-1355",
+   "referenced_type" : "type-1358",
+   "self_type" : "type-1358",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-1356" ],
+   "template_args" : [ "type-1359" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
    "vtable_components" :
    [
@@ -57316,7 +57411,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -57326,13 +57421,13 @@
     {
      "field_name" : "bStoreMetaData",
      "field_offset" : 96,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "android::StoreMetaDataInBuffersParams",
    "name" : "android::StoreMetaDataInBuffersParams",
-   "referenced_type" : "type-2398",
-   "self_type" : "type-2398",
+   "referenced_type" : "type-2401",
+   "self_type" : "type-2401",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android28StoreMetaDataInBuffersParamsE"
@@ -57344,14 +57439,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-1241"
+     "referenced_type" : "type-1244"
     }
    ],
    "linker_set_key" : "android::String16",
    "name" : "android::String16",
    "record_kind" : "class",
-   "referenced_type" : "type-1240",
-   "self_type" : "type-1240",
+   "referenced_type" : "type-1243",
+   "self_type" : "type-1243",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "unique_id" : "_ZTSN7android8String16E"
@@ -57540,7 +57635,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -57555,18 +57650,18 @@
     {
      "field_name" : "bufferHeader",
      "field_offset" : 192,
-     "referenced_type" : "type-2378"
+     "referenced_type" : "type-2381"
     },
     {
      "field_name" : "nativeBuffer",
      "field_offset" : 256,
-     "referenced_type" : "type-2410"
+     "referenced_type" : "type-2413"
     }
    ],
    "linker_set_key" : "android::UseAndroidNativeBufferParams",
    "name" : "android::UseAndroidNativeBufferParams",
-   "referenced_type" : "type-2409",
-   "self_type" : "type-2409",
+   "referenced_type" : "type-2412",
+   "self_type" : "type-2412",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android28UseAndroidNativeBufferParamsE"
@@ -57583,11 +57678,11 @@
    "linker_set_key" : "android::Vector<android::BBinder *>",
    "name" : "android::Vector<android::BBinder *>",
    "record_kind" : "class",
-   "referenced_type" : "type-1205",
-   "self_type" : "type-1205",
+   "referenced_type" : "type-1208",
+   "self_type" : "type-1208",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-1206" ],
+   "template_args" : [ "type-1209" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7BBinderEEE",
    "vtable_components" :
    [
@@ -57693,11 +57788,11 @@
    "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",
+   "referenced_type" : "type-1206",
+   "self_type" : "type-1206",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-1204" ],
+   "template_args" : [ "type-1207" ],
    "unique_id" : "_ZTSN7android6VectorINS_12ProcessState12handle_entryEEE",
    "vtable_components" :
    [
@@ -57748,11 +57843,11 @@
    "linker_set_key" : "android::Vector<android::Rect>",
    "name" : "android::Vector<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-2679",
-   "self_type" : "type-2679",
+   "referenced_type" : "type-2682",
+   "self_type" : "type-2682",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-2680" ],
+   "template_args" : [ "type-2683" ],
    "unique_id" : "_ZTSN7android6VectorINS_4RectEEE",
    "vtable_components" :
    [
@@ -57803,8 +57898,8 @@
    "linker_set_key" : "android::Vector<android::RefBase *>",
    "name" : "android::Vector<android::RefBase *>",
    "record_kind" : "class",
-   "referenced_type" : "type-1208",
-   "self_type" : "type-1208",
+   "referenced_type" : "type-1213",
+   "self_type" : "type-1213",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-270" ],
@@ -57858,8 +57953,8 @@
    "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",
+   "referenced_type" : "type-1212",
+   "self_type" : "type-1212",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-58" ],
@@ -57913,11 +58008,11 @@
    "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",
+   "referenced_type" : "type-1364",
+   "self_type" : "type-1364",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-1362" ],
+   "template_args" : [ "type-1365" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_8hardware9BHwBinderEEE",
    "vtable_components" :
    [
@@ -57968,11 +58063,11 @@
    "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "record_kind" : "class",
-   "referenced_type" : "type-1357",
-   "self_type" : "type-1357",
+   "referenced_type" : "type-1360",
+   "self_type" : "type-1360",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-1358" ],
+   "template_args" : [ "type-1361" ],
    "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
    "vtable_components" :
    [
@@ -58023,8 +58118,8 @@
    "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",
+   "referenced_type" : "type-1229",
+   "self_type" : "type-1229",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-733" ],
@@ -58078,8 +58173,8 @@
    "linker_set_key" : "android::Vector<int>",
    "name" : "android::Vector<int>",
    "record_kind" : "class",
-   "referenced_type" : "type-2688",
-   "self_type" : "type-2688",
+   "referenced_type" : "type-2691",
+   "self_type" : "type-2691",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-4" ],
@@ -58133,8 +58228,8 @@
    "linker_set_key" : "android::Vector<long>",
    "name" : "android::Vector<long>",
    "record_kind" : "class",
-   "referenced_type" : "type-1082",
-   "self_type" : "type-1082",
+   "referenced_type" : "type-1085",
+   "self_type" : "type-1085",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-32" ],
@@ -58261,13 +58356,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2399"
+     "referenced_type" : "type-2402"
     }
    ],
    "linker_set_key" : "android::VideoDecoderOutputMetaData",
    "name" : "android::VideoDecoderOutputMetaData",
-   "referenced_type" : "type-2401",
-   "self_type" : "type-2401",
+   "referenced_type" : "type-2404",
+   "self_type" : "type-2404",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26VideoDecoderOutputMetaDataE"
@@ -58278,7 +58373,7 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-1235"
+     "referenced_type" : "type-1238"
     },
     {
      "field_name" : "pHandle",
@@ -58288,8 +58383,8 @@
    ],
    "linker_set_key" : "android::VideoGrallocMetadata",
    "name" : "android::VideoGrallocMetadata",
-   "referenced_type" : "type-2399",
-   "self_type" : "type-2399",
+   "referenced_type" : "type-2402",
+   "self_type" : "type-2402",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android20VideoGrallocMetadataE"
@@ -58300,7 +58395,7 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-1235"
+     "referenced_type" : "type-1238"
     },
     {
      "field_name" : "pHandle",
@@ -58310,8 +58405,8 @@
    ],
    "linker_set_key" : "android::VideoNativeHandleMetadata",
    "name" : "android::VideoNativeHandleMetadata",
-   "referenced_type" : "type-2407",
-   "self_type" : "type-2407",
+   "referenced_type" : "type-2410",
+   "self_type" : "type-2410",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android25VideoNativeHandleMetadataE"
@@ -58322,12 +58417,12 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-1235"
+     "referenced_type" : "type-1238"
     },
     {
      "field_name" : "pBuffer",
      "field_offset" : 64,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2406"
     },
     {
      "field_name" : "nFenceFd",
@@ -58337,8 +58432,8 @@
    ],
    "linker_set_key" : "android::VideoNativeMetadata",
    "name" : "android::VideoNativeMetadata",
-   "referenced_type" : "type-2402",
-   "self_type" : "type-2402",
+   "referenced_type" : "type-2405",
+   "self_type" : "type-2405",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android19VideoNativeMetadataE"
@@ -58348,14 +58443,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2353"
+     "referenced_type" : "type-2356"
     }
    ],
    "linker_set_key" : "android::VirtualLightRefBase",
    "name" : "android::VirtualLightRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-2355",
-   "self_type" : "type-2355",
+   "referenced_type" : "type-2358",
+   "self_type" : "type-2358",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
    "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
@@ -58382,8 +58477,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::_AUnion_impl",
    "name" : "android::_AUnion_impl",
-   "referenced_type" : "type-1039",
-   "self_type" : "type-1039",
+   "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"
@@ -58402,30 +58497,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::aggregate_traits<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-2608",
-   "self_type" : "type-2608",
+   "referenced_type" : "type-2611",
+   "self_type" : "type-2611",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-4", "type-2609" ],
+   "template_args" : [ "type-4", "type-2612" ],
    "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-2605",
-   "self_type" : "type-2605",
+   "referenced_type" : "type-2608",
+   "self_type" : "type-2608",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-4", "type-2606" ],
+   "template_args" : [ "type-4", "type-2609" ],
    "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-2604",
-   "self_type" : "type-2604",
+   "referenced_type" : "type-2607",
+   "self_type" : "type-2607",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2", "type-2" ],
@@ -58484,13 +58579,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-980"
+     "referenced_type" : "type-978"
     }
    ],
    "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-979",
-   "self_type" : "type-979",
+   "referenced_type" : "type-977",
+   "self_type" : "type-977",
    "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"
@@ -58627,8 +58722,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::base::DefaultCloser",
    "name" : "android::base::DefaultCloser",
-   "referenced_type" : "type-2525",
-   "self_type" : "type-2525",
+   "referenced_type" : "type-2528",
+   "self_type" : "type-2528",
    "size" : 1,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "unique_id" : "_ZTSN7android4base13DefaultCloserE"
@@ -58649,8 +58744,8 @@
    ],
    "linker_set_key" : "android::base::EagerEvaluator<char *, char *>",
    "name" : "android::base::EagerEvaluator<char *, char *>",
-   "referenced_type" : "type-4702",
-   "self_type" : "type-4702",
+   "referenced_type" : "type-4709",
+   "self_type" : "type-4709",
    "size" : 16,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-254", "type-254" ],
@@ -58672,8 +58767,8 @@
    ],
    "linker_set_key" : "android::base::EagerEvaluator<char *, const char *>",
    "name" : "android::base::EagerEvaluator<char *, const char *>",
-   "referenced_type" : "type-4698",
-   "self_type" : "type-4698",
+   "referenced_type" : "type-4705",
+   "self_type" : "type-4705",
    "size" : 16,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-254", "type-124" ],
@@ -58695,8 +58790,8 @@
    ],
    "linker_set_key" : "android::base::EagerEvaluator<const char *, char *>",
    "name" : "android::base::EagerEvaluator<const char *, char *>",
-   "referenced_type" : "type-4685",
-   "self_type" : "type-4685",
+   "referenced_type" : "type-4692",
+   "self_type" : "type-4692",
    "size" : 16,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-124", "type-254" ],
@@ -58718,8 +58813,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-4669",
+   "referenced_type" : "type-4676",
+   "self_type" : "type-4676",
    "size" : 16,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-124", "type-124" ],
@@ -58741,11 +58836,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-4726",
-   "self_type" : "type-4726",
+   "referenced_type" : "type-4732",
+   "self_type" : "type-4732",
    "size" : 16,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-4727", "type-4727" ],
+   "template_args" : [ "type-4733", "type-4733" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaS3_EE"
   },
   {
@@ -58764,11 +58859,11 @@
    ],
    "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",
+   "referenced_type" : "type-4739",
+   "self_type" : "type-4739",
    "size" : 16,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-4727", "type-4734" ],
+   "template_args" : [ "type-4733", "type-4740" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaPaEE"
   },
   {
@@ -58787,8 +58882,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-4706",
+   "referenced_type" : "type-4713",
+   "self_type" : "type-4713",
    "size" : 16,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-99", "type-99" ],
@@ -58810,8 +58905,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-4710",
+   "referenced_type" : "type-4716",
+   "self_type" : "type-4716",
    "size" : 16,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-99", "type-91" ],
@@ -58833,11 +58928,11 @@
    ],
    "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",
+   "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-4727" ],
+   "template_args" : [ "type-4740", "type-4733" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaPKaEE"
   },
   {
@@ -58856,11 +58951,11 @@
    ],
    "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",
+   "referenced_type" : "type-4751",
+   "self_type" : "type-4751",
    "size" : 16,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-4734", "type-4734" ],
+   "template_args" : [ "type-4740", "type-4740" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaS2_EE"
   },
   {
@@ -58879,8 +58974,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-4713",
+   "referenced_type" : "type-4720",
+   "self_type" : "type-4720",
    "size" : 16,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-91", "type-99" ],
@@ -58902,8 +58997,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-4719",
+   "referenced_type" : "type-4725",
+   "self_type" : "type-4725",
    "size" : 16,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-91", "type-91" ],
@@ -58922,8 +59017,8 @@
    "linker_set_key" : "android::base::ErrnoRestorer",
    "name" : "android::base::ErrnoRestorer",
    "record_kind" : "class",
-   "referenced_type" : "type-4660",
-   "self_type" : "type-4660",
+   "referenced_type" : "type-4667",
+   "self_type" : "type-4667",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base13ErrnoRestorerE"
@@ -58935,14 +59030,14 @@
     {
      "access" : "private",
      "field_name" : "data_",
-     "referenced_type" : "type-4755"
+     "referenced_type" : "type-4761"
     }
    ],
    "linker_set_key" : "android::base::LogMessage",
    "name" : "android::base::LogMessage",
    "record_kind" : "class",
-   "referenced_type" : "type-4754",
-   "self_type" : "type-4754",
+   "referenced_type" : "type-4760",
+   "self_type" : "type-4760",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base10LogMessageE"
@@ -58954,14 +59049,14 @@
     {
      "access" : "private",
      "field_name" : "default_log_id_",
-     "referenced_type" : "type-4707"
+     "referenced_type" : "type-4714"
     }
    ],
    "linker_set_key" : "android::base::LogdLogger",
    "name" : "android::base::LogdLogger",
    "record_kind" : "class",
-   "referenced_type" : "type-4725",
-   "self_type" : "type-4725",
+   "referenced_type" : "type-4731",
+   "self_type" : "type-4731",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base10LogdLoggerE"
@@ -58973,14 +59068,14 @@
     {
      "access" : "private",
      "field_name" : "old_",
-     "referenced_type" : "type-4657"
+     "referenced_type" : "type-4664"
     }
    ],
    "linker_set_key" : "android::base::ScopedLogSeverity",
    "name" : "android::base::ScopedLogSeverity",
    "record_kind" : "class",
-   "referenced_type" : "type-4759",
-   "self_type" : "type-4759",
+   "referenced_type" : "type-4766",
+   "self_type" : "type-4766",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base17ScopedLogSeverityE"
@@ -58998,11 +59093,11 @@
    "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser>",
    "name" : "android::base::unique_fd_impl<android::base::DefaultCloser>",
    "record_kind" : "class",
-   "referenced_type" : "type-2555",
-   "self_type" : "type-2555",
+   "referenced_type" : "type-2558",
+   "self_type" : "type-2558",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h",
-   "template_args" : [ "type-2525" ],
+   "template_args" : [ "type-2528" ],
    "unique_id" : "_ZTSN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
   },
   {
@@ -59041,7 +59136,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1360"
+     "referenced_type" : "type-1363"
     }
    ],
    "fields" :
@@ -59062,7 +59157,7 @@
      "access" : "private",
      "field_name" : "mExtras",
      "field_offset" : 128,
-     "referenced_type" : "type-1364"
+     "referenced_type" : "type-1367"
     },
     {
      "access" : "private",
@@ -59074,8 +59169,8 @@
    "linker_set_key" : "android::hardware::BHwBinder",
    "name" : "android::hardware::BHwBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-1363",
-   "self_type" : "type-1363",
+   "referenced_type" : "type-1366",
+   "self_type" : "type-1366",
    "size" : 48,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware9BHwBinderE",
@@ -59191,7 +59286,7 @@
      "access" : "private",
      "field_name" : "mRemote",
      "field_offset" : 64,
-     "referenced_type" : "type-1373"
+     "referenced_type" : "type-1376"
     },
     {
      "access" : "private",
@@ -59203,14 +59298,14 @@
      "access" : "private",
      "field_name" : "mState",
      "field_offset" : 192,
-     "referenced_type" : "type-1374"
+     "referenced_type" : "type-1377"
     }
    ],
    "linker_set_key" : "android::hardware::BpHwRefBase",
    "name" : "android::hardware::BpHwRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-1372",
-   "self_type" : "type-1372",
+   "referenced_type" : "type-1375",
+   "self_type" : "type-1375",
    "size" : 48,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE",
@@ -59429,8 +59524,8 @@
    "linker_set_key" : "android::hardware::IBinder",
    "name" : "android::hardware::IBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-1360",
-   "self_type" : "type-1360",
+   "referenced_type" : "type-1363",
+   "self_type" : "type-1363",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinderE",
@@ -59546,8 +59641,8 @@
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient",
    "name" : "android::hardware::IBinder::DeathRecipient",
    "record_kind" : "class",
-   "referenced_type" : "type-1371",
-   "self_type" : "type-1371",
+   "referenced_type" : "type-1374",
+   "self_type" : "type-1374",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinder14DeathRecipientE",
@@ -59634,8 +59729,8 @@
    "linker_set_key" : "android::hardware::IInterface",
    "name" : "android::hardware::IInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-1377",
-   "self_type" : "type-1377",
+   "referenced_type" : "type-1380",
+   "self_type" : "type-1380",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
    "unique_id" : "_ZTSN7android8hardware10IInterfaceE",
@@ -59717,43 +59812,43 @@
     {
      "access" : "private",
      "field_name" : "mProcess",
-     "referenced_type" : "type-1394"
+     "referenced_type" : "type-1397"
     },
     {
      "access" : "private",
      "field_name" : "mPendingStrongDerefs",
      "field_offset" : 64,
-     "referenced_type" : "type-1361"
+     "referenced_type" : "type-1364"
     },
     {
      "access" : "private",
      "field_name" : "mPendingWeakDerefs",
      "field_offset" : 384,
-     "referenced_type" : "type-1207"
+     "referenced_type" : "type-1212"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteStrongDerefs",
      "field_offset" : 704,
-     "referenced_type" : "type-1208"
+     "referenced_type" : "type-1213"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteWeakDerefs",
      "field_offset" : 1024,
-     "referenced_type" : "type-1207"
+     "referenced_type" : "type-1212"
     },
     {
      "access" : "private",
      "field_name" : "mIn",
      "field_offset" : 1344,
-     "referenced_type" : "type-1378"
+     "referenced_type" : "type-1381"
     },
     {
      "access" : "private",
      "field_name" : "mOut",
      "field_offset" : 2432,
-     "referenced_type" : "type-1378"
+     "referenced_type" : "type-1381"
     },
     {
      "access" : "private",
@@ -59795,7 +59890,7 @@
      "access" : "private",
      "field_name" : "mContextObject",
      "field_offset" : 3776,
-     "referenced_type" : "type-1400"
+     "referenced_type" : "type-1403"
     },
     {
      "access" : "private",
@@ -59813,26 +59908,26 @@
      "access" : "private",
      "field_name" : "mPostCommandTasks",
      "field_offset" : 3904,
-     "referenced_type" : "type-1401"
+     "referenced_type" : "type-1404"
     },
     {
      "access" : "private",
      "field_name" : "mIPCThreadStateBase",
      "field_offset" : 4096,
-     "referenced_type" : "type-1369"
+     "referenced_type" : "type-1372"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 4160,
-     "referenced_type" : "type-1392"
+     "referenced_type" : "type-1395"
     }
    ],
    "linker_set_key" : "android::hardware::IPCThreadState",
    "name" : "android::hardware::IPCThreadState",
    "record_kind" : "class",
-   "referenced_type" : "type-1393",
-   "self_type" : "type-1393",
+   "referenced_type" : "type-1396",
+   "self_type" : "type-1396",
    "size" : 528,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h",
    "unique_id" : "_ZTSN7android8hardware14IPCThreadStateE"
@@ -59850,7 +59945,7 @@
      "access" : "private",
      "field_name" : "mBufCache",
      "field_offset" : 64,
-     "referenced_type" : "type-1379"
+     "referenced_type" : "type-1382"
     },
     {
      "access" : "private",
@@ -59934,7 +60029,7 @@
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 960,
-     "referenced_type" : "type-1380"
+     "referenced_type" : "type-1383"
     },
     {
      "access" : "private",
@@ -59946,8 +60041,8 @@
    "linker_set_key" : "android::hardware::Parcel",
    "name" : "android::hardware::Parcel",
    "record_kind" : "class",
-   "referenced_type" : "type-1378",
-   "self_type" : "type-1378",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1381",
    "size" : 136,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6ParcelE"
@@ -59974,8 +60069,8 @@
    ],
    "linker_set_key" : "android::hardware::Parcel::BufferInfo",
    "name" : "android::hardware::Parcel::BufferInfo",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1383",
+   "referenced_type" : "type-1386",
+   "self_type" : "type-1386",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE"
@@ -60007,13 +60102,13 @@
      "access" : "private",
      "field_name" : "mThreadCountLock",
      "field_offset" : 192,
-     "referenced_type" : "type-1398"
+     "referenced_type" : "type-1401"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountDecrement",
      "field_offset" : 512,
-     "referenced_type" : "type-1399"
+     "referenced_type" : "type-1402"
     },
     {
      "access" : "private",
@@ -60043,7 +60138,7 @@
      "access" : "private",
      "field_name" : "mHandleToObject",
      "field_offset" : 1408,
-     "referenced_type" : "type-1357"
+     "referenced_type" : "type-1360"
     },
     {
      "access" : "private",
@@ -60055,7 +60150,7 @@
      "access" : "private",
      "field_name" : "mBinderContextCheckFunc",
      "field_offset" : 1792,
-     "referenced_type" : "type-1391"
+     "referenced_type" : "type-1394"
     },
     {
      "access" : "private",
@@ -60067,7 +60162,7 @@
      "access" : "private",
      "field_name" : "mContexts",
      "field_offset" : 1920,
-     "referenced_type" : "type-1367"
+     "referenced_type" : "type-1370"
     },
     {
      "access" : "private",
@@ -60091,7 +60186,7 @@
      "access" : "private",
      "field_name" : "mThreadPoolSeq",
      "field_offset" : 2336,
-     "referenced_type" : "type-1255"
+     "referenced_type" : "type-1258"
     },
     {
      "access" : "private",
@@ -60103,14 +60198,14 @@
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 2432,
-     "referenced_type" : "type-1392"
+     "referenced_type" : "type-1395"
     }
    ],
    "linker_set_key" : "android::hardware::ProcessState",
    "name" : "android::hardware::ProcessState",
    "record_kind" : "class",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1397",
+   "referenced_type" : "type-1400",
+   "self_type" : "type-1400",
    "size" : 328,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessStateE",
@@ -60188,7 +60283,7 @@
    [
     {
      "field_name" : "binder",
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1362"
     },
     {
      "field_name" : "refs",
@@ -60198,8 +60293,8 @@
    ],
    "linker_set_key" : "android::hardware::ProcessState::handle_entry",
    "name" : "android::hardware::ProcessState::handle_entry",
-   "referenced_type" : "type-1358",
-   "self_type" : "type-1358",
+   "referenced_type" : "type-1361",
+   "self_type" : "type-1361",
    "size" : 16,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE"
@@ -60224,8 +60319,8 @@
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::bufferqueue::V2_0::Status>",
    "name" : "android::hardware::Return<android::hardware::graphics::bufferqueue::V2_0::Status>",
    "record_kind" : "class",
-   "referenced_type" : "type-7522",
-   "self_type" : "type-7522",
+   "referenced_type" : "type-7547",
+   "self_type" : "type-7547",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "template_args" : [ "type-607" ],
@@ -60245,17 +60340,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 320,
-     "referenced_type" : "type-2465"
+     "referenced_type" : "type-2468"
     }
    ],
    "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",
+   "referenced_type" : "type-4368",
+   "self_type" : "type-4368",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-2465" ],
+   "template_args" : [ "type-2468" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducerEEEEE"
   },
   {
@@ -60272,17 +60367,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 320,
-     "referenced_type" : "type-2456"
+     "referenced_type" : "type-2459"
     }
    ],
    "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",
+   "referenced_type" : "type-4497",
+   "self_type" : "type-4497",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-2456" ],
+   "template_args" : [ "type-2459" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V1_017IProducerListenerEEEEE"
   },
   {
@@ -60299,17 +60394,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 320,
-     "referenced_type" : "type-2478"
+     "referenced_type" : "type-2481"
     }
    ],
    "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",
+   "referenced_type" : "type-4374",
+   "self_type" : "type-4374",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-2478" ],
+   "template_args" : [ "type-2481" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V2_022IGraphicBufferProducerEEEEE"
   },
   {
@@ -60326,17 +60421,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 320,
-     "referenced_type" : "type-2472"
+     "referenced_type" : "type-2475"
     }
    ],
    "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",
+   "referenced_type" : "type-4503",
+   "self_type" : "type-4503",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-2472" ],
+   "template_args" : [ "type-2475" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V2_017IProducerListenerEEEEE"
   },
   {
@@ -60359,8 +60454,8 @@
    "linker_set_key" : "android::hardware::Return<bool>",
    "name" : "android::hardware::Return<bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-4356",
-   "self_type" : "type-4356",
+   "referenced_type" : "type-4362",
+   "self_type" : "type-4362",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "template_args" : [ "type-95" ],
@@ -60413,8 +60508,8 @@
    "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",
+   "referenced_type" : "type-7551",
+   "self_type" : "type-7551",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "template_args" : [ "type-11" ],
@@ -61485,8 +61580,8 @@
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener",
-   "referenced_type" : "type-2458",
-   "self_type" : "type-2458",
+   "referenced_type" : "type-2461",
+   "self_type" : "type-2461",
    "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",
@@ -64063,8 +64158,8 @@
    "linker_set_key" : "android::sp<android::AHandler>",
    "name" : "android::sp<android::AHandler>",
    "record_kind" : "class",
-   "referenced_type" : "type-1189",
-   "self_type" : "type-1189",
+   "referenced_type" : "type-1192",
+   "self_type" : "type-1192",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-264" ],
@@ -64157,17 +64252,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4232"
+     "referenced_type" : "type-4238"
     }
    ],
    "linker_set_key" : "android::sp<android::BpGraphicBufferProducer>",
    "name" : "android::sp<android::BpGraphicBufferProducer>",
    "record_kind" : "class",
-   "referenced_type" : "type-4231",
-   "self_type" : "type-4231",
+   "referenced_type" : "type-4237",
+   "self_type" : "type-4237",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4234" ],
+   "template_args" : [ "type-4240" ],
    "unique_id" : "_ZTSN7android2spINS_23BpGraphicBufferProducerEEE"
   },
   {
@@ -64177,17 +64272,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4454"
+     "referenced_type" : "type-4461"
     }
    ],
    "linker_set_key" : "android::sp<android::BpProducerListener>",
    "name" : "android::sp<android::BpProducerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-4457",
-   "self_type" : "type-4457",
+   "referenced_type" : "type-4464",
+   "self_type" : "type-4464",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4458" ],
+   "template_args" : [ "type-4465" ],
    "unique_id" : "_ZTSN7android2spINS_18BpProducerListenerEEE"
   },
   {
@@ -64257,17 +64352,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1866"
+     "referenced_type" : "type-1870"
     }
    ],
    "linker_set_key" : "android::sp<android::Fence>",
    "name" : "android::sp<android::Fence>",
    "record_kind" : "class",
-   "referenced_type" : "type-1865",
-   "self_type" : "type-1865",
+   "referenced_type" : "type-1869",
+   "self_type" : "type-1869",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1868" ],
+   "template_args" : [ "type-1872" ],
    "unique_id" : "_ZTSN7android2spINS_5FenceEEE"
   },
   {
@@ -64297,17 +64392,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1174"
+     "referenced_type" : "type-1177"
     }
    ],
    "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",
+   "referenced_type" : "type-1176",
+   "self_type" : "type-1176",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1176" ],
+   "template_args" : [ "type-1179" ],
    "unique_id" : "_ZTSN7android2spINS_10GLConsumer8EglImageEEE"
   },
   {
@@ -64363,8 +64458,8 @@
    "linker_set_key" : "android::sp<android::GraphicBufferSource>",
    "name" : "android::sp<android::GraphicBufferSource>",
    "record_kind" : "class",
-   "referenced_type" : "type-2544",
-   "self_type" : "type-2544",
+   "referenced_type" : "type-2547",
+   "self_type" : "type-2547",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-566" ],
@@ -64377,17 +64472,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4259"
+     "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-4262",
-   "self_type" : "type-4262",
+   "referenced_type" : "type-4268",
+   "self_type" : "type-4268",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4263" ],
+   "template_args" : [ "type-4269" ],
    "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE8ObituaryEEE"
   },
   {
@@ -64397,17 +64492,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4268"
+     "referenced_type" : "type-4274"
     }
    ],
    "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",
+   "referenced_type" : "type-4277",
+   "self_type" : "type-4277",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4272" ],
+   "template_args" : [ "type-4278" ],
    "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE8ObituaryEEE"
   },
   {
@@ -64417,17 +64512,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4831"
+     "referenced_type" : "type-4839"
     }
    ],
    "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",
+   "referenced_type" : "type-4838",
+   "self_type" : "type-4838",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4833" ],
+   "template_args" : [ "type-4841" ],
    "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE8ObituaryEEE"
   },
   {
@@ -64437,17 +64532,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-5112"
+     "referenced_type" : "type-5128"
     }
    ],
    "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",
+   "referenced_type" : "type-5127",
+   "self_type" : "type-5127",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-5114" ],
+   "template_args" : [ "type-5130" ],
    "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE8ObituaryEEE"
   },
   {
@@ -64597,17 +64692,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1050"
+     "referenced_type" : "type-1053"
     }
    ],
    "linker_set_key" : "android::sp<android::ISurfaceComposer>",
    "name" : "android::sp<android::ISurfaceComposer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1049",
-   "self_type" : "type-1049",
+   "referenced_type" : "type-1052",
+   "self_type" : "type-1052",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1052" ],
+   "template_args" : [ "type-1055" ],
    "unique_id" : "_ZTSN7android2spINS_16ISurfaceComposerEEE"
   },
   {
@@ -64617,17 +64712,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1042"
+     "referenced_type" : "type-1046"
     }
    ],
    "linker_set_key" : "android::sp<android::ITransactionCompletedListener>",
    "name" : "android::sp<android::ITransactionCompletedListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1041",
-   "self_type" : "type-1041",
+   "referenced_type" : "type-1045",
+   "self_type" : "type-1045",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1044" ],
+   "template_args" : [ "type-1048" ],
    "unique_id" : "_ZTSN7android2spINS_29ITransactionCompletedListenerEEE"
   },
   {
@@ -64657,17 +64752,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1260"
+     "referenced_type" : "type-1263"
     }
    ],
    "linker_set_key" : "android::sp<android::ProcessState>",
    "name" : "android::sp<android::ProcessState>",
    "record_kind" : "class",
-   "referenced_type" : "type-1259",
-   "self_type" : "type-1259",
+   "referenced_type" : "type-1262",
+   "self_type" : "type-1262",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1261" ],
+   "template_args" : [ "type-1264" ],
    "unique_id" : "_ZTSN7android2spINS_12ProcessStateEEE"
   },
   {
@@ -64697,17 +64792,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1362"
+     "referenced_type" : "type-1365"
     }
    ],
    "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",
+   "referenced_type" : "type-1403",
+   "self_type" : "type-1403",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1363" ],
+   "template_args" : [ "type-1366" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
   },
   {
@@ -64717,17 +64812,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1362"
     }
    ],
    "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",
+   "referenced_type" : "type-1371",
+   "self_type" : "type-1371",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1360" ],
+   "template_args" : [ "type-1363" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
   },
   {
@@ -64737,17 +64832,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1396"
+     "referenced_type" : "type-1399"
     }
    ],
    "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",
+   "referenced_type" : "type-1398",
+   "self_type" : "type-1398",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1397" ],
+   "template_args" : [ "type-1400" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
   },
   {
@@ -64757,14 +64852,14 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2466"
+     "referenced_type" : "type-2469"
     }
    ],
    "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-2465",
-   "self_type" : "type-2465",
+   "referenced_type" : "type-2468",
+   "self_type" : "type-2468",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-595" ],
@@ -64777,17 +64872,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2457"
+     "referenced_type" : "type-2460"
     }
    ],
    "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-2456",
-   "self_type" : "type-2456",
+   "referenced_type" : "type-2459",
+   "self_type" : "type-2459",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-2458" ],
+   "template_args" : [ "type-2461" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerEEE"
   },
   {
@@ -64797,17 +64892,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4244"
+     "referenced_type" : "type-4250"
     }
    ],
    "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",
+   "referenced_type" : "type-4249",
+   "self_type" : "type-4249",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4246" ],
+   "template_args" : [ "type-4252" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerEEE"
   },
   {
@@ -64817,17 +64912,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4467"
+     "referenced_type" : "type-4473"
     }
    ],
    "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",
+   "referenced_type" : "type-4476",
+   "self_type" : "type-4476",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4471" ],
+   "template_args" : [ "type-4477" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerEEE"
   },
   {
@@ -64837,14 +64932,14 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2479"
+     "referenced_type" : "type-2482"
     }
    ],
    "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-2478",
-   "self_type" : "type-2478",
+   "referenced_type" : "type-2481",
+   "self_type" : "type-2481",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-677" ],
@@ -64857,14 +64952,14 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2473"
+     "referenced_type" : "type-2476"
     }
    ],
    "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-2472",
-   "self_type" : "type-2472",
+   "referenced_type" : "type-2475",
+   "self_type" : "type-2475",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-604" ],
@@ -64877,17 +64972,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4238"
+     "referenced_type" : "type-4244"
     }
    ],
    "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",
+   "referenced_type" : "type-4243",
+   "self_type" : "type-4243",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4240" ],
+   "template_args" : [ "type-4246" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerEEE"
   },
   {
@@ -64897,17 +64992,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4459"
+     "referenced_type" : "type-4466"
     }
    ],
    "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",
+   "referenced_type" : "type-4469",
+   "self_type" : "type-4469",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4464" ],
+   "template_args" : [ "type-4470" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerEEE"
   },
   {
@@ -64937,14 +65032,14 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2447"
+     "referenced_type" : "type-2450"
     }
    ],
    "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-2446",
-   "self_type" : "type-2446",
+   "referenced_type" : "type-2449",
+   "self_type" : "type-2449",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-531" ],
@@ -64957,14 +65052,14 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2454"
     }
    ],
    "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-2450",
-   "self_type" : "type-2450",
+   "referenced_type" : "type-2453",
+   "self_type" : "type-2453",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-534" ],
@@ -64977,36 +65072,36 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2519"
+     "referenced_type" : "type-2522"
     }
    ],
    "linker_set_key" : "android::sp<const android::AHandler>",
    "name" : "android::sp<const android::AHandler>",
    "record_kind" : "class",
-   "referenced_type" : "type-2518",
-   "self_type" : "type-2518",
+   "referenced_type" : "type-2521",
+   "self_type" : "type-2521",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-2520" ],
+   "template_args" : [ "type-2523" ],
    "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",
+   "referenced_type" : "type-1065",
+   "self_type" : "type-1065",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1063" ],
+   "template_args" : [ "type-1066" ],
    "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-2590",
-   "self_type" : "type-2590",
+   "referenced_type" : "type-2593",
+   "self_type" : "type-2593",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-164" ],
@@ -65016,8 +65111,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::trait_pointer<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-2587",
-   "self_type" : "type-2587",
+   "referenced_type" : "type-2590",
+   "self_type" : "type-2590",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-150" ],
@@ -65027,8 +65122,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::trait_pointer<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-2583",
-   "self_type" : "type-2583",
+   "referenced_type" : "type-2586",
+   "self_type" : "type-2586",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-146" ],
@@ -65038,8 +65133,8 @@
    "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",
+   "referenced_type" : "type-1186",
+   "self_type" : "type-1186",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-733" ],
@@ -65049,8 +65144,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<int>",
    "name" : "android::trait_pointer<int>",
-   "referenced_type" : "type-2586",
-   "self_type" : "type-2586",
+   "referenced_type" : "type-2589",
+   "self_type" : "type-2589",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -65060,8 +65155,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<long>",
    "name" : "android::trait_pointer<long>",
-   "referenced_type" : "type-1061",
-   "self_type" : "type-1061",
+   "referenced_type" : "type-1064",
+   "self_type" : "type-1064",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-32" ],
@@ -65071,30 +65166,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::trait_pointer<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-2591",
-   "self_type" : "type-2591",
+   "referenced_type" : "type-2594",
+   "self_type" : "type-2594",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2592" ],
+   "template_args" : [ "type-2595" ],
    "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-2588",
-   "self_type" : "type-2588",
+   "referenced_type" : "type-2591",
+   "self_type" : "type-2591",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2589" ],
+   "template_args" : [ "type-2592" ],
    "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-2585",
-   "self_type" : "type-2585",
+   "referenced_type" : "type-2588",
+   "self_type" : "type-2588",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -65104,19 +65199,19 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::BufferItem>",
    "name" : "android::trait_trivial_copy<android::BufferItem>",
-   "referenced_type" : "type-1057",
-   "self_type" : "type-1057",
+   "referenced_type" : "type-1060",
+   "self_type" : "type-1060",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1058" ],
+   "template_args" : [ "type-1061" ],
    "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-2574",
-   "self_type" : "type-2574",
+   "referenced_type" : "type-2577",
+   "self_type" : "type-2577",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-164" ],
@@ -65126,8 +65221,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-2571",
-   "self_type" : "type-2571",
+   "referenced_type" : "type-2574",
+   "self_type" : "type-2574",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-150" ],
@@ -65137,8 +65232,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-2568",
-   "self_type" : "type-2568",
+   "referenced_type" : "type-2571",
+   "self_type" : "type-2571",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-146" ],
@@ -65148,8 +65243,8 @@
    "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",
+   "referenced_type" : "type-1184",
+   "self_type" : "type-1184",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-733" ],
@@ -65159,8 +65254,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-2463",
-   "self_type" : "type-2463",
+   "referenced_type" : "type-2466",
+   "self_type" : "type-2466",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-95" ],
@@ -65170,8 +65265,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-2501",
-   "self_type" : "type-2501",
+   "referenced_type" : "type-2504",
+   "self_type" : "type-2504",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-126" ],
@@ -65203,8 +65298,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-2657",
-   "self_type" : "type-2657",
+   "referenced_type" : "type-2660",
+   "self_type" : "type-2660",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -65236,8 +65331,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<short>",
    "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-2595",
-   "self_type" : "type-2595",
+   "referenced_type" : "type-2598",
+   "self_type" : "type-2598",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-498" ],
@@ -65247,30 +65342,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::trait_trivial_copy<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-2572",
-   "self_type" : "type-2572",
+   "referenced_type" : "type-2575",
+   "self_type" : "type-2575",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2573" ],
+   "template_args" : [ "type-2576" ],
    "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-2569",
-   "self_type" : "type-2569",
+   "referenced_type" : "type-2572",
+   "self_type" : "type-2572",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2570" ],
+   "template_args" : [ "type-2573" ],
    "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-2542",
-   "self_type" : "type-2542",
+   "referenced_type" : "type-2545",
+   "self_type" : "type-2545",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-92" ],
@@ -65313,8 +65408,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
    "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-2636",
-   "self_type" : "type-2636",
+   "referenced_type" : "type-2639",
+   "self_type" : "type-2639",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-500" ],
@@ -65324,8 +65419,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-2435",
-   "self_type" : "type-2435",
+   "referenced_type" : "type-2438",
+   "self_type" : "type-2438",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-9" ],
@@ -65335,19 +65430,19 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::BufferItem>",
    "name" : "android::trait_trivial_ctor<android::BufferItem>",
-   "referenced_type" : "type-1053",
-   "self_type" : "type-1053",
+   "referenced_type" : "type-1056",
+   "self_type" : "type-1056",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1054" ],
+   "template_args" : [ "type-1057" ],
    "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-2556",
-   "self_type" : "type-2556",
+   "referenced_type" : "type-2559",
+   "self_type" : "type-2559",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-164" ],
@@ -65357,8 +65452,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-2551",
-   "self_type" : "type-2551",
+   "referenced_type" : "type-2554",
+   "self_type" : "type-2554",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-150" ],
@@ -65368,8 +65463,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-2550",
-   "self_type" : "type-2550",
+   "referenced_type" : "type-2553",
+   "self_type" : "type-2553",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-146" ],
@@ -65379,8 +65474,8 @@
    "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",
+   "referenced_type" : "type-1182",
+   "self_type" : "type-1182",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-733" ],
@@ -65390,8 +65485,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-2445",
-   "self_type" : "type-2445",
+   "referenced_type" : "type-2448",
+   "self_type" : "type-2448",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-95" ],
@@ -65401,8 +65496,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-2481",
-   "self_type" : "type-2481",
+   "referenced_type" : "type-2484",
+   "self_type" : "type-2484",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-126" ],
@@ -65434,8 +65529,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-2649",
-   "self_type" : "type-2649",
+   "referenced_type" : "type-2652",
+   "self_type" : "type-2652",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -65467,8 +65562,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<short>",
    "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-2563",
-   "self_type" : "type-2563",
+   "referenced_type" : "type-2566",
+   "self_type" : "type-2566",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-498" ],
@@ -65478,30 +65573,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::trait_trivial_ctor<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-2557",
-   "self_type" : "type-2557",
+   "referenced_type" : "type-2560",
+   "self_type" : "type-2560",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2558" ],
+   "template_args" : [ "type-2561" ],
    "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-2553",
-   "self_type" : "type-2553",
+   "referenced_type" : "type-2556",
+   "self_type" : "type-2556",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2554" ],
+   "template_args" : [ "type-2557" ],
    "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-2527",
-   "self_type" : "type-2527",
+   "referenced_type" : "type-2530",
+   "self_type" : "type-2530",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-92" ],
@@ -65511,8 +65606,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
    "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-2672",
-   "self_type" : "type-2672",
+   "referenced_type" : "type-2675",
+   "self_type" : "type-2675",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -65544,8 +65639,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned short>",
    "name" : "android::trait_trivial_ctor<unsigned short>",
-   "referenced_type" : "type-2618",
-   "self_type" : "type-2618",
+   "referenced_type" : "type-2621",
+   "self_type" : "type-2621",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-500" ],
@@ -65555,8 +65650,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-2400",
-   "self_type" : "type-2400",
+   "referenced_type" : "type-2403",
+   "self_type" : "type-2403",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-9" ],
@@ -65566,19 +65661,19 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::BufferItem>",
    "name" : "android::trait_trivial_dtor<android::BufferItem>",
-   "referenced_type" : "type-1055",
-   "self_type" : "type-1055",
+   "referenced_type" : "type-1058",
+   "self_type" : "type-1058",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1056" ],
+   "template_args" : [ "type-1059" ],
    "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-2566",
-   "self_type" : "type-2566",
+   "referenced_type" : "type-2569",
+   "self_type" : "type-2569",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-164" ],
@@ -65588,8 +65683,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-2562",
-   "self_type" : "type-2562",
+   "referenced_type" : "type-2565",
+   "self_type" : "type-2565",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-150" ],
@@ -65599,8 +65694,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-2559",
-   "self_type" : "type-2559",
+   "referenced_type" : "type-2562",
+   "self_type" : "type-2562",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-146" ],
@@ -65610,8 +65705,8 @@
    "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",
+   "referenced_type" : "type-1183",
+   "self_type" : "type-1183",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-733" ],
@@ -65621,8 +65716,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<bool>",
    "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-2453",
-   "self_type" : "type-2453",
+   "referenced_type" : "type-2456",
+   "self_type" : "type-2456",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-95" ],
@@ -65632,8 +65727,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-2491",
-   "self_type" : "type-2491",
+   "referenced_type" : "type-2494",
+   "self_type" : "type-2494",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-126" ],
@@ -65665,8 +65760,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<int>",
    "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-2652",
-   "self_type" : "type-2652",
+   "referenced_type" : "type-2655",
+   "self_type" : "type-2655",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -65698,8 +65793,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<short>",
    "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-2584",
-   "self_type" : "type-2584",
+   "referenced_type" : "type-2587",
+   "self_type" : "type-2587",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-498" ],
@@ -65709,30 +65804,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::trait_trivial_dtor<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-2564",
-   "self_type" : "type-2564",
+   "referenced_type" : "type-2567",
+   "self_type" : "type-2567",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2565" ],
+   "template_args" : [ "type-2568" ],
    "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-2560",
-   "self_type" : "type-2560",
+   "referenced_type" : "type-2563",
+   "self_type" : "type-2563",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2561" ],
+   "template_args" : [ "type-2564" ],
    "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-2535",
-   "self_type" : "type-2535",
+   "referenced_type" : "type-2538",
+   "self_type" : "type-2538",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-92" ],
@@ -65742,8 +65837,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
    "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-2683",
-   "self_type" : "type-2683",
+   "referenced_type" : "type-2686",
+   "self_type" : "type-2686",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -65775,8 +65870,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned short>",
    "name" : "android::trait_trivial_dtor<unsigned short>",
-   "referenced_type" : "type-2625",
-   "self_type" : "type-2625",
+   "referenced_type" : "type-2628",
+   "self_type" : "type-2628",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-500" ],
@@ -65786,8 +65881,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-2421",
-   "self_type" : "type-2421",
+   "referenced_type" : "type-2424",
+   "self_type" : "type-2424",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-9" ],
@@ -65797,30 +65892,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::BufferItem>",
    "name" : "android::trait_trivial_move<android::BufferItem>",
-   "referenced_type" : "type-1059",
-   "self_type" : "type-1059",
+   "referenced_type" : "type-1062",
+   "self_type" : "type-1062",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1060" ],
+   "template_args" : [ "type-1063" ],
    "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-2664",
-   "self_type" : "type-2664",
+   "referenced_type" : "type-2667",
+   "self_type" : "type-2667",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-1240" ],
+   "template_args" : [ "type-1243" ],
    "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-2658",
-   "self_type" : "type-2658",
+   "referenced_type" : "type-2661",
+   "self_type" : "type-2661",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "template_args" : [ "type-123" ],
@@ -65830,8 +65925,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
-   "referenced_type" : "type-2581",
-   "self_type" : "type-2581",
+   "referenced_type" : "type-2584",
+   "self_type" : "type-2584",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-164" ],
@@ -65841,8 +65936,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-2578",
-   "self_type" : "type-2578",
+   "referenced_type" : "type-2581",
+   "self_type" : "type-2581",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-150" ],
@@ -65852,8 +65947,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-2575",
-   "self_type" : "type-2575",
+   "referenced_type" : "type-2578",
+   "self_type" : "type-2578",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-146" ],
@@ -65863,8 +65958,8 @@
    "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",
+   "referenced_type" : "type-1185",
+   "self_type" : "type-1185",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-733" ],
@@ -65874,8 +65969,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<bool>",
    "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-2474",
-   "self_type" : "type-2474",
+   "referenced_type" : "type-2477",
+   "self_type" : "type-2477",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-95" ],
@@ -65885,8 +65980,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-2522",
-   "self_type" : "type-2522",
+   "referenced_type" : "type-2525",
+   "self_type" : "type-2525",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-126" ],
@@ -65918,8 +66013,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-2661",
-   "self_type" : "type-2661",
+   "referenced_type" : "type-2664",
+   "self_type" : "type-2664",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -65951,8 +66046,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<short>",
    "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-2607",
-   "self_type" : "type-2607",
+   "referenced_type" : "type-2610",
+   "self_type" : "type-2610",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-498" ],
@@ -65962,30 +66057,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::trait_trivial_move<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-2579",
-   "self_type" : "type-2579",
+   "referenced_type" : "type-2582",
+   "self_type" : "type-2582",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2580" ],
+   "template_args" : [ "type-2583" ],
    "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-2576",
-   "self_type" : "type-2576",
+   "referenced_type" : "type-2579",
+   "self_type" : "type-2579",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2577" ],
+   "template_args" : [ "type-2580" ],
    "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-2552",
-   "self_type" : "type-2552",
+   "referenced_type" : "type-2555",
+   "self_type" : "type-2555",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-92" ],
@@ -66028,8 +66123,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned short>",
    "name" : "android::trait_trivial_move<unsigned short>",
-   "referenced_type" : "type-2647",
-   "self_type" : "type-2647",
+   "referenced_type" : "type-2650",
+   "self_type" : "type-2650",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-500" ],
@@ -66039,8 +66134,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-2443",
-   "self_type" : "type-2443",
+   "referenced_type" : "type-2446",
+   "self_type" : "type-2446",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-9" ],
@@ -66050,19 +66145,19 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::BufferItem>",
    "name" : "android::traits<android::BufferItem>",
-   "referenced_type" : "type-1065",
-   "self_type" : "type-1065",
+   "referenced_type" : "type-1068",
+   "self_type" : "type-1068",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1066" ],
+   "template_args" : [ "type-1069" ],
    "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-2601",
-   "self_type" : "type-2601",
+   "referenced_type" : "type-2604",
+   "self_type" : "type-2604",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-164" ],
@@ -66072,8 +66167,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::traits<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-2598",
-   "self_type" : "type-2598",
+   "referenced_type" : "type-2601",
+   "self_type" : "type-2601",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-150" ],
@@ -66083,8 +66178,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::traits<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-2593",
-   "self_type" : "type-2593",
+   "referenced_type" : "type-2596",
+   "self_type" : "type-2596",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-146" ],
@@ -66094,8 +66189,8 @@
    "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",
+   "referenced_type" : "type-1187",
+   "self_type" : "type-1187",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-733" ],
@@ -66105,8 +66200,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<int>",
    "name" : "android::traits<int>",
-   "referenced_type" : "type-2596",
-   "self_type" : "type-2596",
+   "referenced_type" : "type-2599",
+   "self_type" : "type-2599",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -66116,8 +66211,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<long>",
    "name" : "android::traits<long>",
-   "referenced_type" : "type-1064",
-   "self_type" : "type-1064",
+   "referenced_type" : "type-1067",
+   "self_type" : "type-1067",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-32" ],
@@ -66127,30 +66222,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::traits<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-2602",
-   "self_type" : "type-2602",
+   "referenced_type" : "type-2605",
+   "self_type" : "type-2605",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2603" ],
+   "template_args" : [ "type-2606" ],
    "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-2599",
-   "self_type" : "type-2599",
+   "referenced_type" : "type-2602",
+   "self_type" : "type-2602",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2600" ],
+   "template_args" : [ "type-2603" ],
    "unique_id" : "_ZTSN7android6traitsINSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<unsigned int>",
    "name" : "android::traits<unsigned int>",
-   "referenced_type" : "type-2594",
-   "self_type" : "type-2594",
+   "referenced_type" : "type-2597",
+   "self_type" : "type-2597",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -66161,16 +66256,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1076"
+     "referenced_type" : "type-1080"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::BufferItem>",
    "name" : "android::use_trivial_move<android::BufferItem>",
-   "referenced_type" : "type-1075",
-   "self_type" : "type-1075",
+   "referenced_type" : "type-1079",
+   "self_type" : "type-1079",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1077" ],
+   "template_args" : [ "type-1081" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_10BufferItemEEE"
   },
   {
@@ -66178,13 +66273,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2638"
+     "referenced_type" : "type-2641"
     }
    ],
    "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-2637",
-   "self_type" : "type-2637",
+   "referenced_type" : "type-2640",
+   "self_type" : "type-2640",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-164" ],
@@ -66195,13 +66290,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2635"
+     "referenced_type" : "type-2638"
     }
    ],
    "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-2634",
-   "self_type" : "type-2634",
+   "referenced_type" : "type-2637",
+   "self_type" : "type-2637",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-150" ],
@@ -66212,13 +66307,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2631"
+     "referenced_type" : "type-2634"
     }
    ],
    "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-2630",
-   "self_type" : "type-2630",
+   "referenced_type" : "type-2633",
+   "self_type" : "type-2633",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-146" ],
@@ -66229,13 +66324,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1186"
+     "referenced_type" : "type-1190"
     }
    ],
    "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",
+   "referenced_type" : "type-1189",
+   "self_type" : "type-1189",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-733" ],
@@ -66246,13 +66341,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2633"
+     "referenced_type" : "type-2636"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<int>",
    "name" : "android::use_trivial_move<int>",
-   "referenced_type" : "type-2632",
-   "self_type" : "type-2632",
+   "referenced_type" : "type-2635",
+   "self_type" : "type-2635",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -66263,13 +66358,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1074"
+     "referenced_type" : "type-1077"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<long>",
    "name" : "android::use_trivial_move<long>",
-   "referenced_type" : "type-1073",
-   "self_type" : "type-1073",
+   "referenced_type" : "type-1076",
+   "self_type" : "type-1076",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-32" ],
@@ -66334,7 +66429,7 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1251"
+     "referenced_type" : "type-1255"
     },
     {
      "access" : "private",
@@ -66346,11 +66441,11 @@
    "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",
+   "referenced_type" : "type-1254",
+   "self_type" : "type-1254",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-1253" ],
+   "template_args" : [ "type-1257" ],
    "unique_id" : "_ZTSN7android2wpINS_12ConsumerBase22FrameAvailableListenerEEE"
   },
   {
@@ -66701,13 +66796,13 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-2179"
+     "referenced_type" : "type-2182"
     }
    ],
    "linker_set_key" : "log_msg",
    "name" : "log_msg",
-   "referenced_type" : "type-2178",
-   "self_type" : "type-2178",
+   "referenced_type" : "type-2181",
+   "self_type" : "type-2181",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
@@ -66718,15 +66813,15 @@
    [
     {
      "field_name" : "buf",
-     "referenced_type" : "type-2180"
+     "referenced_type" : "type-2183"
     },
     {
      "field_name" : "entry",
-     "referenced_type" : "type-1409"
+     "referenced_type" : "type-1412"
     },
     {
      "field_name" : "entry_v4",
-     "referenced_type" : "type-1409"
+     "referenced_type" : "type-1412"
     },
     {
      "field_name" : "entry_v3",
@@ -66734,19 +66829,19 @@
     },
     {
      "field_name" : "entry_v2",
-     "referenced_type" : "type-1292"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "entry_v1",
-     "referenced_type" : "type-2181"
+     "referenced_type" : "type-2184"
     }
    ],
    "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-2179",
-   "self_type" : "type-2179",
+   "referenced_type" : "type-2182",
+   "self_type" : "type-2182",
    "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)"
@@ -66767,8 +66862,8 @@
    ],
    "linker_set_key" : "log_time",
    "name" : "log_time",
-   "referenced_type" : "type-2510",
-   "self_type" : "type-2510",
+   "referenced_type" : "type-2513",
+   "self_type" : "type-2513",
    "size" : 8,
    "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
    "unique_id" : "_ZTS8log_time"
@@ -66814,8 +66909,8 @@
    ],
    "linker_set_key" : "logger_entry",
    "name" : "logger_entry",
-   "referenced_type" : "type-2181",
-   "self_type" : "type-2181",
+   "referenced_type" : "type-2184",
+   "self_type" : "type-2184",
    "size" : 20,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
@@ -66866,8 +66961,8 @@
    ],
    "linker_set_key" : "logger_entry_v2",
    "name" : "logger_entry_v2",
-   "referenced_type" : "type-1292",
-   "self_type" : "type-1292",
+   "referenced_type" : "type-1293",
+   "self_type" : "type-1293",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
@@ -66975,8 +67070,8 @@
    ],
    "linker_set_key" : "logger_entry_v4",
    "name" : "logger_entry_v4",
-   "referenced_type" : "type-1409",
-   "self_type" : "type-1409",
+   "referenced_type" : "type-1412",
+   "self_type" : "type-1412",
    "size" : 28,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
@@ -67020,8 +67115,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser> &&",
    "name" : "android::base::unique_fd_impl<android::base::DefaultCloser> &&",
-   "referenced_type" : "type-2555",
-   "self_type" : "type-2612",
+   "referenced_type" : "type-2558",
+   "self_type" : "type-2615",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -67038,8 +67133,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::bufferqueue::V2_0::Status> &&",
    "name" : "android::hardware::Return<android::hardware::graphics::bufferqueue::V2_0::Status> &&",
-   "referenced_type" : "type-7522",
-   "self_type" : "type-7524",
+   "referenced_type" : "type-7547",
+   "self_type" : "type-7549",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -67047,24 +67142,6 @@
    "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,
@@ -67072,8 +67149,8 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> > &&",
-   "name" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> > &&",
+   "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-4497",
    "self_type" : "type-4499",
    "size" : 8,
@@ -67081,10 +67158,28 @@
   },
   {
    "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-4374",
+   "self_type" : "type-4376",
+   "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-4503",
+   "self_type" : "type-4505",
+   "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-4356",
-   "self_type" : "type-4358",
+   "referenced_type" : "type-4362",
+   "self_type" : "type-4364",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -67101,8 +67196,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<unsigned long> &&",
    "name" : "android::hardware::Return<unsigned long> &&",
-   "referenced_type" : "type-7526",
-   "self_type" : "type-7530",
+   "referenced_type" : "type-7551",
+   "self_type" : "type-7553",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -67156,7 +67251,7 @@
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> &&",
    "name" : "android::hardware::hidl_vec<unsigned char> &&",
    "referenced_type" : "type-453",
-   "self_type" : "type-4569",
+   "self_type" : "type-4575",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -67165,7 +67260,7 @@
    "linker_set_key" : "android::sp<android::ALooper> &&",
    "name" : "android::sp<android::ALooper> &&",
    "referenced_type" : "type-322",
-   "self_type" : "type-2258",
+   "self_type" : "type-2261",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67182,8 +67277,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::Fence> &&",
    "name" : "android::sp<android::Fence> &&",
-   "referenced_type" : "type-1865",
-   "self_type" : "type-2526",
+   "referenced_type" : "type-1869",
+   "self_type" : "type-2529",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67191,8 +67286,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::GraphicBufferSource> &&",
    "name" : "android::sp<android::GraphicBufferSource> &&",
-   "referenced_type" : "type-2544",
-   "self_type" : "type-2545",
+   "referenced_type" : "type-2547",
+   "self_type" : "type-2548",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67200,8 +67295,8 @@
    "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-4264",
+   "referenced_type" : "type-4268",
+   "self_type" : "type-4270",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67209,8 +67304,8 @@
    "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",
+   "referenced_type" : "type-4277",
+   "self_type" : "type-4279",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67218,8 +67313,8 @@
    "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",
+   "referenced_type" : "type-4838",
+   "self_type" : "type-4846",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67227,8 +67322,8 @@
    "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",
+   "referenced_type" : "type-5127",
+   "self_type" : "type-5133",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67237,7 +67332,7 @@
    "linker_set_key" : "android::sp<android::IBinder::DeathRecipient> &&",
    "name" : "android::sp<android::IBinder::DeathRecipient> &&",
    "referenced_type" : "type-844",
-   "self_type" : "type-4386",
+   "self_type" : "type-4392",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67246,7 +67341,7 @@
    "linker_set_key" : "android::sp<android::IConsumerListener> &&",
    "name" : "android::sp<android::IConsumerListener> &&",
    "referenced_type" : "type-940",
-   "self_type" : "type-1578",
+   "self_type" : "type-1581",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67255,7 +67350,7 @@
    "linker_set_key" : "android::sp<android::IGraphicBufferConsumer> &&",
    "name" : "android::sp<android::IGraphicBufferConsumer> &&",
    "referenced_type" : "type-574",
-   "self_type" : "type-1601",
+   "self_type" : "type-1605",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67264,7 +67359,7 @@
    "linker_set_key" : "android::sp<android::IGraphicBufferProducer> &&",
    "name" : "android::sp<android::IGraphicBufferProducer> &&",
    "referenced_type" : "type-570",
-   "self_type" : "type-4229",
+   "self_type" : "type-4235",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67273,7 +67368,7 @@
    "linker_set_key" : "android::sp<android::IProducerListener> &&",
    "name" : "android::sp<android::IProducerListener> &&",
    "referenced_type" : "type-958",
-   "self_type" : "type-4255",
+   "self_type" : "type-4261",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67282,7 +67377,7 @@
    "linker_set_key" : "android::sp<android::NativeHandle> &&",
    "name" : "android::sp<android::NativeHandle> &&",
    "referenced_type" : "type-933",
-   "self_type" : "type-1597",
+   "self_type" : "type-1601",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   }
diff --git a/29/64/arm64_armv8-a/source-based/libui.so.lsdump b/29/64/arm64_armv8-a/source-based/libui.so.lsdump
index 00e04b0..4cf0e62 100644
--- a/29/64/arm64_armv8-a/source-based/libui.so.lsdump
+++ b/29/64/arm64_armv8-a/source-based/libui.so.lsdump
@@ -5,8 +5,8 @@
    "alignment" : 8,
    "linker_set_key" : "AHardwareBuffer_Plane [4]",
    "name" : "AHardwareBuffer_Plane [4]",
-   "referenced_type" : "type-510",
-   "self_type" : "type-509",
+   "referenced_type" : "type-508",
+   "self_type" : "type-507",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h"
   },
@@ -23,8 +23,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<float> [4]",
    "name" : "android::details::TVec4<float> [4]",
-   "referenced_type" : "type-218",
-   "self_type" : "type-2429",
+   "referenced_type" : "type-203",
+   "self_type" : "type-2431",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -32,7 +32,7 @@
    "alignment" : 1,
    "linker_set_key" : "char [0]",
    "name" : "char [0]",
-   "referenced_type" : "type-290",
+   "referenced_type" : "type-287",
    "self_type" : "type-1260",
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -47,16 +47,16 @@
    "alignment" : 4,
    "linker_set_key" : "int [0]",
    "name" : "int [0]",
-   "referenced_type" : "type-103",
-   "self_type" : "type-144",
+   "referenced_type" : "type-105",
+   "self_type" : "type-146",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int [7]",
    "name" : "int [7]",
-   "referenced_type" : "type-103",
-   "self_type" : "type-565",
+   "referenced_type" : "type-105",
+   "self_type" : "type-562",
    "size" : 28,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -64,7 +64,7 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
-   "referenced_type" : "type-207",
+   "referenced_type" : "type-220",
    "self_type" : "type-1267",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
@@ -73,7 +73,7 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [10]",
    "name" : "unsigned int [10]",
-   "referenced_type" : "type-123",
+   "referenced_type" : "type-125",
    "self_type" : "type-1110",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -82,8 +82,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [8]",
    "name" : "unsigned int [8]",
-   "referenced_type" : "type-123",
-   "self_type" : "type-351",
+   "referenced_type" : "type-125",
+   "self_type" : "type-348",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -91,8 +91,8 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned long [12]",
    "name" : "unsigned long [12]",
-   "referenced_type" : "type-124",
-   "self_type" : "type-560",
+   "referenced_type" : "type-126",
+   "self_type" : "type-557",
    "size" : 96,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -100,8 +100,8 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned long [25]",
    "name" : "unsigned long [25]",
-   "referenced_type" : "type-124",
-   "self_type" : "type-559",
+   "referenced_type" : "type-126",
+   "self_type" : "type-556",
    "size" : 200,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -109,8 +109,8 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned long [3]",
    "name" : "unsigned long [3]",
-   "referenced_type" : "type-124",
-   "self_type" : "type-944",
+   "referenced_type" : "type-126",
+   "self_type" : "type-936",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -118,26 +118,17 @@
    "alignment" : 8,
    "linker_set_key" : "void *[1]",
    "name" : "void *[1]",
-   "referenced_type" : "type-217",
-   "self_type" : "type-525",
+   "referenced_type" : "type-230",
+   "self_type" : "type-522",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "void *[3]",
-   "name" : "void *[3]",
-   "referenced_type" : "type-217",
-   "self_type" : "type-599",
-   "size" : 24,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "void *[4]",
    "name" : "void *[4]",
-   "referenced_type" : "type-217",
-   "self_type" : "type-521",
+   "referenced_type" : "type-230",
+   "self_type" : "type-518",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -145,8 +136,8 @@
    "alignment" : 8,
    "linker_set_key" : "void *[6]",
    "name" : "void *[6]",
-   "referenced_type" : "type-217",
-   "self_type" : "type-578",
+   "referenced_type" : "type-230",
+   "self_type" : "type-575",
    "size" : 48,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -154,8 +145,8 @@
    "alignment" : 8,
    "linker_set_key" : "void *[7]",
    "name" : "void *[7]",
-   "referenced_type" : "type-217",
-   "self_type" : "type-526",
+   "referenced_type" : "type-230",
+   "self_type" : "type-523",
    "size" : 56,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   }
@@ -178,8 +169,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-290",
-   "self_type" : "type-290",
+   "referenced_type" : "type-287",
+   "self_type" : "type-287",
    "size" : 1
   },
   {
@@ -188,16 +179,16 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-181",
-   "self_type" : "type-181",
+   "referenced_type" : "type-183",
+   "self_type" : "type-183",
    "size" : 2
   },
   {
    "alignment" : 8,
    "linker_set_key" : "double",
    "name" : "double",
-   "referenced_type" : "type-45",
-   "self_type" : "type-45",
+   "referenced_type" : "type-44",
+   "self_type" : "type-44",
    "size" : 8
   },
   {
@@ -213,8 +204,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-103",
-   "self_type" : "type-103",
+   "referenced_type" : "type-105",
+   "self_type" : "type-105",
    "size" : 4
   },
   {
@@ -222,16 +213,16 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-286",
-   "self_type" : "type-286",
+   "referenced_type" : "type-12",
+   "self_type" : "type-12",
    "size" : 8
   },
   {
    "alignment" : 16,
    "linker_set_key" : "long double",
    "name" : "long double",
-   "referenced_type" : "type-310",
-   "self_type" : "type-310",
+   "referenced_type" : "type-305",
+   "self_type" : "type-305",
    "size" : 16
   },
   {
@@ -239,8 +230,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-732",
-   "self_type" : "type-732",
+   "referenced_type" : "type-730",
+   "self_type" : "type-730",
    "size" : 8
   },
   {
@@ -267,8 +258,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned char",
    "name" : "unsigned char",
-   "referenced_type" : "type-207",
-   "self_type" : "type-207",
+   "referenced_type" : "type-220",
+   "self_type" : "type-220",
    "size" : 1
   },
   {
@@ -277,8 +268,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned int",
    "name" : "unsigned int",
-   "referenced_type" : "type-123",
-   "self_type" : "type-123",
+   "referenced_type" : "type-125",
+   "self_type" : "type-125",
    "size" : 4
   },
   {
@@ -287,8 +278,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long",
    "name" : "unsigned long",
-   "referenced_type" : "type-124",
-   "self_type" : "type-124",
+   "referenced_type" : "type-126",
+   "self_type" : "type-126",
    "size" : 8
   },
   {
@@ -297,8 +288,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-209",
-   "self_type" : "type-209",
+   "referenced_type" : "type-222",
+   "self_type" : "type-222",
    "size" : 8
   },
   {
@@ -314,8 +305,8 @@
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-150",
-   "self_type" : "type-150"
+   "referenced_type" : "type-153",
+   "self_type" : "type-153"
   }
  ],
  "elf_functions" :
@@ -1806,7 +1797,7 @@
    "self_type" : "type-618",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "AHardwareBuffer_Format"
   },
   {
@@ -1968,11 +1959,11 @@
    ],
    "linker_set_key" : "AHardwareBuffer_UsageFlags",
    "name" : "AHardwareBuffer_UsageFlags",
-   "referenced_type" : "type-679",
-   "self_type" : "type-679",
+   "referenced_type" : "type-677",
+   "self_type" : "type-677",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "AHardwareBuffer_UsageFlags"
   },
   {
@@ -1990,11 +1981,11 @@
    ],
    "linker_set_key" : "android::Condition::WakeUpType",
    "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-262",
-   "self_type" : "type-262",
+   "referenced_type" : "type-258",
+   "self_type" : "type-258",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android9Condition10WakeUpTypeE"
   },
   {
@@ -2020,7 +2011,7 @@
    "self_type" : "type-1346",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android5Fence6StatusE"
   },
   {
@@ -2042,11 +2033,11 @@
    ],
    "linker_set_key" : "android::FenceTime::Snapshot::State",
    "name" : "android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1384",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1388",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android9FenceTime8Snapshot5StateE"
   },
   {
@@ -2069,11 +2060,11 @@
    ],
    "linker_set_key" : "android::FenceTime::State",
    "name" : "android::FenceTime::State",
-   "referenced_type" : "type-1378",
-   "self_type" : "type-1378",
+   "referenced_type" : "type-1383",
+   "self_type" : "type-1383",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android9FenceTime5StateE"
   },
   {
@@ -2099,11 +2090,11 @@
    ],
    "linker_set_key" : "android::GraphicBuffer::HandleWrapMethod",
    "name" : "android::GraphicBuffer::HandleWrapMethod",
-   "referenced_type" : "type-630",
-   "self_type" : "type-630",
+   "referenced_type" : "type-631",
+   "self_type" : "type-631",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h",
-   "underlying_type" : "type-207",
+   "underlying_type" : "type-220",
    "unique_id" : "_ZTSN7android13GraphicBuffer16HandleWrapMethodE"
   },
   {
@@ -2121,11 +2112,11 @@
    ],
    "linker_set_key" : "android::GraphicBufferMapper::Version",
    "name" : "android::GraphicBufferMapper::Version",
-   "referenced_type" : "type-531",
-   "self_type" : "type-531",
+   "referenced_type" : "type-528",
+   "self_type" : "type-528",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android19GraphicBufferMapper7VersionE"
   },
   {
@@ -2139,11 +2130,11 @@
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-182",
-   "self_type" : "type-182",
+   "referenced_type" : "type-185",
+   "self_type" : "type-185",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android8String1613StaticLinkageE"
   },
   {
@@ -2157,11 +2148,11 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-865",
-   "self_type" : "type-865",
+   "referenced_type" : "type-863",
+   "self_type" : "type-863",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7String813StaticLinkageE"
   },
   {
@@ -2179,7 +2170,7 @@
    "self_type" : "type-976",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details6TMat33IfE7no_initE"
   },
   {
@@ -2193,11 +2184,11 @@
    ],
    "linker_set_key" : "android::details::TMat44<float>::no_init",
    "name" : "android::details::TMat44<float>::no_init",
-   "referenced_type" : "type-2430",
-   "self_type" : "type-2430",
+   "referenced_type" : "type-2432",
+   "self_type" : "type-2432",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details6TMat44IfE7no_initE"
   },
   {
@@ -2211,11 +2202,11 @@
    ],
    "linker_set_key" : "android::details::TQuaternion<double>::no_init",
    "name" : "android::details::TQuaternion<double>::no_init",
-   "referenced_type" : "type-398",
-   "self_type" : "type-398",
+   "referenced_type" : "type-392",
+   "self_type" : "type-392",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details11TQuaternionIdE7no_initE"
   },
   {
@@ -2229,11 +2220,11 @@
    ],
    "linker_set_key" : "android::details::TQuaternion<float>::no_init",
    "name" : "android::details::TQuaternion<float>::no_init",
-   "referenced_type" : "type-430",
-   "self_type" : "type-430",
+   "referenced_type" : "type-427",
+   "self_type" : "type-427",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details11TQuaternionIfE7no_initE"
   },
   {
@@ -2251,7 +2242,7 @@
    "self_type" : "type-1264",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec2IbE7no_initE"
   },
   {
@@ -2269,7 +2260,7 @@
    "self_type" : "type-1069",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec2IdE7no_initE"
   },
   {
@@ -2287,7 +2278,7 @@
    "self_type" : "type-1142",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec2IfE7no_initE"
   },
   {
@@ -2305,7 +2296,7 @@
    "self_type" : "type-1368",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec3IdE7no_initE"
   },
   {
@@ -2319,11 +2310,11 @@
    ],
    "linker_set_key" : "android::details::TVec3<float>::no_init",
    "name" : "android::details::TVec3<float>::no_init",
-   "referenced_type" : "type-1418",
-   "self_type" : "type-1418",
+   "referenced_type" : "type-1419",
+   "self_type" : "type-1419",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec3IfE7no_initE"
   },
   {
@@ -2337,11 +2328,11 @@
    ],
    "linker_set_key" : "android::details::TVec4<double>::no_init",
    "name" : "android::details::TVec4<double>::no_init",
-   "referenced_type" : "type-155",
-   "self_type" : "type-155",
+   "referenced_type" : "type-150",
+   "self_type" : "type-150",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec4IdE7no_initE"
   },
   {
@@ -2355,11 +2346,11 @@
    ],
    "linker_set_key" : "android::details::TVec4<float>::no_init",
    "name" : "android::details::TVec4<float>::no_init",
-   "referenced_type" : "type-317",
-   "self_type" : "type-317",
+   "referenced_type" : "type-312",
+   "self_type" : "type-312",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec4IfE7no_initE"
   },
   {
@@ -2374,11 +2365,11 @@
    ],
    "linker_set_key" : "android::half::Binary",
    "name" : "android::half::Binary",
-   "referenced_type" : "type-404",
-   "self_type" : "type-404",
+   "referenced_type" : "type-400",
+   "self_type" : "type-400",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android4half6BinaryE"
   },
   {
@@ -2404,7 +2395,7 @@
    "self_type" : "type-1320",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware21HidlReturnRestrictionE"
   },
   {
@@ -2426,7 +2417,7 @@
    "self_type" : "type-1130",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android8hardware8MQFlavorE"
   },
   {
@@ -2448,11 +2439,11 @@
    ],
    "linker_set_key" : "android::hardware::ProcessState::CallRestriction",
    "name" : "android::hardware::ProcessState::CallRestriction",
-   "referenced_type" : "type-278",
-   "self_type" : "type-278",
+   "referenced_type" : "type-274",
+   "self_type" : "type-274",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware12ProcessState15CallRestrictionE"
   },
   {
@@ -2506,7 +2497,7 @@
    "self_type" : "type-1306",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware6Status9ExceptionE"
   },
   {
@@ -2560,7 +2551,7 @@
    "self_type" : "type-1223",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentor20InstrumentationEventE"
   },
   {
@@ -2662,11 +2653,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_0::BufferUsage",
-   "referenced_type" : "type-149",
-   "self_type" : "type-149",
+   "referenced_type" : "type-152",
+   "self_type" : "type-152",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_011BufferUsageE"
   },
   {
@@ -2720,7 +2711,7 @@
    "self_type" : "type-1140",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09ColorModeE"
   },
   {
@@ -2762,7 +2753,7 @@
    "self_type" : "type-1141",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_014ColorTransformE"
   },
   {
@@ -3004,7 +2995,7 @@
    "self_type" : "type-1139",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09DataspaceE"
   },
   {
@@ -3030,7 +3021,7 @@
    "self_type" : "type-1143",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_03HdrE"
   },
   {
@@ -3124,7 +3115,7 @@
    "self_type" : "type-1137",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_011PixelFormatE"
   },
   {
@@ -3158,7 +3149,7 @@
    "self_type" : "type-1138",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09TransformE"
   },
   {
@@ -3268,11 +3259,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_1::BufferUsage",
-   "referenced_type" : "type-157",
-   "self_type" : "type-157",
+   "referenced_type" : "type-159",
+   "self_type" : "type-159",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_111BufferUsageE"
   },
   {
@@ -3338,7 +3329,7 @@
    "self_type" : "type-1171",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_19ColorModeE"
   },
   {
@@ -3596,7 +3587,7 @@
    "self_type" : "type-1170",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_19DataspaceE"
   },
   {
@@ -3718,7 +3709,7 @@
    "self_type" : "type-1169",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_111PixelFormatE"
   },
   {
@@ -3748,7 +3739,7 @@
    "self_type" : "type-1172",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_112RenderIntentE"
   },
   {
@@ -3862,11 +3853,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_2::BufferUsage",
-   "referenced_type" : "type-422",
-   "self_type" : "type-422",
+   "referenced_type" : "type-419",
+   "self_type" : "type-419",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_211BufferUsageE"
   },
   {
@@ -3936,7 +3927,7 @@
    "self_type" : "type-1193",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_29ColorModeE"
   },
   {
@@ -4210,7 +4201,7 @@
    "self_type" : "type-1192",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_29DataspaceE"
   },
   {
@@ -4240,7 +4231,7 @@
    "self_type" : "type-1191",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_23HdrE"
   },
   {
@@ -4366,7 +4357,7 @@
    "self_type" : "type-1195",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_211PixelFormatE"
   },
   {
@@ -4388,11 +4379,11 @@
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-163",
-   "self_type" : "type-163",
+   "referenced_type" : "type-166",
+   "self_type" : "type-166",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfo12ArchitectureE"
   },
   {
@@ -4430,11 +4421,11 @@
    ],
    "linker_set_key" : "android::ui::Transform::orientation_flags",
    "name" : "android::ui::Transform::orientation_flags",
-   "referenced_type" : "type-2440",
-   "self_type" : "type-2440",
+   "referenced_type" : "type-2442",
+   "self_type" : "type-2442",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android2ui9Transform17orientation_flagsE"
   },
   {
@@ -4464,11 +4455,11 @@
    ],
    "linker_set_key" : "android::ui::Transform::type_mask",
    "name" : "android::ui::Transform::type_mask",
-   "referenced_type" : "type-2441",
-   "self_type" : "type-2441",
+   "referenced_type" : "type-2443",
+   "self_type" : "type-2443",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android2ui9Transform9type_maskE"
   },
   {
@@ -4518,7 +4509,7 @@
    "self_type" : "type-1256",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_LogPriority"
   },
   {
@@ -4572,7 +4563,7 @@
    "self_type" : "type-1213",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_color_mode_t"
   },
   {
@@ -4598,7 +4589,7 @@
    "self_type" : "type-1218",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_color_mode_v1_1_t"
   },
   {
@@ -4640,7 +4631,7 @@
    "self_type" : "type-1214",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_color_transform_t"
   },
   {
@@ -4882,7 +4873,7 @@
    "self_type" : "type-1212",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_dataspace_t"
   },
   {
@@ -4912,7 +4903,7 @@
    "self_type" : "type-1217",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_dataspace_v1_1_t"
   },
   {
@@ -4942,7 +4933,7 @@
    "self_type" : "type-1221",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_dataspace_v1_2_t"
   },
   {
@@ -4984,7 +4975,7 @@
    "self_type" : "type-1225",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_flex_component"
   },
   {
@@ -5022,7 +5013,7 @@
    "self_type" : "type-1228",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_flex_format"
   },
   {
@@ -5048,7 +5039,7 @@
    "self_type" : "type-1215",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_hdr_t"
   },
   {
@@ -5066,7 +5057,7 @@
    "self_type" : "type-1220",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_hdr_v1_2_t"
   },
   {
@@ -5096,7 +5087,7 @@
    "self_type" : "type-1224",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTS25android_pixel_format_sw_t"
   },
   {
@@ -5190,7 +5181,7 @@
    "self_type" : "type-1210",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_pixel_format_t"
   },
   {
@@ -5232,7 +5223,7 @@
    "self_type" : "type-1216",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_pixel_format_v1_1_t"
   },
   {
@@ -5250,7 +5241,7 @@
    "self_type" : "type-1222",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_pixel_format_v1_2_t"
   },
   {
@@ -5280,7 +5271,7 @@
    "self_type" : "type-1219",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_render_intent_v1_1_t"
   },
   {
@@ -5314,7 +5305,7 @@
    "self_type" : "type-1211",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_transform_t"
   },
   {
@@ -5368,7 +5359,7 @@
    "self_type" : "type-1257",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "log_id"
   }
  ],
@@ -5381,18 +5372,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-186"
+     "referenced_type" : "type-188"
     },
     {
-     "referenced_type" : "type-274"
+     "referenced_type" : "type-270"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     }
    ],
-   "referenced_type" : "type-273",
+   "referenced_type" : "type-269",
    "return_type" : "type-6",
-   "self_type" : "type-273",
+   "self_type" : "type-269",
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
   {
@@ -5405,11 +5396,11 @@
      "referenced_type" : "type-607"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     }
    ],
    "referenced_type" : "type-609",
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "self_type" : "type-609",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -5423,26 +5414,26 @@
      "referenced_type" : "type-607"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-345"
     },
     {
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     }
    ],
    "referenced_type" : "type-606",
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "self_type" : "type-606",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -5453,15 +5444,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-584"
+     "referenced_type" : "type-581"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     }
    ],
-   "referenced_type" : "type-583",
-   "return_type" : "type-103",
-   "self_type" : "type-583",
+   "referenced_type" : "type-580",
+   "return_type" : "type-105",
+   "self_type" : "type-580",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5471,18 +5462,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-584"
+     "referenced_type" : "type-581"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     }
    ],
-   "referenced_type" : "type-595",
-   "return_type" : "type-103",
-   "self_type" : "type-595",
+   "referenced_type" : "type-592",
+   "return_type" : "type-105",
+   "self_type" : "type-592",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5492,33 +5483,33 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-584"
+     "referenced_type" : "type-581"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     }
    ],
-   "referenced_type" : "type-591",
-   "return_type" : "type-103",
-   "self_type" : "type-591",
+   "referenced_type" : "type-588",
+   "return_type" : "type-105",
+   "self_type" : "type-588",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5528,36 +5519,36 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-584"
+     "referenced_type" : "type-581"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-598",
-   "return_type" : "type-103",
-   "self_type" : "type-598",
+   "referenced_type" : "type-595",
+   "return_type" : "type-105",
+   "self_type" : "type-595",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5567,33 +5558,33 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-584"
+     "referenced_type" : "type-581"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-255"
     }
    ],
-   "referenced_type" : "type-587",
-   "return_type" : "type-103",
-   "self_type" : "type-587",
+   "referenced_type" : "type-584",
+   "return_type" : "type-105",
+   "self_type" : "type-584",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5603,36 +5594,93 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-584"
+     "referenced_type" : "type-581"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-255"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-593",
-   "return_type" : "type-103",
-   "self_type" : "type-593",
+   "referenced_type" : "type-590",
+   "return_type" : "type-105",
+   "self_type" : "type-590",
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "name" : "int (const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-581"
+    },
+    {
+     "referenced_type" : "type-143"
+    },
+    {
+     "referenced_type" : "type-124"
+    },
+    {
+     "referenced_type" : "type-124"
+    }
+   ],
+   "referenced_type" : "type-597",
+   "return_type" : "type-105",
+   "self_type" : "type-597",
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "name" : "int (const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-581"
+    },
+    {
+     "referenced_type" : "type-143"
+    },
+    {
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-105"
+    },
+    {
+     "referenced_type" : "type-105"
+    },
+    {
+     "referenced_type" : "type-125"
+    }
+   ],
+   "referenced_type" : "type-599",
+   "return_type" : "type-105",
+   "self_type" : "type-599",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5642,15 +5690,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-584"
+     "referenced_type" : "type-581"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-589",
-   "return_type" : "type-103",
-   "self_type" : "type-589",
+   "referenced_type" : "type-586",
+   "return_type" : "type-105",
+   "self_type" : "type-586",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5660,18 +5708,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-555"
+     "referenced_type" : "type-552"
     },
     {
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-285"
     },
     {
-     "referenced_type" : "type-557"
+     "referenced_type" : "type-554"
     }
    ],
-   "referenced_type" : "type-554",
-   "return_type" : "type-103",
-   "self_type" : "type-554",
+   "referenced_type" : "type-551",
+   "return_type" : "type-105",
+   "self_type" : "type-551",
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
   {
@@ -5681,12 +5729,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-568"
+     "referenced_type" : "type-565"
     }
    ],
-   "referenced_type" : "type-574",
-   "return_type" : "type-103",
-   "self_type" : "type-574",
+   "referenced_type" : "type-571",
+   "return_type" : "type-105",
+   "self_type" : "type-571",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5696,15 +5744,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-568"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     }
    ],
-   "referenced_type" : "type-572",
-   "return_type" : "type-103",
-   "self_type" : "type-572",
+   "referenced_type" : "type-569",
+   "return_type" : "type-105",
+   "self_type" : "type-569",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5714,15 +5762,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-568"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-567",
-   "return_type" : "type-103",
-   "self_type" : "type-567",
+   "referenced_type" : "type-564",
+   "return_type" : "type-105",
+   "self_type" : "type-564",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5732,24 +5780,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-568"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-570",
-   "return_type" : "type-103",
-   "self_type" : "type-570",
+   "referenced_type" : "type-567",
+   "return_type" : "type-105",
+   "self_type" : "type-567",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5759,12 +5807,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-558"
+     "referenced_type" : "type-555"
     }
    ],
-   "referenced_type" : "type-562",
-   "return_type" : "type-103",
-   "self_type" : "type-562",
+   "referenced_type" : "type-559",
+   "return_type" : "type-105",
+   "self_type" : "type-559",
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
   {
@@ -5774,12 +5822,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     }
    ],
-   "referenced_type" : "type-251",
-   "return_type" : "type-103",
-   "self_type" : "type-251",
+   "referenced_type" : "type-253",
+   "return_type" : "type-105",
+   "self_type" : "type-253",
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
   {
@@ -5792,14 +5840,14 @@
      "referenced_type" : "type-607"
     },
     {
-     "referenced_type" : "type-577"
+     "referenced_type" : "type-574"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "referenced_type" : "type-611",
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "self_type" : "type-611",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -5810,27 +5858,27 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-212"
+     "referenced_type" : "type-225"
     },
     {
-     "referenced_type" : "type-213"
+     "referenced_type" : "type-226"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-215"
+     "referenced_type" : "type-228"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     }
    ],
-   "referenced_type" : "type-211",
-   "return_type" : "type-150",
-   "self_type" : "type-211",
+   "referenced_type" : "type-224",
+   "return_type" : "type-153",
+   "self_type" : "type-224",
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
   {
@@ -5840,12 +5888,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-524"
+     "referenced_type" : "type-521"
     }
    ],
-   "referenced_type" : "type-523",
-   "return_type" : "type-150",
-   "self_type" : "type-523",
+   "referenced_type" : "type-520",
+   "return_type" : "type-153",
+   "self_type" : "type-520",
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
   {
@@ -5855,18 +5903,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-568"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-577"
+     "referenced_type" : "type-574"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-576",
-   "return_type" : "type-150",
-   "self_type" : "type-576",
+   "referenced_type" : "type-573",
+   "return_type" : "type-153",
+   "self_type" : "type-573",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   }
  ],
@@ -5881,7 +5929,7 @@
      "referenced_type" : "type-1212"
     }
    ],
-   "return_type" : "type-1434",
+   "return_type" : "type-1437",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5893,7 +5941,7 @@
      "referenced_type" : "type-1212"
     }
    ],
-   "return_type" : "type-1435",
+   "return_type" : "type-1438",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5905,7 +5953,7 @@
      "referenced_type" : "type-1212"
     }
    ],
-   "return_type" : "type-1436",
+   "return_type" : "type-1439",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5917,7 +5965,7 @@
      "referenced_type" : "type-1193"
     }
    ],
-   "return_type" : "type-1437",
+   "return_type" : "type-1440",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5929,7 +5977,7 @@
      "referenced_type" : "type-1212"
     }
    ],
-   "return_type" : "type-1438",
+   "return_type" : "type-1441",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5938,10 +5986,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-1439",
+   "return_type" : "type-1442",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5953,7 +6001,7 @@
      "referenced_type" : "type-1172"
     }
    ],
-   "return_type" : "type-1440",
+   "return_type" : "type-1443",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5965,7 +6013,7 @@
      "referenced_type" : "type-1214"
     }
    ],
-   "return_type" : "type-1441",
+   "return_type" : "type-1444",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5977,7 +6025,7 @@
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-1442",
+   "return_type" : "type-1445",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -6064,7 +6112,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1043"
@@ -6073,7 +6121,7 @@
      "referenced_type" : "type-1043"
     }
    ],
-   "return_type" : "type-1443",
+   "return_type" : "type-1446",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6083,10 +6131,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1003"
     },
     {
-     "referenced_type" : "type-1030"
+     "referenced_type" : "type-1026"
     },
     {
      "referenced_type" : "type-1037"
@@ -6095,14 +6143,14 @@
      "referenced_type" : "type-1051"
     },
     {
-     "referenced_type" : "type-1034"
+     "referenced_type" : "type-1031"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1444"
+     "referenced_type" : "type-1447"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6112,10 +6160,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1003"
     },
     {
-     "referenced_type" : "type-1030"
+     "referenced_type" : "type-1026"
     },
     {
      "referenced_type" : "type-1037"
@@ -6125,18 +6173,18 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1445"
+     "referenced_type" : "type-1448"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1446"
+     "referenced_type" : "type-1449"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1447"
+     "referenced_type" : "type-1450"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6146,10 +6194,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1003"
     },
     {
-     "referenced_type" : "type-1030"
+     "referenced_type" : "type-1026"
     },
     {
      "referenced_type" : "type-1037"
@@ -6162,10 +6210,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1448"
+     "referenced_type" : "type-1451"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6175,23 +6223,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1003"
     },
     {
-     "referenced_type" : "type-1030"
+     "referenced_type" : "type-1026"
     },
     {
-     "referenced_type" : "type-935"
+     "referenced_type" : "type-929"
     },
     {
-     "referenced_type" : "type-1034"
+     "referenced_type" : "type-1031"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1449"
+     "referenced_type" : "type-1452"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6201,28 +6249,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1003"
     },
     {
-     "referenced_type" : "type-1030"
+     "referenced_type" : "type-1026"
     },
     {
-     "referenced_type" : "type-935"
+     "referenced_type" : "type-929"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1450"
+     "referenced_type" : "type-1453"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1451"
+     "referenced_type" : "type-1454"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1452"
+     "referenced_type" : "type-1455"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6232,23 +6280,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1003"
     },
     {
-     "referenced_type" : "type-1030"
+     "referenced_type" : "type-1026"
     },
     {
-     "referenced_type" : "type-935"
+     "referenced_type" : "type-929"
     },
     {
      "referenced_type" : "type-10"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1453"
+     "referenced_type" : "type-1456"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6258,10 +6306,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1003"
     },
     {
-     "referenced_type" : "type-1030"
+     "referenced_type" : "type-1026"
     },
     {
      "referenced_type" : "type-1037"
@@ -6270,14 +6318,14 @@
      "referenced_type" : "type-1051"
     },
     {
-     "referenced_type" : "type-1034"
+     "referenced_type" : "type-1031"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1454"
+     "referenced_type" : "type-1457"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6287,10 +6335,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1003"
     },
     {
-     "referenced_type" : "type-1030"
+     "referenced_type" : "type-1026"
     },
     {
      "referenced_type" : "type-1037"
@@ -6300,18 +6348,18 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1455"
+     "referenced_type" : "type-1458"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1456"
+     "referenced_type" : "type-1459"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1457"
+     "referenced_type" : "type-1460"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6321,10 +6369,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1003"
     },
     {
-     "referenced_type" : "type-1030"
+     "referenced_type" : "type-1026"
     },
     {
      "referenced_type" : "type-1037"
@@ -6337,10 +6385,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1458"
+     "referenced_type" : "type-1461"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6350,23 +6398,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1003"
     },
     {
-     "referenced_type" : "type-1030"
+     "referenced_type" : "type-1026"
     },
     {
-     "referenced_type" : "type-935"
+     "referenced_type" : "type-929"
     },
     {
-     "referenced_type" : "type-1034"
+     "referenced_type" : "type-1031"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1459"
+     "referenced_type" : "type-1462"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6376,28 +6424,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1003"
     },
     {
-     "referenced_type" : "type-1030"
+     "referenced_type" : "type-1026"
     },
     {
-     "referenced_type" : "type-935"
+     "referenced_type" : "type-929"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1460"
+     "referenced_type" : "type-1463"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1464"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1462"
+     "referenced_type" : "type-1465"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6407,23 +6455,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1003"
     },
     {
-     "referenced_type" : "type-1030"
+     "referenced_type" : "type-1026"
     },
     {
-     "referenced_type" : "type-935"
+     "referenced_type" : "type-929"
     },
     {
      "referenced_type" : "type-10"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1463"
+     "referenced_type" : "type-1466"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6433,16 +6481,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1428"
+     "referenced_type" : "type-1432"
     },
     {
      "referenced_type" : "type-1120"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
   {
@@ -6451,10 +6499,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/PixelFormat.h"
   },
   {
@@ -6464,10 +6512,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1401"
+     "referenced_type" : "type-1405"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -6477,13 +6525,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1401"
+     "referenced_type" : "type-1405"
     },
     {
-     "referenced_type" : "type-1402"
+     "referenced_type" : "type-1406"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -6493,25 +6541,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6522,10 +6570,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6535,13 +6583,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6552,28 +6600,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-1464"
+     "referenced_type" : "type-1467"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6584,34 +6632,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-630"
+     "referenced_type" : "type-631"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6621,19 +6669,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6643,22 +6691,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6668,16 +6716,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-1465"
+     "referenced_type" : "type-1468"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6687,22 +6735,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "return_type" : "type-6",
@@ -6715,10 +6763,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     }
    ],
-   "return_type" : "type-622",
+   "return_type" : "type-623",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6727,10 +6775,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-622"
+     "referenced_type" : "type-623"
     }
    ],
-   "return_type" : "type-681",
+   "return_type" : "type-680",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6739,16 +6787,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-629"
+     "referenced_type" : "type-630"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-625",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
    "function_name" : "android::GraphicBuffer::dumpAllocationsToSystemLog",
    "linker_set_key" : "_ZN7android13GraphicBuffer26dumpAllocationsToSystemLogEv",
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6760,7 +6808,7 @@
      "referenced_type" : "type-637"
     }
    ],
-   "return_type" : "type-680",
+   "return_type" : "type-679",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6770,24 +6818,24 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-255"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6797,27 +6845,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-255"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6827,10 +6875,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6840,27 +6888,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-255"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6870,30 +6918,30 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-255"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6903,33 +6951,33 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-255"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6939,16 +6987,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6958,19 +7006,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6980,7 +7028,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
      "referenced_type" : "type-1250"
@@ -6995,7 +7043,7 @@
      "referenced_type" : "type-1146"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7005,34 +7053,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-630"
+     "referenced_type" : "type-631"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7042,26 +7090,26 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1466"
+     "referenced_type" : "type-1469"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7071,25 +7119,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1133"
@@ -7098,7 +7146,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7108,29 +7156,29 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1467"
+     "referenced_type" : "type-1470"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7140,10 +7188,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7153,34 +7201,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-630"
+     "referenced_type" : "type-631"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7190,26 +7238,26 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1468"
+     "referenced_type" : "type-1471"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7219,25 +7267,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1133"
@@ -7246,7 +7294,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7256,29 +7304,29 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1472"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7288,10 +7336,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7302,10 +7350,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7316,10 +7364,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7330,10 +7378,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7342,16 +7390,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/PixelFormat.h"
   },
   {
    "function_name" : "android::Gralloc2Mapper::preload",
    "linker_set_key" : "_ZN7android14Gralloc2Mapper7preloadEv",
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7361,10 +7409,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-339"
+     "referenced_type" : "type-342"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7374,10 +7422,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-339"
+     "referenced_type" : "type-342"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7393,10 +7441,10 @@
      "referenced_type" : "type-1120"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7412,7 +7460,7 @@
      "referenced_type" : "type-971"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7428,7 +7476,7 @@
      "referenced_type" : "type-971"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7441,7 +7489,7 @@
      "referenced_type" : "type-967"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7454,7 +7502,7 @@
      "referenced_type" : "type-967"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7480,13 +7528,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-362"
+     "referenced_type" : "type-359"
     },
     {
-     "referenced_type" : "type-356"
+     "referenced_type" : "type-353"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7496,13 +7544,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-362"
+     "referenced_type" : "type-359"
     },
     {
-     "referenced_type" : "type-356"
+     "referenced_type" : "type-353"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7521,7 +7569,7 @@
      "referenced_type" : "type-1043"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -7540,7 +7588,7 @@
      "referenced_type" : "type-1043"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -7550,16 +7598,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1406"
+     "referenced_type" : "type-1410"
     },
     {
      "referenced_type" : "type-1362"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -7570,10 +7618,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1406"
+     "referenced_type" : "type-1410"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -7583,13 +7631,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1406"
+     "referenced_type" : "type-1410"
     },
     {
      "referenced_type" : "type-1362"
     }
    ],
-   "return_type" : "type-1470",
+   "return_type" : "type-1473",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -7599,19 +7647,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
    "function_name" : "android::GraphicBufferMapper::preloadHal",
    "linker_set_key" : "_ZN7android19GraphicBufferMapper10preloadHalEv",
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7621,28 +7669,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-352"
+     "referenced_type" : "type-349"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7652,16 +7700,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7671,34 +7719,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-345"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7708,25 +7756,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7736,19 +7784,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7758,30 +7806,30 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-255"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7791,13 +7839,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7807,33 +7855,33 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-255"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7843,36 +7891,36 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-255"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7882,22 +7930,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7908,10 +7956,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7922,10 +7970,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7934,16 +7982,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2449"
+     "referenced_type" : "type-2451"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/UiConfig.h"
   },
   {
    "function_name" : "android::GraphicBufferAllocator::dumpToSystemLog",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocator15dumpToSystemLogEv",
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -7953,13 +8001,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-546"
+     "referenced_type" : "type-543"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -7969,93 +8017,93 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-546"
+     "referenced_type" : "type-543"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-126"
+    },
+    {
+     "referenced_type" : "type-345"
     },
     {
      "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-122"
-    },
-    {
-     "referenced_type" : "type-124"
-    },
-    {
-     "referenced_type" : "type-1471"
+     "referenced_type" : "type-1474"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorC1Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-546"
+     "referenced_type" : "type-543"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorC2Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-546"
+     "referenced_type" : "type-543"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::~GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorD1Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-546"
+     "referenced_type" : "type-543"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::~GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorD2Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-546"
+     "referenced_type" : "type-543"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -8068,7 +8116,7 @@
      "referenced_type" : "type-1360"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -8081,7 +8129,7 @@
      "referenced_type" : "type-1360"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -8091,7 +8139,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2439"
     },
     {
      "referenced_type" : "type-10"
@@ -8100,7 +8148,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8110,7 +8158,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2439"
     },
     {
      "referenced_type" : "type-10"
@@ -8125,7 +8173,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8135,10 +8183,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2439"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-10"
@@ -8147,7 +8195,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8157,10 +8205,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2439"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8196,13 +8244,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2439"
     },
     {
-     "referenced_type" : "type-2439"
+     "referenced_type" : "type-2441"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8212,13 +8260,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2439"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8228,10 +8276,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2439"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8241,13 +8289,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2439"
     },
     {
-     "referenced_type" : "type-2439"
+     "referenced_type" : "type-2441"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8257,13 +8305,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2439"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8273,10 +8321,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2439"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8286,10 +8334,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2439"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8299,10 +8347,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2439"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8312,13 +8360,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2439"
     },
     {
-     "referenced_type" : "type-2439"
+     "referenced_type" : "type-2441"
     }
    ],
-   "return_type" : "type-2443",
+   "return_type" : "type-2445",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8331,7 +8379,7 @@
      "referenced_type" : "type-1296"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
   },
   {
@@ -8344,16 +8392,16 @@
      "referenced_type" : "type-1296"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1299",
@@ -8369,10 +8417,10 @@
      "referenced_type" : "type-1296"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1299",
@@ -8388,10 +8436,10 @@
      "referenced_type" : "type-1296"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1299",
@@ -8407,10 +8455,10 @@
      "referenced_type" : "type-1359"
     },
     {
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-285"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8423,10 +8471,10 @@
      "referenced_type" : "type-1359"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8435,7 +8483,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-285"
     },
     {
      "referenced_type" : "type-1362"
@@ -8453,7 +8501,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-890"
+     "referenced_type" : "type-882"
     },
     {
      "referenced_type" : "type-1362"
@@ -8487,7 +8535,7 @@
      "referenced_type" : "type-1146"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8503,7 +8551,7 @@
      "referenced_type" : "type-1341"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8516,10 +8564,10 @@
      "referenced_type" : "type-1359"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8535,7 +8583,7 @@
      "referenced_type" : "type-1341"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8548,10 +8596,10 @@
      "referenced_type" : "type-1359"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8561,13 +8609,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8577,13 +8625,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8593,19 +8641,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8616,16 +8664,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8636,22 +8684,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8662,16 +8710,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8681,16 +8729,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8700,10 +8748,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8713,22 +8761,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8738,19 +8786,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8760,25 +8808,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8788,19 +8836,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8810,25 +8858,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8837,10 +8885,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
-   "return_type" : "type-2390",
+   "return_type" : "type-2392",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8850,13 +8898,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8866,16 +8914,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8885,16 +8933,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8904,10 +8952,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8917,13 +8965,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8933,13 +8981,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8949,19 +8997,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8971,13 +9019,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8987,13 +9035,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9003,19 +9051,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9025,13 +9073,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9041,13 +9089,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9057,19 +9105,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9079,10 +9127,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-285"
     },
     {
      "default_arg" : true,
@@ -9099,7 +9147,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-10"
@@ -9108,7 +9156,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9118,19 +9166,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9140,16 +9188,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9159,16 +9207,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1120"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9178,13 +9226,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9194,13 +9242,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9210,10 +9258,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9223,13 +9271,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9239,13 +9287,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9255,10 +9303,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9268,10 +9316,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9281,10 +9329,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9294,13 +9342,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9310,10 +9358,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1398"
     }
    ],
-   "return_type" : "type-286",
+   "return_type" : "type-12",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9323,13 +9371,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1398"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9339,13 +9387,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1398"
     },
     {
-     "referenced_type" : "type-1394"
+     "referenced_type" : "type-1399"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9355,7 +9403,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
      "referenced_type" : "type-1250"
@@ -9370,7 +9418,7 @@
      "referenced_type" : "type-1146"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9380,13 +9428,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
      "referenced_type" : "type-1362"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9396,13 +9444,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9412,13 +9460,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
      "referenced_type" : "type-1362"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9428,13 +9476,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9444,13 +9492,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1398"
     },
     {
-     "referenced_type" : "type-1411"
+     "referenced_type" : "type-1415"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9460,13 +9508,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1398"
     },
     {
      "referenced_type" : "type-1362"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9477,7 +9525,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1398"
     },
     {
      "referenced_type" : "type-1362"
@@ -9486,7 +9534,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9496,13 +9544,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1398"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9512,13 +9560,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1398"
     },
     {
-     "referenced_type" : "type-1411"
+     "referenced_type" : "type-1415"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9528,13 +9576,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1398"
     },
     {
      "referenced_type" : "type-1362"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9545,7 +9593,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1398"
     },
     {
      "referenced_type" : "type-1362"
@@ -9554,7 +9602,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9564,25 +9612,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1398"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
    "function_name" : "android::Singleton<android::GraphicBufferMapper>::getInstance",
    "linker_set_key" : "_ZN7android9SingletonINS_19GraphicBufferMapperEE11getInstanceEv",
-   "return_type" : "type-528",
+   "return_type" : "type-525",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "function_name" : "android::Singleton<android::GraphicBufferAllocator>::getInstance",
    "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11getInstanceEv",
-   "return_type" : "type-545",
+   "return_type" : "type-542",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
@@ -9592,7 +9640,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1430"
+     "referenced_type" : "type-1434"
     }
    ],
    "return_type" : "type-6",
@@ -9605,10 +9653,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1430"
+     "referenced_type" : "type-1434"
     }
    ],
-   "return_type" : "type-124",
+   "return_type" : "type-126",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
   {
@@ -9618,16 +9666,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1430"
+     "referenced_type" : "type-1434"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
   {
@@ -9647,7 +9695,7 @@
      "referenced_type" : "type-1120"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9661,13 +9709,13 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9681,13 +9729,13 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9701,16 +9749,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "referenced_type" : "type-1120"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9724,16 +9772,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "referenced_type" : "type-1120"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9747,16 +9795,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "referenced_type" : "type-1120"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9770,16 +9818,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "referenced_type" : "type-1120"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9789,10 +9837,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-624"
+     "referenced_type" : "type-625"
     }
    ],
-   "return_type" : "type-124",
+   "return_type" : "type-126",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9802,28 +9850,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-624"
+     "referenced_type" : "type-625"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-352"
+     "referenced_type" : "type-349"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9833,7 +9881,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-624"
+     "referenced_type" : "type-625"
     }
    ],
    "return_type" : "type-637",
@@ -9846,10 +9894,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-624"
+     "referenced_type" : "type-625"
     }
    ],
-   "return_type" : "type-124",
+   "return_type" : "type-126",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9859,10 +9907,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-624"
+     "referenced_type" : "type-625"
     }
    ],
-   "return_type" : "type-629",
+   "return_type" : "type-630",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9872,7 +9920,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-624"
+     "referenced_type" : "type-625"
     },
     {
      "referenced_type" : "type-1249"
@@ -9887,7 +9935,7 @@
      "referenced_type" : "type-1146"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9897,10 +9945,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-624"
+     "referenced_type" : "type-625"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9910,13 +9958,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -9926,28 +9974,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-352"
+     "referenced_type" : "type-349"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -9957,16 +10005,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
      "referenced_type" : "type-1123"
     },
     {
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-345"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -9976,16 +10024,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -9995,19 +10043,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10017,31 +10065,31 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10052,13 +10100,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-353"
+     "referenced_type" : "type-350"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10068,25 +10116,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10096,31 +10144,31 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-255"
     },
     {
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     },
     {
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10130,13 +10178,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10146,7 +10194,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
    "return_type" : "type-6",
@@ -10162,7 +10210,7 @@
      "referenced_type" : "type-974"
     }
    ],
-   "return_type" : "type-124",
+   "return_type" : "type-126",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -10175,13 +10223,13 @@
      "referenced_type" : "type-974"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -10191,10 +10239,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-364"
+     "referenced_type" : "type-361"
     }
    ],
-   "return_type" : "type-1566",
+   "return_type" : "type-1569",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10204,34 +10252,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-364"
+     "referenced_type" : "type-361"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-126"
+    },
+    {
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-123"
-    },
-    {
-     "referenced_type" : "type-122"
-    },
-    {
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-345"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10241,7 +10289,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-364"
+     "referenced_type" : "type-361"
     }
    ],
    "return_type" : "type-6",
@@ -10254,10 +10302,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-721"
+     "referenced_type" : "type-722"
     }
    ],
-   "return_type" : "type-124",
+   "return_type" : "type-126",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -10267,13 +10315,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-721"
+     "referenced_type" : "type-722"
     },
     {
-     "referenced_type" : "type-722"
+     "referenced_type" : "type-723"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -10283,13 +10331,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1241",
@@ -10302,7 +10350,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     }
    ],
    "return_type" : "type-6",
@@ -10315,10 +10363,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10328,7 +10376,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     }
    ],
    "return_type" : "type-10",
@@ -10341,7 +10389,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     }
    ],
    "return_type" : "type-10",
@@ -10354,7 +10402,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     }
    ],
    "return_type" : "type-10",
@@ -10367,7 +10415,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     }
    ],
    "return_type" : "type-10",
@@ -10380,13 +10428,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     },
     {
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-285"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10396,16 +10444,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
-    },
-    {
      "referenced_type" : "type-2444"
     },
     {
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-2446"
+    },
+    {
+     "referenced_type" : "type-285"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10416,10 +10464,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10429,10 +10477,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10442,10 +10490,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     }
    ],
-   "return_type" : "type-2435",
+   "return_type" : "type-2437",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10455,10 +10503,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     }
    ],
-   "return_type" : "type-2428",
+   "return_type" : "type-2430",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10468,7 +10516,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     },
     {
      "referenced_type" : "type-1246"
@@ -10488,13 +10536,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
-   "return_type" : "type-2390",
+   "return_type" : "type-2392",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10504,7 +10552,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     },
     {
      "referenced_type" : "type-1051"
@@ -10520,7 +10568,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     },
     {
      "referenced_type" : "type-1055"
@@ -10536,7 +10584,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     },
     {
      "referenced_type" : "type-1279"
@@ -10552,13 +10600,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-25",
@@ -10571,10 +10619,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "return_type" : "type-1055",
@@ -10587,13 +10635,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     },
     {
-     "referenced_type" : "type-2439"
+     "referenced_type" : "type-2441"
     }
    ],
-   "return_type" : "type-2435",
+   "return_type" : "type-2437",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10641,13 +10689,13 @@
      "referenced_type" : "type-1297"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1241",
@@ -10711,7 +10759,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-124",
+   "return_type" : "type-126",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10724,7 +10772,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-286",
+   "return_type" : "type-12",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10737,7 +10785,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-124",
+   "return_type" : "type-126",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10750,7 +10798,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10775,7 +10823,7 @@
      "referenced_type" : "type-1146"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10785,13 +10833,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10801,13 +10849,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10817,19 +10865,19 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2397"
+    },
+    {
      "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10839,10 +10887,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     }
    ],
-   "return_type" : "type-124",
+   "return_type" : "type-126",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10852,10 +10900,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
    "return_type" : "type-6",
@@ -10868,7 +10916,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     }
    ],
    "return_type" : "type-1297",
@@ -10881,17 +10929,17 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-285"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10901,20 +10949,20 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
-    },
-    {
      "referenced_type" : "type-2397"
     },
     {
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-2399"
+    },
+    {
+     "referenced_type" : "type-285"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10924,7 +10972,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     }
    ],
    "return_type" : "type-1297",
@@ -10937,13 +10985,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10953,13 +11001,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10969,19 +11017,19 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2397"
+    },
+    {
      "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10991,16 +11039,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11010,7 +11058,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
      "referenced_type" : "type-1283"
@@ -11026,13 +11074,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-6",
@@ -11045,10 +11093,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
-     "referenced_type" : "type-2396"
+     "referenced_type" : "type-2398"
     }
    ],
    "return_type" : "type-1297",
@@ -11061,13 +11109,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11077,13 +11125,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11093,19 +11141,19 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2397"
+    },
+    {
      "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11115,13 +11163,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11131,13 +11179,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11147,19 +11195,19 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2397"
+    },
+    {
      "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11170,16 +11218,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11190,22 +11238,22 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2397"
+    },
+    {
      "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11216,16 +11264,16 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2397"
+    },
+    {
      "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2393"
-    },
-    {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11235,16 +11283,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11255,16 +11303,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2388"
+     "referenced_type" : "type-2390"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11275,16 +11323,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2388"
+     "referenced_type" : "type-2390"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11295,19 +11343,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2388"
+     "referenced_type" : "type-2390"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "referenced_type" : "type-1120"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11318,19 +11366,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2388"
+     "referenced_type" : "type-2390"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "referenced_type" : "type-1120"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11341,19 +11389,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2388"
+     "referenced_type" : "type-2390"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "referenced_type" : "type-1120"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11364,19 +11412,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2388"
+     "referenced_type" : "type-2390"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "referenced_type" : "type-1120"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11386,10 +11434,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1396"
+     "referenced_type" : "type-1401"
     }
    ],
-   "return_type" : "type-1383",
+   "return_type" : "type-1387",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11399,10 +11447,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1396"
+     "referenced_type" : "type-1401"
     }
    ],
-   "return_type" : "type-286",
+   "return_type" : "type-12",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11412,7 +11460,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1396"
+     "referenced_type" : "type-1401"
     }
    ],
    "return_type" : "type-6",
@@ -11425,10 +11473,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1394"
     }
    ],
-   "return_type" : "type-124",
+   "return_type" : "type-126",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11438,10 +11486,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1394"
     }
    ],
-   "return_type" : "type-124",
+   "return_type" : "type-126",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11451,7 +11499,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1394"
     },
     {
      "referenced_type" : "type-1249"
@@ -11466,24 +11514,24 @@
      "referenced_type" : "type-1146"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   }
  ],
  "global_vars" :
  [
   {
-   "access" : "private",
+   "access" : "protected",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocator10sAllocListE",
    "name" : "android::GraphicBufferAllocator::sAllocList",
-   "referenced_type" : "type-1570",
+   "referenced_type" : "type-1573",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocator5sLockE",
    "name" : "android::GraphicBufferAllocator::sLock",
-   "referenced_type" : "type-254",
+   "referenced_type" : "type-282",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -11519,41 +11567,41 @@
   {
    "linker_set_key" : "_ZN7android6Region14INVALID_REGIONE",
    "name" : "android::Region::INVALID_REGION",
-   "referenced_type" : "type-2389",
+   "referenced_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
    "linker_set_key" : "_ZN7android9FenceTime8NO_FENCEE",
    "name" : "android::FenceTime::NO_FENCE",
-   "referenced_type" : "type-1391",
+   "referenced_type" : "type-1395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_19GraphicBufferMapperEE5sLockE",
    "name" : "android::Singleton<android::GraphicBufferMapper>::sLock",
-   "referenced_type" : "type-254",
+   "referenced_type" : "type-282",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_19GraphicBufferMapperEE9sInstanceE",
    "name" : "android::Singleton<android::GraphicBufferMapper>::sInstance",
-   "referenced_type" : "type-541",
+   "referenced_type" : "type-538",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE5sLockE",
    "name" : "android::Singleton<android::GraphicBufferAllocator>::sLock",
-   "referenced_type" : "type-254",
+   "referenced_type" : "type-282",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE9sInstanceE",
    "name" : "android::Singleton<android::GraphicBufferAllocator>::sInstance",
-   "referenced_type" : "type-546",
+   "referenced_type" : "type-543",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   }
  ],
@@ -11563,8 +11611,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::FenceTime::Snapshot &",
    "name" : "android::FenceTime::Snapshot &",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1387",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1392",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -11572,8 +11620,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::FenceTime::Snapshot::State &",
    "name" : "android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1409",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1413",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -11581,8 +11629,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferAllocator &",
    "name" : "android::GraphicBufferAllocator &",
-   "referenced_type" : "type-543",
-   "self_type" : "type-545",
+   "referenced_type" : "type-540",
+   "self_type" : "type-542",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -11590,8 +11638,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-529",
-   "self_type" : "type-528",
+   "referenced_type" : "type-526",
+   "self_type" : "type-525",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -11599,7 +11647,7 @@
    "alignment" : 8,
    "linker_set_key" : "android::HdrCapabilities &",
    "name" : "android::HdrCapabilities &",
-   "referenced_type" : "type-960",
+   "referenced_type" : "type-962",
    "self_type" : "type-972",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
@@ -11608,8 +11656,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Mutex &",
    "name" : "android::Mutex &",
-   "referenced_type" : "type-254",
-   "self_type" : "type-258",
+   "referenced_type" : "type-282",
+   "self_type" : "type-1378",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -11626,8 +11674,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RWLock &",
    "name" : "android::RWLock &",
-   "referenced_type" : "type-264",
-   "self_type" : "type-268",
+   "referenced_type" : "type-260",
+   "self_type" : "type-264",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -11644,8 +11692,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Region &",
    "name" : "android::Region &",
-   "referenced_type" : "type-2390",
-   "self_type" : "type-2394",
+   "referenced_type" : "type-2392",
+   "self_type" : "type-2396",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -11653,8 +11701,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
-   "referenced_type" : "type-178",
-   "self_type" : "type-187",
+   "referenced_type" : "type-180",
+   "self_type" : "type-189",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -11662,8 +11710,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
-   "referenced_type" : "type-287",
-   "self_type" : "type-893",
+   "referenced_type" : "type-284",
+   "self_type" : "type-891",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -11671,8 +11719,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Vector<android::Rect> &",
    "name" : "android::Vector<android::Rect> &",
-   "referenced_type" : "type-2383",
-   "self_type" : "type-2387",
+   "referenced_type" : "type-2385",
+   "self_type" : "type-2389",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -11689,8 +11737,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TMat44<float> &",
    "name" : "android::details::TMat44<float> &",
-   "referenced_type" : "type-2428",
-   "self_type" : "type-2434",
+   "referenced_type" : "type-2430",
+   "self_type" : "type-2436",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -11698,8 +11746,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TQuaternion<double> &",
    "name" : "android::details::TQuaternion<double> &",
-   "referenced_type" : "type-340",
-   "self_type" : "type-411",
+   "referenced_type" : "type-336",
+   "self_type" : "type-408",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -11707,8 +11755,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TQuaternion<float> &",
    "name" : "android::details::TQuaternion<float> &",
-   "referenced_type" : "type-415",
-   "self_type" : "type-446",
+   "referenced_type" : "type-411",
+   "self_type" : "type-439",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -11725,7 +11773,7 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TVec2<double> &",
    "name" : "android::details::TVec2<double> &",
-   "referenced_type" : "type-62",
+   "referenced_type" : "type-57",
    "self_type" : "type-1092",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -11743,8 +11791,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TVec3<double> &",
    "name" : "android::details::TVec3<double> &",
-   "referenced_type" : "type-73",
-   "self_type" : "type-1400",
+   "referenced_type" : "type-68",
+   "self_type" : "type-1397",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
   },
@@ -11761,8 +11809,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TVec4<double> &",
    "name" : "android::details::TVec4<double> &",
-   "referenced_type" : "type-57",
-   "self_type" : "type-199",
+   "referenced_type" : "type-52",
+   "self_type" : "type-192",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -11770,8 +11818,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TVec4<float> &",
    "name" : "android::details::TVec4<float> &",
-   "referenced_type" : "type-218",
-   "self_type" : "type-332",
+   "referenced_type" : "type-203",
+   "self_type" : "type-329",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -11779,8 +11827,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &",
-   "referenced_type" : "type-99",
-   "self_type" : "type-108",
+   "referenced_type" : "type-101",
+   "self_type" : "type-110",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11788,8 +11836,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &",
-   "referenced_type" : "type-394",
-   "self_type" : "type-401",
+   "referenced_type" : "type-393",
+   "self_type" : "type-398",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11797,8 +11845,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &",
-   "referenced_type" : "type-111",
-   "self_type" : "type-114",
+   "referenced_type" : "type-113",
+   "self_type" : "type-116",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11815,7 +11863,7 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Status &",
    "name" : "android::hardware::Status &",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1312",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -11824,8 +11872,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1658",
-   "self_type" : "type-1657",
+   "referenced_type" : "type-1662",
+   "self_type" : "type-1661",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11833,8 +11881,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1872",
-   "self_type" : "type-1871",
+   "referenced_type" : "type-1873",
+   "self_type" : "type-1872",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11842,8 +11890,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1949",
-   "self_type" : "type-1948",
+   "referenced_type" : "type-1951",
+   "self_type" : "type-1950",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11851,8 +11899,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-231",
-   "self_type" : "type-230",
+   "referenced_type" : "type-233",
+   "self_type" : "type-232",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11860,8 +11908,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-432",
-   "self_type" : "type-431",
+   "referenced_type" : "type-429",
+   "self_type" : "type-428",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11869,8 +11917,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int> &",
    "name" : "android::hardware::details::hidl_pointer<unsigned int> &",
-   "referenced_type" : "type-120",
-   "self_type" : "type-177",
+   "referenced_type" : "type-122",
+   "self_type" : "type-179",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11887,8 +11935,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned int> &",
    "name" : "android::hardware::hidl_vec<unsigned int> &",
-   "referenced_type" : "type-128",
-   "self_type" : "type-130",
+   "referenced_type" : "type-130",
+   "self_type" : "type-132",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11906,7 +11954,7 @@
    "linker_set_key" : "android::sp<android::Fence> &",
    "name" : "android::sp<android::Fence> &",
    "referenced_type" : "type-1358",
-   "self_type" : "type-1412",
+   "self_type" : "type-1416",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11914,8 +11962,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &",
-   "referenced_type" : "type-357",
-   "self_type" : "type-379",
+   "referenced_type" : "type-354",
+   "self_type" : "type-376",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11923,8 +11971,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &",
-   "referenced_type" : "type-485",
-   "self_type" : "type-491",
+   "referenced_type" : "type-482",
+   "self_type" : "type-488",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11932,8 +11980,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &",
-   "referenced_type" : "type-334",
-   "self_type" : "type-387",
+   "referenced_type" : "type-331",
+   "self_type" : "type-384",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11941,8 +11989,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
-   "referenced_type" : "type-53",
-   "self_type" : "type-93",
+   "referenced_type" : "type-88",
+   "self_type" : "type-95",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11950,8 +11998,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &",
-   "referenced_type" : "type-498",
-   "self_type" : "type-504",
+   "referenced_type" : "type-496",
+   "self_type" : "type-501",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11959,8 +12007,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ui::Transform &",
    "name" : "android::ui::Transform &",
-   "referenced_type" : "type-2435",
-   "self_type" : "type-2443",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2445",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -11983,49 +12031,49 @@
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-1771",
-   "self_type" : "type-1773",
+   "referenced_type" : "type-1772",
+   "self_type" : "type-1774",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-2134",
-   "self_type" : "type-2166",
+   "referenced_type" : "type-2133",
+   "self_type" : "type-2168",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-2408",
-   "self_type" : "type-2410",
+   "referenced_type" : "type-2410",
+   "self_type" : "type-2412",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-1762",
-   "self_type" : "type-1764",
+   "referenced_type" : "type-1763",
+   "self_type" : "type-1765",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-2046",
-   "self_type" : "type-2057",
+   "referenced_type" : "type-2045",
+   "self_type" : "type-2055",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-2425",
-   "self_type" : "type-2427",
+   "referenced_type" : "type-2427",
+   "self_type" : "type-2429",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-965",
+   "referenced_type" : "type-959",
    "self_type" : "type-975",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
@@ -12042,7 +12090,7 @@
    "alignment" : 8,
    "linker_set_key" : "const android::ColorSpace::TransferParameters &",
    "name" : "const android::ColorSpace::TransferParameters &",
-   "referenced_type" : "type-1034",
+   "referenced_type" : "type-1031",
    "self_type" : "type-1042",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
@@ -12051,8 +12099,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::FenceTime::Snapshot &",
    "name" : "const android::FenceTime::Snapshot &",
-   "referenced_type" : "type-1388",
-   "self_type" : "type-1394",
+   "referenced_type" : "type-1393",
+   "self_type" : "type-1399",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -12060,8 +12108,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-1407",
-   "self_type" : "type-1408",
+   "referenced_type" : "type-1411",
+   "self_type" : "type-1412",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -12078,8 +12126,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Gralloc2Mapper &",
    "name" : "const android::Gralloc2Mapper &",
-   "referenced_type" : "type-346",
-   "self_type" : "type-356",
+   "referenced_type" : "type-343",
+   "self_type" : "type-353",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -12087,8 +12135,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-2060",
-   "self_type" : "type-2059",
+   "referenced_type" : "type-2062",
+   "self_type" : "type-2061",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12096,8 +12144,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-2226",
-   "self_type" : "type-2225",
+   "referenced_type" : "type-2229",
+   "self_type" : "type-2228",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12105,8 +12153,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-2230",
-   "self_type" : "type-2229",
+   "referenced_type" : "type-2232",
+   "self_type" : "type-2231",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12132,8 +12180,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-828",
-   "self_type" : "type-827",
+   "referenced_type" : "type-829",
+   "self_type" : "type-828",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12142,7 +12190,7 @@
    "linker_set_key" : "const android::GraphicBufferAllocator::alloc_rec_t &",
    "name" : "const android::GraphicBufferAllocator::alloc_rec_t &",
    "referenced_type" : "type-706",
-   "self_type" : "type-707",
+   "self_type" : "type-708",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12150,7 +12198,7 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBufferMapper &",
    "name" : "const android::GraphicBufferMapper &",
-   "referenced_type" : "type-615",
+   "referenced_type" : "type-616",
    "self_type" : "type-632",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
@@ -12177,8 +12225,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Region &",
    "name" : "const android::Region &",
-   "referenced_type" : "type-2389",
-   "self_type" : "type-2393",
+   "referenced_type" : "type-2391",
+   "self_type" : "type-2395",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -12186,8 +12234,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-183",
-   "self_type" : "type-186",
+   "referenced_type" : "type-186",
+   "self_type" : "type-188",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -12195,8 +12243,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::String8 &",
    "name" : "const android::String8 &",
-   "referenced_type" : "type-876",
-   "self_type" : "type-890",
+   "referenced_type" : "type-866",
+   "self_type" : "type-882",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -12204,8 +12252,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Vector<android::Rect> &",
    "name" : "const android::Vector<android::Rect> &",
-   "referenced_type" : "type-2385",
-   "self_type" : "type-2386",
+   "referenced_type" : "type-2387",
+   "self_type" : "type-2388",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -12213,8 +12261,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::details::TMat33<float> &",
    "name" : "const android::details::TMat33<float> &",
-   "referenced_type" : "type-928",
-   "self_type" : "type-935",
+   "referenced_type" : "type-920",
+   "self_type" : "type-929",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -12222,8 +12270,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::details::TMat44<float> &",
    "name" : "const android::details::TMat44<float> &",
-   "referenced_type" : "type-2432",
-   "self_type" : "type-2433",
+   "referenced_type" : "type-2434",
+   "self_type" : "type-2435",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -12231,8 +12279,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::details::TQuaternion<double> &",
    "name" : "const android::details::TQuaternion<double> &",
-   "referenced_type" : "type-406",
-   "self_type" : "type-407",
+   "referenced_type" : "type-403",
+   "self_type" : "type-404",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -12240,8 +12288,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::details::TQuaternion<float> &",
    "name" : "const android::details::TQuaternion<float> &",
-   "referenced_type" : "type-434",
-   "self_type" : "type-439",
+   "referenced_type" : "type-431",
+   "self_type" : "type-436",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -12294,8 +12342,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::details::TVec4<double> &",
    "name" : "const android::details::TVec4<double> &",
-   "referenced_type" : "type-176",
-   "self_type" : "type-185",
+   "referenced_type" : "type-171",
+   "self_type" : "type-184",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -12303,8 +12351,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::details::TVec4<float> &",
    "name" : "const android::details::TVec4<float> &",
-   "referenced_type" : "type-327",
-   "self_type" : "type-331",
+   "referenced_type" : "type-324",
+   "self_type" : "type-328",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -12312,8 +12360,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-232",
-   "self_type" : "type-233",
+   "referenced_type" : "type-234",
+   "self_type" : "type-235",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -12375,8 +12423,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned int> &",
    "name" : "const android::hardware::hidl_vec<unsigned int> &",
-   "referenced_type" : "type-131",
-   "self_type" : "type-132",
+   "referenced_type" : "type-133",
+   "self_type" : "type-134",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12394,7 +12442,7 @@
    "linker_set_key" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> &",
    "name" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> &",
    "referenced_type" : "type-693",
-   "self_type" : "type-695",
+   "self_type" : "type-698",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12411,8 +12459,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
    "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-275",
-   "self_type" : "type-274",
+   "referenced_type" : "type-271",
+   "self_type" : "type-270",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -12420,8 +12468,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
-   "referenced_type" : "type-91",
-   "self_type" : "type-92",
+   "referenced_type" : "type-93",
+   "self_type" : "type-94",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12447,8 +12495,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::ui::Transform &",
    "name" : "const android::ui::Transform &",
-   "referenced_type" : "type-2438",
-   "self_type" : "type-2439",
+   "referenced_type" : "type-2440",
+   "self_type" : "type-2441",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -12456,7 +12504,7 @@
    "alignment" : 8,
    "linker_set_key" : "const bool &",
    "name" : "const bool &",
-   "referenced_type" : "type-372",
+   "referenced_type" : "type-369",
    "self_type" : "type-1287",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -12465,7 +12513,7 @@
    "alignment" : 8,
    "linker_set_key" : "const double &",
    "name" : "const double &",
-   "referenced_type" : "type-854",
+   "referenced_type" : "type-851",
    "self_type" : "type-860",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -12474,7 +12522,7 @@
    "alignment" : 8,
    "linker_set_key" : "const float &",
    "name" : "const float &",
-   "referenced_type" : "type-564",
+   "referenced_type" : "type-561",
    "self_type" : "type-1226",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -12489,8 +12537,8 @@
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-1774",
-   "self_type" : "type-1776",
+   "referenced_type" : "type-1775",
+   "self_type" : "type-1777",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
@@ -12503,16 +12551,16 @@
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-2414",
-   "self_type" : "type-2416",
+   "referenced_type" : "type-2416",
+   "self_type" : "type-2418",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "const int &",
    "name" : "const int &",
-   "referenced_type" : "type-563",
-   "self_type" : "type-838",
+   "referenced_type" : "type-560",
+   "self_type" : "type-836",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12535,127 +12583,127 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-125",
-   "self_type" : "type-127",
+   "referenced_type" : "type-127",
+   "self_type" : "type-129",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1575",
-   "self_type" : "type-1578",
+   "referenced_type" : "type-1580",
+   "self_type" : "type-1582",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1611",
-   "self_type" : "type-1613",
+   "referenced_type" : "type-1615",
+   "self_type" : "type-1617",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-17",
-   "self_type" : "type-38",
+   "referenced_type" : "type-1786",
+   "self_type" : "type-1788",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1785",
-   "self_type" : "type-1787",
+   "referenced_type" : "type-1848",
+   "self_type" : "type-1850",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1847",
-   "self_type" : "type-1849",
+   "referenced_type" : "type-1867",
+   "self_type" : "type-1869",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1866",
-   "self_type" : "type-1868",
+   "referenced_type" : "type-1935",
+   "self_type" : "type-1937",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1933",
-   "self_type" : "type-1935",
+   "referenced_type" : "type-2082",
+   "self_type" : "type-2084",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2080",
-   "self_type" : "type-2082",
+   "referenced_type" : "type-2174",
+   "self_type" : "type-2177",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2171",
-   "self_type" : "type-2174",
+   "referenced_type" : "type-2250",
+   "self_type" : "type-2252",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2248",
-   "self_type" : "type-2250",
+   "referenced_type" : "type-2292",
+   "self_type" : "type-2294",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2290",
-   "self_type" : "type-2292",
+   "referenced_type" : "type-2343",
+   "self_type" : "type-2345",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2341",
-   "self_type" : "type-2343",
+   "referenced_type" : "type-2475",
+   "self_type" : "type-2477",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2473",
-   "self_type" : "type-2475",
+   "referenced_type" : "type-38",
+   "self_type" : "type-40",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-412",
-   "self_type" : "type-414",
+   "referenced_type" : "type-409",
+   "self_type" : "type-417",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
    "referenced_type" : "type-642",
-   "self_type" : "type-644",
+   "self_type" : "type-645",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-748",
+   "referenced_type" : "type-749",
    "self_type" : "type-751",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-855",
-   "self_type" : "type-857",
+   "referenced_type" : "type-857",
+   "self_type" : "type-859",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12694,8 +12742,8 @@
    "alignment" : 8,
    "linker_set_key" : "const native_handle *const &",
    "name" : "const native_handle *const &",
-   "referenced_type" : "type-696",
-   "self_type" : "type-697",
+   "referenced_type" : "type-699",
+   "self_type" : "type-700",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12703,8 +12751,8 @@
    "alignment" : 8,
    "linker_set_key" : "const short &",
    "name" : "const short &",
-   "referenced_type" : "type-826",
-   "self_type" : "type-830",
+   "referenced_type" : "type-825",
+   "self_type" : "type-827",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12730,8 +12778,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3> &",
    "name" : "const std::array<android::details::TVec2<float>, 3> &",
-   "referenced_type" : "type-1768",
-   "self_type" : "type-1770",
+   "referenced_type" : "type-1769",
+   "self_type" : "type-1771",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12739,8 +12787,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3> &",
    "name" : "const std::array<android::details::TVec2<float>, 3> &",
-   "referenced_type" : "type-2120",
-   "self_type" : "type-2130",
+   "referenced_type" : "type-2118",
+   "self_type" : "type-2126",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12748,8 +12796,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1018",
-   "self_type" : "type-1030",
+   "referenced_type" : "type-1008",
+   "self_type" : "type-1026",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12757,8 +12805,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1765",
-   "self_type" : "type-1767",
+   "referenced_type" : "type-1766",
+   "self_type" : "type-1768",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12766,7 +12814,7 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2102",
+   "referenced_type" : "type-2100",
    "self_type" : "type-2114",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
@@ -12784,8 +12832,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::function<float (float)> &",
    "name" : "const std::function<float (float)> &",
-   "referenced_type" : "type-1777",
-   "self_type" : "type-1779",
+   "referenced_type" : "type-1778",
+   "self_type" : "type-1780",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -12793,8 +12841,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::function<float (float)> &",
    "name" : "const std::function<float (float)> &",
-   "referenced_type" : "type-2223",
-   "self_type" : "type-2228",
+   "referenced_type" : "type-2225",
+   "self_type" : "type-2227",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -12802,8 +12850,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-1391",
-   "self_type" : "type-1402",
+   "referenced_type" : "type-1395",
+   "self_type" : "type-1406",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -12811,8 +12859,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-1839",
-   "self_type" : "type-1841",
+   "referenced_type" : "type-1840",
+   "self_type" : "type-1842",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -12820,8 +12868,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-2663",
-   "self_type" : "type-2671",
+   "referenced_type" : "type-2668",
+   "self_type" : "type-2676",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -12829,8 +12877,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> > &",
    "name" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> > &",
-   "referenced_type" : "type-2331",
-   "self_type" : "type-2333",
+   "referenced_type" : "type-2333",
+   "self_type" : "type-2335",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -12847,8 +12895,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1032",
-   "self_type" : "type-1031",
+   "referenced_type" : "type-1033",
+   "self_type" : "type-1032",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12865,8 +12913,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1581",
-   "self_type" : "type-1580",
+   "referenced_type" : "type-1585",
+   "self_type" : "type-1584",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12874,8 +12922,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1711",
-   "self_type" : "type-1710",
+   "referenced_type" : "type-1712",
+   "self_type" : "type-1711",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12883,8 +12931,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1825",
-   "self_type" : "type-1824",
+   "referenced_type" : "type-1826",
+   "self_type" : "type-1825",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12892,8 +12940,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1851",
-   "self_type" : "type-1850",
+   "referenced_type" : "type-1852",
+   "self_type" : "type-1851",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12901,8 +12949,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1902",
-   "self_type" : "type-1901",
+   "referenced_type" : "type-1903",
+   "self_type" : "type-1902",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12910,8 +12958,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1994",
-   "self_type" : "type-1993",
+   "referenced_type" : "type-1995",
+   "self_type" : "type-1994",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12919,8 +12967,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2075",
-   "self_type" : "type-2074",
+   "referenced_type" : "type-2077",
+   "self_type" : "type-2076",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12928,8 +12976,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2150",
-   "self_type" : "type-2149",
+   "referenced_type" : "type-2153",
+   "self_type" : "type-2152",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12937,8 +12985,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2233",
-   "self_type" : "type-2232",
+   "referenced_type" : "type-2235",
+   "self_type" : "type-2234",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12946,8 +12994,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2328",
-   "self_type" : "type-2327",
+   "referenced_type" : "type-2330",
+   "self_type" : "type-2329",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12955,8 +13003,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2379",
-   "self_type" : "type-2378",
+   "referenced_type" : "type-2381",
+   "self_type" : "type-2380",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12964,8 +13012,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2566",
-   "self_type" : "type-2565",
+   "referenced_type" : "type-2568",
+   "self_type" : "type-2567",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12973,8 +13021,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-329",
-   "self_type" : "type-328",
+   "referenced_type" : "type-326",
+   "self_type" : "type-325",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12982,8 +13030,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-42",
-   "self_type" : "type-41",
+   "referenced_type" : "type-46",
+   "self_type" : "type-45",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12991,8 +13039,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-479",
-   "self_type" : "type-478",
+   "referenced_type" : "type-476",
+   "self_type" : "type-475",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13009,8 +13057,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-726",
-   "self_type" : "type-725",
+   "referenced_type" : "type-727",
+   "self_type" : "type-726",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13018,8 +13066,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-833",
-   "self_type" : "type-832",
+   "referenced_type" : "type-834",
+   "self_type" : "type-833",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13027,8 +13075,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-963",
-   "self_type" : "type-962",
+   "referenced_type" : "type-965",
+   "self_type" : "type-964",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13036,8 +13084,8 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned char &",
    "name" : "const unsigned char &",
-   "referenced_type" : "type-214",
-   "self_type" : "type-823",
+   "referenced_type" : "type-227",
+   "self_type" : "type-814",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13045,7 +13093,7 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned int &",
    "name" : "const unsigned int &",
-   "referenced_type" : "type-237",
+   "referenced_type" : "type-239",
    "self_type" : "type-847",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -13054,8 +13102,8 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned long &",
    "name" : "const unsigned long &",
-   "referenced_type" : "type-238",
-   "self_type" : "type-852",
+   "referenced_type" : "type-240",
+   "self_type" : "type-850",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13064,7 +13112,7 @@
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
    "referenced_type" : "type-831",
-   "self_type" : "type-835",
+   "self_type" : "type-832",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13090,7 +13138,7 @@
    "alignment" : 8,
    "linker_set_key" : "int &",
    "name" : "int &",
-   "referenced_type" : "type-103",
+   "referenced_type" : "type-105",
    "self_type" : "type-1145",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
@@ -13099,7 +13147,7 @@
    "alignment" : 8,
    "linker_set_key" : "int *&",
    "name" : "int *&",
-   "referenced_type" : "type-596",
+   "referenced_type" : "type-593",
    "self_type" : "type-1347",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
@@ -13108,8 +13156,8 @@
    "alignment" : 8,
    "linker_set_key" : "long &",
    "name" : "long &",
-   "referenced_type" : "type-286",
-   "self_type" : "type-1410",
+   "referenced_type" : "type-12",
+   "self_type" : "type-1414",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -13117,8 +13165,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-1753",
-   "self_type" : "type-1752",
+   "referenced_type" : "type-1754",
+   "self_type" : "type-1753",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13126,8 +13174,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-1854",
-   "self_type" : "type-1853",
+   "referenced_type" : "type-1855",
+   "self_type" : "type-1854",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13135,8 +13183,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-2418",
-   "self_type" : "type-2417",
+   "referenced_type" : "type-2420",
+   "self_type" : "type-2419",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13144,8 +13192,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-703",
-   "self_type" : "type-702",
+   "referenced_type" : "type-696",
+   "self_type" : "type-695",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13153,8 +13201,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2148",
-   "self_type" : "type-2147",
+   "referenced_type" : "type-2151",
+   "self_type" : "type-2150",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -13162,8 +13210,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2398",
-   "self_type" : "type-2397",
+   "referenced_type" : "type-2400",
+   "self_type" : "type-2399",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -13171,8 +13219,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2445",
-   "self_type" : "type-2444",
+   "referenced_type" : "type-2447",
+   "self_type" : "type-2446",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -13180,8 +13228,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2450",
-   "self_type" : "type-2449",
+   "referenced_type" : "type-2452",
+   "self_type" : "type-2451",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/UiConfig.h"
   },
@@ -13189,8 +13237,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-723",
-   "self_type" : "type-722",
+   "referenced_type" : "type-724",
+   "self_type" : "type-723",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -13198,7 +13246,7 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned int &",
    "name" : "unsigned int &",
-   "referenced_type" : "type-123",
+   "referenced_type" : "type-125",
    "self_type" : "type-1354",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
@@ -13207,7 +13255,7 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned long &",
    "name" : "unsigned long &",
-   "referenced_type" : "type-124",
+   "referenced_type" : "type-126",
    "self_type" : "type-1146",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
@@ -13216,7 +13264,7 @@
    "alignment" : 8,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-217",
+   "referenced_type" : "type-230",
    "self_type" : "type-1249",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
@@ -13228,8 +13276,8 @@
    "alignment" : 8,
    "linker_set_key" : "AHardwareBuffer *",
    "name" : "AHardwareBuffer *",
-   "referenced_type" : "type-2067",
-   "self_type" : "type-2066",
+   "referenced_type" : "type-2070",
+   "self_type" : "type-2069",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -13237,8 +13285,8 @@
    "alignment" : 8,
    "linker_set_key" : "AHardwareBuffer *",
    "name" : "AHardwareBuffer *",
-   "referenced_type" : "type-623",
-   "self_type" : "type-622",
+   "referenced_type" : "type-624",
+   "self_type" : "type-623",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -13246,7 +13294,7 @@
    "alignment" : 8,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-519",
+   "referenced_type" : "type-516",
    "self_type" : "type-637",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
@@ -13273,8 +13321,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1833",
-   "self_type" : "type-1832",
+   "referenced_type" : "type-1834",
+   "self_type" : "type-1833",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13282,8 +13330,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1838",
-   "self_type" : "type-1837",
+   "referenced_type" : "type-1839",
+   "self_type" : "type-1838",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13291,8 +13339,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2631",
-   "self_type" : "type-2630",
+   "referenced_type" : "type-2633",
+   "self_type" : "type-2632",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13300,8 +13348,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2654",
-   "self_type" : "type-2653",
+   "referenced_type" : "type-2656",
+   "self_type" : "type-2655",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13318,8 +13366,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1414",
-   "self_type" : "type-1413",
+   "referenced_type" : "type-1418",
+   "self_type" : "type-1417",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13327,8 +13375,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1828",
-   "self_type" : "type-1827",
+   "referenced_type" : "type-1829",
+   "self_type" : "type-1828",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13336,8 +13384,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1843",
-   "self_type" : "type-1842",
+   "referenced_type" : "type-1844",
+   "self_type" : "type-1843",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13345,8 +13393,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2622",
-   "self_type" : "type-2621",
+   "referenced_type" : "type-2624",
+   "self_type" : "type-2623",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13354,8 +13402,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2680",
-   "self_type" : "type-2679",
+   "referenced_type" : "type-2685",
+   "self_type" : "type-2684",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13372,8 +13420,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
    "name" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
-   "referenced_type" : "type-518",
-   "self_type" : "type-539",
+   "referenced_type" : "type-515",
+   "self_type" : "type-536",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
   },
@@ -13382,7 +13430,7 @@
    "linker_set_key" : "android::ColorSpace *",
    "name" : "android::ColorSpace *",
    "referenced_type" : "type-980",
-   "self_type" : "type-1007",
+   "self_type" : "type-1003",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -13399,8 +13447,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Condition *",
    "name" : "android::Condition *",
-   "referenced_type" : "type-260",
-   "self_type" : "type-263",
+   "referenced_type" : "type-256",
+   "self_type" : "type-259",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Condition.h"
   },
@@ -13417,8 +13465,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::FenceTime *",
    "name" : "android::FenceTime *",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1393",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1398",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13426,8 +13474,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::FenceTime::Snapshot *",
    "name" : "android::FenceTime::Snapshot *",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1382",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1386",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13435,8 +13483,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::FenceTimeline *",
    "name" : "android::FenceTimeline *",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1401",
+   "referenced_type" : "type-1402",
+   "self_type" : "type-1405",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13444,8 +13492,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::FenceToFenceTimeMap *",
    "name" : "android::FenceToFenceTimeMap *",
-   "referenced_type" : "type-1403",
-   "self_type" : "type-1406",
+   "referenced_type" : "type-1407",
+   "self_type" : "type-1410",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13462,8 +13510,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::FrameStats *",
    "name" : "android::FrameStats *",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1428",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1432",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
@@ -13471,8 +13519,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Gralloc2Allocator *",
    "name" : "android::Gralloc2Allocator *",
-   "referenced_type" : "type-355",
-   "self_type" : "type-362",
+   "referenced_type" : "type-352",
+   "self_type" : "type-359",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -13480,8 +13528,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Gralloc2Mapper *",
    "name" : "android::Gralloc2Mapper *",
-   "referenced_type" : "type-333",
-   "self_type" : "type-339",
+   "referenced_type" : "type-330",
+   "self_type" : "type-342",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -13489,8 +13537,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-527",
-   "self_type" : "type-681",
+   "referenced_type" : "type-524",
+   "self_type" : "type-680",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13498,8 +13546,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferAllocator *",
    "name" : "android::GraphicBufferAllocator *",
-   "referenced_type" : "type-543",
-   "self_type" : "type-546",
+   "referenced_type" : "type-540",
+   "self_type" : "type-543",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -13507,8 +13555,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-529",
-   "self_type" : "type-541",
+   "referenced_type" : "type-526",
+   "self_type" : "type-538",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -13516,7 +13564,7 @@
    "alignment" : 8,
    "linker_set_key" : "android::HdrCapabilities *",
    "name" : "android::HdrCapabilities *",
-   "referenced_type" : "type-960",
+   "referenced_type" : "type-962",
    "self_type" : "type-967",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
@@ -13525,8 +13573,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1679",
-   "self_type" : "type-1678",
+   "referenced_type" : "type-1680",
+   "self_type" : "type-1679",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13534,8 +13582,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1874",
-   "self_type" : "type-1873",
+   "referenced_type" : "type-1875",
+   "self_type" : "type-1874",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13543,8 +13591,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1953",
-   "self_type" : "type-1952",
+   "referenced_type" : "type-1954",
+   "self_type" : "type-1953",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13552,8 +13600,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-294",
-   "self_type" : "type-293",
+   "referenced_type" : "type-291",
+   "self_type" : "type-290",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13561,8 +13609,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-438",
-   "self_type" : "type-437",
+   "referenced_type" : "type-435",
+   "self_type" : "type-434",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13570,8 +13618,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
-   "referenced_type" : "type-715",
-   "self_type" : "type-716",
+   "referenced_type" : "type-716",
+   "self_type" : "type-717",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -13580,7 +13628,7 @@
    "linker_set_key" : "android::LightFlattenablePod<android::Rect> *",
    "name" : "android::LightFlattenablePod<android::Rect> *",
    "referenced_type" : "type-1243",
-   "self_type" : "type-2401",
+   "self_type" : "type-2403",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -13597,8 +13645,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Mutex *",
    "name" : "android::Mutex *",
-   "referenced_type" : "type-254",
-   "self_type" : "type-256",
+   "referenced_type" : "type-282",
+   "self_type" : "type-1376",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -13606,8 +13654,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Mutex::Autolock *",
    "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-257",
-   "self_type" : "type-259",
+   "referenced_type" : "type-1377",
+   "self_type" : "type-1380",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -13624,8 +13672,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RWLock *",
    "name" : "android::RWLock *",
-   "referenced_type" : "type-264",
-   "self_type" : "type-266",
+   "referenced_type" : "type-260",
+   "self_type" : "type-262",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -13633,8 +13681,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RWLock::AutoRLock *",
    "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-267",
-   "self_type" : "type-269",
+   "referenced_type" : "type-263",
+   "self_type" : "type-265",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -13642,8 +13690,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RWLock::AutoWLock *",
    "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-270",
-   "self_type" : "type-271",
+   "referenced_type" : "type-266",
+   "self_type" : "type-267",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -13660,8 +13708,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase *",
    "name" : "android::RefBase *",
-   "referenced_type" : "type-171",
-   "self_type" : "type-248",
+   "referenced_type" : "type-174",
+   "self_type" : "type-250",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13669,8 +13717,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-118",
-   "self_type" : "type-117",
+   "referenced_type" : "type-120",
+   "self_type" : "type-119",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13696,8 +13744,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-14",
-   "self_type" : "type-13",
+   "referenced_type" : "type-1577",
+   "self_type" : "type-1576",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13705,8 +13753,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1573",
-   "self_type" : "type-1572",
+   "referenced_type" : "type-16",
+   "self_type" : "type-15",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13714,8 +13762,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1608",
-   "self_type" : "type-1607",
+   "referenced_type" : "type-1612",
+   "self_type" : "type-1611",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13723,8 +13771,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-174",
-   "self_type" : "type-173",
+   "referenced_type" : "type-177",
+   "self_type" : "type-176",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13732,8 +13780,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1782",
-   "self_type" : "type-1781",
+   "referenced_type" : "type-1783",
+   "self_type" : "type-1782",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13741,8 +13789,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1830",
-   "self_type" : "type-1829",
+   "referenced_type" : "type-1831",
+   "self_type" : "type-1830",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13750,8 +13798,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1835",
-   "self_type" : "type-1834",
+   "referenced_type" : "type-1836",
+   "self_type" : "type-1835",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13759,8 +13807,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1845",
-   "self_type" : "type-1844",
+   "referenced_type" : "type-1846",
+   "self_type" : "type-1845",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13768,8 +13816,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1864",
-   "self_type" : "type-1863",
+   "referenced_type" : "type-1865",
+   "self_type" : "type-1864",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13777,8 +13825,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1930",
-   "self_type" : "type-1929",
+   "referenced_type" : "type-1931",
+   "self_type" : "type-1930",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13786,8 +13834,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2016",
-   "self_type" : "type-2015",
+   "referenced_type" : "type-2017",
+   "self_type" : "type-2016",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13795,8 +13843,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2168",
-   "self_type" : "type-2167",
+   "referenced_type" : "type-2171",
+   "self_type" : "type-2170",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13804,8 +13852,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2246",
-   "self_type" : "type-2245",
+   "referenced_type" : "type-2248",
+   "self_type" : "type-2247",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13813,8 +13861,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2288",
-   "self_type" : "type-2287",
+   "referenced_type" : "type-2290",
+   "self_type" : "type-2289",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13822,8 +13870,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2339",
-   "self_type" : "type-2338",
+   "referenced_type" : "type-2341",
+   "self_type" : "type-2340",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13831,8 +13879,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2458",
-   "self_type" : "type-2457",
+   "referenced_type" : "type-2460",
+   "self_type" : "type-2459",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13840,8 +13888,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2624",
-   "self_type" : "type-2623",
+   "referenced_type" : "type-2626",
+   "self_type" : "type-2625",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13849,8 +13897,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2650",
-   "self_type" : "type-2649",
+   "referenced_type" : "type-2652",
+   "self_type" : "type-2651",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13858,8 +13906,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-409",
-   "self_type" : "type-408",
+   "referenced_type" : "type-406",
+   "self_type" : "type-405",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13867,8 +13915,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-515",
-   "self_type" : "type-514",
+   "referenced_type" : "type-512",
+   "self_type" : "type-511",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13885,8 +13933,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-851",
-   "self_type" : "type-850",
+   "referenced_type" : "type-853",
+   "self_type" : "type-852",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13912,8 +13960,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_type *",
    "name" : "android::RefBase::weakref_type *",
-   "referenced_type" : "type-197",
-   "self_type" : "type-196",
+   "referenced_type" : "type-200",
+   "self_type" : "type-199",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -13930,8 +13978,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Region *",
    "name" : "android::Region *",
-   "referenced_type" : "type-2390",
-   "self_type" : "type-2392",
+   "referenced_type" : "type-2392",
+   "self_type" : "type-2394",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -13948,7 +13996,7 @@
    "alignment" : 8,
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> > *",
    "name" : "android::SortedVector<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> > *",
-   "referenced_type" : "type-710",
+   "referenced_type" : "type-711",
    "self_type" : "type-712",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
@@ -13957,8 +14005,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::String16 *",
    "name" : "android::String16 *",
-   "referenced_type" : "type-178",
-   "self_type" : "type-188",
+   "referenced_type" : "type-180",
+   "self_type" : "type-190",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -13966,8 +14014,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::String8 *",
    "name" : "android::String8 *",
-   "referenced_type" : "type-287",
-   "self_type" : "type-902",
+   "referenced_type" : "type-284",
+   "self_type" : "type-894",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -13975,8 +14023,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Thread *",
    "name" : "android::Thread *",
-   "referenced_type" : "type-371",
-   "self_type" : "type-370",
+   "referenced_type" : "type-368",
+   "self_type" : "type-367",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13984,8 +14032,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Vector<android::Rect> *",
    "name" : "android::Vector<android::Rect> *",
-   "referenced_type" : "type-2383",
-   "self_type" : "type-2384",
+   "referenced_type" : "type-2385",
+   "self_type" : "type-2386",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -13993,8 +14041,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Vector<long> *",
    "name" : "android::Vector<long> *",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1425",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1429",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14029,8 +14077,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TMat44<float> *",
    "name" : "android::details::TMat44<float> *",
-   "referenced_type" : "type-2428",
-   "self_type" : "type-2431",
+   "referenced_type" : "type-2430",
+   "self_type" : "type-2433",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -14039,7 +14087,7 @@
    "linker_set_key" : "android::details::TMatTransform<android::details::TMat33, float> *",
    "name" : "android::details::TMatTransform<android::details::TMat33, float> *",
    "referenced_type" : "type-911",
-   "self_type" : "type-958",
+   "self_type" : "type-952",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -14047,8 +14095,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TMatTransform<android::details::TMat44, float> *",
    "name" : "android::details::TMatTransform<android::details::TMat44, float> *",
-   "referenced_type" : "type-2422",
-   "self_type" : "type-2423",
+   "referenced_type" : "type-2424",
+   "self_type" : "type-2425",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -14056,8 +14104,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TQuaternion<double> *",
    "name" : "android::details::TQuaternion<double> *",
-   "referenced_type" : "type-340",
-   "self_type" : "type-405",
+   "referenced_type" : "type-336",
+   "self_type" : "type-402",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -14065,8 +14113,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TQuaternion<float> *",
    "name" : "android::details::TQuaternion<float> *",
-   "referenced_type" : "type-415",
-   "self_type" : "type-433",
+   "referenced_type" : "type-411",
+   "self_type" : "type-430",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -14083,7 +14131,7 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TVec2<double> *",
    "name" : "android::details::TVec2<double> *",
-   "referenced_type" : "type-62",
+   "referenced_type" : "type-57",
    "self_type" : "type-1070",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -14101,7 +14149,7 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TVec3<double> *",
    "name" : "android::details::TVec3<double> *",
-   "referenced_type" : "type-73",
+   "referenced_type" : "type-68",
    "self_type" : "type-1369",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
@@ -14119,8 +14167,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TVec4<double> *",
    "name" : "android::details::TVec4<double> *",
-   "referenced_type" : "type-57",
-   "self_type" : "type-165",
+   "referenced_type" : "type-52",
+   "self_type" : "type-164",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -14128,8 +14176,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TVec4<float> *",
    "name" : "android::details::TVec4<float> *",
-   "referenced_type" : "type-218",
-   "self_type" : "type-326",
+   "referenced_type" : "type-203",
+   "self_type" : "type-323",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -14174,7 +14222,7 @@
    "linker_set_key" : "android::half *",
    "name" : "android::half *",
    "referenced_type" : "type-1",
-   "self_type" : "type-1381",
+   "self_type" : "type-1379",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -14200,8 +14248,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-244",
-   "self_type" : "type-243",
+   "referenced_type" : "type-246",
+   "self_type" : "type-245",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14218,8 +14266,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-195",
-   "self_type" : "type-194",
+   "referenced_type" : "type-198",
+   "self_type" : "type-197",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14227,8 +14275,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-204",
-   "self_type" : "type-212",
+   "referenced_type" : "type-217",
+   "self_type" : "type-225",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -14236,8 +14284,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-283",
-   "self_type" : "type-282",
+   "referenced_type" : "type-279",
+   "self_type" : "type-278",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14245,8 +14293,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
-   "referenced_type" : "type-99",
-   "self_type" : "type-106",
+   "referenced_type" : "type-101",
+   "self_type" : "type-108",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14254,8 +14302,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
-   "referenced_type" : "type-394",
-   "self_type" : "type-399",
+   "referenced_type" : "type-393",
+   "self_type" : "type-396",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14263,8 +14311,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
-   "referenced_type" : "type-111",
-   "self_type" : "type-112",
+   "referenced_type" : "type-113",
+   "self_type" : "type-114",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14281,7 +14329,7 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Status *",
    "name" : "android::hardware::Status *",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1308",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -14308,8 +14356,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int> *",
    "name" : "android::hardware::details::hidl_pointer<unsigned int> *",
-   "referenced_type" : "type-120",
-   "self_type" : "type-168",
+   "referenced_type" : "type-122",
+   "self_type" : "type-170",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14317,7 +14365,7 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::return_status *",
    "name" : "android::hardware::details::return_status *",
-   "referenced_type" : "type-101",
+   "referenced_type" : "type-103",
    "self_type" : "type-1314",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -14326,8 +14374,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1727",
-   "self_type" : "type-1726",
+   "referenced_type" : "type-1728",
+   "self_type" : "type-1727",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14335,8 +14383,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1909",
-   "self_type" : "type-1908",
+   "referenced_type" : "type-1910",
+   "self_type" : "type-1909",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14344,8 +14392,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2117",
-   "self_type" : "type-2116",
+   "referenced_type" : "type-2121",
+   "self_type" : "type-2120",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14353,8 +14401,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2154",
-   "self_type" : "type-2153",
+   "referenced_type" : "type-2157",
+   "self_type" : "type-2156",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14362,8 +14410,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2236",
-   "self_type" : "type-2235",
+   "referenced_type" : "type-2238",
+   "self_type" : "type-2237",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14371,8 +14419,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-359",
-   "self_type" : "type-358",
+   "referenced_type" : "type-356",
+   "self_type" : "type-355",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14380,8 +14428,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-686",
-   "self_type" : "type-685",
+   "referenced_type" : "type-687",
+   "self_type" : "type-686",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14389,8 +14437,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-730",
-   "self_type" : "type-729",
+   "referenced_type" : "type-732",
+   "self_type" : "type-731",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14398,8 +14446,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-837",
-   "self_type" : "type-836",
+   "referenced_type" : "type-838",
+   "self_type" : "type-837",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14407,8 +14455,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-1998",
-   "self_type" : "type-1997",
+   "referenced_type" : "type-1999",
+   "self_type" : "type-1998",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14416,8 +14464,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-2161",
-   "self_type" : "type-2160",
+   "referenced_type" : "type-2164",
+   "self_type" : "type-2163",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14425,8 +14473,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-2242",
-   "self_type" : "type-2241",
+   "referenced_type" : "type-2244",
+   "self_type" : "type-2243",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14434,8 +14482,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-487",
-   "self_type" : "type-486",
+   "referenced_type" : "type-484",
+   "self_type" : "type-483",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14443,8 +14491,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-738",
-   "self_type" : "type-737",
+   "referenced_type" : "type-739",
+   "self_type" : "type-738",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14461,8 +14509,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1716",
-   "self_type" : "type-1715",
+   "referenced_type" : "type-1717",
+   "self_type" : "type-1716",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14470,8 +14518,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1915",
-   "self_type" : "type-1914",
+   "referenced_type" : "type-1916",
+   "self_type" : "type-1915",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14479,8 +14527,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2119",
-   "self_type" : "type-2118",
+   "referenced_type" : "type-2123",
+   "self_type" : "type-2122",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14488,8 +14536,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2156",
-   "self_type" : "type-2155",
+   "referenced_type" : "type-2159",
+   "self_type" : "type-2158",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14497,8 +14545,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2238",
-   "self_type" : "type-2237",
+   "referenced_type" : "type-2240",
+   "self_type" : "type-2239",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14506,8 +14554,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-336",
-   "self_type" : "type-335",
+   "referenced_type" : "type-333",
+   "self_type" : "type-332",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14515,8 +14563,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-689",
-   "self_type" : "type-688",
+   "referenced_type" : "type-690",
+   "self_type" : "type-689",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14542,8 +14590,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1587",
-   "self_type" : "type-1586",
+   "referenced_type" : "type-1591",
+   "self_type" : "type-1590",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14551,8 +14599,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1859",
-   "self_type" : "type-1858",
+   "referenced_type" : "type-1860",
+   "self_type" : "type-1859",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14560,8 +14608,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2123",
-   "self_type" : "type-2122",
+   "referenced_type" : "type-2125",
+   "self_type" : "type-2124",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14569,8 +14617,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2159",
-   "self_type" : "type-2158",
+   "referenced_type" : "type-2162",
+   "self_type" : "type-2161",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14578,8 +14626,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2240",
-   "self_type" : "type-2239",
+   "referenced_type" : "type-2242",
+   "self_type" : "type-2241",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14587,17 +14635,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-55",
-   "self_type" : "type-54",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-691",
-   "self_type" : "type-690",
+   "referenced_type" : "type-692",
+   "self_type" : "type-691",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14621,10 +14660,19 @@
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
+   "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
+   "referenced_type" : "type-90",
+   "self_type" : "type-89",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
-   "referenced_type" : "type-1724",
-   "self_type" : "type-1723",
+   "referenced_type" : "type-1725",
+   "self_type" : "type-1724",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -14632,8 +14680,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
-   "referenced_type" : "type-1906",
-   "self_type" : "type-1905",
+   "referenced_type" : "type-1908",
+   "self_type" : "type-1907",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -14641,8 +14689,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
-   "referenced_type" : "type-354",
-   "self_type" : "type-353",
+   "referenced_type" : "type-351",
+   "self_type" : "type-350",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -14650,8 +14698,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-2008",
-   "self_type" : "type-2007",
+   "referenced_type" : "type-2009",
+   "self_type" : "type-2008",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14659,8 +14707,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-2164",
-   "self_type" : "type-2163",
+   "referenced_type" : "type-2167",
+   "self_type" : "type-2166",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14668,8 +14716,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-2244",
-   "self_type" : "type-2243",
+   "referenced_type" : "type-2246",
+   "self_type" : "type-2245",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14677,8 +14725,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-500",
-   "self_type" : "type-499",
+   "referenced_type" : "type-498",
+   "self_type" : "type-497",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14722,8 +14770,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_handle *",
    "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-138",
-   "self_type" : "type-137",
+   "referenced_type" : "type-140",
+   "self_type" : "type-139",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14740,8 +14788,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned int> *",
    "name" : "android::hardware::hidl_vec<unsigned int> *",
-   "referenced_type" : "type-128",
-   "self_type" : "type-129",
+   "referenced_type" : "type-130",
+   "self_type" : "type-131",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14758,8 +14806,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::base::V1_0::IBase *",
    "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-170",
-   "self_type" : "type-366",
+   "referenced_type" : "type-173",
+   "self_type" : "type-363",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14767,8 +14815,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-297",
-   "self_type" : "type-374",
+   "referenced_type" : "type-294",
+   "self_type" : "type-371",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14777,7 +14825,7 @@
    "linker_set_key" : "android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "referenced_type" : "type-694",
-   "self_type" : "type-698",
+   "self_type" : "type-701",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14794,8 +14842,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::GraphicBuffer> *",
    "name" : "android::sp<android::GraphicBuffer> *",
-   "referenced_type" : "type-680",
-   "self_type" : "type-682",
+   "referenced_type" : "type-679",
+   "self_type" : "type-683",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14803,8 +14851,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
-   "referenced_type" : "type-357",
-   "self_type" : "type-378",
+   "referenced_type" : "type-354",
+   "self_type" : "type-375",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14812,8 +14860,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
-   "referenced_type" : "type-485",
-   "self_type" : "type-489",
+   "referenced_type" : "type-482",
+   "self_type" : "type-487",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14821,8 +14869,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
-   "referenced_type" : "type-334",
-   "self_type" : "type-386",
+   "referenced_type" : "type-331",
+   "self_type" : "type-383",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14830,8 +14878,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
-   "referenced_type" : "type-53",
-   "self_type" : "type-90",
+   "referenced_type" : "type-88",
+   "self_type" : "type-92",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14839,8 +14887,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
-   "referenced_type" : "type-498",
-   "self_type" : "type-503",
+   "referenced_type" : "type-496",
+   "self_type" : "type-500",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14848,8 +14896,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "referenced_type" : "type-373",
-   "self_type" : "type-375",
+   "referenced_type" : "type-370",
+   "self_type" : "type-372",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14866,8 +14914,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ui::Transform *",
    "name" : "android::ui::Transform *",
-   "referenced_type" : "type-2435",
-   "self_type" : "type-2437",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2439",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -14875,8 +14923,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ui::Transform::mat33 *",
    "name" : "android::ui::Transform::mat33 *",
-   "referenced_type" : "type-2436",
-   "self_type" : "type-2448",
+   "referenced_type" : "type-2438",
+   "self_type" : "type-2450",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -14893,8 +14941,8 @@
    "alignment" : 8,
    "linker_set_key" : "android_native_base_t *",
    "name" : "android_native_base_t *",
-   "referenced_type" : "type-520",
-   "self_type" : "type-524",
+   "referenced_type" : "type-517",
+   "self_type" : "type-521",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -14902,8 +14950,8 @@
    "alignment" : 8,
    "linker_set_key" : "android_ycbcr *",
    "name" : "android_ycbcr *",
-   "referenced_type" : "type-350",
-   "self_type" : "type-349",
+   "referenced_type" : "type-347",
+   "self_type" : "type-346",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -14911,8 +14959,8 @@
    "alignment" : 8,
    "linker_set_key" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
    "name" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
-   "referenced_type" : "type-273",
-   "self_type" : "type-276",
+   "referenced_type" : "type-269",
+   "self_type" : "type-272",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -14921,7 +14969,7 @@
    "linker_set_key" : "bool *",
    "name" : "bool *",
    "referenced_type" : "type-6",
-   "self_type" : "type-352",
+   "self_type" : "type-349",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -14929,8 +14977,8 @@
    "alignment" : 8,
    "linker_set_key" : "char *",
    "name" : "char *",
-   "referenced_type" : "type-290",
-   "self_type" : "type-577",
+   "referenced_type" : "type-287",
+   "self_type" : "type-574",
    "size" : 8,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -14938,8 +14986,8 @@
    "alignment" : 8,
    "linker_set_key" : "const AHardwareBuffer *",
    "name" : "const AHardwareBuffer *",
-   "referenced_type" : "type-2070",
-   "self_type" : "type-2072",
+   "referenced_type" : "type-2072",
+   "self_type" : "type-2074",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -14948,7 +14996,7 @@
    "linker_set_key" : "const AHardwareBuffer *",
    "name" : "const AHardwareBuffer *",
    "referenced_type" : "type-627",
-   "self_type" : "type-629",
+   "self_type" : "type-630",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -14957,7 +15005,7 @@
    "linker_set_key" : "const ANativeWindowBuffer *",
    "name" : "const ANativeWindowBuffer *",
    "referenced_type" : "type-639",
-   "self_type" : "type-640",
+   "self_type" : "type-641",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -14965,8 +15013,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
    "name" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
-   "referenced_type" : "type-536",
-   "self_type" : "type-537",
+   "referenced_type" : "type-534",
+   "self_type" : "type-535",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
   },
@@ -15001,8 +15049,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::FenceTime *",
    "name" : "const android::FenceTime *",
-   "referenced_type" : "type-1395",
-   "self_type" : "type-1396",
+   "referenced_type" : "type-1400",
+   "self_type" : "type-1401",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -15010,8 +15058,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::FenceTime::Snapshot *",
    "name" : "const android::FenceTime::Snapshot *",
-   "referenced_type" : "type-1388",
-   "self_type" : "type-1389",
+   "referenced_type" : "type-1393",
+   "self_type" : "type-1394",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -15028,8 +15076,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::FrameStats *",
    "name" : "const android::FrameStats *",
-   "referenced_type" : "type-1429",
-   "self_type" : "type-1430",
+   "referenced_type" : "type-1433",
+   "self_type" : "type-1434",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
@@ -15037,8 +15085,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Gralloc2Allocator *",
    "name" : "const android::Gralloc2Allocator *",
-   "referenced_type" : "type-363",
-   "self_type" : "type-364",
+   "referenced_type" : "type-360",
+   "self_type" : "type-361",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15046,8 +15094,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Gralloc2Mapper *",
    "name" : "const android::Gralloc2Mapper *",
-   "referenced_type" : "type-346",
-   "self_type" : "type-347",
+   "referenced_type" : "type-343",
+   "self_type" : "type-344",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15055,8 +15103,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-625",
-   "self_type" : "type-624",
+   "referenced_type" : "type-626",
+   "self_type" : "type-625",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -15064,8 +15112,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBufferAllocator *",
    "name" : "const android::GraphicBufferAllocator *",
-   "referenced_type" : "type-720",
-   "self_type" : "type-721",
+   "referenced_type" : "type-721",
+   "self_type" : "type-722",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -15073,8 +15121,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBufferMapper *",
    "name" : "const android::GraphicBufferMapper *",
-   "referenced_type" : "type-615",
-   "self_type" : "type-616",
+   "referenced_type" : "type-616",
+   "self_type" : "type-617",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -15091,8 +15139,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
-   "referenced_type" : "type-717",
-   "self_type" : "type-718",
+   "referenced_type" : "type-718",
+   "self_type" : "type-719",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -15100,8 +15148,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect> *",
    "name" : "const android::LightFlattenablePod<android::Rect> *",
-   "referenced_type" : "type-2399",
-   "self_type" : "type-2400",
+   "referenced_type" : "type-2401",
+   "self_type" : "type-2402",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15154,8 +15202,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Region *",
    "name" : "const android::Region *",
-   "referenced_type" : "type-2389",
-   "self_type" : "type-2395",
+   "referenced_type" : "type-2391",
+   "self_type" : "type-2397",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -15172,8 +15220,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::String16 *",
    "name" : "const android::String16 *",
-   "referenced_type" : "type-183",
-   "self_type" : "type-184",
+   "referenced_type" : "type-186",
+   "self_type" : "type-187",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -15181,8 +15229,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::String8 *",
    "name" : "const android::String8 *",
-   "referenced_type" : "type-876",
-   "self_type" : "type-881",
+   "referenced_type" : "type-866",
+   "self_type" : "type-877",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -15190,8 +15238,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Vector<android::Rect> *",
    "name" : "const android::Vector<android::Rect> *",
-   "referenced_type" : "type-2385",
-   "self_type" : "type-2388",
+   "referenced_type" : "type-2387",
+   "self_type" : "type-2390",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -15199,8 +15247,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Vector<long> *",
    "name" : "const android::Vector<long> *",
-   "referenced_type" : "type-1426",
-   "self_type" : "type-1427",
+   "referenced_type" : "type-1430",
+   "self_type" : "type-1431",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -15208,8 +15256,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::VectorImpl *",
    "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-1423",
-   "self_type" : "type-1424",
+   "referenced_type" : "type-1427",
+   "self_type" : "type-1428",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -15226,7 +15274,7 @@
    "alignment" : 8,
    "linker_set_key" : "const android::details::TMat33<float> *",
    "name" : "const android::details::TMat33<float> *",
-   "referenced_type" : "type-928",
+   "referenced_type" : "type-920",
    "self_type" : "type-977",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
@@ -15254,7 +15302,7 @@
    "linker_set_key" : "const android::details::TVec3<float> *",
    "name" : "const android::details::TVec3<float> *",
    "referenced_type" : "type-1056",
-   "self_type" : "type-1422",
+   "self_type" : "type-1426",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
   },
@@ -15262,7 +15310,7 @@
    "alignment" : 8,
    "linker_set_key" : "const android::half *",
    "name" : "const android::half *",
-   "referenced_type" : "type-40",
+   "referenced_type" : "type-42",
    "self_type" : "type-147",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
@@ -15289,8 +15337,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::BpHwRefBase *",
    "name" : "const android::hardware::BpHwRefBase *",
-   "referenced_type" : "type-200",
-   "self_type" : "type-201",
+   "referenced_type" : "type-202",
+   "self_type" : "type-214",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -15298,8 +15346,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
-   "referenced_type" : "type-109",
-   "self_type" : "type-110",
+   "referenced_type" : "type-111",
+   "self_type" : "type-112",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15307,8 +15355,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
-   "referenced_type" : "type-402",
-   "self_type" : "type-403",
+   "referenced_type" : "type-399",
+   "self_type" : "type-401",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15316,8 +15364,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
-   "referenced_type" : "type-115",
-   "self_type" : "type-116",
+   "referenced_type" : "type-117",
+   "self_type" : "type-118",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15343,8 +15391,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle> *",
-   "referenced_type" : "type-295",
-   "self_type" : "type-299",
+   "referenced_type" : "type-292",
+   "self_type" : "type-296",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15352,8 +15400,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned int> *",
    "name" : "const android::hardware::details::hidl_pointer<unsigned int> *",
-   "referenced_type" : "type-189",
-   "self_type" : "type-203",
+   "referenced_type" : "type-191",
+   "self_type" : "type-216",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15370,8 +15418,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1744",
-   "self_type" : "type-1746",
+   "referenced_type" : "type-1745",
+   "self_type" : "type-1747",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15379,8 +15427,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1911",
-   "self_type" : "type-1913",
+   "referenced_type" : "type-1912",
+   "self_type" : "type-1914",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15388,8 +15436,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-383",
-   "self_type" : "type-385",
+   "referenced_type" : "type-380",
+   "self_type" : "type-382",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15397,8 +15445,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-2004",
-   "self_type" : "type-2006",
+   "referenced_type" : "type-2005",
+   "self_type" : "type-2007",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15406,8 +15454,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-495",
-   "self_type" : "type-497",
+   "referenced_type" : "type-492",
+   "self_type" : "type-494",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15415,8 +15463,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::BufferUsage *",
    "name" : "const android::hardware::graphics::common::V1_0::BufferUsage *",
-   "referenced_type" : "type-152",
-   "self_type" : "type-151",
+   "referenced_type" : "type-155",
+   "self_type" : "type-154",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15424,8 +15472,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::BufferUsage *",
    "name" : "const android::hardware::graphics::common::V1_1::BufferUsage *",
-   "referenced_type" : "type-159",
-   "self_type" : "type-158",
+   "referenced_type" : "type-161",
+   "self_type" : "type-160",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15433,8 +15481,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::BufferUsage *",
    "name" : "const android::hardware::graphics::common::V1_2::BufferUsage *",
-   "referenced_type" : "type-424",
-   "self_type" : "type-423",
+   "referenced_type" : "type-421",
+   "self_type" : "type-420",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15442,8 +15490,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1584",
-   "self_type" : "type-1583",
+   "referenced_type" : "type-1588",
+   "self_type" : "type-1587",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15451,8 +15499,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1856",
-   "self_type" : "type-1855",
+   "referenced_type" : "type-1857",
+   "self_type" : "type-1856",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15460,8 +15508,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-51",
-   "self_type" : "type-50",
+   "referenced_type" : "type-86",
+   "self_type" : "type-85",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15469,8 +15517,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1594",
-   "self_type" : "type-1596",
+   "referenced_type" : "type-1598",
+   "self_type" : "type-1600",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15478,8 +15526,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1860",
-   "self_type" : "type-1862",
+   "referenced_type" : "type-1861",
+   "self_type" : "type-1863",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15487,8 +15535,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-96",
-   "self_type" : "type-98",
+   "referenced_type" : "type-98",
+   "self_type" : "type-100",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15496,8 +15544,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-1918",
-   "self_type" : "type-1917",
+   "referenced_type" : "type-1919",
+   "self_type" : "type-1918",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15505,8 +15553,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-392",
-   "self_type" : "type-391",
+   "referenced_type" : "type-389",
+   "self_type" : "type-388",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15523,8 +15571,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void> *",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void> *",
-   "referenced_type" : "type-153",
-   "self_type" : "type-154",
+   "referenced_type" : "type-156",
+   "self_type" : "type-157",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15532,8 +15580,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void> *",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void> *",
-   "referenced_type" : "type-160",
-   "self_type" : "type-161",
+   "referenced_type" : "type-162",
+   "self_type" : "type-163",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15541,8 +15589,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void> *",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void> *",
-   "referenced_type" : "type-425",
-   "self_type" : "type-426",
+   "referenced_type" : "type-422",
+   "self_type" : "type-423",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15559,8 +15607,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_handle> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_handle> *",
-   "referenced_type" : "type-145",
-   "self_type" : "type-146",
+   "referenced_type" : "type-148",
+   "self_type" : "type-149",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15568,8 +15616,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned int> *",
    "name" : "const android::hardware::hidl_vec<unsigned int> *",
-   "referenced_type" : "type-131",
-   "self_type" : "type-133",
+   "referenced_type" : "type-133",
+   "self_type" : "type-135",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15586,8 +15634,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
    "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-169",
-   "self_type" : "type-175",
+   "referenced_type" : "type-172",
+   "self_type" : "type-178",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
@@ -15595,8 +15643,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-296",
-   "self_type" : "type-298",
+   "referenced_type" : "type-293",
+   "self_type" : "type-295",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
@@ -15605,7 +15653,7 @@
    "linker_set_key" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "referenced_type" : "type-693",
-   "self_type" : "type-699",
+   "self_type" : "type-702",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15622,8 +15670,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
    "name" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
-   "referenced_type" : "type-381",
-   "self_type" : "type-382",
+   "referenced_type" : "type-378",
+   "self_type" : "type-379",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15631,8 +15679,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
    "name" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
-   "referenced_type" : "type-493",
-   "self_type" : "type-494",
+   "referenced_type" : "type-490",
+   "self_type" : "type-491",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15640,8 +15688,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
-   "referenced_type" : "type-389",
-   "self_type" : "type-390",
+   "referenced_type" : "type-386",
+   "self_type" : "type-387",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15649,8 +15697,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
-   "referenced_type" : "type-91",
-   "self_type" : "type-95",
+   "referenced_type" : "type-93",
+   "self_type" : "type-97",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15658,8 +15706,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
    "name" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
-   "referenced_type" : "type-506",
-   "self_type" : "type-507",
+   "referenced_type" : "type-503",
+   "self_type" : "type-504",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15676,8 +15724,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hidl::base::V1_0::IBase> *",
    "name" : "const android::sp<android::hidl::base::V1_0::IBase> *",
-   "referenced_type" : "type-367",
-   "self_type" : "type-368",
+   "referenced_type" : "type-364",
+   "self_type" : "type-365",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15685,8 +15733,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "referenced_type" : "type-376",
-   "self_type" : "type-377",
+   "referenced_type" : "type-373",
+   "self_type" : "type-374",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15703,8 +15751,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::ui::Transform *",
    "name" : "const android::ui::Transform *",
-   "referenced_type" : "type-2438",
-   "self_type" : "type-2442",
+   "referenced_type" : "type-2440",
+   "self_type" : "type-2444",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -15712,8 +15760,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::ui::Transform::mat33 *",
    "name" : "const android::ui::Transform::mat33 *",
-   "referenced_type" : "type-2446",
-   "self_type" : "type-2447",
+   "referenced_type" : "type-2448",
+   "self_type" : "type-2449",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -15721,8 +15769,8 @@
    "alignment" : 8,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-289",
-   "self_type" : "type-288",
+   "referenced_type" : "type-286",
+   "self_type" : "type-285",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -15730,8 +15778,8 @@
    "alignment" : 8,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-180",
-   "self_type" : "type-179",
+   "referenced_type" : "type-182",
+   "self_type" : "type-181",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -15739,8 +15787,8 @@
    "alignment" : 8,
    "linker_set_key" : "const gralloc_module_t *",
    "name" : "const gralloc_module_t *",
-   "referenced_type" : "type-585",
-   "self_type" : "type-584",
+   "referenced_type" : "type-582",
+   "self_type" : "type-581",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -15748,8 +15796,8 @@
    "alignment" : 8,
    "linker_set_key" : "const hw_module_t *",
    "name" : "const hw_module_t *",
-   "referenced_type" : "type-556",
-   "self_type" : "type-555",
+   "referenced_type" : "type-553",
+   "self_type" : "type-552",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15757,7 +15805,7 @@
    "alignment" : 8,
    "linker_set_key" : "const int *",
    "name" : "const int *",
-   "referenced_type" : "type-563",
+   "referenced_type" : "type-560",
    "self_type" : "type-1350",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
@@ -15776,7 +15824,7 @@
    "linker_set_key" : "const long *",
    "name" : "const long *",
    "referenced_type" : "type-848",
-   "self_type" : "type-1415",
+   "self_type" : "type-1420",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15784,8 +15832,8 @@
    "alignment" : 8,
    "linker_set_key" : "const native_handle *",
    "name" : "const native_handle *",
-   "referenced_type" : "type-142",
-   "self_type" : "type-141",
+   "referenced_type" : "type-144",
+   "self_type" : "type-143",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15793,8 +15841,8 @@
    "alignment" : 8,
    "linker_set_key" : "const native_handle **",
    "name" : "const native_handle **",
-   "referenced_type" : "type-141",
-   "self_type" : "type-348",
+   "referenced_type" : "type-143",
+   "self_type" : "type-345",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15802,8 +15850,8 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned char *",
    "name" : "const unsigned char *",
-   "referenced_type" : "type-214",
-   "self_type" : "type-213",
+   "referenced_type" : "type-227",
+   "self_type" : "type-226",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -15811,7 +15859,7 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned int *",
    "name" : "const unsigned int *",
-   "referenced_type" : "type-237",
+   "referenced_type" : "type-239",
    "self_type" : "type-1105",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -15820,8 +15868,8 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned long long *",
    "name" : "const unsigned long long *",
-   "referenced_type" : "type-216",
-   "self_type" : "type-215",
+   "referenced_type" : "type-229",
+   "self_type" : "type-228",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -15838,8 +15886,8 @@
    "alignment" : 8,
    "linker_set_key" : "framebuffer_device_t *",
    "name" : "framebuffer_device_t *",
-   "referenced_type" : "type-547",
-   "self_type" : "type-568",
+   "referenced_type" : "type-544",
+   "self_type" : "type-565",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -15847,8 +15895,8 @@
    "alignment" : 8,
    "linker_set_key" : "hw_device_t *",
    "name" : "hw_device_t *",
-   "referenced_type" : "type-548",
-   "self_type" : "type-558",
+   "referenced_type" : "type-545",
+   "self_type" : "type-555",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15856,8 +15904,8 @@
    "alignment" : 8,
    "linker_set_key" : "hw_device_t **",
    "name" : "hw_device_t **",
-   "referenced_type" : "type-558",
-   "self_type" : "type-557",
+   "referenced_type" : "type-555",
+   "self_type" : "type-554",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15865,8 +15913,8 @@
    "alignment" : 8,
    "linker_set_key" : "hw_module_methods_t *",
    "name" : "hw_module_methods_t *",
-   "referenced_type" : "type-552",
-   "self_type" : "type-551",
+   "referenced_type" : "type-549",
+   "self_type" : "type-548",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15874,8 +15922,8 @@
    "alignment" : 8,
    "linker_set_key" : "hw_module_t *",
    "name" : "hw_module_t *",
-   "referenced_type" : "type-550",
-   "self_type" : "type-549",
+   "referenced_type" : "type-547",
+   "self_type" : "type-546",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15901,8 +15949,8 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *)",
    "name" : "int (*)(const gralloc_module_t *, const native_handle *)",
-   "referenced_type" : "type-583",
-   "self_type" : "type-582",
+   "referenced_type" : "type-580",
+   "self_type" : "type-579",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -15910,8 +15958,8 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int *)",
    "name" : "int (*)(const gralloc_module_t *, const native_handle *, int *)",
-   "referenced_type" : "type-595",
-   "self_type" : "type-594",
+   "referenced_type" : "type-592",
+   "self_type" : "type-591",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -15919,8 +15967,8 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
    "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "referenced_type" : "type-591",
-   "self_type" : "type-590",
+   "referenced_type" : "type-588",
+   "self_type" : "type-587",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -15928,8 +15976,8 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
    "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "referenced_type" : "type-598",
-   "self_type" : "type-597",
+   "referenced_type" : "type-595",
+   "self_type" : "type-594",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -15937,8 +15985,8 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
    "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "referenced_type" : "type-587",
-   "self_type" : "type-586",
+   "referenced_type" : "type-584",
+   "self_type" : "type-583",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -15946,8 +15994,26 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
    "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
-   "referenced_type" : "type-593",
-   "self_type" : "type-592",
+   "referenced_type" : "type-590",
+   "self_type" : "type-589",
+   "size" : 8,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "referenced_type" : "type-597",
+   "self_type" : "type-596",
+   "size" : 8,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "referenced_type" : "type-599",
+   "self_type" : "type-598",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -15955,8 +16021,8 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(const gralloc_module_t *, int, ...)",
    "name" : "int (*)(const gralloc_module_t *, int, ...)",
-   "referenced_type" : "type-589",
-   "self_type" : "type-588",
+   "referenced_type" : "type-586",
+   "self_type" : "type-585",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -15964,8 +16030,8 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(const hw_module_t *, const char *, hw_device_t **)",
    "name" : "int (*)(const hw_module_t *, const char *, hw_device_t **)",
-   "referenced_type" : "type-554",
-   "self_type" : "type-553",
+   "referenced_type" : "type-551",
+   "self_type" : "type-550",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15973,8 +16039,8 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(framebuffer_device_t *)",
    "name" : "int (*)(framebuffer_device_t *)",
-   "referenced_type" : "type-574",
-   "self_type" : "type-573",
+   "referenced_type" : "type-571",
+   "self_type" : "type-570",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -15982,8 +16048,8 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(framebuffer_device_t *, const native_handle *)",
    "name" : "int (*)(framebuffer_device_t *, const native_handle *)",
-   "referenced_type" : "type-572",
-   "self_type" : "type-571",
+   "referenced_type" : "type-569",
+   "self_type" : "type-568",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -15991,8 +16057,8 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(framebuffer_device_t *, int)",
    "name" : "int (*)(framebuffer_device_t *, int)",
-   "referenced_type" : "type-567",
-   "self_type" : "type-566",
+   "referenced_type" : "type-564",
+   "self_type" : "type-563",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16000,8 +16066,8 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(framebuffer_device_t *, int, int, int, int)",
    "name" : "int (*)(framebuffer_device_t *, int, int, int, int)",
-   "referenced_type" : "type-570",
-   "self_type" : "type-569",
+   "referenced_type" : "type-567",
+   "self_type" : "type-566",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16009,8 +16075,8 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(hw_device_t *)",
    "name" : "int (*)(hw_device_t *)",
-   "referenced_type" : "type-562",
-   "self_type" : "type-561",
+   "referenced_type" : "type-559",
+   "self_type" : "type-558",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -16018,8 +16084,8 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
-   "referenced_type" : "type-251",
-   "self_type" : "type-252",
+   "referenced_type" : "type-253",
+   "self_type" : "type-254",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
@@ -16027,8 +16093,8 @@
    "alignment" : 8,
    "linker_set_key" : "int *",
    "name" : "int *",
-   "referenced_type" : "type-103",
-   "self_type" : "type-596",
+   "referenced_type" : "type-105",
+   "self_type" : "type-593",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
@@ -16045,8 +16111,8 @@
    "alignment" : 8,
    "linker_set_key" : "long *",
    "name" : "long *",
-   "referenced_type" : "type-286",
-   "self_type" : "type-1433",
+   "referenced_type" : "type-12",
+   "self_type" : "type-11",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16054,7 +16120,7 @@
    "alignment" : 8,
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
-   "referenced_type" : "type-143",
+   "referenced_type" : "type-145",
    "self_type" : "type-1133",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
@@ -16063,8 +16129,8 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned char *",
    "name" : "unsigned char *",
-   "referenced_type" : "type-207",
-   "self_type" : "type-206",
+   "referenced_type" : "type-220",
+   "self_type" : "type-219",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -16072,8 +16138,8 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
-   "referenced_type" : "type-123",
-   "self_type" : "type-122",
+   "referenced_type" : "type-125",
+   "self_type" : "type-124",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16081,8 +16147,8 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned long *",
    "name" : "unsigned long *",
-   "referenced_type" : "type-124",
-   "self_type" : "type-2396",
+   "referenced_type" : "type-126",
+   "self_type" : "type-2398",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -16090,8 +16156,8 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned long long *",
    "name" : "unsigned long long *",
-   "referenced_type" : "type-209",
-   "self_type" : "type-208",
+   "referenced_type" : "type-222",
+   "self_type" : "type-221",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16108,8 +16174,8 @@
    "alignment" : 8,
    "linker_set_key" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned long, const unsigned long long *, unsigned long, void *)",
    "name" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned long, const unsigned long long *, unsigned long, void *)",
-   "referenced_type" : "type-211",
-   "self_type" : "type-210",
+   "referenced_type" : "type-224",
+   "self_type" : "type-223",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16117,8 +16183,8 @@
    "alignment" : 8,
    "linker_set_key" : "void (*)(android_native_base_t *)",
    "name" : "void (*)(android_native_base_t *)",
-   "referenced_type" : "type-523",
-   "self_type" : "type-522",
+   "referenced_type" : "type-520",
+   "self_type" : "type-519",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -16126,8 +16192,8 @@
    "alignment" : 8,
    "linker_set_key" : "void (*)(framebuffer_device_t *, char *, int)",
    "name" : "void (*)(framebuffer_device_t *, char *, int)",
-   "referenced_type" : "type-576",
-   "self_type" : "type-575",
+   "referenced_type" : "type-573",
+   "self_type" : "type-572",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16135,8 +16201,8 @@
    "alignment" : 8,
    "linker_set_key" : "void *",
    "name" : "void *",
-   "referenced_type" : "type-150",
-   "self_type" : "type-217",
+   "referenced_type" : "type-153",
+   "self_type" : "type-230",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -16144,8 +16210,8 @@
    "alignment" : 8,
    "linker_set_key" : "void **",
    "name" : "void **",
-   "referenced_type" : "type-217",
-   "self_type" : "type-253",
+   "referenced_type" : "type-230",
+   "self_type" : "type-255",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   }
@@ -16157,8 +16223,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-117",
-   "self_type" : "type-119",
+   "referenced_type" : "type-119",
+   "self_type" : "type-121",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16187,8 +16253,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-13",
-   "self_type" : "type-15",
+   "referenced_type" : "type-1576",
+   "self_type" : "type-1578",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16197,8 +16263,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1572",
-   "self_type" : "type-1574",
+   "referenced_type" : "type-15",
+   "self_type" : "type-17",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16207,8 +16273,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1607",
-   "self_type" : "type-1609",
+   "referenced_type" : "type-1611",
+   "self_type" : "type-1613",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16217,8 +16283,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-173",
-   "self_type" : "type-172",
+   "referenced_type" : "type-176",
+   "self_type" : "type-175",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16227,8 +16293,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1781",
-   "self_type" : "type-1783",
+   "referenced_type" : "type-1782",
+   "self_type" : "type-1784",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16237,8 +16303,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1829",
-   "self_type" : "type-1831",
+   "referenced_type" : "type-1830",
+   "self_type" : "type-1832",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16247,8 +16313,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1834",
-   "self_type" : "type-1836",
+   "referenced_type" : "type-1835",
+   "self_type" : "type-1837",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16257,8 +16323,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1844",
-   "self_type" : "type-1846",
+   "referenced_type" : "type-1845",
+   "self_type" : "type-1847",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16267,8 +16333,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1863",
-   "self_type" : "type-1865",
+   "referenced_type" : "type-1864",
+   "self_type" : "type-1866",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16277,8 +16343,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1929",
-   "self_type" : "type-1931",
+   "referenced_type" : "type-1930",
+   "self_type" : "type-1932",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16287,8 +16353,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2015",
-   "self_type" : "type-2017",
+   "referenced_type" : "type-2016",
+   "self_type" : "type-2018",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16297,8 +16363,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2167",
-   "self_type" : "type-2169",
+   "referenced_type" : "type-2170",
+   "self_type" : "type-2172",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16307,8 +16373,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2245",
-   "self_type" : "type-2247",
+   "referenced_type" : "type-2247",
+   "self_type" : "type-2249",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16317,8 +16383,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2287",
-   "self_type" : "type-2289",
+   "referenced_type" : "type-2289",
+   "self_type" : "type-2291",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16327,8 +16393,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2338",
-   "self_type" : "type-2340",
+   "referenced_type" : "type-2340",
+   "self_type" : "type-2342",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16337,8 +16403,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2457",
-   "self_type" : "type-2456",
+   "referenced_type" : "type-2459",
+   "self_type" : "type-2458",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16347,8 +16413,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2623",
-   "self_type" : "type-2625",
+   "referenced_type" : "type-2625",
+   "self_type" : "type-2627",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16357,8 +16423,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2649",
-   "self_type" : "type-2651",
+   "referenced_type" : "type-2651",
+   "self_type" : "type-2653",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16367,8 +16433,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-408",
-   "self_type" : "type-410",
+   "referenced_type" : "type-405",
+   "self_type" : "type-407",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16377,8 +16443,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-514",
-   "self_type" : "type-516",
+   "referenced_type" : "type-511",
+   "self_type" : "type-513",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16388,7 +16454,7 @@
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
    "referenced_type" : "type-744",
-   "self_type" : "type-746",
+   "self_type" : "type-747",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16397,8 +16463,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-850",
-   "self_type" : "type-853",
+   "referenced_type" : "type-852",
+   "self_type" : "type-854",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16427,8 +16493,8 @@
    "is_const" : true,
    "linker_set_key" : "android::hardware::IBinder *const",
    "name" : "android::hardware::IBinder *const",
-   "referenced_type" : "type-194",
-   "self_type" : "type-193",
+   "referenced_type" : "type-197",
+   "self_type" : "type-196",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -16444,32 +16510,32 @@
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-1772",
-   "self_type" : "type-1771",
+   "referenced_type" : "type-1773",
+   "self_type" : "type-1772",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-2135",
-   "self_type" : "type-2134",
+   "referenced_type" : "type-2134",
+   "self_type" : "type-2133",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-2409",
-   "self_type" : "type-2408",
+   "referenced_type" : "type-2411",
+   "self_type" : "type-2410",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const AHardwareBuffer",
    "name" : "const AHardwareBuffer",
-   "referenced_type" : "type-2071",
-   "self_type" : "type-2070",
+   "referenced_type" : "type-2073",
+   "self_type" : "type-2072",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -16485,7 +16551,7 @@
    "is_const" : true,
    "linker_set_key" : "const ANativeWindowBuffer",
    "name" : "const ANativeWindowBuffer",
-   "referenced_type" : "type-519",
+   "referenced_type" : "type-516",
    "self_type" : "type-639",
    "size" : 168,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
@@ -16494,32 +16560,32 @@
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-1763",
-   "self_type" : "type-1762",
+   "referenced_type" : "type-1764",
+   "self_type" : "type-1763",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-2047",
-   "self_type" : "type-2046",
+   "referenced_type" : "type-2046",
+   "self_type" : "type-2045",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-2426",
-   "self_type" : "type-2425",
+   "referenced_type" : "type-2428",
+   "self_type" : "type-2427",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-966",
-   "self_type" : "type-965",
+   "referenced_type" : "type-960",
+   "self_type" : "type-959",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
@@ -16527,8 +16593,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
    "name" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
-   "referenced_type" : "type-518",
-   "self_type" : "type-536",
+   "referenced_type" : "type-515",
+   "self_type" : "type-534",
    "size" : 184,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
   },
@@ -16548,7 +16614,7 @@
    "linker_set_key" : "const android::ColorSpace::TransferParameters",
    "name" : "const android::ColorSpace::TransferParameters",
    "referenced_type" : "type-982",
-   "self_type" : "type-1034",
+   "self_type" : "type-1031",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -16577,8 +16643,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime",
    "name" : "const android::FenceTime",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1395",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1400",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -16587,8 +16653,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot",
    "name" : "const android::FenceTime::Snapshot",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1388",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1393",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -16597,8 +16663,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot::State",
    "name" : "const android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1407",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1411",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16607,8 +16673,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::State",
    "name" : "const android::FenceTime::State",
-   "referenced_type" : "type-1378",
-   "self_type" : "type-1377",
+   "referenced_type" : "type-1383",
+   "self_type" : "type-1382",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -16627,8 +16693,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FrameStats",
    "name" : "const android::FrameStats",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1429",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1433",
    "size" : 128,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
@@ -16637,8 +16703,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Gralloc2Allocator",
    "name" : "const android::Gralloc2Allocator",
-   "referenced_type" : "type-355",
-   "self_type" : "type-363",
+   "referenced_type" : "type-352",
+   "self_type" : "type-360",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -16647,8 +16713,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Gralloc2Mapper",
    "name" : "const android::Gralloc2Mapper",
-   "referenced_type" : "type-333",
-   "self_type" : "type-346",
+   "referenced_type" : "type-330",
+   "self_type" : "type-343",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -16657,8 +16723,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-2061",
-   "self_type" : "type-2060",
+   "referenced_type" : "type-2063",
+   "self_type" : "type-2062",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -16667,8 +16733,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-2227",
-   "self_type" : "type-2226",
+   "referenced_type" : "type-2230",
+   "self_type" : "type-2229",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -16677,8 +16743,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-2231",
-   "self_type" : "type-2230",
+   "referenced_type" : "type-2233",
+   "self_type" : "type-2232",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -16707,8 +16773,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-829",
-   "self_type" : "type-828",
+   "referenced_type" : "type-830",
+   "self_type" : "type-829",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -16717,8 +16783,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-527",
-   "self_type" : "type-625",
+   "referenced_type" : "type-524",
+   "self_type" : "type-626",
    "size" : 256,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -16727,8 +16793,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferAllocator",
    "name" : "const android::GraphicBufferAllocator",
-   "referenced_type" : "type-543",
-   "self_type" : "type-720",
+   "referenced_type" : "type-540",
+   "self_type" : "type-721",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -16737,7 +16803,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferAllocator::alloc_rec_t",
    "name" : "const android::GraphicBufferAllocator::alloc_rec_t",
-   "referenced_type" : "type-677",
+   "referenced_type" : "type-681",
    "self_type" : "type-706",
    "size" : 64,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -16747,8 +16813,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferMapper",
    "name" : "const android::GraphicBufferMapper",
-   "referenced_type" : "type-529",
-   "self_type" : "type-615",
+   "referenced_type" : "type-526",
+   "self_type" : "type-616",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -16757,7 +16823,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::HdrCapabilities",
    "name" : "const android::HdrCapabilities",
-   "referenced_type" : "type-960",
+   "referenced_type" : "type-962",
    "self_type" : "type-973",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
@@ -16767,8 +16833,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-715",
-   "self_type" : "type-717",
+   "referenced_type" : "type-716",
+   "self_type" : "type-718",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -16778,7 +16844,7 @@
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect>",
    "name" : "const android::LightFlattenablePod<android::Rect>",
    "referenced_type" : "type-1243",
-   "self_type" : "type-2399",
+   "self_type" : "type-2401",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16827,7 +16893,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
-   "referenced_type" : "type-171",
+   "referenced_type" : "type-174",
    "self_type" : "type-1078",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
@@ -16837,8 +16903,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Region",
    "name" : "const android::Region",
-   "referenced_type" : "type-2390",
-   "self_type" : "type-2389",
+   "referenced_type" : "type-2392",
+   "self_type" : "type-2391",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -16847,7 +16913,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "const android::SortedVector<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-710",
+   "referenced_type" : "type-711",
    "self_type" : "type-713",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
@@ -16857,8 +16923,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-178",
-   "self_type" : "type-183",
+   "referenced_type" : "type-180",
+   "self_type" : "type-186",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -16867,8 +16933,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
-   "referenced_type" : "type-287",
-   "self_type" : "type-876",
+   "referenced_type" : "type-284",
+   "self_type" : "type-866",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -16877,8 +16943,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<android::Rect>",
    "name" : "const android::Vector<android::Rect>",
-   "referenced_type" : "type-2383",
-   "self_type" : "type-2385",
+   "referenced_type" : "type-2385",
+   "self_type" : "type-2387",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16887,8 +16953,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<long>",
    "name" : "const android::Vector<long>",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1426",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1430",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16897,8 +16963,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
-   "referenced_type" : "type-236",
-   "self_type" : "type-1423",
+   "referenced_type" : "type-238",
+   "self_type" : "type-1427",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -16918,7 +16984,7 @@
    "linker_set_key" : "const android::details::TMat33<float>",
    "name" : "const android::details::TMat33<float>",
    "referenced_type" : "type-904",
-   "self_type" : "type-928",
+   "self_type" : "type-920",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -16927,8 +16993,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TMat44<float>",
    "name" : "const android::details::TMat44<float>",
-   "referenced_type" : "type-2428",
-   "self_type" : "type-2432",
+   "referenced_type" : "type-2430",
+   "self_type" : "type-2434",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -16937,8 +17003,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TQuaternion<double>",
    "name" : "const android::details::TQuaternion<double>",
-   "referenced_type" : "type-340",
-   "self_type" : "type-406",
+   "referenced_type" : "type-336",
+   "self_type" : "type-403",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -16947,8 +17013,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TQuaternion<float>",
    "name" : "const android::details::TQuaternion<float>",
-   "referenced_type" : "type-415",
-   "self_type" : "type-434",
+   "referenced_type" : "type-411",
+   "self_type" : "type-431",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -16967,7 +17033,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec2<double>",
    "name" : "const android::details::TVec2<double>",
-   "referenced_type" : "type-62",
+   "referenced_type" : "type-57",
    "self_type" : "type-1073",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -16987,7 +17053,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec3<double>",
    "name" : "const android::details::TVec3<double>",
-   "referenced_type" : "type-73",
+   "referenced_type" : "type-68",
    "self_type" : "type-1373",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
@@ -17007,8 +17073,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec4<double>",
    "name" : "const android::details::TVec4<double>",
-   "referenced_type" : "type-57",
-   "self_type" : "type-176",
+   "referenced_type" : "type-52",
+   "self_type" : "type-171",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -17017,8 +17083,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec4<float>",
    "name" : "const android::details::TVec4<float>",
-   "referenced_type" : "type-218",
-   "self_type" : "type-327",
+   "referenced_type" : "type-203",
+   "self_type" : "type-324",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -17028,7 +17094,7 @@
    "linker_set_key" : "const android::half",
    "name" : "const android::half",
    "referenced_type" : "type-1",
-   "self_type" : "type-40",
+   "self_type" : "type-42",
    "size" : 2,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -17057,8 +17123,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::BpHwRefBase",
    "name" : "const android::hardware::BpHwRefBase",
-   "referenced_type" : "type-192",
-   "self_type" : "type-200",
+   "referenced_type" : "type-195",
+   "self_type" : "type-202",
    "size" : 48,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -17067,8 +17133,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-204",
-   "self_type" : "type-232",
+   "referenced_type" : "type-217",
+   "self_type" : "type-234",
    "size" : 136,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -17077,8 +17143,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
-   "referenced_type" : "type-99",
-   "self_type" : "type-109",
+   "referenced_type" : "type-101",
+   "self_type" : "type-111",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17087,8 +17153,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
-   "referenced_type" : "type-394",
-   "self_type" : "type-402",
+   "referenced_type" : "type-393",
+   "self_type" : "type-399",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17097,8 +17163,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
-   "referenced_type" : "type-111",
-   "self_type" : "type-115",
+   "referenced_type" : "type-113",
+   "self_type" : "type-117",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17107,7 +17173,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Status",
    "name" : "const android::hardware::Status",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1309",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -17127,8 +17193,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
-   "referenced_type" : "type-135",
-   "self_type" : "type-295",
+   "referenced_type" : "type-137",
+   "self_type" : "type-292",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17137,8 +17203,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned int>",
    "name" : "const android::hardware::details::hidl_pointer<unsigned int>",
-   "referenced_type" : "type-120",
-   "self_type" : "type-189",
+   "referenced_type" : "type-122",
+   "self_type" : "type-191",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17147,7 +17213,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::return_status",
    "name" : "const android::hardware::details::return_status",
-   "referenced_type" : "type-101",
+   "referenced_type" : "type-103",
    "self_type" : "type-1318",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -17157,8 +17223,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
-   "referenced_type" : "type-1745",
-   "self_type" : "type-1744",
+   "referenced_type" : "type-1746",
+   "self_type" : "type-1745",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17167,8 +17233,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
-   "referenced_type" : "type-1912",
-   "self_type" : "type-1911",
+   "referenced_type" : "type-1913",
+   "self_type" : "type-1912",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17177,8 +17243,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
-   "referenced_type" : "type-384",
-   "self_type" : "type-383",
+   "referenced_type" : "type-381",
+   "self_type" : "type-380",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17187,8 +17253,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
-   "referenced_type" : "type-2005",
-   "self_type" : "type-2004",
+   "referenced_type" : "type-2006",
+   "self_type" : "type-2005",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17197,8 +17263,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
-   "referenced_type" : "type-496",
-   "self_type" : "type-495",
+   "referenced_type" : "type-493",
+   "self_type" : "type-492",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17207,8 +17273,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_0::BufferUsage",
-   "referenced_type" : "type-149",
-   "self_type" : "type-152",
+   "referenced_type" : "type-152",
+   "self_type" : "type-155",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -17277,8 +17343,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_1::BufferUsage",
-   "referenced_type" : "type-157",
-   "self_type" : "type-159",
+   "referenced_type" : "type-159",
+   "self_type" : "type-161",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -17327,8 +17393,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_2::BufferUsage",
-   "referenced_type" : "type-422",
-   "self_type" : "type-424",
+   "referenced_type" : "type-419",
+   "self_type" : "type-421",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -17377,8 +17443,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper",
-   "referenced_type" : "type-1585",
-   "self_type" : "type-1584",
+   "referenced_type" : "type-1589",
+   "self_type" : "type-1588",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17387,8 +17453,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper",
-   "referenced_type" : "type-1857",
-   "self_type" : "type-1856",
+   "referenced_type" : "type-1858",
+   "self_type" : "type-1857",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17397,8 +17463,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper",
-   "referenced_type" : "type-52",
-   "self_type" : "type-51",
+   "referenced_type" : "type-87",
+   "self_type" : "type-86",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17407,8 +17473,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper",
-   "referenced_type" : "type-1595",
-   "self_type" : "type-1594",
+   "referenced_type" : "type-1599",
+   "self_type" : "type-1598",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17417,8 +17483,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper",
-   "referenced_type" : "type-1861",
-   "self_type" : "type-1860",
+   "referenced_type" : "type-1862",
+   "self_type" : "type-1861",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17427,8 +17493,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper",
-   "referenced_type" : "type-97",
-   "self_type" : "type-96",
+   "referenced_type" : "type-99",
+   "self_type" : "type-98",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17437,8 +17503,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper",
-   "referenced_type" : "type-1919",
-   "self_type" : "type-1918",
+   "referenced_type" : "type-1920",
+   "self_type" : "type-1919",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17447,8 +17513,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper",
-   "referenced_type" : "type-393",
-   "self_type" : "type-392",
+   "referenced_type" : "type-390",
+   "self_type" : "type-389",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17467,8 +17533,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
-   "referenced_type" : "type-148",
-   "self_type" : "type-153",
+   "referenced_type" : "type-151",
+   "self_type" : "type-156",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17477,8 +17543,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
-   "referenced_type" : "type-156",
-   "self_type" : "type-160",
+   "referenced_type" : "type-158",
+   "self_type" : "type-162",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17487,8 +17553,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
-   "referenced_type" : "type-421",
-   "self_type" : "type-425",
+   "referenced_type" : "type-418",
+   "self_type" : "type-422",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17497,7 +17563,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-138",
+   "referenced_type" : "type-140",
    "self_type" : "type-1122",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -17527,8 +17593,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_handle>",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_handle>",
-   "referenced_type" : "type-134",
-   "self_type" : "type-145",
+   "referenced_type" : "type-136",
+   "self_type" : "type-148",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17537,8 +17603,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned int>",
    "name" : "const android::hardware::hidl_vec<unsigned int>",
-   "referenced_type" : "type-128",
-   "self_type" : "type-131",
+   "referenced_type" : "type-130",
+   "self_type" : "type-133",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17557,8 +17623,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "const android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-163",
-   "self_type" : "type-164",
+   "referenced_type" : "type-166",
+   "self_type" : "type-167",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -17567,8 +17633,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase",
    "name" : "const android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-170",
-   "self_type" : "type-169",
+   "referenced_type" : "type-173",
+   "self_type" : "type-172",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
@@ -17577,8 +17643,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-297",
-   "self_type" : "type-296",
+   "referenced_type" : "type-294",
+   "self_type" : "type-293",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
@@ -17607,8 +17673,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::IBinder>",
    "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-250",
-   "self_type" : "type-275",
+   "referenced_type" : "type-252",
+   "self_type" : "type-271",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -17617,8 +17683,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::ProcessState>",
    "name" : "const android::sp<android::hardware::ProcessState>",
-   "referenced_type" : "type-281",
-   "self_type" : "type-280",
+   "referenced_type" : "type-277",
+   "self_type" : "type-276",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -17627,8 +17693,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
    "name" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
-   "referenced_type" : "type-357",
-   "self_type" : "type-381",
+   "referenced_type" : "type-354",
+   "self_type" : "type-378",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17637,8 +17703,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
    "name" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
-   "referenced_type" : "type-485",
-   "self_type" : "type-493",
+   "referenced_type" : "type-482",
+   "self_type" : "type-490",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17647,8 +17713,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
-   "referenced_type" : "type-334",
-   "self_type" : "type-389",
+   "referenced_type" : "type-331",
+   "self_type" : "type-386",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17657,8 +17723,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
-   "referenced_type" : "type-53",
-   "self_type" : "type-91",
+   "referenced_type" : "type-88",
+   "self_type" : "type-93",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17667,8 +17733,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
    "name" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
-   "referenced_type" : "type-498",
-   "self_type" : "type-506",
+   "referenced_type" : "type-496",
+   "self_type" : "type-503",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17687,8 +17753,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::base::V1_0::IBase>",
    "name" : "const android::sp<android::hidl::base::V1_0::IBase>",
-   "referenced_type" : "type-365",
-   "self_type" : "type-367",
+   "referenced_type" : "type-362",
+   "self_type" : "type-364",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17697,8 +17763,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification>",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification>",
-   "referenced_type" : "type-373",
-   "self_type" : "type-376",
+   "referenced_type" : "type-370",
+   "self_type" : "type-373",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17717,8 +17783,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ui::Transform",
    "name" : "const android::ui::Transform",
-   "referenced_type" : "type-2435",
-   "self_type" : "type-2438",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2440",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -17727,8 +17793,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ui::Transform::mat33",
    "name" : "const android::ui::Transform::mat33",
-   "referenced_type" : "type-2436",
-   "self_type" : "type-2446",
+   "referenced_type" : "type-2438",
+   "self_type" : "type-2448",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -17738,7 +17804,7 @@
    "linker_set_key" : "const bool",
    "name" : "const bool",
    "referenced_type" : "type-6",
-   "self_type" : "type-372",
+   "self_type" : "type-369",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -17747,8 +17813,8 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-290",
-   "self_type" : "type-289",
+   "referenced_type" : "type-287",
+   "self_type" : "type-286",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -17757,8 +17823,8 @@
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-181",
-   "self_type" : "type-180",
+   "referenced_type" : "type-183",
+   "self_type" : "type-182",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -17767,8 +17833,8 @@
    "is_const" : true,
    "linker_set_key" : "const double",
    "name" : "const double",
-   "referenced_type" : "type-45",
-   "self_type" : "type-854",
+   "referenced_type" : "type-44",
+   "self_type" : "type-851",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17778,7 +17844,7 @@
    "linker_set_key" : "const float",
    "name" : "const float",
    "referenced_type" : "type-10",
-   "self_type" : "type-564",
+   "self_type" : "type-561",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
   },
@@ -17794,8 +17860,8 @@
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-1775",
-   "self_type" : "type-1774",
+   "referenced_type" : "type-1776",
+   "self_type" : "type-1775",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
@@ -17810,8 +17876,8 @@
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-2415",
-   "self_type" : "type-2414",
+   "referenced_type" : "type-2417",
+   "self_type" : "type-2416",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
@@ -17819,8 +17885,8 @@
    "is_const" : true,
    "linker_set_key" : "const gralloc_module_t",
    "name" : "const gralloc_module_t",
-   "referenced_type" : "type-581",
-   "self_type" : "type-585",
+   "referenced_type" : "type-578",
+   "self_type" : "type-582",
    "size" : 344,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -17829,8 +17895,8 @@
    "is_const" : true,
    "linker_set_key" : "const hw_module_t",
    "name" : "const hw_module_t",
-   "referenced_type" : "type-550",
-   "self_type" : "type-556",
+   "referenced_type" : "type-547",
+   "self_type" : "type-553",
    "size" : 248,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -17839,8 +17905,8 @@
    "is_const" : true,
    "linker_set_key" : "const int",
    "name" : "const int",
-   "referenced_type" : "type-103",
-   "self_type" : "type-563",
+   "referenced_type" : "type-105",
+   "self_type" : "type-560",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -17856,120 +17922,120 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-126",
-   "self_type" : "type-125",
+   "referenced_type" : "type-128",
+   "self_type" : "type-127",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1576",
-   "self_type" : "type-1575",
+   "referenced_type" : "type-1581",
+   "self_type" : "type-1580",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1612",
-   "self_type" : "type-1611",
+   "referenced_type" : "type-1616",
+   "self_type" : "type-1615",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1786",
-   "self_type" : "type-1785",
+   "referenced_type" : "type-1787",
+   "self_type" : "type-1786",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1848",
-   "self_type" : "type-1847",
+   "referenced_type" : "type-1849",
+   "self_type" : "type-1848",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1867",
-   "self_type" : "type-1866",
+   "referenced_type" : "type-1868",
+   "self_type" : "type-1867",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-18",
-   "self_type" : "type-17",
+   "referenced_type" : "type-1936",
+   "self_type" : "type-1935",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1934",
-   "self_type" : "type-1933",
+   "referenced_type" : "type-2083",
+   "self_type" : "type-2082",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2081",
-   "self_type" : "type-2080",
+   "referenced_type" : "type-2175",
+   "self_type" : "type-2174",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2172",
-   "self_type" : "type-2171",
+   "referenced_type" : "type-2251",
+   "self_type" : "type-2250",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2249",
-   "self_type" : "type-2248",
+   "referenced_type" : "type-2293",
+   "self_type" : "type-2292",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2291",
-   "self_type" : "type-2290",
+   "referenced_type" : "type-2344",
+   "self_type" : "type-2343",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2342",
-   "self_type" : "type-2341",
+   "referenced_type" : "type-2476",
+   "self_type" : "type-2475",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2474",
-   "self_type" : "type-2473",
+   "referenced_type" : "type-39",
+   "self_type" : "type-38",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-413",
-   "self_type" : "type-412",
+   "referenced_type" : "type-410",
+   "self_type" : "type-409",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -17984,16 +18050,16 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-749",
-   "self_type" : "type-748",
+   "referenced_type" : "type-750",
+   "self_type" : "type-749",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-856",
-   "self_type" : "type-855",
+   "referenced_type" : "type-858",
+   "self_type" : "type-857",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -18027,7 +18093,7 @@
    "is_const" : true,
    "linker_set_key" : "const long",
    "name" : "const long",
-   "referenced_type" : "type-286",
+   "referenced_type" : "type-12",
    "self_type" : "type-848",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -18037,8 +18103,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle",
    "name" : "const native_handle",
-   "referenced_type" : "type-143",
-   "self_type" : "type-142",
+   "referenced_type" : "type-145",
+   "self_type" : "type-144",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18047,8 +18113,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle *const",
    "name" : "const native_handle *const",
-   "referenced_type" : "type-141",
-   "self_type" : "type-696",
+   "referenced_type" : "type-143",
+   "self_type" : "type-699",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18058,7 +18124,7 @@
    "linker_set_key" : "const short",
    "name" : "const short",
    "referenced_type" : "type-603",
-   "self_type" : "type-826",
+   "self_type" : "type-825",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18087,8 +18153,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3>",
    "name" : "const std::array<android::details::TVec2<float>, 3>",
-   "referenced_type" : "type-1769",
-   "self_type" : "type-1768",
+   "referenced_type" : "type-1770",
+   "self_type" : "type-1769",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -18097,8 +18163,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3>",
    "name" : "const std::array<android::details::TVec2<float>, 3>",
-   "referenced_type" : "type-2121",
-   "self_type" : "type-2120",
+   "referenced_type" : "type-2119",
+   "self_type" : "type-2118",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -18117,8 +18183,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1687",
-   "self_type" : "type-1686",
+   "referenced_type" : "type-1688",
+   "self_type" : "type-1687",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18127,8 +18193,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1793",
-   "self_type" : "type-1792",
+   "referenced_type" : "type-1794",
+   "self_type" : "type-1793",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18137,8 +18203,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1880",
-   "self_type" : "type-1879",
+   "referenced_type" : "type-1881",
+   "self_type" : "type-1880",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18147,8 +18213,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1957",
-   "self_type" : "type-1956",
+   "referenced_type" : "type-1959",
+   "self_type" : "type-1958",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18157,8 +18223,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2088",
-   "self_type" : "type-2087",
+   "referenced_type" : "type-2091",
+   "self_type" : "type-2090",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18167,8 +18233,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2186",
-   "self_type" : "type-2185",
+   "referenced_type" : "type-2189",
+   "self_type" : "type-2188",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18177,8 +18243,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2256",
-   "self_type" : "type-2255",
+   "referenced_type" : "type-2258",
+   "self_type" : "type-2257",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18187,8 +18253,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2296",
-   "self_type" : "type-2295",
+   "referenced_type" : "type-2298",
+   "self_type" : "type-2297",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18197,8 +18263,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2347",
-   "self_type" : "type-2346",
+   "referenced_type" : "type-2349",
+   "self_type" : "type-2348",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18207,8 +18273,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2512",
-   "self_type" : "type-2511",
+   "referenced_type" : "type-2514",
+   "self_type" : "type-2513",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18217,8 +18283,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-303",
-   "self_type" : "type-302",
+   "referenced_type" : "type-300",
+   "self_type" : "type-299",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18227,8 +18293,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-443",
-   "self_type" : "type-442",
+   "referenced_type" : "type-441",
+   "self_type" : "type-440",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18247,8 +18313,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-763",
-   "self_type" : "type-762",
+   "referenced_type" : "type-765",
+   "self_type" : "type-764",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18257,8 +18323,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-867",
-   "self_type" : "type-866",
+   "referenced_type" : "type-868",
+   "self_type" : "type-867",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18267,8 +18333,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-923",
-   "self_type" : "type-922",
+   "referenced_type" : "type-924",
+   "self_type" : "type-923",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18307,8 +18373,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1693",
-   "self_type" : "type-1692",
+   "referenced_type" : "type-1694",
+   "self_type" : "type-1693",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18317,8 +18383,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1799",
-   "self_type" : "type-1798",
+   "referenced_type" : "type-1800",
+   "self_type" : "type-1799",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18327,8 +18393,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1886",
-   "self_type" : "type-1885",
+   "referenced_type" : "type-1887",
+   "self_type" : "type-1886",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18337,8 +18403,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1964",
-   "self_type" : "type-1963",
+   "referenced_type" : "type-1966",
+   "self_type" : "type-1965",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18347,8 +18413,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2094",
-   "self_type" : "type-2093",
+   "referenced_type" : "type-2097",
+   "self_type" : "type-2096",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18357,8 +18423,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2193",
-   "self_type" : "type-2192",
+   "referenced_type" : "type-2196",
+   "self_type" : "type-2195",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18367,8 +18433,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2262",
-   "self_type" : "type-2261",
+   "referenced_type" : "type-2264",
+   "self_type" : "type-2263",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18377,8 +18443,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2302",
-   "self_type" : "type-2301",
+   "referenced_type" : "type-2304",
+   "self_type" : "type-2303",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18387,8 +18453,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2353",
-   "self_type" : "type-2352",
+   "referenced_type" : "type-2355",
+   "self_type" : "type-2354",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18397,8 +18463,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2518",
-   "self_type" : "type-2517",
+   "referenced_type" : "type-2520",
+   "self_type" : "type-2519",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18407,8 +18473,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-309",
-   "self_type" : "type-308",
+   "referenced_type" : "type-307",
+   "self_type" : "type-306",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18417,8 +18483,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-450",
-   "self_type" : "type-449",
+   "referenced_type" : "type-447",
+   "self_type" : "type-446",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18427,8 +18493,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-659",
-   "self_type" : "type-658",
+   "referenced_type" : "type-660",
+   "self_type" : "type-659",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18437,8 +18503,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-769",
-   "self_type" : "type-768",
+   "referenced_type" : "type-771",
+   "self_type" : "type-770",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18447,8 +18513,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-873",
-   "self_type" : "type-872",
+   "referenced_type" : "type-874",
+   "self_type" : "type-873",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18457,8 +18523,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-930",
-   "self_type" : "type-929",
+   "referenced_type" : "type-931",
+   "self_type" : "type-930",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18467,8 +18533,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1004",
-   "self_type" : "type-1003",
+   "referenced_type" : "type-1005",
+   "self_type" : "type-1004",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18487,8 +18553,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1695",
-   "self_type" : "type-1694",
+   "referenced_type" : "type-1696",
+   "self_type" : "type-1695",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18497,8 +18563,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1801",
-   "self_type" : "type-1800",
+   "referenced_type" : "type-1802",
+   "self_type" : "type-1801",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18507,8 +18573,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1888",
-   "self_type" : "type-1887",
+   "referenced_type" : "type-1889",
+   "self_type" : "type-1888",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18517,8 +18583,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1966",
-   "self_type" : "type-1965",
+   "referenced_type" : "type-1968",
+   "self_type" : "type-1967",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18527,8 +18593,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2096",
-   "self_type" : "type-2095",
+   "referenced_type" : "type-2099",
+   "self_type" : "type-2098",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18537,8 +18603,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2195",
-   "self_type" : "type-2194",
+   "referenced_type" : "type-2198",
+   "self_type" : "type-2197",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18547,8 +18613,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2264",
-   "self_type" : "type-2263",
+   "referenced_type" : "type-2266",
+   "self_type" : "type-2265",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18557,8 +18623,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2304",
-   "self_type" : "type-2303",
+   "referenced_type" : "type-2306",
+   "self_type" : "type-2305",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18567,8 +18633,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2355",
-   "self_type" : "type-2354",
+   "referenced_type" : "type-2357",
+   "self_type" : "type-2356",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18577,8 +18643,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2520",
-   "self_type" : "type-2519",
+   "referenced_type" : "type-2522",
+   "self_type" : "type-2521",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18587,8 +18653,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-312",
-   "self_type" : "type-311",
+   "referenced_type" : "type-309",
+   "self_type" : "type-308",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18597,8 +18663,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-452",
-   "self_type" : "type-451",
+   "referenced_type" : "type-449",
+   "self_type" : "type-448",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18607,8 +18673,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-661",
-   "self_type" : "type-660",
+   "referenced_type" : "type-662",
+   "self_type" : "type-661",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18627,8 +18693,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-875",
-   "self_type" : "type-874",
+   "referenced_type" : "type-876",
+   "self_type" : "type-875",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18637,8 +18703,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-932",
-   "self_type" : "type-931",
+   "referenced_type" : "type-933",
+   "self_type" : "type-932",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18667,8 +18733,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1691",
-   "self_type" : "type-1690",
+   "referenced_type" : "type-1692",
+   "self_type" : "type-1691",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18677,8 +18743,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1797",
-   "self_type" : "type-1796",
+   "referenced_type" : "type-1798",
+   "self_type" : "type-1797",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18687,8 +18753,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1884",
-   "self_type" : "type-1883",
+   "referenced_type" : "type-1885",
+   "self_type" : "type-1884",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18697,8 +18763,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1962",
-   "self_type" : "type-1961",
+   "referenced_type" : "type-1963",
+   "self_type" : "type-1962",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18707,8 +18773,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2092",
-   "self_type" : "type-2091",
+   "referenced_type" : "type-2095",
+   "self_type" : "type-2094",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18717,8 +18783,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2190",
-   "self_type" : "type-2189",
+   "referenced_type" : "type-2193",
+   "self_type" : "type-2192",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18727,8 +18793,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2260",
-   "self_type" : "type-2259",
+   "referenced_type" : "type-2262",
+   "self_type" : "type-2261",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18737,8 +18803,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2300",
-   "self_type" : "type-2299",
+   "referenced_type" : "type-2302",
+   "self_type" : "type-2301",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18747,8 +18813,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2351",
-   "self_type" : "type-2350",
+   "referenced_type" : "type-2353",
+   "self_type" : "type-2352",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18757,8 +18823,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2516",
-   "self_type" : "type-2515",
+   "referenced_type" : "type-2518",
+   "self_type" : "type-2517",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18767,8 +18833,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-307",
-   "self_type" : "type-306",
+   "referenced_type" : "type-304",
+   "self_type" : "type-303",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18777,8 +18843,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-448",
-   "self_type" : "type-447",
+   "referenced_type" : "type-445",
+   "self_type" : "type-444",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18787,8 +18853,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-657",
-   "self_type" : "type-656",
+   "referenced_type" : "type-658",
+   "self_type" : "type-657",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18797,8 +18863,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-767",
-   "self_type" : "type-766",
+   "referenced_type" : "type-769",
+   "self_type" : "type-768",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18807,8 +18873,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-871",
-   "self_type" : "type-870",
+   "referenced_type" : "type-872",
+   "self_type" : "type-871",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18817,8 +18883,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-927",
-   "self_type" : "type-926",
+   "referenced_type" : "type-928",
+   "self_type" : "type-927",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18827,8 +18893,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1006",
-   "self_type" : "type-1005",
+   "referenced_type" : "type-1007",
+   "self_type" : "type-1006",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18847,8 +18913,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1697",
-   "self_type" : "type-1696",
+   "referenced_type" : "type-1698",
+   "self_type" : "type-1697",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18857,8 +18923,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1803",
-   "self_type" : "type-1802",
+   "referenced_type" : "type-1804",
+   "self_type" : "type-1803",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18867,8 +18933,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1890",
-   "self_type" : "type-1889",
+   "referenced_type" : "type-1891",
+   "self_type" : "type-1890",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18877,8 +18943,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1968",
-   "self_type" : "type-1967",
+   "referenced_type" : "type-1970",
+   "self_type" : "type-1969",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18887,8 +18953,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2099",
-   "self_type" : "type-2098",
+   "referenced_type" : "type-2103",
+   "self_type" : "type-2102",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18897,8 +18963,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2197",
-   "self_type" : "type-2196",
+   "referenced_type" : "type-2200",
+   "self_type" : "type-2199",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18907,8 +18973,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2266",
-   "self_type" : "type-2265",
+   "referenced_type" : "type-2268",
+   "self_type" : "type-2267",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18917,8 +18983,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2306",
-   "self_type" : "type-2305",
+   "referenced_type" : "type-2308",
+   "self_type" : "type-2307",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18927,8 +18993,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2357",
-   "self_type" : "type-2356",
+   "referenced_type" : "type-2359",
+   "self_type" : "type-2358",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18937,8 +19003,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2522",
-   "self_type" : "type-2521",
+   "referenced_type" : "type-2524",
+   "self_type" : "type-2523",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18947,8 +19013,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-314",
-   "self_type" : "type-313",
+   "referenced_type" : "type-311",
+   "self_type" : "type-310",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18957,8 +19023,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-454",
-   "self_type" : "type-453",
+   "referenced_type" : "type-451",
+   "self_type" : "type-450",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18987,8 +19053,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-878",
-   "self_type" : "type-877",
+   "referenced_type" : "type-879",
+   "self_type" : "type-878",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18997,8 +19063,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-934",
-   "self_type" : "type-933",
+   "referenced_type" : "type-935",
+   "self_type" : "type-934",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19017,8 +19083,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1685",
-   "self_type" : "type-1684",
+   "referenced_type" : "type-1686",
+   "self_type" : "type-1685",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19027,8 +19093,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1791",
-   "self_type" : "type-1790",
+   "referenced_type" : "type-1792",
+   "self_type" : "type-1791",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19037,8 +19103,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1878",
-   "self_type" : "type-1877",
+   "referenced_type" : "type-1879",
+   "self_type" : "type-1878",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19047,8 +19113,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1955",
-   "self_type" : "type-1954",
+   "referenced_type" : "type-1957",
+   "self_type" : "type-1956",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19057,8 +19123,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2086",
-   "self_type" : "type-2085",
+   "referenced_type" : "type-2088",
+   "self_type" : "type-2087",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19067,8 +19133,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2184",
-   "self_type" : "type-2183",
+   "referenced_type" : "type-2187",
+   "self_type" : "type-2186",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19077,8 +19143,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2254",
-   "self_type" : "type-2253",
+   "referenced_type" : "type-2256",
+   "self_type" : "type-2255",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19087,8 +19153,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2294",
-   "self_type" : "type-2293",
+   "referenced_type" : "type-2296",
+   "self_type" : "type-2295",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19097,8 +19163,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2345",
-   "self_type" : "type-2344",
+   "referenced_type" : "type-2347",
+   "self_type" : "type-2346",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19107,8 +19173,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2510",
-   "self_type" : "type-2509",
+   "referenced_type" : "type-2512",
+   "self_type" : "type-2511",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19117,8 +19183,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-301",
-   "self_type" : "type-300",
+   "referenced_type" : "type-298",
+   "self_type" : "type-297",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19127,8 +19193,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-441",
-   "self_type" : "type-440",
+   "referenced_type" : "type-438",
+   "self_type" : "type-437",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19137,8 +19203,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-650",
-   "self_type" : "type-649",
+   "referenced_type" : "type-651",
+   "self_type" : "type-650",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19157,8 +19223,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-864",
-   "self_type" : "type-863",
+   "referenced_type" : "type-865",
+   "self_type" : "type-864",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19167,8 +19233,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-921",
-   "self_type" : "type-920",
+   "referenced_type" : "type-922",
+   "self_type" : "type-921",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19197,8 +19263,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1689",
-   "self_type" : "type-1688",
+   "referenced_type" : "type-1690",
+   "self_type" : "type-1689",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19207,8 +19273,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1795",
-   "self_type" : "type-1794",
+   "referenced_type" : "type-1796",
+   "self_type" : "type-1795",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19217,8 +19283,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1882",
-   "self_type" : "type-1881",
+   "referenced_type" : "type-1883",
+   "self_type" : "type-1882",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19227,8 +19293,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1960",
-   "self_type" : "type-1959",
+   "referenced_type" : "type-1961",
+   "self_type" : "type-1960",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19237,8 +19303,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2090",
-   "self_type" : "type-2089",
+   "referenced_type" : "type-2093",
+   "self_type" : "type-2092",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19247,8 +19313,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2188",
-   "self_type" : "type-2187",
+   "referenced_type" : "type-2191",
+   "self_type" : "type-2190",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19257,8 +19323,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2258",
-   "self_type" : "type-2257",
+   "referenced_type" : "type-2260",
+   "self_type" : "type-2259",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19267,8 +19333,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2298",
-   "self_type" : "type-2297",
+   "referenced_type" : "type-2300",
+   "self_type" : "type-2299",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19277,8 +19343,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2349",
-   "self_type" : "type-2348",
+   "referenced_type" : "type-2351",
+   "self_type" : "type-2350",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19287,8 +19353,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2514",
-   "self_type" : "type-2513",
+   "referenced_type" : "type-2516",
+   "self_type" : "type-2515",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19297,8 +19363,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-305",
-   "self_type" : "type-304",
+   "referenced_type" : "type-302",
+   "self_type" : "type-301",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19307,8 +19373,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-445",
-   "self_type" : "type-444",
+   "referenced_type" : "type-443",
+   "self_type" : "type-442",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19327,8 +19393,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-765",
-   "self_type" : "type-764",
+   "referenced_type" : "type-767",
+   "self_type" : "type-766",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19337,8 +19403,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-869",
-   "self_type" : "type-868",
+   "referenced_type" : "type-870",
+   "self_type" : "type-869",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19347,8 +19413,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-925",
-   "self_type" : "type-924",
+   "referenced_type" : "type-926",
+   "self_type" : "type-925",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19367,8 +19433,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1011",
-   "self_type" : "type-1010",
+   "referenced_type" : "type-1013",
+   "self_type" : "type-1012",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19387,8 +19453,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1701",
-   "self_type" : "type-1700",
+   "referenced_type" : "type-1702",
+   "self_type" : "type-1701",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19397,8 +19463,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1807",
-   "self_type" : "type-1806",
+   "referenced_type" : "type-1808",
+   "self_type" : "type-1807",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19407,8 +19473,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1894",
-   "self_type" : "type-1893",
+   "referenced_type" : "type-1895",
+   "self_type" : "type-1894",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19417,8 +19483,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1973",
-   "self_type" : "type-1972",
+   "referenced_type" : "type-1975",
+   "self_type" : "type-1974",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19427,8 +19493,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2105",
-   "self_type" : "type-2104",
+   "referenced_type" : "type-2107",
+   "self_type" : "type-2106",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19437,8 +19503,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2202",
-   "self_type" : "type-2201",
+   "referenced_type" : "type-2205",
+   "self_type" : "type-2204",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19447,8 +19513,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2270",
-   "self_type" : "type-2269",
+   "referenced_type" : "type-2272",
+   "self_type" : "type-2271",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19457,8 +19523,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2310",
-   "self_type" : "type-2309",
+   "referenced_type" : "type-2312",
+   "self_type" : "type-2311",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19467,8 +19533,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2361",
-   "self_type" : "type-2360",
+   "referenced_type" : "type-2363",
+   "self_type" : "type-2362",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19477,8 +19543,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2530",
-   "self_type" : "type-2529",
+   "referenced_type" : "type-2532",
+   "self_type" : "type-2531",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19487,8 +19553,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-319",
-   "self_type" : "type-318",
+   "referenced_type" : "type-316",
+   "self_type" : "type-315",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19497,8 +19563,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-458",
-   "self_type" : "type-457",
+   "referenced_type" : "type-455",
+   "self_type" : "type-454",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19507,8 +19573,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-668",
-   "self_type" : "type-667",
+   "referenced_type" : "type-669",
+   "self_type" : "type-668",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19517,8 +19583,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-779",
-   "self_type" : "type-778",
+   "referenced_type" : "type-780",
+   "self_type" : "type-779",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19527,8 +19593,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-883",
-   "self_type" : "type-882",
+   "referenced_type" : "type-884",
+   "self_type" : "type-883",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19537,8 +19603,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-939",
-   "self_type" : "type-938",
+   "referenced_type" : "type-940",
+   "self_type" : "type-939",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19547,8 +19613,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1015",
-   "self_type" : "type-1014",
+   "referenced_type" : "type-1017",
+   "self_type" : "type-1016",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19567,8 +19633,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1705",
-   "self_type" : "type-1704",
+   "referenced_type" : "type-1706",
+   "self_type" : "type-1705",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19577,8 +19643,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1811",
-   "self_type" : "type-1810",
+   "referenced_type" : "type-1812",
+   "self_type" : "type-1811",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19587,8 +19653,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1898",
-   "self_type" : "type-1897",
+   "referenced_type" : "type-1899",
+   "self_type" : "type-1898",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19597,8 +19663,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1978",
-   "self_type" : "type-1977",
+   "referenced_type" : "type-1979",
+   "self_type" : "type-1978",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19607,8 +19673,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2109",
-   "self_type" : "type-2108",
+   "referenced_type" : "type-2111",
+   "self_type" : "type-2110",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19617,8 +19683,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2206",
-   "self_type" : "type-2205",
+   "referenced_type" : "type-2209",
+   "self_type" : "type-2208",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19627,8 +19693,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2274",
-   "self_type" : "type-2273",
+   "referenced_type" : "type-2276",
+   "self_type" : "type-2275",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19637,8 +19703,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2314",
-   "self_type" : "type-2313",
+   "referenced_type" : "type-2316",
+   "self_type" : "type-2315",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19647,8 +19713,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2365",
-   "self_type" : "type-2364",
+   "referenced_type" : "type-2367",
+   "self_type" : "type-2366",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19657,8 +19723,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2534",
-   "self_type" : "type-2533",
+   "referenced_type" : "type-2536",
+   "self_type" : "type-2535",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19667,8 +19733,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-323",
-   "self_type" : "type-322",
+   "referenced_type" : "type-320",
+   "self_type" : "type-319",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19677,8 +19743,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-464",
-   "self_type" : "type-463",
+   "referenced_type" : "type-461",
+   "self_type" : "type-460",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19687,8 +19753,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-673",
-   "self_type" : "type-672",
+   "referenced_type" : "type-674",
+   "self_type" : "type-673",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19697,8 +19763,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-783",
-   "self_type" : "type-782",
+   "referenced_type" : "type-784",
+   "self_type" : "type-783",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19707,8 +19773,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-887",
-   "self_type" : "type-886",
+   "referenced_type" : "type-888",
+   "self_type" : "type-887",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19717,8 +19783,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-943",
-   "self_type" : "type-942",
+   "referenced_type" : "type-944",
+   "self_type" : "type-943",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19727,8 +19793,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1013",
-   "self_type" : "type-1012",
+   "referenced_type" : "type-1015",
+   "self_type" : "type-1014",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19747,8 +19813,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1703",
-   "self_type" : "type-1702",
+   "referenced_type" : "type-1704",
+   "self_type" : "type-1703",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19757,8 +19823,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1809",
-   "self_type" : "type-1808",
+   "referenced_type" : "type-1810",
+   "self_type" : "type-1809",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19767,8 +19833,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1896",
-   "self_type" : "type-1895",
+   "referenced_type" : "type-1897",
+   "self_type" : "type-1896",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19777,8 +19843,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1975",
-   "self_type" : "type-1974",
+   "referenced_type" : "type-1977",
+   "self_type" : "type-1976",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19787,8 +19853,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2107",
-   "self_type" : "type-2106",
+   "referenced_type" : "type-2109",
+   "self_type" : "type-2108",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19797,8 +19863,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2204",
-   "self_type" : "type-2203",
+   "referenced_type" : "type-2207",
+   "self_type" : "type-2206",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19807,8 +19873,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2272",
-   "self_type" : "type-2271",
+   "referenced_type" : "type-2274",
+   "self_type" : "type-2273",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19817,8 +19883,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2312",
-   "self_type" : "type-2311",
+   "referenced_type" : "type-2314",
+   "self_type" : "type-2313",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19827,8 +19893,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2363",
-   "self_type" : "type-2362",
+   "referenced_type" : "type-2365",
+   "self_type" : "type-2364",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19837,8 +19903,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2532",
-   "self_type" : "type-2531",
+   "referenced_type" : "type-2534",
+   "self_type" : "type-2533",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19847,8 +19913,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-321",
-   "self_type" : "type-320",
+   "referenced_type" : "type-318",
+   "self_type" : "type-317",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19857,8 +19923,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-460",
-   "self_type" : "type-459",
+   "referenced_type" : "type-459",
+   "self_type" : "type-458",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19877,8 +19943,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-781",
-   "self_type" : "type-780",
+   "referenced_type" : "type-782",
+   "self_type" : "type-781",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19887,8 +19953,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-885",
-   "self_type" : "type-884",
+   "referenced_type" : "type-886",
+   "self_type" : "type-885",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19897,8 +19963,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-941",
-   "self_type" : "type-940",
+   "referenced_type" : "type-942",
+   "self_type" : "type-941",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19907,8 +19973,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1009",
-   "self_type" : "type-1008",
+   "referenced_type" : "type-1011",
+   "self_type" : "type-1010",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19927,8 +19993,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1699",
-   "self_type" : "type-1698",
+   "referenced_type" : "type-1700",
+   "self_type" : "type-1699",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19937,8 +20003,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1805",
-   "self_type" : "type-1804",
+   "referenced_type" : "type-1806",
+   "self_type" : "type-1805",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19947,8 +20013,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1892",
-   "self_type" : "type-1891",
+   "referenced_type" : "type-1893",
+   "self_type" : "type-1892",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19957,8 +20023,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1971",
-   "self_type" : "type-1970",
+   "referenced_type" : "type-1973",
+   "self_type" : "type-1972",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19967,8 +20033,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2101",
-   "self_type" : "type-2100",
+   "referenced_type" : "type-2105",
+   "self_type" : "type-2104",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19977,8 +20043,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2200",
-   "self_type" : "type-2199",
+   "referenced_type" : "type-2203",
+   "self_type" : "type-2202",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19987,8 +20053,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2268",
-   "self_type" : "type-2267",
+   "referenced_type" : "type-2270",
+   "self_type" : "type-2269",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19997,8 +20063,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2308",
-   "self_type" : "type-2307",
+   "referenced_type" : "type-2310",
+   "self_type" : "type-2309",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20007,8 +20073,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2359",
-   "self_type" : "type-2358",
+   "referenced_type" : "type-2361",
+   "self_type" : "type-2360",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20017,8 +20083,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2528",
-   "self_type" : "type-2527",
+   "referenced_type" : "type-2530",
+   "self_type" : "type-2529",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20027,8 +20093,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-316",
-   "self_type" : "type-315",
+   "referenced_type" : "type-314",
+   "self_type" : "type-313",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20037,8 +20103,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-456",
-   "self_type" : "type-455",
+   "referenced_type" : "type-453",
+   "self_type" : "type-452",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20047,8 +20113,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-666",
-   "self_type" : "type-665",
+   "referenced_type" : "type-667",
+   "self_type" : "type-666",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20067,8 +20133,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-880",
-   "self_type" : "type-879",
+   "referenced_type" : "type-881",
+   "self_type" : "type-880",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20077,8 +20143,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-937",
-   "self_type" : "type-936",
+   "referenced_type" : "type-938",
+   "self_type" : "type-937",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20087,8 +20153,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1017",
-   "self_type" : "type-1016",
+   "referenced_type" : "type-1019",
+   "self_type" : "type-1018",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20107,8 +20173,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1707",
-   "self_type" : "type-1706",
+   "referenced_type" : "type-1708",
+   "self_type" : "type-1707",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20117,8 +20183,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1813",
-   "self_type" : "type-1812",
+   "referenced_type" : "type-1814",
+   "self_type" : "type-1813",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20127,8 +20193,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1900",
-   "self_type" : "type-1899",
+   "referenced_type" : "type-1901",
+   "self_type" : "type-1900",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20137,8 +20203,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1980",
-   "self_type" : "type-1979",
+   "referenced_type" : "type-1981",
+   "self_type" : "type-1980",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20147,8 +20213,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2111",
-   "self_type" : "type-2110",
+   "referenced_type" : "type-2113",
+   "self_type" : "type-2112",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20157,8 +20223,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2209",
-   "self_type" : "type-2208",
+   "referenced_type" : "type-2213",
+   "self_type" : "type-2212",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20167,8 +20233,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2276",
-   "self_type" : "type-2275",
+   "referenced_type" : "type-2278",
+   "self_type" : "type-2277",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20177,8 +20243,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2316",
-   "self_type" : "type-2315",
+   "referenced_type" : "type-2318",
+   "self_type" : "type-2317",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20187,8 +20253,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2367",
-   "self_type" : "type-2366",
+   "referenced_type" : "type-2369",
+   "self_type" : "type-2368",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20197,8 +20263,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2536",
-   "self_type" : "type-2535",
+   "referenced_type" : "type-2538",
+   "self_type" : "type-2537",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20207,8 +20273,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-325",
-   "self_type" : "type-324",
+   "referenced_type" : "type-322",
+   "self_type" : "type-321",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20217,8 +20283,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-466",
-   "self_type" : "type-465",
+   "referenced_type" : "type-463",
+   "self_type" : "type-462",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20227,8 +20293,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-675",
-   "self_type" : "type-674",
+   "referenced_type" : "type-676",
+   "self_type" : "type-675",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20247,8 +20313,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-889",
-   "self_type" : "type-888",
+   "referenced_type" : "type-890",
+   "self_type" : "type-889",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20257,8 +20323,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-946",
-   "self_type" : "type-945",
+   "referenced_type" : "type-947",
+   "self_type" : "type-946",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20267,8 +20333,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1027",
-   "self_type" : "type-1026",
+   "referenced_type" : "type-1028",
+   "self_type" : "type-1027",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20287,8 +20353,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1821",
-   "self_type" : "type-1820",
+   "referenced_type" : "type-1822",
+   "self_type" : "type-1821",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20297,8 +20363,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1989",
-   "self_type" : "type-1988",
+   "referenced_type" : "type-1991",
+   "self_type" : "type-1990",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20307,8 +20373,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2219",
-   "self_type" : "type-2218",
+   "referenced_type" : "type-2221",
+   "self_type" : "type-2220",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20317,8 +20383,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2284",
-   "self_type" : "type-2283",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2285",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20327,8 +20393,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2324",
-   "self_type" : "type-2323",
+   "referenced_type" : "type-2326",
+   "self_type" : "type-2325",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20337,8 +20403,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2375",
-   "self_type" : "type-2374",
+   "referenced_type" : "type-2377",
+   "self_type" : "type-2376",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20347,8 +20413,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2548",
-   "self_type" : "type-2547",
+   "referenced_type" : "type-2550",
+   "self_type" : "type-2549",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20357,8 +20423,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-474",
-   "self_type" : "type-473",
+   "referenced_type" : "type-471",
+   "self_type" : "type-470",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20367,8 +20433,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-795",
-   "self_type" : "type-794",
+   "referenced_type" : "type-796",
+   "self_type" : "type-795",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20377,8 +20443,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-899",
-   "self_type" : "type-898",
+   "referenced_type" : "type-900",
+   "self_type" : "type-899",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20387,8 +20453,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-955",
-   "self_type" : "type-954",
+   "referenced_type" : "type-956",
+   "self_type" : "type-955",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20417,8 +20483,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-1819",
-   "self_type" : "type-1818",
+   "referenced_type" : "type-1820",
+   "self_type" : "type-1819",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20427,8 +20493,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-1987",
-   "self_type" : "type-1986",
+   "referenced_type" : "type-1988",
+   "self_type" : "type-1987",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20437,8 +20503,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2217",
-   "self_type" : "type-2216",
+   "referenced_type" : "type-2219",
+   "self_type" : "type-2218",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20447,8 +20513,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2282",
-   "self_type" : "type-2281",
+   "referenced_type" : "type-2284",
+   "self_type" : "type-2283",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20457,8 +20523,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2322",
-   "self_type" : "type-2321",
+   "referenced_type" : "type-2324",
+   "self_type" : "type-2323",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20467,8 +20533,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2373",
-   "self_type" : "type-2372",
+   "referenced_type" : "type-2375",
+   "self_type" : "type-2374",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20477,8 +20543,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2546",
-   "self_type" : "type-2545",
+   "referenced_type" : "type-2548",
+   "self_type" : "type-2547",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20487,8 +20553,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-472",
-   "self_type" : "type-471",
+   "referenced_type" : "type-469",
+   "self_type" : "type-468",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20497,8 +20563,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-793",
-   "self_type" : "type-792",
+   "referenced_type" : "type-794",
+   "self_type" : "type-793",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20507,8 +20573,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-897",
-   "self_type" : "type-896",
+   "referenced_type" : "type-898",
+   "self_type" : "type-897",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20517,8 +20583,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-953",
-   "self_type" : "type-952",
+   "referenced_type" : "type-954",
+   "self_type" : "type-953",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20547,8 +20613,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-1817",
-   "self_type" : "type-1816",
+   "referenced_type" : "type-1818",
+   "self_type" : "type-1817",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20557,8 +20623,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-1985",
-   "self_type" : "type-1984",
+   "referenced_type" : "type-1986",
+   "self_type" : "type-1985",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20567,8 +20633,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2215",
-   "self_type" : "type-2214",
+   "referenced_type" : "type-2217",
+   "self_type" : "type-2216",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20577,8 +20643,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2280",
-   "self_type" : "type-2279",
+   "referenced_type" : "type-2282",
+   "self_type" : "type-2281",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20587,8 +20653,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2320",
-   "self_type" : "type-2319",
+   "referenced_type" : "type-2322",
+   "self_type" : "type-2321",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20597,8 +20663,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2371",
-   "self_type" : "type-2370",
+   "referenced_type" : "type-2373",
+   "self_type" : "type-2372",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20607,8 +20673,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2544",
-   "self_type" : "type-2543",
+   "referenced_type" : "type-2546",
+   "self_type" : "type-2545",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20617,8 +20683,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-470",
-   "self_type" : "type-469",
+   "referenced_type" : "type-467",
+   "self_type" : "type-466",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20627,8 +20693,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-791",
-   "self_type" : "type-790",
+   "referenced_type" : "type-792",
+   "self_type" : "type-791",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20637,8 +20703,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-895",
-   "self_type" : "type-894",
+   "referenced_type" : "type-896",
+   "self_type" : "type-895",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20647,8 +20713,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-950",
-   "self_type" : "type-949",
+   "referenced_type" : "type-951",
+   "self_type" : "type-950",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20677,8 +20743,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-1815",
-   "self_type" : "type-1814",
+   "referenced_type" : "type-1816",
+   "self_type" : "type-1815",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20687,8 +20753,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-1982",
-   "self_type" : "type-1981",
+   "referenced_type" : "type-1984",
+   "self_type" : "type-1983",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20697,8 +20763,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2213",
-   "self_type" : "type-2212",
+   "referenced_type" : "type-2215",
+   "self_type" : "type-2214",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20707,8 +20773,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2278",
-   "self_type" : "type-2277",
+   "referenced_type" : "type-2280",
+   "self_type" : "type-2279",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20717,8 +20783,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2318",
-   "self_type" : "type-2317",
+   "referenced_type" : "type-2320",
+   "self_type" : "type-2319",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20727,8 +20793,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2369",
-   "self_type" : "type-2368",
+   "referenced_type" : "type-2371",
+   "self_type" : "type-2370",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20737,8 +20803,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2542",
-   "self_type" : "type-2541",
+   "referenced_type" : "type-2544",
+   "self_type" : "type-2543",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20747,8 +20813,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-468",
-   "self_type" : "type-467",
+   "referenced_type" : "type-465",
+   "self_type" : "type-464",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20767,8 +20833,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-892",
-   "self_type" : "type-891",
+   "referenced_type" : "type-893",
+   "self_type" : "type-892",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20777,8 +20843,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-948",
-   "self_type" : "type-947",
+   "referenced_type" : "type-949",
+   "self_type" : "type-948",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20787,8 +20853,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1029",
-   "self_type" : "type-1028",
+   "referenced_type" : "type-1030",
+   "self_type" : "type-1029",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20807,8 +20873,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1823",
-   "self_type" : "type-1822",
+   "referenced_type" : "type-1824",
+   "self_type" : "type-1823",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20817,8 +20883,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1991",
-   "self_type" : "type-1990",
+   "referenced_type" : "type-1993",
+   "self_type" : "type-1992",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20827,8 +20893,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2221",
-   "self_type" : "type-2220",
+   "referenced_type" : "type-2224",
+   "self_type" : "type-2223",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20837,8 +20903,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2286",
-   "self_type" : "type-2285",
+   "referenced_type" : "type-2288",
+   "self_type" : "type-2287",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20847,8 +20913,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2326",
-   "self_type" : "type-2325",
+   "referenced_type" : "type-2328",
+   "self_type" : "type-2327",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20857,8 +20923,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2377",
-   "self_type" : "type-2376",
+   "referenced_type" : "type-2379",
+   "self_type" : "type-2378",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20867,8 +20933,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2550",
-   "self_type" : "type-2549",
+   "referenced_type" : "type-2552",
+   "self_type" : "type-2551",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20877,8 +20943,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-476",
-   "self_type" : "type-475",
+   "referenced_type" : "type-473",
+   "self_type" : "type-472",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20887,8 +20953,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-797",
-   "self_type" : "type-796",
+   "referenced_type" : "type-798",
+   "self_type" : "type-797",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20897,8 +20963,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-901",
-   "self_type" : "type-900",
+   "referenced_type" : "type-902",
+   "self_type" : "type-901",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20907,8 +20973,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-957",
-   "self_type" : "type-956",
+   "referenced_type" : "type-958",
+   "self_type" : "type-957",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20917,8 +20983,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1632",
-   "self_type" : "type-1631",
+   "referenced_type" : "type-1636",
+   "self_type" : "type-1635",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20927,8 +20993,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-167",
-   "self_type" : "type-166",
+   "referenced_type" : "type-169",
+   "self_type" : "type-168",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20937,8 +21003,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1870",
-   "self_type" : "type-1869",
+   "referenced_type" : "type-1871",
+   "self_type" : "type-1870",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20947,8 +21013,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1944",
-   "self_type" : "type-1943",
+   "referenced_type" : "type-1945",
+   "self_type" : "type-1944",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20957,8 +21023,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2084",
-   "self_type" : "type-2083",
+   "referenced_type" : "type-2086",
+   "self_type" : "type-2085",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20967,8 +21033,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2180",
-   "self_type" : "type-2179",
+   "referenced_type" : "type-2183",
+   "self_type" : "type-2182",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20977,8 +21043,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2252",
-   "self_type" : "type-2251",
+   "referenced_type" : "type-2254",
+   "self_type" : "type-2253",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20987,8 +21053,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-428",
-   "self_type" : "type-427",
+   "referenced_type" : "type-425",
+   "self_type" : "type-424",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20997,8 +21063,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-647",
-   "self_type" : "type-646",
+   "referenced_type" : "type-648",
+   "self_type" : "type-647",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -21007,8 +21073,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-757",
-   "self_type" : "type-756",
+   "referenced_type" : "type-758",
+   "self_type" : "type-757",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -21027,8 +21093,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1019",
-   "self_type" : "type-1018",
+   "referenced_type" : "type-1009",
+   "self_type" : "type-1008",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -21037,8 +21103,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1766",
-   "self_type" : "type-1765",
+   "referenced_type" : "type-1767",
+   "self_type" : "type-1766",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -21047,8 +21113,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2103",
-   "self_type" : "type-2102",
+   "referenced_type" : "type-2101",
+   "self_type" : "type-2100",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -21057,8 +21123,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-1757",
-   "self_type" : "type-1756",
+   "referenced_type" : "type-1758",
+   "self_type" : "type-1757",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -21067,8 +21133,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-1876",
-   "self_type" : "type-1875",
+   "referenced_type" : "type-1877",
+   "self_type" : "type-1876",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -21077,46 +21143,6 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-2405",
-   "self_type" : "type-2404",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::float_denorm_style",
-   "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-771",
-   "self_type" : "type-770",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::float_round_style",
-   "name" : "const std::float_round_style",
-   "referenced_type" : "type-1761",
-   "self_type" : "type-1760",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::float_round_style",
-   "name" : "const std::float_round_style",
-   "referenced_type" : "type-1947",
-   "self_type" : "type-1946",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::float_round_style",
-   "name" : "const std::float_round_style",
    "referenced_type" : "type-2407",
    "self_type" : "type-2406",
    "size" : 4,
@@ -21125,10 +21151,50 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const std::float_denorm_style",
+   "name" : "const std::float_denorm_style",
+   "referenced_type" : "type-763",
+   "self_type" : "type-762",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const std::float_round_style",
    "name" : "const std::float_round_style",
-   "referenced_type" : "type-859",
-   "self_type" : "type-858",
+   "referenced_type" : "type-1762",
+   "self_type" : "type-1761",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::float_round_style",
+   "name" : "const std::float_round_style",
+   "referenced_type" : "type-1948",
+   "self_type" : "type-1947",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::float_round_style",
+   "name" : "const std::float_round_style",
+   "referenced_type" : "type-2409",
+   "self_type" : "type-2408",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::float_round_style",
+   "name" : "const std::float_round_style",
+   "referenced_type" : "type-856",
+   "self_type" : "type-855",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -21147,8 +21213,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<float (float)>",
    "name" : "const std::function<float (float)>",
-   "referenced_type" : "type-1778",
-   "self_type" : "type-1777",
+   "referenced_type" : "type-1779",
+   "self_type" : "type-1778",
    "size" : 48,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -21157,8 +21223,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<float (float)>",
    "name" : "const std::function<float (float)>",
-   "referenced_type" : "type-2224",
-   "self_type" : "type-2223",
+   "referenced_type" : "type-2226",
+   "self_type" : "type-2225",
    "size" : 48,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -21167,8 +21233,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-1392",
-   "self_type" : "type-1391",
+   "referenced_type" : "type-1396",
+   "self_type" : "type-1395",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -21177,8 +21243,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-1840",
-   "self_type" : "type-1839",
+   "referenced_type" : "type-1841",
+   "self_type" : "type-1840",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -21187,8 +21253,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-2664",
-   "self_type" : "type-2663",
+   "referenced_type" : "type-2669",
+   "self_type" : "type-2668",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -21197,8 +21263,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> >",
    "name" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> >",
-   "referenced_type" : "type-2332",
-   "self_type" : "type-2331",
+   "referenced_type" : "type-2334",
+   "self_type" : "type-2333",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -21217,8 +21283,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1033",
-   "self_type" : "type-1032",
+   "referenced_type" : "type-1034",
+   "self_type" : "type-1033",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21237,8 +21303,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1582",
-   "self_type" : "type-1581",
+   "referenced_type" : "type-1586",
+   "self_type" : "type-1585",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21247,8 +21313,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1712",
-   "self_type" : "type-1711",
+   "referenced_type" : "type-1713",
+   "self_type" : "type-1712",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21257,8 +21323,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1826",
-   "self_type" : "type-1825",
+   "referenced_type" : "type-1827",
+   "self_type" : "type-1826",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21267,8 +21333,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1852",
-   "self_type" : "type-1851",
+   "referenced_type" : "type-1853",
+   "self_type" : "type-1852",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21277,8 +21343,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1903",
-   "self_type" : "type-1902",
+   "referenced_type" : "type-1904",
+   "self_type" : "type-1903",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21287,8 +21353,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1995",
-   "self_type" : "type-1994",
+   "referenced_type" : "type-1996",
+   "self_type" : "type-1995",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21297,8 +21363,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2076",
-   "self_type" : "type-2075",
+   "referenced_type" : "type-2078",
+   "self_type" : "type-2077",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21307,8 +21373,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2151",
-   "self_type" : "type-2150",
+   "referenced_type" : "type-2154",
+   "self_type" : "type-2153",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21317,8 +21383,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2234",
-   "self_type" : "type-2233",
+   "referenced_type" : "type-2236",
+   "self_type" : "type-2235",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21327,8 +21393,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2329",
-   "self_type" : "type-2328",
+   "referenced_type" : "type-2331",
+   "self_type" : "type-2330",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21337,8 +21403,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2380",
-   "self_type" : "type-2379",
+   "referenced_type" : "type-2382",
+   "self_type" : "type-2381",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21347,8 +21413,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2567",
-   "self_type" : "type-2566",
+   "referenced_type" : "type-2569",
+   "self_type" : "type-2568",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21357,8 +21423,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-330",
-   "self_type" : "type-329",
+   "referenced_type" : "type-327",
+   "self_type" : "type-326",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21367,8 +21433,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-43",
-   "self_type" : "type-42",
+   "referenced_type" : "type-477",
+   "self_type" : "type-476",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21377,8 +21443,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-480",
-   "self_type" : "type-479",
+   "referenced_type" : "type-47",
+   "self_type" : "type-46",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21397,8 +21463,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-727",
-   "self_type" : "type-726",
+   "referenced_type" : "type-728",
+   "self_type" : "type-727",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21407,8 +21473,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-834",
-   "self_type" : "type-833",
+   "referenced_type" : "type-835",
+   "self_type" : "type-834",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21417,8 +21483,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-964",
-   "self_type" : "type-963",
+   "referenced_type" : "type-966",
+   "self_type" : "type-965",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21427,8 +21493,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned char",
    "name" : "const unsigned char",
-   "referenced_type" : "type-207",
-   "self_type" : "type-214",
+   "referenced_type" : "type-220",
+   "self_type" : "type-227",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -21437,8 +21503,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned int",
    "name" : "const unsigned int",
-   "referenced_type" : "type-123",
-   "self_type" : "type-237",
+   "referenced_type" : "type-125",
+   "self_type" : "type-239",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -21447,8 +21513,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned long",
    "name" : "const unsigned long",
-   "referenced_type" : "type-124",
-   "self_type" : "type-238",
+   "referenced_type" : "type-126",
+   "self_type" : "type-240",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
   },
@@ -21457,8 +21523,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned long long",
    "name" : "const unsigned long long",
-   "referenced_type" : "type-209",
-   "self_type" : "type-216",
+   "referenced_type" : "type-222",
+   "self_type" : "type-229",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -21476,7 +21542,7 @@
    "is_const" : true,
    "linker_set_key" : "const void",
    "name" : "const void",
-   "referenced_type" : "type-150",
+   "referenced_type" : "type-153",
    "self_type" : "type-1119",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -21485,8 +21551,8 @@
    "is_const" : true,
    "linker_set_key" : "unsigned long const[3]",
    "name" : "unsigned long const[3]",
-   "referenced_type" : "type-944",
-   "self_type" : "type-951",
+   "referenced_type" : "type-936",
+   "self_type" : "type-945",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -21496,7 +21562,7 @@
    "linker_set_key" : "volatile bool",
    "name" : "volatile bool",
    "referenced_type" : "type-6",
-   "self_type" : "type-272",
+   "self_type" : "type-268",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Thread.h"
   },
@@ -21505,8 +21571,8 @@
    "is_volatile" : true,
    "linker_set_key" : "volatile int",
    "name" : "volatile int",
-   "referenced_type" : "type-103",
-   "self_type" : "type-277",
+   "referenced_type" : "type-105",
+   "self_type" : "type-273",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   }
@@ -21519,48 +21585,48 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "layers",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "format",
      "field_offset" : 96,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "usage",
      "field_offset" : 128,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "stride",
      "field_offset" : 192,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "rfu0",
      "field_offset" : 224,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "rfu1",
      "field_offset" : 256,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "AHardwareBuffer_Desc",
    "name" : "AHardwareBuffer_Desc",
-   "referenced_type" : "type-684",
-   "self_type" : "type-684",
+   "referenced_type" : "type-685",
+   "self_type" : "type-685",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
    "unique_id" : "AHardwareBuffer_Desc"
@@ -21571,23 +21637,23 @@
    [
     {
      "field_name" : "data",
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "field_name" : "pixelStride",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "rowStride",
      "field_offset" : 96,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "linker_set_key" : "AHardwareBuffer_Plane",
    "name" : "AHardwareBuffer_Plane",
-   "referenced_type" : "type-510",
-   "self_type" : "type-510",
+   "referenced_type" : "type-508",
+   "self_type" : "type-508",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
    "unique_id" : "AHardwareBuffer_Plane"
@@ -21598,18 +21664,18 @@
    [
     {
      "field_name" : "planeCount",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "planes",
      "field_offset" : 64,
-     "referenced_type" : "type-509"
+     "referenced_type" : "type-507"
     }
    ],
    "linker_set_key" : "AHardwareBuffer_Planes",
    "name" : "AHardwareBuffer_Planes",
-   "referenced_type" : "type-508",
-   "self_type" : "type-508",
+   "referenced_type" : "type-506",
+   "self_type" : "type-506",
    "size" : 72,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
    "unique_id" : "AHardwareBuffer_Planes"
@@ -21620,63 +21686,63 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-520"
+     "referenced_type" : "type-517"
     },
     {
      "field_name" : "width",
      "field_offset" : 448,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "height",
      "field_offset" : 480,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "stride",
      "field_offset" : 512,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "format",
      "field_offset" : 544,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "usage_deprecated",
      "field_offset" : 576,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "layerCount",
      "field_offset" : 640,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 704,
-     "referenced_type" : "type-525"
+     "referenced_type" : "type-522"
     },
     {
      "field_name" : "handle",
      "field_offset" : 768,
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
      "field_name" : "usage",
      "field_offset" : 832,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "reserved_proc",
      "field_offset" : 896,
-     "referenced_type" : "type-526"
+     "referenced_type" : "type-523"
     }
    ],
    "linker_set_key" : "ANativeWindowBuffer",
    "name" : "ANativeWindowBuffer",
-   "referenced_type" : "type-519",
-   "self_type" : "type-519",
+   "referenced_type" : "type-516",
+   "self_type" : "type-516",
    "size" : 168,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
    "unique_id" : "ANativeWindowBuffer"
@@ -21687,22 +21753,22 @@
    [
     {
      "field_name" : "left",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "top",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "right",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "bottom",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "ARect",
@@ -21719,7 +21785,7 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-548"
+     "referenced_type" : "type-545"
     },
     {
      "field_name" : "alloc",
@@ -21739,7 +21805,7 @@
     {
      "field_name" : "reserved_proc",
      "field_offset" : 1152,
-     "referenced_type" : "type-526"
+     "referenced_type" : "type-523"
     }
    ],
    "linker_set_key" : "alloc_device_t",
@@ -21755,20 +21821,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-519"
+     "referenced_type" : "type-516"
     },
     {
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-174"
     }
    ],
    "linker_set_key" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
    "name" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
    "record_kind" : "class",
-   "referenced_type" : "type-518",
-   "self_type" : "type-518",
+   "referenced_type" : "type-515",
+   "self_type" : "type-515",
    "size" : 184,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h",
-   "template_args" : [ "type-519", "type-527", "type-171", "type-520" ],
+   "template_args" : [ "type-516", "type-524", "type-174", "type-517" ],
    "unique_id" : "_ZTSN7android17ANativeObjectBaseI19ANativeWindowBufferNS_13GraphicBufferENS_7RefBaseE21android_native_base_tEE",
    "vtable_components" :
    [
@@ -21963,14 +22029,14 @@
     {
      "access" : "private",
      "field_name" : "mCond",
-     "referenced_type" : "type-261"
+     "referenced_type" : "type-257"
     }
    ],
    "linker_set_key" : "android::Condition",
    "name" : "android::Condition",
    "record_kind" : "class",
-   "referenced_type" : "type-260",
-   "self_type" : "type-260",
+   "referenced_type" : "type-256",
+   "self_type" : "type-256",
    "size" : 48,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "unique_id" : "_ZTSN7android9ConditionE"
@@ -22011,13 +22077,13 @@
     {
      "access" : "private",
      "field_name" : "mState",
-     "referenced_type" : "type-1377"
+     "referenced_type" : "type-1382"
     },
     {
      "access" : "private",
      "field_name" : "mMutex",
      "field_offset" : 32,
-     "referenced_type" : "type-1379"
+     "referenced_type" : "type-1384"
     },
     {
      "access" : "private",
@@ -22029,14 +22095,14 @@
      "access" : "private",
      "field_name" : "mSignalTime",
      "field_offset" : 448,
-     "referenced_type" : "type-1380"
+     "referenced_type" : "type-1385"
     }
    ],
    "linker_set_key" : "android::FenceTime",
    "name" : "android::FenceTime",
    "record_kind" : "class",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1376",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1381",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android9FenceTimeE"
@@ -22046,14 +22112,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1385"
+     "referenced_type" : "type-1389"
     }
    ],
    "fields" :
    [
     {
      "field_name" : "state",
-     "referenced_type" : "type-1384"
+     "referenced_type" : "type-1388"
     },
     {
      "field_name" : "fence",
@@ -22063,13 +22129,13 @@
     {
      "field_name" : "signalTime",
      "field_offset" : 128,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-12"
     }
    ],
    "linker_set_key" : "android::FenceTime::Snapshot",
    "name" : "android::FenceTime::Snapshot",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1383",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1387",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android9FenceTime8SnapshotE"
@@ -22081,20 +22147,20 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-1398"
+     "referenced_type" : "type-1403"
     },
     {
      "access" : "private",
      "field_name" : "mQueue",
      "field_offset" : 320,
-     "referenced_type" : "type-1399"
+     "referenced_type" : "type-1404"
     }
    ],
    "linker_set_key" : "android::FenceTimeline",
    "name" : "android::FenceTimeline",
    "record_kind" : "class",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1397",
+   "referenced_type" : "type-1402",
+   "self_type" : "type-1402",
    "size" : 88,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android13FenceTimelineE"
@@ -22106,20 +22172,20 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-1404"
+     "referenced_type" : "type-1408"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 320,
-     "referenced_type" : "type-1405"
+     "referenced_type" : "type-1409"
     }
    ],
    "linker_set_key" : "android::FenceToFenceTimeMap",
    "name" : "android::FenceToFenceTimeMap",
    "record_kind" : "class",
-   "referenced_type" : "type-1403",
-   "self_type" : "type-1403",
+   "referenced_type" : "type-1407",
+   "self_type" : "type-1407",
    "size" : 80,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android19FenceToFenceTimeMapE"
@@ -22141,11 +22207,11 @@
    "linker_set_key" : "android::Flattenable<android::FenceTime::Snapshot>",
    "name" : "android::Flattenable<android::FenceTime::Snapshot>",
    "record_kind" : "class",
-   "referenced_type" : "type-1385",
-   "self_type" : "type-1385",
+   "referenced_type" : "type-1389",
+   "self_type" : "type-1389",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1383" ],
+   "template_args" : [ "type-1387" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_9FenceTime8SnapshotEEE"
   },
   {
@@ -22153,11 +22219,11 @@
    "linker_set_key" : "android::Flattenable<android::GraphicBuffer>",
    "name" : "android::Flattenable<android::GraphicBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-534",
-   "self_type" : "type-534",
+   "referenced_type" : "type-531",
+   "self_type" : "type-531",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-527" ],
+   "template_args" : [ "type-524" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_13GraphicBufferEEE"
   },
   {
@@ -22209,36 +22275,36 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1419"
+     "referenced_type" : "type-1423"
     }
    ],
    "fields" :
    [
     {
      "field_name" : "refreshPeriodNano",
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-12"
     },
     {
      "field_name" : "desiredPresentTimesNano",
      "field_offset" : 64,
-     "referenced_type" : "type-1421"
+     "referenced_type" : "type-1425"
     },
     {
      "field_name" : "actualPresentTimesNano",
      "field_offset" : 384,
-     "referenced_type" : "type-1421"
+     "referenced_type" : "type-1425"
     },
     {
      "field_name" : "frameReadyTimesNano",
      "field_offset" : 704,
-     "referenced_type" : "type-1421"
+     "referenced_type" : "type-1425"
     }
    ],
    "linker_set_key" : "android::FrameStats",
    "name" : "android::FrameStats",
    "record_kind" : "class",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1420",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1424",
    "size" : 128,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h",
    "unique_id" : "_ZTSN7android10FrameStatsE"
@@ -22248,7 +22314,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-361"
+     "referenced_type" : "type-358"
     }
    ],
    "fields" :
@@ -22257,20 +22323,20 @@
      "access" : "private",
      "field_name" : "mMapper",
      "field_offset" : 64,
-     "referenced_type" : "type-356"
+     "referenced_type" : "type-353"
     },
     {
      "access" : "private",
      "field_name" : "mAllocator",
      "field_offset" : 128,
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-354"
     }
    ],
    "linker_set_key" : "android::Gralloc2Allocator",
    "name" : "android::Gralloc2Allocator",
    "record_kind" : "class",
-   "referenced_type" : "type-355",
-   "self_type" : "type-355",
+   "referenced_type" : "type-352",
+   "self_type" : "type-352",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h",
    "unique_id" : "_ZTSN7android17Gralloc2AllocatorE",
@@ -22307,7 +22373,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-338"
+     "referenced_type" : "type-335"
     }
    ],
    "fields" :
@@ -22316,20 +22382,20 @@
      "access" : "private",
      "field_name" : "mMapper",
      "field_offset" : 64,
-     "referenced_type" : "type-334"
+     "referenced_type" : "type-331"
     },
     {
      "access" : "private",
      "field_name" : "mMapperV2_1",
      "field_offset" : 128,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-88"
     }
    ],
    "linker_set_key" : "android::Gralloc2Mapper",
    "name" : "android::Gralloc2Mapper",
    "record_kind" : "class",
-   "referenced_type" : "type-333",
-   "self_type" : "type-333",
+   "referenced_type" : "type-330",
+   "self_type" : "type-330",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h",
    "unique_id" : "_ZTSN7android14Gralloc2MapperE",
@@ -22387,10 +22453,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-518"
+     "referenced_type" : "type-515"
     },
     {
-     "referenced_type" : "type-534"
+     "referenced_type" : "type-531"
     }
    ],
    "fields" :
@@ -22399,62 +22465,62 @@
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 1472,
-     "referenced_type" : "type-207"
+     "referenced_type" : "type-220"
     },
     {
      "access" : "private",
      "field_name" : "mBufferMapper",
      "field_offset" : 1536,
-     "referenced_type" : "type-528"
+     "referenced_type" : "type-525"
     },
     {
      "access" : "private",
      "field_name" : "mInitCheck",
      "field_offset" : 1600,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-12"
     },
     {
      "access" : "private",
      "field_name" : "mTransportNumFds",
      "field_offset" : 1664,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mTransportNumInts",
      "field_offset" : 1696,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mId",
      "field_offset" : 1728,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
      "field_name" : "mBufferId",
      "field_offset" : 1792,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mGenerationNumber",
      "field_offset" : 1824,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mDeathCallbacks",
      "field_offset" : 1856,
-     "referenced_type" : "type-533"
+     "referenced_type" : "type-530"
     }
    ],
    "linker_set_key" : "android::GraphicBuffer",
    "name" : "android::GraphicBuffer",
    "record_kind" : "class",
-   "referenced_type" : "type-527",
-   "self_type" : "type-527",
+   "referenced_type" : "type-524",
+   "self_type" : "type-524",
    "size" : 256,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h",
    "unique_id" : "_ZTSN7android13GraphicBufferE",
@@ -22494,81 +22560,81 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-542"
+     "referenced_type" : "type-539"
     }
    ],
    "fields" :
    [
     {
-     "access" : "private",
+     "access" : "protected",
      "field_name" : "mMapper",
-     "referenced_type" : "type-528"
+     "referenced_type" : "type-525"
     },
     {
-     "access" : "private",
+     "access" : "protected",
      "field_name" : "mAllocator",
      "field_offset" : 64,
-     "referenced_type" : "type-544"
+     "referenced_type" : "type-541"
     }
    ],
    "linker_set_key" : "android::GraphicBufferAllocator",
    "name" : "android::GraphicBufferAllocator",
    "record_kind" : "class",
-   "referenced_type" : "type-543",
-   "self_type" : "type-543",
+   "referenced_type" : "type-540",
+   "self_type" : "type-540",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h",
    "unique_id" : "_ZTSN7android22GraphicBufferAllocatorE"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "alignment" : 8,
    "fields" :
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "stride",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "format",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "layerCount",
      "field_offset" : 128,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "usage",
      "field_offset" : 192,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "size",
      "field_offset" : 256,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "requestorName",
      "field_offset" : 320,
-     "referenced_type" : "type-678"
+     "referenced_type" : "type-682"
     }
    ],
    "linker_set_key" : "android::GraphicBufferAllocator::alloc_rec_t",
    "name" : "android::GraphicBufferAllocator::alloc_rec_t",
-   "referenced_type" : "type-677",
-   "self_type" : "type-677",
+   "referenced_type" : "type-681",
+   "self_type" : "type-681",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h",
    "unique_id" : "_ZTSN7android22GraphicBufferAllocator11alloc_rec_tE"
@@ -22578,7 +22644,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-532"
+     "referenced_type" : "type-529"
     }
    ],
    "fields" :
@@ -22586,20 +22652,20 @@
     {
      "access" : "private",
      "field_name" : "mMapper",
-     "referenced_type" : "type-530"
+     "referenced_type" : "type-527"
     },
     {
      "access" : "private",
      "field_name" : "mMapperVersion",
      "field_offset" : 64,
-     "referenced_type" : "type-531"
+     "referenced_type" : "type-528"
     }
    ],
    "linker_set_key" : "android::GraphicBufferMapper",
    "name" : "android::GraphicBufferMapper",
    "record_kind" : "class",
-   "referenced_type" : "type-529",
-   "self_type" : "type-529",
+   "referenced_type" : "type-526",
+   "self_type" : "type-526",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h",
    "unique_id" : "_ZTSN7android19GraphicBufferMapperE"
@@ -22609,7 +22675,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-959"
+     "referenced_type" : "type-961"
     }
    ],
    "fields" :
@@ -22617,7 +22683,7 @@
     {
      "access" : "private",
      "field_name" : "mSupportedHdrTypes",
-     "referenced_type" : "type-961"
+     "referenced_type" : "type-963"
     },
     {
      "access" : "private",
@@ -22641,8 +22707,8 @@
    "linker_set_key" : "android::HdrCapabilities",
    "name" : "android::HdrCapabilities",
    "record_kind" : "class",
-   "referenced_type" : "type-960",
-   "self_type" : "type-960",
+   "referenced_type" : "type-962",
+   "self_type" : "type-962",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h",
    "unique_id" : "_ZTSN7android15HdrCapabilitiesE"
@@ -22654,17 +22720,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-234"
+     "referenced_type" : "type-236"
     }
    ],
    "linker_set_key" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
    "name" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
    "record_kind" : "class",
-   "referenced_type" : "type-249",
-   "self_type" : "type-249",
+   "referenced_type" : "type-251",
+   "self_type" : "type-251",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-178", "type-250" ],
+   "template_args" : [ "type-180", "type-252" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
   },
   {
@@ -22674,17 +22740,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-710"
+     "referenced_type" : "type-711"
     }
    ],
    "linker_set_key" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "record_kind" : "class",
-   "referenced_type" : "type-715",
-   "self_type" : "type-715",
+   "referenced_type" : "type-716",
+   "self_type" : "type-716",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-141", "type-677" ],
+   "template_args" : [ "type-143", "type-681" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -22692,11 +22758,11 @@
    "linker_set_key" : "android::LightFlattenable<android::FrameStats>",
    "name" : "android::LightFlattenable<android::FrameStats>",
    "record_kind" : "class",
-   "referenced_type" : "type-1419",
-   "self_type" : "type-1419",
+   "referenced_type" : "type-1423",
+   "self_type" : "type-1423",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1420" ],
+   "template_args" : [ "type-1424" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_10FrameStatsEEE"
   },
   {
@@ -22704,11 +22770,11 @@
    "linker_set_key" : "android::LightFlattenable<android::HdrCapabilities>",
    "name" : "android::LightFlattenable<android::HdrCapabilities>",
    "record_kind" : "class",
-   "referenced_type" : "type-959",
-   "self_type" : "type-959",
+   "referenced_type" : "type-961",
+   "self_type" : "type-961",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-960" ],
+   "template_args" : [ "type-962" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_15HdrCapabilitiesEEE"
   },
   {
@@ -22740,11 +22806,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Region>",
    "name" : "android::LightFlattenable<android::Region>",
    "record_kind" : "class",
-   "referenced_type" : "type-2391",
-   "self_type" : "type-2391",
+   "referenced_type" : "type-2393",
+   "self_type" : "type-2393",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-2390" ],
+   "template_args" : [ "type-2392" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_6RegionEEE"
   },
   {
@@ -22850,14 +22916,14 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-255"
+     "referenced_type" : "type-283"
     }
    ],
    "linker_set_key" : "android::Mutex",
    "name" : "android::Mutex",
    "record_kind" : "class",
-   "referenced_type" : "type-254",
-   "self_type" : "type-254",
+   "referenced_type" : "type-282",
+   "self_type" : "type-282",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5MutexE"
@@ -22869,14 +22935,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-258"
+     "referenced_type" : "type-1378"
     }
    ],
    "linker_set_key" : "android::Mutex::Autolock",
    "name" : "android::Mutex::Autolock",
    "record_kind" : "class",
-   "referenced_type" : "type-257",
-   "self_type" : "type-257",
+   "referenced_type" : "type-1377",
+   "self_type" : "type-1377",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5Mutex8AutolockE"
@@ -22925,12 +22991,12 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "y",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::Point",
@@ -22949,14 +23015,14 @@
     {
      "access" : "private",
      "field_name" : "mRWLock",
-     "referenced_type" : "type-265"
+     "referenced_type" : "type-261"
     }
    ],
    "linker_set_key" : "android::RWLock",
    "name" : "android::RWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-264",
-   "self_type" : "type-264",
+   "referenced_type" : "type-260",
+   "self_type" : "type-260",
    "size" : 56,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLockE"
@@ -22968,14 +23034,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-268"
+     "referenced_type" : "type-264"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoRLock",
    "name" : "android::RWLock::AutoRLock",
    "record_kind" : "class",
-   "referenced_type" : "type-267",
-   "self_type" : "type-267",
+   "referenced_type" : "type-263",
+   "self_type" : "type-263",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
@@ -22987,14 +23053,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-268"
+     "referenced_type" : "type-264"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoWLock",
    "name" : "android::RWLock::AutoWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-270",
-   "self_type" : "type-270",
+   "referenced_type" : "type-266",
+   "self_type" : "type-266",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
@@ -23027,14 +23093,14 @@
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 64,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::RefBase",
    "name" : "android::RefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-171",
-   "self_type" : "type-171",
+   "referenced_type" : "type-174",
+   "self_type" : "type-174",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBaseE",
@@ -23074,8 +23140,8 @@
    "linker_set_key" : "android::RefBase::weakref_type",
    "name" : "android::RefBase::weakref_type",
    "record_kind" : "class",
-   "referenced_type" : "type-197",
-   "self_type" : "type-197",
+   "referenced_type" : "type-200",
+   "self_type" : "type-200",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBase12weakref_typeE"
@@ -23121,7 +23187,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     }
    ],
    "fields" :
@@ -23129,14 +23195,14 @@
     {
      "access" : "private",
      "field_name" : "mStorage",
-     "referenced_type" : "type-2383"
+     "referenced_type" : "type-2385"
     }
    ],
    "linker_set_key" : "android::Region",
    "name" : "android::Region",
    "record_kind" : "class",
-   "referenced_type" : "type-2390",
-   "self_type" : "type-2390",
+   "referenced_type" : "type-2392",
+   "self_type" : "type-2392",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h",
    "unique_id" : "_ZTSN7android6RegionE"
@@ -23148,7 +23214,7 @@
     {
      "access" : "private",
      "field_name" : "mTag",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "android::ScopedTrace",
@@ -23165,11 +23231,11 @@
    "linker_set_key" : "android::Singleton<android::GraphicBufferAllocator>",
    "name" : "android::Singleton<android::GraphicBufferAllocator>",
    "record_kind" : "class",
-   "referenced_type" : "type-542",
-   "self_type" : "type-542",
+   "referenced_type" : "type-539",
+   "self_type" : "type-539",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-543" ],
+   "template_args" : [ "type-540" ],
    "unique_id" : "_ZTSN7android9SingletonINS_22GraphicBufferAllocatorEEE"
   },
   {
@@ -23177,11 +23243,11 @@
    "linker_set_key" : "android::Singleton<android::GraphicBufferMapper>",
    "name" : "android::Singleton<android::GraphicBufferMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-532",
-   "self_type" : "type-532",
+   "referenced_type" : "type-529",
+   "self_type" : "type-529",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-529" ],
+   "template_args" : [ "type-526" ],
    "unique_id" : "_ZTSN7android9SingletonINS_19GraphicBufferMapperEEE"
   },
   {
@@ -23190,17 +23256,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
    "name" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-234",
-   "self_type" : "type-234",
+   "referenced_type" : "type-236",
+   "self_type" : "type-236",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-239" ],
+   "template_args" : [ "type-241" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
    "vtable_components" :
    [
@@ -23248,14 +23314,14 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::SortedVector<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "record_kind" : "class",
-   "referenced_type" : "type-710",
-   "self_type" : "type-710",
+   "referenced_type" : "type-711",
+   "self_type" : "type-711",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
    "template_args" : [ "type-694" ],
@@ -23305,14 +23371,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     }
    ],
    "linker_set_key" : "android::SortedVectorImpl",
    "name" : "android::SortedVectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-235",
-   "self_type" : "type-235",
+   "referenced_type" : "type-237",
+   "self_type" : "type-237",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android16SortedVectorImplE",
@@ -23370,14 +23436,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-179"
+     "referenced_type" : "type-181"
     }
    ],
    "linker_set_key" : "android::String16",
    "name" : "android::String16",
    "record_kind" : "class",
-   "referenced_type" : "type-178",
-   "self_type" : "type-178",
+   "referenced_type" : "type-180",
+   "self_type" : "type-180",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "unique_id" : "_ZTSN7android8String16E"
@@ -23389,14 +23455,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-285"
     }
    ],
    "linker_set_key" : "android::String8",
    "name" : "android::String8",
    "record_kind" : "class",
-   "referenced_type" : "type-287",
-   "self_type" : "type-287",
+   "referenced_type" : "type-284",
+   "self_type" : "type-284",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "unique_id" : "_ZTSN7android7String8E"
@@ -23407,7 +23473,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-174"
     }
    ],
    "fields" :
@@ -23416,62 +23482,62 @@
      "access" : "private",
      "field_name" : "mCanCallJava",
      "field_offset" : 64,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-369"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 128,
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 192,
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-282"
     },
     {
      "access" : "private",
      "field_name" : "mThreadExitedCondition",
      "field_offset" : 512,
-     "referenced_type" : "type-260"
+     "referenced_type" : "type-256"
     },
     {
      "access" : "private",
      "field_name" : "mStatus",
      "field_offset" : 896,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mExitPending",
      "field_offset" : 928,
-     "referenced_type" : "type-272"
+     "referenced_type" : "type-268"
     },
     {
      "access" : "private",
      "field_name" : "mRunning",
      "field_offset" : 936,
-     "referenced_type" : "type-272"
+     "referenced_type" : "type-268"
     },
     {
      "access" : "private",
      "field_name" : "mHoldSelf",
      "field_offset" : 960,
-     "referenced_type" : "type-369"
+     "referenced_type" : "type-366"
     },
     {
      "access" : "private",
      "field_name" : "mTid",
      "field_offset" : 1024,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::Thread",
    "name" : "android::Thread",
    "record_kind" : "class",
-   "referenced_type" : "type-371",
-   "self_type" : "type-371",
+   "referenced_type" : "type-368",
+   "self_type" : "type-368",
    "size" : 152,
    "source_file" : "/system/core/libutils/include/utils/Thread.h",
    "unique_id" : "_ZTSN7android6ThreadE",
@@ -23561,14 +23627,14 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     }
    ],
    "linker_set_key" : "android::Vector<android::Rect>",
    "name" : "android::Vector<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-2383",
-   "self_type" : "type-2383",
+   "referenced_type" : "type-2385",
+   "self_type" : "type-2385",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-1241" ],
@@ -23616,17 +23682,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     }
    ],
    "linker_set_key" : "android::Vector<android::RefBase *>",
    "name" : "android::Vector<android::RefBase *>",
    "record_kind" : "class",
-   "referenced_type" : "type-247",
-   "self_type" : "type-247",
+   "referenced_type" : "type-249",
+   "self_type" : "type-249",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-248" ],
+   "template_args" : [ "type-250" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7RefBaseEEE",
    "vtable_components" :
    [
@@ -23671,17 +23737,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     }
    ],
    "linker_set_key" : "android::Vector<android::RefBase::weakref_type *>",
    "name" : "android::Vector<android::RefBase::weakref_type *>",
    "record_kind" : "class",
-   "referenced_type" : "type-246",
-   "self_type" : "type-246",
+   "referenced_type" : "type-248",
+   "self_type" : "type-248",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-196" ],
+   "template_args" : [ "type-199" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7RefBase12weakref_typeEEE",
    "vtable_components" :
    [
@@ -23726,17 +23792,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::BHwBinder *>",
    "name" : "android::Vector<android::hardware::BHwBinder *>",
    "record_kind" : "class",
-   "referenced_type" : "type-242",
-   "self_type" : "type-242",
+   "referenced_type" : "type-244",
+   "self_type" : "type-244",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-243" ],
+   "template_args" : [ "type-245" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_8hardware9BHwBinderEEE",
    "vtable_components" :
    [
@@ -23781,17 +23847,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "record_kind" : "class",
-   "referenced_type" : "type-240",
-   "self_type" : "type-240",
+   "referenced_type" : "type-242",
+   "self_type" : "type-242",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-241" ],
+   "template_args" : [ "type-243" ],
    "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
    "vtable_components" :
    [
@@ -23836,17 +23902,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     }
    ],
    "linker_set_key" : "android::Vector<long>",
    "name" : "android::Vector<long>",
    "record_kind" : "class",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1421",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1425",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-286" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android6VectorIlEE",
    "vtable_components" :
    [
@@ -23893,32 +23959,32 @@
      "access" : "private",
      "field_name" : "mStorage",
      "field_offset" : 64,
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "access" : "private",
      "field_name" : "mCount",
      "field_offset" : 128,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
      "field_name" : "mFlags",
      "field_offset" : 192,
-     "referenced_type" : "type-237"
+     "referenced_type" : "type-239"
     },
     {
      "access" : "private",
      "field_name" : "mItemSize",
      "field_offset" : 256,
-     "referenced_type" : "type-238"
+     "referenced_type" : "type-240"
     }
    ],
    "linker_set_key" : "android::VectorImpl",
    "name" : "android::VectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-236",
-   "self_type" : "type-236",
+   "referenced_type" : "type-238",
+   "self_type" : "type-238",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android10VectorImplE",
@@ -24004,11 +24070,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::aggregate_traits<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-825",
-   "self_type" : "type-825",
+   "referenced_type" : "type-826",
+   "self_type" : "type-826",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-141", "type-677" ],
+   "template_args" : [ "type-143", "type-681" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -24028,7 +24094,7 @@
     {
      "access" : "private",
      "field_name" : "fd_",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser>",
@@ -24093,28 +24159,28 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2412"
+     "referenced_type" : "type-2414"
+    },
+    {
+     "referenced_type" : "type-2415"
     },
     {
      "referenced_type" : "type-2413"
     },
     {
-     "referenced_type" : "type-2411"
-    },
-    {
-     "referenced_type" : "type-2419"
-    },
-    {
-     "referenced_type" : "type-2420"
+     "referenced_type" : "type-2421"
     },
     {
      "referenced_type" : "type-2422"
     },
     {
-     "referenced_type" : "type-2421"
+     "referenced_type" : "type-2424"
     },
     {
-     "referenced_type" : "type-2424"
+     "referenced_type" : "type-2423"
+    },
+    {
+     "referenced_type" : "type-2426"
     }
    ],
    "fields" :
@@ -24122,14 +24188,14 @@
     {
      "access" : "private",
      "field_name" : "m_value",
-     "referenced_type" : "type-2429"
+     "referenced_type" : "type-2431"
     }
    ],
    "linker_set_key" : "android::details::TMat44<float>",
    "name" : "android::details::TMat44<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2428",
-   "self_type" : "type-2428",
+   "referenced_type" : "type-2430",
+   "self_type" : "type-2430",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h",
    "template_args" : [ "type-10" ],
@@ -24152,8 +24218,8 @@
    "linker_set_key" : "android::details::TMatDebug<android::details::TMat44, float>",
    "name" : "android::details::TMatDebug<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2424",
-   "self_type" : "type-2424",
+   "referenced_type" : "type-2426",
+   "self_type" : "type-2426",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24176,8 +24242,8 @@
    "linker_set_key" : "android::details::TMatHelpers<android::details::TMat44, float>",
    "name" : "android::details::TMatHelpers<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2421",
-   "self_type" : "type-2421",
+   "referenced_type" : "type-2423",
+   "self_type" : "type-2423",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24200,8 +24266,8 @@
    "linker_set_key" : "android::details::TMatProductOperators<android::details::TMat44, float>",
    "name" : "android::details::TMatProductOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2419",
-   "self_type" : "type-2419",
+   "referenced_type" : "type-2421",
+   "self_type" : "type-2421",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24224,8 +24290,8 @@
    "linker_set_key" : "android::details::TMatSquareFunctions<android::details::TMat44, float>",
    "name" : "android::details::TMatSquareFunctions<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2420",
-   "self_type" : "type-2420",
+   "referenced_type" : "type-2422",
+   "self_type" : "type-2422",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24248,8 +24314,8 @@
    "linker_set_key" : "android::details::TMatTransform<android::details::TMat44, float>",
    "name" : "android::details::TMatTransform<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2422",
-   "self_type" : "type-2422",
+   "referenced_type" : "type-2424",
+   "self_type" : "type-2424",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24260,11 +24326,11 @@
    "linker_set_key" : "android::details::TQuatDebug<android::details::TQuaternion, double>",
    "name" : "android::details::TQuatDebug<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-49",
-   "self_type" : "type-49",
+   "referenced_type" : "type-51",
+   "self_type" : "type-51",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details10TQuatDebugINS0_11TQuaternionEdEE"
   },
   {
@@ -24272,8 +24338,8 @@
    "linker_set_key" : "android::details::TQuatDebug<android::details::TQuaternion, float>",
    "name" : "android::details::TQuatDebug<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-48",
-   "self_type" : "type-48",
+   "referenced_type" : "type-50",
+   "self_type" : "type-50",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24284,11 +24350,11 @@
    "linker_set_key" : "android::details::TQuatFunctions<android::details::TQuaternion, double>",
    "name" : "android::details::TQuatFunctions<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-47",
-   "self_type" : "type-47",
+   "referenced_type" : "type-49",
+   "self_type" : "type-49",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details14TQuatFunctionsINS0_11TQuaternionEdEE"
   },
   {
@@ -24296,8 +24362,8 @@
    "linker_set_key" : "android::details::TQuatFunctions<android::details::TQuaternion, float>",
    "name" : "android::details::TQuatFunctions<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-46",
-   "self_type" : "type-46",
+   "referenced_type" : "type-48",
+   "self_type" : "type-48",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24308,11 +24374,11 @@
    "linker_set_key" : "android::details::TQuatProductOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TQuatProductOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-44",
-   "self_type" : "type-44",
+   "referenced_type" : "type-43",
+   "self_type" : "type-43",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details21TQuatProductOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -24320,8 +24386,8 @@
    "linker_set_key" : "android::details::TQuatProductOperators<android::details::TQuaternion, float>",
    "name" : "android::details::TQuatProductOperators<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-39",
-   "self_type" : "type-39",
+   "referenced_type" : "type-41",
+   "self_type" : "type-41",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24332,38 +24398,38 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-343"
+     "referenced_type" : "type-339"
     },
     {
-     "referenced_type" : "type-344"
+     "referenced_type" : "type-340"
     },
     {
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-341"
     },
     {
-     "referenced_type" : "type-44"
-    },
-    {
-     "referenced_type" : "type-47"
+     "referenced_type" : "type-43"
     },
     {
      "referenced_type" : "type-49"
+    },
+    {
+     "referenced_type" : "type-51"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-337"
     }
    ],
    "linker_set_key" : "android::details::TQuaternion<double>",
    "name" : "android::details::TQuaternion<double>",
    "record_kind" : "class",
-   "referenced_type" : "type-340",
-   "self_type" : "type-340",
+   "referenced_type" : "type-336",
+   "self_type" : "type-336",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details11TQuaternionIdEE"
   },
   {
@@ -24371,27 +24437,27 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-342"
+     "referenced_type" : "type-338"
     },
     {
      "field_name" : "xyzw",
-     "referenced_type" : "type-57"
+     "referenced_type" : "type-52"
     },
     {
      "field_name" : "xyz",
-     "referenced_type" : "type-73"
+     "referenced_type" : "type-68"
     },
     {
      "field_name" : "xy",
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-57"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "name" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "record_kind" : "union",
-   "referenced_type" : "type-341",
-   "self_type" : "type-341",
+   "referenced_type" : "type-337",
+   "self_type" : "type-337",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIdEUt_E"
@@ -24402,29 +24468,29 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "z",
      "field_offset" : 128,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "w",
      "field_offset" : 192,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
    "name" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
-   "referenced_type" : "type-342",
-   "self_type" : "type-342",
+   "referenced_type" : "type-338",
+   "self_type" : "type-338",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIdEUt_Ut_E"
@@ -24434,35 +24500,35 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-418"
+     "referenced_type" : "type-414"
     },
     {
-     "referenced_type" : "type-419"
+     "referenced_type" : "type-415"
     },
     {
-     "referenced_type" : "type-420"
+     "referenced_type" : "type-416"
     },
     {
-     "referenced_type" : "type-39"
-    },
-    {
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-41"
     },
     {
      "referenced_type" : "type-48"
+    },
+    {
+     "referenced_type" : "type-50"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-416"
+     "referenced_type" : "type-412"
     }
    ],
    "linker_set_key" : "android::details::TQuaternion<float>",
    "name" : "android::details::TQuaternion<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-415",
-   "self_type" : "type-415",
+   "referenced_type" : "type-411",
+   "self_type" : "type-411",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "template_args" : [ "type-10" ],
@@ -24473,11 +24539,11 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-417"
+     "referenced_type" : "type-413"
     },
     {
      "field_name" : "xyzw",
-     "referenced_type" : "type-218"
+     "referenced_type" : "type-203"
     },
     {
      "field_name" : "xyz",
@@ -24492,8 +24558,8 @@
    "linker_set_key" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "name" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "record_kind" : "union",
-   "referenced_type" : "type-416",
-   "self_type" : "type-416",
+   "referenced_type" : "type-412",
+   "self_type" : "type-412",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIfEUt_E"
@@ -24525,8 +24591,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
    "name" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
-   "referenced_type" : "type-417",
-   "self_type" : "type-417",
+   "referenced_type" : "type-413",
+   "self_type" : "type-413",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIfEUt_Ut_E"
@@ -24536,22 +24602,22 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-397"
+     "referenced_type" : "type-391"
     },
     {
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-456"
     },
     {
-     "referenced_type" : "type-512"
+     "referenced_type" : "type-509"
     },
     {
      "referenced_type" : "type-601"
     },
     {
-     "referenced_type" : "type-645"
+     "referenced_type" : "type-644"
     }
    ],
    "fields" :
@@ -24668,44 +24734,11 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-62"
     },
     {
-     "referenced_type" : "type-68"
-    },
-    {
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-70"
-    },
-    {
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-72"
-    }
-   ],
-   "fields" :
-   [
-    {
      "referenced_type" : "type-63"
-    }
-   ],
-   "linker_set_key" : "android::details::TVec2<double>",
-   "name" : "android::details::TVec2<double>",
-   "record_kind" : "class",
-   "referenced_type" : "type-62",
-   "self_type" : "type-62",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "template_args" : [ "type-45" ],
-   "unique_id" : "_ZTSN7android7details5TVec2IdEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
+    },
     {
      "referenced_type" : "type-64"
     },
@@ -24714,14 +24747,47 @@
     },
     {
      "referenced_type" : "type-66"
+    },
+    {
+     "referenced_type" : "type-67"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "referenced_type" : "type-58"
+    }
+   ],
+   "linker_set_key" : "android::details::TVec2<double>",
+   "name" : "android::details::TVec2<double>",
+   "record_kind" : "class",
+   "referenced_type" : "type-57",
+   "self_type" : "type-57",
+   "size" : 16,
+   "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
+   "template_args" : [ "type-44" ],
+   "unique_id" : "_ZTSN7android7details5TVec2IdEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "referenced_type" : "type-59"
+    },
+    {
+     "referenced_type" : "type-60"
+    },
+    {
+     "referenced_type" : "type-61"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5) at frameworks/native/libs/math/include/math/vec2.h:49:5",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5) at frameworks/native/libs/math/include/math/vec2.h:49:5",
    "record_kind" : "union",
-   "referenced_type" : "type-63",
-   "self_type" : "type-63",
+   "referenced_type" : "type-58",
+   "self_type" : "type-58",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_E"
@@ -24732,19 +24798,19 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:50:9) at frameworks/native/libs/math/include/math/vec2.h:50:9",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:50:9) at frameworks/native/libs/math/include/math/vec2.h:50:9",
-   "referenced_type" : "type-64",
-   "self_type" : "type-64",
+   "referenced_type" : "type-59",
+   "self_type" : "type-59",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_Ut_E"
@@ -24755,19 +24821,19 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "t",
      "field_offset" : 64,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:51:9) at frameworks/native/libs/math/include/math/vec2.h:51:9",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:51:9) at frameworks/native/libs/math/include/math/vec2.h:51:9",
-   "referenced_type" : "type-65",
-   "self_type" : "type-65",
+   "referenced_type" : "type-60",
+   "self_type" : "type-60",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_Ut0_E"
@@ -24778,19 +24844,19 @@
    [
     {
      "field_name" : "r",
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "g",
      "field_offset" : 64,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:52:9) at frameworks/native/libs/math/include/math/vec2.h:52:9",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:52:9) at frameworks/native/libs/math/include/math/vec2.h:52:9",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
+   "referenced_type" : "type-61",
+   "self_type" : "type-61",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_Ut1_E"
@@ -24932,44 +24998,11 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-73"
     },
     {
-     "referenced_type" : "type-79"
-    },
-    {
-     "referenced_type" : "type-80"
-    },
-    {
-     "referenced_type" : "type-81"
-    },
-    {
-     "referenced_type" : "type-82"
-    },
-    {
-     "referenced_type" : "type-83"
-    }
-   ],
-   "fields" :
-   [
-    {
      "referenced_type" : "type-74"
-    }
-   ],
-   "linker_set_key" : "android::details::TVec3<double>",
-   "name" : "android::details::TVec3<double>",
-   "record_kind" : "class",
-   "referenced_type" : "type-73",
-   "self_type" : "type-73",
-   "size" : 24,
-   "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
-   "template_args" : [ "type-45" ],
-   "unique_id" : "_ZTSN7android7details5TVec3IdEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
+    },
     {
      "referenced_type" : "type-75"
     },
@@ -24980,24 +25013,57 @@
      "referenced_type" : "type-77"
     },
     {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "referenced_type" : "type-69"
+    }
+   ],
+   "linker_set_key" : "android::details::TVec3<double>",
+   "name" : "android::details::TVec3<double>",
+   "record_kind" : "class",
+   "referenced_type" : "type-68",
+   "self_type" : "type-68",
+   "size" : 24,
+   "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
+   "template_args" : [ "type-44" ],
+   "unique_id" : "_ZTSN7android7details5TVec3IdEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "referenced_type" : "type-70"
+    },
+    {
+     "referenced_type" : "type-71"
+    },
+    {
+     "referenced_type" : "type-72"
+    },
+    {
      "field_name" : "xy",
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "st",
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "rg",
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-57"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5) at frameworks/native/libs/math/include/math/vec3.h:47:5",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5) at frameworks/native/libs/math/include/math/vec3.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-74",
-   "self_type" : "type-74",
+   "referenced_type" : "type-69",
+   "self_type" : "type-69",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_E"
@@ -25008,24 +25074,24 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "z",
      "field_offset" : 128,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:48:9) at frameworks/native/libs/math/include/math/vec3.h:48:9",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:48:9) at frameworks/native/libs/math/include/math/vec3.h:48:9",
-   "referenced_type" : "type-75",
-   "self_type" : "type-75",
+   "referenced_type" : "type-70",
+   "self_type" : "type-70",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_Ut_E"
@@ -25036,24 +25102,24 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "t",
      "field_offset" : 64,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "p",
      "field_offset" : 128,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:49:9) at frameworks/native/libs/math/include/math/vec3.h:49:9",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:49:9) at frameworks/native/libs/math/include/math/vec3.h:49:9",
-   "referenced_type" : "type-76",
-   "self_type" : "type-76",
+   "referenced_type" : "type-71",
+   "self_type" : "type-71",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_Ut0_E"
@@ -25064,24 +25130,24 @@
    [
     {
      "field_name" : "r",
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "g",
      "field_offset" : 64,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "b",
      "field_offset" : 128,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:50:9) at frameworks/native/libs/math/include/math/vec3.h:50:9",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:50:9) at frameworks/native/libs/math/include/math/vec3.h:50:9",
-   "referenced_type" : "type-77",
-   "self_type" : "type-77",
+   "referenced_type" : "type-72",
+   "self_type" : "type-72",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_Ut1_E"
@@ -25097,13 +25163,13 @@
      "referenced_type" : "type-9"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-13"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-18"
     },
     {
      "referenced_type" : "type-37"
@@ -25250,38 +25316,38 @@
    "base_specifiers" :
    [
     {
+     "referenced_type" : "type-79"
+    },
+    {
+     "referenced_type" : "type-80"
+    },
+    {
+     "referenced_type" : "type-81"
+    },
+    {
+     "referenced_type" : "type-82"
+    },
+    {
+     "referenced_type" : "type-83"
+    },
+    {
      "referenced_type" : "type-84"
-    },
-    {
-     "referenced_type" : "type-85"
-    },
-    {
-     "referenced_type" : "type-86"
-    },
-    {
-     "referenced_type" : "type-87"
-    },
-    {
-     "referenced_type" : "type-88"
-    },
-    {
-     "referenced_type" : "type-89"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-58"
+     "referenced_type" : "type-53"
     }
    ],
    "linker_set_key" : "android::details::TVec4<double>",
    "name" : "android::details::TVec4<double>",
    "record_kind" : "class",
-   "referenced_type" : "type-57",
-   "self_type" : "type-57",
+   "referenced_type" : "type-52",
+   "self_type" : "type-52",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details5TVec4IdEE"
   },
   {
@@ -25289,45 +25355,45 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-54"
     },
     {
-     "referenced_type" : "type-60"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-56"
     },
     {
      "field_name" : "xy",
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "st",
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "rg",
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "xyz",
-     "referenced_type" : "type-73"
+     "referenced_type" : "type-68"
     },
     {
      "field_name" : "stp",
-     "referenced_type" : "type-73"
+     "referenced_type" : "type-68"
     },
     {
      "field_name" : "rgb",
-     "referenced_type" : "type-73"
+     "referenced_type" : "type-68"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
+   "referenced_type" : "type-53",
+   "self_type" : "type-53",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_E"
@@ -25338,29 +25404,29 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "z",
      "field_offset" : 128,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "w",
      "field_offset" : 192,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
-   "referenced_type" : "type-59",
-   "self_type" : "type-59",
+   "referenced_type" : "type-54",
+   "self_type" : "type-54",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_Ut_E"
@@ -25371,29 +25437,29 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "t",
      "field_offset" : 64,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "p",
      "field_offset" : 128,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "q",
      "field_offset" : 192,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
-   "referenced_type" : "type-60",
-   "self_type" : "type-60",
+   "referenced_type" : "type-55",
+   "self_type" : "type-55",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_Ut0_E"
@@ -25404,29 +25470,29 @@
    [
     {
      "field_name" : "r",
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "g",
      "field_offset" : 64,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "b",
      "field_offset" : 128,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "a",
      "field_offset" : 192,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
-   "referenced_type" : "type-61",
-   "self_type" : "type-61",
+   "referenced_type" : "type-56",
+   "self_type" : "type-56",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_Ut1_E"
@@ -25436,35 +25502,35 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-223"
+     "referenced_type" : "type-208"
     },
     {
-     "referenced_type" : "type-224"
+     "referenced_type" : "type-209"
     },
     {
-     "referenced_type" : "type-225"
+     "referenced_type" : "type-210"
     },
     {
-     "referenced_type" : "type-226"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-212"
     },
     {
-     "referenced_type" : "type-228"
+     "referenced_type" : "type-213"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-219"
+     "referenced_type" : "type-204"
     }
    ],
    "linker_set_key" : "android::details::TVec4<float>",
    "name" : "android::details::TVec4<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-218",
-   "self_type" : "type-218",
+   "referenced_type" : "type-203",
+   "self_type" : "type-203",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "template_args" : [ "type-10" ],
@@ -25475,13 +25541,13 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-220"
+     "referenced_type" : "type-205"
     },
     {
-     "referenced_type" : "type-221"
+     "referenced_type" : "type-206"
     },
     {
-     "referenced_type" : "type-222"
+     "referenced_type" : "type-207"
     },
     {
      "field_name" : "xy",
@@ -25512,8 +25578,8 @@
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-219",
-   "self_type" : "type-219",
+   "referenced_type" : "type-204",
+   "self_type" : "type-204",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_E"
@@ -25545,8 +25611,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
-   "referenced_type" : "type-220",
-   "self_type" : "type-220",
+   "referenced_type" : "type-205",
+   "self_type" : "type-205",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_Ut_E"
@@ -25578,8 +25644,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
-   "referenced_type" : "type-221",
-   "self_type" : "type-221",
+   "referenced_type" : "type-206",
+   "self_type" : "type-206",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_Ut0_E"
@@ -25611,8 +25677,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
-   "referenced_type" : "type-222",
-   "self_type" : "type-222",
+   "referenced_type" : "type-207",
+   "self_type" : "type-207",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_Ut1_E"
@@ -25634,8 +25700,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TMat44, float>",
    "name" : "android::details::TVecAddOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2411",
-   "self_type" : "type-2411",
+   "referenced_type" : "type-2413",
+   "self_type" : "type-2413",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25646,11 +25712,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TVecAddOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-343",
-   "self_type" : "type-343",
+   "referenced_type" : "type-339",
+   "self_type" : "type-339",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -25658,8 +25724,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TQuaternion, float>",
    "name" : "android::details::TVecAddOperators<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-418",
-   "self_type" : "type-418",
+   "referenced_type" : "type-414",
+   "self_type" : "type-414",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25670,8 +25736,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecAddOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-429",
-   "self_type" : "type-429",
+   "referenced_type" : "type-426",
+   "self_type" : "type-426",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -25682,11 +25748,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecAddOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-68",
-   "self_type" : "type-68",
+   "referenced_type" : "type-63",
+   "self_type" : "type-63",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -25706,11 +25772,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecAddOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-79",
-   "self_type" : "type-79",
+   "referenced_type" : "type-74",
+   "self_type" : "type-74",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -25730,11 +25796,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecAddOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-85",
-   "self_type" : "type-85",
+   "referenced_type" : "type-80",
+   "self_type" : "type-80",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -25742,8 +25808,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecAddOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-224",
-   "self_type" : "type-224",
+   "referenced_type" : "type-209",
+   "self_type" : "type-209",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25766,8 +25832,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TMat44, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2413",
-   "self_type" : "type-2413",
+   "referenced_type" : "type-2415",
+   "self_type" : "type-2415",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25778,11 +25844,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-345",
-   "self_type" : "type-345",
+   "referenced_type" : "type-341",
+   "self_type" : "type-341",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -25790,8 +25856,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TQuaternion, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-420",
-   "self_type" : "type-420",
+   "referenced_type" : "type-416",
+   "self_type" : "type-416",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25802,8 +25868,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-512",
-   "self_type" : "type-512",
+   "referenced_type" : "type-509",
+   "self_type" : "type-509",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -25814,11 +25880,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-70",
-   "self_type" : "type-70",
+   "referenced_type" : "type-65",
+   "self_type" : "type-65",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -25838,11 +25904,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-81",
-   "self_type" : "type-81",
+   "referenced_type" : "type-76",
+   "self_type" : "type-76",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -25850,8 +25916,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec3, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-12",
-   "self_type" : "type-12",
+   "referenced_type" : "type-14",
+   "self_type" : "type-14",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25862,11 +25928,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-87",
-   "self_type" : "type-87",
+   "referenced_type" : "type-82",
+   "self_type" : "type-82",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -25874,8 +25940,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-226",
-   "self_type" : "type-226",
+   "referenced_type" : "type-211",
+   "self_type" : "type-211",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25886,8 +25952,8 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec2, bool>",
    "name" : "android::details::TVecDebug<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-645",
-   "self_type" : "type-645",
+   "referenced_type" : "type-644",
+   "self_type" : "type-644",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -25898,11 +25964,11 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec2, double>",
    "name" : "android::details::TVecDebug<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-72",
-   "self_type" : "type-72",
+   "referenced_type" : "type-67",
+   "self_type" : "type-67",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details9TVecDebugINS0_5TVec2EdEE"
   },
   {
@@ -25922,11 +25988,11 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec3, double>",
    "name" : "android::details::TVecDebug<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-83",
-   "self_type" : "type-83",
+   "referenced_type" : "type-78",
+   "self_type" : "type-78",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details9TVecDebugINS0_5TVec3EdEE"
   },
   {
@@ -25946,11 +26012,11 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec4, double>",
    "name" : "android::details::TVecDebug<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-89",
-   "self_type" : "type-89",
+   "referenced_type" : "type-84",
+   "self_type" : "type-84",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details9TVecDebugINS0_5TVec4EdEE"
   },
   {
@@ -25958,8 +26024,8 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec4, float>",
    "name" : "android::details::TVecDebug<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-228",
-   "self_type" : "type-228",
+   "referenced_type" : "type-213",
+   "self_type" : "type-213",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25982,11 +26048,11 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec2, double>",
    "name" : "android::details::TVecFunctions<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-71",
-   "self_type" : "type-71",
+   "referenced_type" : "type-66",
+   "self_type" : "type-66",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details13TVecFunctionsINS0_5TVec2EdEE"
   },
   {
@@ -26006,11 +26072,11 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec3, double>",
    "name" : "android::details::TVecFunctions<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-82",
-   "self_type" : "type-82",
+   "referenced_type" : "type-77",
+   "self_type" : "type-77",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details13TVecFunctionsINS0_5TVec3EdEE"
   },
   {
@@ -26018,8 +26084,8 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec3, float>",
    "name" : "android::details::TVecFunctions<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-16",
-   "self_type" : "type-16",
+   "referenced_type" : "type-18",
+   "self_type" : "type-18",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26030,11 +26096,11 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec4, double>",
    "name" : "android::details::TVecFunctions<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-88",
-   "self_type" : "type-88",
+   "referenced_type" : "type-83",
+   "self_type" : "type-83",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details13TVecFunctionsINS0_5TVec4EdEE"
   },
   {
@@ -26042,8 +26108,8 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec4, float>",
    "name" : "android::details::TVecFunctions<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-227",
-   "self_type" : "type-227",
+   "referenced_type" : "type-212",
+   "self_type" : "type-212",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26054,8 +26120,8 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecProductOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-397",
-   "self_type" : "type-397",
+   "referenced_type" : "type-391",
+   "self_type" : "type-391",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -26066,11 +26132,11 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecProductOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-67",
-   "self_type" : "type-67",
+   "referenced_type" : "type-62",
+   "self_type" : "type-62",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details20TVecProductOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -26090,11 +26156,11 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecProductOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-78",
-   "self_type" : "type-78",
+   "referenced_type" : "type-73",
+   "self_type" : "type-73",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details20TVecProductOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -26114,11 +26180,11 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecProductOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-84",
-   "self_type" : "type-84",
+   "referenced_type" : "type-79",
+   "self_type" : "type-79",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details20TVecProductOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -26126,8 +26192,8 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecProductOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-223",
-   "self_type" : "type-223",
+   "referenced_type" : "type-208",
+   "self_type" : "type-208",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26150,8 +26216,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TMat44, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2412",
-   "self_type" : "type-2412",
+   "referenced_type" : "type-2414",
+   "self_type" : "type-2414",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26162,11 +26228,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-344",
-   "self_type" : "type-344",
+   "referenced_type" : "type-340",
+   "self_type" : "type-340",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -26174,8 +26240,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TQuaternion, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-419",
-   "self_type" : "type-419",
+   "referenced_type" : "type-415",
+   "self_type" : "type-415",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26186,8 +26252,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-461",
-   "self_type" : "type-461",
+   "referenced_type" : "type-456",
+   "self_type" : "type-456",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -26198,11 +26264,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-69",
-   "self_type" : "type-69",
+   "referenced_type" : "type-64",
+   "self_type" : "type-64",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -26222,11 +26288,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-80",
-   "self_type" : "type-80",
+   "referenced_type" : "type-75",
+   "self_type" : "type-75",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -26234,8 +26300,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec3, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-11",
-   "self_type" : "type-11",
+   "referenced_type" : "type-13",
+   "self_type" : "type-13",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26246,11 +26312,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-86",
-   "self_type" : "type-86",
+   "referenced_type" : "type-81",
+   "self_type" : "type-81",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -26258,8 +26324,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-225",
-   "self_type" : "type-225",
+   "referenced_type" : "type-210",
+   "self_type" : "type-210",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26325,7 +26391,7 @@
    [
     {
      "field_name" : "bits",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "fp",
@@ -26347,7 +26413,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -26356,32 +26422,32 @@
      "access" : "protected",
      "field_name" : "mSchedPolicy",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "protected",
      "field_name" : "mSchedPriority",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mExtras",
      "field_offset" : 128,
-     "referenced_type" : "type-245"
+     "referenced_type" : "type-247"
     },
     {
      "access" : "private",
      "field_name" : "mReserved0",
      "field_offset" : 192,
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     }
    ],
    "linker_set_key" : "android::hardware::BHwBinder",
    "name" : "android::hardware::BHwBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-244",
-   "self_type" : "type-244",
+   "referenced_type" : "type-246",
+   "self_type" : "type-246",
    "size" : 48,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware9BHwBinderE",
@@ -26488,7 +26554,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-174"
     }
    ],
    "fields" :
@@ -26497,26 +26563,26 @@
      "access" : "private",
      "field_name" : "mRemote",
      "field_offset" : 64,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-196"
     },
     {
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 128,
-     "referenced_type" : "type-196"
+     "referenced_type" : "type-199"
     },
     {
      "access" : "private",
      "field_name" : "mState",
      "field_offset" : 192,
-     "referenced_type" : "type-198"
+     "referenced_type" : "type-201"
     }
    ],
    "linker_set_key" : "android::hardware::BpHwRefBase",
    "name" : "android::hardware::BpHwRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-192",
-   "self_type" : "type-192",
+   "referenced_type" : "type-195",
+   "self_type" : "type-195",
    "size" : 48,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE",
@@ -26605,22 +26671,22 @@
    [
     {
      "field_name" : "flags",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "fdIndex",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "offset",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "extent",
      "field_offset" : 128,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "android::hardware::GrantorDescriptor",
@@ -26641,7 +26707,7 @@
     },
     {
      "is_virtual" : true,
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-174"
     }
    ],
    "linker_set_key" : "android::hardware::HidlMemory",
@@ -26729,14 +26795,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-174"
     }
    ],
    "linker_set_key" : "android::hardware::IBinder",
    "name" : "android::hardware::IBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-195",
-   "self_type" : "type-195",
+   "referenced_type" : "type-198",
+   "self_type" : "type-198",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinderE",
@@ -26846,14 +26912,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-174"
     }
    ],
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient",
    "name" : "android::hardware::IBinder::DeathRecipient",
    "record_kind" : "class",
-   "referenced_type" : "type-191",
-   "self_type" : "type-191",
+   "referenced_type" : "type-194",
+   "self_type" : "type-194",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinder14DeathRecipientE",
@@ -26934,14 +27000,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-174"
     }
    ],
    "linker_set_key" : "android::hardware::IInterface",
    "name" : "android::hardware::IInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-202",
-   "self_type" : "type-202",
+   "referenced_type" : "type-215",
+   "self_type" : "type-215",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
    "unique_id" : "_ZTSN7android8hardware10IInterfaceE",
@@ -27023,85 +27089,85 @@
     {
      "access" : "private",
      "field_name" : "mProcess",
-     "referenced_type" : "type-280"
+     "referenced_type" : "type-276"
     },
     {
      "access" : "private",
      "field_name" : "mPendingStrongDerefs",
      "field_offset" : 64,
-     "referenced_type" : "type-242"
+     "referenced_type" : "type-244"
     },
     {
      "access" : "private",
      "field_name" : "mPendingWeakDerefs",
      "field_offset" : 384,
-     "referenced_type" : "type-246"
+     "referenced_type" : "type-248"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteStrongDerefs",
      "field_offset" : 704,
-     "referenced_type" : "type-247"
+     "referenced_type" : "type-249"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteWeakDerefs",
      "field_offset" : 1024,
-     "referenced_type" : "type-246"
+     "referenced_type" : "type-248"
     },
     {
      "access" : "private",
      "field_name" : "mIn",
      "field_offset" : 1344,
-     "referenced_type" : "type-204"
+     "referenced_type" : "type-217"
     },
     {
      "access" : "private",
      "field_name" : "mOut",
      "field_offset" : 2432,
-     "referenced_type" : "type-204"
+     "referenced_type" : "type-217"
     },
     {
      "access" : "private",
      "field_name" : "mLastError",
      "field_offset" : 3520,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mCallingPid",
      "field_offset" : 3552,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mCallingSid",
      "field_offset" : 3584,
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-285"
     },
     {
      "access" : "private",
      "field_name" : "mCallingUid",
      "field_offset" : 3648,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mStrictModePolicy",
      "field_offset" : 3680,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mLastTransactionBinderFlags",
      "field_offset" : 3712,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mContextObject",
      "field_offset" : 3776,
-     "referenced_type" : "type-291"
+     "referenced_type" : "type-288"
     },
     {
      "access" : "private",
@@ -27119,26 +27185,26 @@
      "access" : "private",
      "field_name" : "mPostCommandTasks",
      "field_offset" : 3904,
-     "referenced_type" : "type-292"
+     "referenced_type" : "type-289"
     },
     {
      "access" : "private",
      "field_name" : "mIPCThreadStateBase",
      "field_offset" : 4096,
-     "referenced_type" : "type-293"
+     "referenced_type" : "type-290"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 4160,
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-274"
     }
    ],
    "linker_set_key" : "android::hardware::IPCThreadState",
    "name" : "android::hardware::IPCThreadState",
    "record_kind" : "class",
-   "referenced_type" : "type-279",
-   "self_type" : "type-279",
+   "referenced_type" : "type-275",
+   "self_type" : "type-275",
    "size" : 528,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h",
    "unique_id" : "_ZTSN7android8hardware14IPCThreadStateE"
@@ -27150,73 +27216,73 @@
     {
      "access" : "private",
      "field_name" : "mBufCachePos",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
      "field_name" : "mBufCache",
      "field_offset" : 64,
-     "referenced_type" : "type-205"
+     "referenced_type" : "type-218"
     },
     {
      "access" : "private",
      "field_name" : "mError",
      "field_offset" : 256,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mData",
      "field_offset" : 320,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-219"
     },
     {
      "access" : "private",
      "field_name" : "mDataSize",
      "field_offset" : 384,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
      "field_name" : "mDataCapacity",
      "field_offset" : 448,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
      "field_name" : "mDataPos",
      "field_offset" : 512,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
      "field_name" : "mObjects",
      "field_offset" : 576,
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-221"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsSize",
      "field_offset" : 640,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsCapacity",
      "field_offset" : 704,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
      "field_name" : "mNextObjectHint",
      "field_offset" : 768,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
      "field_name" : "mNumRef",
      "field_offset" : 832,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
@@ -27240,20 +27306,20 @@
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 960,
-     "referenced_type" : "type-210"
+     "referenced_type" : "type-223"
     },
     {
      "access" : "private",
      "field_name" : "mOwnerCookie",
      "field_offset" : 1024,
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     }
    ],
    "linker_set_key" : "android::hardware::Parcel",
    "name" : "android::hardware::Parcel",
    "record_kind" : "class",
-   "referenced_type" : "type-204",
-   "self_type" : "type-204",
+   "referenced_type" : "type-217",
+   "self_type" : "type-217",
    "size" : 136,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6ParcelE"
@@ -27265,23 +27331,23 @@
    [
     {
      "field_name" : "index",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "buffer",
      "field_offset" : 64,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-222"
     },
     {
      "field_name" : "bufend",
      "field_offset" : 128,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-222"
     }
    ],
    "linker_set_key" : "android::hardware::Parcel::BufferInfo",
    "name" : "android::hardware::Parcel::BufferInfo",
-   "referenced_type" : "type-229",
-   "self_type" : "type-229",
+   "referenced_type" : "type-231",
+   "self_type" : "type-231",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE"
@@ -27292,7 +27358,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-174"
     }
    ],
    "fields" :
@@ -27301,55 +27367,55 @@
      "access" : "private",
      "field_name" : "mDriverFD",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mVMStart",
      "field_offset" : 128,
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountLock",
      "field_offset" : 192,
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-280"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountDecrement",
      "field_offset" : 512,
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-281"
     },
     {
      "access" : "private",
      "field_name" : "mExecutingThreadsCount",
      "field_offset" : 896,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
      "field_name" : "mMaxThreads",
      "field_offset" : 960,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
      "field_name" : "mStarvationStartTimeMs",
      "field_offset" : 1024,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-12"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 1088,
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-282"
     },
     {
      "access" : "private",
      "field_name" : "mHandleToObject",
      "field_offset" : 1408,
-     "referenced_type" : "type-240"
+     "referenced_type" : "type-242"
     },
     {
      "access" : "private",
@@ -27361,25 +27427,25 @@
      "access" : "private",
      "field_name" : "mBinderContextCheckFunc",
      "field_offset" : 1792,
-     "referenced_type" : "type-276"
+     "referenced_type" : "type-272"
     },
     {
      "access" : "private",
      "field_name" : "mBinderContextUserData",
      "field_offset" : 1856,
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "access" : "private",
      "field_name" : "mContexts",
      "field_offset" : 1920,
-     "referenced_type" : "type-249"
+     "referenced_type" : "type-251"
     },
     {
      "access" : "private",
      "field_name" : "mRootDir",
      "field_offset" : 2240,
-     "referenced_type" : "type-287"
+     "referenced_type" : "type-284"
     },
     {
      "access" : "private",
@@ -27397,26 +27463,26 @@
      "access" : "private",
      "field_name" : "mThreadPoolSeq",
      "field_offset" : 2336,
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-273"
     },
     {
      "access" : "private",
      "field_name" : "mMmapSize",
      "field_offset" : 2368,
-     "referenced_type" : "type-238"
+     "referenced_type" : "type-240"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 2432,
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-274"
     }
    ],
    "linker_set_key" : "android::hardware::ProcessState",
    "name" : "android::hardware::ProcessState",
    "record_kind" : "class",
-   "referenced_type" : "type-283",
-   "self_type" : "type-283",
+   "referenced_type" : "type-279",
+   "self_type" : "type-279",
    "size" : 328,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessStateE",
@@ -27494,18 +27560,18 @@
    [
     {
      "field_name" : "binder",
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-197"
     },
     {
      "field_name" : "refs",
      "field_offset" : 64,
-     "referenced_type" : "type-196"
+     "referenced_type" : "type-199"
     }
    ],
    "linker_set_key" : "android::hardware::ProcessState::handle_entry",
    "name" : "android::hardware::ProcessState::handle_entry",
-   "referenced_type" : "type-241",
-   "self_type" : "type-241",
+   "referenced_type" : "type-243",
+   "self_type" : "type-243",
    "size" : 16,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE"
@@ -27515,7 +27581,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "fields" :
@@ -27524,17 +27590,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 288,
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-102"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
    "record_kind" : "class",
-   "referenced_type" : "type-99",
-   "self_type" : "type-99",
+   "referenced_type" : "type-101",
+   "self_type" : "type-101",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-105" ],
+   "template_args" : [ "type-107" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS0_8graphics6mapper4V2_05ErrorEEE"
   },
   {
@@ -27542,7 +27608,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "fields" :
@@ -27551,17 +27617,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 288,
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-394"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
    "record_kind" : "class",
-   "referenced_type" : "type-394",
-   "self_type" : "type-394",
+   "referenced_type" : "type-393",
+   "self_type" : "type-393",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-396" ],
+   "template_args" : [ "type-395" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS0_8graphics6mapper4V3_05ErrorEEE"
   },
   {
@@ -27569,7 +27635,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "fields" :
@@ -27578,17 +27644,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 320,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-88"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
    "record_kind" : "class",
-   "referenced_type" : "type-111",
-   "self_type" : "type-111",
+   "referenced_type" : "type-113",
+   "self_type" : "type-113",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-53" ],
+   "template_args" : [ "type-88" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics6mapper4V2_17IMapperEEEEE"
   },
   {
@@ -27596,7 +27662,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "linker_set_key" : "android::hardware::Return<void>",
@@ -27606,7 +27672,7 @@
    "self_type" : "type-1321",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-150" ],
+   "template_args" : [ "type-153" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIvEE"
   },
   {
@@ -27616,26 +27682,26 @@
     {
      "access" : "private",
      "field_name" : "mException",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mErrorCode",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-106"
     }
    ],
    "linker_set_key" : "android::hardware::Status",
    "name" : "android::hardware::Status",
    "record_kind" : "class",
-   "referenced_type" : "type-102",
-   "self_type" : "type-102",
+   "referenced_type" : "type-104",
+   "self_type" : "type-104",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware6StatusE"
@@ -27741,7 +27807,7 @@
    "self_type" : "type-1104",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware7details14const_accessorIjLm10EJEEE"
   },
   {
@@ -27755,12 +27821,12 @@
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-1100",
    "self_type" : "type-1100",
@@ -27792,16 +27858,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-136"
+     "referenced_type" : "type-138"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
-   "referenced_type" : "type-135",
-   "self_type" : "type-135",
+   "referenced_type" : "type-137",
+   "self_type" : "type-137",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-138" ],
+   "template_args" : [ "type-140" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_handleEEE"
   },
   {
@@ -27819,7 +27885,7 @@
    "self_type" : "type-1071",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-289" ],
+   "template_args" : [ "type-286" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEE"
   },
   {
@@ -27829,16 +27895,16 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-285"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-1072",
    "self_type" : "type-1072",
@@ -27852,16 +27918,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-140"
+     "referenced_type" : "type-142"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>",
-   "referenced_type" : "type-139",
-   "self_type" : "type-139",
+   "referenced_type" : "type-141",
+   "self_type" : "type-141",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-144" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEE"
   },
   {
@@ -27871,19 +27937,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-140",
-   "self_type" : "type-140",
+   "referenced_type" : "type-142",
+   "self_type" : "type-142",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEUt_E"
@@ -27895,19 +27961,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-137"
+     "referenced_type" : "type-139"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<hidl_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<hidl_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-136",
-   "self_type" : "type-136",
+   "referenced_type" : "type-138",
+   "self_type" : "type-138",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_handleEEUt_E"
@@ -27927,7 +27993,7 @@
    "self_type" : "type-1150",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-143" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEE"
   },
   {
@@ -27941,12 +28007,12 @@
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-1151",
    "self_type" : "type-1151",
@@ -27960,16 +28026,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-121"
+     "referenced_type" : "type-123"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int>",
    "name" : "android::hardware::details::hidl_pointer<unsigned int>",
-   "referenced_type" : "type-120",
-   "self_type" : "type-120",
+   "referenced_type" : "type-122",
+   "self_type" : "type-122",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIjEE"
   },
   {
@@ -27979,19 +28045,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<unsigned int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<unsigned int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-121",
-   "self_type" : "type-121",
+   "referenced_type" : "type-123",
+   "self_type" : "type-123",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIjEUt_E"
@@ -28013,7 +28079,7 @@
     {
      "access" : "private",
      "field_name" : "mStatus",
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-104"
     },
     {
      "access" : "private",
@@ -28025,8 +28091,8 @@
    "linker_set_key" : "android::hardware::details::return_status",
    "name" : "android::hardware::details::return_status",
    "record_kind" : "class",
-   "referenced_type" : "type-101",
-   "self_type" : "type-101",
+   "referenced_type" : "type-103",
+   "self_type" : "type-103",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware7details13return_statusE"
@@ -28039,7 +28105,7 @@
    "self_type" : "type-1103",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware7details9std_arrayIjLm10EJEEE"
   },
   {
@@ -28053,7 +28119,7 @@
     {
      "field_name" : "nativeHandle",
      "field_offset" : 320,
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-140"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::HardwareBuffer",
@@ -28080,7 +28146,7 @@
    "self_type" : "type-1109",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware10hidl_arrayIjLm10EJEEE"
   },
   {
@@ -28089,7 +28155,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-174"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_death_recipient",
@@ -28174,33 +28240,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
    "name" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
-   "referenced_type" : "type-148",
-   "self_type" : "type-148",
+   "referenced_type" : "type-151",
+   "self_type" : "type-151",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-149", "type-150" ],
+   "template_args" : [ "type-152", "type-153" ],
    "unique_id" : "_ZTSN7android8hardware15hidl_enum_rangeINS0_8graphics6common4V1_011BufferUsageEvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
    "name" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
-   "referenced_type" : "type-156",
-   "self_type" : "type-156",
+   "referenced_type" : "type-158",
+   "self_type" : "type-158",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-157", "type-150" ],
+   "template_args" : [ "type-159", "type-153" ],
    "unique_id" : "_ZTSN7android8hardware15hidl_enum_rangeINS0_8graphics6common4V1_111BufferUsageEvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
    "name" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
-   "referenced_type" : "type-421",
-   "self_type" : "type-421",
+   "referenced_type" : "type-418",
+   "self_type" : "type-418",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-422", "type-150" ],
+   "template_args" : [ "type-419", "type-153" ],
    "unique_id" : "_ZTSN7android8hardware15hidl_enum_rangeINS0_8graphics6common4V1_211BufferUsageEvEE"
   },
   {
@@ -28210,7 +28276,7 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-141"
     },
     {
      "access" : "private",
@@ -28221,8 +28287,8 @@
    ],
    "linker_set_key" : "android::hardware::hidl_handle",
    "name" : "android::hardware::hidl_handle",
-   "referenced_type" : "type-138",
-   "self_type" : "type-138",
+   "referenced_type" : "type-140",
+   "self_type" : "type-140",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_handleE"
@@ -28234,13 +28300,13 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-140"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 128,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
@@ -28270,7 +28336,7 @@
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -28300,7 +28366,7 @@
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -28325,13 +28391,13 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-137"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -28342,11 +28408,11 @@
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_handle>",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_handle>",
-   "referenced_type" : "type-134",
-   "self_type" : "type-134",
+   "referenced_type" : "type-136",
+   "self_type" : "type-136",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-138" ],
+   "template_args" : [ "type-140" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_11hidl_handleEEE"
   },
   {
@@ -28356,13 +28422,13 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-120"
+     "referenced_type" : "type-122"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -28373,11 +28439,11 @@
    ],
    "linker_set_key" : "android::hardware::hidl_vec<unsigned int>",
    "name" : "android::hardware::hidl_vec<unsigned int>",
-   "referenced_type" : "type-128",
-   "self_type" : "type-128",
+   "referenced_type" : "type-130",
+   "self_type" : "type-130",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecIjEE"
   },
   {
@@ -28410,23 +28476,23 @@
    [
     {
      "field_name" : "pid",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "ptr",
      "field_offset" : 64,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "arch",
      "field_offset" : 128,
-     "referenced_type" : "type-163"
+     "referenced_type" : "type-166"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo",
    "name" : "android::hidl::base::V1_0::DebugInfo",
-   "referenced_type" : "type-162",
-   "self_type" : "type-162",
+   "referenced_type" : "type-165",
+   "self_type" : "type-165",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfoE"
@@ -28437,13 +28503,13 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-174"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::IBase",
    "name" : "android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-170",
-   "self_type" : "type-170",
+   "referenced_type" : "type-173",
+   "self_type" : "type-173",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_05IBaseE",
@@ -28552,13 +28618,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-170"
+     "referenced_type" : "type-173"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification",
    "name" : "android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-297",
-   "self_type" : "type-297",
+   "referenced_type" : "type-294",
+   "self_type" : "type-294",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_020IServiceNotificationE",
@@ -28672,12 +28738,12 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
      "field_name" : "value",
      "field_offset" : 64,
-     "referenced_type" : "type-677"
+     "referenced_type" : "type-681"
     }
    ],
    "linker_set_key" : "android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
@@ -28686,7 +28752,7 @@
    "self_type" : "type-694",
    "size" : 72,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-141", "type-677" ],
+   "template_args" : [ "type-143", "type-681" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -28716,17 +28782,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     }
    ],
    "linker_set_key" : "android::sp<android::GraphicBuffer>",
    "name" : "android::sp<android::GraphicBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-680",
-   "self_type" : "type-680",
+   "referenced_type" : "type-679",
+   "self_type" : "type-679",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-527" ],
+   "template_args" : [ "type-524" ],
    "unique_id" : "_ZTSN7android2spINS_13GraphicBufferEEE"
   },
   {
@@ -28736,17 +28802,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-370"
+     "referenced_type" : "type-367"
     }
    ],
    "linker_set_key" : "android::sp<android::Thread>",
    "name" : "android::sp<android::Thread>",
    "record_kind" : "class",
-   "referenced_type" : "type-369",
-   "self_type" : "type-369",
+   "referenced_type" : "type-366",
+   "self_type" : "type-366",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-371" ],
+   "template_args" : [ "type-368" ],
    "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
   },
   {
@@ -28756,17 +28822,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-243"
+     "referenced_type" : "type-245"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::BHwBinder>",
    "name" : "android::sp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-291",
-   "self_type" : "type-291",
+   "referenced_type" : "type-288",
+   "self_type" : "type-288",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-244" ],
+   "template_args" : [ "type-246" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
   },
   {
@@ -28776,17 +28842,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-197"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IBinder>",
    "name" : "android::sp<android::hardware::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-250",
-   "self_type" : "type-250",
+   "referenced_type" : "type-252",
+   "self_type" : "type-252",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-195" ],
+   "template_args" : [ "type-198" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
   },
   {
@@ -28796,17 +28862,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-282"
+     "referenced_type" : "type-278"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::ProcessState>",
    "name" : "android::sp<android::hardware::ProcessState>",
    "record_kind" : "class",
-   "referenced_type" : "type-281",
-   "self_type" : "type-281",
+   "referenced_type" : "type-277",
+   "self_type" : "type-277",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-283" ],
+   "template_args" : [ "type-279" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
   },
   {
@@ -28816,17 +28882,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-358"
+     "referenced_type" : "type-355"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
    "record_kind" : "class",
-   "referenced_type" : "type-357",
-   "self_type" : "type-357",
+   "referenced_type" : "type-354",
+   "self_type" : "type-354",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-360" ],
+   "template_args" : [ "type-357" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics9allocator4V2_010IAllocatorEEE"
   },
   {
@@ -28836,17 +28902,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-486"
+     "referenced_type" : "type-483"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
    "record_kind" : "class",
-   "referenced_type" : "type-485",
-   "self_type" : "type-485",
+   "referenced_type" : "type-482",
+   "self_type" : "type-482",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-488" ],
+   "template_args" : [ "type-485" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics9allocator4V3_010IAllocatorEEE"
   },
   {
@@ -28856,17 +28922,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-335"
+     "referenced_type" : "type-332"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-334",
-   "self_type" : "type-334",
+   "referenced_type" : "type-331",
+   "self_type" : "type-331",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-337" ],
+   "template_args" : [ "type-334" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics6mapper4V2_07IMapperEEE"
   },
   {
@@ -28876,17 +28942,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-89"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-53",
-   "self_type" : "type-53",
+   "referenced_type" : "type-88",
+   "self_type" : "type-88",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-56" ],
+   "template_args" : [ "type-91" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics6mapper4V2_17IMapperEEE"
   },
   {
@@ -28896,17 +28962,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-499"
+     "referenced_type" : "type-497"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-498",
-   "self_type" : "type-498",
+   "referenced_type" : "type-496",
+   "self_type" : "type-496",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-501" ],
+   "template_args" : [ "type-499" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics6mapper4V3_07IMapperEEE"
   },
   {
@@ -28936,17 +29002,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-366"
+     "referenced_type" : "type-363"
     }
    ],
    "linker_set_key" : "android::sp<android::hidl::base::V1_0::IBase>",
    "name" : "android::sp<android::hidl::base::V1_0::IBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-365",
-   "self_type" : "type-365",
+   "referenced_type" : "type-362",
+   "self_type" : "type-362",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-170" ],
+   "template_args" : [ "type-173" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl4base4V1_05IBaseEEE"
   },
   {
@@ -28956,36 +29022,36 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-374"
+     "referenced_type" : "type-371"
     }
    ],
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceNotification>",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification>",
    "record_kind" : "class",
-   "referenced_type" : "type-373",
-   "self_type" : "type-373",
+   "referenced_type" : "type-370",
+   "self_type" : "type-370",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-297" ],
+   "template_args" : [ "type-294" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::trait_pointer<android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-820",
-   "self_type" : "type-820",
+   "referenced_type" : "type-821",
+   "self_type" : "type-821",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-677" ],
+   "template_args" : [ "type-681" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::Rect>",
    "name" : "android::trait_pointer<android::Rect>",
-   "referenced_type" : "type-2402",
-   "self_type" : "type-2402",
+   "referenced_type" : "type-2404",
+   "self_type" : "type-2404",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -28995,8 +29061,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::trait_pointer<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-818",
-   "self_type" : "type-818",
+   "referenced_type" : "type-819",
+   "self_type" : "type-819",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -29006,22 +29072,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<const native_handle *>",
    "name" : "android::trait_pointer<const native_handle *>",
-   "referenced_type" : "type-819",
-   "self_type" : "type-819",
+   "referenced_type" : "type-820",
+   "self_type" : "type-820",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-141" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android13trait_pointerIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<long>",
    "name" : "android::trait_pointer<long>",
-   "referenced_type" : "type-1431",
-   "self_type" : "type-1431",
+   "referenced_type" : "type-1435",
+   "self_type" : "type-1435",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android13trait_pointerIlEE"
   },
   {
@@ -29032,7 +29098,7 @@
    "self_type" : "type-813",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-677" ],
+   "template_args" : [ "type-681" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -29061,8 +29127,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-814",
-   "self_type" : "type-814",
+   "referenced_type" : "type-815",
+   "self_type" : "type-815",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -29072,8 +29138,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-490",
-   "self_type" : "type-490",
+   "referenced_type" : "type-486",
+   "self_type" : "type-486",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -29083,11 +29149,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-517",
-   "self_type" : "type-517",
+   "referenced_type" : "type-514",
+   "self_type" : "type-514",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-290" ],
+   "template_args" : [ "type-287" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
   },
   {
@@ -29098,26 +29164,26 @@
    "self_type" : "type-812",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-141" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<double>",
    "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-798",
-   "self_type" : "type-798",
+   "referenced_type" : "type-790",
+   "self_type" : "type-790",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<float>",
    "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-758",
-   "self_type" : "type-758",
+   "referenced_type" : "type-756",
+   "self_type" : "type-756",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-10" ],
@@ -29127,11 +29193,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-651",
-   "self_type" : "type-651",
+   "referenced_type" : "type-649",
+   "self_type" : "type-649",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIiEE"
   },
   {
@@ -29142,18 +29208,18 @@
    "self_type" : "type-742",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-732" ],
+   "template_args" : [ "type-730" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long>",
    "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-708",
-   "self_type" : "type-708",
+   "referenced_type" : "type-707",
+   "self_type" : "type-707",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
   },
   {
@@ -29171,22 +29237,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned char>",
    "name" : "android::trait_trivial_copy<unsigned char>",
-   "referenced_type" : "type-579",
-   "self_type" : "type-579",
+   "referenced_type" : "type-576",
+   "self_type" : "type-576",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-207" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned int>",
    "name" : "android::trait_trivial_copy<unsigned int>",
-   "referenced_type" : "type-683",
-   "self_type" : "type-683",
+   "referenced_type" : "type-678",
+   "self_type" : "type-678",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIjEE"
   },
   {
@@ -29197,18 +29263,18 @@
    "self_type" : "type-752",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-209" ],
+   "template_args" : [ "type-222" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long>",
    "name" : "android::trait_trivial_copy<unsigned long>",
-   "referenced_type" : "type-724",
-   "self_type" : "type-724",
+   "referenced_type" : "type-720",
+   "self_type" : "type-720",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyImEE"
   },
   {
@@ -29226,11 +29292,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-481",
-   "self_type" : "type-481",
+   "referenced_type" : "type-478",
+   "self_type" : "type-478",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-150" ],
+   "template_args" : [ "type-153" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
   },
   {
@@ -29241,7 +29307,7 @@
    "self_type" : "type-808",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-677" ],
+   "template_args" : [ "type-681" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -29281,8 +29347,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-483",
-   "self_type" : "type-483",
+   "referenced_type" : "type-480",
+   "self_type" : "type-480",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -29292,11 +29358,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-511",
-   "self_type" : "type-511",
+   "referenced_type" : "type-505",
+   "self_type" : "type-505",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-290" ],
+   "template_args" : [ "type-287" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
   },
   {
@@ -29307,18 +29373,18 @@
    "self_type" : "type-807",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-141" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<double>",
    "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-784",
-   "self_type" : "type-784",
+   "referenced_type" : "type-778",
+   "self_type" : "type-778",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIdEE"
   },
   {
@@ -29336,33 +29402,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-641",
-   "self_type" : "type-641",
+   "referenced_type" : "type-640",
+   "self_type" : "type-640",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long long>",
    "name" : "android::trait_trivial_ctor<long long>",
-   "referenced_type" : "type-731",
-   "self_type" : "type-731",
+   "referenced_type" : "type-729",
+   "self_type" : "type-729",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-732" ],
+   "template_args" : [ "type-730" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long>",
    "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-692",
-   "self_type" : "type-692",
+   "referenced_type" : "type-688",
+   "self_type" : "type-688",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
   },
   {
@@ -29380,52 +29446,52 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned char>",
    "name" : "android::trait_trivial_ctor<unsigned char>",
-   "referenced_type" : "type-538",
-   "self_type" : "type-538",
+   "referenced_type" : "type-533",
+   "self_type" : "type-533",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-207" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
    "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-669",
-   "self_type" : "type-669",
+   "referenced_type" : "type-665",
+   "self_type" : "type-665",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
    "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-747",
-   "self_type" : "type-747",
+   "referenced_type" : "type-746",
+   "self_type" : "type-746",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-209" ],
+   "template_args" : [ "type-222" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long>",
    "name" : "android::trait_trivial_ctor<unsigned long>",
-   "referenced_type" : "type-711",
-   "self_type" : "type-711",
+   "referenced_type" : "type-710",
+   "self_type" : "type-710",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned short>",
    "name" : "android::trait_trivial_ctor<unsigned short>",
-   "referenced_type" : "type-626",
-   "self_type" : "type-626",
+   "referenced_type" : "type-622",
+   "self_type" : "type-622",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-3" ],
@@ -29435,11 +29501,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-462",
-   "self_type" : "type-462",
+   "referenced_type" : "type-457",
+   "self_type" : "type-457",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-150" ],
+   "template_args" : [ "type-153" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
   },
   {
@@ -29450,7 +29516,7 @@
    "self_type" : "type-810",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-677" ],
+   "template_args" : [ "type-681" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -29490,8 +29556,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<bool>",
    "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-484",
-   "self_type" : "type-484",
+   "referenced_type" : "type-481",
+   "self_type" : "type-481",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -29501,11 +29567,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-513",
-   "self_type" : "type-513",
+   "referenced_type" : "type-510",
+   "self_type" : "type-510",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-290" ],
+   "template_args" : [ "type-287" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
   },
   {
@@ -29516,7 +29582,7 @@
    "self_type" : "type-809",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-141" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIPK13native_handleEE"
   },
   {
@@ -29527,7 +29593,7 @@
    "self_type" : "type-787",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIdEE"
   },
   {
@@ -29545,41 +29611,41 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<int>",
    "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-648",
-   "self_type" : "type-648",
+   "referenced_type" : "type-646",
+   "self_type" : "type-646",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long long>",
    "name" : "android::trait_trivial_dtor<long long>",
-   "referenced_type" : "type-739",
-   "self_type" : "type-739",
+   "referenced_type" : "type-737",
+   "self_type" : "type-737",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-732" ],
+   "template_args" : [ "type-730" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long>",
    "name" : "android::trait_trivial_dtor<long>",
-   "referenced_type" : "type-704",
-   "self_type" : "type-704",
+   "referenced_type" : "type-697",
+   "self_type" : "type-697",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<short>",
    "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-617",
-   "self_type" : "type-617",
+   "referenced_type" : "type-615",
+   "self_type" : "type-615",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-603" ],
@@ -29589,52 +29655,52 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned char>",
    "name" : "android::trait_trivial_dtor<unsigned char>",
-   "referenced_type" : "type-540",
-   "self_type" : "type-540",
+   "referenced_type" : "type-537",
+   "self_type" : "type-537",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-207" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
    "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-676",
-   "self_type" : "type-676",
+   "referenced_type" : "type-672",
+   "self_type" : "type-672",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
    "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-750",
-   "self_type" : "type-750",
+   "referenced_type" : "type-748",
+   "self_type" : "type-748",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-209" ],
+   "template_args" : [ "type-222" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long>",
    "name" : "android::trait_trivial_dtor<unsigned long>",
-   "referenced_type" : "type-719",
-   "self_type" : "type-719",
+   "referenced_type" : "type-715",
+   "self_type" : "type-715",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned short>",
    "name" : "android::trait_trivial_dtor<unsigned short>",
-   "referenced_type" : "type-631",
-   "self_type" : "type-631",
+   "referenced_type" : "type-629",
+   "self_type" : "type-629",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-3" ],
@@ -29644,22 +29710,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-477",
-   "self_type" : "type-477",
+   "referenced_type" : "type-474",
+   "self_type" : "type-474",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-150" ],
+   "template_args" : [ "type-153" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::trait_trivial_move<android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-816",
-   "self_type" : "type-816",
+   "referenced_type" : "type-817",
+   "self_type" : "type-817",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-677" ],
+   "template_args" : [ "type-681" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -29688,11 +29754,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String16>",
    "name" : "android::trait_trivial_move<android::String16>",
-   "referenced_type" : "type-190",
-   "self_type" : "type-190",
+   "referenced_type" : "type-193",
+   "self_type" : "type-193",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-178" ],
+   "template_args" : [ "type-180" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8String16EEE"
   },
   {
@@ -29703,15 +29769,15 @@
    "self_type" : "type-903",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-287" ],
+   "template_args" : [ "type-284" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-817",
-   "self_type" : "type-817",
+   "referenced_type" : "type-818",
+   "self_type" : "type-818",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -29721,8 +29787,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<bool>",
    "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-502",
-   "self_type" : "type-502",
+   "referenced_type" : "type-495",
+   "self_type" : "type-495",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -29732,22 +29798,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-535",
-   "self_type" : "type-535",
+   "referenced_type" : "type-532",
+   "self_type" : "type-532",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-290" ],
+   "template_args" : [ "type-287" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<const native_handle *>",
    "name" : "android::trait_trivial_move<const native_handle *>",
-   "referenced_type" : "type-815",
-   "self_type" : "type-815",
+   "referenced_type" : "type-816",
+   "self_type" : "type-816",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-141" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIPK13native_handleEE"
   },
   {
@@ -29758,7 +29824,7 @@
    "self_type" : "type-799",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIdEE"
   },
   {
@@ -29776,11 +29842,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-662",
-   "self_type" : "type-662",
+   "referenced_type" : "type-656",
+   "self_type" : "type-656",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIiEE"
   },
   {
@@ -29791,7 +29857,7 @@
    "self_type" : "type-743",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-732" ],
+   "template_args" : [ "type-730" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
   },
   {
@@ -29802,15 +29868,15 @@
    "self_type" : "type-709",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<short>",
    "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-621",
-   "self_type" : "type-621",
+   "referenced_type" : "type-620",
+   "self_type" : "type-620",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-603" ],
@@ -29824,18 +29890,18 @@
    "self_type" : "type-600",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-207" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned int>",
    "name" : "android::trait_trivial_move<unsigned int>",
-   "referenced_type" : "type-687",
-   "self_type" : "type-687",
+   "referenced_type" : "type-684",
+   "self_type" : "type-684",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIjEE"
   },
   {
@@ -29846,18 +29912,18 @@
    "self_type" : "type-753",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-209" ],
+   "template_args" : [ "type-222" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long>",
    "name" : "android::trait_trivial_move<unsigned long>",
-   "referenced_type" : "type-728",
-   "self_type" : "type-728",
+   "referenced_type" : "type-725",
+   "self_type" : "type-725",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveImEE"
   },
   {
@@ -29875,11 +29941,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-482",
-   "self_type" : "type-482",
+   "referenced_type" : "type-479",
+   "self_type" : "type-479",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-150" ],
+   "template_args" : [ "type-153" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
   },
   {
@@ -29890,15 +29956,15 @@
    "self_type" : "type-824",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-677" ],
+   "template_args" : [ "type-681" ],
    "unique_id" : "_ZTSN7android6traitsINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::Rect>",
    "name" : "android::traits<android::Rect>",
-   "referenced_type" : "type-2403",
-   "self_type" : "type-2403",
+   "referenced_type" : "type-2405",
+   "self_type" : "type-2405",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -29908,8 +29974,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::traits<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-821",
-   "self_type" : "type-821",
+   "referenced_type" : "type-822",
+   "self_type" : "type-822",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -29919,22 +29985,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<const native_handle *>",
    "name" : "android::traits<const native_handle *>",
-   "referenced_type" : "type-822",
-   "self_type" : "type-822",
+   "referenced_type" : "type-823",
+   "self_type" : "type-823",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-141" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android6traitsIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<long>",
    "name" : "android::traits<long>",
-   "referenced_type" : "type-1432",
-   "self_type" : "type-1432",
+   "referenced_type" : "type-1436",
+   "self_type" : "type-1436",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android6traitsIlEE"
   },
   {
@@ -29943,12 +30009,12 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::ui::Size",
@@ -29966,20 +30032,20 @@
     {
      "access" : "private",
      "field_name" : "mMatrix",
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     },
     {
      "access" : "private",
      "field_name" : "mType",
      "field_offset" : 288,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "linker_set_key" : "android::ui::Transform",
    "name" : "android::ui::Transform",
    "record_kind" : "class",
-   "referenced_type" : "type-2435",
-   "self_type" : "type-2435",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2437",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "unique_id" : "_ZTSN7android2ui9TransformE"
@@ -29996,8 +30062,8 @@
    ],
    "linker_set_key" : "android::ui::Transform::mat33",
    "name" : "android::ui::Transform::mat33",
-   "referenced_type" : "type-2436",
-   "self_type" : "type-2436",
+   "referenced_type" : "type-2438",
+   "self_type" : "type-2438",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "unique_id" : "_ZTSN7android2ui9Transform5mat33E"
@@ -30007,13 +30073,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2382"
+     "referenced_type" : "type-2384"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::Rect>",
    "name" : "android::use_trivial_move<android::Rect>",
-   "referenced_type" : "type-2381",
-   "self_type" : "type-2381",
+   "referenced_type" : "type-2383",
+   "self_type" : "type-2383",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -30024,13 +30090,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-701"
+     "referenced_type" : "type-704"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-700",
-   "self_type" : "type-700",
+   "referenced_type" : "type-703",
+   "self_type" : "type-703",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -30041,16 +30107,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1417"
+     "referenced_type" : "type-1422"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<long>",
    "name" : "android::use_trivial_move<long>",
-   "referenced_type" : "type-1416",
-   "self_type" : "type-1416",
+   "referenced_type" : "type-1421",
+   "self_type" : "type-1421",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveIlEE"
   },
   {
@@ -30081,12 +30147,12 @@
    [
     {
      "field_name" : "num_points",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 32,
-     "referenced_type" : "type-351"
+     "referenced_type" : "type-348"
     },
     {
      "field_name" : "xyzc_points",
@@ -30113,7 +30179,7 @@
     {
      "field_name" : "num_planes",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "planes",
@@ -30135,7 +30201,7 @@
    [
     {
      "field_name" : "top_left",
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-219"
     },
     {
      "field_name" : "component",
@@ -30145,32 +30211,32 @@
     {
      "field_name" : "bits_per_component",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "bits_used",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "h_increment",
      "field_offset" : 160,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "v_increment",
      "field_offset" : 192,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "h_subsampling",
      "field_offset" : 224,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "v_subsampling",
      "field_offset" : 256,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android_flex_plane",
@@ -30187,33 +30253,33 @@
    [
     {
      "field_name" : "magic",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "version",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 64,
-     "referenced_type" : "type-521"
+     "referenced_type" : "type-518"
     },
     {
      "field_name" : "incRef",
      "field_offset" : 320,
-     "referenced_type" : "type-522"
+     "referenced_type" : "type-519"
     },
     {
      "field_name" : "decRef",
      "field_offset" : 384,
-     "referenced_type" : "type-522"
+     "referenced_type" : "type-519"
     }
    ],
    "linker_set_key" : "android_native_base_t",
    "name" : "android_native_base_t",
-   "referenced_type" : "type-520",
-   "self_type" : "type-520",
+   "referenced_type" : "type-517",
+   "self_type" : "type-517",
    "size" : 56,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
    "unique_id" : "android_native_base_t"
@@ -30224,28 +30290,28 @@
    [
     {
      "field_name" : "left",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "top",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "right",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "bottom",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android_native_rect_t",
    "name" : "android_native_rect_t",
-   "referenced_type" : "type-620",
-   "self_type" : "type-620",
+   "referenced_type" : "type-621",
+   "self_type" : "type-621",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
    "unique_id" : "android_native_rect_t"
@@ -30320,43 +30386,43 @@
    [
     {
      "field_name" : "y",
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "field_name" : "cb",
      "field_offset" : 64,
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "field_name" : "cr",
      "field_offset" : 128,
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "field_name" : "ystride",
      "field_offset" : 192,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "cstride",
      "field_offset" : 256,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "chroma_step",
      "field_offset" : 320,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 384,
-     "referenced_type" : "type-351"
+     "referenced_type" : "type-348"
     }
    ],
    "linker_set_key" : "android_ycbcr",
    "name" : "android_ycbcr",
-   "referenced_type" : "type-350",
-   "self_type" : "type-350",
+   "referenced_type" : "type-347",
+   "self_type" : "type-347",
    "size" : 80,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_ycbcr"
@@ -30367,108 +30433,108 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-548"
+     "referenced_type" : "type-545"
     },
     {
      "field_name" : "flags",
      "field_offset" : 960,
-     "referenced_type" : "type-237"
+     "referenced_type" : "type-239"
     },
     {
      "field_name" : "width",
      "field_offset" : 992,
-     "referenced_type" : "type-237"
+     "referenced_type" : "type-239"
     },
     {
      "field_name" : "height",
      "field_offset" : 1024,
-     "referenced_type" : "type-237"
+     "referenced_type" : "type-239"
     },
     {
      "field_name" : "stride",
      "field_offset" : 1056,
-     "referenced_type" : "type-563"
+     "referenced_type" : "type-560"
     },
     {
      "field_name" : "format",
      "field_offset" : 1088,
-     "referenced_type" : "type-563"
+     "referenced_type" : "type-560"
     },
     {
      "field_name" : "xdpi",
      "field_offset" : 1120,
-     "referenced_type" : "type-564"
+     "referenced_type" : "type-561"
     },
     {
      "field_name" : "ydpi",
      "field_offset" : 1152,
-     "referenced_type" : "type-564"
+     "referenced_type" : "type-561"
     },
     {
      "field_name" : "fps",
      "field_offset" : 1184,
-     "referenced_type" : "type-564"
+     "referenced_type" : "type-561"
     },
     {
      "field_name" : "minSwapInterval",
      "field_offset" : 1216,
-     "referenced_type" : "type-563"
+     "referenced_type" : "type-560"
     },
     {
      "field_name" : "maxSwapInterval",
      "field_offset" : 1248,
-     "referenced_type" : "type-563"
+     "referenced_type" : "type-560"
     },
     {
      "field_name" : "numFramebuffers",
      "field_offset" : 1280,
-     "referenced_type" : "type-563"
+     "referenced_type" : "type-560"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 1312,
-     "referenced_type" : "type-565"
+     "referenced_type" : "type-562"
     },
     {
      "field_name" : "setSwapInterval",
      "field_offset" : 1536,
-     "referenced_type" : "type-566"
+     "referenced_type" : "type-563"
     },
     {
      "field_name" : "setUpdateRect",
      "field_offset" : 1600,
-     "referenced_type" : "type-569"
+     "referenced_type" : "type-566"
     },
     {
      "field_name" : "post",
      "field_offset" : 1664,
-     "referenced_type" : "type-571"
+     "referenced_type" : "type-568"
     },
     {
      "field_name" : "compositionComplete",
      "field_offset" : 1728,
-     "referenced_type" : "type-573"
+     "referenced_type" : "type-570"
     },
     {
      "field_name" : "dump",
      "field_offset" : 1792,
-     "referenced_type" : "type-575"
+     "referenced_type" : "type-572"
     },
     {
      "field_name" : "enableScreen",
      "field_offset" : 1856,
-     "referenced_type" : "type-566"
+     "referenced_type" : "type-563"
     },
     {
      "field_name" : "reserved_proc",
      "field_offset" : 1920,
-     "referenced_type" : "type-578"
+     "referenced_type" : "type-575"
     }
    ],
    "linker_set_key" : "framebuffer_device_t",
    "name" : "framebuffer_device_t",
-   "referenced_type" : "type-547",
-   "self_type" : "type-547",
+   "referenced_type" : "type-544",
+   "self_type" : "type-544",
    "size" : 288,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h",
    "unique_id" : "framebuffer_device_t"
@@ -30479,63 +30545,73 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-550"
+     "referenced_type" : "type-547"
     },
     {
      "field_name" : "registerBuffer",
      "field_offset" : 1984,
-     "referenced_type" : "type-582"
+     "referenced_type" : "type-579"
     },
     {
      "field_name" : "unregisterBuffer",
      "field_offset" : 2048,
-     "referenced_type" : "type-582"
+     "referenced_type" : "type-579"
     },
     {
      "field_name" : "lock",
      "field_offset" : 2112,
-     "referenced_type" : "type-586"
+     "referenced_type" : "type-583"
     },
     {
      "field_name" : "unlock",
      "field_offset" : 2176,
-     "referenced_type" : "type-582"
+     "referenced_type" : "type-579"
     },
     {
      "field_name" : "perform",
      "field_offset" : 2240,
-     "referenced_type" : "type-588"
+     "referenced_type" : "type-585"
     },
     {
      "field_name" : "lock_ycbcr",
      "field_offset" : 2304,
-     "referenced_type" : "type-590"
+     "referenced_type" : "type-587"
     },
     {
      "field_name" : "lockAsync",
      "field_offset" : 2368,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-589"
     },
     {
      "field_name" : "unlockAsync",
      "field_offset" : 2432,
-     "referenced_type" : "type-594"
+     "referenced_type" : "type-591"
     },
     {
      "field_name" : "lockAsync_ycbcr",
      "field_offset" : 2496,
-     "referenced_type" : "type-597"
+     "referenced_type" : "type-594"
+    },
+    {
+     "field_name" : "getTransportSize",
+     "field_offset" : 2560,
+     "referenced_type" : "type-596"
+    },
+    {
+     "field_name" : "validateBufferSize",
+     "field_offset" : 2624,
+     "referenced_type" : "type-598"
     },
     {
      "field_name" : "reserved_proc",
-     "field_offset" : 2560,
-     "referenced_type" : "type-599"
+     "field_offset" : 2688,
+     "referenced_type" : "type-522"
     }
    ],
    "linker_set_key" : "gralloc_module_t",
    "name" : "gralloc_module_t",
-   "referenced_type" : "type-581",
-   "self_type" : "type-581",
+   "referenced_type" : "type-578",
+   "self_type" : "type-578",
    "size" : 344,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h",
    "unique_id" : "gralloc_module_t"
@@ -30546,33 +30622,33 @@
    [
     {
      "field_name" : "tag",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "version",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "module",
      "field_offset" : 64,
-     "referenced_type" : "type-549"
+     "referenced_type" : "type-546"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 128,
-     "referenced_type" : "type-560"
+     "referenced_type" : "type-557"
     },
     {
      "field_name" : "close",
      "field_offset" : 896,
-     "referenced_type" : "type-561"
+     "referenced_type" : "type-558"
     }
    ],
    "linker_set_key" : "hw_device_t",
    "name" : "hw_device_t",
-   "referenced_type" : "type-548",
-   "self_type" : "type-548",
+   "referenced_type" : "type-545",
+   "self_type" : "type-545",
    "size" : 120,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
    "unique_id" : "hw_device_t"
@@ -30583,13 +30659,13 @@
    [
     {
      "field_name" : "open",
-     "referenced_type" : "type-553"
+     "referenced_type" : "type-550"
     }
    ],
    "linker_set_key" : "hw_module_methods_t",
    "name" : "hw_module_methods_t",
-   "referenced_type" : "type-552",
-   "self_type" : "type-552",
+   "referenced_type" : "type-549",
+   "self_type" : "type-549",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
    "unique_id" : "hw_module_methods_t"
@@ -30600,7 +30676,7 @@
    [
     {
      "field_name" : "tag",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "module_api_version",
@@ -30615,38 +30691,38 @@
     {
      "field_name" : "id",
      "field_offset" : 64,
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-285"
     },
     {
      "field_name" : "name",
      "field_offset" : 128,
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-285"
     },
     {
      "field_name" : "author",
      "field_offset" : 192,
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-285"
     },
     {
      "field_name" : "methods",
      "field_offset" : 256,
-     "referenced_type" : "type-551"
+     "referenced_type" : "type-548"
     },
     {
      "field_name" : "dso",
      "field_offset" : 320,
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 384,
-     "referenced_type" : "type-559"
+     "referenced_type" : "type-556"
     }
    ],
    "linker_set_key" : "hw_module_t",
    "name" : "hw_module_t",
-   "referenced_type" : "type-550",
-   "self_type" : "type-550",
+   "referenced_type" : "type-547",
+   "self_type" : "type-547",
    "size" : 248,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
    "unique_id" : "hw_module_t"
@@ -30712,12 +30788,12 @@
    [
     {
      "field_name" : "tv_sec",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "tv_nsec",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "linker_set_key" : "log_time",
@@ -30744,22 +30820,22 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "msg",
@@ -30791,27 +30867,27 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "euid",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "msg",
@@ -30843,27 +30919,27 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "lid",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "msg",
@@ -30895,32 +30971,32 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "lid",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "uid",
      "field_offset" : 192,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "msg",
@@ -30942,28 +31018,28 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "numFds",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "numInts",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "data",
      "field_offset" : 96,
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-146"
     }
    ],
    "linker_set_key" : "native_handle",
    "name" : "native_handle",
-   "referenced_type" : "type-143",
-   "self_type" : "type-143",
+   "referenced_type" : "type-145",
+   "self_type" : "type-145",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
    "unique_id" : "native_handle"
@@ -30973,13 +31049,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-436"
+     "referenced_type" : "type-433"
     }
    ],
    "linker_set_key" : "std::is_floating_point<android::half>",
    "name" : "std::is_floating_point<android::half>",
-   "referenced_type" : "type-435",
-   "self_type" : "type-435",
+   "referenced_type" : "type-432",
+   "self_type" : "type-432",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h",
    "template_args" : [ "type-1" ],
@@ -30990,8 +31066,8 @@
    "linker_set_key" : "std::numeric_limits<android::half>",
    "name" : "std::numeric_limits<android::half>",
    "record_kind" : "class",
-   "referenced_type" : "type-580",
-   "self_type" : "type-580",
+   "referenced_type" : "type-577",
+   "self_type" : "type-577",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h",
    "template_args" : [ "type-1" ],
@@ -31004,8 +31080,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::FenceTime::Snapshot &&",
    "name" : "android::FenceTime::Snapshot &&",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1386",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1391",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -31013,7 +31089,7 @@
    "alignment" : 8,
    "linker_set_key" : "android::HdrCapabilities &&",
    "name" : "android::HdrCapabilities &&",
-   "referenced_type" : "type-960",
+   "referenced_type" : "type-962",
    "self_type" : "type-971",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
@@ -31031,8 +31107,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &&",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &&",
-   "referenced_type" : "type-99",
-   "self_type" : "type-107",
+   "referenced_type" : "type-101",
+   "self_type" : "type-109",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -31040,8 +31116,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &&",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &&",
-   "referenced_type" : "type-394",
-   "self_type" : "type-400",
+   "referenced_type" : "type-393",
+   "self_type" : "type-397",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -31049,8 +31125,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &&",
-   "referenced_type" : "type-111",
-   "self_type" : "type-113",
+   "referenced_type" : "type-113",
+   "self_type" : "type-115",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -31067,7 +31143,7 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Status &&",
    "name" : "android::hardware::Status &&",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1311",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -31076,7 +31152,7 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::return_status &&",
    "name" : "android::hardware::details::return_status &&",
-   "referenced_type" : "type-101",
+   "referenced_type" : "type-103",
    "self_type" : "type-1316",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -31085,7 +31161,7 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_handle &&",
    "name" : "android::hardware::hidl_handle &&",
-   "referenced_type" : "type-138",
+   "referenced_type" : "type-140",
    "self_type" : "type-1087",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -31104,7 +31180,7 @@
    "linker_set_key" : "android::sp<android::Fence> &&",
    "name" : "android::sp<android::Fence> &&",
    "referenced_type" : "type-1358",
-   "self_type" : "type-1411",
+   "self_type" : "type-1415",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31112,8 +31188,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &&",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &&",
-   "referenced_type" : "type-357",
-   "self_type" : "type-380",
+   "referenced_type" : "type-354",
+   "self_type" : "type-377",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31121,8 +31197,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &&",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &&",
-   "referenced_type" : "type-485",
-   "self_type" : "type-492",
+   "referenced_type" : "type-482",
+   "self_type" : "type-489",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31130,8 +31206,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &&",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &&",
-   "referenced_type" : "type-334",
-   "self_type" : "type-388",
+   "referenced_type" : "type-331",
+   "self_type" : "type-385",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31139,8 +31215,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &&",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &&",
-   "referenced_type" : "type-53",
-   "self_type" : "type-94",
+   "referenced_type" : "type-88",
+   "self_type" : "type-96",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31148,8 +31224,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &&",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &&",
-   "referenced_type" : "type-498",
-   "self_type" : "type-505",
+   "referenced_type" : "type-496",
+   "self_type" : "type-502",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31157,7 +31233,7 @@
    "alignment" : 8,
    "linker_set_key" : "int &&",
    "name" : "int &&",
-   "referenced_type" : "type-103",
+   "referenced_type" : "type-105",
    "self_type" : "type-1294",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
diff --git a/29/64/arm_armv7-a-neon/source-based/libstagefright_bufferqueue_helper.so.lsdump b/29/64/arm_armv7-a-neon/source-based/libstagefright_bufferqueue_helper.so.lsdump
index f78a8c9..ecf3f4a 100644
--- a/29/64/arm_armv7-a-neon/source-based/libstagefright_bufferqueue_helper.so.lsdump
+++ b/29/64/arm_armv7-a-neon/source-based/libstagefright_bufferqueue_helper.so.lsdump
@@ -5,15 +5,15 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_AUDIO_CHANNELTYPE [16]",
    "name" : "OMX_AUDIO_CHANNELTYPE [16]",
-   "referenced_type" : "type-1637",
-   "self_type" : "type-1642",
+   "referenced_type" : "type-1635",
+   "self_type" : "type-1641",
    "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-1499",
+   "referenced_type" : "type-1498",
    "self_type" : "type-1515",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -30,8 +30,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::MediaImage2::PlaneInfo [4]",
    "name" : "android::MediaImage2::PlaneInfo [4]",
-   "referenced_type" : "type-2423",
-   "self_type" : "type-2422",
+   "referenced_type" : "type-2426",
+   "self_type" : "type-2425",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
@@ -39,8 +39,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::MediaImage::PlaneInfo [3]",
    "name" : "android::MediaImage::PlaneInfo [3]",
-   "referenced_type" : "type-2418",
-   "self_type" : "type-2417",
+   "referenced_type" : "type-2421",
+   "self_type" : "type-2420",
    "size" : 60,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
@@ -81,7 +81,7 @@
    "linker_set_key" : "int [3]",
    "name" : "int [3]",
    "referenced_type" : "type-4",
-   "self_type" : "type-2202",
+   "self_type" : "type-2205",
    "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-2202",
-   "self_type" : "type-2201",
+   "referenced_type" : "type-2205",
+   "self_type" : "type-2204",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
   },
@@ -117,7 +117,7 @@
    "linker_set_key" : "unsigned char [16]",
    "name" : "unsigned char [16]",
    "referenced_type" : "type-90",
-   "self_type" : "type-2311",
+   "self_type" : "type-2314",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -126,7 +126,7 @@
    "linker_set_key" : "unsigned char [1]",
    "name" : "unsigned char [1]",
    "referenced_type" : "type-90",
-   "self_type" : "type-1572",
+   "self_type" : "type-1567",
    "size" : 1,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -135,7 +135,7 @@
    "linker_set_key" : "unsigned char [256]",
    "name" : "unsigned char [256]",
    "referenced_type" : "type-90",
-   "self_type" : "type-2312",
+   "self_type" : "type-2315",
    "size" : 256,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -144,7 +144,7 @@
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
    "referenced_type" : "type-90",
-   "self_type" : "type-2179",
+   "self_type" : "type-2182",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -153,7 +153,7 @@
    "linker_set_key" : "unsigned char [64]",
    "name" : "unsigned char [64]",
    "referenced_type" : "type-90",
-   "self_type" : "type-2308",
+   "self_type" : "type-2311",
    "size" : 64,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -204,8 +204,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-1242",
-   "self_type" : "type-1242",
+   "referenced_type" : "type-1245",
+   "self_type" : "type-1245",
    "size" : 2
   },
   {
@@ -246,8 +246,8 @@
    "alignment" : 8,
    "linker_set_key" : "long double",
    "name" : "long double",
-   "referenced_type" : "type-1453",
-   "self_type" : "type-1453",
+   "referenced_type" : "type-1456",
+   "self_type" : "type-1456",
    "size" : 8
   },
   {
@@ -760,6 +760,9 @@
    "name" : "_ZN7android18BnProducerListener18needsReleaseNotifyEv"
   },
   {
+   "name" : "_ZN7android18BnProducerListener18onBuffersDiscardedERKNSt3__16vectorIiNS1_9allocatorIiEEEE"
+  },
+  {
    "name" : "_ZN7android18BpConsumerListenerD0Ev"
   },
   {
@@ -3200,8 +3203,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AACPROFILETYPE",
    "name" : "OMX_AUDIO_AACPROFILETYPE",
-   "referenced_type" : "type-1676",
-   "self_type" : "type-1676",
+   "referenced_type" : "type-1671",
+   "self_type" : "type-1671",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3254,8 +3257,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
    "name" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
-   "referenced_type" : "type-1668",
-   "self_type" : "type-1668",
+   "referenced_type" : "type-1670",
+   "self_type" : "type-1670",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3352,8 +3355,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRBANDMODETYPE",
    "name" : "OMX_AUDIO_AMRBANDMODETYPE",
-   "referenced_type" : "type-1890",
-   "self_type" : "type-1890",
+   "referenced_type" : "type-1881",
+   "self_type" : "type-1881",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3398,8 +3401,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRDTXMODETYPE",
    "name" : "OMX_AUDIO_AMRDTXMODETYPE",
-   "referenced_type" : "type-1901",
-   "self_type" : "type-1901",
+   "referenced_type" : "type-1892",
+   "self_type" : "type-1892",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3448,8 +3451,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
    "name" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
-   "referenced_type" : "type-1877",
-   "self_type" : "type-1877",
+   "referenced_type" : "type-1862",
+   "self_type" : "type-1862",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3498,8 +3501,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CDMARATETYPE",
    "name" : "OMX_AUDIO_CDMARATETYPE",
-   "referenced_type" : "type-2021",
-   "self_type" : "type-2021",
+   "referenced_type" : "type-2013",
+   "self_type" : "type-2013",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3540,8 +3543,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CHANNELMODETYPE",
    "name" : "OMX_AUDIO_CHANNELMODETYPE",
-   "referenced_type" : "type-1652",
-   "self_type" : "type-1652",
+   "referenced_type" : "type-1651",
+   "self_type" : "type-1651",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3606,8 +3609,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CHANNELTYPE",
    "name" : "OMX_AUDIO_CHANNELTYPE",
-   "referenced_type" : "type-1637",
-   "self_type" : "type-1637",
+   "referenced_type" : "type-1635",
+   "self_type" : "type-1635",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3748,8 +3751,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CODINGTYPE",
    "name" : "OMX_AUDIO_CODINGTYPE",
-   "referenced_type" : "type-1618",
-   "self_type" : "type-1618",
+   "referenced_type" : "type-1616",
+   "self_type" : "type-1616",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3790,8 +3793,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_ECHOCANTYPE",
    "name" : "OMX_AUDIO_ECHOCANTYPE",
-   "referenced_type" : "type-2196",
-   "self_type" : "type-2196",
+   "referenced_type" : "type-2199",
+   "self_type" : "type-2199",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3828,8 +3831,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G723RATE",
    "name" : "OMX_AUDIO_G723RATE",
-   "referenced_type" : "type-1808",
-   "self_type" : "type-1808",
+   "referenced_type" : "type-1799",
+   "self_type" : "type-1799",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3874,8 +3877,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G726MODE",
    "name" : "OMX_AUDIO_G726MODE",
-   "referenced_type" : "type-1831",
-   "self_type" : "type-1831",
+   "referenced_type" : "type-1822",
+   "self_type" : "type-1822",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3916,8 +3919,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G729TYPE",
    "name" : "OMX_AUDIO_G729TYPE",
-   "referenced_type" : "type-1851",
-   "self_type" : "type-1851",
+   "referenced_type" : "type-1845",
+   "self_type" : "type-1845",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3974,8 +3977,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDIFORMATTYPE",
    "name" : "OMX_AUDIO_MIDIFORMATTYPE",
-   "referenced_type" : "type-2087",
-   "self_type" : "type-2087",
+   "referenced_type" : "type-2079",
+   "self_type" : "type-2079",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4028,8 +4031,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
    "name" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
-   "referenced_type" : "type-2169",
-   "self_type" : "type-2169",
+   "referenced_type" : "type-2168",
+   "self_type" : "type-2168",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4070,8 +4073,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
    "name" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
-   "referenced_type" : "type-2121",
-   "self_type" : "type-2121",
+   "referenced_type" : "type-2113",
+   "self_type" : "type-2113",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4116,8 +4119,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
    "name" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
-   "referenced_type" : "type-2111",
-   "self_type" : "type-2111",
+   "referenced_type" : "type-2102",
+   "self_type" : "type-2102",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4154,8 +4157,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
    "name" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
-   "referenced_type" : "type-1660",
-   "self_type" : "type-1660",
+   "referenced_type" : "type-1656",
+   "self_type" : "type-1656",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4192,8 +4195,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PCMMODETYPE",
    "name" : "OMX_AUDIO_PCMMODETYPE",
-   "referenced_type" : "type-1633",
-   "self_type" : "type-1633",
+   "referenced_type" : "type-1628",
+   "self_type" : "type-1628",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4250,8 +4253,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_RAFORMATTYPE",
    "name" : "OMX_AUDIO_RAFORMATTYPE",
-   "referenced_type" : "type-1752",
-   "self_type" : "type-1752",
+   "referenced_type" : "type-1746",
+   "self_type" : "type-1746",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4284,8 +4287,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
    "name" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
-   "referenced_type" : "type-1775",
-   "self_type" : "type-1775",
+   "referenced_type" : "type-1766",
+   "self_type" : "type-1766",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4318,8 +4321,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_STEREOWIDENINGTYPE",
    "name" : "OMX_AUDIO_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-2192",
-   "self_type" : "type-2192",
+   "referenced_type" : "type-2195",
+   "self_type" : "type-2195",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4360,8 +4363,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_WMAFORMATTYPE",
    "name" : "OMX_AUDIO_WMAFORMATTYPE",
-   "referenced_type" : "type-1719",
-   "self_type" : "type-1719",
+   "referenced_type" : "type-1711",
+   "self_type" : "type-1711",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4402,8 +4405,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_WMAPROFILETYPE",
    "name" : "OMX_AUDIO_WMAPROFILETYPE",
-   "referenced_type" : "type-1732",
-   "self_type" : "type-1732",
+   "referenced_type" : "type-1722",
+   "self_type" : "type-1722",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4428,8 +4431,8 @@
    ],
    "linker_set_key" : "OMX_BOOL",
    "name" : "OMX_BOOL",
-   "referenced_type" : "type-1293",
-   "self_type" : "type-1293",
+   "referenced_type" : "type-1296",
+   "self_type" : "type-1296",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "underlying_type" : "type-2",
@@ -4466,8 +4469,8 @@
    ],
    "linker_set_key" : "OMX_BUFFERSUPPLIERTYPE",
    "name" : "OMX_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-1601",
-   "self_type" : "type-1601",
+   "referenced_type" : "type-1599",
+   "self_type" : "type-1599",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -4520,8 +4523,8 @@
    ],
    "linker_set_key" : "OMX_COLORBLENDTYPE",
    "name" : "OMX_COLORBLENDTYPE",
-   "referenced_type" : "type-2209",
-   "self_type" : "type-2209",
+   "referenced_type" : "type-2212",
+   "self_type" : "type-2212",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4762,8 +4765,8 @@
    ],
    "linker_set_key" : "OMX_COLOR_FORMATTYPE",
    "name" : "OMX_COLOR_FORMATTYPE",
-   "referenced_type" : "type-2199",
-   "self_type" : "type-2199",
+   "referenced_type" : "type-2202",
+   "self_type" : "type-2202",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4808,8 +4811,8 @@
    ],
    "linker_set_key" : "OMX_COMMANDTYPE",
    "name" : "OMX_COMMANDTYPE",
-   "referenced_type" : "type-1485",
-   "self_type" : "type-1485",
+   "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-2",
@@ -4846,8 +4849,8 @@
    ],
    "linker_set_key" : "OMX_DATAUNITENCAPSULATIONTYPE",
    "name" : "OMX_DATAUNITENCAPSULATIONTYPE",
-   "referenced_type" : "type-2236",
-   "self_type" : "type-2236",
+   "referenced_type" : "type-2239",
+   "self_type" : "type-2239",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4888,8 +4891,8 @@
    ],
    "linker_set_key" : "OMX_DATAUNITTYPE",
    "name" : "OMX_DATAUNITTYPE",
-   "referenced_type" : "type-2235",
-   "self_type" : "type-2235",
+   "referenced_type" : "type-2238",
+   "self_type" : "type-2238",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4914,8 +4917,8 @@
    ],
    "linker_set_key" : "OMX_DIRTYPE",
    "name" : "OMX_DIRTYPE",
-   "referenced_type" : "type-1452",
-   "self_type" : "type-1452",
+   "referenced_type" : "type-1455",
+   "self_type" : "type-1455",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "underlying_type" : "type-2",
@@ -4956,8 +4959,8 @@
    ],
    "linker_set_key" : "OMX_DITHERTYPE",
    "name" : "OMX_DITHERTYPE",
-   "referenced_type" : "type-2238",
-   "self_type" : "type-2238",
+   "referenced_type" : "type-2241",
+   "self_type" : "type-2241",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4982,8 +4985,8 @@
    ],
    "linker_set_key" : "OMX_ENDIANTYPE",
    "name" : "OMX_ENDIANTYPE",
-   "referenced_type" : "type-1460",
-   "self_type" : "type-1460",
+   "referenced_type" : "type-1459",
+   "self_type" : "type-1459",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "underlying_type" : "type-2",
@@ -5160,8 +5163,8 @@
    ],
    "linker_set_key" : "OMX_ERRORTYPE",
    "name" : "OMX_ERRORTYPE",
-   "referenced_type" : "type-1494",
-   "self_type" : "type-1494",
+   "referenced_type" : "type-1495",
+   "self_type" : "type-1495",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-4",
@@ -5234,8 +5237,8 @@
    ],
    "linker_set_key" : "OMX_EVENTTYPE",
    "name" : "OMX_EVENTTYPE",
-   "referenced_type" : "type-1588",
-   "self_type" : "type-1588",
+   "referenced_type" : "type-1589",
+   "self_type" : "type-1589",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -5300,8 +5303,8 @@
    ],
    "linker_set_key" : "OMX_EXPOSURECONTROLTYPE",
    "name" : "OMX_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-2221",
-   "self_type" : "type-2221",
+   "referenced_type" : "type-2224",
+   "self_type" : "type-2224",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -5334,8 +5337,8 @@
    ],
    "linker_set_key" : "OMX_EXTRADATATYPE",
    "name" : "OMX_EXTRADATATYPE",
-   "referenced_type" : "type-1561",
-   "self_type" : "type-1561",
+   "referenced_type" : "type-1556",
+   "self_type" : "type-1556",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -5380,8 +5383,8 @@
    ],
    "linker_set_key" : "OMX_FOCUSSTATUSTYPE",
    "name" : "OMX_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-2246",
-   "self_type" : "type-2246",
+   "referenced_type" : "type-2249",
+   "self_type" : "type-2249",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -5450,8 +5453,8 @@
    ],
    "linker_set_key" : "OMX_IMAGEFILTERTYPE",
    "name" : "OMX_IMAGEFILTERTYPE",
-   "referenced_type" : "type-2205",
-   "self_type" : "type-2205",
+   "referenced_type" : "type-2208",
+   "self_type" : "type-2208",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -5516,8 +5519,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_CODINGTYPE",
    "name" : "OMX_IMAGE_CODINGTYPE",
-   "referenced_type" : "type-2297",
-   "self_type" : "type-2297",
+   "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-2",
@@ -5566,8 +5569,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_FLASHCONTROLTYPE",
    "name" : "OMX_IMAGE_FLASHCONTROLTYPE",
-   "referenced_type" : "type-2300",
-   "self_type" : "type-2300",
+   "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-2",
@@ -5608,8 +5611,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_FOCUSCONTROLTYPE",
    "name" : "OMX_IMAGE_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-2303",
-   "self_type" : "type-2303",
+   "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-2",
@@ -5658,8 +5661,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_HUFFMANTABLETYPE",
    "name" : "OMX_IMAGE_HUFFMANTABLETYPE",
-   "referenced_type" : "type-2309",
-   "self_type" : "type-2309",
+   "referenced_type" : "type-2312",
+   "self_type" : "type-2312",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "underlying_type" : "type-2",
@@ -5700,8 +5703,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
    "name" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-2306",
-   "self_type" : "type-2306",
+   "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-2",
@@ -6560,8 +6563,8 @@
    ],
    "linker_set_key" : "OMX_METADATACHARSETTYPE",
    "name" : "OMX_METADATACHARSETTYPE",
-   "referenced_type" : "type-2345",
-   "self_type" : "type-2345",
+   "referenced_type" : "type-2348",
+   "self_type" : "type-2348",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6602,8 +6605,8 @@
    ],
    "linker_set_key" : "OMX_METADATASCOPETYPE",
    "name" : "OMX_METADATASCOPETYPE",
-   "referenced_type" : "type-2346",
-   "self_type" : "type-2346",
+   "referenced_type" : "type-2349",
+   "self_type" : "type-2349",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6640,8 +6643,8 @@
    ],
    "linker_set_key" : "OMX_METADATASEARCHMODETYPE",
    "name" : "OMX_METADATASEARCHMODETYPE",
-   "referenced_type" : "type-2347",
-   "self_type" : "type-2347",
+   "referenced_type" : "type-2350",
+   "self_type" : "type-2350",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6678,8 +6681,8 @@
    ],
    "linker_set_key" : "OMX_METERINGTYPE",
    "name" : "OMX_METERINGTYPE",
-   "referenced_type" : "type-2242",
-   "self_type" : "type-2242",
+   "referenced_type" : "type-2245",
+   "self_type" : "type-2245",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -6720,8 +6723,8 @@
    ],
    "linker_set_key" : "OMX_MIRRORTYPE",
    "name" : "OMX_MIRRORTYPE",
-   "referenced_type" : "type-2213",
-   "self_type" : "type-2213",
+   "referenced_type" : "type-2216",
+   "self_type" : "type-2216",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -6796,8 +6799,8 @@
    ],
    "linker_set_key" : "OMX_OTHER_FORMATTYPE",
    "name" : "OMX_OTHER_FORMATTYPE",
-   "referenced_type" : "type-2314",
-   "self_type" : "type-2314",
+   "referenced_type" : "type-2317",
+   "self_type" : "type-2317",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -6838,8 +6841,8 @@
    ],
    "linker_set_key" : "OMX_PORTDOMAINTYPE",
    "name" : "OMX_PORTDOMAINTYPE",
-   "referenced_type" : "type-2332",
-   "self_type" : "type-2332",
+   "referenced_type" : "type-2335",
+   "self_type" : "type-2335",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6888,8 +6891,8 @@
    ],
    "linker_set_key" : "OMX_STATETYPE",
    "name" : "OMX_STATETYPE",
-   "referenced_type" : "type-1488",
-   "self_type" : "type-1488",
+   "referenced_type" : "type-1490",
+   "self_type" : "type-1490",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -6922,8 +6925,8 @@
    ],
    "linker_set_key" : "OMX_SUSPENSIONPOLICYTYPE",
    "name" : "OMX_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-2336",
-   "self_type" : "type-2336",
+   "referenced_type" : "type-2339",
+   "self_type" : "type-2339",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6956,8 +6959,8 @@
    ],
    "linker_set_key" : "OMX_SUSPENSIONTYPE",
    "name" : "OMX_SUSPENSIONTYPE",
-   "referenced_type" : "type-2338",
-   "self_type" : "type-2338",
+   "referenced_type" : "type-2341",
+   "self_type" : "type-2341",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6994,8 +6997,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CLOCKSTATE",
    "name" : "OMX_TIME_CLOCKSTATE",
-   "referenced_type" : "type-2321",
-   "self_type" : "type-2321",
+   "referenced_type" : "type-2324",
+   "self_type" : "type-2324",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -7032,8 +7035,8 @@
    ],
    "linker_set_key" : "OMX_TIME_REFCLOCKTYPE",
    "name" : "OMX_TIME_REFCLOCKTYPE",
-   "referenced_type" : "type-2319",
-   "self_type" : "type-2319",
+   "referenced_type" : "type-2322",
+   "self_type" : "type-2322",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -7066,8 +7069,8 @@
    ],
    "linker_set_key" : "OMX_TIME_SEEKMODETYPE",
    "name" : "OMX_TIME_SEEKMODETYPE",
-   "referenced_type" : "type-2315",
-   "self_type" : "type-2315",
+   "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-2",
@@ -7104,8 +7107,8 @@
    ],
    "linker_set_key" : "OMX_TIME_UPDATETYPE",
    "name" : "OMX_TIME_UPDATETYPE",
-   "referenced_type" : "type-2318",
-   "self_type" : "type-2318",
+   "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-2",
@@ -7158,8 +7161,8 @@
    ],
    "linker_set_key" : "OMX_TRANSITIONEFFECTTYPE",
    "name" : "OMX_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-2233",
-   "self_type" : "type-2233",
+   "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-2",
@@ -7264,8 +7267,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCLEVELTYPE",
    "name" : "OMX_VIDEO_AVCLEVELTYPE",
-   "referenced_type" : "type-2280",
-   "self_type" : "type-2280",
+   "referenced_type" : "type-2283",
+   "self_type" : "type-2283",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7302,8 +7305,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
    "name" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
-   "referenced_type" : "type-2282",
-   "self_type" : "type-2282",
+   "referenced_type" : "type-2285",
+   "self_type" : "type-2285",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7356,8 +7359,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCPROFILETYPE",
    "name" : "OMX_VIDEO_AVCPROFILETYPE",
-   "referenced_type" : "type-2279",
-   "self_type" : "type-2279",
+   "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-2",
@@ -7394,8 +7397,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCSLICEMODETYPE",
    "name" : "OMX_VIDEO_AVCSLICEMODETYPE",
-   "referenced_type" : "type-2293",
-   "self_type" : "type-2293",
+   "referenced_type" : "type-2296",
+   "self_type" : "type-2296",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7476,8 +7479,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CODINGTYPE",
    "name" : "OMX_VIDEO_CODINGTYPE",
-   "referenced_type" : "type-2248",
-   "self_type" : "type-2248",
+   "referenced_type" : "type-2251",
+   "self_type" : "type-2251",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7526,8 +7529,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONTROLRATETYPE",
    "name" : "OMX_VIDEO_CONTROLRATETYPE",
-   "referenced_type" : "type-2253",
-   "self_type" : "type-2253",
+   "referenced_type" : "type-2256",
+   "self_type" : "type-2256",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7584,8 +7587,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_H263LEVELTYPE",
    "name" : "OMX_VIDEO_H263LEVELTYPE",
-   "referenced_type" : "type-2264",
-   "self_type" : "type-2264",
+   "referenced_type" : "type-2267",
+   "self_type" : "type-2267",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7646,8 +7649,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_H263PROFILETYPE",
    "name" : "OMX_VIDEO_H263PROFILETYPE",
-   "referenced_type" : "type-2263",
-   "self_type" : "type-2263",
+   "referenced_type" : "type-2266",
+   "self_type" : "type-2266",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7684,8 +7687,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_INTRAREFRESHTYPE",
    "name" : "OMX_VIDEO_INTRAREFRESHTYPE",
-   "referenced_type" : "type-2259",
-   "self_type" : "type-2259",
+   "referenced_type" : "type-2262",
+   "self_type" : "type-2262",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7726,8 +7729,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MOTIONVECTORTYPE",
    "name" : "OMX_VIDEO_MOTIONVECTORTYPE",
-   "referenced_type" : "type-2257",
-   "self_type" : "type-2257",
+   "referenced_type" : "type-2260",
+   "self_type" : "type-2260",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7772,8 +7775,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG2LEVELTYPE",
    "name" : "OMX_VIDEO_MPEG2LEVELTYPE",
-   "referenced_type" : "type-2269",
-   "self_type" : "type-2269",
+   "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-2",
@@ -7822,8 +7825,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG2PROFILETYPE",
    "name" : "OMX_VIDEO_MPEG2PROFILETYPE",
-   "referenced_type" : "type-2268",
-   "self_type" : "type-2268",
+   "referenced_type" : "type-2271",
+   "self_type" : "type-2271",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7888,8 +7891,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG4LEVELTYPE",
    "name" : "OMX_VIDEO_MPEG4LEVELTYPE",
-   "referenced_type" : "type-2272",
-   "self_type" : "type-2272",
+   "referenced_type" : "type-2275",
+   "self_type" : "type-2275",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7978,8 +7981,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG4PROFILETYPE",
    "name" : "OMX_VIDEO_MPEG4PROFILETYPE",
-   "referenced_type" : "type-2271",
-   "self_type" : "type-2271",
+   "referenced_type" : "type-2274",
+   "self_type" : "type-2274",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -8036,8 +8039,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PICTURETYPE",
    "name" : "OMX_VIDEO_PICTURETYPE",
-   "referenced_type" : "type-2265",
-   "self_type" : "type-2265",
+   "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-2",
@@ -8078,8 +8081,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_RVFORMATTYPE",
    "name" : "OMX_VIDEO_RVFORMATTYPE",
-   "referenced_type" : "type-2276",
-   "self_type" : "type-2276",
+   "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-2",
@@ -8120,8 +8123,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_WMVFORMATTYPE",
    "name" : "OMX_VIDEO_WMVFORMATTYPE",
-   "referenced_type" : "type-2274",
-   "self_type" : "type-2274",
+   "referenced_type" : "type-2277",
+   "self_type" : "type-2277",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -8186,8 +8189,8 @@
    ],
    "linker_set_key" : "OMX_WHITEBALCONTROLTYPE",
    "name" : "OMX_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-2219",
-   "self_type" : "type-2219",
+   "referenced_type" : "type-2222",
+   "self_type" : "type-2222",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -8228,8 +8231,8 @@
    ],
    "linker_set_key" : "android::ADebug::Level",
    "name" : "android::ADebug::Level",
-   "referenced_type" : "type-2292",
-   "self_type" : "type-2292",
+   "referenced_type" : "type-2295",
+   "self_type" : "type-2295",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
    "underlying_type" : "type-2",
@@ -8332,8 +8335,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::MatrixCoeffs",
    "name" : "android::ColorAspects::MatrixCoeffs",
-   "referenced_type" : "type-2432",
-   "self_type" : "type-2432",
+   "referenced_type" : "type-2435",
+   "self_type" : "type-2435",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8378,8 +8381,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::Primaries",
    "name" : "android::ColorAspects::Primaries",
-   "referenced_type" : "type-2430",
-   "self_type" : "type-2430",
+   "referenced_type" : "type-2433",
+   "self_type" : "type-2433",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8408,8 +8411,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::Range",
    "name" : "android::ColorAspects::Range",
-   "referenced_type" : "type-2429",
-   "self_type" : "type-2429",
+   "referenced_type" : "type-2432",
+   "self_type" : "type-2432",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8532,8 +8535,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::Transfer",
    "name" : "android::ColorAspects::Transfer",
-   "referenced_type" : "type-2431",
-   "self_type" : "type-2431",
+   "referenced_type" : "type-2434",
+   "self_type" : "type-2434",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8566,8 +8569,8 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorRange",
    "name" : "android::ColorUtils::ColorRange",
-   "referenced_type" : "type-1197",
-   "self_type" : "type-1197",
+   "referenced_type" : "type-1195",
+   "self_type" : "type-1195",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
    "underlying_type" : "type-2",
@@ -8632,8 +8635,8 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorStandard",
    "name" : "android::ColorUtils::ColorStandard",
-   "referenced_type" : "type-1187",
-   "self_type" : "type-1187",
+   "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-2",
@@ -8690,8 +8693,8 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorTransfer",
    "name" : "android::ColorUtils::ColorTransfer",
-   "referenced_type" : "type-1189",
-   "self_type" : "type-1189",
+   "referenced_type" : "type-1192",
+   "self_type" : "type-1192",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
    "underlying_type" : "type-2",
@@ -8756,8 +8759,8 @@
    ],
    "linker_set_key" : "android::HDRStaticInfo::ID",
    "name" : "android::HDRStaticInfo::ID",
-   "referenced_type" : "type-2436",
-   "self_type" : "type-2436",
+   "referenced_type" : "type-2439",
+   "self_type" : "type-2439",
    "size" : 1,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-90",
@@ -8840,8 +8843,8 @@
    ],
    "linker_set_key" : "android::MediaImage2::Type",
    "name" : "android::MediaImage2::Type",
-   "referenced_type" : "type-2421",
-   "self_type" : "type-2421",
+   "referenced_type" : "type-2424",
+   "self_type" : "type-2424",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8892,8 +8895,8 @@
    ],
    "linker_set_key" : "android::MediaImage::Type",
    "name" : "android::MediaImage::Type",
-   "referenced_type" : "type-2416",
-   "self_type" : "type-2416",
+   "referenced_type" : "type-2419",
+   "self_type" : "type-2419",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8926,8 +8929,8 @@
    ],
    "linker_set_key" : "android::MetadataBufferType",
    "name" : "android::MetadataBufferType",
-   "referenced_type" : "type-1234",
-   "self_type" : "type-1234",
+   "referenced_type" : "type-1235",
+   "self_type" : "type-1235",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/MetadataBufferType.h",
    "underlying_type" : "type-4",
@@ -8952,8 +8955,8 @@
    ],
    "linker_set_key" : "android::ProcessState::CallRestriction",
    "name" : "android::ProcessState::CallRestriction",
-   "referenced_type" : "type-1255",
-   "self_type" : "type-1255",
+   "referenced_type" : "type-1259",
+   "self_type" : "type-1259",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h",
    "underlying_type" : "type-4",
@@ -8970,8 +8973,8 @@
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-2657",
-   "self_type" : "type-2657",
+   "referenced_type" : "type-2660",
+   "self_type" : "type-2660",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "underlying_type" : "type-2",
@@ -8988,8 +8991,8 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-2652",
-   "self_type" : "type-2652",
+   "referenced_type" : "type-2655",
+   "self_type" : "type-2655",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "underlying_type" : "type-2",
@@ -9014,8 +9017,8 @@
    ],
    "linker_set_key" : "android::base::LogId",
    "name" : "android::base::LogId",
-   "referenced_type" : "type-4704",
-   "self_type" : "type-4704",
+   "referenced_type" : "type-4711",
+   "self_type" : "type-4711",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "type-2",
@@ -9056,8 +9059,8 @@
    ],
    "linker_set_key" : "android::base::LogSeverity",
    "name" : "android::base::LogSeverity",
-   "referenced_type" : "type-4654",
-   "self_type" : "type-4654",
+   "referenced_type" : "type-4661",
+   "self_type" : "type-4661",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "type-2",
@@ -9192,8 +9195,8 @@
    ],
    "linker_set_key" : "android::hardware::ProcessState::CallRestriction",
    "name" : "android::hardware::ProcessState::CallRestriction",
-   "referenced_type" : "type-1391",
-   "self_type" : "type-1391",
+   "referenced_type" : "type-1394",
+   "self_type" : "type-1394",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "underlying_type" : "type-4",
@@ -12186,8 +12189,8 @@
    ],
    "linker_set_key" : "log_id",
    "name" : "log_id",
-   "referenced_type" : "type-2411",
-   "self_type" : "type-2411",
+   "referenced_type" : "type-2414",
+   "self_type" : "type-2414",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
@@ -12206,9 +12209,9 @@
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1501",
-   "return_type" : "type-1494",
-   "self_type" : "type-1501",
+   "referenced_type" : "type-1500",
+   "return_type" : "type-1495",
+   "self_type" : "type-1500",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -12221,12 +12224,12 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1595"
+     "referenced_type" : "type-1598"
     }
    ],
-   "referenced_type" : "type-2382",
-   "return_type" : "type-1494",
-   "self_type" : "type-2382",
+   "referenced_type" : "type-2385",
+   "return_type" : "type-1495",
+   "self_type" : "type-2385",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12239,7 +12242,7 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-2376"
+     "referenced_type" : "type-2379"
     },
     {
      "referenced_type" : "type-2"
@@ -12251,9 +12254,9 @@
      "referenced_type" : "type-2"
     }
    ],
-   "referenced_type" : "type-2378",
-   "return_type" : "type-1494",
-   "self_type" : "type-2378",
+   "referenced_type" : "type-2381",
+   "return_type" : "type-1495",
+   "self_type" : "type-2381",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12266,7 +12269,7 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-2376"
+     "referenced_type" : "type-2379"
     },
     {
      "referenced_type" : "type-2"
@@ -12281,9 +12284,9 @@
      "referenced_type" : "type-89"
     }
    ],
-   "referenced_type" : "type-2375",
-   "return_type" : "type-1494",
-   "self_type" : "type-2375",
+   "referenced_type" : "type-2378",
+   "return_type" : "type-1495",
+   "self_type" : "type-2378",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12296,7 +12299,7 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-2376"
+     "referenced_type" : "type-2379"
     },
     {
      "referenced_type" : "type-2"
@@ -12308,9 +12311,9 @@
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-2387",
-   "return_type" : "type-1494",
-   "self_type" : "type-2387",
+   "referenced_type" : "type-2390",
+   "return_type" : "type-1495",
+   "self_type" : "type-2390",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12323,15 +12326,15 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-2385"
+     "referenced_type" : "type-2388"
     },
     {
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-2384",
-   "return_type" : "type-1494",
-   "self_type" : "type-2384",
+   "referenced_type" : "type-2387",
+   "return_type" : "type-1495",
+   "self_type" : "type-2387",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12344,7 +12347,7 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-1488"
     },
     {
      "referenced_type" : "type-2"
@@ -12353,9 +12356,9 @@
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-2362",
-   "return_type" : "type-1494",
-   "self_type" : "type-2362",
+   "referenced_type" : "type-2365",
+   "return_type" : "type-1495",
+   "self_type" : "type-2365",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12374,9 +12377,9 @@
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-2364",
-   "return_type" : "type-1494",
-   "self_type" : "type-2364",
+   "referenced_type" : "type-2367",
+   "return_type" : "type-1495",
+   "self_type" : "type-2367",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12389,12 +12392,12 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-2370"
+     "referenced_type" : "type-2373"
     }
    ],
-   "referenced_type" : "type-2369",
-   "return_type" : "type-1494",
-   "self_type" : "type-2369",
+   "referenced_type" : "type-2372",
+   "return_type" : "type-1495",
+   "self_type" : "type-2372",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12410,12 +12413,12 @@
      "referenced_type" : "type-254"
     },
     {
-     "referenced_type" : "type-2367"
+     "referenced_type" : "type-2370"
     }
    ],
-   "referenced_type" : "type-2366",
-   "return_type" : "type-1494",
-   "self_type" : "type-2366",
+   "referenced_type" : "type-2369",
+   "return_type" : "type-1495",
+   "self_type" : "type-2369",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12431,18 +12434,18 @@
      "referenced_type" : "type-254"
     },
     {
-     "referenced_type" : "type-2359"
+     "referenced_type" : "type-2362"
     },
     {
-     "referenced_type" : "type-2359"
+     "referenced_type" : "type-2362"
     },
     {
-     "referenced_type" : "type-2360"
+     "referenced_type" : "type-2363"
     }
    ],
-   "referenced_type" : "type-2358",
-   "return_type" : "type-1494",
-   "self_type" : "type-2358",
+   "referenced_type" : "type-2361",
+   "return_type" : "type-1495",
+   "self_type" : "type-2361",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12461,9 +12464,9 @@
      "referenced_type" : "type-2"
     }
    ],
-   "referenced_type" : "type-2389",
-   "return_type" : "type-1494",
-   "self_type" : "type-2389",
+   "referenced_type" : "type-2392",
+   "return_type" : "type-1495",
+   "self_type" : "type-2392",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12479,12 +12482,12 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1595"
+     "referenced_type" : "type-1598"
     }
    ],
-   "referenced_type" : "type-2380",
-   "return_type" : "type-1494",
-   "self_type" : "type-2380",
+   "referenced_type" : "type-2383",
+   "return_type" : "type-1495",
+   "self_type" : "type-2383",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12506,12 +12509,12 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-2373"
+     "referenced_type" : "type-2376"
     }
    ],
-   "referenced_type" : "type-2372",
-   "return_type" : "type-1494",
-   "self_type" : "type-2372",
+   "referenced_type" : "type-2375",
+   "return_type" : "type-1495",
+   "self_type" : "type-2375",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12527,12 +12530,12 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1595"
+     "referenced_type" : "type-1598"
     }
    ],
-   "referenced_type" : "type-1594",
-   "return_type" : "type-1494",
-   "self_type" : "type-1594",
+   "referenced_type" : "type-1597",
+   "return_type" : "type-1495",
+   "self_type" : "type-1597",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -12548,7 +12551,7 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1588"
+     "referenced_type" : "type-1589"
     },
     {
      "referenced_type" : "type-2"
@@ -12560,9 +12563,9 @@
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1592",
-   "return_type" : "type-1494",
-   "self_type" : "type-1592",
+   "referenced_type" : "type-1595",
+   "return_type" : "type-1495",
+   "self_type" : "type-1595",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -12572,18 +12575,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1247"
+     "referenced_type" : "type-1250"
     },
     {
-     "referenced_type" : "type-1037"
+     "referenced_type" : "type-1041"
     },
     {
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1246",
+   "referenced_type" : "type-1249",
    "return_type" : "type-93",
-   "self_type" : "type-1246",
+   "self_type" : "type-1249",
    "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h"
   },
   {
@@ -12593,18 +12596,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1247"
+     "referenced_type" : "type-1250"
     },
     {
-     "referenced_type" : "type-1388"
+     "referenced_type" : "type-1391"
     },
     {
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1387",
+   "referenced_type" : "type-1390",
    "return_type" : "type-93",
-   "self_type" : "type-1387",
+   "self_type" : "type-1390",
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
   {
@@ -12659,7 +12662,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1381"
+     "referenced_type" : "type-1384"
     },
     {
      "referenced_type" : "type-97"
@@ -12677,9 +12680,9 @@
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1380",
+   "referenced_type" : "type-1383",
    "return_type" : "type-9",
-   "self_type" : "type-1380",
+   "self_type" : "type-1383",
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   }
  ],
@@ -12707,7 +12710,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-4500"
+     "referenced_type" : "type-4506"
     }
    ],
    "return_type" : "type-50",
@@ -12735,7 +12738,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1271"
+     "referenced_type" : "type-1275"
     }
    ],
    "return_type" : "type-50",
@@ -13014,7 +13017,7 @@
      "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-2190"
+     "referenced_type" : "type-2193"
     }
    ],
    "return_type" : "type-9",
@@ -13360,7 +13363,7 @@
      "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-2492"
+     "referenced_type" : "type-2495"
     },
     {
      "referenced_type" : "type-4"
@@ -13469,13 +13472,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2522"
+     "referenced_type" : "type-2525"
     },
     {
      "referenced_type" : "type-725"
     }
    ],
-   "return_type" : "type-2525",
+   "return_type" : "type-2528",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -13485,13 +13488,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2522"
+     "referenced_type" : "type-2525"
     },
     {
-     "referenced_type" : "type-1862"
+     "referenced_type" : "type-1866"
     }
    ],
-   "return_type" : "type-2525",
+   "return_type" : "type-2528",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -13502,7 +13505,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2673"
+     "referenced_type" : "type-2676"
     },
     {
      "referenced_type" : "type-11"
@@ -13522,7 +13525,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2673"
+     "referenced_type" : "type-2676"
     },
     {
      "referenced_type" : "type-8"
@@ -13542,7 +13545,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2673"
+     "referenced_type" : "type-2676"
     },
     {
      "referenced_type" : "type-8"
@@ -13562,7 +13565,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2673"
+     "referenced_type" : "type-2676"
     },
     {
      "referenced_type" : "type-8"
@@ -13585,7 +13588,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2673"
+     "referenced_type" : "type-2676"
     },
     {
      "referenced_type" : "type-8"
@@ -13608,7 +13611,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2673"
+     "referenced_type" : "type-2676"
     },
     {
      "referenced_type" : "type-8"
@@ -13631,7 +13634,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2673"
+     "referenced_type" : "type-2676"
     },
     {
      "referenced_type" : "type-8"
@@ -13654,7 +13657,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2676"
+     "referenced_type" : "type-2679"
     },
     {
      "referenced_type" : "type-11"
@@ -13674,7 +13677,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2676"
+     "referenced_type" : "type-2679"
     },
     {
      "referenced_type" : "type-8"
@@ -13694,7 +13697,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2676"
+     "referenced_type" : "type-2679"
     },
     {
      "referenced_type" : "type-8"
@@ -13714,7 +13717,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2676"
+     "referenced_type" : "type-2679"
     },
     {
      "referenced_type" : "type-8"
@@ -13737,7 +13740,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2676"
+     "referenced_type" : "type-2679"
     },
     {
      "referenced_type" : "type-8"
@@ -13760,7 +13763,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2676"
+     "referenced_type" : "type-2679"
     },
     {
      "referenced_type" : "type-8"
@@ -13783,7 +13786,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2676"
+     "referenced_type" : "type-2679"
     },
     {
      "referenced_type" : "type-8"
@@ -13806,7 +13809,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2668"
+     "referenced_type" : "type-2671"
     },
     {
      "referenced_type" : "type-11"
@@ -13826,7 +13829,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2668"
+     "referenced_type" : "type-2671"
     },
     {
      "referenced_type" : "type-8"
@@ -13846,7 +13849,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2668"
+     "referenced_type" : "type-2671"
     },
     {
      "referenced_type" : "type-8"
@@ -13866,7 +13869,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2668"
+     "referenced_type" : "type-2671"
     },
     {
      "referenced_type" : "type-8"
@@ -13889,7 +13892,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2668"
+     "referenced_type" : "type-2671"
     },
     {
      "referenced_type" : "type-8"
@@ -13912,7 +13915,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2668"
+     "referenced_type" : "type-2671"
     },
     {
      "referenced_type" : "type-8"
@@ -13935,7 +13938,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2668"
+     "referenced_type" : "type-2671"
     },
     {
      "referenced_type" : "type-8"
@@ -13957,10 +13960,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2547"
+     "referenced_type" : "type-2550"
     }
    ],
-   "return_type" : "type-2476",
+   "return_type" : "type-2479",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -13970,7 +13973,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2547"
+     "referenced_type" : "type-2550"
     }
    ],
    "return_type" : "type-570",
@@ -13983,10 +13986,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2547"
+     "referenced_type" : "type-2550"
     }
    ],
-   "return_type" : "type-2463",
+   "return_type" : "type-2466",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -13997,18 +14000,18 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1513"
+     "referenced_type" : "type-1517"
     },
     {
-     "referenced_type" : "type-1648"
+     "referenced_type" : "type-1652"
     },
     {
-     "referenced_type" : "type-3128"
+     "referenced_type" : "type-3131"
     }
    ],
    "return_type" : "type-4",
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-3129", "type-83" ]
+   "template_args" : [ "type-3132", "type-83" ]
   },
   {
    "function_name" : "android::Parcel::readNullableStrongBinder",
@@ -14017,15 +14020,15 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1513"
+     "referenced_type" : "type-1517"
     },
     {
-     "referenced_type" : "type-2534"
+     "referenced_type" : "type-2537"
     }
    ],
    "return_type" : "type-4",
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-3130" ]
+   "template_args" : [ "type-3133" ]
   },
   {
    "access" : "protected",
@@ -14035,7 +14038,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-978"
+     "referenced_type" : "type-980"
     },
     {
      "referenced_type" : "type-8"
@@ -14055,7 +14058,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-978"
+     "referenced_type" : "type-980"
     },
     {
      "referenced_type" : "type-8"
@@ -14075,7 +14078,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-978"
+     "referenced_type" : "type-980"
     },
     {
      "referenced_type" : "type-8"
@@ -14098,7 +14101,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-978"
+     "referenced_type" : "type-980"
     },
     {
      "referenced_type" : "type-8"
@@ -14121,7 +14124,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-978"
+     "referenced_type" : "type-980"
     },
     {
      "referenced_type" : "type-8"
@@ -14144,7 +14147,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-978"
+     "referenced_type" : "type-980"
     },
     {
      "referenced_type" : "type-8"
@@ -14167,7 +14170,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1228"
+     "referenced_type" : "type-1232"
     },
     {
      "referenced_type" : "type-8"
@@ -14187,7 +14190,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1228"
+     "referenced_type" : "type-1232"
     },
     {
      "referenced_type" : "type-8"
@@ -14207,7 +14210,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1228"
+     "referenced_type" : "type-1232"
     },
     {
      "referenced_type" : "type-8"
@@ -14230,7 +14233,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1228"
+     "referenced_type" : "type-1232"
     },
     {
      "referenced_type" : "type-8"
@@ -14253,7 +14256,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1228"
+     "referenced_type" : "type-1232"
     },
     {
      "referenced_type" : "type-8"
@@ -14276,7 +14279,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1228"
+     "referenced_type" : "type-1232"
     },
     {
      "referenced_type" : "type-8"
@@ -14299,7 +14302,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2689"
+     "referenced_type" : "type-2692"
     },
     {
      "referenced_type" : "type-8"
@@ -14319,7 +14322,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2689"
+     "referenced_type" : "type-2692"
     },
     {
      "referenced_type" : "type-8"
@@ -14339,7 +14342,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2689"
+     "referenced_type" : "type-2692"
     },
     {
      "referenced_type" : "type-8"
@@ -14362,7 +14365,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2689"
+     "referenced_type" : "type-2692"
     },
     {
      "referenced_type" : "type-8"
@@ -14385,7 +14388,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2689"
+     "referenced_type" : "type-2692"
     },
     {
      "referenced_type" : "type-8"
@@ -14408,7 +14411,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2689"
+     "referenced_type" : "type-2692"
     },
     {
      "referenced_type" : "type-8"
@@ -14445,7 +14448,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-4500"
+     "referenced_type" : "type-4506"
     }
    ],
    "return_type" : "type-50",
@@ -14459,8 +14462,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem &",
    "name" : "android::BufferItem &",
-   "referenced_type" : "type-1224",
-   "self_type" : "type-1223",
+   "referenced_type" : "type-1227",
+   "self_type" : "type-1226",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14468,8 +14471,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem &",
    "name" : "android::BufferItem &",
-   "referenced_type" : "type-3796",
-   "self_type" : "type-3795",
+   "referenced_type" : "type-3802",
+   "self_type" : "type-3801",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14477,8 +14480,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem &",
    "name" : "android::BufferItem &",
-   "referenced_type" : "type-5717",
-   "self_type" : "type-5716",
+   "referenced_type" : "type-5726",
+   "self_type" : "type-5725",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14486,8 +14489,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem &",
    "name" : "android::BufferItem &",
-   "referenced_type" : "type-8033",
-   "self_type" : "type-8032",
+   "referenced_type" : "type-8057",
+   "self_type" : "type-8056",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14495,8 +14498,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem &",
    "name" : "android::BufferItem &",
-   "referenced_type" : "type-8578",
-   "self_type" : "type-8577",
+   "referenced_type" : "type-8605",
+   "self_type" : "type-8604",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14504,8 +14507,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *&",
    "name" : "android::BufferItem *&",
-   "referenced_type" : "type-1669",
-   "self_type" : "type-1853",
+   "referenced_type" : "type-1673",
+   "self_type" : "type-1857",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -14513,8 +14516,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *&",
    "name" : "android::BufferItem *&",
-   "referenced_type" : "type-4124",
-   "self_type" : "type-4132",
+   "referenced_type" : "type-4130",
+   "self_type" : "type-4138",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -14522,8 +14525,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *&",
    "name" : "android::BufferItem *&",
-   "referenced_type" : "type-6045",
-   "self_type" : "type-6053",
+   "referenced_type" : "type-6054",
+   "self_type" : "type-6062",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -14531,8 +14534,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *&",
    "name" : "android::BufferItem *&",
-   "referenced_type" : "type-8871",
-   "self_type" : "type-8885",
+   "referenced_type" : "type-8899",
+   "self_type" : "type-8913",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -14540,8 +14543,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::CompositorTiming &",
    "name" : "android::CompositorTiming &",
-   "referenced_type" : "type-1431",
-   "self_type" : "type-1430",
+   "referenced_type" : "type-1434",
+   "self_type" : "type-1433",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14549,8 +14552,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::CompositorTiming &",
    "name" : "android::CompositorTiming &",
-   "referenced_type" : "type-3961",
-   "self_type" : "type-3960",
+   "referenced_type" : "type-3967",
+   "self_type" : "type-3966",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14558,8 +14561,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::CompositorTiming &",
    "name" : "android::CompositorTiming &",
-   "referenced_type" : "type-5882",
-   "self_type" : "type-5881",
+   "referenced_type" : "type-5891",
+   "self_type" : "type-5890",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14567,8 +14570,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::CompositorTiming &",
    "name" : "android::CompositorTiming &",
-   "referenced_type" : "type-8714",
-   "self_type" : "type-8713",
+   "referenced_type" : "type-8741",
+   "self_type" : "type-8740",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14576,8 +14579,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-2528",
-   "self_type" : "type-2527",
+   "referenced_type" : "type-2531",
+   "self_type" : "type-2530",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14585,8 +14588,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-4415",
-   "self_type" : "type-4414",
+   "referenced_type" : "type-4417",
+   "self_type" : "type-4416",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14594,8 +14597,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-4671",
-   "self_type" : "type-4670",
+   "referenced_type" : "type-4677",
+   "self_type" : "type-4676",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14603,8 +14606,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-4939",
-   "self_type" : "type-4938",
+   "referenced_type" : "type-4945",
+   "self_type" : "type-4944",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14612,8 +14615,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-6312",
-   "self_type" : "type-6311",
+   "referenced_type" : "type-6317",
+   "self_type" : "type-6316",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14621,8 +14624,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-6552",
-   "self_type" : "type-6551",
+   "referenced_type" : "type-6561",
+   "self_type" : "type-6560",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14630,8 +14633,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-7044",
-   "self_type" : "type-7043",
+   "referenced_type" : "type-7052",
+   "self_type" : "type-7051",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14639,8 +14642,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-8175",
-   "self_type" : "type-8174",
+   "referenced_type" : "type-8199",
+   "self_type" : "type-8198",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14648,8 +14651,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-9180",
-   "self_type" : "type-9179",
+   "referenced_type" : "type-9204",
+   "self_type" : "type-9203",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14657,8 +14660,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-9362",
-   "self_type" : "type-9361",
+   "referenced_type" : "type-9389",
+   "self_type" : "type-9388",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14666,8 +14669,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-9474",
-   "self_type" : "type-9473",
+   "referenced_type" : "type-9501",
+   "self_type" : "type-9500",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14675,8 +14678,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot::State &",
    "name" : "android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-4585",
-   "self_type" : "type-4584",
+   "referenced_type" : "type-4591",
+   "self_type" : "type-4590",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14684,8 +14687,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot::State &",
    "name" : "android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-6469",
-   "self_type" : "type-6468",
+   "referenced_type" : "type-6478",
+   "self_type" : "type-6477",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14693,8 +14696,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot::State &",
    "name" : "android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-9382",
-   "self_type" : "type-9381",
+   "referenced_type" : "type-9411",
+   "self_type" : "type-9410",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14703,7 +14706,7 @@
    "linker_set_key" : "android::Flattenable<android::BufferItem> &",
    "name" : "android::Flattenable<android::BufferItem> &",
    "referenced_type" : "type-21",
-   "self_type" : "type-1514",
+   "self_type" : "type-1518",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14712,7 +14715,7 @@
    "linker_set_key" : "android::Flattenable<android::Fence> &",
    "name" : "android::Flattenable<android::Fence> &",
    "referenced_type" : "type-16",
-   "self_type" : "type-1651",
+   "self_type" : "type-1655",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14721,7 +14724,7 @@
    "linker_set_key" : "android::Flattenable<android::FrameEventHistoryDelta> &",
    "name" : "android::Flattenable<android::FrameEventHistoryDelta> &",
    "referenced_type" : "type-25",
-   "self_type" : "type-4324",
+   "self_type" : "type-4330",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14730,7 +14733,7 @@
    "linker_set_key" : "android::Flattenable<android::GraphicBuffer> &",
    "name" : "android::Flattenable<android::GraphicBuffer> &",
    "referenced_type" : "type-14",
-   "self_type" : "type-1650",
+   "self_type" : "type-1654",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14739,7 +14742,7 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> &",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> &",
    "referenced_type" : "type-32",
-   "self_type" : "type-4326",
+   "self_type" : "type-4333",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14748,7 +14751,7 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> &",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> &",
    "referenced_type" : "type-34",
-   "self_type" : "type-4325",
+   "self_type" : "type-4332",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14756,8 +14759,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-2391",
-   "self_type" : "type-2390",
+   "referenced_type" : "type-2394",
+   "self_type" : "type-2393",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14765,8 +14768,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-4217",
-   "self_type" : "type-4216",
+   "referenced_type" : "type-4223",
+   "self_type" : "type-4222",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14774,8 +14777,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-4678",
-   "self_type" : "type-4677",
+   "referenced_type" : "type-4685",
+   "self_type" : "type-4684",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14783,8 +14786,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-4769",
-   "self_type" : "type-4768",
+   "referenced_type" : "type-4775",
+   "self_type" : "type-4774",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14792,8 +14795,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-6138",
-   "self_type" : "type-6137",
+   "referenced_type" : "type-6147",
+   "self_type" : "type-6146",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14801,8 +14804,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-6559",
-   "self_type" : "type-6558",
+   "referenced_type" : "type-6569",
+   "self_type" : "type-6568",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14810,8 +14813,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-6635",
-   "self_type" : "type-6634",
+   "referenced_type" : "type-6644",
+   "self_type" : "type-6643",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14819,8 +14822,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-8149",
-   "self_type" : "type-8148",
+   "referenced_type" : "type-8173",
+   "self_type" : "type-8172",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14828,8 +14831,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-8973",
-   "self_type" : "type-8972",
+   "referenced_type" : "type-9000",
+   "self_type" : "type-8999",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14837,8 +14840,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-8994",
-   "self_type" : "type-8993",
+   "referenced_type" : "type-9022",
+   "self_type" : "type-9021",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14846,8 +14849,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-9481",
-   "self_type" : "type-9480",
+   "referenced_type" : "type-9508",
+   "self_type" : "type-9507",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14855,8 +14858,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1086",
-   "self_type" : "type-1085",
+   "referenced_type" : "type-1089",
+   "self_type" : "type-1088",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14864,8 +14867,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1268",
-   "self_type" : "type-1267",
+   "referenced_type" : "type-1271",
+   "self_type" : "type-1270",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14873,8 +14876,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1410",
-   "self_type" : "type-1409",
+   "referenced_type" : "type-1413",
+   "self_type" : "type-1412",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14882,8 +14885,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1446",
-   "self_type" : "type-1445",
+   "referenced_type" : "type-1449",
+   "self_type" : "type-1448",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14891,8 +14894,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-2172",
-   "self_type" : "type-2171",
+   "referenced_type" : "type-2176",
+   "self_type" : "type-2175",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14900,8 +14903,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3250",
-   "self_type" : "type-3249",
+   "referenced_type" : "type-3253",
+   "self_type" : "type-3252",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14918,8 +14921,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3463",
-   "self_type" : "type-3462",
+   "referenced_type" : "type-3466",
+   "self_type" : "type-3465",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14927,8 +14930,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3528",
-   "self_type" : "type-3527",
+   "referenced_type" : "type-3531",
+   "self_type" : "type-3530",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14936,8 +14939,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3639",
-   "self_type" : "type-3638",
+   "referenced_type" : "type-3642",
+   "self_type" : "type-3641",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14945,8 +14948,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3696",
-   "self_type" : "type-3695",
+   "referenced_type" : "type-3702",
+   "self_type" : "type-3701",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14954,8 +14957,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3821",
-   "self_type" : "type-3820",
+   "referenced_type" : "type-3827",
+   "self_type" : "type-3826",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14963,8 +14966,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3937",
-   "self_type" : "type-3936",
+   "referenced_type" : "type-3943",
+   "self_type" : "type-3942",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14972,8 +14975,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3978",
-   "self_type" : "type-3977",
+   "referenced_type" : "type-3985",
+   "self_type" : "type-3984",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14981,8 +14984,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-4207",
-   "self_type" : "type-4206",
+   "referenced_type" : "type-4214",
+   "self_type" : "type-4213",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14990,8 +14993,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-4386",
-   "self_type" : "type-4385",
+   "referenced_type" : "type-4392",
+   "self_type" : "type-4391",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14999,8 +15002,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-4597",
-   "self_type" : "type-4596",
+   "referenced_type" : "type-4604",
+   "self_type" : "type-4603",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15008,8 +15011,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-4764",
-   "self_type" : "type-4763",
+   "referenced_type" : "type-4771",
+   "self_type" : "type-4770",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15017,8 +15020,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5171",
-   "self_type" : "type-5170",
+   "referenced_type" : "type-5177",
+   "self_type" : "type-5176",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15026,8 +15029,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5384",
-   "self_type" : "type-5383",
+   "referenced_type" : "type-5390",
+   "self_type" : "type-5389",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15035,8 +15038,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5449",
-   "self_type" : "type-5448",
+   "referenced_type" : "type-5455",
+   "self_type" : "type-5454",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15044,8 +15047,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5560",
-   "self_type" : "type-5559",
+   "referenced_type" : "type-5566",
+   "self_type" : "type-5565",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15053,8 +15056,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5617",
-   "self_type" : "type-5616",
+   "referenced_type" : "type-5626",
+   "self_type" : "type-5625",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15062,8 +15065,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5742",
-   "self_type" : "type-5741",
+   "referenced_type" : "type-5751",
+   "self_type" : "type-5750",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15071,8 +15074,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5858",
-   "self_type" : "type-5857",
+   "referenced_type" : "type-5867",
+   "self_type" : "type-5866",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15080,8 +15083,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5899",
-   "self_type" : "type-5898",
+   "referenced_type" : "type-5909",
+   "self_type" : "type-5908",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15089,8 +15092,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6128",
-   "self_type" : "type-6127",
+   "referenced_type" : "type-6138",
+   "self_type" : "type-6137",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15098,8 +15101,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6283",
-   "self_type" : "type-6282",
+   "referenced_type" : "type-6292",
+   "self_type" : "type-6291",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15107,8 +15110,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6481",
-   "self_type" : "type-6480",
+   "referenced_type" : "type-6491",
+   "self_type" : "type-6490",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15116,8 +15119,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6630",
-   "self_type" : "type-6629",
+   "referenced_type" : "type-6640",
+   "self_type" : "type-6639",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15125,8 +15128,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6857",
-   "self_type" : "type-6856",
+   "referenced_type" : "type-6867",
+   "self_type" : "type-6866",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15134,8 +15137,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-7009",
-   "self_type" : "type-7008",
+   "referenced_type" : "type-7018",
+   "self_type" : "type-7017",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15143,8 +15146,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-7100",
-   "self_type" : "type-7099",
+   "referenced_type" : "type-7109",
+   "self_type" : "type-7108",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15152,8 +15155,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-7258",
-   "self_type" : "type-7257",
+   "referenced_type" : "type-7278",
+   "self_type" : "type-7277",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15161,8 +15164,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-7324",
-   "self_type" : "type-7323",
+   "referenced_type" : "type-7344",
+   "self_type" : "type-7343",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15170,8 +15173,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-7487",
-   "self_type" : "type-7486",
+   "referenced_type" : "type-7508",
+   "self_type" : "type-7507",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15188,8 +15191,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-7700",
-   "self_type" : "type-7699",
+   "referenced_type" : "type-7721",
+   "self_type" : "type-7720",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15197,8 +15200,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-7765",
-   "self_type" : "type-7764",
+   "referenced_type" : "type-7786",
+   "self_type" : "type-7785",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15206,8 +15209,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-7876",
-   "self_type" : "type-7875",
+   "referenced_type" : "type-7897",
+   "self_type" : "type-7896",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15215,8 +15218,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-7933",
-   "self_type" : "type-7932",
+   "referenced_type" : "type-7957",
+   "self_type" : "type-7956",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15224,8 +15227,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-8058",
-   "self_type" : "type-8057",
+   "referenced_type" : "type-8082",
+   "self_type" : "type-8081",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15233,8 +15236,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-8218",
-   "self_type" : "type-8217",
+   "referenced_type" : "type-8242",
+   "self_type" : "type-8241",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15242,8 +15245,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-8301",
-   "self_type" : "type-8300",
+   "referenced_type" : "type-8325",
+   "self_type" : "type-8324",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15251,8 +15254,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-8353",
-   "self_type" : "type-8352",
+   "referenced_type" : "type-8377",
+   "self_type" : "type-8376",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15269,8 +15272,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-8447",
-   "self_type" : "type-8446",
+   "referenced_type" : "type-8471",
+   "self_type" : "type-8470",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15278,8 +15281,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-8491",
-   "self_type" : "type-8490",
+   "referenced_type" : "type-8518",
+   "self_type" : "type-8517",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15287,8 +15290,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-8586",
-   "self_type" : "type-8585",
+   "referenced_type" : "type-8614",
+   "self_type" : "type-8613",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15296,8 +15299,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-8692",
-   "self_type" : "type-8691",
+   "referenced_type" : "type-8719",
+   "self_type" : "type-8718",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15305,8 +15308,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-8729",
-   "self_type" : "type-8728",
+   "referenced_type" : "type-8756",
+   "self_type" : "type-8755",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15314,8 +15317,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-8975",
-   "self_type" : "type-8974",
+   "referenced_type" : "type-9002",
+   "self_type" : "type-9001",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15323,8 +15326,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-9147",
-   "self_type" : "type-9146",
+   "referenced_type" : "type-9175",
+   "self_type" : "type-9174",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15332,8 +15335,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-9398",
-   "self_type" : "type-9397",
+   "referenced_type" : "type-9425",
+   "self_type" : "type-9424",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15341,8 +15344,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-9537",
-   "self_type" : "type-9536",
+   "referenced_type" : "type-9564",
+   "self_type" : "type-9563",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15350,8 +15353,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-9759",
-   "self_type" : "type-9758",
+   "referenced_type" : "type-9786",
+   "self_type" : "type-9785",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15431,8 +15434,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-3472",
-   "self_type" : "type-3471",
+   "referenced_type" : "type-3475",
+   "self_type" : "type-3474",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15440,8 +15443,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-4303",
-   "self_type" : "type-4302",
+   "referenced_type" : "type-4309",
+   "self_type" : "type-4308",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15449,8 +15452,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-4755",
-   "self_type" : "type-4754",
+   "referenced_type" : "type-4761",
+   "self_type" : "type-4760",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15458,8 +15461,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-5393",
-   "self_type" : "type-5392",
+   "referenced_type" : "type-5399",
+   "self_type" : "type-5398",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15467,8 +15470,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-6212",
-   "self_type" : "type-6211",
+   "referenced_type" : "type-6221",
+   "self_type" : "type-6220",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15476,8 +15479,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-6622",
-   "self_type" : "type-6621",
+   "referenced_type" : "type-6631",
+   "self_type" : "type-6630",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15494,8 +15497,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-7709",
-   "self_type" : "type-7708",
+   "referenced_type" : "type-7730",
+   "self_type" : "type-7729",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15503,8 +15506,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-8309",
-   "self_type" : "type-8308",
+   "referenced_type" : "type-8333",
+   "self_type" : "type-8332",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15512,8 +15515,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-9070",
-   "self_type" : "type-9069",
+   "referenced_type" : "type-9097",
+   "self_type" : "type-9096",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15521,8 +15524,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-9530",
-   "self_type" : "type-9529",
+   "referenced_type" : "type-9557",
+   "self_type" : "type-9556",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15530,8 +15533,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
-   "referenced_type" : "type-1239",
-   "self_type" : "type-2660",
+   "referenced_type" : "type-1242",
+   "self_type" : "type-2663",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -15540,7 +15543,7 @@
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
    "referenced_type" : "type-121",
-   "self_type" : "type-2654",
+   "self_type" : "type-2657",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -15548,8 +15551,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 *&",
    "name" : "android::String8 *&",
-   "referenced_type" : "type-1885",
-   "self_type" : "type-1884",
+   "referenced_type" : "type-1889",
+   "self_type" : "type-1888",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -15557,8 +15560,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1101",
-   "self_type" : "type-1100",
+   "referenced_type" : "type-1104",
+   "self_type" : "type-1103",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15575,8 +15578,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1237",
-   "self_type" : "type-1236",
+   "referenced_type" : "type-1240",
+   "self_type" : "type-1239",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15584,8 +15587,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1365",
-   "self_type" : "type-1364",
+   "referenced_type" : "type-1368",
+   "self_type" : "type-1367",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15593,8 +15596,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1451",
-   "self_type" : "type-1450",
+   "referenced_type" : "type-1454",
+   "self_type" : "type-1453",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15602,8 +15605,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1524",
-   "self_type" : "type-1523",
+   "referenced_type" : "type-1529",
+   "self_type" : "type-1528",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15611,8 +15614,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1665",
-   "self_type" : "type-1664",
+   "referenced_type" : "type-1669",
+   "self_type" : "type-1668",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15620,8 +15623,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3168",
-   "self_type" : "type-3167",
+   "referenced_type" : "type-3171",
+   "self_type" : "type-3170",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15629,8 +15632,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3532",
-   "self_type" : "type-3531",
+   "referenced_type" : "type-3535",
+   "self_type" : "type-3534",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15638,8 +15641,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3643",
-   "self_type" : "type-3642",
+   "referenced_type" : "type-3646",
+   "self_type" : "type-3645",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15647,8 +15650,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3705",
-   "self_type" : "type-3704",
+   "referenced_type" : "type-3711",
+   "self_type" : "type-3710",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15656,8 +15659,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3806",
-   "self_type" : "type-3805",
+   "referenced_type" : "type-3812",
+   "self_type" : "type-3811",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15665,8 +15668,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3911",
-   "self_type" : "type-3910",
+   "referenced_type" : "type-3918",
+   "self_type" : "type-3917",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15674,8 +15677,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3984",
-   "self_type" : "type-3983",
+   "referenced_type" : "type-3990",
+   "self_type" : "type-3989",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15683,8 +15686,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4036",
-   "self_type" : "type-4035",
+   "referenced_type" : "type-4042",
+   "self_type" : "type-4041",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15692,8 +15695,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4121",
-   "self_type" : "type-4120",
+   "referenced_type" : "type-4127",
+   "self_type" : "type-4126",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15701,8 +15704,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4345",
-   "self_type" : "type-4344",
+   "referenced_type" : "type-4351",
+   "self_type" : "type-4350",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15710,8 +15713,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4484",
-   "self_type" : "type-4483",
+   "referenced_type" : "type-4490",
+   "self_type" : "type-4489",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15719,8 +15722,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4531",
-   "self_type" : "type-4530",
+   "referenced_type" : "type-4537",
+   "self_type" : "type-4536",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15728,8 +15731,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4553",
-   "self_type" : "type-4552",
+   "referenced_type" : "type-4559",
+   "self_type" : "type-4558",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15737,8 +15740,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4592",
-   "self_type" : "type-4591",
+   "referenced_type" : "type-4599",
+   "self_type" : "type-4598",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15746,8 +15749,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4771",
-   "self_type" : "type-4770",
+   "referenced_type" : "type-4777",
+   "self_type" : "type-4776",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15755,8 +15758,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4858",
-   "self_type" : "type-4857",
+   "referenced_type" : "type-4864",
+   "self_type" : "type-4863",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15764,8 +15767,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5089",
-   "self_type" : "type-5088",
+   "referenced_type" : "type-5095",
+   "self_type" : "type-5094",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15773,8 +15776,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5453",
-   "self_type" : "type-5452",
+   "referenced_type" : "type-5459",
+   "self_type" : "type-5458",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15782,8 +15785,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5564",
-   "self_type" : "type-5563",
+   "referenced_type" : "type-5570",
+   "self_type" : "type-5569",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15791,8 +15794,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5626",
-   "self_type" : "type-5625",
+   "referenced_type" : "type-5635",
+   "self_type" : "type-5634",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15800,8 +15803,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5727",
-   "self_type" : "type-5726",
+   "referenced_type" : "type-5736",
+   "self_type" : "type-5735",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15809,8 +15812,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5832",
-   "self_type" : "type-5831",
+   "referenced_type" : "type-5842",
+   "self_type" : "type-5841",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15818,8 +15821,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5905",
-   "self_type" : "type-5904",
+   "referenced_type" : "type-5914",
+   "self_type" : "type-5913",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15827,8 +15830,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5957",
-   "self_type" : "type-5956",
+   "referenced_type" : "type-5966",
+   "self_type" : "type-5965",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15836,8 +15839,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6042",
-   "self_type" : "type-6041",
+   "referenced_type" : "type-6051",
+   "self_type" : "type-6050",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15845,8 +15848,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6245",
-   "self_type" : "type-6244",
+   "referenced_type" : "type-6254",
+   "self_type" : "type-6253",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15854,8 +15857,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6370",
-   "self_type" : "type-6369",
+   "referenced_type" : "type-6379",
+   "self_type" : "type-6378",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15863,8 +15866,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6415",
-   "self_type" : "type-6414",
+   "referenced_type" : "type-6424",
+   "self_type" : "type-6423",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15872,8 +15875,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6437",
-   "self_type" : "type-6436",
+   "referenced_type" : "type-6446",
+   "self_type" : "type-6445",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15881,8 +15884,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6476",
-   "self_type" : "type-6475",
+   "referenced_type" : "type-6486",
+   "self_type" : "type-6485",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15890,8 +15893,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6637",
-   "self_type" : "type-6636",
+   "referenced_type" : "type-6646",
+   "self_type" : "type-6645",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15899,8 +15902,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6722",
-   "self_type" : "type-6721",
+   "referenced_type" : "type-6731",
+   "self_type" : "type-6730",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15908,8 +15911,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6748",
-   "self_type" : "type-6747",
+   "referenced_type" : "type-6757",
+   "self_type" : "type-6756",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15917,8 +15920,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6854",
-   "self_type" : "type-6853",
+   "referenced_type" : "type-6864",
+   "self_type" : "type-6863",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15926,8 +15929,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6885",
-   "self_type" : "type-6884",
+   "referenced_type" : "type-6895",
+   "self_type" : "type-6894",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15935,8 +15938,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7007",
-   "self_type" : "type-7006",
+   "referenced_type" : "type-7015",
+   "self_type" : "type-7014",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15944,8 +15947,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7067",
-   "self_type" : "type-7066",
+   "referenced_type" : "type-7075",
+   "self_type" : "type-7074",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15953,8 +15956,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7105",
-   "self_type" : "type-7104",
+   "referenced_type" : "type-7113",
+   "self_type" : "type-7112",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15962,8 +15965,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7256",
-   "self_type" : "type-7255",
+   "referenced_type" : "type-7276",
+   "self_type" : "type-7275",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15971,8 +15974,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7294",
-   "self_type" : "type-7293",
+   "referenced_type" : "type-7314",
+   "self_type" : "type-7313",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15980,8 +15983,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7330",
-   "self_type" : "type-7329",
+   "referenced_type" : "type-7350",
+   "self_type" : "type-7349",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15989,8 +15992,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7405",
-   "self_type" : "type-7404",
+   "referenced_type" : "type-7426",
+   "self_type" : "type-7425",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15998,8 +16001,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7769",
-   "self_type" : "type-7768",
+   "referenced_type" : "type-7790",
+   "self_type" : "type-7789",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16007,8 +16010,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7880",
-   "self_type" : "type-7879",
+   "referenced_type" : "type-7901",
+   "self_type" : "type-7900",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16016,8 +16019,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7942",
-   "self_type" : "type-7941",
+   "referenced_type" : "type-7966",
+   "self_type" : "type-7965",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16025,8 +16028,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-8043",
-   "self_type" : "type-8042",
+   "referenced_type" : "type-8067",
+   "self_type" : "type-8066",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16034,8 +16037,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-8211",
-   "self_type" : "type-8210",
+   "referenced_type" : "type-8235",
+   "self_type" : "type-8234",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16043,8 +16046,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-8357",
-   "self_type" : "type-8356",
+   "referenced_type" : "type-8381",
+   "self_type" : "type-8380",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16061,8 +16064,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-8453",
-   "self_type" : "type-8452",
+   "referenced_type" : "type-8477",
+   "self_type" : "type-8476",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16070,8 +16073,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-8497",
-   "self_type" : "type-8496",
+   "referenced_type" : "type-8524",
+   "self_type" : "type-8523",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16079,8 +16082,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-8580",
-   "self_type" : "type-8579",
+   "referenced_type" : "type-8607",
+   "self_type" : "type-8606",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16088,8 +16091,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-8666",
-   "self_type" : "type-8665",
+   "referenced_type" : "type-8693",
+   "self_type" : "type-8692",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16097,8 +16100,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-8734",
-   "self_type" : "type-8733",
+   "referenced_type" : "type-8761",
+   "self_type" : "type-8760",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16106,8 +16109,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-8786",
-   "self_type" : "type-8785",
+   "referenced_type" : "type-8815",
+   "self_type" : "type-8814",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16115,8 +16118,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-8869",
-   "self_type" : "type-8868",
+   "referenced_type" : "type-8897",
+   "self_type" : "type-8896",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16124,8 +16127,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-9103",
-   "self_type" : "type-9102",
+   "referenced_type" : "type-9131",
+   "self_type" : "type-9130",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16133,8 +16136,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-9246",
-   "self_type" : "type-9245",
+   "referenced_type" : "type-9275",
+   "self_type" : "type-9274",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16142,8 +16145,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-9305",
-   "self_type" : "type-9304",
+   "referenced_type" : "type-9333",
+   "self_type" : "type-9332",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16151,8 +16154,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-9335",
-   "self_type" : "type-9334",
+   "referenced_type" : "type-9364",
+   "self_type" : "type-9363",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16160,8 +16163,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-9391",
-   "self_type" : "type-9390",
+   "referenced_type" : "type-9421",
+   "self_type" : "type-9420",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16169,8 +16172,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-9542",
-   "self_type" : "type-9541",
+   "referenced_type" : "type-9569",
+   "self_type" : "type-9568",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16178,8 +16181,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-9620",
-   "self_type" : "type-9619",
+   "referenced_type" : "type-9648",
+   "self_type" : "type-9647",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16187,8 +16190,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-9656",
-   "self_type" : "type-9655",
+   "referenced_type" : "type-9683",
+   "self_type" : "type-9682",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16196,8 +16199,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-9756",
-   "self_type" : "type-9755",
+   "referenced_type" : "type-9784",
+   "self_type" : "type-9783",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16205,8 +16208,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-9785",
-   "self_type" : "type-9784",
+   "referenced_type" : "type-9813",
+   "self_type" : "type-9812",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16232,8 +16235,8 @@
    "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",
+   "referenced_type" : "type-6779",
+   "self_type" : "type-6782",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16241,24 +16244,6 @@
    "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,
@@ -16266,8 +16251,8 @@
   },
   {
    "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> > &",
+   "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-4494",
    "self_type" : "type-4497",
    "size" : 4,
@@ -16275,10 +16260,28 @@
   },
   {
    "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-4371",
+   "self_type" : "type-4374",
+   "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-4500",
+   "self_type" : "type-4503",
+   "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-4356",
+   "referenced_type" : "type-4359",
+   "self_type" : "type-4362",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16295,8 +16298,8 @@
    "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",
+   "referenced_type" : "type-6783",
+   "self_type" : "type-6786",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16322,8 +16325,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1383",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1386",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16331,8 +16334,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-3921",
-   "self_type" : "type-3920",
+   "referenced_type" : "type-3927",
+   "self_type" : "type-3926",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16340,8 +16343,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-5842",
-   "self_type" : "type-5841",
+   "referenced_type" : "type-5851",
+   "self_type" : "type-5850",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16349,8 +16352,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-8675",
-   "self_type" : "type-8674",
+   "referenced_type" : "type-8703",
+   "self_type" : "type-8702",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16368,7 +16371,7 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> > &",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> > &",
    "referenced_type" : "type-381",
-   "self_type" : "type-6896",
+   "self_type" : "type-6905",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16377,7 +16380,7 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect> &",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect> &",
    "referenced_type" : "type-372",
-   "self_type" : "type-4594",
+   "self_type" : "type-4600",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16386,7 +16389,7 @@
    "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-4347",
+   "self_type" : "type-4353",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16395,7 +16398,7 @@
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming &",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming &",
    "referenced_type" : "type-588",
-   "self_type" : "type-4586",
+   "self_type" : "type-4592",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16404,7 +16407,7 @@
    "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-4590",
+   "self_type" : "type-4597",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16413,7 +16416,7 @@
    "linker_set_key" : "android::hardware::hidl_array<int, 4> &",
    "name" : "android::hardware::hidl_array<int, 4> &",
    "referenced_type" : "type-384",
-   "self_type" : "type-6897",
+   "self_type" : "type-7114",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16431,7 +16434,7 @@
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> &",
    "name" : "android::hardware::hidl_vec<unsigned char> &",
    "referenced_type" : "type-452",
-   "self_type" : "type-4379",
+   "self_type" : "type-4385",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16440,7 +16443,7 @@
    "linker_set_key" : "android::hardware::media::V1_0::Rect &",
    "name" : "android::hardware::media::V1_0::Rect &",
    "referenced_type" : "type-375",
-   "self_type" : "type-4598",
+   "self_type" : "type-4605",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16449,7 +16452,7 @@
    "linker_set_key" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > &",
    "name" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > &",
    "referenced_type" : "type-160",
-   "self_type" : "type-2642",
+   "self_type" : "type-2645",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16458,7 +16461,7 @@
    "linker_set_key" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > &",
    "name" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > &",
    "referenced_type" : "type-147",
-   "self_type" : "type-2638",
+   "self_type" : "type-2641",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16467,7 +16470,7 @@
    "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int> &",
    "name" : "android::key_value_pair_t<unsigned int, unsigned int> &",
    "referenced_type" : "type-143",
-   "self_type" : "type-2637",
+   "self_type" : "type-2640",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16476,7 +16479,7 @@
    "linker_set_key" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > &",
    "name" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > &",
    "referenced_type" : "type-581",
-   "self_type" : "type-2512",
+   "self_type" : "type-2515",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16485,7 +16488,7 @@
    "linker_set_key" : "android::sp<android::ALooper> &",
    "name" : "android::sp<android::ALooper> &",
    "referenced_type" : "type-321",
-   "self_type" : "type-2266",
+   "self_type" : "type-2269",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16494,7 +16497,7 @@
    "linker_set_key" : "android::sp<android::AMessage> &",
    "name" : "android::sp<android::AMessage> &",
    "referenced_type" : "type-259",
-   "self_type" : "type-2077",
+   "self_type" : "type-2068",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16503,7 +16506,7 @@
    "linker_set_key" : "android::sp<android::ComponentWrapper> &",
    "name" : "android::sp<android::ComponentWrapper> &",
    "referenced_type" : "type-567",
-   "self_type" : "type-2490",
+   "self_type" : "type-2493",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16511,8 +16514,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::Fence> &",
    "name" : "android::sp<android::Fence> &",
-   "referenced_type" : "type-1864",
-   "self_type" : "type-2525",
+   "referenced_type" : "type-1868",
+   "self_type" : "type-2528",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16521,7 +16524,7 @@
    "linker_set_key" : "android::sp<android::FrameDropper> &",
    "name" : "android::sp<android::FrameDropper> &",
    "referenced_type" : "type-578",
-   "self_type" : "type-2505",
+   "self_type" : "type-2508",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16539,7 +16542,7 @@
    "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy> &",
    "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy> &",
    "referenced_type" : "type-473",
-   "self_type" : "type-2497",
+   "self_type" : "type-2500",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16547,8 +16550,8 @@
    "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",
+   "referenced_type" : "type-4265",
+   "self_type" : "type-4268",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16556,8 +16559,8 @@
    "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",
+   "referenced_type" : "type-4274",
+   "self_type" : "type-4277",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16565,8 +16568,8 @@
    "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",
+   "referenced_type" : "type-4833",
+   "self_type" : "type-4844",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16574,8 +16577,8 @@
    "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",
+   "referenced_type" : "type-7038",
+   "self_type" : "type-7048",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16628,8 +16631,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::NativeHandle> *&",
    "name" : "android::sp<android::NativeHandle> *&",
-   "referenced_type" : "type-1880",
-   "self_type" : "type-1879",
+   "referenced_type" : "type-1884",
+   "self_type" : "type-1883",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16637,8 +16640,8 @@
    "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",
+   "referenced_type" : "type-2473",
+   "self_type" : "type-6916",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16656,7 +16659,7 @@
    "linker_set_key" : "android::wp<android::IBinder::DeathRecipient> &",
    "name" : "android::wp<android::IBinder::DeathRecipient> &",
    "referenced_type" : "type-172",
-   "self_type" : "type-4304",
+   "self_type" : "type-4310",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16665,7 +16668,7 @@
    "linker_set_key" : "android_cta861_3_metadata &",
    "name" : "android_cta861_3_metadata &",
    "referenced_type" : "type-305",
-   "self_type" : "type-1476",
+   "self_type" : "type-1480",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16683,7 +16686,7 @@
    "linker_set_key" : "android_smpte2086_metadata &",
    "name" : "android_smpte2086_metadata &",
    "referenced_type" : "type-304",
-   "self_type" : "type-1475",
+   "self_type" : "type-1479",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16700,8 +16703,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AString &",
    "name" : "const android::AString &",
-   "referenced_type" : "type-2110",
-   "self_type" : "type-2241",
+   "referenced_type" : "type-2101",
+   "self_type" : "type-2244",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -16709,8 +16712,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-1219",
-   "self_type" : "type-1222",
+   "referenced_type" : "type-1223",
+   "self_type" : "type-1225",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16718,8 +16721,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-1530",
-   "self_type" : "type-1532",
+   "referenced_type" : "type-1533",
+   "self_type" : "type-1535",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16727,8 +16730,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-1671",
-   "self_type" : "type-1673",
+   "referenced_type" : "type-1675",
+   "self_type" : "type-1677",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16736,8 +16739,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-3441",
-   "self_type" : "type-3443",
+   "referenced_type" : "type-3444",
+   "self_type" : "type-3446",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -16745,8 +16748,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-3633",
-   "self_type" : "type-3637",
+   "referenced_type" : "type-3636",
+   "self_type" : "type-3640",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16754,8 +16757,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-3791",
-   "self_type" : "type-3794",
+   "referenced_type" : "type-3798",
+   "self_type" : "type-3800",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16763,8 +16766,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-4040",
-   "self_type" : "type-4043",
+   "referenced_type" : "type-4047",
+   "self_type" : "type-4049",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16772,8 +16775,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-4126",
-   "self_type" : "type-4128",
+   "referenced_type" : "type-4132",
+   "self_type" : "type-4134",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16781,8 +16784,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-5362",
-   "self_type" : "type-5364",
+   "referenced_type" : "type-5368",
+   "self_type" : "type-5370",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -16790,8 +16793,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-5554",
-   "self_type" : "type-5558",
+   "referenced_type" : "type-5560",
+   "self_type" : "type-5564",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16799,8 +16802,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-5712",
-   "self_type" : "type-5715",
+   "referenced_type" : "type-5722",
+   "self_type" : "type-5724",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16808,8 +16811,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-5961",
-   "self_type" : "type-5964",
+   "referenced_type" : "type-5971",
+   "self_type" : "type-5973",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16817,8 +16820,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-6047",
-   "self_type" : "type-6049",
+   "referenced_type" : "type-6056",
+   "self_type" : "type-6058",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16835,8 +16838,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-7678",
-   "self_type" : "type-7680",
+   "referenced_type" : "type-7699",
+   "self_type" : "type-7701",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -16844,8 +16847,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-7870",
-   "self_type" : "type-7874",
+   "referenced_type" : "type-7891",
+   "self_type" : "type-7895",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16853,8 +16856,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-8028",
-   "self_type" : "type-8031",
+   "referenced_type" : "type-8053",
+   "self_type" : "type-8055",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16862,8 +16865,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-8282",
-   "self_type" : "type-8284",
+   "referenced_type" : "type-8306",
+   "self_type" : "type-8308",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -16871,8 +16874,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-8441",
-   "self_type" : "type-8445",
+   "referenced_type" : "type-8465",
+   "self_type" : "type-8469",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16880,8 +16883,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-8574",
-   "self_type" : "type-8576",
+   "referenced_type" : "type-8601",
+   "self_type" : "type-8603",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16889,8 +16892,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-8792",
-   "self_type" : "type-8794",
+   "referenced_type" : "type-8819",
+   "self_type" : "type-8821",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16898,8 +16901,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-8874",
-   "self_type" : "type-8876",
+   "referenced_type" : "type-8901",
+   "self_type" : "type-8903",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16916,8 +16919,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::CompositorTiming &",
    "name" : "const android::CompositorTiming &",
-   "referenced_type" : "type-1424",
-   "self_type" : "type-1426",
+   "referenced_type" : "type-1427",
+   "self_type" : "type-1429",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16925,8 +16928,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::CompositorTiming &",
    "name" : "const android::CompositorTiming &",
-   "referenced_type" : "type-3952",
-   "self_type" : "type-3954",
+   "referenced_type" : "type-3960",
+   "self_type" : "type-3962",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16934,8 +16937,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::CompositorTiming &",
    "name" : "const android::CompositorTiming &",
-   "referenced_type" : "type-5873",
-   "self_type" : "type-5875",
+   "referenced_type" : "type-5884",
+   "self_type" : "type-5886",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16943,8 +16946,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::CompositorTiming &",
    "name" : "const android::CompositorTiming &",
-   "referenced_type" : "type-8707",
-   "self_type" : "type-8709",
+   "referenced_type" : "type-8734",
+   "self_type" : "type-8736",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16952,8 +16955,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-4579",
-   "self_type" : "type-4581",
+   "referenced_type" : "type-4585",
+   "self_type" : "type-4587",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16961,8 +16964,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-4747",
-   "self_type" : "type-4749",
+   "referenced_type" : "type-4754",
+   "self_type" : "type-4756",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16970,8 +16973,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-6463",
-   "self_type" : "type-6465",
+   "referenced_type" : "type-6472",
+   "self_type" : "type-6474",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16979,8 +16982,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-6615",
-   "self_type" : "type-6617",
+   "referenced_type" : "type-6625",
+   "self_type" : "type-6627",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16988,8 +16991,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-9376",
-   "self_type" : "type-9378",
+   "referenced_type" : "type-9405",
+   "self_type" : "type-9407",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16997,8 +17000,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-9524",
-   "self_type" : "type-9526",
+   "referenced_type" : "type-9551",
+   "self_type" : "type-9553",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17006,8 +17009,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Flattenable<android::BufferItem> &",
    "name" : "const android::Flattenable<android::BufferItem> &",
-   "referenced_type" : "type-1506",
-   "self_type" : "type-1512",
+   "referenced_type" : "type-1509",
+   "self_type" : "type-1516",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17015,8 +17018,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Flattenable<android::Fence> &",
    "name" : "const android::Flattenable<android::Fence> &",
-   "referenced_type" : "type-1634",
-   "self_type" : "type-1647",
+   "referenced_type" : "type-1638",
+   "self_type" : "type-1650",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17024,8 +17027,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Flattenable<android::FrameEventHistoryDelta> &",
    "name" : "const android::Flattenable<android::FrameEventHistoryDelta> &",
-   "referenced_type" : "type-4306",
-   "self_type" : "type-4322",
+   "referenced_type" : "type-4312",
+   "self_type" : "type-4328",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17033,8 +17036,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Flattenable<android::GraphicBuffer> &",
    "name" : "const android::Flattenable<android::GraphicBuffer> &",
-   "referenced_type" : "type-1638",
-   "self_type" : "type-1646",
+   "referenced_type" : "type-1643",
+   "self_type" : "type-1649",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17042,8 +17045,8 @@
    "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",
+   "referenced_type" : "type-4315",
+   "self_type" : "type-4327",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17051,8 +17054,8 @@
    "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",
+   "referenced_type" : "type-4318",
+   "self_type" : "type-4329",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17114,8 +17117,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel &",
    "name" : "const android::Parcel &",
-   "referenced_type" : "type-4533",
-   "self_type" : "type-4532",
+   "referenced_type" : "type-4539",
+   "self_type" : "type-4538",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17123,8 +17126,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel &",
    "name" : "const android::Parcel &",
-   "referenced_type" : "type-6417",
-   "self_type" : "type-6416",
+   "referenced_type" : "type-6426",
+   "self_type" : "type-6425",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17132,8 +17135,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel &",
    "name" : "const android::Parcel &",
-   "referenced_type" : "type-9308",
-   "self_type" : "type-9307",
+   "referenced_type" : "type-9335",
+   "self_type" : "type-9334",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17150,8 +17153,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-1215",
-   "self_type" : "type-1217",
+   "referenced_type" : "type-1218",
+   "self_type" : "type-1220",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17159,8 +17162,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-1490",
-   "self_type" : "type-1492",
+   "referenced_type" : "type-1493",
+   "self_type" : "type-1496",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17168,8 +17171,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-1621",
-   "self_type" : "type-1623",
+   "referenced_type" : "type-1624",
+   "self_type" : "type-1626",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17177,8 +17180,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-2683",
-   "self_type" : "type-2685",
+   "referenced_type" : "type-2686",
+   "self_type" : "type-2688",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17186,8 +17189,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-3466",
-   "self_type" : "type-3468",
+   "referenced_type" : "type-3469",
+   "self_type" : "type-3471",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17195,8 +17198,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-3787",
-   "self_type" : "type-3789",
+   "referenced_type" : "type-3793",
+   "self_type" : "type-3795",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17204,8 +17207,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-4011",
-   "self_type" : "type-4013",
+   "referenced_type" : "type-4017",
+   "self_type" : "type-4019",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17213,8 +17216,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-4090",
-   "self_type" : "type-4092",
+   "referenced_type" : "type-4096",
+   "self_type" : "type-4098",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17222,8 +17225,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-4292",
-   "self_type" : "type-4294",
+   "referenced_type" : "type-4298",
+   "self_type" : "type-4300",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17231,8 +17234,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-4572",
-   "self_type" : "type-4574",
+   "referenced_type" : "type-4578",
+   "self_type" : "type-4580",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17240,8 +17243,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-4736",
-   "self_type" : "type-4738",
+   "referenced_type" : "type-4743",
+   "self_type" : "type-4745",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17249,8 +17252,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-5019",
-   "self_type" : "type-5021",
+   "referenced_type" : "type-5025",
+   "self_type" : "type-5027",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17258,8 +17261,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-5387",
-   "self_type" : "type-5389",
+   "referenced_type" : "type-5393",
+   "self_type" : "type-5395",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17267,8 +17270,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-5708",
-   "self_type" : "type-5710",
+   "referenced_type" : "type-5717",
+   "self_type" : "type-5719",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17276,8 +17279,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-5932",
-   "self_type" : "type-5934",
+   "referenced_type" : "type-5941",
+   "self_type" : "type-5943",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17285,8 +17288,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-6011",
-   "self_type" : "type-6013",
+   "referenced_type" : "type-6020",
+   "self_type" : "type-6022",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17294,8 +17297,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-6201",
-   "self_type" : "type-6203",
+   "referenced_type" : "type-6210",
+   "self_type" : "type-6212",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17303,8 +17306,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-6456",
-   "self_type" : "type-6458",
+   "referenced_type" : "type-6465",
+   "self_type" : "type-6467",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17312,8 +17315,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-6605",
-   "self_type" : "type-6607",
+   "referenced_type" : "type-6615",
+   "self_type" : "type-6617",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17321,8 +17324,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-6836",
-   "self_type" : "type-6839",
+   "referenced_type" : "type-6846",
+   "self_type" : "type-6849",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17330,8 +17333,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-6990",
-   "self_type" : "type-6992",
+   "referenced_type" : "type-6999",
+   "self_type" : "type-7001",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17339,8 +17342,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-7221",
-   "self_type" : "type-7223",
+   "referenced_type" : "type-7230",
+   "self_type" : "type-7232",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17348,8 +17351,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-7241",
-   "self_type" : "type-7243",
+   "referenced_type" : "type-7262",
+   "self_type" : "type-7265",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17366,8 +17369,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-7703",
-   "self_type" : "type-7705",
+   "referenced_type" : "type-7724",
+   "self_type" : "type-7726",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17375,8 +17378,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-8024",
-   "self_type" : "type-8026",
+   "referenced_type" : "type-8048",
+   "self_type" : "type-8050",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17384,8 +17387,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-8206",
-   "self_type" : "type-8208",
+   "referenced_type" : "type-8230",
+   "self_type" : "type-8232",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17393,8 +17396,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-8305",
-   "self_type" : "type-8307",
+   "referenced_type" : "type-8329",
+   "self_type" : "type-8331",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17402,8 +17405,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-8570",
-   "self_type" : "type-8572",
+   "referenced_type" : "type-8597",
+   "self_type" : "type-8599",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17411,8 +17414,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-8760",
-   "self_type" : "type-8762",
+   "referenced_type" : "type-8788",
+   "self_type" : "type-8790",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17420,8 +17423,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-8839",
-   "self_type" : "type-8841",
+   "referenced_type" : "type-8866",
+   "self_type" : "type-8868",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17429,8 +17432,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-9057",
-   "self_type" : "type-9060",
+   "referenced_type" : "type-9085",
+   "self_type" : "type-9087",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17438,8 +17441,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-9368",
-   "self_type" : "type-9370",
+   "referenced_type" : "type-9396",
+   "self_type" : "type-9398",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17447,8 +17450,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-9515",
-   "self_type" : "type-9517",
+   "referenced_type" : "type-9542",
+   "self_type" : "type-9544",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17456,8 +17459,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-9739",
-   "self_type" : "type-9741",
+   "referenced_type" : "type-9766",
+   "self_type" : "type-9768",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17465,8 +17468,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-9840",
-   "self_type" : "type-9843",
+   "referenced_type" : "type-9863",
+   "self_type" : "type-9869",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17474,8 +17477,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SafeInterface::ParcelHandler &",
    "name" : "const android::SafeInterface::ParcelHandler &",
-   "referenced_type" : "type-1256",
-   "self_type" : "type-1675",
+   "referenced_type" : "type-1254",
+   "self_type" : "type-1680",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -17483,8 +17486,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-1248",
-   "self_type" : "type-1247",
+   "referenced_type" : "type-1251",
+   "self_type" : "type-1250",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -17492,8 +17495,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 &",
    "name" : "const android::String8 &",
-   "referenced_type" : "type-1875",
-   "self_type" : "type-1874",
+   "referenced_type" : "type-1879",
+   "self_type" : "type-1878",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -17510,8 +17513,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1385",
-   "self_type" : "type-1386",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1389",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -17546,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-4348",
-   "self_type" : "type-4570",
+   "referenced_type" : "type-4354",
+   "self_type" : "type-4576",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17555,8 +17558,8 @@
    "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-4582",
-   "self_type" : "type-4583",
+   "referenced_type" : "type-4588",
+   "self_type" : "type-4589",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17663,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-2619",
-   "self_type" : "type-2620",
+   "referenced_type" : "type-2622",
+   "self_type" : "type-2623",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17672,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-2617",
-   "self_type" : "type-2618",
+   "referenced_type" : "type-2620",
+   "self_type" : "type-2621",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17681,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-2613",
-   "self_type" : "type-2614",
+   "referenced_type" : "type-2616",
+   "self_type" : "type-2617",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17690,8 +17693,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-2409",
-   "self_type" : "type-2408",
+   "referenced_type" : "type-2412",
+   "self_type" : "type-2411",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -17699,8 +17702,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-4845",
-   "self_type" : "type-4844",
+   "referenced_type" : "type-4851",
+   "self_type" : "type-4850",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -17708,8 +17711,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-6709",
-   "self_type" : "type-6708",
+   "referenced_type" : "type-6718",
+   "self_type" : "type-6717",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -17717,8 +17720,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-8154",
-   "self_type" : "type-8156",
+   "referenced_type" : "type-8178",
+   "self_type" : "type-8180",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -17726,8 +17729,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-8989",
-   "self_type" : "type-8988",
+   "referenced_type" : "type-9016",
+   "self_type" : "type-9015",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -17735,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-1304",
-   "self_type" : "type-1486",
+   "referenced_type" : "type-1301",
+   "self_type" : "type-1489",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17753,8 +17756,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::AMessage> &",
    "name" : "const android::sp<android::AMessage> &",
-   "referenced_type" : "type-2175",
-   "self_type" : "type-2190",
+   "referenced_type" : "type-2174",
+   "self_type" : "type-2193",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17762,8 +17765,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::BpGraphicBufferProducer> &",
    "name" : "const android::sp<android::BpGraphicBufferProducer> &",
-   "referenced_type" : "type-4227",
-   "self_type" : "type-4232",
+   "referenced_type" : "type-4233",
+   "self_type" : "type-4238",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17771,8 +17774,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::BpProducerListener> &",
    "name" : "const android::sp<android::BpProducerListener> &",
-   "referenced_type" : "type-4516",
-   "self_type" : "type-4517",
+   "referenced_type" : "type-4522",
+   "self_type" : "type-4523",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17789,8 +17792,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::ComponentWrapper> &",
    "name" : "const android::sp<android::ComponentWrapper> &",
-   "referenced_type" : "type-2491",
-   "self_type" : "type-2492",
+   "referenced_type" : "type-2494",
+   "self_type" : "type-2495",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17798,8 +17801,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::Fence> &",
    "name" : "const android::sp<android::Fence> &",
-   "referenced_type" : "type-1863",
-   "self_type" : "type-1862",
+   "referenced_type" : "type-1867",
+   "self_type" : "type-1866",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17807,8 +17810,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::GraphicBuffer> &",
    "name" : "const android::sp<android::GraphicBuffer> &",
-   "referenced_type" : "type-1196",
-   "self_type" : "type-1859",
+   "referenced_type" : "type-1200",
+   "self_type" : "type-1864",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17825,8 +17828,8 @@
    "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",
+   "referenced_type" : "type-4270",
+   "self_type" : "type-4396",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17834,8 +17837,8 @@
    "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",
+   "referenced_type" : "type-4279",
+   "self_type" : "type-4397",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17843,8 +17846,8 @@
    "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",
+   "referenced_type" : "type-4832",
+   "self_type" : "type-4837",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17852,8 +17855,8 @@
    "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",
+   "referenced_type" : "type-7037",
+   "self_type" : "type-7043",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17861,8 +17864,8 @@
    "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",
+   "referenced_type" : "type-4306",
+   "self_type" : "type-4307",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17870,8 +17873,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IBinder> &",
    "name" : "const android::sp<android::IBinder> &",
-   "referenced_type" : "type-1036",
-   "self_type" : "type-1037",
+   "referenced_type" : "type-1040",
+   "self_type" : "type-1041",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17897,8 +17900,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer> &",
    "name" : "const android::sp<android::IGraphicBufferProducer> &",
-   "referenced_type" : "type-2485",
-   "self_type" : "type-2486",
+   "referenced_type" : "type-2488",
+   "self_type" : "type-2489",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17915,8 +17918,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::ITransactionCompletedListener> &",
    "name" : "const android::sp<android::ITransactionCompletedListener> &",
-   "referenced_type" : "type-1046",
-   "self_type" : "type-1047",
+   "referenced_type" : "type-1049",
+   "self_type" : "type-1050",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17933,8 +17936,8 @@
    "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",
+   "referenced_type" : "type-1392",
+   "self_type" : "type-1391",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -17942,8 +17945,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-2468",
-   "self_type" : "type-4222",
+   "referenced_type" : "type-2471",
+   "self_type" : "type-4228",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17951,8 +17954,8 @@
    "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-2458",
-   "self_type" : "type-4510",
+   "referenced_type" : "type-2461",
+   "self_type" : "type-4516",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17960,8 +17963,8 @@
    "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",
+   "referenced_type" : "type-4245",
+   "self_type" : "type-4250",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17969,8 +17972,8 @@
    "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",
+   "referenced_type" : "type-4476",
+   "self_type" : "type-4525",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17978,8 +17981,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-2482",
-   "self_type" : "type-4223",
+   "referenced_type" : "type-2485",
+   "self_type" : "type-4229",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17987,8 +17990,8 @@
    "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",
+   "referenced_type" : "type-2477",
+   "self_type" : "type-4519",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17996,8 +17999,8 @@
    "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",
+   "referenced_type" : "type-4239",
+   "self_type" : "type-4244",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18005,8 +18008,8 @@
    "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",
+   "referenced_type" : "type-4469",
+   "self_type" : "type-4524",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18050,8 +18053,8 @@
    "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",
+   "referenced_type" : "type-4296",
+   "self_type" : "type-4301",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18059,8 +18062,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::IBinder> &",
    "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "type-4280",
-   "self_type" : "type-4281",
+   "referenced_type" : "type-4286",
+   "self_type" : "type-4287",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18068,8 +18071,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android_cta861_3_metadata &",
    "name" : "const android_cta861_3_metadata &",
-   "referenced_type" : "type-1473",
-   "self_type" : "type-1474",
+   "referenced_type" : "type-1477",
+   "self_type" : "type-1478",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18086,8 +18089,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android_smpte2086_metadata &",
    "name" : "const android_smpte2086_metadata &",
-   "referenced_type" : "type-1471",
-   "self_type" : "type-1472",
+   "referenced_type" : "type-1474",
+   "self_type" : "type-1476",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18104,8 +18107,8 @@
    "alignment" : 4,
    "linker_set_key" : "const double &",
    "name" : "const double &",
-   "referenced_type" : "type-1077",
-   "self_type" : "type-1124",
+   "referenced_type" : "type-1080",
+   "self_type" : "type-1123",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18132,7 +18135,7 @@
    "linker_set_key" : "const int *&",
    "name" : "const int *&",
    "referenced_type" : "type-479",
-   "self_type" : "type-1511",
+   "self_type" : "type-1514",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18146,57 +18149,57 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1109",
-   "self_type" : "type-1111",
+   "referenced_type" : "type-1112",
+   "self_type" : "type-1114",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1281",
-   "self_type" : "type-1283",
+   "referenced_type" : "type-1284",
+   "self_type" : "type-1286",
    "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",
+   "referenced_type" : "type-3309",
+   "self_type" : "type-3311",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3538",
-   "self_type" : "type-3540",
+   "referenced_type" : "type-3541",
+   "self_type" : "type-3543",
    "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",
+   "referenced_type" : "type-3650",
+   "self_type" : "type-3652",
    "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",
+   "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-3832",
-   "self_type" : "type-3834",
+   "referenced_type" : "type-3838",
+   "self_type" : "type-3840",
    "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",
+   "referenced_type" : "type-4378",
+   "self_type" : "type-4380",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -18209,239 +18212,232 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-4501",
-   "self_type" : "type-4503",
+   "referenced_type" : "type-4507",
+   "self_type" : "type-4509",
    "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",
+   "referenced_type" : "type-4544",
+   "self_type" : "type-4546",
    "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",
+   "referenced_type" : "type-4569",
+   "self_type" : "type-4571",
    "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",
+   "referenced_type" : "type-4723",
+   "self_type" : "type-4725",
    "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",
+   "referenced_type" : "type-4853",
+   "self_type" : "type-4855",
    "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",
+   "referenced_type" : "type-5233",
+   "self_type" : "type-5235",
    "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",
+   "referenced_type" : "type-5465",
+   "self_type" : "type-5467",
    "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",
+   "referenced_type" : "type-5574",
+   "self_type" : "type-5576",
    "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",
+   "referenced_type" : "type-5640",
+   "self_type" : "type-5642",
    "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",
+   "referenced_type" : "type-5762",
+   "self_type" : "type-5764",
    "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",
+   "referenced_type" : "type-6278",
+   "self_type" : "type-6280",
    "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",
+   "referenced_type" : "type-6394",
+   "self_type" : "type-6396",
    "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",
+   "referenced_type" : "type-6431",
+   "self_type" : "type-6433",
    "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",
+   "referenced_type" : "type-6456",
+   "self_type" : "type-6458",
    "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",
+   "referenced_type" : "type-6599",
+   "self_type" : "type-6601",
    "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",
+   "referenced_type" : "type-6720",
+   "self_type" : "type-6722",
    "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",
+   "referenced_type" : "type-6747",
+   "self_type" : "type-6749",
    "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",
+   "referenced_type" : "type-6792",
+   "self_type" : "type-6794",
    "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",
+   "referenced_type" : "type-6881",
+   "self_type" : "type-6883",
    "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",
+   "referenced_type" : "type-6944",
+   "self_type" : "type-6946",
    "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",
+   "referenced_type" : "type-7059",
+   "self_type" : "type-7061",
    "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",
+   "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-7284",
-   "self_type" : "type-7286",
+   "referenced_type" : "type-7304",
+   "self_type" : "type-7306",
    "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",
+   "referenced_type" : "type-7357",
+   "self_type" : "type-7359",
    "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",
+   "referenced_type" : "type-7564",
+   "self_type" : "type-7566",
    "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",
+   "referenced_type" : "type-7796",
+   "self_type" : "type-7798",
    "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",
+   "referenced_type" : "type-7905",
+   "self_type" : "type-7907",
    "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",
+   "referenced_type" : "type-7971",
+   "self_type" : "type-7973",
    "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",
+   "referenced_type" : "type-8093",
+   "self_type" : "type-8095",
    "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",
+   "referenced_type" : "type-8249",
+   "self_type" : "type-8254",
    "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",
+   "referenced_type" : "type-8385",
+   "self_type" : "type-8387",
    "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",
+   "referenced_type" : "type-8481",
+   "self_type" : "type-8483",
    "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",
+   "referenced_type" : "type-8528",
+   "self_type" : "type-8532",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -18454,79 +18450,86 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-9131",
-   "self_type" : "type-9133",
+   "referenced_type" : "type-8620",
+   "self_type" : "type-8622",
    "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",
+   "referenced_type" : "type-9159",
+   "self_type" : "type-9161",
    "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",
+   "referenced_type" : "type-9293",
+   "self_type" : "type-9296",
    "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",
+   "referenced_type" : "type-9346",
+   "self_type" : "type-9348",
    "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",
+   "referenced_type" : "type-9382",
+   "self_type" : "type-9384",
    "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",
+   "referenced_type" : "type-9531",
+   "self_type" : "type-9533",
    "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",
+   "referenced_type" : "type-9631",
+   "self_type" : "type-9633",
    "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",
+   "referenced_type" : "type-9669",
+   "self_type" : "type-9671",
    "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",
+   "referenced_type" : "type-9720",
+   "self_type" : "type-9722",
    "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",
+   "referenced_type" : "type-9800",
+   "self_type" : "type-9802",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-9865",
+   "self_type" : "type-9867",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const log_msg &",
    "name" : "const log_msg &",
-   "referenced_type" : "type-2313",
-   "self_type" : "type-2331",
+   "referenced_type" : "type-2316",
+   "self_type" : "type-2334",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -18561,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-2643",
-   "self_type" : "type-2646",
+   "referenced_type" : "type-2646",
+   "self_type" : "type-2649",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18570,8 +18573,8 @@
    "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",
+   "referenced_type" : "type-4993",
+   "self_type" : "type-4995",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18579,8 +18582,8 @@
    "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",
+   "referenced_type" : "type-7198",
+   "self_type" : "type-7200",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18588,8 +18591,8 @@
    "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",
+   "referenced_type" : "type-8221",
+   "self_type" : "type-8223",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18597,8 +18600,8 @@
    "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",
+   "referenced_type" : "type-9708",
+   "self_type" : "type-9716",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18606,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-2639",
-   "self_type" : "type-2641",
+   "referenced_type" : "type-2642",
+   "self_type" : "type-2644",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18615,8 +18618,8 @@
    "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",
+   "referenced_type" : "type-4989",
+   "self_type" : "type-4991",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18624,8 +18627,8 @@
    "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",
+   "referenced_type" : "type-7194",
+   "self_type" : "type-7196",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18633,8 +18636,8 @@
    "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",
+   "referenced_type" : "type-8216",
+   "self_type" : "type-8218",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18642,8 +18645,8 @@
    "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",
+   "referenced_type" : "type-9696",
+   "self_type" : "type-9704",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18651,8 +18654,8 @@
    "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",
+   "referenced_type" : "type-1646",
+   "self_type" : "type-1648",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -18660,8 +18663,8 @@
    "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",
+   "referenced_type" : "type-4111",
+   "self_type" : "type-4113",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -18669,8 +18672,8 @@
    "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",
+   "referenced_type" : "type-6035",
+   "self_type" : "type-6037",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -18678,8 +18681,8 @@
    "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",
+   "referenced_type" : "type-8880",
+   "self_type" : "type-8882",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -18696,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-1107",
-   "self_type" : "type-1106",
+   "referenced_type" : "type-1110",
+   "self_type" : "type-1109",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18705,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-1279",
-   "self_type" : "type-1278",
+   "referenced_type" : "type-1282",
+   "self_type" : "type-1281",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18714,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-3271",
-   "self_type" : "type-3270",
+   "referenced_type" : "type-3274",
+   "self_type" : "type-3273",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18723,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-3535",
-   "self_type" : "type-3534",
+   "referenced_type" : "type-3538",
+   "self_type" : "type-3537",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18732,8 +18735,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-3645",
-   "self_type" : "type-3644",
+   "referenced_type" : "type-3648",
+   "self_type" : "type-3647",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18741,8 +18744,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-3708",
-   "self_type" : "type-3707",
+   "referenced_type" : "type-3714",
+   "self_type" : "type-3713",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18750,8 +18753,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-3830",
-   "self_type" : "type-3829",
+   "referenced_type" : "type-3836",
+   "self_type" : "type-3835",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18768,8 +18771,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-4351",
-   "self_type" : "type-4350",
+   "referenced_type" : "type-4357",
+   "self_type" : "type-4356",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18777,8 +18780,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-4486",
-   "self_type" : "type-4485",
+   "referenced_type" : "type-4492",
+   "self_type" : "type-4491",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18786,8 +18789,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-4555",
-   "self_type" : "type-4554",
+   "referenced_type" : "type-4561",
+   "self_type" : "type-4560",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18795,8 +18798,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-4619",
-   "self_type" : "type-4618",
+   "referenced_type" : "type-4623",
+   "self_type" : "type-4622",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18804,8 +18807,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-4659",
-   "self_type" : "type-4658",
+   "referenced_type" : "type-4666",
+   "self_type" : "type-4665",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18813,8 +18816,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-4867",
-   "self_type" : "type-4866",
+   "referenced_type" : "type-4873",
+   "self_type" : "type-4872",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18822,8 +18825,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-5192",
-   "self_type" : "type-5191",
+   "referenced_type" : "type-5198",
+   "self_type" : "type-5197",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18831,8 +18834,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-5456",
-   "self_type" : "type-5455",
+   "referenced_type" : "type-5462",
+   "self_type" : "type-5461",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18840,8 +18843,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-5566",
-   "self_type" : "type-5565",
+   "referenced_type" : "type-5572",
+   "self_type" : "type-5571",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18849,8 +18852,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-5629",
-   "self_type" : "type-5628",
+   "referenced_type" : "type-5638",
+   "self_type" : "type-5637",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18858,8 +18861,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-5751",
-   "self_type" : "type-5750",
+   "referenced_type" : "type-5760",
+   "self_type" : "type-5759",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18867,8 +18870,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-6251",
-   "self_type" : "type-6250",
+   "referenced_type" : "type-6260",
+   "self_type" : "type-6259",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18876,8 +18879,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-6372",
-   "self_type" : "type-6371",
+   "referenced_type" : "type-6381",
+   "self_type" : "type-6380",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18885,8 +18888,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-6439",
-   "self_type" : "type-6438",
+   "referenced_type" : "type-6448",
+   "self_type" : "type-6447",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18894,8 +18897,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-6503",
-   "self_type" : "type-6502",
+   "referenced_type" : "type-6510",
+   "self_type" : "type-6509",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18903,8 +18906,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-6541",
-   "self_type" : "type-6540",
+   "referenced_type" : "type-6551",
+   "self_type" : "type-6550",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18912,8 +18915,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-6731",
-   "self_type" : "type-6730",
+   "referenced_type" : "type-6740",
+   "self_type" : "type-6739",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18921,8 +18924,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-6750",
-   "self_type" : "type-6749",
+   "referenced_type" : "type-6759",
+   "self_type" : "type-6758",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18930,8 +18933,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-6755",
-   "self_type" : "type-6754",
+   "referenced_type" : "type-6765",
+   "self_type" : "type-6764",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18939,8 +18942,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-6887",
-   "self_type" : "type-6886",
+   "referenced_type" : "type-6897",
+   "self_type" : "type-6896",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18948,8 +18951,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-6899",
-   "self_type" : "type-6898",
+   "referenced_type" : "type-6907",
+   "self_type" : "type-6906",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18957,8 +18960,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-7078",
-   "self_type" : "type-7077",
+   "referenced_type" : "type-7086",
+   "self_type" : "type-7085",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18966,8 +18969,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-7107",
-   "self_type" : "type-7106",
+   "referenced_type" : "type-7116",
+   "self_type" : "type-7115",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18975,8 +18978,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-7303",
-   "self_type" : "type-7302",
+   "referenced_type" : "type-7323",
+   "self_type" : "type-7322",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18984,8 +18987,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-7332",
-   "self_type" : "type-7331",
+   "referenced_type" : "type-7353",
+   "self_type" : "type-7352",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18993,8 +18996,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-7508",
-   "self_type" : "type-7507",
+   "referenced_type" : "type-7529",
+   "self_type" : "type-7528",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19002,8 +19005,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-7772",
-   "self_type" : "type-7771",
+   "referenced_type" : "type-7793",
+   "self_type" : "type-7792",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19011,8 +19014,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-7882",
-   "self_type" : "type-7881",
+   "referenced_type" : "type-7903",
+   "self_type" : "type-7902",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19020,8 +19023,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-7945",
-   "self_type" : "type-7944",
+   "referenced_type" : "type-7969",
+   "self_type" : "type-7968",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19029,8 +19032,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-8067",
-   "self_type" : "type-8066",
+   "referenced_type" : "type-8091",
+   "self_type" : "type-8090",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19038,8 +19041,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-8222",
-   "self_type" : "type-8221",
+   "referenced_type" : "type-8246",
+   "self_type" : "type-8245",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19047,8 +19050,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-8359",
-   "self_type" : "type-8358",
+   "referenced_type" : "type-8383",
+   "self_type" : "type-8382",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19056,8 +19059,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-8455",
-   "self_type" : "type-8454",
+   "referenced_type" : "type-8479",
+   "self_type" : "type-8478",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19065,8 +19068,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-8499",
-   "self_type" : "type-8498",
+   "referenced_type" : "type-8526",
+   "self_type" : "type-8525",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19083,8 +19086,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-8591",
-   "self_type" : "type-8590",
+   "referenced_type" : "type-8618",
+   "self_type" : "type-8617",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19092,8 +19095,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-9111",
-   "self_type" : "type-9110",
+   "referenced_type" : "type-9139",
+   "self_type" : "type-9138",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19101,8 +19104,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-9250",
-   "self_type" : "type-9249",
+   "referenced_type" : "type-9277",
+   "self_type" : "type-9276",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19110,8 +19113,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-9338",
-   "self_type" : "type-9337",
+   "referenced_type" : "type-9366",
+   "self_type" : "type-9365",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19119,8 +19122,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-9421",
-   "self_type" : "type-9420",
+   "referenced_type" : "type-9447",
+   "self_type" : "type-9446",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19128,8 +19131,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-9464",
-   "self_type" : "type-9463",
+   "referenced_type" : "type-9492",
+   "self_type" : "type-9491",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19137,8 +19140,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-9630",
-   "self_type" : "type-9629",
+   "referenced_type" : "type-9660",
+   "self_type" : "type-9659",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19146,8 +19149,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-9658",
-   "self_type" : "type-9657",
+   "referenced_type" : "type-9685",
+   "self_type" : "type-9684",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19155,8 +19158,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-9663",
-   "self_type" : "type-9662",
+   "referenced_type" : "type-9690",
+   "self_type" : "type-9689",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19164,8 +19167,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-9787",
-   "self_type" : "type-9786",
+   "referenced_type" : "type-9816",
+   "self_type" : "type-9815",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19173,8 +19176,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-9799",
-   "self_type" : "type-9798",
+   "referenced_type" : "type-9827",
+   "self_type" : "type-9826",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19182,8 +19185,8 @@
    "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",
+   "referenced_type" : "type-4382",
+   "self_type" : "type-4384",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19191,8 +19194,8 @@
    "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",
+   "referenced_type" : "type-4510",
+   "self_type" : "type-4512",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19200,8 +19203,8 @@
    "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",
+   "referenced_type" : "type-6282",
+   "self_type" : "type-6284",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19209,8 +19212,8 @@
    "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",
+   "referenced_type" : "type-6397",
+   "self_type" : "type-6399",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19218,8 +19221,8 @@
    "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",
+   "referenced_type" : "type-9163",
+   "self_type" : "type-9165",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19227,8 +19230,8 @@
    "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",
+   "referenced_type" : "type-9297",
+   "self_type" : "type-9299",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19263,8 +19266,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
-   "referenced_type" : "type-2520",
-   "self_type" : "type-2615",
+   "referenced_type" : "type-2523",
+   "self_type" : "type-2618",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19290,8 +19293,8 @@
    "alignment" : 4,
    "linker_set_key" : "int *&",
    "name" : "int *&",
-   "referenced_type" : "type-1509",
-   "self_type" : "type-1508",
+   "referenced_type" : "type-1512",
+   "self_type" : "type-1511",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -19300,7 +19303,7 @@
    "linker_set_key" : "long long &",
    "name" : "long long &",
    "referenced_type" : "type-169",
-   "self_type" : "type-1429",
+   "self_type" : "type-1432",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -19308,8 +19311,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-4758",
-   "self_type" : "type-4757",
+   "referenced_type" : "type-4765",
+   "self_type" : "type-4764",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -19317,8 +19320,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-4862",
-   "self_type" : "type-4861",
+   "referenced_type" : "type-4868",
+   "self_type" : "type-4867",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -19326,8 +19329,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-6624",
-   "self_type" : "type-6623",
+   "referenced_type" : "type-6634",
+   "self_type" : "type-6633",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -19335,8 +19338,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-6726",
-   "self_type" : "type-6725",
+   "referenced_type" : "type-6735",
+   "self_type" : "type-6734",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -19344,8 +19347,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-6848",
-   "self_type" : "type-6847",
+   "referenced_type" : "type-6858",
+   "self_type" : "type-6857",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -19353,8 +19356,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-6995",
-   "self_type" : "type-6994",
+   "referenced_type" : "type-7004",
+   "self_type" : "type-7003",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -19362,8 +19365,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-7071",
-   "self_type" : "type-7070",
+   "referenced_type" : "type-7081",
+   "self_type" : "type-7080",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -19371,8 +19374,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-7245",
-   "self_type" : "type-7244",
+   "referenced_type" : "type-7267",
+   "self_type" : "type-7266",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -19380,8 +19383,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-7298",
-   "self_type" : "type-7297",
+   "referenced_type" : "type-7318",
+   "self_type" : "type-7317",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -19389,8 +19392,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-9532",
-   "self_type" : "type-9531",
+   "referenced_type" : "type-9559",
+   "self_type" : "type-9558",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -19398,8 +19401,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-9625",
-   "self_type" : "type-9624",
+   "referenced_type" : "type-9652",
+   "self_type" : "type-9651",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -19407,8 +19410,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-9749",
-   "self_type" : "type-9748",
+   "referenced_type" : "type-9778",
+   "self_type" : "type-9777",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -19425,8 +19428,8 @@
    "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",
+   "referenced_type" : "type-3186",
+   "self_type" : "type-3185",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -19434,8 +19437,8 @@
    "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",
+   "referenced_type" : "type-5110",
+   "self_type" : "type-5109",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -19443,8 +19446,8 @@
    "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",
+   "referenced_type" : "type-7441",
+   "self_type" : "type-7440",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -19452,8 +19455,8 @@
    "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",
+   "referenced_type" : "type-8237",
+   "self_type" : "type-8236",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -19461,8 +19464,8 @@
    "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",
+   "referenced_type" : "type-1652",
+   "self_type" : "type-1886",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -19470,8 +19473,8 @@
    "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",
+   "referenced_type" : "type-4116",
+   "self_type" : "type-4142",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -19479,8 +19482,8 @@
    "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",
+   "referenced_type" : "type-6040",
+   "self_type" : "type-6066",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -19488,8 +19491,8 @@
    "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",
+   "referenced_type" : "type-8885",
+   "self_type" : "type-8917",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -19498,7 +19501,7 @@
    "linker_set_key" : "unsigned char &",
    "name" : "unsigned char &",
    "referenced_type" : "type-90",
-   "self_type" : "type-1428",
+   "self_type" : "type-1431",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -19525,7 +19528,7 @@
    "linker_set_key" : "unsigned long long *&",
    "name" : "unsigned long long *&",
    "referenced_type" : "type-91",
-   "self_type" : "type-1871",
+   "self_type" : "type-1875",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -19534,7 +19537,7 @@
    "linker_set_key" : "unsigned short &",
    "name" : "unsigned short &",
    "referenced_type" : "type-497",
-   "self_type" : "type-1427",
+   "self_type" : "type-1430",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -19542,8 +19545,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-1444",
-   "self_type" : "type-1443",
+   "referenced_type" : "type-1447",
+   "self_type" : "type-1446",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -19551,8 +19554,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-3976",
-   "self_type" : "type-3975",
+   "referenced_type" : "type-3982",
+   "self_type" : "type-3981",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -19560,8 +19563,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-5897",
-   "self_type" : "type-5896",
+   "referenced_type" : "type-5906",
+   "self_type" : "type-5905",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -19578,8 +19581,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-8727",
-   "self_type" : "type-8726",
+   "referenced_type" : "type-8754",
+   "self_type" : "type-8753",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   }
@@ -19590,8 +19593,8 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-2402",
-   "self_type" : "type-2401",
+   "referenced_type" : "type-2405",
+   "self_type" : "type-2404",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -19599,8 +19602,8 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-4833",
-   "self_type" : "type-4832",
+   "referenced_type" : "type-4839",
+   "self_type" : "type-4838",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -19608,8 +19611,8 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-6697",
-   "self_type" : "type-6696",
+   "referenced_type" : "type-6706",
+   "self_type" : "type-6705",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -19617,8 +19620,8 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-8151",
-   "self_type" : "type-8150",
+   "referenced_type" : "type-8175",
+   "self_type" : "type-8174",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -19626,8 +19629,8 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-8984",
-   "self_type" : "type-8983",
+   "referenced_type" : "type-9011",
+   "self_type" : "type-9010",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -19644,8 +19647,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1142",
-   "self_type" : "type-1141",
+   "referenced_type" : "type-1137",
+   "self_type" : "type-1136",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19653,8 +19656,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1165",
-   "self_type" : "type-1164",
+   "referenced_type" : "type-1170",
+   "self_type" : "type-1169",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19662,8 +19665,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1350",
-   "self_type" : "type-1349",
+   "referenced_type" : "type-1353",
+   "self_type" : "type-1352",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19671,8 +19674,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1407",
-   "self_type" : "type-1406",
+   "referenced_type" : "type-1410",
+   "self_type" : "type-1409",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19680,8 +19683,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1423",
-   "self_type" : "type-1422",
+   "referenced_type" : "type-1426",
+   "self_type" : "type-1425",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19689,8 +19692,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1439",
-   "self_type" : "type-1438",
+   "referenced_type" : "type-1442",
+   "self_type" : "type-1441",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19698,8 +19701,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1505",
-   "self_type" : "type-1504",
+   "referenced_type" : "type-1508",
+   "self_type" : "type-1507",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19707,8 +19710,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1632",
-   "self_type" : "type-1631",
+   "referenced_type" : "type-1637",
+   "self_type" : "type-1636",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19716,8 +19719,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2612",
-   "self_type" : "type-2611",
+   "referenced_type" : "type-2615",
+   "self_type" : "type-2614",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19725,8 +19728,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3478",
-   "self_type" : "type-3477",
+   "referenced_type" : "type-3481",
+   "self_type" : "type-3480",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19734,8 +19737,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3579",
-   "self_type" : "type-3578",
+   "referenced_type" : "type-3578",
+   "self_type" : "type-3577",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19743,8 +19746,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3655",
-   "self_type" : "type-3654",
+   "referenced_type" : "type-3658",
+   "self_type" : "type-3657",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19752,8 +19755,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3745",
-   "self_type" : "type-3744",
+   "referenced_type" : "type-3743",
+   "self_type" : "type-3742",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19761,8 +19764,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3770",
-   "self_type" : "type-3769",
+   "referenced_type" : "type-3777",
+   "self_type" : "type-3776",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19770,8 +19773,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3904",
-   "self_type" : "type-3903",
+   "referenced_type" : "type-3910",
+   "self_type" : "type-3909",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19779,8 +19782,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3935",
-   "self_type" : "type-3934",
+   "referenced_type" : "type-3941",
+   "self_type" : "type-3940",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19788,8 +19791,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3951",
-   "self_type" : "type-3950",
+   "referenced_type" : "type-3957",
+   "self_type" : "type-3956",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19797,8 +19800,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3971",
-   "self_type" : "type-3970",
+   "referenced_type" : "type-3977",
+   "self_type" : "type-3976",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19806,8 +19809,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4019",
-   "self_type" : "type-4018",
+   "referenced_type" : "type-4026",
+   "self_type" : "type-4025",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19815,8 +19818,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4097",
-   "self_type" : "type-4096",
+   "referenced_type" : "type-4103",
+   "self_type" : "type-4102",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19824,8 +19827,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4299",
-   "self_type" : "type-4298",
+   "referenced_type" : "type-4305",
+   "self_type" : "type-4304",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19833,8 +19836,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4472",
-   "self_type" : "type-4471",
+   "referenced_type" : "type-4478",
+   "self_type" : "type-4477",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19842,8 +19845,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4525",
-   "self_type" : "type-4524",
+   "referenced_type" : "type-4531",
+   "self_type" : "type-4530",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19851,8 +19854,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4551",
-   "self_type" : "type-4550",
+   "referenced_type" : "type-4557",
+   "self_type" : "type-4556",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19860,8 +19863,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4578",
-   "self_type" : "type-4577",
+   "referenced_type" : "type-4584",
+   "self_type" : "type-4583",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19869,8 +19872,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4745",
-   "self_type" : "type-4744",
+   "referenced_type" : "type-4752",
+   "self_type" : "type-4751",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19878,8 +19881,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4855",
-   "self_type" : "type-4854",
+   "referenced_type" : "type-4861",
+   "self_type" : "type-4860",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19887,8 +19890,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4967",
-   "self_type" : "type-4966",
+   "referenced_type" : "type-4973",
+   "self_type" : "type-4972",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19896,8 +19899,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5399",
-   "self_type" : "type-5398",
+   "referenced_type" : "type-5405",
+   "self_type" : "type-5404",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19905,8 +19908,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5500",
-   "self_type" : "type-5499",
+   "referenced_type" : "type-5502",
+   "self_type" : "type-5501",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19914,8 +19917,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5576",
-   "self_type" : "type-5575",
+   "referenced_type" : "type-5582",
+   "self_type" : "type-5581",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19923,8 +19926,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5666",
-   "self_type" : "type-5665",
+   "referenced_type" : "type-5667",
+   "self_type" : "type-5666",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19932,8 +19935,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5691",
-   "self_type" : "type-5690",
+   "referenced_type" : "type-5701",
+   "self_type" : "type-5700",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19941,8 +19944,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5825",
-   "self_type" : "type-5824",
+   "referenced_type" : "type-5834",
+   "self_type" : "type-5833",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19950,8 +19953,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5856",
-   "self_type" : "type-5855",
+   "referenced_type" : "type-5865",
+   "self_type" : "type-5864",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19959,8 +19962,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5872",
-   "self_type" : "type-5871",
+   "referenced_type" : "type-5881",
+   "self_type" : "type-5880",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19968,8 +19971,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5892",
-   "self_type" : "type-5891",
+   "referenced_type" : "type-5901",
+   "self_type" : "type-5900",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19977,8 +19980,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5940",
-   "self_type" : "type-5939",
+   "referenced_type" : "type-5950",
+   "self_type" : "type-5949",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19986,8 +19989,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6018",
-   "self_type" : "type-6017",
+   "referenced_type" : "type-6027",
+   "self_type" : "type-6026",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19995,8 +19998,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6208",
-   "self_type" : "type-6207",
+   "referenced_type" : "type-6217",
+   "self_type" : "type-6216",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20004,8 +20007,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6361",
-   "self_type" : "type-6360",
+   "referenced_type" : "type-6370",
+   "self_type" : "type-6369",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20013,8 +20016,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6409",
-   "self_type" : "type-6408",
+   "referenced_type" : "type-6418",
+   "self_type" : "type-6417",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20022,8 +20025,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6435",
-   "self_type" : "type-6434",
+   "referenced_type" : "type-6444",
+   "self_type" : "type-6443",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20031,8 +20034,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6462",
-   "self_type" : "type-6461",
+   "referenced_type" : "type-6471",
+   "self_type" : "type-6470",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20040,8 +20043,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6613",
-   "self_type" : "type-6612",
+   "referenced_type" : "type-6623",
+   "self_type" : "type-6622",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20049,8 +20052,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6719",
-   "self_type" : "type-6718",
+   "referenced_type" : "type-6728",
+   "self_type" : "type-6727",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20058,8 +20061,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6746",
-   "self_type" : "type-6745",
+   "referenced_type" : "type-6755",
+   "self_type" : "type-6754",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20067,8 +20070,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6846",
-   "self_type" : "type-6845",
+   "referenced_type" : "type-6856",
+   "self_type" : "type-6855",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20076,8 +20079,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6882",
-   "self_type" : "type-6881",
+   "referenced_type" : "type-6892",
+   "self_type" : "type-6891",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20085,8 +20088,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7003",
-   "self_type" : "type-7002",
+   "referenced_type" : "type-7011",
+   "self_type" : "type-7010",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20094,8 +20097,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7062",
-   "self_type" : "type-7061",
+   "referenced_type" : "type-7071",
+   "self_type" : "type-7070",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20103,8 +20106,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7162",
-   "self_type" : "type-7161",
+   "referenced_type" : "type-7171",
+   "self_type" : "type-7170",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20112,8 +20115,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7169",
-   "self_type" : "type-7168",
+   "referenced_type" : "type-7178",
+   "self_type" : "type-7177",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20121,8 +20124,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7253",
-   "self_type" : "type-7252",
+   "referenced_type" : "type-7273",
+   "self_type" : "type-7272",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20130,8 +20133,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7292",
-   "self_type" : "type-7291",
+   "referenced_type" : "type-7312",
+   "self_type" : "type-7311",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20139,8 +20142,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7396",
-   "self_type" : "type-7395",
+   "referenced_type" : "type-7419",
+   "self_type" : "type-7418",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20157,8 +20160,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7715",
-   "self_type" : "type-7714",
+   "referenced_type" : "type-7736",
+   "self_type" : "type-7735",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20166,8 +20169,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7816",
-   "self_type" : "type-7815",
+   "referenced_type" : "type-7833",
+   "self_type" : "type-7832",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20175,8 +20178,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7892",
-   "self_type" : "type-7891",
+   "referenced_type" : "type-7913",
+   "self_type" : "type-7912",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20184,8 +20187,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7982",
-   "self_type" : "type-7981",
+   "referenced_type" : "type-7998",
+   "self_type" : "type-7997",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20193,8 +20196,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-8007",
-   "self_type" : "type-8006",
+   "referenced_type" : "type-8032",
+   "self_type" : "type-8031",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20202,8 +20205,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-8190",
-   "self_type" : "type-8189",
+   "referenced_type" : "type-8215",
+   "self_type" : "type-8214",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20211,8 +20214,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-8314",
-   "self_type" : "type-8313",
+   "referenced_type" : "type-8338",
+   "self_type" : "type-8337",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20220,8 +20223,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-8402",
-   "self_type" : "type-8401",
+   "referenced_type" : "type-8422",
+   "self_type" : "type-8421",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20229,8 +20232,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-8465",
-   "self_type" : "type-8464",
+   "referenced_type" : "type-8489",
+   "self_type" : "type-8488",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20238,8 +20241,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-8537",
-   "self_type" : "type-8536",
+   "referenced_type" : "type-8556",
+   "self_type" : "type-8555",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20247,8 +20250,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-8559",
-   "self_type" : "type-8558",
+   "referenced_type" : "type-8586",
+   "self_type" : "type-8585",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20256,8 +20259,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-8658",
-   "self_type" : "type-8657",
+   "referenced_type" : "type-8685",
+   "self_type" : "type-8684",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20265,8 +20268,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-8689",
-   "self_type" : "type-8688",
+   "referenced_type" : "type-8717",
+   "self_type" : "type-8716",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20274,8 +20277,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-8706",
-   "self_type" : "type-8705",
+   "referenced_type" : "type-8733",
+   "self_type" : "type-8732",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20283,8 +20286,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-8722",
-   "self_type" : "type-8721",
+   "referenced_type" : "type-8749",
+   "self_type" : "type-8748",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20292,8 +20295,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-8769",
-   "self_type" : "type-8768",
+   "referenced_type" : "type-8796",
+   "self_type" : "type-8795",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20301,8 +20304,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-8846",
-   "self_type" : "type-8845",
+   "referenced_type" : "type-8873",
+   "self_type" : "type-8872",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20310,8 +20313,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-9065",
-   "self_type" : "type-9064",
+   "referenced_type" : "type-904",
+   "self_type" : "type-903",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20319,8 +20322,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-908",
-   "self_type" : "type-907",
+   "referenced_type" : "type-9092",
+   "self_type" : "type-9091",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20328,8 +20331,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-9233",
-   "self_type" : "type-9232",
+   "referenced_type" : "type-9261",
+   "self_type" : "type-9260",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20337,8 +20340,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-9296",
-   "self_type" : "type-9295",
+   "referenced_type" : "type-9325",
+   "self_type" : "type-9324",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20346,8 +20349,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-9331",
-   "self_type" : "type-9330",
+   "referenced_type" : "type-9360",
+   "self_type" : "type-9359",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20355,8 +20358,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-9375",
-   "self_type" : "type-9374",
+   "referenced_type" : "type-9402",
+   "self_type" : "type-9401",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20364,8 +20367,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-9522",
-   "self_type" : "type-9521",
+   "referenced_type" : "type-9549",
+   "self_type" : "type-9548",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20373,8 +20376,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-9615",
-   "self_type" : "type-9614",
+   "referenced_type" : "type-9640",
+   "self_type" : "type-9639",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20382,8 +20385,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-9617",
-   "self_type" : "type-9616",
+   "referenced_type" : "type-9644",
+   "self_type" : "type-9643",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20391,8 +20394,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-9653",
-   "self_type" : "type-9652",
+   "referenced_type" : "type-9681",
+   "self_type" : "type-9680",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20400,8 +20403,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-9747",
-   "self_type" : "type-9746",
+   "referenced_type" : "type-9776",
+   "self_type" : "type-9775",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20409,8 +20412,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-9782",
-   "self_type" : "type-9781",
+   "referenced_type" : "type-9809",
+   "self_type" : "type-9808",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20418,8 +20421,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE *",
    "name" : "OMX_BUFFERHEADERTYPE *",
-   "referenced_type" : "type-1540",
-   "self_type" : "type-1595",
+   "referenced_type" : "type-1536",
+   "self_type" : "type-1598",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -20427,8 +20430,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE **",
    "name" : "OMX_BUFFERHEADERTYPE **",
-   "referenced_type" : "type-1595",
-   "self_type" : "type-2376",
+   "referenced_type" : "type-1598",
+   "self_type" : "type-2379",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -20436,8 +20439,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_CALLBACKTYPE *",
    "name" : "OMX_CALLBACKTYPE *",
-   "referenced_type" : "type-1590",
-   "self_type" : "type-2385",
+   "referenced_type" : "type-1593",
+   "self_type" : "type-2388",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -20445,8 +20448,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *)",
    "name" : "OMX_ERRORTYPE (*)(void *)",
-   "referenced_type" : "type-1501",
-   "self_type" : "type-1500",
+   "referenced_type" : "type-1500",
+   "self_type" : "type-1499",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -20454,8 +20457,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-2382",
-   "self_type" : "type-2381",
+   "referenced_type" : "type-2385",
+   "self_type" : "type-2384",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -20463,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-2378",
-   "self_type" : "type-2377",
+   "referenced_type" : "type-2381",
+   "self_type" : "type-2380",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -20472,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-2375",
-   "self_type" : "type-2374",
+   "referenced_type" : "type-2378",
+   "self_type" : "type-2377",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -20481,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-2387",
-   "self_type" : "type-2386",
+   "referenced_type" : "type-2390",
+   "self_type" : "type-2389",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -20490,8 +20493,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
-   "referenced_type" : "type-2384",
-   "self_type" : "type-2383",
+   "referenced_type" : "type-2387",
+   "self_type" : "type-2386",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -20499,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-2362",
-   "self_type" : "type-2361",
+   "referenced_type" : "type-2365",
+   "self_type" : "type-2364",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -20508,8 +20511,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
-   "referenced_type" : "type-2364",
-   "self_type" : "type-2363",
+   "referenced_type" : "type-2367",
+   "self_type" : "type-2366",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -20517,51 +20520,6 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
-   "referenced_type" : "type-2369",
-   "self_type" : "type-2368",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, char *, OMX_INDEXTYPE *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, char *, OMX_INDEXTYPE *)",
-   "referenced_type" : "type-2366",
-   "self_type" : "type-2365",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-2358",
-   "self_type" : "type-2357",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, unsigned char *, unsigned int)",
-   "name" : "OMX_ERRORTYPE (*)(void *, unsigned char *, unsigned int)",
-   "referenced_type" : "type-2389",
-   "self_type" : "type-2388",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, unsigned int, OMX_BUFFERHEADERTYPE *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, unsigned int, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-2380",
-   "self_type" : "type-2379",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-2372",
    "self_type" : "type-2371",
    "size" : 4,
@@ -20569,10 +20527,55 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, char *, OMX_INDEXTYPE *)",
+   "name" : "OMX_ERRORTYPE (*)(void *, char *, OMX_INDEXTYPE *)",
+   "referenced_type" : "type-2369",
+   "self_type" : "type-2368",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "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-2361",
+   "self_type" : "type-2360",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, unsigned char *, unsigned int)",
+   "name" : "OMX_ERRORTYPE (*)(void *, unsigned char *, unsigned int)",
+   "referenced_type" : "type-2392",
+   "self_type" : "type-2391",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, unsigned int, OMX_BUFFERHEADERTYPE *)",
+   "name" : "OMX_ERRORTYPE (*)(void *, unsigned int, OMX_BUFFERHEADERTYPE *)",
+   "referenced_type" : "type-2383",
+   "self_type" : "type-2382",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "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-2375",
+   "self_type" : "type-2374",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, void *, OMX_BUFFERHEADERTYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, void *, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-1594",
-   "self_type" : "type-1593",
+   "referenced_type" : "type-1597",
+   "self_type" : "type-1596",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -20580,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-1592",
-   "self_type" : "type-1591",
+   "referenced_type" : "type-1595",
+   "self_type" : "type-1594",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -20590,7 +20593,7 @@
    "linker_set_key" : "OMX_INDEXTYPE *",
    "name" : "OMX_INDEXTYPE *",
    "referenced_type" : "type-1484",
-   "self_type" : "type-2367",
+   "self_type" : "type-2370",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -20598,8 +20601,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_STATETYPE *",
    "name" : "OMX_STATETYPE *",
-   "referenced_type" : "type-1488",
-   "self_type" : "type-2370",
+   "referenced_type" : "type-1490",
+   "self_type" : "type-2373",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -20607,8 +20610,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_TUNNELSETUPTYPE *",
    "name" : "OMX_TUNNELSETUPTYPE *",
-   "referenced_type" : "type-1612",
-   "self_type" : "type-2373",
+   "referenced_type" : "type-1613",
+   "self_type" : "type-2376",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -20616,8 +20619,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_VERSIONTYPE *",
    "name" : "OMX_VERSIONTYPE *",
-   "referenced_type" : "type-1478",
-   "self_type" : "type-2359",
+   "referenced_type" : "type-1481",
+   "self_type" : "type-2362",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -20634,8 +20637,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1115",
-   "self_type" : "type-1114",
+   "referenced_type" : "type-1118",
+   "self_type" : "type-1117",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20643,8 +20646,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1335",
-   "self_type" : "type-1334",
+   "referenced_type" : "type-1338",
+   "self_type" : "type-1337",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20652,8 +20655,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1402",
-   "self_type" : "type-1401",
+   "referenced_type" : "type-1405",
+   "self_type" : "type-1404",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20661,8 +20664,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1418",
-   "self_type" : "type-1417",
+   "referenced_type" : "type-1421",
+   "self_type" : "type-1420",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20670,8 +20673,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1435",
-   "self_type" : "type-1434",
+   "referenced_type" : "type-1438",
+   "self_type" : "type-1437",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20679,8 +20682,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1437",
-   "self_type" : "type-1436",
+   "referenced_type" : "type-1440",
+   "self_type" : "type-1439",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20688,8 +20691,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1503",
-   "self_type" : "type-1502",
+   "referenced_type" : "type-1506",
+   "self_type" : "type-1505",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20697,8 +20700,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1630",
-   "self_type" : "type-1629",
+   "referenced_type" : "type-1634",
+   "self_type" : "type-1633",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20706,8 +20709,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2609",
-   "self_type" : "type-2608",
+   "referenced_type" : "type-2612",
+   "self_type" : "type-2611",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20715,8 +20718,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3476",
-   "self_type" : "type-3475",
+   "referenced_type" : "type-3479",
+   "self_type" : "type-3478",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20724,8 +20727,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3548",
-   "self_type" : "type-3547",
+   "referenced_type" : "type-3547",
+   "self_type" : "type-3546",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20733,8 +20736,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3653",
-   "self_type" : "type-3652",
+   "referenced_type" : "type-3656",
+   "self_type" : "type-3655",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20742,8 +20745,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3718",
-   "self_type" : "type-3717",
+   "referenced_type" : "type-3724",
+   "self_type" : "type-3723",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20751,8 +20754,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3886",
-   "self_type" : "type-3885",
+   "referenced_type" : "type-3892",
+   "self_type" : "type-3891",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20760,8 +20763,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3929",
-   "self_type" : "type-3928",
+   "referenced_type" : "type-3936",
+   "self_type" : "type-3935",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20769,8 +20772,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3945",
-   "self_type" : "type-3944",
+   "referenced_type" : "type-3951",
+   "self_type" : "type-3950",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20778,8 +20781,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3965",
-   "self_type" : "type-3964",
+   "referenced_type" : "type-3971",
+   "self_type" : "type-3970",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20787,8 +20790,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3967",
-   "self_type" : "type-3966",
+   "referenced_type" : "type-3973",
+   "self_type" : "type-3972",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20796,8 +20799,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4017",
-   "self_type" : "type-4016",
+   "referenced_type" : "type-4023",
+   "self_type" : "type-4022",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20805,8 +20808,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4095",
-   "self_type" : "type-4094",
+   "referenced_type" : "type-4101",
+   "self_type" : "type-4100",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20814,8 +20817,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4297",
-   "self_type" : "type-4296",
+   "referenced_type" : "type-4303",
+   "self_type" : "type-4302",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20823,8 +20826,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4512",
-   "self_type" : "type-4511",
+   "referenced_type" : "type-4518",
+   "self_type" : "type-4517",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20832,8 +20835,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4523",
-   "self_type" : "type-4522",
+   "referenced_type" : "type-4529",
+   "self_type" : "type-4528",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20841,8 +20844,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4549",
-   "self_type" : "type-4548",
+   "referenced_type" : "type-4555",
+   "self_type" : "type-4554",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20850,8 +20853,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4576",
-   "self_type" : "type-4575",
+   "referenced_type" : "type-4582",
+   "self_type" : "type-4581",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20859,8 +20862,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4743",
-   "self_type" : "type-4742",
+   "referenced_type" : "type-4749",
+   "self_type" : "type-4748",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20868,8 +20871,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4853",
-   "self_type" : "type-4852",
+   "referenced_type" : "type-4859",
+   "self_type" : "type-4858",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20877,8 +20880,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4964",
-   "self_type" : "type-4963",
+   "referenced_type" : "type-4970",
+   "self_type" : "type-4969",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20886,8 +20889,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5397",
-   "self_type" : "type-5396",
+   "referenced_type" : "type-5403",
+   "self_type" : "type-5402",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20895,8 +20898,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5469",
-   "self_type" : "type-5468",
+   "referenced_type" : "type-5471",
+   "self_type" : "type-5470",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20904,8 +20907,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5574",
-   "self_type" : "type-5573",
+   "referenced_type" : "type-5580",
+   "self_type" : "type-5579",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20913,8 +20916,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5639",
-   "self_type" : "type-5638",
+   "referenced_type" : "type-5648",
+   "self_type" : "type-5647",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20922,8 +20925,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5807",
-   "self_type" : "type-5806",
+   "referenced_type" : "type-5816",
+   "self_type" : "type-5815",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20931,8 +20934,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5850",
-   "self_type" : "type-5849",
+   "referenced_type" : "type-5860",
+   "self_type" : "type-5859",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20940,8 +20943,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5866",
-   "self_type" : "type-5865",
+   "referenced_type" : "type-5875",
+   "self_type" : "type-5874",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20949,8 +20952,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5886",
-   "self_type" : "type-5885",
+   "referenced_type" : "type-5895",
+   "self_type" : "type-5894",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20958,8 +20961,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5888",
-   "self_type" : "type-5887",
+   "referenced_type" : "type-5897",
+   "self_type" : "type-5896",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20967,8 +20970,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5938",
-   "self_type" : "type-5937",
+   "referenced_type" : "type-5947",
+   "self_type" : "type-5946",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20976,8 +20979,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6016",
-   "self_type" : "type-6015",
+   "referenced_type" : "type-6025",
+   "self_type" : "type-6024",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20985,8 +20988,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6206",
-   "self_type" : "type-6205",
+   "referenced_type" : "type-6215",
+   "self_type" : "type-6214",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20994,8 +20997,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6396",
-   "self_type" : "type-6395",
+   "referenced_type" : "type-6405",
+   "self_type" : "type-6404",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21003,8 +21006,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6407",
-   "self_type" : "type-6406",
+   "referenced_type" : "type-6416",
+   "self_type" : "type-6415",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21012,8 +21015,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6433",
-   "self_type" : "type-6432",
+   "referenced_type" : "type-6442",
+   "self_type" : "type-6441",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21021,8 +21024,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6460",
-   "self_type" : "type-6459",
+   "referenced_type" : "type-6469",
+   "self_type" : "type-6468",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21030,8 +21033,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6611",
-   "self_type" : "type-6610",
+   "referenced_type" : "type-6620",
+   "self_type" : "type-6619",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21039,8 +21042,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6717",
-   "self_type" : "type-6716",
+   "referenced_type" : "type-6726",
+   "self_type" : "type-6725",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21048,8 +21051,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6744",
-   "self_type" : "type-6743",
+   "referenced_type" : "type-6753",
+   "self_type" : "type-6752",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21057,8 +21060,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6844",
-   "self_type" : "type-6843",
+   "referenced_type" : "type-6854",
+   "self_type" : "type-6853",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21066,8 +21069,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6880",
-   "self_type" : "type-6879",
+   "referenced_type" : "type-6890",
+   "self_type" : "type-6889",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21075,8 +21078,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7000",
-   "self_type" : "type-6999",
+   "referenced_type" : "type-7009",
+   "self_type" : "type-7008",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21084,8 +21087,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7060",
-   "self_type" : "type-7059",
+   "referenced_type" : "type-7069",
+   "self_type" : "type-7068",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21093,8 +21096,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7150",
-   "self_type" : "type-7149",
+   "referenced_type" : "type-7159",
+   "self_type" : "type-7158",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21102,8 +21105,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7166",
-   "self_type" : "type-7165",
+   "referenced_type" : "type-7175",
+   "self_type" : "type-7174",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21111,8 +21114,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7251",
-   "self_type" : "type-7250",
+   "referenced_type" : "type-7271",
+   "self_type" : "type-7270",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21120,8 +21123,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7290",
-   "self_type" : "type-7289",
+   "referenced_type" : "type-7310",
+   "self_type" : "type-7309",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21129,8 +21132,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7383",
-   "self_type" : "type-7382",
+   "referenced_type" : "type-7405",
+   "self_type" : "type-7404",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21147,8 +21150,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7713",
-   "self_type" : "type-7712",
+   "referenced_type" : "type-7734",
+   "self_type" : "type-7733",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21156,8 +21159,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7785",
-   "self_type" : "type-7784",
+   "referenced_type" : "type-7802",
+   "self_type" : "type-7801",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21165,8 +21168,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7890",
-   "self_type" : "type-7889",
+   "referenced_type" : "type-7911",
+   "self_type" : "type-7910",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21174,8 +21177,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7955",
-   "self_type" : "type-7954",
+   "referenced_type" : "type-7979",
+   "self_type" : "type-7978",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21183,8 +21186,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-8123",
-   "self_type" : "type-8122",
+   "referenced_type" : "type-8147",
+   "self_type" : "type-8146",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21192,8 +21195,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-8188",
-   "self_type" : "type-8187",
+   "referenced_type" : "type-8212",
+   "self_type" : "type-8211",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21201,8 +21204,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-8312",
-   "self_type" : "type-8311",
+   "referenced_type" : "type-8336",
+   "self_type" : "type-8335",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21210,8 +21213,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-8371",
-   "self_type" : "type-8370",
+   "referenced_type" : "type-8391",
+   "self_type" : "type-8390",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21219,8 +21222,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-8463",
-   "self_type" : "type-8462",
+   "referenced_type" : "type-8487",
+   "self_type" : "type-8486",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21228,8 +21231,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-8510",
-   "self_type" : "type-8509",
+   "referenced_type" : "type-8538",
+   "self_type" : "type-8537",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21237,8 +21240,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-8642",
-   "self_type" : "type-8641",
+   "referenced_type" : "type-8669",
+   "self_type" : "type-8668",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21246,8 +21249,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-8684",
-   "self_type" : "type-8683",
+   "referenced_type" : "type-868",
+   "self_type" : "type-867",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21255,8 +21258,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-8700",
-   "self_type" : "type-8699",
+   "referenced_type" : "type-8711",
+   "self_type" : "type-8710",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21264,8 +21267,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-8718",
-   "self_type" : "type-8717",
+   "referenced_type" : "type-8727",
+   "self_type" : "type-8726",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21273,8 +21276,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-872",
-   "self_type" : "type-871",
+   "referenced_type" : "type-8745",
+   "self_type" : "type-8744",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21282,8 +21285,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-8720",
-   "self_type" : "type-8719",
+   "referenced_type" : "type-8747",
+   "self_type" : "type-8746",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21291,8 +21294,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-8767",
-   "self_type" : "type-8766",
+   "referenced_type" : "type-8794",
+   "self_type" : "type-8793",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21300,8 +21303,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-8844",
-   "self_type" : "type-8843",
+   "referenced_type" : "type-8871",
+   "self_type" : "type-8870",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21309,8 +21312,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-9063",
-   "self_type" : "type-9062",
+   "referenced_type" : "type-9090",
+   "self_type" : "type-9089",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21318,8 +21321,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-9279",
-   "self_type" : "type-9278",
+   "referenced_type" : "type-9307",
+   "self_type" : "type-9306",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21327,8 +21330,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-9294",
-   "self_type" : "type-9293",
+   "referenced_type" : "type-9322",
+   "self_type" : "type-9321",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21336,8 +21339,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-9329",
-   "self_type" : "type-9328",
+   "referenced_type" : "type-9358",
+   "self_type" : "type-9357",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21345,8 +21348,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-9373",
-   "self_type" : "type-9372",
+   "referenced_type" : "type-9400",
+   "self_type" : "type-9399",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21354,8 +21357,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-9520",
-   "self_type" : "type-9519",
+   "referenced_type" : "type-9547",
+   "self_type" : "type-9546",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21363,8 +21366,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-9610",
-   "self_type" : "type-9609",
+   "referenced_type" : "type-9635",
+   "self_type" : "type-9634",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21372,8 +21375,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-9613",
-   "self_type" : "type-9612",
+   "referenced_type" : "type-9642",
+   "self_type" : "type-9641",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21381,8 +21384,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-9651",
-   "self_type" : "type-9650",
+   "referenced_type" : "type-9679",
+   "self_type" : "type-9678",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21390,8 +21393,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-9745",
-   "self_type" : "type-9744",
+   "referenced_type" : "type-9774",
+   "self_type" : "type-9773",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21399,8 +21402,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-9780",
-   "self_type" : "type-9779",
+   "referenced_type" : "type-9807",
+   "self_type" : "type-9806",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21444,8 +21447,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ALooper::LooperThread *",
    "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-3759",
-   "self_type" : "type-3758",
+   "referenced_type" : "type-3763",
+   "self_type" : "type-3762",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21453,8 +21456,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ALooper::LooperThread *",
    "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-5680",
-   "self_type" : "type-5679",
+   "referenced_type" : "type-5687",
+   "self_type" : "type-5686",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21462,8 +21465,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ALooper::LooperThread *",
    "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-7996",
-   "self_type" : "type-7995",
+   "referenced_type" : "type-8018",
+   "self_type" : "type-8017",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21471,8 +21474,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ALooper::LooperThread *",
    "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-8144",
-   "self_type" : "type-8143",
+   "referenced_type" : "type-8168",
+   "self_type" : "type-8167",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21489,8 +21492,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::AReplyToken *",
    "name" : "android::AReplyToken *",
-   "referenced_type" : "type-1044",
-   "self_type" : "type-1163",
+   "referenced_type" : "type-1043",
+   "self_type" : "type-1166",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -21508,7 +21511,7 @@
    "linker_set_key" : "android::BBinder *",
    "name" : "android::BBinder *",
    "referenced_type" : "type-67",
-   "self_type" : "type-1206",
+   "self_type" : "type-1209",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -21535,7 +21538,7 @@
    "linker_set_key" : "android::BnInterface<android::IGraphicBufferProducer> *",
    "name" : "android::BnInterface<android::IGraphicBufferProducer> *",
    "referenced_type" : "type-71",
-   "self_type" : "type-1271",
+   "self_type" : "type-1275",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21544,7 +21547,7 @@
    "linker_set_key" : "android::BnInterface<android::IProducerListener> *",
    "name" : "android::BnInterface<android::IProducerListener> *",
    "referenced_type" : "type-80",
-   "self_type" : "type-4500",
+   "self_type" : "type-4506",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21552,8 +21555,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BnInterface<android::ITransactionCompletedListener> *",
    "name" : "android::BnInterface<android::ITransactionCompletedListener> *",
-   "referenced_type" : "type-1031",
-   "self_type" : "type-1034",
+   "referenced_type" : "type-1034",
+   "self_type" : "type-1037",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21561,8 +21564,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpConsumerListener *",
    "name" : "android::BpConsumerListener *",
-   "referenced_type" : "type-1579",
-   "self_type" : "type-1578",
+   "referenced_type" : "type-1583",
+   "self_type" : "type-1582",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21570,8 +21573,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpConsumerListener *",
    "name" : "android::BpConsumerListener *",
-   "referenced_type" : "type-4059",
-   "self_type" : "type-4058",
+   "referenced_type" : "type-4065",
+   "self_type" : "type-4064",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21579,8 +21582,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpConsumerListener *",
    "name" : "android::BpConsumerListener *",
-   "referenced_type" : "type-5980",
-   "self_type" : "type-5979",
+   "referenced_type" : "type-5989",
+   "self_type" : "type-5988",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21588,8 +21591,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpConsumerListener *",
    "name" : "android::BpConsumerListener *",
-   "referenced_type" : "type-8808",
-   "self_type" : "type-8807",
+   "referenced_type" : "type-8835",
+   "self_type" : "type-8834",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21597,8 +21600,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpGraphicBufferConsumer *",
    "name" : "android::BpGraphicBufferConsumer *",
-   "referenced_type" : "type-1603",
-   "self_type" : "type-1602",
+   "referenced_type" : "type-1607",
+   "self_type" : "type-1606",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21606,8 +21609,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpGraphicBufferConsumer *",
    "name" : "android::BpGraphicBufferConsumer *",
-   "referenced_type" : "type-4076",
-   "self_type" : "type-4075",
+   "referenced_type" : "type-4082",
+   "self_type" : "type-4081",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21615,8 +21618,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpGraphicBufferConsumer *",
    "name" : "android::BpGraphicBufferConsumer *",
-   "referenced_type" : "type-5997",
-   "self_type" : "type-5996",
+   "referenced_type" : "type-6006",
+   "self_type" : "type-6005",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21624,8 +21627,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpGraphicBufferConsumer *",
    "name" : "android::BpGraphicBufferConsumer *",
-   "referenced_type" : "type-8823",
-   "self_type" : "type-8822",
+   "referenced_type" : "type-8850",
+   "self_type" : "type-8849",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21633,8 +21636,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpGraphicBufferProducer *",
    "name" : "android::BpGraphicBufferProducer *",
-   "referenced_type" : "type-4230",
-   "self_type" : "type-4229",
+   "referenced_type" : "type-4236",
+   "self_type" : "type-4235",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21642,8 +21645,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpGraphicBufferProducer *",
    "name" : "android::BpGraphicBufferProducer *",
-   "referenced_type" : "type-6150",
-   "self_type" : "type-6149",
+   "referenced_type" : "type-6159",
+   "self_type" : "type-6158",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21651,8 +21654,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpGraphicBufferProducer *",
    "name" : "android::BpGraphicBufferProducer *",
-   "referenced_type" : "type-9007",
-   "self_type" : "type-9006",
+   "referenced_type" : "type-9034",
+   "self_type" : "type-9033",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21660,8 +21663,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpInterface<android::IConsumerListener> *",
    "name" : "android::BpInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-1495",
-   "self_type" : "type-1498",
+   "referenced_type" : "type-1501",
+   "self_type" : "type-1504",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -21669,8 +21672,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpInterface<android::IGraphicBufferConsumer> *",
    "name" : "android::BpInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-1624",
-   "self_type" : "type-1628",
+   "referenced_type" : "type-1629",
+   "self_type" : "type-1632",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -21678,8 +21681,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpInterface<android::IGraphicBufferProducer> *",
    "name" : "android::BpInterface<android::IGraphicBufferProducer> *",
-   "referenced_type" : "type-4317",
-   "self_type" : "type-4320",
+   "referenced_type" : "type-4323",
+   "self_type" : "type-4326",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -21687,8 +21690,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpInterface<android::IProducerListener> *",
    "name" : "android::BpInterface<android::IProducerListener> *",
-   "referenced_type" : "type-4479",
-   "self_type" : "type-4482",
+   "referenced_type" : "type-4485",
+   "self_type" : "type-4488",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -21696,8 +21699,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpProducerListener *",
    "name" : "android::BpProducerListener *",
-   "referenced_type" : "type-4452",
-   "self_type" : "type-4451",
+   "referenced_type" : "type-4458",
+   "self_type" : "type-4457",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21705,8 +21708,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpProducerListener *",
    "name" : "android::BpProducerListener *",
-   "referenced_type" : "type-6349",
-   "self_type" : "type-6348",
+   "referenced_type" : "type-6358",
+   "self_type" : "type-6357",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21714,8 +21717,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpProducerListener *",
    "name" : "android::BpProducerListener *",
-   "referenced_type" : "type-9221",
-   "self_type" : "type-9220",
+   "referenced_type" : "type-9249",
+   "self_type" : "type-9248",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21732,8 +21735,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-1067",
-   "self_type" : "type-1066",
+   "referenced_type" : "type-1070",
+   "self_type" : "type-1069",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -21741,8 +21744,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-1529",
-   "self_type" : "type-1528",
+   "referenced_type" : "type-1532",
+   "self_type" : "type-1531",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -21750,8 +21753,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-1670",
-   "self_type" : "type-1669",
+   "referenced_type" : "type-1674",
+   "self_type" : "type-1673",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -21759,8 +21762,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-3636",
-   "self_type" : "type-3635",
+   "referenced_type" : "type-3639",
+   "self_type" : "type-3638",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -21768,8 +21771,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-3680",
-   "self_type" : "type-3679",
+   "referenced_type" : "type-3686",
+   "self_type" : "type-3685",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -21777,8 +21780,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-4039",
-   "self_type" : "type-4038",
+   "referenced_type" : "type-4046",
+   "self_type" : "type-4045",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -21786,8 +21789,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-4125",
-   "self_type" : "type-4124",
+   "referenced_type" : "type-4131",
+   "self_type" : "type-4130",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -21795,8 +21798,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-5557",
-   "self_type" : "type-5556",
+   "referenced_type" : "type-5563",
+   "self_type" : "type-5562",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -21804,8 +21807,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-5601",
-   "self_type" : "type-5600",
+   "referenced_type" : "type-5610",
+   "self_type" : "type-5609",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -21813,8 +21816,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-5960",
-   "self_type" : "type-5959",
+   "referenced_type" : "type-5970",
+   "self_type" : "type-5969",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -21822,8 +21825,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-6046",
-   "self_type" : "type-6045",
+   "referenced_type" : "type-6055",
+   "self_type" : "type-6054",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -21831,8 +21834,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-7873",
-   "self_type" : "type-7872",
+   "referenced_type" : "type-7894",
+   "self_type" : "type-7893",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -21840,8 +21843,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-7917",
-   "self_type" : "type-7916",
+   "referenced_type" : "type-7941",
+   "self_type" : "type-7940",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -21849,8 +21852,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-8444",
-   "self_type" : "type-8443",
+   "referenced_type" : "type-8468",
+   "self_type" : "type-8467",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -21858,8 +21861,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-8482",
-   "self_type" : "type-8481",
+   "referenced_type" : "type-8509",
+   "self_type" : "type-8508",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -21867,8 +21870,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-8791",
-   "self_type" : "type-8790",
+   "referenced_type" : "type-8818",
+   "self_type" : "type-8817",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -21876,8 +21879,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-8872",
-   "self_type" : "type-8871",
+   "referenced_type" : "type-8900",
+   "self_type" : "type-8899",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -21894,8 +21897,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
    "name" : "android::BufferQueue::ProxyConsumerListener *",
-   "referenced_type" : "type-2536",
-   "self_type" : "type-2535",
+   "referenced_type" : "type-2539",
+   "self_type" : "type-2538",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21903,8 +21906,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
    "name" : "android::BufferQueue::ProxyConsumerListener *",
-   "referenced_type" : "type-4948",
-   "self_type" : "type-4947",
+   "referenced_type" : "type-4954",
+   "self_type" : "type-4953",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21912,8 +21915,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
    "name" : "android::BufferQueue::ProxyConsumerListener *",
-   "referenced_type" : "type-7065",
-   "self_type" : "type-7064",
+   "referenced_type" : "type-7073",
+   "self_type" : "type-7072",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21921,8 +21924,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
    "name" : "android::BufferQueue::ProxyConsumerListener *",
-   "referenced_type" : "type-8182",
-   "self_type" : "type-8181",
+   "referenced_type" : "type-8206",
+   "self_type" : "type-8205",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21930,8 +21933,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
    "name" : "android::BufferQueue::ProxyConsumerListener *",
-   "referenced_type" : "type-9395",
-   "self_type" : "type-9394",
+   "referenced_type" : "type-9419",
+   "self_type" : "type-9418",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21939,8 +21942,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueConsumer *",
    "name" : "android::BufferQueueConsumer *",
-   "referenced_type" : "type-3491",
-   "self_type" : "type-3490",
+   "referenced_type" : "type-3494",
+   "self_type" : "type-3493",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21948,8 +21951,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueConsumer *",
    "name" : "android::BufferQueueConsumer *",
-   "referenced_type" : "type-5412",
-   "self_type" : "type-5411",
+   "referenced_type" : "type-5418",
+   "self_type" : "type-5417",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21957,8 +21960,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueConsumer *",
    "name" : "android::BufferQueueConsumer *",
-   "referenced_type" : "type-7728",
-   "self_type" : "type-7727",
+   "referenced_type" : "type-7749",
+   "self_type" : "type-7748",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21975,8 +21978,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueConsumer *",
    "name" : "android::BufferQueueConsumer *",
-   "referenced_type" : "type-8324",
-   "self_type" : "type-8323",
+   "referenced_type" : "type-8348",
+   "self_type" : "type-8347",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21984,8 +21987,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-1169",
-   "self_type" : "type-1168",
+   "referenced_type" : "type-1172",
+   "self_type" : "type-1171",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21993,8 +21996,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-3517",
-   "self_type" : "type-3516",
+   "referenced_type" : "type-3520",
+   "self_type" : "type-3519",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22002,8 +22005,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-3615",
-   "self_type" : "type-3614",
+   "referenced_type" : "type-3618",
+   "self_type" : "type-3617",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22011,8 +22014,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-3773",
-   "self_type" : "type-3772",
+   "referenced_type" : "type-3779",
+   "self_type" : "type-3778",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22020,8 +22023,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-5438",
-   "self_type" : "type-5437",
+   "referenced_type" : "type-5444",
+   "self_type" : "type-5443",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22029,8 +22032,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-5536",
-   "self_type" : "type-5535",
+   "referenced_type" : "type-5542",
+   "self_type" : "type-5541",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22038,8 +22041,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-5694",
-   "self_type" : "type-5693",
+   "referenced_type" : "type-5703",
+   "self_type" : "type-5702",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22047,8 +22050,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-7754",
-   "self_type" : "type-7753",
+   "referenced_type" : "type-7775",
+   "self_type" : "type-7774",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22056,8 +22059,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-7852",
-   "self_type" : "type-7851",
+   "referenced_type" : "type-7873",
+   "self_type" : "type-7872",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22065,8 +22068,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-8010",
-   "self_type" : "type-8009",
+   "referenced_type" : "type-8034",
+   "self_type" : "type-8033",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22083,8 +22086,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-8343",
-   "self_type" : "type-8342",
+   "referenced_type" : "type-8367",
+   "self_type" : "type-8366",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22092,8 +22095,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-8430",
-   "self_type" : "type-8429",
+   "referenced_type" : "type-8454",
+   "self_type" : "type-8453",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22101,8 +22104,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-8561",
-   "self_type" : "type-8560",
+   "referenced_type" : "type-8588",
+   "self_type" : "type-8587",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22119,8 +22122,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueProducer *",
    "name" : "android::BufferQueueProducer *",
-   "referenced_type" : "type-3502",
-   "self_type" : "type-3501",
+   "referenced_type" : "type-3505",
+   "self_type" : "type-3504",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22128,8 +22131,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueProducer *",
    "name" : "android::BufferQueueProducer *",
-   "referenced_type" : "type-5423",
-   "self_type" : "type-5422",
+   "referenced_type" : "type-5429",
+   "self_type" : "type-5428",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22137,8 +22140,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueProducer *",
    "name" : "android::BufferQueueProducer *",
-   "referenced_type" : "type-7739",
-   "self_type" : "type-7738",
+   "referenced_type" : "type-7760",
+   "self_type" : "type-7759",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22155,8 +22158,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueProducer *",
    "name" : "android::BufferQueueProducer *",
-   "referenced_type" : "type-8333",
-   "self_type" : "type-8332",
+   "referenced_type" : "type-8357",
+   "self_type" : "type-8356",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22173,8 +22176,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ComposerService *",
    "name" : "android::ComposerService *",
-   "referenced_type" : "type-1092",
-   "self_type" : "type-1091",
+   "referenced_type" : "type-1095",
+   "self_type" : "type-1094",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -22182,8 +22185,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ComposerService *",
    "name" : "android::ComposerService *",
-   "referenced_type" : "type-3700",
-   "self_type" : "type-3699",
+   "referenced_type" : "type-3706",
+   "self_type" : "type-3705",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -22191,8 +22194,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ComposerService *",
    "name" : "android::ComposerService *",
-   "referenced_type" : "type-5621",
-   "self_type" : "type-5620",
+   "referenced_type" : "type-5630",
+   "self_type" : "type-5629",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -22200,8 +22203,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ComposerService *",
    "name" : "android::ComposerService *",
-   "referenced_type" : "type-7937",
-   "self_type" : "type-7936",
+   "referenced_type" : "type-7961",
+   "self_type" : "type-7960",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -22209,8 +22212,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ComposerService *",
    "name" : "android::ComposerService *",
-   "referenced_type" : "type-8495",
-   "self_type" : "type-8494",
+   "referenced_type" : "type-8522",
+   "self_type" : "type-8521",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -22227,8 +22230,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-1253",
-   "self_type" : "type-1252",
+   "referenced_type" : "type-1257",
+   "self_type" : "type-1256",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22236,8 +22239,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-1455",
-   "self_type" : "type-1454",
+   "referenced_type" : "type-1458",
+   "self_type" : "type-1457",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22245,8 +22248,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-3813",
-   "self_type" : "type-3812",
+   "referenced_type" : "type-3820",
+   "self_type" : "type-3819",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22254,8 +22257,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-3986",
-   "self_type" : "type-3985",
+   "referenced_type" : "type-3992",
+   "self_type" : "type-3991",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22263,8 +22266,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-5734",
-   "self_type" : "type-5733",
+   "referenced_type" : "type-5744",
+   "self_type" : "type-5743",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22272,8 +22275,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-5907",
-   "self_type" : "type-5906",
+   "referenced_type" : "type-5916",
+   "self_type" : "type-5915",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22281,8 +22284,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-8050",
-   "self_type" : "type-8049",
+   "referenced_type" : "type-8075",
+   "self_type" : "type-8074",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22290,8 +22293,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-8584",
-   "self_type" : "type-8583",
+   "referenced_type" : "type-8611",
+   "self_type" : "type-8610",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22299,8 +22302,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-8736",
-   "self_type" : "type-8735",
+   "referenced_type" : "type-8763",
+   "self_type" : "type-8762",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22308,8 +22311,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-3291",
-   "self_type" : "type-3290",
+   "referenced_type" : "type-3294",
+   "self_type" : "type-3293",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22317,8 +22320,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-3480",
-   "self_type" : "type-3479",
+   "referenced_type" : "type-3483",
+   "self_type" : "type-3482",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22335,8 +22338,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-5212",
-   "self_type" : "type-5211",
+   "referenced_type" : "type-5218",
+   "self_type" : "type-5217",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22344,8 +22347,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-5401",
-   "self_type" : "type-5400",
+   "referenced_type" : "type-5407",
+   "self_type" : "type-5406",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22353,17 +22356,8 @@
    "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",
+   "referenced_type" : "type-7549",
+   "self_type" : "type-7548",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22380,8 +22374,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-8228",
-   "self_type" : "type-8227",
+   "referenced_type" : "type-7738",
+   "self_type" : "type-7737",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22389,8 +22383,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-8316",
-   "self_type" : "type-8315",
+   "referenced_type" : "type-8252",
+   "self_type" : "type-8251",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-8340",
+   "self_type" : "type-8339",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22416,8 +22419,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-1285",
-   "self_type" : "type-1284",
+   "referenced_type" : "type-1288",
+   "self_type" : "type-1287",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22425,8 +22428,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-1414",
-   "self_type" : "type-1413",
+   "referenced_type" : "type-1417",
+   "self_type" : "type-1416",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22434,8 +22437,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-1433",
-   "self_type" : "type-1432",
+   "referenced_type" : "type-1436",
+   "self_type" : "type-1435",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22443,8 +22446,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-1457",
-   "self_type" : "type-1456",
+   "referenced_type" : "type-1461",
+   "self_type" : "type-1460",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22452,8 +22455,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-1584",
-   "self_type" : "type-1583",
+   "referenced_type" : "type-1588",
+   "self_type" : "type-1587",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22461,8 +22464,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-1611",
-   "self_type" : "type-1610",
+   "referenced_type" : "type-1615",
+   "self_type" : "type-1614",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22470,8 +22473,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-1866",
-   "self_type" : "type-1865",
+   "referenced_type" : "type-1870",
+   "self_type" : "type-1869",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22479,8 +22482,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3447",
-   "self_type" : "type-3446",
+   "referenced_type" : "type-3450",
+   "self_type" : "type-3449",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22488,8 +22491,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3485",
-   "self_type" : "type-3484",
+   "referenced_type" : "type-3488",
+   "self_type" : "type-3487",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22497,8 +22500,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3658",
-   "self_type" : "type-3657",
+   "referenced_type" : "type-3661",
+   "self_type" : "type-3660",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22506,8 +22509,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3660",
-   "self_type" : "type-3659",
+   "referenced_type" : "type-3663",
+   "self_type" : "type-3662",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22515,8 +22518,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3836",
-   "self_type" : "type-3835",
+   "referenced_type" : "type-3842",
+   "self_type" : "type-3841",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22524,8 +22527,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3941",
-   "self_type" : "type-3940",
+   "referenced_type" : "type-3947",
+   "self_type" : "type-3946",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22533,8 +22536,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3963",
-   "self_type" : "type-3962",
+   "referenced_type" : "type-3969",
+   "self_type" : "type-3968",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22542,8 +22545,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3988",
-   "self_type" : "type-3987",
+   "referenced_type" : "type-3994",
+   "self_type" : "type-3993",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22551,8 +22554,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-4064",
-   "self_type" : "type-4063",
+   "referenced_type" : "type-4070",
+   "self_type" : "type-4069",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22560,8 +22563,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-4083",
-   "self_type" : "type-4082",
+   "referenced_type" : "type-4089",
+   "self_type" : "type-4088",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22569,8 +22572,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-4395",
-   "self_type" : "type-4394",
+   "referenced_type" : "type-4399",
+   "self_type" : "type-4398",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22578,8 +22581,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-4653",
-   "self_type" : "type-4652",
+   "referenced_type" : "type-4659",
+   "self_type" : "type-4658",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22587,8 +22590,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-4669",
-   "self_type" : "type-4668",
+   "referenced_type" : "type-4675",
+   "self_type" : "type-4674",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22596,8 +22599,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-4932",
-   "self_type" : "type-4931",
+   "referenced_type" : "type-4938",
+   "self_type" : "type-4937",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22605,8 +22608,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5368",
-   "self_type" : "type-5367",
+   "referenced_type" : "type-5374",
+   "self_type" : "type-5373",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22614,8 +22617,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5406",
-   "self_type" : "type-5405",
+   "referenced_type" : "type-5412",
+   "self_type" : "type-5411",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22623,8 +22626,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5579",
-   "self_type" : "type-5578",
+   "referenced_type" : "type-5585",
+   "self_type" : "type-5584",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22632,8 +22635,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5581",
-   "self_type" : "type-5580",
+   "referenced_type" : "type-5587",
+   "self_type" : "type-5586",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22641,8 +22644,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5757",
-   "self_type" : "type-5756",
+   "referenced_type" : "type-5766",
+   "self_type" : "type-5765",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22650,8 +22653,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5862",
-   "self_type" : "type-5861",
+   "referenced_type" : "type-5871",
+   "self_type" : "type-5870",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22659,8 +22662,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5884",
-   "self_type" : "type-5883",
+   "referenced_type" : "type-5893",
+   "self_type" : "type-5892",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22668,8 +22671,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5909",
-   "self_type" : "type-5908",
+   "referenced_type" : "type-5918",
+   "self_type" : "type-5917",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22677,8 +22680,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5985",
-   "self_type" : "type-5984",
+   "referenced_type" : "type-5994",
+   "self_type" : "type-5993",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22686,8 +22689,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6004",
-   "self_type" : "type-6003",
+   "referenced_type" : "type-6013",
+   "self_type" : "type-6012",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22695,8 +22698,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6292",
-   "self_type" : "type-6291",
+   "referenced_type" : "type-6299",
+   "self_type" : "type-6298",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22704,8 +22707,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6537",
-   "self_type" : "type-6536",
+   "referenced_type" : "type-6546",
+   "self_type" : "type-6545",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22713,8 +22716,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6550",
-   "self_type" : "type-6549",
+   "referenced_type" : "type-6559",
+   "self_type" : "type-6558",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22722,8 +22725,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6764",
-   "self_type" : "type-6763",
+   "referenced_type" : "type-6773",
+   "self_type" : "type-6772",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22731,8 +22734,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6914",
-   "self_type" : "type-6913",
+   "referenced_type" : "type-6923",
+   "self_type" : "type-6922",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22749,8 +22752,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-7081",
-   "self_type" : "type-7080",
+   "referenced_type" : "type-7089",
+   "self_type" : "type-7088",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22767,8 +22770,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-7306",
-   "self_type" : "type-7305",
+   "referenced_type" : "type-7327",
+   "self_type" : "type-7326",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22776,8 +22779,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-7684",
-   "self_type" : "type-7683",
+   "referenced_type" : "type-7705",
+   "self_type" : "type-7704",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22785,8 +22788,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-7722",
-   "self_type" : "type-7721",
+   "referenced_type" : "type-7743",
+   "self_type" : "type-7742",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22803,8 +22806,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-7895",
-   "self_type" : "type-7894",
+   "referenced_type" : "type-7916",
+   "self_type" : "type-7915",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22812,8 +22815,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-7897",
-   "self_type" : "type-7896",
+   "referenced_type" : "type-7918",
+   "self_type" : "type-7917",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22821,8 +22824,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-8073",
-   "self_type" : "type-8072",
+   "referenced_type" : "type-8097",
+   "self_type" : "type-8096",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22830,8 +22833,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-8173",
-   "self_type" : "type-8172",
+   "referenced_type" : "type-8197",
+   "self_type" : "type-8196",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22839,8 +22842,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-8286",
-   "self_type" : "type-8285",
+   "referenced_type" : "type-8310",
+   "self_type" : "type-8309",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22848,8 +22851,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-8318",
-   "self_type" : "type-8317",
+   "referenced_type" : "type-8342",
+   "self_type" : "type-8341",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22857,8 +22860,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-8468",
-   "self_type" : "type-8467",
+   "referenced_type" : "type-8492",
+   "self_type" : "type-8491",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22866,8 +22869,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-8470",
-   "self_type" : "type-8469",
+   "referenced_type" : "type-8494",
+   "self_type" : "type-8493",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22875,8 +22878,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-8597",
-   "self_type" : "type-8596",
+   "referenced_type" : "type-8624",
+   "self_type" : "type-8623",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22884,8 +22887,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-8696",
-   "self_type" : "type-8695",
+   "referenced_type" : "type-8723",
+   "self_type" : "type-8722",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22893,8 +22896,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-8716",
-   "self_type" : "type-8715",
+   "referenced_type" : "type-8743",
+   "self_type" : "type-8742",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22902,8 +22905,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-8738",
-   "self_type" : "type-8737",
+   "referenced_type" : "type-8765",
+   "self_type" : "type-8764",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22911,8 +22914,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-8813",
-   "self_type" : "type-8812",
+   "referenced_type" : "type-8840",
+   "self_type" : "type-8839",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22920,8 +22923,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-8830",
-   "self_type" : "type-8829",
+   "referenced_type" : "type-8857",
+   "self_type" : "type-8856",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22929,8 +22932,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-9157",
-   "self_type" : "type-9156",
+   "referenced_type" : "type-9183",
+   "self_type" : "type-9182",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22938,8 +22941,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-9347",
-   "self_type" : "type-9346",
+   "referenced_type" : "type-9374",
+   "self_type" : "type-9373",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22947,8 +22950,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-9459",
-   "self_type" : "type-9458",
+   "referenced_type" : "type-9487",
+   "self_type" : "type-9486",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22956,8 +22959,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-9472",
-   "self_type" : "type-9471",
+   "referenced_type" : "type-9499",
+   "self_type" : "type-9498",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22965,8 +22968,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-9672",
-   "self_type" : "type-9671",
+   "referenced_type" : "type-9701",
+   "self_type" : "type-9700",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22974,8 +22977,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-9816",
-   "self_type" : "type-9815",
+   "referenced_type" : "type-9843",
+   "self_type" : "type-9842",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22983,8 +22986,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FileDescriptor::Autoclose *",
    "name" : "android::FileDescriptor::Autoclose *",
-   "referenced_type" : "type-1204",
-   "self_type" : "type-1213",
+   "referenced_type" : "type-1203",
+   "self_type" : "type-1212",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h"
   },
@@ -22993,7 +22996,7 @@
    "linker_set_key" : "android::Flattenable<android::BufferItem> *",
    "name" : "android::Flattenable<android::BufferItem> *",
    "referenced_type" : "type-21",
-   "self_type" : "type-1510",
+   "self_type" : "type-1513",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -23002,7 +23005,7 @@
    "linker_set_key" : "android::Flattenable<android::Fence> *",
    "name" : "android::Flattenable<android::Fence> *",
    "referenced_type" : "type-16",
-   "self_type" : "type-1636",
+   "self_type" : "type-1642",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -23011,7 +23014,7 @@
    "linker_set_key" : "android::Flattenable<android::FrameEventHistoryDelta> *",
    "name" : "android::Flattenable<android::FrameEventHistoryDelta> *",
    "referenced_type" : "type-25",
-   "self_type" : "type-4308",
+   "self_type" : "type-4314",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -23020,7 +23023,7 @@
    "linker_set_key" : "android::Flattenable<android::GraphicBuffer> *",
    "name" : "android::Flattenable<android::GraphicBuffer> *",
    "referenced_type" : "type-14",
-   "self_type" : "type-1640",
+   "self_type" : "type-1645",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -23029,7 +23032,7 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> *",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> *",
    "referenced_type" : "type-32",
-   "self_type" : "type-4311",
+   "self_type" : "type-4317",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -23038,7 +23041,7 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> *",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> *",
    "referenced_type" : "type-34",
-   "self_type" : "type-4314",
+   "self_type" : "type-4320",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -23055,8 +23058,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-1175",
-   "self_type" : "type-1174",
+   "referenced_type" : "type-1178",
+   "self_type" : "type-1177",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23064,8 +23067,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-1468",
-   "self_type" : "type-1467",
+   "referenced_type" : "type-1472",
+   "self_type" : "type-1471",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23073,8 +23076,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-3778",
-   "self_type" : "type-3777",
+   "referenced_type" : "type-3784",
+   "self_type" : "type-3783",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23082,8 +23085,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-3997",
-   "self_type" : "type-3996",
+   "referenced_type" : "type-4003",
+   "self_type" : "type-4002",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23091,8 +23094,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-5699",
-   "self_type" : "type-5698",
+   "referenced_type" : "type-5708",
+   "self_type" : "type-5707",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23100,8 +23103,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-5918",
-   "self_type" : "type-5917",
+   "referenced_type" : "type-5927",
+   "self_type" : "type-5926",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23109,8 +23112,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-8015",
-   "self_type" : "type-8014",
+   "referenced_type" : "type-8039",
+   "self_type" : "type-8038",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23118,8 +23121,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-8565",
-   "self_type" : "type-8564",
+   "referenced_type" : "type-8592",
+   "self_type" : "type-8591",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23127,8 +23130,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-8747",
-   "self_type" : "type-8746",
+   "referenced_type" : "type-8774",
+   "self_type" : "type-8773",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23145,8 +23148,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1331",
-   "self_type" : "type-1330",
+   "referenced_type" : "type-1330",
+   "self_type" : "type-1329",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23154,8 +23157,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1416",
-   "self_type" : "type-1415",
+   "referenced_type" : "type-1419",
+   "self_type" : "type-1418",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23163,8 +23166,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1459",
-   "self_type" : "type-1458",
+   "referenced_type" : "type-1463",
+   "self_type" : "type-1462",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23172,8 +23175,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1587",
-   "self_type" : "type-1586",
+   "referenced_type" : "type-1591",
+   "self_type" : "type-1590",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23181,8 +23184,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1608",
-   "self_type" : "type-1607",
+   "referenced_type" : "type-1612",
+   "self_type" : "type-1611",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23190,8 +23193,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3452",
-   "self_type" : "type-3451",
+   "referenced_type" : "type-3455",
+   "self_type" : "type-3454",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23199,8 +23202,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3487",
-   "self_type" : "type-3486",
+   "referenced_type" : "type-3490",
+   "self_type" : "type-3489",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23208,8 +23211,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3597",
-   "self_type" : "type-3596",
+   "referenced_type" : "type-3600",
+   "self_type" : "type-3599",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23217,8 +23220,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3662",
-   "self_type" : "type-3661",
+   "referenced_type" : "type-3665",
+   "self_type" : "type-3664",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23226,8 +23229,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3882",
-   "self_type" : "type-3881",
+   "referenced_type" : "type-3884",
+   "self_type" : "type-3883",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23235,8 +23238,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3943",
-   "self_type" : "type-3942",
+   "referenced_type" : "type-3949",
+   "self_type" : "type-3948",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23244,8 +23247,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3990",
-   "self_type" : "type-3989",
+   "referenced_type" : "type-3996",
+   "self_type" : "type-3995",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23253,8 +23256,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-4066",
-   "self_type" : "type-4065",
+   "referenced_type" : "type-4072",
+   "self_type" : "type-4071",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23262,8 +23265,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-4081",
-   "self_type" : "type-4080",
+   "referenced_type" : "type-4087",
+   "self_type" : "type-4086",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23271,8 +23274,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-4447",
-   "self_type" : "type-4446",
+   "referenced_type" : "type-4453",
+   "self_type" : "type-4452",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23280,8 +23283,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-4547",
-   "self_type" : "type-4546",
+   "referenced_type" : "type-4551",
+   "self_type" : "type-4550",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23289,8 +23292,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-4676",
-   "self_type" : "type-4675",
+   "referenced_type" : "type-4683",
+   "self_type" : "type-4682",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23298,8 +23301,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5373",
-   "self_type" : "type-5372",
+   "referenced_type" : "type-5379",
+   "self_type" : "type-5378",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23307,8 +23310,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5408",
-   "self_type" : "type-5407",
+   "referenced_type" : "type-5414",
+   "self_type" : "type-5413",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23316,8 +23319,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5518",
-   "self_type" : "type-5517",
+   "referenced_type" : "type-5524",
+   "self_type" : "type-5523",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23325,8 +23328,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5583",
-   "self_type" : "type-5582",
+   "referenced_type" : "type-5589",
+   "self_type" : "type-5588",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23334,8 +23337,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5803",
-   "self_type" : "type-5802",
+   "referenced_type" : "type-5808",
+   "self_type" : "type-5807",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23343,8 +23346,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5864",
-   "self_type" : "type-5863",
+   "referenced_type" : "type-5873",
+   "self_type" : "type-5872",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23352,8 +23355,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5911",
-   "self_type" : "type-5910",
+   "referenced_type" : "type-5920",
+   "self_type" : "type-5919",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23361,8 +23364,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5987",
-   "self_type" : "type-5986",
+   "referenced_type" : "type-5996",
+   "self_type" : "type-5995",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23370,8 +23373,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6002",
-   "self_type" : "type-6001",
+   "referenced_type" : "type-6011",
+   "self_type" : "type-6010",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23379,8 +23382,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6344",
-   "self_type" : "type-6343",
+   "referenced_type" : "type-6353",
+   "self_type" : "type-6352",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23388,8 +23391,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6431",
-   "self_type" : "type-6430",
+   "referenced_type" : "type-6438",
+   "self_type" : "type-6437",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23397,8 +23400,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6557",
-   "self_type" : "type-6556",
+   "referenced_type" : "type-6567",
+   "self_type" : "type-6566",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23406,8 +23409,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6766",
-   "self_type" : "type-6765",
+   "referenced_type" : "type-6776",
+   "self_type" : "type-6775",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23415,8 +23418,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6917",
-   "self_type" : "type-6916",
+   "referenced_type" : "type-6926",
+   "self_type" : "type-6925",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23424,17 +23427,8 @@
    "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",
+   "referenced_type" : "type-7092",
+   "self_type" : "type-7091",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23451,6 +23445,15 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-7329",
+   "self_type" : "type-7328",
+   "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,
@@ -23460,8 +23463,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-7689",
-   "self_type" : "type-7688",
+   "referenced_type" : "type-7710",
+   "self_type" : "type-7709",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23469,8 +23472,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-7724",
-   "self_type" : "type-7723",
+   "referenced_type" : "type-7745",
+   "self_type" : "type-7744",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23487,8 +23490,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-7834",
-   "self_type" : "type-7833",
+   "referenced_type" : "type-7855",
+   "self_type" : "type-7854",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23496,8 +23499,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-7899",
-   "self_type" : "type-7898",
+   "referenced_type" : "type-7920",
+   "self_type" : "type-7919",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23505,8 +23508,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-8119",
-   "self_type" : "type-8118",
+   "referenced_type" : "type-8139",
+   "self_type" : "type-8138",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23514,8 +23517,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-8146",
-   "self_type" : "type-8145",
+   "referenced_type" : "type-8170",
+   "self_type" : "type-8169",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23523,8 +23526,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-8292",
-   "self_type" : "type-8291",
+   "referenced_type" : "type-8316",
+   "self_type" : "type-8315",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23532,8 +23535,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-8320",
-   "self_type" : "type-8319",
+   "referenced_type" : "type-8344",
+   "self_type" : "type-8343",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23541,8 +23544,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-8419",
-   "self_type" : "type-8418",
+   "referenced_type" : "type-8443",
+   "self_type" : "type-8442",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23550,8 +23553,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-8472",
-   "self_type" : "type-8471",
+   "referenced_type" : "type-8496",
+   "self_type" : "type-8495",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23559,8 +23562,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-8638",
-   "self_type" : "type-8637",
+   "referenced_type" : "type-8661",
+   "self_type" : "type-8660",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23568,8 +23571,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-8698",
-   "self_type" : "type-8697",
+   "referenced_type" : "type-8725",
+   "self_type" : "type-8724",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23577,8 +23580,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-8740",
-   "self_type" : "type-8739",
+   "referenced_type" : "type-8767",
+   "self_type" : "type-8766",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23586,8 +23589,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-8789",
-   "self_type" : "type-8788",
+   "referenced_type" : "type-8812",
+   "self_type" : "type-8811",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23595,8 +23598,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-8815",
-   "self_type" : "type-8814",
+   "referenced_type" : "type-8842",
+   "self_type" : "type-8841",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23604,8 +23607,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-8828",
-   "self_type" : "type-8827",
+   "referenced_type" : "type-8855",
+   "self_type" : "type-8854",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23613,8 +23616,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-9215",
-   "self_type" : "type-9214",
+   "referenced_type" : "type-9242",
+   "self_type" : "type-9241",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23631,8 +23634,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-9479",
-   "self_type" : "type-9478",
+   "referenced_type" : "type-9506",
+   "self_type" : "type-9505",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23640,8 +23643,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-9676",
-   "self_type" : "type-9675",
+   "referenced_type" : "type-9703",
+   "self_type" : "type-9702",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23649,8 +23652,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-9819",
-   "self_type" : "type-9818",
+   "referenced_type" : "type-9846",
+   "self_type" : "type-9845",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23658,8 +23661,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1088",
-   "self_type" : "type-1087",
+   "referenced_type" : "type-1091",
+   "self_type" : "type-1090",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23667,8 +23670,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1270",
-   "self_type" : "type-1269",
+   "referenced_type" : "type-1273",
+   "self_type" : "type-1272",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23676,8 +23679,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1412",
-   "self_type" : "type-1411",
+   "referenced_type" : "type-1415",
+   "self_type" : "type-1414",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23685,8 +23688,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1448",
-   "self_type" : "type-1447",
+   "referenced_type" : "type-1451",
+   "self_type" : "type-1450",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23694,8 +23697,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-2174",
-   "self_type" : "type-2173",
+   "referenced_type" : "type-2178",
+   "self_type" : "type-2177",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23703,8 +23706,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3252",
-   "self_type" : "type-3251",
+   "referenced_type" : "type-3255",
+   "self_type" : "type-3254",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23721,8 +23724,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3465",
-   "self_type" : "type-3464",
+   "referenced_type" : "type-3468",
+   "self_type" : "type-3467",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23730,8 +23733,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3530",
-   "self_type" : "type-3529",
+   "referenced_type" : "type-3533",
+   "self_type" : "type-3532",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23739,8 +23742,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3641",
-   "self_type" : "type-3640",
+   "referenced_type" : "type-3644",
+   "self_type" : "type-3643",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23748,8 +23751,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3698",
-   "self_type" : "type-3697",
+   "referenced_type" : "type-3704",
+   "self_type" : "type-3703",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23757,8 +23760,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3823",
-   "self_type" : "type-3822",
+   "referenced_type" : "type-3829",
+   "self_type" : "type-3828",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23766,8 +23769,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3939",
-   "self_type" : "type-3938",
+   "referenced_type" : "type-3945",
+   "self_type" : "type-3944",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23775,8 +23778,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3980",
-   "self_type" : "type-3979",
+   "referenced_type" : "type-3987",
+   "self_type" : "type-3986",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23784,8 +23787,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-4209",
-   "self_type" : "type-4208",
+   "referenced_type" : "type-4216",
+   "self_type" : "type-4215",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23793,8 +23796,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-4388",
-   "self_type" : "type-4387",
+   "referenced_type" : "type-4394",
+   "self_type" : "type-4393",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23802,8 +23805,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-4600",
-   "self_type" : "type-4599",
+   "referenced_type" : "type-4607",
+   "self_type" : "type-4606",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23811,8 +23814,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-4766",
-   "self_type" : "type-4765",
+   "referenced_type" : "type-4773",
+   "self_type" : "type-4772",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23820,8 +23823,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5173",
-   "self_type" : "type-5172",
+   "referenced_type" : "type-5179",
+   "self_type" : "type-5178",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23829,8 +23832,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5386",
-   "self_type" : "type-5385",
+   "referenced_type" : "type-5392",
+   "self_type" : "type-5391",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23838,8 +23841,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5451",
-   "self_type" : "type-5450",
+   "referenced_type" : "type-5457",
+   "self_type" : "type-5456",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23847,8 +23850,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5562",
-   "self_type" : "type-5561",
+   "referenced_type" : "type-5568",
+   "self_type" : "type-5567",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23856,8 +23859,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5619",
-   "self_type" : "type-5618",
+   "referenced_type" : "type-5628",
+   "self_type" : "type-5627",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23865,8 +23868,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5744",
-   "self_type" : "type-5743",
+   "referenced_type" : "type-5753",
+   "self_type" : "type-5752",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23874,8 +23877,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5860",
-   "self_type" : "type-5859",
+   "referenced_type" : "type-5869",
+   "self_type" : "type-5868",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23883,8 +23886,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5901",
-   "self_type" : "type-5900",
+   "referenced_type" : "type-5911",
+   "self_type" : "type-5910",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23892,8 +23895,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6130",
-   "self_type" : "type-6129",
+   "referenced_type" : "type-6140",
+   "self_type" : "type-6139",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23901,8 +23904,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6285",
-   "self_type" : "type-6284",
+   "referenced_type" : "type-6294",
+   "self_type" : "type-6293",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23910,8 +23913,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6484",
-   "self_type" : "type-6483",
+   "referenced_type" : "type-6494",
+   "self_type" : "type-6493",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23919,8 +23922,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6632",
-   "self_type" : "type-6631",
+   "referenced_type" : "type-6642",
+   "self_type" : "type-6641",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23928,8 +23931,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6859",
-   "self_type" : "type-6858",
+   "referenced_type" : "type-6869",
+   "self_type" : "type-6868",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23937,8 +23940,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-7011",
-   "self_type" : "type-7010",
+   "referenced_type" : "type-7020",
+   "self_type" : "type-7019",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23946,8 +23949,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-7102",
-   "self_type" : "type-7101",
+   "referenced_type" : "type-7111",
+   "self_type" : "type-7110",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23955,8 +23958,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-7260",
-   "self_type" : "type-7259",
+   "referenced_type" : "type-7280",
+   "self_type" : "type-7279",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23964,8 +23967,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-7326",
-   "self_type" : "type-7325",
+   "referenced_type" : "type-7346",
+   "self_type" : "type-7345",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23973,8 +23976,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-7489",
-   "self_type" : "type-7488",
+   "referenced_type" : "type-7510",
+   "self_type" : "type-7509",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23991,8 +23994,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-7702",
-   "self_type" : "type-7701",
+   "referenced_type" : "type-7723",
+   "self_type" : "type-7722",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -24000,8 +24003,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-7767",
-   "self_type" : "type-7766",
+   "referenced_type" : "type-7788",
+   "self_type" : "type-7787",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -24009,8 +24012,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-7878",
-   "self_type" : "type-7877",
+   "referenced_type" : "type-7899",
+   "self_type" : "type-7898",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -24018,8 +24021,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-7935",
-   "self_type" : "type-7934",
+   "referenced_type" : "type-7959",
+   "self_type" : "type-7958",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -24027,8 +24030,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-8060",
-   "self_type" : "type-8059",
+   "referenced_type" : "type-8084",
+   "self_type" : "type-8083",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -24036,8 +24039,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-8220",
-   "self_type" : "type-8219",
+   "referenced_type" : "type-8244",
+   "self_type" : "type-8243",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -24045,8 +24048,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-8303",
-   "self_type" : "type-8302",
+   "referenced_type" : "type-8328",
+   "self_type" : "type-8327",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -24054,8 +24057,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-8355",
-   "self_type" : "type-8354",
+   "referenced_type" : "type-8379",
+   "self_type" : "type-8378",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -24072,8 +24075,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-8449",
-   "self_type" : "type-8448",
+   "referenced_type" : "type-8473",
+   "self_type" : "type-8472",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -24081,8 +24084,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-8493",
-   "self_type" : "type-8492",
+   "referenced_type" : "type-8520",
+   "self_type" : "type-8519",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -24090,8 +24093,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-8588",
-   "self_type" : "type-8587",
+   "referenced_type" : "type-8616",
+   "self_type" : "type-8615",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -24099,8 +24102,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-8694",
-   "self_type" : "type-8693",
+   "referenced_type" : "type-8721",
+   "self_type" : "type-8720",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -24108,8 +24111,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-8731",
-   "self_type" : "type-8730",
+   "referenced_type" : "type-8758",
+   "self_type" : "type-8757",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -24117,8 +24120,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-8977",
-   "self_type" : "type-8976",
+   "referenced_type" : "type-9004",
+   "self_type" : "type-9003",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -24126,8 +24129,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-9149",
-   "self_type" : "type-9148",
+   "referenced_type" : "type-9177",
+   "self_type" : "type-9176",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -24135,8 +24138,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-9401",
-   "self_type" : "type-9400",
+   "referenced_type" : "type-9428",
+   "self_type" : "type-9427",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -24144,8 +24147,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-9539",
-   "self_type" : "type-9538",
+   "referenced_type" : "type-9567",
+   "self_type" : "type-9566",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -24153,8 +24156,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-9761",
-   "self_type" : "type-9760",
+   "referenced_type" : "type-9788",
+   "self_type" : "type-9787",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -24189,8 +24192,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
    "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-3902",
-   "self_type" : "type-3901",
+   "referenced_type" : "type-3908",
+   "self_type" : "type-3907",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24207,8 +24210,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
    "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-5823",
-   "self_type" : "type-5822",
+   "referenced_type" : "type-5832",
+   "self_type" : "type-5831",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24216,8 +24219,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
    "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-8139",
-   "self_type" : "type-8138",
+   "referenced_type" : "type-8163",
+   "self_type" : "type-8162",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24225,8 +24228,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
    "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-8166",
-   "self_type" : "type-8165",
+   "referenced_type" : "type-8190",
+   "self_type" : "type-8189",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24243,8 +24246,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-4257",
-   "self_type" : "type-4256",
+   "referenced_type" : "type-4263",
+   "self_type" : "type-4262",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24252,8 +24255,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-4266",
-   "self_type" : "type-4265",
+   "referenced_type" : "type-4272",
+   "self_type" : "type-4271",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24261,8 +24264,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-4693",
-   "self_type" : "type-4692",
+   "referenced_type" : "type-4700",
+   "self_type" : "type-4699",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24270,8 +24273,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-6172",
-   "self_type" : "type-6171",
+   "referenced_type" : "type-6181",
+   "self_type" : "type-6180",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24279,8 +24282,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-6178",
-   "self_type" : "type-6177",
+   "referenced_type" : "type-6187",
+   "self_type" : "type-6186",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24288,8 +24291,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-6573",
-   "self_type" : "type-6572",
+   "referenced_type" : "type-6583",
+   "self_type" : "type-6582",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24297,8 +24300,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-6920",
-   "self_type" : "type-6919",
+   "referenced_type" : "type-6929",
+   "self_type" : "type-6928",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24306,8 +24309,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-9029",
-   "self_type" : "type-9028",
+   "referenced_type" : "type-9056",
+   "self_type" : "type-9055",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24315,8 +24318,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-9035",
-   "self_type" : "type-9034",
+   "referenced_type" : "type-9062",
+   "self_type" : "type-9061",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24324,8 +24327,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-9492",
-   "self_type" : "type-9491",
+   "referenced_type" : "type-9519",
+   "self_type" : "type-9518",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24333,8 +24336,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-9822",
-   "self_type" : "type-9821",
+   "referenced_type" : "type-9849",
+   "self_type" : "type-9848",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24342,8 +24345,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
    "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
-   "referenced_type" : "type-4829",
-   "self_type" : "type-4828",
+   "referenced_type" : "type-4835",
+   "self_type" : "type-4834",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24351,8 +24354,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
    "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
-   "referenced_type" : "type-6694",
-   "self_type" : "type-6693",
+   "referenced_type" : "type-6703",
+   "self_type" : "type-6702",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24360,8 +24363,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
    "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
-   "referenced_type" : "type-7031",
-   "self_type" : "type-7030",
+   "referenced_type" : "type-7040",
+   "self_type" : "type-7039",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24369,8 +24372,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
    "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
-   "referenced_type" : "type-7275",
-   "self_type" : "type-7274",
+   "referenced_type" : "type-7295",
+   "self_type" : "type-7294",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24378,8 +24381,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
    "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
-   "referenced_type" : "type-9594",
-   "self_type" : "type-9593",
+   "referenced_type" : "type-9622",
+   "self_type" : "type-9621",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24387,8 +24390,8 @@
    "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",
+   "referenced_type" : "type-4289",
+   "self_type" : "type-4288",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24396,8 +24399,8 @@
    "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",
+   "referenced_type" : "type-4671",
+   "self_type" : "type-4670",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24405,8 +24408,8 @@
    "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",
+   "referenced_type" : "type-6201",
+   "self_type" : "type-6200",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24414,8 +24417,8 @@
    "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",
+   "referenced_type" : "type-6556",
+   "self_type" : "type-6555",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24423,8 +24426,8 @@
    "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",
+   "referenced_type" : "type-9076",
+   "self_type" : "type-9075",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24432,8 +24435,8 @@
    "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",
+   "referenced_type" : "type-9497",
+   "self_type" : "type-9496",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24441,8 +24444,8 @@
    "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",
+   "referenced_type" : "type-4831",
+   "self_type" : "type-4830",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24450,8 +24453,8 @@
    "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",
+   "referenced_type" : "type-6700",
+   "self_type" : "type-6699",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24459,8 +24462,8 @@
    "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",
+   "referenced_type" : "type-9618",
+   "self_type" : "type-9617",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24468,8 +24471,8 @@
    "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",
+   "referenced_type" : "type-4291",
+   "self_type" : "type-4290",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24477,8 +24480,8 @@
    "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",
+   "referenced_type" : "type-6203",
+   "self_type" : "type-6202",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24486,8 +24489,8 @@
    "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",
+   "referenced_type" : "type-6911",
+   "self_type" : "type-6910",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24495,8 +24498,8 @@
    "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",
+   "referenced_type" : "type-9078",
+   "self_type" : "type-9077",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24504,8 +24507,8 @@
    "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",
+   "referenced_type" : "type-9831",
+   "self_type" : "type-9830",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24513,8 +24516,8 @@
    "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",
+   "referenced_type" : "type-7035",
+   "self_type" : "type-7034",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24522,8 +24525,8 @@
    "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",
+   "referenced_type" : "type-7292",
+   "self_type" : "type-7291",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24531,8 +24534,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::HpGraphicBufferProducer *",
    "name" : "android::HpGraphicBufferProducer *",
-   "referenced_type" : "type-4246",
-   "self_type" : "type-4245",
+   "referenced_type" : "type-4252",
+   "self_type" : "type-4251",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24540,8 +24543,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::HpGraphicBufferProducer *",
    "name" : "android::HpGraphicBufferProducer *",
-   "referenced_type" : "type-6161",
-   "self_type" : "type-6160",
+   "referenced_type" : "type-6170",
+   "self_type" : "type-6169",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24549,8 +24552,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::HpGraphicBufferProducer *",
    "name" : "android::HpGraphicBufferProducer *",
-   "referenced_type" : "type-9018",
-   "self_type" : "type-9017",
+   "referenced_type" : "type-9045",
+   "self_type" : "type-9044",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24558,8 +24561,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::HpProducerListener *",
    "name" : "android::HpProducerListener *",
-   "referenced_type" : "type-4521",
-   "self_type" : "type-4520",
+   "referenced_type" : "type-4527",
+   "self_type" : "type-4526",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24567,8 +24570,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::HpProducerListener *",
    "name" : "android::HpProducerListener *",
-   "referenced_type" : "type-6405",
-   "self_type" : "type-6404",
+   "referenced_type" : "type-6414",
+   "self_type" : "type-6413",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24576,8 +24579,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::HpProducerListener *",
    "name" : "android::HpProducerListener *",
-   "referenced_type" : "type-9290",
-   "self_type" : "type-9289",
+   "referenced_type" : "type-9318",
+   "self_type" : "type-9317",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24612,8 +24615,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-1154",
-   "self_type" : "type-1153",
+   "referenced_type" : "type-1157",
+   "self_type" : "type-1156",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24621,8 +24624,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-1576",
-   "self_type" : "type-1575",
+   "referenced_type" : "type-1579",
+   "self_type" : "type-1578",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24630,8 +24633,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-1614",
-   "self_type" : "type-1613",
+   "referenced_type" : "type-1618",
+   "self_type" : "type-1617",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24639,8 +24642,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-3498",
-   "self_type" : "type-3497",
+   "referenced_type" : "type-3501",
+   "self_type" : "type-3500",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24648,8 +24651,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-3605",
-   "self_type" : "type-3604",
+   "referenced_type" : "type-3608",
+   "self_type" : "type-3607",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24657,8 +24660,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-3664",
-   "self_type" : "type-3663",
+   "referenced_type" : "type-3667",
+   "self_type" : "type-3666",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24666,8 +24669,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-3757",
-   "self_type" : "type-3756",
+   "referenced_type" : "type-3765",
+   "self_type" : "type-3764",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24675,8 +24678,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-4055",
-   "self_type" : "type-4054",
+   "referenced_type" : "type-4062",
+   "self_type" : "type-4061",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24684,8 +24687,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-4085",
-   "self_type" : "type-4084",
+   "referenced_type" : "type-4091",
+   "self_type" : "type-4090",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24693,8 +24696,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-4945",
-   "self_type" : "type-4944",
+   "referenced_type" : "type-4951",
+   "self_type" : "type-4950",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24702,8 +24705,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-5419",
-   "self_type" : "type-5418",
+   "referenced_type" : "type-5425",
+   "self_type" : "type-5424",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24711,8 +24714,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-5526",
-   "self_type" : "type-5525",
+   "referenced_type" : "type-5532",
+   "self_type" : "type-5531",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24720,8 +24723,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-5585",
-   "self_type" : "type-5584",
+   "referenced_type" : "type-5591",
+   "self_type" : "type-5590",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24729,8 +24732,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-5678",
-   "self_type" : "type-5677",
+   "referenced_type" : "type-5689",
+   "self_type" : "type-5688",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24738,8 +24741,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-5976",
-   "self_type" : "type-5975",
+   "referenced_type" : "type-5986",
+   "self_type" : "type-5985",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24747,8 +24750,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-6006",
-   "self_type" : "type-6005",
+   "referenced_type" : "type-6015",
+   "self_type" : "type-6014",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24756,8 +24759,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-7058",
-   "self_type" : "type-7057",
+   "referenced_type" : "type-7066",
+   "self_type" : "type-7065",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24765,8 +24768,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-7086",
-   "self_type" : "type-7085",
+   "referenced_type" : "type-7096",
+   "self_type" : "type-7095",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24774,8 +24777,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-7311",
-   "self_type" : "type-7310",
+   "referenced_type" : "type-7331",
+   "self_type" : "type-7330",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24783,8 +24786,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-7735",
-   "self_type" : "type-7734",
+   "referenced_type" : "type-7756",
+   "self_type" : "type-7755",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24792,8 +24795,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-7842",
-   "self_type" : "type-7841",
+   "referenced_type" : "type-7863",
+   "self_type" : "type-7862",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24801,8 +24804,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-7901",
-   "self_type" : "type-7900",
+   "referenced_type" : "type-7922",
+   "self_type" : "type-7921",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24819,8 +24822,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-7994",
-   "self_type" : "type-7993",
+   "referenced_type" : "type-8020",
+   "self_type" : "type-8019",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24828,8 +24831,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-8180",
-   "self_type" : "type-8179",
+   "referenced_type" : "type-8204",
+   "self_type" : "type-8203",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24837,8 +24840,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-8329",
-   "self_type" : "type-8328",
+   "referenced_type" : "type-8353",
+   "self_type" : "type-8352",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24846,8 +24849,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-8424",
-   "self_type" : "type-8423",
+   "referenced_type" : "type-8449",
+   "self_type" : "type-8448",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24855,8 +24858,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-8474",
-   "self_type" : "type-8473",
+   "referenced_type" : "type-8498",
+   "self_type" : "type-8497",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24864,17 +24867,8 @@
    "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",
+   "referenced_type" : "type-8576",
+   "self_type" : "type-8575",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24891,6 +24885,15 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-8859",
+   "self_type" : "type-8858",
+   "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,
@@ -24900,8 +24903,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-9384",
-   "self_type" : "type-9383",
+   "referenced_type" : "type-9404",
+   "self_type" : "type-9403",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24918,8 +24921,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-1172",
-   "self_type" : "type-1171",
+   "referenced_type" : "type-1175",
+   "self_type" : "type-1174",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24927,8 +24930,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-1466",
-   "self_type" : "type-1465",
+   "referenced_type" : "type-1470",
+   "self_type" : "type-1469",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24936,8 +24939,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-1599",
-   "self_type" : "type-1598",
+   "referenced_type" : "type-1603",
+   "self_type" : "type-1602",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24945,8 +24948,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-3489",
-   "self_type" : "type-3488",
+   "referenced_type" : "type-3492",
+   "self_type" : "type-3491",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24954,8 +24957,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-3776",
-   "self_type" : "type-3775",
+   "referenced_type" : "type-3782",
+   "self_type" : "type-3781",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24963,8 +24966,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-3969",
-   "self_type" : "type-3968",
+   "referenced_type" : "type-3975",
+   "self_type" : "type-3974",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24972,8 +24975,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-3995",
-   "self_type" : "type-3994",
+   "referenced_type" : "type-4001",
+   "self_type" : "type-4000",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24981,8 +24984,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-4073",
-   "self_type" : "type-4072",
+   "referenced_type" : "type-4079",
+   "self_type" : "type-4078",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24990,8 +24993,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-5410",
-   "self_type" : "type-5409",
+   "referenced_type" : "type-5416",
+   "self_type" : "type-5415",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24999,8 +25002,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-5697",
-   "self_type" : "type-5696",
+   "referenced_type" : "type-5706",
+   "self_type" : "type-5705",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25017,8 +25020,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-5890",
-   "self_type" : "type-5889",
+   "referenced_type" : "type-5899",
+   "self_type" : "type-5898",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25026,8 +25029,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-5916",
-   "self_type" : "type-5915",
+   "referenced_type" : "type-5925",
+   "self_type" : "type-5924",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25035,8 +25038,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-5994",
-   "self_type" : "type-5993",
+   "referenced_type" : "type-6003",
+   "self_type" : "type-6002",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25044,8 +25047,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-7726",
-   "self_type" : "type-7725",
+   "referenced_type" : "type-7747",
+   "self_type" : "type-7746",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25062,8 +25065,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-8013",
-   "self_type" : "type-8012",
+   "referenced_type" : "type-8037",
+   "self_type" : "type-8036",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25071,8 +25074,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-8168",
-   "self_type" : "type-8167",
+   "referenced_type" : "type-8192",
+   "self_type" : "type-8191",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25080,8 +25083,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-8204",
-   "self_type" : "type-8203",
+   "referenced_type" : "type-8228",
+   "self_type" : "type-8227",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25089,8 +25092,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-8322",
-   "self_type" : "type-8321",
+   "referenced_type" : "type-8346",
+   "self_type" : "type-8345",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25098,8 +25101,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-8563",
-   "self_type" : "type-8562",
+   "referenced_type" : "type-8590",
+   "self_type" : "type-8589",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25107,8 +25110,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-8745",
-   "self_type" : "type-8744",
+   "referenced_type" : "type-8772",
+   "self_type" : "type-8771",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25116,8 +25119,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-8820",
-   "self_type" : "type-8819",
+   "referenced_type" : "type-8847",
+   "self_type" : "type-8846",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25125,8 +25128,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-3500",
-   "self_type" : "type-3499",
+   "referenced_type" : "type-3503",
+   "self_type" : "type-3502",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25134,8 +25137,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-3956",
-   "self_type" : "type-3955",
+   "referenced_type" : "type-3959",
+   "self_type" : "type-3958",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25143,8 +25146,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-4225",
-   "self_type" : "type-4224",
+   "referenced_type" : "type-4231",
+   "self_type" : "type-4230",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25152,8 +25155,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-5421",
-   "self_type" : "type-5420",
+   "referenced_type" : "type-5427",
+   "self_type" : "type-5426",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25170,8 +25173,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-5877",
-   "self_type" : "type-5876",
+   "referenced_type" : "type-5883",
+   "self_type" : "type-5882",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25179,8 +25182,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-6146",
-   "self_type" : "type-6145",
+   "referenced_type" : "type-6155",
+   "self_type" : "type-6154",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25188,8 +25191,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-6769",
-   "self_type" : "type-6768",
+   "referenced_type" : "type-6778",
+   "self_type" : "type-6777",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25197,8 +25200,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-7737",
-   "self_type" : "type-7736",
+   "referenced_type" : "type-7758",
+   "self_type" : "type-7757",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25215,8 +25218,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-8164",
-   "self_type" : "type-8163",
+   "referenced_type" : "type-8188",
+   "self_type" : "type-8187",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25224,8 +25227,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-8199",
-   "self_type" : "type-8198",
+   "referenced_type" : "type-8220",
+   "self_type" : "type-8219",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25233,8 +25236,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-8331",
-   "self_type" : "type-8330",
+   "referenced_type" : "type-8355",
+   "self_type" : "type-8354",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25242,8 +25245,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-9003",
-   "self_type" : "type-9002",
+   "referenced_type" : "type-9030",
+   "self_type" : "type-9029",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25251,8 +25254,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-9678",
-   "self_type" : "type-9677",
+   "referenced_type" : "type-9706",
+   "self_type" : "type-9705",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25269,8 +25272,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1265",
-   "self_type" : "type-1264",
+   "referenced_type" : "type-1268",
+   "self_type" : "type-1267",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -25278,8 +25281,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1369",
-   "self_type" : "type-1368",
+   "referenced_type" : "type-1372",
+   "self_type" : "type-1371",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -25287,8 +25290,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-3818",
-   "self_type" : "type-3817",
+   "referenced_type" : "type-3825",
+   "self_type" : "type-3824",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -25296,8 +25299,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-3914",
-   "self_type" : "type-3913",
+   "referenced_type" : "type-3920",
+   "self_type" : "type-3919",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -25305,8 +25308,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-5739",
-   "self_type" : "type-5738",
+   "referenced_type" : "type-5749",
+   "self_type" : "type-5748",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -25314,8 +25317,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-5835",
-   "self_type" : "type-5834",
+   "referenced_type" : "type-5844",
+   "self_type" : "type-5843",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -25323,8 +25326,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-8055",
-   "self_type" : "type-8054",
+   "referenced_type" : "type-8080",
+   "self_type" : "type-8079",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -25332,8 +25335,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-8582",
-   "self_type" : "type-8581",
+   "referenced_type" : "type-8609",
+   "self_type" : "type-8608",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -25341,8 +25344,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-8668",
-   "self_type" : "type-8667",
+   "referenced_type" : "type-8695",
+   "self_type" : "type-8694",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -25359,8 +25362,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-1159",
-   "self_type" : "type-1158",
+   "referenced_type" : "type-1162",
+   "self_type" : "type-1161",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25368,8 +25371,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-3508",
-   "self_type" : "type-3507",
+   "referenced_type" : "type-3511",
+   "self_type" : "type-3510",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25377,8 +25380,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-3618",
-   "self_type" : "type-3617",
+   "referenced_type" : "type-3621",
+   "self_type" : "type-3620",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25386,8 +25389,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-3666",
-   "self_type" : "type-3665",
+   "referenced_type" : "type-3669",
+   "self_type" : "type-3668",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25395,8 +25398,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-3764",
-   "self_type" : "type-3763",
+   "referenced_type" : "type-3770",
+   "self_type" : "type-3769",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25404,8 +25407,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-4251",
-   "self_type" : "type-4250",
+   "referenced_type" : "type-4257",
+   "self_type" : "type-4256",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25413,8 +25416,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-4515",
-   "self_type" : "type-4514",
+   "referenced_type" : "type-4521",
+   "self_type" : "type-4520",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25422,8 +25425,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-4558",
-   "self_type" : "type-4557",
+   "referenced_type" : "type-4564",
+   "self_type" : "type-4563",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25431,8 +25434,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-4688",
-   "self_type" : "type-4687",
+   "referenced_type" : "type-4694",
+   "self_type" : "type-4693",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25440,8 +25443,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-4950",
-   "self_type" : "type-4949",
+   "referenced_type" : "type-4956",
+   "self_type" : "type-4955",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25449,8 +25452,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-5429",
-   "self_type" : "type-5428",
+   "referenced_type" : "type-5435",
+   "self_type" : "type-5434",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25458,8 +25461,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-5539",
-   "self_type" : "type-5538",
+   "referenced_type" : "type-5545",
+   "self_type" : "type-5544",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25467,8 +25470,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-5587",
-   "self_type" : "type-5586",
+   "referenced_type" : "type-5593",
+   "self_type" : "type-5592",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25476,8 +25479,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-5685",
-   "self_type" : "type-5684",
+   "referenced_type" : "type-5694",
+   "self_type" : "type-5693",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25485,8 +25488,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6166",
-   "self_type" : "type-6165",
+   "referenced_type" : "type-6175",
+   "self_type" : "type-6174",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25494,8 +25497,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6399",
-   "self_type" : "type-6398",
+   "referenced_type" : "type-6408",
+   "self_type" : "type-6407",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25503,8 +25506,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6442",
-   "self_type" : "type-6441",
+   "referenced_type" : "type-6451",
+   "self_type" : "type-6450",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25512,8 +25515,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6568",
-   "self_type" : "type-6567",
+   "referenced_type" : "type-6577",
+   "self_type" : "type-6576",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25521,8 +25524,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6753",
-   "self_type" : "type-6752",
+   "referenced_type" : "type-6762",
+   "self_type" : "type-6761",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25530,8 +25533,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6759",
-   "self_type" : "type-6758",
+   "referenced_type" : "type-6769",
+   "self_type" : "type-6768",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25539,8 +25542,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6893",
-   "self_type" : "type-6892",
+   "referenced_type" : "type-6902",
+   "self_type" : "type-6901",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25548,8 +25551,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6912",
-   "self_type" : "type-6911",
+   "referenced_type" : "type-6921",
+   "self_type" : "type-6920",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25557,8 +25560,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7076",
-   "self_type" : "type-7075",
+   "referenced_type" : "type-7079",
+   "self_type" : "type-7078",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25566,8 +25569,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7088",
-   "self_type" : "type-7087",
+   "referenced_type" : "type-7098",
+   "self_type" : "type-7097",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25575,8 +25578,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7313",
-   "self_type" : "type-7312",
+   "referenced_type" : "type-7333",
+   "self_type" : "type-7332",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25584,8 +25587,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7745",
-   "self_type" : "type-7744",
+   "referenced_type" : "type-7766",
+   "self_type" : "type-7765",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25593,8 +25596,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7855",
-   "self_type" : "type-7854",
+   "referenced_type" : "type-7876",
+   "self_type" : "type-7875",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25602,8 +25605,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7903",
-   "self_type" : "type-7902",
+   "referenced_type" : "type-7924",
+   "self_type" : "type-7923",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25611,8 +25614,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-8001",
-   "self_type" : "type-8000",
+   "referenced_type" : "type-8025",
+   "self_type" : "type-8024",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25629,8 +25632,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-8184",
-   "self_type" : "type-8183",
+   "referenced_type" : "type-8208",
+   "self_type" : "type-8207",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25638,8 +25641,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-8338",
-   "self_type" : "type-8337",
+   "referenced_type" : "type-8362",
+   "self_type" : "type-8361",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25647,8 +25650,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-8432",
-   "self_type" : "type-8431",
+   "referenced_type" : "type-8456",
+   "self_type" : "type-8455",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25656,8 +25659,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-8476",
-   "self_type" : "type-8475",
+   "referenced_type" : "type-8500",
+   "self_type" : "type-8499",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25665,8 +25668,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-8554",
-   "self_type" : "type-8553",
+   "referenced_type" : "type-8581",
+   "self_type" : "type-8580",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25674,8 +25677,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-9023",
-   "self_type" : "type-9022",
+   "referenced_type" : "type-9050",
+   "self_type" : "type-9049",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25683,8 +25686,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-9283",
-   "self_type" : "type-9282",
+   "referenced_type" : "type-9311",
+   "self_type" : "type-9310",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25692,8 +25695,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-9342",
-   "self_type" : "type-9341",
+   "referenced_type" : "type-9370",
+   "self_type" : "type-9369",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25701,8 +25704,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-9405",
-   "self_type" : "type-9404",
+   "referenced_type" : "type-9430",
+   "self_type" : "type-9429",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25710,8 +25713,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-9487",
-   "self_type" : "type-9486",
+   "referenced_type" : "type-9514",
+   "self_type" : "type-9513",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25737,8 +25740,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-9661",
-   "self_type" : "type-9660",
+   "referenced_type" : "type-9688",
+   "self_type" : "type-9687",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25746,8 +25749,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-9667",
-   "self_type" : "type-9666",
+   "referenced_type" : "type-9695",
+   "self_type" : "type-9694",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25755,8 +25758,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-9793",
-   "self_type" : "type-9792",
+   "referenced_type" : "type-9821",
+   "self_type" : "type-9820",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25764,8 +25767,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-9814",
-   "self_type" : "type-9813",
+   "referenced_type" : "type-9841",
+   "self_type" : "type-9840",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25773,8 +25776,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ISurfaceComposer *",
    "name" : "android::ISurfaceComposer *",
-   "referenced_type" : "type-1050",
-   "self_type" : "type-1049",
+   "referenced_type" : "type-1053",
+   "self_type" : "type-1052",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25782,8 +25785,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ISurfaceComposer *",
    "name" : "android::ISurfaceComposer *",
-   "referenced_type" : "type-3677",
-   "self_type" : "type-3676",
+   "referenced_type" : "type-3683",
+   "self_type" : "type-3682",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25791,8 +25794,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ISurfaceComposer *",
    "name" : "android::ISurfaceComposer *",
-   "referenced_type" : "type-5598",
-   "self_type" : "type-5597",
+   "referenced_type" : "type-5607",
+   "self_type" : "type-5606",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25800,8 +25803,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ISurfaceComposer *",
    "name" : "android::ISurfaceComposer *",
-   "referenced_type" : "type-7914",
-   "self_type" : "type-7913",
+   "referenced_type" : "type-7938",
+   "self_type" : "type-7937",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25809,8 +25812,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ISurfaceComposer *",
    "name" : "android::ISurfaceComposer *",
-   "referenced_type" : "type-8480",
-   "self_type" : "type-8479",
+   "referenced_type" : "type-8507",
+   "self_type" : "type-8506",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25818,8 +25821,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ITransactionCompletedListener *",
    "name" : "android::ITransactionCompletedListener *",
-   "referenced_type" : "type-1042",
-   "self_type" : "type-1041",
+   "referenced_type" : "type-1046",
+   "self_type" : "type-1045",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25827,8 +25830,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ITransactionCompletedListener *",
    "name" : "android::ITransactionCompletedListener *",
-   "referenced_type" : "type-3672",
-   "self_type" : "type-3671",
+   "referenced_type" : "type-3678",
+   "self_type" : "type-3677",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25836,8 +25839,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ITransactionCompletedListener *",
    "name" : "android::ITransactionCompletedListener *",
-   "referenced_type" : "type-5593",
-   "self_type" : "type-5592",
+   "referenced_type" : "type-5602",
+   "self_type" : "type-5601",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25845,8 +25848,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ITransactionCompletedListener *",
    "name" : "android::ITransactionCompletedListener *",
-   "referenced_type" : "type-7909",
-   "self_type" : "type-7908",
+   "referenced_type" : "type-7933",
+   "self_type" : "type-7932",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25854,8 +25857,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ITransactionCompletedListener *",
    "name" : "android::ITransactionCompletedListener *",
-   "referenced_type" : "type-8478",
-   "self_type" : "type-8477",
+   "referenced_type" : "type-8505",
+   "self_type" : "type-8504",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25890,8 +25893,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::LWProducerListener *",
    "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-2539",
-   "self_type" : "type-2538",
+   "referenced_type" : "type-2542",
+   "self_type" : "type-2541",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25899,8 +25902,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::LWProducerListener *",
    "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-4953",
-   "self_type" : "type-4952",
+   "referenced_type" : "type-4959",
+   "self_type" : "type-4958",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25908,8 +25911,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::LWProducerListener *",
    "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-7090",
-   "self_type" : "type-7089",
+   "referenced_type" : "type-7094",
+   "self_type" : "type-7093",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25917,8 +25920,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::LWProducerListener *",
    "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-8186",
-   "self_type" : "type-8185",
+   "referenced_type" : "type-8210",
+   "self_type" : "type-8209",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25926,8 +25929,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::LWProducerListener *",
    "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-9431",
-   "self_type" : "type-9430",
+   "referenced_type" : "type-9452",
+   "self_type" : "type-9451",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25936,7 +25939,7 @@
    "linker_set_key" : "android::LightFlattenablePod<android::Rect> *",
    "name" : "android::LightFlattenablePod<android::Rect> *",
    "referenced_type" : "type-46",
-   "self_type" : "type-4589",
+   "self_type" : "type-4595",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -25980,8 +25983,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::List<Event>::_Node *",
    "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-3687",
-   "self_type" : "type-3686",
+   "referenced_type" : "type-3693",
+   "self_type" : "type-3692",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -25989,8 +25992,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::List<Event>::_Node *",
    "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-5608",
-   "self_type" : "type-5607",
+   "referenced_type" : "type-5617",
+   "self_type" : "type-5616",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -25998,8 +26001,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::List<Event>::_Node *",
    "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-7924",
-   "self_type" : "type-7923",
+   "referenced_type" : "type-7948",
+   "self_type" : "type-7947",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -26007,8 +26010,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::List<Event>::_Node *",
    "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-8215",
-   "self_type" : "type-8214",
+   "referenced_type" : "type-8240",
+   "self_type" : "type-8239",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -26124,8 +26127,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::OMXPluginBase *",
    "name" : "android::OMXPluginBase *",
-   "referenced_type" : "type-2393",
-   "self_type" : "type-2394",
+   "referenced_type" : "type-2396",
+   "self_type" : "type-2397",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h"
   },
@@ -26142,8 +26145,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel::FlattenableHelper<android::BufferItem> *",
    "name" : "android::Parcel::FlattenableHelper<android::BufferItem> *",
-   "referenced_type" : "type-1516",
-   "self_type" : "type-1518",
+   "referenced_type" : "type-1520",
+   "self_type" : "type-1522",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -26151,8 +26154,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel::FlattenableHelper<android::Fence> *",
    "name" : "android::Parcel::FlattenableHelper<android::Fence> *",
-   "referenced_type" : "type-1658",
-   "self_type" : "type-1661",
+   "referenced_type" : "type-1662",
+   "self_type" : "type-1665",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -26160,8 +26163,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta> *",
    "name" : "android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta> *",
-   "referenced_type" : "type-4328",
-   "self_type" : "type-4330",
+   "referenced_type" : "type-4334",
+   "self_type" : "type-4336",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -26169,8 +26172,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel::FlattenableHelper<android::GraphicBuffer> *",
    "name" : "android::Parcel::FlattenableHelper<android::GraphicBuffer> *",
-   "referenced_type" : "type-1653",
-   "self_type" : "type-1655",
+   "referenced_type" : "type-1657",
+   "self_type" : "type-1659",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -26178,8 +26181,8 @@
    "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",
+   "referenced_type" : "type-4339",
+   "self_type" : "type-4342",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -26187,8 +26190,8 @@
    "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",
+   "referenced_type" : "type-4345",
+   "self_type" : "type-4347",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -26232,8 +26235,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ProcessState *",
    "name" : "android::ProcessState *",
-   "referenced_type" : "type-1261",
-   "self_type" : "type-1260",
+   "referenced_type" : "type-1264",
+   "self_type" : "type-1263",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26277,8 +26280,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1079",
-   "self_type" : "type-1078",
+   "referenced_type" : "type-1082",
+   "self_type" : "type-1081",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26286,8 +26289,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1191",
-   "self_type" : "type-1190",
+   "referenced_type" : "type-1194",
+   "self_type" : "type-1193",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26295,8 +26298,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1352",
-   "self_type" : "type-1351",
+   "referenced_type" : "type-1355",
+   "self_type" : "type-1354",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26304,8 +26307,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1404",
-   "self_type" : "type-1403",
+   "referenced_type" : "type-1407",
+   "self_type" : "type-1406",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26313,8 +26316,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1419",
+   "referenced_type" : "type-1423",
+   "self_type" : "type-1422",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26322,8 +26325,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1441",
-   "self_type" : "type-1440",
+   "referenced_type" : "type-1444",
+   "self_type" : "type-1443",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26331,8 +26334,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1482",
-   "self_type" : "type-1481",
+   "referenced_type" : "type-1486",
+   "self_type" : "type-1485",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26340,8 +26343,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1616",
-   "self_type" : "type-1615",
+   "referenced_type" : "type-1620",
+   "self_type" : "type-1619",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26349,8 +26352,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2649",
-   "self_type" : "type-2648",
+   "referenced_type" : "type-2652",
+   "self_type" : "type-2651",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26358,8 +26361,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3459",
-   "self_type" : "type-3458",
+   "referenced_type" : "type-3462",
+   "self_type" : "type-3461",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26367,8 +26370,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3525",
-   "self_type" : "type-3524",
+   "referenced_type" : "type-3528",
+   "self_type" : "type-3527",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26376,8 +26379,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3627",
-   "self_type" : "type-3626",
+   "referenced_type" : "type-3630",
+   "self_type" : "type-3629",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26385,8 +26388,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3689",
-   "self_type" : "type-3688",
+   "referenced_type" : "type-3695",
+   "self_type" : "type-3694",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26394,8 +26397,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3781",
-   "self_type" : "type-3780",
+   "referenced_type" : "type-3787",
+   "self_type" : "type-3786",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26403,8 +26406,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3842",
-   "self_type" : "type-3841",
+   "referenced_type" : "type-3848",
+   "self_type" : "type-3847",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26412,8 +26415,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3906",
-   "self_type" : "type-3905",
+   "referenced_type" : "type-3912",
+   "self_type" : "type-3911",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26421,8 +26424,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3932",
-   "self_type" : "type-3931",
+   "referenced_type" : "type-3938",
+   "self_type" : "type-3937",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26430,8 +26433,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3947",
-   "self_type" : "type-3946",
+   "referenced_type" : "type-3954",
+   "self_type" : "type-3953",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26439,8 +26442,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3973",
-   "self_type" : "type-3972",
+   "referenced_type" : "type-3979",
+   "self_type" : "type-3978",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26448,8 +26451,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4006",
-   "self_type" : "type-4005",
+   "referenced_type" : "type-4012",
+   "self_type" : "type-4011",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26457,8 +26460,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4087",
-   "self_type" : "type-4086",
+   "referenced_type" : "type-4093",
+   "self_type" : "type-4092",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26466,8 +26469,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4287",
-   "self_type" : "type-4286",
+   "referenced_type" : "type-4293",
+   "self_type" : "type-4292",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26475,8 +26478,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4474",
-   "self_type" : "type-4473",
+   "referenced_type" : "type-4480",
+   "self_type" : "type-4479",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26484,8 +26487,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4527",
-   "self_type" : "type-4526",
+   "referenced_type" : "type-4533",
+   "self_type" : "type-4532",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26493,8 +26496,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4535",
-   "self_type" : "type-4534",
+   "referenced_type" : "type-4542",
+   "self_type" : "type-4541",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26502,8 +26505,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4561",
-   "self_type" : "type-4560",
+   "referenced_type" : "type-4567",
+   "self_type" : "type-4566",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26511,8 +26514,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4711",
-   "self_type" : "type-4710",
+   "referenced_type" : "type-4718",
+   "self_type" : "type-4717",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26520,8 +26523,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4842",
-   "self_type" : "type-4841",
+   "referenced_type" : "type-4848",
+   "self_type" : "type-4847",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26529,8 +26532,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4991",
-   "self_type" : "type-4990",
+   "referenced_type" : "type-4997",
+   "self_type" : "type-4996",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26538,8 +26541,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5380",
-   "self_type" : "type-5379",
+   "referenced_type" : "type-5386",
+   "self_type" : "type-5385",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26547,8 +26550,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5446",
-   "self_type" : "type-5445",
+   "referenced_type" : "type-5452",
+   "self_type" : "type-5451",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26565,8 +26568,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5548",
-   "self_type" : "type-5547",
+   "referenced_type" : "type-5554",
+   "self_type" : "type-5553",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26574,8 +26577,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5610",
-   "self_type" : "type-5609",
+   "referenced_type" : "type-5619",
+   "self_type" : "type-5618",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26583,8 +26586,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5702",
-   "self_type" : "type-5701",
+   "referenced_type" : "type-5711",
+   "self_type" : "type-5710",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26592,8 +26595,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5763",
-   "self_type" : "type-5762",
+   "referenced_type" : "type-5772",
+   "self_type" : "type-5771",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26601,8 +26604,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5827",
-   "self_type" : "type-5826",
+   "referenced_type" : "type-5836",
+   "self_type" : "type-5835",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26610,8 +26613,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5853",
-   "self_type" : "type-5852",
+   "referenced_type" : "type-5862",
+   "self_type" : "type-5861",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26619,8 +26622,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5868",
-   "self_type" : "type-5867",
+   "referenced_type" : "type-5878",
+   "self_type" : "type-5877",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26628,8 +26631,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5894",
-   "self_type" : "type-5893",
+   "referenced_type" : "type-5903",
+   "self_type" : "type-5902",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26637,8 +26640,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5927",
-   "self_type" : "type-5926",
+   "referenced_type" : "type-5936",
+   "self_type" : "type-5935",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26646,8 +26649,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6008",
-   "self_type" : "type-6007",
+   "referenced_type" : "type-6017",
+   "self_type" : "type-6016",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26655,8 +26658,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6196",
-   "self_type" : "type-6195",
+   "referenced_type" : "type-6205",
+   "self_type" : "type-6204",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26664,8 +26667,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6363",
-   "self_type" : "type-6362",
+   "referenced_type" : "type-6372",
+   "self_type" : "type-6371",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26673,8 +26676,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6411",
-   "self_type" : "type-6410",
+   "referenced_type" : "type-6420",
+   "self_type" : "type-6419",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26682,8 +26685,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6419",
-   "self_type" : "type-6418",
+   "referenced_type" : "type-6429",
+   "self_type" : "type-6428",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26691,8 +26694,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6445",
-   "self_type" : "type-6444",
+   "referenced_type" : "type-6454",
+   "self_type" : "type-6453",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26700,8 +26703,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6585",
-   "self_type" : "type-6584",
+   "referenced_type" : "type-6595",
+   "self_type" : "type-6594",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26709,8 +26712,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6706",
-   "self_type" : "type-6705",
+   "referenced_type" : "type-6715",
+   "self_type" : "type-6714",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26718,8 +26721,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6736",
-   "self_type" : "type-6735",
+   "referenced_type" : "type-6745",
+   "self_type" : "type-6744",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26727,8 +26730,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6779",
-   "self_type" : "type-6778",
+   "referenced_type" : "type-6789",
+   "self_type" : "type-6788",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26736,8 +26739,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6869",
-   "self_type" : "type-6868",
+   "referenced_type" : "type-6878",
+   "self_type" : "type-6877",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26745,8 +26748,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6932",
-   "self_type" : "type-6931",
+   "referenced_type" : "type-6941",
+   "self_type" : "type-6940",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26754,8 +26757,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7047",
-   "self_type" : "type-7046",
+   "referenced_type" : "type-7057",
+   "self_type" : "type-7056",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26763,8 +26766,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7094",
-   "self_type" : "type-7093",
+   "referenced_type" : "type-7103",
+   "self_type" : "type-7102",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26772,8 +26775,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7193",
-   "self_type" : "type-7192",
+   "referenced_type" : "type-7202",
+   "self_type" : "type-7201",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26781,8 +26784,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7282",
-   "self_type" : "type-7281",
+   "referenced_type" : "type-7302",
+   "self_type" : "type-7301",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26790,8 +26793,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7319",
-   "self_type" : "type-7318",
+   "referenced_type" : "type-7341",
+   "self_type" : "type-7340",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26808,8 +26811,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7696",
-   "self_type" : "type-7695",
+   "referenced_type" : "type-7717",
+   "self_type" : "type-7716",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26817,8 +26820,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7762",
-   "self_type" : "type-7761",
+   "referenced_type" : "type-7783",
+   "self_type" : "type-7782",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26826,8 +26829,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7864",
-   "self_type" : "type-7863",
+   "referenced_type" : "type-7885",
+   "self_type" : "type-7884",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26835,8 +26838,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7926",
-   "self_type" : "type-7925",
+   "referenced_type" : "type-7950",
+   "self_type" : "type-7949",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26844,8 +26847,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-8018",
-   "self_type" : "type-8017",
+   "referenced_type" : "type-8042",
+   "self_type" : "type-8041",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26853,8 +26856,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-8079",
-   "self_type" : "type-8078",
+   "referenced_type" : "type-8103",
+   "self_type" : "type-8102",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26862,8 +26865,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-8141",
-   "self_type" : "type-8140",
+   "referenced_type" : "type-8165",
+   "self_type" : "type-8164",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26871,8 +26874,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-8201",
-   "self_type" : "type-8200",
+   "referenced_type" : "type-8225",
+   "self_type" : "type-8224",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26880,17 +26883,8 @@
    "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",
+   "referenced_type" : "type-8321",
+   "self_type" : "type-8320",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26907,8 +26901,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-8438",
-   "self_type" : "type-8437",
+   "referenced_type" : "type-8373",
+   "self_type" : "type-8372",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26916,8 +26910,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-8487",
-   "self_type" : "type-8486",
+   "referenced_type" : "type-8462",
+   "self_type" : "type-8461",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26925,8 +26919,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-8567",
-   "self_type" : "type-8566",
+   "referenced_type" : "type-8514",
+   "self_type" : "type-8513",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26934,8 +26928,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-8660",
-   "self_type" : "type-8659",
+   "referenced_type" : "type-8594",
+   "self_type" : "type-8593",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26943,8 +26937,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-8686",
-   "self_type" : "type-8685",
+   "referenced_type" : "type-8687",
+   "self_type" : "type-8686",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26952,8 +26946,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-8702",
-   "self_type" : "type-8701",
+   "referenced_type" : "type-8713",
+   "self_type" : "type-8712",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26961,8 +26955,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-8724",
-   "self_type" : "type-8723",
+   "referenced_type" : "type-8730",
+   "self_type" : "type-8729",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26970,8 +26964,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-8756",
-   "self_type" : "type-8755",
+   "referenced_type" : "type-8751",
+   "self_type" : "type-8750",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26979,8 +26973,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-8834",
-   "self_type" : "type-8833",
+   "referenced_type" : "type-8783",
+   "self_type" : "type-8782",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26988,8 +26982,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-9053",
-   "self_type" : "type-9052",
+   "referenced_type" : "type-8863",
+   "self_type" : "type-8862",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26997,8 +26991,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-9237",
-   "self_type" : "type-9236",
+   "referenced_type" : "type-9080",
+   "self_type" : "type-9079",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27006,8 +27000,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-9299",
-   "self_type" : "type-9298",
+   "referenced_type" : "type-9265",
+   "self_type" : "type-9264",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27015,8 +27009,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-9314",
-   "self_type" : "type-9313",
+   "referenced_type" : "type-9327",
+   "self_type" : "type-9326",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27024,8 +27018,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-9351",
-   "self_type" : "type-9350",
+   "referenced_type" : "type-9342",
+   "self_type" : "type-9341",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27033,8 +27027,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-9500",
-   "self_type" : "type-9499",
+   "referenced_type" : "type-9378",
+   "self_type" : "type-9377",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27042,8 +27036,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-9602",
-   "self_type" : "type-9601",
+   "referenced_type" : "type-9528",
+   "self_type" : "type-9527",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27051,8 +27045,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-9637",
-   "self_type" : "type-9636",
+   "referenced_type" : "type-9629",
+   "self_type" : "type-9628",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27060,8 +27054,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-9691",
-   "self_type" : "type-9690",
+   "referenced_type" : "type-9666",
+   "self_type" : "type-9665",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-9718",
+   "self_type" : "type-9717",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27078,8 +27081,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-9751",
-   "self_type" : "type-9750",
+   "referenced_type" : "type-9770",
+   "self_type" : "type-9769",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27087,8 +27090,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-9769",
-   "self_type" : "type-9768",
+   "referenced_type" : "type-9798",
+   "self_type" : "type-9797",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27096,8 +27099,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-9832",
-   "self_type" : "type-9831",
+   "referenced_type" : "type-9860",
+   "self_type" : "type-9859",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27114,8 +27117,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ReferenceRenamer *",
    "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-1166",
-   "self_type" : "type-1212",
+   "referenced_type" : "type-1167",
+   "self_type" : "type-1211",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27123,8 +27126,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> > *",
    "name" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> > *",
-   "referenced_type" : "type-1563",
-   "self_type" : "type-1564",
+   "referenced_type" : "type-1568",
+   "self_type" : "type-1569",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -27132,8 +27135,8 @@
    "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",
+   "referenced_type" : "type-1572",
+   "self_type" : "type-1573",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -27141,132 +27144,6 @@
    "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,
@@ -27274,8 +27151,17 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long> > *",
-   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long> > *",
+   "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-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<android_dataspace_t> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<android_dataspace_t> > *",
    "referenced_type" : "type-2091",
    "self_type" : "type-2092",
    "size" : 4,
@@ -27283,116 +27169,125 @@
   },
   {
    "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-2111",
+   "self_type" : "type-2112",
+   "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-2097",
+   "self_type" : "type-2098",
+   "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-2116",
+   "self_type" : "type-2117",
+   "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-2086",
+   "self_type" : "type-2087",
+   "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-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<int *, const sp<GraphicBuffer> &> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int *, const sp<GraphicBuffer> &> > *",
+   "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, unsigned long long, const sp<Fence> &> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int, unsigned long long, const sp<Fence> &> > *",
+   "referenced_type" : "type-2064",
+   "self_type" : "type-2065",
+   "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-2055",
+   "self_type" : "type-2056",
+   "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-2107",
+   "self_type" : "type-2108",
+   "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-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<unsigned int> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned int> > *",
+   "referenced_type" : "type-2103",
+   "self_type" : "type-2104",
+   "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-2077",
+   "self_type" : "type-2078",
+   "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-2095",
+   "self_type" : "type-2096",
+   "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,
@@ -27400,17 +27295,62 @@
   },
   {
    "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",
+   "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-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<unsigned long long *> > *",
-   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long *> > *",
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<android_dataspace_t> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<android_dataspace_t> > *",
+   "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<bool, vector<Segment, allocator<Segment> > *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool, vector<Segment, allocator<Segment> > *> > *",
+   "referenced_type" : "type-2169",
+   "self_type" : "type-2170",
+   "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-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<const String8 &, String8 *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &, String8 *> > *",
+   "referenced_type" : "type-2171",
+   "self_type" : "type-2172",
+   "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-2155",
+   "self_type" : "type-2156",
+   "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-2147",
    "self_type" : "type-2148",
    "size" : 4,
@@ -27418,10 +27358,73 @@
   },
   {
    "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-2142",
+   "self_type" : "type-2143",
+   "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-2144",
+   "self_type" : "type-2145",
+   "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-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<sp<NativeHandle> *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<sp<NativeHandle> *> > *",
+   "referenced_type" : "type-2166",
+   "self_type" : "type-2167",
+   "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-2153",
+   "self_type" : "type-2154",
+   "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-2164",
+   "self_type" : "type-2165",
+   "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-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<unsigned long long> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long> > *",
-   "referenced_type" : "type-2156",
-   "self_type" : "type-2157",
+   "referenced_type" : "type-2160",
+   "self_type" : "type-2161",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -27429,8 +27432,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::SafeBnInterface<android::IConsumerListener> *",
    "name" : "android::SafeBnInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-1287",
-   "self_type" : "type-1292",
+   "referenced_type" : "type-1290",
+   "self_type" : "type-1295",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -27438,8 +27441,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
    "name" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-1276",
-   "self_type" : "type-1286",
+   "referenced_type" : "type-1279",
+   "self_type" : "type-1289",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -27447,8 +27450,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::SafeBnInterface<android::ITransactionCompletedListener> *",
    "name" : "android::SafeBnInterface<android::ITransactionCompletedListener> *",
-   "referenced_type" : "type-1102",
-   "self_type" : "type-1105",
+   "referenced_type" : "type-1105",
+   "self_type" : "type-1108",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -27456,8 +27459,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::SafeBpInterface<android::IConsumerListener> *",
    "name" : "android::SafeBpInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-1537",
-   "self_type" : "type-1539",
+   "referenced_type" : "type-1541",
+   "self_type" : "type-1543",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -27465,8 +27468,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::SafeBpInterface<android::IGraphicBufferConsumer> *",
    "name" : "android::SafeBpInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-1716",
-   "self_type" : "type-1718",
+   "referenced_type" : "type-1720",
+   "self_type" : "type-1723",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -27474,8 +27477,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::SafeInterface::ParcelHandler *",
    "name" : "android::SafeInterface::ParcelHandler *",
-   "referenced_type" : "type-1235",
-   "self_type" : "type-1245",
+   "referenced_type" : "type-1238",
+   "self_type" : "type-1247",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -27493,7 +27496,7 @@
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > > *",
    "name" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > > *",
    "referenced_type" : "type-159",
-   "self_type" : "type-2674",
+   "self_type" : "type-2677",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27502,7 +27505,7 @@
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > > *",
    "name" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > > *",
    "referenced_type" : "type-146",
-   "self_type" : "type-2669",
+   "self_type" : "type-2672",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27511,7 +27514,7 @@
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
    "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
    "referenced_type" : "type-139",
-   "self_type" : "type-2666",
+   "self_type" : "type-2669",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27519,8 +27522,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 *",
    "name" : "android::String16 *",
-   "referenced_type" : "type-1239",
-   "self_type" : "type-2661",
+   "referenced_type" : "type-1242",
+   "self_type" : "type-2664",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -27529,7 +27532,7 @@
    "linker_set_key" : "android::String8 *",
    "name" : "android::String8 *",
    "referenced_type" : "type-121",
-   "self_type" : "type-1885",
+   "self_type" : "type-1889",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -27537,8 +27540,8 @@
    "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",
+   "referenced_type" : "type-2470",
+   "self_type" : "type-2469",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27546,8 +27549,8 @@
    "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",
+   "referenced_type" : "type-4895",
+   "self_type" : "type-4894",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27555,8 +27558,8 @@
    "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",
+   "referenced_type" : "type-6871",
+   "self_type" : "type-6870",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27564,8 +27567,8 @@
    "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",
+   "referenced_type" : "type-8183",
+   "self_type" : "type-8182",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27573,8 +27576,8 @@
    "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",
+   "referenced_type" : "type-9219",
+   "self_type" : "type-9218",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27592,7 +27595,7 @@
    "linker_set_key" : "android::Vector<android::BufferItem> *",
    "name" : "android::Vector<android::BufferItem> *",
    "referenced_type" : "type-837",
-   "self_type" : "type-976",
+   "self_type" : "type-978",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27600,8 +27603,8 @@
    "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",
+   "referenced_type" : "type-1228",
+   "self_type" : "type-1230",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27609,8 +27612,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<int> *",
    "name" : "android::Vector<int> *",
-   "referenced_type" : "type-2686",
-   "self_type" : "type-2687",
+   "referenced_type" : "type-2689",
+   "self_type" : "type-2690",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27618,8 +27621,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<long long> *",
    "name" : "android::Vector<long long> *",
-   "referenced_type" : "type-1081",
-   "self_type" : "type-1082",
+   "referenced_type" : "type-1084",
+   "self_type" : "type-1085",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27627,8 +27630,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::VirtualLightRefBase *",
    "name" : "android::VirtualLightRefBase *",
-   "referenced_type" : "type-2354",
-   "self_type" : "type-2392",
+   "referenced_type" : "type-2357",
+   "self_type" : "type-2395",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -27636,8 +27639,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::base::EagerEvaluator<char *, char *> *",
    "name" : "android::base::EagerEvaluator<char *, char *> *",
-   "referenced_type" : "type-4699",
-   "self_type" : "type-4701",
+   "referenced_type" : "type-4705",
+   "self_type" : "type-4708",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27645,8 +27648,8 @@
    "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",
+   "referenced_type" : "type-4702",
+   "self_type" : "type-4703",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27654,8 +27657,8 @@
    "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",
+   "referenced_type" : "type-4689",
+   "self_type" : "type-4692",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27663,8 +27666,8 @@
    "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",
+   "referenced_type" : "type-4672",
+   "self_type" : "type-4687",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27672,8 +27675,8 @@
    "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",
+   "referenced_type" : "type-4729",
+   "self_type" : "type-4735",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27681,8 +27684,8 @@
    "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",
+   "referenced_type" : "type-4736",
+   "self_type" : "type-4739",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27690,8 +27693,8 @@
    "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",
+   "referenced_type" : "type-4710",
+   "self_type" : "type-4712",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27699,8 +27702,8 @@
    "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",
+   "referenced_type" : "type-4713",
+   "self_type" : "type-4714",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27708,8 +27711,8 @@
    "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",
+   "referenced_type" : "type-4740",
+   "self_type" : "type-4746",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27717,8 +27720,8 @@
    "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",
+   "referenced_type" : "type-4747",
+   "self_type" : "type-4753",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27726,8 +27729,8 @@
    "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",
+   "referenced_type" : "type-4716",
+   "self_type" : "type-4721",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27735,8 +27738,8 @@
    "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",
+   "referenced_type" : "type-4722",
+   "self_type" : "type-4727",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27744,8 +27747,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::base::ErrnoRestorer *",
    "name" : "android::base::ErrnoRestorer *",
-   "referenced_type" : "type-4656",
-   "self_type" : "type-4822",
+   "referenced_type" : "type-4663",
+   "self_type" : "type-4828",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27753,8 +27756,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
    "name" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
-   "referenced_type" : "type-2553",
-   "self_type" : "type-2565",
+   "referenced_type" : "type-2556",
+   "self_type" : "type-2568",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -27771,8 +27774,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1362",
-   "self_type" : "type-1361",
+   "referenced_type" : "type-1365",
+   "self_type" : "type-1364",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27789,8 +27792,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1359",
-   "self_type" : "type-1358",
+   "referenced_type" : "type-1362",
+   "self_type" : "type-1361",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27798,8 +27801,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1377",
-   "self_type" : "type-1381",
+   "referenced_type" : "type-1380",
+   "self_type" : "type-1384",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -27807,8 +27810,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1396",
-   "self_type" : "type-1395",
+   "referenced_type" : "type-1399",
+   "self_type" : "type-1398",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27816,8 +27819,8 @@
    "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",
+   "referenced_type" : "type-6779",
+   "self_type" : "type-6780",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27825,24 +27828,6 @@
    "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,
@@ -27850,8 +27835,8 @@
   },
   {
    "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> > *",
+   "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-4494",
    "self_type" : "type-4495",
    "size" : 4,
@@ -27859,10 +27844,28 @@
   },
   {
    "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-4371",
+   "self_type" : "type-4372",
+   "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-4500",
+   "self_type" : "type-4501",
+   "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",
+   "referenced_type" : "type-4359",
+   "self_type" : "type-4360",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27879,8 +27882,8 @@
    "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",
+   "referenced_type" : "type-6783",
+   "self_type" : "type-6784",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27943,7 +27946,7 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> > *",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> > *",
    "referenced_type" : "type-381",
-   "self_type" : "type-6895",
+   "self_type" : "type-6904",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -27952,7 +27955,7 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect> *",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect> *",
    "referenced_type" : "type-372",
-   "self_type" : "type-4595",
+   "self_type" : "type-4601",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -27961,7 +27964,7 @@
    "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",
+   "self_type" : "type-4352",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -27979,7 +27982,7 @@
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
    "referenced_type" : "type-595",
-   "self_type" : "type-2464",
+   "self_type" : "type-2467",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27996,8 +27999,8 @@
    "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",
+   "referenced_type" : "type-2459",
+   "self_type" : "type-2458",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28005,8 +28008,8 @@
    "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",
+   "referenced_type" : "type-4691",
+   "self_type" : "type-4690",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28014,8 +28017,8 @@
    "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",
+   "referenced_type" : "type-6574",
+   "self_type" : "type-6573",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28023,8 +28026,8 @@
    "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",
+   "referenced_type" : "type-9511",
+   "self_type" : "type-9510",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28032,8 +28035,8 @@
    "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",
+   "referenced_type" : "type-4248",
+   "self_type" : "type-4247",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28041,8 +28044,8 @@
    "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",
+   "referenced_type" : "type-6167",
+   "self_type" : "type-6166",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28050,8 +28053,8 @@
    "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",
+   "referenced_type" : "type-9042",
+   "self_type" : "type-9041",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28059,8 +28062,8 @@
    "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",
+   "referenced_type" : "type-4471",
+   "self_type" : "type-4470",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28068,8 +28071,8 @@
    "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",
+   "referenced_type" : "type-6366",
+   "self_type" : "type-6365",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28077,8 +28080,8 @@
    "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",
+   "referenced_type" : "type-9256",
+   "self_type" : "type-9255",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28087,7 +28090,7 @@
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
    "referenced_type" : "type-677",
-   "self_type" : "type-2477",
+   "self_type" : "type-2480",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28096,7 +28099,7 @@
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
    "referenced_type" : "type-604",
-   "self_type" : "type-2471",
+   "self_type" : "type-2474",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28104,8 +28107,8 @@
    "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",
+   "referenced_type" : "type-2483",
+   "self_type" : "type-2482",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28113,8 +28116,8 @@
    "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",
+   "referenced_type" : "type-4903",
+   "self_type" : "type-4902",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28122,8 +28125,8 @@
    "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",
+   "referenced_type" : "type-6900",
+   "self_type" : "type-6899",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28131,8 +28134,8 @@
    "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",
+   "referenced_type" : "type-8186",
+   "self_type" : "type-8185",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28140,8 +28143,8 @@
    "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",
+   "referenced_type" : "type-9273",
+   "self_type" : "type-9272",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28149,8 +28152,8 @@
    "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",
+   "referenced_type" : "type-6918",
+   "self_type" : "type-6917",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28158,8 +28161,8 @@
    "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",
+   "referenced_type" : "type-9839",
+   "self_type" : "type-9838",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28167,8 +28170,8 @@
    "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",
+   "referenced_type" : "type-4242",
+   "self_type" : "type-4241",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28176,8 +28179,8 @@
    "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",
+   "referenced_type" : "type-6163",
+   "self_type" : "type-6162",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28185,8 +28188,8 @@
    "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",
+   "referenced_type" : "type-9038",
+   "self_type" : "type-9037",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28194,8 +28197,8 @@
    "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",
+   "referenced_type" : "type-4463",
+   "self_type" : "type-4462",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28203,8 +28206,8 @@
    "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",
+   "referenced_type" : "type-6361",
+   "self_type" : "type-6360",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28212,8 +28215,8 @@
    "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",
+   "referenced_type" : "type-6771",
+   "self_type" : "type-6770",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28221,8 +28224,8 @@
    "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",
+   "referenced_type" : "type-9252",
+   "self_type" : "type-9251",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28230,8 +28233,8 @@
    "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",
+   "referenced_type" : "type-9699",
+   "self_type" : "type-9698",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28294,7 +28297,7 @@
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > *",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > *",
    "referenced_type" : "type-462",
-   "self_type" : "type-6939",
+   "self_type" : "type-6949",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -28303,7 +28306,7 @@
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::media::V1_0::Rect> *",
    "name" : "android::hardware::hidl_vec<android::hardware::media::V1_0::Rect> *",
    "referenced_type" : "type-453",
-   "self_type" : "type-4567",
+   "self_type" : "type-4573",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -28312,7 +28315,7 @@
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> *",
    "name" : "android::hardware::hidl_vec<unsigned char> *",
    "referenced_type" : "type-452",
-   "self_type" : "type-4374",
+   "self_type" : "type-4381",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -28339,7 +28342,7 @@
    "linker_set_key" : "android::hidl::base::V1_0::IBase *",
    "name" : "android::hidl::base::V1_0::IBase *",
    "referenced_type" : "type-530",
-   "self_type" : "type-2445",
+   "self_type" : "type-2448",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28348,7 +28351,7 @@
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "android::hidl::manager::V1_0::IServiceNotification *",
    "referenced_type" : "type-533",
-   "self_type" : "type-2449",
+   "self_type" : "type-2452",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28357,7 +28360,7 @@
    "linker_set_key" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
    "name" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
    "referenced_type" : "type-160",
-   "self_type" : "type-2623",
+   "self_type" : "type-2626",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28366,7 +28369,7 @@
    "linker_set_key" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
    "name" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
    "referenced_type" : "type-147",
-   "self_type" : "type-2622",
+   "self_type" : "type-2625",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28375,7 +28378,7 @@
    "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int> *",
    "name" : "android::key_value_pair_t<unsigned int, unsigned int> *",
    "referenced_type" : "type-143",
-   "self_type" : "type-2621",
+   "self_type" : "type-2624",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28383,8 +28386,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::AHandler> *",
    "name" : "android::sp<android::AHandler> *",
-   "referenced_type" : "type-1188",
-   "self_type" : "type-1243",
+   "referenced_type" : "type-1191",
+   "self_type" : "type-1246",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28393,7 +28396,7 @@
    "linker_set_key" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
    "name" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
    "referenced_type" : "type-581",
-   "self_type" : "type-2511",
+   "self_type" : "type-2514",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28402,7 +28405,7 @@
    "linker_set_key" : "android::sp<android::ALooper> *",
    "name" : "android::sp<android::ALooper> *",
    "referenced_type" : "type-321",
-   "self_type" : "type-2244",
+   "self_type" : "type-2247",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28411,7 +28414,7 @@
    "linker_set_key" : "android::sp<android::AMessage> *",
    "name" : "android::sp<android::AMessage> *",
    "referenced_type" : "type-259",
-   "self_type" : "type-1956",
+   "self_type" : "type-1947",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28419,8 +28422,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::BpGraphicBufferProducer> *",
    "name" : "android::sp<android::BpGraphicBufferProducer> *",
-   "referenced_type" : "type-4228",
-   "self_type" : "type-4274",
+   "referenced_type" : "type-4234",
+   "self_type" : "type-4280",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28428,8 +28431,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::BpProducerListener> *",
    "name" : "android::sp<android::BpProducerListener> *",
-   "referenced_type" : "type-4454",
-   "self_type" : "type-4453",
+   "referenced_type" : "type-4460",
+   "self_type" : "type-4459",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28447,7 +28450,7 @@
    "linker_set_key" : "android::sp<android::ComponentWrapper> *",
    "name" : "android::sp<android::ComponentWrapper> *",
    "referenced_type" : "type-567",
-   "self_type" : "type-2488",
+   "self_type" : "type-2491",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28464,8 +28467,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::Fence> *",
    "name" : "android::sp<android::Fence> *",
-   "referenced_type" : "type-1864",
-   "self_type" : "type-2522",
+   "referenced_type" : "type-1868",
+   "self_type" : "type-2525",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28474,7 +28477,7 @@
    "linker_set_key" : "android::sp<android::FrameDropper> *",
    "name" : "android::sp<android::FrameDropper> *",
    "referenced_type" : "type-578",
-   "self_type" : "type-2504",
+   "self_type" : "type-2507",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28482,8 +28485,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::GLConsumer::EglImage> *",
    "name" : "android::sp<android::GLConsumer::EglImage> *",
-   "referenced_type" : "type-1173",
-   "self_type" : "type-1177",
+   "referenced_type" : "type-1176",
+   "self_type" : "type-1181",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28492,7 +28495,7 @@
    "linker_set_key" : "android::sp<android::GraphicBuffer> *",
    "name" : "android::sp<android::GraphicBuffer> *",
    "referenced_type" : "type-733",
-   "self_type" : "type-1194",
+   "self_type" : "type-1198",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28501,7 +28504,7 @@
    "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy> *",
    "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy> *",
    "referenced_type" : "type-473",
-   "self_type" : "type-2496",
+   "self_type" : "type-2499",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28509,8 +28512,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::GraphicBufferSource> *",
    "name" : "android::sp<android::GraphicBufferSource> *",
-   "referenced_type" : "type-2542",
-   "self_type" : "type-2541",
+   "referenced_type" : "type-2545",
+   "self_type" : "type-2544",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28518,8 +28521,8 @@
    "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",
+   "referenced_type" : "type-4265",
+   "self_type" : "type-4264",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28527,8 +28530,8 @@
    "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",
+   "referenced_type" : "type-4274",
+   "self_type" : "type-4273",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28536,8 +28539,8 @@
    "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",
+   "referenced_type" : "type-4833",
+   "self_type" : "type-4842",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28545,8 +28548,8 @@
    "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",
+   "referenced_type" : "type-7038",
+   "self_type" : "type-7046",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28555,7 +28558,7 @@
    "linker_set_key" : "android::sp<android::IBinder::DeathRecipient> *",
    "name" : "android::sp<android::IBinder::DeathRecipient> *",
    "referenced_type" : "type-843",
-   "self_type" : "type-1274",
+   "self_type" : "type-1278",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28564,7 +28567,7 @@
    "linker_set_key" : "android::sp<android::IBinder> *",
    "name" : "android::sp<android::IBinder> *",
    "referenced_type" : "type-795",
-   "self_type" : "type-1035",
+   "self_type" : "type-1039",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28573,7 +28576,7 @@
    "linker_set_key" : "android::sp<android::IConsumerListener> *",
    "name" : "android::sp<android::IConsumerListener> *",
    "referenced_type" : "type-939",
-   "self_type" : "type-2534",
+   "self_type" : "type-2537",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28582,7 +28585,7 @@
    "linker_set_key" : "android::sp<android::IGraphicBufferConsumer> *",
    "name" : "android::sp<android::IGraphicBufferConsumer> *",
    "referenced_type" : "type-574",
-   "self_type" : "type-2498",
+   "self_type" : "type-2501",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28591,7 +28594,7 @@
    "linker_set_key" : "android::sp<android::IGraphicBufferProducer> *",
    "name" : "android::sp<android::IGraphicBufferProducer> *",
    "referenced_type" : "type-570",
-   "self_type" : "type-2484",
+   "self_type" : "type-2487",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28609,7 +28612,7 @@
    "linker_set_key" : "android::sp<android::IProducerListener> *",
    "name" : "android::sp<android::IProducerListener> *",
    "referenced_type" : "type-957",
-   "self_type" : "type-2537",
+   "self_type" : "type-2540",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28617,8 +28620,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::ITransactionCompletedListener> *",
    "name" : "android::sp<android::ITransactionCompletedListener> *",
-   "referenced_type" : "type-1040",
-   "self_type" : "type-1045",
+   "referenced_type" : "type-1044",
+   "self_type" : "type-1048",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28627,7 +28630,7 @@
    "linker_set_key" : "android::sp<android::NativeHandle> *",
    "name" : "android::sp<android::NativeHandle> *",
    "referenced_type" : "type-932",
-   "self_type" : "type-1880",
+   "self_type" : "type-1884",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28635,8 +28638,8 @@
    "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",
+   "referenced_type" : "type-2466",
+   "self_type" : "type-2468",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28644,8 +28647,8 @@
    "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",
+   "referenced_type" : "type-2457",
+   "self_type" : "type-2460",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28653,8 +28656,8 @@
    "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",
+   "referenced_type" : "type-4246",
+   "self_type" : "type-4283",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28662,8 +28665,8 @@
    "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",
+   "referenced_type" : "type-4473",
+   "self_type" : "type-4472",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28671,8 +28674,8 @@
    "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",
+   "referenced_type" : "type-2479",
+   "self_type" : "type-2481",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28680,8 +28683,8 @@
    "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",
+   "referenced_type" : "type-2473",
+   "self_type" : "type-2476",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28689,8 +28692,8 @@
    "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",
+   "referenced_type" : "type-4240",
+   "self_type" : "type-4281",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28698,8 +28701,8 @@
    "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",
+   "referenced_type" : "type-4466",
+   "self_type" : "type-4465",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28708,7 +28711,7 @@
    "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",
+   "self_type" : "type-4395",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28716,8 +28719,8 @@
    "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",
+   "referenced_type" : "type-2447",
+   "self_type" : "type-4227",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28725,8 +28728,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "referenced_type" : "type-2448",
-   "self_type" : "type-2450",
+   "referenced_type" : "type-2451",
+   "self_type" : "type-2453",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28734,8 +28737,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<const android::AHandler> *",
    "name" : "android::sp<const android::AHandler> *",
-   "referenced_type" : "type-2516",
-   "self_type" : "type-2519",
+   "referenced_type" : "type-2519",
+   "self_type" : "type-2522",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28780,7 +28783,7 @@
    "linker_set_key" : "android::wp<android::IBinder::DeathRecipient> *",
    "name" : "android::wp<android::IBinder::DeathRecipient> *",
    "referenced_type" : "type-172",
-   "self_type" : "type-1244",
+   "self_type" : "type-1248",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28789,7 +28792,7 @@
    "linker_set_key" : "android::wp<android::IBinder> *",
    "name" : "android::wp<android::IBinder> *",
    "referenced_type" : "type-130",
-   "self_type" : "type-4279",
+   "self_type" : "type-4285",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28798,7 +28801,7 @@
    "linker_set_key" : "android_dataspace_t *",
    "name" : "android_dataspace_t *",
    "referenced_type" : "type-170",
-   "self_type" : "type-1667",
+   "self_type" : "type-1672",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28815,8 +28818,8 @@
    "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",
+   "referenced_type" : "type-1249",
+   "self_type" : "type-1252",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h"
   },
@@ -28824,8 +28827,8 @@
    "alignment" : 4,
    "linker_set_key" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
    "name" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
-   "referenced_type" : "type-1387",
-   "self_type" : "type-1390",
+   "referenced_type" : "type-1390",
+   "self_type" : "type-1393",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -28834,7 +28837,7 @@
    "linker_set_key" : "bool *",
    "name" : "bool *",
    "referenced_type" : "type-93",
-   "self_type" : "type-1272",
+   "self_type" : "type-1274",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28851,8 +28854,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AHandler *",
    "name" : "const android::AHandler *",
-   "referenced_type" : "type-2518",
-   "self_type" : "type-2517",
+   "referenced_type" : "type-2521",
+   "self_type" : "type-2520",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28860,8 +28863,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AHandlerReflector<android::GraphicBufferSource> *",
    "name" : "const android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-2514",
-   "self_type" : "type-2515",
+   "referenced_type" : "type-2517",
+   "self_type" : "type-2518",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28869,8 +28872,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ALooper *",
    "name" : "const android::ALooper *",
-   "referenced_type" : "type-2289",
-   "self_type" : "type-2301",
+   "referenced_type" : "type-2292",
+   "self_type" : "type-2304",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28878,8 +28881,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AReplyToken *",
    "name" : "const android::AReplyToken *",
-   "referenced_type" : "type-1167",
-   "self_type" : "type-1170",
+   "referenced_type" : "type-1168",
+   "self_type" : "type-1173",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -28887,8 +28890,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AString *",
    "name" : "const android::AString *",
-   "referenced_type" : "type-2110",
-   "self_type" : "type-2230",
+   "referenced_type" : "type-2101",
+   "self_type" : "type-2233",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -28914,8 +28917,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BnInterface<android::IGraphicBufferProducer> *",
    "name" : "const android::BnInterface<android::IGraphicBufferProducer> *",
-   "referenced_type" : "type-1232",
-   "self_type" : "type-1233",
+   "referenced_type" : "type-1236",
+   "self_type" : "type-1237",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -28923,8 +28926,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BnInterface<android::IProducerListener> *",
    "name" : "const android::BnInterface<android::IProducerListener> *",
-   "referenced_type" : "type-4477",
-   "self_type" : "type-4478",
+   "referenced_type" : "type-4483",
+   "self_type" : "type-4484",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -28932,8 +28935,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BnInterface<android::ITransactionCompletedListener> *",
    "name" : "const android::BnInterface<android::ITransactionCompletedListener> *",
-   "referenced_type" : "type-1093",
-   "self_type" : "type-1094",
+   "referenced_type" : "type-1096",
+   "self_type" : "type-1097",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -28950,8 +28953,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-1069",
-   "self_type" : "type-1071",
+   "referenced_type" : "type-1072",
+   "self_type" : "type-1074",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28959,8 +28962,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-1219",
-   "self_type" : "type-1218",
+   "referenced_type" : "type-1223",
+   "self_type" : "type-1222",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -28968,8 +28971,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-3633",
-   "self_type" : "type-3632",
+   "referenced_type" : "type-3636",
+   "self_type" : "type-3635",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -28977,8 +28980,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-3682",
-   "self_type" : "type-3684",
+   "referenced_type" : "type-3688",
+   "self_type" : "type-3690",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28986,8 +28989,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-3791",
-   "self_type" : "type-3790",
+   "referenced_type" : "type-3798",
+   "self_type" : "type-3797",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -28995,8 +28998,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-5554",
-   "self_type" : "type-5553",
+   "referenced_type" : "type-5560",
+   "self_type" : "type-5559",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -29004,8 +29007,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-5603",
-   "self_type" : "type-5605",
+   "referenced_type" : "type-5612",
+   "self_type" : "type-5614",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -29013,8 +29016,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-5712",
-   "self_type" : "type-5711",
+   "referenced_type" : "type-5722",
+   "self_type" : "type-5721",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -29022,8 +29025,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-7870",
-   "self_type" : "type-7869",
+   "referenced_type" : "type-7891",
+   "self_type" : "type-7890",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -29031,8 +29034,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-7919",
-   "self_type" : "type-7921",
+   "referenced_type" : "type-7943",
+   "self_type" : "type-7945",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -29040,8 +29043,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-8028",
-   "self_type" : "type-8027",
+   "referenced_type" : "type-8053",
+   "self_type" : "type-8052",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -29049,8 +29052,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-8441",
-   "self_type" : "type-8440",
+   "referenced_type" : "type-8465",
+   "self_type" : "type-8464",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -29058,8 +29061,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-8483",
-   "self_type" : "type-8485",
+   "referenced_type" : "type-8510",
+   "self_type" : "type-8512",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -29067,8 +29070,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-8574",
-   "self_type" : "type-8573",
+   "referenced_type" : "type-8601",
+   "self_type" : "type-8600",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -29085,8 +29088,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferQueueCore *",
    "name" : "const android::BufferQueueCore *",
-   "referenced_type" : "type-3521",
-   "self_type" : "type-3523",
+   "referenced_type" : "type-3524",
+   "self_type" : "type-3526",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29094,8 +29097,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferQueueCore *",
    "name" : "const android::BufferQueueCore *",
-   "referenced_type" : "type-5442",
-   "self_type" : "type-5444",
+   "referenced_type" : "type-5448",
+   "self_type" : "type-5450",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29103,8 +29106,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferQueueCore *",
    "name" : "const android::BufferQueueCore *",
-   "referenced_type" : "type-7758",
-   "self_type" : "type-7760",
+   "referenced_type" : "type-7779",
+   "self_type" : "type-7781",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29121,8 +29124,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferQueueCore *",
    "name" : "const android::BufferQueueCore *",
-   "referenced_type" : "type-8344",
-   "self_type" : "type-8346",
+   "referenced_type" : "type-8368",
+   "self_type" : "type-8370",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29130,8 +29133,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ComponentWrapper *",
    "name" : "const android::ComponentWrapper *",
-   "referenced_type" : "type-2494",
-   "self_type" : "type-2495",
+   "referenced_type" : "type-2497",
+   "self_type" : "type-2498",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29139,8 +29142,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ConsumerListener *",
    "name" : "const android::ConsumerListener *",
-   "referenced_type" : "type-3513",
-   "self_type" : "type-3515",
+   "referenced_type" : "type-3516",
+   "self_type" : "type-3518",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29148,8 +29151,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ConsumerListener *",
    "name" : "const android::ConsumerListener *",
-   "referenced_type" : "type-5434",
-   "self_type" : "type-5436",
+   "referenced_type" : "type-5440",
+   "self_type" : "type-5442",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29157,8 +29160,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ConsumerListener *",
    "name" : "const android::ConsumerListener *",
-   "referenced_type" : "type-7750",
-   "self_type" : "type-7752",
+   "referenced_type" : "type-7771",
+   "self_type" : "type-7773",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29175,8 +29178,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ConsumerListener *",
    "name" : "const android::ConsumerListener *",
-   "referenced_type" : "type-8339",
-   "self_type" : "type-8341",
+   "referenced_type" : "type-8363",
+   "self_type" : "type-8365",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29184,8 +29187,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-1309",
-   "self_type" : "type-1315",
+   "referenced_type" : "type-1312",
+   "self_type" : "type-1316",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29193,8 +29196,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-2530",
-   "self_type" : "type-2532",
+   "referenced_type" : "type-2533",
+   "self_type" : "type-2535",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29202,8 +29205,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-3448",
-   "self_type" : "type-3450",
+   "referenced_type" : "type-3451",
+   "self_type" : "type-3453",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29211,8 +29214,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-3593",
-   "self_type" : "type-3595",
+   "referenced_type" : "type-3596",
+   "self_type" : "type-3598",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29220,8 +29223,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-3859",
-   "self_type" : "type-3865",
+   "referenced_type" : "type-3865",
+   "self_type" : "type-3869",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29229,8 +29232,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-4422",
-   "self_type" : "type-4430",
+   "referenced_type" : "type-4428",
+   "self_type" : "type-4432",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29238,8 +29241,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-4672",
-   "self_type" : "type-4674",
+   "referenced_type" : "type-4679",
+   "self_type" : "type-4681",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29247,8 +29250,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-4941",
-   "self_type" : "type-4943",
+   "referenced_type" : "type-4947",
+   "self_type" : "type-4949",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29256,8 +29259,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-5369",
-   "self_type" : "type-5371",
+   "referenced_type" : "type-5375",
+   "self_type" : "type-5377",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29265,8 +29268,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-5514",
-   "self_type" : "type-5516",
+   "referenced_type" : "type-5520",
+   "self_type" : "type-5522",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29274,8 +29277,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-5780",
-   "self_type" : "type-5786",
+   "referenced_type" : "type-5789",
+   "self_type" : "type-5793",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29283,8 +29286,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-6319",
-   "self_type" : "type-6327",
+   "referenced_type" : "type-6328",
+   "self_type" : "type-6332",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29292,8 +29295,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-6553",
-   "self_type" : "type-6555",
+   "referenced_type" : "type-6563",
+   "self_type" : "type-6565",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29301,8 +29304,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-7049",
-   "self_type" : "type-7054",
+   "referenced_type" : "type-7054",
+   "self_type" : "type-7062",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29319,8 +29322,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-7685",
-   "self_type" : "type-7687",
+   "referenced_type" : "type-7706",
+   "self_type" : "type-7708",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29328,8 +29331,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-7830",
-   "self_type" : "type-7832",
+   "referenced_type" : "type-7851",
+   "self_type" : "type-7853",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29337,8 +29340,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-8096",
-   "self_type" : "type-8102",
+   "referenced_type" : "type-8120",
+   "self_type" : "type-8124",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29346,8 +29349,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-8176",
-   "self_type" : "type-8178",
+   "referenced_type" : "type-8200",
+   "self_type" : "type-8202",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29355,8 +29358,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-8287",
-   "self_type" : "type-8290",
+   "referenced_type" : "type-8312",
+   "self_type" : "type-8314",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29364,8 +29367,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-8415",
-   "self_type" : "type-8417",
+   "referenced_type" : "type-8439",
+   "self_type" : "type-8441",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29373,8 +29376,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-8616",
-   "self_type" : "type-8622",
+   "referenced_type" : "type-8643",
+   "self_type" : "type-8647",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29382,8 +29385,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-9188",
-   "self_type" : "type-9197",
+   "referenced_type" : "type-9216",
+   "self_type" : "type-9222",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29400,8 +29403,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-9365",
-   "self_type" : "type-9371",
+   "referenced_type" : "type-9392",
+   "self_type" : "type-9394",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29409,8 +29412,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-9475",
-   "self_type" : "type-9477",
+   "referenced_type" : "type-9502",
+   "self_type" : "type-9504",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29419,7 +29422,7 @@
    "linker_set_key" : "const android::FileDescriptor::Autoclose *",
    "name" : "const android::FileDescriptor::Autoclose *",
    "referenced_type" : "type-1221",
-   "self_type" : "type-1230",
+   "self_type" : "type-1229",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h"
   },
@@ -29427,8 +29430,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Flattenable<android::BufferItem> *",
    "name" : "const android::Flattenable<android::BufferItem> *",
-   "referenced_type" : "type-1506",
-   "self_type" : "type-1507",
+   "referenced_type" : "type-1509",
+   "self_type" : "type-1510",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -29436,24 +29439,6 @@
    "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,
@@ -29461,17 +29446,8 @@
   },
   {
    "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> *",
+   "linker_set_key" : "const android::Flattenable<android::FrameEventHistoryDelta> *",
+   "name" : "const android::Flattenable<android::FrameEventHistoryDelta> *",
    "referenced_type" : "type-4312",
    "self_type" : "type-4313",
    "size" : 4,
@@ -29479,10 +29455,37 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::GraphicBuffer> *",
+   "name" : "const android::Flattenable<android::GraphicBuffer> *",
+   "referenced_type" : "type-1643",
+   "self_type" : "type-1644",
+   "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-4315",
+   "self_type" : "type-4316",
+   "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-4318",
+   "self_type" : "type-4319",
+   "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",
+   "referenced_type" : "type-2511",
+   "self_type" : "type-2513",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29490,8 +29493,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-1346",
-   "self_type" : "type-1348",
+   "referenced_type" : "type-1349",
+   "self_type" : "type-1351",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29499,8 +29502,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-1461",
-   "self_type" : "type-1463",
+   "referenced_type" : "type-1465",
+   "self_type" : "type-1467",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29508,8 +29511,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-2403",
-   "self_type" : "type-2425",
+   "referenced_type" : "type-2406",
+   "self_type" : "type-2428",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29517,8 +29520,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-3454",
-   "self_type" : "type-3456",
+   "referenced_type" : "type-3457",
+   "self_type" : "type-3459",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29526,8 +29529,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-3598",
-   "self_type" : "type-3600",
+   "referenced_type" : "type-3601",
+   "self_type" : "type-3603",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29535,8 +29538,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-3898",
-   "self_type" : "type-3900",
+   "referenced_type" : "type-3904",
+   "self_type" : "type-3906",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29544,8 +29547,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-3991",
-   "self_type" : "type-3993",
+   "referenced_type" : "type-3997",
+   "self_type" : "type-3999",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29553,8 +29556,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-4218",
-   "self_type" : "type-4220",
+   "referenced_type" : "type-4224",
+   "self_type" : "type-4226",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29562,8 +29565,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-4838",
-   "self_type" : "type-4870",
+   "referenced_type" : "type-4840",
+   "self_type" : "type-4876",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29571,8 +29574,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-5375",
-   "self_type" : "type-5377",
+   "referenced_type" : "type-5381",
+   "self_type" : "type-5383",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29580,8 +29583,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-5519",
-   "self_type" : "type-5521",
+   "referenced_type" : "type-5525",
+   "self_type" : "type-5527",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29589,8 +29592,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-5819",
-   "self_type" : "type-5821",
+   "referenced_type" : "type-5828",
+   "self_type" : "type-5830",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29598,8 +29601,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-5912",
-   "self_type" : "type-5914",
+   "referenced_type" : "type-5921",
+   "self_type" : "type-5923",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29607,8 +29610,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-6139",
-   "self_type" : "type-6141",
+   "referenced_type" : "type-6148",
+   "self_type" : "type-6150",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29616,8 +29619,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-6702",
-   "self_type" : "type-6734",
+   "referenced_type" : "type-6707",
+   "self_type" : "type-6743",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29634,8 +29637,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-7691",
-   "self_type" : "type-7693",
+   "referenced_type" : "type-7712",
+   "self_type" : "type-7714",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29643,8 +29646,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-7835",
-   "self_type" : "type-7837",
+   "referenced_type" : "type-7856",
+   "self_type" : "type-7858",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29652,8 +29655,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-8135",
-   "self_type" : "type-8137",
+   "referenced_type" : "type-8159",
+   "self_type" : "type-8161",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29661,8 +29664,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-8152",
-   "self_type" : "type-8157",
+   "referenced_type" : "type-8176",
+   "self_type" : "type-8181",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29670,8 +29673,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-8293",
-   "self_type" : "type-8295",
+   "referenced_type" : "type-8317",
+   "self_type" : "type-8319",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29679,8 +29682,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-8420",
-   "self_type" : "type-8422",
+   "referenced_type" : "type-8444",
+   "self_type" : "type-8446",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29688,8 +29691,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-8653",
-   "self_type" : "type-8655",
+   "referenced_type" : "type-8680",
+   "self_type" : "type-8683",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29697,8 +29700,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-8741",
-   "self_type" : "type-8743",
+   "referenced_type" : "type-8768",
+   "self_type" : "type-8770",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29706,8 +29709,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-8985",
-   "self_type" : "type-8995",
+   "referenced_type" : "type-9012",
+   "self_type" : "type-9020",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29715,8 +29718,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-8996",
-   "self_type" : "type-8998",
+   "referenced_type" : "type-9023",
+   "self_type" : "type-9025",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29733,8 +29736,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBufferSource *",
    "name" : "const android::GraphicBufferSource *",
-   "referenced_type" : "type-2546",
-   "self_type" : "type-2547",
+   "referenced_type" : "type-2549",
+   "self_type" : "type-2550",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29742,8 +29745,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IBinder *",
    "name" : "const android::IBinder *",
-   "referenced_type" : "type-1520",
-   "self_type" : "type-1525",
+   "referenced_type" : "type-1524",
+   "self_type" : "type-1530",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29751,8 +29754,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IBinder::DeathRecipient *",
    "name" : "const android::IBinder::DeathRecipient *",
-   "referenced_type" : "type-4315",
-   "self_type" : "type-4316",
+   "referenced_type" : "type-4321",
+   "self_type" : "type-4322",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29760,8 +29763,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-1155",
-   "self_type" : "type-1157",
+   "referenced_type" : "type-1158",
+   "self_type" : "type-1160",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29769,8 +29772,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-1580",
-   "self_type" : "type-1582",
+   "referenced_type" : "type-1584",
+   "self_type" : "type-1586",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29778,8 +29781,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-3611",
-   "self_type" : "type-3613",
+   "referenced_type" : "type-3614",
+   "self_type" : "type-3616",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29787,8 +29790,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-3760",
-   "self_type" : "type-3762",
+   "referenced_type" : "type-3766",
+   "self_type" : "type-3768",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29796,8 +29799,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-4060",
-   "self_type" : "type-4062",
+   "referenced_type" : "type-4066",
+   "self_type" : "type-4068",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29805,8 +29808,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-5532",
-   "self_type" : "type-5534",
+   "referenced_type" : "type-5538",
+   "self_type" : "type-5540",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29814,8 +29817,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-5681",
-   "self_type" : "type-5683",
+   "referenced_type" : "type-5690",
+   "self_type" : "type-5692",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29823,8 +29826,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-5981",
-   "self_type" : "type-5983",
+   "referenced_type" : "type-5990",
+   "self_type" : "type-5992",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29832,8 +29835,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-7848",
-   "self_type" : "type-7850",
+   "referenced_type" : "type-7869",
+   "self_type" : "type-7871",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29841,8 +29844,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-7997",
-   "self_type" : "type-7999",
+   "referenced_type" : "type-8021",
+   "self_type" : "type-8023",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29850,8 +29853,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-8426",
-   "self_type" : "type-8428",
+   "referenced_type" : "type-8450",
+   "self_type" : "type-8452",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29859,8 +29862,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-8550",
-   "self_type" : "type-8552",
+   "referenced_type" : "type-8577",
+   "self_type" : "type-8579",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29868,8 +29871,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-8809",
-   "self_type" : "type-8811",
+   "referenced_type" : "type-8836",
+   "self_type" : "type-8838",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29886,8 +29889,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-1604",
-   "self_type" : "type-1606",
+   "referenced_type" : "type-1608",
+   "self_type" : "type-1610",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29895,8 +29898,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-2501",
-   "self_type" : "type-2503",
+   "referenced_type" : "type-2504",
+   "self_type" : "type-2506",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29904,8 +29907,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-3494",
-   "self_type" : "type-3496",
+   "referenced_type" : "type-3497",
+   "self_type" : "type-3499",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29913,8 +29916,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-4077",
-   "self_type" : "type-4079",
+   "referenced_type" : "type-4083",
+   "self_type" : "type-4085",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29922,8 +29925,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-4914",
-   "self_type" : "type-4916",
+   "referenced_type" : "type-4920",
+   "self_type" : "type-4922",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29931,8 +29934,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-5415",
-   "self_type" : "type-5417",
+   "referenced_type" : "type-5421",
+   "self_type" : "type-5423",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29940,8 +29943,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-5998",
-   "self_type" : "type-6000",
+   "referenced_type" : "type-6007",
+   "self_type" : "type-6009",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29949,8 +29952,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6940",
-   "self_type" : "type-6942",
+   "referenced_type" : "type-6947",
+   "self_type" : "type-6950",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29958,8 +29961,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-7731",
-   "self_type" : "type-7733",
+   "referenced_type" : "type-7752",
+   "self_type" : "type-7754",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29976,8 +29979,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-8169",
-   "self_type" : "type-8171",
+   "referenced_type" : "type-8193",
+   "self_type" : "type-8195",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29985,8 +29988,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-8325",
-   "self_type" : "type-8327",
+   "referenced_type" : "type-8349",
+   "self_type" : "type-8351",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29994,8 +29997,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-8824",
-   "self_type" : "type-8826",
+   "referenced_type" : "type-8851",
+   "self_type" : "type-8853",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30003,8 +30006,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-9310",
-   "self_type" : "type-9312",
+   "referenced_type" : "type-9337",
+   "self_type" : "type-9339",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30012,8 +30015,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferProducer *",
    "name" : "const android::IGraphicBufferProducer *",
-   "referenced_type" : "type-3504",
-   "self_type" : "type-3506",
+   "referenced_type" : "type-3507",
+   "self_type" : "type-3509",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30021,8 +30024,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferProducer *",
    "name" : "const android::IGraphicBufferProducer *",
-   "referenced_type" : "type-4247",
-   "self_type" : "type-4249",
+   "referenced_type" : "type-4253",
+   "self_type" : "type-4255",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30030,8 +30033,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferProducer *",
    "name" : "const android::IGraphicBufferProducer *",
-   "referenced_type" : "type-5425",
-   "self_type" : "type-5427",
+   "referenced_type" : "type-5431",
+   "self_type" : "type-5433",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30039,8 +30042,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferProducer *",
    "name" : "const android::IGraphicBufferProducer *",
-   "referenced_type" : "type-6162",
-   "self_type" : "type-6164",
+   "referenced_type" : "type-6171",
+   "self_type" : "type-6173",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30048,8 +30051,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferProducer *",
    "name" : "const android::IGraphicBufferProducer *",
-   "referenced_type" : "type-7741",
-   "self_type" : "type-7743",
+   "referenced_type" : "type-7762",
+   "self_type" : "type-7764",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30066,8 +30069,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferProducer *",
    "name" : "const android::IGraphicBufferProducer *",
-   "referenced_type" : "type-8334",
-   "self_type" : "type-8336",
+   "referenced_type" : "type-8358",
+   "self_type" : "type-8360",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30075,8 +30078,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferProducer *",
    "name" : "const android::IGraphicBufferProducer *",
-   "referenced_type" : "type-9019",
-   "self_type" : "type-9021",
+   "referenced_type" : "type-9046",
+   "self_type" : "type-9048",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30084,8 +30087,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-1160",
-   "self_type" : "type-1162",
+   "referenced_type" : "type-1031",
+   "self_type" : "type-1033",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30093,8 +30096,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-3623",
-   "self_type" : "type-3625",
+   "referenced_type" : "type-1163",
+   "self_type" : "type-1165",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30102,8 +30105,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-3765",
-   "self_type" : "type-3767",
+   "referenced_type" : "type-3626",
+   "self_type" : "type-3628",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30111,8 +30114,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-4253",
-   "self_type" : "type-4255",
+   "referenced_type" : "type-3670",
+   "self_type" : "type-3672",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30120,8 +30123,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-4449",
-   "self_type" : "type-4448",
+   "referenced_type" : "type-3771",
+   "self_type" : "type-3773",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30129,8 +30132,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-4689",
-   "self_type" : "type-4691",
+   "referenced_type" : "type-4259",
+   "self_type" : "type-4261",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30138,8 +30141,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-5544",
-   "self_type" : "type-5546",
+   "referenced_type" : "type-4455",
+   "self_type" : "type-4454",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30147,8 +30150,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-5686",
-   "self_type" : "type-5688",
+   "referenced_type" : "type-4696",
+   "self_type" : "type-4698",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30156,8 +30159,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-6168",
-   "self_type" : "type-6170",
+   "referenced_type" : "type-5550",
+   "self_type" : "type-5552",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30165,8 +30168,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-6346",
-   "self_type" : "type-6345",
+   "referenced_type" : "type-5594",
+   "self_type" : "type-5596",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30174,8 +30177,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-6569",
-   "self_type" : "type-6571",
+   "referenced_type" : "type-5695",
+   "self_type" : "type-5697",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30183,8 +30186,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-7860",
-   "self_type" : "type-7862",
+   "referenced_type" : "type-6177",
+   "self_type" : "type-6179",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30192,8 +30195,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-8002",
-   "self_type" : "type-8004",
+   "referenced_type" : "type-6355",
+   "self_type" : "type-6354",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30201,8 +30204,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-8433",
-   "self_type" : "type-8435",
+   "referenced_type" : "type-6579",
+   "self_type" : "type-6581",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30210,8 +30213,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-8555",
-   "self_type" : "type-8557",
+   "referenced_type" : "type-7881",
+   "self_type" : "type-7883",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30219,8 +30222,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-9025",
-   "self_type" : "type-9027",
+   "referenced_type" : "type-7925",
+   "self_type" : "type-7927",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30228,8 +30231,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-9218",
-   "self_type" : "type-9217",
+   "referenced_type" : "type-8026",
+   "self_type" : "type-8028",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30237,8 +30240,53 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-9488",
-   "self_type" : "type-9490",
+   "referenced_type" : "type-8457",
+   "self_type" : "type-8459",
+   "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-8501",
+   "self_type" : "type-8503",
+   "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-8582",
+   "self_type" : "type-8584",
+   "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-9052",
+   "self_type" : "type-9054",
+   "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-9246",
+   "self_type" : "type-9245",
+   "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-9515",
+   "self_type" : "type-9517",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30273,8 +30321,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect> *",
    "name" : "const android::LightFlattenablePod<android::Rect> *",
-   "referenced_type" : "type-4587",
-   "self_type" : "type-4588",
+   "referenced_type" : "type-4593",
+   "self_type" : "type-4594",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30291,8 +30339,8 @@
    "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",
+   "referenced_type" : "type-1233",
+   "self_type" : "type-1234",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -30300,8 +30348,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::LightRefBase<android::NativeHandle> *",
    "name" : "const android::LightRefBase<android::NativeHandle> *",
-   "referenced_type" : "type-2663",
-   "self_type" : "type-2672",
+   "referenced_type" : "type-2666",
+   "self_type" : "type-2675",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -30418,7 +30466,7 @@
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
    "referenced_type" : "type-118",
-   "self_type" : "type-1513",
+   "self_type" : "type-1517",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -30435,8 +30483,8 @@
    "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",
+   "referenced_type" : "type-1523",
+   "self_type" : "type-1525",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -30444,8 +30492,8 @@
    "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",
+   "referenced_type" : "type-1666",
+   "self_type" : "type-1667",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -30453,8 +30501,8 @@
    "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",
+   "referenced_type" : "type-4337",
+   "self_type" : "type-4338",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -30462,8 +30510,8 @@
    "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",
+   "referenced_type" : "type-1660",
+   "self_type" : "type-1661",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -30471,8 +30519,8 @@
    "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",
+   "referenced_type" : "type-4343",
+   "self_type" : "type-4344",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -30480,8 +30528,8 @@
    "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",
+   "referenced_type" : "type-4348",
+   "self_type" : "type-4349",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -30498,8 +30546,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1215",
-   "self_type" : "type-1214",
+   "referenced_type" : "type-1218",
+   "self_type" : "type-1217",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30507,8 +30555,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1490",
-   "self_type" : "type-1489",
+   "referenced_type" : "type-1493",
+   "self_type" : "type-1492",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30516,8 +30564,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1621",
-   "self_type" : "type-1620",
+   "referenced_type" : "type-1624",
+   "self_type" : "type-1623",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30525,8 +30573,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-2683",
-   "self_type" : "type-2682",
+   "referenced_type" : "type-2686",
+   "self_type" : "type-2685",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30534,8 +30582,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-3787",
-   "self_type" : "type-3786",
+   "referenced_type" : "type-3793",
+   "self_type" : "type-3792",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30543,8 +30591,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4011",
-   "self_type" : "type-4010",
+   "referenced_type" : "type-4017",
+   "self_type" : "type-4016",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30552,8 +30600,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4090",
-   "self_type" : "type-4089",
+   "referenced_type" : "type-4096",
+   "self_type" : "type-4095",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30561,8 +30609,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4292",
-   "self_type" : "type-4291",
+   "referenced_type" : "type-4298",
+   "self_type" : "type-4297",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30570,8 +30618,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4572",
-   "self_type" : "type-4571",
+   "referenced_type" : "type-4578",
+   "self_type" : "type-4577",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30579,8 +30627,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4736",
-   "self_type" : "type-4735",
+   "referenced_type" : "type-4743",
+   "self_type" : "type-4742",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30588,8 +30636,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-5019",
-   "self_type" : "type-5018",
+   "referenced_type" : "type-5025",
+   "self_type" : "type-5024",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30597,8 +30645,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-5708",
-   "self_type" : "type-5707",
+   "referenced_type" : "type-5717",
+   "self_type" : "type-5716",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30606,8 +30654,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-5932",
-   "self_type" : "type-5931",
+   "referenced_type" : "type-5941",
+   "self_type" : "type-5940",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30615,8 +30663,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-6011",
-   "self_type" : "type-6010",
+   "referenced_type" : "type-6020",
+   "self_type" : "type-6019",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30624,8 +30672,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-6201",
-   "self_type" : "type-6200",
+   "referenced_type" : "type-6210",
+   "self_type" : "type-6209",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30633,8 +30681,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-6456",
-   "self_type" : "type-6455",
+   "referenced_type" : "type-6465",
+   "self_type" : "type-6464",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30642,8 +30690,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-6605",
-   "self_type" : "type-6604",
+   "referenced_type" : "type-6615",
+   "self_type" : "type-6614",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30651,8 +30699,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-6836",
-   "self_type" : "type-6835",
+   "referenced_type" : "type-6846",
+   "self_type" : "type-6845",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30660,8 +30708,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-6990",
-   "self_type" : "type-6989",
+   "referenced_type" : "type-6999",
+   "self_type" : "type-6998",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30669,8 +30717,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-7221",
-   "self_type" : "type-7220",
+   "referenced_type" : "type-7230",
+   "self_type" : "type-7229",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30678,8 +30726,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-7241",
-   "self_type" : "type-7240",
+   "referenced_type" : "type-7262",
+   "self_type" : "type-7261",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30687,8 +30735,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-8024",
-   "self_type" : "type-8023",
+   "referenced_type" : "type-8048",
+   "self_type" : "type-8047",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30696,8 +30744,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-8206",
-   "self_type" : "type-8205",
+   "referenced_type" : "type-8230",
+   "self_type" : "type-8229",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30705,8 +30753,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-8570",
-   "self_type" : "type-8569",
+   "referenced_type" : "type-8597",
+   "self_type" : "type-8596",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30714,8 +30762,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-8760",
-   "self_type" : "type-8759",
+   "referenced_type" : "type-8788",
+   "self_type" : "type-8787",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30723,8 +30771,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-8839",
-   "self_type" : "type-8838",
+   "referenced_type" : "type-8866",
+   "self_type" : "type-8865",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30732,8 +30780,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-9057",
-   "self_type" : "type-9056",
+   "referenced_type" : "type-9085",
+   "self_type" : "type-9084",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30741,8 +30789,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-9368",
-   "self_type" : "type-9367",
+   "referenced_type" : "type-9396",
+   "self_type" : "type-9395",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30750,8 +30798,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-9515",
-   "self_type" : "type-9514",
+   "referenced_type" : "type-9542",
+   "self_type" : "type-9541",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30759,8 +30807,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-9739",
-   "self_type" : "type-9738",
+   "referenced_type" : "type-9766",
+   "self_type" : "type-9765",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30768,8 +30816,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-9840",
-   "self_type" : "type-9839",
+   "referenced_type" : "type-9863",
+   "self_type" : "type-9862",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30777,8 +30825,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::RefBase *",
    "name" : "const android::RefBase *",
-   "referenced_type" : "type-1449",
-   "self_type" : "type-1480",
+   "referenced_type" : "type-1452",
+   "self_type" : "type-1483",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -30786,8 +30834,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SafeBpInterface<android::IConsumerListener> *",
    "name" : "const android::SafeBpInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-1551",
-   "self_type" : "type-1552",
+   "referenced_type" : "type-1554",
+   "self_type" : "type-1555",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -30795,8 +30843,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SafeBpInterface<android::IGraphicBufferConsumer> *",
    "name" : "const android::SafeBpInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-1886",
-   "self_type" : "type-1887",
+   "referenced_type" : "type-1890",
+   "self_type" : "type-1891",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -30804,8 +30852,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SafeInterface::ParcelHandler *",
    "name" : "const android::SafeInterface::ParcelHandler *",
-   "referenced_type" : "type-1256",
-   "self_type" : "type-1266",
+   "referenced_type" : "type-1254",
+   "self_type" : "type-1269",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -30813,8 +30861,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-2675",
-   "self_type" : "type-2676",
+   "referenced_type" : "type-2678",
+   "self_type" : "type-2679",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -30822,8 +30870,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-2671",
-   "self_type" : "type-2673",
+   "referenced_type" : "type-2674",
+   "self_type" : "type-2676",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -30831,8 +30879,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-2667",
-   "self_type" : "type-2668",
+   "referenced_type" : "type-2670",
+   "self_type" : "type-2671",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -30840,8 +30888,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 *",
    "name" : "const android::String16 *",
-   "referenced_type" : "type-1248",
-   "self_type" : "type-2658",
+   "referenced_type" : "type-1251",
+   "self_type" : "type-2661",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -30849,8 +30897,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 *",
    "name" : "const android::String8 *",
-   "referenced_type" : "type-1875",
-   "self_type" : "type-2653",
+   "referenced_type" : "type-1879",
+   "self_type" : "type-2656",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -30858,8 +30906,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::BufferItem> *",
    "name" : "const android::Vector<android::BufferItem> *",
-   "referenced_type" : "type-977",
-   "self_type" : "type-978",
+   "referenced_type" : "type-979",
+   "self_type" : "type-980",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30867,8 +30915,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::Rect> *",
    "name" : "const android::Vector<android::Rect> *",
-   "referenced_type" : "type-2679",
-   "self_type" : "type-2680",
+   "referenced_type" : "type-2682",
+   "self_type" : "type-2683",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30876,8 +30924,8 @@
    "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",
+   "referenced_type" : "type-1231",
+   "self_type" : "type-1232",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30885,8 +30933,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<int> *",
    "name" : "const android::Vector<int> *",
-   "referenced_type" : "type-2688",
-   "self_type" : "type-2689",
+   "referenced_type" : "type-2691",
+   "self_type" : "type-2692",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30894,8 +30942,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<long long> *",
    "name" : "const android::Vector<long long> *",
-   "referenced_type" : "type-1083",
-   "self_type" : "type-1084",
+   "referenced_type" : "type-1086",
+   "self_type" : "type-1087",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30903,8 +30951,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::VectorImpl *",
    "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-2664",
-   "self_type" : "type-2665",
+   "referenced_type" : "type-2667",
+   "self_type" : "type-2668",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -30912,8 +30960,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::base::ErrnoRestorer *",
    "name" : "const android::base::ErrnoRestorer *",
-   "referenced_type" : "type-4655",
-   "self_type" : "type-4661",
+   "referenced_type" : "type-4662",
+   "self_type" : "type-4668",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -30921,8 +30969,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser> *",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser> *",
-   "referenced_type" : "type-2580",
-   "self_type" : "type-2595",
+   "referenced_type" : "type-2583",
+   "self_type" : "type-2598",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -30939,8 +30987,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::BpHwRefBase *",
    "name" : "const android::hardware::BpHwRefBase *",
-   "referenced_type" : "type-1374",
-   "self_type" : "type-1375",
+   "referenced_type" : "type-1377",
+   "self_type" : "type-1378",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -30948,8 +30996,8 @@
    "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",
+   "referenced_type" : "type-6932",
+   "self_type" : "type-6933",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -30957,24 +31005,6 @@
    "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,
@@ -30982,8 +31012,8 @@
   },
   {
    "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> > *",
+   "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-4498",
    "self_type" : "type-4499",
    "size" : 4,
@@ -30991,10 +31021,28 @@
   },
   {
    "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-4375",
+   "self_type" : "type-4376",
+   "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-4504",
+   "self_type" : "type-4505",
+   "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-4357",
-   "self_type" : "type-4358",
+   "referenced_type" : "type-4363",
+   "self_type" : "type-4364",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -31002,8 +31050,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<int> *",
    "name" : "const android::hardware::Return<int> *",
-   "referenced_type" : "type-4698",
-   "self_type" : "type-4700",
+   "referenced_type" : "type-4704",
+   "self_type" : "type-4706",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -31011,8 +31059,8 @@
    "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",
+   "referenced_type" : "type-6935",
+   "self_type" : "type-6936",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -31074,8 +31122,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-4348",
-   "self_type" : "type-4349",
+   "referenced_type" : "type-4354",
+   "self_type" : "type-4355",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -31101,8 +31149,8 @@
    "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-2460",
-   "self_type" : "type-2461",
+   "referenced_type" : "type-2463",
+   "self_type" : "type-2464",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31128,8 +31176,8 @@
    "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",
+   "referenced_type" : "type-4732",
+   "self_type" : "type-4733",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -31191,8 +31239,8 @@
    "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",
+   "referenced_type" : "type-4386",
+   "self_type" : "type-4387",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -31227,8 +31275,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-2619",
-   "self_type" : "type-2627",
+   "referenced_type" : "type-2622",
+   "self_type" : "type-2630",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -31236,8 +31284,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-2617",
-   "self_type" : "type-2626",
+   "referenced_type" : "type-2620",
+   "self_type" : "type-2629",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -31245,8 +31293,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-2613",
-   "self_type" : "type-2625",
+   "referenced_type" : "type-2616",
+   "self_type" : "type-2628",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -31254,8 +31302,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
    "name" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
-   "referenced_type" : "type-1304",
-   "self_type" : "type-2513",
+   "referenced_type" : "type-1301",
+   "self_type" : "type-2516",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31264,7 +31312,7 @@
    "linker_set_key" : "const android::sp<android::ALooper> *",
    "name" : "const android::sp<android::ALooper> *",
    "referenced_type" : "type-320",
-   "self_type" : "type-2277",
+   "self_type" : "type-2280",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31272,8 +31320,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::AMessage> *",
    "name" : "const android::sp<android::AMessage> *",
-   "referenced_type" : "type-2175",
-   "self_type" : "type-2203",
+   "referenced_type" : "type-2174",
+   "self_type" : "type-2206",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31290,8 +31338,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::ComponentWrapper> *",
    "name" : "const android::sp<android::ComponentWrapper> *",
-   "referenced_type" : "type-2491",
-   "self_type" : "type-2493",
+   "referenced_type" : "type-2494",
+   "self_type" : "type-2496",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31308,8 +31356,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::Fence> *",
    "name" : "const android::sp<android::Fence> *",
-   "referenced_type" : "type-1863",
-   "self_type" : "type-2529",
+   "referenced_type" : "type-1867",
+   "self_type" : "type-2532",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31317,8 +31365,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::FrameDropper> *",
    "name" : "const android::sp<android::FrameDropper> *",
-   "referenced_type" : "type-2506",
-   "self_type" : "type-2507",
+   "referenced_type" : "type-2509",
+   "self_type" : "type-2510",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31326,8 +31374,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::GraphicBuffer> *",
    "name" : "const android::sp<android::GraphicBuffer> *",
-   "referenced_type" : "type-1196",
-   "self_type" : "type-1195",
+   "referenced_type" : "type-1200",
+   "self_type" : "type-1199",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31335,8 +31383,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::GraphicBufferSource> *",
    "name" : "const android::sp<android::GraphicBufferSource> *",
-   "referenced_type" : "type-2544",
-   "self_type" : "type-2545",
+   "referenced_type" : "type-2547",
+   "self_type" : "type-2548",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31344,8 +31392,8 @@
    "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",
+   "referenced_type" : "type-4270",
+   "self_type" : "type-4269",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31353,8 +31401,8 @@
    "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",
+   "referenced_type" : "type-4279",
+   "self_type" : "type-4278",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31362,8 +31410,8 @@
    "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",
+   "referenced_type" : "type-4832",
+   "self_type" : "type-4845",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31371,8 +31419,8 @@
    "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",
+   "referenced_type" : "type-7037",
+   "self_type" : "type-7049",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31380,8 +31428,8 @@
    "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",
+   "referenced_type" : "type-4306",
+   "self_type" : "type-4390",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31389,8 +31437,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IBinder> *",
    "name" : "const android::sp<android::IBinder> *",
-   "referenced_type" : "type-1036",
-   "self_type" : "type-1273",
+   "referenced_type" : "type-1040",
+   "self_type" : "type-1277",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31408,7 +31456,7 @@
    "linker_set_key" : "const android::sp<android::IGraphicBufferConsumer> *",
    "name" : "const android::sp<android::IGraphicBufferConsumer> *",
    "referenced_type" : "type-789",
-   "self_type" : "type-2500",
+   "self_type" : "type-2503",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31416,8 +31464,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer> *",
    "name" : "const android::sp<android::IGraphicBufferProducer> *",
-   "referenced_type" : "type-2485",
-   "self_type" : "type-2487",
+   "referenced_type" : "type-2488",
+   "self_type" : "type-2490",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31425,8 +31473,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IInterface> *",
    "name" : "const android::sp<android::IInterface> *",
-   "referenced_type" : "type-1487",
-   "self_type" : "type-1493",
+   "referenced_type" : "type-1491",
+   "self_type" : "type-1497",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31444,7 +31492,7 @@
    "linker_set_key" : "const android::sp<android::NativeHandle> *",
    "name" : "const android::sp<android::NativeHandle> *",
    "referenced_type" : "type-934",
-   "self_type" : "type-1597",
+   "self_type" : "type-1601",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31452,8 +31500,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-2468",
-   "self_type" : "type-2469",
+   "referenced_type" : "type-2471",
+   "self_type" : "type-2472",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31461,8 +31509,8 @@
    "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-2458",
-   "self_type" : "type-2459",
+   "referenced_type" : "type-2461",
+   "self_type" : "type-2462",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31470,8 +31518,8 @@
    "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",
+   "referenced_type" : "type-4245",
+   "self_type" : "type-4284",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31479,8 +31527,8 @@
    "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",
+   "referenced_type" : "type-4476",
+   "self_type" : "type-4475",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31488,8 +31536,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-2482",
-   "self_type" : "type-2483",
+   "referenced_type" : "type-2485",
+   "self_type" : "type-2486",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31497,8 +31545,8 @@
    "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-2475",
+   "referenced_type" : "type-2477",
+   "self_type" : "type-2478",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31506,8 +31554,8 @@
    "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",
+   "referenced_type" : "type-4239",
+   "self_type" : "type-4282",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31515,8 +31563,8 @@
    "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",
+   "referenced_type" : "type-4469",
+   "self_type" : "type-4468",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31525,7 +31573,7 @@
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient> *",
    "name" : "const android::sp<android::hardware::hidl_death_recipient> *",
    "referenced_type" : "type-513",
-   "self_type" : "type-2442",
+   "self_type" : "type-2445",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31533,8 +31581,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-2446",
-   "self_type" : "type-2447",
+   "referenced_type" : "type-2449",
+   "self_type" : "type-2450",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31542,8 +31590,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "referenced_type" : "type-2451",
-   "self_type" : "type-2453",
+   "referenced_type" : "type-2454",
+   "self_type" : "type-2456",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31578,8 +31626,8 @@
    "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",
+   "referenced_type" : "type-4296",
+   "self_type" : "type-4311",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -31596,8 +31644,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-1241",
-   "self_type" : "type-1240",
+   "referenced_type" : "type-1244",
+   "self_type" : "type-1243",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -31623,8 +31671,8 @@
    "alignment" : 4,
    "linker_set_key" : "const log_msg *",
    "name" : "const log_msg *",
-   "referenced_type" : "type-2313",
-   "self_type" : "type-2320",
+   "referenced_type" : "type-2316",
+   "self_type" : "type-2323",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -31633,7 +31681,7 @@
    "linker_set_key" : "const long long *",
    "name" : "const long long *",
    "referenced_type" : "type-560",
-   "self_type" : "type-1068",
+   "self_type" : "type-1071",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -31651,7 +31699,7 @@
    "linker_set_key" : "const signed char *",
    "name" : "const signed char *",
    "referenced_type" : "type-437",
-   "self_type" : "type-4723",
+   "self_type" : "type-4730",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -31659,8 +31707,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-4759",
-   "self_type" : "type-4761",
+   "referenced_type" : "type-4766",
+   "self_type" : "type-4768",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -31668,8 +31716,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-4863",
-   "self_type" : "type-4865",
+   "referenced_type" : "type-4869",
+   "self_type" : "type-4871",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -31677,8 +31725,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-6625",
-   "self_type" : "type-6627",
+   "referenced_type" : "type-6635",
+   "self_type" : "type-6637",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -31686,8 +31734,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-6727",
-   "self_type" : "type-6729",
+   "referenced_type" : "type-6736",
+   "self_type" : "type-6738",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -31695,8 +31743,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-6850",
-   "self_type" : "type-6852",
+   "referenced_type" : "type-6859",
+   "self_type" : "type-6862",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -31704,8 +31752,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-6997",
-   "self_type" : "type-7004",
+   "referenced_type" : "type-7006",
+   "self_type" : "type-7012",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -31713,8 +31761,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-7072",
-   "self_type" : "type-7074",
+   "referenced_type" : "type-7082",
+   "self_type" : "type-7084",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -31722,8 +31770,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-7248",
-   "self_type" : "type-7254",
+   "referenced_type" : "type-7268",
+   "self_type" : "type-7274",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -31731,8 +31779,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-7299",
-   "self_type" : "type-7301",
+   "referenced_type" : "type-7319",
+   "self_type" : "type-7321",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -31740,8 +31788,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-9533",
-   "self_type" : "type-9535",
+   "referenced_type" : "type-9560",
+   "self_type" : "type-9562",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -31749,8 +31797,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-9626",
-   "self_type" : "type-9628",
+   "referenced_type" : "type-9655",
+   "self_type" : "type-9657",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -31758,8 +31806,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-9752",
-   "self_type" : "type-9754",
+   "referenced_type" : "type-9780",
+   "self_type" : "type-9782",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -31804,7 +31852,7 @@
    "linker_set_key" : "float *",
    "name" : "float *",
    "referenced_type" : "type-268",
-   "self_type" : "type-1275",
+   "self_type" : "type-1276",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -31822,7 +31870,7 @@
    "linker_set_key" : "int *",
    "name" : "int *",
    "referenced_type" : "type-4",
-   "self_type" : "type-1509",
+   "self_type" : "type-1512",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -31830,8 +31878,8 @@
    "alignment" : 4,
    "linker_set_key" : "log_msg *",
    "name" : "log_msg *",
-   "referenced_type" : "type-2177",
-   "self_type" : "type-2342",
+   "referenced_type" : "type-2180",
+   "self_type" : "type-2345",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -31858,7 +31906,7 @@
    "linker_set_key" : "signed char *",
    "name" : "signed char *",
    "referenced_type" : "type-438",
-   "self_type" : "type-4731",
+   "self_type" : "type-4737",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -31866,8 +31914,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::tuple<> *",
    "name" : "std::tuple<> *",
-   "referenced_type" : "type-1566",
-   "self_type" : "type-1565",
+   "referenced_type" : "type-1571",
+   "self_type" : "type-1570",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -31875,573 +31923,6 @@
    "alignment" : 4,
    "linker_set_key" : "std::tuple<> *",
    "name" : "std::tuple<> *",
-   "referenced_type" : "type-2072",
-   "self_type" : "type-2071",
-   "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-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-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,
@@ -32449,17 +31930,368 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "std::tuple<unsigned long long> *",
-   "name" : "std::tuple<unsigned long long> *",
-   "referenced_type" : "type-4162",
-   "self_type" : "type-4161",
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-4056",
+   "self_type" : "type-4055",
    "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> *",
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "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<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-5980",
+   "self_type" : "type-5979",
+   "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-6090",
+   "self_type" : "type-6089",
+   "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-8827",
+   "self_type" : "type-8826",
+   "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-8949",
+   "self_type" : "type-8948",
+   "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-2054",
+   "self_type" : "type-2053",
+   "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-4150",
+   "self_type" : "type-4149",
+   "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-6074",
+   "self_type" : "type-6073",
+   "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-8933",
+   "self_type" : "type-8932",
+   "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-1575",
+   "self_type" : "type-1574",
+   "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-4059",
+   "self_type" : "type-4058",
+   "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-5983",
+   "self_type" : "type-5982",
+   "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-8830",
+   "self_type" : "type-8829",
+   "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-2119",
+   "self_type" : "type-2118",
+   "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-4195",
+   "self_type" : "type-4194",
+   "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-6119",
+   "self_type" : "type-6118",
+   "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-8979",
+   "self_type" : "type-8978",
+   "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-2089",
+   "self_type" : "type-2088",
+   "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-4175",
+   "self_type" : "type-4174",
+   "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-6099",
+   "self_type" : "type-6098",
+   "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-8958",
+   "self_type" : "type-8957",
+   "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-2094",
+   "self_type" : "type-2093",
+   "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-4178",
+   "self_type" : "type-4177",
+   "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-6102",
+   "self_type" : "type-6101",
+   "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-8961",
+   "self_type" : "type-8960",
+   "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-2115",
+   "self_type" : "type-2114",
+   "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-4192",
+   "self_type" : "type-4191",
+   "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-6116",
+   "self_type" : "type-6115",
+   "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-8976",
+   "self_type" : "type-8975",
+   "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-2100",
+   "self_type" : "type-2099",
+   "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-4182",
+   "self_type" : "type-4181",
+   "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-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> *",
+   "name" : "std::tuple<bool> *",
+   "referenced_type" : "type-8966",
+   "self_type" : "type-8965",
+   "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-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, sp<GraphicBuffer> > *",
+   "name" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "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<int, sp<GraphicBuffer> > *",
+   "name" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "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<int, sp<GraphicBuffer> > *",
+   "name" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "referenced_type" : "type-8939",
+   "self_type" : "type-8938",
+   "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-2067",
+   "self_type" : "type-2066",
+   "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-4159",
+   "self_type" : "type-4158",
+   "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-6083",
    "self_type" : "type-6082",
    "size" : 4,
@@ -32467,10 +32299,226 @@
   },
   {
    "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-8942",
+   "self_type" : "type-8941",
+   "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-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> *",
+   "name" : "std::tuple<int> *",
+   "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> *",
+   "name" : "std::tuple<int> *",
+   "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<int> *",
+   "name" : "std::tuple<int> *",
+   "referenced_type" : "type-8936",
+   "self_type" : "type-8935",
+   "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-2072",
+   "self_type" : "type-2071",
+   "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-4163",
+   "self_type" : "type-4162",
+   "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-6087",
+   "self_type" : "type-6086",
+   "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-8945",
+   "self_type" : "type-8944",
+   "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-2110",
+   "self_type" : "type-2109",
+   "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-4189",
+   "self_type" : "type-4188",
+   "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-6113",
+   "self_type" : "type-6112",
+   "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-8973",
+   "self_type" : "type-8972",
+   "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-2085",
+   "self_type" : "type-2084",
+   "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-4172",
+   "self_type" : "type-4171",
+   "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-6096",
+   "self_type" : "type-6095",
+   "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-8955",
+   "self_type" : "type-8954",
+   "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-2106",
+   "self_type" : "type-2105",
+   "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-4186",
+   "self_type" : "type-4185",
+   "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-6110",
+   "self_type" : "type-6109",
+   "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-8969",
+   "self_type" : "type-8968",
+   "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",
+   "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 long long> *",
+   "name" : "std::tuple<unsigned long long> *",
+   "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<unsigned long long> *",
+   "name" : "std::tuple<unsigned long long> *",
+   "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<unsigned long long> *",
+   "name" : "std::tuple<unsigned long long> *",
+   "referenced_type" : "type-8952",
+   "self_type" : "type-8951",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -32478,8 +32526,8 @@
    "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",
+   "referenced_type" : "type-1653",
+   "self_type" : "type-1652",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -32487,8 +32535,8 @@
    "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",
+   "referenced_type" : "type-4117",
+   "self_type" : "type-4116",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -32496,8 +32544,8 @@
    "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",
+   "referenced_type" : "type-6041",
+   "self_type" : "type-6040",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -32505,8 +32553,8 @@
    "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",
+   "referenced_type" : "type-8886",
+   "self_type" : "type-8885",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -32515,7 +32563,7 @@
    "linker_set_key" : "unsigned char (*)[128]",
    "name" : "unsigned char (*)[128]",
    "referenced_type" : "type-1527",
-   "self_type" : "type-2360",
+   "self_type" : "type-2363",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -32533,7 +32581,7 @@
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
    "referenced_type" : "type-2",
-   "self_type" : "type-1680",
+   "self_type" : "type-1684",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -32559,8 +32607,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
    "name" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
-   "referenced_type" : "type-1380",
-   "self_type" : "type-1379",
+   "referenced_type" : "type-1383",
+   "self_type" : "type-1382",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -32600,8 +32648,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1078",
-   "self_type" : "type-1080",
+   "referenced_type" : "type-1081",
+   "self_type" : "type-1083",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32610,8 +32658,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1190",
-   "self_type" : "type-1192",
+   "referenced_type" : "type-1193",
+   "self_type" : "type-1196",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32620,8 +32668,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1351",
-   "self_type" : "type-1353",
+   "referenced_type" : "type-1354",
+   "self_type" : "type-1356",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32630,8 +32678,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1403",
-   "self_type" : "type-1405",
+   "referenced_type" : "type-1406",
+   "self_type" : "type-1408",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32640,8 +32688,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1419",
-   "self_type" : "type-1421",
+   "referenced_type" : "type-1422",
+   "self_type" : "type-1424",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32650,8 +32698,8 @@
    "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",
+   "referenced_type" : "type-1443",
+   "self_type" : "type-1445",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32660,8 +32708,8 @@
    "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",
+   "referenced_type" : "type-1485",
+   "self_type" : "type-1487",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32670,8 +32718,8 @@
    "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",
+   "referenced_type" : "type-1619",
+   "self_type" : "type-1622",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32680,8 +32728,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2648",
-   "self_type" : "type-2651",
+   "referenced_type" : "type-2651",
+   "self_type" : "type-2654",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32690,8 +32738,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",
+   "referenced_type" : "type-3461",
+   "self_type" : "type-3463",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32700,8 +32748,8 @@
    "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",
+   "referenced_type" : "type-3527",
+   "self_type" : "type-3529",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32710,8 +32758,8 @@
    "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",
+   "referenced_type" : "type-3629",
+   "self_type" : "type-3631",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32720,8 +32768,8 @@
    "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",
+   "referenced_type" : "type-3694",
+   "self_type" : "type-3696",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32730,8 +32778,8 @@
    "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",
+   "referenced_type" : "type-3786",
+   "self_type" : "type-3788",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32740,8 +32788,8 @@
    "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",
+   "referenced_type" : "type-3847",
+   "self_type" : "type-3846",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32750,8 +32798,8 @@
    "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",
+   "referenced_type" : "type-3911",
+   "self_type" : "type-3913",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32760,8 +32808,8 @@
    "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",
+   "referenced_type" : "type-3937",
+   "self_type" : "type-3939",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32770,8 +32818,8 @@
    "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",
+   "referenced_type" : "type-3953",
+   "self_type" : "type-3955",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32780,8 +32828,8 @@
    "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",
+   "referenced_type" : "type-3978",
+   "self_type" : "type-3980",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32790,8 +32838,8 @@
    "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",
+   "referenced_type" : "type-4011",
+   "self_type" : "type-4013",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32800,8 +32848,8 @@
    "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",
+   "referenced_type" : "type-4092",
+   "self_type" : "type-4094",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32810,8 +32858,8 @@
    "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",
+   "referenced_type" : "type-4292",
+   "self_type" : "type-4294",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32820,8 +32868,8 @@
    "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",
+   "referenced_type" : "type-4479",
+   "self_type" : "type-4481",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32830,8 +32878,8 @@
    "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",
+   "referenced_type" : "type-4532",
+   "self_type" : "type-4534",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32840,8 +32888,8 @@
    "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",
+   "referenced_type" : "type-4541",
+   "self_type" : "type-4543",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32850,8 +32898,8 @@
    "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",
+   "referenced_type" : "type-4566",
+   "self_type" : "type-4568",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32860,8 +32908,8 @@
    "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",
+   "referenced_type" : "type-4717",
+   "self_type" : "type-4720",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32870,8 +32918,8 @@
    "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",
+   "referenced_type" : "type-4847",
+   "self_type" : "type-4849",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32880,8 +32928,8 @@
    "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",
+   "referenced_type" : "type-4996",
+   "self_type" : "type-4998",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32890,8 +32938,8 @@
    "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",
+   "referenced_type" : "type-5385",
+   "self_type" : "type-5387",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32900,8 +32948,8 @@
    "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",
+   "referenced_type" : "type-5451",
+   "self_type" : "type-5453",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32920,8 +32968,8 @@
    "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",
+   "referenced_type" : "type-5553",
+   "self_type" : "type-5555",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32930,8 +32978,8 @@
    "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",
+   "referenced_type" : "type-5618",
+   "self_type" : "type-5620",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32940,8 +32988,8 @@
    "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",
+   "referenced_type" : "type-5710",
+   "self_type" : "type-5712",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32950,8 +32998,8 @@
    "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",
+   "referenced_type" : "type-5771",
+   "self_type" : "type-5770",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32960,8 +33008,8 @@
    "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",
+   "referenced_type" : "type-5835",
+   "self_type" : "type-5837",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32970,8 +33018,8 @@
    "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",
+   "referenced_type" : "type-5861",
+   "self_type" : "type-5863",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32980,8 +33028,8 @@
    "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",
+   "referenced_type" : "type-5877",
+   "self_type" : "type-5879",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32990,8 +33038,8 @@
    "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",
+   "referenced_type" : "type-5902",
+   "self_type" : "type-5904",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33000,8 +33048,8 @@
    "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",
+   "referenced_type" : "type-5935",
+   "self_type" : "type-5937",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33010,8 +33058,8 @@
    "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",
+   "referenced_type" : "type-6016",
+   "self_type" : "type-6018",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33020,8 +33068,8 @@
    "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",
+   "referenced_type" : "type-6204",
+   "self_type" : "type-6206",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33030,8 +33078,8 @@
    "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",
+   "referenced_type" : "type-6371",
+   "self_type" : "type-6373",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33040,8 +33088,8 @@
    "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",
+   "referenced_type" : "type-6419",
+   "self_type" : "type-6421",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33050,8 +33098,8 @@
    "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",
+   "referenced_type" : "type-6428",
+   "self_type" : "type-6430",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33060,8 +33108,8 @@
    "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",
+   "referenced_type" : "type-6453",
+   "self_type" : "type-6455",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33070,8 +33118,8 @@
    "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",
+   "referenced_type" : "type-6594",
+   "self_type" : "type-6597",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33080,8 +33128,8 @@
    "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",
+   "referenced_type" : "type-6714",
+   "self_type" : "type-6716",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33090,8 +33138,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-6735",
-   "self_type" : "type-6737",
+   "referenced_type" : "type-6744",
+   "self_type" : "type-6746",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33100,8 +33148,8 @@
    "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",
+   "referenced_type" : "type-6788",
+   "self_type" : "type-6790",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33110,8 +33158,8 @@
    "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",
+   "referenced_type" : "type-6877",
+   "self_type" : "type-6880",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33120,8 +33168,8 @@
    "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",
+   "referenced_type" : "type-6940",
+   "self_type" : "type-6942",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33130,8 +33178,8 @@
    "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",
+   "referenced_type" : "type-7056",
+   "self_type" : "type-7058",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33140,8 +33188,8 @@
    "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",
+   "referenced_type" : "type-7102",
+   "self_type" : "type-7105",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33150,8 +33198,8 @@
    "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",
+   "referenced_type" : "type-7201",
+   "self_type" : "type-7203",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33160,8 +33208,8 @@
    "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",
+   "referenced_type" : "type-7301",
+   "self_type" : "type-7303",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33170,8 +33218,8 @@
    "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",
+   "referenced_type" : "type-7340",
+   "self_type" : "type-7342",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33190,8 +33238,8 @@
    "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",
+   "referenced_type" : "type-7716",
+   "self_type" : "type-7718",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33200,8 +33248,8 @@
    "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",
+   "referenced_type" : "type-7782",
+   "self_type" : "type-7784",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33210,8 +33258,8 @@
    "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",
+   "referenced_type" : "type-7884",
+   "self_type" : "type-7886",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33220,8 +33268,8 @@
    "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",
+   "referenced_type" : "type-7949",
+   "self_type" : "type-7951",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33230,8 +33278,8 @@
    "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",
+   "referenced_type" : "type-8041",
+   "self_type" : "type-8043",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33240,8 +33288,8 @@
    "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",
+   "referenced_type" : "type-8102",
+   "self_type" : "type-8101",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33250,8 +33298,8 @@
    "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",
+   "referenced_type" : "type-8164",
+   "self_type" : "type-8166",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33260,8 +33308,8 @@
    "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",
+   "referenced_type" : "type-8224",
+   "self_type" : "type-8226",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33270,18 +33318,8 @@
    "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",
+   "referenced_type" : "type-8320",
+   "self_type" : "type-8322",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33300,8 +33338,8 @@
    "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",
+   "referenced_type" : "type-8372",
+   "self_type" : "type-8374",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33310,8 +33348,8 @@
    "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",
+   "referenced_type" : "type-8461",
+   "self_type" : "type-8463",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33320,8 +33358,8 @@
    "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",
+   "referenced_type" : "type-8513",
+   "self_type" : "type-8515",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33330,8 +33368,8 @@
    "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",
+   "referenced_type" : "type-8593",
+   "self_type" : "type-8595",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33340,8 +33378,8 @@
    "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",
+   "referenced_type" : "type-8686",
+   "self_type" : "type-8688",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33350,8 +33388,8 @@
    "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",
+   "referenced_type" : "type-8712",
+   "self_type" : "type-8714",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33360,8 +33398,8 @@
    "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",
+   "referenced_type" : "type-8729",
+   "self_type" : "type-8731",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33370,8 +33408,8 @@
    "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",
+   "referenced_type" : "type-8750",
+   "self_type" : "type-8752",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33380,8 +33418,8 @@
    "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",
+   "referenced_type" : "type-8782",
+   "self_type" : "type-8784",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33390,8 +33428,8 @@
    "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",
+   "referenced_type" : "type-8862",
+   "self_type" : "type-8864",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33400,8 +33438,8 @@
    "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",
+   "referenced_type" : "type-9079",
+   "self_type" : "type-9081",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33410,8 +33448,8 @@
    "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",
+   "referenced_type" : "type-9264",
+   "self_type" : "type-9266",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33420,8 +33458,8 @@
    "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",
+   "referenced_type" : "type-9326",
+   "self_type" : "type-9329",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33430,8 +33468,8 @@
    "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",
+   "referenced_type" : "type-9341",
+   "self_type" : "type-9344",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33440,8 +33478,8 @@
    "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",
+   "referenced_type" : "type-9377",
+   "self_type" : "type-9379",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33450,8 +33488,8 @@
    "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",
+   "referenced_type" : "type-9527",
+   "self_type" : "type-9529",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33460,8 +33498,8 @@
    "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",
+   "referenced_type" : "type-9628",
+   "self_type" : "type-9630",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33470,8 +33508,18 @@
    "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",
+   "referenced_type" : "type-9665",
+   "self_type" : "type-9667",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-9717",
+   "self_type" : "type-9719",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33490,8 +33538,8 @@
    "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",
+   "referenced_type" : "type-9769",
+   "self_type" : "type-9779",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33500,8 +33548,8 @@
    "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",
+   "referenced_type" : "type-9797",
+   "self_type" : "type-9799",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33510,8 +33558,8 @@
    "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",
+   "referenced_type" : "type-9859",
+   "self_type" : "type-9861",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33520,8 +33568,8 @@
    "is_const" : true,
    "linker_set_key" : "android::hardware::IBinder *const",
    "name" : "android::hardware::IBinder *const",
-   "referenced_type" : "type-1358",
-   "self_type" : "type-1372",
+   "referenced_type" : "type-1361",
+   "self_type" : "type-1375",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -33531,7 +33579,7 @@
    "linker_set_key" : "const android::AHandler",
    "name" : "const android::AHandler",
    "referenced_type" : "type-264",
-   "self_type" : "type-2518",
+   "self_type" : "type-2521",
    "size" : 48,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33541,7 +33589,7 @@
    "linker_set_key" : "const android::AHandlerReflector<android::GraphicBufferSource>",
    "name" : "const android::AHandlerReflector<android::GraphicBufferSource>",
    "referenced_type" : "type-583",
-   "self_type" : "type-2514",
+   "self_type" : "type-2517",
    "size" : 56,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33551,7 +33599,7 @@
    "linker_set_key" : "const android::ALooper",
    "name" : "const android::ALooper",
    "referenced_type" : "type-248",
-   "self_type" : "type-2289",
+   "self_type" : "type-2292",
    "size" : 52,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33560,8 +33608,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AReplyToken",
    "name" : "const android::AReplyToken",
-   "referenced_type" : "type-1044",
-   "self_type" : "type-1167",
+   "referenced_type" : "type-1043",
+   "self_type" : "type-1168",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -33571,7 +33619,7 @@
    "linker_set_key" : "const android::AString",
    "name" : "const android::AString",
    "referenced_type" : "type-253",
-   "self_type" : "type-2110",
+   "self_type" : "type-2101",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -33601,7 +33649,7 @@
    "linker_set_key" : "const android::BnInterface<android::IGraphicBufferProducer>",
    "name" : "const android::BnInterface<android::IGraphicBufferProducer>",
    "referenced_type" : "type-71",
-   "self_type" : "type-1232",
+   "self_type" : "type-1236",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -33611,7 +33659,7 @@
    "linker_set_key" : "const android::BnInterface<android::IProducerListener>",
    "name" : "const android::BnInterface<android::IProducerListener>",
    "referenced_type" : "type-80",
-   "self_type" : "type-4477",
+   "self_type" : "type-4483",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -33620,8 +33668,8 @@
    "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",
+   "referenced_type" : "type-1034",
+   "self_type" : "type-1096",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -33640,8 +33688,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-1070",
-   "self_type" : "type-1069",
+   "referenced_type" : "type-1073",
+   "self_type" : "type-1072",
    "size" : 168,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -33650,8 +33698,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-1220",
-   "self_type" : "type-1219",
+   "referenced_type" : "type-1224",
+   "self_type" : "type-1223",
    "size" : 168,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -33660,8 +33708,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-1531",
-   "self_type" : "type-1530",
+   "referenced_type" : "type-1534",
+   "self_type" : "type-1533",
    "size" : 168,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -33670,8 +33718,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-1672",
-   "self_type" : "type-1671",
+   "referenced_type" : "type-1676",
+   "self_type" : "type-1675",
    "size" : 168,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -33680,8 +33728,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-3442",
-   "self_type" : "type-3441",
+   "referenced_type" : "type-3445",
+   "self_type" : "type-3444",
    "size" : 168,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -33690,8 +33738,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-3634",
-   "self_type" : "type-3633",
+   "referenced_type" : "type-3637",
+   "self_type" : "type-3636",
    "size" : 168,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -33700,8 +33748,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-3683",
-   "self_type" : "type-3682",
+   "referenced_type" : "type-3689",
+   "self_type" : "type-3688",
    "size" : 168,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -33710,8 +33758,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-3792",
-   "self_type" : "type-3791",
+   "referenced_type" : "type-3799",
+   "self_type" : "type-3798",
    "size" : 168,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -33720,8 +33768,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-4041",
-   "self_type" : "type-4040",
+   "referenced_type" : "type-4048",
+   "self_type" : "type-4047",
    "size" : 168,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -33730,8 +33778,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-4127",
-   "self_type" : "type-4126",
+   "referenced_type" : "type-4133",
+   "self_type" : "type-4132",
    "size" : 168,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -33740,8 +33788,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-5363",
-   "self_type" : "type-5362",
+   "referenced_type" : "type-5369",
+   "self_type" : "type-5368",
    "size" : 168,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -33750,8 +33798,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-5555",
-   "self_type" : "type-5554",
+   "referenced_type" : "type-5561",
+   "self_type" : "type-5560",
    "size" : 168,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -33760,8 +33808,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-5604",
-   "self_type" : "type-5603",
+   "referenced_type" : "type-5613",
+   "self_type" : "type-5612",
    "size" : 168,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -33770,8 +33818,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-5713",
-   "self_type" : "type-5712",
+   "referenced_type" : "type-5723",
+   "self_type" : "type-5722",
    "size" : 168,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -33780,8 +33828,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-5962",
-   "self_type" : "type-5961",
+   "referenced_type" : "type-5972",
+   "self_type" : "type-5971",
    "size" : 168,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -33790,8 +33838,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-6048",
-   "self_type" : "type-6047",
+   "referenced_type" : "type-6057",
+   "self_type" : "type-6056",
    "size" : 168,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -33810,8 +33858,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-7679",
-   "self_type" : "type-7678",
+   "referenced_type" : "type-7700",
+   "self_type" : "type-7699",
    "size" : 168,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -33820,8 +33868,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-7871",
-   "self_type" : "type-7870",
+   "referenced_type" : "type-7892",
+   "self_type" : "type-7891",
    "size" : 168,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -33830,8 +33878,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-7920",
-   "self_type" : "type-7919",
+   "referenced_type" : "type-7944",
+   "self_type" : "type-7943",
    "size" : 168,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -33840,8 +33888,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-8029",
-   "self_type" : "type-8028",
+   "referenced_type" : "type-8054",
+   "self_type" : "type-8053",
    "size" : 168,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -33850,8 +33898,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-8283",
-   "self_type" : "type-8282",
+   "referenced_type" : "type-8307",
+   "self_type" : "type-8306",
    "size" : 168,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -33860,8 +33908,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-8442",
-   "self_type" : "type-8441",
+   "referenced_type" : "type-8466",
+   "self_type" : "type-8465",
    "size" : 168,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -33870,8 +33918,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-8484",
-   "self_type" : "type-8483",
+   "referenced_type" : "type-8511",
+   "self_type" : "type-8510",
    "size" : 168,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -33880,8 +33928,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-8575",
-   "self_type" : "type-8574",
+   "referenced_type" : "type-8602",
+   "self_type" : "type-8601",
    "size" : 168,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -33890,8 +33938,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-8793",
-   "self_type" : "type-8792",
+   "referenced_type" : "type-8820",
+   "self_type" : "type-8819",
    "size" : 168,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -33900,8 +33948,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-8875",
-   "self_type" : "type-8874",
+   "referenced_type" : "type-8902",
+   "self_type" : "type-8901",
    "size" : 168,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -33920,8 +33968,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferQueueCore",
    "name" : "const android::BufferQueueCore",
-   "referenced_type" : "type-3522",
-   "self_type" : "type-3521",
+   "referenced_type" : "type-3525",
+   "self_type" : "type-3524",
    "size" : 3928,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33930,8 +33978,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferQueueCore",
    "name" : "const android::BufferQueueCore",
-   "referenced_type" : "type-5443",
-   "self_type" : "type-5442",
+   "referenced_type" : "type-5449",
+   "self_type" : "type-5448",
    "size" : 3928,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33940,8 +33988,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferQueueCore",
    "name" : "const android::BufferQueueCore",
-   "referenced_type" : "type-7759",
-   "self_type" : "type-7758",
+   "referenced_type" : "type-7780",
+   "self_type" : "type-7779",
    "size" : 3928,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33960,8 +34008,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferQueueCore",
    "name" : "const android::BufferQueueCore",
-   "referenced_type" : "type-8345",
-   "self_type" : "type-8344",
+   "referenced_type" : "type-8369",
+   "self_type" : "type-8368",
    "size" : 3928,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33971,7 +34019,7 @@
    "linker_set_key" : "const android::ComponentWrapper",
    "name" : "const android::ComponentWrapper",
    "referenced_type" : "type-569",
-   "self_type" : "type-2494",
+   "self_type" : "type-2497",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33980,8 +34028,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::CompositorTiming",
    "name" : "const android::CompositorTiming",
-   "referenced_type" : "type-1425",
-   "self_type" : "type-1424",
+   "referenced_type" : "type-1428",
+   "self_type" : "type-1427",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -33990,8 +34038,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::CompositorTiming",
    "name" : "const android::CompositorTiming",
-   "referenced_type" : "type-3953",
-   "self_type" : "type-3952",
+   "referenced_type" : "type-3961",
+   "self_type" : "type-3960",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -34000,8 +34048,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::CompositorTiming",
    "name" : "const android::CompositorTiming",
-   "referenced_type" : "type-5874",
-   "self_type" : "type-5873",
+   "referenced_type" : "type-5885",
+   "self_type" : "type-5884",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -34010,8 +34058,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::CompositorTiming",
    "name" : "const android::CompositorTiming",
-   "referenced_type" : "type-8708",
-   "self_type" : "type-8707",
+   "referenced_type" : "type-8735",
+   "self_type" : "type-8734",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -34020,8 +34068,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ConsumerListener",
    "name" : "const android::ConsumerListener",
-   "referenced_type" : "type-3514",
-   "self_type" : "type-3513",
+   "referenced_type" : "type-3517",
+   "self_type" : "type-3516",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34030,8 +34078,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ConsumerListener",
    "name" : "const android::ConsumerListener",
-   "referenced_type" : "type-5435",
-   "self_type" : "type-5434",
+   "referenced_type" : "type-5441",
+   "self_type" : "type-5440",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34040,8 +34088,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ConsumerListener",
    "name" : "const android::ConsumerListener",
-   "referenced_type" : "type-7751",
-   "self_type" : "type-7750",
+   "referenced_type" : "type-7772",
+   "self_type" : "type-7771",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34060,8 +34108,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ConsumerListener",
    "name" : "const android::ConsumerListener",
-   "referenced_type" : "type-8340",
-   "self_type" : "type-8339",
+   "referenced_type" : "type-8364",
+   "self_type" : "type-8363",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34070,8 +34118,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-1310",
-   "self_type" : "type-1309",
+   "referenced_type" : "type-1313",
+   "self_type" : "type-1312",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34080,8 +34128,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-2531",
-   "self_type" : "type-2530",
+   "referenced_type" : "type-2534",
+   "self_type" : "type-2533",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34090,8 +34138,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-3449",
-   "self_type" : "type-3448",
+   "referenced_type" : "type-3452",
+   "self_type" : "type-3451",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34100,8 +34148,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-3594",
-   "self_type" : "type-3593",
+   "referenced_type" : "type-3597",
+   "self_type" : "type-3596",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34110,8 +34158,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-3860",
-   "self_type" : "type-3859",
+   "referenced_type" : "type-3866",
+   "self_type" : "type-3865",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34120,8 +34168,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-4423",
-   "self_type" : "type-4422",
+   "referenced_type" : "type-4429",
+   "self_type" : "type-4428",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34130,8 +34178,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-4673",
-   "self_type" : "type-4672",
+   "referenced_type" : "type-4680",
+   "self_type" : "type-4679",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34140,8 +34188,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-4942",
-   "self_type" : "type-4941",
+   "referenced_type" : "type-4948",
+   "self_type" : "type-4947",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34150,8 +34198,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-5370",
-   "self_type" : "type-5369",
+   "referenced_type" : "type-5376",
+   "self_type" : "type-5375",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34160,8 +34208,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-5515",
-   "self_type" : "type-5514",
+   "referenced_type" : "type-5521",
+   "self_type" : "type-5520",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34170,8 +34218,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-5781",
-   "self_type" : "type-5780",
+   "referenced_type" : "type-5790",
+   "self_type" : "type-5789",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34180,8 +34228,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-6320",
-   "self_type" : "type-6319",
+   "referenced_type" : "type-6329",
+   "self_type" : "type-6328",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34190,8 +34238,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-6554",
-   "self_type" : "type-6553",
+   "referenced_type" : "type-6564",
+   "self_type" : "type-6563",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34200,8 +34248,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-7050",
-   "self_type" : "type-7049",
+   "referenced_type" : "type-7055",
+   "self_type" : "type-7054",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34220,8 +34268,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-7686",
-   "self_type" : "type-7685",
+   "referenced_type" : "type-7707",
+   "self_type" : "type-7706",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34230,8 +34278,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-7831",
-   "self_type" : "type-7830",
+   "referenced_type" : "type-7852",
+   "self_type" : "type-7851",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34240,8 +34288,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-8097",
-   "self_type" : "type-8096",
+   "referenced_type" : "type-8121",
+   "self_type" : "type-8120",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34250,8 +34298,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-8177",
-   "self_type" : "type-8176",
+   "referenced_type" : "type-8201",
+   "self_type" : "type-8200",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34260,8 +34308,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-8288",
-   "self_type" : "type-8287",
+   "referenced_type" : "type-8313",
+   "self_type" : "type-8312",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34270,8 +34318,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-8416",
-   "self_type" : "type-8415",
+   "referenced_type" : "type-8440",
+   "self_type" : "type-8439",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34280,8 +34328,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-8617",
-   "self_type" : "type-8616",
+   "referenced_type" : "type-8644",
+   "self_type" : "type-8643",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34290,8 +34338,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-9189",
-   "self_type" : "type-9188",
+   "referenced_type" : "type-9217",
+   "self_type" : "type-9216",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34310,8 +34358,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-9366",
-   "self_type" : "type-9365",
+   "referenced_type" : "type-9393",
+   "self_type" : "type-9392",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34320,8 +34368,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-9476",
-   "self_type" : "type-9475",
+   "referenced_type" : "type-9503",
+   "self_type" : "type-9502",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34330,8 +34378,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot::State",
    "name" : "const android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-4580",
-   "self_type" : "type-4579",
+   "referenced_type" : "type-4586",
+   "self_type" : "type-4585",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -34340,8 +34388,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot::State",
    "name" : "const android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-4748",
-   "self_type" : "type-4747",
+   "referenced_type" : "type-4755",
+   "self_type" : "type-4754",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -34350,8 +34398,8 @@
    "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",
+   "referenced_type" : "type-6473",
+   "self_type" : "type-6472",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -34360,8 +34408,8 @@
    "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",
+   "referenced_type" : "type-6626",
+   "self_type" : "type-6625",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -34370,8 +34418,8 @@
    "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",
+   "referenced_type" : "type-9406",
+   "self_type" : "type-9405",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -34380,8 +34428,8 @@
    "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",
+   "referenced_type" : "type-9552",
+   "self_type" : "type-9551",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -34390,7 +34438,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::FileDescriptor::Autoclose",
    "name" : "const android::FileDescriptor::Autoclose",
-   "referenced_type" : "type-1204",
+   "referenced_type" : "type-1203",
    "self_type" : "type-1221",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h"
@@ -34401,7 +34449,7 @@
    "linker_set_key" : "const android::Flattenable<android::BufferItem>",
    "name" : "const android::Flattenable<android::BufferItem>",
    "referenced_type" : "type-21",
-   "self_type" : "type-1506",
+   "self_type" : "type-1509",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -34411,7 +34459,7 @@
    "linker_set_key" : "const android::Flattenable<android::Fence>",
    "name" : "const android::Flattenable<android::Fence>",
    "referenced_type" : "type-16",
-   "self_type" : "type-1634",
+   "self_type" : "type-1638",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -34421,7 +34469,7 @@
    "linker_set_key" : "const android::Flattenable<android::FrameEventHistoryDelta>",
    "name" : "const android::Flattenable<android::FrameEventHistoryDelta>",
    "referenced_type" : "type-25",
-   "self_type" : "type-4306",
+   "self_type" : "type-4312",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -34431,7 +34479,7 @@
    "linker_set_key" : "const android::Flattenable<android::GraphicBuffer>",
    "name" : "const android::Flattenable<android::GraphicBuffer>",
    "referenced_type" : "type-14",
-   "self_type" : "type-1638",
+   "self_type" : "type-1643",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -34441,7 +34489,7 @@
    "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
    "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
    "referenced_type" : "type-32",
-   "self_type" : "type-4309",
+   "self_type" : "type-4315",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -34451,7 +34499,7 @@
    "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
    "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
    "referenced_type" : "type-34",
-   "self_type" : "type-4312",
+   "self_type" : "type-4318",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -34461,7 +34509,7 @@
    "linker_set_key" : "const android::FrameDropper",
    "name" : "const android::FrameDropper",
    "referenced_type" : "type-580",
-   "self_type" : "type-2508",
+   "self_type" : "type-2511",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34470,8 +34518,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-1347",
-   "self_type" : "type-1346",
+   "referenced_type" : "type-1350",
+   "self_type" : "type-1349",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34480,8 +34528,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-1462",
-   "self_type" : "type-1461",
+   "referenced_type" : "type-1466",
+   "self_type" : "type-1465",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34490,8 +34538,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-2404",
-   "self_type" : "type-2403",
+   "referenced_type" : "type-2407",
+   "self_type" : "type-2406",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34500,8 +34548,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-3455",
-   "self_type" : "type-3454",
+   "referenced_type" : "type-3458",
+   "self_type" : "type-3457",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34510,8 +34558,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-3599",
-   "self_type" : "type-3598",
+   "referenced_type" : "type-3602",
+   "self_type" : "type-3601",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34520,8 +34568,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-3899",
-   "self_type" : "type-3898",
+   "referenced_type" : "type-3905",
+   "self_type" : "type-3904",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34530,8 +34578,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-3992",
-   "self_type" : "type-3991",
+   "referenced_type" : "type-3998",
+   "self_type" : "type-3997",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34540,8 +34588,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-4219",
-   "self_type" : "type-4218",
+   "referenced_type" : "type-4225",
+   "self_type" : "type-4224",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34550,8 +34598,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-4839",
-   "self_type" : "type-4838",
+   "referenced_type" : "type-4841",
+   "self_type" : "type-4840",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34560,8 +34608,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-5376",
-   "self_type" : "type-5375",
+   "referenced_type" : "type-5382",
+   "self_type" : "type-5381",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34570,8 +34618,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-5520",
-   "self_type" : "type-5519",
+   "referenced_type" : "type-5526",
+   "self_type" : "type-5525",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34580,8 +34628,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-5820",
-   "self_type" : "type-5819",
+   "referenced_type" : "type-5829",
+   "self_type" : "type-5828",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34590,8 +34638,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-5913",
-   "self_type" : "type-5912",
+   "referenced_type" : "type-5922",
+   "self_type" : "type-5921",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34600,8 +34648,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-6140",
-   "self_type" : "type-6139",
+   "referenced_type" : "type-6149",
+   "self_type" : "type-6148",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34610,8 +34658,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-6703",
-   "self_type" : "type-6702",
+   "referenced_type" : "type-6708",
+   "self_type" : "type-6707",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34630,8 +34678,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-7692",
-   "self_type" : "type-7691",
+   "referenced_type" : "type-7713",
+   "self_type" : "type-7712",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34640,8 +34688,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-7836",
-   "self_type" : "type-7835",
+   "referenced_type" : "type-7857",
+   "self_type" : "type-7856",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34650,8 +34698,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-8136",
-   "self_type" : "type-8135",
+   "referenced_type" : "type-8160",
+   "self_type" : "type-8159",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34660,8 +34708,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-8153",
-   "self_type" : "type-8152",
+   "referenced_type" : "type-8177",
+   "self_type" : "type-8176",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34670,8 +34718,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-8294",
-   "self_type" : "type-8293",
+   "referenced_type" : "type-8318",
+   "self_type" : "type-8317",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34680,8 +34728,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-8421",
-   "self_type" : "type-8420",
+   "referenced_type" : "type-8445",
+   "self_type" : "type-8444",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34690,8 +34738,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-8654",
-   "self_type" : "type-8653",
+   "referenced_type" : "type-8681",
+   "self_type" : "type-8680",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34700,8 +34748,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-8742",
-   "self_type" : "type-8741",
+   "referenced_type" : "type-8769",
+   "self_type" : "type-8768",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34710,8 +34758,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-8986",
-   "self_type" : "type-8985",
+   "referenced_type" : "type-9013",
+   "self_type" : "type-9012",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34720,8 +34768,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-8997",
-   "self_type" : "type-8996",
+   "referenced_type" : "type-9024",
+   "self_type" : "type-9023",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34741,7 +34789,7 @@
    "linker_set_key" : "const android::GraphicBufferSource",
    "name" : "const android::GraphicBufferSource",
    "referenced_type" : "type-566",
-   "self_type" : "type-2546",
+   "self_type" : "type-2549",
    "size" : 280,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34771,7 +34819,7 @@
    "linker_set_key" : "const android::IBinder",
    "name" : "const android::IBinder",
    "referenced_type" : "type-51",
-   "self_type" : "type-1520",
+   "self_type" : "type-1524",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34781,7 +34829,7 @@
    "linker_set_key" : "const android::IBinder::DeathRecipient",
    "name" : "const android::IBinder::DeathRecipient",
    "referenced_type" : "type-174",
-   "self_type" : "type-4315",
+   "self_type" : "type-4321",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -34790,8 +34838,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-1156",
-   "self_type" : "type-1155",
+   "referenced_type" : "type-1159",
+   "self_type" : "type-1158",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34800,8 +34848,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-1581",
-   "self_type" : "type-1580",
+   "referenced_type" : "type-1585",
+   "self_type" : "type-1584",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34810,8 +34858,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-3612",
-   "self_type" : "type-3611",
+   "referenced_type" : "type-3615",
+   "self_type" : "type-3614",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34820,8 +34868,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-3761",
-   "self_type" : "type-3760",
+   "referenced_type" : "type-3767",
+   "self_type" : "type-3766",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34830,8 +34878,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-4061",
-   "self_type" : "type-4060",
+   "referenced_type" : "type-4067",
+   "self_type" : "type-4066",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34840,8 +34888,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-5533",
-   "self_type" : "type-5532",
+   "referenced_type" : "type-5539",
+   "self_type" : "type-5538",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34850,8 +34898,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-5682",
-   "self_type" : "type-5681",
+   "referenced_type" : "type-5691",
+   "self_type" : "type-5690",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34860,8 +34908,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-5982",
-   "self_type" : "type-5981",
+   "referenced_type" : "type-5991",
+   "self_type" : "type-5990",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34870,8 +34918,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-7849",
-   "self_type" : "type-7848",
+   "referenced_type" : "type-7870",
+   "self_type" : "type-7869",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34880,8 +34928,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-7998",
-   "self_type" : "type-7997",
+   "referenced_type" : "type-8022",
+   "self_type" : "type-8021",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34890,8 +34938,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-8427",
-   "self_type" : "type-8426",
+   "referenced_type" : "type-8451",
+   "self_type" : "type-8450",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34900,8 +34948,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-8551",
-   "self_type" : "type-8550",
+   "referenced_type" : "type-8578",
+   "self_type" : "type-8577",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34910,8 +34958,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-8810",
-   "self_type" : "type-8809",
+   "referenced_type" : "type-8837",
+   "self_type" : "type-8836",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34930,8 +34978,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-1605",
-   "self_type" : "type-1604",
+   "referenced_type" : "type-1609",
+   "self_type" : "type-1608",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34940,8 +34988,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-2502",
-   "self_type" : "type-2501",
+   "referenced_type" : "type-2505",
+   "self_type" : "type-2504",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34950,8 +34998,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-3495",
-   "self_type" : "type-3494",
+   "referenced_type" : "type-3498",
+   "self_type" : "type-3497",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34960,8 +35008,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-4078",
-   "self_type" : "type-4077",
+   "referenced_type" : "type-4084",
+   "self_type" : "type-4083",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34970,8 +35018,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-4915",
-   "self_type" : "type-4914",
+   "referenced_type" : "type-4921",
+   "self_type" : "type-4920",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34980,8 +35028,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-5416",
-   "self_type" : "type-5415",
+   "referenced_type" : "type-5422",
+   "self_type" : "type-5421",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34990,8 +35038,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-5999",
-   "self_type" : "type-5998",
+   "referenced_type" : "type-6008",
+   "self_type" : "type-6007",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35000,8 +35048,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-6941",
-   "self_type" : "type-6940",
+   "referenced_type" : "type-6948",
+   "self_type" : "type-6947",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35010,8 +35058,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-7732",
-   "self_type" : "type-7731",
+   "referenced_type" : "type-7753",
+   "self_type" : "type-7752",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35030,8 +35078,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-8170",
-   "self_type" : "type-8169",
+   "referenced_type" : "type-8194",
+   "self_type" : "type-8193",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35040,8 +35088,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-8326",
-   "self_type" : "type-8325",
+   "referenced_type" : "type-8350",
+   "self_type" : "type-8349",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35050,8 +35098,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-8825",
-   "self_type" : "type-8824",
+   "referenced_type" : "type-8852",
+   "self_type" : "type-8851",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35060,8 +35108,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-9311",
-   "self_type" : "type-9310",
+   "referenced_type" : "type-9338",
+   "self_type" : "type-9337",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35070,8 +35118,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferProducer",
    "name" : "const android::IGraphicBufferProducer",
-   "referenced_type" : "type-3505",
-   "self_type" : "type-3504",
+   "referenced_type" : "type-3508",
+   "self_type" : "type-3507",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35080,8 +35128,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferProducer",
    "name" : "const android::IGraphicBufferProducer",
-   "referenced_type" : "type-4248",
-   "self_type" : "type-4247",
+   "referenced_type" : "type-4254",
+   "self_type" : "type-4253",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35090,8 +35138,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferProducer",
    "name" : "const android::IGraphicBufferProducer",
-   "referenced_type" : "type-5426",
-   "self_type" : "type-5425",
+   "referenced_type" : "type-5432",
+   "self_type" : "type-5431",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35100,8 +35148,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferProducer",
    "name" : "const android::IGraphicBufferProducer",
-   "referenced_type" : "type-6163",
-   "self_type" : "type-6162",
+   "referenced_type" : "type-6172",
+   "self_type" : "type-6171",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35110,8 +35158,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferProducer",
    "name" : "const android::IGraphicBufferProducer",
-   "referenced_type" : "type-7742",
-   "self_type" : "type-7741",
+   "referenced_type" : "type-7763",
+   "self_type" : "type-7762",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35130,8 +35178,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferProducer",
    "name" : "const android::IGraphicBufferProducer",
-   "referenced_type" : "type-8335",
-   "self_type" : "type-8334",
+   "referenced_type" : "type-8359",
+   "self_type" : "type-8358",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35140,8 +35188,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferProducer",
    "name" : "const android::IGraphicBufferProducer",
-   "referenced_type" : "type-9020",
-   "self_type" : "type-9019",
+   "referenced_type" : "type-9047",
+   "self_type" : "type-9046",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35150,8 +35198,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-1161",
-   "self_type" : "type-1160",
+   "referenced_type" : "type-1032",
+   "self_type" : "type-1031",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35160,8 +35208,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-3624",
-   "self_type" : "type-3623",
+   "referenced_type" : "type-1164",
+   "self_type" : "type-1163",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35170,8 +35218,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-3766",
-   "self_type" : "type-3765",
+   "referenced_type" : "type-3627",
+   "self_type" : "type-3626",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35180,8 +35228,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-4254",
-   "self_type" : "type-4253",
+   "referenced_type" : "type-3671",
+   "self_type" : "type-3670",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35190,8 +35238,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-4450",
-   "self_type" : "type-4449",
+   "referenced_type" : "type-3772",
+   "self_type" : "type-3771",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35200,8 +35248,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-4690",
-   "self_type" : "type-4689",
+   "referenced_type" : "type-4260",
+   "self_type" : "type-4259",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35210,8 +35258,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-5545",
-   "self_type" : "type-5544",
+   "referenced_type" : "type-4456",
+   "self_type" : "type-4455",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35220,8 +35268,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-5687",
-   "self_type" : "type-5686",
+   "referenced_type" : "type-4697",
+   "self_type" : "type-4696",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35230,8 +35278,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-6169",
-   "self_type" : "type-6168",
+   "referenced_type" : "type-5551",
+   "self_type" : "type-5550",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35240,8 +35288,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-6347",
-   "self_type" : "type-6346",
+   "referenced_type" : "type-5595",
+   "self_type" : "type-5594",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35250,8 +35298,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-6570",
-   "self_type" : "type-6569",
+   "referenced_type" : "type-5696",
+   "self_type" : "type-5695",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35260,8 +35308,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-7861",
-   "self_type" : "type-7860",
+   "referenced_type" : "type-6178",
+   "self_type" : "type-6177",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35270,8 +35318,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-8003",
-   "self_type" : "type-8002",
+   "referenced_type" : "type-6356",
+   "self_type" : "type-6355",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35280,8 +35328,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-8434",
-   "self_type" : "type-8433",
+   "referenced_type" : "type-6580",
+   "self_type" : "type-6579",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35290,8 +35338,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-8556",
-   "self_type" : "type-8555",
+   "referenced_type" : "type-7882",
+   "self_type" : "type-7881",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35300,8 +35348,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-9026",
-   "self_type" : "type-9025",
+   "referenced_type" : "type-7926",
+   "self_type" : "type-7925",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35310,8 +35358,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-9219",
-   "self_type" : "type-9218",
+   "referenced_type" : "type-8027",
+   "self_type" : "type-8026",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35320,8 +35368,58 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-9489",
-   "self_type" : "type-9488",
+   "referenced_type" : "type-8458",
+   "self_type" : "type-8457",
+   "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-8502",
+   "self_type" : "type-8501",
+   "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-8583",
+   "self_type" : "type-8582",
+   "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-9053",
+   "self_type" : "type-9052",
+   "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-9247",
+   "self_type" : "type-9246",
+   "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-9516",
+   "self_type" : "type-9515",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35361,7 +35459,7 @@
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect>",
    "name" : "const android::LightFlattenablePod<android::Rect>",
    "referenced_type" : "type-46",
-   "self_type" : "type-4587",
+   "self_type" : "type-4593",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -35380,8 +35478,8 @@
    "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",
+   "referenced_type" : "type-1214",
+   "self_type" : "type-1233",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -35391,7 +35489,7 @@
    "linker_set_key" : "const android::LightRefBase<android::NativeHandle>",
    "name" : "const android::LightRefBase<android::NativeHandle>",
    "referenced_type" : "type-521",
-   "self_type" : "type-2663",
+   "self_type" : "type-2666",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -35540,8 +35638,8 @@
    "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",
+   "referenced_type" : "type-1520",
+   "self_type" : "type-1523",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -35550,8 +35648,8 @@
    "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",
+   "referenced_type" : "type-1662",
+   "self_type" : "type-1666",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -35560,8 +35658,8 @@
    "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",
+   "referenced_type" : "type-4334",
+   "self_type" : "type-4337",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -35570,8 +35668,8 @@
    "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",
+   "referenced_type" : "type-1657",
+   "self_type" : "type-1660",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -35580,8 +35678,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-4333",
-   "self_type" : "type-4336",
+   "referenced_type" : "type-4339",
+   "self_type" : "type-4343",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -35590,8 +35688,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-4338",
-   "self_type" : "type-4341",
+   "referenced_type" : "type-4345",
+   "self_type" : "type-4348",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -35620,8 +35718,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-1216",
-   "self_type" : "type-1215",
+   "referenced_type" : "type-1219",
+   "self_type" : "type-1218",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35630,8 +35728,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-1491",
-   "self_type" : "type-1490",
+   "referenced_type" : "type-1494",
+   "self_type" : "type-1493",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35640,8 +35738,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-1622",
-   "self_type" : "type-1621",
+   "referenced_type" : "type-1625",
+   "self_type" : "type-1624",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35650,8 +35748,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-2684",
-   "self_type" : "type-2683",
+   "referenced_type" : "type-2687",
+   "self_type" : "type-2686",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35660,8 +35758,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-3467",
-   "self_type" : "type-3466",
+   "referenced_type" : "type-3470",
+   "self_type" : "type-3469",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -35670,8 +35768,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-3788",
-   "self_type" : "type-3787",
+   "referenced_type" : "type-3794",
+   "self_type" : "type-3793",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35680,8 +35778,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4012",
-   "self_type" : "type-4011",
+   "referenced_type" : "type-4018",
+   "self_type" : "type-4017",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35690,8 +35788,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4091",
-   "self_type" : "type-4090",
+   "referenced_type" : "type-4097",
+   "self_type" : "type-4096",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35700,8 +35798,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4293",
-   "self_type" : "type-4292",
+   "referenced_type" : "type-4299",
+   "self_type" : "type-4298",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35710,8 +35808,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4573",
-   "self_type" : "type-4572",
+   "referenced_type" : "type-4579",
+   "self_type" : "type-4578",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35720,8 +35818,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4737",
-   "self_type" : "type-4736",
+   "referenced_type" : "type-4744",
+   "self_type" : "type-4743",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35730,8 +35828,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-5020",
-   "self_type" : "type-5019",
+   "referenced_type" : "type-5026",
+   "self_type" : "type-5025",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35740,8 +35838,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-5388",
-   "self_type" : "type-5387",
+   "referenced_type" : "type-5394",
+   "self_type" : "type-5393",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -35750,8 +35848,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-5709",
-   "self_type" : "type-5708",
+   "referenced_type" : "type-5718",
+   "self_type" : "type-5717",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35760,8 +35858,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-5933",
-   "self_type" : "type-5932",
+   "referenced_type" : "type-5942",
+   "self_type" : "type-5941",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35770,8 +35868,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-6012",
-   "self_type" : "type-6011",
+   "referenced_type" : "type-6021",
+   "self_type" : "type-6020",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35780,8 +35878,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-6202",
-   "self_type" : "type-6201",
+   "referenced_type" : "type-6211",
+   "self_type" : "type-6210",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35790,8 +35888,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-6457",
-   "self_type" : "type-6456",
+   "referenced_type" : "type-6466",
+   "self_type" : "type-6465",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35800,8 +35898,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-6606",
-   "self_type" : "type-6605",
+   "referenced_type" : "type-6616",
+   "self_type" : "type-6615",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35810,8 +35908,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-6837",
-   "self_type" : "type-6836",
+   "referenced_type" : "type-6847",
+   "self_type" : "type-6846",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35820,8 +35918,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-6991",
-   "self_type" : "type-6990",
+   "referenced_type" : "type-7000",
+   "self_type" : "type-6999",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35830,8 +35928,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-7222",
-   "self_type" : "type-7221",
+   "referenced_type" : "type-7231",
+   "self_type" : "type-7230",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35840,8 +35938,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-7242",
-   "self_type" : "type-7241",
+   "referenced_type" : "type-7263",
+   "self_type" : "type-7262",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35860,8 +35958,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-7704",
-   "self_type" : "type-7703",
+   "referenced_type" : "type-7725",
+   "self_type" : "type-7724",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -35870,8 +35968,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-8025",
-   "self_type" : "type-8024",
+   "referenced_type" : "type-8049",
+   "self_type" : "type-8048",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35880,8 +35978,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-8207",
-   "self_type" : "type-8206",
+   "referenced_type" : "type-8231",
+   "self_type" : "type-8230",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35890,8 +35988,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-8306",
-   "self_type" : "type-8305",
+   "referenced_type" : "type-8330",
+   "self_type" : "type-8329",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -35900,8 +35998,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-8571",
-   "self_type" : "type-8570",
+   "referenced_type" : "type-8598",
+   "self_type" : "type-8597",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35910,8 +36008,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-8761",
-   "self_type" : "type-8760",
+   "referenced_type" : "type-8789",
+   "self_type" : "type-8788",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35920,8 +36018,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-8840",
-   "self_type" : "type-8839",
+   "referenced_type" : "type-8867",
+   "self_type" : "type-8866",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35930,8 +36028,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-9058",
-   "self_type" : "type-9057",
+   "referenced_type" : "type-9086",
+   "self_type" : "type-9085",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35940,8 +36038,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-9369",
-   "self_type" : "type-9368",
+   "referenced_type" : "type-9397",
+   "self_type" : "type-9396",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35950,8 +36048,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-9516",
-   "self_type" : "type-9515",
+   "referenced_type" : "type-9543",
+   "self_type" : "type-9542",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35960,8 +36058,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-9740",
-   "self_type" : "type-9739",
+   "referenced_type" : "type-9767",
+   "self_type" : "type-9766",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35970,8 +36068,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-9841",
-   "self_type" : "type-9840",
+   "referenced_type" : "type-9864",
+   "self_type" : "type-9863",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35981,7 +36079,7 @@
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
    "referenced_type" : "type-52",
-   "self_type" : "type-1449",
+   "self_type" : "type-1452",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -35990,8 +36088,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SafeBpInterface<android::IConsumerListener>",
    "name" : "const android::SafeBpInterface<android::IConsumerListener>",
-   "referenced_type" : "type-1537",
-   "self_type" : "type-1551",
+   "referenced_type" : "type-1541",
+   "self_type" : "type-1554",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -36000,8 +36098,8 @@
    "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",
+   "referenced_type" : "type-1720",
+   "self_type" : "type-1890",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -36010,8 +36108,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SafeInterface::ParcelHandler",
    "name" : "const android::SafeInterface::ParcelHandler",
-   "referenced_type" : "type-1235",
-   "self_type" : "type-1256",
+   "referenced_type" : "type-1238",
+   "self_type" : "type-1254",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -36021,7 +36119,7 @@
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
    "name" : "const android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
    "referenced_type" : "type-159",
-   "self_type" : "type-2675",
+   "self_type" : "type-2678",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -36031,7 +36129,7 @@
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "const android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "referenced_type" : "type-146",
-   "self_type" : "type-2671",
+   "self_type" : "type-2674",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -36041,7 +36139,7 @@
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "const android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
    "referenced_type" : "type-139",
-   "self_type" : "type-2667",
+   "self_type" : "type-2670",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -36050,8 +36148,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-1239",
-   "self_type" : "type-1248",
+   "referenced_type" : "type-1242",
+   "self_type" : "type-1251",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -36061,7 +36159,7 @@
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
    "referenced_type" : "type-121",
-   "self_type" : "type-1875",
+   "self_type" : "type-1879",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -36071,7 +36169,7 @@
    "linker_set_key" : "const android::Vector<android::BufferItem>",
    "name" : "const android::Vector<android::BufferItem>",
    "referenced_type" : "type-837",
-   "self_type" : "type-977",
+   "self_type" : "type-979",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -36080,8 +36178,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<android::Rect>",
    "name" : "const android::Vector<android::Rect>",
-   "referenced_type" : "type-2677",
-   "self_type" : "type-2679",
+   "referenced_type" : "type-2680",
+   "self_type" : "type-2682",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -36090,8 +36188,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",
+   "referenced_type" : "type-1228",
+   "self_type" : "type-1231",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -36100,8 +36198,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<int>",
    "name" : "const android::Vector<int>",
-   "referenced_type" : "type-2686",
-   "self_type" : "type-2688",
+   "referenced_type" : "type-2689",
+   "self_type" : "type-2691",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -36110,8 +36208,8 @@
    "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",
+   "referenced_type" : "type-1084",
+   "self_type" : "type-1086",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -36121,7 +36219,7 @@
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
    "referenced_type" : "type-141",
-   "self_type" : "type-2664",
+   "self_type" : "type-2667",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -36130,8 +36228,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::base::ErrnoRestorer",
    "name" : "const android::base::ErrnoRestorer",
-   "referenced_type" : "type-4656",
-   "self_type" : "type-4655",
+   "referenced_type" : "type-4663",
+   "self_type" : "type-4662",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -36140,8 +36238,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
-   "referenced_type" : "type-2553",
-   "self_type" : "type-2580",
+   "referenced_type" : "type-2556",
+   "self_type" : "type-2583",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -36160,8 +36258,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::BpHwRefBase",
    "name" : "const android::hardware::BpHwRefBase",
-   "referenced_type" : "type-1371",
-   "self_type" : "type-1374",
+   "referenced_type" : "type-1374",
+   "self_type" : "type-1377",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -36170,8 +36268,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1377",
-   "self_type" : "type-1385",
+   "referenced_type" : "type-1380",
+   "self_type" : "type-1388",
    "size" : 68,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -36180,8 +36278,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-6770",
-   "self_type" : "type-6923",
+   "referenced_type" : "type-6779",
+   "self_type" : "type-6932",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -36190,26 +36288,6 @@
    "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,
@@ -36218,8 +36296,8 @@
   {
    "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> >",
+   "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-4494",
    "self_type" : "type-4498",
    "size" : 28,
@@ -36228,10 +36306,30 @@
   {
    "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-4371",
+   "self_type" : "type-4375",
+   "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-4500",
+   "self_type" : "type-4504",
+   "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-4353",
-   "self_type" : "type-4357",
+   "referenced_type" : "type-4359",
+   "self_type" : "type-4363",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -36241,7 +36339,7 @@
    "linker_set_key" : "const android::hardware::Return<int>",
    "name" : "const android::hardware::Return<int>",
    "referenced_type" : "type-413",
-   "self_type" : "type-4698",
+   "self_type" : "type-4704",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -36250,8 +36348,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",
+   "referenced_type" : "type-6783",
+   "self_type" : "type-6935",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -36321,7 +36419,7 @@
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned char>",
    "name" : "const android::hardware::details::hidl_pointer<unsigned char>",
    "referenced_type" : "type-390",
-   "self_type" : "type-4348",
+   "self_type" : "type-4354",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -36351,7 +36449,7 @@
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming",
    "referenced_type" : "type-588",
-   "self_type" : "type-4582",
+   "self_type" : "type-4588",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -36390,8 +36488,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-2456",
-   "self_type" : "type-2460",
+   "referenced_type" : "type-2459",
+   "self_type" : "type-2463",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -36621,7 +36719,7 @@
    "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",
+   "self_type" : "type-4732",
    "size" : 64,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -36711,7 +36809,7 @@
    "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",
+   "self_type" : "type-4386",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -36771,7 +36869,7 @@
    "linker_set_key" : "const android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "const android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "referenced_type" : "type-160",
-   "self_type" : "type-2619",
+   "self_type" : "type-2622",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -36781,7 +36879,7 @@
    "linker_set_key" : "const android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "name" : "const android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "referenced_type" : "type-147",
-   "self_type" : "type-2617",
+   "self_type" : "type-2620",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -36791,7 +36889,7 @@
    "linker_set_key" : "const android::key_value_pair_t<unsigned int, unsigned int>",
    "name" : "const android::key_value_pair_t<unsigned int, unsigned int>",
    "referenced_type" : "type-143",
-   "self_type" : "type-2613",
+   "self_type" : "type-2616",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -36799,40 +36897,40 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer>",
    "name" : "const android::sp<ANativeWindowBuffer>",
-   "referenced_type" : "type-2410",
-   "self_type" : "type-2409",
+   "referenced_type" : "type-2413",
+   "self_type" : "type-2412",
    "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",
+   "referenced_type" : "type-4852",
+   "self_type" : "type-4851",
    "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",
+   "referenced_type" : "type-6719",
+   "self_type" : "type-6718",
    "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",
+   "referenced_type" : "type-8179",
+   "self_type" : "type-8178",
    "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",
+   "referenced_type" : "type-9017",
+   "self_type" : "type-9016",
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
   {
@@ -36841,7 +36939,7 @@
    "linker_set_key" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
    "name" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
    "referenced_type" : "type-581",
-   "self_type" : "type-1304",
+   "self_type" : "type-1301",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -36861,7 +36959,7 @@
    "linker_set_key" : "const android::sp<android::AMessage>",
    "name" : "const android::sp<android::AMessage>",
    "referenced_type" : "type-259",
-   "self_type" : "type-2175",
+   "self_type" : "type-2174",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -36870,8 +36968,8 @@
    "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",
+   "referenced_type" : "type-4234",
+   "self_type" : "type-4233",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -36880,8 +36978,8 @@
    "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",
+   "referenced_type" : "type-4460",
+   "self_type" : "type-4522",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -36901,7 +36999,7 @@
    "linker_set_key" : "const android::sp<android::ComponentWrapper>",
    "name" : "const android::sp<android::ComponentWrapper>",
    "referenced_type" : "type-567",
-   "self_type" : "type-2491",
+   "self_type" : "type-2494",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -36920,8 +37018,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::Fence>",
    "name" : "const android::sp<android::Fence>",
-   "referenced_type" : "type-1864",
-   "self_type" : "type-1863",
+   "referenced_type" : "type-1868",
+   "self_type" : "type-1867",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -36931,7 +37029,7 @@
    "linker_set_key" : "const android::sp<android::FrameDropper>",
    "name" : "const android::sp<android::FrameDropper>",
    "referenced_type" : "type-578",
-   "self_type" : "type-2506",
+   "self_type" : "type-2509",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -36941,7 +37039,7 @@
    "linker_set_key" : "const android::sp<android::GraphicBuffer>",
    "name" : "const android::sp<android::GraphicBuffer>",
    "referenced_type" : "type-733",
-   "self_type" : "type-1196",
+   "self_type" : "type-1200",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -36960,8 +37058,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::GraphicBufferSource>",
    "name" : "const android::sp<android::GraphicBufferSource>",
-   "referenced_type" : "type-2542",
-   "self_type" : "type-2544",
+   "referenced_type" : "type-2545",
+   "self_type" : "type-2547",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -36970,8 +37068,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-4259",
-   "self_type" : "type-4264",
+   "referenced_type" : "type-4265",
+   "self_type" : "type-4270",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -36980,8 +37078,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-4268",
-   "self_type" : "type-4273",
+   "referenced_type" : "type-4274",
+   "self_type" : "type-4279",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -36990,8 +37088,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-4827",
-   "self_type" : "type-4826",
+   "referenced_type" : "type-4833",
+   "self_type" : "type-4832",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -37000,8 +37098,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-7029",
-   "self_type" : "type-7028",
+   "referenced_type" : "type-7038",
+   "self_type" : "type-7037",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -37011,7 +37109,7 @@
    "linker_set_key" : "const android::sp<android::IBinder::DeathRecipient>",
    "name" : "const android::sp<android::IBinder::DeathRecipient>",
    "referenced_type" : "type-843",
-   "self_type" : "type-4300",
+   "self_type" : "type-4306",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -37021,7 +37119,7 @@
    "linker_set_key" : "const android::sp<android::IBinder>",
    "name" : "const android::sp<android::IBinder>",
    "referenced_type" : "type-795",
-   "self_type" : "type-1036",
+   "self_type" : "type-1040",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -37051,7 +37149,7 @@
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer>",
    "name" : "const android::sp<android::IGraphicBufferProducer>",
    "referenced_type" : "type-570",
-   "self_type" : "type-2485",
+   "self_type" : "type-2488",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -37061,7 +37159,7 @@
    "linker_set_key" : "const android::sp<android::IInterface>",
    "name" : "const android::sp<android::IInterface>",
    "referenced_type" : "type-646",
-   "self_type" : "type-1487",
+   "self_type" : "type-1491",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -37080,8 +37178,8 @@
    "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",
+   "referenced_type" : "type-1044",
+   "self_type" : "type-1049",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -37100,8 +37198,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",
+   "referenced_type" : "type-1262",
+   "self_type" : "type-1261",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -37110,8 +37208,8 @@
    "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",
+   "referenced_type" : "type-1370",
+   "self_type" : "type-1392",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -37120,8 +37218,8 @@
    "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",
+   "referenced_type" : "type-1397",
+   "self_type" : "type-1396",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -37130,8 +37228,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-2463",
-   "self_type" : "type-2468",
+   "referenced_type" : "type-2466",
+   "self_type" : "type-2471",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -37140,8 +37238,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener>",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener>",
-   "referenced_type" : "type-2454",
-   "self_type" : "type-2458",
+   "referenced_type" : "type-2457",
+   "self_type" : "type-2461",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -37150,8 +37248,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-4240",
-   "self_type" : "type-4239",
+   "referenced_type" : "type-4246",
+   "self_type" : "type-4245",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -37160,8 +37258,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-4466",
-   "self_type" : "type-4469",
+   "referenced_type" : "type-4473",
+   "self_type" : "type-4476",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -37170,8 +37268,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-2476",
-   "self_type" : "type-2482",
+   "referenced_type" : "type-2479",
+   "self_type" : "type-2485",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -37180,8 +37278,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener>",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener>",
-   "referenced_type" : "type-2470",
-   "self_type" : "type-2474",
+   "referenced_type" : "type-2473",
+   "self_type" : "type-2477",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -37190,8 +37288,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-4234",
-   "self_type" : "type-4233",
+   "referenced_type" : "type-4240",
+   "self_type" : "type-4239",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -37200,8 +37298,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-4459",
-   "self_type" : "type-4462",
+   "referenced_type" : "type-4466",
+   "self_type" : "type-4469",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -37220,8 +37318,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-2444",
-   "self_type" : "type-2446",
+   "referenced_type" : "type-2447",
+   "self_type" : "type-2449",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -37230,8 +37328,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification>",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification>",
-   "referenced_type" : "type-2448",
-   "self_type" : "type-2451",
+   "referenced_type" : "type-2451",
+   "self_type" : "type-2454",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -37271,7 +37369,7 @@
    "linker_set_key" : "const android::wp<android::IBinder::DeathRecipient>",
    "name" : "const android::wp<android::IBinder::DeathRecipient>",
    "referenced_type" : "type-172",
-   "self_type" : "type-4289",
+   "self_type" : "type-4296",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -37281,7 +37379,7 @@
    "linker_set_key" : "const android::wp<android::IBinder>",
    "name" : "const android::wp<android::IBinder>",
    "referenced_type" : "type-130",
-   "self_type" : "type-4280",
+   "self_type" : "type-4286",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -37291,7 +37389,7 @@
    "linker_set_key" : "const android_cta861_3_metadata",
    "name" : "const android_cta861_3_metadata",
    "referenced_type" : "type-305",
-   "self_type" : "type-1473",
+   "self_type" : "type-1477",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -37311,7 +37409,7 @@
    "linker_set_key" : "const android_smpte2086_metadata",
    "name" : "const android_smpte2086_metadata",
    "referenced_type" : "type-304",
-   "self_type" : "type-1471",
+   "self_type" : "type-1474",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -37341,7 +37439,7 @@
    "linker_set_key" : "const char *const",
    "name" : "const char *const",
    "referenced_type" : "type-122",
-   "self_type" : "type-1103",
+   "self_type" : "type-1106",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -37350,8 +37448,8 @@
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-1242",
-   "self_type" : "type-1241",
+   "referenced_type" : "type-1245",
+   "self_type" : "type-1244",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -37361,7 +37459,7 @@
    "linker_set_key" : "const double",
    "name" : "const double",
    "referenced_type" : "type-269",
-   "self_type" : "type-1077",
+   "self_type" : "type-1080",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -37397,64 +37495,64 @@
    "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-1113",
+   "self_type" : "type-1112",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1282",
-   "self_type" : "type-1281",
+   "referenced_type" : "type-1285",
+   "self_type" : "type-1284",
    "source_file" : "/system/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",
+   "referenced_type" : "type-3310",
+   "self_type" : "type-3309",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3539",
-   "self_type" : "type-3538",
+   "referenced_type" : "type-3542",
+   "self_type" : "type-3541",
    "source_file" : "/system/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",
+   "referenced_type" : "type-3651",
+   "self_type" : "type-3650",
    "source_file" : "/system/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",
+   "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-3833",
-   "self_type" : "type-3832",
+   "referenced_type" : "type-3839",
+   "self_type" : "type-3838",
    "source_file" : "/system/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",
+   "referenced_type" : "type-4379",
+   "self_type" : "type-4378",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -37469,272 +37567,272 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-4502",
-   "self_type" : "type-4501",
+   "referenced_type" : "type-4508",
+   "self_type" : "type-4507",
    "source_file" : "/system/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",
+   "referenced_type" : "type-4545",
+   "self_type" : "type-4544",
    "source_file" : "/system/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",
+   "referenced_type" : "type-4570",
+   "self_type" : "type-4569",
    "source_file" : "/system/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",
+   "referenced_type" : "type-4724",
+   "self_type" : "type-4723",
    "source_file" : "/system/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",
+   "referenced_type" : "type-4854",
+   "self_type" : "type-4853",
    "source_file" : "/system/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",
+   "referenced_type" : "type-5234",
+   "self_type" : "type-5233",
    "source_file" : "/system/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",
+   "referenced_type" : "type-5466",
+   "self_type" : "type-5465",
    "source_file" : "/system/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",
+   "referenced_type" : "type-5575",
+   "self_type" : "type-5574",
    "source_file" : "/system/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",
+   "referenced_type" : "type-5641",
+   "self_type" : "type-5640",
    "source_file" : "/system/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",
+   "referenced_type" : "type-5763",
+   "self_type" : "type-5762",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6279",
+   "self_type" : "type-6278",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6395",
+   "self_type" : "type-6394",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6432",
+   "self_type" : "type-6431",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6457",
+   "self_type" : "type-6456",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6600",
+   "self_type" : "type-6599",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6721",
+   "self_type" : "type-6720",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6748",
+   "self_type" : "type-6747",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6793",
+   "self_type" : "type-6792",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6882",
+   "self_type" : "type-6881",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6945",
+   "self_type" : "type-6944",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7060",
+   "self_type" : "type-7059",
    "source_file" : "/system/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",
+   "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-7285",
-   "self_type" : "type-7284",
+   "referenced_type" : "type-7305",
+   "self_type" : "type-7304",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7358",
+   "self_type" : "type-7357",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7565",
+   "self_type" : "type-7564",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7797",
+   "self_type" : "type-7796",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7906",
+   "self_type" : "type-7905",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7972",
+   "self_type" : "type-7971",
    "source_file" : "/system/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",
+   "referenced_type" : "type-8094",
+   "self_type" : "type-8093",
    "source_file" : "/system/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",
+   "referenced_type" : "type-8250",
+   "self_type" : "type-8249",
    "source_file" : "/system/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",
+   "referenced_type" : "type-8386",
+   "self_type" : "type-8385",
    "source_file" : "/system/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",
+   "referenced_type" : "type-8482",
+   "self_type" : "type-8481",
    "source_file" : "/system/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",
+   "referenced_type" : "type-8529",
+   "self_type" : "type-8528",
    "source_file" : "/system/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",
+   "referenced_type" : "type-8621",
+   "self_type" : "type-8620",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -37749,80 +37847,80 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-9132",
-   "self_type" : "type-9131",
+   "referenced_type" : "type-9160",
+   "self_type" : "type-9159",
    "source_file" : "/system/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",
+   "referenced_type" : "type-9294",
+   "self_type" : "type-9293",
    "source_file" : "/system/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",
+   "referenced_type" : "type-9347",
+   "self_type" : "type-9346",
    "source_file" : "/system/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",
+   "referenced_type" : "type-9383",
+   "self_type" : "type-9382",
    "source_file" : "/system/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",
+   "referenced_type" : "type-9532",
+   "self_type" : "type-9531",
    "source_file" : "/system/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",
+   "referenced_type" : "type-9632",
+   "self_type" : "type-9631",
    "source_file" : "/system/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",
+   "referenced_type" : "type-9670",
+   "self_type" : "type-9669",
    "source_file" : "/system/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",
+   "referenced_type" : "type-9721",
+   "self_type" : "type-9720",
    "source_file" : "/system/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",
+   "referenced_type" : "type-9801",
+   "self_type" : "type-9800",
    "source_file" : "/system/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",
+   "referenced_type" : "type-9866",
+   "self_type" : "type-9865",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -37830,8 +37928,8 @@
    "is_const" : true,
    "linker_set_key" : "const log_msg",
    "name" : "const log_msg",
-   "referenced_type" : "type-2177",
-   "self_type" : "type-2313",
+   "referenced_type" : "type-2180",
+   "self_type" : "type-2316",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -37880,8 +37978,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-1314",
-   "self_type" : "type-1313",
+   "referenced_type" : "type-1318",
+   "self_type" : "type-1317",
    "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"
   },
@@ -37890,8 +37988,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-3392",
-   "self_type" : "type-3391",
+   "referenced_type" : "type-3395",
+   "self_type" : "type-3394",
    "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"
   },
@@ -37900,8 +37998,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-3562",
-   "self_type" : "type-3561",
+   "referenced_type" : "type-3565",
+   "self_type" : "type-3564",
    "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"
   },
@@ -37910,8 +38008,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-3864",
-   "self_type" : "type-3863",
+   "referenced_type" : "type-3871",
+   "self_type" : "type-3870",
    "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"
   },
@@ -37920,8 +38018,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-4413",
-   "self_type" : "type-4412",
+   "referenced_type" : "type-4421",
+   "self_type" : "type-4420",
    "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"
   },
@@ -37930,8 +38028,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-4624",
-   "self_type" : "type-4623",
+   "referenced_type" : "type-4630",
+   "self_type" : "type-4629",
    "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"
   },
@@ -37940,8 +38038,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-4794",
-   "self_type" : "type-4793",
+   "referenced_type" : "type-4800",
+   "self_type" : "type-4799",
    "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"
   },
@@ -37950,8 +38048,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-5313",
-   "self_type" : "type-5312",
+   "referenced_type" : "type-5319",
+   "self_type" : "type-5318",
    "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"
   },
@@ -37960,8 +38058,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-5483",
-   "self_type" : "type-5482",
+   "referenced_type" : "type-5489",
+   "self_type" : "type-5488",
    "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"
   },
@@ -37970,8 +38068,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-5785",
-   "self_type" : "type-5784",
+   "referenced_type" : "type-5795",
+   "self_type" : "type-5794",
    "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"
   },
@@ -37990,8 +38088,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-6310",
-   "self_type" : "type-6309",
+   "referenced_type" : "type-6321",
+   "self_type" : "type-6320",
    "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"
   },
@@ -38000,8 +38098,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-6508",
-   "self_type" : "type-6507",
+   "referenced_type" : "type-6517",
+   "self_type" : "type-6516",
    "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"
   },
@@ -38010,8 +38108,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-6660",
-   "self_type" : "type-6659",
+   "referenced_type" : "type-6669",
+   "self_type" : "type-6668",
    "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"
   },
@@ -38020,8 +38118,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-6864",
-   "self_type" : "type-6863",
+   "referenced_type" : "type-6875",
+   "self_type" : "type-6874",
    "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"
   },
@@ -38030,8 +38128,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-7017",
-   "self_type" : "type-7016",
+   "referenced_type" : "type-7027",
+   "self_type" : "type-7026",
    "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"
   },
@@ -38040,8 +38138,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-7131",
-   "self_type" : "type-7130",
+   "referenced_type" : "type-7141",
+   "self_type" : "type-7140",
    "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"
   },
@@ -38050,8 +38148,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-7264",
-   "self_type" : "type-7263",
+   "referenced_type" : "type-7284",
+   "self_type" : "type-7283",
    "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"
   },
@@ -38060,8 +38158,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-7362",
-   "self_type" : "type-7361",
+   "referenced_type" : "type-7384",
+   "self_type" : "type-7383",
    "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"
   },
@@ -38070,8 +38168,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-7629",
-   "self_type" : "type-7628",
+   "referenced_type" : "type-7650",
+   "self_type" : "type-7649",
    "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"
   },
@@ -38080,8 +38178,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-7799",
-   "self_type" : "type-7798",
+   "referenced_type" : "type-7820",
+   "self_type" : "type-7819",
    "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"
   },
@@ -38090,8 +38188,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-8101",
-   "self_type" : "type-8100",
+   "referenced_type" : "type-8126",
+   "self_type" : "type-8125",
    "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"
   },
@@ -38100,8 +38198,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-8253",
-   "self_type" : "type-8252",
+   "referenced_type" : "type-8277",
+   "self_type" : "type-8276",
    "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"
   },
@@ -38110,8 +38208,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-8385",
-   "self_type" : "type-8384",
+   "referenced_type" : "type-8409",
+   "self_type" : "type-8408",
    "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"
   },
@@ -38120,8 +38218,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-8621",
-   "self_type" : "type-8620",
+   "referenced_type" : "type-8649",
+   "self_type" : "type-8648",
    "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"
   },
@@ -38140,8 +38238,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-9178",
-   "self_type" : "type-9177",
+   "referenced_type" : "type-9208",
+   "self_type" : "type-9207",
    "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"
   },
@@ -38150,8 +38248,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-9427",
-   "self_type" : "type-9426",
+   "referenced_type" : "type-9456",
+   "self_type" : "type-9455",
    "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"
   },
@@ -38160,8 +38258,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-9562",
-   "self_type" : "type-9561",
+   "referenced_type" : "type-9589",
+   "self_type" : "type-9588",
    "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"
   },
@@ -38170,8 +38268,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-9765",
-   "self_type" : "type-9764",
+   "referenced_type" : "type-9792",
+   "self_type" : "type-9791",
    "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"
   },
@@ -38180,8 +38278,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-1312",
-   "self_type" : "type-1311",
+   "referenced_type" : "type-1315",
+   "self_type" : "type-1314",
    "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"
   },
@@ -38190,8 +38288,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-3390",
-   "self_type" : "type-3389",
+   "referenced_type" : "type-3393",
+   "self_type" : "type-3392",
    "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"
   },
@@ -38200,8 +38298,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-3560",
-   "self_type" : "type-3559",
+   "referenced_type" : "type-3563",
+   "self_type" : "type-3562",
    "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"
   },
@@ -38210,8 +38308,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-3862",
-   "self_type" : "type-3861",
+   "referenced_type" : "type-3868",
+   "self_type" : "type-3867",
    "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"
   },
@@ -38220,8 +38318,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-4411",
-   "self_type" : "type-4410",
+   "referenced_type" : "type-4419",
+   "self_type" : "type-4418",
    "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"
   },
@@ -38230,8 +38328,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-4622",
-   "self_type" : "type-4621",
+   "referenced_type" : "type-4628",
+   "self_type" : "type-4627",
    "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"
   },
@@ -38240,8 +38338,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-4792",
-   "self_type" : "type-4791",
+   "referenced_type" : "type-4798",
+   "self_type" : "type-4797",
    "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"
   },
@@ -38250,8 +38348,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-5311",
-   "self_type" : "type-5310",
+   "referenced_type" : "type-5317",
+   "self_type" : "type-5316",
    "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"
   },
@@ -38260,8 +38358,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-5481",
-   "self_type" : "type-5480",
+   "referenced_type" : "type-5487",
+   "self_type" : "type-5486",
    "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"
   },
@@ -38270,8 +38368,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-5783",
-   "self_type" : "type-5782",
+   "referenced_type" : "type-5792",
+   "self_type" : "type-5791",
    "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"
   },
@@ -38290,8 +38388,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-6308",
-   "self_type" : "type-6307",
+   "referenced_type" : "type-6319",
+   "self_type" : "type-6318",
    "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"
   },
@@ -38300,8 +38398,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-6506",
-   "self_type" : "type-6505",
+   "referenced_type" : "type-6515",
+   "self_type" : "type-6514",
    "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"
   },
@@ -38310,8 +38408,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-6658",
-   "self_type" : "type-6657",
+   "referenced_type" : "type-6667",
+   "self_type" : "type-6666",
    "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"
   },
@@ -38320,8 +38418,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-6862",
-   "self_type" : "type-6861",
+   "referenced_type" : "type-6873",
+   "self_type" : "type-6872",
    "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"
   },
@@ -38330,8 +38428,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-7014",
-   "self_type" : "type-7013",
+   "referenced_type" : "type-7023",
+   "self_type" : "type-7022",
    "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"
   },
@@ -38340,8 +38438,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-7129",
-   "self_type" : "type-7128",
+   "referenced_type" : "type-7139",
+   "self_type" : "type-7138",
    "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"
   },
@@ -38350,8 +38448,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-7262",
-   "self_type" : "type-7261",
+   "referenced_type" : "type-7282",
+   "self_type" : "type-7281",
    "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"
   },
@@ -38360,8 +38458,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-7360",
-   "self_type" : "type-7359",
+   "referenced_type" : "type-7382",
+   "self_type" : "type-7381",
    "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"
   },
@@ -38370,8 +38468,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-7627",
-   "self_type" : "type-7626",
+   "referenced_type" : "type-7648",
+   "self_type" : "type-7647",
    "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"
   },
@@ -38380,8 +38478,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-7797",
-   "self_type" : "type-7796",
+   "referenced_type" : "type-7818",
+   "self_type" : "type-7817",
    "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"
   },
@@ -38390,8 +38488,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-8099",
-   "self_type" : "type-8098",
+   "referenced_type" : "type-8123",
+   "self_type" : "type-8122",
    "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"
   },
@@ -38400,8 +38498,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-8251",
-   "self_type" : "type-8250",
+   "referenced_type" : "type-8275",
+   "self_type" : "type-8274",
    "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"
   },
@@ -38410,8 +38508,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-8383",
-   "self_type" : "type-8382",
+   "referenced_type" : "type-8407",
+   "self_type" : "type-8406",
    "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"
   },
@@ -38420,8 +38518,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-8619",
-   "self_type" : "type-8618",
+   "referenced_type" : "type-8646",
+   "self_type" : "type-8645",
    "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"
   },
@@ -38440,8 +38538,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-9176",
-   "self_type" : "type-9175",
+   "referenced_type" : "type-9206",
+   "self_type" : "type-9205",
    "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"
   },
@@ -38450,8 +38548,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-9424",
-   "self_type" : "type-9423",
+   "referenced_type" : "type-9454",
+   "self_type" : "type-9453",
    "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"
   },
@@ -38460,8 +38558,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-9560",
-   "self_type" : "type-9559",
+   "referenced_type" : "type-9587",
+   "self_type" : "type-9586",
    "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"
   },
@@ -38470,8 +38568,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-9763",
-   "self_type" : "type-9762",
+   "referenced_type" : "type-9790",
+   "self_type" : "type-9789",
    "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"
   },
@@ -38480,8 +38578,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-1321",
-   "self_type" : "type-1320",
+   "referenced_type" : "type-1324",
+   "self_type" : "type-1323",
    "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"
   },
@@ -38490,8 +38588,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-3404",
-   "self_type" : "type-3403",
+   "referenced_type" : "type-3407",
+   "self_type" : "type-3406",
    "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"
   },
@@ -38500,8 +38598,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-3568",
-   "self_type" : "type-3567",
+   "referenced_type" : "type-3571",
+   "self_type" : "type-3570",
    "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"
   },
@@ -38510,8 +38608,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-3872",
-   "self_type" : "type-3871",
+   "referenced_type" : "type-3878",
+   "self_type" : "type-3877",
    "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"
   },
@@ -38520,8 +38618,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-4421",
-   "self_type" : "type-4420",
+   "referenced_type" : "type-4427",
+   "self_type" : "type-4426",
    "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"
   },
@@ -38530,8 +38628,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-4630",
-   "self_type" : "type-4629",
+   "referenced_type" : "type-4636",
+   "self_type" : "type-4635",
    "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"
   },
@@ -38540,8 +38638,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-4800",
-   "self_type" : "type-4799",
+   "referenced_type" : "type-4806",
+   "self_type" : "type-4805",
    "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"
   },
@@ -38550,8 +38648,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-5325",
-   "self_type" : "type-5324",
+   "referenced_type" : "type-5331",
+   "self_type" : "type-5330",
    "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"
   },
@@ -38560,8 +38658,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-5489",
-   "self_type" : "type-5488",
+   "referenced_type" : "type-5495",
+   "self_type" : "type-5494",
    "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"
   },
@@ -38570,8 +38668,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-5793",
-   "self_type" : "type-5792",
+   "referenced_type" : "type-5802",
+   "self_type" : "type-5801",
    "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"
   },
@@ -38590,8 +38688,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-6318",
-   "self_type" : "type-6317",
+   "referenced_type" : "type-6327",
+   "self_type" : "type-6326",
    "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"
   },
@@ -38600,8 +38698,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-6514",
-   "self_type" : "type-6513",
+   "referenced_type" : "type-6523",
+   "self_type" : "type-6522",
    "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"
   },
@@ -38610,8 +38708,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-6666",
-   "self_type" : "type-6665",
+   "referenced_type" : "type-6675",
+   "self_type" : "type-6674",
    "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"
   },
@@ -38620,8 +38718,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-6793",
-   "self_type" : "type-6792",
+   "referenced_type" : "type-6803",
+   "self_type" : "type-6802",
    "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"
   },
@@ -38630,8 +38728,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-7023",
-   "self_type" : "type-7022",
+   "referenced_type" : "type-7033",
+   "self_type" : "type-7032",
    "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"
   },
@@ -38640,8 +38738,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-7138",
-   "self_type" : "type-7137",
+   "referenced_type" : "type-7147",
+   "self_type" : "type-7146",
    "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"
   },
@@ -38650,8 +38748,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-7270",
-   "self_type" : "type-7269",
+   "referenced_type" : "type-7290",
+   "self_type" : "type-7289",
    "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"
   },
@@ -38660,8 +38758,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-7369",
-   "self_type" : "type-7368",
+   "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"
   },
@@ -38670,8 +38768,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-7641",
-   "self_type" : "type-7640",
+   "referenced_type" : "type-7662",
+   "self_type" : "type-7661",
    "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"
   },
@@ -38680,8 +38778,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-7805",
-   "self_type" : "type-7804",
+   "referenced_type" : "type-7826",
+   "self_type" : "type-7825",
    "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"
   },
@@ -38690,8 +38788,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-8109",
-   "self_type" : "type-8108",
+   "referenced_type" : "type-8133",
+   "self_type" : "type-8132",
    "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"
   },
@@ -38700,8 +38798,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-8259",
-   "self_type" : "type-8258",
+   "referenced_type" : "type-8284",
+   "self_type" : "type-8283",
    "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"
   },
@@ -38710,8 +38808,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-8391",
-   "self_type" : "type-8390",
+   "referenced_type" : "type-8415",
+   "self_type" : "type-8414",
    "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"
   },
@@ -38720,8 +38818,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-8628",
-   "self_type" : "type-8627",
+   "referenced_type" : "type-8655",
+   "self_type" : "type-8654",
    "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"
   },
@@ -38740,8 +38838,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-9187",
-   "self_type" : "type-9186",
+   "referenced_type" : "type-9215",
+   "self_type" : "type-9214",
    "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"
   },
@@ -38750,8 +38848,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-9435",
-   "self_type" : "type-9434",
+   "referenced_type" : "type-9462",
+   "self_type" : "type-9461",
    "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"
   },
@@ -38760,8 +38858,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-9568",
-   "self_type" : "type-9567",
+   "referenced_type" : "type-9595",
+   "self_type" : "type-9594",
    "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"
   },
@@ -38770,8 +38868,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-9701",
-   "self_type" : "type-9700",
+   "referenced_type" : "type-9728",
+   "self_type" : "type-9727",
    "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"
   },
@@ -38780,8 +38878,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-1319",
-   "self_type" : "type-1318",
+   "referenced_type" : "type-1322",
+   "self_type" : "type-1321",
    "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"
   },
@@ -38790,8 +38888,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-3402",
-   "self_type" : "type-3401",
+   "referenced_type" : "type-3405",
+   "self_type" : "type-3404",
    "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"
   },
@@ -38800,8 +38898,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-3566",
-   "self_type" : "type-3565",
+   "referenced_type" : "type-3569",
+   "self_type" : "type-3568",
    "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"
   },
@@ -38810,8 +38908,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-3870",
-   "self_type" : "type-3869",
+   "referenced_type" : "type-3876",
+   "self_type" : "type-3875",
    "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"
   },
@@ -38820,8 +38918,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-4419",
-   "self_type" : "type-4418",
+   "referenced_type" : "type-4425",
+   "self_type" : "type-4424",
    "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"
   },
@@ -38830,8 +38928,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-4628",
-   "self_type" : "type-4627",
+   "referenced_type" : "type-4634",
+   "self_type" : "type-4633",
    "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"
   },
@@ -38840,8 +38938,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-4798",
-   "self_type" : "type-4797",
+   "referenced_type" : "type-4804",
+   "self_type" : "type-4803",
    "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"
   },
@@ -38850,8 +38948,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-5323",
-   "self_type" : "type-5322",
+   "referenced_type" : "type-5329",
+   "self_type" : "type-5328",
    "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"
   },
@@ -38860,8 +38958,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-5487",
-   "self_type" : "type-5486",
+   "referenced_type" : "type-5493",
+   "self_type" : "type-5492",
    "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"
   },
@@ -38870,8 +38968,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-5791",
-   "self_type" : "type-5790",
+   "referenced_type" : "type-5800",
+   "self_type" : "type-5799",
    "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"
   },
@@ -38890,8 +38988,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-6316",
-   "self_type" : "type-6315",
+   "referenced_type" : "type-6325",
+   "self_type" : "type-6324",
    "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"
   },
@@ -38900,8 +38998,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-6512",
-   "self_type" : "type-6511",
+   "referenced_type" : "type-6521",
+   "self_type" : "type-6520",
    "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"
   },
@@ -38910,8 +39008,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-6664",
-   "self_type" : "type-6663",
+   "referenced_type" : "type-6673",
+   "self_type" : "type-6672",
    "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"
   },
@@ -38920,8 +39018,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-6791",
-   "self_type" : "type-6790",
+   "referenced_type" : "type-6801",
+   "self_type" : "type-6800",
    "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"
   },
@@ -38930,8 +39028,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-7021",
-   "self_type" : "type-7020",
+   "referenced_type" : "type-7031",
+   "self_type" : "type-7030",
    "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"
   },
@@ -38940,8 +39038,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-7136",
-   "self_type" : "type-7135",
+   "referenced_type" : "type-7145",
+   "self_type" : "type-7144",
    "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"
   },
@@ -38950,8 +39048,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-7268",
-   "self_type" : "type-7267",
+   "referenced_type" : "type-7288",
+   "self_type" : "type-7287",
    "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"
   },
@@ -38960,8 +39058,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-7367",
-   "self_type" : "type-7366",
+   "referenced_type" : "type-7389",
+   "self_type" : "type-7388",
    "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"
   },
@@ -38970,8 +39068,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-7639",
-   "self_type" : "type-7638",
+   "referenced_type" : "type-7660",
+   "self_type" : "type-7659",
    "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"
   },
@@ -38980,8 +39078,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-7803",
-   "self_type" : "type-7802",
+   "referenced_type" : "type-7824",
+   "self_type" : "type-7823",
    "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"
   },
@@ -38990,8 +39088,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-8107",
-   "self_type" : "type-8106",
+   "referenced_type" : "type-8131",
+   "self_type" : "type-8130",
    "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"
   },
@@ -39000,8 +39098,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-8257",
-   "self_type" : "type-8256",
+   "referenced_type" : "type-8282",
+   "self_type" : "type-8281",
    "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"
   },
@@ -39010,8 +39108,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-8389",
-   "self_type" : "type-8388",
+   "referenced_type" : "type-8413",
+   "self_type" : "type-8412",
    "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"
   },
@@ -39020,8 +39118,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-8626",
-   "self_type" : "type-8625",
+   "referenced_type" : "type-8653",
+   "self_type" : "type-8652",
    "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"
   },
@@ -39040,8 +39138,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-9185",
-   "self_type" : "type-9184",
+   "referenced_type" : "type-9213",
+   "self_type" : "type-9212",
    "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"
   },
@@ -39050,8 +39148,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-9433",
-   "self_type" : "type-9432",
+   "referenced_type" : "type-9460",
+   "self_type" : "type-9459",
    "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"
   },
@@ -39060,8 +39158,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-9566",
-   "self_type" : "type-9565",
+   "referenced_type" : "type-9593",
+   "self_type" : "type-9592",
    "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"
   },
@@ -39070,8 +39168,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-9699",
-   "self_type" : "type-9698",
+   "referenced_type" : "type-9726",
+   "self_type" : "type-9725",
    "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"
   },
@@ -39080,8 +39178,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-1317",
-   "self_type" : "type-1316",
+   "referenced_type" : "type-1320",
+   "self_type" : "type-1319",
    "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"
   },
@@ -39090,8 +39188,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-3400",
-   "self_type" : "type-3399",
+   "referenced_type" : "type-3403",
+   "self_type" : "type-3402",
    "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"
   },
@@ -39100,8 +39198,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-3564",
-   "self_type" : "type-3563",
+   "referenced_type" : "type-3567",
+   "self_type" : "type-3566",
    "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"
   },
@@ -39110,8 +39208,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-3868",
-   "self_type" : "type-3867",
+   "referenced_type" : "type-3874",
+   "self_type" : "type-3873",
    "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"
   },
@@ -39120,8 +39218,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-4417",
-   "self_type" : "type-4416",
+   "referenced_type" : "type-4423",
+   "self_type" : "type-4422",
    "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"
   },
@@ -39130,8 +39228,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-4626",
-   "self_type" : "type-4625",
+   "referenced_type" : "type-4632",
+   "self_type" : "type-4631",
    "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"
   },
@@ -39140,8 +39238,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-4796",
-   "self_type" : "type-4795",
+   "referenced_type" : "type-4802",
+   "self_type" : "type-4801",
    "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"
   },
@@ -39150,8 +39248,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-5321",
-   "self_type" : "type-5320",
+   "referenced_type" : "type-5327",
+   "self_type" : "type-5326",
    "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"
   },
@@ -39160,8 +39258,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-5485",
-   "self_type" : "type-5484",
+   "referenced_type" : "type-5491",
+   "self_type" : "type-5490",
    "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"
   },
@@ -39170,8 +39268,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-5789",
-   "self_type" : "type-5788",
+   "referenced_type" : "type-5798",
+   "self_type" : "type-5797",
    "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"
   },
@@ -39190,8 +39288,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-6314",
-   "self_type" : "type-6313",
+   "referenced_type" : "type-6323",
+   "self_type" : "type-6322",
    "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"
   },
@@ -39200,8 +39298,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-6510",
-   "self_type" : "type-6509",
+   "referenced_type" : "type-6519",
+   "self_type" : "type-6518",
    "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"
   },
@@ -39210,8 +39308,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-6662",
-   "self_type" : "type-6661",
+   "referenced_type" : "type-6671",
+   "self_type" : "type-6670",
    "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"
   },
@@ -39220,8 +39318,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-6789",
-   "self_type" : "type-6788",
+   "referenced_type" : "type-6799",
+   "self_type" : "type-6798",
    "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"
   },
@@ -39230,8 +39328,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-7019",
-   "self_type" : "type-7018",
+   "referenced_type" : "type-7029",
+   "self_type" : "type-7028",
    "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"
   },
@@ -39240,8 +39338,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-7134",
-   "self_type" : "type-7133",
+   "referenced_type" : "type-7143",
+   "self_type" : "type-7142",
    "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"
   },
@@ -39250,8 +39348,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-7266",
-   "self_type" : "type-7265",
+   "referenced_type" : "type-7286",
+   "self_type" : "type-7285",
    "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"
   },
@@ -39260,8 +39358,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-7365",
-   "self_type" : "type-7364",
+   "referenced_type" : "type-7387",
+   "self_type" : "type-7386",
    "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"
   },
@@ -39270,8 +39368,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-7637",
-   "self_type" : "type-7636",
+   "referenced_type" : "type-7658",
+   "self_type" : "type-7657",
    "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"
   },
@@ -39280,8 +39378,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-7801",
-   "self_type" : "type-7800",
+   "referenced_type" : "type-7822",
+   "self_type" : "type-7821",
    "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"
   },
@@ -39290,8 +39388,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-8105",
-   "self_type" : "type-8104",
+   "referenced_type" : "type-8129",
+   "self_type" : "type-8128",
    "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"
   },
@@ -39300,8 +39398,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-8255",
-   "self_type" : "type-8254",
+   "referenced_type" : "type-8279",
+   "self_type" : "type-8278",
    "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"
   },
@@ -39310,8 +39408,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-8387",
-   "self_type" : "type-8386",
+   "referenced_type" : "type-8411",
+   "self_type" : "type-8410",
    "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"
   },
@@ -39320,8 +39418,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-8624",
-   "self_type" : "type-8623",
+   "referenced_type" : "type-8651",
+   "self_type" : "type-8650",
    "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"
   },
@@ -39340,8 +39438,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-9183",
-   "self_type" : "type-9182",
+   "referenced_type" : "type-9210",
+   "self_type" : "type-9209",
    "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"
   },
@@ -39350,8 +39448,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-9429",
-   "self_type" : "type-9428",
+   "referenced_type" : "type-9458",
+   "self_type" : "type-9457",
    "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"
   },
@@ -39360,8 +39458,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-9564",
-   "self_type" : "type-9563",
+   "referenced_type" : "type-9591",
+   "self_type" : "type-9590",
    "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"
   },
@@ -39370,8 +39468,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-9697",
-   "self_type" : "type-9696",
+   "referenced_type" : "type-9724",
+   "self_type" : "type-9723",
    "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"
   },
@@ -39380,8 +39478,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1119",
-   "self_type" : "type-1118",
+   "referenced_type" : "type-1122",
+   "self_type" : "type-1121",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39390,8 +39488,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1297",
-   "self_type" : "type-1296",
+   "referenced_type" : "type-1300",
+   "self_type" : "type-1299",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39400,8 +39498,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3374",
+   "self_type" : "type-3373",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39410,8 +39508,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3551",
+   "self_type" : "type-3550",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39420,8 +39518,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3728",
+   "self_type" : "type-3727",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39430,8 +39528,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3853",
+   "self_type" : "type-3852",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39440,8 +39538,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4405",
+   "self_type" : "type-4404",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39450,8 +39548,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4613",
+   "self_type" : "type-4612",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39460,8 +39558,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4786",
+   "self_type" : "type-4785",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39470,8 +39568,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5298",
+   "self_type" : "type-5297",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39480,8 +39578,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5475",
+   "self_type" : "type-5474",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39500,8 +39598,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5652",
+   "self_type" : "type-5651",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39510,8 +39608,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5777",
+   "self_type" : "type-5776",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39520,8 +39618,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6305",
+   "self_type" : "type-6304",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39530,8 +39628,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6500",
+   "self_type" : "type-6499",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39540,8 +39638,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6655",
+   "self_type" : "type-6654",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39550,8 +39648,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6808",
+   "self_type" : "type-6807",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39560,8 +39658,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6955",
+   "self_type" : "type-6954",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39570,8 +39668,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7126",
+   "self_type" : "type-7125",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39580,8 +39678,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7369",
+   "self_type" : "type-7368",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39590,8 +39688,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7629",
+   "self_type" : "type-7628",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39600,8 +39698,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7806",
+   "self_type" : "type-7805",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39610,8 +39708,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7983",
+   "self_type" : "type-7982",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39620,8 +39718,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8108",
+   "self_type" : "type-8107",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39630,8 +39728,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8262",
+   "self_type" : "type-8261",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39640,8 +39738,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8395",
+   "self_type" : "type-8394",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39650,8 +39748,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8542",
+   "self_type" : "type-8541",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39660,8 +39758,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8632",
+   "self_type" : "type-8631",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39670,8 +39768,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-872",
+   "self_type" : "type-871",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39680,8 +39778,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-9191",
+   "self_type" : "type-9190",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39690,8 +39788,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-9436",
+   "self_type" : "type-9435",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39700,8 +39798,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-9575",
+   "self_type" : "type-9574",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39710,8 +39808,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-9732",
+   "self_type" : "type-9731",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39720,8 +39818,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-9874",
+   "self_type" : "type-9873",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39730,8 +39828,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-1126",
-   "self_type" : "type-1125",
+   "referenced_type" : "type-1129",
+   "self_type" : "type-1128",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39740,8 +39838,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-1303",
-   "self_type" : "type-1302",
+   "referenced_type" : "type-1307",
+   "self_type" : "type-1306",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39750,8 +39848,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-3377",
-   "self_type" : "type-3376",
+   "referenced_type" : "type-3380",
+   "self_type" : "type-3379",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39760,8 +39858,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-3554",
-   "self_type" : "type-3553",
+   "referenced_type" : "type-3557",
+   "self_type" : "type-3556",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39770,8 +39868,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-3729",
-   "self_type" : "type-3728",
+   "referenced_type" : "type-3735",
+   "self_type" : "type-3734",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39780,8 +39878,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-3853",
-   "self_type" : "type-3852",
+   "referenced_type" : "type-3860",
+   "self_type" : "type-3859",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39790,8 +39888,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-4405",
-   "self_type" : "type-4404",
+   "referenced_type" : "type-4411",
+   "self_type" : "type-4410",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39800,8 +39898,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-4613",
-   "self_type" : "type-4612",
+   "referenced_type" : "type-4619",
+   "self_type" : "type-4618",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39810,8 +39908,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-4785",
-   "self_type" : "type-4784",
+   "referenced_type" : "type-4792",
+   "self_type" : "type-4791",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39820,8 +39918,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-5298",
-   "self_type" : "type-5297",
+   "referenced_type" : "type-5304",
+   "self_type" : "type-5303",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39830,8 +39928,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-5475",
-   "self_type" : "type-5474",
+   "referenced_type" : "type-5481",
+   "self_type" : "type-5480",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39850,8 +39948,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-5650",
-   "self_type" : "type-5649",
+   "referenced_type" : "type-5659",
+   "self_type" : "type-5658",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39860,8 +39958,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-5774",
-   "self_type" : "type-5773",
+   "referenced_type" : "type-5784",
+   "self_type" : "type-5783",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39870,8 +39968,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-6302",
-   "self_type" : "type-6301",
+   "referenced_type" : "type-6311",
+   "self_type" : "type-6310",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39880,8 +39978,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-6497",
-   "self_type" : "type-6496",
+   "referenced_type" : "type-6506",
+   "self_type" : "type-6505",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39890,8 +39988,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-6651",
-   "self_type" : "type-6650",
+   "referenced_type" : "type-6661",
+   "self_type" : "type-6660",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39900,8 +39998,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-6805",
-   "self_type" : "type-6804",
+   "referenced_type" : "type-6815",
+   "self_type" : "type-6814",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39910,8 +40008,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-6953",
-   "self_type" : "type-6952",
+   "referenced_type" : "type-6962",
+   "self_type" : "type-6961",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39920,8 +40018,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-7123",
-   "self_type" : "type-7122",
+   "referenced_type" : "type-7132",
+   "self_type" : "type-7131",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39930,8 +40028,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-7354",
-   "self_type" : "type-7353",
+   "referenced_type" : "type-7375",
+   "self_type" : "type-7374",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39940,8 +40038,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-7614",
-   "self_type" : "type-7613",
+   "referenced_type" : "type-7635",
+   "self_type" : "type-7634",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39950,8 +40048,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-7791",
-   "self_type" : "type-7790",
+   "referenced_type" : "type-7812",
+   "self_type" : "type-7811",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39960,8 +40058,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-7966",
-   "self_type" : "type-7965",
+   "referenced_type" : "type-7990",
+   "self_type" : "type-7989",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39970,8 +40068,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-8090",
-   "self_type" : "type-8089",
+   "referenced_type" : "type-8115",
+   "self_type" : "type-8114",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39980,8 +40078,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-8244",
-   "self_type" : "type-8243",
+   "referenced_type" : "type-8268",
+   "self_type" : "type-8267",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39990,8 +40088,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-8377",
-   "self_type" : "type-8376",
+   "referenced_type" : "type-8401",
+   "self_type" : "type-8400",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40000,8 +40098,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-8521",
-   "self_type" : "type-8520",
+   "referenced_type" : "type-8548",
+   "self_type" : "type-8547",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40010,8 +40108,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-8611",
-   "self_type" : "type-8610",
+   "referenced_type" : "type-8638",
+   "self_type" : "type-8637",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40030,8 +40128,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-9169",
-   "self_type" : "type-9168",
+   "referenced_type" : "type-9197",
+   "self_type" : "type-9196",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40040,8 +40138,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-9415",
-   "self_type" : "type-9414",
+   "referenced_type" : "type-9443",
+   "self_type" : "type-9442",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40050,8 +40148,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-9554",
-   "self_type" : "type-9553",
+   "referenced_type" : "type-9581",
+   "self_type" : "type-9580",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40060,8 +40158,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-9711",
-   "self_type" : "type-9710",
+   "referenced_type" : "type-9738",
+   "self_type" : "type-9737",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40070,8 +40168,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-9853",
-   "self_type" : "type-9852",
+   "referenced_type" : "type-9880",
+   "self_type" : "type-9879",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40080,8 +40178,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-1128",
-   "self_type" : "type-1127",
+   "referenced_type" : "type-1131",
+   "self_type" : "type-1130",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40090,8 +40188,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-1306",
-   "self_type" : "type-1305",
+   "referenced_type" : "type-1309",
+   "self_type" : "type-1308",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40100,8 +40198,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-3380",
-   "self_type" : "type-3379",
+   "referenced_type" : "type-3383",
+   "self_type" : "type-3382",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40110,8 +40208,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-3556",
-   "self_type" : "type-3555",
+   "referenced_type" : "type-3559",
+   "self_type" : "type-3558",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40120,8 +40218,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-3731",
-   "self_type" : "type-3730",
+   "referenced_type" : "type-3737",
+   "self_type" : "type-3736",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40130,8 +40228,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-3856",
-   "self_type" : "type-3855",
+   "referenced_type" : "type-3862",
+   "self_type" : "type-3861",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40140,8 +40238,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-4407",
-   "self_type" : "type-4406",
+   "referenced_type" : "type-4413",
+   "self_type" : "type-4412",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40150,8 +40248,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-4615",
-   "self_type" : "type-4614",
+   "referenced_type" : "type-4621",
+   "self_type" : "type-4620",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40160,8 +40258,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-4787",
-   "self_type" : "type-4786",
+   "referenced_type" : "type-4794",
+   "self_type" : "type-4793",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40170,8 +40268,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-5301",
-   "self_type" : "type-5300",
+   "referenced_type" : "type-5307",
+   "self_type" : "type-5306",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40180,8 +40278,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-5477",
-   "self_type" : "type-5476",
+   "referenced_type" : "type-5483",
+   "self_type" : "type-5482",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40200,8 +40298,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-5652",
-   "self_type" : "type-5651",
+   "referenced_type" : "type-5661",
+   "self_type" : "type-5660",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40210,8 +40308,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-5777",
-   "self_type" : "type-5776",
+   "referenced_type" : "type-5786",
+   "self_type" : "type-5785",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40220,8 +40318,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-6304",
-   "self_type" : "type-6303",
+   "referenced_type" : "type-6313",
+   "self_type" : "type-6312",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40230,8 +40328,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-6499",
-   "self_type" : "type-6498",
+   "referenced_type" : "type-6508",
+   "self_type" : "type-6507",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40240,8 +40338,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-6653",
-   "self_type" : "type-6652",
+   "referenced_type" : "type-6663",
+   "self_type" : "type-6662",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40250,8 +40348,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-6807",
-   "self_type" : "type-6806",
+   "referenced_type" : "type-6817",
+   "self_type" : "type-6816",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40260,8 +40358,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-6955",
-   "self_type" : "type-6954",
+   "referenced_type" : "type-6964",
+   "self_type" : "type-6963",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40270,8 +40368,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-7125",
-   "self_type" : "type-7124",
+   "referenced_type" : "type-7134",
+   "self_type" : "type-7133",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40280,8 +40378,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-7356",
-   "self_type" : "type-7355",
+   "referenced_type" : "type-7377",
+   "self_type" : "type-7376",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40290,8 +40388,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-7617",
-   "self_type" : "type-7616",
+   "referenced_type" : "type-7638",
+   "self_type" : "type-7637",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40300,8 +40398,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-7793",
-   "self_type" : "type-7792",
+   "referenced_type" : "type-7814",
+   "self_type" : "type-7813",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40310,8 +40408,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-7968",
-   "self_type" : "type-7967",
+   "referenced_type" : "type-7992",
+   "self_type" : "type-7991",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40320,8 +40418,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-8093",
-   "self_type" : "type-8092",
+   "referenced_type" : "type-8117",
+   "self_type" : "type-8116",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40330,8 +40428,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-8246",
-   "self_type" : "type-8245",
+   "referenced_type" : "type-8270",
+   "self_type" : "type-8269",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40340,8 +40438,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-8379",
-   "self_type" : "type-8378",
+   "referenced_type" : "type-8403",
+   "self_type" : "type-8402",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40350,8 +40448,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-8523",
-   "self_type" : "type-8522",
+   "referenced_type" : "type-8550",
+   "self_type" : "type-8549",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40360,8 +40458,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-8613",
-   "self_type" : "type-8612",
+   "referenced_type" : "type-8640",
+   "self_type" : "type-8639",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40380,8 +40478,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-9172",
-   "self_type" : "type-9171",
+   "referenced_type" : "type-9199",
+   "self_type" : "type-9198",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40390,8 +40488,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-9417",
-   "self_type" : "type-9416",
+   "referenced_type" : "type-9445",
+   "self_type" : "type-9444",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40400,8 +40498,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-9556",
-   "self_type" : "type-9555",
+   "referenced_type" : "type-9583",
+   "self_type" : "type-9582",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40410,8 +40508,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-9713",
-   "self_type" : "type-9712",
+   "referenced_type" : "type-9740",
+   "self_type" : "type-9739",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40420,8 +40518,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-9855",
-   "self_type" : "type-9854",
+   "referenced_type" : "type-9883",
+   "self_type" : "type-9882",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40430,8 +40528,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-1123",
-   "self_type" : "type-1122",
+   "referenced_type" : "type-1127",
+   "self_type" : "type-1126",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40440,8 +40538,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-1301",
-   "self_type" : "type-1300",
+   "referenced_type" : "type-1305",
+   "self_type" : "type-1304",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40450,8 +40548,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-3375",
-   "self_type" : "type-3374",
+   "referenced_type" : "type-3378",
+   "self_type" : "type-3377",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40460,8 +40558,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-3552",
-   "self_type" : "type-3551",
+   "referenced_type" : "type-3555",
+   "self_type" : "type-3554",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40470,8 +40568,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-3726",
-   "self_type" : "type-3725",
+   "referenced_type" : "type-3733",
+   "self_type" : "type-3732",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40480,8 +40578,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-3851",
-   "self_type" : "type-3850",
+   "referenced_type" : "type-3858",
+   "self_type" : "type-3857",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40490,8 +40588,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-4403",
-   "self_type" : "type-4402",
+   "referenced_type" : "type-4409",
+   "self_type" : "type-4408",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40500,8 +40598,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-4611",
-   "self_type" : "type-4610",
+   "referenced_type" : "type-4617",
+   "self_type" : "type-4616",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40510,8 +40608,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-4783",
-   "self_type" : "type-4782",
+   "referenced_type" : "type-4790",
+   "self_type" : "type-4789",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40520,8 +40618,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-5296",
-   "self_type" : "type-5295",
+   "referenced_type" : "type-5302",
+   "self_type" : "type-5301",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40530,8 +40628,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-5473",
-   "self_type" : "type-5472",
+   "referenced_type" : "type-5479",
+   "self_type" : "type-5478",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40550,8 +40648,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-5647",
-   "self_type" : "type-5646",
+   "referenced_type" : "type-5657",
+   "self_type" : "type-5656",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40560,8 +40658,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-5772",
-   "self_type" : "type-5771",
+   "referenced_type" : "type-5782",
+   "self_type" : "type-5781",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40570,8 +40668,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-6300",
-   "self_type" : "type-6299",
+   "referenced_type" : "type-6309",
+   "self_type" : "type-6308",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40580,8 +40678,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-6495",
-   "self_type" : "type-6494",
+   "referenced_type" : "type-6504",
+   "self_type" : "type-6503",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40590,8 +40688,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-6649",
-   "self_type" : "type-6648",
+   "referenced_type" : "type-6659",
+   "self_type" : "type-6658",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40600,8 +40698,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-6803",
-   "self_type" : "type-6802",
+   "referenced_type" : "type-6813",
+   "self_type" : "type-6812",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40610,8 +40708,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-6951",
-   "self_type" : "type-6950",
+   "referenced_type" : "type-6960",
+   "self_type" : "type-6959",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40620,8 +40718,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-7121",
-   "self_type" : "type-7120",
+   "referenced_type" : "type-7130",
+   "self_type" : "type-7129",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40630,8 +40728,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-7352",
-   "self_type" : "type-7351",
+   "referenced_type" : "type-7373",
+   "self_type" : "type-7372",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40640,8 +40738,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-7612",
-   "self_type" : "type-7611",
+   "referenced_type" : "type-7633",
+   "self_type" : "type-7632",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40650,8 +40748,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-7789",
-   "self_type" : "type-7788",
+   "referenced_type" : "type-7810",
+   "self_type" : "type-7809",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40660,8 +40758,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-7963",
-   "self_type" : "type-7962",
+   "referenced_type" : "type-7988",
+   "self_type" : "type-7987",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40670,8 +40768,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-8088",
-   "self_type" : "type-8087",
+   "referenced_type" : "type-8113",
+   "self_type" : "type-8112",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40680,8 +40778,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-8241",
-   "self_type" : "type-8240",
+   "referenced_type" : "type-8266",
+   "self_type" : "type-8265",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40690,8 +40788,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-8375",
-   "self_type" : "type-8374",
+   "referenced_type" : "type-8399",
+   "self_type" : "type-8398",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40700,8 +40798,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-8519",
-   "self_type" : "type-8518",
+   "referenced_type" : "type-8546",
+   "self_type" : "type-8545",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40710,8 +40808,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-8608",
-   "self_type" : "type-8607",
+   "referenced_type" : "type-8636",
+   "self_type" : "type-8635",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40730,8 +40828,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-9167",
-   "self_type" : "type-9166",
+   "referenced_type" : "type-9195",
+   "self_type" : "type-9194",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40740,8 +40838,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-9413",
-   "self_type" : "type-9412",
+   "referenced_type" : "type-9440",
+   "self_type" : "type-9439",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40750,8 +40848,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-9552",
-   "self_type" : "type-9551",
+   "referenced_type" : "type-9579",
+   "self_type" : "type-9578",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40760,8 +40858,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-9709",
-   "self_type" : "type-9708",
+   "referenced_type" : "type-9736",
+   "self_type" : "type-9735",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40770,8 +40868,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-9851",
-   "self_type" : "type-9850",
+   "referenced_type" : "type-9878",
+   "self_type" : "type-9877",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40780,8 +40878,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-1130",
-   "self_type" : "type-1129",
+   "referenced_type" : "type-1133",
+   "self_type" : "type-1132",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40790,8 +40888,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-1308",
-   "self_type" : "type-1307",
+   "referenced_type" : "type-1311",
+   "self_type" : "type-1310",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40800,8 +40898,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-3383",
-   "self_type" : "type-3382",
+   "referenced_type" : "type-3386",
+   "self_type" : "type-3385",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40810,8 +40908,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-3558",
-   "self_type" : "type-3557",
+   "referenced_type" : "type-3561",
+   "self_type" : "type-3560",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40820,8 +40918,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-3733",
-   "self_type" : "type-3732",
+   "referenced_type" : "type-3739",
+   "self_type" : "type-3738",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40830,8 +40928,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-3858",
-   "self_type" : "type-3857",
+   "referenced_type" : "type-3864",
+   "self_type" : "type-3863",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40840,8 +40938,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-4409",
-   "self_type" : "type-4408",
+   "referenced_type" : "type-4415",
+   "self_type" : "type-4414",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40850,8 +40948,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-4617",
-   "self_type" : "type-4616",
+   "referenced_type" : "type-4626",
+   "self_type" : "type-4625",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40860,8 +40958,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-4789",
-   "self_type" : "type-4788",
+   "referenced_type" : "type-4796",
+   "self_type" : "type-4795",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40870,8 +40968,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-5304",
-   "self_type" : "type-5303",
+   "referenced_type" : "type-5310",
+   "self_type" : "type-5309",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40880,8 +40978,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-5479",
-   "self_type" : "type-5478",
+   "referenced_type" : "type-5485",
+   "self_type" : "type-5484",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40890,8 +40988,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-5654",
-   "self_type" : "type-5653",
+   "referenced_type" : "type-5663",
+   "self_type" : "type-5662",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40900,8 +40998,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-5779",
-   "self_type" : "type-5778",
+   "referenced_type" : "type-5788",
+   "self_type" : "type-5787",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40920,8 +41018,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-6306",
-   "self_type" : "type-6305",
+   "referenced_type" : "type-6315",
+   "self_type" : "type-6314",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40930,8 +41028,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-6501",
-   "self_type" : "type-6500",
+   "referenced_type" : "type-6513",
+   "self_type" : "type-6512",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40940,8 +41038,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-6655",
-   "self_type" : "type-6654",
+   "referenced_type" : "type-6665",
+   "self_type" : "type-6664",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40950,8 +41048,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-6809",
-   "self_type" : "type-6808",
+   "referenced_type" : "type-6819",
+   "self_type" : "type-6818",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40960,8 +41058,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-6958",
-   "self_type" : "type-6957",
+   "referenced_type" : "type-6967",
+   "self_type" : "type-6966",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40970,8 +41068,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-7127",
-   "self_type" : "type-7126",
+   "referenced_type" : "type-7136",
+   "self_type" : "type-7135",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40980,8 +41078,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-7358",
-   "self_type" : "type-7357",
+   "referenced_type" : "type-7380",
+   "self_type" : "type-7379",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40990,8 +41088,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-7620",
-   "self_type" : "type-7619",
+   "referenced_type" : "type-7641",
+   "self_type" : "type-7640",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41000,8 +41098,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-7795",
-   "self_type" : "type-7794",
+   "referenced_type" : "type-7816",
+   "self_type" : "type-7815",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41010,8 +41108,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-7970",
-   "self_type" : "type-7969",
+   "referenced_type" : "type-7994",
+   "self_type" : "type-7993",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41020,8 +41118,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-8095",
-   "self_type" : "type-8094",
+   "referenced_type" : "type-8119",
+   "self_type" : "type-8118",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41030,8 +41128,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-8248",
-   "self_type" : "type-8247",
+   "referenced_type" : "type-8273",
+   "self_type" : "type-8272",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41040,8 +41138,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-8381",
-   "self_type" : "type-8380",
+   "referenced_type" : "type-8405",
+   "self_type" : "type-8404",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41050,8 +41148,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-8525",
-   "self_type" : "type-8524",
+   "referenced_type" : "type-8552",
+   "self_type" : "type-8551",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41060,8 +41158,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-8615",
-   "self_type" : "type-8614",
+   "referenced_type" : "type-8642",
+   "self_type" : "type-8641",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41080,8 +41178,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-9174",
-   "self_type" : "type-9173",
+   "referenced_type" : "type-9201",
+   "self_type" : "type-9200",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41090,8 +41188,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-9419",
-   "self_type" : "type-9418",
+   "referenced_type" : "type-9450",
+   "self_type" : "type-9449",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41100,8 +41198,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-9558",
-   "self_type" : "type-9557",
+   "referenced_type" : "type-9585",
+   "self_type" : "type-9584",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41110,8 +41208,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-9715",
-   "self_type" : "type-9714",
+   "referenced_type" : "type-9742",
+   "self_type" : "type-9741",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41120,8 +41218,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-9857",
-   "self_type" : "type-9856",
+   "referenced_type" : "type-9885",
+   "self_type" : "type-9884",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41130,8 +41228,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-1117",
-   "self_type" : "type-1116",
+   "referenced_type" : "type-1120",
+   "self_type" : "type-1119",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41140,8 +41238,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-1295",
-   "self_type" : "type-1294",
+   "referenced_type" : "type-1298",
+   "self_type" : "type-1297",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41150,8 +41248,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-3369",
-   "self_type" : "type-3368",
+   "referenced_type" : "type-3372",
+   "self_type" : "type-3371",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41160,8 +41258,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-3544",
-   "self_type" : "type-3543",
+   "referenced_type" : "type-3549",
+   "self_type" : "type-3548",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41170,8 +41268,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-3720",
-   "self_type" : "type-3719",
+   "referenced_type" : "type-3726",
+   "self_type" : "type-3725",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41180,8 +41278,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-3845",
-   "self_type" : "type-3844",
+   "referenced_type" : "type-3851",
+   "self_type" : "type-3850",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41190,8 +41288,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-4397",
-   "self_type" : "type-4396",
+   "referenced_type" : "type-4403",
+   "self_type" : "type-4402",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41200,8 +41298,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-4605",
-   "self_type" : "type-4604",
+   "referenced_type" : "type-4611",
+   "self_type" : "type-4610",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41210,8 +41308,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-4776",
-   "self_type" : "type-4775",
+   "referenced_type" : "type-4783",
+   "self_type" : "type-4782",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41220,8 +41318,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-5290",
-   "self_type" : "type-5289",
+   "referenced_type" : "type-5296",
+   "self_type" : "type-5295",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41230,8 +41328,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-5465",
-   "self_type" : "type-5464",
+   "referenced_type" : "type-5473",
+   "self_type" : "type-5472",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41250,8 +41348,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-5641",
-   "self_type" : "type-5640",
+   "referenced_type" : "type-5650",
+   "self_type" : "type-5649",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41260,8 +41358,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-5766",
-   "self_type" : "type-5765",
+   "referenced_type" : "type-5775",
+   "self_type" : "type-5774",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41270,8 +41368,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-6294",
-   "self_type" : "type-6293",
+   "referenced_type" : "type-6303",
+   "self_type" : "type-6302",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41280,8 +41378,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-6489",
-   "self_type" : "type-6488",
+   "referenced_type" : "type-6498",
+   "self_type" : "type-6497",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41290,8 +41388,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-6642",
-   "self_type" : "type-6641",
+   "referenced_type" : "type-6652",
+   "self_type" : "type-6651",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41300,8 +41398,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-6796",
-   "self_type" : "type-6795",
+   "referenced_type" : "type-6806",
+   "self_type" : "type-6805",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41310,8 +41408,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-6944",
-   "self_type" : "type-6943",
+   "referenced_type" : "type-6953",
+   "self_type" : "type-6952",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41320,8 +41418,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-7115",
-   "self_type" : "type-7114",
+   "referenced_type" : "type-7124",
+   "self_type" : "type-7123",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41330,8 +41428,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-7345",
-   "self_type" : "type-7344",
+   "referenced_type" : "type-7367",
+   "self_type" : "type-7366",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41340,8 +41438,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-7606",
-   "self_type" : "type-7605",
+   "referenced_type" : "type-7627",
+   "self_type" : "type-7626",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41350,8 +41448,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-7781",
-   "self_type" : "type-7780",
+   "referenced_type" : "type-7804",
+   "self_type" : "type-7803",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41360,8 +41458,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-7957",
-   "self_type" : "type-7956",
+   "referenced_type" : "type-7981",
+   "self_type" : "type-7980",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41370,8 +41468,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-8082",
-   "self_type" : "type-8081",
+   "referenced_type" : "type-8106",
+   "self_type" : "type-8105",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41380,8 +41478,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-8235",
-   "self_type" : "type-8234",
+   "referenced_type" : "type-8259",
+   "self_type" : "type-8258",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41390,8 +41488,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-8367",
-   "self_type" : "type-8366",
+   "referenced_type" : "type-8393",
+   "self_type" : "type-8392",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41400,8 +41498,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-8513",
-   "self_type" : "type-8512",
+   "referenced_type" : "type-8540",
+   "self_type" : "type-8539",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41410,8 +41508,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-8602",
-   "self_type" : "type-8601",
+   "referenced_type" : "type-8630",
+   "self_type" : "type-8629",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41420,8 +41518,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-868",
-   "self_type" : "type-867",
+   "referenced_type" : "type-870",
+   "self_type" : "type-869",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41430,8 +41528,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-9161",
-   "self_type" : "type-9160",
+   "referenced_type" : "type-9189",
+   "self_type" : "type-9188",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41440,8 +41538,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-9407",
-   "self_type" : "type-9406",
+   "referenced_type" : "type-9434",
+   "self_type" : "type-9433",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41450,8 +41548,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-9546",
-   "self_type" : "type-9545",
+   "referenced_type" : "type-9573",
+   "self_type" : "type-9572",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41460,8 +41558,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-9703",
-   "self_type" : "type-9702",
+   "referenced_type" : "type-9730",
+   "self_type" : "type-9729",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41470,8 +41568,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-9845",
-   "self_type" : "type-9844",
+   "referenced_type" : "type-9872",
+   "self_type" : "type-9871",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41480,8 +41578,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-1121",
-   "self_type" : "type-1120",
+   "referenced_type" : "type-1125",
+   "self_type" : "type-1124",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41490,8 +41588,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-1299",
-   "self_type" : "type-1298",
+   "referenced_type" : "type-1303",
+   "self_type" : "type-1302",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41500,8 +41598,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-3373",
-   "self_type" : "type-3372",
+   "referenced_type" : "type-3376",
+   "self_type" : "type-3375",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41510,8 +41608,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-3550",
-   "self_type" : "type-3549",
+   "referenced_type" : "type-3553",
+   "self_type" : "type-3552",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41520,8 +41618,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-3724",
-   "self_type" : "type-3723",
+   "referenced_type" : "type-3731",
+   "self_type" : "type-3730",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41530,8 +41628,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-3849",
-   "self_type" : "type-3848",
+   "referenced_type" : "type-3856",
+   "self_type" : "type-3855",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41540,8 +41638,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-4401",
-   "self_type" : "type-4400",
+   "referenced_type" : "type-4407",
+   "self_type" : "type-4406",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41550,8 +41648,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-4609",
-   "self_type" : "type-4608",
+   "referenced_type" : "type-4615",
+   "self_type" : "type-4614",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41560,8 +41658,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-4781",
-   "self_type" : "type-4780",
+   "referenced_type" : "type-4788",
+   "self_type" : "type-4787",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41570,8 +41668,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-5294",
-   "self_type" : "type-5293",
+   "referenced_type" : "type-5300",
+   "self_type" : "type-5299",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41580,8 +41678,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-5471",
-   "self_type" : "type-5470",
+   "referenced_type" : "type-5477",
+   "self_type" : "type-5476",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41600,8 +41698,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-5645",
-   "self_type" : "type-5644",
+   "referenced_type" : "type-5655",
+   "self_type" : "type-5654",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41610,8 +41708,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-5770",
-   "self_type" : "type-5769",
+   "referenced_type" : "type-5780",
+   "self_type" : "type-5779",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41620,8 +41718,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-6298",
-   "self_type" : "type-6297",
+   "referenced_type" : "type-6307",
+   "self_type" : "type-6306",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41630,8 +41728,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-6493",
-   "self_type" : "type-6492",
+   "referenced_type" : "type-6502",
+   "self_type" : "type-6501",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41640,8 +41738,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-6647",
-   "self_type" : "type-6646",
+   "referenced_type" : "type-6657",
+   "self_type" : "type-6656",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41650,8 +41748,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-6800",
-   "self_type" : "type-6799",
+   "referenced_type" : "type-6810",
+   "self_type" : "type-6809",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41660,8 +41758,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-6949",
-   "self_type" : "type-6948",
+   "referenced_type" : "type-6958",
+   "self_type" : "type-6957",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41670,8 +41768,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-7119",
-   "self_type" : "type-7118",
+   "referenced_type" : "type-7128",
+   "self_type" : "type-7127",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41680,8 +41778,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-7349",
-   "self_type" : "type-7348",
+   "referenced_type" : "type-7371",
+   "self_type" : "type-7370",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41690,8 +41788,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-7610",
-   "self_type" : "type-7609",
+   "referenced_type" : "type-7631",
+   "self_type" : "type-7630",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41700,8 +41798,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-7787",
-   "self_type" : "type-7786",
+   "referenced_type" : "type-7808",
+   "self_type" : "type-7807",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41710,8 +41808,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-7961",
-   "self_type" : "type-7960",
+   "referenced_type" : "type-7986",
+   "self_type" : "type-7985",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41720,8 +41818,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-8086",
-   "self_type" : "type-8085",
+   "referenced_type" : "type-8111",
+   "self_type" : "type-8110",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41730,8 +41828,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-8239",
-   "self_type" : "type-8238",
+   "referenced_type" : "type-8264",
+   "self_type" : "type-8263",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41740,8 +41838,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-8373",
-   "self_type" : "type-8372",
+   "referenced_type" : "type-8397",
+   "self_type" : "type-8396",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41750,8 +41848,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-8517",
-   "self_type" : "type-8516",
+   "referenced_type" : "type-8544",
+   "self_type" : "type-8543",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41760,8 +41858,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-8606",
-   "self_type" : "type-8605",
+   "referenced_type" : "type-8634",
+   "self_type" : "type-8633",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41780,8 +41878,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-9165",
-   "self_type" : "type-9164",
+   "referenced_type" : "type-9193",
+   "self_type" : "type-9192",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41790,8 +41888,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-9411",
-   "self_type" : "type-9410",
+   "referenced_type" : "type-9438",
+   "self_type" : "type-9437",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41800,8 +41898,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-9550",
-   "self_type" : "type-9549",
+   "referenced_type" : "type-9577",
+   "self_type" : "type-9576",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41810,8 +41908,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-9707",
-   "self_type" : "type-9706",
+   "referenced_type" : "type-9734",
+   "self_type" : "type-9733",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41820,8 +41918,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-9849",
-   "self_type" : "type-9848",
+   "referenced_type" : "type-9876",
+   "self_type" : "type-9875",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41830,8 +41928,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-1139",
+   "self_type" : "type-1138",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -41840,8 +41938,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-1328",
+   "self_type" : "type-1327",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -41850,8 +41948,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3417",
+   "self_type" : "type-3416",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -41860,8 +41958,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3576",
+   "self_type" : "type-3575",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -41870,8 +41968,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3745",
+   "self_type" : "type-3744",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -41880,8 +41978,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3882",
+   "self_type" : "type-3881",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -41890,8 +41988,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4435",
+   "self_type" : "type-4434",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -41900,8 +41998,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4640",
+   "self_type" : "type-4639",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -41910,8 +42008,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4811",
+   "self_type" : "type-4810",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -41920,8 +42018,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5341",
+   "self_type" : "type-5340",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -41930,8 +42028,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5500",
+   "self_type" : "type-5499",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -41940,8 +42038,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5669",
+   "self_type" : "type-5668",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -41950,8 +42048,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5806",
+   "self_type" : "type-5805",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -41960,8 +42058,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6335",
+   "self_type" : "type-6334",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -41980,8 +42078,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6527",
+   "self_type" : "type-6526",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -41990,8 +42088,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6680",
+   "self_type" : "type-6679",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42000,8 +42098,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6823",
+   "self_type" : "type-6822",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42010,8 +42108,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6972",
+   "self_type" : "type-6971",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42020,8 +42118,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7151",
+   "self_type" : "type-7150",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42030,8 +42128,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "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"
   },
@@ -42040,8 +42138,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7672",
+   "self_type" : "type-7671",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42050,8 +42148,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7831",
+   "self_type" : "type-7830",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42060,8 +42158,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8000",
+   "self_type" : "type-7999",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42070,8 +42168,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8137",
+   "self_type" : "type-8136",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42080,8 +42178,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8288",
+   "self_type" : "type-8287",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42090,8 +42188,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8420",
+   "self_type" : "type-8419",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42100,8 +42198,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8558",
+   "self_type" : "type-8557",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42110,8 +42208,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8659",
+   "self_type" : "type-8658",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42130,8 +42228,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-9224",
+   "self_type" : "type-9223",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42140,8 +42238,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-9467",
+   "self_type" : "type-9466",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42150,8 +42248,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-9599",
+   "self_type" : "type-9598",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42160,8 +42258,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-9746",
+   "self_type" : "type-9745",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42170,8 +42268,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-9890",
+   "self_type" : "type-9889",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42180,8 +42278,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-1138",
-   "self_type" : "type-1137",
+   "referenced_type" : "type-1143",
+   "self_type" : "type-1142",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42190,8 +42288,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-1329",
-   "self_type" : "type-1328",
+   "referenced_type" : "type-1334",
+   "self_type" : "type-1333",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42200,8 +42298,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-3418",
-   "self_type" : "type-3417",
+   "referenced_type" : "type-3421",
+   "self_type" : "type-3420",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42210,8 +42308,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-3577",
-   "self_type" : "type-3576",
+   "referenced_type" : "type-3582",
+   "self_type" : "type-3581",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42220,8 +42318,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-3741",
-   "self_type" : "type-3740",
+   "referenced_type" : "type-3749",
+   "self_type" : "type-3748",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42230,8 +42328,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-3880",
-   "self_type" : "type-3879",
+   "referenced_type" : "type-3888",
+   "self_type" : "type-3887",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42240,8 +42338,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-4432",
-   "self_type" : "type-4431",
+   "referenced_type" : "type-4439",
+   "self_type" : "type-4438",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42250,8 +42348,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-4638",
-   "self_type" : "type-4637",
+   "referenced_type" : "type-4644",
+   "self_type" : "type-4643",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42260,8 +42358,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-4808",
-   "self_type" : "type-4807",
+   "referenced_type" : "type-4815",
+   "self_type" : "type-4814",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42270,8 +42368,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-5339",
-   "self_type" : "type-5338",
+   "referenced_type" : "type-5345",
+   "self_type" : "type-5344",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42280,8 +42378,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-5498",
-   "self_type" : "type-5497",
+   "referenced_type" : "type-5506",
+   "self_type" : "type-5505",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42290,8 +42388,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-5662",
-   "self_type" : "type-5661",
+   "referenced_type" : "type-5673",
+   "self_type" : "type-5672",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42300,8 +42398,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-5801",
-   "self_type" : "type-5800",
+   "referenced_type" : "type-5812",
+   "self_type" : "type-5811",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42310,8 +42408,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-6329",
-   "self_type" : "type-6328",
+   "referenced_type" : "type-6339",
+   "self_type" : "type-6338",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42330,8 +42428,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-6522",
-   "self_type" : "type-6521",
+   "referenced_type" : "type-6531",
+   "self_type" : "type-6530",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42340,8 +42438,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-6674",
-   "self_type" : "type-6673",
+   "referenced_type" : "type-6684",
+   "self_type" : "type-6683",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42350,8 +42448,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-6818",
-   "self_type" : "type-6817",
+   "referenced_type" : "type-6828",
+   "self_type" : "type-6827",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42360,8 +42458,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-6967",
-   "self_type" : "type-6966",
+   "referenced_type" : "type-6976",
+   "self_type" : "type-6975",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42370,8 +42468,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-7146",
-   "self_type" : "type-7145",
+   "referenced_type" : "type-7155",
+   "self_type" : "type-7154",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42380,8 +42478,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-7379",
-   "self_type" : "type-7378",
+   "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"
   },
@@ -42390,8 +42488,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-7655",
-   "self_type" : "type-7654",
+   "referenced_type" : "type-7676",
+   "self_type" : "type-7675",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42400,8 +42498,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-7814",
-   "self_type" : "type-7813",
+   "referenced_type" : "type-7837",
+   "self_type" : "type-7836",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42410,8 +42508,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-7978",
-   "self_type" : "type-7977",
+   "referenced_type" : "type-8004",
+   "self_type" : "type-8003",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42420,8 +42518,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-8117",
-   "self_type" : "type-8116",
+   "referenced_type" : "type-8143",
+   "self_type" : "type-8142",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42430,8 +42528,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-8268",
-   "self_type" : "type-8267",
+   "referenced_type" : "type-8292",
+   "self_type" : "type-8291",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42440,8 +42538,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-8400",
-   "self_type" : "type-8399",
+   "referenced_type" : "type-8426",
+   "self_type" : "type-8425",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42450,8 +42548,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-8533",
-   "self_type" : "type-8532",
+   "referenced_type" : "type-8562",
+   "self_type" : "type-8561",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42460,8 +42558,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-8636",
-   "self_type" : "type-8635",
+   "referenced_type" : "type-8665",
+   "self_type" : "type-8664",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42470,8 +42568,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-906",
-   "self_type" : "type-905",
+   "referenced_type" : "type-908",
+   "self_type" : "type-907",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42480,8 +42578,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-9199",
-   "self_type" : "type-9198",
+   "referenced_type" : "type-9228",
+   "self_type" : "type-9227",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42490,8 +42588,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-9443",
-   "self_type" : "type-9442",
+   "referenced_type" : "type-9471",
+   "self_type" : "type-9470",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42500,8 +42598,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-9576",
-   "self_type" : "type-9575",
+   "referenced_type" : "type-9603",
+   "self_type" : "type-9602",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42510,8 +42608,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-9723",
-   "self_type" : "type-9722",
+   "referenced_type" : "type-9750",
+   "self_type" : "type-9749",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42520,8 +42618,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-9867",
-   "self_type" : "type-9866",
+   "referenced_type" : "type-9894",
+   "self_type" : "type-9893",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42530,8 +42628,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-1136",
-   "self_type" : "type-1135",
+   "referenced_type" : "type-1141",
+   "self_type" : "type-1140",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42540,8 +42638,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-1327",
-   "self_type" : "type-1326",
+   "referenced_type" : "type-1332",
+   "self_type" : "type-1331",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42550,8 +42648,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-3416",
-   "self_type" : "type-3415",
+   "referenced_type" : "type-3419",
+   "self_type" : "type-3418",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42560,8 +42658,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-3575",
-   "self_type" : "type-3574",
+   "referenced_type" : "type-3580",
+   "self_type" : "type-3579",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42570,8 +42668,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-3739",
-   "self_type" : "type-3738",
+   "referenced_type" : "type-3747",
+   "self_type" : "type-3746",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42580,8 +42678,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-3878",
-   "self_type" : "type-3877",
+   "referenced_type" : "type-3886",
+   "self_type" : "type-3885",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42590,8 +42688,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-4429",
-   "self_type" : "type-4428",
+   "referenced_type" : "type-4437",
+   "self_type" : "type-4436",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42600,8 +42698,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-4636",
-   "self_type" : "type-4635",
+   "referenced_type" : "type-4642",
+   "self_type" : "type-4641",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42610,8 +42708,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-4806",
-   "self_type" : "type-4805",
+   "referenced_type" : "type-4813",
+   "self_type" : "type-4812",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42620,8 +42718,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-5337",
-   "self_type" : "type-5336",
+   "referenced_type" : "type-5343",
+   "self_type" : "type-5342",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42630,8 +42728,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-5496",
-   "self_type" : "type-5495",
+   "referenced_type" : "type-5504",
+   "self_type" : "type-5503",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42640,8 +42738,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-5660",
-   "self_type" : "type-5659",
+   "referenced_type" : "type-5671",
+   "self_type" : "type-5670",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42650,8 +42748,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-5799",
-   "self_type" : "type-5798",
+   "referenced_type" : "type-5810",
+   "self_type" : "type-5809",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42660,8 +42758,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-6326",
-   "self_type" : "type-6325",
+   "referenced_type" : "type-6337",
+   "self_type" : "type-6336",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42680,8 +42778,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-6520",
-   "self_type" : "type-6519",
+   "referenced_type" : "type-6529",
+   "self_type" : "type-6528",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42690,8 +42788,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-6672",
-   "self_type" : "type-6671",
+   "referenced_type" : "type-6682",
+   "self_type" : "type-6681",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42700,8 +42798,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-6816",
-   "self_type" : "type-6815",
+   "referenced_type" : "type-6825",
+   "self_type" : "type-6824",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42710,8 +42808,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-6965",
-   "self_type" : "type-6964",
+   "referenced_type" : "type-6974",
+   "self_type" : "type-6973",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42720,8 +42818,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-7144",
-   "self_type" : "type-7143",
+   "referenced_type" : "type-7153",
+   "self_type" : "type-7152",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42730,8 +42828,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-7376",
-   "self_type" : "type-7375",
+   "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"
   },
@@ -42740,8 +42838,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-7653",
-   "self_type" : "type-7652",
+   "referenced_type" : "type-7674",
+   "self_type" : "type-7673",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42750,8 +42848,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-7812",
-   "self_type" : "type-7811",
+   "referenced_type" : "type-7835",
+   "self_type" : "type-7834",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42760,8 +42858,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-7976",
-   "self_type" : "type-7975",
+   "referenced_type" : "type-8002",
+   "self_type" : "type-8001",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42770,8 +42868,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-8115",
-   "self_type" : "type-8114",
+   "referenced_type" : "type-8141",
+   "self_type" : "type-8140",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42780,8 +42878,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-8266",
-   "self_type" : "type-8265",
+   "referenced_type" : "type-8290",
+   "self_type" : "type-8289",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42790,8 +42888,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-8397",
-   "self_type" : "type-8396",
+   "referenced_type" : "type-8424",
+   "self_type" : "type-8423",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42800,8 +42898,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-8531",
-   "self_type" : "type-8530",
+   "referenced_type" : "type-8560",
+   "self_type" : "type-8559",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42810,8 +42908,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-8634",
-   "self_type" : "type-8633",
+   "referenced_type" : "type-8663",
+   "self_type" : "type-8662",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42820,8 +42918,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-904",
-   "self_type" : "type-903",
+   "referenced_type" : "type-906",
+   "self_type" : "type-905",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42830,8 +42928,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-9195",
-   "self_type" : "type-9194",
+   "referenced_type" : "type-9226",
+   "self_type" : "type-9225",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42840,8 +42938,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-9441",
-   "self_type" : "type-9440",
+   "referenced_type" : "type-9469",
+   "self_type" : "type-9468",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42850,8 +42948,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-9574",
-   "self_type" : "type-9573",
+   "referenced_type" : "type-9601",
+   "self_type" : "type-9600",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42860,8 +42958,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-9721",
-   "self_type" : "type-9720",
+   "referenced_type" : "type-9748",
+   "self_type" : "type-9747",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42870,8 +42968,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-9865",
-   "self_type" : "type-9864",
+   "referenced_type" : "type-9892",
+   "self_type" : "type-9891",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42880,8 +42978,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-1132",
-   "self_type" : "type-1131",
+   "referenced_type" : "type-1135",
+   "self_type" : "type-1134",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42890,8 +42988,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-1323",
-   "self_type" : "type-1322",
+   "referenced_type" : "type-1326",
+   "self_type" : "type-1325",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42900,8 +42998,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-3412",
-   "self_type" : "type-3411",
+   "referenced_type" : "type-3415",
+   "self_type" : "type-3414",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42910,8 +43008,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-3571",
-   "self_type" : "type-3570",
+   "referenced_type" : "type-3574",
+   "self_type" : "type-3573",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42920,8 +43018,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-3735",
-   "self_type" : "type-3734",
+   "referenced_type" : "type-3741",
+   "self_type" : "type-3740",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42930,8 +43028,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-3874",
-   "self_type" : "type-3873",
+   "referenced_type" : "type-3880",
+   "self_type" : "type-3879",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42940,8 +43038,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-4425",
-   "self_type" : "type-4424",
+   "referenced_type" : "type-4431",
+   "self_type" : "type-4430",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42950,8 +43048,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-4632",
-   "self_type" : "type-4631",
+   "referenced_type" : "type-4638",
+   "self_type" : "type-4637",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42960,8 +43058,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-4802",
-   "self_type" : "type-4801",
+   "referenced_type" : "type-4809",
+   "self_type" : "type-4808",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42970,8 +43068,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-5333",
-   "self_type" : "type-5332",
+   "referenced_type" : "type-5339",
+   "self_type" : "type-5338",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42980,8 +43078,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-5492",
-   "self_type" : "type-5491",
+   "referenced_type" : "type-5498",
+   "self_type" : "type-5497",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42990,8 +43088,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-5656",
-   "self_type" : "type-5655",
+   "referenced_type" : "type-5665",
+   "self_type" : "type-5664",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43000,8 +43098,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-5795",
-   "self_type" : "type-5794",
+   "referenced_type" : "type-5804",
+   "self_type" : "type-5803",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43010,8 +43108,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-6322",
-   "self_type" : "type-6321",
+   "referenced_type" : "type-6331",
+   "self_type" : "type-6330",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43030,8 +43128,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-6516",
-   "self_type" : "type-6515",
+   "referenced_type" : "type-6525",
+   "self_type" : "type-6524",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43040,8 +43138,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-6668",
-   "self_type" : "type-6667",
+   "referenced_type" : "type-6678",
+   "self_type" : "type-6677",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43050,8 +43148,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-6812",
-   "self_type" : "type-6811",
+   "referenced_type" : "type-6821",
+   "self_type" : "type-6820",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43060,8 +43158,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-6960",
-   "self_type" : "type-6959",
+   "referenced_type" : "type-6969",
+   "self_type" : "type-6968",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43070,8 +43168,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-7140",
-   "self_type" : "type-7139",
+   "referenced_type" : "type-7149",
+   "self_type" : "type-7148",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43080,8 +43178,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-7372",
-   "self_type" : "type-7371",
+   "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"
   },
@@ -43090,8 +43188,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-7649",
-   "self_type" : "type-7648",
+   "referenced_type" : "type-7670",
+   "self_type" : "type-7669",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43100,8 +43198,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-7808",
-   "self_type" : "type-7807",
+   "referenced_type" : "type-7829",
+   "self_type" : "type-7828",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43110,8 +43208,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-7972",
-   "self_type" : "type-7971",
+   "referenced_type" : "type-7996",
+   "self_type" : "type-7995",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43120,8 +43218,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-8111",
-   "self_type" : "type-8110",
+   "referenced_type" : "type-8135",
+   "self_type" : "type-8134",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43130,8 +43228,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-8262",
-   "self_type" : "type-8261",
+   "referenced_type" : "type-8286",
+   "self_type" : "type-8285",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43140,8 +43238,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-8393",
-   "self_type" : "type-8392",
+   "referenced_type" : "type-8418",
+   "self_type" : "type-8417",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43150,8 +43248,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-8527",
-   "self_type" : "type-8526",
+   "referenced_type" : "type-8554",
+   "self_type" : "type-8553",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43160,8 +43258,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-8630",
-   "self_type" : "type-8629",
+   "referenced_type" : "type-8657",
+   "self_type" : "type-8656",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43180,8 +43278,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-9191",
-   "self_type" : "type-9190",
+   "referenced_type" : "type-9221",
+   "self_type" : "type-9220",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43190,8 +43288,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-9437",
-   "self_type" : "type-9436",
+   "referenced_type" : "type-9465",
+   "self_type" : "type-9464",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43200,8 +43298,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-9570",
-   "self_type" : "type-9569",
+   "referenced_type" : "type-9597",
+   "self_type" : "type-9596",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43210,8 +43308,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-9717",
-   "self_type" : "type-9716",
+   "referenced_type" : "type-9744",
+   "self_type" : "type-9743",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43220,8 +43318,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-9860",
-   "self_type" : "type-9859",
+   "referenced_type" : "type-9888",
+   "self_type" : "type-9887",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43230,8 +43328,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-1140",
-   "self_type" : "type-1139",
+   "referenced_type" : "type-1145",
+   "self_type" : "type-1144",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43240,8 +43338,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-1333",
-   "self_type" : "type-1332",
+   "referenced_type" : "type-1336",
+   "self_type" : "type-1335",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43250,8 +43348,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-3421",
-   "self_type" : "type-3420",
+   "referenced_type" : "type-3424",
+   "self_type" : "type-3423",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43260,8 +43358,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-3581",
-   "self_type" : "type-3580",
+   "referenced_type" : "type-3584",
+   "self_type" : "type-3583",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43270,8 +43368,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-3743",
-   "self_type" : "type-3742",
+   "referenced_type" : "type-3751",
+   "self_type" : "type-3750",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43280,8 +43378,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-3884",
-   "self_type" : "type-3883",
+   "referenced_type" : "type-3890",
+   "self_type" : "type-3889",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43290,8 +43388,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-4434",
-   "self_type" : "type-4433",
+   "referenced_type" : "type-4441",
+   "self_type" : "type-4440",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43300,8 +43398,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-4640",
-   "self_type" : "type-4639",
+   "referenced_type" : "type-4646",
+   "self_type" : "type-4645",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43310,8 +43408,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-4810",
-   "self_type" : "type-4809",
+   "referenced_type" : "type-4817",
+   "self_type" : "type-4816",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43320,8 +43418,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-5342",
-   "self_type" : "type-5341",
+   "referenced_type" : "type-5348",
+   "self_type" : "type-5347",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43330,8 +43428,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-5502",
-   "self_type" : "type-5501",
+   "referenced_type" : "type-5508",
+   "self_type" : "type-5507",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43340,8 +43438,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-5664",
-   "self_type" : "type-5663",
+   "referenced_type" : "type-5675",
+   "self_type" : "type-5674",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43350,8 +43448,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-5805",
-   "self_type" : "type-5804",
+   "referenced_type" : "type-5814",
+   "self_type" : "type-5813",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43360,8 +43458,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-6331",
-   "self_type" : "type-6330",
+   "referenced_type" : "type-6341",
+   "self_type" : "type-6340",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43380,8 +43478,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-6524",
-   "self_type" : "type-6523",
+   "referenced_type" : "type-6533",
+   "self_type" : "type-6532",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43390,8 +43488,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-6676",
-   "self_type" : "type-6675",
+   "referenced_type" : "type-6686",
+   "self_type" : "type-6685",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43400,8 +43498,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-6820",
-   "self_type" : "type-6819",
+   "referenced_type" : "type-6830",
+   "self_type" : "type-6829",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43410,8 +43508,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-6969",
-   "self_type" : "type-6968",
+   "referenced_type" : "type-6978",
+   "self_type" : "type-6977",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43420,8 +43518,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-7148",
-   "self_type" : "type-7147",
+   "referenced_type" : "type-7157",
+   "self_type" : "type-7156",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43430,8 +43528,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-7381",
-   "self_type" : "type-7380",
+   "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"
   },
@@ -43440,8 +43538,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-7658",
-   "self_type" : "type-7657",
+   "referenced_type" : "type-7679",
+   "self_type" : "type-7678",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43450,8 +43548,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-7818",
-   "self_type" : "type-7817",
+   "referenced_type" : "type-7839",
+   "self_type" : "type-7838",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43460,8 +43558,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-7980",
-   "self_type" : "type-7979",
+   "referenced_type" : "type-8006",
+   "self_type" : "type-8005",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43470,8 +43568,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-8121",
-   "self_type" : "type-8120",
+   "referenced_type" : "type-8145",
+   "self_type" : "type-8144",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43480,8 +43578,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-8270",
-   "self_type" : "type-8269",
+   "referenced_type" : "type-8294",
+   "self_type" : "type-8293",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43490,8 +43588,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-8404",
-   "self_type" : "type-8403",
+   "referenced_type" : "type-8428",
+   "self_type" : "type-8427",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43500,8 +43598,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-8535",
-   "self_type" : "type-8534",
+   "referenced_type" : "type-8564",
+   "self_type" : "type-8563",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43510,8 +43608,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-8640",
-   "self_type" : "type-8639",
+   "referenced_type" : "type-8667",
+   "self_type" : "type-8666",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43530,8 +43628,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-9201",
-   "self_type" : "type-9200",
+   "referenced_type" : "type-9230",
+   "self_type" : "type-9229",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43540,8 +43638,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-9445",
-   "self_type" : "type-9444",
+   "referenced_type" : "type-9473",
+   "self_type" : "type-9472",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43550,8 +43648,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-9578",
-   "self_type" : "type-9577",
+   "referenced_type" : "type-9605",
+   "self_type" : "type-9604",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43560,8 +43658,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-9725",
-   "self_type" : "type-9724",
+   "referenced_type" : "type-9752",
+   "self_type" : "type-9751",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43570,8 +43668,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-9869",
-   "self_type" : "type-9868",
+   "referenced_type" : "type-9896",
+   "self_type" : "type-9895",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43580,8 +43678,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-1153",
+   "self_type" : "type-1152",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43590,8 +43688,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-1346",
+   "self_type" : "type-1345",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43600,8 +43698,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3437",
+   "self_type" : "type-3436",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43610,8 +43708,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3592",
+   "self_type" : "type-3591",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43620,8 +43718,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3759",
+   "self_type" : "type-3758",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43630,8 +43728,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3901",
+   "self_type" : "type-3900",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43640,8 +43738,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4449",
+   "self_type" : "type-4448",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43650,8 +43748,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4655",
+   "self_type" : "type-4654",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43660,8 +43758,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4825",
+   "self_type" : "type-4824",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43670,8 +43768,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5361",
+   "self_type" : "type-5360",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43680,8 +43778,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5516",
+   "self_type" : "type-5515",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43690,8 +43788,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5683",
+   "self_type" : "type-5682",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43700,8 +43798,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5825",
+   "self_type" : "type-5824",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43710,8 +43808,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6349",
+   "self_type" : "type-6348",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43720,8 +43818,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6542",
+   "self_type" : "type-6541",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43730,8 +43828,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6694",
+   "self_type" : "type-6693",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43750,8 +43848,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6838",
+   "self_type" : "type-6837",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43760,8 +43858,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6988",
+   "self_type" : "type-6987",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43770,8 +43868,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7167",
+   "self_type" : "type-7166",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43780,8 +43878,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7251",
+   "self_type" : "type-7250",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43790,8 +43888,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7414",
+   "self_type" : "type-7413",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43800,8 +43898,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7692",
+   "self_type" : "type-7691",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43810,8 +43908,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7847",
+   "self_type" : "type-7846",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43820,8 +43918,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8014",
+   "self_type" : "type-8013",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43830,8 +43928,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8156",
+   "self_type" : "type-8155",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43840,8 +43938,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8303",
+   "self_type" : "type-8302",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43850,8 +43948,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8436",
+   "self_type" : "type-8435",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43860,8 +43958,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8572",
+   "self_type" : "type-8571",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/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-8677",
+   "self_type" : "type-8676",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43880,8 +43988,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-9238",
+   "self_type" : "type-9237",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43890,8 +43998,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-9482",
+   "self_type" : "type-9481",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43900,8 +44008,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-9613",
+   "self_type" : "type-9612",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43910,18 +44018,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-9760",
+   "self_type" : "type-9759",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43930,8 +44028,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-1148",
-   "self_type" : "type-1147",
+   "referenced_type" : "type-1151",
+   "self_type" : "type-1150",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43940,8 +44038,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-1341",
-   "self_type" : "type-1340",
+   "referenced_type" : "type-1344",
+   "self_type" : "type-1343",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43950,8 +44048,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-3432",
-   "self_type" : "type-3431",
+   "referenced_type" : "type-3435",
+   "self_type" : "type-3434",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43960,8 +44058,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-3587",
-   "self_type" : "type-3586",
+   "referenced_type" : "type-3590",
+   "self_type" : "type-3589",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43970,8 +44068,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-3751",
-   "self_type" : "type-3750",
+   "referenced_type" : "type-3757",
+   "self_type" : "type-3756",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43980,8 +44078,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-3893",
-   "self_type" : "type-3892",
+   "referenced_type" : "type-3899",
+   "self_type" : "type-3898",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43990,8 +44088,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-4441",
-   "self_type" : "type-4440",
+   "referenced_type" : "type-4447",
+   "self_type" : "type-4446",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44000,8 +44098,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-4646",
-   "self_type" : "type-4645",
+   "referenced_type" : "type-4653",
+   "self_type" : "type-4652",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44010,8 +44108,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-4817",
-   "self_type" : "type-4816",
+   "referenced_type" : "type-4823",
+   "self_type" : "type-4822",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44020,8 +44118,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-5353",
-   "self_type" : "type-5352",
+   "referenced_type" : "type-5359",
+   "self_type" : "type-5358",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44030,8 +44128,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-5508",
-   "self_type" : "type-5507",
+   "referenced_type" : "type-5514",
+   "self_type" : "type-5513",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44040,8 +44138,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-5672",
-   "self_type" : "type-5671",
+   "referenced_type" : "type-5681",
+   "self_type" : "type-5680",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44050,8 +44148,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-5814",
-   "self_type" : "type-5813",
+   "referenced_type" : "type-5823",
+   "self_type" : "type-5822",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44060,8 +44158,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-6338",
-   "self_type" : "type-6337",
+   "referenced_type" : "type-6347",
+   "self_type" : "type-6346",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44070,8 +44168,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-6530",
-   "self_type" : "type-6529",
+   "referenced_type" : "type-6540",
+   "self_type" : "type-6539",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44090,8 +44188,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-6683",
-   "self_type" : "type-6682",
+   "referenced_type" : "type-6692",
+   "self_type" : "type-6691",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44100,8 +44198,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-6827",
-   "self_type" : "type-6826",
+   "referenced_type" : "type-6836",
+   "self_type" : "type-6835",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44110,8 +44208,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-6976",
-   "self_type" : "type-6975",
+   "referenced_type" : "type-6985",
+   "self_type" : "type-6984",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44120,8 +44218,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-7156",
-   "self_type" : "type-7155",
+   "referenced_type" : "type-7165",
+   "self_type" : "type-7164",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44130,8 +44228,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-7389",
-   "self_type" : "type-7388",
+   "referenced_type" : "type-7249",
+   "self_type" : "type-7248",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44140,8 +44238,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-7669",
-   "self_type" : "type-7668",
+   "referenced_type" : "type-7412",
+   "self_type" : "type-7411",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44150,8 +44248,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-7824",
-   "self_type" : "type-7823",
+   "referenced_type" : "type-7690",
+   "self_type" : "type-7689",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44160,8 +44258,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-7988",
-   "self_type" : "type-7987",
+   "referenced_type" : "type-7845",
+   "self_type" : "type-7844",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44170,8 +44268,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-8130",
-   "self_type" : "type-8129",
+   "referenced_type" : "type-8012",
+   "self_type" : "type-8011",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44180,8 +44278,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-8277",
-   "self_type" : "type-8276",
+   "referenced_type" : "type-8154",
+   "self_type" : "type-8153",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44190,8 +44288,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-8410",
-   "self_type" : "type-8409",
+   "referenced_type" : "type-8301",
+   "self_type" : "type-8300",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44200,8 +44298,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-8543",
-   "self_type" : "type-8542",
+   "referenced_type" : "type-8434",
+   "self_type" : "type-8433",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44210,8 +44308,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8570",
+   "self_type" : "type-8569",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-8675",
+   "self_type" : "type-8674",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44230,8 +44338,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-9209",
-   "self_type" : "type-9208",
+   "referenced_type" : "type-9236",
+   "self_type" : "type-9235",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44240,8 +44348,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-9452",
-   "self_type" : "type-9451",
+   "referenced_type" : "type-9480",
+   "self_type" : "type-9479",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44250,8 +44358,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-9584",
-   "self_type" : "type-9583",
+   "referenced_type" : "type-9611",
+   "self_type" : "type-9610",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44260,18 +44368,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-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",
+   "referenced_type" : "type-9758",
+   "self_type" : "type-9757",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44280,8 +44378,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-1146",
-   "self_type" : "type-1145",
+   "referenced_type" : "type-1149",
+   "self_type" : "type-1148",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44290,8 +44388,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-1339",
-   "self_type" : "type-1338",
+   "referenced_type" : "type-1342",
+   "self_type" : "type-1341",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44300,8 +44398,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-3430",
-   "self_type" : "type-3429",
+   "referenced_type" : "type-3433",
+   "self_type" : "type-3432",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44310,8 +44408,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-3585",
-   "self_type" : "type-3584",
+   "referenced_type" : "type-3588",
+   "self_type" : "type-3587",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44320,8 +44418,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-3749",
-   "self_type" : "type-3748",
+   "referenced_type" : "type-3755",
+   "self_type" : "type-3754",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44330,8 +44428,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-3891",
-   "self_type" : "type-3890",
+   "referenced_type" : "type-3897",
+   "self_type" : "type-3896",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44340,8 +44438,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-4439",
-   "self_type" : "type-4438",
+   "referenced_type" : "type-4445",
+   "self_type" : "type-4444",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44350,8 +44448,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-4644",
-   "self_type" : "type-4643",
+   "referenced_type" : "type-4650",
+   "self_type" : "type-4649",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44360,8 +44458,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-4815",
-   "self_type" : "type-4814",
+   "referenced_type" : "type-4821",
+   "self_type" : "type-4820",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44370,8 +44468,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-5351",
-   "self_type" : "type-5350",
+   "referenced_type" : "type-5357",
+   "self_type" : "type-5356",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44380,8 +44478,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-5506",
-   "self_type" : "type-5505",
+   "referenced_type" : "type-5512",
+   "self_type" : "type-5511",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44390,8 +44488,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-5670",
-   "self_type" : "type-5669",
+   "referenced_type" : "type-5679",
+   "self_type" : "type-5678",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44400,8 +44498,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-5812",
-   "self_type" : "type-5811",
+   "referenced_type" : "type-5821",
+   "self_type" : "type-5820",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44410,8 +44508,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-6336",
-   "self_type" : "type-6335",
+   "referenced_type" : "type-6345",
+   "self_type" : "type-6344",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44420,8 +44518,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-6528",
-   "self_type" : "type-6527",
+   "referenced_type" : "type-6537",
+   "self_type" : "type-6536",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44440,8 +44538,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-6681",
-   "self_type" : "type-6680",
+   "referenced_type" : "type-6690",
+   "self_type" : "type-6689",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44450,8 +44548,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-6825",
-   "self_type" : "type-6824",
+   "referenced_type" : "type-6834",
+   "self_type" : "type-6833",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44460,8 +44558,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-6974",
-   "self_type" : "type-6973",
+   "referenced_type" : "type-6983",
+   "self_type" : "type-6982",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44470,8 +44568,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-7154",
-   "self_type" : "type-7153",
+   "referenced_type" : "type-7163",
+   "self_type" : "type-7162",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44480,8 +44578,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-7387",
-   "self_type" : "type-7386",
+   "referenced_type" : "type-7247",
+   "self_type" : "type-7246",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44490,8 +44588,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-7667",
-   "self_type" : "type-7666",
+   "referenced_type" : "type-7409",
+   "self_type" : "type-7408",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44500,8 +44598,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-7822",
-   "self_type" : "type-7821",
+   "referenced_type" : "type-7688",
+   "self_type" : "type-7687",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44510,8 +44608,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-7986",
-   "self_type" : "type-7985",
+   "referenced_type" : "type-7843",
+   "self_type" : "type-7842",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44520,8 +44618,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-8128",
-   "self_type" : "type-8127",
+   "referenced_type" : "type-8010",
+   "self_type" : "type-8009",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44530,8 +44628,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-8275",
-   "self_type" : "type-8274",
+   "referenced_type" : "type-8152",
+   "self_type" : "type-8151",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44540,8 +44638,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-8408",
-   "self_type" : "type-8407",
+   "referenced_type" : "type-8299",
+   "self_type" : "type-8298",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44550,8 +44648,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-8541",
-   "self_type" : "type-8540",
+   "referenced_type" : "type-8432",
+   "self_type" : "type-8431",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44560,8 +44658,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8568",
+   "self_type" : "type-8567",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-8673",
+   "self_type" : "type-8672",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44580,8 +44688,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-9207",
-   "self_type" : "type-9206",
+   "referenced_type" : "type-9234",
+   "self_type" : "type-9233",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44590,8 +44698,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-9450",
-   "self_type" : "type-9449",
+   "referenced_type" : "type-9478",
+   "self_type" : "type-9477",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44600,8 +44708,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-9582",
-   "self_type" : "type-9581",
+   "referenced_type" : "type-9609",
+   "self_type" : "type-9608",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44610,18 +44718,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-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",
+   "referenced_type" : "type-9756",
+   "self_type" : "type-9755",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44630,8 +44728,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-1144",
-   "self_type" : "type-1143",
+   "referenced_type" : "type-1147",
+   "self_type" : "type-1146",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44640,8 +44738,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-1337",
-   "self_type" : "type-1336",
+   "referenced_type" : "type-1340",
+   "self_type" : "type-1339",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44650,8 +44748,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-3428",
-   "self_type" : "type-3427",
+   "referenced_type" : "type-3431",
+   "self_type" : "type-3430",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44660,8 +44758,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-3583",
-   "self_type" : "type-3582",
+   "referenced_type" : "type-3586",
+   "self_type" : "type-3585",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44670,8 +44768,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-3747",
-   "self_type" : "type-3746",
+   "referenced_type" : "type-3753",
+   "self_type" : "type-3752",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44680,8 +44778,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-3889",
-   "self_type" : "type-3888",
+   "referenced_type" : "type-3895",
+   "self_type" : "type-3894",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44690,8 +44788,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-4437",
-   "self_type" : "type-4436",
+   "referenced_type" : "type-4443",
+   "self_type" : "type-4442",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44700,8 +44798,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-4642",
-   "self_type" : "type-4641",
+   "referenced_type" : "type-4648",
+   "self_type" : "type-4647",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44710,8 +44808,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-4813",
-   "self_type" : "type-4812",
+   "referenced_type" : "type-4819",
+   "self_type" : "type-4818",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44720,8 +44818,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-5349",
-   "self_type" : "type-5348",
+   "referenced_type" : "type-5355",
+   "self_type" : "type-5354",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44730,8 +44828,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-5504",
-   "self_type" : "type-5503",
+   "referenced_type" : "type-5510",
+   "self_type" : "type-5509",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44740,8 +44838,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-5668",
-   "self_type" : "type-5667",
+   "referenced_type" : "type-5677",
+   "self_type" : "type-5676",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44750,8 +44848,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-5810",
-   "self_type" : "type-5809",
+   "referenced_type" : "type-5819",
+   "self_type" : "type-5818",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44760,8 +44858,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-6334",
-   "self_type" : "type-6333",
+   "referenced_type" : "type-6343",
+   "self_type" : "type-6342",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44770,8 +44868,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-6526",
-   "self_type" : "type-6525",
+   "referenced_type" : "type-6535",
+   "self_type" : "type-6534",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44790,8 +44888,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-6679",
-   "self_type" : "type-6678",
+   "referenced_type" : "type-6688",
+   "self_type" : "type-6687",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44800,8 +44898,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-6822",
-   "self_type" : "type-6821",
+   "referenced_type" : "type-6832",
+   "self_type" : "type-6831",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44810,8 +44908,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-6972",
-   "self_type" : "type-6971",
+   "referenced_type" : "type-6981",
+   "self_type" : "type-6980",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44820,8 +44918,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-7152",
-   "self_type" : "type-7151",
+   "referenced_type" : "type-7161",
+   "self_type" : "type-7160",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44830,8 +44928,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-7385",
-   "self_type" : "type-7384",
+   "referenced_type" : "type-7407",
+   "self_type" : "type-7406",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44840,8 +44938,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-7665",
-   "self_type" : "type-7664",
+   "referenced_type" : "type-7686",
+   "self_type" : "type-7685",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44850,8 +44948,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-7820",
-   "self_type" : "type-7819",
+   "referenced_type" : "type-7841",
+   "self_type" : "type-7840",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44860,8 +44958,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-7984",
-   "self_type" : "type-7983",
+   "referenced_type" : "type-8008",
+   "self_type" : "type-8007",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44870,8 +44968,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-8126",
-   "self_type" : "type-8125",
+   "referenced_type" : "type-8150",
+   "self_type" : "type-8149",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44880,8 +44978,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-8273",
-   "self_type" : "type-8272",
+   "referenced_type" : "type-8297",
+   "self_type" : "type-8296",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44890,8 +44988,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-8406",
-   "self_type" : "type-8405",
+   "referenced_type" : "type-8430",
+   "self_type" : "type-8429",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44900,8 +44998,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-8539",
-   "self_type" : "type-8538",
+   "referenced_type" : "type-8566",
+   "self_type" : "type-8565",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44910,8 +45008,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-8644",
-   "self_type" : "type-8643",
+   "referenced_type" : "type-8671",
+   "self_type" : "type-8670",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44930,8 +45028,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-9205",
-   "self_type" : "type-9204",
+   "referenced_type" : "type-9232",
+   "self_type" : "type-9231",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44940,8 +45038,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-9448",
-   "self_type" : "type-9447",
+   "referenced_type" : "type-9476",
+   "self_type" : "type-9475",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44950,8 +45048,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-9580",
-   "self_type" : "type-9579",
+   "referenced_type" : "type-9607",
+   "self_type" : "type-9606",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44960,8 +45058,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-9727",
-   "self_type" : "type-9726",
+   "referenced_type" : "type-9754",
+   "self_type" : "type-9753",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44970,8 +45068,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-9872",
-   "self_type" : "type-9871",
+   "referenced_type" : "type-9898",
+   "self_type" : "type-9897",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44980,8 +45078,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-1152",
-   "self_type" : "type-1151",
+   "referenced_type" : "type-1155",
+   "self_type" : "type-1154",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44990,8 +45088,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-1345",
-   "self_type" : "type-1344",
+   "referenced_type" : "type-1348",
+   "self_type" : "type-1347",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45000,8 +45098,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-3436",
-   "self_type" : "type-3435",
+   "referenced_type" : "type-3439",
+   "self_type" : "type-3438",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45010,8 +45108,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-3591",
-   "self_type" : "type-3590",
+   "referenced_type" : "type-3594",
+   "self_type" : "type-3593",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45020,8 +45118,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-3755",
-   "self_type" : "type-3754",
+   "referenced_type" : "type-3761",
+   "self_type" : "type-3760",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45030,8 +45128,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-3897",
-   "self_type" : "type-3896",
+   "referenced_type" : "type-3903",
+   "self_type" : "type-3902",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45040,8 +45138,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-4445",
-   "self_type" : "type-4444",
+   "referenced_type" : "type-4451",
+   "self_type" : "type-4450",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45050,8 +45148,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-4650",
-   "self_type" : "type-4649",
+   "referenced_type" : "type-4657",
+   "self_type" : "type-4656",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45060,8 +45158,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-4821",
-   "self_type" : "type-4820",
+   "referenced_type" : "type-4827",
+   "self_type" : "type-4826",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45070,8 +45168,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-5357",
-   "self_type" : "type-5356",
+   "referenced_type" : "type-5363",
+   "self_type" : "type-5362",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45080,8 +45178,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-5512",
-   "self_type" : "type-5511",
+   "referenced_type" : "type-5518",
+   "self_type" : "type-5517",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45090,8 +45188,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-5676",
-   "self_type" : "type-5675",
+   "referenced_type" : "type-5685",
+   "self_type" : "type-5684",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45100,8 +45198,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-5818",
-   "self_type" : "type-5817",
+   "referenced_type" : "type-5827",
+   "self_type" : "type-5826",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45110,8 +45208,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-6342",
-   "self_type" : "type-6341",
+   "referenced_type" : "type-6351",
+   "self_type" : "type-6350",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45120,8 +45218,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-6534",
-   "self_type" : "type-6533",
+   "referenced_type" : "type-6544",
+   "self_type" : "type-6543",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45130,8 +45228,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-6687",
-   "self_type" : "type-6686",
+   "referenced_type" : "type-6696",
+   "self_type" : "type-6695",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45150,8 +45248,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-6831",
-   "self_type" : "type-6830",
+   "referenced_type" : "type-6840",
+   "self_type" : "type-6839",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45160,8 +45258,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-6981",
-   "self_type" : "type-6980",
+   "referenced_type" : "type-6990",
+   "self_type" : "type-6989",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45170,8 +45268,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-7160",
-   "self_type" : "type-7159",
+   "referenced_type" : "type-7169",
+   "self_type" : "type-7168",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45180,8 +45278,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-7394",
-   "self_type" : "type-7393",
+   "referenced_type" : "type-7253",
+   "self_type" : "type-7252",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45190,8 +45288,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-7673",
-   "self_type" : "type-7672",
+   "referenced_type" : "type-7416",
+   "self_type" : "type-7415",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45200,8 +45298,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-7828",
-   "self_type" : "type-7827",
+   "referenced_type" : "type-7694",
+   "self_type" : "type-7693",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45210,8 +45308,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-7992",
-   "self_type" : "type-7991",
+   "referenced_type" : "type-7849",
+   "self_type" : "type-7848",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45220,8 +45318,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-8134",
-   "self_type" : "type-8133",
+   "referenced_type" : "type-8016",
+   "self_type" : "type-8015",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45230,8 +45328,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-8281",
-   "self_type" : "type-8280",
+   "referenced_type" : "type-8158",
+   "self_type" : "type-8157",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45240,8 +45338,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-8414",
-   "self_type" : "type-8413",
+   "referenced_type" : "type-8305",
+   "self_type" : "type-8304",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45250,8 +45348,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-8547",
-   "self_type" : "type-8546",
+   "referenced_type" : "type-8438",
+   "self_type" : "type-8437",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45260,8 +45358,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8574",
+   "self_type" : "type-8573",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/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-8679",
+   "self_type" : "type-8678",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45280,8 +45388,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-9213",
-   "self_type" : "type-9212",
+   "referenced_type" : "type-9240",
+   "self_type" : "type-9239",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45290,8 +45398,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-9456",
-   "self_type" : "type-9455",
+   "referenced_type" : "type-9484",
+   "self_type" : "type-9483",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45300,8 +45408,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-9588",
-   "self_type" : "type-9587",
+   "referenced_type" : "type-9615",
+   "self_type" : "type-9614",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45310,18 +45418,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-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",
+   "referenced_type" : "type-9762",
+   "self_type" : "type-9761",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45340,8 +45438,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-1113",
-   "self_type" : "type-1112",
+   "referenced_type" : "type-1116",
+   "self_type" : "type-1115",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45350,8 +45448,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-1290",
-   "self_type" : "type-1289",
+   "referenced_type" : "type-1293",
+   "self_type" : "type-1292",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45360,8 +45458,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-3355",
-   "self_type" : "type-3354",
+   "referenced_type" : "type-3358",
+   "self_type" : "type-3357",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45370,8 +45468,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-3542",
-   "self_type" : "type-3541",
+   "referenced_type" : "type-3545",
+   "self_type" : "type-3544",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45380,8 +45478,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-3651",
-   "self_type" : "type-3650",
+   "referenced_type" : "type-3654",
+   "self_type" : "type-3653",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45390,8 +45488,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-3715",
-   "self_type" : "type-3714",
+   "referenced_type" : "type-3722",
+   "self_type" : "type-3721",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45400,8 +45498,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-3839",
-   "self_type" : "type-3838",
+   "referenced_type" : "type-3845",
+   "self_type" : "type-3844",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45410,8 +45508,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-4393",
-   "self_type" : "type-4392",
+   "referenced_type" : "type-4401",
+   "self_type" : "type-4400",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45420,8 +45518,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-4508",
-   "self_type" : "type-4507",
+   "referenced_type" : "type-4515",
+   "self_type" : "type-4514",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45430,8 +45528,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-4544",
-   "self_type" : "type-4543",
+   "referenced_type" : "type-4553",
+   "self_type" : "type-4552",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45440,8 +45538,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-4603",
-   "self_type" : "type-4602",
+   "referenced_type" : "type-4609",
+   "self_type" : "type-4608",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45450,8 +45548,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-4773",
-   "self_type" : "type-4772",
+   "referenced_type" : "type-4780",
+   "self_type" : "type-4779",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45460,8 +45558,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-4851",
-   "self_type" : "type-4850",
+   "referenced_type" : "type-4857",
+   "self_type" : "type-4856",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45470,8 +45568,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-5276",
-   "self_type" : "type-5275",
+   "referenced_type" : "type-5282",
+   "self_type" : "type-5281",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45490,8 +45588,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-5463",
-   "self_type" : "type-5462",
+   "referenced_type" : "type-5469",
+   "self_type" : "type-5468",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45500,8 +45598,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-5572",
-   "self_type" : "type-5571",
+   "referenced_type" : "type-5578",
+   "self_type" : "type-5577",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45510,8 +45608,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-5636",
-   "self_type" : "type-5635",
+   "referenced_type" : "type-5646",
+   "self_type" : "type-5645",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45520,8 +45618,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-5760",
-   "self_type" : "type-5759",
+   "referenced_type" : "type-5769",
+   "self_type" : "type-5768",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45530,8 +45628,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-6290",
-   "self_type" : "type-6289",
+   "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"
   },
@@ -45540,8 +45638,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-6392",
-   "self_type" : "type-6391",
+   "referenced_type" : "type-6402",
+   "self_type" : "type-6401",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45550,8 +45648,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-6428",
-   "self_type" : "type-6427",
+   "referenced_type" : "type-6440",
+   "self_type" : "type-6439",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45560,8 +45658,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-6487",
-   "self_type" : "type-6486",
+   "referenced_type" : "type-6496",
+   "self_type" : "type-6495",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45570,8 +45668,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-6639",
-   "self_type" : "type-6638",
+   "referenced_type" : "type-6649",
+   "self_type" : "type-6648",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45580,8 +45678,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-6715",
-   "self_type" : "type-6714",
+   "referenced_type" : "type-6724",
+   "self_type" : "type-6723",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45590,8 +45688,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-6742",
-   "self_type" : "type-6741",
+   "referenced_type" : "type-6751",
+   "self_type" : "type-6750",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45600,8 +45698,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-6833",
-   "self_type" : "type-6832",
+   "referenced_type" : "type-6842",
+   "self_type" : "type-6841",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45610,8 +45708,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-6877",
-   "self_type" : "type-6876",
+   "referenced_type" : "type-6886",
+   "self_type" : "type-6885",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45620,8 +45718,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-6983",
-   "self_type" : "type-6982",
+   "referenced_type" : "type-6992",
+   "self_type" : "type-6991",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45630,8 +45728,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-7056",
-   "self_type" : "type-7055",
+   "referenced_type" : "type-7064",
+   "self_type" : "type-7063",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45640,8 +45738,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-7113",
-   "self_type" : "type-7112",
+   "referenced_type" : "type-7122",
+   "self_type" : "type-7121",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45650,8 +45748,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-7288",
-   "self_type" : "type-7287",
+   "referenced_type" : "type-7255",
+   "self_type" : "type-7254",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45660,8 +45758,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-7342",
-   "self_type" : "type-7341",
+   "referenced_type" : "type-7308",
+   "self_type" : "type-7307",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45670,8 +45768,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-7592",
-   "self_type" : "type-7591",
+   "referenced_type" : "type-7364",
+   "self_type" : "type-7363",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45680,8 +45778,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-7779",
-   "self_type" : "type-7778",
+   "referenced_type" : "type-7613",
+   "self_type" : "type-7612",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45690,8 +45788,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-7888",
-   "self_type" : "type-7887",
+   "referenced_type" : "type-7800",
+   "self_type" : "type-7799",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45700,8 +45798,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-7952",
-   "self_type" : "type-7951",
+   "referenced_type" : "type-7909",
+   "self_type" : "type-7908",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45710,8 +45808,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-8076",
-   "self_type" : "type-8075",
+   "referenced_type" : "type-7977",
+   "self_type" : "type-7976",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45720,8 +45818,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-8232",
-   "self_type" : "type-8231",
+   "referenced_type" : "type-8100",
+   "self_type" : "type-8099",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45730,8 +45828,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-8365",
-   "self_type" : "type-8364",
+   "referenced_type" : "type-8257",
+   "self_type" : "type-8256",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45740,8 +45838,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-8461",
-   "self_type" : "type-8460",
+   "referenced_type" : "type-8389",
+   "self_type" : "type-8388",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45750,8 +45848,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-8507",
-   "self_type" : "type-8506",
+   "referenced_type" : "type-8485",
+   "self_type" : "type-8484",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45760,8 +45858,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8535",
+   "self_type" : "type-8534",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-8627",
+   "self_type" : "type-8626",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45780,8 +45888,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-9155",
-   "self_type" : "type-9154",
+   "referenced_type" : "type-9185",
+   "self_type" : "type-9184",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45790,8 +45898,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-9274",
-   "self_type" : "type-9273",
+   "referenced_type" : "type-9303",
+   "self_type" : "type-9302",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45800,8 +45908,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-9325",
-   "self_type" : "type-9324",
+   "referenced_type" : "type-9354",
+   "self_type" : "type-9353",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45810,8 +45918,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-9403",
-   "self_type" : "type-9402",
+   "referenced_type" : "type-9432",
+   "self_type" : "type-9431",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45820,8 +45928,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-9544",
-   "self_type" : "type-9543",
+   "referenced_type" : "type-9571",
+   "self_type" : "type-9570",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45830,8 +45938,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-9608",
-   "self_type" : "type-9607",
+   "referenced_type" : "type-9637",
+   "self_type" : "type-9636",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45840,8 +45948,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-9648",
-   "self_type" : "type-9647",
+   "referenced_type" : "type-9676",
+   "self_type" : "type-9675",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45850,8 +45958,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-9737",
-   "self_type" : "type-9736",
+   "referenced_type" : "type-9764",
+   "self_type" : "type-9763",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45860,18 +45968,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-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",
+   "referenced_type" : "type-9804",
+   "self_type" : "type-9803",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45880,8 +45978,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-4760",
-   "self_type" : "type-4759",
+   "referenced_type" : "type-4767",
+   "self_type" : "type-4766",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -45890,8 +45988,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-4864",
-   "self_type" : "type-4863",
+   "referenced_type" : "type-4870",
+   "self_type" : "type-4869",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -45900,8 +45998,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-6626",
-   "self_type" : "type-6625",
+   "referenced_type" : "type-6636",
+   "self_type" : "type-6635",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -45910,8 +46008,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-6728",
-   "self_type" : "type-6727",
+   "referenced_type" : "type-6737",
+   "self_type" : "type-6736",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -45920,188 +46018,228 @@
    "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-6860",
+   "self_type" : "type-6859",
+   "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-7007",
+   "self_type" : "type-7006",
+   "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-7083",
+   "self_type" : "type-7082",
+   "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-7269",
+   "self_type" : "type-7268",
+   "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-7320",
+   "self_type" : "type-7319",
+   "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-9561",
+   "self_type" : "type-9560",
+   "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-9656",
+   "self_type" : "type-9655",
+   "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-9781",
+   "self_type" : "type-9780",
+   "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-2647",
+   "self_type" : "type-2646",
+   "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-4994",
+   "self_type" : "type-4993",
+   "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-7199",
+   "self_type" : "type-7198",
+   "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-8222",
+   "self_type" : "type-8221",
+   "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-9709",
+   "self_type" : "type-9708",
+   "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-2643",
+   "self_type" : "type-2642",
+   "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-4990",
+   "self_type" : "type-4989",
+   "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-7195",
+   "self_type" : "type-7194",
+   "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-8217",
+   "self_type" : "type-8216",
+   "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-9697",
+   "self_type" : "type-9696",
+   "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-4759",
+   "self_type" : "type-4758",
+   "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-4866",
+   "self_type" : "type-4865",
+   "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-6629",
+   "self_type" : "type-6628",
+   "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-6733",
+   "self_type" : "type-6732",
+   "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-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"
   },
@@ -46110,8 +46248,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-4860",
-   "self_type" : "type-4859",
+   "referenced_type" : "type-6996",
+   "self_type" : "type-6995",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -46120,8 +46258,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-6620",
-   "self_type" : "type-6619",
+   "referenced_type" : "type-7077",
+   "self_type" : "type-7076",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -46130,8 +46268,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-6724",
-   "self_type" : "type-6723",
+   "referenced_type" : "type-7259",
+   "self_type" : "type-7258",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -46140,8 +46278,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-6841",
-   "self_type" : "type-6840",
+   "referenced_type" : "type-7316",
+   "self_type" : "type-7315",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -46150,8 +46288,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-6987",
-   "self_type" : "type-6986",
+   "referenced_type" : "type-9555",
+   "self_type" : "type-9554",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -46160,8 +46298,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-7069",
-   "self_type" : "type-7068",
+   "referenced_type" : "type-9650",
+   "self_type" : "type-9649",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -46170,48 +46308,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-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",
+   "referenced_type" : "type-9772",
+   "self_type" : "type-9771",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -46220,8 +46318,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-1644",
-   "self_type" : "type-1643",
+   "referenced_type" : "type-1647",
+   "self_type" : "type-1646",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -46230,8 +46328,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-4105",
-   "self_type" : "type-4104",
+   "referenced_type" : "type-4112",
+   "self_type" : "type-4111",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -46240,8 +46338,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-6026",
-   "self_type" : "type-6025",
+   "referenced_type" : "type-6036",
+   "self_type" : "type-6035",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -46250,8 +46348,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-8854",
-   "self_type" : "type-8853",
+   "referenced_type" : "type-8881",
+   "self_type" : "type-8880",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -46270,8 +46368,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1108",
-   "self_type" : "type-1107",
+   "referenced_type" : "type-1111",
+   "self_type" : "type-1110",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46280,8 +46378,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1280",
-   "self_type" : "type-1279",
+   "referenced_type" : "type-1283",
+   "self_type" : "type-1282",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46290,8 +46388,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-3275",
+   "self_type" : "type-3274",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46300,8 +46398,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-3539",
+   "self_type" : "type-3538",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46310,8 +46408,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-3649",
+   "self_type" : "type-3648",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46320,8 +46418,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-3715",
+   "self_type" : "type-3714",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46330,8 +46428,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-3837",
+   "self_type" : "type-3836",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46350,8 +46448,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-4358",
+   "self_type" : "type-4357",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46360,8 +46458,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-4493",
+   "self_type" : "type-4492",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46370,8 +46468,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-4562",
+   "self_type" : "type-4561",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46380,8 +46478,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-4624",
+   "self_type" : "type-4623",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46390,8 +46488,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-4667",
+   "self_type" : "type-4666",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46400,8 +46498,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-4874",
+   "self_type" : "type-4873",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46410,8 +46508,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-5199",
+   "self_type" : "type-5198",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46420,8 +46518,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-5463",
+   "self_type" : "type-5462",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46430,8 +46528,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-5573",
+   "self_type" : "type-5572",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46440,8 +46538,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-5639",
+   "self_type" : "type-5638",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46450,8 +46548,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-5761",
+   "self_type" : "type-5760",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46460,8 +46558,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6261",
+   "self_type" : "type-6260",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46470,8 +46568,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6382",
+   "self_type" : "type-6381",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46480,8 +46578,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6449",
+   "self_type" : "type-6448",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46490,8 +46588,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6511",
+   "self_type" : "type-6510",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46500,8 +46598,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6552",
+   "self_type" : "type-6551",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46510,8 +46608,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6741",
+   "self_type" : "type-6740",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46520,8 +46618,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6760",
+   "self_type" : "type-6759",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46530,8 +46628,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6766",
+   "self_type" : "type-6765",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46540,8 +46638,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6898",
+   "self_type" : "type-6897",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46550,8 +46648,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6908",
+   "self_type" : "type-6907",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46560,8 +46658,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7087",
+   "self_type" : "type-7086",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46570,8 +46668,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7117",
+   "self_type" : "type-7116",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46580,8 +46678,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7324",
+   "self_type" : "type-7323",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46590,8 +46688,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7354",
+   "self_type" : "type-7353",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46600,8 +46698,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7530",
+   "self_type" : "type-7529",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46610,8 +46708,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7794",
+   "self_type" : "type-7793",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46620,8 +46718,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7904",
+   "self_type" : "type-7903",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46630,8 +46728,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7970",
+   "self_type" : "type-7969",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46640,8 +46738,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-8092",
+   "self_type" : "type-8091",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46650,8 +46748,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-8247",
+   "self_type" : "type-8246",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46660,8 +46758,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-8384",
+   "self_type" : "type-8383",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46670,8 +46768,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-8480",
+   "self_type" : "type-8479",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46680,18 +46778,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-8527",
+   "self_type" : "type-8526",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46710,8 +46798,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-8619",
+   "self_type" : "type-8618",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46720,8 +46808,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-9140",
+   "self_type" : "type-9139",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46730,8 +46818,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-9278",
+   "self_type" : "type-9277",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46740,8 +46828,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-9367",
+   "self_type" : "type-9366",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46750,8 +46838,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-9448",
+   "self_type" : "type-9447",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46760,8 +46848,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-9493",
+   "self_type" : "type-9492",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46770,8 +46858,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-9661",
+   "self_type" : "type-9660",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46780,8 +46868,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-9686",
+   "self_type" : "type-9685",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46790,8 +46878,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-9691",
+   "self_type" : "type-9690",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46800,8 +46888,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-9800",
-   "self_type" : "type-9799",
+   "referenced_type" : "type-9817",
+   "self_type" : "type-9816",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-9828",
+   "self_type" : "type-9827",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46810,8 +46908,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-4376",
-   "self_type" : "type-4375",
+   "referenced_type" : "type-4383",
+   "self_type" : "type-4382",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -46820,8 +46918,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-4505",
-   "self_type" : "type-4504",
+   "referenced_type" : "type-4511",
+   "self_type" : "type-4510",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -46830,8 +46928,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-6273",
-   "self_type" : "type-6272",
+   "referenced_type" : "type-6283",
+   "self_type" : "type-6282",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -46840,8 +46938,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-6389",
-   "self_type" : "type-6388",
+   "referenced_type" : "type-6398",
+   "self_type" : "type-6397",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -46850,8 +46948,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-9136",
-   "self_type" : "type-9135",
+   "referenced_type" : "type-9164",
+   "self_type" : "type-9163",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -46860,8 +46958,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-9269",
-   "self_type" : "type-9268",
+   "referenced_type" : "type-9298",
+   "self_type" : "type-9297",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -46901,7 +46999,7 @@
    "linker_set_key" : "const unsigned short",
    "name" : "const unsigned short",
    "referenced_type" : "type-497",
-   "self_type" : "type-2520",
+   "self_type" : "type-2523",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -46929,7 +47027,7 @@
    "linker_set_key" : "volatile int",
    "name" : "volatile int",
    "referenced_type" : "type-4",
-   "self_type" : "type-1250",
+   "self_type" : "type-1253",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h"
   }
@@ -46947,7 +47045,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -46962,8 +47060,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_BALANCETYPE",
    "name" : "OMX_AUDIO_CONFIG_BALANCETYPE",
-   "referenced_type" : "type-2184",
-   "self_type" : "type-2184",
+   "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_BALANCETYPE"
@@ -46979,7 +47077,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -46989,7 +47087,7 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nBass",
@@ -46999,8 +47097,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_BASSTYPE",
    "name" : "OMX_AUDIO_CONFIG_BASSTYPE",
-   "referenced_type" : "type-2188",
-   "self_type" : "type-2188",
+   "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_BASSTYPE"
@@ -47016,7 +47114,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47031,18 +47129,18 @@
     {
      "field_name" : "bMute",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bIsMIDI",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
    "name" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
-   "referenced_type" : "type-2186",
-   "self_type" : "type-2186",
+   "referenced_type" : "type-2189",
+   "self_type" : "type-2189",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE"
@@ -47058,7 +47156,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47073,23 +47171,23 @@
     {
      "field_name" : "bLinear",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "sVolume",
      "field_offset" : 160,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     },
     {
      "field_name" : "bIsMIDI",
      "field_offset" : 256,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
    "name" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
-   "referenced_type" : "type-2183",
-   "self_type" : "type-2183",
+   "referenced_type" : "type-2186",
+   "self_type" : "type-2186",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE"
@@ -47105,7 +47203,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47115,17 +47213,17 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "sDelay",
      "field_offset" : 128,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "sModulationRate",
      "field_offset" : 224,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "nModulationDepth",
@@ -47135,13 +47233,13 @@
     {
      "field_name" : "nFeedback",
      "field_offset" : 352,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
    "name" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
-   "referenced_type" : "type-2194",
-   "self_type" : "type-2194",
+   "referenced_type" : "type-2197",
+   "self_type" : "type-2197",
    "size" : 56,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHORUSTYPE"
@@ -47157,7 +47255,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47167,13 +47265,13 @@
     {
      "field_name" : "eEchoCancelation",
      "field_offset" : 96,
-     "referenced_type" : "type-2196"
+     "referenced_type" : "type-2199"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
-   "referenced_type" : "type-2197",
-   "self_type" : "type-2197",
+   "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_ECHOCANCELATIONTYPE"
@@ -47189,7 +47287,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47199,28 +47297,28 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "sBandIndex",
      "field_offset" : 128,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "sCenterFreq",
      "field_offset" : 224,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "sBandLevel",
      "field_offset" : 320,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
    "name" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
-   "referenced_type" : "type-2191",
-   "self_type" : "type-2191",
+   "referenced_type" : "type-2194",
+   "self_type" : "type-2194",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE"
@@ -47236,7 +47334,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47246,13 +47344,13 @@
     {
      "field_name" : "bLoudness",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
    "name" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
-   "referenced_type" : "type-2187",
-   "self_type" : "type-2187",
+   "referenced_type" : "type-2190",
+   "self_type" : "type-2190",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE"
@@ -47268,7 +47366,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47278,17 +47376,17 @@
     {
      "field_name" : "sPitchTransposition",
      "field_offset" : 96,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     },
     {
      "field_name" : "sPlayBackRate",
      "field_offset" : 192,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "sTempo",
      "field_offset" : 288,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "nMaxPolyphony",
@@ -47338,8 +47436,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
-   "referenced_type" : "type-2165",
-   "self_type" : "type-2165",
+   "referenced_type" : "type-2157",
+   "self_type" : "type-2157",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE"
@@ -47355,7 +47453,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47370,13 +47468,13 @@
     {
      "field_name" : "nMidiEvents",
      "field_offset" : 128,
-     "referenced_type" : "type-1572"
+     "referenced_type" : "type-1567"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
-   "referenced_type" : "type-2143",
-   "self_type" : "type-2143",
+   "referenced_type" : "type-2135",
+   "self_type" : "type-2135",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE"
@@ -47392,7 +47490,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47412,13 +47510,13 @@
     {
      "field_name" : "nData",
      "field_offset" : 160,
-     "referenced_type" : "type-1572"
+     "referenced_type" : "type-1567"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
-   "referenced_type" : "type-2181",
-   "self_type" : "type-2181",
+   "referenced_type" : "type-2184",
+   "self_type" : "type-2184",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE"
@@ -47434,7 +47532,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47469,8 +47567,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
-   "referenced_type" : "type-2176",
-   "self_type" : "type-2176",
+   "referenced_type" : "type-2179",
+   "self_type" : "type-2179",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE"
@@ -47486,7 +47584,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47516,8 +47614,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
-   "referenced_type" : "type-2154",
-   "self_type" : "type-2154",
+   "referenced_type" : "type-2146",
+   "self_type" : "type-2146",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE"
@@ -47533,7 +47631,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47558,7 +47656,7 @@
     {
      "field_name" : "bVibra",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nNumMetaEvents",
@@ -47573,13 +47671,13 @@
     {
      "field_name" : "eMIDIPlayBackState",
      "field_offset" : 288,
-     "referenced_type" : "type-2169"
+     "referenced_type" : "type-2168"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
-   "referenced_type" : "type-2170",
-   "self_type" : "type-2170",
+   "referenced_type" : "type-2173",
+   "self_type" : "type-2173",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE"
@@ -47595,7 +47693,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47605,13 +47703,13 @@
     {
      "field_name" : "bMute",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MUTETYPE",
    "name" : "OMX_AUDIO_CONFIG_MUTETYPE",
-   "referenced_type" : "type-2185",
-   "self_type" : "type-2185",
+   "referenced_type" : "type-2188",
+   "self_type" : "type-2188",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MUTETYPE"
@@ -47627,7 +47725,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47637,13 +47735,13 @@
     {
      "field_name" : "bNoiseReduction",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
-   "referenced_type" : "type-2198",
-   "self_type" : "type-2198",
+   "referenced_type" : "type-2201",
+   "self_type" : "type-2201",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE"
@@ -47659,7 +47757,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47669,47 +47767,47 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "sRoomLevel",
      "field_offset" : 128,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     },
     {
      "field_name" : "sRoomHighFreqLevel",
      "field_offset" : 224,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     },
     {
      "field_name" : "sReflectionsLevel",
      "field_offset" : 320,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     },
     {
      "field_name" : "sReflectionsDelay",
      "field_offset" : 416,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "sReverbLevel",
      "field_offset" : 512,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     },
     {
      "field_name" : "sReverbDelay",
      "field_offset" : 608,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "sDecayTime",
      "field_offset" : 704,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "nDecayHighFreqRatio",
      "field_offset" : 800,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "nDensity",
@@ -47724,13 +47822,13 @@
     {
      "field_name" : "sReferenceHighFreq",
      "field_offset" : 960,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
-   "referenced_type" : "type-2195",
-   "self_type" : "type-2195",
+   "referenced_type" : "type-2198",
+   "self_type" : "type-2198",
    "size" : 132,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE"
@@ -47746,7 +47844,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47756,12 +47854,12 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eWideningType",
      "field_offset" : 128,
-     "referenced_type" : "type-2192"
+     "referenced_type" : "type-2195"
     },
     {
      "field_name" : "nStereoWidening",
@@ -47771,8 +47869,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
    "name" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-2193",
-   "self_type" : "type-2193",
+   "referenced_type" : "type-2196",
+   "self_type" : "type-2196",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE"
@@ -47788,7 +47886,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47798,7 +47896,7 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nTreble",
@@ -47808,8 +47906,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_TREBLETYPE",
    "name" : "OMX_AUDIO_CONFIG_TREBLETYPE",
-   "referenced_type" : "type-2189",
-   "self_type" : "type-2189",
+   "referenced_type" : "type-2192",
+   "self_type" : "type-2192",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_TREBLETYPE"
@@ -47825,7 +47923,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47835,18 +47933,18 @@
     {
      "field_name" : "bLinear",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "sVolume",
      "field_offset" : 128,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
    "name" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
-   "referenced_type" : "type-2182",
-   "self_type" : "type-2182",
+   "referenced_type" : "type-2185",
+   "self_type" : "type-2185",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_VOLUMETYPE"
@@ -47862,7 +47960,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47907,23 +48005,23 @@
     {
      "field_name" : "eAACProfile",
      "field_offset" : 320,
-     "referenced_type" : "type-1676"
+     "referenced_type" : "type-1671"
     },
     {
      "field_name" : "eAACStreamFormat",
      "field_offset" : 352,
-     "referenced_type" : "type-1668"
+     "referenced_type" : "type-1670"
     },
     {
      "field_name" : "eChannelMode",
      "field_offset" : 384,
-     "referenced_type" : "type-1652"
+     "referenced_type" : "type-1651"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
    "name" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
-   "referenced_type" : "type-1687",
-   "self_type" : "type-1687",
+   "referenced_type" : "type-1679",
+   "self_type" : "type-1679",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_AACPROFILETYPE"
@@ -47939,7 +48037,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47964,8 +48062,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_ADPCMTYPE",
    "name" : "OMX_AUDIO_PARAM_ADPCMTYPE",
-   "referenced_type" : "type-1798",
-   "self_type" : "type-1798",
+   "referenced_type" : "type-1789",
+   "self_type" : "type-1789",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_ADPCMTYPE"
@@ -47981,7 +48079,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48001,23 +48099,23 @@
     {
      "field_name" : "eAMRBandMode",
      "field_offset" : 160,
-     "referenced_type" : "type-1890"
+     "referenced_type" : "type-1881"
     },
     {
      "field_name" : "eAMRDTXMode",
      "field_offset" : 192,
-     "referenced_type" : "type-1901"
+     "referenced_type" : "type-1892"
     },
     {
      "field_name" : "eAMRFrameFormat",
      "field_offset" : 224,
-     "referenced_type" : "type-1877"
+     "referenced_type" : "type-1862"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_AMRTYPE",
    "name" : "OMX_AUDIO_PARAM_AMRTYPE",
-   "referenced_type" : "type-1912",
-   "self_type" : "type-1912",
+   "referenced_type" : "type-1903",
+   "self_type" : "type-1903",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_AMRTYPE"
@@ -48033,7 +48131,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48048,12 +48146,12 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-2021"
+     "referenced_type" : "type-2013"
     },
     {
      "field_name" : "bRATE_REDUCon",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nMinBitRate",
@@ -48068,23 +48166,23 @@
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 256,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bNoiseSuppressor",
      "field_offset" : 288,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_EVRCTYPE",
    "name" : "OMX_AUDIO_PARAM_EVRCTYPE",
-   "referenced_type" : "type-2055",
-   "self_type" : "type-2055",
+   "referenced_type" : "type-2046",
+   "self_type" : "type-2046",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_EVRCTYPE"
@@ -48100,7 +48198,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48125,8 +48223,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_FLACTYPE",
    "name" : "OMX_AUDIO_PARAM_FLACTYPE",
-   "referenced_type" : "type-1709",
-   "self_type" : "type-1709",
+   "referenced_type" : "type-1700",
+   "self_type" : "type-1700",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_FLACTYPE"
@@ -48142,7 +48240,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48157,28 +48255,28 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eBitRate",
      "field_offset" : 160,
-     "referenced_type" : "type-1808"
+     "referenced_type" : "type-1799"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G723TYPE",
    "name" : "OMX_AUDIO_PARAM_G723TYPE",
-   "referenced_type" : "type-1818",
-   "self_type" : "type-1818",
+   "referenced_type" : "type-1812",
+   "self_type" : "type-1812",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G723TYPE"
@@ -48194,7 +48292,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48209,13 +48307,13 @@
     {
      "field_name" : "eG726Mode",
      "field_offset" : 128,
-     "referenced_type" : "type-1831"
+     "referenced_type" : "type-1822"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G726TYPE",
    "name" : "OMX_AUDIO_PARAM_G726TYPE",
-   "referenced_type" : "type-1841",
-   "self_type" : "type-1841",
+   "referenced_type" : "type-1832",
+   "self_type" : "type-1832",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G726TYPE"
@@ -48231,7 +48329,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48246,18 +48344,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eBitType",
      "field_offset" : 160,
-     "referenced_type" : "type-1851"
+     "referenced_type" : "type-1845"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G729TYPE",
    "name" : "OMX_AUDIO_PARAM_G729TYPE",
-   "referenced_type" : "type-1860",
-   "self_type" : "type-1860",
+   "referenced_type" : "type-1855",
+   "self_type" : "type-1855",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G729TYPE"
@@ -48273,7 +48371,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48283,18 +48381,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
-   "referenced_type" : "type-1945",
-   "self_type" : "type-1945",
+   "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_GSMEFRTYPE"
@@ -48310,7 +48408,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48320,18 +48418,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMFRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMFRTYPE",
-   "referenced_type" : "type-1923",
-   "self_type" : "type-1923",
+   "referenced_type" : "type-1914",
+   "self_type" : "type-1914",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_GSMFRTYPE"
@@ -48347,7 +48445,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48357,18 +48455,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMHRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMHRTYPE",
-   "referenced_type" : "type-1934",
-   "self_type" : "type-1934",
+   "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_GSMHRTYPE"
@@ -48384,7 +48482,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48409,18 +48507,18 @@
     {
      "field_name" : "eMidiSoundBank",
      "field_offset" : 192,
-     "referenced_type" : "type-2111"
+     "referenced_type" : "type-2102"
     },
     {
      "field_name" : "eMidiSoundBankLayout",
      "field_offset" : 224,
-     "referenced_type" : "type-2121"
+     "referenced_type" : "type-2113"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
    "name" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
-   "referenced_type" : "type-2132",
-   "self_type" : "type-2132",
+   "referenced_type" : "type-2124",
+   "self_type" : "type-2124",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE"
@@ -48436,7 +48534,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48451,23 +48549,23 @@
     {
      "field_name" : "sMaxPolyphony",
      "field_offset" : 128,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "bLoadDefaultSound",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eMidiFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-2087"
+     "referenced_type" : "type-2079"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MIDITYPE",
    "name" : "OMX_AUDIO_PARAM_MIDITYPE",
-   "referenced_type" : "type-2098",
-   "self_type" : "type-2098",
+   "referenced_type" : "type-2090",
+   "self_type" : "type-2090",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MIDITYPE"
@@ -48483,7 +48581,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48513,18 +48611,18 @@
     {
      "field_name" : "eChannelMode",
      "field_offset" : 224,
-     "referenced_type" : "type-1652"
+     "referenced_type" : "type-1651"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-1660"
+     "referenced_type" : "type-1656"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MP3TYPE",
    "name" : "OMX_AUDIO_PARAM_MP3TYPE",
-   "referenced_type" : "type-1666",
-   "self_type" : "type-1666",
+   "referenced_type" : "type-1664",
+   "self_type" : "type-1664",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MP3TYPE"
@@ -48540,7 +48638,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48560,12 +48658,12 @@
     {
      "field_name" : "eEndian",
      "field_offset" : 160,
-     "referenced_type" : "type-1460"
+     "referenced_type" : "type-1459"
     },
     {
      "field_name" : "bInterleaved",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nBitPerSample",
@@ -48580,18 +48678,18 @@
     {
      "field_name" : "ePCMMode",
      "field_offset" : 288,
-     "referenced_type" : "type-1633"
+     "referenced_type" : "type-1628"
     },
     {
      "field_name" : "eChannelMapping",
      "field_offset" : 320,
-     "referenced_type" : "type-1642"
+     "referenced_type" : "type-1641"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PCMMODETYPE",
    "name" : "OMX_AUDIO_PARAM_PCMMODETYPE",
-   "referenced_type" : "type-1641",
-   "self_type" : "type-1641",
+   "referenced_type" : "type-1640",
+   "self_type" : "type-1640",
    "size" : 104,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PCMMODETYPE"
@@ -48607,7 +48705,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48622,18 +48720,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
-   "referenced_type" : "type-2000",
-   "self_type" : "type-2000",
+   "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_PDCEFRTYPE"
@@ -48649,7 +48747,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48664,18 +48762,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCFRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCFRTYPE",
-   "referenced_type" : "type-1989",
-   "self_type" : "type-1989",
+   "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_PDCFRTYPE"
@@ -48691,7 +48789,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48706,18 +48804,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCHRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCHRTYPE",
-   "referenced_type" : "type-2011",
-   "self_type" : "type-2011",
+   "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_PDCHRTYPE"
@@ -48733,7 +48831,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48748,7 +48846,7 @@
     {
      "field_name" : "eEncoding",
      "field_offset" : 128,
-     "referenced_type" : "type-1618"
+     "referenced_type" : "type-1616"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PORTFORMATTYPE",
@@ -48770,7 +48868,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48785,7 +48883,7 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-2021"
+     "referenced_type" : "type-2013"
     },
     {
      "field_name" : "nMinBitRate",
@@ -48800,8 +48898,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_QCELP13TYPE",
    "name" : "OMX_AUDIO_PARAM_QCELP13TYPE",
-   "referenced_type" : "type-2043",
-   "self_type" : "type-2043",
+   "referenced_type" : "type-2035",
+   "self_type" : "type-2035",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_QCELP13TYPE"
@@ -48817,7 +48915,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48837,7 +48935,7 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 160,
-     "referenced_type" : "type-2021"
+     "referenced_type" : "type-2013"
     },
     {
      "field_name" : "nMinBitRate",
@@ -48852,8 +48950,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_QCELP8TYPE",
    "name" : "OMX_AUDIO_PARAM_QCELP8TYPE",
-   "referenced_type" : "type-2032",
-   "self_type" : "type-2032",
+   "referenced_type" : "type-2024",
+   "self_type" : "type-2024",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_QCELP8TYPE"
@@ -48869,7 +48967,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48914,13 +49012,13 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 320,
-     "referenced_type" : "type-1752"
+     "referenced_type" : "type-1746"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_RATYPE",
    "name" : "OMX_AUDIO_PARAM_RATYPE",
-   "referenced_type" : "type-1765",
-   "self_type" : "type-1765",
+   "referenced_type" : "type-1756",
+   "self_type" : "type-1756",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_RATYPE"
@@ -48936,7 +49034,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48976,23 +49074,23 @@
     {
      "field_name" : "bEnableBitrate",
      "field_offset" : 288,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eChannelMode",
      "field_offset" : 320,
-     "referenced_type" : "type-1652"
+     "referenced_type" : "type-1651"
     },
     {
      "field_name" : "eSBCAllocType",
      "field_offset" : 352,
-     "referenced_type" : "type-1775"
+     "referenced_type" : "type-1766"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_SBCTYPE",
    "name" : "OMX_AUDIO_PARAM_SBCTYPE",
-   "referenced_type" : "type-1785",
-   "self_type" : "type-1785",
+   "referenced_type" : "type-1779",
+   "self_type" : "type-1779",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_SBCTYPE"
@@ -49008,7 +49106,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -49023,12 +49121,12 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-2021"
+     "referenced_type" : "type-2013"
     },
     {
      "field_name" : "bRATE_REDUCon",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nMinBitRate",
@@ -49043,23 +49141,23 @@
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 256,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bNoiseSuppressor",
      "field_offset" : 288,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_SMVTYPE",
    "name" : "OMX_AUDIO_PARAM_SMVTYPE",
-   "referenced_type" : "type-2065",
-   "self_type" : "type-2065",
+   "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_SMVTYPE"
@@ -49075,7 +49173,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -49090,18 +49188,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
-   "referenced_type" : "type-1978",
-   "self_type" : "type-1978",
+   "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_TDMAEFRTYPE"
@@ -49117,7 +49215,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -49132,18 +49230,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
    "name" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
-   "referenced_type" : "type-1967",
-   "self_type" : "type-1967",
+   "referenced_type" : "type-1958",
+   "self_type" : "type-1958",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_TDMAFRTYPE"
@@ -49159,7 +49257,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -49204,18 +49302,18 @@
     {
      "field_name" : "bManaged",
      "field_offset" : 320,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bDownmix",
      "field_offset" : 352,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_VORBISTYPE",
    "name" : "OMX_AUDIO_PARAM_VORBISTYPE",
-   "referenced_type" : "type-1698",
-   "self_type" : "type-1698",
+   "referenced_type" : "type-1689",
+   "self_type" : "type-1689",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_VORBISTYPE"
@@ -49231,7 +49329,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -49251,12 +49349,12 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-1719"
+     "referenced_type" : "type-1711"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 192,
-     "referenced_type" : "type-1732"
+     "referenced_type" : "type-1722"
     },
     {
      "field_name" : "nSamplingRate",
@@ -49281,8 +49379,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_WMATYPE",
    "name" : "OMX_AUDIO_PARAM_WMATYPE",
-   "referenced_type" : "type-1742",
-   "self_type" : "type-1742",
+   "referenced_type" : "type-1733",
+   "self_type" : "type-1733",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_WMATYPE"
@@ -49303,18 +49401,18 @@
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 64,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eEncoding",
      "field_offset" : 96,
-     "referenced_type" : "type-1618"
+     "referenced_type" : "type-1616"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PORTDEFINITIONTYPE",
    "name" : "OMX_AUDIO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-1619",
-   "self_type" : "type-1619",
+   "referenced_type" : "type-1621",
+   "self_type" : "type-1621",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PORTDEFINITIONTYPE"
@@ -49340,8 +49438,8 @@
    ],
    "linker_set_key" : "OMX_BS32",
    "name" : "OMX_BS32",
-   "referenced_type" : "type-1470",
-   "self_type" : "type-1470",
+   "referenced_type" : "type-1473",
+   "self_type" : "type-1473",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_BS32"
@@ -49367,8 +49465,8 @@
    ],
    "linker_set_key" : "OMX_BU32",
    "name" : "OMX_BU32",
-   "referenced_type" : "type-1469",
-   "self_type" : "type-1469",
+   "referenced_type" : "type-1468",
+   "self_type" : "type-1468",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_BU32"
@@ -49384,7 +49482,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "pBuffer",
@@ -49464,8 +49562,8 @@
    ],
    "linker_set_key" : "OMX_BUFFERHEADERTYPE",
    "name" : "OMX_BUFFERHEADERTYPE",
-   "referenced_type" : "type-1540",
-   "self_type" : "type-1540",
+   "referenced_type" : "type-1536",
+   "self_type" : "type-1536",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_BUFFERHEADERTYPE"
@@ -49476,23 +49574,23 @@
    [
     {
      "field_name" : "EventHandler",
-     "referenced_type" : "type-1591"
+     "referenced_type" : "type-1594"
     },
     {
      "field_name" : "EmptyBufferDone",
      "field_offset" : 32,
-     "referenced_type" : "type-1593"
+     "referenced_type" : "type-1596"
     },
     {
      "field_name" : "FillBufferDone",
      "field_offset" : 64,
-     "referenced_type" : "type-1593"
+     "referenced_type" : "type-1596"
     }
    ],
    "linker_set_key" : "OMX_CALLBACKTYPE",
    "name" : "OMX_CALLBACKTYPE",
-   "referenced_type" : "type-1590",
-   "self_type" : "type-1590",
+   "referenced_type" : "type-1593",
+   "self_type" : "type-1593",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_CALLBACKTYPE"
@@ -49508,13 +49606,13 @@
     {
      "field_name" : "pInitialize",
      "field_offset" : 32,
-     "referenced_type" : "type-1500"
+     "referenced_type" : "type-1499"
     }
    ],
    "linker_set_key" : "OMX_COMPONENTREGISTERTYPE",
    "name" : "OMX_COMPONENTREGISTERTYPE",
-   "referenced_type" : "type-1499",
-   "self_type" : "type-1499",
+   "referenced_type" : "type-1498",
+   "self_type" : "type-1498",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_COMPONENTREGISTERTYPE"
@@ -49530,7 +49628,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "pComponentPrivate",
@@ -49545,98 +49643,98 @@
     {
      "field_name" : "GetComponentVersion",
      "field_offset" : 128,
-     "referenced_type" : "type-2357"
+     "referenced_type" : "type-2360"
     },
     {
      "field_name" : "SendCommand",
      "field_offset" : 160,
-     "referenced_type" : "type-2361"
+     "referenced_type" : "type-2364"
     },
     {
      "field_name" : "GetParameter",
      "field_offset" : 192,
-     "referenced_type" : "type-2363"
+     "referenced_type" : "type-2366"
     },
     {
      "field_name" : "SetParameter",
      "field_offset" : 224,
-     "referenced_type" : "type-2363"
+     "referenced_type" : "type-2366"
     },
     {
      "field_name" : "GetConfig",
      "field_offset" : 256,
-     "referenced_type" : "type-2363"
+     "referenced_type" : "type-2366"
     },
     {
      "field_name" : "SetConfig",
      "field_offset" : 288,
-     "referenced_type" : "type-2363"
+     "referenced_type" : "type-2366"
     },
     {
      "field_name" : "GetExtensionIndex",
      "field_offset" : 320,
-     "referenced_type" : "type-2365"
+     "referenced_type" : "type-2368"
     },
     {
      "field_name" : "GetState",
      "field_offset" : 352,
-     "referenced_type" : "type-2368"
+     "referenced_type" : "type-2371"
     },
     {
      "field_name" : "ComponentTunnelRequest",
      "field_offset" : 384,
-     "referenced_type" : "type-2371"
+     "referenced_type" : "type-2374"
     },
     {
      "field_name" : "UseBuffer",
      "field_offset" : 416,
-     "referenced_type" : "type-2374"
+     "referenced_type" : "type-2377"
     },
     {
      "field_name" : "AllocateBuffer",
      "field_offset" : 448,
-     "referenced_type" : "type-2377"
+     "referenced_type" : "type-2380"
     },
     {
      "field_name" : "FreeBuffer",
      "field_offset" : 480,
-     "referenced_type" : "type-2379"
+     "referenced_type" : "type-2382"
     },
     {
      "field_name" : "EmptyThisBuffer",
      "field_offset" : 512,
-     "referenced_type" : "type-2381"
+     "referenced_type" : "type-2384"
     },
     {
      "field_name" : "FillThisBuffer",
      "field_offset" : 544,
-     "referenced_type" : "type-2381"
+     "referenced_type" : "type-2384"
     },
     {
      "field_name" : "SetCallbacks",
      "field_offset" : 576,
-     "referenced_type" : "type-2383"
+     "referenced_type" : "type-2386"
     },
     {
      "field_name" : "ComponentDeInit",
      "field_offset" : 608,
-     "referenced_type" : "type-1500"
+     "referenced_type" : "type-1499"
     },
     {
      "field_name" : "UseEGLImage",
      "field_offset" : 640,
-     "referenced_type" : "type-2386"
+     "referenced_type" : "type-2389"
     },
     {
      "field_name" : "ComponentRoleEnum",
      "field_offset" : 672,
-     "referenced_type" : "type-2388"
+     "referenced_type" : "type-2391"
     }
    ],
    "linker_set_key" : "OMX_COMPONENTTYPE",
    "name" : "OMX_COMPONENTTYPE",
-   "referenced_type" : "type-2356",
-   "self_type" : "type-2356",
+   "referenced_type" : "type-2359",
+   "self_type" : "type-2359",
    "size" : 88,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_COMPONENTTYPE"
@@ -49652,7 +49750,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -49672,8 +49770,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_BACKLIGHTTYPE",
    "name" : "OMX_CONFIG_BACKLIGHTTYPE",
-   "referenced_type" : "type-2226",
-   "self_type" : "type-2226",
+   "referenced_type" : "type-2229",
+   "self_type" : "type-2229",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_BACKLIGHTTYPE"
@@ -49689,18 +49787,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "bEnabled",
      "field_offset" : 64,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_BOOLEANTYPE",
    "name" : "OMX_CONFIG_BOOLEANTYPE",
-   "referenced_type" : "type-2340",
-   "self_type" : "type-2340",
+   "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_CONFIG_BOOLEANTYPE"
@@ -49716,7 +49814,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -49731,8 +49829,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_BRIGHTNESSTYPE",
    "name" : "OMX_CONFIG_BRIGHTNESSTYPE",
-   "referenced_type" : "type-2225",
-   "self_type" : "type-2225",
+   "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_BRIGHTNESSTYPE"
@@ -49748,7 +49846,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -49758,12 +49856,12 @@
     {
      "field_name" : "bContinuous",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bFrameLimited",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nFrameLimit",
@@ -49773,8 +49871,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_CAPTUREMODETYPE",
    "name" : "OMX_CONFIG_CAPTUREMODETYPE",
-   "referenced_type" : "type-2240",
-   "self_type" : "type-2240",
+   "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"
@@ -49790,7 +49888,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -49805,13 +49903,13 @@
     {
      "field_name" : "eColorBlend",
      "field_offset" : 128,
-     "referenced_type" : "type-2209"
+     "referenced_type" : "type-2212"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_COLORBLENDTYPE",
    "name" : "OMX_CONFIG_COLORBLENDTYPE",
-   "referenced_type" : "type-2210",
-   "self_type" : "type-2210",
+   "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_CONFIG_COLORBLENDTYPE"
@@ -49827,7 +49925,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -49837,7 +49935,7 @@
     {
      "field_name" : "xColorMatrix",
      "field_offset" : 96,
-     "referenced_type" : "type-2201"
+     "referenced_type" : "type-2204"
     },
     {
      "field_name" : "xColorOffset",
@@ -49847,8 +49945,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_COLORCONVERSIONTYPE",
    "name" : "OMX_CONFIG_COLORCONVERSIONTYPE",
-   "referenced_type" : "type-2200",
-   "self_type" : "type-2200",
+   "referenced_type" : "type-2203",
+   "self_type" : "type-2203",
    "size" : 64,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORCONVERSIONTYPE"
@@ -49864,7 +49962,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -49874,7 +49972,7 @@
     {
      "field_name" : "bColorEnhancement",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nCustomizedU",
@@ -49889,8 +49987,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
    "name" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
-   "referenced_type" : "type-2207",
-   "self_type" : "type-2207",
+   "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_COLORENHANCEMENTTYPE"
@@ -49906,7 +50004,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -49926,8 +50024,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_COLORKEYTYPE",
    "name" : "OMX_CONFIG_COLORKEYTYPE",
-   "referenced_type" : "type-2208",
-   "self_type" : "type-2208",
+   "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_CONFIG_COLORKEYTYPE"
@@ -49943,12 +50041,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nParentNodeID",
@@ -49963,8 +50061,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
    "name" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
-   "referenced_type" : "type-2350",
-   "self_type" : "type-2350",
+   "referenced_type" : "type-2353",
+   "self_type" : "type-2353",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE"
@@ -49980,12 +50078,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nParentNodeID",
@@ -50010,13 +50108,13 @@
     {
      "field_name" : "bIsLeafType",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
    "name" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
-   "referenced_type" : "type-2351",
-   "self_type" : "type-2351",
+   "referenced_type" : "type-2354",
+   "self_type" : "type-2354",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_CONTAINERNODEIDTYPE"
@@ -50032,7 +50130,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50047,8 +50145,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_CONTRASTTYPE",
    "name" : "OMX_CONFIG_CONTRASTTYPE",
-   "referenced_type" : "type-2224",
-   "self_type" : "type-2224",
+   "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_CONTRASTTYPE"
@@ -50064,7 +50162,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50074,13 +50172,13 @@
     {
      "field_name" : "eDither",
      "field_offset" : 96,
-     "referenced_type" : "type-2238"
+     "referenced_type" : "type-2241"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_DITHERTYPE",
    "name" : "OMX_CONFIG_DITHERTYPE",
-   "referenced_type" : "type-2239",
-   "self_type" : "type-2239",
+   "referenced_type" : "type-2242",
+   "self_type" : "type-2242",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_DITHERTYPE"
@@ -50096,7 +50194,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50106,13 +50204,13 @@
     {
      "field_name" : "eExposureControl",
      "field_offset" : 96,
-     "referenced_type" : "type-2221"
+     "referenced_type" : "type-2224"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
    "name" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-2222",
-   "self_type" : "type-2222",
+   "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_EXPOSURECONTROLTYPE"
@@ -50128,7 +50226,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50138,7 +50236,7 @@
     {
      "field_name" : "eMetering",
      "field_offset" : 96,
-     "referenced_type" : "type-2242"
+     "referenced_type" : "type-2245"
     },
     {
      "field_name" : "xEVCompensation",
@@ -50153,7 +50251,7 @@
     {
      "field_name" : "bAutoAperture",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nShutterSpeedMsec",
@@ -50163,7 +50261,7 @@
     {
      "field_name" : "bAutoShutterSpeed",
      "field_offset" : 256,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nSensitivity",
@@ -50173,13 +50271,13 @@
     {
      "field_name" : "bAutoSensitivity",
      "field_offset" : 320,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_EXPOSUREVALUETYPE",
    "name" : "OMX_CONFIG_EXPOSUREVALUETYPE",
-   "referenced_type" : "type-2243",
-   "self_type" : "type-2243",
+   "referenced_type" : "type-2246",
+   "self_type" : "type-2246",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_EXPOSUREVALUETYPE"
@@ -50195,7 +50293,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50205,53 +50303,53 @@
     {
      "field_name" : "bCenter",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bLeft",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bRight",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bTop",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bBottom",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bTopLeft",
      "field_offset" : 256,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bTopRight",
      "field_offset" : 288,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bBottomLeft",
      "field_offset" : 320,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bBottomRight",
      "field_offset" : 352,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_FOCUSREGIONTYPE",
    "name" : "OMX_CONFIG_FOCUSREGIONTYPE",
-   "referenced_type" : "type-2245",
-   "self_type" : "type-2245",
+   "referenced_type" : "type-2248",
+   "self_type" : "type-2248",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_FOCUSREGIONTYPE"
@@ -50267,7 +50365,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50282,8 +50380,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_FRAMERATETYPE",
    "name" : "OMX_CONFIG_FRAMERATETYPE",
-   "referenced_type" : "type-2286",
-   "self_type" : "type-2286",
+   "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_FRAMERATETYPE"
@@ -50299,7 +50397,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50309,13 +50407,13 @@
     {
      "field_name" : "bStab",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_FRAMESTABTYPE",
    "name" : "OMX_CONFIG_FRAMESTABTYPE",
-   "referenced_type" : "type-2218",
-   "self_type" : "type-2218",
+   "referenced_type" : "type-2221",
+   "self_type" : "type-2221",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_FRAMESTABTYPE"
@@ -50331,7 +50429,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50346,8 +50444,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_GAMMATYPE",
    "name" : "OMX_CONFIG_GAMMATYPE",
-   "referenced_type" : "type-2227",
-   "self_type" : "type-2227",
+   "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_GAMMATYPE"
@@ -50363,7 +50461,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50373,13 +50471,13 @@
     {
      "field_name" : "eImageFilter",
      "field_offset" : 96,
-     "referenced_type" : "type-2205"
+     "referenced_type" : "type-2208"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_IMAGEFILTERTYPE",
    "name" : "OMX_CONFIG_IMAGEFILTERTYPE",
-   "referenced_type" : "type-2206",
-   "self_type" : "type-2206",
+   "referenced_type" : "type-2209",
+   "self_type" : "type-2209",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_IMAGEFILTERTYPE"
@@ -50395,7 +50493,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50405,13 +50503,13 @@
     {
      "field_name" : "IntraRefreshVOP",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
    "name" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
-   "referenced_type" : "type-2287",
-   "self_type" : "type-2287",
+   "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_INTRAREFRESHVOPTYPE"
@@ -50427,7 +50525,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50442,8 +50540,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_LIGHTNESSTYPE",
    "name" : "OMX_CONFIG_LIGHTNESSTYPE",
-   "referenced_type" : "type-2229",
-   "self_type" : "type-2229",
+   "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"
@@ -50459,7 +50557,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50474,13 +50572,13 @@
     {
      "field_name" : "ErrMap",
      "field_offset" : 128,
-     "referenced_type" : "type-1572"
+     "referenced_type" : "type-1567"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
    "name" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
-   "referenced_type" : "type-2288",
-   "self_type" : "type-2288",
+   "referenced_type" : "type-2291",
+   "self_type" : "type-2291",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE"
@@ -50496,7 +50594,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50506,13 +50604,13 @@
     {
      "field_name" : "bEnabled",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
    "name" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
-   "referenced_type" : "type-2290",
-   "self_type" : "type-2290",
+   "referenced_type" : "type-2293",
+   "self_type" : "type-2293",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_MBERRORREPORTINGTYPE"
@@ -50528,12 +50626,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "eScopeMode",
      "field_offset" : 64,
-     "referenced_type" : "type-2346"
+     "referenced_type" : "type-2349"
     },
     {
      "field_name" : "nScopeSpecifier",
@@ -50548,8 +50646,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
    "name" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
-   "referenced_type" : "type-2348",
-   "self_type" : "type-2348",
+   "referenced_type" : "type-2351",
+   "self_type" : "type-2351",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_METADATAITEMCOUNTTYPE"
@@ -50565,12 +50663,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "eScopeMode",
      "field_offset" : 64,
-     "referenced_type" : "type-2346"
+     "referenced_type" : "type-2349"
     },
     {
      "field_name" : "nScopeSpecifier",
@@ -50585,12 +50683,12 @@
     {
      "field_name" : "eSearchMode",
      "field_offset" : 160,
-     "referenced_type" : "type-2347"
+     "referenced_type" : "type-2350"
     },
     {
      "field_name" : "eKeyCharset",
      "field_offset" : 192,
-     "referenced_type" : "type-2345"
+     "referenced_type" : "type-2348"
     },
     {
      "field_name" : "nKeySizeUsed",
@@ -50605,7 +50703,7 @@
     {
      "field_name" : "eValueCharset",
      "field_offset" : 1280,
-     "referenced_type" : "type-2345"
+     "referenced_type" : "type-2348"
     },
     {
      "field_name" : "sLanguageCountry",
@@ -50625,13 +50723,13 @@
     {
      "field_name" : "nValue",
      "field_offset" : 1408,
-     "referenced_type" : "type-1572"
+     "referenced_type" : "type-1567"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_METADATAITEMTYPE",
    "name" : "OMX_CONFIG_METADATAITEMTYPE",
-   "referenced_type" : "type-2349",
-   "self_type" : "type-2349",
+   "referenced_type" : "type-2352",
+   "self_type" : "type-2352",
    "size" : 180,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_METADATAITEMTYPE"
@@ -50647,7 +50745,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50657,13 +50755,13 @@
     {
      "field_name" : "eMirror",
      "field_offset" : 96,
-     "referenced_type" : "type-2213"
+     "referenced_type" : "type-2216"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MIRRORTYPE",
    "name" : "OMX_CONFIG_MIRRORTYPE",
-   "referenced_type" : "type-2214",
-   "self_type" : "type-2214",
+   "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_CONFIG_MIRRORTYPE"
@@ -50679,7 +50777,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50699,8 +50797,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_PLANEBLENDTYPE",
    "name" : "OMX_CONFIG_PLANEBLENDTYPE",
-   "referenced_type" : "type-2231",
-   "self_type" : "type-2231",
+   "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_CONFIG_PLANEBLENDTYPE"
@@ -50716,7 +50814,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50736,8 +50834,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_POINTTYPE",
    "name" : "OMX_CONFIG_POINTTYPE",
-   "referenced_type" : "type-2215",
-   "self_type" : "type-2215",
+   "referenced_type" : "type-2218",
+   "self_type" : "type-2218",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_POINTTYPE"
@@ -50753,7 +50851,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50783,8 +50881,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_RECTTYPE",
    "name" : "OMX_CONFIG_RECTTYPE",
-   "referenced_type" : "type-2216",
-   "self_type" : "type-2216",
+   "referenced_type" : "type-2219",
+   "self_type" : "type-2219",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_RECTTYPE"
@@ -50800,7 +50898,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50815,8 +50913,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_ROTATIONTYPE",
    "name" : "OMX_CONFIG_ROTATIONTYPE",
-   "referenced_type" : "type-2212",
-   "self_type" : "type-2212",
+   "referenced_type" : "type-2215",
+   "self_type" : "type-2215",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_ROTATIONTYPE"
@@ -50832,7 +50930,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50847,8 +50945,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_SATURATIONTYPE",
    "name" : "OMX_CONFIG_SATURATIONTYPE",
-   "referenced_type" : "type-2228",
-   "self_type" : "type-2228",
+   "referenced_type" : "type-2231",
+   "self_type" : "type-2231",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_SATURATIONTYPE"
@@ -50864,7 +50962,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50884,8 +50982,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_SCALEFACTORTYPE",
    "name" : "OMX_CONFIG_SCALEFACTORTYPE",
-   "referenced_type" : "type-2204",
-   "self_type" : "type-2204",
+   "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_SCALEFACTORTYPE"
@@ -50901,7 +50999,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50911,13 +51009,13 @@
     {
      "field_name" : "eEffect",
      "field_offset" : 96,
-     "referenced_type" : "type-2233"
+     "referenced_type" : "type-2236"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
    "name" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-2234",
-   "self_type" : "type-2234",
+   "referenced_type" : "type-2237",
+   "self_type" : "type-2237",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_TRANSITIONEFFECTTYPE"
@@ -50933,7 +51031,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50943,13 +51041,13 @@
     {
      "field_name" : "eWhiteBalControl",
      "field_offset" : 96,
-     "referenced_type" : "type-2219"
+     "referenced_type" : "type-2222"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
    "name" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-2220",
-   "self_type" : "type-2220",
+   "referenced_type" : "type-2223",
+   "self_type" : "type-2223",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_WHITEBALCONTROLTYPE"
@@ -50965,7 +51063,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50985,8 +51083,8 @@
    ],
    "linker_set_key" : "OMX_FRAMESIZETYPE",
    "name" : "OMX_FRAMESIZETYPE",
-   "referenced_type" : "type-2211",
-   "self_type" : "type-2211",
+   "referenced_type" : "type-2214",
+   "self_type" : "type-2214",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_FRAMESIZETYPE"
@@ -51002,7 +51100,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -51012,7 +51110,7 @@
     {
      "field_name" : "eFocusControl",
      "field_offset" : 96,
-     "referenced_type" : "type-2303"
+     "referenced_type" : "type-2306"
     },
     {
      "field_name" : "nFocusSteps",
@@ -51027,8 +51125,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
    "name" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-2304",
-   "self_type" : "type-2304",
+   "referenced_type" : "type-2307",
+   "self_type" : "type-2307",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE"
@@ -51044,7 +51142,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -51054,13 +51152,13 @@
     {
      "field_name" : "eFlashControl",
      "field_offset" : 96,
-     "referenced_type" : "type-2300"
+     "referenced_type" : "type-2303"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
    "name" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
-   "referenced_type" : "type-2302",
-   "self_type" : "type-2302",
+   "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_FLASHCONTROLTYPE"
@@ -51076,7 +51174,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -51086,23 +51184,23 @@
     {
      "field_name" : "eHuffmanTable",
      "field_offset" : 96,
-     "referenced_type" : "type-2309"
+     "referenced_type" : "type-2312"
     },
     {
      "field_name" : "nNumberOfHuffmanCodeOfLength",
      "field_offset" : 128,
-     "referenced_type" : "type-2311"
+     "referenced_type" : "type-2314"
     },
     {
      "field_name" : "nHuffmanTable",
      "field_offset" : 256,
-     "referenced_type" : "type-2312"
+     "referenced_type" : "type-2315"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
    "name" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
-   "referenced_type" : "type-2310",
-   "self_type" : "type-2310",
+   "referenced_type" : "type-2313",
+   "self_type" : "type-2313",
    "size" : 288,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE"
@@ -51118,7 +51216,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -51133,18 +51231,18 @@
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-2297"
+     "referenced_type" : "type-2300"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-2199"
+     "referenced_type" : "type-2202"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
    "name" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-2299",
-   "self_type" : "type-2299",
+   "referenced_type" : "type-2302",
+   "self_type" : "type-2302",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_PORTFORMATTYPE"
@@ -51160,7 +51258,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -51175,8 +51273,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_QFACTORTYPE",
    "name" : "OMX_IMAGE_PARAM_QFACTORTYPE",
-   "referenced_type" : "type-2305",
-   "self_type" : "type-2305",
+   "referenced_type" : "type-2308",
+   "self_type" : "type-2308",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_QFACTORTYPE"
@@ -51192,7 +51290,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -51202,18 +51300,18 @@
     {
      "field_name" : "eQuantizationTable",
      "field_offset" : 96,
-     "referenced_type" : "type-2306"
+     "referenced_type" : "type-2309"
     },
     {
      "field_name" : "nQuantizationMatrix",
      "field_offset" : 128,
-     "referenced_type" : "type-2308"
+     "referenced_type" : "type-2311"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
    "name" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-2307",
-   "self_type" : "type-2307",
+   "referenced_type" : "type-2310",
+   "self_type" : "type-2310",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE"
@@ -51254,17 +51352,17 @@
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 224,
-     "referenced_type" : "type-2297"
+     "referenced_type" : "type-2300"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-2199"
+     "referenced_type" : "type-2202"
     },
     {
      "field_name" : "pNativeWindow",
@@ -51274,8 +51372,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_PORTDEFINITIONTYPE",
    "name" : "OMX_IMAGE_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-2298",
-   "self_type" : "type-2298",
+   "referenced_type" : "type-2301",
+   "self_type" : "type-2301",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PORTDEFINITIONTYPE"
@@ -51296,8 +51394,8 @@
    ],
    "linker_set_key" : "OMX_MARKTYPE",
    "name" : "OMX_MARKTYPE",
-   "referenced_type" : "type-1477",
-   "self_type" : "type-1477",
+   "referenced_type" : "type-1475",
+   "self_type" : "type-1475",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_MARKTYPE"
@@ -51313,18 +51411,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "bEnablePM",
      "field_offset" : 64,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_OTHER_CONFIG_POWERTYPE",
    "name" : "OMX_OTHER_CONFIG_POWERTYPE",
-   "referenced_type" : "type-2327",
-   "self_type" : "type-2327",
+   "referenced_type" : "type-2330",
+   "self_type" : "type-2330",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_CONFIG_POWERTYPE"
@@ -51340,13 +51438,13 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     }
    ],
    "linker_set_key" : "OMX_OTHER_CONFIG_STATSTYPE",
    "name" : "OMX_OTHER_CONFIG_STATSTYPE",
-   "referenced_type" : "type-2328",
-   "self_type" : "type-2328",
+   "referenced_type" : "type-2331",
+   "self_type" : "type-2331",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_CONFIG_STATSTYPE"
@@ -51362,7 +51460,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -51372,7 +51470,7 @@
     {
      "field_name" : "eType",
      "field_offset" : 96,
-     "referenced_type" : "type-1561"
+     "referenced_type" : "type-1556"
     },
     {
      "field_name" : "nDataSize",
@@ -51382,13 +51480,13 @@
     {
      "field_name" : "data",
      "field_offset" : 160,
-     "referenced_type" : "type-1572"
+     "referenced_type" : "type-1567"
     }
    ],
    "linker_set_key" : "OMX_OTHER_EXTRADATATYPE",
    "name" : "OMX_OTHER_EXTRADATATYPE",
-   "referenced_type" : "type-1571",
-   "self_type" : "type-1571",
+   "referenced_type" : "type-1566",
+   "self_type" : "type-1566",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_OTHER_EXTRADATATYPE"
@@ -51404,7 +51502,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -51419,13 +51517,13 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-2314"
+     "referenced_type" : "type-2317"
     }
    ],
    "linker_set_key" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
    "name" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-2330",
-   "self_type" : "type-2330",
+   "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"
@@ -51436,13 +51534,13 @@
    [
     {
      "field_name" : "eFormat",
-     "referenced_type" : "type-2314"
+     "referenced_type" : "type-2317"
     }
    ],
    "linker_set_key" : "OMX_OTHER_PORTDEFINITIONTYPE",
    "name" : "OMX_OTHER_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-2329",
-   "self_type" : "type-2329",
+   "referenced_type" : "type-2332",
+   "self_type" : "type-2332",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_PORTDEFINITIONTYPE"
@@ -51458,7 +51556,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -51468,13 +51566,13 @@
     {
      "field_name" : "eBufferSupplier",
      "field_offset" : 96,
-     "referenced_type" : "type-1601"
+     "referenced_type" : "type-1599"
     }
    ],
    "linker_set_key" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
    "name" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-1609",
-   "self_type" : "type-1609",
+   "referenced_type" : "type-1605",
+   "self_type" : "type-1605",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PARAM_BUFFERSUPPLIERTYPE"
@@ -51490,7 +51588,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "cRole",
@@ -51517,7 +51615,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "hPipe",
@@ -51527,8 +51625,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_CONTENTPIPETYPE",
    "name" : "OMX_PARAM_CONTENTPIPETYPE",
-   "referenced_type" : "type-2343",
-   "self_type" : "type-2343",
+   "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_PARAM_CONTENTPIPETYPE"
@@ -51544,18 +51642,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "contentURI",
      "field_offset" : 64,
-     "referenced_type" : "type-1572"
+     "referenced_type" : "type-1567"
     }
    ],
    "linker_set_key" : "OMX_PARAM_CONTENTURITYPE",
    "name" : "OMX_PARAM_CONTENTURITYPE",
-   "referenced_type" : "type-2341",
-   "self_type" : "type-2341",
+   "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"
@@ -51571,7 +51669,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -51581,18 +51679,18 @@
     {
      "field_name" : "eUnitType",
      "field_offset" : 96,
-     "referenced_type" : "type-2235"
+     "referenced_type" : "type-2238"
     },
     {
      "field_name" : "eEncapsulationType",
      "field_offset" : 128,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2239"
     }
    ],
    "linker_set_key" : "OMX_PARAM_DATAUNITTYPE",
    "name" : "OMX_PARAM_DATAUNITTYPE",
-   "referenced_type" : "type-2237",
-   "self_type" : "type-2237",
+   "referenced_type" : "type-2240",
+   "self_type" : "type-2240",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_DATAUNITTYPE"
@@ -51608,7 +51706,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -51618,13 +51716,13 @@
     {
      "field_name" : "bDeblocking",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_PARAM_DEBLOCKINGTYPE",
    "name" : "OMX_PARAM_DEBLOCKINGTYPE",
-   "referenced_type" : "type-2217",
-   "self_type" : "type-2217",
+   "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_PARAM_DEBLOCKINGTYPE"
@@ -51640,7 +51738,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -51650,58 +51748,58 @@
     {
      "field_name" : "eFocusStatus",
      "field_offset" : 96,
-     "referenced_type" : "type-2246"
+     "referenced_type" : "type-2249"
     },
     {
      "field_name" : "bCenterStatus",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bLeftStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bRightStatus",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bTopStatus",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bBottomStatus",
      "field_offset" : 256,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bTopLeftStatus",
      "field_offset" : 288,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bTopRightStatus",
      "field_offset" : 320,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bBottomLeftStatus",
      "field_offset" : 352,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bBottomRightStatus",
      "field_offset" : 384,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_PARAM_FOCUSSTATUSTYPE",
    "name" : "OMX_PARAM_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-2247",
-   "self_type" : "type-2247",
+   "referenced_type" : "type-2250",
+   "self_type" : "type-2250",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_FOCUSSTATUSTYPE"
@@ -51717,7 +51815,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -51727,7 +51825,7 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nInterleavePortIndex",
@@ -51737,8 +51835,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_INTERLEAVETYPE",
    "name" : "OMX_PARAM_INTERLEAVETYPE",
-   "referenced_type" : "type-2232",
-   "self_type" : "type-2232",
+   "referenced_type" : "type-2235",
+   "self_type" : "type-2235",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_INTERLEAVETYPE"
@@ -51754,7 +51852,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -51769,8 +51867,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_MACROBLOCKSTYPE",
    "name" : "OMX_PARAM_MACROBLOCKSTYPE",
-   "referenced_type" : "type-2291",
-   "self_type" : "type-2291",
+   "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"
@@ -51786,17 +51884,17 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eKeyCharset",
      "field_offset" : 96,
-     "referenced_type" : "type-2345"
+     "referenced_type" : "type-2348"
     },
     {
      "field_name" : "nKeySizeUsed",
@@ -51821,13 +51919,13 @@
     {
      "field_name" : "bEnabled",
      "field_offset" : 2240,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_PARAM_METADATAFILTERTYPE",
    "name" : "OMX_PARAM_METADATAFILTERTYPE",
-   "referenced_type" : "type-2355",
-   "self_type" : "type-2355",
+   "referenced_type" : "type-2358",
+   "self_type" : "type-2358",
    "size" : 284,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_METADATAFILTERTYPE"
@@ -51843,7 +51941,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -51853,7 +51951,7 @@
     {
      "field_name" : "eDir",
      "field_offset" : 96,
-     "referenced_type" : "type-1452"
+     "referenced_type" : "type-1455"
     },
     {
      "field_name" : "nBufferCountActual",
@@ -51873,27 +51971,27 @@
     {
      "field_name" : "bEnabled",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bPopulated",
      "field_offset" : 256,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eDomain",
      "field_offset" : 288,
-     "referenced_type" : "type-2332"
+     "referenced_type" : "type-2335"
     },
     {
      "field_name" : "format",
      "field_offset" : 320,
-     "referenced_type" : "type-2334"
+     "referenced_type" : "type-2337"
     },
     {
      "field_name" : "bBuffersContiguous",
      "field_offset" : 704,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nBufferAlignment",
@@ -51903,8 +52001,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_PORTDEFINITIONTYPE",
    "name" : "OMX_PARAM_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-2333",
-   "self_type" : "type-2333",
+   "referenced_type" : "type-2336",
+   "self_type" : "type-2336",
    "size" : 96,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_PORTDEFINITIONTYPE"
@@ -51915,27 +52013,27 @@
    [
     {
      "field_name" : "audio",
-     "referenced_type" : "type-1619"
+     "referenced_type" : "type-1621"
     },
     {
      "field_name" : "video",
-     "referenced_type" : "type-2249"
+     "referenced_type" : "type-2252"
     },
     {
      "field_name" : "image",
-     "referenced_type" : "type-2298"
+     "referenced_type" : "type-2301"
     },
     {
      "field_name" : "other",
-     "referenced_type" : "type-2329"
+     "referenced_type" : "type-2332"
     }
    ],
    "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-2334",
-   "self_type" : "type-2334",
+   "referenced_type" : "type-2337",
+   "self_type" : "type-2337",
    "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)"
@@ -51951,7 +52049,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -51966,18 +52064,18 @@
     {
      "field_name" : "bOneShot",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "sFrameSize",
      "field_offset" : 160,
-     "referenced_type" : "type-2211"
+     "referenced_type" : "type-2214"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SENSORMODETYPE",
    "name" : "OMX_PARAM_SENSORMODETYPE",
-   "referenced_type" : "type-2223",
-   "self_type" : "type-2223",
+   "referenced_type" : "type-2226",
+   "self_type" : "type-2226",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_SENSORMODETYPE"
@@ -51993,18 +52091,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "ePolicy",
      "field_offset" : 64,
-     "referenced_type" : "type-2336"
+     "referenced_type" : "type-2339"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
    "name" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-2337",
-   "self_type" : "type-2337",
+   "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_PARAM_SUSPENSIONPOLICYTYPE"
@@ -52020,18 +52118,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "eType",
      "field_offset" : 64,
-     "referenced_type" : "type-2338"
+     "referenced_type" : "type-2341"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SUSPENSIONTYPE",
    "name" : "OMX_PARAM_SUSPENSIONTYPE",
-   "referenced_type" : "type-2339",
-   "self_type" : "type-2339",
+   "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_PARAM_SUSPENSIONTYPE"
@@ -52047,7 +52145,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -52062,8 +52160,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_U32TYPE",
    "name" : "OMX_PARAM_U32TYPE",
-   "referenced_type" : "type-2335",
-   "self_type" : "type-2335",
+   "referenced_type" : "type-2338",
+   "self_type" : "type-2338",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_U32TYPE"
@@ -52079,7 +52177,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPorts",
@@ -52094,8 +52192,8 @@
    ],
    "linker_set_key" : "OMX_PORT_PARAM_TYPE",
    "name" : "OMX_PORT_PARAM_TYPE",
-   "referenced_type" : "type-1585",
-   "self_type" : "type-1585",
+   "referenced_type" : "type-1581",
+   "self_type" : "type-1581",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PORT_PARAM_TYPE"
@@ -52111,7 +52209,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nGroupPriority",
@@ -52126,8 +52224,8 @@
    ],
    "linker_set_key" : "OMX_PRIORITYMGMTTYPE",
    "name" : "OMX_PRIORITYMGMTTYPE",
-   "referenced_type" : "type-1522",
-   "self_type" : "type-1522",
+   "referenced_type" : "type-1519",
+   "self_type" : "type-1519",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PRIORITYMGMTTYPE"
@@ -52143,18 +52241,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "bResourceConcealmentForbidden",
      "field_offset" : 64,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_RESOURCECONCEALMENTTYPE",
    "name" : "OMX_RESOURCECONCEALMENTTYPE",
-   "referenced_type" : "type-2344",
-   "self_type" : "type-2344",
+   "referenced_type" : "type-2347",
+   "self_type" : "type-2347",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_RESOURCECONCEALMENTTYPE"
@@ -52170,18 +52268,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "eClock",
      "field_offset" : 64,
-     "referenced_type" : "type-2319"
+     "referenced_type" : "type-2322"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
    "name" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
-   "referenced_type" : "type-2326",
-   "self_type" : "type-2326",
+   "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_TIME_CONFIG_ACTIVEREFCLOCKTYPE"
@@ -52197,12 +52295,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "eState",
      "field_offset" : 64,
-     "referenced_type" : "type-2321"
+     "referenced_type" : "type-2324"
     },
     {
      "field_name" : "nStartTime",
@@ -52222,8 +52320,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
    "name" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
-   "referenced_type" : "type-2325",
-   "self_type" : "type-2325",
+   "referenced_type" : "type-2328",
+   "self_type" : "type-2328",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_CLOCKSTATETYPE"
@@ -52239,7 +52337,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -52264,8 +52362,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
    "name" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
-   "referenced_type" : "type-2322",
-   "self_type" : "type-2322",
+   "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_MEDIATIMEREQUESTTYPE"
@@ -52281,7 +52379,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "xScale",
@@ -52291,8 +52389,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_SCALETYPE",
    "name" : "OMX_TIME_CONFIG_SCALETYPE",
-   "referenced_type" : "type-2324",
-   "self_type" : "type-2324",
+   "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_TIME_CONFIG_SCALETYPE"
@@ -52308,18 +52406,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "eType",
      "field_offset" : 64,
-     "referenced_type" : "type-2315"
+     "referenced_type" : "type-2318"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_SEEKMODETYPE",
    "name" : "OMX_TIME_CONFIG_SEEKMODETYPE",
-   "referenced_type" : "type-2316",
-   "self_type" : "type-2316",
+   "referenced_type" : "type-2319",
+   "self_type" : "type-2319",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_SEEKMODETYPE"
@@ -52335,7 +52433,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -52350,8 +52448,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
    "name" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
-   "referenced_type" : "type-2317",
-   "self_type" : "type-2317",
+   "referenced_type" : "type-2320",
+   "self_type" : "type-2320",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_TIMESTAMPTYPE"
@@ -52367,7 +52465,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nClientPrivate",
@@ -52377,7 +52475,7 @@
     {
      "field_name" : "eUpdateType",
      "field_offset" : 96,
-     "referenced_type" : "type-2318"
+     "referenced_type" : "type-2321"
     },
     {
      "field_name" : "nMediaTimestamp",
@@ -52402,13 +52500,13 @@
     {
      "field_name" : "eState",
      "field_offset" : 352,
-     "referenced_type" : "type-2321"
+     "referenced_type" : "type-2324"
     }
    ],
    "linker_set_key" : "OMX_TIME_MEDIATIMETYPE",
    "name" : "OMX_TIME_MEDIATIMETYPE",
-   "referenced_type" : "type-2323",
-   "self_type" : "type-2323",
+   "referenced_type" : "type-2326",
+   "self_type" : "type-2326",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_MEDIATIMETYPE"
@@ -52424,13 +52522,13 @@
     {
      "field_name" : "eSupplier",
      "field_offset" : 32,
-     "referenced_type" : "type-1601"
+     "referenced_type" : "type-1599"
     }
    ],
    "linker_set_key" : "OMX_TUNNELSETUPTYPE",
    "name" : "OMX_TUNNELSETUPTYPE",
-   "referenced_type" : "type-1612",
-   "self_type" : "type-1612",
+   "referenced_type" : "type-1613",
+   "self_type" : "type-1613",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_TUNNELSETUPTYPE"
@@ -52441,7 +52539,7 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-1479"
+     "referenced_type" : "type-1482"
     },
     {
      "field_name" : "nVersion",
@@ -52451,8 +52549,8 @@
    "linker_set_key" : "OMX_VERSIONTYPE",
    "name" : "OMX_VERSIONTYPE",
    "record_kind" : "union",
-   "referenced_type" : "type-1478",
-   "self_type" : "type-1478",
+   "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"
@@ -52484,8 +52582,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "OMX_VERSIONTYPE::(anonymous struct at frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h:376:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h:376:5",
    "name" : "OMX_VERSIONTYPE::(anonymous struct at frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h:376:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h:376:5",
-   "referenced_type" : "type-1479",
-   "self_type" : "type-1479",
+   "referenced_type" : "type-1482",
+   "self_type" : "type-1482",
    "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)"
@@ -52501,7 +52599,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -52521,8 +52619,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
    "name" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
-   "referenced_type" : "type-2295",
-   "self_type" : "type-2295",
+   "referenced_type" : "type-2298",
+   "self_type" : "type-2298",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD"
@@ -52538,7 +52636,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -52553,8 +52651,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_BITRATETYPE",
    "name" : "OMX_VIDEO_CONFIG_BITRATETYPE",
-   "referenced_type" : "type-2285",
-   "self_type" : "type-2285",
+   "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_VIDEO_CONFIG_BITRATETYPE"
@@ -52570,7 +52668,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -52585,8 +52683,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_NALSIZE",
    "name" : "OMX_VIDEO_CONFIG_NALSIZE",
-   "referenced_type" : "type-2296",
-   "self_type" : "type-2296",
+   "referenced_type" : "type-2299",
+   "self_type" : "type-2299",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_NALSIZE"
@@ -52602,7 +52700,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -52622,13 +52720,13 @@
     {
      "field_name" : "eSliceMode",
      "field_offset" : 128,
-     "referenced_type" : "type-2293"
+     "referenced_type" : "type-2296"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
    "name" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
-   "referenced_type" : "type-2294",
-   "self_type" : "type-2294",
+   "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_PARAM_AVCSLICEFMO"
@@ -52644,7 +52742,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -52669,7 +52767,7 @@
     {
      "field_name" : "bUseHadamard",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nRefFrames",
@@ -52689,32 +52787,32 @@
     {
      "field_name" : "bEnableUEP",
      "field_offset" : 320,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bEnableFMO",
      "field_offset" : 352,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bEnableASO",
      "field_offset" : 384,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bEnableRS",
      "field_offset" : 416,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 448,
-     "referenced_type" : "type-2279"
+     "referenced_type" : "type-2282"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 480,
-     "referenced_type" : "type-2280"
+     "referenced_type" : "type-2283"
     },
     {
      "field_name" : "nAllowedPictureTypes",
@@ -52724,22 +52822,22 @@
     {
      "field_name" : "bFrameMBsOnly",
      "field_offset" : 544,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bMBAFF",
      "field_offset" : 576,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bEntropyCodingCABAC",
      "field_offset" : 608,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bWeightedPPrediction",
      "field_offset" : 640,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nWeightedBipredicitonMode",
@@ -52749,17 +52847,17 @@
     {
      "field_name" : "bconstIpred",
      "field_offset" : 704,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bDirect8x8Inference",
      "field_offset" : 736,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bDirectSpatialTemporal",
      "field_offset" : 768,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nCabacInitIdc",
@@ -52769,13 +52867,13 @@
     {
      "field_name" : "eLoopFilterMode",
      "field_offset" : 832,
-     "referenced_type" : "type-2282"
+     "referenced_type" : "type-2285"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_AVCTYPE",
    "name" : "OMX_VIDEO_PARAM_AVCTYPE",
-   "referenced_type" : "type-2283",
-   "self_type" : "type-2283",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2286",
    "size" : 108,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_AVCTYPE"
@@ -52791,7 +52889,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -52801,17 +52899,17 @@
     {
      "field_name" : "eControlRate",
      "field_offset" : 96,
-     "referenced_type" : "type-2253"
+     "referenced_type" : "type-2256"
     },
     {
      "field_offset" : 128,
-     "referenced_type" : "type-2255"
+     "referenced_type" : "type-2258"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_BITRATETYPE",
    "name" : "OMX_VIDEO_PARAM_BITRATETYPE",
-   "referenced_type" : "type-2254",
-   "self_type" : "type-2254",
+   "referenced_type" : "type-2257",
+   "self_type" : "type-2257",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_BITRATETYPE"
@@ -52833,8 +52931,8 @@
    "linker_set_key" : "OMX_VIDEO_PARAM_BITRATETYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5",
    "name" : "OMX_VIDEO_PARAM_BITRATETYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5",
    "record_kind" : "union",
-   "referenced_type" : "type-2255",
-   "self_type" : "type-2255",
+   "referenced_type" : "type-2258",
+   "self_type" : "type-2258",
    "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)"
@@ -52850,7 +52948,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -52860,12 +52958,12 @@
     {
      "field_name" : "bEnableHEC",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bEnableResync",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nResynchMarkerSpacing",
@@ -52875,18 +52973,18 @@
     {
      "field_name" : "bEnableDataPartitioning",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bEnableRVLC",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE",
    "name" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE",
-   "referenced_type" : "type-2261",
-   "self_type" : "type-2261",
+   "referenced_type" : "type-2264",
+   "self_type" : "type-2264",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE"
@@ -52902,7 +53000,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -52922,17 +53020,17 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 160,
-     "referenced_type" : "type-2263"
+     "referenced_type" : "type-2266"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 192,
-     "referenced_type" : "type-2264"
+     "referenced_type" : "type-2267"
     },
     {
      "field_name" : "bPLUSPTYPEAllowed",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nAllowedPictureTypes",
@@ -52942,7 +53040,7 @@
     {
      "field_name" : "bForceRoundingTypeToZero",
      "field_offset" : 288,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nPictureHeaderRepetition",
@@ -52957,8 +53055,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_H263TYPE",
    "name" : "OMX_VIDEO_PARAM_H263TYPE",
-   "referenced_type" : "type-2267",
-   "self_type" : "type-2267",
+   "referenced_type" : "type-2270",
+   "self_type" : "type-2270",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_H263TYPE"
@@ -52974,7 +53072,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -52984,7 +53082,7 @@
     {
      "field_name" : "eRefreshMode",
      "field_offset" : 96,
-     "referenced_type" : "type-2259"
+     "referenced_type" : "type-2262"
     },
     {
      "field_name" : "nAirMBs",
@@ -53004,8 +53102,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
    "name" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
-   "referenced_type" : "type-2260",
-   "self_type" : "type-2260",
+   "referenced_type" : "type-2263",
+   "self_type" : "type-2263",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE"
@@ -53021,7 +53119,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -53031,17 +53129,17 @@
     {
      "field_name" : "eAccuracy",
      "field_offset" : 96,
-     "referenced_type" : "type-2257"
+     "referenced_type" : "type-2260"
     },
     {
      "field_name" : "bUnrestrictedMVs",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bFourMV",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "sXSearchRange",
@@ -53056,8 +53154,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
    "name" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
-   "referenced_type" : "type-2258",
-   "self_type" : "type-2258",
+   "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_MOTIONVECTORTYPE"
@@ -53073,7 +53171,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -53093,18 +53191,18 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 160,
-     "referenced_type" : "type-2268"
+     "referenced_type" : "type-2271"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 192,
-     "referenced_type" : "type-2269"
+     "referenced_type" : "type-2272"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MPEG2TYPE",
    "name" : "OMX_VIDEO_PARAM_MPEG2TYPE",
-   "referenced_type" : "type-2270",
-   "self_type" : "type-2270",
+   "referenced_type" : "type-2273",
+   "self_type" : "type-2273",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MPEG2TYPE"
@@ -53120,7 +53218,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -53135,12 +53233,12 @@
     {
      "field_name" : "bSVH",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bGov",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nPFrames",
@@ -53160,7 +53258,7 @@
     {
      "field_name" : "bACPred",
      "field_offset" : 288,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nMaxPacketSize",
@@ -53175,12 +53273,12 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 384,
-     "referenced_type" : "type-2271"
+     "referenced_type" : "type-2274"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 416,
-     "referenced_type" : "type-2272"
+     "referenced_type" : "type-2275"
     },
     {
      "field_name" : "nAllowedPictureTypes",
@@ -53195,13 +53293,13 @@
     {
      "field_name" : "bReversibleVLC",
      "field_offset" : 512,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MPEG4TYPE",
    "name" : "OMX_VIDEO_PARAM_MPEG4TYPE",
-   "referenced_type" : "type-2273",
-   "self_type" : "type-2273",
+   "referenced_type" : "type-2276",
+   "self_type" : "type-2276",
    "size" : 68,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MPEG4TYPE"
@@ -53217,7 +53315,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -53232,12 +53330,12 @@
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-2248"
+     "referenced_type" : "type-2251"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-2199"
+     "referenced_type" : "type-2202"
     },
     {
      "field_name" : "xFramerate",
@@ -53247,8 +53345,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
    "name" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-2250",
-   "self_type" : "type-2250",
+   "referenced_type" : "type-2253",
+   "self_type" : "type-2253",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_PORTFORMATTYPE"
@@ -53264,7 +53362,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -53289,8 +53387,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
    "name" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
-   "referenced_type" : "type-2284",
-   "self_type" : "type-2284",
+   "referenced_type" : "type-2287",
+   "self_type" : "type-2287",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE"
@@ -53306,7 +53404,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -53331,8 +53429,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
    "name" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
-   "referenced_type" : "type-2251",
-   "self_type" : "type-2251",
+   "referenced_type" : "type-2254",
+   "self_type" : "type-2254",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE"
@@ -53348,7 +53446,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -53358,7 +53456,7 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 96,
-     "referenced_type" : "type-2276"
+     "referenced_type" : "type-2279"
     },
     {
      "field_name" : "nBitsPerPixel",
@@ -53398,23 +53496,23 @@
     {
      "field_name" : "bEnablePostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bEnableTemporalInterpolation",
      "field_offset" : 352,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bEnableLatencyMode",
      "field_offset" : 384,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_RVTYPE",
    "name" : "OMX_VIDEO_PARAM_RVTYPE",
-   "referenced_type" : "type-2278",
-   "self_type" : "type-2278",
+   "referenced_type" : "type-2281",
+   "self_type" : "type-2281",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_RVTYPE"
@@ -53430,7 +53528,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -53440,43 +53538,43 @@
     {
      "field_name" : "b16x16",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "b16x8",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "b8x16",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "b8x8",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "b8x4",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "b4x8",
      "field_offset" : 256,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "b4x4",
      "field_offset" : 288,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VBSMCTYPE",
    "name" : "OMX_VIDEO_PARAM_VBSMCTYPE",
-   "referenced_type" : "type-2262",
-   "self_type" : "type-2262",
+   "referenced_type" : "type-2265",
+   "self_type" : "type-2265",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_VBSMCTYPE"
@@ -53492,7 +53590,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -53502,7 +53600,7 @@
     {
      "field_name" : "bEnableVFU",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nFirstGOB",
@@ -53522,8 +53620,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
    "name" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
-   "referenced_type" : "type-2252",
-   "self_type" : "type-2252",
+   "referenced_type" : "type-2255",
+   "self_type" : "type-2255",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE"
@@ -53539,7 +53637,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -53549,13 +53647,13 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 96,
-     "referenced_type" : "type-2274"
+     "referenced_type" : "type-2277"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_WMVTYPE",
    "name" : "OMX_VIDEO_PARAM_WMVTYPE",
-   "referenced_type" : "type-2275",
-   "self_type" : "type-2275",
+   "referenced_type" : "type-2278",
+   "self_type" : "type-2278",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_WMVTYPE"
@@ -53606,17 +53704,17 @@
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 256,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 288,
-     "referenced_type" : "type-2248"
+     "referenced_type" : "type-2251"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 320,
-     "referenced_type" : "type-2199"
+     "referenced_type" : "type-2202"
     },
     {
      "field_name" : "pNativeWindow",
@@ -53626,8 +53724,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PORTDEFINITIONTYPE",
    "name" : "OMX_VIDEO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-2249",
-   "self_type" : "type-2249",
+   "referenced_type" : "type-2252",
+   "self_type" : "type-2252",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PORTDEFINITIONTYPE"
@@ -53637,7 +53735,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1166"
+     "referenced_type" : "type-1167"
     }
    ],
    "fields" :
@@ -53646,20 +53744,20 @@
      "access" : "private",
      "field_name" : "d_",
      "field_offset" : 32,
-     "referenced_type" : "type-1194"
+     "referenced_type" : "type-1198"
     },
     {
      "access" : "private",
      "field_name" : "s_",
      "field_offset" : 64,
-     "referenced_type" : "type-1195"
+     "referenced_type" : "type-1199"
     }
    ],
    "linker_set_key" : "Renamer",
    "name" : "Renamer",
    "record_kind" : "class",
-   "referenced_type" : "type-1193",
-   "self_type" : "type-1193",
+   "referenced_type" : "type-1197",
+   "self_type" : "type-1197",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSZN7android14ReferenceMover15move_referencesINS_13GraphicBufferEEEvPNS_2spIT_EEPKS5_jE7Renamer",
@@ -53689,8 +53787,8 @@
    "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-1039",
-   "self_type" : "type-1039",
+   "referenced_type" : "type-1042",
+   "self_type" : "type-1042",
    "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"
@@ -53699,8 +53797,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::ADebug",
    "name" : "android::ADebug",
-   "referenced_type" : "type-2281",
-   "self_type" : "type-2281",
+   "referenced_type" : "type-2284",
+   "self_type" : "type-2284",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
    "unique_id" : "_ZTSN7android6ADebugE"
@@ -54199,8 +54297,8 @@
    ],
    "linker_set_key" : "android::AReplyToken",
    "name" : "android::AReplyToken",
-   "referenced_type" : "type-1044",
-   "self_type" : "type-1044",
+   "referenced_type" : "type-1043",
+   "self_type" : "type-1043",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android11AReplyTokenE",
@@ -55169,6 +55267,10 @@
      "mangled_component_name" : "_ZN7android16ProducerListener18needsReleaseNotifyEv"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ProducerListener18onBuffersDiscardedERKNSt3__16vectorIiNS1_9allocatorIiEEEE"
+    },
+    {
      "mangled_component_name" : "_ZNK7android17IProducerListener13getHalVariantEv"
     },
     {
@@ -55319,7 +55421,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1096"
+     "referenced_type" : "type-1099"
     },
     {
      "referenced_type" : "type-67"
@@ -55328,11 +55430,11 @@
    "linker_set_key" : "android::BnInterface<android::ISurfaceComposer>",
    "name" : "android::BnInterface<android::ISurfaceComposer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1095",
-   "self_type" : "type-1095",
+   "referenced_type" : "type-1098",
+   "self_type" : "type-1098",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-1097" ],
+   "template_args" : [ "type-1100" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_16ISurfaceComposerEEE",
    "vtable_components" :
    [
@@ -55367,7 +55469,7 @@
     },
     {
      "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ISurfaceComposer28createDisplayEventConnectionENS0_11VsyncSourceE"
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer28createDisplayEventConnectionENS0_11VsyncSourceENS0_13ConfigChangedE"
     },
     {
      "is_pure" : true,
@@ -55446,6 +55548,10 @@
     },
     {
      "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer13captureScreenEyPNS_8hardware8graphics6common4V1_29DataspaceEPNS_2spINS_13GraphicBufferEEE"
+    },
+    {
+     "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"
     },
     {
@@ -55525,6 +55631,10 @@
      "mangled_component_name" : "_ZNK7android16ISurfaceComposer20setDisplayBrightnessERKNS_2spINS_7IBinderEEEf"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer15notifyPowerHintEi"
+    },
+    {
      "mangled_component_name" : "_ZN7android11BnInterfaceINS_16ISurfaceComposerEE19queryLocalInterfaceERKNS_8String16E"
     },
     {
@@ -55643,7 +55753,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1032"
+     "referenced_type" : "type-1035"
     },
     {
      "referenced_type" : "type-67"
@@ -55652,11 +55762,11 @@
    "linker_set_key" : "android::BnInterface<android::ITransactionCompletedListener>",
    "name" : "android::BnInterface<android::ITransactionCompletedListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1031",
-   "self_type" : "type-1031",
+   "referenced_type" : "type-1034",
+   "self_type" : "type-1034",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-1033" ],
+   "template_args" : [ "type-1036" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_29ITransactionCompletedListenerEEE",
    "vtable_components" :
    [
@@ -55808,7 +55918,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1496"
+     "referenced_type" : "type-1502"
     },
     {
      "referenced_type" : "type-48"
@@ -55817,11 +55927,11 @@
    "linker_set_key" : "android::BpInterface<android::IConsumerListener>",
    "name" : "android::BpInterface<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1495",
-   "self_type" : "type-1495",
+   "referenced_type" : "type-1501",
+   "self_type" : "type-1501",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-1497" ],
+   "template_args" : [ "type-1503" ],
    "unique_id" : "_ZTSN7android11BpInterfaceINS_17IConsumerListenerEEE",
    "vtable_components" :
    [
@@ -55977,7 +56087,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1625"
+     "referenced_type" : "type-1630"
     },
     {
      "referenced_type" : "type-48"
@@ -55986,11 +56096,11 @@
    "linker_set_key" : "android::BpInterface<android::IGraphicBufferConsumer>",
    "name" : "android::BpInterface<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1624",
-   "self_type" : "type-1624",
+   "referenced_type" : "type-1629",
+   "self_type" : "type-1629",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-1626" ],
+   "template_args" : [ "type-1631" ],
    "unique_id" : "_ZTSN7android11BpInterfaceINS_22IGraphicBufferConsumerEEE",
    "vtable_components" :
    [
@@ -56182,7 +56292,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-4318"
+     "referenced_type" : "type-4324"
     },
     {
      "referenced_type" : "type-48"
@@ -56191,11 +56301,11 @@
    "linker_set_key" : "android::BpInterface<android::IGraphicBufferProducer>",
    "name" : "android::BpInterface<android::IGraphicBufferProducer>",
    "record_kind" : "class",
-   "referenced_type" : "type-4317",
-   "self_type" : "type-4317",
+   "referenced_type" : "type-4323",
+   "self_type" : "type-4323",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-4319" ],
+   "template_args" : [ "type-4325" ],
    "unique_id" : "_ZTSN7android11BpInterfaceINS_22IGraphicBufferProducerEEE",
    "vtable_components" :
    [
@@ -56411,7 +56521,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-4480"
+     "referenced_type" : "type-4486"
     },
     {
      "referenced_type" : "type-48"
@@ -56420,11 +56530,11 @@
    "linker_set_key" : "android::BpInterface<android::IProducerListener>",
    "name" : "android::BpInterface<android::IProducerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-4479",
-   "self_type" : "type-4479",
+   "referenced_type" : "type-4485",
+   "self_type" : "type-4485",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-4481" ],
+   "template_args" : [ "type-4487" ],
    "unique_id" : "_ZTSN7android11BpInterfaceINS_17IProducerListenerEEE",
    "vtable_components" :
    [
@@ -56456,6 +56566,10 @@
      "mangled_component_name" : "_ZN7android16ProducerListener18needsReleaseNotifyEv"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ProducerListener18onBuffersDiscardedERKNSt3__16vectorIiNS1_9allocatorIiEEEE"
+    },
+    {
      "mangled_component_name" : "_ZNK7android17IProducerListener13getHalVariantEv"
     },
     {
@@ -56688,28 +56802,28 @@
    [
     {
      "field_name" : "mRange",
-     "referenced_type" : "type-2429"
+     "referenced_type" : "type-2432"
     },
     {
      "field_name" : "mPrimaries",
      "field_offset" : 32,
-     "referenced_type" : "type-2430"
+     "referenced_type" : "type-2433"
     },
     {
      "field_name" : "mTransfer",
      "field_offset" : 64,
-     "referenced_type" : "type-2431"
+     "referenced_type" : "type-2434"
     },
     {
      "field_name" : "mMatrixCoeffs",
      "field_offset" : 96,
-     "referenced_type" : "type-2432"
+     "referenced_type" : "type-2435"
     }
    ],
    "linker_set_key" : "android::ColorAspects",
    "name" : "android::ColorAspects",
-   "referenced_type" : "type-2428",
-   "self_type" : "type-2428",
+   "referenced_type" : "type-2431",
+   "self_type" : "type-2431",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android12ColorAspectsE"
@@ -56718,8 +56832,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::ColorUtils",
    "name" : "android::ColorUtils",
-   "referenced_type" : "type-1181",
-   "self_type" : "type-1181",
+   "referenced_type" : "type-1180",
+   "self_type" : "type-1180",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
    "unique_id" : "_ZTSN7android10ColorUtilsE"
@@ -56728,8 +56842,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::CompileTimeAssert<true>",
    "name" : "android::CompileTimeAssert<true>",
-   "referenced_type" : "type-2690",
-   "self_type" : "type-2690",
+   "referenced_type" : "type-2693",
+   "self_type" : "type-2693",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Debug.h",
    "unique_id" : "_ZTSN7android17CompileTimeAssertILb1EEE"
@@ -56822,7 +56936,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -56832,7 +56946,7 @@
     {
      "field_name" : "bTunneled",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nAudioHwSync",
@@ -56847,8 +56961,8 @@
    ],
    "linker_set_key" : "android::ConfigureVideoTunnelModeParams",
    "name" : "android::ConfigureVideoTunnelModeParams",
-   "referenced_type" : "type-2426",
-   "self_type" : "type-2426",
+   "referenced_type" : "type-2429",
+   "self_type" : "type-2429",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android30ConfigureVideoTunnelModeParamsE"
@@ -56864,7 +56978,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -56874,12 +56988,12 @@
     {
      "field_name" : "bRequestingDataSpace",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bDataSpaceChanged",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nPixelFormat",
@@ -56894,13 +57008,13 @@
     {
      "field_name" : "sAspects",
      "field_offset" : 224,
-     "referenced_type" : "type-2428"
+     "referenced_type" : "type-2431"
     }
    ],
    "linker_set_key" : "android::DescribeColorAspectsParams",
    "name" : "android::DescribeColorAspectsParams",
-   "referenced_type" : "type-2427",
-   "self_type" : "type-2427",
+   "referenced_type" : "type-2430",
+   "self_type" : "type-2430",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26DescribeColorAspectsParamsE"
@@ -56916,12 +57030,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 64,
-     "referenced_type" : "type-2199"
+     "referenced_type" : "type-2202"
     },
     {
      "field_name" : "nFrameWidth",
@@ -56946,18 +57060,18 @@
     {
      "field_name" : "bUsingNativeBuffers",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "sMediaImage",
      "field_offset" : 256,
-     "referenced_type" : "type-2420"
+     "referenced_type" : "type-2423"
     }
    ],
    "linker_set_key" : "android::DescribeColorFormat2Params",
    "name" : "android::DescribeColorFormat2Params",
-   "referenced_type" : "type-2419",
-   "self_type" : "type-2419",
+   "referenced_type" : "type-2422",
+   "self_type" : "type-2422",
    "size" : 136,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26DescribeColorFormat2ParamsE"
@@ -56973,12 +57087,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 64,
-     "referenced_type" : "type-2199"
+     "referenced_type" : "type-2202"
     },
     {
      "field_name" : "nFrameWidth",
@@ -57003,18 +57117,18 @@
     {
      "field_name" : "bUsingNativeBuffers",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "sMediaImage",
      "field_offset" : 256,
-     "referenced_type" : "type-2415"
+     "referenced_type" : "type-2418"
     }
    ],
    "linker_set_key" : "android::DescribeColorFormatParams",
    "name" : "android::DescribeColorFormatParams",
-   "referenced_type" : "type-2414",
-   "self_type" : "type-2414",
+   "referenced_type" : "type-2417",
+   "self_type" : "type-2417",
    "size" : 112,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android25DescribeColorFormatParamsE"
@@ -57030,7 +57144,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -57050,13 +57164,13 @@
     {
      "field_name" : "nValue",
      "field_offset" : 160,
-     "referenced_type" : "type-1572"
+     "referenced_type" : "type-1567"
     }
    ],
    "linker_set_key" : "android::DescribeHDR10PlusInfoParams",
    "name" : "android::DescribeHDR10PlusInfoParams",
-   "referenced_type" : "type-2440",
-   "self_type" : "type-2440",
+   "referenced_type" : "type-2443",
+   "self_type" : "type-2443",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android27DescribeHDR10PlusInfoParamsE"
@@ -57072,7 +57186,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -57082,13 +57196,13 @@
     {
      "field_name" : "sInfo",
      "field_offset" : 96,
-     "referenced_type" : "type-2435"
+     "referenced_type" : "type-2438"
     }
    ],
    "linker_set_key" : "android::DescribeHDRStaticInfoParams",
    "name" : "android::DescribeHDRStaticInfoParams",
-   "referenced_type" : "type-2434",
-   "self_type" : "type-2434",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2437",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android27DescribeHDRStaticInfoParamsE"
@@ -57104,7 +57218,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -57114,13 +57228,13 @@
     {
      "field_name" : "enable",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "android::EnableAndroidNativeBuffersParams",
    "name" : "android::EnableAndroidNativeBuffersParams",
-   "referenced_type" : "type-2395",
-   "self_type" : "type-2395",
+   "referenced_type" : "type-2398",
+   "self_type" : "type-2398",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android32EnableAndroidNativeBuffersParamsE"
@@ -57132,13 +57246,13 @@
     {
      "access" : "private",
      "field_name" : "mSharedFd",
-     "referenced_type" : "type-1199"
+     "referenced_type" : "type-1202"
     }
    ],
    "linker_set_key" : "android::FileDescriptor",
    "name" : "android::FileDescriptor",
-   "referenced_type" : "type-1198",
-   "self_type" : "type-1198",
+   "referenced_type" : "type-1201",
+   "self_type" : "type-1201",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h",
    "unique_id" : "_ZTSN7android14FileDescriptorE"
@@ -57155,8 +57269,8 @@
    ],
    "linker_set_key" : "android::FileDescriptor::Autoclose",
    "name" : "android::FileDescriptor::Autoclose",
-   "referenced_type" : "type-1204",
-   "self_type" : "type-1204",
+   "referenced_type" : "type-1203",
+   "self_type" : "type-1203",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h",
    "unique_id" : "_ZTSN7android14FileDescriptor9AutocloseE"
@@ -57340,7 +57454,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -57355,8 +57469,8 @@
    ],
    "linker_set_key" : "android::GetAndroidNativeBufferUsageParams",
    "name" : "android::GetAndroidNativeBufferUsageParams",
-   "referenced_type" : "type-2412",
-   "self_type" : "type-2412",
+   "referenced_type" : "type-2415",
+   "self_type" : "type-2415",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android33GetAndroidNativeBufferUsageParamsE"
@@ -57702,17 +57816,17 @@
    [
     {
      "field_name" : "mID",
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2439"
     },
     {
      "field_offset" : 8,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2440"
     }
    ],
    "linker_set_key" : "android::HDRStaticInfo",
    "name" : "android::HDRStaticInfo",
-   "referenced_type" : "type-2435",
-   "self_type" : "type-2435",
+   "referenced_type" : "type-2438",
+   "self_type" : "type-2438",
    "size" : 25,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfoE"
@@ -57723,15 +57837,15 @@
    [
     {
      "field_name" : "sType1",
-     "referenced_type" : "type-2438"
+     "referenced_type" : "type-2441"
     }
    ],
    "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-2437",
-   "self_type" : "type-2437",
+   "referenced_type" : "type-2440",
+   "self_type" : "type-2440",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfoUt_E"
@@ -57752,8 +57866,8 @@
    ],
    "linker_set_key" : "android::HDRStaticInfo::Primaries1",
    "name" : "android::HDRStaticInfo::Primaries1",
-   "referenced_type" : "type-2439",
-   "self_type" : "type-2439",
+   "referenced_type" : "type-2442",
+   "self_type" : "type-2442",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfo10Primaries1E"
@@ -57764,22 +57878,22 @@
    [
     {
      "field_name" : "mR",
-     "referenced_type" : "type-2439"
+     "referenced_type" : "type-2442"
     },
     {
      "field_name" : "mG",
      "field_offset" : 32,
-     "referenced_type" : "type-2439"
+     "referenced_type" : "type-2442"
     },
     {
      "field_name" : "mB",
      "field_offset" : 64,
-     "referenced_type" : "type-2439"
+     "referenced_type" : "type-2442"
     },
     {
      "field_name" : "mW",
      "field_offset" : 96,
-     "referenced_type" : "type-2439"
+     "referenced_type" : "type-2442"
     },
     {
      "field_name" : "mMaxDisplayLuminance",
@@ -57804,8 +57918,8 @@
    ],
    "linker_set_key" : "android::HDRStaticInfo::Type1",
    "name" : "android::HDRStaticInfo::Type1",
-   "referenced_type" : "type-2438",
-   "self_type" : "type-2438",
+   "referenced_type" : "type-2441",
+   "self_type" : "type-2441",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfo5Type1E"
@@ -58129,31 +58243,31 @@
     {
      "access" : "private",
      "field_name" : "mProcess",
-     "referenced_type" : "type-1258"
+     "referenced_type" : "type-1261"
     },
     {
      "access" : "private",
      "field_name" : "mPendingStrongDerefs",
      "field_offset" : 32,
-     "referenced_type" : "type-1205"
+     "referenced_type" : "type-1208"
     },
     {
      "access" : "private",
      "field_name" : "mPendingWeakDerefs",
      "field_offset" : 192,
-     "referenced_type" : "type-1207"
+     "referenced_type" : "type-1210"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteStrongDerefs",
      "field_offset" : 352,
-     "referenced_type" : "type-1208"
+     "referenced_type" : "type-1213"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteWeakDerefs",
      "field_offset" : 512,
-     "referenced_type" : "type-1207"
+     "referenced_type" : "type-1210"
     },
     {
      "access" : "private",
@@ -58219,20 +58333,20 @@
      "access" : "private",
      "field_name" : "mIPCThreadStateBase",
      "field_offset" : 1888,
-     "referenced_type" : "type-1264"
+     "referenced_type" : "type-1267"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 1920,
-     "referenced_type" : "type-1255"
+     "referenced_type" : "type-1259"
     }
    ],
    "linker_set_key" : "android::IPCThreadState",
    "name" : "android::IPCThreadState",
    "record_kind" : "class",
-   "referenced_type" : "type-1257",
-   "self_type" : "type-1257",
+   "referenced_type" : "type-1260",
+   "self_type" : "type-1260",
    "size" : 244,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h",
    "unique_id" : "_ZTSN7android14IPCThreadStateE"
@@ -58244,17 +58358,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-1200"
+     "referenced_type" : "type-1204"
     }
    ],
    "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",
+   "referenced_type" : "type-1241",
+   "self_type" : "type-1241",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-1239", "type-795" ],
+   "template_args" : [ "type-1242", "type-795" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_7IBinderEEEEE"
   },
   {
@@ -58264,17 +58378,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-1354"
+     "referenced_type" : "type-1357"
     }
    ],
    "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",
+   "referenced_type" : "type-1369",
+   "self_type" : "type-1369",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-1239", "type-1367" ],
+   "template_args" : [ "type-1242", "type-1370" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
   },
   {
@@ -58342,11 +58456,11 @@
    "linker_set_key" : "android::LightFlattenable<android::FrameStats>",
    "name" : "android::LightFlattenable<android::FrameStats>",
    "record_kind" : "class",
-   "referenced_type" : "type-1098",
-   "self_type" : "type-1098",
+   "referenced_type" : "type-1101",
+   "self_type" : "type-1101",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1099" ],
+   "template_args" : [ "type-1102" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_10FrameStatsEEE"
   },
   {
@@ -58460,17 +58574,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-1210"
+     "referenced_type" : "type-1215"
     }
    ],
    "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",
+   "referenced_type" : "type-1214",
+   "self_type" : "type-1214",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-1211" ],
+   "template_args" : [ "type-1216" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_10GLConsumer8EglImageEEE"
   },
   {
@@ -58500,17 +58614,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-2353"
+     "referenced_type" : "type-2356"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
    "name" : "android::LightRefBase<android::VirtualLightRefBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-2352",
-   "self_type" : "type-2352",
+   "referenced_type" : "type-2355",
+   "self_type" : "type-2355",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-2354" ],
+   "template_args" : [ "type-2357" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
   },
   {
@@ -58921,7 +59035,7 @@
    [
     {
      "field_name" : "mType",
-     "referenced_type" : "type-2416"
+     "referenced_type" : "type-2419"
     },
     {
      "field_name" : "mNumPlanes",
@@ -58946,13 +59060,13 @@
     {
      "field_name" : "mPlane",
      "field_offset" : 160,
-     "referenced_type" : "type-2417"
+     "referenced_type" : "type-2420"
     }
    ],
    "linker_set_key" : "android::MediaImage",
    "name" : "android::MediaImage",
-   "referenced_type" : "type-2415",
-   "self_type" : "type-2415",
+   "referenced_type" : "type-2418",
+   "self_type" : "type-2418",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android10MediaImageE"
@@ -58963,7 +59077,7 @@
    [
     {
      "field_name" : "mType",
-     "referenced_type" : "type-2421"
+     "referenced_type" : "type-2424"
     },
     {
      "field_name" : "mNumPlanes",
@@ -58993,13 +59107,13 @@
     {
      "field_name" : "mPlane",
      "field_offset" : 192,
-     "referenced_type" : "type-2422"
+     "referenced_type" : "type-2425"
     }
    ],
    "linker_set_key" : "android::MediaImage2",
    "name" : "android::MediaImage2",
-   "referenced_type" : "type-2420",
-   "self_type" : "type-2420",
+   "referenced_type" : "type-2423",
+   "self_type" : "type-2423",
    "size" : 104,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android11MediaImage2E"
@@ -59035,8 +59149,8 @@
    ],
    "linker_set_key" : "android::MediaImage2::PlaneInfo",
    "name" : "android::MediaImage2::PlaneInfo",
-   "referenced_type" : "type-2423",
-   "self_type" : "type-2423",
+   "referenced_type" : "type-2426",
+   "self_type" : "type-2426",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android11MediaImage29PlaneInfoE"
@@ -59072,8 +59186,8 @@
    ],
    "linker_set_key" : "android::MediaImage::PlaneInfo",
    "name" : "android::MediaImage::PlaneInfo",
-   "referenced_type" : "type-2418",
-   "self_type" : "type-2418",
+   "referenced_type" : "type-2421",
+   "self_type" : "type-2421",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android10MediaImage9PlaneInfoE"
@@ -59152,8 +59266,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::OMXPluginBase",
    "name" : "android::OMXPluginBase",
-   "referenced_type" : "type-2393",
-   "self_type" : "type-2393",
+   "referenced_type" : "type-2396",
+   "self_type" : "type-2396",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h",
    "unique_id" : "_ZTSN7android13OMXPluginBaseE",
@@ -59365,17 +59479,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 32,
-     "referenced_type" : "type-1512"
+     "referenced_type" : "type-1516"
     }
    ],
    "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",
+   "referenced_type" : "type-1520",
+   "self_type" : "type-1520",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-1517" ],
+   "template_args" : [ "type-1521" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_10BufferItemEEE",
    "vtable_components" :
    [
@@ -59414,17 +59528,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 32,
-     "referenced_type" : "type-1647"
+     "referenced_type" : "type-1650"
     }
    ],
    "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",
+   "referenced_type" : "type-1662",
+   "self_type" : "type-1662",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-1659" ],
+   "template_args" : [ "type-1663" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_5FenceEEE",
    "vtable_components" :
    [
@@ -59463,17 +59577,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 32,
-     "referenced_type" : "type-4322"
+     "referenced_type" : "type-4328"
     }
    ],
    "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",
+   "referenced_type" : "type-4334",
+   "self_type" : "type-4334",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-4329" ],
+   "template_args" : [ "type-4335" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEEE",
    "vtable_components" :
    [
@@ -59512,17 +59626,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 32,
-     "referenced_type" : "type-1646"
+     "referenced_type" : "type-1649"
     }
    ],
    "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",
+   "referenced_type" : "type-1657",
+   "self_type" : "type-1657",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-1654" ],
+   "template_args" : [ "type-1658" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_13GraphicBufferEEE",
    "vtable_components" :
    [
@@ -59561,17 +59675,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 32,
-     "referenced_type" : "type-4321"
+     "referenced_type" : "type-4327"
     }
    ],
    "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",
+   "referenced_type" : "type-4339",
+   "self_type" : "type-4339",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-4334" ],
+   "template_args" : [ "type-4340" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEEE",
    "vtable_components" :
    [
@@ -59610,17 +59724,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 32,
-     "referenced_type" : "type-4323"
+     "referenced_type" : "type-4329"
     }
    ],
    "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",
+   "referenced_type" : "type-4345",
+   "self_type" : "type-4345",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-4339" ],
+   "template_args" : [ "type-4346" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEEE",
    "vtable_components" :
    [
@@ -59765,7 +59879,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -59775,7 +59889,7 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nMaxFrameWidth",
@@ -59790,8 +59904,8 @@
    ],
    "linker_set_key" : "android::PrepareForAdaptivePlaybackParams",
    "name" : "android::PrepareForAdaptivePlaybackParams",
-   "referenced_type" : "type-2406",
-   "self_type" : "type-2406",
+   "referenced_type" : "type-2409",
+   "self_type" : "type-2409",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android32PrepareForAdaptivePlaybackParamsE"
@@ -59807,18 +59921,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 64,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "android::PrependSPSPPSToIDRFramesParams",
    "name" : "android::PrependSPSPPSToIDRFramesParams",
-   "referenced_type" : "type-2413",
-   "self_type" : "type-2413",
+   "referenced_type" : "type-2416",
+   "self_type" : "type-2416",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android30PrependSPSPPSToIDRFramesParamsE"
@@ -59856,13 +59970,13 @@
      "access" : "private",
      "field_name" : "mThreadCountLock",
      "field_offset" : 128,
-     "referenced_type" : "type-1262"
+     "referenced_type" : "type-1265"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountDecrement",
      "field_offset" : 160,
-     "referenced_type" : "type-1263"
+     "referenced_type" : "type-1266"
     },
     {
      "access" : "private",
@@ -59892,7 +60006,7 @@
      "access" : "private",
      "field_name" : "mHandleToObject",
      "field_offset" : 352,
-     "referenced_type" : "type-1202"
+     "referenced_type" : "type-1206"
     },
     {
      "access" : "private",
@@ -59904,7 +60018,7 @@
      "access" : "private",
      "field_name" : "mBinderContextCheckFunc",
      "field_offset" : 544,
-     "referenced_type" : "type-1249"
+     "referenced_type" : "type-1252"
     },
     {
      "access" : "private",
@@ -59916,7 +60030,7 @@
      "access" : "private",
      "field_name" : "mContexts",
      "field_offset" : 608,
-     "referenced_type" : "type-1238"
+     "referenced_type" : "type-1241"
     },
     {
      "access" : "private",
@@ -59934,20 +60048,20 @@
      "access" : "private",
      "field_name" : "mThreadPoolSeq",
      "field_offset" : 832,
-     "referenced_type" : "type-1250"
+     "referenced_type" : "type-1253"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 864,
-     "referenced_type" : "type-1255"
+     "referenced_type" : "type-1259"
     }
    ],
    "linker_set_key" : "android::ProcessState",
    "name" : "android::ProcessState",
    "record_kind" : "class",
-   "referenced_type" : "type-1261",
-   "self_type" : "type-1261",
+   "referenced_type" : "type-1264",
+   "self_type" : "type-1264",
    "size" : 120,
    "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h",
    "unique_id" : "_ZTSN7android12ProcessStateE",
@@ -60035,8 +60149,8 @@
    ],
    "linker_set_key" : "android::ProcessState::handle_entry",
    "name" : "android::ProcessState::handle_entry",
-   "referenced_type" : "type-1203",
-   "self_type" : "type-1203",
+   "referenced_type" : "type-1207",
+   "self_type" : "type-1207",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h",
    "unique_id" : "_ZTSN7android12ProcessState12handle_entryE"
@@ -60164,8 +60278,8 @@
    "linker_set_key" : "android::ReferenceMover",
    "name" : "android::ReferenceMover",
    "record_kind" : "class",
-   "referenced_type" : "type-1589",
-   "self_type" : "type-1589",
+   "referenced_type" : "type-1592",
+   "self_type" : "type-1592",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android14ReferenceMoverE"
@@ -60175,8 +60289,8 @@
    "linker_set_key" : "android::ReferenceRenamer",
    "name" : "android::ReferenceRenamer",
    "record_kind" : "class",
-   "referenced_type" : "type-1166",
-   "self_type" : "type-1166",
+   "referenced_type" : "type-1167",
+   "self_type" : "type-1167",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android16ReferenceRenamerE",
@@ -60199,8 +60313,8 @@
    "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",
+   "referenced_type" : "type-1565",
+   "self_type" : "type-1565",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE16ElementIsPointerILj0EJRKNS_10BufferItemEEEE"
@@ -60212,14 +60326,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> >",
    "name" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> >",
    "record_kind" : "class",
-   "referenced_type" : "type-1563",
-   "self_type" : "type-1563",
+   "referenced_type" : "type-1568",
+   "self_type" : "type-1568",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE11InputReaderIJNSt3__15tupleIJEEEEEE"
@@ -60231,14 +60345,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-1572",
+   "self_type" : "type-1572",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE11InputReaderIJNSt3__15tupleIJRKNS_10BufferItemEEEEEEE"
@@ -60247,8 +60361,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::MethodCaller<tuple<> >",
    "name" : "android::SafeBnInterface<IConsumerListener>::MethodCaller<tuple<> >",
-   "referenced_type" : "type-1573",
-   "self_type" : "type-1573",
+   "referenced_type" : "type-1576",
+   "self_type" : "type-1576",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE12MethodCallerIJNSt3__15tupleIJEEEEEE"
@@ -60257,8 +60371,8 @@
    "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",
+   "referenced_type" : "type-1577",
+   "self_type" : "type-1577",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE12MethodCallerIJNSt3__15tupleIJRKNS_10BufferItemEEEEEEE"
@@ -60267,52 +60381,52 @@
    "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",
+   "referenced_type" : "type-1559",
+   "self_type" : "type-1559",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1556" ],
+   "template_args" : [ "type-1560" ],
    "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",
+   "referenced_type" : "type-1561",
+   "self_type" : "type-1561",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1558" ],
+   "template_args" : [ "type-1562" ],
    "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",
+   "referenced_type" : "type-1563",
+   "self_type" : "type-1563",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1560" ],
+   "template_args" : [ "type-1564" ],
    "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",
+   "referenced_type" : "type-1557",
+   "self_type" : "type-1557",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1554" ],
+   "template_args" : [ "type-1558" ],
    "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",
+   "referenced_type" : "type-2025",
+   "self_type" : "type-2025",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJPNS_10BufferItemExyEEE"
@@ -60321,8 +60435,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, android_dataspace_t>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, android_dataspace_t>",
-   "referenced_type" : "type-2037",
-   "self_type" : "type-2037",
+   "referenced_type" : "type-2041",
+   "self_type" : "type-2041",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJ19android_dataspace_tEEE"
@@ -60331,8 +60445,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, bool, vector<Segment, allocator<Segment> > *>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, bool, vector<Segment, allocator<Segment> > *>",
-   "referenced_type" : "type-2042",
-   "self_type" : "type-2042",
+   "referenced_type" : "type-2047",
+   "self_type" : "type-2047",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS7_EEEEEEE"
@@ -60341,8 +60455,8 @@
    "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",
+   "referenced_type" : "type-2043",
+   "self_type" : "type-2043",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJbEEE"
@@ -60351,8 +60465,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, const String8 &, String8 *>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, const String8 &, String8 *>",
-   "referenced_type" : "type-2045",
-   "self_type" : "type-2045",
+   "referenced_type" : "type-2049",
+   "self_type" : "type-2049",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJRKNS_7String8EPS4_EEE"
@@ -60361,8 +60475,8 @@
    "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",
+   "referenced_type" : "type-2040",
+   "self_type" : "type-2040",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJRKNS_7String8EEEE"
@@ -60371,8 +60485,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, const sp<IConsumerListener> &, bool>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, const sp<IConsumerListener> &, bool>",
-   "referenced_type" : "type-2030",
-   "self_type" : "type-2030",
+   "referenced_type" : "type-2034",
+   "self_type" : "type-2034",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJRKNS_2spINS_17IConsumerListenerEEEbEEE"
@@ -60381,8 +60495,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, int *, const sp<GraphicBuffer> &>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, int *, const sp<GraphicBuffer> &>",
-   "referenced_type" : "type-2025",
-   "self_type" : "type-2025",
+   "referenced_type" : "type-2029",
+   "self_type" : "type-2029",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJPiRKNS_2spINS_13GraphicBufferEEEEEE"
@@ -60391,8 +60505,8 @@
    "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",
+   "referenced_type" : "type-2031",
+   "self_type" : "type-2031",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJiyRKNS_2spINS_5FenceEEEEEE"
@@ -60401,8 +60515,8 @@
    "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",
+   "referenced_type" : "type-2028",
+   "self_type" : "type-2028",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJiEEE"
@@ -60411,8 +60525,8 @@
    "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",
+   "referenced_type" : "type-2045",
+   "self_type" : "type-2045",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJPNS_2spINS_12NativeHandleEEEEEE"
@@ -60421,8 +60535,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned int, unsigned int>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned int, unsigned int>",
-   "referenced_type" : "type-2034",
-   "self_type" : "type-2034",
+   "referenced_type" : "type-2038",
+   "self_type" : "type-2038",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJjjEEE"
@@ -60431,8 +60545,8 @@
    "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",
+   "referenced_type" : "type-2044",
+   "self_type" : "type-2044",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJjEEE"
@@ -60441,8 +60555,8 @@
    "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",
+   "referenced_type" : "type-2037",
+   "self_type" : "type-2037",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJPyEEE"
@@ -60451,8 +60565,8 @@
    "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",
+   "referenced_type" : "type-2042",
+   "self_type" : "type-2042",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJyEEE"
@@ -60461,8 +60575,8 @@
    "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",
+   "referenced_type" : "type-2026",
+   "self_type" : "type-2026",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJPNS_10BufferItemExyEEE"
@@ -60471,8 +60585,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, bool, vector<Segment, allocator<Segment> > *>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, bool, vector<Segment, allocator<Segment> > *>",
-   "referenced_type" : "type-2044",
-   "self_type" : "type-2044",
+   "referenced_type" : "type-2048",
+   "self_type" : "type-2048",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS7_EEEEEEE"
@@ -60481,8 +60595,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, const String8 &, String8 *>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, const String8 &, String8 *>",
-   "referenced_type" : "type-2046",
-   "self_type" : "type-2046",
+   "referenced_type" : "type-2050",
+   "self_type" : "type-2050",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJRKNS_7String8EPS4_EEE"
@@ -60491,8 +60605,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, const sp<IConsumerListener> &, bool>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, const sp<IConsumerListener> &, bool>",
-   "referenced_type" : "type-2031",
-   "self_type" : "type-2031",
+   "referenced_type" : "type-2036",
+   "self_type" : "type-2036",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJRKNS_2spINS_17IConsumerListenerEEEbEEE"
@@ -60501,8 +60615,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, int *, const sp<GraphicBuffer> &>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, int *, const sp<GraphicBuffer> &>",
-   "referenced_type" : "type-2026",
-   "self_type" : "type-2026",
+   "referenced_type" : "type-2030",
+   "self_type" : "type-2030",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJPiRKNS_2spINS_13GraphicBufferEEEEEE"
@@ -60511,8 +60625,8 @@
    "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",
+   "referenced_type" : "type-2032",
+   "self_type" : "type-2032",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJiyRKNS_2spINS_5FenceEEEEEE"
@@ -60521,8 +60635,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, unsigned int, unsigned int>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, unsigned int, unsigned int>",
-   "referenced_type" : "type-2035",
-   "self_type" : "type-2035",
+   "referenced_type" : "type-2039",
+   "self_type" : "type-2039",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJjjEEE"
@@ -60531,8 +60645,8 @@
    "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",
+   "referenced_type" : "type-2027",
+   "self_type" : "type-2027",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj2EJPNS_10BufferItemExyEEE"
@@ -60541,8 +60655,8 @@
    "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",
+   "referenced_type" : "type-2033",
+   "self_type" : "type-2033",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj2EJiyRKNS_2spINS_5FenceEEEEEE"
@@ -60554,14 +60668,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2073",
+   "self_type" : "type-2073",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJEEEEEE"
@@ -60573,14 +60687,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2051",
+   "self_type" : "type-2051",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPNS_10BufferItemExyEEEEEE"
@@ -60592,14 +60706,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2091",
+   "self_type" : "type-2091",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJ19android_dataspace_tEEEEEE"
@@ -60611,14 +60725,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2111",
+   "self_type" : "type-2111",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJbPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEEEE"
@@ -60630,14 +60744,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2097",
+   "self_type" : "type-2097",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJbEEEEEE"
@@ -60649,14 +60763,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2116",
+   "self_type" : "type-2116",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJRKNS_7String8EPS6_EEEEEE"
@@ -60668,14 +60782,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2086",
+   "self_type" : "type-2086",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJRKNS_7String8EEEEEEE"
@@ -60687,14 +60801,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2069",
+   "self_type" : "type-2069",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEEbEEEEEE"
@@ -60706,14 +60820,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2060",
+   "self_type" : "type-2060",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
@@ -60725,14 +60839,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2064",
+   "self_type" : "type-2064",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJiyRKNS_2spINS_5FenceEEEEEEEEE"
@@ -60744,14 +60858,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2055",
+   "self_type" : "type-2055",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJiEEEEEE"
@@ -60763,14 +60877,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2107",
+   "self_type" : "type-2107",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPNS_2spINS_12NativeHandleEEEEEEEEE"
@@ -60782,14 +60896,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2082",
+   "self_type" : "type-2082",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJjjEEEEEE"
@@ -60801,14 +60915,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2103",
+   "self_type" : "type-2103",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJjEEEEEE"
@@ -60820,14 +60934,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2077",
+   "self_type" : "type-2077",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPyEEEEEE"
@@ -60839,14 +60953,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2095",
+   "self_type" : "type-2095",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJyEEEEEE"
@@ -60855,8 +60969,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<> >",
-   "referenced_type" : "type-2122",
-   "self_type" : "type-2122",
+   "referenced_type" : "type-2126",
+   "self_type" : "type-2126",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJEEEEEE"
@@ -60865,8 +60979,8 @@
    "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",
+   "referenced_type" : "type-2120",
+   "self_type" : "type-2120",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPNS_10BufferItemExyEEEEEE"
@@ -60875,8 +60989,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<android_dataspace_t> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<android_dataspace_t> >",
-   "referenced_type" : "type-2126",
-   "self_type" : "type-2126",
+   "referenced_type" : "type-2130",
+   "self_type" : "type-2130",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJ19android_dataspace_tEEEEEE"
@@ -60885,8 +60999,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<bool, vector<Segment, allocator<Segment> > *> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<bool, vector<Segment, allocator<Segment> > *> >",
-   "referenced_type" : "type-2131",
-   "self_type" : "type-2131",
+   "referenced_type" : "type-2136",
+   "self_type" : "type-2136",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJbPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEEEE"
@@ -60895,8 +61009,8 @@
    "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",
+   "referenced_type" : "type-2132",
+   "self_type" : "type-2132",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJbEEEEEE"
@@ -60905,8 +61019,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<const String8 &, String8 *> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<const String8 &, String8 *> >",
-   "referenced_type" : "type-2133",
-   "self_type" : "type-2133",
+   "referenced_type" : "type-2137",
+   "self_type" : "type-2137",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJRKNS_7String8EPS6_EEEEEE"
@@ -60915,8 +61029,8 @@
    "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",
+   "referenced_type" : "type-2129",
+   "self_type" : "type-2129",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJRKNS_7String8EEEEEEE"
@@ -60925,8 +61039,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<const sp<IConsumerListener> &, bool> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<const sp<IConsumerListener> &, bool> >",
-   "referenced_type" : "type-2120",
-   "self_type" : "type-2120",
+   "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_2spINS_17IConsumerListenerEEEbEEEEEE"
@@ -60935,8 +61049,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<int *, const sp<GraphicBuffer> &> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<int *, const sp<GraphicBuffer> &> >",
-   "referenced_type" : "type-2118",
-   "self_type" : "type-2118",
+   "referenced_type" : "type-2122",
+   "self_type" : "type-2122",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
@@ -60945,8 +61059,8 @@
    "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",
+   "referenced_type" : "type-2123",
+   "self_type" : "type-2123",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJiyRKNS_2spINS_5FenceEEEEEEEEE"
@@ -60955,8 +61069,8 @@
    "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",
+   "referenced_type" : "type-2121",
+   "self_type" : "type-2121",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJiEEEEEE"
@@ -60965,8 +61079,8 @@
    "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",
+   "referenced_type" : "type-2134",
+   "self_type" : "type-2134",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPNS_2spINS_12NativeHandleEEEEEEEEE"
@@ -60975,8 +61089,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned int, unsigned int> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned int, unsigned int> >",
-   "referenced_type" : "type-2124",
-   "self_type" : "type-2124",
+   "referenced_type" : "type-2128",
+   "self_type" : "type-2128",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJjjEEEEEE"
@@ -60985,8 +61099,8 @@
    "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",
+   "referenced_type" : "type-2133",
+   "self_type" : "type-2133",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJjEEEEEE"
@@ -60995,8 +61109,8 @@
    "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",
+   "referenced_type" : "type-2127",
+   "self_type" : "type-2127",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPyEEEEEE"
@@ -61005,8 +61119,8 @@
    "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",
+   "referenced_type" : "type-2131",
+   "self_type" : "type-2131",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJyEEEEEE"
@@ -61018,13 +61132,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<> >",
-   "referenced_type" : "type-2145",
-   "self_type" : "type-2145",
+   "referenced_type" : "type-2149",
+   "self_type" : "type-2149",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJEEEEEE"
@@ -61036,13 +61150,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2138",
+   "self_type" : "type-2138",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPNS_10BufferItemExyEEEEEE"
@@ -61054,13 +61168,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2158",
+   "self_type" : "type-2158",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJ19android_dataspace_tEEEEEE"
@@ -61072,13 +61186,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2169",
+   "self_type" : "type-2169",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJbPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEEEE"
@@ -61090,13 +61204,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool> >",
-   "referenced_type" : "type-2158",
-   "self_type" : "type-2158",
+   "referenced_type" : "type-2162",
+   "self_type" : "type-2162",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJbEEEEEE"
@@ -61108,13 +61222,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2171",
+   "self_type" : "type-2171",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJRKNS_7String8EPS6_EEEEEE"
@@ -61126,13 +61240,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2155",
+   "self_type" : "type-2155",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJRKNS_7String8EEEEEEE"
@@ -61144,13 +61258,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2147",
+   "self_type" : "type-2147",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEEbEEEEEE"
@@ -61162,13 +61276,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2142",
+   "self_type" : "type-2142",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
@@ -61180,13 +61294,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2144",
+   "self_type" : "type-2144",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJiyRKNS_2spINS_5FenceEEEEEEEEE"
@@ -61198,13 +61312,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int> >",
-   "referenced_type" : "type-2136",
-   "self_type" : "type-2136",
+   "referenced_type" : "type-2140",
+   "self_type" : "type-2140",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJiEEEEEE"
@@ -61216,13 +61330,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2166",
+   "self_type" : "type-2166",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPNS_2spINS_12NativeHandleEEEEEEEEE"
@@ -61234,13 +61348,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2153",
+   "self_type" : "type-2153",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJjjEEEEEE"
@@ -61252,13 +61366,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2164",
+   "self_type" : "type-2164",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJjEEEEEE"
@@ -61270,13 +61384,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2151",
+   "self_type" : "type-2151",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPyEEEEEE"
@@ -61288,13 +61402,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2160",
+   "self_type" : "type-2160",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJyEEEEEE"
@@ -61303,660 +61417,660 @@
    "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",
+   "referenced_type" : "type-1974",
+   "self_type" : "type-1974",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1971" ],
+   "template_args" : [ "type-1975" ],
    "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",
+   "referenced_type" : "type-1939",
+   "self_type" : "type-1939",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1936" ],
+   "template_args" : [ "type-1940" ],
    "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",
+   "referenced_type" : "type-1992",
+   "self_type" : "type-1992",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1988" ],
+   "template_args" : [ "type-1993" ],
    "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",
+   "referenced_type" : "type-2011",
+   "self_type" : "type-2011",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2008" ],
+   "template_args" : [ "type-2012" ],
    "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",
+   "referenced_type" : "type-1998",
+   "self_type" : "type-1998",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1995" ],
+   "template_args" : [ "type-1999" ],
    "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",
+   "referenced_type" : "type-2018",
+   "self_type" : "type-2018",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2015" ],
+   "template_args" : [ "type-2019" ],
    "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",
+   "referenced_type" : "type-1987",
+   "self_type" : "type-1987",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1984" ],
+   "template_args" : [ "type-1988" ],
    "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",
+   "referenced_type" : "type-1967",
+   "self_type" : "type-1967",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1964" ],
+   "template_args" : [ "type-1968" ],
    "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",
+   "referenced_type" : "type-1952",
+   "self_type" : "type-1952",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1949" ],
+   "template_args" : [ "type-1953" ],
    "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",
+   "referenced_type" : "type-1959",
+   "self_type" : "type-1959",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1955" ],
+   "template_args" : [ "type-1960" ],
    "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",
+   "referenced_type" : "type-1948",
+   "self_type" : "type-1948",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1944" ],
+   "template_args" : [ "type-1949" ],
    "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",
+   "referenced_type" : "type-2007",
+   "self_type" : "type-2007",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2004" ],
+   "template_args" : [ "type-2008" ],
    "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",
+   "referenced_type" : "type-1981",
+   "self_type" : "type-1981",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1977" ],
+   "template_args" : [ "type-1982" ],
    "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",
+   "referenced_type" : "type-2003",
+   "self_type" : "type-2003",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1999" ],
+   "template_args" : [ "type-2004" ],
    "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",
+   "referenced_type" : "type-1976",
+   "self_type" : "type-1976",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1973" ],
+   "template_args" : [ "type-1977" ],
    "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",
+   "referenced_type" : "type-1996",
+   "self_type" : "type-1996",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1993" ],
+   "template_args" : [ "type-1997" ],
    "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",
+   "referenced_type" : "type-1945",
+   "self_type" : "type-1945",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1942" ],
+   "template_args" : [ "type-1946" ],
    "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",
+   "referenced_type" : "type-1943",
+   "self_type" : "type-1943",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1940" ],
+   "template_args" : [ "type-1944" ],
    "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",
+   "referenced_type" : "type-1941",
+   "self_type" : "type-1941",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1938" ],
+   "template_args" : [ "type-1942" ],
    "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",
+   "referenced_type" : "type-2022",
+   "self_type" : "type-2022",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2019" ],
+   "template_args" : [ "type-2023" ],
    "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",
+   "referenced_type" : "type-1989",
+   "self_type" : "type-1989",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1986" ],
+   "template_args" : [ "type-1990" ],
    "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",
+   "referenced_type" : "type-2020",
+   "self_type" : "type-2020",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2017" ],
+   "template_args" : [ "type-2021" ],
    "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",
+   "referenced_type" : "type-1994",
+   "self_type" : "type-1994",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1991" ],
+   "template_args" : [ "type-1995" ],
    "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",
+   "referenced_type" : "type-2016",
+   "self_type" : "type-2016",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2013" ],
+   "template_args" : [ "type-2017" ],
    "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",
+   "referenced_type" : "type-2000",
+   "self_type" : "type-2000",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1997" ],
+   "template_args" : [ "type-2001" ],
    "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",
+   "referenced_type" : "type-2014",
+   "self_type" : "type-2014",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2010" ],
+   "template_args" : [ "type-2015" ],
    "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",
+   "referenced_type" : "type-1956",
+   "self_type" : "type-1956",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1953" ],
+   "template_args" : [ "type-1957" ],
    "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",
+   "referenced_type" : "type-1965",
+   "self_type" : "type-1965",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1962" ],
+   "template_args" : [ "type-1966" ],
    "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",
+   "referenced_type" : "type-1963",
+   "self_type" : "type-1963",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1960" ],
+   "template_args" : [ "type-1964" ],
    "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",
+   "referenced_type" : "type-1950",
+   "self_type" : "type-1950",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1947" ],
+   "template_args" : [ "type-1951" ],
    "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",
+   "referenced_type" : "type-1954",
+   "self_type" : "type-1954",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1951" ],
+   "template_args" : [ "type-1955" ],
    "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",
+   "referenced_type" : "type-1961",
+   "self_type" : "type-1961",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1958" ],
+   "template_args" : [ "type-1962" ],
    "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",
+   "referenced_type" : "type-1970",
+   "self_type" : "type-1970",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1966" ],
+   "template_args" : [ "type-1971" ],
    "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",
+   "referenced_type" : "type-1972",
+   "self_type" : "type-1972",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1969" ],
+   "template_args" : [ "type-1973" ],
    "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",
+   "referenced_type" : "type-2009",
+   "self_type" : "type-2009",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2006" ],
+   "template_args" : [ "type-2010" ],
    "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",
+   "referenced_type" : "type-1985",
+   "self_type" : "type-1985",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1982" ],
+   "template_args" : [ "type-1986" ],
    "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",
+   "referenced_type" : "type-2005",
+   "self_type" : "type-2005",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2002" ],
+   "template_args" : [ "type-2006" ],
    "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",
+   "referenced_type" : "type-1983",
+   "self_type" : "type-1983",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1980" ],
+   "template_args" : [ "type-1984" ],
    "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",
+   "referenced_type" : "type-1978",
+   "self_type" : "type-1978",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1975" ],
+   "template_args" : [ "type-1979" ],
    "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",
+   "referenced_type" : "type-1893",
+   "self_type" : "type-1893",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1889" ],
+   "template_args" : [ "type-1894" ],
    "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",
+   "referenced_type" : "type-1937",
+   "self_type" : "type-1937",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1933" ],
+   "template_args" : [ "type-1938" ],
    "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",
+   "referenced_type" : "type-1926",
+   "self_type" : "type-1926",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1922" ],
+   "template_args" : [ "type-1927" ],
    "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",
+   "referenced_type" : "type-1930",
+   "self_type" : "type-1930",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1927" ],
+   "template_args" : [ "type-1931" ],
    "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",
+   "referenced_type" : "type-1915",
+   "self_type" : "type-1915",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1911" ],
+   "template_args" : [ "type-1916" ],
    "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",
+   "referenced_type" : "type-1934",
+   "self_type" : "type-1934",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1931" ],
+   "template_args" : [ "type-1935" ],
    "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",
+   "referenced_type" : "type-1923",
+   "self_type" : "type-1923",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1920" ],
+   "template_args" : [ "type-1924" ],
    "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",
+   "referenced_type" : "type-1910",
+   "self_type" : "type-1910",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1907" ],
+   "template_args" : [ "type-1911" ],
    "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",
+   "referenced_type" : "type-1904",
+   "self_type" : "type-1904",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1900" ],
+   "template_args" : [ "type-1905" ],
    "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",
+   "referenced_type" : "type-1912",
+   "self_type" : "type-1912",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1909" ],
+   "template_args" : [ "type-1913" ],
    "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",
+   "referenced_type" : "type-1901",
+   "self_type" : "type-1901",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1898" ],
+   "template_args" : [ "type-1902" ],
    "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",
+   "referenced_type" : "type-1906",
+   "self_type" : "type-1906",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1903" ],
+   "template_args" : [ "type-1907" ],
    "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",
+   "referenced_type" : "type-1899",
+   "self_type" : "type-1899",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1896" ],
+   "template_args" : [ "type-1900" ],
    "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",
+   "referenced_type" : "type-1895",
+   "self_type" : "type-1895",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1892" ],
+   "template_args" : [ "type-1896" ],
    "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",
+   "referenced_type" : "type-1928",
+   "self_type" : "type-1928",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1925" ],
+   "template_args" : [ "type-1929" ],
    "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",
+   "referenced_type" : "type-1919",
+   "self_type" : "type-1919",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1916" ],
+   "template_args" : [ "type-1920" ],
    "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",
+   "referenced_type" : "type-1921",
+   "self_type" : "type-1921",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1918" ],
+   "template_args" : [ "type-1922" ],
    "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",
+   "referenced_type" : "type-1917",
+   "self_type" : "type-1917",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1914" ],
+   "template_args" : [ "type-1918" ],
    "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",
+   "referenced_type" : "type-1908",
+   "self_type" : "type-1908",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1905" ],
+   "template_args" : [ "type-1909" ],
    "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",
+   "referenced_type" : "type-1897",
+   "self_type" : "type-1897",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1894" ],
+   "template_args" : [ "type-1898" ],
    "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",
+   "referenced_type" : "type-1932",
+   "self_type" : "type-1932",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1929" ],
+   "template_args" : [ "type-1933" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEJEEE"
   },
   {
@@ -61973,17 +62087,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 160,
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<android::IConsumerListener>",
    "name" : "android::SafeBnInterface<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1287",
-   "self_type" : "type-1287",
+   "referenced_type" : "type-1290",
+   "self_type" : "type-1290",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1288" ],
+   "template_args" : [ "type-1291" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEEE",
    "vtable_components" :
    [
@@ -62184,17 +62298,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 128,
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<android::IGraphicBufferConsumer>",
    "name" : "android::SafeBnInterface<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1276",
-   "self_type" : "type-1276",
+   "referenced_type" : "type-1279",
+   "self_type" : "type-1279",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1277" ],
+   "template_args" : [ "type-1280" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEEE",
    "vtable_components" :
    [
@@ -62422,7 +62536,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1031"
+     "referenced_type" : "type-1034"
     }
    ],
    "fields" :
@@ -62431,17 +62545,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 128,
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<android::ITransactionCompletedListener>",
    "name" : "android::SafeBnInterface<android::ITransactionCompletedListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1102",
-   "self_type" : "type-1102",
+   "referenced_type" : "type-1105",
+   "self_type" : "type-1105",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1104" ],
+   "template_args" : [ "type-1107" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEEE",
    "vtable_components" :
    [
@@ -62592,525 +62706,525 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IConsumerListener>::ArgsMatchParams<std::tuple<>, std::tuple<> >",
    "name" : "android::SafeBpInterface<IConsumerListener>::ArgsMatchParams<std::tuple<>, std::tuple<> >",
-   "referenced_type" : "type-1544",
-   "self_type" : "type-1544",
+   "referenced_type" : "type-1547",
+   "self_type" : "type-1547",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1545", "type-1546" ],
+   "template_args" : [ "type-1548", "type-1549" ],
    "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",
+   "referenced_type" : "type-1550",
+   "self_type" : "type-1550",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1548", "type-1549" ],
+   "template_args" : [ "type-1551", "type-1552" ],
    "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",
+   "referenced_type" : "type-1544",
+   "self_type" : "type-1544",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1542", "type-1543" ],
+   "template_args" : [ "type-1545", "type-1546" ],
    "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",
+   "referenced_type" : "type-1553",
+   "self_type" : "type-1553",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1532" ],
+   "template_args" : [ "type-1535" ],
    "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",
+   "referenced_type" : "type-1819",
+   "self_type" : "type-1819",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1816", "type-1817" ],
+   "template_args" : [ "type-1820", "type-1821" ],
    "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",
+   "referenced_type" : "type-1803",
+   "self_type" : "type-1803",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1800", "type-1801" ],
+   "template_args" : [ "type-1804", "type-1805" ],
    "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",
+   "referenced_type" : "type-1833",
+   "self_type" : "type-1833",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1829", "type-1830" ],
+   "template_args" : [ "type-1834", "type-1835" ],
    "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",
+   "referenced_type" : "type-1849",
+   "self_type" : "type-1849",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1846", "type-1847" ],
+   "template_args" : [ "type-1850", "type-1851" ],
    "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",
+   "referenced_type" : "type-1839",
+   "self_type" : "type-1839",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1836", "type-1837" ],
+   "template_args" : [ "type-1840", "type-1841" ],
    "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",
+   "referenced_type" : "type-1852",
+   "self_type" : "type-1852",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1849", "type-1850" ],
+   "template_args" : [ "type-1853", "type-1854" ],
    "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",
+   "referenced_type" : "type-1829",
+   "self_type" : "type-1829",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1826", "type-1827" ],
+   "template_args" : [ "type-1830", "type-1831" ],
    "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",
+   "referenced_type" : "type-1816",
+   "self_type" : "type-1816",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1813", "type-1814" ],
+   "template_args" : [ "type-1817", "type-1818" ],
    "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",
+   "referenced_type" : "type-1813",
+   "self_type" : "type-1813",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1810", "type-1811" ],
+   "template_args" : [ "type-1814", "type-1815" ],
    "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",
+   "referenced_type" : "type-1806",
+   "self_type" : "type-1806",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1803", "type-1804" ],
+   "template_args" : [ "type-1807", "type-1808" ],
    "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",
+   "referenced_type" : "type-1809",
+   "self_type" : "type-1809",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1806", "type-1807" ],
+   "template_args" : [ "type-1810", "type-1811" ],
    "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",
+   "referenced_type" : "type-1846",
+   "self_type" : "type-1846",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1843", "type-1844" ],
+   "template_args" : [ "type-1847", "type-1848" ],
    "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",
+   "referenced_type" : "type-1826",
+   "self_type" : "type-1826",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1823", "type-1824" ],
+   "template_args" : [ "type-1827", "type-1828" ],
    "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",
+   "referenced_type" : "type-1842",
+   "self_type" : "type-1842",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1839", "type-1840" ],
+   "template_args" : [ "type-1843", "type-1844" ],
    "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",
+   "referenced_type" : "type-1836",
+   "self_type" : "type-1836",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1833", "type-1834" ],
+   "template_args" : [ "type-1837", "type-1838" ],
    "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",
+   "referenced_type" : "type-1823",
+   "self_type" : "type-1823",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1820", "type-1821" ],
+   "template_args" : [ "type-1824", "type-1825" ],
    "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",
+   "referenced_type" : "type-1724",
+   "self_type" : "type-1724",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1721", "type-1722" ],
+   "template_args" : [ "type-1725", "type-1726" ],
    "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",
+   "referenced_type" : "type-1773",
+   "self_type" : "type-1773",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1770", "type-1771" ],
+   "template_args" : [ "type-1774", "type-1775" ],
    "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",
+   "referenced_type" : "type-1790",
+   "self_type" : "type-1790",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1787", "type-1788" ],
+   "template_args" : [ "type-1791", "type-1792" ],
    "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",
+   "referenced_type" : "type-1780",
+   "self_type" : "type-1780",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1777", "type-1778" ],
+   "template_args" : [ "type-1781", "type-1782" ],
    "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",
+   "referenced_type" : "type-1796",
+   "self_type" : "type-1796",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1793", "type-1794" ],
+   "template_args" : [ "type-1797", "type-1798" ],
    "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",
+   "referenced_type" : "type-1770",
+   "self_type" : "type-1770",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1767", "type-1768" ],
+   "template_args" : [ "type-1771", "type-1772" ],
    "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",
+   "referenced_type" : "type-1753",
+   "self_type" : "type-1753",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1750", "type-1751" ],
+   "template_args" : [ "type-1754", "type-1755" ],
    "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",
+   "referenced_type" : "type-1743",
+   "self_type" : "type-1743",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1740", "type-1741" ],
+   "template_args" : [ "type-1744", "type-1745" ],
    "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",
+   "referenced_type" : "type-1734",
+   "self_type" : "type-1734",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1730", "type-1731" ],
+   "template_args" : [ "type-1735", "type-1736" ],
    "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",
+   "referenced_type" : "type-1737",
+   "self_type" : "type-1737",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1734", "type-1735" ],
+   "template_args" : [ "type-1738", "type-1739" ],
    "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",
+   "referenced_type" : "type-1786",
+   "self_type" : "type-1786",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1783", "type-1784" ],
+   "template_args" : [ "type-1787", "type-1788" ],
    "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",
+   "referenced_type" : "type-1763",
+   "self_type" : "type-1763",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1760", "type-1761" ],
+   "template_args" : [ "type-1764", "type-1765" ],
    "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",
+   "referenced_type" : "type-1783",
+   "self_type" : "type-1783",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1780", "type-1781" ],
+   "template_args" : [ "type-1784", "type-1785" ],
    "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",
+   "referenced_type" : "type-1776",
+   "self_type" : "type-1776",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1773", "type-1774" ],
+   "template_args" : [ "type-1777", "type-1778" ],
    "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",
+   "referenced_type" : "type-1760",
+   "self_type" : "type-1760",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1757", "type-1758" ],
+   "template_args" : [ "type-1761", "type-1762" ],
    "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",
+   "referenced_type" : "type-1727",
+   "self_type" : "type-1727",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1724", "type-1725" ],
+   "template_args" : [ "type-1728", "type-1729" ],
    "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",
+   "referenced_type" : "type-1793",
+   "self_type" : "type-1793",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1790", "type-1791" ],
+   "template_args" : [ "type-1794", "type-1795" ],
    "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",
+   "referenced_type" : "type-1800",
+   "self_type" : "type-1800",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1796", "type-1797" ],
+   "template_args" : [ "type-1801", "type-1802" ],
    "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",
+   "referenced_type" : "type-1757",
+   "self_type" : "type-1757",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1754", "type-1755" ],
+   "template_args" : [ "type-1758", "type-1759" ],
    "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",
+   "referenced_type" : "type-1747",
+   "self_type" : "type-1747",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1744", "type-1745" ],
+   "template_args" : [ "type-1748", "type-1749" ],
    "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",
+   "referenced_type" : "type-1740",
+   "self_type" : "type-1740",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1737", "type-1738" ],
+   "template_args" : [ "type-1741", "type-1742" ],
    "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",
+   "referenced_type" : "type-1767",
+   "self_type" : "type-1767",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1763", "type-1764" ],
+   "template_args" : [ "type-1768", "type-1769" ],
    "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",
+   "referenced_type" : "type-1730",
+   "self_type" : "type-1730",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1727", "type-1728" ],
+   "template_args" : [ "type-1731", "type-1732" ],
    "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",
+   "referenced_type" : "type-1750",
+   "self_type" : "type-1750",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1747", "type-1748" ],
+   "template_args" : [ "type-1751", "type-1752" ],
    "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",
+   "referenced_type" : "type-1856",
+   "self_type" : "type-1856",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1853" ],
+   "template_args" : [ "type-1857" ],
    "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",
+   "referenced_type" : "type-1887",
+   "self_type" : "type-1887",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1884" ],
+   "template_args" : [ "type-1888" ],
    "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",
+   "referenced_type" : "type-1882",
+   "self_type" : "type-1882",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1879" ],
+   "template_args" : [ "type-1883" ],
    "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",
+   "referenced_type" : "type-1880",
+   "self_type" : "type-1880",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-767" ],
@@ -63120,8 +63234,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<bool &>",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<bool &>",
-   "referenced_type" : "type-1869",
-   "self_type" : "type-1869",
+   "referenced_type" : "type-1873",
+   "self_type" : "type-1873",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-766" ],
@@ -63131,41 +63245,41 @@
    "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",
+   "referenced_type" : "type-1877",
+   "self_type" : "type-1877",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1874" ],
+   "template_args" : [ "type-1878" ],
    "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",
+   "referenced_type" : "type-1865",
+   "self_type" : "type-1865",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1862" ],
+   "template_args" : [ "type-1866" ],
    "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",
+   "referenced_type" : "type-1863",
+   "self_type" : "type-1863",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1859" ],
+   "template_args" : [ "type-1864" ],
    "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",
+   "referenced_type" : "type-1872",
+   "self_type" : "type-1872",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-944" ],
@@ -63175,8 +63289,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int &>",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int &>",
-   "referenced_type" : "type-1856",
-   "self_type" : "type-1856",
+   "referenced_type" : "type-1860",
+   "self_type" : "type-1860",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-198" ],
@@ -63186,41 +63300,41 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int *&>",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int *&>",
-   "referenced_type" : "type-1857",
-   "self_type" : "type-1857",
+   "referenced_type" : "type-1861",
+   "self_type" : "type-1861",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1508" ],
+   "template_args" : [ "type-1511" ],
    "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",
+   "referenced_type" : "type-1858",
+   "self_type" : "type-1858",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1429" ],
+   "template_args" : [ "type-1432" ],
    "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",
+   "referenced_type" : "type-1885",
+   "self_type" : "type-1885",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1882" ],
+   "template_args" : [ "type-1886" ],
    "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",
+   "referenced_type" : "type-1876",
+   "self_type" : "type-1876",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-10" ],
@@ -63230,8 +63344,8 @@
    "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",
+   "referenced_type" : "type-1859",
+   "self_type" : "type-1859",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-544" ],
@@ -63241,11 +63355,11 @@
    "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",
+   "referenced_type" : "type-1874",
+   "self_type" : "type-1874",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1871" ],
+   "template_args" : [ "type-1875" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRPyEE"
   },
   {
@@ -63253,7 +63367,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1495"
+     "referenced_type" : "type-1501"
     }
    ],
    "fields" :
@@ -63262,17 +63376,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 192,
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeBpInterface<android::IConsumerListener>",
    "name" : "android::SafeBpInterface<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1537",
-   "self_type" : "type-1537",
+   "referenced_type" : "type-1541",
+   "self_type" : "type-1541",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1538" ],
+   "template_args" : [ "type-1542" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_17IConsumerListenerEEE",
    "vtable_components" :
    [
@@ -63428,7 +63542,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1624"
+     "referenced_type" : "type-1629"
     }
    ],
    "fields" :
@@ -63437,17 +63551,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 160,
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeBpInterface<android::IGraphicBufferConsumer>",
    "name" : "android::SafeBpInterface<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1716",
-   "self_type" : "type-1716",
+   "referenced_type" : "type-1720",
+   "self_type" : "type-1720",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1717" ],
+   "template_args" : [ "type-1721" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEEE",
    "vtable_components" :
    [
@@ -63638,198 +63752,198 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)()>",
    "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)()>",
-   "referenced_type" : "type-1692",
-   "self_type" : "type-1692",
+   "referenced_type" : "type-1696",
+   "self_type" : "type-1696",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1693" ],
+   "template_args" : [ "type-1697" ],
    "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",
+   "referenced_type" : "type-1685",
+   "self_type" : "type-1685",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1682" ],
+   "template_args" : [ "type-1686" ],
    "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",
+   "referenced_type" : "type-1705",
+   "self_type" : "type-1705",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1702" ],
+   "template_args" : [ "type-1706" ],
    "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",
+   "referenced_type" : "type-1709",
+   "self_type" : "type-1709",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1706" ],
+   "template_args" : [ "type-1710" ],
    "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",
+   "referenced_type" : "type-1716",
+   "self_type" : "type-1716",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1713" ],
+   "template_args" : [ "type-1717" ],
    "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",
+   "referenced_type" : "type-1703",
+   "self_type" : "type-1703",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1700" ],
+   "template_args" : [ "type-1704" ],
    "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",
+   "referenced_type" : "type-1718",
+   "self_type" : "type-1718",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1715" ],
+   "template_args" : [ "type-1719" ],
    "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",
+   "referenced_type" : "type-1694",
+   "self_type" : "type-1694",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1691" ],
+   "template_args" : [ "type-1695" ],
    "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",
+   "referenced_type" : "type-1690",
+   "self_type" : "type-1690",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1686" ],
+   "template_args" : [ "type-1691" ],
    "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",
+   "referenced_type" : "type-1687",
+   "self_type" : "type-1687",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1684" ],
+   "template_args" : [ "type-1688" ],
    "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",
+   "referenced_type" : "type-1692",
+   "self_type" : "type-1692",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1689" ],
+   "template_args" : [ "type-1693" ],
    "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",
+   "referenced_type" : "type-1714",
+   "self_type" : "type-1714",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1711" ],
+   "template_args" : [ "type-1715" ],
    "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",
+   "referenced_type" : "type-1712",
+   "self_type" : "type-1712",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1708" ],
+   "template_args" : [ "type-1713" ],
    "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",
+   "referenced_type" : "type-1701",
+   "self_type" : "type-1701",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1697" ],
+   "template_args" : [ "type-1702" ],
    "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",
+   "referenced_type" : "type-1698",
+   "self_type" : "type-1698",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1695" ],
+   "template_args" : [ "type-1699" ],
    "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",
+   "referenced_type" : "type-1707",
+   "self_type" : "type-1707",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1704" ],
+   "template_args" : [ "type-1708" ],
    "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",
+   "referenced_type" : "type-1537",
+   "self_type" : "type-1537",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1534" ],
+   "template_args" : [ "type-1538" ],
    "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",
+   "referenced_type" : "type-1539",
+   "self_type" : "type-1539",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1536" ],
+   "template_args" : [ "type-1540" ],
    "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_16ConsumerListenerEFvRKNS_10BufferItemEEEE"
   },
   {
@@ -63839,14 +63953,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeInterface::ParcelHandler",
    "name" : "android::SafeInterface::ParcelHandler",
    "record_kind" : "class",
-   "referenced_type" : "type-1235",
-   "self_type" : "type-1235",
+   "referenced_type" : "type-1238",
+   "self_type" : "type-1238",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android13SafeInterface13ParcelHandlerE"
@@ -63855,8 +63969,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParcelHandler::HandleInt<false, 4, unsigned int>",
    "name" : "android::SafeInterface::ParcelHandler::HandleInt<false, 4, unsigned int>",
-   "referenced_type" : "type-1679",
-   "self_type" : "type-1679",
+   "referenced_type" : "type-1683",
+   "self_type" : "type-1683",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-2" ],
@@ -63866,8 +63980,8 @@
    "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",
+   "referenced_type" : "type-1681",
+   "self_type" : "type-1681",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-92" ],
@@ -63877,8 +63991,8 @@
    "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",
+   "referenced_type" : "type-1682",
+   "self_type" : "type-1682",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-4" ],
@@ -63888,8 +64002,8 @@
    "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",
+   "referenced_type" : "type-1678",
+   "self_type" : "type-1678",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-169" ],
@@ -63919,11 +64033,11 @@
    "linker_set_key" : "android::Singleton<android::ComposerService>",
    "name" : "android::Singleton<android::ComposerService>",
    "record_kind" : "class",
-   "referenced_type" : "type-1089",
-   "self_type" : "type-1089",
+   "referenced_type" : "type-1092",
+   "self_type" : "type-1092",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-1090" ],
+   "template_args" : [ "type-1093" ],
    "unique_id" : "_ZTSN7android9SingletonINS_15ComposerServiceEEE"
   },
   {
@@ -63950,11 +64064,11 @@
    "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",
+   "referenced_type" : "type-1204",
+   "self_type" : "type-1204",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-1201" ],
+   "template_args" : [ "type-1205" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEEE",
    "vtable_components" :
    [
@@ -64008,11 +64122,11 @@
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
    "name" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-1354",
-   "self_type" : "type-1354",
+   "referenced_type" : "type-1357",
+   "self_type" : "type-1357",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-1355" ],
+   "template_args" : [ "type-1358" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
    "vtable_components" :
    [
@@ -64302,7 +64416,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -64312,13 +64426,13 @@
     {
      "field_name" : "bStoreMetaData",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "android::StoreMetaDataInBuffersParams",
    "name" : "android::StoreMetaDataInBuffersParams",
-   "referenced_type" : "type-2396",
-   "self_type" : "type-2396",
+   "referenced_type" : "type-2399",
+   "self_type" : "type-2399",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android28StoreMetaDataInBuffersParamsE"
@@ -64330,14 +64444,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-1240"
+     "referenced_type" : "type-1243"
     }
    ],
    "linker_set_key" : "android::String16",
    "name" : "android::String16",
    "record_kind" : "class",
-   "referenced_type" : "type-1239",
-   "self_type" : "type-1239",
+   "referenced_type" : "type-1242",
+   "self_type" : "type-1242",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "unique_id" : "_ZTSN7android8String16E"
@@ -64526,7 +64640,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -64541,18 +64655,18 @@
     {
      "field_name" : "bufferHeader",
      "field_offset" : 128,
-     "referenced_type" : "type-2376"
+     "referenced_type" : "type-2379"
     },
     {
      "field_name" : "nativeBuffer",
      "field_offset" : 160,
-     "referenced_type" : "type-2408"
+     "referenced_type" : "type-2411"
     }
    ],
    "linker_set_key" : "android::UseAndroidNativeBufferParams",
    "name" : "android::UseAndroidNativeBufferParams",
-   "referenced_type" : "type-2407",
-   "self_type" : "type-2407",
+   "referenced_type" : "type-2410",
+   "self_type" : "type-2410",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android28UseAndroidNativeBufferParamsE"
@@ -64569,11 +64683,11 @@
    "linker_set_key" : "android::Vector<android::BBinder *>",
    "name" : "android::Vector<android::BBinder *>",
    "record_kind" : "class",
-   "referenced_type" : "type-1205",
-   "self_type" : "type-1205",
+   "referenced_type" : "type-1208",
+   "self_type" : "type-1208",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-1206" ],
+   "template_args" : [ "type-1209" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7BBinderEEE",
    "vtable_components" :
    [
@@ -64679,11 +64793,11 @@
    "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",
+   "referenced_type" : "type-1206",
+   "self_type" : "type-1206",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-1203" ],
+   "template_args" : [ "type-1207" ],
    "unique_id" : "_ZTSN7android6VectorINS_12ProcessState12handle_entryEEE",
    "vtable_components" :
    [
@@ -64734,11 +64848,11 @@
    "linker_set_key" : "android::Vector<android::Rect>",
    "name" : "android::Vector<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-2677",
-   "self_type" : "type-2677",
+   "referenced_type" : "type-2680",
+   "self_type" : "type-2680",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-2678" ],
+   "template_args" : [ "type-2681" ],
    "unique_id" : "_ZTSN7android6VectorINS_4RectEEE",
    "vtable_components" :
    [
@@ -64789,8 +64903,8 @@
    "linker_set_key" : "android::Vector<android::RefBase *>",
    "name" : "android::Vector<android::RefBase *>",
    "record_kind" : "class",
-   "referenced_type" : "type-1208",
-   "self_type" : "type-1208",
+   "referenced_type" : "type-1213",
+   "self_type" : "type-1213",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-270" ],
@@ -64844,8 +64958,8 @@
    "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",
+   "referenced_type" : "type-1210",
+   "self_type" : "type-1210",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-56" ],
@@ -64899,11 +65013,11 @@
    "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",
+   "referenced_type" : "type-1363",
+   "self_type" : "type-1363",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-1361" ],
+   "template_args" : [ "type-1364" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_8hardware9BHwBinderEEE",
    "vtable_components" :
    [
@@ -64954,11 +65068,11 @@
    "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "record_kind" : "class",
-   "referenced_type" : "type-1356",
-   "self_type" : "type-1356",
+   "referenced_type" : "type-1359",
+   "self_type" : "type-1359",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-1357" ],
+   "template_args" : [ "type-1360" ],
    "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
    "vtable_components" :
    [
@@ -65009,8 +65123,8 @@
    "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",
+   "referenced_type" : "type-1228",
+   "self_type" : "type-1228",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-733" ],
@@ -65064,8 +65178,8 @@
    "linker_set_key" : "android::Vector<int>",
    "name" : "android::Vector<int>",
    "record_kind" : "class",
-   "referenced_type" : "type-2686",
-   "self_type" : "type-2686",
+   "referenced_type" : "type-2689",
+   "self_type" : "type-2689",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-4" ],
@@ -65119,8 +65233,8 @@
    "linker_set_key" : "android::Vector<long long>",
    "name" : "android::Vector<long long>",
    "record_kind" : "class",
-   "referenced_type" : "type-1081",
-   "self_type" : "type-1081",
+   "referenced_type" : "type-1084",
+   "self_type" : "type-1084",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-169" ],
@@ -65247,13 +65361,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2397"
+     "referenced_type" : "type-2400"
     }
    ],
    "linker_set_key" : "android::VideoDecoderOutputMetaData",
    "name" : "android::VideoDecoderOutputMetaData",
-   "referenced_type" : "type-2398",
-   "self_type" : "type-2398",
+   "referenced_type" : "type-2401",
+   "self_type" : "type-2401",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26VideoDecoderOutputMetaDataE"
@@ -65264,7 +65378,7 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-1234"
+     "referenced_type" : "type-1235"
     },
     {
      "field_name" : "pHandle",
@@ -65274,8 +65388,8 @@
    ],
    "linker_set_key" : "android::VideoGrallocMetadata",
    "name" : "android::VideoGrallocMetadata",
-   "referenced_type" : "type-2397",
-   "self_type" : "type-2397",
+   "referenced_type" : "type-2400",
+   "self_type" : "type-2400",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android20VideoGrallocMetadataE"
@@ -65286,7 +65400,7 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-1234"
+     "referenced_type" : "type-1235"
     },
     {
      "field_name" : "pHandle",
@@ -65296,8 +65410,8 @@
    ],
    "linker_set_key" : "android::VideoNativeHandleMetadata",
    "name" : "android::VideoNativeHandleMetadata",
-   "referenced_type" : "type-2405",
-   "self_type" : "type-2405",
+   "referenced_type" : "type-2408",
+   "self_type" : "type-2408",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android25VideoNativeHandleMetadataE"
@@ -65308,12 +65422,12 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-1234"
+     "referenced_type" : "type-1235"
     },
     {
      "field_name" : "pBuffer",
      "field_offset" : 32,
-     "referenced_type" : "type-2401"
+     "referenced_type" : "type-2404"
     },
     {
      "field_name" : "nFenceFd",
@@ -65323,8 +65437,8 @@
    ],
    "linker_set_key" : "android::VideoNativeMetadata",
    "name" : "android::VideoNativeMetadata",
-   "referenced_type" : "type-2400",
-   "self_type" : "type-2400",
+   "referenced_type" : "type-2403",
+   "self_type" : "type-2403",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android19VideoNativeMetadataE"
@@ -65334,14 +65448,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2352"
+     "referenced_type" : "type-2355"
     }
    ],
    "linker_set_key" : "android::VirtualLightRefBase",
    "name" : "android::VirtualLightRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-2354",
-   "self_type" : "type-2354",
+   "referenced_type" : "type-2357",
+   "self_type" : "type-2357",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
    "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
@@ -65388,30 +65502,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::aggregate_traits<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-2606",
-   "self_type" : "type-2606",
+   "referenced_type" : "type-2609",
+   "self_type" : "type-2609",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-4", "type-2607" ],
+   "template_args" : [ "type-4", "type-2610" ],
    "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-2603",
-   "self_type" : "type-2603",
+   "referenced_type" : "type-2606",
+   "self_type" : "type-2606",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-4", "type-2604" ],
+   "template_args" : [ "type-4", "type-2607" ],
    "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-2602",
-   "self_type" : "type-2602",
+   "referenced_type" : "type-2605",
+   "self_type" : "type-2605",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2", "type-2" ],
@@ -65470,13 +65584,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-980"
+     "referenced_type" : "type-977"
     }
    ],
    "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-979",
-   "self_type" : "type-979",
+   "referenced_type" : "type-976",
+   "self_type" : "type-976",
    "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"
@@ -65613,8 +65727,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::base::DefaultCloser",
    "name" : "android::base::DefaultCloser",
-   "referenced_type" : "type-2523",
-   "self_type" : "type-2523",
+   "referenced_type" : "type-2526",
+   "self_type" : "type-2526",
    "size" : 1,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "unique_id" : "_ZTSN7android4base13DefaultCloserE"
@@ -65635,8 +65749,8 @@
    ],
    "linker_set_key" : "android::base::EagerEvaluator<char *, char *>",
    "name" : "android::base::EagerEvaluator<char *, char *>",
-   "referenced_type" : "type-4699",
-   "self_type" : "type-4699",
+   "referenced_type" : "type-4705",
+   "self_type" : "type-4705",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-254", "type-254" ],
@@ -65658,8 +65772,8 @@
    ],
    "linker_set_key" : "android::base::EagerEvaluator<char *, const char *>",
    "name" : "android::base::EagerEvaluator<char *, const char *>",
-   "referenced_type" : "type-4695",
-   "self_type" : "type-4695",
+   "referenced_type" : "type-4702",
+   "self_type" : "type-4702",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-254", "type-122" ],
@@ -65681,8 +65795,8 @@
    ],
    "linker_set_key" : "android::base::EagerEvaluator<const char *, char *>",
    "name" : "android::base::EagerEvaluator<const char *, char *>",
-   "referenced_type" : "type-4681",
-   "self_type" : "type-4681",
+   "referenced_type" : "type-4689",
+   "self_type" : "type-4689",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-122", "type-254" ],
@@ -65704,8 +65818,8 @@
    ],
    "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",
+   "referenced_type" : "type-4672",
+   "self_type" : "type-4672",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-122", "type-122" ],
@@ -65727,11 +65841,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",
+   "referenced_type" : "type-4729",
+   "self_type" : "type-4729",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-4723", "type-4723" ],
+   "template_args" : [ "type-4730", "type-4730" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaS3_EE"
   },
   {
@@ -65750,11 +65864,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",
+   "referenced_type" : "type-4736",
+   "self_type" : "type-4736",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-4723", "type-4731" ],
+   "template_args" : [ "type-4730", "type-4737" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaPaEE"
   },
   {
@@ -65773,8 +65887,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-4703",
-   "self_type" : "type-4703",
+   "referenced_type" : "type-4710",
+   "self_type" : "type-4710",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-97", "type-97" ],
@@ -65796,8 +65910,8 @@
    ],
    "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",
+   "referenced_type" : "type-4713",
+   "self_type" : "type-4713",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-97", "type-89" ],
@@ -65819,11 +65933,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",
+   "referenced_type" : "type-4740",
+   "self_type" : "type-4740",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-4731", "type-4723" ],
+   "template_args" : [ "type-4737", "type-4730" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaPKaEE"
   },
   {
@@ -65842,11 +65956,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",
+   "referenced_type" : "type-4747",
+   "self_type" : "type-4747",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-4731", "type-4731" ],
+   "template_args" : [ "type-4737", "type-4737" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaS2_EE"
   },
   {
@@ -65865,8 +65979,8 @@
    ],
    "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",
+   "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-97" ],
@@ -65888,8 +66002,8 @@
    ],
    "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",
+   "referenced_type" : "type-4722",
+   "self_type" : "type-4722",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-89", "type-89" ],
@@ -65908,8 +66022,8 @@
    "linker_set_key" : "android::base::ErrnoRestorer",
    "name" : "android::base::ErrnoRestorer",
    "record_kind" : "class",
-   "referenced_type" : "type-4656",
-   "self_type" : "type-4656",
+   "referenced_type" : "type-4663",
+   "self_type" : "type-4663",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base13ErrnoRestorerE"
@@ -65921,14 +66035,14 @@
     {
      "access" : "private",
      "field_name" : "data_",
-     "referenced_type" : "type-4752"
+     "referenced_type" : "type-4758"
     }
    ],
    "linker_set_key" : "android::base::LogMessage",
    "name" : "android::base::LogMessage",
    "record_kind" : "class",
-   "referenced_type" : "type-4751",
-   "self_type" : "type-4751",
+   "referenced_type" : "type-4757",
+   "self_type" : "type-4757",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base10LogMessageE"
@@ -65940,14 +66054,14 @@
     {
      "access" : "private",
      "field_name" : "default_log_id_",
-     "referenced_type" : "type-4704"
+     "referenced_type" : "type-4711"
     }
    ],
    "linker_set_key" : "android::base::LogdLogger",
    "name" : "android::base::LogdLogger",
    "record_kind" : "class",
-   "referenced_type" : "type-4721",
-   "self_type" : "type-4721",
+   "referenced_type" : "type-4728",
+   "self_type" : "type-4728",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base10LogdLoggerE"
@@ -65959,14 +66073,14 @@
     {
      "access" : "private",
      "field_name" : "old_",
-     "referenced_type" : "type-4654"
+     "referenced_type" : "type-4661"
     }
    ],
    "linker_set_key" : "android::base::ScopedLogSeverity",
    "name" : "android::base::ScopedLogSeverity",
    "record_kind" : "class",
-   "referenced_type" : "type-4756",
-   "self_type" : "type-4756",
+   "referenced_type" : "type-4763",
+   "self_type" : "type-4763",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base17ScopedLogSeverityE"
@@ -65984,11 +66098,11 @@
    "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser>",
    "name" : "android::base::unique_fd_impl<android::base::DefaultCloser>",
    "record_kind" : "class",
-   "referenced_type" : "type-2553",
-   "self_type" : "type-2553",
+   "referenced_type" : "type-2556",
+   "self_type" : "type-2556",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h",
-   "template_args" : [ "type-2523" ],
+   "template_args" : [ "type-2526" ],
    "unique_id" : "_ZTSN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
   },
   {
@@ -66027,7 +66141,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1362"
     }
    ],
    "fields" :
@@ -66048,7 +66162,7 @@
      "access" : "private",
      "field_name" : "mExtras",
      "field_offset" : 96,
-     "referenced_type" : "type-1363"
+     "referenced_type" : "type-1366"
     },
     {
      "access" : "private",
@@ -66060,8 +66174,8 @@
    "linker_set_key" : "android::hardware::BHwBinder",
    "name" : "android::hardware::BHwBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-1362",
-   "self_type" : "type-1362",
+   "referenced_type" : "type-1365",
+   "self_type" : "type-1365",
    "size" : 28,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware9BHwBinderE",
@@ -66177,7 +66291,7 @@
      "access" : "private",
      "field_name" : "mRemote",
      "field_offset" : 32,
-     "referenced_type" : "type-1372"
+     "referenced_type" : "type-1375"
     },
     {
      "access" : "private",
@@ -66189,14 +66303,14 @@
      "access" : "private",
      "field_name" : "mState",
      "field_offset" : 96,
-     "referenced_type" : "type-1373"
+     "referenced_type" : "type-1376"
     }
    ],
    "linker_set_key" : "android::hardware::BpHwRefBase",
    "name" : "android::hardware::BpHwRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-1371",
-   "self_type" : "type-1371",
+   "referenced_type" : "type-1374",
+   "self_type" : "type-1374",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE",
@@ -66415,8 +66529,8 @@
    "linker_set_key" : "android::hardware::IBinder",
    "name" : "android::hardware::IBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-1359",
-   "self_type" : "type-1359",
+   "referenced_type" : "type-1362",
+   "self_type" : "type-1362",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinderE",
@@ -66532,8 +66646,8 @@
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient",
    "name" : "android::hardware::IBinder::DeathRecipient",
    "record_kind" : "class",
-   "referenced_type" : "type-1370",
-   "self_type" : "type-1370",
+   "referenced_type" : "type-1373",
+   "self_type" : "type-1373",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinder14DeathRecipientE",
@@ -66620,8 +66734,8 @@
    "linker_set_key" : "android::hardware::IInterface",
    "name" : "android::hardware::IInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1376",
+   "referenced_type" : "type-1379",
+   "self_type" : "type-1379",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
    "unique_id" : "_ZTSN7android8hardware10IInterfaceE",
@@ -66703,43 +66817,43 @@
     {
      "access" : "private",
      "field_name" : "mProcess",
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1396"
     },
     {
      "access" : "private",
      "field_name" : "mPendingStrongDerefs",
      "field_offset" : 32,
-     "referenced_type" : "type-1360"
+     "referenced_type" : "type-1363"
     },
     {
      "access" : "private",
      "field_name" : "mPendingWeakDerefs",
      "field_offset" : 192,
-     "referenced_type" : "type-1207"
+     "referenced_type" : "type-1210"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteStrongDerefs",
      "field_offset" : 352,
-     "referenced_type" : "type-1208"
+     "referenced_type" : "type-1213"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteWeakDerefs",
      "field_offset" : 512,
-     "referenced_type" : "type-1207"
+     "referenced_type" : "type-1210"
     },
     {
      "access" : "private",
      "field_name" : "mIn",
      "field_offset" : 672,
-     "referenced_type" : "type-1377"
+     "referenced_type" : "type-1380"
     },
     {
      "access" : "private",
      "field_name" : "mOut",
      "field_offset" : 1216,
-     "referenced_type" : "type-1377"
+     "referenced_type" : "type-1380"
     },
     {
      "access" : "private",
@@ -66781,7 +66895,7 @@
      "access" : "private",
      "field_name" : "mContextObject",
      "field_offset" : 1952,
-     "referenced_type" : "type-1399"
+     "referenced_type" : "type-1402"
     },
     {
      "access" : "private",
@@ -66799,26 +66913,26 @@
      "access" : "private",
      "field_name" : "mPostCommandTasks",
      "field_offset" : 2016,
-     "referenced_type" : "type-1400"
+     "referenced_type" : "type-1403"
     },
     {
      "access" : "private",
      "field_name" : "mIPCThreadStateBase",
      "field_offset" : 2112,
-     "referenced_type" : "type-1368"
+     "referenced_type" : "type-1371"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 2144,
-     "referenced_type" : "type-1391"
+     "referenced_type" : "type-1394"
     }
    ],
    "linker_set_key" : "android::hardware::IPCThreadState",
    "name" : "android::hardware::IPCThreadState",
    "record_kind" : "class",
-   "referenced_type" : "type-1392",
-   "self_type" : "type-1392",
+   "referenced_type" : "type-1395",
+   "self_type" : "type-1395",
    "size" : 272,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h",
    "unique_id" : "_ZTSN7android8hardware14IPCThreadStateE"
@@ -66836,7 +66950,7 @@
      "access" : "private",
      "field_name" : "mBufCache",
      "field_offset" : 32,
-     "referenced_type" : "type-1378"
+     "referenced_type" : "type-1381"
     },
     {
      "access" : "private",
@@ -66920,7 +67034,7 @@
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 480,
-     "referenced_type" : "type-1379"
+     "referenced_type" : "type-1382"
     },
     {
      "access" : "private",
@@ -66932,8 +67046,8 @@
    "linker_set_key" : "android::hardware::Parcel",
    "name" : "android::hardware::Parcel",
    "record_kind" : "class",
-   "referenced_type" : "type-1377",
-   "self_type" : "type-1377",
+   "referenced_type" : "type-1380",
+   "self_type" : "type-1380",
    "size" : 68,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6ParcelE"
@@ -66960,8 +67074,8 @@
    ],
    "linker_set_key" : "android::hardware::Parcel::BufferInfo",
    "name" : "android::hardware::Parcel::BufferInfo",
-   "referenced_type" : "type-1382",
-   "self_type" : "type-1382",
+   "referenced_type" : "type-1385",
+   "self_type" : "type-1385",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE"
@@ -66993,13 +67107,13 @@
      "access" : "private",
      "field_name" : "mThreadCountLock",
      "field_offset" : 96,
-     "referenced_type" : "type-1397"
+     "referenced_type" : "type-1400"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountDecrement",
      "field_offset" : 128,
-     "referenced_type" : "type-1398"
+     "referenced_type" : "type-1401"
     },
     {
      "access" : "private",
@@ -67029,7 +67143,7 @@
      "access" : "private",
      "field_name" : "mHandleToObject",
      "field_offset" : 352,
-     "referenced_type" : "type-1356"
+     "referenced_type" : "type-1359"
     },
     {
      "access" : "private",
@@ -67041,7 +67155,7 @@
      "access" : "private",
      "field_name" : "mBinderContextCheckFunc",
      "field_offset" : 544,
-     "referenced_type" : "type-1390"
+     "referenced_type" : "type-1393"
     },
     {
      "access" : "private",
@@ -67053,7 +67167,7 @@
      "access" : "private",
      "field_name" : "mContexts",
      "field_offset" : 608,
-     "referenced_type" : "type-1366"
+     "referenced_type" : "type-1369"
     },
     {
      "access" : "private",
@@ -67077,7 +67191,7 @@
      "access" : "private",
      "field_name" : "mThreadPoolSeq",
      "field_offset" : 832,
-     "referenced_type" : "type-1250"
+     "referenced_type" : "type-1253"
     },
     {
      "access" : "private",
@@ -67089,14 +67203,14 @@
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 896,
-     "referenced_type" : "type-1391"
+     "referenced_type" : "type-1394"
     }
    ],
    "linker_set_key" : "android::hardware::ProcessState",
    "name" : "android::hardware::ProcessState",
    "record_kind" : "class",
-   "referenced_type" : "type-1396",
-   "self_type" : "type-1396",
+   "referenced_type" : "type-1399",
+   "self_type" : "type-1399",
    "size" : 128,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessStateE",
@@ -67174,7 +67288,7 @@
    [
     {
      "field_name" : "binder",
-     "referenced_type" : "type-1358"
+     "referenced_type" : "type-1361"
     },
     {
      "field_name" : "refs",
@@ -67184,8 +67298,8 @@
    ],
    "linker_set_key" : "android::hardware::ProcessState::handle_entry",
    "name" : "android::hardware::ProcessState::handle_entry",
-   "referenced_type" : "type-1357",
-   "self_type" : "type-1357",
+   "referenced_type" : "type-1360",
+   "self_type" : "type-1360",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE"
@@ -67210,8 +67324,8 @@
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::bufferqueue::V2_0::Status>",
    "name" : "android::hardware::Return<android::hardware::graphics::bufferqueue::V2_0::Status>",
    "record_kind" : "class",
-   "referenced_type" : "type-6770",
-   "self_type" : "type-6770",
+   "referenced_type" : "type-6779",
+   "self_type" : "type-6779",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "template_args" : [ "type-607" ],
@@ -67231,17 +67345,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-2463"
+     "referenced_type" : "type-2466"
     }
    ],
    "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",
+   "referenced_type" : "type-4365",
+   "self_type" : "type-4365",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-2463" ],
+   "template_args" : [ "type-2466" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducerEEEEE"
   },
   {
@@ -67258,17 +67372,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-2454"
+     "referenced_type" : "type-2457"
     }
    ],
    "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",
+   "referenced_type" : "type-4494",
+   "self_type" : "type-4494",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-2454" ],
+   "template_args" : [ "type-2457" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V1_017IProducerListenerEEEEE"
   },
   {
@@ -67285,17 +67399,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-2476"
+     "referenced_type" : "type-2479"
     }
    ],
    "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",
+   "referenced_type" : "type-4371",
+   "self_type" : "type-4371",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-2476" ],
+   "template_args" : [ "type-2479" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V2_022IGraphicBufferProducerEEEEE"
   },
   {
@@ -67312,17 +67426,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-2470"
+     "referenced_type" : "type-2473"
     }
    ],
    "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",
+   "referenced_type" : "type-4500",
+   "self_type" : "type-4500",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-2470" ],
+   "template_args" : [ "type-2473" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V2_017IProducerListenerEEEEE"
   },
   {
@@ -67345,8 +67459,8 @@
    "linker_set_key" : "android::hardware::Return<bool>",
    "name" : "android::hardware::Return<bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-4353",
-   "self_type" : "type-4353",
+   "referenced_type" : "type-4359",
+   "self_type" : "type-4359",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "template_args" : [ "type-93" ],
@@ -67399,8 +67513,8 @@
    "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",
+   "referenced_type" : "type-6783",
+   "self_type" : "type-6783",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "template_args" : [ "type-92" ],
@@ -68471,8 +68585,8 @@
    ],
    "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-2456",
+   "referenced_type" : "type-2459",
+   "self_type" : "type-2459",
    "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",
@@ -71049,8 +71163,8 @@
    "linker_set_key" : "android::sp<android::AHandler>",
    "name" : "android::sp<android::AHandler>",
    "record_kind" : "class",
-   "referenced_type" : "type-1188",
-   "self_type" : "type-1188",
+   "referenced_type" : "type-1191",
+   "self_type" : "type-1191",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-264" ],
@@ -71143,17 +71257,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4229"
+     "referenced_type" : "type-4235"
     }
    ],
    "linker_set_key" : "android::sp<android::BpGraphicBufferProducer>",
    "name" : "android::sp<android::BpGraphicBufferProducer>",
    "record_kind" : "class",
-   "referenced_type" : "type-4228",
-   "self_type" : "type-4228",
+   "referenced_type" : "type-4234",
+   "self_type" : "type-4234",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4231" ],
+   "template_args" : [ "type-4237" ],
    "unique_id" : "_ZTSN7android2spINS_23BpGraphicBufferProducerEEE"
   },
   {
@@ -71163,17 +71277,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4451"
+     "referenced_type" : "type-4457"
     }
    ],
    "linker_set_key" : "android::sp<android::BpProducerListener>",
    "name" : "android::sp<android::BpProducerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-4454",
-   "self_type" : "type-4454",
+   "referenced_type" : "type-4460",
+   "self_type" : "type-4460",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4455" ],
+   "template_args" : [ "type-4461" ],
    "unique_id" : "_ZTSN7android2spINS_18BpProducerListenerEEE"
   },
   {
@@ -71243,17 +71357,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1865"
+     "referenced_type" : "type-1869"
     }
    ],
    "linker_set_key" : "android::sp<android::Fence>",
    "name" : "android::sp<android::Fence>",
    "record_kind" : "class",
-   "referenced_type" : "type-1864",
-   "self_type" : "type-1864",
+   "referenced_type" : "type-1868",
+   "self_type" : "type-1868",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1867" ],
+   "template_args" : [ "type-1871" ],
    "unique_id" : "_ZTSN7android2spINS_5FenceEEE"
   },
   {
@@ -71283,17 +71397,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1174"
+     "referenced_type" : "type-1177"
     }
    ],
    "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",
+   "referenced_type" : "type-1176",
+   "self_type" : "type-1176",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1176" ],
+   "template_args" : [ "type-1179" ],
    "unique_id" : "_ZTSN7android2spINS_10GLConsumer8EglImageEEE"
   },
   {
@@ -71349,8 +71463,8 @@
    "linker_set_key" : "android::sp<android::GraphicBufferSource>",
    "name" : "android::sp<android::GraphicBufferSource>",
    "record_kind" : "class",
-   "referenced_type" : "type-2542",
-   "self_type" : "type-2542",
+   "referenced_type" : "type-2545",
+   "self_type" : "type-2545",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-566" ],
@@ -71363,17 +71477,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4256"
+     "referenced_type" : "type-4262"
     }
    ],
    "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",
+   "referenced_type" : "type-4265",
+   "self_type" : "type-4265",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4260" ],
+   "template_args" : [ "type-4266" ],
    "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE8ObituaryEEE"
   },
   {
@@ -71383,17 +71497,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4265"
+     "referenced_type" : "type-4271"
     }
    ],
    "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",
+   "referenced_type" : "type-4274",
+   "self_type" : "type-4274",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4269" ],
+   "template_args" : [ "type-4275" ],
    "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE8ObituaryEEE"
   },
   {
@@ -71403,17 +71517,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4828"
+     "referenced_type" : "type-4834"
     }
    ],
    "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",
+   "referenced_type" : "type-4833",
+   "self_type" : "type-4833",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4830" ],
+   "template_args" : [ "type-4836" ],
    "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE8ObituaryEEE"
   },
   {
@@ -71423,17 +71537,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-7030"
+     "referenced_type" : "type-7039"
     }
    ],
    "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",
+   "referenced_type" : "type-7038",
+   "self_type" : "type-7038",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-7032" ],
+   "template_args" : [ "type-7041" ],
    "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE8ObituaryEEE"
   },
   {
@@ -71583,17 +71697,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1049"
+     "referenced_type" : "type-1052"
     }
    ],
    "linker_set_key" : "android::sp<android::ISurfaceComposer>",
    "name" : "android::sp<android::ISurfaceComposer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1048",
-   "self_type" : "type-1048",
+   "referenced_type" : "type-1051",
+   "self_type" : "type-1051",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1051" ],
+   "template_args" : [ "type-1054" ],
    "unique_id" : "_ZTSN7android2spINS_16ISurfaceComposerEEE"
   },
   {
@@ -71603,17 +71717,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1041"
+     "referenced_type" : "type-1045"
     }
    ],
    "linker_set_key" : "android::sp<android::ITransactionCompletedListener>",
    "name" : "android::sp<android::ITransactionCompletedListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1040",
-   "self_type" : "type-1040",
+   "referenced_type" : "type-1044",
+   "self_type" : "type-1044",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1043" ],
+   "template_args" : [ "type-1047" ],
    "unique_id" : "_ZTSN7android2spINS_29ITransactionCompletedListenerEEE"
   },
   {
@@ -71643,17 +71757,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1260"
+     "referenced_type" : "type-1263"
     }
    ],
    "linker_set_key" : "android::sp<android::ProcessState>",
    "name" : "android::sp<android::ProcessState>",
    "record_kind" : "class",
-   "referenced_type" : "type-1259",
-   "self_type" : "type-1259",
+   "referenced_type" : "type-1262",
+   "self_type" : "type-1262",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1261" ],
+   "template_args" : [ "type-1264" ],
    "unique_id" : "_ZTSN7android2spINS_12ProcessStateEEE"
   },
   {
@@ -71683,17 +71797,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1361"
+     "referenced_type" : "type-1364"
     }
    ],
    "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",
+   "referenced_type" : "type-1402",
+   "self_type" : "type-1402",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1362" ],
+   "template_args" : [ "type-1365" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
   },
   {
@@ -71703,17 +71817,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1358"
+     "referenced_type" : "type-1361"
     }
    ],
    "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",
+   "referenced_type" : "type-1370",
+   "self_type" : "type-1370",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1359" ],
+   "template_args" : [ "type-1362" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
   },
   {
@@ -71723,17 +71837,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1395"
+     "referenced_type" : "type-1398"
     }
    ],
    "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",
+   "referenced_type" : "type-1397",
+   "self_type" : "type-1397",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1396" ],
+   "template_args" : [ "type-1399" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
   },
   {
@@ -71743,14 +71857,14 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2464"
+     "referenced_type" : "type-2467"
     }
    ],
    "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-2463",
-   "self_type" : "type-2463",
+   "referenced_type" : "type-2466",
+   "self_type" : "type-2466",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-595" ],
@@ -71763,17 +71877,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2455"
+     "referenced_type" : "type-2458"
     }
    ],
    "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-2454",
-   "self_type" : "type-2454",
+   "referenced_type" : "type-2457",
+   "self_type" : "type-2457",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-2456" ],
+   "template_args" : [ "type-2459" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerEEE"
   },
   {
@@ -71783,17 +71897,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4241"
+     "referenced_type" : "type-4247"
     }
    ],
    "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",
+   "referenced_type" : "type-4246",
+   "self_type" : "type-4246",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4243" ],
+   "template_args" : [ "type-4249" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerEEE"
   },
   {
@@ -71803,17 +71917,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4463"
+     "referenced_type" : "type-4470"
     }
    ],
    "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",
+   "referenced_type" : "type-4473",
+   "self_type" : "type-4473",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4467" ],
+   "template_args" : [ "type-4474" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerEEE"
   },
   {
@@ -71823,14 +71937,14 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2477"
+     "referenced_type" : "type-2480"
     }
    ],
    "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-2476",
-   "self_type" : "type-2476",
+   "referenced_type" : "type-2479",
+   "self_type" : "type-2479",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-677" ],
@@ -71843,14 +71957,14 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2471"
+     "referenced_type" : "type-2474"
     }
    ],
    "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-2470",
-   "self_type" : "type-2470",
+   "referenced_type" : "type-2473",
+   "self_type" : "type-2473",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-604" ],
@@ -71863,17 +71977,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4235"
+     "referenced_type" : "type-4241"
     }
    ],
    "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",
+   "referenced_type" : "type-4240",
+   "self_type" : "type-4240",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4237" ],
+   "template_args" : [ "type-4243" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerEEE"
   },
   {
@@ -71883,17 +71997,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4456"
+     "referenced_type" : "type-4462"
     }
    ],
    "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",
+   "referenced_type" : "type-4466",
+   "self_type" : "type-4466",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4460" ],
+   "template_args" : [ "type-4467" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerEEE"
   },
   {
@@ -71923,14 +72037,14 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2445"
+     "referenced_type" : "type-2448"
     }
    ],
    "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-2444",
-   "self_type" : "type-2444",
+   "referenced_type" : "type-2447",
+   "self_type" : "type-2447",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-530" ],
@@ -71943,14 +72057,14 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2449"
+     "referenced_type" : "type-2452"
     }
    ],
    "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-2448",
-   "self_type" : "type-2448",
+   "referenced_type" : "type-2451",
+   "self_type" : "type-2451",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-533" ],
@@ -71963,36 +72077,36 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2517"
+     "referenced_type" : "type-2520"
     }
    ],
    "linker_set_key" : "android::sp<const android::AHandler>",
    "name" : "android::sp<const android::AHandler>",
    "record_kind" : "class",
-   "referenced_type" : "type-2516",
-   "self_type" : "type-2516",
+   "referenced_type" : "type-2519",
+   "self_type" : "type-2519",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-2518" ],
+   "template_args" : [ "type-2521" ],
    "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",
+   "referenced_type" : "type-1064",
+   "self_type" : "type-1064",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1062" ],
+   "template_args" : [ "type-1065" ],
    "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-2588",
-   "self_type" : "type-2588",
+   "referenced_type" : "type-2591",
+   "self_type" : "type-2591",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-160" ],
@@ -72002,8 +72116,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::trait_pointer<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-2585",
-   "self_type" : "type-2585",
+   "referenced_type" : "type-2588",
+   "self_type" : "type-2588",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-147" ],
@@ -72013,8 +72127,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::trait_pointer<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-2581",
-   "self_type" : "type-2581",
+   "referenced_type" : "type-2584",
+   "self_type" : "type-2584",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-143" ],
@@ -72024,8 +72138,8 @@
    "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",
+   "referenced_type" : "type-1186",
+   "self_type" : "type-1186",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-733" ],
@@ -72035,8 +72149,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<int>",
    "name" : "android::trait_pointer<int>",
-   "referenced_type" : "type-2584",
-   "self_type" : "type-2584",
+   "referenced_type" : "type-2587",
+   "self_type" : "type-2587",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -72046,8 +72160,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<long long>",
    "name" : "android::trait_pointer<long long>",
-   "referenced_type" : "type-1060",
-   "self_type" : "type-1060",
+   "referenced_type" : "type-1063",
+   "self_type" : "type-1063",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-169" ],
@@ -72057,30 +72171,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::trait_pointer<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-2589",
-   "self_type" : "type-2589",
+   "referenced_type" : "type-2592",
+   "self_type" : "type-2592",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2590" ],
+   "template_args" : [ "type-2593" ],
    "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-2586",
-   "self_type" : "type-2586",
+   "referenced_type" : "type-2589",
+   "self_type" : "type-2589",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2587" ],
+   "template_args" : [ "type-2590" ],
    "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-2582",
-   "self_type" : "type-2582",
+   "referenced_type" : "type-2585",
+   "self_type" : "type-2585",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -72090,19 +72204,19 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::BufferItem>",
    "name" : "android::trait_trivial_copy<android::BufferItem>",
-   "referenced_type" : "type-1056",
-   "self_type" : "type-1056",
+   "referenced_type" : "type-1059",
+   "self_type" : "type-1059",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1057" ],
+   "template_args" : [ "type-1060" ],
    "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-2572",
-   "self_type" : "type-2572",
+   "referenced_type" : "type-2575",
+   "self_type" : "type-2575",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-160" ],
@@ -72112,8 +72226,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-2569",
-   "self_type" : "type-2569",
+   "referenced_type" : "type-2572",
+   "self_type" : "type-2572",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-147" ],
@@ -72123,8 +72237,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-2566",
-   "self_type" : "type-2566",
+   "referenced_type" : "type-2569",
+   "self_type" : "type-2569",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-143" ],
@@ -72134,8 +72248,8 @@
    "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",
+   "referenced_type" : "type-1184",
+   "self_type" : "type-1184",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-733" ],
@@ -72145,8 +72259,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-2462",
-   "self_type" : "type-2462",
+   "referenced_type" : "type-2465",
+   "self_type" : "type-2465",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-93" ],
@@ -72156,8 +72270,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-2499",
-   "self_type" : "type-2499",
+   "referenced_type" : "type-2502",
+   "self_type" : "type-2502",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-124" ],
@@ -72189,8 +72303,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-2655",
-   "self_type" : "type-2655",
+   "referenced_type" : "type-2658",
+   "self_type" : "type-2658",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -72222,8 +72336,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<short>",
    "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-2594",
-   "self_type" : "type-2594",
+   "referenced_type" : "type-2597",
+   "self_type" : "type-2597",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-499" ],
@@ -72233,30 +72347,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::trait_trivial_copy<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-2570",
-   "self_type" : "type-2570",
+   "referenced_type" : "type-2573",
+   "self_type" : "type-2573",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2571" ],
+   "template_args" : [ "type-2574" ],
    "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-2567",
-   "self_type" : "type-2567",
+   "referenced_type" : "type-2570",
+   "self_type" : "type-2570",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2568" ],
+   "template_args" : [ "type-2571" ],
    "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-2540",
-   "self_type" : "type-2540",
+   "referenced_type" : "type-2543",
+   "self_type" : "type-2543",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-90" ],
@@ -72299,8 +72413,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
    "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-2634",
-   "self_type" : "type-2634",
+   "referenced_type" : "type-2637",
+   "self_type" : "type-2637",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-497" ],
@@ -72310,8 +72424,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-2433",
-   "self_type" : "type-2433",
+   "referenced_type" : "type-2436",
+   "self_type" : "type-2436",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-9" ],
@@ -72321,19 +72435,19 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::BufferItem>",
    "name" : "android::trait_trivial_ctor<android::BufferItem>",
-   "referenced_type" : "type-1052",
-   "self_type" : "type-1052",
+   "referenced_type" : "type-1055",
+   "self_type" : "type-1055",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1053" ],
+   "template_args" : [ "type-1056" ],
    "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-2554",
-   "self_type" : "type-2554",
+   "referenced_type" : "type-2557",
+   "self_type" : "type-2557",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-160" ],
@@ -72343,8 +72457,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-2549",
-   "self_type" : "type-2549",
+   "referenced_type" : "type-2552",
+   "self_type" : "type-2552",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-147" ],
@@ -72354,8 +72468,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-2548",
-   "self_type" : "type-2548",
+   "referenced_type" : "type-2551",
+   "self_type" : "type-2551",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-143" ],
@@ -72365,8 +72479,8 @@
    "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",
+   "referenced_type" : "type-1182",
+   "self_type" : "type-1182",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-733" ],
@@ -72376,8 +72490,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-2443",
-   "self_type" : "type-2443",
+   "referenced_type" : "type-2446",
+   "self_type" : "type-2446",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-93" ],
@@ -72387,8 +72501,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-2481",
-   "self_type" : "type-2481",
+   "referenced_type" : "type-2484",
+   "self_type" : "type-2484",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-124" ],
@@ -72420,8 +72534,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-2647",
-   "self_type" : "type-2647",
+   "referenced_type" : "type-2650",
+   "self_type" : "type-2650",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -72453,8 +72567,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<short>",
    "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-2563",
-   "self_type" : "type-2563",
+   "referenced_type" : "type-2566",
+   "self_type" : "type-2566",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-499" ],
@@ -72464,30 +72578,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::trait_trivial_ctor<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-2555",
-   "self_type" : "type-2555",
+   "referenced_type" : "type-2558",
+   "self_type" : "type-2558",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2556" ],
+   "template_args" : [ "type-2559" ],
    "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-2550",
-   "self_type" : "type-2550",
+   "referenced_type" : "type-2553",
+   "self_type" : "type-2553",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2551" ],
+   "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-2526",
-   "self_type" : "type-2526",
+   "referenced_type" : "type-2529",
+   "self_type" : "type-2529",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-90" ],
@@ -72497,8 +72611,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
    "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-2670",
-   "self_type" : "type-2670",
+   "referenced_type" : "type-2673",
+   "self_type" : "type-2673",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -72530,8 +72644,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned short>",
    "name" : "android::trait_trivial_ctor<unsigned short>",
-   "referenced_type" : "type-2616",
-   "self_type" : "type-2616",
+   "referenced_type" : "type-2619",
+   "self_type" : "type-2619",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-497" ],
@@ -72541,8 +72655,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-2399",
-   "self_type" : "type-2399",
+   "referenced_type" : "type-2402",
+   "self_type" : "type-2402",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-9" ],
@@ -72552,19 +72666,19 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::BufferItem>",
    "name" : "android::trait_trivial_dtor<android::BufferItem>",
-   "referenced_type" : "type-1054",
-   "self_type" : "type-1054",
+   "referenced_type" : "type-1057",
+   "self_type" : "type-1057",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1055" ],
+   "template_args" : [ "type-1058" ],
    "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-2564",
-   "self_type" : "type-2564",
+   "referenced_type" : "type-2567",
+   "self_type" : "type-2567",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-160" ],
@@ -72574,8 +72688,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-2560",
-   "self_type" : "type-2560",
+   "referenced_type" : "type-2563",
+   "self_type" : "type-2563",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-147" ],
@@ -72585,8 +72699,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-2557",
-   "self_type" : "type-2557",
+   "referenced_type" : "type-2560",
+   "self_type" : "type-2560",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-143" ],
@@ -72596,8 +72710,8 @@
    "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",
+   "referenced_type" : "type-1183",
+   "self_type" : "type-1183",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-733" ],
@@ -72607,8 +72721,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<bool>",
    "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-2452",
-   "self_type" : "type-2452",
+   "referenced_type" : "type-2455",
+   "self_type" : "type-2455",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-93" ],
@@ -72618,8 +72732,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-2489",
-   "self_type" : "type-2489",
+   "referenced_type" : "type-2492",
+   "self_type" : "type-2492",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-124" ],
@@ -72651,8 +72765,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<int>",
    "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-2650",
-   "self_type" : "type-2650",
+   "referenced_type" : "type-2653",
+   "self_type" : "type-2653",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -72684,8 +72798,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<short>",
    "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-2583",
-   "self_type" : "type-2583",
+   "referenced_type" : "type-2586",
+   "self_type" : "type-2586",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-499" ],
@@ -72695,30 +72809,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::trait_trivial_dtor<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-2561",
-   "self_type" : "type-2561",
+   "referenced_type" : "type-2564",
+   "self_type" : "type-2564",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2562" ],
+   "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-2558",
-   "self_type" : "type-2558",
+   "referenced_type" : "type-2561",
+   "self_type" : "type-2561",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2559" ],
+   "template_args" : [ "type-2562" ],
    "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-2533",
-   "self_type" : "type-2533",
+   "referenced_type" : "type-2536",
+   "self_type" : "type-2536",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-90" ],
@@ -72728,8 +72842,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
    "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-2681",
-   "self_type" : "type-2681",
+   "referenced_type" : "type-2684",
+   "self_type" : "type-2684",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -72761,8 +72875,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned short>",
    "name" : "android::trait_trivial_dtor<unsigned short>",
-   "referenced_type" : "type-2624",
-   "self_type" : "type-2624",
+   "referenced_type" : "type-2627",
+   "self_type" : "type-2627",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-497" ],
@@ -72772,8 +72886,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-2424",
-   "self_type" : "type-2424",
+   "referenced_type" : "type-2427",
+   "self_type" : "type-2427",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-9" ],
@@ -72783,30 +72897,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::BufferItem>",
    "name" : "android::trait_trivial_move<android::BufferItem>",
-   "referenced_type" : "type-1058",
-   "self_type" : "type-1058",
+   "referenced_type" : "type-1061",
+   "self_type" : "type-1061",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1059" ],
+   "template_args" : [ "type-1062" ],
    "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-2662",
-   "self_type" : "type-2662",
+   "referenced_type" : "type-2665",
+   "self_type" : "type-2665",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-1239" ],
+   "template_args" : [ "type-1242" ],
    "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-2656",
-   "self_type" : "type-2656",
+   "referenced_type" : "type-2659",
+   "self_type" : "type-2659",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "template_args" : [ "type-121" ],
@@ -72816,8 +72930,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
-   "referenced_type" : "type-2579",
-   "self_type" : "type-2579",
+   "referenced_type" : "type-2582",
+   "self_type" : "type-2582",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-160" ],
@@ -72827,8 +72941,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-2576",
-   "self_type" : "type-2576",
+   "referenced_type" : "type-2579",
+   "self_type" : "type-2579",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-147" ],
@@ -72838,8 +72952,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-2573",
-   "self_type" : "type-2573",
+   "referenced_type" : "type-2576",
+   "self_type" : "type-2576",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-143" ],
@@ -72849,8 +72963,8 @@
    "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",
+   "referenced_type" : "type-1185",
+   "self_type" : "type-1185",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-733" ],
@@ -72860,8 +72974,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<bool>",
    "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-2472",
-   "self_type" : "type-2472",
+   "referenced_type" : "type-2475",
+   "self_type" : "type-2475",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-93" ],
@@ -72871,8 +72985,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-2521",
-   "self_type" : "type-2521",
+   "referenced_type" : "type-2524",
+   "self_type" : "type-2524",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-124" ],
@@ -72904,8 +73018,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-2659",
-   "self_type" : "type-2659",
+   "referenced_type" : "type-2662",
+   "self_type" : "type-2662",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -72937,8 +73051,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<short>",
    "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-2605",
-   "self_type" : "type-2605",
+   "referenced_type" : "type-2608",
+   "self_type" : "type-2608",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-499" ],
@@ -72948,30 +73062,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::trait_trivial_move<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-2577",
-   "self_type" : "type-2577",
+   "referenced_type" : "type-2580",
+   "self_type" : "type-2580",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2578" ],
+   "template_args" : [ "type-2581" ],
    "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-2574",
-   "self_type" : "type-2574",
+   "referenced_type" : "type-2577",
+   "self_type" : "type-2577",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2575" ],
+   "template_args" : [ "type-2578" ],
    "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-2552",
-   "self_type" : "type-2552",
+   "referenced_type" : "type-2555",
+   "self_type" : "type-2555",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-90" ],
@@ -73014,8 +73128,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned short>",
    "name" : "android::trait_trivial_move<unsigned short>",
-   "referenced_type" : "type-2645",
-   "self_type" : "type-2645",
+   "referenced_type" : "type-2648",
+   "self_type" : "type-2648",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-497" ],
@@ -73025,8 +73139,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-2441",
-   "self_type" : "type-2441",
+   "referenced_type" : "type-2444",
+   "self_type" : "type-2444",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-9" ],
@@ -73036,19 +73150,19 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::BufferItem>",
    "name" : "android::traits<android::BufferItem>",
-   "referenced_type" : "type-1064",
-   "self_type" : "type-1064",
+   "referenced_type" : "type-1067",
+   "self_type" : "type-1067",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1065" ],
+   "template_args" : [ "type-1068" ],
    "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-2599",
-   "self_type" : "type-2599",
+   "referenced_type" : "type-2602",
+   "self_type" : "type-2602",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-160" ],
@@ -73058,8 +73172,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::traits<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-2596",
-   "self_type" : "type-2596",
+   "referenced_type" : "type-2599",
+   "self_type" : "type-2599",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-147" ],
@@ -73069,8 +73183,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::traits<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-2591",
-   "self_type" : "type-2591",
+   "referenced_type" : "type-2594",
+   "self_type" : "type-2594",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-143" ],
@@ -73080,8 +73194,8 @@
    "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",
+   "referenced_type" : "type-1187",
+   "self_type" : "type-1187",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-733" ],
@@ -73091,8 +73205,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<int>",
    "name" : "android::traits<int>",
-   "referenced_type" : "type-2593",
-   "self_type" : "type-2593",
+   "referenced_type" : "type-2596",
+   "self_type" : "type-2596",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -73102,8 +73216,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<long long>",
    "name" : "android::traits<long long>",
-   "referenced_type" : "type-1063",
-   "self_type" : "type-1063",
+   "referenced_type" : "type-1066",
+   "self_type" : "type-1066",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-169" ],
@@ -73113,30 +73227,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::traits<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-2600",
-   "self_type" : "type-2600",
+   "referenced_type" : "type-2603",
+   "self_type" : "type-2603",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2601" ],
+   "template_args" : [ "type-2604" ],
    "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-2597",
-   "self_type" : "type-2597",
+   "referenced_type" : "type-2600",
+   "self_type" : "type-2600",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2598" ],
+   "template_args" : [ "type-2601" ],
    "unique_id" : "_ZTSN7android6traitsINSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<unsigned int>",
    "name" : "android::traits<unsigned int>",
-   "referenced_type" : "type-2592",
-   "self_type" : "type-2592",
+   "referenced_type" : "type-2595",
+   "self_type" : "type-2595",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -73147,16 +73261,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1075"
+     "referenced_type" : "type-1078"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::BufferItem>",
    "name" : "android::use_trivial_move<android::BufferItem>",
-   "referenced_type" : "type-1074",
-   "self_type" : "type-1074",
+   "referenced_type" : "type-1077",
+   "self_type" : "type-1077",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1076" ],
+   "template_args" : [ "type-1079" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_10BufferItemEEE"
   },
   {
@@ -73164,13 +73278,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2636"
+     "referenced_type" : "type-2639"
     }
    ],
    "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-2635",
-   "self_type" : "type-2635",
+   "referenced_type" : "type-2638",
+   "self_type" : "type-2638",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-160" ],
@@ -73181,13 +73295,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2633"
+     "referenced_type" : "type-2636"
     }
    ],
    "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-2632",
-   "self_type" : "type-2632",
+   "referenced_type" : "type-2635",
+   "self_type" : "type-2635",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-147" ],
@@ -73198,13 +73312,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2629"
+     "referenced_type" : "type-2632"
     }
    ],
    "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-2628",
-   "self_type" : "type-2628",
+   "referenced_type" : "type-2631",
+   "self_type" : "type-2631",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-143" ],
@@ -73215,13 +73329,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1186"
+     "referenced_type" : "type-1190"
     }
    ],
    "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",
+   "referenced_type" : "type-1189",
+   "self_type" : "type-1189",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-733" ],
@@ -73232,13 +73346,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2631"
+     "referenced_type" : "type-2634"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<int>",
    "name" : "android::use_trivial_move<int>",
-   "referenced_type" : "type-2630",
-   "self_type" : "type-2630",
+   "referenced_type" : "type-2633",
+   "self_type" : "type-2633",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -73249,13 +73363,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1073"
+     "referenced_type" : "type-1076"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<long long>",
    "name" : "android::use_trivial_move<long long>",
-   "referenced_type" : "type-1072",
-   "self_type" : "type-1072",
+   "referenced_type" : "type-1075",
+   "self_type" : "type-1075",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-169" ],
@@ -73320,7 +73434,7 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1252"
+     "referenced_type" : "type-1256"
     },
     {
      "access" : "private",
@@ -73332,11 +73446,11 @@
    "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",
+   "referenced_type" : "type-1255",
+   "self_type" : "type-1255",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-1254" ],
+   "template_args" : [ "type-1258" ],
    "unique_id" : "_ZTSN7android2wpINS_12ConsumerBase22FrameAvailableListenerEEE"
   },
   {
@@ -73687,13 +73801,13 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-2178"
+     "referenced_type" : "type-2181"
     }
    ],
    "linker_set_key" : "log_msg",
    "name" : "log_msg",
-   "referenced_type" : "type-2177",
-   "self_type" : "type-2177",
+   "referenced_type" : "type-2180",
+   "self_type" : "type-2180",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
@@ -73704,15 +73818,15 @@
    [
     {
      "field_name" : "buf",
-     "referenced_type" : "type-2179"
+     "referenced_type" : "type-2182"
     },
     {
      "field_name" : "entry",
-     "referenced_type" : "type-1408"
+     "referenced_type" : "type-1411"
     },
     {
      "field_name" : "entry_v4",
-     "referenced_type" : "type-1408"
+     "referenced_type" : "type-1411"
     },
     {
      "field_name" : "entry_v3",
@@ -73720,19 +73834,19 @@
     },
     {
      "field_name" : "entry_v2",
-     "referenced_type" : "type-1291"
+     "referenced_type" : "type-1294"
     },
     {
      "field_name" : "entry_v1",
-     "referenced_type" : "type-2180"
+     "referenced_type" : "type-2183"
     }
    ],
    "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-2178",
-   "self_type" : "type-2178",
+   "referenced_type" : "type-2181",
+   "self_type" : "type-2181",
    "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)"
@@ -73753,8 +73867,8 @@
    ],
    "linker_set_key" : "log_time",
    "name" : "log_time",
-   "referenced_type" : "type-2509",
-   "self_type" : "type-2509",
+   "referenced_type" : "type-2512",
+   "self_type" : "type-2512",
    "size" : 8,
    "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
    "unique_id" : "_ZTS8log_time"
@@ -73800,8 +73914,8 @@
    ],
    "linker_set_key" : "logger_entry",
    "name" : "logger_entry",
-   "referenced_type" : "type-2180",
-   "self_type" : "type-2180",
+   "referenced_type" : "type-2183",
+   "self_type" : "type-2183",
    "size" : 20,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
@@ -73852,8 +73966,8 @@
    ],
    "linker_set_key" : "logger_entry_v2",
    "name" : "logger_entry_v2",
-   "referenced_type" : "type-1291",
-   "self_type" : "type-1291",
+   "referenced_type" : "type-1294",
+   "self_type" : "type-1294",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
@@ -73961,8 +74075,8 @@
    ],
    "linker_set_key" : "logger_entry_v4",
    "name" : "logger_entry_v4",
-   "referenced_type" : "type-1408",
-   "self_type" : "type-1408",
+   "referenced_type" : "type-1411",
+   "self_type" : "type-1411",
    "size" : 28,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
@@ -74006,8 +74120,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser> &&",
    "name" : "android::base::unique_fd_impl<android::base::DefaultCloser> &&",
-   "referenced_type" : "type-2553",
-   "self_type" : "type-2610",
+   "referenced_type" : "type-2556",
+   "self_type" : "type-2613",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -74024,8 +74138,8 @@
    "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",
+   "referenced_type" : "type-6779",
+   "self_type" : "type-6781",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -74033,24 +74147,6 @@
    "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,
@@ -74058,8 +74154,8 @@
   },
   {
    "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> > &&",
+   "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-4494",
    "self_type" : "type-4496",
    "size" : 4,
@@ -74067,10 +74163,28 @@
   },
   {
    "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-4371",
+   "self_type" : "type-4373",
+   "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-4500",
+   "self_type" : "type-4502",
+   "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-4355",
+   "referenced_type" : "type-4359",
+   "self_type" : "type-4361",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -74087,8 +74201,8 @@
    "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",
+   "referenced_type" : "type-6783",
+   "self_type" : "type-6785",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -74142,7 +74256,7 @@
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> &&",
    "name" : "android::hardware::hidl_vec<unsigned char> &&",
    "referenced_type" : "type-452",
-   "self_type" : "type-4566",
+   "self_type" : "type-4572",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -74151,7 +74265,7 @@
    "linker_set_key" : "android::sp<android::ALooper> &&",
    "name" : "android::sp<android::ALooper> &&",
    "referenced_type" : "type-321",
-   "self_type" : "type-2256",
+   "self_type" : "type-2259",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -74168,8 +74282,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::Fence> &&",
    "name" : "android::sp<android::Fence> &&",
-   "referenced_type" : "type-1864",
-   "self_type" : "type-2524",
+   "referenced_type" : "type-1868",
+   "self_type" : "type-2527",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -74177,8 +74291,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::GraphicBufferSource> &&",
    "name" : "android::sp<android::GraphicBufferSource> &&",
-   "referenced_type" : "type-2542",
-   "self_type" : "type-2543",
+   "referenced_type" : "type-2545",
+   "self_type" : "type-2546",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -74186,8 +74300,8 @@
    "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-4261",
+   "referenced_type" : "type-4265",
+   "self_type" : "type-4267",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -74195,8 +74309,8 @@
    "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",
+   "referenced_type" : "type-4274",
+   "self_type" : "type-4276",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -74204,8 +74318,8 @@
    "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",
+   "referenced_type" : "type-4833",
+   "self_type" : "type-4843",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -74213,8 +74327,8 @@
    "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",
+   "referenced_type" : "type-7038",
+   "self_type" : "type-7047",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -74223,7 +74337,7 @@
    "linker_set_key" : "android::sp<android::IBinder::DeathRecipient> &&",
    "name" : "android::sp<android::IBinder::DeathRecipient> &&",
    "referenced_type" : "type-843",
-   "self_type" : "type-4383",
+   "self_type" : "type-4389",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -74232,7 +74346,7 @@
    "linker_set_key" : "android::sp<android::IConsumerListener> &&",
    "name" : "android::sp<android::IConsumerListener> &&",
    "referenced_type" : "type-939",
-   "self_type" : "type-1577",
+   "self_type" : "type-1580",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -74241,7 +74355,7 @@
    "linker_set_key" : "android::sp<android::IGraphicBufferConsumer> &&",
    "name" : "android::sp<android::IGraphicBufferConsumer> &&",
    "referenced_type" : "type-574",
-   "self_type" : "type-1600",
+   "self_type" : "type-1604",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -74250,7 +74364,7 @@
    "linker_set_key" : "android::sp<android::IGraphicBufferProducer> &&",
    "name" : "android::sp<android::IGraphicBufferProducer> &&",
    "referenced_type" : "type-570",
-   "self_type" : "type-4226",
+   "self_type" : "type-4232",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -74259,7 +74373,7 @@
    "linker_set_key" : "android::sp<android::IProducerListener> &&",
    "name" : "android::sp<android::IProducerListener> &&",
    "referenced_type" : "type-957",
-   "self_type" : "type-4252",
+   "self_type" : "type-4258",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -74268,7 +74382,7 @@
    "linker_set_key" : "android::sp<android::NativeHandle> &&",
    "name" : "android::sp<android::NativeHandle> &&",
    "referenced_type" : "type-932",
-   "self_type" : "type-1596",
+   "self_type" : "type-1600",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   }
diff --git a/29/64/arm_armv7-a-neon/source-based/libui.so.lsdump b/29/64/arm_armv7-a-neon/source-based/libui.so.lsdump
index 20c7f22..517f12f 100644
--- a/29/64/arm_armv7-a-neon/source-based/libui.so.lsdump
+++ b/29/64/arm_armv7-a-neon/source-based/libui.so.lsdump
@@ -5,8 +5,8 @@
    "alignment" : 4,
    "linker_set_key" : "AHardwareBuffer_Plane [4]",
    "name" : "AHardwareBuffer_Plane [4]",
-   "referenced_type" : "type-509",
-   "self_type" : "type-508",
+   "referenced_type" : "type-506",
+   "self_type" : "type-505",
    "size" : 48,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h"
   },
@@ -14,7 +14,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<float> [3]",
    "name" : "android::details::TVec3<float> [3]",
-   "referenced_type" : "type-17",
+   "referenced_type" : "type-18",
    "self_type" : "type-904",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
@@ -23,8 +23,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<float> [4]",
    "name" : "android::details::TVec4<float> [4]",
-   "referenced_type" : "type-200",
-   "self_type" : "type-2277",
+   "referenced_type" : "type-192",
+   "self_type" : "type-2279",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -32,7 +32,7 @@
    "alignment" : 1,
    "linker_set_key" : "char [0]",
    "name" : "char [0]",
-   "referenced_type" : "type-288",
+   "referenced_type" : "type-285",
    "self_type" : "type-1261",
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -47,16 +47,16 @@
    "alignment" : 4,
    "linker_set_key" : "int [0]",
    "name" : "int [0]",
-   "referenced_type" : "type-103",
-   "self_type" : "type-145",
+   "referenced_type" : "type-105",
+   "self_type" : "type-148",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int [7]",
    "name" : "int [7]",
-   "referenced_type" : "type-103",
-   "self_type" : "type-564",
+   "referenced_type" : "type-105",
+   "self_type" : "type-561",
    "size" : 28,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -64,7 +64,7 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
-   "referenced_type" : "type-218",
+   "referenced_type" : "type-220",
    "self_type" : "type-1270",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
@@ -73,7 +73,7 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [10]",
    "name" : "unsigned int [10]",
-   "referenced_type" : "type-123",
+   "referenced_type" : "type-125",
    "self_type" : "type-1109",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -82,8 +82,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [12]",
    "name" : "unsigned int [12]",
-   "referenced_type" : "type-123",
-   "self_type" : "type-559",
+   "referenced_type" : "type-125",
+   "self_type" : "type-556",
    "size" : 48,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -91,8 +91,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [25]",
    "name" : "unsigned int [25]",
-   "referenced_type" : "type-123",
-   "self_type" : "type-558",
+   "referenced_type" : "type-125",
+   "self_type" : "type-555",
    "size" : 100,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -100,8 +100,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [3]",
    "name" : "unsigned int [3]",
-   "referenced_type" : "type-123",
-   "self_type" : "type-941",
+   "referenced_type" : "type-125",
+   "self_type" : "type-935",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -109,8 +109,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [8]",
    "name" : "unsigned int [8]",
-   "referenced_type" : "type-123",
-   "self_type" : "type-349",
+   "referenced_type" : "type-125",
+   "self_type" : "type-346",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -118,26 +118,17 @@
    "alignment" : 4,
    "linker_set_key" : "void *[1]",
    "name" : "void *[1]",
-   "referenced_type" : "type-227",
-   "self_type" : "type-523",
+   "referenced_type" : "type-229",
+   "self_type" : "type-521",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void *[3]",
-   "name" : "void *[3]",
-   "referenced_type" : "type-227",
-   "self_type" : "type-596",
-   "size" : 12,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "void *[4]",
    "name" : "void *[4]",
-   "referenced_type" : "type-227",
-   "self_type" : "type-519",
+   "referenced_type" : "type-229",
+   "self_type" : "type-517",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -145,8 +136,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *[6]",
    "name" : "void *[6]",
-   "referenced_type" : "type-227",
-   "self_type" : "type-524",
+   "referenced_type" : "type-229",
+   "self_type" : "type-522",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -154,7 +145,7 @@
    "alignment" : 4,
    "linker_set_key" : "void *[7]",
    "name" : "void *[7]",
-   "referenced_type" : "type-227",
+   "referenced_type" : "type-229",
    "self_type" : "type-609",
    "size" : 28,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
@@ -178,8 +169,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-288",
-   "self_type" : "type-288",
+   "referenced_type" : "type-285",
+   "self_type" : "type-285",
    "size" : 1
   },
   {
@@ -188,16 +179,16 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-182",
-   "self_type" : "type-182",
+   "referenced_type" : "type-185",
+   "self_type" : "type-185",
    "size" : 2
   },
   {
    "alignment" : 8,
    "linker_set_key" : "double",
    "name" : "double",
-   "referenced_type" : "type-41",
-   "self_type" : "type-41",
+   "referenced_type" : "type-43",
+   "self_type" : "type-43",
    "size" : 8
   },
   {
@@ -213,8 +204,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-103",
-   "self_type" : "type-103",
+   "referenced_type" : "type-105",
+   "self_type" : "type-105",
    "size" : 4
   },
   {
@@ -222,16 +213,16 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-687",
-   "self_type" : "type-687",
+   "referenced_type" : "type-684",
+   "self_type" : "type-684",
    "size" : 4
   },
   {
    "alignment" : 8,
    "linker_set_key" : "long double",
    "name" : "long double",
-   "referenced_type" : "type-298",
-   "self_type" : "type-298",
+   "referenced_type" : "type-295",
+   "self_type" : "type-295",
    "size" : 8
   },
   {
@@ -239,8 +230,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-284",
-   "self_type" : "type-284",
+   "referenced_type" : "type-12",
+   "self_type" : "type-12",
    "size" : 8
   },
   {
@@ -267,8 +258,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned char",
    "name" : "unsigned char",
-   "referenced_type" : "type-218",
-   "self_type" : "type-218",
+   "referenced_type" : "type-220",
+   "self_type" : "type-220",
    "size" : 1
   },
   {
@@ -277,8 +268,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned int",
    "name" : "unsigned int",
-   "referenced_type" : "type-123",
-   "self_type" : "type-123",
+   "referenced_type" : "type-125",
+   "self_type" : "type-125",
    "size" : 4
   },
   {
@@ -297,8 +288,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-124",
-   "self_type" : "type-124",
+   "referenced_type" : "type-126",
+   "self_type" : "type-126",
    "size" : 8
   },
   {
@@ -314,8 +305,8 @@
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-151",
-   "self_type" : "type-151"
+   "referenced_type" : "type-154",
+   "self_type" : "type-154"
   }
  ],
  "elf_functions" :
@@ -1661,12 +1652,18 @@
    "name" : "__aeabi_memset8"
   },
   {
+   "name" : "__aeabi_uidiv"
+  },
+  {
    "name" : "__aeabi_uidivmod"
   },
   {
    "name" : "__udivmodsi4"
   },
   {
+   "name" : "__udivsi3"
+  },
+  {
    "name" : "android_convertGralloc0To1Usage"
   },
   {
@@ -1848,11 +1845,11 @@
    ],
    "linker_set_key" : "AHardwareBuffer_Format",
    "name" : "AHardwareBuffer_Format",
-   "referenced_type" : "type-616",
-   "self_type" : "type-616",
+   "referenced_type" : "type-617",
+   "self_type" : "type-617",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "AHardwareBuffer_Format"
   },
   {
@@ -2014,11 +2011,11 @@
    ],
    "linker_set_key" : "AHardwareBuffer_UsageFlags",
    "name" : "AHardwareBuffer_UsageFlags",
-   "referenced_type" : "type-678",
-   "self_type" : "type-678",
+   "referenced_type" : "type-676",
+   "self_type" : "type-676",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "AHardwareBuffer_UsageFlags"
   },
   {
@@ -2036,11 +2033,11 @@
    ],
    "linker_set_key" : "android::Condition::WakeUpType",
    "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-260",
-   "self_type" : "type-260",
+   "referenced_type" : "type-256",
+   "self_type" : "type-256",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android9Condition10WakeUpTypeE"
   },
   {
@@ -2066,7 +2063,7 @@
    "self_type" : "type-1346",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android5Fence6StatusE"
   },
   {
@@ -2088,11 +2085,11 @@
    ],
    "linker_set_key" : "android::FenceTime::Snapshot::State",
    "name" : "android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1384",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1388",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android9FenceTime8Snapshot5StateE"
   },
   {
@@ -2115,11 +2112,11 @@
    ],
    "linker_set_key" : "android::FenceTime::State",
    "name" : "android::FenceTime::State",
-   "referenced_type" : "type-1378",
-   "self_type" : "type-1378",
+   "referenced_type" : "type-1383",
+   "self_type" : "type-1383",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android9FenceTime5StateE"
   },
   {
@@ -2145,11 +2142,11 @@
    ],
    "linker_set_key" : "android::GraphicBuffer::HandleWrapMethod",
    "name" : "android::GraphicBuffer::HandleWrapMethod",
-   "referenced_type" : "type-629",
-   "self_type" : "type-629",
+   "referenced_type" : "type-630",
+   "self_type" : "type-630",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h",
-   "underlying_type" : "type-218",
+   "underlying_type" : "type-220",
    "unique_id" : "_ZTSN7android13GraphicBuffer16HandleWrapMethodE"
   },
   {
@@ -2167,11 +2164,11 @@
    ],
    "linker_set_key" : "android::GraphicBufferMapper::Version",
    "name" : "android::GraphicBufferMapper::Version",
-   "referenced_type" : "type-529",
-   "self_type" : "type-529",
+   "referenced_type" : "type-527",
+   "self_type" : "type-527",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android19GraphicBufferMapper7VersionE"
   },
   {
@@ -2185,11 +2182,11 @@
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-183",
-   "self_type" : "type-183",
+   "referenced_type" : "type-186",
+   "self_type" : "type-186",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android8String1613StaticLinkageE"
   },
   {
@@ -2203,11 +2200,11 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-864",
-   "self_type" : "type-864",
+   "referenced_type" : "type-862",
+   "self_type" : "type-862",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7String813StaticLinkageE"
   },
   {
@@ -2225,7 +2222,7 @@
    "self_type" : "type-975",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details6TMat33IfE7no_initE"
   },
   {
@@ -2239,11 +2236,11 @@
    ],
    "linker_set_key" : "android::details::TMat44<float>::no_init",
    "name" : "android::details::TMat44<float>::no_init",
-   "referenced_type" : "type-2278",
-   "self_type" : "type-2278",
+   "referenced_type" : "type-2281",
+   "self_type" : "type-2281",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details6TMat44IfE7no_initE"
   },
   {
@@ -2257,11 +2254,11 @@
    ],
    "linker_set_key" : "android::details::TQuaternion<double>::no_init",
    "name" : "android::details::TQuaternion<double>::no_init",
-   "referenced_type" : "type-389",
-   "self_type" : "type-389",
+   "referenced_type" : "type-386",
+   "self_type" : "type-386",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details11TQuaternionIdE7no_initE"
   },
   {
@@ -2275,11 +2272,11 @@
    ],
    "linker_set_key" : "android::details::TQuaternion<float>::no_init",
    "name" : "android::details::TQuaternion<float>::no_init",
-   "referenced_type" : "type-428",
-   "self_type" : "type-428",
+   "referenced_type" : "type-425",
+   "self_type" : "type-425",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details11TQuaternionIfE7no_initE"
   },
   {
@@ -2297,7 +2294,7 @@
    "self_type" : "type-1255",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec2IbE7no_initE"
   },
   {
@@ -2315,7 +2312,7 @@
    "self_type" : "type-1068",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec2IdE7no_initE"
   },
   {
@@ -2333,7 +2330,7 @@
    "self_type" : "type-1135",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec2IfE7no_initE"
   },
   {
@@ -2351,7 +2348,7 @@
    "self_type" : "type-1365",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec3IdE7no_initE"
   },
   {
@@ -2365,11 +2362,11 @@
    ],
    "linker_set_key" : "android::details::TVec3<float>::no_init",
    "name" : "android::details::TVec3<float>::no_init",
-   "referenced_type" : "type-1412",
-   "self_type" : "type-1412",
+   "referenced_type" : "type-1414",
+   "self_type" : "type-1414",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec3IfE7no_initE"
   },
   {
@@ -2383,11 +2380,11 @@
    ],
    "linker_set_key" : "android::details::TVec4<double>::no_init",
    "name" : "android::details::TVec4<double>::no_init",
-   "referenced_type" : "type-148",
-   "self_type" : "type-148",
+   "referenced_type" : "type-137",
+   "self_type" : "type-137",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec4IdE7no_initE"
   },
   {
@@ -2401,11 +2398,11 @@
    ],
    "linker_set_key" : "android::details::TVec4<float>::no_init",
    "name" : "android::details::TVec4<float>::no_init",
-   "referenced_type" : "type-309",
-   "self_type" : "type-309",
+   "referenced_type" : "type-304",
+   "self_type" : "type-304",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec4IfE7no_initE"
   },
   {
@@ -2420,11 +2417,11 @@
    ],
    "linker_set_key" : "android::half::Binary",
    "name" : "android::half::Binary",
-   "referenced_type" : "type-403",
-   "self_type" : "type-403",
+   "referenced_type" : "type-399",
+   "self_type" : "type-399",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android4half6BinaryE"
   },
   {
@@ -2450,7 +2447,7 @@
    "self_type" : "type-1321",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware21HidlReturnRestrictionE"
   },
   {
@@ -2472,7 +2469,7 @@
    "self_type" : "type-1129",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android8hardware8MQFlavorE"
   },
   {
@@ -2494,11 +2491,11 @@
    ],
    "linker_set_key" : "android::hardware::ProcessState::CallRestriction",
    "name" : "android::hardware::ProcessState::CallRestriction",
-   "referenced_type" : "type-276",
-   "self_type" : "type-276",
+   "referenced_type" : "type-272",
+   "self_type" : "type-272",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware12ProcessState15CallRestrictionE"
   },
   {
@@ -2552,7 +2549,7 @@
    "self_type" : "type-1308",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware6Status9ExceptionE"
   },
   {
@@ -2606,7 +2603,7 @@
    "self_type" : "type-1223",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentor20InstrumentationEventE"
   },
   {
@@ -2708,11 +2705,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_0::BufferUsage",
-   "referenced_type" : "type-150",
-   "self_type" : "type-150",
+   "referenced_type" : "type-153",
+   "self_type" : "type-153",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_011BufferUsageE"
   },
   {
@@ -2766,7 +2763,7 @@
    "self_type" : "type-1140",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09ColorModeE"
   },
   {
@@ -2808,7 +2805,7 @@
    "self_type" : "type-1141",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_014ColorTransformE"
   },
   {
@@ -3050,7 +3047,7 @@
    "self_type" : "type-1139",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09DataspaceE"
   },
   {
@@ -3076,7 +3073,7 @@
    "self_type" : "type-1143",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_03HdrE"
   },
   {
@@ -3170,7 +3167,7 @@
    "self_type" : "type-1137",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_011PixelFormatE"
   },
   {
@@ -3204,7 +3201,7 @@
    "self_type" : "type-1138",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09TransformE"
   },
   {
@@ -3314,11 +3311,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_1::BufferUsage",
-   "referenced_type" : "type-158",
-   "self_type" : "type-158",
+   "referenced_type" : "type-160",
+   "self_type" : "type-160",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_111BufferUsageE"
   },
   {
@@ -3384,7 +3381,7 @@
    "self_type" : "type-1170",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_19ColorModeE"
   },
   {
@@ -3642,7 +3639,7 @@
    "self_type" : "type-1169",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_19DataspaceE"
   },
   {
@@ -3764,7 +3761,7 @@
    "self_type" : "type-1168",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_111PixelFormatE"
   },
   {
@@ -3794,7 +3791,7 @@
    "self_type" : "type-1171",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_112RenderIntentE"
   },
   {
@@ -3908,11 +3905,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_2::BufferUsage",
-   "referenced_type" : "type-420",
-   "self_type" : "type-420",
+   "referenced_type" : "type-417",
+   "self_type" : "type-417",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_211BufferUsageE"
   },
   {
@@ -3982,7 +3979,7 @@
    "self_type" : "type-1192",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_29ColorModeE"
   },
   {
@@ -4256,7 +4253,7 @@
    "self_type" : "type-1191",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_29DataspaceE"
   },
   {
@@ -4286,7 +4283,7 @@
    "self_type" : "type-1190",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_23HdrE"
   },
   {
@@ -4412,7 +4409,7 @@
    "self_type" : "type-1194",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_211PixelFormatE"
   },
   {
@@ -4434,11 +4431,11 @@
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-164",
-   "self_type" : "type-164",
+   "referenced_type" : "type-167",
+   "self_type" : "type-167",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfo12ArchitectureE"
   },
   {
@@ -4476,11 +4473,11 @@
    ],
    "linker_set_key" : "android::ui::Transform::orientation_flags",
    "name" : "android::ui::Transform::orientation_flags",
-   "referenced_type" : "type-2289",
-   "self_type" : "type-2289",
+   "referenced_type" : "type-2291",
+   "self_type" : "type-2291",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android2ui9Transform17orientation_flagsE"
   },
   {
@@ -4510,11 +4507,11 @@
    ],
    "linker_set_key" : "android::ui::Transform::type_mask",
    "name" : "android::ui::Transform::type_mask",
-   "referenced_type" : "type-2290",
-   "self_type" : "type-2290",
+   "referenced_type" : "type-2292",
+   "self_type" : "type-2292",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android2ui9Transform9type_maskE"
   },
   {
@@ -4564,7 +4561,7 @@
    "self_type" : "type-1257",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_LogPriority"
   },
   {
@@ -4618,7 +4615,7 @@
    "self_type" : "type-1212",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_color_mode_t"
   },
   {
@@ -4644,7 +4641,7 @@
    "self_type" : "type-1217",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_color_mode_v1_1_t"
   },
   {
@@ -4686,7 +4683,7 @@
    "self_type" : "type-1213",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_color_transform_t"
   },
   {
@@ -4928,7 +4925,7 @@
    "self_type" : "type-1211",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_dataspace_t"
   },
   {
@@ -4958,7 +4955,7 @@
    "self_type" : "type-1216",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_dataspace_v1_1_t"
   },
   {
@@ -4988,7 +4985,7 @@
    "self_type" : "type-1221",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_dataspace_v1_2_t"
   },
   {
@@ -5030,7 +5027,7 @@
    "self_type" : "type-1225",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_flex_component"
   },
   {
@@ -5068,7 +5065,7 @@
    "self_type" : "type-1227",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_flex_format"
   },
   {
@@ -5094,7 +5091,7 @@
    "self_type" : "type-1214",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_hdr_t"
   },
   {
@@ -5112,7 +5109,7 @@
    "self_type" : "type-1220",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_hdr_v1_2_t"
   },
   {
@@ -5142,7 +5139,7 @@
    "self_type" : "type-1224",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTS25android_pixel_format_sw_t"
   },
   {
@@ -5236,7 +5233,7 @@
    "self_type" : "type-1209",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_pixel_format_t"
   },
   {
@@ -5278,7 +5275,7 @@
    "self_type" : "type-1215",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_pixel_format_v1_1_t"
   },
   {
@@ -5296,7 +5293,7 @@
    "self_type" : "type-1222",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_pixel_format_v1_2_t"
   },
   {
@@ -5326,7 +5323,7 @@
    "self_type" : "type-1219",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_render_intent_v1_1_t"
   },
   {
@@ -5360,7 +5357,7 @@
    "self_type" : "type-1210",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_transform_t"
   },
   {
@@ -5414,7 +5411,7 @@
    "self_type" : "type-1258",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "log_id"
   }
  ],
@@ -5427,18 +5424,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-272"
+     "referenced_type" : "type-268"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
-   "referenced_type" : "type-271",
+   "referenced_type" : "type-267",
    "return_type" : "type-6",
-   "self_type" : "type-271",
+   "self_type" : "type-267",
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
   {
@@ -5451,11 +5448,11 @@
      "referenced_type" : "type-604"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
    "referenced_type" : "type-606",
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "self_type" : "type-606",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -5469,26 +5466,26 @@
      "referenced_type" : "type-604"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-343"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
    "referenced_type" : "type-603",
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "self_type" : "type-603",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -5499,15 +5496,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "referenced_type" : "type-580",
-   "return_type" : "type-103",
-   "self_type" : "type-580",
+   "referenced_type" : "type-578",
+   "return_type" : "type-105",
+   "self_type" : "type-578",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5517,18 +5514,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "referenced_type" : "type-592",
-   "return_type" : "type-103",
-   "self_type" : "type-592",
+   "referenced_type" : "type-590",
+   "return_type" : "type-105",
+   "self_type" : "type-590",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5538,33 +5535,33 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "referenced_type" : "type-588",
-   "return_type" : "type-103",
-   "self_type" : "type-588",
+   "referenced_type" : "type-586",
+   "return_type" : "type-105",
+   "self_type" : "type-586",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5574,36 +5571,36 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-595",
-   "return_type" : "type-103",
-   "self_type" : "type-595",
+   "referenced_type" : "type-593",
+   "return_type" : "type-105",
+   "self_type" : "type-593",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5613,33 +5610,33 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     }
    ],
-   "referenced_type" : "type-584",
-   "return_type" : "type-103",
-   "self_type" : "type-584",
+   "referenced_type" : "type-582",
+   "return_type" : "type-105",
+   "self_type" : "type-582",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5649,36 +5646,93 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-590",
-   "return_type" : "type-103",
-   "self_type" : "type-590",
+   "referenced_type" : "type-588",
+   "return_type" : "type-105",
+   "self_type" : "type-588",
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "name" : "int (const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-579"
+    },
+    {
+     "referenced_type" : "type-145"
+    },
+    {
+     "referenced_type" : "type-124"
+    },
+    {
+     "referenced_type" : "type-124"
+    }
+   ],
+   "referenced_type" : "type-595",
+   "return_type" : "type-105",
+   "self_type" : "type-595",
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "name" : "int (const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-579"
+    },
+    {
+     "referenced_type" : "type-145"
+    },
+    {
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-105"
+    },
+    {
+     "referenced_type" : "type-105"
+    },
+    {
+     "referenced_type" : "type-125"
+    }
+   ],
+   "referenced_type" : "type-597",
+   "return_type" : "type-105",
+   "self_type" : "type-597",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5688,15 +5742,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-586",
-   "return_type" : "type-103",
-   "self_type" : "type-586",
+   "referenced_type" : "type-584",
+   "return_type" : "type-105",
+   "self_type" : "type-584",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5706,18 +5760,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-554"
+     "referenced_type" : "type-551"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
-     "referenced_type" : "type-556"
+     "referenced_type" : "type-553"
     }
    ],
-   "referenced_type" : "type-553",
-   "return_type" : "type-103",
-   "self_type" : "type-553",
+   "referenced_type" : "type-550",
+   "return_type" : "type-105",
+   "self_type" : "type-550",
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
   {
@@ -5727,12 +5781,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     }
    ],
-   "referenced_type" : "type-573",
-   "return_type" : "type-103",
-   "self_type" : "type-573",
+   "referenced_type" : "type-570",
+   "return_type" : "type-105",
+   "self_type" : "type-570",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5742,15 +5796,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "referenced_type" : "type-571",
-   "return_type" : "type-103",
-   "self_type" : "type-571",
+   "referenced_type" : "type-568",
+   "return_type" : "type-105",
+   "self_type" : "type-568",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5760,15 +5814,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-566",
-   "return_type" : "type-103",
-   "self_type" : "type-566",
+   "referenced_type" : "type-563",
+   "return_type" : "type-105",
+   "self_type" : "type-563",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5778,24 +5832,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-569",
-   "return_type" : "type-103",
-   "self_type" : "type-569",
+   "referenced_type" : "type-566",
+   "return_type" : "type-105",
+   "self_type" : "type-566",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5805,12 +5859,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-557"
+     "referenced_type" : "type-554"
     }
    ],
-   "referenced_type" : "type-561",
-   "return_type" : "type-103",
-   "self_type" : "type-561",
+   "referenced_type" : "type-558",
+   "return_type" : "type-105",
+   "self_type" : "type-558",
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
   {
@@ -5820,12 +5874,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
-   "referenced_type" : "type-249",
-   "return_type" : "type-103",
-   "self_type" : "type-249",
+   "referenced_type" : "type-251",
+   "return_type" : "type-105",
+   "self_type" : "type-251",
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
   {
@@ -5838,14 +5892,14 @@
      "referenced_type" : "type-604"
     },
     {
-     "referenced_type" : "type-576"
+     "referenced_type" : "type-573"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "referenced_type" : "type-608",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "self_type" : "type-608",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -5856,27 +5910,27 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-222"
-    },
-    {
-     "referenced_type" : "type-223"
-    },
-    {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-224"
     },
     {
      "referenced_type" : "type-225"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-227"
+    },
+    {
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-229"
     }
    ],
-   "referenced_type" : "type-221",
-   "return_type" : "type-151",
-   "self_type" : "type-221",
+   "referenced_type" : "type-223",
+   "return_type" : "type-154",
+   "self_type" : "type-223",
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
   {
@@ -5886,12 +5940,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-522"
+     "referenced_type" : "type-520"
     }
    ],
-   "referenced_type" : "type-521",
-   "return_type" : "type-151",
-   "self_type" : "type-521",
+   "referenced_type" : "type-519",
+   "return_type" : "type-154",
+   "self_type" : "type-519",
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
   {
@@ -5901,18 +5955,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     },
     {
-     "referenced_type" : "type-576"
+     "referenced_type" : "type-573"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-575",
-   "return_type" : "type-151",
-   "self_type" : "type-575",
+   "referenced_type" : "type-572",
+   "return_type" : "type-154",
+   "self_type" : "type-572",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   }
  ],
@@ -5927,7 +5981,7 @@
      "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-1433",
+   "return_type" : "type-1436",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5939,7 +5993,7 @@
      "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-1434",
+   "return_type" : "type-1437",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5951,7 +6005,7 @@
      "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-1435",
+   "return_type" : "type-1438",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5963,7 +6017,7 @@
      "referenced_type" : "type-1192"
     }
    ],
-   "return_type" : "type-1436",
+   "return_type" : "type-1439",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5975,7 +6029,7 @@
      "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-1437",
+   "return_type" : "type-1440",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5984,10 +6038,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-1438",
+   "return_type" : "type-1441",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5999,7 +6053,7 @@
      "referenced_type" : "type-1171"
     }
    ],
-   "return_type" : "type-1439",
+   "return_type" : "type-1442",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -6011,7 +6065,7 @@
      "referenced_type" : "type-1213"
     }
    ],
-   "return_type" : "type-1440",
+   "return_type" : "type-1443",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -6023,7 +6077,7 @@
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-1441",
+   "return_type" : "type-1444",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -6110,7 +6164,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1042"
@@ -6119,7 +6173,7 @@
      "referenced_type" : "type-1042"
     }
    ],
-   "return_type" : "type-1442",
+   "return_type" : "type-1445",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6129,10 +6183,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6141,14 +6195,14 @@
      "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-1030"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1443"
+     "referenced_type" : "type-1446"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6158,10 +6212,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6171,18 +6225,18 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1444"
+     "referenced_type" : "type-1447"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1445"
+     "referenced_type" : "type-1448"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1446"
+     "referenced_type" : "type-1449"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6192,10 +6246,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6208,10 +6262,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1447"
+     "referenced_type" : "type-1450"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6221,23 +6275,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-1030"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1448"
+     "referenced_type" : "type-1451"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6247,28 +6301,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1449"
+     "referenced_type" : "type-1452"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1450"
+     "referenced_type" : "type-1453"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1451"
+     "referenced_type" : "type-1454"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6278,23 +6332,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
      "referenced_type" : "type-10"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1452"
+     "referenced_type" : "type-1455"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6304,10 +6358,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6316,14 +6370,14 @@
      "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-1030"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1453"
+     "referenced_type" : "type-1456"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6333,10 +6387,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6346,18 +6400,18 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1454"
+     "referenced_type" : "type-1457"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1455"
+     "referenced_type" : "type-1458"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1456"
+     "referenced_type" : "type-1459"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6367,10 +6421,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6383,10 +6437,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1457"
+     "referenced_type" : "type-1460"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6396,23 +6450,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-1030"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1458"
+     "referenced_type" : "type-1461"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6422,28 +6476,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1459"
+     "referenced_type" : "type-1462"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1460"
+     "referenced_type" : "type-1463"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1464"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6453,23 +6507,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
      "referenced_type" : "type-10"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1462"
+     "referenced_type" : "type-1465"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6479,16 +6533,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1427"
+     "referenced_type" : "type-1431"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
   {
@@ -6497,10 +6551,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/PixelFormat.h"
   },
   {
@@ -6510,10 +6564,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1400"
+     "referenced_type" : "type-1404"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -6523,13 +6577,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1400"
+     "referenced_type" : "type-1404"
     },
     {
-     "referenced_type" : "type-1401"
+     "referenced_type" : "type-1405"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -6539,25 +6593,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6568,10 +6622,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6581,13 +6635,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6598,28 +6652,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-1463"
+     "referenced_type" : "type-1466"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6630,34 +6684,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-629"
+     "referenced_type" : "type-630"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6667,19 +6721,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6689,22 +6743,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6714,16 +6768,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-1464"
+     "referenced_type" : "type-1467"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6733,22 +6787,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "return_type" : "type-6",
@@ -6761,10 +6815,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-621",
+   "return_type" : "type-622",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6773,10 +6827,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-621"
+     "referenced_type" : "type-622"
     }
    ],
-   "return_type" : "type-680",
+   "return_type" : "type-679",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6788,13 +6842,13 @@
      "referenced_type" : "type-628"
     }
    ],
-   "return_type" : "type-623",
+   "return_type" : "type-624",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
    "function_name" : "android::GraphicBuffer::dumpAllocationsToSystemLog",
    "linker_set_key" : "_ZN7android13GraphicBuffer26dumpAllocationsToSystemLogEv",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6806,7 +6860,7 @@
      "referenced_type" : "type-636"
     }
    ],
-   "return_type" : "type-679",
+   "return_type" : "type-678",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6816,24 +6870,24 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6843,27 +6897,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6873,10 +6927,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6886,27 +6940,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6916,30 +6970,30 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6949,33 +7003,33 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6985,16 +7039,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7004,19 +7058,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7026,7 +7080,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
      "referenced_type" : "type-1251"
@@ -7041,7 +7095,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7051,34 +7105,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-629"
+     "referenced_type" : "type-630"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7088,26 +7142,26 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1465"
+     "referenced_type" : "type-1468"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7117,25 +7171,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1132"
@@ -7144,7 +7198,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7154,29 +7208,29 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1466"
+     "referenced_type" : "type-1469"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7186,10 +7240,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7199,34 +7253,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-629"
+     "referenced_type" : "type-630"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7236,26 +7290,26 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1467"
+     "referenced_type" : "type-1470"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7265,25 +7319,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1132"
@@ -7292,7 +7346,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7302,29 +7356,29 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1468"
+     "referenced_type" : "type-1471"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7334,10 +7388,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7348,10 +7402,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7362,10 +7416,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7376,10 +7430,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7388,16 +7442,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/PixelFormat.h"
   },
   {
    "function_name" : "android::Gralloc2Mapper::preload",
    "linker_set_key" : "_ZN7android14Gralloc2Mapper7preloadEv",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7407,10 +7461,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-343"
+     "referenced_type" : "type-340"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7420,10 +7474,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-343"
+     "referenced_type" : "type-340"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7439,10 +7493,10 @@
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7458,7 +7512,7 @@
      "referenced_type" : "type-970"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7474,7 +7528,7 @@
      "referenced_type" : "type-970"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7487,7 +7541,7 @@
      "referenced_type" : "type-966"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7500,7 +7554,7 @@
      "referenced_type" : "type-966"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7526,13 +7580,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-360"
+     "referenced_type" : "type-357"
     },
     {
-     "referenced_type" : "type-354"
+     "referenced_type" : "type-351"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7542,13 +7596,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-360"
+     "referenced_type" : "type-357"
     },
     {
-     "referenced_type" : "type-354"
+     "referenced_type" : "type-351"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7567,7 +7621,7 @@
      "referenced_type" : "type-1042"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -7586,7 +7640,7 @@
      "referenced_type" : "type-1042"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -7596,16 +7650,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1405"
+     "referenced_type" : "type-1409"
     },
     {
      "referenced_type" : "type-1361"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -7616,10 +7670,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1405"
+     "referenced_type" : "type-1409"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -7629,13 +7683,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1405"
+     "referenced_type" : "type-1409"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-1469",
+   "return_type" : "type-1472",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -7645,19 +7699,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
    "function_name" : "android::GraphicBufferMapper::preloadHal",
    "linker_set_key" : "_ZN7android19GraphicBufferMapper10preloadHalEv",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7667,28 +7721,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-350"
+     "referenced_type" : "type-347"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7698,16 +7752,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7717,34 +7771,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-343"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7754,25 +7808,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7782,19 +7836,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7804,30 +7858,30 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7837,13 +7891,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7853,33 +7907,33 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7889,36 +7943,36 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7928,22 +7982,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7954,10 +8008,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7968,10 +8022,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7980,16 +8034,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2298"
+     "referenced_type" : "type-2300"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/UiConfig.h"
   },
   {
    "function_name" : "android::GraphicBufferAllocator::dumpToSystemLog",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocator15dumpToSystemLogEv",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -7999,13 +8053,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -8015,93 +8069,93 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-126"
+    },
+    {
+     "referenced_type" : "type-343"
     },
     {
      "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-122"
-    },
-    {
-     "referenced_type" : "type-124"
-    },
-    {
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorC1Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorC2Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::~GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorD1Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::~GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorD2Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -8114,7 +8168,7 @@
      "referenced_type" : "type-1359"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -8127,7 +8181,7 @@
      "referenced_type" : "type-1359"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -8137,7 +8191,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     },
     {
      "referenced_type" : "type-10"
@@ -8146,7 +8200,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8156,7 +8210,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     },
     {
      "referenced_type" : "type-10"
@@ -8171,7 +8225,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8181,10 +8235,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-10"
@@ -8193,7 +8247,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8203,10 +8257,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8242,13 +8296,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     },
     {
-     "referenced_type" : "type-2288"
+     "referenced_type" : "type-2290"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8258,13 +8312,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8274,10 +8328,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8287,13 +8341,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     },
     {
-     "referenced_type" : "type-2288"
+     "referenced_type" : "type-2290"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8303,13 +8357,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8319,10 +8373,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8332,10 +8386,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8345,10 +8399,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8358,13 +8412,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     },
     {
-     "referenced_type" : "type-2288"
+     "referenced_type" : "type-2290"
     }
    ],
-   "return_type" : "type-2292",
+   "return_type" : "type-2294",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8377,7 +8431,7 @@
      "referenced_type" : "type-1296"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
   },
   {
@@ -8390,16 +8444,16 @@
      "referenced_type" : "type-1296"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1300",
@@ -8415,10 +8469,10 @@
      "referenced_type" : "type-1296"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1300",
@@ -8434,10 +8488,10 @@
      "referenced_type" : "type-1296"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1300",
@@ -8453,10 +8507,10 @@
      "referenced_type" : "type-1358"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8469,10 +8523,10 @@
      "referenced_type" : "type-1358"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8481,7 +8535,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "referenced_type" : "type-1361"
@@ -8499,7 +8553,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-889"
+     "referenced_type" : "type-879"
     },
     {
      "referenced_type" : "type-1361"
@@ -8533,7 +8587,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8549,7 +8603,7 @@
      "referenced_type" : "type-1341"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8562,10 +8616,10 @@
      "referenced_type" : "type-1358"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8581,7 +8635,7 @@
      "referenced_type" : "type-1341"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8594,10 +8648,10 @@
      "referenced_type" : "type-1358"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8607,13 +8661,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8623,13 +8677,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8639,19 +8693,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8662,16 +8716,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8682,22 +8736,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8708,16 +8762,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8727,16 +8781,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8746,10 +8800,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8759,22 +8813,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8784,19 +8838,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2225"
+     "referenced_type" : "type-2228"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8806,25 +8860,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2225"
+     "referenced_type" : "type-2228"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8834,19 +8888,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2225"
+     "referenced_type" : "type-2228"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8856,25 +8910,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2225"
+     "referenced_type" : "type-2228"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8883,10 +8937,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2221",
+   "return_type" : "type-2224",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8896,13 +8950,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8912,16 +8966,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8931,16 +8985,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8950,10 +9004,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8963,13 +9017,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8979,13 +9033,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8995,19 +9049,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9017,13 +9071,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9033,13 +9087,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9049,19 +9103,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9071,13 +9125,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9087,13 +9141,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9103,19 +9157,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9125,10 +9179,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "default_arg" : true,
@@ -9145,7 +9199,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-10"
@@ -9154,7 +9208,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9164,19 +9218,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2225"
+     "referenced_type" : "type-2228"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9186,16 +9240,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2225"
+     "referenced_type" : "type-2228"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9205,16 +9259,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9224,13 +9278,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9240,13 +9294,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9256,10 +9310,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9269,13 +9323,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9285,13 +9339,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9301,10 +9355,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9314,10 +9368,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9327,10 +9381,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9340,13 +9394,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9356,10 +9410,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     }
    ],
-   "return_type" : "type-284",
+   "return_type" : "type-12",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9369,13 +9423,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9385,13 +9439,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-1394"
+     "referenced_type" : "type-1398"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9401,7 +9455,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
      "referenced_type" : "type-1251"
@@ -9416,7 +9470,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9426,13 +9480,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9442,13 +9496,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9458,13 +9512,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9474,13 +9528,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9490,13 +9544,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-1410"
+     "referenced_type" : "type-1415"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9506,13 +9560,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9523,7 +9577,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
      "referenced_type" : "type-1361"
@@ -9532,7 +9586,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9542,13 +9596,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9558,13 +9612,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-1410"
+     "referenced_type" : "type-1415"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9574,13 +9628,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9591,7 +9645,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
      "referenced_type" : "type-1361"
@@ -9600,7 +9654,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9610,25 +9664,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
    "function_name" : "android::Singleton<android::GraphicBufferMapper>::getInstance",
    "linker_set_key" : "_ZN7android9SingletonINS_19GraphicBufferMapperEE11getInstanceEv",
-   "return_type" : "type-526",
+   "return_type" : "type-524",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "function_name" : "android::Singleton<android::GraphicBufferAllocator>::getInstance",
    "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11getInstanceEv",
-   "return_type" : "type-544",
+   "return_type" : "type-541",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
@@ -9638,7 +9692,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1429"
+     "referenced_type" : "type-1433"
     }
    ],
    "return_type" : "type-6",
@@ -9651,10 +9705,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1429"
+     "referenced_type" : "type-1433"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
   {
@@ -9664,16 +9718,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1429"
+     "referenced_type" : "type-1433"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
   {
@@ -9693,7 +9747,7 @@
      "referenced_type" : "type-1119"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9707,13 +9761,13 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9727,13 +9781,13 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9747,16 +9801,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9770,16 +9824,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9793,16 +9847,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9816,16 +9870,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9835,10 +9889,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9848,28 +9902,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-350"
+     "referenced_type" : "type-347"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9879,7 +9933,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
    "return_type" : "type-636",
@@ -9892,10 +9946,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9905,7 +9959,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
    "return_type" : "type-628",
@@ -9918,7 +9972,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     },
     {
      "referenced_type" : "type-1249"
@@ -9933,7 +9987,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9943,10 +9997,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9956,13 +10010,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -9972,28 +10026,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-350"
+     "referenced_type" : "type-347"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10003,16 +10057,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
      "referenced_type" : "type-1122"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-343"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10022,16 +10076,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10041,19 +10095,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10063,31 +10117,31 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10098,13 +10152,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-351"
+     "referenced_type" : "type-348"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10114,25 +10168,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10142,31 +10196,31 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10176,13 +10230,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10192,7 +10246,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     }
    ],
    "return_type" : "type-6",
@@ -10205,10 +10259,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-973"
+     "referenced_type" : "type-974"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -10218,16 +10272,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-973"
+     "referenced_type" : "type-974"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -10237,10 +10291,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-362"
+     "referenced_type" : "type-359"
     }
    ],
-   "return_type" : "type-1566",
+   "return_type" : "type-1569",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10250,34 +10304,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-362"
+     "referenced_type" : "type-359"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-126"
+    },
+    {
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-123"
-    },
-    {
-     "referenced_type" : "type-122"
-    },
-    {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-343"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10287,7 +10341,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-362"
+     "referenced_type" : "type-359"
     }
    ],
    "return_type" : "type-6",
@@ -10300,10 +10354,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-721"
+     "referenced_type" : "type-722"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -10313,13 +10367,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-721"
+     "referenced_type" : "type-722"
     },
     {
      "referenced_type" : "type-723"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -10329,13 +10383,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1241",
@@ -10348,7 +10402,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
    "return_type" : "type-6",
@@ -10361,10 +10415,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10374,7 +10428,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
    "return_type" : "type-10",
@@ -10387,7 +10441,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
    "return_type" : "type-10",
@@ -10400,7 +10454,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
    "return_type" : "type-10",
@@ -10413,7 +10467,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
    "return_type" : "type-10",
@@ -10426,13 +10480,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10442,16 +10496,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
-    },
-    {
      "referenced_type" : "type-2293"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-2295"
+    },
+    {
+     "referenced_type" : "type-283"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10462,10 +10516,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10475,10 +10529,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10488,10 +10542,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
-   "return_type" : "type-2283",
+   "return_type" : "type-2286",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10501,10 +10555,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
-   "return_type" : "type-2276",
+   "return_type" : "type-2278",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10514,7 +10568,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
      "referenced_type" : "type-1246"
@@ -10534,13 +10588,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2221",
+   "return_type" : "type-2224",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10550,13 +10604,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
      "referenced_type" : "type-1050"
     }
    ],
-   "return_type" : "type-22",
+   "return_type" : "type-23",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10566,13 +10620,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
      "referenced_type" : "type-1054"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-18",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10582,7 +10636,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
      "referenced_type" : "type-1280"
@@ -10598,16 +10652,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-22",
+   "return_type" : "type-23",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10617,10 +10671,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "return_type" : "type-1054",
@@ -10633,13 +10687,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
-     "referenced_type" : "type-2288"
+     "referenced_type" : "type-2290"
     }
    ],
-   "return_type" : "type-2283",
+   "return_type" : "type-2286",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10687,13 +10741,13 @@
      "referenced_type" : "type-1299"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1241",
@@ -10757,7 +10811,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10770,7 +10824,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-284",
+   "return_type" : "type-12",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10783,7 +10837,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10796,7 +10850,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10821,7 +10875,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10831,13 +10885,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10847,13 +10901,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10863,19 +10917,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10885,10 +10939,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10898,10 +10952,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
    "return_type" : "type-6",
@@ -10914,7 +10968,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     }
    ],
    "return_type" : "type-1299",
@@ -10927,17 +10981,17 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10947,20 +11001,20 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2228"
+     "referenced_type" : "type-2231"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10970,7 +11024,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     }
    ],
    "return_type" : "type-1299",
@@ -10983,13 +11037,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10999,13 +11053,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11015,19 +11069,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11037,16 +11091,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11056,7 +11110,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
      "referenced_type" : "type-1284"
@@ -11072,13 +11126,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-6",
@@ -11091,10 +11145,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     }
    ],
    "return_type" : "type-1299",
@@ -11107,13 +11161,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11123,13 +11177,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11139,19 +11193,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11161,13 +11215,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11177,13 +11231,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11193,19 +11247,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11216,16 +11270,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11236,22 +11290,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11262,16 +11316,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11281,16 +11335,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11301,16 +11355,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2219"
+     "referenced_type" : "type-2222"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11321,16 +11375,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2219"
+     "referenced_type" : "type-2222"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11341,19 +11395,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2219"
+     "referenced_type" : "type-2222"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11364,19 +11418,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2219"
+     "referenced_type" : "type-2222"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11387,19 +11441,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2219"
+     "referenced_type" : "type-2222"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11410,19 +11464,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2219"
+     "referenced_type" : "type-2222"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11432,10 +11486,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1396"
+     "referenced_type" : "type-1400"
     }
    ],
-   "return_type" : "type-1383",
+   "return_type" : "type-1387",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11445,10 +11499,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1396"
+     "referenced_type" : "type-1400"
     }
    ],
-   "return_type" : "type-284",
+   "return_type" : "type-12",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11458,7 +11512,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1396"
+     "referenced_type" : "type-1400"
     }
    ],
    "return_type" : "type-6",
@@ -11471,10 +11525,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1394"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11484,10 +11538,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1394"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11497,7 +11551,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1394"
     },
     {
      "referenced_type" : "type-1249"
@@ -11512,24 +11566,24 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   }
  ],
  "global_vars" :
  [
   {
-   "access" : "private",
+   "access" : "protected",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocator10sAllocListE",
    "name" : "android::GraphicBufferAllocator::sAllocList",
-   "referenced_type" : "type-1570",
+   "referenced_type" : "type-1573",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocator5sLockE",
    "name" : "android::GraphicBufferAllocator::sLock",
-   "referenced_type" : "type-252",
+   "referenced_type" : "type-280",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -11565,41 +11619,41 @@
   {
    "linker_set_key" : "_ZN7android6Region14INVALID_REGIONE",
    "name" : "android::Region::INVALID_REGION",
-   "referenced_type" : "type-2220",
+   "referenced_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
    "linker_set_key" : "_ZN7android9FenceTime8NO_FENCEE",
    "name" : "android::FenceTime::NO_FENCE",
-   "referenced_type" : "type-1391",
+   "referenced_type" : "type-1395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_19GraphicBufferMapperEE5sLockE",
    "name" : "android::Singleton<android::GraphicBufferMapper>::sLock",
-   "referenced_type" : "type-252",
+   "referenced_type" : "type-280",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_19GraphicBufferMapperEE9sInstanceE",
    "name" : "android::Singleton<android::GraphicBufferMapper>::sInstance",
-   "referenced_type" : "type-539",
+   "referenced_type" : "type-537",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE5sLockE",
    "name" : "android::Singleton<android::GraphicBufferAllocator>::sLock",
-   "referenced_type" : "type-252",
+   "referenced_type" : "type-280",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE9sInstanceE",
    "name" : "android::Singleton<android::GraphicBufferAllocator>::sInstance",
-   "referenced_type" : "type-545",
+   "referenced_type" : "type-542",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   }
  ],
@@ -11609,8 +11663,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot &",
    "name" : "android::FenceTime::Snapshot &",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1387",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1392",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -11618,8 +11672,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot::State &",
    "name" : "android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1408",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1412",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -11627,8 +11681,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferAllocator &",
    "name" : "android::GraphicBufferAllocator &",
-   "referenced_type" : "type-542",
-   "self_type" : "type-544",
+   "referenced_type" : "type-539",
+   "self_type" : "type-541",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -11636,8 +11690,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-527",
-   "self_type" : "type-526",
+   "referenced_type" : "type-525",
+   "self_type" : "type-524",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -11654,8 +11708,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex &",
    "name" : "android::Mutex &",
-   "referenced_type" : "type-252",
-   "self_type" : "type-256",
+   "referenced_type" : "type-280",
+   "self_type" : "type-1379",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -11672,8 +11726,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock &",
    "name" : "android::RWLock &",
-   "referenced_type" : "type-262",
-   "self_type" : "type-266",
+   "referenced_type" : "type-258",
+   "self_type" : "type-262",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -11690,8 +11744,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Region &",
    "name" : "android::Region &",
-   "referenced_type" : "type-2221",
-   "self_type" : "type-2225",
+   "referenced_type" : "type-2224",
+   "self_type" : "type-2228",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -11699,8 +11753,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
-   "referenced_type" : "type-179",
-   "self_type" : "type-188",
+   "referenced_type" : "type-182",
+   "self_type" : "type-190",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -11708,8 +11762,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
-   "referenced_type" : "type-285",
-   "self_type" : "type-890",
+   "referenced_type" : "type-282",
+   "self_type" : "type-888",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -11717,8 +11771,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<android::Rect> &",
    "name" : "android::Vector<android::Rect> &",
-   "referenced_type" : "type-2213",
-   "self_type" : "type-2217",
+   "referenced_type" : "type-2216",
+   "self_type" : "type-2220",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -11735,8 +11789,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TMat44<float> &",
    "name" : "android::details::TMat44<float> &",
-   "referenced_type" : "type-2276",
-   "self_type" : "type-2282",
+   "referenced_type" : "type-2278",
+   "self_type" : "type-2285",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -11744,8 +11798,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TQuaternion<double> &",
    "name" : "android::details::TQuaternion<double> &",
-   "referenced_type" : "type-331",
-   "self_type" : "type-406",
+   "referenced_type" : "type-328",
+   "self_type" : "type-403",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -11753,8 +11807,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TQuaternion<float> &",
    "name" : "android::details::TQuaternion<float> &",
-   "referenced_type" : "type-410",
-   "self_type" : "type-438",
+   "referenced_type" : "type-407",
+   "self_type" : "type-435",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -11771,7 +11825,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec2<double> &",
    "name" : "android::details::TVec2<double> &",
-   "referenced_type" : "type-55",
+   "referenced_type" : "type-57",
    "self_type" : "type-1081",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -11780,7 +11834,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec2<float> &",
    "name" : "android::details::TVec2<float> &",
-   "referenced_type" : "type-22",
+   "referenced_type" : "type-23",
    "self_type" : "type-1048",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -11789,7 +11843,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<double> &",
    "name" : "android::details::TVec3<double> &",
-   "referenced_type" : "type-66",
+   "referenced_type" : "type-68",
    "self_type" : "type-1390",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
@@ -11798,7 +11852,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<float> &",
    "name" : "android::details::TVec3<float> &",
-   "referenced_type" : "type-17",
+   "referenced_type" : "type-18",
    "self_type" : "type-1052",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -11807,8 +11861,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<double> &",
    "name" : "android::details::TVec4<double> &",
-   "referenced_type" : "type-50",
-   "self_type" : "type-185",
+   "referenced_type" : "type-52",
+   "self_type" : "type-181",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -11816,8 +11870,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<float> &",
    "name" : "android::details::TVec4<float> &",
-   "referenced_type" : "type-200",
-   "self_type" : "type-330",
+   "referenced_type" : "type-192",
+   "self_type" : "type-327",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -11825,8 +11879,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &",
-   "referenced_type" : "type-99",
-   "self_type" : "type-108",
+   "referenced_type" : "type-101",
+   "self_type" : "type-110",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11834,8 +11888,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &",
-   "referenced_type" : "type-393",
-   "self_type" : "type-400",
+   "referenced_type" : "type-392",
+   "self_type" : "type-397",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11843,8 +11897,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &",
-   "referenced_type" : "type-111",
-   "self_type" : "type-114",
+   "referenced_type" : "type-113",
+   "self_type" : "type-116",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11861,7 +11915,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status &",
    "name" : "android::hardware::Status &",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1313",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -11870,8 +11924,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1658",
-   "self_type" : "type-1657",
+   "referenced_type" : "type-1662",
+   "self_type" : "type-1661",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11879,8 +11933,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1777",
-   "self_type" : "type-1776",
+   "referenced_type" : "type-1778",
+   "self_type" : "type-1777",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11888,8 +11942,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-230",
-   "self_type" : "type-229",
+   "referenced_type" : "type-232",
+   "self_type" : "type-231",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11897,8 +11951,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-2627",
-   "self_type" : "type-2626",
+   "referenced_type" : "type-2632",
+   "self_type" : "type-2631",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11906,8 +11960,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-2841",
-   "self_type" : "type-2840",
+   "referenced_type" : "type-2843",
+   "self_type" : "type-2842",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11915,8 +11969,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-2917",
-   "self_type" : "type-2916",
+   "referenced_type" : "type-2920",
+   "self_type" : "type-2919",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11924,8 +11978,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-431",
-   "self_type" : "type-430",
+   "referenced_type" : "type-428",
+   "self_type" : "type-427",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11933,8 +11987,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int> &",
    "name" : "android::hardware::details::hidl_pointer<unsigned int> &",
-   "referenced_type" : "type-120",
-   "self_type" : "type-178",
+   "referenced_type" : "type-122",
+   "self_type" : "type-180",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11951,8 +12005,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned int> &",
    "name" : "android::hardware::hidl_vec<unsigned int> &",
-   "referenced_type" : "type-128",
-   "self_type" : "type-131",
+   "referenced_type" : "type-131",
+   "self_type" : "type-133",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11970,7 +12024,7 @@
    "linker_set_key" : "android::sp<android::Fence> &",
    "name" : "android::sp<android::Fence> &",
    "referenced_type" : "type-1357",
-   "self_type" : "type-1411",
+   "self_type" : "type-1416",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11978,8 +12032,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &",
-   "referenced_type" : "type-355",
-   "self_type" : "type-377",
+   "referenced_type" : "type-352",
+   "self_type" : "type-374",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11987,8 +12041,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &",
-   "referenced_type" : "type-484",
-   "self_type" : "type-489",
+   "referenced_type" : "type-481",
+   "self_type" : "type-487",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11996,8 +12050,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &",
-   "referenced_type" : "type-338",
-   "self_type" : "type-385",
+   "referenced_type" : "type-335",
+   "self_type" : "type-382",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12005,8 +12059,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
-   "referenced_type" : "type-86",
-   "self_type" : "type-93",
+   "referenced_type" : "type-88",
+   "self_type" : "type-95",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12014,8 +12068,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &",
-   "referenced_type" : "type-497",
-   "self_type" : "type-503",
+   "referenced_type" : "type-494",
+   "self_type" : "type-500",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12023,8 +12077,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ui::Transform &",
    "name" : "android::ui::Transform &",
-   "referenced_type" : "type-2283",
-   "self_type" : "type-2292",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2294",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -12047,78 +12101,78 @@
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-2204",
+   "referenced_type" : "type-2206",
    "self_type" : "type-2230",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-2249",
-   "self_type" : "type-2251",
+   "referenced_type" : "type-2252",
+   "self_type" : "type-2254",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-2740",
-   "self_type" : "type-2742",
+   "referenced_type" : "type-2742",
+   "self_type" : "type-2744",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
    "referenced_type" : "type-3102",
-   "self_type" : "type-3134",
+   "self_type" : "type-3137",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-3368",
-   "self_type" : "type-3370",
+   "referenced_type" : "type-3371",
+   "self_type" : "type-3373",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-2139",
+   "referenced_type" : "type-2138",
    "self_type" : "type-2149",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-2273",
-   "self_type" : "type-2275",
+   "referenced_type" : "type-2275",
+   "self_type" : "type-2277",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-2731",
-   "self_type" : "type-2733",
+   "referenced_type" : "type-2733",
+   "self_type" : "type-2735",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-3015",
-   "self_type" : "type-3025",
+   "referenced_type" : "type-3014",
+   "self_type" : "type-3024",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-3378",
-   "self_type" : "type-3380",
+   "referenced_type" : "type-3381",
+   "self_type" : "type-3383",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-961",
-   "self_type" : "type-974",
+   "referenced_type" : "type-958",
+   "self_type" : "type-972",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
@@ -12134,7 +12188,7 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ColorSpace::TransferParameters &",
    "name" : "const android::ColorSpace::TransferParameters &",
-   "referenced_type" : "type-1033",
+   "referenced_type" : "type-1030",
    "self_type" : "type-1041",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
@@ -12143,8 +12197,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot &",
    "name" : "const android::FenceTime::Snapshot &",
-   "referenced_type" : "type-1388",
-   "self_type" : "type-1394",
+   "referenced_type" : "type-1393",
+   "self_type" : "type-1398",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -12152,8 +12206,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-1406",
-   "self_type" : "type-1407",
+   "referenced_type" : "type-1410",
+   "self_type" : "type-1411",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -12170,8 +12224,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Gralloc2Mapper &",
    "name" : "const android::Gralloc2Mapper &",
-   "referenced_type" : "type-344",
-   "self_type" : "type-354",
+   "referenced_type" : "type-341",
+   "self_type" : "type-351",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -12179,8 +12233,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-1875",
-   "self_type" : "type-1874",
+   "referenced_type" : "type-1877",
+   "self_type" : "type-1876",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12188,8 +12242,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-2009",
-   "self_type" : "type-2008",
+   "referenced_type" : "type-2012",
+   "self_type" : "type-2011",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12197,8 +12251,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-2015",
-   "self_type" : "type-2014",
+   "referenced_type" : "type-2018",
+   "self_type" : "type-2017",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12206,17 +12260,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-3028",
-   "self_type" : "type-3027",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::GrallocMapper &",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-3194",
-   "self_type" : "type-3193",
+   "referenced_type" : "type-3031",
+   "self_type" : "type-3030",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12233,6 +12278,15 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
+   "referenced_type" : "type-3201",
+   "self_type" : "type-3200",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GrallocMapper &",
+   "name" : "const android::GrallocMapper &",
    "referenced_type" : "type-612",
    "self_type" : "type-611",
    "size" : 4,
@@ -12242,8 +12296,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-802",
-   "self_type" : "type-801",
+   "referenced_type" : "type-803",
+   "self_type" : "type-802",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12251,8 +12305,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-827",
-   "self_type" : "type-826",
+   "referenced_type" : "type-828",
+   "self_type" : "type-827",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12261,7 +12315,7 @@
    "linker_set_key" : "const android::GraphicBufferAllocator::alloc_rec_t &",
    "name" : "const android::GraphicBufferAllocator::alloc_rec_t &",
    "referenced_type" : "type-706",
-   "self_type" : "type-707",
+   "self_type" : "type-708",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12269,8 +12323,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBufferMapper &",
    "name" : "const android::GraphicBufferMapper &",
-   "referenced_type" : "type-614",
-   "self_type" : "type-630",
+   "referenced_type" : "type-615",
+   "self_type" : "type-631",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -12296,8 +12350,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Region &",
    "name" : "const android::Region &",
-   "referenced_type" : "type-2220",
-   "self_type" : "type-2224",
+   "referenced_type" : "type-2223",
+   "self_type" : "type-2227",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -12305,8 +12359,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-184",
-   "self_type" : "type-187",
+   "referenced_type" : "type-187",
+   "self_type" : "type-189",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -12314,8 +12368,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 &",
    "name" : "const android::String8 &",
-   "referenced_type" : "type-873",
-   "self_type" : "type-889",
+   "referenced_type" : "type-863",
+   "self_type" : "type-879",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -12323,8 +12377,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::Rect> &",
    "name" : "const android::Vector<android::Rect> &",
-   "referenced_type" : "type-2215",
-   "self_type" : "type-2216",
+   "referenced_type" : "type-2218",
+   "self_type" : "type-2219",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -12332,8 +12386,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TMat33<float> &",
    "name" : "const android::details::TMat33<float> &",
-   "referenced_type" : "type-925",
-   "self_type" : "type-934",
+   "referenced_type" : "type-919",
+   "self_type" : "type-926",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -12341,8 +12395,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TMat44<float> &",
    "name" : "const android::details::TMat44<float> &",
-   "referenced_type" : "type-2280",
-   "self_type" : "type-2281",
+   "referenced_type" : "type-2283",
+   "self_type" : "type-2284",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -12350,8 +12404,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TQuaternion<double> &",
    "name" : "const android::details::TQuaternion<double> &",
-   "referenced_type" : "type-404",
-   "self_type" : "type-405",
+   "referenced_type" : "type-401",
+   "self_type" : "type-402",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -12359,8 +12413,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TQuaternion<float> &",
    "name" : "const android::details::TQuaternion<float> &",
-   "referenced_type" : "type-432",
-   "self_type" : "type-433",
+   "referenced_type" : "type-429",
+   "self_type" : "type-430",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -12413,8 +12467,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TVec4<double> &",
    "name" : "const android::details::TVec4<double> &",
-   "referenced_type" : "type-166",
-   "self_type" : "type-177",
+   "referenced_type" : "type-164",
+   "self_type" : "type-171",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -12422,8 +12476,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TVec4<float> &",
    "name" : "const android::details::TVec4<float> &",
-   "referenced_type" : "type-325",
-   "self_type" : "type-326",
+   "referenced_type" : "type-322",
+   "self_type" : "type-323",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -12431,8 +12485,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-231",
-   "self_type" : "type-232",
+   "referenced_type" : "type-233",
+   "self_type" : "type-234",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -12494,8 +12548,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned int> &",
    "name" : "const android::hardware::hidl_vec<unsigned int> &",
-   "referenced_type" : "type-132",
-   "self_type" : "type-133",
+   "referenced_type" : "type-134",
+   "self_type" : "type-135",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12513,7 +12567,7 @@
    "linker_set_key" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> &",
    "name" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> &",
    "referenced_type" : "type-693",
-   "self_type" : "type-695",
+   "self_type" : "type-698",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12530,8 +12584,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
    "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-273",
-   "self_type" : "type-272",
+   "referenced_type" : "type-269",
+   "self_type" : "type-268",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -12539,8 +12593,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
-   "referenced_type" : "type-91",
-   "self_type" : "type-92",
+   "referenced_type" : "type-93",
+   "self_type" : "type-94",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12566,8 +12620,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ui::Transform &",
    "name" : "const android::ui::Transform &",
-   "referenced_type" : "type-2286",
-   "self_type" : "type-2288",
+   "referenced_type" : "type-2289",
+   "self_type" : "type-2290",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -12575,7 +12629,7 @@
    "alignment" : 4,
    "linker_set_key" : "const bool &",
    "name" : "const bool &",
-   "referenced_type" : "type-370",
+   "referenced_type" : "type-367",
    "self_type" : "type-1276",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -12584,7 +12638,7 @@
    "alignment" : 4,
    "linker_set_key" : "const double &",
    "name" : "const double &",
-   "referenced_type" : "type-853",
+   "referenced_type" : "type-850",
    "self_type" : "type-859",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -12593,7 +12647,7 @@
    "alignment" : 4,
    "linker_set_key" : "const float &",
    "name" : "const float &",
-   "referenced_type" : "type-563",
+   "referenced_type" : "type-560",
    "self_type" : "type-1218",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -12608,44 +12662,44 @@
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-2256",
-   "self_type" : "type-2258",
+   "referenced_type" : "type-2259",
+   "self_type" : "type-2261",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-2262",
-   "self_type" : "type-2264",
+   "referenced_type" : "type-2264",
+   "self_type" : "type-2266",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-2743",
-   "self_type" : "type-2745",
+   "referenced_type" : "type-2745",
+   "self_type" : "type-2747",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-3178",
-   "self_type" : "type-3190",
+   "referenced_type" : "type-3177",
+   "self_type" : "type-3191",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-3371",
-   "self_type" : "type-3373",
+   "referenced_type" : "type-3374",
+   "self_type" : "type-3376",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const int &",
    "name" : "const int &",
-   "referenced_type" : "type-562",
-   "self_type" : "type-837",
+   "referenced_type" : "type-559",
+   "self_type" : "type-835",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12668,169 +12722,169 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-125",
-   "self_type" : "type-127",
+   "referenced_type" : "type-128",
+   "self_type" : "type-130",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1576",
-   "self_type" : "type-1578",
+   "referenced_type" : "type-1580",
+   "self_type" : "type-1582",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1611",
-   "self_type" : "type-1613",
+   "referenced_type" : "type-1616",
+   "self_type" : "type-1618",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1767",
-   "self_type" : "type-1769",
+   "referenced_type" : "type-1768",
+   "self_type" : "type-1770",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1892",
-   "self_type" : "type-1894",
+   "referenced_type" : "type-1894",
+   "self_type" : "type-1896",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1966",
-   "self_type" : "type-1968",
+   "referenced_type" : "type-1968",
+   "self_type" : "type-1970",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2042",
-   "self_type" : "type-2044",
+   "referenced_type" : "type-2046",
+   "self_type" : "type-2048",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2094",
-   "self_type" : "type-2096",
+   "referenced_type" : "type-2096",
+   "self_type" : "type-2098",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2156",
-   "self_type" : "type-2158",
+   "referenced_type" : "type-2158",
+   "self_type" : "type-2160",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2322",
-   "self_type" : "type-2324",
+   "referenced_type" : "type-2324",
+   "self_type" : "type-2326",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2545",
-   "self_type" : "type-2547",
+   "referenced_type" : "type-2550",
+   "self_type" : "type-2552",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2580",
-   "self_type" : "type-2582",
+   "referenced_type" : "type-2586",
+   "self_type" : "type-2588",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2755",
-   "self_type" : "type-2757",
+   "referenced_type" : "type-2757",
+   "self_type" : "type-2759",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2816",
-   "self_type" : "type-2818",
+   "referenced_type" : "type-2818",
+   "self_type" : "type-2820",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2835",
-   "self_type" : "type-2837",
+   "referenced_type" : "type-2837",
+   "self_type" : "type-2839",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2902",
-   "self_type" : "type-2904",
+   "referenced_type" : "type-2905",
+   "self_type" : "type-2907",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3048",
-   "self_type" : "type-3050",
+   "referenced_type" : "type-3051",
+   "self_type" : "type-3053",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3139",
-   "self_type" : "type-3142",
+   "referenced_type" : "type-3143",
+   "self_type" : "type-3146",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3216",
-   "self_type" : "type-3218",
+   "referenced_type" : "type-3219",
+   "self_type" : "type-3221",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3258",
-   "self_type" : "type-3260",
+   "referenced_type" : "type-3261",
+   "self_type" : "type-3263",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3309",
-   "self_type" : "type-3311",
+   "referenced_type" : "type-3312",
+   "self_type" : "type-3314",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3419",
-   "self_type" : "type-3421",
+   "referenced_type" : "type-3422",
+   "self_type" : "type-3424",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-36",
-   "self_type" : "type-39",
+   "referenced_type" : "type-39",
+   "self_type" : "type-41",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-416",
-   "self_type" : "type-418",
+   "referenced_type" : "type-413",
+   "self_type" : "type-415",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12843,15 +12897,15 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-747",
+   "referenced_type" : "type-748",
    "self_type" : "type-750",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-854",
-   "self_type" : "type-856",
+   "referenced_type" : "type-856",
+   "self_type" : "type-858",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12890,8 +12944,8 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle *const &",
    "name" : "const native_handle *const &",
-   "referenced_type" : "type-696",
-   "self_type" : "type-697",
+   "referenced_type" : "type-699",
+   "self_type" : "type-700",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12899,8 +12953,8 @@
    "alignment" : 4,
    "linker_set_key" : "const short &",
    "name" : "const short &",
-   "referenced_type" : "type-825",
-   "self_type" : "type-829",
+   "referenced_type" : "type-823",
+   "self_type" : "type-826",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12909,7 +12963,7 @@
    "linker_set_key" : "const signed char &",
    "name" : "const signed char &",
    "referenced_type" : "type-799",
-   "self_type" : "type-804",
+   "self_type" : "type-801",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12926,8 +12980,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3> &",
    "name" : "const std::array<android::details::TVec2<float>, 3> &",
-   "referenced_type" : "type-2201",
-   "self_type" : "type-2203",
+   "referenced_type" : "type-2203",
+   "self_type" : "type-2205",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12935,8 +12989,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3> &",
    "name" : "const std::array<android::details::TVec2<float>, 3> &",
-   "referenced_type" : "type-2737",
-   "self_type" : "type-2739",
+   "referenced_type" : "type-2739",
+   "self_type" : "type-2741",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12944,8 +12998,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3> &",
    "name" : "const std::array<android::details::TVec2<float>, 3> &",
-   "referenced_type" : "type-3090",
-   "self_type" : "type-3098",
+   "referenced_type" : "type-3089",
+   "self_type" : "type-3095",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12953,8 +13007,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1015",
-   "self_type" : "type-1029",
+   "referenced_type" : "type-1007",
+   "self_type" : "type-1021",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12962,8 +13016,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2182",
-   "self_type" : "type-2196",
+   "referenced_type" : "type-2176",
+   "self_type" : "type-2190",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12971,8 +13025,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2734",
-   "self_type" : "type-2736",
+   "referenced_type" : "type-2736",
+   "self_type" : "type-2738",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12980,8 +13034,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-3072",
-   "self_type" : "type-3082",
+   "referenced_type" : "type-3069",
+   "self_type" : "type-3083",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12998,8 +13052,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<float (float)> &",
    "name" : "const std::function<float (float)> &",
-   "referenced_type" : "type-2266",
-   "self_type" : "type-2287",
+   "referenced_type" : "type-2267",
+   "self_type" : "type-2280",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13007,8 +13061,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<float (float)> &",
    "name" : "const std::function<float (float)> &",
-   "referenced_type" : "type-2746",
-   "self_type" : "type-2748",
+   "referenced_type" : "type-2748",
+   "self_type" : "type-2750",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13016,7 +13070,7 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<float (float)> &",
    "name" : "const std::function<float (float)> &",
-   "referenced_type" : "type-3191",
+   "referenced_type" : "type-3194",
    "self_type" : "type-3196",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -13025,8 +13079,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-1391",
-   "self_type" : "type-1401",
+   "referenced_type" : "type-1395",
+   "self_type" : "type-1405",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13034,8 +13088,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-2513",
-   "self_type" : "type-2520",
+   "referenced_type" : "type-2518",
+   "self_type" : "type-2525",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13043,8 +13097,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-2808",
-   "self_type" : "type-2810",
+   "referenced_type" : "type-2810",
+   "self_type" : "type-2812",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13052,8 +13106,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-3610",
-   "self_type" : "type-3617",
+   "referenced_type" : "type-3616",
+   "self_type" : "type-3623",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13061,8 +13115,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> > &",
    "name" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> > &",
-   "referenced_type" : "type-2142",
-   "self_type" : "type-2144",
+   "referenced_type" : "type-2144",
+   "self_type" : "type-2146",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -13070,8 +13124,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> > &",
    "name" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> > &",
-   "referenced_type" : "type-3299",
-   "self_type" : "type-3301",
+   "referenced_type" : "type-3302",
+   "self_type" : "type-3304",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -13088,8 +13142,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1031",
-   "self_type" : "type-1030",
+   "referenced_type" : "type-1032",
+   "self_type" : "type-1031",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13106,8 +13160,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1581",
-   "self_type" : "type-1580",
+   "referenced_type" : "type-1585",
+   "self_type" : "type-1584",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13115,8 +13169,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1712",
-   "self_type" : "type-1711",
+   "referenced_type" : "type-1713",
+   "self_type" : "type-1712",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13124,8 +13178,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1818",
-   "self_type" : "type-1817",
+   "referenced_type" : "type-1819",
+   "self_type" : "type-1818",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13133,8 +13187,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1887",
-   "self_type" : "type-1886",
+   "referenced_type" : "type-1889",
+   "self_type" : "type-1888",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13142,8 +13196,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1951",
-   "self_type" : "type-1950",
+   "referenced_type" : "type-1953",
+   "self_type" : "type-1952",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13151,8 +13205,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2020",
-   "self_type" : "type-2019",
+   "referenced_type" : "type-2023",
+   "self_type" : "type-2022",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13160,8 +13214,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2137",
-   "self_type" : "type-2136",
+   "referenced_type" : "type-2141",
+   "self_type" : "type-2140",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13169,8 +13223,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2198",
-   "self_type" : "type-2197",
+   "referenced_type" : "type-2201",
+   "self_type" : "type-2200",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13178,8 +13232,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2416",
-   "self_type" : "type-2415",
+   "referenced_type" : "type-2418",
+   "self_type" : "type-2417",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13187,8 +13241,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2550",
-   "self_type" : "type-2549",
+   "referenced_type" : "type-2555",
+   "self_type" : "type-2554",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13196,8 +13250,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2681",
-   "self_type" : "type-2680",
+   "referenced_type" : "type-2683",
+   "self_type" : "type-2682",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13205,8 +13259,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2794",
-   "self_type" : "type-2793",
+   "referenced_type" : "type-2796",
+   "self_type" : "type-2795",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13214,8 +13268,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2820",
-   "self_type" : "type-2819",
+   "referenced_type" : "type-2822",
+   "self_type" : "type-2821",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13223,8 +13277,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2871",
-   "self_type" : "type-2870",
+   "referenced_type" : "type-2873",
+   "self_type" : "type-2872",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13232,8 +13286,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2962",
-   "self_type" : "type-2961",
+   "referenced_type" : "type-2964",
+   "self_type" : "type-2963",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13241,8 +13295,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3043",
-   "self_type" : "type-3042",
+   "referenced_type" : "type-3046",
+   "self_type" : "type-3045",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13250,8 +13304,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3118",
-   "self_type" : "type-3117",
+   "referenced_type" : "type-3122",
+   "self_type" : "type-3121",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13259,8 +13313,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3201",
-   "self_type" : "type-3200",
+   "referenced_type" : "type-3204",
+   "self_type" : "type-3203",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13268,8 +13322,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-328",
-   "self_type" : "type-327",
+   "referenced_type" : "type-325",
+   "self_type" : "type-324",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13277,8 +13331,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3296",
-   "self_type" : "type-3295",
+   "referenced_type" : "type-3299",
+   "self_type" : "type-3298",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13286,8 +13340,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3347",
-   "self_type" : "type-3346",
+   "referenced_type" : "type-3350",
+   "self_type" : "type-3349",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13295,8 +13349,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3513",
-   "self_type" : "type-3512",
+   "referenced_type" : "type-3516",
+   "self_type" : "type-3515",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13304,8 +13358,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-45",
-   "self_type" : "type-44",
+   "referenced_type" : "type-47",
+   "self_type" : "type-46",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13313,8 +13367,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-478",
-   "self_type" : "type-477",
+   "referenced_type" : "type-475",
+   "self_type" : "type-474",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13331,8 +13385,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-726",
-   "self_type" : "type-725",
+   "referenced_type" : "type-727",
+   "self_type" : "type-726",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13340,8 +13394,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-832",
-   "self_type" : "type-831",
+   "referenced_type" : "type-833",
+   "self_type" : "type-832",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13349,8 +13403,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-959",
-   "self_type" : "type-958",
+   "referenced_type" : "type-961",
+   "self_type" : "type-960",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13358,8 +13412,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned char &",
    "name" : "const unsigned char &",
-   "referenced_type" : "type-224",
-   "self_type" : "type-821",
+   "referenced_type" : "type-226",
+   "self_type" : "type-812",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13367,8 +13421,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned int &",
    "name" : "const unsigned int &",
-   "referenced_type" : "type-236",
-   "self_type" : "type-846",
+   "referenced_type" : "type-238",
+   "self_type" : "type-842",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13376,7 +13430,7 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long &",
    "name" : "const unsigned long long &",
-   "referenced_type" : "type-226",
+   "referenced_type" : "type-228",
    "self_type" : "type-849",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -13386,7 +13440,7 @@
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
    "referenced_type" : "type-830",
-   "self_type" : "type-834",
+   "self_type" : "type-831",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13412,7 +13466,7 @@
    "alignment" : 4,
    "linker_set_key" : "int &",
    "name" : "int &",
-   "referenced_type" : "type-103",
+   "referenced_type" : "type-105",
    "self_type" : "type-1145",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
@@ -13421,7 +13475,7 @@
    "alignment" : 4,
    "linker_set_key" : "int *&",
    "name" : "int *&",
-   "referenced_type" : "type-593",
+   "referenced_type" : "type-591",
    "self_type" : "type-1347",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
@@ -13430,8 +13484,8 @@
    "alignment" : 4,
    "linker_set_key" : "long long &",
    "name" : "long long &",
-   "referenced_type" : "type-284",
-   "self_type" : "type-1409",
+   "referenced_type" : "type-12",
+   "self_type" : "type-1413",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -13439,8 +13493,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-1936",
-   "self_type" : "type-1935",
+   "referenced_type" : "type-1933",
+   "self_type" : "type-1932",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13448,8 +13502,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-2260",
-   "self_type" : "type-2259",
+   "referenced_type" : "type-2263",
+   "self_type" : "type-2262",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13457,8 +13511,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-2722",
-   "self_type" : "type-2721",
+   "referenced_type" : "type-2724",
+   "self_type" : "type-2723",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13466,8 +13520,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-2823",
-   "self_type" : "type-2822",
+   "referenced_type" : "type-2825",
+   "self_type" : "type-2824",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13475,8 +13529,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-3375",
-   "self_type" : "type-3374",
+   "referenced_type" : "type-3378",
+   "self_type" : "type-3377",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13484,8 +13538,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-703",
-   "self_type" : "type-702",
+   "referenced_type" : "type-696",
+   "self_type" : "type-695",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13493,8 +13547,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1949",
-   "self_type" : "type-1948",
+   "referenced_type" : "type-1951",
+   "self_type" : "type-1950",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -13502,8 +13556,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2229",
-   "self_type" : "type-2228",
+   "referenced_type" : "type-2232",
+   "self_type" : "type-2231",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -13511,8 +13565,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2294",
-   "self_type" : "type-2293",
+   "referenced_type" : "type-2296",
+   "self_type" : "type-2295",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -13520,8 +13574,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2299",
-   "self_type" : "type-2298",
+   "referenced_type" : "type-2301",
+   "self_type" : "type-2300",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/UiConfig.h"
   },
@@ -13529,8 +13583,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-3116",
-   "self_type" : "type-3115",
+   "referenced_type" : "type-3120",
+   "self_type" : "type-3119",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -13538,8 +13592,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-3360",
-   "self_type" : "type-3359",
+   "referenced_type" : "type-3363",
+   "self_type" : "type-3362",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -13547,8 +13601,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-3392",
-   "self_type" : "type-3391",
+   "referenced_type" : "type-3395",
+   "self_type" : "type-3394",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -13556,8 +13610,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-3397",
-   "self_type" : "type-3396",
+   "referenced_type" : "type-3400",
+   "self_type" : "type-3399",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/UiConfig.h"
   },
@@ -13574,7 +13628,7 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int &",
    "name" : "unsigned int &",
-   "referenced_type" : "type-123",
+   "referenced_type" : "type-125",
    "self_type" : "type-1250",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
@@ -13583,7 +13637,7 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned long long &",
    "name" : "unsigned long long &",
-   "referenced_type" : "type-124",
+   "referenced_type" : "type-126",
    "self_type" : "type-1146",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
@@ -13592,7 +13646,7 @@
    "alignment" : 4,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-227",
+   "referenced_type" : "type-229",
    "self_type" : "type-1249",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
@@ -13604,8 +13658,8 @@
    "alignment" : 4,
    "linker_set_key" : "AHardwareBuffer *",
    "name" : "AHardwareBuffer *",
-   "referenced_type" : "type-1880",
-   "self_type" : "type-1879",
+   "referenced_type" : "type-1882",
+   "self_type" : "type-1881",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -13613,8 +13667,8 @@
    "alignment" : 4,
    "linker_set_key" : "AHardwareBuffer *",
    "name" : "AHardwareBuffer *",
-   "referenced_type" : "type-3035",
-   "self_type" : "type-3034",
+   "referenced_type" : "type-3039",
+   "self_type" : "type-3038",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -13622,8 +13676,8 @@
    "alignment" : 4,
    "linker_set_key" : "AHardwareBuffer *",
    "name" : "AHardwareBuffer *",
-   "referenced_type" : "type-622",
-   "self_type" : "type-621",
+   "referenced_type" : "type-623",
+   "self_type" : "type-622",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -13631,7 +13685,7 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-517",
+   "referenced_type" : "type-515",
    "self_type" : "type-636",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
@@ -13658,8 +13712,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2482",
-   "self_type" : "type-2481",
+   "referenced_type" : "type-2484",
+   "self_type" : "type-2483",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13667,8 +13721,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2504",
-   "self_type" : "type-2503",
+   "referenced_type" : "type-2506",
+   "self_type" : "type-2505",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13676,8 +13730,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2802",
-   "self_type" : "type-2801",
+   "referenced_type" : "type-2804",
+   "self_type" : "type-2803",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13685,8 +13739,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2807",
-   "self_type" : "type-2806",
+   "referenced_type" : "type-2809",
+   "self_type" : "type-2808",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13694,8 +13748,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3579",
-   "self_type" : "type-3578",
+   "referenced_type" : "type-3582",
+   "self_type" : "type-3581",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13703,8 +13757,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3601",
-   "self_type" : "type-3600",
+   "referenced_type" : "type-3604",
+   "self_type" : "type-3603",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13721,8 +13775,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1414",
-   "self_type" : "type-1413",
+   "referenced_type" : "type-1418",
+   "self_type" : "type-1417",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13730,8 +13784,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2472",
-   "self_type" : "type-2471",
+   "referenced_type" : "type-2474",
+   "self_type" : "type-2473",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13739,8 +13793,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2529",
-   "self_type" : "type-2528",
+   "referenced_type" : "type-2534",
+   "self_type" : "type-2533",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13748,8 +13802,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2797",
-   "self_type" : "type-2796",
+   "referenced_type" : "type-2799",
+   "self_type" : "type-2798",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13757,8 +13811,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2812",
-   "self_type" : "type-2811",
+   "referenced_type" : "type-2814",
+   "self_type" : "type-2813",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13766,8 +13820,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3569",
-   "self_type" : "type-3568",
+   "referenced_type" : "type-3572",
+   "self_type" : "type-3571",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13775,8 +13829,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3626",
-   "self_type" : "type-3625",
+   "referenced_type" : "type-3632",
+   "self_type" : "type-3631",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13793,8 +13847,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
    "name" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
-   "referenced_type" : "type-516",
-   "self_type" : "type-537",
+   "referenced_type" : "type-514",
+   "self_type" : "type-534",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
   },
@@ -13803,7 +13857,7 @@
    "linker_set_key" : "android::ColorSpace *",
    "name" : "android::ColorSpace *",
    "referenced_type" : "type-979",
-   "self_type" : "type-1006",
+   "self_type" : "type-1000",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -13820,8 +13874,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Condition *",
    "name" : "android::Condition *",
-   "referenced_type" : "type-258",
-   "self_type" : "type-261",
+   "referenced_type" : "type-254",
+   "self_type" : "type-257",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h"
   },
@@ -13838,8 +13892,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime *",
    "name" : "android::FenceTime *",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1393",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1397",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13847,8 +13901,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot *",
    "name" : "android::FenceTime::Snapshot *",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1382",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1386",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13856,8 +13910,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTimeline *",
    "name" : "android::FenceTimeline *",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1400",
+   "referenced_type" : "type-1401",
+   "self_type" : "type-1404",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13865,8 +13919,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceToFenceTimeMap *",
    "name" : "android::FenceToFenceTimeMap *",
-   "referenced_type" : "type-1402",
-   "self_type" : "type-1405",
+   "referenced_type" : "type-1406",
+   "self_type" : "type-1409",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13883,8 +13937,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FrameStats *",
    "name" : "android::FrameStats *",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1427",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1431",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
@@ -13892,8 +13946,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Gralloc2Allocator *",
    "name" : "android::Gralloc2Allocator *",
-   "referenced_type" : "type-353",
-   "self_type" : "type-360",
+   "referenced_type" : "type-350",
+   "self_type" : "type-357",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -13901,8 +13955,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Gralloc2Mapper *",
    "name" : "android::Gralloc2Mapper *",
-   "referenced_type" : "type-337",
-   "self_type" : "type-343",
+   "referenced_type" : "type-334",
+   "self_type" : "type-340",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -13910,8 +13964,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-525",
-   "self_type" : "type-680",
+   "referenced_type" : "type-523",
+   "self_type" : "type-679",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13919,8 +13973,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferAllocator *",
    "name" : "android::GraphicBufferAllocator *",
-   "referenced_type" : "type-542",
-   "self_type" : "type-545",
+   "referenced_type" : "type-539",
+   "self_type" : "type-542",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -13928,8 +13982,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-527",
-   "self_type" : "type-539",
+   "referenced_type" : "type-525",
+   "self_type" : "type-537",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -13946,8 +14000,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1679",
-   "self_type" : "type-1678",
+   "referenced_type" : "type-1680",
+   "self_type" : "type-1679",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13955,8 +14009,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1781",
-   "self_type" : "type-1780",
+   "referenced_type" : "type-1782",
+   "self_type" : "type-1781",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13964,8 +14018,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-2648",
-   "self_type" : "type-2647",
+   "referenced_type" : "type-2650",
+   "self_type" : "type-2649",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13973,8 +14027,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-2843",
-   "self_type" : "type-2842",
+   "referenced_type" : "type-2845",
+   "self_type" : "type-2844",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13982,8 +14036,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-292",
-   "self_type" : "type-291",
+   "referenced_type" : "type-289",
+   "self_type" : "type-288",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13991,8 +14045,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-2921",
-   "self_type" : "type-2920",
+   "referenced_type" : "type-2923",
+   "self_type" : "type-2922",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -14000,8 +14054,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-437",
-   "self_type" : "type-436",
+   "referenced_type" : "type-434",
+   "self_type" : "type-433",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -14009,8 +14063,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
-   "referenced_type" : "type-715",
-   "self_type" : "type-716",
+   "referenced_type" : "type-716",
+   "self_type" : "type-717",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -14019,7 +14073,7 @@
    "linker_set_key" : "android::LightFlattenablePod<android::Rect> *",
    "name" : "android::LightFlattenablePod<android::Rect> *",
    "referenced_type" : "type-1243",
-   "self_type" : "type-2233",
+   "self_type" : "type-2236",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14036,8 +14090,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex *",
    "name" : "android::Mutex *",
-   "referenced_type" : "type-252",
-   "self_type" : "type-254",
+   "referenced_type" : "type-280",
+   "self_type" : "type-1376",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -14045,8 +14099,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex::Autolock *",
    "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-255",
-   "self_type" : "type-257",
+   "referenced_type" : "type-1378",
+   "self_type" : "type-1380",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -14063,8 +14117,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock *",
    "name" : "android::RWLock *",
-   "referenced_type" : "type-262",
-   "self_type" : "type-264",
+   "referenced_type" : "type-258",
+   "self_type" : "type-260",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -14072,8 +14126,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock::AutoRLock *",
    "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-265",
-   "self_type" : "type-267",
+   "referenced_type" : "type-261",
+   "self_type" : "type-263",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -14081,8 +14135,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock::AutoWLock *",
    "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-268",
-   "self_type" : "type-269",
+   "referenced_type" : "type-264",
+   "self_type" : "type-265",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -14099,8 +14153,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase *",
    "name" : "android::RefBase *",
-   "referenced_type" : "type-172",
-   "self_type" : "type-246",
+   "referenced_type" : "type-175",
+   "self_type" : "type-248",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14108,8 +14162,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-118",
-   "self_type" : "type-117",
+   "referenced_type" : "type-120",
+   "self_type" : "type-119",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14135,8 +14189,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-14",
-   "self_type" : "type-13",
+   "referenced_type" : "type-1577",
+   "self_type" : "type-1576",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14144,8 +14198,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1573",
-   "self_type" : "type-1572",
+   "referenced_type" : "type-16",
+   "self_type" : "type-15",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14153,8 +14207,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1608",
-   "self_type" : "type-1607",
+   "referenced_type" : "type-1612",
+   "self_type" : "type-1611",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14162,8 +14216,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-175",
-   "self_type" : "type-174",
+   "referenced_type" : "type-1766",
+   "self_type" : "type-1765",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14171,8 +14225,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1765",
-   "self_type" : "type-1764",
+   "referenced_type" : "type-178",
+   "self_type" : "type-177",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14180,8 +14234,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1839",
-   "self_type" : "type-1838",
+   "referenced_type" : "type-1840",
+   "self_type" : "type-1839",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14189,8 +14243,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1964",
-   "self_type" : "type-1963",
+   "referenced_type" : "type-1966",
+   "self_type" : "type-1965",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14198,8 +14252,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2039",
-   "self_type" : "type-2038",
+   "referenced_type" : "type-2042",
+   "self_type" : "type-2041",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14207,8 +14261,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2092",
-   "self_type" : "type-2091",
+   "referenced_type" : "type-2094",
+   "self_type" : "type-2093",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14216,8 +14270,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2154",
-   "self_type" : "type-2153",
+   "referenced_type" : "type-2156",
+   "self_type" : "type-2155",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14225,8 +14279,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2308",
-   "self_type" : "type-2307",
+   "referenced_type" : "type-2310",
+   "self_type" : "type-2309",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14234,8 +14288,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2474",
-   "self_type" : "type-2473",
+   "referenced_type" : "type-2476",
+   "self_type" : "type-2475",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14243,8 +14297,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2500",
-   "self_type" : "type-2499",
+   "referenced_type" : "type-2502",
+   "self_type" : "type-2501",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14252,8 +14306,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2542",
-   "self_type" : "type-2541",
+   "referenced_type" : "type-2547",
+   "self_type" : "type-2546",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14261,8 +14315,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2577",
-   "self_type" : "type-2576",
+   "referenced_type" : "type-2582",
+   "self_type" : "type-2581",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14270,8 +14324,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2752",
-   "self_type" : "type-2751",
+   "referenced_type" : "type-2754",
+   "self_type" : "type-2753",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14279,8 +14333,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2799",
-   "self_type" : "type-2798",
+   "referenced_type" : "type-2801",
+   "self_type" : "type-2800",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14288,8 +14342,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2804",
-   "self_type" : "type-2803",
+   "referenced_type" : "type-2806",
+   "self_type" : "type-2805",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14297,8 +14351,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2814",
-   "self_type" : "type-2813",
+   "referenced_type" : "type-2816",
+   "self_type" : "type-2815",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14306,8 +14360,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2833",
-   "self_type" : "type-2832",
+   "referenced_type" : "type-2835",
+   "self_type" : "type-2834",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14315,8 +14369,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2899",
-   "self_type" : "type-2898",
+   "referenced_type" : "type-2901",
+   "self_type" : "type-2900",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14324,8 +14378,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2984",
-   "self_type" : "type-2983",
+   "referenced_type" : "type-2986",
+   "self_type" : "type-2985",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14333,8 +14387,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3136",
-   "self_type" : "type-3135",
+   "referenced_type" : "type-3140",
+   "self_type" : "type-3139",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14342,8 +14396,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3214",
-   "self_type" : "type-3213",
+   "referenced_type" : "type-3217",
+   "self_type" : "type-3216",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14351,8 +14405,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3256",
-   "self_type" : "type-3255",
+   "referenced_type" : "type-3259",
+   "self_type" : "type-3258",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14360,8 +14414,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3307",
-   "self_type" : "type-3306",
+   "referenced_type" : "type-3310",
+   "self_type" : "type-3309",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14369,8 +14423,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3405",
-   "self_type" : "type-3404",
+   "referenced_type" : "type-3408",
+   "self_type" : "type-3407",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14378,8 +14432,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3571",
-   "self_type" : "type-3570",
+   "referenced_type" : "type-3574",
+   "self_type" : "type-3573",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14387,8 +14441,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3597",
-   "self_type" : "type-3596",
+   "referenced_type" : "type-3600",
+   "self_type" : "type-3599",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14396,8 +14450,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-408",
-   "self_type" : "type-407",
+   "referenced_type" : "type-405",
+   "self_type" : "type-404",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14405,8 +14459,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-514",
-   "self_type" : "type-513",
+   "referenced_type" : "type-511",
+   "self_type" : "type-510",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14414,8 +14468,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-744",
-   "self_type" : "type-743",
+   "referenced_type" : "type-745",
+   "self_type" : "type-744",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14423,8 +14477,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-851",
-   "self_type" : "type-850",
+   "referenced_type" : "type-852",
+   "self_type" : "type-851",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14450,8 +14504,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_type *",
    "name" : "android::RefBase::weakref_type *",
-   "referenced_type" : "type-198",
-   "self_type" : "type-197",
+   "referenced_type" : "type-211",
+   "self_type" : "type-210",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -14468,8 +14522,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Region *",
    "name" : "android::Region *",
-   "referenced_type" : "type-2221",
-   "self_type" : "type-2223",
+   "referenced_type" : "type-2224",
+   "self_type" : "type-2226",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -14495,8 +14549,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 *",
    "name" : "android::String16 *",
-   "referenced_type" : "type-179",
-   "self_type" : "type-189",
+   "referenced_type" : "type-182",
+   "self_type" : "type-191",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -14504,8 +14558,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 *",
    "name" : "android::String8 *",
-   "referenced_type" : "type-285",
-   "self_type" : "type-901",
+   "referenced_type" : "type-282",
+   "self_type" : "type-891",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -14513,8 +14567,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Thread *",
    "name" : "android::Thread *",
-   "referenced_type" : "type-369",
-   "self_type" : "type-368",
+   "referenced_type" : "type-366",
+   "self_type" : "type-365",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14522,8 +14576,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<android::Rect> *",
    "name" : "android::Vector<android::Rect> *",
-   "referenced_type" : "type-2213",
-   "self_type" : "type-2214",
+   "referenced_type" : "type-2216",
+   "self_type" : "type-2217",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14531,8 +14585,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<long long> *",
    "name" : "android::Vector<long long> *",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1424",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1428",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14567,8 +14621,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TMat44<float> *",
    "name" : "android::details::TMat44<float> *",
-   "referenced_type" : "type-2276",
-   "self_type" : "type-2279",
+   "referenced_type" : "type-2278",
+   "self_type" : "type-2282",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -14577,7 +14631,7 @@
    "linker_set_key" : "android::details::TMatTransform<android::details::TMat33, float> *",
    "name" : "android::details::TMatTransform<android::details::TMat33, float> *",
    "referenced_type" : "type-910",
-   "self_type" : "type-957",
+   "self_type" : "type-949",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -14585,8 +14639,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TMatTransform<android::details::TMat44, float> *",
    "name" : "android::details::TMatTransform<android::details::TMat44, float> *",
-   "referenced_type" : "type-2270",
-   "self_type" : "type-2271",
+   "referenced_type" : "type-2272",
+   "self_type" : "type-2273",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -14594,8 +14648,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TQuaternion<double> *",
    "name" : "android::details::TQuaternion<double> *",
-   "referenced_type" : "type-331",
-   "self_type" : "type-397",
+   "referenced_type" : "type-328",
+   "self_type" : "type-391",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -14603,8 +14657,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TQuaternion<float> *",
    "name" : "android::details::TQuaternion<float> *",
-   "referenced_type" : "type-410",
-   "self_type" : "type-429",
+   "referenced_type" : "type-407",
+   "self_type" : "type-426",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -14621,7 +14675,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec2<double> *",
    "name" : "android::details::TVec2<double> *",
-   "referenced_type" : "type-55",
+   "referenced_type" : "type-57",
    "self_type" : "type-1069",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -14630,7 +14684,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec2<float> *",
    "name" : "android::details::TVec2<float> *",
-   "referenced_type" : "type-22",
+   "referenced_type" : "type-23",
    "self_type" : "type-1245",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -14639,7 +14693,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<double> *",
    "name" : "android::details::TVec3<double> *",
-   "referenced_type" : "type-66",
+   "referenced_type" : "type-68",
    "self_type" : "type-1368",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
@@ -14648,8 +14702,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<float> *",
    "name" : "android::details::TVec3<float> *",
-   "referenced_type" : "type-17",
-   "self_type" : "type-16",
+   "referenced_type" : "type-18",
+   "self_type" : "type-17",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
   },
@@ -14657,8 +14711,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<double> *",
    "name" : "android::details::TVec4<double> *",
-   "referenced_type" : "type-50",
-   "self_type" : "type-155",
+   "referenced_type" : "type-52",
+   "self_type" : "type-151",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -14666,8 +14720,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<float> *",
    "name" : "android::details::TVec4<float> *",
-   "referenced_type" : "type-200",
-   "self_type" : "type-316",
+   "referenced_type" : "type-192",
+   "self_type" : "type-311",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -14675,7 +14729,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec2, float> *",
    "name" : "android::details::TVecAddOperators<android::details::TVec2, float> *",
-   "referenced_type" : "type-28",
+   "referenced_type" : "type-29",
    "self_type" : "type-1049",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -14684,7 +14738,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec3, float> *",
    "name" : "android::details::TVecAddOperators<android::details::TVec3, float> *",
-   "referenced_type" : "type-34",
+   "referenced_type" : "type-35",
    "self_type" : "type-1053",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -14693,7 +14747,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec2, float> *",
    "name" : "android::details::TVecProductOperators<android::details::TVec2, float> *",
-   "referenced_type" : "type-27",
+   "referenced_type" : "type-28",
    "self_type" : "type-1057",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -14702,7 +14756,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec3, float> *",
    "name" : "android::details::TVecProductOperators<android::details::TVec3, float> *",
-   "referenced_type" : "type-33",
+   "referenced_type" : "type-34",
    "self_type" : "type-1058",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -14712,7 +14766,7 @@
    "linker_set_key" : "android::half *",
    "name" : "android::half *",
    "referenced_type" : "type-1",
-   "self_type" : "type-1381",
+   "self_type" : "type-1377",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -14738,8 +14792,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-242",
-   "self_type" : "type-241",
+   "referenced_type" : "type-244",
+   "self_type" : "type-243",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14756,8 +14810,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-196",
-   "self_type" : "type-195",
+   "referenced_type" : "type-209",
+   "self_type" : "type-208",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14765,8 +14819,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-215",
-   "self_type" : "type-222",
+   "referenced_type" : "type-217",
+   "self_type" : "type-224",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -14774,8 +14828,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-281",
-   "self_type" : "type-280",
+   "referenced_type" : "type-277",
+   "self_type" : "type-276",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14783,8 +14837,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
-   "referenced_type" : "type-99",
-   "self_type" : "type-106",
+   "referenced_type" : "type-101",
+   "self_type" : "type-108",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14792,8 +14846,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
-   "referenced_type" : "type-393",
-   "self_type" : "type-398",
+   "referenced_type" : "type-392",
+   "self_type" : "type-395",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14801,8 +14855,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
-   "referenced_type" : "type-111",
-   "self_type" : "type-112",
+   "referenced_type" : "type-113",
+   "self_type" : "type-114",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14819,7 +14873,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status *",
    "name" : "android::hardware::Status *",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1309",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -14846,8 +14900,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int> *",
    "name" : "android::hardware::details::hidl_pointer<unsigned int> *",
-   "referenced_type" : "type-120",
-   "self_type" : "type-169",
+   "referenced_type" : "type-122",
+   "self_type" : "type-172",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14855,7 +14909,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status *",
    "name" : "android::hardware::details::return_status *",
-   "referenced_type" : "type-101",
+   "referenced_type" : "type-103",
    "self_type" : "type-1315",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -14864,8 +14918,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1727",
-   "self_type" : "type-1726",
+   "referenced_type" : "type-1728",
+   "self_type" : "type-1727",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14873,8 +14927,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1924",
-   "self_type" : "type-1923",
+   "referenced_type" : "type-1926",
+   "self_type" : "type-1925",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14882,8 +14936,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1954",
-   "self_type" : "type-1953",
+   "referenced_type" : "type-1956",
+   "self_type" : "type-1955",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14891,8 +14945,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2024",
-   "self_type" : "type-2023",
+   "referenced_type" : "type-2027",
+   "self_type" : "type-2026",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14900,8 +14954,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2696",
-   "self_type" : "type-2695",
+   "referenced_type" : "type-2698",
+   "self_type" : "type-2697",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14909,8 +14963,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2878",
-   "self_type" : "type-2877",
+   "referenced_type" : "type-2880",
+   "self_type" : "type-2879",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14918,8 +14972,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-3084",
-   "self_type" : "type-3083",
+   "referenced_type" : "type-3088",
+   "self_type" : "type-3087",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14927,8 +14981,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-3122",
-   "self_type" : "type-3121",
+   "referenced_type" : "type-3126",
+   "self_type" : "type-3125",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14936,8 +14990,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-3204",
-   "self_type" : "type-3203",
+   "referenced_type" : "type-3207",
+   "self_type" : "type-3206",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14945,8 +14999,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-357",
-   "self_type" : "type-356",
+   "referenced_type" : "type-354",
+   "self_type" : "type-353",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14954,8 +15008,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-685",
-   "self_type" : "type-684",
+   "referenced_type" : "type-687",
+   "self_type" : "type-686",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14972,8 +15026,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-836",
-   "self_type" : "type-835",
+   "referenced_type" : "type-837",
+   "self_type" : "type-836",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14981,8 +15035,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-1821",
-   "self_type" : "type-1820",
+   "referenced_type" : "type-1822",
+   "self_type" : "type-1821",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14990,8 +15044,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-1960",
-   "self_type" : "type-1959",
+   "referenced_type" : "type-1962",
+   "self_type" : "type-1961",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14999,8 +15053,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-2031",
-   "self_type" : "type-2030",
+   "referenced_type" : "type-2034",
+   "self_type" : "type-2033",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15008,8 +15062,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-2966",
-   "self_type" : "type-2965",
+   "referenced_type" : "type-2968",
+   "self_type" : "type-2967",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15017,8 +15071,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-3129",
-   "self_type" : "type-3128",
+   "referenced_type" : "type-3133",
+   "self_type" : "type-3132",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15026,8 +15080,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-3210",
-   "self_type" : "type-3209",
+   "referenced_type" : "type-3213",
+   "self_type" : "type-3212",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15035,8 +15089,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-486",
-   "self_type" : "type-485",
+   "referenced_type" : "type-483",
+   "self_type" : "type-482",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15044,8 +15098,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-737",
-   "self_type" : "type-736",
+   "referenced_type" : "type-738",
+   "self_type" : "type-737",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15053,8 +15107,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-843",
-   "self_type" : "type-842",
+   "referenced_type" : "type-844",
+   "self_type" : "type-843",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15062,8 +15116,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1716",
-   "self_type" : "type-1715",
+   "referenced_type" : "type-1717",
+   "self_type" : "type-1716",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15071,8 +15125,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1926",
-   "self_type" : "type-1925",
+   "referenced_type" : "type-1928",
+   "self_type" : "type-1927",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15080,8 +15134,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1956",
-   "self_type" : "type-1955",
+   "referenced_type" : "type-1958",
+   "self_type" : "type-1957",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15089,8 +15143,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2027",
-   "self_type" : "type-2026",
+   "referenced_type" : "type-2029",
+   "self_type" : "type-2028",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15098,8 +15152,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2685",
-   "self_type" : "type-2684",
+   "referenced_type" : "type-2687",
+   "self_type" : "type-2686",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15107,8 +15161,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2884",
-   "self_type" : "type-2883",
+   "referenced_type" : "type-2886",
+   "self_type" : "type-2885",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15116,8 +15170,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-3087",
-   "self_type" : "type-3086",
+   "referenced_type" : "type-3092",
+   "self_type" : "type-3091",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15125,8 +15179,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-3124",
-   "self_type" : "type-3123",
+   "referenced_type" : "type-3128",
+   "self_type" : "type-3127",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15134,8 +15188,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-3206",
-   "self_type" : "type-3205",
+   "referenced_type" : "type-3209",
+   "self_type" : "type-3208",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15143,8 +15197,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-340",
-   "self_type" : "type-339",
+   "referenced_type" : "type-337",
+   "self_type" : "type-336",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15179,8 +15233,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1587",
-   "self_type" : "type-1586",
+   "referenced_type" : "type-1591",
+   "self_type" : "type-1590",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15188,8 +15242,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1928",
-   "self_type" : "type-1927",
+   "referenced_type" : "type-1930",
+   "self_type" : "type-1929",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15197,8 +15251,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1958",
-   "self_type" : "type-1957",
+   "referenced_type" : "type-1960",
+   "self_type" : "type-1959",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15206,8 +15260,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2029",
-   "self_type" : "type-2028",
+   "referenced_type" : "type-2031",
+   "self_type" : "type-2030",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15215,8 +15269,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2556",
-   "self_type" : "type-2555",
+   "referenced_type" : "type-2561",
+   "self_type" : "type-2560",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15224,8 +15278,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2828",
-   "self_type" : "type-2827",
+   "referenced_type" : "type-2830",
+   "self_type" : "type-2829",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15233,8 +15287,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-3089",
-   "self_type" : "type-3088",
+   "referenced_type" : "type-3094",
+   "self_type" : "type-3093",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15242,8 +15296,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-3127",
-   "self_type" : "type-3126",
+   "referenced_type" : "type-3131",
+   "self_type" : "type-3130",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15251,8 +15305,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-3208",
-   "self_type" : "type-3207",
+   "referenced_type" : "type-3211",
+   "self_type" : "type-3210",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15287,8 +15341,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-88",
-   "self_type" : "type-87",
+   "referenced_type" : "type-90",
+   "self_type" : "type-89",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15296,8 +15350,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
-   "referenced_type" : "type-1724",
-   "self_type" : "type-1723",
+   "referenced_type" : "type-1725",
+   "self_type" : "type-1724",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15305,8 +15359,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
-   "referenced_type" : "type-2693",
-   "self_type" : "type-2692",
+   "referenced_type" : "type-2695",
+   "self_type" : "type-2694",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15314,8 +15368,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
-   "referenced_type" : "type-2875",
-   "self_type" : "type-2874",
+   "referenced_type" : "type-2878",
+   "self_type" : "type-2877",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15323,8 +15377,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
-   "referenced_type" : "type-352",
-   "self_type" : "type-351",
+   "referenced_type" : "type-349",
+   "self_type" : "type-348",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15332,8 +15386,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-1831",
-   "self_type" : "type-1830",
+   "referenced_type" : "type-1832",
+   "self_type" : "type-1831",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15341,8 +15395,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-1962",
-   "self_type" : "type-1961",
+   "referenced_type" : "type-1964",
+   "self_type" : "type-1963",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15350,8 +15404,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-2033",
-   "self_type" : "type-2032",
+   "referenced_type" : "type-2036",
+   "self_type" : "type-2035",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15359,8 +15413,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-2976",
-   "self_type" : "type-2975",
+   "referenced_type" : "type-2978",
+   "self_type" : "type-2977",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15368,8 +15422,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-3132",
-   "self_type" : "type-3131",
+   "referenced_type" : "type-3136",
+   "self_type" : "type-3135",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15377,8 +15431,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-3212",
-   "self_type" : "type-3211",
+   "referenced_type" : "type-3215",
+   "self_type" : "type-3214",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15386,8 +15440,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-499",
-   "self_type" : "type-498",
+   "referenced_type" : "type-496",
+   "self_type" : "type-495",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15404,8 +15458,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-845",
-   "self_type" : "type-844",
+   "referenced_type" : "type-846",
+   "self_type" : "type-845",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15431,8 +15485,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_handle *",
    "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-139",
-   "self_type" : "type-138",
+   "referenced_type" : "type-142",
+   "self_type" : "type-141",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15449,8 +15503,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned int> *",
    "name" : "android::hardware::hidl_vec<unsigned int> *",
-   "referenced_type" : "type-128",
-   "self_type" : "type-129",
+   "referenced_type" : "type-131",
+   "self_type" : "type-132",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15467,8 +15521,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::base::V1_0::IBase *",
    "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-171",
-   "self_type" : "type-364",
+   "referenced_type" : "type-174",
+   "self_type" : "type-361",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15476,8 +15530,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-295",
-   "self_type" : "type-372",
+   "referenced_type" : "type-292",
+   "self_type" : "type-369",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15486,7 +15540,7 @@
    "linker_set_key" : "android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "referenced_type" : "type-694",
-   "self_type" : "type-698",
+   "self_type" : "type-701",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15503,8 +15557,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::GraphicBuffer> *",
    "name" : "android::sp<android::GraphicBuffer> *",
-   "referenced_type" : "type-679",
-   "self_type" : "type-681",
+   "referenced_type" : "type-678",
+   "self_type" : "type-682",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15512,8 +15566,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
-   "referenced_type" : "type-355",
-   "self_type" : "type-376",
+   "referenced_type" : "type-352",
+   "self_type" : "type-373",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15521,8 +15575,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
-   "referenced_type" : "type-484",
-   "self_type" : "type-488",
+   "referenced_type" : "type-481",
+   "self_type" : "type-486",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15530,8 +15584,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
-   "referenced_type" : "type-338",
-   "self_type" : "type-384",
+   "referenced_type" : "type-335",
+   "self_type" : "type-381",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15539,8 +15593,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
-   "referenced_type" : "type-86",
-   "self_type" : "type-90",
+   "referenced_type" : "type-88",
+   "self_type" : "type-92",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15548,8 +15602,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
-   "referenced_type" : "type-497",
-   "self_type" : "type-502",
+   "referenced_type" : "type-494",
+   "self_type" : "type-499",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15557,8 +15611,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "referenced_type" : "type-371",
-   "self_type" : "type-373",
+   "referenced_type" : "type-368",
+   "self_type" : "type-370",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15575,8 +15629,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ui::Transform *",
    "name" : "android::ui::Transform *",
-   "referenced_type" : "type-2283",
-   "self_type" : "type-2285",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2288",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -15584,8 +15638,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ui::Transform::mat33 *",
    "name" : "android::ui::Transform::mat33 *",
-   "referenced_type" : "type-2284",
-   "self_type" : "type-2297",
+   "referenced_type" : "type-2287",
+   "self_type" : "type-2299",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -15602,8 +15656,8 @@
    "alignment" : 4,
    "linker_set_key" : "android_native_base_t *",
    "name" : "android_native_base_t *",
-   "referenced_type" : "type-518",
-   "self_type" : "type-522",
+   "referenced_type" : "type-516",
+   "self_type" : "type-520",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -15611,8 +15665,8 @@
    "alignment" : 4,
    "linker_set_key" : "android_ycbcr *",
    "name" : "android_ycbcr *",
-   "referenced_type" : "type-348",
-   "self_type" : "type-347",
+   "referenced_type" : "type-345",
+   "self_type" : "type-344",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15620,8 +15674,8 @@
    "alignment" : 4,
    "linker_set_key" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
    "name" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
-   "referenced_type" : "type-271",
-   "self_type" : "type-274",
+   "referenced_type" : "type-267",
+   "self_type" : "type-270",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -15630,7 +15684,7 @@
    "linker_set_key" : "bool *",
    "name" : "bool *",
    "referenced_type" : "type-6",
-   "self_type" : "type-350",
+   "self_type" : "type-347",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15638,8 +15692,8 @@
    "alignment" : 4,
    "linker_set_key" : "char *",
    "name" : "char *",
-   "referenced_type" : "type-288",
-   "self_type" : "type-576",
+   "referenced_type" : "type-285",
+   "self_type" : "type-573",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -15647,8 +15701,8 @@
    "alignment" : 4,
    "linker_set_key" : "const AHardwareBuffer *",
    "name" : "const AHardwareBuffer *",
-   "referenced_type" : "type-1882",
-   "self_type" : "type-1884",
+   "referenced_type" : "type-1884",
+   "self_type" : "type-1886",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -15656,8 +15710,8 @@
    "alignment" : 4,
    "linker_set_key" : "const AHardwareBuffer *",
    "name" : "const AHardwareBuffer *",
-   "referenced_type" : "type-3038",
-   "self_type" : "type-3040",
+   "referenced_type" : "type-3041",
+   "self_type" : "type-3043",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -15674,7 +15728,7 @@
    "alignment" : 4,
    "linker_set_key" : "const ANativeWindowBuffer *",
    "name" : "const ANativeWindowBuffer *",
-   "referenced_type" : "type-637",
+   "referenced_type" : "type-638",
    "self_type" : "type-639",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
@@ -15683,8 +15737,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
    "name" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
-   "referenced_type" : "type-535",
-   "self_type" : "type-536",
+   "referenced_type" : "type-532",
+   "self_type" : "type-533",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
   },
@@ -15719,8 +15773,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime *",
    "name" : "const android::FenceTime *",
-   "referenced_type" : "type-1395",
-   "self_type" : "type-1396",
+   "referenced_type" : "type-1399",
+   "self_type" : "type-1400",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -15728,8 +15782,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot *",
    "name" : "const android::FenceTime::Snapshot *",
-   "referenced_type" : "type-1388",
-   "self_type" : "type-1389",
+   "referenced_type" : "type-1393",
+   "self_type" : "type-1394",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -15746,8 +15800,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FrameStats *",
    "name" : "const android::FrameStats *",
-   "referenced_type" : "type-1428",
-   "self_type" : "type-1429",
+   "referenced_type" : "type-1432",
+   "self_type" : "type-1433",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
@@ -15755,8 +15809,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Gralloc2Allocator *",
    "name" : "const android::Gralloc2Allocator *",
-   "referenced_type" : "type-361",
-   "self_type" : "type-362",
+   "referenced_type" : "type-358",
+   "self_type" : "type-359",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15764,8 +15818,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Gralloc2Mapper *",
    "name" : "const android::Gralloc2Mapper *",
-   "referenced_type" : "type-344",
-   "self_type" : "type-345",
+   "referenced_type" : "type-341",
+   "self_type" : "type-342",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15773,8 +15827,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-624",
-   "self_type" : "type-623",
+   "referenced_type" : "type-625",
+   "self_type" : "type-624",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -15782,8 +15836,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBufferAllocator *",
    "name" : "const android::GraphicBufferAllocator *",
-   "referenced_type" : "type-720",
-   "self_type" : "type-721",
+   "referenced_type" : "type-721",
+   "self_type" : "type-722",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -15791,8 +15845,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBufferMapper *",
    "name" : "const android::GraphicBufferMapper *",
-   "referenced_type" : "type-614",
-   "self_type" : "type-615",
+   "referenced_type" : "type-615",
+   "self_type" : "type-616",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -15800,8 +15854,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::HdrCapabilities *",
    "name" : "const android::HdrCapabilities *",
-   "referenced_type" : "type-972",
-   "self_type" : "type-973",
+   "referenced_type" : "type-973",
+   "self_type" : "type-974",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -15809,8 +15863,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
-   "referenced_type" : "type-717",
-   "self_type" : "type-718",
+   "referenced_type" : "type-718",
+   "self_type" : "type-719",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -15818,8 +15872,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect> *",
    "name" : "const android::LightFlattenablePod<android::Rect> *",
-   "referenced_type" : "type-2231",
-   "self_type" : "type-2232",
+   "referenced_type" : "type-2234",
+   "self_type" : "type-2235",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15872,8 +15926,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Region *",
    "name" : "const android::Region *",
-   "referenced_type" : "type-2220",
-   "self_type" : "type-2226",
+   "referenced_type" : "type-2223",
+   "self_type" : "type-2229",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -15890,8 +15944,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 *",
    "name" : "const android::String16 *",
-   "referenced_type" : "type-184",
-   "self_type" : "type-186",
+   "referenced_type" : "type-187",
+   "self_type" : "type-188",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -15899,8 +15953,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 *",
    "name" : "const android::String8 *",
-   "referenced_type" : "type-873",
-   "self_type" : "type-878",
+   "referenced_type" : "type-863",
+   "self_type" : "type-874",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -15908,8 +15962,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::Rect> *",
    "name" : "const android::Vector<android::Rect> *",
-   "referenced_type" : "type-2215",
-   "self_type" : "type-2219",
+   "referenced_type" : "type-2218",
+   "self_type" : "type-2222",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -15917,8 +15971,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<long long> *",
    "name" : "const android::Vector<long long> *",
-   "referenced_type" : "type-1425",
-   "self_type" : "type-1426",
+   "referenced_type" : "type-1429",
+   "self_type" : "type-1430",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -15926,8 +15980,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::VectorImpl *",
    "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-1422",
-   "self_type" : "type-1423",
+   "referenced_type" : "type-1426",
+   "self_type" : "type-1427",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -15944,7 +15998,7 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TMat33<float> *",
    "name" : "const android::details::TMat33<float> *",
-   "referenced_type" : "type-925",
+   "referenced_type" : "type-919",
    "self_type" : "type-976",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
@@ -15972,7 +16026,7 @@
    "linker_set_key" : "const android::details::TVec3<float> *",
    "name" : "const android::details::TVec3<float> *",
    "referenced_type" : "type-1055",
-   "self_type" : "type-1418",
+   "self_type" : "type-1419",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
   },
@@ -15980,8 +16034,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::half *",
    "name" : "const android::half *",
-   "referenced_type" : "type-42",
-   "self_type" : "type-130",
+   "referenced_type" : "type-44",
+   "self_type" : "type-127",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -16007,8 +16061,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::BpHwRefBase *",
    "name" : "const android::hardware::BpHwRefBase *",
-   "referenced_type" : "type-211",
-   "self_type" : "type-212",
+   "referenced_type" : "type-213",
+   "self_type" : "type-214",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -16016,8 +16070,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
-   "referenced_type" : "type-109",
-   "self_type" : "type-110",
+   "referenced_type" : "type-111",
+   "self_type" : "type-112",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16025,8 +16079,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
-   "referenced_type" : "type-401",
-   "self_type" : "type-402",
+   "referenced_type" : "type-398",
+   "self_type" : "type-400",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16034,8 +16088,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
-   "referenced_type" : "type-115",
-   "self_type" : "type-116",
+   "referenced_type" : "type-117",
+   "self_type" : "type-118",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16061,8 +16115,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle> *",
-   "referenced_type" : "type-293",
-   "self_type" : "type-297",
+   "referenced_type" : "type-290",
+   "self_type" : "type-294",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16070,8 +16124,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned int> *",
    "name" : "const android::hardware::details::hidl_pointer<unsigned int> *",
-   "referenced_type" : "type-190",
-   "self_type" : "type-214",
+   "referenced_type" : "type-203",
+   "self_type" : "type-216",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16088,8 +16142,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1744",
-   "self_type" : "type-1746",
+   "referenced_type" : "type-1745",
+   "self_type" : "type-1747",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16097,8 +16151,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2713",
-   "self_type" : "type-2715",
+   "referenced_type" : "type-2715",
+   "self_type" : "type-2717",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16106,8 +16160,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2879",
-   "self_type" : "type-2882",
+   "referenced_type" : "type-2882",
+   "self_type" : "type-2884",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16115,8 +16169,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-381",
-   "self_type" : "type-383",
+   "referenced_type" : "type-378",
+   "self_type" : "type-380",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16124,8 +16178,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-1827",
-   "self_type" : "type-1829",
+   "referenced_type" : "type-1828",
+   "self_type" : "type-1830",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16133,8 +16187,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-2972",
-   "self_type" : "type-2974",
+   "referenced_type" : "type-2974",
+   "self_type" : "type-2976",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16142,8 +16196,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-494",
-   "self_type" : "type-496",
+   "referenced_type" : "type-491",
+   "self_type" : "type-493",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16151,8 +16205,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::BufferUsage *",
    "name" : "const android::hardware::graphics::common::V1_0::BufferUsage *",
-   "referenced_type" : "type-153",
-   "self_type" : "type-152",
+   "referenced_type" : "type-156",
+   "self_type" : "type-155",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16160,8 +16214,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::BufferUsage *",
    "name" : "const android::hardware::graphics::common::V1_1::BufferUsage *",
-   "referenced_type" : "type-160",
-   "self_type" : "type-159",
+   "referenced_type" : "type-162",
+   "self_type" : "type-161",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16169,8 +16223,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::BufferUsage *",
    "name" : "const android::hardware::graphics::common::V1_2::BufferUsage *",
-   "referenced_type" : "type-422",
-   "self_type" : "type-421",
+   "referenced_type" : "type-419",
+   "self_type" : "type-418",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16178,8 +16232,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1584",
-   "self_type" : "type-1583",
+   "referenced_type" : "type-1588",
+   "self_type" : "type-1587",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16187,8 +16241,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2553",
-   "self_type" : "type-2552",
+   "referenced_type" : "type-2558",
+   "self_type" : "type-2557",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16196,8 +16250,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2825",
-   "self_type" : "type-2824",
+   "referenced_type" : "type-2827",
+   "self_type" : "type-2826",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16205,8 +16259,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-84",
-   "self_type" : "type-83",
+   "referenced_type" : "type-86",
+   "self_type" : "type-85",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16214,8 +16268,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1594",
-   "self_type" : "type-1596",
+   "referenced_type" : "type-1598",
+   "self_type" : "type-1600",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16223,8 +16277,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2563",
-   "self_type" : "type-2565",
+   "referenced_type" : "type-2568",
+   "self_type" : "type-2570",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16232,8 +16286,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2829",
-   "self_type" : "type-2831",
+   "referenced_type" : "type-2831",
+   "self_type" : "type-2833",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16241,8 +16295,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-96",
-   "self_type" : "type-98",
+   "referenced_type" : "type-98",
+   "self_type" : "type-100",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16250,8 +16304,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-1753",
-   "self_type" : "type-1752",
+   "referenced_type" : "type-1754",
+   "self_type" : "type-1753",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16259,8 +16313,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-2887",
-   "self_type" : "type-2886",
+   "referenced_type" : "type-2889",
+   "self_type" : "type-2888",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16268,8 +16322,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-391",
-   "self_type" : "type-390",
+   "referenced_type" : "type-388",
+   "self_type" : "type-387",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16286,8 +16340,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void> *",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void> *",
-   "referenced_type" : "type-154",
-   "self_type" : "type-156",
+   "referenced_type" : "type-157",
+   "self_type" : "type-158",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16295,8 +16349,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void> *",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void> *",
-   "referenced_type" : "type-161",
-   "self_type" : "type-162",
+   "referenced_type" : "type-163",
+   "self_type" : "type-165",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16304,8 +16358,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void> *",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void> *",
-   "referenced_type" : "type-423",
-   "self_type" : "type-424",
+   "referenced_type" : "type-420",
+   "self_type" : "type-421",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16322,8 +16376,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_handle> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_handle> *",
-   "referenced_type" : "type-146",
-   "self_type" : "type-147",
+   "referenced_type" : "type-149",
+   "self_type" : "type-150",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16331,8 +16385,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned int> *",
    "name" : "const android::hardware::hidl_vec<unsigned int> *",
-   "referenced_type" : "type-132",
-   "self_type" : "type-134",
+   "referenced_type" : "type-134",
+   "self_type" : "type-136",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16349,8 +16403,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
    "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-170",
-   "self_type" : "type-176",
+   "referenced_type" : "type-173",
+   "self_type" : "type-179",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
@@ -16358,8 +16412,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-294",
-   "self_type" : "type-296",
+   "referenced_type" : "type-291",
+   "self_type" : "type-293",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
@@ -16368,7 +16422,7 @@
    "linker_set_key" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "referenced_type" : "type-693",
-   "self_type" : "type-699",
+   "self_type" : "type-702",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16385,8 +16439,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
    "name" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
-   "referenced_type" : "type-379",
-   "self_type" : "type-380",
+   "referenced_type" : "type-376",
+   "self_type" : "type-377",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16394,8 +16448,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
    "name" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
-   "referenced_type" : "type-492",
-   "self_type" : "type-493",
+   "referenced_type" : "type-489",
+   "self_type" : "type-490",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16403,8 +16457,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
-   "referenced_type" : "type-387",
-   "self_type" : "type-388",
+   "referenced_type" : "type-384",
+   "self_type" : "type-385",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16412,8 +16466,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
-   "referenced_type" : "type-91",
-   "self_type" : "type-95",
+   "referenced_type" : "type-93",
+   "self_type" : "type-97",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16421,8 +16475,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
    "name" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
-   "referenced_type" : "type-505",
-   "self_type" : "type-506",
+   "referenced_type" : "type-502",
+   "self_type" : "type-503",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16439,8 +16493,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::base::V1_0::IBase> *",
    "name" : "const android::sp<android::hidl::base::V1_0::IBase> *",
-   "referenced_type" : "type-365",
-   "self_type" : "type-366",
+   "referenced_type" : "type-362",
+   "self_type" : "type-363",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16448,8 +16502,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "referenced_type" : "type-374",
-   "self_type" : "type-375",
+   "referenced_type" : "type-371",
+   "self_type" : "type-372",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16466,8 +16520,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ui::Transform *",
    "name" : "const android::ui::Transform *",
-   "referenced_type" : "type-2286",
-   "self_type" : "type-2291",
+   "referenced_type" : "type-2289",
+   "self_type" : "type-2293",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -16475,8 +16529,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ui::Transform::mat33 *",
    "name" : "const android::ui::Transform::mat33 *",
-   "referenced_type" : "type-2295",
-   "self_type" : "type-2296",
+   "referenced_type" : "type-2297",
+   "self_type" : "type-2298",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -16484,8 +16538,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-287",
-   "self_type" : "type-286",
+   "referenced_type" : "type-284",
+   "self_type" : "type-283",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -16493,8 +16547,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-181",
-   "self_type" : "type-180",
+   "referenced_type" : "type-184",
+   "self_type" : "type-183",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -16502,8 +16556,8 @@
    "alignment" : 4,
    "linker_set_key" : "const gralloc_module_t *",
    "name" : "const gralloc_module_t *",
-   "referenced_type" : "type-582",
-   "self_type" : "type-581",
+   "referenced_type" : "type-580",
+   "self_type" : "type-579",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -16511,8 +16565,8 @@
    "alignment" : 4,
    "linker_set_key" : "const hw_module_t *",
    "name" : "const hw_module_t *",
-   "referenced_type" : "type-555",
-   "self_type" : "type-554",
+   "referenced_type" : "type-552",
+   "self_type" : "type-551",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -16520,7 +16574,7 @@
    "alignment" : 4,
    "linker_set_key" : "const int *",
    "name" : "const int *",
-   "referenced_type" : "type-562",
+   "referenced_type" : "type-559",
    "self_type" : "type-1348",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
@@ -16539,7 +16593,7 @@
    "linker_set_key" : "const long long *",
    "name" : "const long long *",
    "referenced_type" : "type-847",
-   "self_type" : "type-1415",
+   "self_type" : "type-1420",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16547,8 +16601,8 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle *",
    "name" : "const native_handle *",
-   "referenced_type" : "type-143",
-   "self_type" : "type-142",
+   "referenced_type" : "type-146",
+   "self_type" : "type-145",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16556,8 +16610,8 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle **",
    "name" : "const native_handle **",
-   "referenced_type" : "type-142",
-   "self_type" : "type-346",
+   "referenced_type" : "type-145",
+   "self_type" : "type-343",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -16565,8 +16619,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned char *",
    "name" : "const unsigned char *",
-   "referenced_type" : "type-224",
-   "self_type" : "type-223",
+   "referenced_type" : "type-226",
+   "self_type" : "type-225",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16574,7 +16628,7 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned int *",
    "name" : "const unsigned int *",
-   "referenced_type" : "type-236",
+   "referenced_type" : "type-238",
    "self_type" : "type-1104",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -16583,8 +16637,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long *",
    "name" : "const unsigned long long *",
-   "referenced_type" : "type-226",
-   "self_type" : "type-225",
+   "referenced_type" : "type-228",
+   "self_type" : "type-227",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16601,8 +16655,8 @@
    "alignment" : 4,
    "linker_set_key" : "framebuffer_device_t *",
    "name" : "framebuffer_device_t *",
-   "referenced_type" : "type-546",
-   "self_type" : "type-567",
+   "referenced_type" : "type-543",
+   "self_type" : "type-564",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16610,8 +16664,8 @@
    "alignment" : 4,
    "linker_set_key" : "hw_device_t *",
    "name" : "hw_device_t *",
-   "referenced_type" : "type-547",
-   "self_type" : "type-557",
+   "referenced_type" : "type-544",
+   "self_type" : "type-554",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -16619,8 +16673,8 @@
    "alignment" : 4,
    "linker_set_key" : "hw_device_t **",
    "name" : "hw_device_t **",
-   "referenced_type" : "type-557",
-   "self_type" : "type-556",
+   "referenced_type" : "type-554",
+   "self_type" : "type-553",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -16628,8 +16682,8 @@
    "alignment" : 4,
    "linker_set_key" : "hw_module_methods_t *",
    "name" : "hw_module_methods_t *",
-   "referenced_type" : "type-551",
-   "self_type" : "type-550",
+   "referenced_type" : "type-548",
+   "self_type" : "type-547",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -16637,8 +16691,8 @@
    "alignment" : 4,
    "linker_set_key" : "hw_module_t *",
    "name" : "hw_module_t *",
-   "referenced_type" : "type-549",
-   "self_type" : "type-548",
+   "referenced_type" : "type-546",
+   "self_type" : "type-545",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -16664,8 +16718,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *)",
    "name" : "int (*)(const gralloc_module_t *, const native_handle *)",
-   "referenced_type" : "type-580",
-   "self_type" : "type-579",
+   "referenced_type" : "type-578",
+   "self_type" : "type-577",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -16673,42 +16727,6 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int *)",
    "name" : "int (*)(const gralloc_module_t *, const native_handle *, int *)",
-   "referenced_type" : "type-592",
-   "self_type" : "type-591",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "referenced_type" : "type-588",
-   "self_type" : "type-587",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "referenced_type" : "type-595",
-   "self_type" : "type-594",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "referenced_type" : "type-584",
-   "self_type" : "type-583",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
    "referenced_type" : "type-590",
    "self_type" : "type-589",
    "size" : 4,
@@ -16716,8 +16734,8 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, int, ...)",
-   "name" : "int (*)(const gralloc_module_t *, int, ...)",
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
    "referenced_type" : "type-586",
    "self_type" : "type-585",
    "size" : 4,
@@ -16725,10 +16743,64 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
+   "referenced_type" : "type-593",
+   "self_type" : "type-592",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
+   "referenced_type" : "type-582",
+   "self_type" : "type-581",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
+   "referenced_type" : "type-588",
+   "self_type" : "type-587",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "referenced_type" : "type-595",
+   "self_type" : "type-594",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "referenced_type" : "type-597",
+   "self_type" : "type-596",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, int, ...)",
+   "name" : "int (*)(const gralloc_module_t *, int, ...)",
+   "referenced_type" : "type-584",
+   "self_type" : "type-583",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "int (*)(const hw_module_t *, const char *, hw_device_t **)",
    "name" : "int (*)(const hw_module_t *, const char *, hw_device_t **)",
-   "referenced_type" : "type-553",
-   "self_type" : "type-552",
+   "referenced_type" : "type-550",
+   "self_type" : "type-549",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -16736,8 +16808,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(framebuffer_device_t *)",
    "name" : "int (*)(framebuffer_device_t *)",
-   "referenced_type" : "type-573",
-   "self_type" : "type-572",
+   "referenced_type" : "type-570",
+   "self_type" : "type-569",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16745,8 +16817,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(framebuffer_device_t *, const native_handle *)",
    "name" : "int (*)(framebuffer_device_t *, const native_handle *)",
-   "referenced_type" : "type-571",
-   "self_type" : "type-570",
+   "referenced_type" : "type-568",
+   "self_type" : "type-567",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16754,8 +16826,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(framebuffer_device_t *, int)",
    "name" : "int (*)(framebuffer_device_t *, int)",
-   "referenced_type" : "type-566",
-   "self_type" : "type-565",
+   "referenced_type" : "type-563",
+   "self_type" : "type-562",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16763,8 +16835,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(framebuffer_device_t *, int, int, int, int)",
    "name" : "int (*)(framebuffer_device_t *, int, int, int, int)",
-   "referenced_type" : "type-569",
-   "self_type" : "type-568",
+   "referenced_type" : "type-566",
+   "self_type" : "type-565",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16772,8 +16844,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(hw_device_t *)",
    "name" : "int (*)(hw_device_t *)",
-   "referenced_type" : "type-561",
-   "self_type" : "type-560",
+   "referenced_type" : "type-558",
+   "self_type" : "type-557",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -16781,8 +16853,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
-   "referenced_type" : "type-249",
-   "self_type" : "type-250",
+   "referenced_type" : "type-251",
+   "self_type" : "type-252",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
@@ -16790,8 +16862,8 @@
    "alignment" : 4,
    "linker_set_key" : "int *",
    "name" : "int *",
-   "referenced_type" : "type-103",
-   "self_type" : "type-593",
+   "referenced_type" : "type-105",
+   "self_type" : "type-591",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
@@ -16808,8 +16880,8 @@
    "alignment" : 4,
    "linker_set_key" : "long long *",
    "name" : "long long *",
-   "referenced_type" : "type-284",
-   "self_type" : "type-1432",
+   "referenced_type" : "type-12",
+   "self_type" : "type-11",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16817,7 +16889,7 @@
    "alignment" : 4,
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
-   "referenced_type" : "type-144",
+   "referenced_type" : "type-147",
    "self_type" : "type-1132",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
@@ -16826,8 +16898,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned char *",
    "name" : "unsigned char *",
-   "referenced_type" : "type-218",
-   "self_type" : "type-217",
+   "referenced_type" : "type-220",
+   "self_type" : "type-219",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -16835,8 +16907,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
-   "referenced_type" : "type-123",
-   "self_type" : "type-122",
+   "referenced_type" : "type-125",
+   "self_type" : "type-124",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16844,8 +16916,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned long long *",
    "name" : "unsigned long long *",
-   "referenced_type" : "type-124",
-   "self_type" : "type-219",
+   "referenced_type" : "type-126",
+   "self_type" : "type-221",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16862,8 +16934,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
    "name" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
-   "referenced_type" : "type-221",
-   "self_type" : "type-220",
+   "referenced_type" : "type-223",
+   "self_type" : "type-222",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16871,8 +16943,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(android_native_base_t *)",
    "name" : "void (*)(android_native_base_t *)",
-   "referenced_type" : "type-521",
-   "self_type" : "type-520",
+   "referenced_type" : "type-519",
+   "self_type" : "type-518",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -16880,8 +16952,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(framebuffer_device_t *, char *, int)",
    "name" : "void (*)(framebuffer_device_t *, char *, int)",
-   "referenced_type" : "type-575",
-   "self_type" : "type-574",
+   "referenced_type" : "type-572",
+   "self_type" : "type-571",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16889,8 +16961,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *",
    "name" : "void *",
-   "referenced_type" : "type-151",
-   "self_type" : "type-227",
+   "referenced_type" : "type-154",
+   "self_type" : "type-229",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -16898,8 +16970,8 @@
    "alignment" : 4,
    "linker_set_key" : "void **",
    "name" : "void **",
-   "referenced_type" : "type-227",
-   "self_type" : "type-251",
+   "referenced_type" : "type-229",
+   "self_type" : "type-253",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   }
@@ -16911,8 +16983,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-117",
-   "self_type" : "type-119",
+   "referenced_type" : "type-119",
+   "self_type" : "type-121",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16941,8 +17013,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-13",
-   "self_type" : "type-15",
+   "referenced_type" : "type-1576",
+   "self_type" : "type-1579",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16951,8 +17023,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1572",
-   "self_type" : "type-1574",
+   "referenced_type" : "type-15",
+   "self_type" : "type-37",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16961,8 +17033,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1607",
-   "self_type" : "type-1609",
+   "referenced_type" : "type-1611",
+   "self_type" : "type-1613",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16971,8 +17043,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-174",
-   "self_type" : "type-173",
+   "referenced_type" : "type-1765",
+   "self_type" : "type-1767",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16981,8 +17053,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1764",
-   "self_type" : "type-1766",
+   "referenced_type" : "type-177",
+   "self_type" : "type-176",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16991,8 +17063,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1838",
-   "self_type" : "type-1840",
+   "referenced_type" : "type-1839",
+   "self_type" : "type-1841",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17001,8 +17073,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1963",
-   "self_type" : "type-1965",
+   "referenced_type" : "type-1965",
+   "self_type" : "type-1967",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17011,8 +17083,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2038",
-   "self_type" : "type-2040",
+   "referenced_type" : "type-2041",
+   "self_type" : "type-2043",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17021,8 +17093,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2091",
-   "self_type" : "type-2093",
+   "referenced_type" : "type-2093",
+   "self_type" : "type-2095",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17031,8 +17103,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2153",
-   "self_type" : "type-2155",
+   "referenced_type" : "type-2155",
+   "self_type" : "type-2157",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17041,8 +17113,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2307",
-   "self_type" : "type-2306",
+   "referenced_type" : "type-2309",
+   "self_type" : "type-2308",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17051,8 +17123,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2473",
-   "self_type" : "type-2475",
+   "referenced_type" : "type-2475",
+   "self_type" : "type-2477",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17061,8 +17133,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2499",
-   "self_type" : "type-2501",
+   "referenced_type" : "type-2501",
+   "self_type" : "type-2503",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17071,8 +17143,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2541",
-   "self_type" : "type-2543",
+   "referenced_type" : "type-2546",
+   "self_type" : "type-2549",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17081,8 +17153,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2576",
-   "self_type" : "type-2578",
+   "referenced_type" : "type-2581",
+   "self_type" : "type-2583",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17091,8 +17163,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2751",
-   "self_type" : "type-2753",
+   "referenced_type" : "type-2753",
+   "self_type" : "type-2755",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17101,8 +17173,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2798",
-   "self_type" : "type-2800",
+   "referenced_type" : "type-2800",
+   "self_type" : "type-2802",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17111,8 +17183,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2803",
-   "self_type" : "type-2805",
+   "referenced_type" : "type-2805",
+   "self_type" : "type-2807",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17121,8 +17193,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2813",
-   "self_type" : "type-2815",
+   "referenced_type" : "type-2815",
+   "self_type" : "type-2817",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17131,8 +17203,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2832",
-   "self_type" : "type-2834",
+   "referenced_type" : "type-2834",
+   "self_type" : "type-2836",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17141,8 +17213,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2898",
-   "self_type" : "type-2900",
+   "referenced_type" : "type-2900",
+   "self_type" : "type-2902",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17151,8 +17223,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2983",
-   "self_type" : "type-2985",
+   "referenced_type" : "type-2985",
+   "self_type" : "type-2987",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17161,8 +17233,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3135",
-   "self_type" : "type-3137",
+   "referenced_type" : "type-3139",
+   "self_type" : "type-3141",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17171,8 +17243,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3213",
-   "self_type" : "type-3215",
+   "referenced_type" : "type-3216",
+   "self_type" : "type-3218",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17181,8 +17253,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3255",
-   "self_type" : "type-3257",
+   "referenced_type" : "type-3258",
+   "self_type" : "type-3260",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17191,8 +17263,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3306",
-   "self_type" : "type-3308",
+   "referenced_type" : "type-3309",
+   "self_type" : "type-3311",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17201,8 +17273,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3404",
-   "self_type" : "type-3403",
+   "referenced_type" : "type-3407",
+   "self_type" : "type-3406",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17211,8 +17283,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3570",
-   "self_type" : "type-3572",
+   "referenced_type" : "type-3573",
+   "self_type" : "type-3575",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17221,8 +17293,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3596",
-   "self_type" : "type-3598",
+   "referenced_type" : "type-3599",
+   "self_type" : "type-3601",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17231,8 +17303,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-407",
-   "self_type" : "type-409",
+   "referenced_type" : "type-404",
+   "self_type" : "type-406",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17241,8 +17313,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-513",
-   "self_type" : "type-515",
+   "referenced_type" : "type-510",
+   "self_type" : "type-512",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17251,8 +17323,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-743",
-   "self_type" : "type-745",
+   "referenced_type" : "type-744",
+   "self_type" : "type-746",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17261,8 +17333,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-850",
-   "self_type" : "type-852",
+   "referenced_type" : "type-851",
+   "self_type" : "type-853",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17291,8 +17363,8 @@
    "is_const" : true,
    "linker_set_key" : "android::hardware::IBinder *const",
    "name" : "android::hardware::IBinder *const",
-   "referenced_type" : "type-195",
-   "self_type" : "type-194",
+   "referenced_type" : "type-208",
+   "self_type" : "type-207",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -17308,24 +17380,24 @@
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-2205",
-   "self_type" : "type-2204",
+   "referenced_type" : "type-2207",
+   "self_type" : "type-2206",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-2250",
-   "self_type" : "type-2249",
+   "referenced_type" : "type-2253",
+   "self_type" : "type-2252",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-2741",
-   "self_type" : "type-2740",
+   "referenced_type" : "type-2743",
+   "self_type" : "type-2742",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
@@ -17340,24 +17412,24 @@
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-3369",
-   "self_type" : "type-3368",
+   "referenced_type" : "type-3372",
+   "self_type" : "type-3371",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const AHardwareBuffer",
    "name" : "const AHardwareBuffer",
-   "referenced_type" : "type-1883",
-   "self_type" : "type-1882",
+   "referenced_type" : "type-1885",
+   "self_type" : "type-1884",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const AHardwareBuffer",
    "name" : "const AHardwareBuffer",
-   "referenced_type" : "type-3039",
-   "self_type" : "type-3038",
+   "referenced_type" : "type-3042",
+   "self_type" : "type-3041",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -17373,8 +17445,8 @@
    "is_const" : true,
    "linker_set_key" : "const ANativeWindowBuffer",
    "name" : "const ANativeWindowBuffer",
-   "referenced_type" : "type-517",
-   "self_type" : "type-637",
+   "referenced_type" : "type-515",
+   "self_type" : "type-638",
    "size" : 96,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -17382,48 +17454,48 @@
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-2140",
-   "self_type" : "type-2139",
+   "referenced_type" : "type-2139",
+   "self_type" : "type-2138",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-2274",
-   "self_type" : "type-2273",
+   "referenced_type" : "type-2276",
+   "self_type" : "type-2275",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-2732",
-   "self_type" : "type-2731",
+   "referenced_type" : "type-2734",
+   "self_type" : "type-2733",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-3016",
-   "self_type" : "type-3015",
+   "referenced_type" : "type-3015",
+   "self_type" : "type-3014",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-3379",
-   "self_type" : "type-3378",
+   "referenced_type" : "type-3382",
+   "self_type" : "type-3381",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-962",
-   "self_type" : "type-961",
+   "referenced_type" : "type-959",
+   "self_type" : "type-958",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
@@ -17431,8 +17503,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
    "name" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
-   "referenced_type" : "type-516",
-   "self_type" : "type-535",
+   "referenced_type" : "type-514",
+   "self_type" : "type-532",
    "size" : 104,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
   },
@@ -17452,7 +17524,7 @@
    "linker_set_key" : "const android::ColorSpace::TransferParameters",
    "name" : "const android::ColorSpace::TransferParameters",
    "referenced_type" : "type-981",
-   "self_type" : "type-1033",
+   "self_type" : "type-1030",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -17481,8 +17553,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime",
    "name" : "const android::FenceTime",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1395",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1399",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -17491,8 +17563,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot",
    "name" : "const android::FenceTime::Snapshot",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1388",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1393",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -17501,8 +17573,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot::State",
    "name" : "const android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1406",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1410",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17511,8 +17583,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::State",
    "name" : "const android::FenceTime::State",
-   "referenced_type" : "type-1378",
-   "self_type" : "type-1377",
+   "referenced_type" : "type-1383",
+   "self_type" : "type-1382",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -17531,8 +17603,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FrameStats",
    "name" : "const android::FrameStats",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1428",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1432",
    "size" : 72,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
@@ -17541,8 +17613,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Gralloc2Allocator",
    "name" : "const android::Gralloc2Allocator",
-   "referenced_type" : "type-353",
-   "self_type" : "type-361",
+   "referenced_type" : "type-350",
+   "self_type" : "type-358",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -17551,8 +17623,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Gralloc2Mapper",
    "name" : "const android::Gralloc2Mapper",
-   "referenced_type" : "type-337",
-   "self_type" : "type-344",
+   "referenced_type" : "type-334",
+   "self_type" : "type-341",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -17561,8 +17633,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-1876",
-   "self_type" : "type-1875",
+   "referenced_type" : "type-1878",
+   "self_type" : "type-1877",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -17571,8 +17643,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-2010",
-   "self_type" : "type-2009",
+   "referenced_type" : "type-2013",
+   "self_type" : "type-2012",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -17581,8 +17653,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-2016",
-   "self_type" : "type-2015",
+   "referenced_type" : "type-2019",
+   "self_type" : "type-2018",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -17591,18 +17663,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-3029",
-   "self_type" : "type-3028",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::GrallocMapper",
-   "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-3195",
-   "self_type" : "type-3194",
+   "referenced_type" : "type-3032",
+   "self_type" : "type-3031",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -17621,6 +17683,16 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
+   "referenced_type" : "type-3202",
+   "self_type" : "type-3201",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GrallocMapper",
+   "name" : "const android::GrallocMapper",
    "referenced_type" : "type-613",
    "self_type" : "type-612",
    "size" : 4,
@@ -17631,8 +17703,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-803",
-   "self_type" : "type-802",
+   "referenced_type" : "type-804",
+   "self_type" : "type-803",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -17641,8 +17713,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-828",
-   "self_type" : "type-827",
+   "referenced_type" : "type-829",
+   "self_type" : "type-828",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -17651,8 +17723,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-525",
-   "self_type" : "type-624",
+   "referenced_type" : "type-523",
+   "self_type" : "type-625",
    "size" : 160,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -17661,8 +17733,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferAllocator",
    "name" : "const android::GraphicBufferAllocator",
-   "referenced_type" : "type-542",
-   "self_type" : "type-720",
+   "referenced_type" : "type-539",
+   "self_type" : "type-721",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -17671,7 +17743,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferAllocator::alloc_rec_t",
    "name" : "const android::GraphicBufferAllocator::alloc_rec_t",
-   "referenced_type" : "type-676",
+   "referenced_type" : "type-680",
    "self_type" : "type-706",
    "size" : 48,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -17681,8 +17753,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferMapper",
    "name" : "const android::GraphicBufferMapper",
-   "referenced_type" : "type-527",
-   "self_type" : "type-614",
+   "referenced_type" : "type-525",
+   "self_type" : "type-615",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -17692,7 +17764,7 @@
    "linker_set_key" : "const android::HdrCapabilities",
    "name" : "const android::HdrCapabilities",
    "referenced_type" : "type-964",
-   "self_type" : "type-972",
+   "self_type" : "type-973",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -17701,8 +17773,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-715",
-   "self_type" : "type-717",
+   "referenced_type" : "type-716",
+   "self_type" : "type-718",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -17712,7 +17784,7 @@
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect>",
    "name" : "const android::LightFlattenablePod<android::Rect>",
    "referenced_type" : "type-1243",
-   "self_type" : "type-2231",
+   "self_type" : "type-2234",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17761,7 +17833,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
-   "referenced_type" : "type-172",
+   "referenced_type" : "type-175",
    "self_type" : "type-1078",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
@@ -17771,8 +17843,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Region",
    "name" : "const android::Region",
-   "referenced_type" : "type-2221",
-   "self_type" : "type-2220",
+   "referenced_type" : "type-2224",
+   "self_type" : "type-2223",
    "size" : 20,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -17791,8 +17863,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-179",
-   "self_type" : "type-184",
+   "referenced_type" : "type-182",
+   "self_type" : "type-187",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -17801,8 +17873,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
-   "referenced_type" : "type-285",
-   "self_type" : "type-873",
+   "referenced_type" : "type-282",
+   "self_type" : "type-863",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -17811,8 +17883,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<android::Rect>",
    "name" : "const android::Vector<android::Rect>",
-   "referenced_type" : "type-2213",
-   "self_type" : "type-2215",
+   "referenced_type" : "type-2216",
+   "self_type" : "type-2218",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17821,8 +17893,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<long long>",
    "name" : "const android::Vector<long long>",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1425",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1429",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17831,8 +17903,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
-   "referenced_type" : "type-235",
-   "self_type" : "type-1422",
+   "referenced_type" : "type-237",
+   "self_type" : "type-1426",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -17852,7 +17924,7 @@
    "linker_set_key" : "const android::details::TMat33<float>",
    "name" : "const android::details::TMat33<float>",
    "referenced_type" : "type-903",
-   "self_type" : "type-925",
+   "self_type" : "type-919",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -17861,8 +17933,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TMat44<float>",
    "name" : "const android::details::TMat44<float>",
-   "referenced_type" : "type-2276",
-   "self_type" : "type-2280",
+   "referenced_type" : "type-2278",
+   "self_type" : "type-2283",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -17871,8 +17943,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TQuaternion<double>",
    "name" : "const android::details::TQuaternion<double>",
-   "referenced_type" : "type-331",
-   "self_type" : "type-404",
+   "referenced_type" : "type-328",
+   "self_type" : "type-401",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -17881,8 +17953,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TQuaternion<float>",
    "name" : "const android::details::TQuaternion<float>",
-   "referenced_type" : "type-410",
-   "self_type" : "type-432",
+   "referenced_type" : "type-407",
+   "self_type" : "type-429",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -17901,7 +17973,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec2<double>",
    "name" : "const android::details::TVec2<double>",
-   "referenced_type" : "type-55",
+   "referenced_type" : "type-57",
    "self_type" : "type-1070",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -17911,7 +17983,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec2<float>",
    "name" : "const android::details::TVec2<float>",
-   "referenced_type" : "type-22",
+   "referenced_type" : "type-23",
    "self_type" : "type-1051",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -17921,7 +17993,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec3<double>",
    "name" : "const android::details::TVec3<double>",
-   "referenced_type" : "type-66",
+   "referenced_type" : "type-68",
    "self_type" : "type-1369",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
@@ -17931,7 +18003,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec3<float>",
    "name" : "const android::details::TVec3<float>",
-   "referenced_type" : "type-17",
+   "referenced_type" : "type-18",
    "self_type" : "type-1055",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -17941,8 +18013,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec4<double>",
    "name" : "const android::details::TVec4<double>",
-   "referenced_type" : "type-50",
-   "self_type" : "type-166",
+   "referenced_type" : "type-52",
+   "self_type" : "type-164",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -17951,8 +18023,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec4<float>",
    "name" : "const android::details::TVec4<float>",
-   "referenced_type" : "type-200",
-   "self_type" : "type-325",
+   "referenced_type" : "type-192",
+   "self_type" : "type-322",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -17962,7 +18034,7 @@
    "linker_set_key" : "const android::half",
    "name" : "const android::half",
    "referenced_type" : "type-1",
-   "self_type" : "type-42",
+   "self_type" : "type-44",
    "size" : 2,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -17991,8 +18063,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::BpHwRefBase",
    "name" : "const android::hardware::BpHwRefBase",
-   "referenced_type" : "type-193",
-   "self_type" : "type-211",
+   "referenced_type" : "type-206",
+   "self_type" : "type-213",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -18001,8 +18073,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-215",
-   "self_type" : "type-231",
+   "referenced_type" : "type-217",
+   "self_type" : "type-233",
    "size" : 68,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -18011,8 +18083,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
-   "referenced_type" : "type-99",
-   "self_type" : "type-109",
+   "referenced_type" : "type-101",
+   "self_type" : "type-111",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -18021,8 +18093,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
-   "referenced_type" : "type-393",
-   "self_type" : "type-401",
+   "referenced_type" : "type-392",
+   "self_type" : "type-398",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -18031,8 +18103,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
-   "referenced_type" : "type-111",
-   "self_type" : "type-115",
+   "referenced_type" : "type-113",
+   "self_type" : "type-117",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -18041,7 +18113,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Status",
    "name" : "const android::hardware::Status",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1310",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -18061,8 +18133,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
-   "referenced_type" : "type-136",
-   "self_type" : "type-293",
+   "referenced_type" : "type-139",
+   "self_type" : "type-290",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18071,8 +18143,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned int>",
    "name" : "const android::hardware::details::hidl_pointer<unsigned int>",
-   "referenced_type" : "type-120",
-   "self_type" : "type-190",
+   "referenced_type" : "type-122",
+   "self_type" : "type-203",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18081,7 +18153,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::return_status",
    "name" : "const android::hardware::details::return_status",
-   "referenced_type" : "type-101",
+   "referenced_type" : "type-103",
    "self_type" : "type-1319",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -18091,8 +18163,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
-   "referenced_type" : "type-1745",
-   "self_type" : "type-1744",
+   "referenced_type" : "type-1746",
+   "self_type" : "type-1745",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18101,8 +18173,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
-   "referenced_type" : "type-2714",
-   "self_type" : "type-2713",
+   "referenced_type" : "type-2716",
+   "self_type" : "type-2715",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18111,8 +18183,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
-   "referenced_type" : "type-2880",
-   "self_type" : "type-2879",
+   "referenced_type" : "type-2883",
+   "self_type" : "type-2882",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18121,8 +18193,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
-   "referenced_type" : "type-382",
-   "self_type" : "type-381",
+   "referenced_type" : "type-379",
+   "self_type" : "type-378",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18131,8 +18203,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
-   "referenced_type" : "type-1828",
-   "self_type" : "type-1827",
+   "referenced_type" : "type-1829",
+   "self_type" : "type-1828",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18141,8 +18213,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
-   "referenced_type" : "type-2973",
-   "self_type" : "type-2972",
+   "referenced_type" : "type-2975",
+   "self_type" : "type-2974",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18151,8 +18223,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
-   "referenced_type" : "type-495",
-   "self_type" : "type-494",
+   "referenced_type" : "type-492",
+   "self_type" : "type-491",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18161,8 +18233,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_0::BufferUsage",
-   "referenced_type" : "type-150",
-   "self_type" : "type-153",
+   "referenced_type" : "type-153",
+   "self_type" : "type-156",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18231,8 +18303,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_1::BufferUsage",
-   "referenced_type" : "type-158",
-   "self_type" : "type-160",
+   "referenced_type" : "type-160",
+   "self_type" : "type-162",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -18281,8 +18353,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_2::BufferUsage",
-   "referenced_type" : "type-420",
-   "self_type" : "type-422",
+   "referenced_type" : "type-417",
+   "self_type" : "type-419",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -18331,8 +18403,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper",
-   "referenced_type" : "type-1585",
-   "self_type" : "type-1584",
+   "referenced_type" : "type-1589",
+   "self_type" : "type-1588",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18341,8 +18413,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper",
-   "referenced_type" : "type-2554",
-   "self_type" : "type-2553",
+   "referenced_type" : "type-2559",
+   "self_type" : "type-2558",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18351,8 +18423,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper",
-   "referenced_type" : "type-2826",
-   "self_type" : "type-2825",
+   "referenced_type" : "type-2828",
+   "self_type" : "type-2827",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18361,8 +18433,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper",
-   "referenced_type" : "type-85",
-   "self_type" : "type-84",
+   "referenced_type" : "type-87",
+   "self_type" : "type-86",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18371,8 +18443,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper",
-   "referenced_type" : "type-1595",
-   "self_type" : "type-1594",
+   "referenced_type" : "type-1599",
+   "self_type" : "type-1598",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18381,8 +18453,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper",
-   "referenced_type" : "type-2564",
-   "self_type" : "type-2563",
+   "referenced_type" : "type-2569",
+   "self_type" : "type-2568",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18391,8 +18463,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper",
-   "referenced_type" : "type-2830",
-   "self_type" : "type-2829",
+   "referenced_type" : "type-2832",
+   "self_type" : "type-2831",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18401,8 +18473,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper",
-   "referenced_type" : "type-97",
-   "self_type" : "type-96",
+   "referenced_type" : "type-99",
+   "self_type" : "type-98",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18411,8 +18483,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper",
-   "referenced_type" : "type-1754",
-   "self_type" : "type-1753",
+   "referenced_type" : "type-1755",
+   "self_type" : "type-1754",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18421,8 +18493,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper",
-   "referenced_type" : "type-2888",
-   "self_type" : "type-2887",
+   "referenced_type" : "type-2890",
+   "self_type" : "type-2889",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18431,8 +18503,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper",
-   "referenced_type" : "type-392",
-   "self_type" : "type-391",
+   "referenced_type" : "type-389",
+   "self_type" : "type-388",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18451,8 +18523,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
-   "referenced_type" : "type-149",
-   "self_type" : "type-154",
+   "referenced_type" : "type-152",
+   "self_type" : "type-157",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18461,8 +18533,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
-   "referenced_type" : "type-157",
-   "self_type" : "type-161",
+   "referenced_type" : "type-159",
+   "self_type" : "type-163",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18471,8 +18543,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
-   "referenced_type" : "type-419",
-   "self_type" : "type-423",
+   "referenced_type" : "type-416",
+   "self_type" : "type-420",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18481,7 +18553,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-139",
+   "referenced_type" : "type-142",
    "self_type" : "type-1121",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -18511,8 +18583,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_handle>",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_handle>",
-   "referenced_type" : "type-135",
-   "self_type" : "type-146",
+   "referenced_type" : "type-138",
+   "self_type" : "type-149",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18521,8 +18593,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned int>",
    "name" : "const android::hardware::hidl_vec<unsigned int>",
-   "referenced_type" : "type-128",
-   "self_type" : "type-132",
+   "referenced_type" : "type-131",
+   "self_type" : "type-134",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18541,8 +18613,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "const android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-164",
-   "self_type" : "type-165",
+   "referenced_type" : "type-167",
+   "self_type" : "type-168",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18551,8 +18623,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase",
    "name" : "const android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-171",
-   "self_type" : "type-170",
+   "referenced_type" : "type-174",
+   "self_type" : "type-173",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
@@ -18561,8 +18633,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-295",
-   "self_type" : "type-294",
+   "referenced_type" : "type-292",
+   "self_type" : "type-291",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
@@ -18591,8 +18663,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::IBinder>",
    "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-248",
-   "self_type" : "type-273",
+   "referenced_type" : "type-250",
+   "self_type" : "type-269",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -18601,8 +18673,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::ProcessState>",
    "name" : "const android::sp<android::hardware::ProcessState>",
-   "referenced_type" : "type-279",
-   "self_type" : "type-278",
+   "referenced_type" : "type-275",
+   "self_type" : "type-274",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -18611,8 +18683,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
    "name" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
-   "referenced_type" : "type-355",
-   "self_type" : "type-379",
+   "referenced_type" : "type-352",
+   "self_type" : "type-376",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18621,8 +18693,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
    "name" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
-   "referenced_type" : "type-484",
-   "self_type" : "type-492",
+   "referenced_type" : "type-481",
+   "self_type" : "type-489",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18631,8 +18703,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
-   "referenced_type" : "type-338",
-   "self_type" : "type-387",
+   "referenced_type" : "type-335",
+   "self_type" : "type-384",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18641,8 +18713,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
-   "referenced_type" : "type-86",
-   "self_type" : "type-91",
+   "referenced_type" : "type-88",
+   "self_type" : "type-93",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18651,8 +18723,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
    "name" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
-   "referenced_type" : "type-497",
-   "self_type" : "type-505",
+   "referenced_type" : "type-494",
+   "self_type" : "type-502",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18671,8 +18743,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::base::V1_0::IBase>",
    "name" : "const android::sp<android::hidl::base::V1_0::IBase>",
-   "referenced_type" : "type-363",
-   "self_type" : "type-365",
+   "referenced_type" : "type-360",
+   "self_type" : "type-362",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18681,8 +18753,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification>",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification>",
-   "referenced_type" : "type-371",
-   "self_type" : "type-374",
+   "referenced_type" : "type-368",
+   "self_type" : "type-371",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18701,8 +18773,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ui::Transform",
    "name" : "const android::ui::Transform",
-   "referenced_type" : "type-2283",
-   "self_type" : "type-2286",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2289",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -18711,8 +18783,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ui::Transform::mat33",
    "name" : "const android::ui::Transform::mat33",
-   "referenced_type" : "type-2284",
-   "self_type" : "type-2295",
+   "referenced_type" : "type-2287",
+   "self_type" : "type-2297",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -18722,7 +18794,7 @@
    "linker_set_key" : "const bool",
    "name" : "const bool",
    "referenced_type" : "type-6",
-   "self_type" : "type-370",
+   "self_type" : "type-367",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -18731,8 +18803,8 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-288",
-   "self_type" : "type-287",
+   "referenced_type" : "type-285",
+   "self_type" : "type-284",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -18741,8 +18813,8 @@
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-182",
-   "self_type" : "type-181",
+   "referenced_type" : "type-185",
+   "self_type" : "type-184",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -18751,8 +18823,8 @@
    "is_const" : true,
    "linker_set_key" : "const double",
    "name" : "const double",
-   "referenced_type" : "type-41",
-   "self_type" : "type-853",
+   "referenced_type" : "type-43",
+   "self_type" : "type-850",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18762,7 +18834,7 @@
    "linker_set_key" : "const float",
    "name" : "const float",
    "referenced_type" : "type-10",
-   "self_type" : "type-563",
+   "self_type" : "type-560",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
   },
@@ -18778,40 +18850,40 @@
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-2257",
-   "self_type" : "type-2256",
+   "referenced_type" : "type-2260",
+   "self_type" : "type-2259",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-2263",
-   "self_type" : "type-2262",
+   "referenced_type" : "type-2265",
+   "self_type" : "type-2264",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-2744",
-   "self_type" : "type-2743",
+   "referenced_type" : "type-2746",
+   "self_type" : "type-2745",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-3179",
-   "self_type" : "type-3178",
+   "referenced_type" : "type-3178",
+   "self_type" : "type-3177",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-3372",
-   "self_type" : "type-3371",
+   "referenced_type" : "type-3375",
+   "self_type" : "type-3374",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
@@ -18819,8 +18891,8 @@
    "is_const" : true,
    "linker_set_key" : "const gralloc_module_t",
    "name" : "const gralloc_module_t",
-   "referenced_type" : "type-578",
-   "self_type" : "type-582",
+   "referenced_type" : "type-576",
+   "self_type" : "type-580",
    "size" : 176,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -18829,8 +18901,8 @@
    "is_const" : true,
    "linker_set_key" : "const hw_module_t",
    "name" : "const hw_module_t",
-   "referenced_type" : "type-549",
-   "self_type" : "type-555",
+   "referenced_type" : "type-546",
+   "self_type" : "type-552",
    "size" : 128,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -18839,8 +18911,8 @@
    "is_const" : true,
    "linker_set_key" : "const int",
    "name" : "const int",
-   "referenced_type" : "type-103",
-   "self_type" : "type-562",
+   "referenced_type" : "type-105",
+   "self_type" : "type-559",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -18856,192 +18928,192 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-126",
-   "self_type" : "type-125",
+   "referenced_type" : "type-129",
+   "self_type" : "type-128",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1577",
-   "self_type" : "type-1576",
+   "referenced_type" : "type-1581",
+   "self_type" : "type-1580",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1612",
-   "self_type" : "type-1611",
+   "referenced_type" : "type-1617",
+   "self_type" : "type-1616",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1768",
-   "self_type" : "type-1767",
+   "referenced_type" : "type-1769",
+   "self_type" : "type-1768",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1893",
-   "self_type" : "type-1892",
+   "referenced_type" : "type-1895",
+   "self_type" : "type-1894",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1967",
-   "self_type" : "type-1966",
+   "referenced_type" : "type-1969",
+   "self_type" : "type-1968",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2043",
-   "self_type" : "type-2042",
+   "referenced_type" : "type-2047",
+   "self_type" : "type-2046",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2095",
-   "self_type" : "type-2094",
+   "referenced_type" : "type-2097",
+   "self_type" : "type-2096",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2157",
-   "self_type" : "type-2156",
+   "referenced_type" : "type-2159",
+   "self_type" : "type-2158",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2323",
-   "self_type" : "type-2322",
+   "referenced_type" : "type-2325",
+   "self_type" : "type-2324",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2546",
-   "self_type" : "type-2545",
+   "referenced_type" : "type-2551",
+   "self_type" : "type-2550",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2581",
-   "self_type" : "type-2580",
+   "referenced_type" : "type-2587",
+   "self_type" : "type-2586",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2756",
-   "self_type" : "type-2755",
+   "referenced_type" : "type-2758",
+   "self_type" : "type-2757",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2817",
-   "self_type" : "type-2816",
+   "referenced_type" : "type-2819",
+   "self_type" : "type-2818",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2836",
-   "self_type" : "type-2835",
+   "referenced_type" : "type-2838",
+   "self_type" : "type-2837",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2903",
-   "self_type" : "type-2902",
+   "referenced_type" : "type-2906",
+   "self_type" : "type-2905",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3049",
-   "self_type" : "type-3048",
+   "referenced_type" : "type-3052",
+   "self_type" : "type-3051",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3140",
-   "self_type" : "type-3139",
+   "referenced_type" : "type-3144",
+   "self_type" : "type-3143",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3217",
-   "self_type" : "type-3216",
+   "referenced_type" : "type-3220",
+   "self_type" : "type-3219",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3259",
-   "self_type" : "type-3258",
+   "referenced_type" : "type-3262",
+   "self_type" : "type-3261",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3310",
-   "self_type" : "type-3309",
+   "referenced_type" : "type-3313",
+   "self_type" : "type-3312",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3420",
-   "self_type" : "type-3419",
+   "referenced_type" : "type-3423",
+   "self_type" : "type-3422",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-37",
-   "self_type" : "type-36",
+   "referenced_type" : "type-40",
+   "self_type" : "type-39",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-417",
-   "self_type" : "type-416",
+   "referenced_type" : "type-414",
+   "self_type" : "type-413",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -19056,16 +19128,16 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-748",
-   "self_type" : "type-747",
+   "referenced_type" : "type-749",
+   "self_type" : "type-748",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-855",
-   "self_type" : "type-854",
+   "referenced_type" : "type-857",
+   "self_type" : "type-856",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -19099,7 +19171,7 @@
    "is_const" : true,
    "linker_set_key" : "const long long",
    "name" : "const long long",
-   "referenced_type" : "type-284",
+   "referenced_type" : "type-12",
    "self_type" : "type-847",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -19109,8 +19181,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle",
    "name" : "const native_handle",
-   "referenced_type" : "type-144",
-   "self_type" : "type-143",
+   "referenced_type" : "type-147",
+   "self_type" : "type-146",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19119,8 +19191,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle *const",
    "name" : "const native_handle *const",
-   "referenced_type" : "type-142",
-   "self_type" : "type-696",
+   "referenced_type" : "type-145",
+   "self_type" : "type-699",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19130,7 +19202,7 @@
    "linker_set_key" : "const short",
    "name" : "const short",
    "referenced_type" : "type-599",
-   "self_type" : "type-825",
+   "self_type" : "type-823",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19159,8 +19231,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3>",
    "name" : "const std::array<android::details::TVec2<float>, 3>",
-   "referenced_type" : "type-2202",
-   "self_type" : "type-2201",
+   "referenced_type" : "type-2204",
+   "self_type" : "type-2203",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -19169,8 +19241,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3>",
    "name" : "const std::array<android::details::TVec2<float>, 3>",
-   "referenced_type" : "type-2738",
-   "self_type" : "type-2737",
+   "referenced_type" : "type-2740",
+   "self_type" : "type-2739",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -19179,8 +19251,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3>",
    "name" : "const std::array<android::details::TVec2<float>, 3>",
-   "referenced_type" : "type-3091",
-   "self_type" : "type-3090",
+   "referenced_type" : "type-3090",
+   "self_type" : "type-3089",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -19199,8 +19271,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1687",
-   "self_type" : "type-1686",
+   "referenced_type" : "type-1688",
+   "self_type" : "type-1687",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19209,8 +19281,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1786",
-   "self_type" : "type-1785",
+   "referenced_type" : "type-1787",
+   "self_type" : "type-1786",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19219,8 +19291,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1900",
-   "self_type" : "type-1899",
+   "referenced_type" : "type-1902",
+   "self_type" : "type-1901",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19229,8 +19301,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1974",
-   "self_type" : "type-1973",
+   "referenced_type" : "type-1978",
+   "self_type" : "type-1977",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19239,8 +19311,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2054",
-   "self_type" : "type-2053",
+   "referenced_type" : "type-2057",
+   "self_type" : "type-2056",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19249,8 +19321,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2100",
-   "self_type" : "type-2099",
+   "referenced_type" : "type-2103",
+   "self_type" : "type-2102",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19259,8 +19331,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2162",
-   "self_type" : "type-2161",
+   "referenced_type" : "type-2164",
+   "self_type" : "type-2163",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19269,8 +19341,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2361",
-   "self_type" : "type-2360",
+   "referenced_type" : "type-2363",
+   "self_type" : "type-2362",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19279,8 +19351,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2656",
-   "self_type" : "type-2655",
+   "referenced_type" : "type-2658",
+   "self_type" : "type-2657",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19289,8 +19361,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2762",
-   "self_type" : "type-2761",
+   "referenced_type" : "type-2764",
+   "self_type" : "type-2763",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19299,8 +19371,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2849",
-   "self_type" : "type-2848",
+   "referenced_type" : "type-2851",
+   "self_type" : "type-2850",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19309,8 +19381,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2925",
-   "self_type" : "type-2924",
+   "referenced_type" : "type-2928",
+   "self_type" : "type-2927",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19319,8 +19391,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-302",
-   "self_type" : "type-301",
+   "referenced_type" : "type-299",
+   "self_type" : "type-298",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19329,8 +19401,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-3056",
-   "self_type" : "type-3055",
+   "referenced_type" : "type-3060",
+   "self_type" : "type-3059",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19339,8 +19411,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-3154",
-   "self_type" : "type-3153",
+   "referenced_type" : "type-3158",
+   "self_type" : "type-3157",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19349,8 +19421,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-3224",
-   "self_type" : "type-3223",
+   "referenced_type" : "type-3227",
+   "self_type" : "type-3226",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19359,8 +19431,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-3264",
-   "self_type" : "type-3263",
+   "referenced_type" : "type-3267",
+   "self_type" : "type-3266",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19369,8 +19441,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-3315",
-   "self_type" : "type-3314",
+   "referenced_type" : "type-3318",
+   "self_type" : "type-3317",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19379,8 +19451,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-3458",
-   "self_type" : "type-3457",
+   "referenced_type" : "type-3461",
+   "self_type" : "type-3460",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19389,8 +19461,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-442",
-   "self_type" : "type-441",
+   "referenced_type" : "type-439",
+   "self_type" : "type-438",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19409,8 +19481,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-762",
-   "self_type" : "type-761",
+   "referenced_type" : "type-764",
+   "self_type" : "type-763",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19419,8 +19491,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-866",
-   "self_type" : "type-865",
+   "referenced_type" : "type-867",
+   "self_type" : "type-866",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19429,8 +19501,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-922",
-   "self_type" : "type-921",
+   "referenced_type" : "type-923",
+   "self_type" : "type-922",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19449,8 +19521,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1001",
-   "self_type" : "type-1000",
+   "referenced_type" : "type-1002",
+   "self_type" : "type-1001",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19469,8 +19541,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1693",
-   "self_type" : "type-1692",
+   "referenced_type" : "type-1694",
+   "self_type" : "type-1693",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19479,8 +19551,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1792",
-   "self_type" : "type-1791",
+   "referenced_type" : "type-1793",
+   "self_type" : "type-1792",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19489,8 +19561,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1906",
-   "self_type" : "type-1905",
+   "referenced_type" : "type-1908",
+   "self_type" : "type-1907",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19499,8 +19571,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1982",
-   "self_type" : "type-1981",
+   "referenced_type" : "type-1984",
+   "self_type" : "type-1983",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19509,8 +19581,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2060",
-   "self_type" : "type-2059",
+   "referenced_type" : "type-2063",
+   "self_type" : "type-2062",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19519,8 +19591,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2107",
-   "self_type" : "type-2106",
+   "referenced_type" : "type-2110",
+   "self_type" : "type-2109",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19529,8 +19601,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2168",
-   "self_type" : "type-2167",
+   "referenced_type" : "type-2171",
+   "self_type" : "type-2170",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19539,8 +19611,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2367",
-   "self_type" : "type-2366",
+   "referenced_type" : "type-2369",
+   "self_type" : "type-2368",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19549,8 +19621,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2662",
-   "self_type" : "type-2661",
+   "referenced_type" : "type-2664",
+   "self_type" : "type-2663",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19559,8 +19631,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2768",
-   "self_type" : "type-2767",
+   "referenced_type" : "type-2770",
+   "self_type" : "type-2769",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19569,8 +19641,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2855",
-   "self_type" : "type-2854",
+   "referenced_type" : "type-2857",
+   "self_type" : "type-2856",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19579,8 +19651,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2932",
-   "self_type" : "type-2931",
+   "referenced_type" : "type-2934",
+   "self_type" : "type-2933",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19589,8 +19661,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-3062",
-   "self_type" : "type-3061",
+   "referenced_type" : "type-3066",
+   "self_type" : "type-3065",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19599,8 +19671,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-308",
-   "self_type" : "type-307",
+   "referenced_type" : "type-306",
+   "self_type" : "type-305",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19609,8 +19681,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-3161",
-   "self_type" : "type-3160",
+   "referenced_type" : "type-3165",
+   "self_type" : "type-3164",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19619,8 +19691,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-3230",
-   "self_type" : "type-3229",
+   "referenced_type" : "type-3233",
+   "self_type" : "type-3232",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19629,8 +19701,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-3270",
-   "self_type" : "type-3269",
+   "referenced_type" : "type-3273",
+   "self_type" : "type-3272",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19639,8 +19711,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-3321",
-   "self_type" : "type-3320",
+   "referenced_type" : "type-3324",
+   "self_type" : "type-3323",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19649,8 +19721,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-3464",
-   "self_type" : "type-3463",
+   "referenced_type" : "type-3467",
+   "self_type" : "type-3466",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19659,8 +19731,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-448",
-   "self_type" : "type-447",
+   "referenced_type" : "type-445",
+   "self_type" : "type-444",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19669,8 +19741,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-658",
-   "self_type" : "type-657",
+   "referenced_type" : "type-659",
+   "self_type" : "type-658",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19689,8 +19761,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-872",
-   "self_type" : "type-871",
+   "referenced_type" : "type-873",
+   "self_type" : "type-872",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19699,8 +19771,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-929",
-   "self_type" : "type-928",
+   "referenced_type" : "type-930",
+   "self_type" : "type-929",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19709,8 +19781,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1003",
-   "self_type" : "type-1002",
+   "referenced_type" : "type-1004",
+   "self_type" : "type-1003",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19729,8 +19801,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1695",
-   "self_type" : "type-1694",
+   "referenced_type" : "type-1696",
+   "self_type" : "type-1695",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19739,8 +19811,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1794",
-   "self_type" : "type-1793",
+   "referenced_type" : "type-1795",
+   "self_type" : "type-1794",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19749,8 +19821,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1908",
-   "self_type" : "type-1907",
+   "referenced_type" : "type-1910",
+   "self_type" : "type-1909",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19759,8 +19831,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1984",
-   "self_type" : "type-1983",
+   "referenced_type" : "type-1986",
+   "self_type" : "type-1985",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19769,8 +19841,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2063",
-   "self_type" : "type-2062",
+   "referenced_type" : "type-2066",
+   "self_type" : "type-2065",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19779,8 +19851,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2109",
-   "self_type" : "type-2108",
+   "referenced_type" : "type-2112",
+   "self_type" : "type-2111",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19789,8 +19861,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2170",
-   "self_type" : "type-2169",
+   "referenced_type" : "type-2173",
+   "self_type" : "type-2172",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19799,8 +19871,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2369",
-   "self_type" : "type-2368",
+   "referenced_type" : "type-2371",
+   "self_type" : "type-2370",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19809,8 +19881,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2664",
-   "self_type" : "type-2663",
+   "referenced_type" : "type-2666",
+   "self_type" : "type-2665",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19819,8 +19891,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2770",
-   "self_type" : "type-2769",
+   "referenced_type" : "type-2772",
+   "self_type" : "type-2771",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19829,8 +19901,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2857",
-   "self_type" : "type-2856",
+   "referenced_type" : "type-2859",
+   "self_type" : "type-2858",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19839,8 +19911,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2934",
-   "self_type" : "type-2933",
+   "referenced_type" : "type-2937",
+   "self_type" : "type-2936",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19849,8 +19921,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-3064",
-   "self_type" : "type-3063",
+   "referenced_type" : "type-3068",
+   "self_type" : "type-3067",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19859,8 +19931,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-311",
-   "self_type" : "type-310",
+   "referenced_type" : "type-308",
+   "self_type" : "type-307",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19869,8 +19941,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-3163",
-   "self_type" : "type-3162",
+   "referenced_type" : "type-3167",
+   "self_type" : "type-3166",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19879,8 +19951,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-3232",
-   "self_type" : "type-3231",
+   "referenced_type" : "type-3235",
+   "self_type" : "type-3234",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19889,8 +19961,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-3272",
-   "self_type" : "type-3271",
+   "referenced_type" : "type-3275",
+   "self_type" : "type-3274",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19899,8 +19971,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-3323",
-   "self_type" : "type-3322",
+   "referenced_type" : "type-3326",
+   "self_type" : "type-3325",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19909,8 +19981,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-3466",
-   "self_type" : "type-3465",
+   "referenced_type" : "type-3469",
+   "self_type" : "type-3468",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19919,8 +19991,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-450",
-   "self_type" : "type-449",
+   "referenced_type" : "type-447",
+   "self_type" : "type-446",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19929,8 +20001,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-660",
-   "self_type" : "type-659",
+   "referenced_type" : "type-661",
+   "self_type" : "type-660",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19949,8 +20021,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-875",
-   "self_type" : "type-874",
+   "referenced_type" : "type-876",
+   "self_type" : "type-875",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19959,8 +20031,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-931",
-   "self_type" : "type-930",
+   "referenced_type" : "type-932",
+   "self_type" : "type-931",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19979,8 +20051,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1691",
-   "self_type" : "type-1690",
+   "referenced_type" : "type-1692",
+   "self_type" : "type-1691",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19989,8 +20061,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1790",
-   "self_type" : "type-1789",
+   "referenced_type" : "type-1791",
+   "self_type" : "type-1790",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19999,8 +20071,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1904",
-   "self_type" : "type-1903",
+   "referenced_type" : "type-1906",
+   "self_type" : "type-1905",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20009,8 +20081,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1978",
-   "self_type" : "type-1977",
+   "referenced_type" : "type-1982",
+   "self_type" : "type-1981",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20019,8 +20091,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2058",
-   "self_type" : "type-2057",
+   "referenced_type" : "type-2061",
+   "self_type" : "type-2060",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20029,8 +20101,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2105",
-   "self_type" : "type-2104",
+   "referenced_type" : "type-2108",
+   "self_type" : "type-2107",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20039,8 +20111,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2166",
-   "self_type" : "type-2165",
+   "referenced_type" : "type-2168",
+   "self_type" : "type-2167",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20049,8 +20121,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2365",
-   "self_type" : "type-2364",
+   "referenced_type" : "type-2367",
+   "self_type" : "type-2366",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20059,8 +20131,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2660",
-   "self_type" : "type-2659",
+   "referenced_type" : "type-2662",
+   "self_type" : "type-2661",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20069,8 +20141,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2766",
-   "self_type" : "type-2765",
+   "referenced_type" : "type-2768",
+   "self_type" : "type-2767",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20079,8 +20151,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2853",
-   "self_type" : "type-2852",
+   "referenced_type" : "type-2855",
+   "self_type" : "type-2854",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20089,8 +20161,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2930",
-   "self_type" : "type-2929",
+   "referenced_type" : "type-2932",
+   "self_type" : "type-2931",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20099,8 +20171,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-3060",
-   "self_type" : "type-3059",
+   "referenced_type" : "type-303",
+   "self_type" : "type-302",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20109,8 +20181,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-306",
-   "self_type" : "type-305",
+   "referenced_type" : "type-3064",
+   "self_type" : "type-3063",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20119,8 +20191,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-3158",
-   "self_type" : "type-3157",
+   "referenced_type" : "type-3162",
+   "self_type" : "type-3161",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20129,8 +20201,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-3228",
-   "self_type" : "type-3227",
+   "referenced_type" : "type-3231",
+   "self_type" : "type-3230",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20139,8 +20211,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-3268",
-   "self_type" : "type-3267",
+   "referenced_type" : "type-3271",
+   "self_type" : "type-3270",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20149,8 +20221,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-3319",
-   "self_type" : "type-3318",
+   "referenced_type" : "type-3322",
+   "self_type" : "type-3321",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20159,8 +20231,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-3462",
-   "self_type" : "type-3461",
+   "referenced_type" : "type-3465",
+   "self_type" : "type-3464",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20169,8 +20241,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-446",
-   "self_type" : "type-445",
+   "referenced_type" : "type-443",
+   "self_type" : "type-442",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20179,8 +20251,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-656",
-   "self_type" : "type-655",
+   "referenced_type" : "type-657",
+   "self_type" : "type-656",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20189,8 +20261,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-766",
-   "self_type" : "type-765",
+   "referenced_type" : "type-768",
+   "self_type" : "type-767",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20199,8 +20271,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-870",
-   "self_type" : "type-869",
+   "referenced_type" : "type-871",
+   "self_type" : "type-870",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20209,8 +20281,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-927",
-   "self_type" : "type-926",
+   "referenced_type" : "type-928",
+   "self_type" : "type-927",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20229,8 +20301,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1005",
-   "self_type" : "type-1004",
+   "referenced_type" : "type-1006",
+   "self_type" : "type-1005",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20249,8 +20321,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1697",
-   "self_type" : "type-1696",
+   "referenced_type" : "type-1698",
+   "self_type" : "type-1697",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20259,8 +20331,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1796",
-   "self_type" : "type-1795",
+   "referenced_type" : "type-1797",
+   "self_type" : "type-1796",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20269,8 +20341,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1910",
-   "self_type" : "type-1909",
+   "referenced_type" : "type-1912",
+   "self_type" : "type-1911",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20279,8 +20351,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1986",
-   "self_type" : "type-1985",
+   "referenced_type" : "type-1988",
+   "self_type" : "type-1987",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20289,8 +20361,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2065",
-   "self_type" : "type-2064",
+   "referenced_type" : "type-2068",
+   "self_type" : "type-2067",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20299,8 +20371,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2111",
-   "self_type" : "type-2110",
+   "referenced_type" : "type-2114",
+   "self_type" : "type-2113",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20309,8 +20381,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2172",
-   "self_type" : "type-2171",
+   "referenced_type" : "type-2175",
+   "self_type" : "type-2174",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20319,8 +20391,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2371",
-   "self_type" : "type-2370",
+   "referenced_type" : "type-2373",
+   "self_type" : "type-2372",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20329,8 +20401,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2666",
-   "self_type" : "type-2665",
+   "referenced_type" : "type-2668",
+   "self_type" : "type-2667",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20339,8 +20411,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2772",
-   "self_type" : "type-2771",
+   "referenced_type" : "type-2774",
+   "self_type" : "type-2773",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20349,8 +20421,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2859",
-   "self_type" : "type-2858",
+   "referenced_type" : "type-2861",
+   "self_type" : "type-2860",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20359,8 +20431,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2936",
-   "self_type" : "type-2935",
+   "referenced_type" : "type-2939",
+   "self_type" : "type-2938",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20369,8 +20441,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-3067",
-   "self_type" : "type-3066",
+   "referenced_type" : "type-3072",
+   "self_type" : "type-3071",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20379,8 +20451,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-313",
-   "self_type" : "type-312",
+   "referenced_type" : "type-310",
+   "self_type" : "type-309",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20389,8 +20461,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-3165",
-   "self_type" : "type-3164",
+   "referenced_type" : "type-3169",
+   "self_type" : "type-3168",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20399,8 +20471,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-3234",
-   "self_type" : "type-3233",
+   "referenced_type" : "type-3237",
+   "self_type" : "type-3236",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20409,8 +20481,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-3274",
-   "self_type" : "type-3273",
+   "referenced_type" : "type-3277",
+   "self_type" : "type-3276",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20419,8 +20491,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-3325",
-   "self_type" : "type-3324",
+   "referenced_type" : "type-3328",
+   "self_type" : "type-3327",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20429,8 +20501,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-3468",
-   "self_type" : "type-3467",
+   "referenced_type" : "type-3471",
+   "self_type" : "type-3470",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20439,8 +20511,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-452",
-   "self_type" : "type-451",
+   "referenced_type" : "type-449",
+   "self_type" : "type-448",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20469,8 +20541,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-877",
-   "self_type" : "type-876",
+   "referenced_type" : "type-878",
+   "self_type" : "type-877",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20479,8 +20551,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-933",
-   "self_type" : "type-932",
+   "referenced_type" : "type-934",
+   "self_type" : "type-933",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20499,8 +20571,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1685",
-   "self_type" : "type-1684",
+   "referenced_type" : "type-1686",
+   "self_type" : "type-1685",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20509,8 +20581,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1784",
-   "self_type" : "type-1783",
+   "referenced_type" : "type-1785",
+   "self_type" : "type-1784",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20519,8 +20591,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1898",
-   "self_type" : "type-1897",
+   "referenced_type" : "type-1900",
+   "self_type" : "type-1899",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20529,8 +20601,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1972",
-   "self_type" : "type-1971",
+   "referenced_type" : "type-1974",
+   "self_type" : "type-1973",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20539,8 +20611,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2052",
-   "self_type" : "type-2051",
+   "referenced_type" : "type-2055",
+   "self_type" : "type-2054",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20549,8 +20621,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2098",
-   "self_type" : "type-2097",
+   "referenced_type" : "type-2101",
+   "self_type" : "type-2100",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20559,8 +20631,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2160",
-   "self_type" : "type-2159",
+   "referenced_type" : "type-2162",
+   "self_type" : "type-2161",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20569,8 +20641,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2359",
-   "self_type" : "type-2358",
+   "referenced_type" : "type-2361",
+   "self_type" : "type-2360",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20579,8 +20651,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2654",
-   "self_type" : "type-2653",
+   "referenced_type" : "type-2656",
+   "self_type" : "type-2655",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20589,8 +20661,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2760",
-   "self_type" : "type-2759",
+   "referenced_type" : "type-2762",
+   "self_type" : "type-2761",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20599,8 +20671,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2847",
-   "self_type" : "type-2846",
+   "referenced_type" : "type-2849",
+   "self_type" : "type-2848",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20609,8 +20681,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2923",
-   "self_type" : "type-2922",
+   "referenced_type" : "type-2925",
+   "self_type" : "type-2924",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20619,8 +20691,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-300",
-   "self_type" : "type-299",
+   "referenced_type" : "type-297",
+   "self_type" : "type-296",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20629,8 +20701,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-3054",
-   "self_type" : "type-3053",
+   "referenced_type" : "type-3057",
+   "self_type" : "type-3056",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20639,8 +20711,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-3152",
-   "self_type" : "type-3151",
+   "referenced_type" : "type-3156",
+   "self_type" : "type-3155",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20649,8 +20721,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-3222",
-   "self_type" : "type-3221",
+   "referenced_type" : "type-3225",
+   "self_type" : "type-3224",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20659,8 +20731,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-3262",
-   "self_type" : "type-3261",
+   "referenced_type" : "type-3265",
+   "self_type" : "type-3264",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20669,8 +20741,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-3313",
-   "self_type" : "type-3312",
+   "referenced_type" : "type-3316",
+   "self_type" : "type-3315",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20679,8 +20751,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-3456",
-   "self_type" : "type-3455",
+   "referenced_type" : "type-3459",
+   "self_type" : "type-3458",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20689,8 +20761,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-440",
-   "self_type" : "type-439",
+   "referenced_type" : "type-437",
+   "self_type" : "type-436",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20699,8 +20771,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-649",
-   "self_type" : "type-648",
+   "referenced_type" : "type-650",
+   "self_type" : "type-649",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20719,8 +20791,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-863",
-   "self_type" : "type-862",
+   "referenced_type" : "type-865",
+   "self_type" : "type-864",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20729,8 +20801,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-920",
-   "self_type" : "type-919",
+   "referenced_type" : "type-921",
+   "self_type" : "type-920",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20759,8 +20831,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1689",
-   "self_type" : "type-1688",
+   "referenced_type" : "type-1690",
+   "self_type" : "type-1689",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20769,8 +20841,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1788",
-   "self_type" : "type-1787",
+   "referenced_type" : "type-1789",
+   "self_type" : "type-1788",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20779,8 +20851,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1902",
-   "self_type" : "type-1901",
+   "referenced_type" : "type-1904",
+   "self_type" : "type-1903",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20789,8 +20861,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1976",
-   "self_type" : "type-1975",
+   "referenced_type" : "type-1980",
+   "self_type" : "type-1979",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20799,8 +20871,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2056",
-   "self_type" : "type-2055",
+   "referenced_type" : "type-2059",
+   "self_type" : "type-2058",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20809,8 +20881,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2102",
-   "self_type" : "type-2101",
+   "referenced_type" : "type-2105",
+   "self_type" : "type-2104",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20819,8 +20891,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2164",
-   "self_type" : "type-2163",
+   "referenced_type" : "type-2166",
+   "self_type" : "type-2165",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20829,8 +20901,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2363",
-   "self_type" : "type-2362",
+   "referenced_type" : "type-2365",
+   "self_type" : "type-2364",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20839,8 +20911,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2658",
-   "self_type" : "type-2657",
+   "referenced_type" : "type-2660",
+   "self_type" : "type-2659",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20849,8 +20921,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2764",
-   "self_type" : "type-2763",
+   "referenced_type" : "type-2766",
+   "self_type" : "type-2765",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20859,8 +20931,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2851",
-   "self_type" : "type-2850",
+   "referenced_type" : "type-2853",
+   "self_type" : "type-2852",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20869,8 +20941,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2927",
-   "self_type" : "type-2926",
+   "referenced_type" : "type-2930",
+   "self_type" : "type-2929",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20879,8 +20951,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-304",
-   "self_type" : "type-303",
+   "referenced_type" : "type-301",
+   "self_type" : "type-300",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20889,8 +20961,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-3058",
-   "self_type" : "type-3057",
+   "referenced_type" : "type-3062",
+   "self_type" : "type-3061",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20899,8 +20971,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-3156",
-   "self_type" : "type-3155",
+   "referenced_type" : "type-3160",
+   "self_type" : "type-3159",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20909,8 +20981,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-3226",
-   "self_type" : "type-3225",
+   "referenced_type" : "type-3229",
+   "self_type" : "type-3228",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20919,8 +20991,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-3266",
-   "self_type" : "type-3265",
+   "referenced_type" : "type-3269",
+   "self_type" : "type-3268",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20929,8 +21001,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-3317",
-   "self_type" : "type-3316",
+   "referenced_type" : "type-3320",
+   "self_type" : "type-3319",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20939,8 +21011,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-3460",
-   "self_type" : "type-3459",
+   "referenced_type" : "type-3463",
+   "self_type" : "type-3462",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20949,8 +21021,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-444",
-   "self_type" : "type-443",
+   "referenced_type" : "type-441",
+   "self_type" : "type-440",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20969,8 +21041,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-764",
-   "self_type" : "type-763",
+   "referenced_type" : "type-766",
+   "self_type" : "type-765",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20979,8 +21051,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-868",
-   "self_type" : "type-867",
+   "referenced_type" : "type-869",
+   "self_type" : "type-868",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20989,8 +21061,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-924",
-   "self_type" : "type-923",
+   "referenced_type" : "type-925",
+   "self_type" : "type-924",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -21009,8 +21081,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1010",
-   "self_type" : "type-1009",
+   "referenced_type" : "type-1012",
+   "self_type" : "type-1011",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21029,8 +21101,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1702",
-   "self_type" : "type-1701",
+   "referenced_type" : "type-1703",
+   "self_type" : "type-1702",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21039,8 +21111,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1800",
-   "self_type" : "type-1799",
+   "referenced_type" : "type-1801",
+   "self_type" : "type-1800",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21049,8 +21121,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1914",
-   "self_type" : "type-1913",
+   "referenced_type" : "type-1916",
+   "self_type" : "type-1915",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21059,8 +21131,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1990",
-   "self_type" : "type-1989",
+   "referenced_type" : "type-1992",
+   "self_type" : "type-1991",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21069,8 +21141,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2070",
-   "self_type" : "type-2069",
+   "referenced_type" : "type-2073",
+   "self_type" : "type-2072",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21079,8 +21151,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2116",
-   "self_type" : "type-2115",
+   "referenced_type" : "type-2119",
+   "self_type" : "type-2118",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21089,8 +21161,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2177",
-   "self_type" : "type-2176",
+   "referenced_type" : "type-2181",
+   "self_type" : "type-2180",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21099,8 +21171,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2379",
-   "self_type" : "type-2378",
+   "referenced_type" : "type-2381",
+   "self_type" : "type-2380",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21109,8 +21181,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2671",
-   "self_type" : "type-2670",
+   "referenced_type" : "type-2673",
+   "self_type" : "type-2672",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21119,8 +21191,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2776",
-   "self_type" : "type-2775",
+   "referenced_type" : "type-2778",
+   "self_type" : "type-2777",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21129,8 +21201,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2863",
-   "self_type" : "type-2862",
+   "referenced_type" : "type-2865",
+   "self_type" : "type-2864",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21139,8 +21211,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2941",
-   "self_type" : "type-2940",
+   "referenced_type" : "type-2944",
+   "self_type" : "type-2943",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21149,8 +21221,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-3071",
-   "self_type" : "type-3070",
+   "referenced_type" : "type-3076",
+   "self_type" : "type-3075",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21159,8 +21231,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-3170",
-   "self_type" : "type-3169",
+   "referenced_type" : "type-315",
+   "self_type" : "type-314",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21169,8 +21241,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-318",
-   "self_type" : "type-317",
+   "referenced_type" : "type-3174",
+   "self_type" : "type-3173",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21179,8 +21251,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-3238",
-   "self_type" : "type-3237",
+   "referenced_type" : "type-3241",
+   "self_type" : "type-3240",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21189,8 +21261,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-3278",
-   "self_type" : "type-3277",
+   "referenced_type" : "type-3281",
+   "self_type" : "type-3280",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21199,8 +21271,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-3329",
-   "self_type" : "type-3328",
+   "referenced_type" : "type-3332",
+   "self_type" : "type-3331",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21209,8 +21281,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-3476",
-   "self_type" : "type-3475",
+   "referenced_type" : "type-3479",
+   "self_type" : "type-3478",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21219,8 +21291,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-457",
-   "self_type" : "type-456",
+   "referenced_type" : "type-454",
+   "self_type" : "type-453",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21229,8 +21301,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-667",
-   "self_type" : "type-666",
+   "referenced_type" : "type-668",
+   "self_type" : "type-667",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21239,8 +21311,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-778",
-   "self_type" : "type-777",
+   "referenced_type" : "type-779",
+   "self_type" : "type-778",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21249,8 +21321,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-882",
-   "self_type" : "type-881",
+   "referenced_type" : "type-883",
+   "self_type" : "type-882",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21259,8 +21331,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-938",
-   "self_type" : "type-937",
+   "referenced_type" : "type-939",
+   "self_type" : "type-938",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21269,8 +21341,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1013",
+   "referenced_type" : "type-1016",
+   "self_type" : "type-1015",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21289,8 +21361,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1706",
-   "self_type" : "type-1705",
+   "referenced_type" : "type-1707",
+   "self_type" : "type-1706",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21299,8 +21371,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1804",
-   "self_type" : "type-1803",
+   "referenced_type" : "type-1805",
+   "self_type" : "type-1804",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21309,8 +21381,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1918",
-   "self_type" : "type-1917",
+   "referenced_type" : "type-1920",
+   "self_type" : "type-1919",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21319,8 +21391,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1994",
-   "self_type" : "type-1993",
+   "referenced_type" : "type-1996",
+   "self_type" : "type-1995",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21329,8 +21401,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2074",
-   "self_type" : "type-2073",
+   "referenced_type" : "type-2077",
+   "self_type" : "type-2076",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21339,8 +21411,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2121",
-   "self_type" : "type-2120",
+   "referenced_type" : "type-2124",
+   "self_type" : "type-2123",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21349,8 +21421,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2181",
-   "self_type" : "type-2180",
+   "referenced_type" : "type-2185",
+   "self_type" : "type-2184",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21359,8 +21431,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2383",
-   "self_type" : "type-2382",
+   "referenced_type" : "type-2385",
+   "self_type" : "type-2384",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21369,8 +21441,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2675",
-   "self_type" : "type-2674",
+   "referenced_type" : "type-2677",
+   "self_type" : "type-2676",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21379,8 +21451,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2780",
-   "self_type" : "type-2779",
+   "referenced_type" : "type-2782",
+   "self_type" : "type-2781",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21389,8 +21461,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2867",
-   "self_type" : "type-2866",
+   "referenced_type" : "type-2869",
+   "self_type" : "type-2868",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21399,8 +21471,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2945",
-   "self_type" : "type-2944",
+   "referenced_type" : "type-2948",
+   "self_type" : "type-2947",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21409,8 +21481,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-3077",
-   "self_type" : "type-3076",
+   "referenced_type" : "type-3080",
+   "self_type" : "type-3079",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21419,8 +21491,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-3175",
-   "self_type" : "type-3174",
+   "referenced_type" : "type-3180",
+   "self_type" : "type-3179",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21429,8 +21501,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-322",
-   "self_type" : "type-321",
+   "referenced_type" : "type-319",
+   "self_type" : "type-318",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21439,8 +21511,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-3242",
-   "self_type" : "type-3241",
+   "referenced_type" : "type-3245",
+   "self_type" : "type-3244",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21449,8 +21521,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-3282",
-   "self_type" : "type-3281",
+   "referenced_type" : "type-3285",
+   "self_type" : "type-3284",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21459,8 +21531,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-3333",
-   "self_type" : "type-3332",
+   "referenced_type" : "type-3336",
+   "self_type" : "type-3335",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21469,8 +21541,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-3480",
-   "self_type" : "type-3479",
+   "referenced_type" : "type-3483",
+   "self_type" : "type-3482",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21479,8 +21551,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-461",
-   "self_type" : "type-460",
+   "referenced_type" : "type-459",
+   "self_type" : "type-458",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21489,8 +21561,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-672",
-   "self_type" : "type-671",
+   "referenced_type" : "type-673",
+   "self_type" : "type-672",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21509,8 +21581,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-886",
-   "self_type" : "type-885",
+   "referenced_type" : "type-887",
+   "self_type" : "type-886",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21519,8 +21591,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-943",
-   "self_type" : "type-942",
+   "referenced_type" : "type-944",
+   "self_type" : "type-943",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21529,8 +21601,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1012",
-   "self_type" : "type-1011",
+   "referenced_type" : "type-1014",
+   "self_type" : "type-1013",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21549,8 +21621,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1704",
-   "self_type" : "type-1703",
+   "referenced_type" : "type-1705",
+   "self_type" : "type-1704",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21559,8 +21631,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1802",
-   "self_type" : "type-1801",
+   "referenced_type" : "type-1803",
+   "self_type" : "type-1802",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21569,8 +21641,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1916",
-   "self_type" : "type-1915",
+   "referenced_type" : "type-1918",
+   "self_type" : "type-1917",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21579,8 +21651,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1992",
-   "self_type" : "type-1991",
+   "referenced_type" : "type-1994",
+   "self_type" : "type-1993",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21589,8 +21661,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2072",
-   "self_type" : "type-2071",
+   "referenced_type" : "type-2075",
+   "self_type" : "type-2074",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21599,8 +21671,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2118",
-   "self_type" : "type-2117",
+   "referenced_type" : "type-2121",
+   "self_type" : "type-2120",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21609,8 +21681,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2179",
-   "self_type" : "type-2178",
+   "referenced_type" : "type-2183",
+   "self_type" : "type-2182",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21619,8 +21691,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2381",
-   "self_type" : "type-2380",
+   "referenced_type" : "type-2383",
+   "self_type" : "type-2382",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21629,8 +21701,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2673",
-   "self_type" : "type-2672",
+   "referenced_type" : "type-2675",
+   "self_type" : "type-2674",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21639,8 +21711,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2778",
-   "self_type" : "type-2777",
+   "referenced_type" : "type-2780",
+   "self_type" : "type-2779",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21649,8 +21721,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2865",
-   "self_type" : "type-2864",
+   "referenced_type" : "type-2867",
+   "self_type" : "type-2866",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21659,8 +21731,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2943",
-   "self_type" : "type-2942",
+   "referenced_type" : "type-2946",
+   "self_type" : "type-2945",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21669,8 +21741,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-3075",
-   "self_type" : "type-3074",
+   "referenced_type" : "type-3078",
+   "self_type" : "type-3077",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21679,8 +21751,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-3172",
-   "self_type" : "type-3171",
+   "referenced_type" : "type-3176",
+   "self_type" : "type-3175",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21689,8 +21761,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-320",
-   "self_type" : "type-319",
+   "referenced_type" : "type-317",
+   "self_type" : "type-316",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21699,8 +21771,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-3240",
-   "self_type" : "type-3239",
+   "referenced_type" : "type-3243",
+   "self_type" : "type-3242",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21709,8 +21781,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-3280",
-   "self_type" : "type-3279",
+   "referenced_type" : "type-3283",
+   "self_type" : "type-3282",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21719,8 +21791,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-3331",
-   "self_type" : "type-3330",
+   "referenced_type" : "type-3334",
+   "self_type" : "type-3333",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21729,8 +21801,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-3478",
-   "self_type" : "type-3477",
+   "referenced_type" : "type-3481",
+   "self_type" : "type-3480",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21739,8 +21811,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-459",
-   "self_type" : "type-458",
+   "referenced_type" : "type-457",
+   "self_type" : "type-456",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21759,8 +21831,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-780",
-   "self_type" : "type-779",
+   "referenced_type" : "type-781",
+   "self_type" : "type-780",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21769,8 +21841,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-884",
-   "self_type" : "type-883",
+   "referenced_type" : "type-885",
+   "self_type" : "type-884",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21779,8 +21851,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-940",
-   "self_type" : "type-939",
+   "referenced_type" : "type-941",
+   "self_type" : "type-940",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21789,8 +21861,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1008",
-   "self_type" : "type-1007",
+   "referenced_type" : "type-1010",
+   "self_type" : "type-1009",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21809,8 +21881,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1699",
-   "self_type" : "type-1698",
+   "referenced_type" : "type-1701",
+   "self_type" : "type-1700",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21819,8 +21891,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1798",
-   "self_type" : "type-1797",
+   "referenced_type" : "type-1799",
+   "self_type" : "type-1798",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21829,8 +21901,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1912",
-   "self_type" : "type-1911",
+   "referenced_type" : "type-1914",
+   "self_type" : "type-1913",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21839,8 +21911,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1988",
-   "self_type" : "type-1987",
+   "referenced_type" : "type-1990",
+   "self_type" : "type-1989",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21849,8 +21921,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2068",
-   "self_type" : "type-2067",
+   "referenced_type" : "type-2071",
+   "self_type" : "type-2070",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21859,8 +21931,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2114",
-   "self_type" : "type-2113",
+   "referenced_type" : "type-2117",
+   "self_type" : "type-2116",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21869,8 +21941,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2175",
-   "self_type" : "type-2174",
+   "referenced_type" : "type-2179",
+   "self_type" : "type-2178",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21879,8 +21951,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2377",
-   "self_type" : "type-2376",
+   "referenced_type" : "type-2379",
+   "self_type" : "type-2378",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21889,8 +21961,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2668",
-   "self_type" : "type-2667",
+   "referenced_type" : "type-2671",
+   "self_type" : "type-2670",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21899,8 +21971,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2774",
-   "self_type" : "type-2773",
+   "referenced_type" : "type-2776",
+   "self_type" : "type-2775",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21909,8 +21981,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2861",
-   "self_type" : "type-2860",
+   "referenced_type" : "type-2863",
+   "self_type" : "type-2862",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21919,8 +21991,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2939",
-   "self_type" : "type-2938",
+   "referenced_type" : "type-2941",
+   "self_type" : "type-2940",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21929,8 +22001,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-3069",
-   "self_type" : "type-3068",
+   "referenced_type" : "type-3074",
+   "self_type" : "type-3073",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21939,8 +22011,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-315",
-   "self_type" : "type-314",
+   "referenced_type" : "type-313",
+   "self_type" : "type-312",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21949,8 +22021,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-3168",
-   "self_type" : "type-3167",
+   "referenced_type" : "type-3172",
+   "self_type" : "type-3171",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21959,8 +22031,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-3236",
-   "self_type" : "type-3235",
+   "referenced_type" : "type-3239",
+   "self_type" : "type-3238",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21969,8 +22041,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-3276",
-   "self_type" : "type-3275",
+   "referenced_type" : "type-3279",
+   "self_type" : "type-3278",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21979,8 +22051,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-3327",
-   "self_type" : "type-3326",
+   "referenced_type" : "type-3330",
+   "self_type" : "type-3329",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21989,8 +22061,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-3474",
-   "self_type" : "type-3473",
+   "referenced_type" : "type-3477",
+   "self_type" : "type-3476",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21999,8 +22071,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-455",
-   "self_type" : "type-454",
+   "referenced_type" : "type-452",
+   "self_type" : "type-451",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22009,8 +22081,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-665",
-   "self_type" : "type-664",
+   "referenced_type" : "type-666",
+   "self_type" : "type-665",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22019,8 +22091,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-776",
-   "self_type" : "type-775",
+   "referenced_type" : "type-777",
+   "self_type" : "type-776",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22029,8 +22101,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-880",
-   "self_type" : "type-879",
+   "referenced_type" : "type-881",
+   "self_type" : "type-880",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22039,8 +22111,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-936",
-   "self_type" : "type-935",
+   "referenced_type" : "type-937",
+   "self_type" : "type-936",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22069,8 +22141,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1708",
-   "self_type" : "type-1707",
+   "referenced_type" : "type-1709",
+   "self_type" : "type-1708",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22079,8 +22151,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1806",
-   "self_type" : "type-1805",
+   "referenced_type" : "type-1807",
+   "self_type" : "type-1806",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22089,8 +22161,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1920",
-   "self_type" : "type-1919",
+   "referenced_type" : "type-1922",
+   "self_type" : "type-1921",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22099,8 +22171,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1996",
-   "self_type" : "type-1995",
+   "referenced_type" : "type-1998",
+   "self_type" : "type-1997",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22109,8 +22181,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2076",
-   "self_type" : "type-2075",
+   "referenced_type" : "type-2080",
+   "self_type" : "type-2079",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22119,8 +22191,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2123",
-   "self_type" : "type-2122",
+   "referenced_type" : "type-2126",
+   "self_type" : "type-2125",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22129,8 +22201,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2185",
-   "self_type" : "type-2184",
+   "referenced_type" : "type-2187",
+   "self_type" : "type-2186",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22139,8 +22211,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2385",
-   "self_type" : "type-2384",
+   "referenced_type" : "type-2387",
+   "self_type" : "type-2386",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22149,8 +22221,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2677",
-   "self_type" : "type-2676",
+   "referenced_type" : "type-2679",
+   "self_type" : "type-2678",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22159,8 +22231,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2782",
-   "self_type" : "type-2781",
+   "referenced_type" : "type-2784",
+   "self_type" : "type-2783",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22169,8 +22241,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2869",
-   "self_type" : "type-2868",
+   "referenced_type" : "type-2871",
+   "self_type" : "type-2870",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22179,8 +22251,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2948",
-   "self_type" : "type-2947",
+   "referenced_type" : "type-2950",
+   "self_type" : "type-2949",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22189,8 +22261,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-3079",
-   "self_type" : "type-3078",
+   "referenced_type" : "type-3082",
+   "self_type" : "type-3081",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22199,8 +22271,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-3177",
-   "self_type" : "type-3176",
+   "referenced_type" : "type-3182",
+   "self_type" : "type-3181",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22209,8 +22281,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-3244",
-   "self_type" : "type-3243",
+   "referenced_type" : "type-321",
+   "self_type" : "type-320",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22219,8 +22291,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-324",
-   "self_type" : "type-323",
+   "referenced_type" : "type-3247",
+   "self_type" : "type-3246",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22229,8 +22301,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-3284",
-   "self_type" : "type-3283",
+   "referenced_type" : "type-3287",
+   "self_type" : "type-3286",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22239,8 +22311,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-3335",
-   "self_type" : "type-3334",
+   "referenced_type" : "type-3338",
+   "self_type" : "type-3337",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22249,8 +22321,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-3482",
-   "self_type" : "type-3481",
+   "referenced_type" : "type-3485",
+   "self_type" : "type-3484",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22259,8 +22331,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-464",
-   "self_type" : "type-463",
+   "referenced_type" : "type-461",
+   "self_type" : "type-460",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22269,8 +22341,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-674",
-   "self_type" : "type-673",
+   "referenced_type" : "type-675",
+   "self_type" : "type-674",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22289,8 +22361,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-888",
-   "self_type" : "type-887",
+   "referenced_type" : "type-890",
+   "self_type" : "type-889",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22299,8 +22371,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-945",
-   "self_type" : "type-944",
+   "referenced_type" : "type-946",
+   "self_type" : "type-945",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22309,8 +22381,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1026",
-   "self_type" : "type-1025",
+   "referenced_type" : "type-1027",
+   "self_type" : "type-1026",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22329,8 +22401,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1814",
-   "self_type" : "type-1813",
+   "referenced_type" : "type-1815",
+   "self_type" : "type-1814",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22339,8 +22411,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2004",
-   "self_type" : "type-2003",
+   "referenced_type" : "type-2006",
+   "self_type" : "type-2005",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22349,8 +22421,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2086",
-   "self_type" : "type-2085",
+   "referenced_type" : "type-2089",
+   "self_type" : "type-2088",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22359,8 +22431,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2132",
-   "self_type" : "type-2131",
+   "referenced_type" : "type-2135",
+   "self_type" : "type-2134",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22369,8 +22441,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2193",
-   "self_type" : "type-2192",
+   "referenced_type" : "type-2196",
+   "self_type" : "type-2195",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22379,8 +22451,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2397",
-   "self_type" : "type-2396",
+   "referenced_type" : "type-2399",
+   "self_type" : "type-2398",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22389,8 +22461,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2790",
-   "self_type" : "type-2789",
+   "referenced_type" : "type-2792",
+   "self_type" : "type-2791",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22399,8 +22471,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2957",
-   "self_type" : "type-2956",
+   "referenced_type" : "type-2959",
+   "self_type" : "type-2958",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22409,8 +22481,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-3187",
-   "self_type" : "type-3186",
+   "referenced_type" : "type-3190",
+   "self_type" : "type-3189",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22419,8 +22491,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-3252",
-   "self_type" : "type-3251",
+   "referenced_type" : "type-3255",
+   "self_type" : "type-3254",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22429,8 +22501,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-3292",
-   "self_type" : "type-3291",
+   "referenced_type" : "type-3295",
+   "self_type" : "type-3294",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22439,8 +22511,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-3343",
-   "self_type" : "type-3342",
+   "referenced_type" : "type-3346",
+   "self_type" : "type-3345",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22449,8 +22521,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-3494",
-   "self_type" : "type-3493",
+   "referenced_type" : "type-3497",
+   "self_type" : "type-3496",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22459,8 +22531,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-473",
-   "self_type" : "type-472",
+   "referenced_type" : "type-470",
+   "self_type" : "type-469",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22469,8 +22541,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-794",
-   "self_type" : "type-793",
+   "referenced_type" : "type-795",
+   "self_type" : "type-794",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22479,8 +22551,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-898",
-   "self_type" : "type-897",
+   "referenced_type" : "type-899",
+   "self_type" : "type-898",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22489,8 +22561,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-954",
-   "self_type" : "type-953",
+   "referenced_type" : "type-955",
+   "self_type" : "type-954",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22499,8 +22571,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-1024",
-   "self_type" : "type-1023",
+   "referenced_type" : "type-1025",
+   "self_type" : "type-1024",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22519,8 +22591,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-1812",
-   "self_type" : "type-1811",
+   "referenced_type" : "type-1813",
+   "self_type" : "type-1812",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22529,8 +22601,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2002",
-   "self_type" : "type-2001",
+   "referenced_type" : "type-2004",
+   "self_type" : "type-2003",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22539,8 +22611,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2084",
-   "self_type" : "type-2083",
+   "referenced_type" : "type-2087",
+   "self_type" : "type-2086",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22549,8 +22621,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2130",
-   "self_type" : "type-2129",
+   "referenced_type" : "type-2133",
+   "self_type" : "type-2132",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22559,8 +22631,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2191",
-   "self_type" : "type-2190",
+   "referenced_type" : "type-2194",
+   "self_type" : "type-2193",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22569,8 +22641,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2395",
-   "self_type" : "type-2394",
+   "referenced_type" : "type-2397",
+   "self_type" : "type-2396",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22579,8 +22651,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2788",
-   "self_type" : "type-2787",
+   "referenced_type" : "type-2790",
+   "self_type" : "type-2789",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22589,8 +22661,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2955",
-   "self_type" : "type-2954",
+   "referenced_type" : "type-2957",
+   "self_type" : "type-2956",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22599,8 +22671,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-3185",
-   "self_type" : "type-3184",
+   "referenced_type" : "type-3188",
+   "self_type" : "type-3187",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22609,8 +22681,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-3250",
-   "self_type" : "type-3249",
+   "referenced_type" : "type-3253",
+   "self_type" : "type-3252",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22619,8 +22691,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-3290",
-   "self_type" : "type-3289",
+   "referenced_type" : "type-3293",
+   "self_type" : "type-3292",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22629,8 +22701,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-3341",
-   "self_type" : "type-3340",
+   "referenced_type" : "type-3344",
+   "self_type" : "type-3343",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22639,8 +22711,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-3492",
-   "self_type" : "type-3491",
+   "referenced_type" : "type-3495",
+   "self_type" : "type-3494",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22649,8 +22721,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-471",
-   "self_type" : "type-470",
+   "referenced_type" : "type-468",
+   "self_type" : "type-467",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22659,8 +22731,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-792",
-   "self_type" : "type-791",
+   "referenced_type" : "type-793",
+   "self_type" : "type-792",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22669,8 +22741,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-896",
-   "self_type" : "type-895",
+   "referenced_type" : "type-897",
+   "self_type" : "type-896",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22679,8 +22751,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-952",
-   "self_type" : "type-951",
+   "referenced_type" : "type-953",
+   "self_type" : "type-952",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22689,8 +22761,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-1022",
-   "self_type" : "type-1021",
+   "referenced_type" : "type-1023",
+   "self_type" : "type-1022",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22709,8 +22781,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-1810",
-   "self_type" : "type-1809",
+   "referenced_type" : "type-1811",
+   "self_type" : "type-1810",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22719,8 +22791,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2000",
-   "self_type" : "type-1999",
+   "referenced_type" : "type-2002",
+   "self_type" : "type-2001",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22729,8 +22801,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2082",
-   "self_type" : "type-2081",
+   "referenced_type" : "type-2085",
+   "self_type" : "type-2084",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22739,8 +22811,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2128",
-   "self_type" : "type-2127",
+   "referenced_type" : "type-2131",
+   "self_type" : "type-2130",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22749,8 +22821,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2189",
-   "self_type" : "type-2188",
+   "referenced_type" : "type-2192",
+   "self_type" : "type-2191",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22759,8 +22831,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2393",
-   "self_type" : "type-2392",
+   "referenced_type" : "type-2395",
+   "self_type" : "type-2394",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22769,8 +22841,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2786",
-   "self_type" : "type-2785",
+   "referenced_type" : "type-2788",
+   "self_type" : "type-2787",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22779,8 +22851,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2952",
-   "self_type" : "type-2951",
+   "referenced_type" : "type-2955",
+   "self_type" : "type-2954",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22789,8 +22861,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-3183",
-   "self_type" : "type-3182",
+   "referenced_type" : "type-3186",
+   "self_type" : "type-3185",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22799,8 +22871,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-3248",
-   "self_type" : "type-3247",
+   "referenced_type" : "type-3251",
+   "self_type" : "type-3250",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22809,8 +22881,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-3288",
-   "self_type" : "type-3287",
+   "referenced_type" : "type-3291",
+   "self_type" : "type-3290",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22819,8 +22891,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-3339",
-   "self_type" : "type-3338",
+   "referenced_type" : "type-3342",
+   "self_type" : "type-3341",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22829,8 +22901,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-3490",
-   "self_type" : "type-3489",
+   "referenced_type" : "type-3493",
+   "self_type" : "type-3492",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22839,8 +22911,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-468",
-   "self_type" : "type-467",
+   "referenced_type" : "type-466",
+   "self_type" : "type-465",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22849,8 +22921,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-790",
-   "self_type" : "type-789",
+   "referenced_type" : "type-791",
+   "self_type" : "type-790",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22859,8 +22931,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-894",
-   "self_type" : "type-893",
+   "referenced_type" : "type-895",
+   "self_type" : "type-894",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22869,8 +22941,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-950",
-   "self_type" : "type-949",
+   "referenced_type" : "type-951",
+   "self_type" : "type-950",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22899,8 +22971,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-1808",
-   "self_type" : "type-1807",
+   "referenced_type" : "type-1809",
+   "self_type" : "type-1808",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22909,8 +22981,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-1998",
-   "self_type" : "type-1997",
+   "referenced_type" : "type-2000",
+   "self_type" : "type-1999",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22919,8 +22991,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2080",
-   "self_type" : "type-2079",
+   "referenced_type" : "type-2083",
+   "self_type" : "type-2082",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22929,8 +23001,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2125",
-   "self_type" : "type-2124",
+   "referenced_type" : "type-2128",
+   "self_type" : "type-2127",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22939,8 +23011,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2187",
-   "self_type" : "type-2186",
+   "referenced_type" : "type-2189",
+   "self_type" : "type-2188",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22949,8 +23021,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2391",
-   "self_type" : "type-2390",
+   "referenced_type" : "type-2393",
+   "self_type" : "type-2392",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22959,8 +23031,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2784",
-   "self_type" : "type-2783",
+   "referenced_type" : "type-2786",
+   "self_type" : "type-2785",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22969,8 +23041,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2950",
-   "self_type" : "type-2949",
+   "referenced_type" : "type-2953",
+   "self_type" : "type-2952",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22979,8 +23051,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-3181",
-   "self_type" : "type-3180",
+   "referenced_type" : "type-3184",
+   "self_type" : "type-3183",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22989,8 +23061,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-3246",
-   "self_type" : "type-3245",
+   "referenced_type" : "type-3249",
+   "self_type" : "type-3248",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22999,8 +23071,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-3286",
-   "self_type" : "type-3285",
+   "referenced_type" : "type-3289",
+   "self_type" : "type-3288",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23009,8 +23081,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-3337",
-   "self_type" : "type-3336",
+   "referenced_type" : "type-3340",
+   "self_type" : "type-3339",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23019,8 +23091,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-3488",
-   "self_type" : "type-3487",
+   "referenced_type" : "type-3491",
+   "self_type" : "type-3490",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23029,8 +23101,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-466",
-   "self_type" : "type-465",
+   "referenced_type" : "type-464",
+   "self_type" : "type-463",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23039,8 +23111,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-788",
-   "self_type" : "type-787",
+   "referenced_type" : "type-789",
+   "self_type" : "type-788",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23049,8 +23121,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-892",
-   "self_type" : "type-891",
+   "referenced_type" : "type-893",
+   "self_type" : "type-892",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23059,8 +23131,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-947",
-   "self_type" : "type-946",
+   "referenced_type" : "type-948",
+   "self_type" : "type-947",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23069,8 +23141,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1028",
-   "self_type" : "type-1027",
+   "referenced_type" : "type-1029",
+   "self_type" : "type-1028",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23089,8 +23161,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1816",
-   "self_type" : "type-1815",
+   "referenced_type" : "type-1817",
+   "self_type" : "type-1816",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23099,8 +23171,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2006",
-   "self_type" : "type-2005",
+   "referenced_type" : "type-2008",
+   "self_type" : "type-2007",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23109,8 +23181,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2088",
-   "self_type" : "type-2087",
+   "referenced_type" : "type-2091",
+   "self_type" : "type-2090",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23119,8 +23191,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2134",
-   "self_type" : "type-2133",
+   "referenced_type" : "type-2137",
+   "self_type" : "type-2136",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23129,8 +23201,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2195",
-   "self_type" : "type-2194",
+   "referenced_type" : "type-2198",
+   "self_type" : "type-2197",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23139,8 +23211,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2399",
-   "self_type" : "type-2398",
+   "referenced_type" : "type-2401",
+   "self_type" : "type-2400",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23149,8 +23221,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2792",
-   "self_type" : "type-2791",
+   "referenced_type" : "type-2794",
+   "self_type" : "type-2793",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23159,8 +23231,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2959",
-   "self_type" : "type-2958",
+   "referenced_type" : "type-2962",
+   "self_type" : "type-2961",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23169,8 +23241,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-3189",
-   "self_type" : "type-3188",
+   "referenced_type" : "type-3193",
+   "self_type" : "type-3192",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23179,8 +23251,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-3254",
-   "self_type" : "type-3253",
+   "referenced_type" : "type-3257",
+   "self_type" : "type-3256",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23189,8 +23261,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-3294",
-   "self_type" : "type-3293",
+   "referenced_type" : "type-3297",
+   "self_type" : "type-3296",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23199,8 +23271,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-3345",
-   "self_type" : "type-3344",
+   "referenced_type" : "type-3348",
+   "self_type" : "type-3347",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23209,8 +23281,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-3496",
-   "self_type" : "type-3495",
+   "referenced_type" : "type-3499",
+   "self_type" : "type-3498",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23219,8 +23291,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-475",
-   "self_type" : "type-474",
+   "referenced_type" : "type-472",
+   "self_type" : "type-471",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23239,8 +23311,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-900",
-   "self_type" : "type-899",
+   "referenced_type" : "type-901",
+   "self_type" : "type-900",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23249,8 +23321,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-956",
-   "self_type" : "type-955",
+   "referenced_type" : "type-957",
+   "self_type" : "type-956",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23259,8 +23331,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1633",
-   "self_type" : "type-1632",
+   "referenced_type" : "type-1637",
+   "self_type" : "type-1636",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23269,8 +23341,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-168",
-   "self_type" : "type-167",
+   "referenced_type" : "type-170",
+   "self_type" : "type-169",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23279,8 +23351,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1774",
-   "self_type" : "type-1773",
+   "referenced_type" : "type-1775",
+   "self_type" : "type-1774",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23289,8 +23361,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1896",
-   "self_type" : "type-1895",
+   "referenced_type" : "type-1898",
+   "self_type" : "type-1897",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23299,8 +23371,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1970",
-   "self_type" : "type-1969",
+   "referenced_type" : "type-1972",
+   "self_type" : "type-1971",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23309,8 +23381,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2050",
-   "self_type" : "type-2049",
+   "referenced_type" : "type-2052",
+   "self_type" : "type-2051",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23319,8 +23391,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2602",
-   "self_type" : "type-2601",
+   "referenced_type" : "type-2607",
+   "self_type" : "type-2606",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23329,8 +23401,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2839",
-   "self_type" : "type-2838",
+   "referenced_type" : "type-2841",
+   "self_type" : "type-2840",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23339,8 +23411,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2912",
-   "self_type" : "type-2911",
+   "referenced_type" : "type-2914",
+   "self_type" : "type-2913",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23349,8 +23421,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-3052",
-   "self_type" : "type-3051",
+   "referenced_type" : "type-3055",
+   "self_type" : "type-3054",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23359,8 +23431,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-3148",
-   "self_type" : "type-3147",
+   "referenced_type" : "type-3152",
+   "self_type" : "type-3151",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23369,8 +23441,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-3220",
-   "self_type" : "type-3219",
+   "referenced_type" : "type-3223",
+   "self_type" : "type-3222",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23379,8 +23451,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-426",
-   "self_type" : "type-425",
+   "referenced_type" : "type-423",
+   "self_type" : "type-422",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23389,8 +23461,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-646",
-   "self_type" : "type-645",
+   "referenced_type" : "type-647",
+   "self_type" : "type-646",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23399,8 +23471,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-756",
-   "self_type" : "type-755",
+   "referenced_type" : "type-757",
+   "self_type" : "type-756",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23419,8 +23491,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1016",
-   "self_type" : "type-1015",
+   "referenced_type" : "type-1008",
+   "self_type" : "type-1007",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -23429,8 +23501,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2183",
-   "self_type" : "type-2182",
+   "referenced_type" : "type-2177",
+   "self_type" : "type-2176",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -23439,8 +23511,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2735",
-   "self_type" : "type-2734",
+   "referenced_type" : "type-2737",
+   "self_type" : "type-2736",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -23449,8 +23521,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-3073",
-   "self_type" : "type-3072",
+   "referenced_type" : "type-3070",
+   "self_type" : "type-3069",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -23459,8 +23531,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-1980",
-   "self_type" : "type-1979",
+   "referenced_type" : "type-1976",
+   "self_type" : "type-1975",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23469,8 +23541,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-2246",
-   "self_type" : "type-2245",
+   "referenced_type" : "type-2249",
+   "self_type" : "type-2248",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23479,8 +23551,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-2727",
-   "self_type" : "type-2726",
+   "referenced_type" : "type-2729",
+   "self_type" : "type-2728",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23489,8 +23561,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-2845",
-   "self_type" : "type-2844",
+   "referenced_type" : "type-2847",
+   "self_type" : "type-2846",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23499,8 +23571,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-3365",
-   "self_type" : "type-3364",
+   "referenced_type" : "type-3368",
+   "self_type" : "type-3367",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23509,8 +23581,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-768",
-   "self_type" : "type-767",
+   "referenced_type" : "type-762",
+   "self_type" : "type-761",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23519,8 +23591,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_round_style",
    "name" : "const std::float_round_style",
-   "referenced_type" : "type-2046",
-   "self_type" : "type-2045",
+   "referenced_type" : "type-2045",
+   "self_type" : "type-2044",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23529,8 +23601,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_round_style",
    "name" : "const std::float_round_style",
-   "referenced_type" : "type-2248",
-   "self_type" : "type-2247",
+   "referenced_type" : "type-2251",
+   "self_type" : "type-2250",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23539,8 +23611,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_round_style",
    "name" : "const std::float_round_style",
-   "referenced_type" : "type-2730",
-   "self_type" : "type-2729",
+   "referenced_type" : "type-2732",
+   "self_type" : "type-2731",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23549,8 +23621,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_round_style",
    "name" : "const std::float_round_style",
-   "referenced_type" : "type-2915",
-   "self_type" : "type-2914",
+   "referenced_type" : "type-2917",
+   "self_type" : "type-2916",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23559,8 +23631,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_round_style",
    "name" : "const std::float_round_style",
-   "referenced_type" : "type-3367",
-   "self_type" : "type-3366",
+   "referenced_type" : "type-3370",
+   "self_type" : "type-3369",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23569,8 +23641,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_round_style",
    "name" : "const std::float_round_style",
-   "referenced_type" : "type-858",
-   "self_type" : "type-857",
+   "referenced_type" : "type-855",
+   "self_type" : "type-854",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23589,8 +23661,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<float (float)>",
    "name" : "const std::function<float (float)>",
-   "referenced_type" : "type-2267",
-   "self_type" : "type-2266",
+   "referenced_type" : "type-2268",
+   "self_type" : "type-2267",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -23599,8 +23671,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<float (float)>",
    "name" : "const std::function<float (float)>",
-   "referenced_type" : "type-2747",
-   "self_type" : "type-2746",
+   "referenced_type" : "type-2749",
+   "self_type" : "type-2748",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -23609,8 +23681,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<float (float)>",
    "name" : "const std::function<float (float)>",
-   "referenced_type" : "type-3192",
-   "self_type" : "type-3191",
+   "referenced_type" : "type-3195",
+   "self_type" : "type-3194",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -23619,8 +23691,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-1392",
-   "self_type" : "type-1391",
+   "referenced_type" : "type-1396",
+   "self_type" : "type-1395",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -23629,8 +23701,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-2514",
-   "self_type" : "type-2513",
+   "referenced_type" : "type-2519",
+   "self_type" : "type-2518",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -23639,8 +23711,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-2809",
-   "self_type" : "type-2808",
+   "referenced_type" : "type-2811",
+   "self_type" : "type-2810",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -23649,8 +23721,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-3611",
-   "self_type" : "type-3610",
+   "referenced_type" : "type-3617",
+   "self_type" : "type-3616",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -23659,8 +23731,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> >",
    "name" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> >",
-   "referenced_type" : "type-2143",
-   "self_type" : "type-2142",
+   "referenced_type" : "type-2145",
+   "self_type" : "type-2144",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -23669,8 +23741,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> >",
    "name" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> >",
-   "referenced_type" : "type-3300",
-   "self_type" : "type-3299",
+   "referenced_type" : "type-3303",
+   "self_type" : "type-3302",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -23689,8 +23761,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1032",
-   "self_type" : "type-1031",
+   "referenced_type" : "type-1033",
+   "self_type" : "type-1032",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23709,8 +23781,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1582",
-   "self_type" : "type-1581",
+   "referenced_type" : "type-1586",
+   "self_type" : "type-1585",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23719,8 +23791,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1713",
-   "self_type" : "type-1712",
+   "referenced_type" : "type-1714",
+   "self_type" : "type-1713",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23729,8 +23801,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1819",
-   "self_type" : "type-1818",
+   "referenced_type" : "type-1820",
+   "self_type" : "type-1819",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23739,8 +23811,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1888",
-   "self_type" : "type-1887",
+   "referenced_type" : "type-1890",
+   "self_type" : "type-1889",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23749,8 +23821,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1952",
-   "self_type" : "type-1951",
+   "referenced_type" : "type-1954",
+   "self_type" : "type-1953",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23759,8 +23831,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2021",
-   "self_type" : "type-2020",
+   "referenced_type" : "type-2024",
+   "self_type" : "type-2023",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23769,8 +23841,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2138",
-   "self_type" : "type-2137",
+   "referenced_type" : "type-2142",
+   "self_type" : "type-2141",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23779,8 +23851,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2199",
-   "self_type" : "type-2198",
+   "referenced_type" : "type-2202",
+   "self_type" : "type-2201",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23789,8 +23861,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2417",
-   "self_type" : "type-2416",
+   "referenced_type" : "type-2419",
+   "self_type" : "type-2418",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23799,8 +23871,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2551",
-   "self_type" : "type-2550",
+   "referenced_type" : "type-2556",
+   "self_type" : "type-2555",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23809,8 +23881,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2682",
-   "self_type" : "type-2681",
+   "referenced_type" : "type-2684",
+   "self_type" : "type-2683",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23819,8 +23891,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2795",
-   "self_type" : "type-2794",
+   "referenced_type" : "type-2797",
+   "self_type" : "type-2796",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23829,8 +23901,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2821",
-   "self_type" : "type-2820",
+   "referenced_type" : "type-2823",
+   "self_type" : "type-2822",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23839,8 +23911,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2872",
-   "self_type" : "type-2871",
+   "referenced_type" : "type-2874",
+   "self_type" : "type-2873",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23849,8 +23921,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2963",
-   "self_type" : "type-2962",
+   "referenced_type" : "type-2965",
+   "self_type" : "type-2964",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23859,8 +23931,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3044",
-   "self_type" : "type-3043",
+   "referenced_type" : "type-3047",
+   "self_type" : "type-3046",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23869,8 +23941,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3119",
-   "self_type" : "type-3118",
+   "referenced_type" : "type-3123",
+   "self_type" : "type-3122",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23879,8 +23951,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3202",
-   "self_type" : "type-3201",
+   "referenced_type" : "type-3205",
+   "self_type" : "type-3204",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23889,8 +23961,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3297",
-   "self_type" : "type-3296",
+   "referenced_type" : "type-326",
+   "self_type" : "type-325",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23899,8 +23971,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-329",
-   "self_type" : "type-328",
+   "referenced_type" : "type-3300",
+   "self_type" : "type-3299",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23909,8 +23981,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3348",
-   "self_type" : "type-3347",
+   "referenced_type" : "type-3351",
+   "self_type" : "type-3350",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23919,8 +23991,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3514",
-   "self_type" : "type-3513",
+   "referenced_type" : "type-3517",
+   "self_type" : "type-3516",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23929,8 +24001,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-46",
-   "self_type" : "type-45",
+   "referenced_type" : "type-476",
+   "self_type" : "type-475",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23939,8 +24011,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-479",
-   "self_type" : "type-478",
+   "referenced_type" : "type-48",
+   "self_type" : "type-47",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23959,8 +24031,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-727",
-   "self_type" : "type-726",
+   "referenced_type" : "type-728",
+   "self_type" : "type-727",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23969,8 +24041,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-833",
-   "self_type" : "type-832",
+   "referenced_type" : "type-834",
+   "self_type" : "type-833",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23979,8 +24051,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-960",
-   "self_type" : "type-959",
+   "referenced_type" : "type-962",
+   "self_type" : "type-961",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23989,8 +24061,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned char",
    "name" : "const unsigned char",
-   "referenced_type" : "type-218",
-   "self_type" : "type-224",
+   "referenced_type" : "type-220",
+   "self_type" : "type-226",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -23999,8 +24071,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned int",
    "name" : "const unsigned int",
-   "referenced_type" : "type-123",
-   "self_type" : "type-236",
+   "referenced_type" : "type-125",
+   "self_type" : "type-238",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
   },
@@ -24009,8 +24081,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned long long",
    "name" : "const unsigned long long",
-   "referenced_type" : "type-124",
-   "self_type" : "type-226",
+   "referenced_type" : "type-126",
+   "self_type" : "type-228",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -24028,7 +24100,7 @@
    "is_const" : true,
    "linker_set_key" : "const void",
    "name" : "const void",
-   "referenced_type" : "type-151",
+   "referenced_type" : "type-154",
    "self_type" : "type-1118",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -24037,8 +24109,8 @@
    "is_const" : true,
    "linker_set_key" : "unsigned int const[3]",
    "name" : "unsigned int const[3]",
-   "referenced_type" : "type-941",
-   "self_type" : "type-948",
+   "referenced_type" : "type-935",
+   "self_type" : "type-942",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -24048,7 +24120,7 @@
    "linker_set_key" : "volatile bool",
    "name" : "volatile bool",
    "referenced_type" : "type-6",
-   "self_type" : "type-270",
+   "self_type" : "type-266",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Thread.h"
   },
@@ -24057,8 +24129,8 @@
    "is_volatile" : true,
    "linker_set_key" : "volatile int",
    "name" : "volatile int",
-   "referenced_type" : "type-103",
-   "self_type" : "type-275",
+   "referenced_type" : "type-105",
+   "self_type" : "type-271",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   }
@@ -24071,48 +24143,48 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "layers",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "format",
      "field_offset" : 96,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "usage",
      "field_offset" : 128,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "stride",
      "field_offset" : 192,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "rfu0",
      "field_offset" : 224,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "rfu1",
      "field_offset" : 256,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "AHardwareBuffer_Desc",
    "name" : "AHardwareBuffer_Desc",
-   "referenced_type" : "type-683",
-   "self_type" : "type-683",
+   "referenced_type" : "type-685",
+   "self_type" : "type-685",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
    "unique_id" : "AHardwareBuffer_Desc"
@@ -24123,23 +24195,23 @@
    [
     {
      "field_name" : "data",
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "pixelStride",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "rowStride",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "linker_set_key" : "AHardwareBuffer_Plane",
    "name" : "AHardwareBuffer_Plane",
-   "referenced_type" : "type-509",
-   "self_type" : "type-509",
+   "referenced_type" : "type-506",
+   "self_type" : "type-506",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
    "unique_id" : "AHardwareBuffer_Plane"
@@ -24150,18 +24222,18 @@
    [
     {
      "field_name" : "planeCount",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "planes",
      "field_offset" : 32,
-     "referenced_type" : "type-508"
+     "referenced_type" : "type-505"
     }
    ],
    "linker_set_key" : "AHardwareBuffer_Planes",
    "name" : "AHardwareBuffer_Planes",
-   "referenced_type" : "type-507",
-   "self_type" : "type-507",
+   "referenced_type" : "type-504",
+   "self_type" : "type-504",
    "size" : 52,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
    "unique_id" : "AHardwareBuffer_Planes"
@@ -24172,63 +24244,63 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-518"
+     "referenced_type" : "type-516"
     },
     {
      "field_name" : "width",
      "field_offset" : 256,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "height",
      "field_offset" : 288,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "stride",
      "field_offset" : 320,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "format",
      "field_offset" : 352,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "usage_deprecated",
      "field_offset" : 384,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "layerCount",
      "field_offset" : 416,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 448,
-     "referenced_type" : "type-523"
+     "referenced_type" : "type-521"
     },
     {
      "field_name" : "handle",
      "field_offset" : 480,
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
      "field_name" : "usage",
      "field_offset" : 512,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "reserved_proc",
      "field_offset" : 576,
-     "referenced_type" : "type-524"
+     "referenced_type" : "type-522"
     }
    ],
    "linker_set_key" : "ANativeWindowBuffer",
    "name" : "ANativeWindowBuffer",
-   "referenced_type" : "type-517",
-   "self_type" : "type-517",
+   "referenced_type" : "type-515",
+   "self_type" : "type-515",
    "size" : 96,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
    "unique_id" : "ANativeWindowBuffer"
@@ -24239,22 +24311,22 @@
    [
     {
      "field_name" : "left",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "top",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "right",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "bottom",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "ARect",
@@ -24271,7 +24343,7 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-547"
+     "referenced_type" : "type-544"
     },
     {
      "field_name" : "alloc",
@@ -24307,20 +24379,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-517"
+     "referenced_type" : "type-515"
     },
     {
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
    "name" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
    "record_kind" : "class",
-   "referenced_type" : "type-516",
-   "self_type" : "type-516",
+   "referenced_type" : "type-514",
+   "self_type" : "type-514",
    "size" : 104,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h",
-   "template_args" : [ "type-517", "type-525", "type-172", "type-518" ],
+   "template_args" : [ "type-515", "type-523", "type-175", "type-516" ],
    "unique_id" : "_ZTSN7android17ANativeObjectBaseI19ANativeWindowBufferNS_13GraphicBufferENS_7RefBaseE21android_native_base_tEE",
    "vtable_components" :
    [
@@ -24408,7 +24480,7 @@
      "access" : "private",
      "field_name" : "mWhitePoint",
      "field_offset" : 1664,
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     }
    ],
    "linker_set_key" : "android::ColorSpace",
@@ -24515,14 +24587,14 @@
     {
      "access" : "private",
      "field_name" : "mCond",
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-255"
     }
    ],
    "linker_set_key" : "android::Condition",
    "name" : "android::Condition",
    "record_kind" : "class",
-   "referenced_type" : "type-258",
-   "self_type" : "type-258",
+   "referenced_type" : "type-254",
+   "self_type" : "type-254",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "unique_id" : "_ZTSN7android9ConditionE"
@@ -24563,13 +24635,13 @@
     {
      "access" : "private",
      "field_name" : "mState",
-     "referenced_type" : "type-1377"
+     "referenced_type" : "type-1382"
     },
     {
      "access" : "private",
      "field_name" : "mMutex",
      "field_offset" : 32,
-     "referenced_type" : "type-1379"
+     "referenced_type" : "type-1384"
     },
     {
      "access" : "private",
@@ -24581,14 +24653,14 @@
      "access" : "private",
      "field_name" : "mSignalTime",
      "field_offset" : 128,
-     "referenced_type" : "type-1380"
+     "referenced_type" : "type-1385"
     }
    ],
    "linker_set_key" : "android::FenceTime",
    "name" : "android::FenceTime",
    "record_kind" : "class",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1376",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1381",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android9FenceTimeE"
@@ -24598,14 +24670,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1385"
+     "referenced_type" : "type-1389"
     }
    ],
    "fields" :
    [
     {
      "field_name" : "state",
-     "referenced_type" : "type-1384"
+     "referenced_type" : "type-1388"
     },
     {
      "field_name" : "fence",
@@ -24615,13 +24687,13 @@
     {
      "field_name" : "signalTime",
      "field_offset" : 64,
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
    "linker_set_key" : "android::FenceTime::Snapshot",
    "name" : "android::FenceTime::Snapshot",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1383",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1387",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android9FenceTime8SnapshotE"
@@ -24633,20 +24705,20 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-1398"
+     "referenced_type" : "type-1402"
     },
     {
      "access" : "private",
      "field_name" : "mQueue",
      "field_offset" : 32,
-     "referenced_type" : "type-1399"
+     "referenced_type" : "type-1403"
     }
    ],
    "linker_set_key" : "android::FenceTimeline",
    "name" : "android::FenceTimeline",
    "record_kind" : "class",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1397",
+   "referenced_type" : "type-1401",
+   "self_type" : "type-1401",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android13FenceTimelineE"
@@ -24658,20 +24730,20 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-1403"
+     "referenced_type" : "type-1407"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-1404"
+     "referenced_type" : "type-1408"
     }
    ],
    "linker_set_key" : "android::FenceToFenceTimeMap",
    "name" : "android::FenceToFenceTimeMap",
    "record_kind" : "class",
-   "referenced_type" : "type-1402",
-   "self_type" : "type-1402",
+   "referenced_type" : "type-1406",
+   "self_type" : "type-1406",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android19FenceToFenceTimeMapE"
@@ -24693,11 +24765,11 @@
    "linker_set_key" : "android::Flattenable<android::FenceTime::Snapshot>",
    "name" : "android::Flattenable<android::FenceTime::Snapshot>",
    "record_kind" : "class",
-   "referenced_type" : "type-1385",
-   "self_type" : "type-1385",
+   "referenced_type" : "type-1389",
+   "self_type" : "type-1389",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1383" ],
+   "template_args" : [ "type-1387" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_9FenceTime8SnapshotEEE"
   },
   {
@@ -24705,11 +24777,11 @@
    "linker_set_key" : "android::Flattenable<android::GraphicBuffer>",
    "name" : "android::Flattenable<android::GraphicBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-532",
-   "self_type" : "type-532",
+   "referenced_type" : "type-530",
+   "self_type" : "type-530",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-525" ],
+   "template_args" : [ "type-523" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_13GraphicBufferEEE"
   },
   {
@@ -24761,36 +24833,36 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1419"
+     "referenced_type" : "type-1423"
     }
    ],
    "fields" :
    [
     {
      "field_name" : "refreshPeriodNano",
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     },
     {
      "field_name" : "desiredPresentTimesNano",
      "field_offset" : 64,
-     "referenced_type" : "type-1421"
+     "referenced_type" : "type-1425"
     },
     {
      "field_name" : "actualPresentTimesNano",
      "field_offset" : 224,
-     "referenced_type" : "type-1421"
+     "referenced_type" : "type-1425"
     },
     {
      "field_name" : "frameReadyTimesNano",
      "field_offset" : 384,
-     "referenced_type" : "type-1421"
+     "referenced_type" : "type-1425"
     }
    ],
    "linker_set_key" : "android::FrameStats",
    "name" : "android::FrameStats",
    "record_kind" : "class",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1420",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1424",
    "size" : 72,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h",
    "unique_id" : "_ZTSN7android10FrameStatsE"
@@ -24800,7 +24872,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-359"
+     "referenced_type" : "type-356"
     }
    ],
    "fields" :
@@ -24809,20 +24881,20 @@
      "access" : "private",
      "field_name" : "mMapper",
      "field_offset" : 32,
-     "referenced_type" : "type-354"
+     "referenced_type" : "type-351"
     },
     {
      "access" : "private",
      "field_name" : "mAllocator",
      "field_offset" : 64,
-     "referenced_type" : "type-355"
+     "referenced_type" : "type-352"
     }
    ],
    "linker_set_key" : "android::Gralloc2Allocator",
    "name" : "android::Gralloc2Allocator",
    "record_kind" : "class",
-   "referenced_type" : "type-353",
-   "self_type" : "type-353",
+   "referenced_type" : "type-350",
+   "self_type" : "type-350",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h",
    "unique_id" : "_ZTSN7android17Gralloc2AllocatorE",
@@ -24859,7 +24931,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-342"
+     "referenced_type" : "type-339"
     }
    ],
    "fields" :
@@ -24868,20 +24940,20 @@
      "access" : "private",
      "field_name" : "mMapper",
      "field_offset" : 32,
-     "referenced_type" : "type-338"
+     "referenced_type" : "type-335"
     },
     {
      "access" : "private",
      "field_name" : "mMapperV2_1",
      "field_offset" : 64,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-88"
     }
    ],
    "linker_set_key" : "android::Gralloc2Mapper",
    "name" : "android::Gralloc2Mapper",
    "record_kind" : "class",
-   "referenced_type" : "type-337",
-   "self_type" : "type-337",
+   "referenced_type" : "type-334",
+   "self_type" : "type-334",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h",
    "unique_id" : "_ZTSN7android14Gralloc2MapperE",
@@ -24939,10 +25011,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-516"
+     "referenced_type" : "type-514"
     },
     {
-     "referenced_type" : "type-532"
+     "referenced_type" : "type-530"
     }
    ],
    "fields" :
@@ -24951,62 +25023,62 @@
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 832,
-     "referenced_type" : "type-218"
+     "referenced_type" : "type-220"
     },
     {
      "access" : "private",
      "field_name" : "mBufferMapper",
      "field_offset" : 864,
-     "referenced_type" : "type-526"
+     "referenced_type" : "type-524"
     },
     {
      "access" : "private",
      "field_name" : "mInitCheck",
      "field_offset" : 896,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mTransportNumFds",
      "field_offset" : 928,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mTransportNumInts",
      "field_offset" : 960,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mId",
      "field_offset" : 1024,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
      "field_name" : "mBufferId",
      "field_offset" : 1088,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mGenerationNumber",
      "field_offset" : 1120,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mDeathCallbacks",
      "field_offset" : 1152,
-     "referenced_type" : "type-531"
+     "referenced_type" : "type-529"
     }
    ],
    "linker_set_key" : "android::GraphicBuffer",
    "name" : "android::GraphicBuffer",
    "record_kind" : "class",
-   "referenced_type" : "type-525",
-   "self_type" : "type-525",
+   "referenced_type" : "type-523",
+   "self_type" : "type-523",
    "size" : 160,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h",
    "unique_id" : "_ZTSN7android13GraphicBufferE",
@@ -25046,7 +25118,91 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "protected",
+     "field_name" : "mMapper",
+     "referenced_type" : "type-524"
+    },
+    {
+     "access" : "protected",
+     "field_name" : "mAllocator",
+     "field_offset" : 32,
+     "referenced_type" : "type-540"
+    }
+   ],
+   "linker_set_key" : "android::GraphicBufferAllocator",
+   "name" : "android::GraphicBufferAllocator",
+   "record_kind" : "class",
+   "referenced_type" : "type-539",
+   "self_type" : "type-539",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h",
+   "unique_id" : "_ZTSN7android22GraphicBufferAllocatorE"
+  },
+  {
+   "access" : "protected",
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "width",
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "height",
+     "field_offset" : 32,
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "stride",
+     "field_offset" : 64,
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "format",
+     "field_offset" : 96,
+     "referenced_type" : "type-105"
+    },
+    {
+     "field_name" : "layerCount",
+     "field_offset" : 128,
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "usage",
+     "field_offset" : 192,
+     "referenced_type" : "type-126"
+    },
+    {
+     "field_name" : "size",
+     "field_offset" : 256,
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "requestorName",
+     "field_offset" : 288,
+     "referenced_type" : "type-681"
+    }
+   ],
+   "linker_set_key" : "android::GraphicBufferAllocator::alloc_rec_t",
+   "name" : "android::GraphicBufferAllocator::alloc_rec_t",
+   "referenced_type" : "type-680",
+   "self_type" : "type-680",
+   "size" : 48,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h",
+   "unique_id" : "_ZTSN7android22GraphicBufferAllocator11alloc_rec_tE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-528"
     }
    ],
    "fields" :
@@ -25058,100 +25214,16 @@
     },
     {
      "access" : "private",
-     "field_name" : "mAllocator",
-     "field_offset" : 32,
-     "referenced_type" : "type-543"
-    }
-   ],
-   "linker_set_key" : "android::GraphicBufferAllocator",
-   "name" : "android::GraphicBufferAllocator",
-   "record_kind" : "class",
-   "referenced_type" : "type-542",
-   "self_type" : "type-542",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h",
-   "unique_id" : "_ZTSN7android22GraphicBufferAllocatorE"
-  },
-  {
-   "access" : "private",
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "width",
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "height",
-     "field_offset" : 32,
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "stride",
-     "field_offset" : 64,
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "format",
-     "field_offset" : 96,
-     "referenced_type" : "type-103"
-    },
-    {
-     "field_name" : "layerCount",
-     "field_offset" : 128,
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "usage",
-     "field_offset" : 192,
-     "referenced_type" : "type-124"
-    },
-    {
-     "field_name" : "size",
-     "field_offset" : 256,
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "requestorName",
-     "field_offset" : 288,
-     "referenced_type" : "type-677"
-    }
-   ],
-   "linker_set_key" : "android::GraphicBufferAllocator::alloc_rec_t",
-   "name" : "android::GraphicBufferAllocator::alloc_rec_t",
-   "referenced_type" : "type-676",
-   "self_type" : "type-676",
-   "size" : 48,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h",
-   "unique_id" : "_ZTSN7android22GraphicBufferAllocator11alloc_rec_tE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-530"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMapper",
-     "referenced_type" : "type-528"
-    },
-    {
-     "access" : "private",
      "field_name" : "mMapperVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-529"
+     "referenced_type" : "type-527"
     }
    ],
    "linker_set_key" : "android::GraphicBufferMapper",
    "name" : "android::GraphicBufferMapper",
    "record_kind" : "class",
-   "referenced_type" : "type-527",
-   "self_type" : "type-527",
+   "referenced_type" : "type-525",
+   "self_type" : "type-525",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h",
    "unique_id" : "_ZTSN7android19GraphicBufferMapperE"
@@ -25206,17 +25278,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-235"
     }
    ],
    "linker_set_key" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
    "name" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
    "record_kind" : "class",
-   "referenced_type" : "type-247",
-   "self_type" : "type-247",
+   "referenced_type" : "type-249",
+   "self_type" : "type-249",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-179", "type-248" ],
+   "template_args" : [ "type-182", "type-250" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
   },
   {
@@ -25232,11 +25304,11 @@
    "linker_set_key" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "record_kind" : "class",
-   "referenced_type" : "type-715",
-   "self_type" : "type-715",
+   "referenced_type" : "type-716",
+   "self_type" : "type-716",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-142", "type-676" ],
+   "template_args" : [ "type-145", "type-680" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -25244,11 +25316,11 @@
    "linker_set_key" : "android::LightFlattenable<android::FrameStats>",
    "name" : "android::LightFlattenable<android::FrameStats>",
    "record_kind" : "class",
-   "referenced_type" : "type-1419",
-   "self_type" : "type-1419",
+   "referenced_type" : "type-1423",
+   "self_type" : "type-1423",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1420" ],
+   "template_args" : [ "type-1424" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_10FrameStatsEEE"
   },
   {
@@ -25292,11 +25364,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Region>",
    "name" : "android::LightFlattenable<android::Region>",
    "record_kind" : "class",
-   "referenced_type" : "type-2222",
-   "self_type" : "type-2222",
+   "referenced_type" : "type-2225",
+   "self_type" : "type-2225",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-2221" ],
+   "template_args" : [ "type-2224" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_6RegionEEE"
   },
   {
@@ -25402,14 +25474,14 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-281"
     }
    ],
    "linker_set_key" : "android::Mutex",
    "name" : "android::Mutex",
    "record_kind" : "class",
-   "referenced_type" : "type-252",
-   "self_type" : "type-252",
+   "referenced_type" : "type-280",
+   "self_type" : "type-280",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5MutexE"
@@ -25421,14 +25493,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-256"
+     "referenced_type" : "type-1379"
     }
    ],
    "linker_set_key" : "android::Mutex::Autolock",
    "name" : "android::Mutex::Autolock",
    "record_kind" : "class",
-   "referenced_type" : "type-255",
-   "self_type" : "type-255",
+   "referenced_type" : "type-1378",
+   "self_type" : "type-1378",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5Mutex8AutolockE"
@@ -25477,12 +25549,12 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "y",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::Point",
@@ -25501,14 +25573,14 @@
     {
      "access" : "private",
      "field_name" : "mRWLock",
-     "referenced_type" : "type-263"
+     "referenced_type" : "type-259"
     }
    ],
    "linker_set_key" : "android::RWLock",
    "name" : "android::RWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-262",
-   "self_type" : "type-262",
+   "referenced_type" : "type-258",
+   "self_type" : "type-258",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLockE"
@@ -25520,14 +25592,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-262"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoRLock",
    "name" : "android::RWLock::AutoRLock",
    "record_kind" : "class",
-   "referenced_type" : "type-265",
-   "self_type" : "type-265",
+   "referenced_type" : "type-261",
+   "self_type" : "type-261",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
@@ -25539,14 +25611,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-262"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoWLock",
    "name" : "android::RWLock::AutoWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-268",
-   "self_type" : "type-268",
+   "referenced_type" : "type-264",
+   "self_type" : "type-264",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
@@ -25579,14 +25651,14 @@
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 32,
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-176"
     }
    ],
    "linker_set_key" : "android::RefBase",
    "name" : "android::RefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-172",
-   "self_type" : "type-172",
+   "referenced_type" : "type-175",
+   "self_type" : "type-175",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBaseE",
@@ -25626,8 +25698,8 @@
    "linker_set_key" : "android::RefBase::weakref_type",
    "name" : "android::RefBase::weakref_type",
    "record_kind" : "class",
-   "referenced_type" : "type-198",
-   "self_type" : "type-198",
+   "referenced_type" : "type-211",
+   "self_type" : "type-211",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBase12weakref_typeE"
@@ -25673,7 +25745,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2222"
+     "referenced_type" : "type-2225"
     }
    ],
    "fields" :
@@ -25681,14 +25753,14 @@
     {
      "access" : "private",
      "field_name" : "mStorage",
-     "referenced_type" : "type-2213"
+     "referenced_type" : "type-2216"
     }
    ],
    "linker_set_key" : "android::Region",
    "name" : "android::Region",
    "record_kind" : "class",
-   "referenced_type" : "type-2221",
-   "self_type" : "type-2221",
+   "referenced_type" : "type-2224",
+   "self_type" : "type-2224",
    "size" : 20,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h",
    "unique_id" : "_ZTSN7android6RegionE"
@@ -25700,7 +25772,7 @@
     {
      "access" : "private",
      "field_name" : "mTag",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "android::ScopedTrace",
@@ -25717,11 +25789,11 @@
    "linker_set_key" : "android::Singleton<android::GraphicBufferAllocator>",
    "name" : "android::Singleton<android::GraphicBufferAllocator>",
    "record_kind" : "class",
-   "referenced_type" : "type-541",
-   "self_type" : "type-541",
+   "referenced_type" : "type-538",
+   "self_type" : "type-538",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-542" ],
+   "template_args" : [ "type-539" ],
    "unique_id" : "_ZTSN7android9SingletonINS_22GraphicBufferAllocatorEEE"
   },
   {
@@ -25729,11 +25801,11 @@
    "linker_set_key" : "android::Singleton<android::GraphicBufferMapper>",
    "name" : "android::Singleton<android::GraphicBufferMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-530",
-   "self_type" : "type-530",
+   "referenced_type" : "type-528",
+   "self_type" : "type-528",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-527" ],
+   "template_args" : [ "type-525" ],
    "unique_id" : "_ZTSN7android9SingletonINS_19GraphicBufferMapperEEE"
   },
   {
@@ -25742,17 +25814,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-234"
+     "referenced_type" : "type-236"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
    "name" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-233",
-   "self_type" : "type-233",
+   "referenced_type" : "type-235",
+   "self_type" : "type-235",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-237" ],
+   "template_args" : [ "type-239" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
    "vtable_components" :
    [
@@ -25800,7 +25872,7 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-234"
+     "referenced_type" : "type-236"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
@@ -25857,14 +25929,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::SortedVectorImpl",
    "name" : "android::SortedVectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-234",
-   "self_type" : "type-234",
+   "referenced_type" : "type-236",
+   "self_type" : "type-236",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android16SortedVectorImplE",
@@ -25922,14 +25994,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-180"
+     "referenced_type" : "type-183"
     }
    ],
    "linker_set_key" : "android::String16",
    "name" : "android::String16",
    "record_kind" : "class",
-   "referenced_type" : "type-179",
-   "self_type" : "type-179",
+   "referenced_type" : "type-182",
+   "self_type" : "type-182",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "unique_id" : "_ZTSN7android8String16E"
@@ -25941,14 +26013,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     }
    ],
    "linker_set_key" : "android::String8",
    "name" : "android::String8",
    "record_kind" : "class",
-   "referenced_type" : "type-285",
-   "self_type" : "type-285",
+   "referenced_type" : "type-282",
+   "self_type" : "type-282",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "unique_id" : "_ZTSN7android7String8E"
@@ -25959,7 +26031,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "fields" :
@@ -25968,62 +26040,62 @@
      "access" : "private",
      "field_name" : "mCanCallJava",
      "field_offset" : 32,
-     "referenced_type" : "type-370"
+     "referenced_type" : "type-367"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 64,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 96,
-     "referenced_type" : "type-252"
+     "referenced_type" : "type-280"
     },
     {
      "access" : "private",
      "field_name" : "mThreadExitedCondition",
      "field_offset" : 128,
-     "referenced_type" : "type-258"
+     "referenced_type" : "type-254"
     },
     {
      "access" : "private",
      "field_name" : "mStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mExitPending",
      "field_offset" : 192,
-     "referenced_type" : "type-270"
+     "referenced_type" : "type-266"
     },
     {
      "access" : "private",
      "field_name" : "mRunning",
      "field_offset" : 200,
-     "referenced_type" : "type-270"
+     "referenced_type" : "type-266"
     },
     {
      "access" : "private",
      "field_name" : "mHoldSelf",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-364"
     },
     {
      "access" : "private",
      "field_name" : "mTid",
      "field_offset" : 256,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::Thread",
    "name" : "android::Thread",
    "record_kind" : "class",
-   "referenced_type" : "type-369",
-   "self_type" : "type-369",
+   "referenced_type" : "type-366",
+   "self_type" : "type-366",
    "size" : 44,
    "source_file" : "/system/core/libutils/include/utils/Thread.h",
    "unique_id" : "_ZTSN7android6ThreadE",
@@ -26113,14 +26185,14 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::Rect>",
    "name" : "android::Vector<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-2213",
-   "self_type" : "type-2213",
+   "referenced_type" : "type-2216",
+   "self_type" : "type-2216",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-1241" ],
@@ -26168,17 +26240,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::RefBase *>",
    "name" : "android::Vector<android::RefBase *>",
    "record_kind" : "class",
-   "referenced_type" : "type-245",
-   "self_type" : "type-245",
+   "referenced_type" : "type-247",
+   "self_type" : "type-247",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-246" ],
+   "template_args" : [ "type-248" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7RefBaseEEE",
    "vtable_components" :
    [
@@ -26223,17 +26295,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::RefBase::weakref_type *>",
    "name" : "android::Vector<android::RefBase::weakref_type *>",
    "record_kind" : "class",
-   "referenced_type" : "type-244",
-   "self_type" : "type-244",
+   "referenced_type" : "type-246",
+   "self_type" : "type-246",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-197" ],
+   "template_args" : [ "type-210" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7RefBase12weakref_typeEEE",
    "vtable_components" :
    [
@@ -26278,17 +26350,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::BHwBinder *>",
    "name" : "android::Vector<android::hardware::BHwBinder *>",
    "record_kind" : "class",
-   "referenced_type" : "type-240",
-   "self_type" : "type-240",
+   "referenced_type" : "type-242",
+   "self_type" : "type-242",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-241" ],
+   "template_args" : [ "type-243" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_8hardware9BHwBinderEEE",
    "vtable_components" :
    [
@@ -26333,17 +26405,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "record_kind" : "class",
-   "referenced_type" : "type-238",
-   "self_type" : "type-238",
+   "referenced_type" : "type-240",
+   "self_type" : "type-240",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-239" ],
+   "template_args" : [ "type-241" ],
    "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
    "vtable_components" :
    [
@@ -26388,17 +26460,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<long long>",
    "name" : "android::Vector<long long>",
    "record_kind" : "class",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1421",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1425",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android6VectorIxEE",
    "vtable_components" :
    [
@@ -26445,32 +26517,32 @@
      "access" : "private",
      "field_name" : "mStorage",
      "field_offset" : 32,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "access" : "private",
      "field_name" : "mCount",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mFlags",
      "field_offset" : 96,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "access" : "private",
      "field_name" : "mItemSize",
      "field_offset" : 128,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     }
    ],
    "linker_set_key" : "android::VectorImpl",
    "name" : "android::VectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-235",
-   "self_type" : "type-235",
+   "referenced_type" : "type-237",
+   "self_type" : "type-237",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android10VectorImplE",
@@ -26556,11 +26628,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::aggregate_traits<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-824",
-   "self_type" : "type-824",
+   "referenced_type" : "type-825",
+   "self_type" : "type-825",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142", "type-676" ],
+   "template_args" : [ "type-145", "type-680" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -26580,7 +26652,7 @@
     {
      "access" : "private",
      "field_name" : "fd_",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser>",
@@ -26645,28 +26717,28 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2254"
+     "referenced_type" : "type-2257"
+    },
+    {
+     "referenced_type" : "type-2258"
     },
     {
      "referenced_type" : "type-2255"
     },
     {
-     "referenced_type" : "type-2252"
-    },
-    {
-     "referenced_type" : "type-2265"
-    },
-    {
-     "referenced_type" : "type-2268"
+     "referenced_type" : "type-2269"
     },
     {
      "referenced_type" : "type-2270"
     },
     {
-     "referenced_type" : "type-2269"
+     "referenced_type" : "type-2272"
     },
     {
-     "referenced_type" : "type-2272"
+     "referenced_type" : "type-2271"
+    },
+    {
+     "referenced_type" : "type-2274"
     }
    ],
    "fields" :
@@ -26674,14 +26746,14 @@
     {
      "access" : "private",
      "field_name" : "m_value",
-     "referenced_type" : "type-2277"
+     "referenced_type" : "type-2279"
     }
    ],
    "linker_set_key" : "android::details::TMat44<float>",
    "name" : "android::details::TMat44<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2276",
-   "self_type" : "type-2276",
+   "referenced_type" : "type-2278",
+   "self_type" : "type-2278",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h",
    "template_args" : [ "type-10" ],
@@ -26704,8 +26776,8 @@
    "linker_set_key" : "android::details::TMatDebug<android::details::TMat44, float>",
    "name" : "android::details::TMatDebug<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2272",
-   "self_type" : "type-2272",
+   "referenced_type" : "type-2274",
+   "self_type" : "type-2274",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26728,8 +26800,8 @@
    "linker_set_key" : "android::details::TMatHelpers<android::details::TMat44, float>",
    "name" : "android::details::TMatHelpers<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2269",
-   "self_type" : "type-2269",
+   "referenced_type" : "type-2271",
+   "self_type" : "type-2271",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26752,8 +26824,8 @@
    "linker_set_key" : "android::details::TMatProductOperators<android::details::TMat44, float>",
    "name" : "android::details::TMatProductOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2265",
-   "self_type" : "type-2265",
+   "referenced_type" : "type-2269",
+   "self_type" : "type-2269",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26776,8 +26848,8 @@
    "linker_set_key" : "android::details::TMatSquareFunctions<android::details::TMat44, float>",
    "name" : "android::details::TMatSquareFunctions<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2268",
-   "self_type" : "type-2268",
+   "referenced_type" : "type-2270",
+   "self_type" : "type-2270",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26800,8 +26872,8 @@
    "linker_set_key" : "android::details::TMatTransform<android::details::TMat44, float>",
    "name" : "android::details::TMatTransform<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2270",
-   "self_type" : "type-2270",
+   "referenced_type" : "type-2272",
+   "self_type" : "type-2272",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26812,11 +26884,11 @@
    "linker_set_key" : "android::details::TQuatDebug<android::details::TQuaternion, double>",
    "name" : "android::details::TQuatDebug<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-49",
-   "self_type" : "type-49",
+   "referenced_type" : "type-51",
+   "self_type" : "type-51",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details10TQuatDebugINS0_11TQuaternionEdEE"
   },
   {
@@ -26824,8 +26896,8 @@
    "linker_set_key" : "android::details::TQuatDebug<android::details::TQuaternion, float>",
    "name" : "android::details::TQuatDebug<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-48",
-   "self_type" : "type-48",
+   "referenced_type" : "type-50",
+   "self_type" : "type-50",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26836,11 +26908,11 @@
    "linker_set_key" : "android::details::TQuatFunctions<android::details::TQuaternion, double>",
    "name" : "android::details::TQuatFunctions<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-47",
-   "self_type" : "type-47",
+   "referenced_type" : "type-49",
+   "self_type" : "type-49",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details14TQuatFunctionsINS0_11TQuaternionEdEE"
   },
   {
@@ -26848,8 +26920,8 @@
    "linker_set_key" : "android::details::TQuatFunctions<android::details::TQuaternion, float>",
    "name" : "android::details::TQuatFunctions<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-43",
-   "self_type" : "type-43",
+   "referenced_type" : "type-45",
+   "self_type" : "type-45",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26860,11 +26932,11 @@
    "linker_set_key" : "android::details::TQuatProductOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TQuatProductOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-40",
-   "self_type" : "type-40",
+   "referenced_type" : "type-42",
+   "self_type" : "type-42",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details21TQuatProductOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -26884,38 +26956,38 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-334"
+     "referenced_type" : "type-331"
     },
     {
-     "referenced_type" : "type-335"
+     "referenced_type" : "type-332"
     },
     {
-     "referenced_type" : "type-336"
+     "referenced_type" : "type-333"
     },
     {
-     "referenced_type" : "type-40"
-    },
-    {
-     "referenced_type" : "type-47"
+     "referenced_type" : "type-42"
     },
     {
      "referenced_type" : "type-49"
+    },
+    {
+     "referenced_type" : "type-51"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-332"
+     "referenced_type" : "type-329"
     }
    ],
    "linker_set_key" : "android::details::TQuaternion<double>",
    "name" : "android::details::TQuaternion<double>",
    "record_kind" : "class",
-   "referenced_type" : "type-331",
-   "self_type" : "type-331",
+   "referenced_type" : "type-328",
+   "self_type" : "type-328",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details11TQuaternionIdEE"
   },
   {
@@ -26923,27 +26995,27 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-330"
     },
     {
      "field_name" : "xyzw",
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-52"
     },
     {
      "field_name" : "xyz",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-68"
     },
     {
      "field_name" : "xy",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "name" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "record_kind" : "union",
-   "referenced_type" : "type-332",
-   "self_type" : "type-332",
+   "referenced_type" : "type-329",
+   "self_type" : "type-329",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIdEUt_E"
@@ -26954,29 +27026,29 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "z",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "w",
      "field_offset" : 192,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
    "name" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
-   "referenced_type" : "type-333",
-   "self_type" : "type-333",
+   "referenced_type" : "type-330",
+   "self_type" : "type-330",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIdEUt_Ut_E"
@@ -26986,35 +27058,35 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-413"
+     "referenced_type" : "type-410"
     },
     {
-     "referenced_type" : "type-414"
+     "referenced_type" : "type-411"
     },
     {
-     "referenced_type" : "type-415"
+     "referenced_type" : "type-412"
     },
     {
      "referenced_type" : "type-38"
     },
     {
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-50"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-411"
+     "referenced_type" : "type-408"
     }
    ],
    "linker_set_key" : "android::details::TQuaternion<float>",
    "name" : "android::details::TQuaternion<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-410",
-   "self_type" : "type-410",
+   "referenced_type" : "type-407",
+   "self_type" : "type-407",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "template_args" : [ "type-10" ],
@@ -27025,27 +27097,27 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-412"
+     "referenced_type" : "type-409"
     },
     {
      "field_name" : "xyzw",
-     "referenced_type" : "type-200"
+     "referenced_type" : "type-192"
     },
     {
      "field_name" : "xyz",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-18"
     },
     {
      "field_name" : "xy",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "name" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "record_kind" : "union",
-   "referenced_type" : "type-411",
-   "self_type" : "type-411",
+   "referenced_type" : "type-408",
+   "self_type" : "type-408",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIfEUt_E"
@@ -27077,8 +27149,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
    "name" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
-   "referenced_type" : "type-412",
-   "self_type" : "type-412",
+   "referenced_type" : "type-409",
+   "self_type" : "type-409",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIfEUt_Ut_E"
@@ -27088,16 +27160,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-396"
+     "referenced_type" : "type-390"
     },
     {
-     "referenced_type" : "type-427"
+     "referenced_type" : "type-424"
     },
     {
-     "referenced_type" : "type-462"
+     "referenced_type" : "type-455"
     },
     {
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-507"
     },
     {
      "referenced_type" : "type-600"
@@ -27220,12 +27292,6 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-61"
-    },
-    {
      "referenced_type" : "type-62"
     },
     {
@@ -27236,22 +27302,28 @@
     },
     {
      "referenced_type" : "type-65"
+    },
+    {
+     "referenced_type" : "type-66"
+    },
+    {
+     "referenced_type" : "type-67"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-58"
     }
    ],
    "linker_set_key" : "android::details::TVec2<double>",
    "name" : "android::details::TVec2<double>",
    "record_kind" : "class",
-   "referenced_type" : "type-55",
-   "self_type" : "type-55",
+   "referenced_type" : "type-57",
+   "self_type" : "type-57",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details5TVec2IdEE"
   },
   {
@@ -27259,21 +27331,21 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-57"
-    },
-    {
-     "referenced_type" : "type-58"
-    },
-    {
      "referenced_type" : "type-59"
+    },
+    {
+     "referenced_type" : "type-60"
+    },
+    {
+     "referenced_type" : "type-61"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5) at frameworks/native/libs/math/include/math/vec2.h:49:5",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5) at frameworks/native/libs/math/include/math/vec2.h:49:5",
    "record_kind" : "union",
-   "referenced_type" : "type-56",
-   "self_type" : "type-56",
+   "referenced_type" : "type-58",
+   "self_type" : "type-58",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_E"
@@ -27284,19 +27356,19 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:50:9) at frameworks/native/libs/math/include/math/vec2.h:50:9",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:50:9) at frameworks/native/libs/math/include/math/vec2.h:50:9",
-   "referenced_type" : "type-57",
-   "self_type" : "type-57",
+   "referenced_type" : "type-59",
+   "self_type" : "type-59",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_Ut_E"
@@ -27307,19 +27379,19 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "t",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:51:9) at frameworks/native/libs/math/include/math/vec2.h:51:9",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:51:9) at frameworks/native/libs/math/include/math/vec2.h:51:9",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
+   "referenced_type" : "type-60",
+   "self_type" : "type-60",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_Ut0_E"
@@ -27330,19 +27402,19 @@
    [
     {
      "field_name" : "r",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "g",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:52:9) at frameworks/native/libs/math/include/math/vec2.h:52:9",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:52:9) at frameworks/native/libs/math/include/math/vec2.h:52:9",
-   "referenced_type" : "type-59",
-   "self_type" : "type-59",
+   "referenced_type" : "type-61",
+   "self_type" : "type-61",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_Ut1_E"
@@ -27352,9 +27424,6 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-27"
-    },
-    {
      "referenced_type" : "type-28"
     },
     {
@@ -27368,19 +27437,22 @@
     },
     {
      "referenced_type" : "type-32"
+    },
+    {
+     "referenced_type" : "type-33"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-24"
     }
    ],
    "linker_set_key" : "android::details::TVec2<float>",
    "name" : "android::details::TVec2<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-22",
-   "self_type" : "type-22",
+   "referenced_type" : "type-23",
+   "self_type" : "type-23",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "template_args" : [ "type-10" ],
@@ -27391,21 +27463,21 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-24"
-    },
-    {
      "referenced_type" : "type-25"
     },
     {
      "referenced_type" : "type-26"
+    },
+    {
+     "referenced_type" : "type-27"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5) at frameworks/native/libs/math/include/math/vec2.h:49:5",
    "name" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5) at frameworks/native/libs/math/include/math/vec2.h:49:5",
    "record_kind" : "union",
-   "referenced_type" : "type-23",
-   "self_type" : "type-23",
+   "referenced_type" : "type-24",
+   "self_type" : "type-24",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IfEUt_E"
@@ -27427,8 +27499,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:50:9) at frameworks/native/libs/math/include/math/vec2.h:50:9",
    "name" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:50:9) at frameworks/native/libs/math/include/math/vec2.h:50:9",
-   "referenced_type" : "type-24",
-   "self_type" : "type-24",
+   "referenced_type" : "type-25",
+   "self_type" : "type-25",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IfEUt_Ut_E"
@@ -27450,8 +27522,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:51:9) at frameworks/native/libs/math/include/math/vec2.h:51:9",
    "name" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:51:9) at frameworks/native/libs/math/include/math/vec2.h:51:9",
-   "referenced_type" : "type-25",
-   "self_type" : "type-25",
+   "referenced_type" : "type-26",
+   "self_type" : "type-26",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IfEUt_Ut0_E"
@@ -27473,8 +27545,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:52:9) at frameworks/native/libs/math/include/math/vec2.h:52:9",
    "name" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:52:9) at frameworks/native/libs/math/include/math/vec2.h:52:9",
-   "referenced_type" : "type-26",
-   "self_type" : "type-26",
+   "referenced_type" : "type-27",
+   "self_type" : "type-27",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IfEUt_Ut1_E"
@@ -27484,12 +27556,6 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-72"
-    },
-    {
      "referenced_type" : "type-73"
     },
     {
@@ -27500,22 +27566,28 @@
     },
     {
      "referenced_type" : "type-76"
+    },
+    {
+     "referenced_type" : "type-77"
+    },
+    {
+     "referenced_type" : "type-78"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-69"
     }
    ],
    "linker_set_key" : "android::details::TVec3<double>",
    "name" : "android::details::TVec3<double>",
    "record_kind" : "class",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
+   "referenced_type" : "type-68",
+   "self_type" : "type-68",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details5TVec3IdEE"
   },
   {
@@ -27523,33 +27595,33 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-68"
-    },
-    {
-     "referenced_type" : "type-69"
-    },
-    {
      "referenced_type" : "type-70"
     },
     {
+     "referenced_type" : "type-71"
+    },
+    {
+     "referenced_type" : "type-72"
+    },
+    {
      "field_name" : "xy",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "st",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "rg",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5) at frameworks/native/libs/math/include/math/vec3.h:47:5",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5) at frameworks/native/libs/math/include/math/vec3.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-67",
-   "self_type" : "type-67",
+   "referenced_type" : "type-69",
+   "self_type" : "type-69",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_E"
@@ -27560,24 +27632,24 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "z",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:48:9) at frameworks/native/libs/math/include/math/vec3.h:48:9",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:48:9) at frameworks/native/libs/math/include/math/vec3.h:48:9",
-   "referenced_type" : "type-68",
-   "self_type" : "type-68",
+   "referenced_type" : "type-70",
+   "self_type" : "type-70",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_Ut_E"
@@ -27588,24 +27660,24 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "t",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "p",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:49:9) at frameworks/native/libs/math/include/math/vec3.h:49:9",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:49:9) at frameworks/native/libs/math/include/math/vec3.h:49:9",
-   "referenced_type" : "type-69",
-   "self_type" : "type-69",
+   "referenced_type" : "type-71",
+   "self_type" : "type-71",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_Ut0_E"
@@ -27616,24 +27688,24 @@
    [
     {
      "field_name" : "r",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "g",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "b",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:50:9) at frameworks/native/libs/math/include/math/vec3.h:50:9",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:50:9) at frameworks/native/libs/math/include/math/vec3.h:50:9",
-   "referenced_type" : "type-70",
-   "self_type" : "type-70",
+   "referenced_type" : "type-72",
+   "self_type" : "type-72",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_Ut1_E"
@@ -27643,35 +27715,35 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-33"
+     "referenced_type" : "type-34"
     },
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-35"
     },
     {
      "referenced_type" : "type-9"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-13"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "type-36"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-19"
     }
    ],
    "linker_set_key" : "android::details::TVec3<float>",
    "name" : "android::details::TVec3<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-17",
-   "self_type" : "type-17",
+   "referenced_type" : "type-18",
+   "self_type" : "type-18",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "template_args" : [ "type-10" ],
@@ -27682,33 +27754,33 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-19"
-    },
-    {
      "referenced_type" : "type-20"
     },
     {
      "referenced_type" : "type-21"
     },
     {
-     "field_name" : "xy",
      "referenced_type" : "type-22"
     },
     {
+     "field_name" : "xy",
+     "referenced_type" : "type-23"
+    },
+    {
      "field_name" : "st",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "rg",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5) at frameworks/native/libs/math/include/math/vec3.h:47:5",
    "name" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5) at frameworks/native/libs/math/include/math/vec3.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-18",
-   "self_type" : "type-18",
+   "referenced_type" : "type-19",
+   "self_type" : "type-19",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IfEUt_E"
@@ -27735,8 +27807,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:48:9) at frameworks/native/libs/math/include/math/vec3.h:48:9",
    "name" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:48:9) at frameworks/native/libs/math/include/math/vec3.h:48:9",
-   "referenced_type" : "type-19",
-   "self_type" : "type-19",
+   "referenced_type" : "type-20",
+   "self_type" : "type-20",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IfEUt_Ut_E"
@@ -27763,8 +27835,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:49:9) at frameworks/native/libs/math/include/math/vec3.h:49:9",
    "name" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:49:9) at frameworks/native/libs/math/include/math/vec3.h:49:9",
-   "referenced_type" : "type-20",
-   "self_type" : "type-20",
+   "referenced_type" : "type-21",
+   "self_type" : "type-21",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IfEUt_Ut0_E"
@@ -27791,8 +27863,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:50:9) at frameworks/native/libs/math/include/math/vec3.h:50:9",
    "name" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:50:9) at frameworks/native/libs/math/include/math/vec3.h:50:9",
-   "referenced_type" : "type-21",
-   "self_type" : "type-21",
+   "referenced_type" : "type-22",
+   "self_type" : "type-22",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IfEUt_Ut1_E"
@@ -27802,12 +27874,6 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-78"
-    },
-    {
      "referenced_type" : "type-79"
     },
     {
@@ -27818,22 +27884,28 @@
     },
     {
      "referenced_type" : "type-82"
+    },
+    {
+     "referenced_type" : "type-83"
+    },
+    {
+     "referenced_type" : "type-84"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-53"
     }
    ],
    "linker_set_key" : "android::details::TVec4<double>",
    "name" : "android::details::TVec4<double>",
    "record_kind" : "class",
-   "referenced_type" : "type-50",
-   "self_type" : "type-50",
+   "referenced_type" : "type-52",
+   "self_type" : "type-52",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details5TVec4IdEE"
   },
   {
@@ -27841,45 +27913,45 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-52"
-    },
-    {
-     "referenced_type" : "type-53"
-    },
-    {
      "referenced_type" : "type-54"
     },
     {
-     "field_name" : "xy",
      "referenced_type" : "type-55"
     },
     {
+     "referenced_type" : "type-56"
+    },
+    {
+     "field_name" : "xy",
+     "referenced_type" : "type-57"
+    },
+    {
      "field_name" : "st",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "rg",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "xyz",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-68"
     },
     {
      "field_name" : "stp",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-68"
     },
     {
      "field_name" : "rgb",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-68"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-51",
-   "self_type" : "type-51",
+   "referenced_type" : "type-53",
+   "self_type" : "type-53",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_E"
@@ -27890,29 +27962,29 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "z",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "w",
      "field_offset" : 192,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
-   "referenced_type" : "type-52",
-   "self_type" : "type-52",
+   "referenced_type" : "type-54",
+   "self_type" : "type-54",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_Ut_E"
@@ -27923,29 +27995,29 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "t",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "p",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "q",
      "field_offset" : 192,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
-   "referenced_type" : "type-53",
-   "self_type" : "type-53",
+   "referenced_type" : "type-55",
+   "self_type" : "type-55",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_Ut0_E"
@@ -27956,29 +28028,29 @@
    [
     {
      "field_name" : "r",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "g",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "b",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "a",
      "field_offset" : 192,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
-   "referenced_type" : "type-54",
-   "self_type" : "type-54",
+   "referenced_type" : "type-56",
+   "self_type" : "type-56",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_Ut1_E"
@@ -27988,35 +28060,35 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-205"
+     "referenced_type" : "type-197"
     },
     {
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-198"
     },
     {
-     "referenced_type" : "type-207"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-200"
     },
     {
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-201"
     },
     {
-     "referenced_type" : "type-210"
+     "referenced_type" : "type-202"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-193"
     }
    ],
    "linker_set_key" : "android::details::TVec4<float>",
    "name" : "android::details::TVec4<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-200",
-   "self_type" : "type-200",
+   "referenced_type" : "type-192",
+   "self_type" : "type-192",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "template_args" : [ "type-10" ],
@@ -28027,45 +28099,45 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-202"
+     "referenced_type" : "type-194"
     },
     {
-     "referenced_type" : "type-203"
+     "referenced_type" : "type-195"
     },
     {
-     "referenced_type" : "type-204"
+     "referenced_type" : "type-196"
     },
     {
      "field_name" : "xy",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "st",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "rg",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "xyz",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-18"
     },
     {
      "field_name" : "stp",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-18"
     },
     {
      "field_name" : "rgb",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-18"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-201",
-   "self_type" : "type-201",
+   "referenced_type" : "type-193",
+   "self_type" : "type-193",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_E"
@@ -28097,8 +28169,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
-   "referenced_type" : "type-202",
-   "self_type" : "type-202",
+   "referenced_type" : "type-194",
+   "self_type" : "type-194",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_Ut_E"
@@ -28130,8 +28202,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
-   "referenced_type" : "type-203",
-   "self_type" : "type-203",
+   "referenced_type" : "type-195",
+   "self_type" : "type-195",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_Ut0_E"
@@ -28163,8 +28235,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
-   "referenced_type" : "type-204",
-   "self_type" : "type-204",
+   "referenced_type" : "type-196",
+   "self_type" : "type-196",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_Ut1_E"
@@ -28186,8 +28258,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TMat44, float>",
    "name" : "android::details::TVecAddOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2252",
-   "self_type" : "type-2252",
+   "referenced_type" : "type-2255",
+   "self_type" : "type-2255",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28198,11 +28270,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TVecAddOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-334",
-   "self_type" : "type-334",
+   "referenced_type" : "type-331",
+   "self_type" : "type-331",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -28210,8 +28282,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TQuaternion, float>",
    "name" : "android::details::TVecAddOperators<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-413",
-   "self_type" : "type-413",
+   "referenced_type" : "type-410",
+   "self_type" : "type-410",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28222,8 +28294,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecAddOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-427",
-   "self_type" : "type-427",
+   "referenced_type" : "type-424",
+   "self_type" : "type-424",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -28234,11 +28306,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecAddOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-61",
-   "self_type" : "type-61",
+   "referenced_type" : "type-63",
+   "self_type" : "type-63",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -28246,8 +28318,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec2, float>",
    "name" : "android::details::TVecAddOperators<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-28",
-   "self_type" : "type-28",
+   "referenced_type" : "type-29",
+   "self_type" : "type-29",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28258,11 +28330,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecAddOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-72",
-   "self_type" : "type-72",
+   "referenced_type" : "type-74",
+   "self_type" : "type-74",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -28270,8 +28342,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec3, float>",
    "name" : "android::details::TVecAddOperators<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-34",
-   "self_type" : "type-34",
+   "referenced_type" : "type-35",
+   "self_type" : "type-35",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28282,11 +28354,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecAddOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-78",
-   "self_type" : "type-78",
+   "referenced_type" : "type-80",
+   "self_type" : "type-80",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -28294,8 +28366,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecAddOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-206",
-   "self_type" : "type-206",
+   "referenced_type" : "type-198",
+   "self_type" : "type-198",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28318,8 +28390,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TMat44, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2255",
-   "self_type" : "type-2255",
+   "referenced_type" : "type-2258",
+   "self_type" : "type-2258",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28330,11 +28402,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-336",
-   "self_type" : "type-336",
+   "referenced_type" : "type-333",
+   "self_type" : "type-333",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -28342,8 +28414,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TQuaternion, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-415",
-   "self_type" : "type-415",
+   "referenced_type" : "type-412",
+   "self_type" : "type-412",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28354,8 +28426,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-510",
-   "self_type" : "type-510",
+   "referenced_type" : "type-507",
+   "self_type" : "type-507",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -28366,11 +28438,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-63",
-   "self_type" : "type-63",
+   "referenced_type" : "type-65",
+   "self_type" : "type-65",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -28378,8 +28450,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec2, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-30",
-   "self_type" : "type-30",
+   "referenced_type" : "type-31",
+   "self_type" : "type-31",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28390,11 +28462,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-74",
-   "self_type" : "type-74",
+   "referenced_type" : "type-76",
+   "self_type" : "type-76",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -28402,8 +28474,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec3, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-11",
-   "self_type" : "type-11",
+   "referenced_type" : "type-13",
+   "self_type" : "type-13",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28414,11 +28486,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-80",
-   "self_type" : "type-80",
+   "referenced_type" : "type-82",
+   "self_type" : "type-82",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -28426,8 +28498,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-208",
-   "self_type" : "type-208",
+   "referenced_type" : "type-200",
+   "self_type" : "type-200",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28450,11 +28522,11 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec2, double>",
    "name" : "android::details::TVecDebug<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-65",
-   "self_type" : "type-65",
+   "referenced_type" : "type-67",
+   "self_type" : "type-67",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details9TVecDebugINS0_5TVec2EdEE"
   },
   {
@@ -28462,8 +28534,8 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec2, float>",
    "name" : "android::details::TVecDebug<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-32",
-   "self_type" : "type-32",
+   "referenced_type" : "type-33",
+   "self_type" : "type-33",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28474,11 +28546,11 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec3, double>",
    "name" : "android::details::TVecDebug<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-76",
-   "self_type" : "type-76",
+   "referenced_type" : "type-78",
+   "self_type" : "type-78",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details9TVecDebugINS0_5TVec3EdEE"
   },
   {
@@ -28486,8 +28558,8 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec3, float>",
    "name" : "android::details::TVecDebug<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-35",
-   "self_type" : "type-35",
+   "referenced_type" : "type-36",
+   "self_type" : "type-36",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28498,11 +28570,11 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec4, double>",
    "name" : "android::details::TVecDebug<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-82",
-   "self_type" : "type-82",
+   "referenced_type" : "type-84",
+   "self_type" : "type-84",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details9TVecDebugINS0_5TVec4EdEE"
   },
   {
@@ -28510,8 +28582,8 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec4, float>",
    "name" : "android::details::TVecDebug<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-210",
-   "self_type" : "type-210",
+   "referenced_type" : "type-202",
+   "self_type" : "type-202",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28534,11 +28606,11 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec2, double>",
    "name" : "android::details::TVecFunctions<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-64",
-   "self_type" : "type-64",
+   "referenced_type" : "type-66",
+   "self_type" : "type-66",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details13TVecFunctionsINS0_5TVec2EdEE"
   },
   {
@@ -28546,8 +28618,8 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec2, float>",
    "name" : "android::details::TVecFunctions<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-31",
-   "self_type" : "type-31",
+   "referenced_type" : "type-32",
+   "self_type" : "type-32",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28558,11 +28630,11 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec3, double>",
    "name" : "android::details::TVecFunctions<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-75",
-   "self_type" : "type-75",
+   "referenced_type" : "type-77",
+   "self_type" : "type-77",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details13TVecFunctionsINS0_5TVec3EdEE"
   },
   {
@@ -28570,8 +28642,8 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec3, float>",
    "name" : "android::details::TVecFunctions<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-12",
-   "self_type" : "type-12",
+   "referenced_type" : "type-14",
+   "self_type" : "type-14",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28582,11 +28654,11 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec4, double>",
    "name" : "android::details::TVecFunctions<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-81",
-   "self_type" : "type-81",
+   "referenced_type" : "type-83",
+   "self_type" : "type-83",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details13TVecFunctionsINS0_5TVec4EdEE"
   },
   {
@@ -28594,8 +28666,8 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec4, float>",
    "name" : "android::details::TVecFunctions<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-209",
-   "self_type" : "type-209",
+   "referenced_type" : "type-201",
+   "self_type" : "type-201",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28606,8 +28678,8 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecProductOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-396",
-   "self_type" : "type-396",
+   "referenced_type" : "type-390",
+   "self_type" : "type-390",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -28618,11 +28690,11 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecProductOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-60",
-   "self_type" : "type-60",
+   "referenced_type" : "type-62",
+   "self_type" : "type-62",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details20TVecProductOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -28630,8 +28702,8 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec2, float>",
    "name" : "android::details::TVecProductOperators<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-27",
-   "self_type" : "type-27",
+   "referenced_type" : "type-28",
+   "self_type" : "type-28",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28642,11 +28714,11 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecProductOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-71",
-   "self_type" : "type-71",
+   "referenced_type" : "type-73",
+   "self_type" : "type-73",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details20TVecProductOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -28654,8 +28726,8 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec3, float>",
    "name" : "android::details::TVecProductOperators<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-33",
-   "self_type" : "type-33",
+   "referenced_type" : "type-34",
+   "self_type" : "type-34",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28666,11 +28738,11 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecProductOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-77",
-   "self_type" : "type-77",
+   "referenced_type" : "type-79",
+   "self_type" : "type-79",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details20TVecProductOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -28678,8 +28750,8 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecProductOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-205",
-   "self_type" : "type-205",
+   "referenced_type" : "type-197",
+   "self_type" : "type-197",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28702,8 +28774,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TMat44, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2254",
-   "self_type" : "type-2254",
+   "referenced_type" : "type-2257",
+   "self_type" : "type-2257",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28714,11 +28786,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-335",
-   "self_type" : "type-335",
+   "referenced_type" : "type-332",
+   "self_type" : "type-332",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -28726,8 +28798,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TQuaternion, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-414",
-   "self_type" : "type-414",
+   "referenced_type" : "type-411",
+   "self_type" : "type-411",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28738,8 +28810,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-462",
-   "self_type" : "type-462",
+   "referenced_type" : "type-455",
+   "self_type" : "type-455",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -28750,11 +28822,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-62",
-   "self_type" : "type-62",
+   "referenced_type" : "type-64",
+   "self_type" : "type-64",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -28762,8 +28834,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec2, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-29",
-   "self_type" : "type-29",
+   "referenced_type" : "type-30",
+   "self_type" : "type-30",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28774,11 +28846,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-73",
-   "self_type" : "type-73",
+   "referenced_type" : "type-75",
+   "self_type" : "type-75",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -28798,11 +28870,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-79",
-   "self_type" : "type-79",
+   "referenced_type" : "type-81",
+   "self_type" : "type-81",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -28810,8 +28882,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-207",
-   "self_type" : "type-207",
+   "referenced_type" : "type-199",
+   "self_type" : "type-199",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28877,7 +28949,7 @@
    [
     {
      "field_name" : "bits",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "fp",
@@ -28899,7 +28971,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-196"
+     "referenced_type" : "type-209"
     }
    ],
    "fields" :
@@ -28908,32 +28980,32 @@
      "access" : "protected",
      "field_name" : "mSchedPolicy",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "protected",
      "field_name" : "mSchedPriority",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mExtras",
      "field_offset" : 96,
-     "referenced_type" : "type-243"
+     "referenced_type" : "type-245"
     },
     {
      "access" : "private",
      "field_name" : "mReserved0",
      "field_offset" : 128,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
    "linker_set_key" : "android::hardware::BHwBinder",
    "name" : "android::hardware::BHwBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-242",
-   "self_type" : "type-242",
+   "referenced_type" : "type-244",
+   "self_type" : "type-244",
    "size" : 28,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware9BHwBinderE",
@@ -29040,7 +29112,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "fields" :
@@ -29049,26 +29121,26 @@
      "access" : "private",
      "field_name" : "mRemote",
      "field_offset" : 32,
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-207"
     },
     {
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 64,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-210"
     },
     {
      "access" : "private",
      "field_name" : "mState",
      "field_offset" : 96,
-     "referenced_type" : "type-199"
+     "referenced_type" : "type-212"
     }
    ],
    "linker_set_key" : "android::hardware::BpHwRefBase",
    "name" : "android::hardware::BpHwRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-193",
-   "self_type" : "type-193",
+   "referenced_type" : "type-206",
+   "self_type" : "type-206",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE",
@@ -29157,22 +29229,22 @@
    [
     {
      "field_name" : "flags",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "fdIndex",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "offset",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "extent",
      "field_offset" : 128,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "android::hardware::GrantorDescriptor",
@@ -29193,7 +29265,7 @@
     },
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::HidlMemory",
@@ -29281,14 +29353,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::IBinder",
    "name" : "android::hardware::IBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-196",
-   "self_type" : "type-196",
+   "referenced_type" : "type-209",
+   "self_type" : "type-209",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinderE",
@@ -29398,14 +29470,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient",
    "name" : "android::hardware::IBinder::DeathRecipient",
    "record_kind" : "class",
-   "referenced_type" : "type-192",
-   "self_type" : "type-192",
+   "referenced_type" : "type-205",
+   "self_type" : "type-205",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinder14DeathRecipientE",
@@ -29486,14 +29558,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::IInterface",
    "name" : "android::hardware::IInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-213",
-   "self_type" : "type-213",
+   "referenced_type" : "type-215",
+   "self_type" : "type-215",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
    "unique_id" : "_ZTSN7android8hardware10IInterfaceE",
@@ -29575,85 +29647,85 @@
     {
      "access" : "private",
      "field_name" : "mProcess",
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-274"
     },
     {
      "access" : "private",
      "field_name" : "mPendingStrongDerefs",
      "field_offset" : 32,
-     "referenced_type" : "type-240"
+     "referenced_type" : "type-242"
     },
     {
      "access" : "private",
      "field_name" : "mPendingWeakDerefs",
      "field_offset" : 192,
-     "referenced_type" : "type-244"
+     "referenced_type" : "type-246"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteStrongDerefs",
      "field_offset" : 352,
-     "referenced_type" : "type-245"
+     "referenced_type" : "type-247"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteWeakDerefs",
      "field_offset" : 512,
-     "referenced_type" : "type-244"
+     "referenced_type" : "type-246"
     },
     {
      "access" : "private",
      "field_name" : "mIn",
      "field_offset" : 672,
-     "referenced_type" : "type-215"
+     "referenced_type" : "type-217"
     },
     {
      "access" : "private",
      "field_name" : "mOut",
      "field_offset" : 1216,
-     "referenced_type" : "type-215"
+     "referenced_type" : "type-217"
     },
     {
      "access" : "private",
      "field_name" : "mLastError",
      "field_offset" : 1760,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mCallingPid",
      "field_offset" : 1792,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mCallingSid",
      "field_offset" : 1824,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "access" : "private",
      "field_name" : "mCallingUid",
      "field_offset" : 1856,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mStrictModePolicy",
      "field_offset" : 1888,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mLastTransactionBinderFlags",
      "field_offset" : 1920,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mContextObject",
      "field_offset" : 1952,
-     "referenced_type" : "type-289"
+     "referenced_type" : "type-286"
     },
     {
      "access" : "private",
@@ -29671,26 +29743,26 @@
      "access" : "private",
      "field_name" : "mPostCommandTasks",
      "field_offset" : 2016,
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-287"
     },
     {
      "access" : "private",
      "field_name" : "mIPCThreadStateBase",
      "field_offset" : 2112,
-     "referenced_type" : "type-291"
+     "referenced_type" : "type-288"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 2144,
-     "referenced_type" : "type-276"
+     "referenced_type" : "type-272"
     }
    ],
    "linker_set_key" : "android::hardware::IPCThreadState",
    "name" : "android::hardware::IPCThreadState",
    "record_kind" : "class",
-   "referenced_type" : "type-277",
-   "self_type" : "type-277",
+   "referenced_type" : "type-273",
+   "self_type" : "type-273",
    "size" : 272,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h",
    "unique_id" : "_ZTSN7android8hardware14IPCThreadStateE"
@@ -29702,73 +29774,73 @@
     {
      "access" : "private",
      "field_name" : "mBufCachePos",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mBufCache",
      "field_offset" : 32,
-     "referenced_type" : "type-216"
+     "referenced_type" : "type-218"
     },
     {
      "access" : "private",
      "field_name" : "mError",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mData",
      "field_offset" : 160,
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-219"
     },
     {
      "access" : "private",
      "field_name" : "mDataSize",
      "field_offset" : 192,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mDataCapacity",
      "field_offset" : 224,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mDataPos",
      "field_offset" : 256,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mObjects",
      "field_offset" : 288,
-     "referenced_type" : "type-219"
+     "referenced_type" : "type-221"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsSize",
      "field_offset" : 320,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsCapacity",
      "field_offset" : 352,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mNextObjectHint",
      "field_offset" : 384,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mNumRef",
      "field_offset" : 416,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -29792,20 +29864,20 @@
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 480,
-     "referenced_type" : "type-220"
+     "referenced_type" : "type-222"
     },
     {
      "access" : "private",
      "field_name" : "mOwnerCookie",
      "field_offset" : 512,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
    "linker_set_key" : "android::hardware::Parcel",
    "name" : "android::hardware::Parcel",
    "record_kind" : "class",
-   "referenced_type" : "type-215",
-   "self_type" : "type-215",
+   "referenced_type" : "type-217",
+   "self_type" : "type-217",
    "size" : 68,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6ParcelE"
@@ -29817,23 +29889,23 @@
    [
     {
      "field_name" : "index",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "buffer",
      "field_offset" : 64,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "bufend",
      "field_offset" : 128,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "android::hardware::Parcel::BufferInfo",
    "name" : "android::hardware::Parcel::BufferInfo",
-   "referenced_type" : "type-228",
-   "self_type" : "type-228",
+   "referenced_type" : "type-230",
+   "self_type" : "type-230",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE"
@@ -29844,7 +29916,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "fields" :
@@ -29853,55 +29925,55 @@
      "access" : "private",
      "field_name" : "mDriverFD",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mVMStart",
      "field_offset" : 64,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountLock",
      "field_offset" : 96,
-     "referenced_type" : "type-282"
+     "referenced_type" : "type-278"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountDecrement",
      "field_offset" : 128,
-     "referenced_type" : "type-283"
+     "referenced_type" : "type-279"
     },
     {
      "access" : "private",
      "field_name" : "mExecutingThreadsCount",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mMaxThreads",
      "field_offset" : 192,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mStarvationStartTimeMs",
      "field_offset" : 256,
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 320,
-     "referenced_type" : "type-252"
+     "referenced_type" : "type-280"
     },
     {
      "access" : "private",
      "field_name" : "mHandleToObject",
      "field_offset" : 352,
-     "referenced_type" : "type-238"
+     "referenced_type" : "type-240"
     },
     {
      "access" : "private",
@@ -29913,25 +29985,25 @@
      "access" : "private",
      "field_name" : "mBinderContextCheckFunc",
      "field_offset" : 544,
-     "referenced_type" : "type-274"
+     "referenced_type" : "type-270"
     },
     {
      "access" : "private",
      "field_name" : "mBinderContextUserData",
      "field_offset" : 576,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "access" : "private",
      "field_name" : "mContexts",
      "field_offset" : 608,
-     "referenced_type" : "type-247"
+     "referenced_type" : "type-249"
     },
     {
      "access" : "private",
      "field_name" : "mRootDir",
      "field_offset" : 768,
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-282"
     },
     {
      "access" : "private",
@@ -29949,26 +30021,26 @@
      "access" : "private",
      "field_name" : "mThreadPoolSeq",
      "field_offset" : 832,
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-271"
     },
     {
      "access" : "private",
      "field_name" : "mMmapSize",
      "field_offset" : 864,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 896,
-     "referenced_type" : "type-276"
+     "referenced_type" : "type-272"
     }
    ],
    "linker_set_key" : "android::hardware::ProcessState",
    "name" : "android::hardware::ProcessState",
    "record_kind" : "class",
-   "referenced_type" : "type-281",
-   "self_type" : "type-281",
+   "referenced_type" : "type-277",
+   "self_type" : "type-277",
    "size" : 128,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessStateE",
@@ -30046,18 +30118,18 @@
    [
     {
      "field_name" : "binder",
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-208"
     },
     {
      "field_name" : "refs",
      "field_offset" : 32,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-210"
     }
    ],
    "linker_set_key" : "android::hardware::ProcessState::handle_entry",
    "name" : "android::hardware::ProcessState::handle_entry",
-   "referenced_type" : "type-239",
-   "self_type" : "type-239",
+   "referenced_type" : "type-241",
+   "self_type" : "type-241",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE"
@@ -30067,7 +30139,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "fields" :
@@ -30076,17 +30148,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-102"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
    "record_kind" : "class",
-   "referenced_type" : "type-99",
-   "self_type" : "type-99",
+   "referenced_type" : "type-101",
+   "self_type" : "type-101",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-105" ],
+   "template_args" : [ "type-107" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS0_8graphics6mapper4V2_05ErrorEEE"
   },
   {
@@ -30094,7 +30166,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "fields" :
@@ -30103,17 +30175,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-393"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
    "record_kind" : "class",
-   "referenced_type" : "type-393",
-   "self_type" : "type-393",
+   "referenced_type" : "type-392",
+   "self_type" : "type-392",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-395" ],
+   "template_args" : [ "type-394" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS0_8graphics6mapper4V3_05ErrorEEE"
   },
   {
@@ -30121,7 +30193,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "fields" :
@@ -30130,17 +30202,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-88"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
    "record_kind" : "class",
-   "referenced_type" : "type-111",
-   "self_type" : "type-111",
+   "referenced_type" : "type-113",
+   "self_type" : "type-113",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-88" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics6mapper4V2_17IMapperEEEEE"
   },
   {
@@ -30148,7 +30220,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "linker_set_key" : "android::hardware::Return<void>",
@@ -30158,7 +30230,7 @@
    "self_type" : "type-1322",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIvEE"
   },
   {
@@ -30168,26 +30240,26 @@
     {
      "access" : "private",
      "field_name" : "mException",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mErrorCode",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-106"
     }
    ],
    "linker_set_key" : "android::hardware::Status",
    "name" : "android::hardware::Status",
    "record_kind" : "class",
-   "referenced_type" : "type-102",
-   "self_type" : "type-102",
+   "referenced_type" : "type-104",
+   "self_type" : "type-104",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware6StatusE"
@@ -30293,7 +30365,7 @@
    "self_type" : "type-1103",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware7details14const_accessorIjLj10EJEEE"
   },
   {
@@ -30307,12 +30379,12 @@
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-1099",
    "self_type" : "type-1099",
@@ -30344,16 +30416,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-137"
+     "referenced_type" : "type-140"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
-   "referenced_type" : "type-136",
-   "self_type" : "type-136",
+   "referenced_type" : "type-139",
+   "self_type" : "type-139",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-139" ],
+   "template_args" : [ "type-142" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_handleEEE"
   },
   {
@@ -30371,7 +30443,7 @@
    "self_type" : "type-1071",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-287" ],
+   "template_args" : [ "type-284" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEE"
   },
   {
@@ -30381,16 +30453,16 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-1072",
    "self_type" : "type-1072",
@@ -30404,16 +30476,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-144"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>",
-   "referenced_type" : "type-140",
-   "self_type" : "type-140",
+   "referenced_type" : "type-143",
+   "self_type" : "type-143",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-143" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEE"
   },
   {
@@ -30423,19 +30495,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-141",
-   "self_type" : "type-141",
+   "referenced_type" : "type-144",
+   "self_type" : "type-144",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEUt_E"
@@ -30447,19 +30519,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-141"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<hidl_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<hidl_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-137",
-   "self_type" : "type-137",
+   "referenced_type" : "type-140",
+   "self_type" : "type-140",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_handleEEUt_E"
@@ -30479,7 +30551,7 @@
    "self_type" : "type-1150",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-144" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEE"
   },
   {
@@ -30493,12 +30565,12 @@
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-1151",
    "self_type" : "type-1151",
@@ -30512,16 +30584,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-121"
+     "referenced_type" : "type-123"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int>",
    "name" : "android::hardware::details::hidl_pointer<unsigned int>",
-   "referenced_type" : "type-120",
-   "self_type" : "type-120",
+   "referenced_type" : "type-122",
+   "self_type" : "type-122",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIjEE"
   },
   {
@@ -30531,19 +30603,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<unsigned int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<unsigned int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-121",
-   "self_type" : "type-121",
+   "referenced_type" : "type-123",
+   "self_type" : "type-123",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIjEUt_E"
@@ -30565,7 +30637,7 @@
     {
      "access" : "private",
      "field_name" : "mStatus",
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-104"
     },
     {
      "access" : "private",
@@ -30577,8 +30649,8 @@
    "linker_set_key" : "android::hardware::details::return_status",
    "name" : "android::hardware::details::return_status",
    "record_kind" : "class",
-   "referenced_type" : "type-101",
-   "self_type" : "type-101",
+   "referenced_type" : "type-103",
+   "self_type" : "type-103",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware7details13return_statusE"
@@ -30591,7 +30663,7 @@
    "self_type" : "type-1102",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware7details9std_arrayIjLj10EJEEE"
   },
   {
@@ -30605,7 +30677,7 @@
     {
      "field_name" : "nativeHandle",
      "field_offset" : 320,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-142"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::HardwareBuffer",
@@ -30632,7 +30704,7 @@
    "self_type" : "type-1108",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware10hidl_arrayIjLj10EJEEE"
   },
   {
@@ -30641,7 +30713,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_death_recipient",
@@ -30726,33 +30798,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
    "name" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
-   "referenced_type" : "type-149",
-   "self_type" : "type-149",
+   "referenced_type" : "type-152",
+   "self_type" : "type-152",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-150", "type-151" ],
+   "template_args" : [ "type-153", "type-154" ],
    "unique_id" : "_ZTSN7android8hardware15hidl_enum_rangeINS0_8graphics6common4V1_011BufferUsageEvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
    "name" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
-   "referenced_type" : "type-157",
-   "self_type" : "type-157",
+   "referenced_type" : "type-159",
+   "self_type" : "type-159",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-158", "type-151" ],
+   "template_args" : [ "type-160", "type-154" ],
    "unique_id" : "_ZTSN7android8hardware15hidl_enum_rangeINS0_8graphics6common4V1_111BufferUsageEvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
    "name" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
-   "referenced_type" : "type-419",
-   "self_type" : "type-419",
+   "referenced_type" : "type-416",
+   "self_type" : "type-416",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-420", "type-151" ],
+   "template_args" : [ "type-417", "type-154" ],
    "unique_id" : "_ZTSN7android8hardware15hidl_enum_rangeINS0_8graphics6common4V1_211BufferUsageEvEE"
   },
   {
@@ -30762,7 +30834,7 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-140"
+     "referenced_type" : "type-143"
     },
     {
      "access" : "private",
@@ -30773,8 +30845,8 @@
    ],
    "linker_set_key" : "android::hardware::hidl_handle",
    "name" : "android::hardware::hidl_handle",
-   "referenced_type" : "type-139",
-   "self_type" : "type-139",
+   "referenced_type" : "type-142",
+   "self_type" : "type-142",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_handleE"
@@ -30786,13 +30858,13 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-142"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 128,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
@@ -30822,7 +30894,7 @@
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -30852,7 +30924,7 @@
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -30877,13 +30949,13 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-136"
+     "referenced_type" : "type-139"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -30894,11 +30966,11 @@
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_handle>",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_handle>",
-   "referenced_type" : "type-135",
-   "self_type" : "type-135",
+   "referenced_type" : "type-138",
+   "self_type" : "type-138",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-139" ],
+   "template_args" : [ "type-142" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_11hidl_handleEEE"
   },
   {
@@ -30908,13 +30980,13 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-120"
+     "referenced_type" : "type-122"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -30925,11 +30997,11 @@
    ],
    "linker_set_key" : "android::hardware::hidl_vec<unsigned int>",
    "name" : "android::hardware::hidl_vec<unsigned int>",
-   "referenced_type" : "type-128",
-   "self_type" : "type-128",
+   "referenced_type" : "type-131",
+   "self_type" : "type-131",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecIjEE"
   },
   {
@@ -30962,23 +31034,23 @@
    [
     {
      "field_name" : "pid",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "ptr",
      "field_offset" : 64,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "arch",
      "field_offset" : 128,
-     "referenced_type" : "type-164"
+     "referenced_type" : "type-167"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo",
    "name" : "android::hidl::base::V1_0::DebugInfo",
-   "referenced_type" : "type-163",
-   "self_type" : "type-163",
+   "referenced_type" : "type-166",
+   "self_type" : "type-166",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfoE"
@@ -30989,13 +31061,13 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::IBase",
    "name" : "android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-171",
-   "self_type" : "type-171",
+   "referenced_type" : "type-174",
+   "self_type" : "type-174",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_05IBaseE",
@@ -31104,13 +31176,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-174"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification",
    "name" : "android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-295",
-   "self_type" : "type-295",
+   "referenced_type" : "type-292",
+   "self_type" : "type-292",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_020IServiceNotificationE",
@@ -31224,12 +31296,12 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
      "field_name" : "value",
      "field_offset" : 64,
-     "referenced_type" : "type-676"
+     "referenced_type" : "type-680"
     }
    ],
    "linker_set_key" : "android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
@@ -31238,7 +31310,7 @@
    "self_type" : "type-694",
    "size" : 56,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142", "type-676" ],
+   "template_args" : [ "type-145", "type-680" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -31268,17 +31340,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
    "linker_set_key" : "android::sp<android::GraphicBuffer>",
    "name" : "android::sp<android::GraphicBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-679",
-   "self_type" : "type-679",
+   "referenced_type" : "type-678",
+   "self_type" : "type-678",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-525" ],
+   "template_args" : [ "type-523" ],
    "unique_id" : "_ZTSN7android2spINS_13GraphicBufferEEE"
   },
   {
@@ -31288,17 +31360,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-365"
     }
    ],
    "linker_set_key" : "android::sp<android::Thread>",
    "name" : "android::sp<android::Thread>",
    "record_kind" : "class",
-   "referenced_type" : "type-367",
-   "self_type" : "type-367",
+   "referenced_type" : "type-364",
+   "self_type" : "type-364",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-369" ],
+   "template_args" : [ "type-366" ],
    "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
   },
   {
@@ -31308,17 +31380,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-241"
+     "referenced_type" : "type-243"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::BHwBinder>",
    "name" : "android::sp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-289",
-   "self_type" : "type-289",
+   "referenced_type" : "type-286",
+   "self_type" : "type-286",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-242" ],
+   "template_args" : [ "type-244" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
   },
   {
@@ -31328,17 +31400,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-208"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IBinder>",
    "name" : "android::sp<android::hardware::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-248",
-   "self_type" : "type-248",
+   "referenced_type" : "type-250",
+   "self_type" : "type-250",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-196" ],
+   "template_args" : [ "type-209" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
   },
   {
@@ -31348,17 +31420,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-280"
+     "referenced_type" : "type-276"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::ProcessState>",
    "name" : "android::sp<android::hardware::ProcessState>",
    "record_kind" : "class",
-   "referenced_type" : "type-279",
-   "self_type" : "type-279",
+   "referenced_type" : "type-275",
+   "self_type" : "type-275",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-281" ],
+   "template_args" : [ "type-277" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
   },
   {
@@ -31368,17 +31440,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-356"
+     "referenced_type" : "type-353"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
    "record_kind" : "class",
-   "referenced_type" : "type-355",
-   "self_type" : "type-355",
+   "referenced_type" : "type-352",
+   "self_type" : "type-352",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-358" ],
+   "template_args" : [ "type-355" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics9allocator4V2_010IAllocatorEEE"
   },
   {
@@ -31388,17 +31460,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-485"
+     "referenced_type" : "type-482"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
    "record_kind" : "class",
-   "referenced_type" : "type-484",
-   "self_type" : "type-484",
+   "referenced_type" : "type-481",
+   "self_type" : "type-481",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-487" ],
+   "template_args" : [ "type-484" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics9allocator4V3_010IAllocatorEEE"
   },
   {
@@ -31408,17 +31480,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-339"
+     "referenced_type" : "type-336"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-338",
-   "self_type" : "type-338",
+   "referenced_type" : "type-335",
+   "self_type" : "type-335",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-341" ],
+   "template_args" : [ "type-338" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics6mapper4V2_07IMapperEEE"
   },
   {
@@ -31428,17 +31500,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-87"
+     "referenced_type" : "type-89"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-86",
-   "self_type" : "type-86",
+   "referenced_type" : "type-88",
+   "self_type" : "type-88",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-89" ],
+   "template_args" : [ "type-91" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics6mapper4V2_17IMapperEEE"
   },
   {
@@ -31448,17 +31520,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-498"
+     "referenced_type" : "type-495"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-497",
-   "self_type" : "type-497",
+   "referenced_type" : "type-494",
+   "self_type" : "type-494",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-500" ],
+   "template_args" : [ "type-497" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics6mapper4V3_07IMapperEEE"
   },
   {
@@ -31488,17 +31560,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-364"
+     "referenced_type" : "type-361"
     }
    ],
    "linker_set_key" : "android::sp<android::hidl::base::V1_0::IBase>",
    "name" : "android::sp<android::hidl::base::V1_0::IBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-363",
-   "self_type" : "type-363",
+   "referenced_type" : "type-360",
+   "self_type" : "type-360",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-171" ],
+   "template_args" : [ "type-174" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl4base4V1_05IBaseEEE"
   },
   {
@@ -31508,36 +31580,36 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-369"
     }
    ],
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceNotification>",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification>",
    "record_kind" : "class",
-   "referenced_type" : "type-371",
-   "self_type" : "type-371",
+   "referenced_type" : "type-368",
+   "self_type" : "type-368",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-295" ],
+   "template_args" : [ "type-292" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::trait_pointer<android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-819",
-   "self_type" : "type-819",
+   "referenced_type" : "type-820",
+   "self_type" : "type-820",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::Rect>",
    "name" : "android::trait_pointer<android::Rect>",
-   "referenced_type" : "type-2234",
-   "self_type" : "type-2234",
+   "referenced_type" : "type-2237",
+   "self_type" : "type-2237",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -31547,8 +31619,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::trait_pointer<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-817",
-   "self_type" : "type-817",
+   "referenced_type" : "type-818",
+   "self_type" : "type-818",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -31558,33 +31630,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<const native_handle *>",
    "name" : "android::trait_pointer<const native_handle *>",
-   "referenced_type" : "type-818",
-   "self_type" : "type-818",
+   "referenced_type" : "type-819",
+   "self_type" : "type-819",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android13trait_pointerIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<long long>",
    "name" : "android::trait_pointer<long long>",
-   "referenced_type" : "type-1430",
-   "self_type" : "type-1430",
+   "referenced_type" : "type-1434",
+   "self_type" : "type-1434",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android13trait_pointerIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::trait_trivial_copy<android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-812",
-   "self_type" : "type-812",
+   "referenced_type" : "type-813",
+   "self_type" : "type-813",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -31613,8 +31685,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-813",
-   "self_type" : "type-813",
+   "referenced_type" : "type-814",
+   "self_type" : "type-814",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -31624,8 +31696,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-483",
-   "self_type" : "type-483",
+   "referenced_type" : "type-480",
+   "self_type" : "type-480",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -31635,11 +31707,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-512",
-   "self_type" : "type-512",
+   "referenced_type" : "type-509",
+   "self_type" : "type-509",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-288" ],
+   "template_args" : [ "type-285" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
   },
   {
@@ -31650,26 +31722,26 @@
    "self_type" : "type-811",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<double>",
    "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-795",
-   "self_type" : "type-795",
+   "referenced_type" : "type-787",
+   "self_type" : "type-787",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<float>",
    "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-757",
-   "self_type" : "type-757",
+   "referenced_type" : "type-755",
+   "self_type" : "type-755",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-10" ],
@@ -31679,11 +31751,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-647",
-   "self_type" : "type-647",
+   "referenced_type" : "type-645",
+   "self_type" : "type-645",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIiEE"
   },
   {
@@ -31694,26 +31766,26 @@
    "self_type" : "type-741",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long>",
    "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-704",
-   "self_type" : "type-704",
+   "referenced_type" : "type-697",
+   "self_type" : "type-697",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-687" ],
+   "template_args" : [ "type-684" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<short>",
    "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-617",
-   "self_type" : "type-617",
+   "referenced_type" : "type-614",
+   "self_type" : "type-614",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-599" ],
@@ -31723,22 +31795,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned char>",
    "name" : "android::trait_trivial_copy<unsigned char>",
-   "referenced_type" : "type-540",
-   "self_type" : "type-540",
+   "referenced_type" : "type-536",
+   "self_type" : "type-536",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-218" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned int>",
    "name" : "android::trait_trivial_copy<unsigned int>",
-   "referenced_type" : "type-675",
-   "self_type" : "type-675",
+   "referenced_type" : "type-671",
+   "self_type" : "type-671",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIjEE"
   },
   {
@@ -31749,15 +31821,15 @@
    "self_type" : "type-751",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long>",
    "name" : "android::trait_trivial_copy<unsigned long>",
-   "referenced_type" : "type-722",
-   "self_type" : "type-722",
+   "referenced_type" : "type-720",
+   "self_type" : "type-720",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-710" ],
@@ -31767,8 +31839,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
    "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-631",
-   "self_type" : "type-631",
+   "referenced_type" : "type-629",
+   "self_type" : "type-629",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-3" ],
@@ -31778,11 +31850,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-476",
-   "self_type" : "type-476",
+   "referenced_type" : "type-473",
+   "self_type" : "type-473",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
   },
   {
@@ -31793,7 +31865,7 @@
    "self_type" : "type-807",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -31833,8 +31905,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-481",
-   "self_type" : "type-481",
+   "referenced_type" : "type-478",
+   "self_type" : "type-478",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -31844,11 +31916,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-501",
-   "self_type" : "type-501",
+   "referenced_type" : "type-498",
+   "self_type" : "type-498",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-288" ],
+   "template_args" : [ "type-285" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
   },
   {
@@ -31859,18 +31931,18 @@
    "self_type" : "type-806",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<double>",
    "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-781",
-   "self_type" : "type-781",
+   "referenced_type" : "type-775",
+   "self_type" : "type-775",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIdEE"
   },
   {
@@ -31888,11 +31960,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-638",
-   "self_type" : "type-638",
+   "referenced_type" : "type-637",
+   "self_type" : "type-637",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIiEE"
   },
   {
@@ -31903,18 +31975,18 @@
    "self_type" : "type-729",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long>",
    "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-686",
-   "self_type" : "type-686",
+   "referenced_type" : "type-683",
+   "self_type" : "type-683",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-687" ],
+   "template_args" : [ "type-684" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
   },
   {
@@ -31932,33 +32004,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned char>",
    "name" : "android::trait_trivial_ctor<unsigned char>",
-   "referenced_type" : "type-534",
-   "self_type" : "type-534",
+   "referenced_type" : "type-531",
+   "self_type" : "type-531",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-218" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
    "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-661",
-   "self_type" : "type-661",
+   "referenced_type" : "type-655",
+   "self_type" : "type-655",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
    "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-746",
-   "self_type" : "type-746",
+   "referenced_type" : "type-743",
+   "self_type" : "type-743",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIyEE"
   },
   {
@@ -31976,8 +32048,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned short>",
    "name" : "android::trait_trivial_ctor<unsigned short>",
-   "referenced_type" : "type-620",
-   "self_type" : "type-620",
+   "referenced_type" : "type-619",
+   "self_type" : "type-619",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-3" ],
@@ -31987,11 +32059,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-453",
-   "self_type" : "type-453",
+   "referenced_type" : "type-450",
+   "self_type" : "type-450",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
   },
   {
@@ -32002,7 +32074,7 @@
    "self_type" : "type-809",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -32042,8 +32114,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<bool>",
    "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-482",
-   "self_type" : "type-482",
+   "referenced_type" : "type-479",
+   "self_type" : "type-479",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -32053,11 +32125,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-511",
-   "self_type" : "type-511",
+   "referenced_type" : "type-508",
+   "self_type" : "type-508",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-288" ],
+   "template_args" : [ "type-285" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
   },
   {
@@ -32068,7 +32140,7 @@
    "self_type" : "type-808",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIPK13native_handleEE"
   },
   {
@@ -32079,7 +32151,7 @@
    "self_type" : "type-786",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIdEE"
   },
   {
@@ -32101,18 +32173,18 @@
    "self_type" : "type-644",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long long>",
    "name" : "android::trait_trivial_dtor<long long>",
-   "referenced_type" : "type-738",
-   "self_type" : "type-738",
+   "referenced_type" : "type-736",
+   "self_type" : "type-736",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
   },
   {
@@ -32123,7 +32195,7 @@
    "self_type" : "type-692",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-687" ],
+   "template_args" : [ "type-684" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
   },
   {
@@ -32141,41 +32213,41 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned char>",
    "name" : "android::trait_trivial_dtor<unsigned char>",
-   "referenced_type" : "type-538",
-   "self_type" : "type-538",
+   "referenced_type" : "type-535",
+   "self_type" : "type-535",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-218" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
    "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-668",
-   "self_type" : "type-668",
+   "referenced_type" : "type-664",
+   "self_type" : "type-664",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
    "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-749",
-   "self_type" : "type-749",
+   "referenced_type" : "type-747",
+   "self_type" : "type-747",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long>",
    "name" : "android::trait_trivial_dtor<unsigned long>",
-   "referenced_type" : "type-719",
-   "self_type" : "type-719",
+   "referenced_type" : "type-715",
+   "self_type" : "type-715",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-710" ],
@@ -32185,8 +32257,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned short>",
    "name" : "android::trait_trivial_dtor<unsigned short>",
-   "referenced_type" : "type-625",
-   "self_type" : "type-625",
+   "referenced_type" : "type-621",
+   "self_type" : "type-621",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-3" ],
@@ -32196,22 +32268,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-469",
-   "self_type" : "type-469",
+   "referenced_type" : "type-462",
+   "self_type" : "type-462",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::trait_trivial_move<android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-815",
-   "self_type" : "type-815",
+   "referenced_type" : "type-816",
+   "self_type" : "type-816",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -32240,11 +32312,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String16>",
    "name" : "android::trait_trivial_move<android::String16>",
-   "referenced_type" : "type-191",
-   "self_type" : "type-191",
+   "referenced_type" : "type-204",
+   "self_type" : "type-204",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-179" ],
+   "template_args" : [ "type-182" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8String16EEE"
   },
   {
@@ -32255,15 +32327,15 @@
    "self_type" : "type-902",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-285" ],
+   "template_args" : [ "type-282" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-816",
-   "self_type" : "type-816",
+   "referenced_type" : "type-817",
+   "self_type" : "type-817",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -32273,8 +32345,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<bool>",
    "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-490",
-   "self_type" : "type-490",
+   "referenced_type" : "type-485",
+   "self_type" : "type-485",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -32284,22 +32356,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-533",
-   "self_type" : "type-533",
+   "referenced_type" : "type-513",
+   "self_type" : "type-513",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-288" ],
+   "template_args" : [ "type-285" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<const native_handle *>",
    "name" : "android::trait_trivial_move<const native_handle *>",
-   "referenced_type" : "type-814",
-   "self_type" : "type-814",
+   "referenced_type" : "type-815",
+   "self_type" : "type-815",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIPK13native_handleEE"
   },
   {
@@ -32310,7 +32382,7 @@
    "self_type" : "type-798",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIdEE"
   },
   {
@@ -32328,11 +32400,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-650",
-   "self_type" : "type-650",
+   "referenced_type" : "type-648",
+   "self_type" : "type-648",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIiEE"
   },
   {
@@ -32343,18 +32415,18 @@
    "self_type" : "type-742",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long>",
    "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-708",
-   "self_type" : "type-708",
+   "referenced_type" : "type-707",
+   "self_type" : "type-707",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-687" ],
+   "template_args" : [ "type-684" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
   },
   {
@@ -32372,22 +32444,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned char>",
    "name" : "android::trait_trivial_move<unsigned char>",
-   "referenced_type" : "type-577",
-   "self_type" : "type-577",
+   "referenced_type" : "type-574",
+   "self_type" : "type-574",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-218" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned int>",
    "name" : "android::trait_trivial_move<unsigned int>",
-   "referenced_type" : "type-682",
-   "self_type" : "type-682",
+   "referenced_type" : "type-677",
+   "self_type" : "type-677",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIjEE"
   },
   {
@@ -32398,15 +32470,15 @@
    "self_type" : "type-752",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long>",
    "name" : "android::trait_trivial_move<unsigned long>",
-   "referenced_type" : "type-728",
-   "self_type" : "type-728",
+   "referenced_type" : "type-725",
+   "self_type" : "type-725",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-710" ],
@@ -32427,30 +32499,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-480",
-   "self_type" : "type-480",
+   "referenced_type" : "type-477",
+   "self_type" : "type-477",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::traits<android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-823",
-   "self_type" : "type-823",
+   "referenced_type" : "type-824",
+   "self_type" : "type-824",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android6traitsINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::Rect>",
    "name" : "android::traits<android::Rect>",
-   "referenced_type" : "type-2235",
-   "self_type" : "type-2235",
+   "referenced_type" : "type-2238",
+   "self_type" : "type-2238",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -32460,8 +32532,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::traits<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-820",
-   "self_type" : "type-820",
+   "referenced_type" : "type-821",
+   "self_type" : "type-821",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -32475,18 +32547,18 @@
    "self_type" : "type-822",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android6traitsIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<long long>",
    "name" : "android::traits<long long>",
-   "referenced_type" : "type-1431",
-   "self_type" : "type-1431",
+   "referenced_type" : "type-1435",
+   "self_type" : "type-1435",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android6traitsIxEE"
   },
   {
@@ -32495,12 +32567,12 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::ui::Size",
@@ -32518,20 +32590,20 @@
     {
      "access" : "private",
      "field_name" : "mMatrix",
-     "referenced_type" : "type-2284"
+     "referenced_type" : "type-2287"
     },
     {
      "access" : "private",
      "field_name" : "mType",
      "field_offset" : 288,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "linker_set_key" : "android::ui::Transform",
    "name" : "android::ui::Transform",
    "record_kind" : "class",
-   "referenced_type" : "type-2283",
-   "self_type" : "type-2283",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2286",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "unique_id" : "_ZTSN7android2ui9TransformE"
@@ -32548,8 +32620,8 @@
    ],
    "linker_set_key" : "android::ui::Transform::mat33",
    "name" : "android::ui::Transform::mat33",
-   "referenced_type" : "type-2284",
-   "self_type" : "type-2284",
+   "referenced_type" : "type-2287",
+   "self_type" : "type-2287",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "unique_id" : "_ZTSN7android2ui9Transform5mat33E"
@@ -32559,13 +32631,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2209"
+     "referenced_type" : "type-2212"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::Rect>",
    "name" : "android::use_trivial_move<android::Rect>",
-   "referenced_type" : "type-2208",
-   "self_type" : "type-2208",
+   "referenced_type" : "type-2211",
+   "self_type" : "type-2211",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -32576,13 +32648,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-701"
+     "referenced_type" : "type-704"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-700",
-   "self_type" : "type-700",
+   "referenced_type" : "type-703",
+   "self_type" : "type-703",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -32593,16 +32665,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1417"
+     "referenced_type" : "type-1422"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<long long>",
    "name" : "android::use_trivial_move<long long>",
-   "referenced_type" : "type-1416",
-   "self_type" : "type-1416",
+   "referenced_type" : "type-1421",
+   "self_type" : "type-1421",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveIxEE"
   },
   {
@@ -32633,12 +32705,12 @@
    [
     {
      "field_name" : "num_points",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 32,
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     },
     {
      "field_name" : "xyzc_points",
@@ -32665,7 +32737,7 @@
     {
      "field_name" : "num_planes",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "planes",
@@ -32687,7 +32759,7 @@
    [
     {
      "field_name" : "top_left",
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-219"
     },
     {
      "field_name" : "component",
@@ -32697,32 +32769,32 @@
     {
      "field_name" : "bits_per_component",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "bits_used",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "h_increment",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "v_increment",
      "field_offset" : 160,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "h_subsampling",
      "field_offset" : 192,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "v_subsampling",
      "field_offset" : 224,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android_flex_plane",
@@ -32739,33 +32811,33 @@
    [
     {
      "field_name" : "magic",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "version",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 64,
-     "referenced_type" : "type-519"
+     "referenced_type" : "type-517"
     },
     {
      "field_name" : "incRef",
      "field_offset" : 192,
-     "referenced_type" : "type-520"
+     "referenced_type" : "type-518"
     },
     {
      "field_name" : "decRef",
      "field_offset" : 224,
-     "referenced_type" : "type-520"
+     "referenced_type" : "type-518"
     }
    ],
    "linker_set_key" : "android_native_base_t",
    "name" : "android_native_base_t",
-   "referenced_type" : "type-518",
-   "self_type" : "type-518",
+   "referenced_type" : "type-516",
+   "self_type" : "type-516",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
    "unique_id" : "android_native_base_t"
@@ -32776,28 +32848,28 @@
    [
     {
      "field_name" : "left",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "top",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "right",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "bottom",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android_native_rect_t",
    "name" : "android_native_rect_t",
-   "referenced_type" : "type-619",
-   "self_type" : "type-619",
+   "referenced_type" : "type-620",
+   "self_type" : "type-620",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
    "unique_id" : "android_native_rect_t"
@@ -32872,43 +32944,43 @@
    [
     {
      "field_name" : "y",
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "cb",
      "field_offset" : 32,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "cr",
      "field_offset" : 64,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "ystride",
      "field_offset" : 96,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "cstride",
      "field_offset" : 128,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "chroma_step",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 192,
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     }
    ],
    "linker_set_key" : "android_ycbcr",
    "name" : "android_ycbcr",
-   "referenced_type" : "type-348",
-   "self_type" : "type-348",
+   "referenced_type" : "type-345",
+   "self_type" : "type-345",
    "size" : 56,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_ycbcr"
@@ -32919,108 +32991,108 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-547"
+     "referenced_type" : "type-544"
     },
     {
      "field_name" : "flags",
      "field_offset" : 512,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "field_name" : "width",
      "field_offset" : 544,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "field_name" : "height",
      "field_offset" : 576,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "field_name" : "stride",
      "field_offset" : 608,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "format",
      "field_offset" : 640,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "xdpi",
      "field_offset" : 672,
-     "referenced_type" : "type-563"
+     "referenced_type" : "type-560"
     },
     {
      "field_name" : "ydpi",
      "field_offset" : 704,
-     "referenced_type" : "type-563"
+     "referenced_type" : "type-560"
     },
     {
      "field_name" : "fps",
      "field_offset" : 736,
-     "referenced_type" : "type-563"
+     "referenced_type" : "type-560"
     },
     {
      "field_name" : "minSwapInterval",
      "field_offset" : 768,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "maxSwapInterval",
      "field_offset" : 800,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "numFramebuffers",
      "field_offset" : 832,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 864,
-     "referenced_type" : "type-564"
+     "referenced_type" : "type-561"
     },
     {
      "field_name" : "setSwapInterval",
      "field_offset" : 1088,
-     "referenced_type" : "type-565"
+     "referenced_type" : "type-562"
     },
     {
      "field_name" : "setUpdateRect",
      "field_offset" : 1120,
-     "referenced_type" : "type-568"
+     "referenced_type" : "type-565"
     },
     {
      "field_name" : "post",
      "field_offset" : 1152,
-     "referenced_type" : "type-570"
+     "referenced_type" : "type-567"
     },
     {
      "field_name" : "compositionComplete",
      "field_offset" : 1184,
-     "referenced_type" : "type-572"
+     "referenced_type" : "type-569"
     },
     {
      "field_name" : "dump",
      "field_offset" : 1216,
-     "referenced_type" : "type-574"
+     "referenced_type" : "type-571"
     },
     {
      "field_name" : "enableScreen",
      "field_offset" : 1248,
-     "referenced_type" : "type-565"
+     "referenced_type" : "type-562"
     },
     {
      "field_name" : "reserved_proc",
      "field_offset" : 1280,
-     "referenced_type" : "type-524"
+     "referenced_type" : "type-522"
     }
    ],
    "linker_set_key" : "framebuffer_device_t",
    "name" : "framebuffer_device_t",
-   "referenced_type" : "type-546",
-   "self_type" : "type-546",
+   "referenced_type" : "type-543",
+   "self_type" : "type-543",
    "size" : 184,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h",
    "unique_id" : "framebuffer_device_t"
@@ -33031,63 +33103,73 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-549"
+     "referenced_type" : "type-546"
     },
     {
      "field_name" : "registerBuffer",
      "field_offset" : 1024,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-577"
     },
     {
      "field_name" : "unregisterBuffer",
      "field_offset" : 1056,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-577"
     },
     {
      "field_name" : "lock",
      "field_offset" : 1088,
-     "referenced_type" : "type-583"
+     "referenced_type" : "type-581"
     },
     {
      "field_name" : "unlock",
      "field_offset" : 1120,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-577"
     },
     {
      "field_name" : "perform",
      "field_offset" : 1152,
-     "referenced_type" : "type-585"
+     "referenced_type" : "type-583"
     },
     {
      "field_name" : "lock_ycbcr",
      "field_offset" : 1184,
-     "referenced_type" : "type-587"
+     "referenced_type" : "type-585"
     },
     {
      "field_name" : "lockAsync",
      "field_offset" : 1216,
-     "referenced_type" : "type-589"
+     "referenced_type" : "type-587"
     },
     {
      "field_name" : "unlockAsync",
      "field_offset" : 1248,
-     "referenced_type" : "type-591"
+     "referenced_type" : "type-589"
     },
     {
      "field_name" : "lockAsync_ycbcr",
      "field_offset" : 1280,
+     "referenced_type" : "type-592"
+    },
+    {
+     "field_name" : "getTransportSize",
+     "field_offset" : 1312,
      "referenced_type" : "type-594"
     },
     {
-     "field_name" : "reserved_proc",
-     "field_offset" : 1312,
+     "field_name" : "validateBufferSize",
+     "field_offset" : 1344,
      "referenced_type" : "type-596"
+    },
+    {
+     "field_name" : "reserved_proc",
+     "field_offset" : 1376,
+     "referenced_type" : "type-521"
     }
    ],
    "linker_set_key" : "gralloc_module_t",
    "name" : "gralloc_module_t",
-   "referenced_type" : "type-578",
-   "self_type" : "type-578",
+   "referenced_type" : "type-576",
+   "self_type" : "type-576",
    "size" : 176,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h",
    "unique_id" : "gralloc_module_t"
@@ -33098,33 +33180,33 @@
    [
     {
      "field_name" : "tag",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "version",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "module",
      "field_offset" : 64,
-     "referenced_type" : "type-548"
+     "referenced_type" : "type-545"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 96,
-     "referenced_type" : "type-559"
+     "referenced_type" : "type-556"
     },
     {
      "field_name" : "close",
      "field_offset" : 480,
-     "referenced_type" : "type-560"
+     "referenced_type" : "type-557"
     }
    ],
    "linker_set_key" : "hw_device_t",
    "name" : "hw_device_t",
-   "referenced_type" : "type-547",
-   "self_type" : "type-547",
+   "referenced_type" : "type-544",
+   "self_type" : "type-544",
    "size" : 64,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
    "unique_id" : "hw_device_t"
@@ -33135,13 +33217,13 @@
    [
     {
      "field_name" : "open",
-     "referenced_type" : "type-552"
+     "referenced_type" : "type-549"
     }
    ],
    "linker_set_key" : "hw_module_methods_t",
    "name" : "hw_module_methods_t",
-   "referenced_type" : "type-551",
-   "self_type" : "type-551",
+   "referenced_type" : "type-548",
+   "self_type" : "type-548",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
    "unique_id" : "hw_module_methods_t"
@@ -33152,7 +33234,7 @@
    [
     {
      "field_name" : "tag",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "module_api_version",
@@ -33167,38 +33249,38 @@
     {
      "field_name" : "id",
      "field_offset" : 64,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "field_name" : "name",
      "field_offset" : 96,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "field_name" : "author",
      "field_offset" : 128,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "field_name" : "methods",
      "field_offset" : 160,
-     "referenced_type" : "type-550"
+     "referenced_type" : "type-547"
     },
     {
      "field_name" : "dso",
      "field_offset" : 192,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 224,
-     "referenced_type" : "type-558"
+     "referenced_type" : "type-555"
     }
    ],
    "linker_set_key" : "hw_module_t",
    "name" : "hw_module_t",
-   "referenced_type" : "type-549",
-   "self_type" : "type-549",
+   "referenced_type" : "type-546",
+   "self_type" : "type-546",
    "size" : 128,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
    "unique_id" : "hw_module_t"
@@ -33264,12 +33346,12 @@
    [
     {
      "field_name" : "tv_sec",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "tv_nsec",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "linker_set_key" : "log_time",
@@ -33296,22 +33378,22 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "msg",
@@ -33343,27 +33425,27 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "euid",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "msg",
@@ -33395,27 +33477,27 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "lid",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "msg",
@@ -33447,32 +33529,32 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "lid",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "uid",
      "field_offset" : 192,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "msg",
@@ -33494,28 +33576,28 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "numFds",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "numInts",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "data",
      "field_offset" : 96,
-     "referenced_type" : "type-145"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "native_handle",
    "name" : "native_handle",
-   "referenced_type" : "type-144",
-   "self_type" : "type-144",
+   "referenced_type" : "type-147",
+   "self_type" : "type-147",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
    "unique_id" : "native_handle"
@@ -33525,13 +33607,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-435"
+     "referenced_type" : "type-432"
     }
    ],
    "linker_set_key" : "std::is_floating_point<android::half>",
    "name" : "std::is_floating_point<android::half>",
-   "referenced_type" : "type-434",
-   "self_type" : "type-434",
+   "referenced_type" : "type-431",
+   "self_type" : "type-431",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h",
    "template_args" : [ "type-1" ],
@@ -33542,8 +33624,8 @@
    "linker_set_key" : "std::numeric_limits<android::half>",
    "name" : "std::numeric_limits<android::half>",
    "record_kind" : "class",
-   "referenced_type" : "type-597",
-   "self_type" : "type-597",
+   "referenced_type" : "type-575",
+   "self_type" : "type-575",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h",
    "template_args" : [ "type-1" ],
@@ -33556,8 +33638,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot &&",
    "name" : "android::FenceTime::Snapshot &&",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1386",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1391",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -33583,8 +33665,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &&",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &&",
-   "referenced_type" : "type-99",
-   "self_type" : "type-107",
+   "referenced_type" : "type-101",
+   "self_type" : "type-109",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -33592,8 +33674,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &&",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &&",
-   "referenced_type" : "type-393",
-   "self_type" : "type-399",
+   "referenced_type" : "type-392",
+   "self_type" : "type-396",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -33601,8 +33683,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &&",
-   "referenced_type" : "type-111",
-   "self_type" : "type-113",
+   "referenced_type" : "type-113",
+   "self_type" : "type-115",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -33619,7 +33701,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status &&",
    "name" : "android::hardware::Status &&",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1312",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -33628,7 +33710,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status &&",
    "name" : "android::hardware::details::return_status &&",
-   "referenced_type" : "type-101",
+   "referenced_type" : "type-103",
    "self_type" : "type-1318",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -33637,7 +33719,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_handle &&",
    "name" : "android::hardware::hidl_handle &&",
-   "referenced_type" : "type-139",
+   "referenced_type" : "type-142",
    "self_type" : "type-1087",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -33656,7 +33738,7 @@
    "linker_set_key" : "android::sp<android::Fence> &&",
    "name" : "android::sp<android::Fence> &&",
    "referenced_type" : "type-1357",
-   "self_type" : "type-1410",
+   "self_type" : "type-1415",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33664,8 +33746,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &&",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &&",
-   "referenced_type" : "type-355",
-   "self_type" : "type-378",
+   "referenced_type" : "type-352",
+   "self_type" : "type-375",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33673,8 +33755,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &&",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &&",
-   "referenced_type" : "type-484",
-   "self_type" : "type-491",
+   "referenced_type" : "type-481",
+   "self_type" : "type-488",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33682,8 +33764,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &&",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &&",
-   "referenced_type" : "type-338",
-   "self_type" : "type-386",
+   "referenced_type" : "type-335",
+   "self_type" : "type-383",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33691,8 +33773,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &&",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &&",
-   "referenced_type" : "type-86",
-   "self_type" : "type-94",
+   "referenced_type" : "type-88",
+   "self_type" : "type-96",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33700,8 +33782,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &&",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &&",
-   "referenced_type" : "type-497",
-   "self_type" : "type-504",
+   "referenced_type" : "type-494",
+   "self_type" : "type-501",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33709,7 +33791,7 @@
    "alignment" : 4,
    "linker_set_key" : "int &&",
    "name" : "int &&",
-   "referenced_type" : "type-103",
+   "referenced_type" : "type-105",
    "self_type" : "type-1294",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
diff --git a/29/64/arm_armv8-a/source-based/libstagefright_bufferqueue_helper.so.lsdump b/29/64/arm_armv8-a/source-based/libstagefright_bufferqueue_helper.so.lsdump
index f78a8c9..ecf3f4a 100644
--- a/29/64/arm_armv8-a/source-based/libstagefright_bufferqueue_helper.so.lsdump
+++ b/29/64/arm_armv8-a/source-based/libstagefright_bufferqueue_helper.so.lsdump
@@ -5,15 +5,15 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_AUDIO_CHANNELTYPE [16]",
    "name" : "OMX_AUDIO_CHANNELTYPE [16]",
-   "referenced_type" : "type-1637",
-   "self_type" : "type-1642",
+   "referenced_type" : "type-1635",
+   "self_type" : "type-1641",
    "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-1499",
+   "referenced_type" : "type-1498",
    "self_type" : "type-1515",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -30,8 +30,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::MediaImage2::PlaneInfo [4]",
    "name" : "android::MediaImage2::PlaneInfo [4]",
-   "referenced_type" : "type-2423",
-   "self_type" : "type-2422",
+   "referenced_type" : "type-2426",
+   "self_type" : "type-2425",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
@@ -39,8 +39,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::MediaImage::PlaneInfo [3]",
    "name" : "android::MediaImage::PlaneInfo [3]",
-   "referenced_type" : "type-2418",
-   "self_type" : "type-2417",
+   "referenced_type" : "type-2421",
+   "self_type" : "type-2420",
    "size" : 60,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
@@ -81,7 +81,7 @@
    "linker_set_key" : "int [3]",
    "name" : "int [3]",
    "referenced_type" : "type-4",
-   "self_type" : "type-2202",
+   "self_type" : "type-2205",
    "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-2202",
-   "self_type" : "type-2201",
+   "referenced_type" : "type-2205",
+   "self_type" : "type-2204",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
   },
@@ -117,7 +117,7 @@
    "linker_set_key" : "unsigned char [16]",
    "name" : "unsigned char [16]",
    "referenced_type" : "type-90",
-   "self_type" : "type-2311",
+   "self_type" : "type-2314",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -126,7 +126,7 @@
    "linker_set_key" : "unsigned char [1]",
    "name" : "unsigned char [1]",
    "referenced_type" : "type-90",
-   "self_type" : "type-1572",
+   "self_type" : "type-1567",
    "size" : 1,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -135,7 +135,7 @@
    "linker_set_key" : "unsigned char [256]",
    "name" : "unsigned char [256]",
    "referenced_type" : "type-90",
-   "self_type" : "type-2312",
+   "self_type" : "type-2315",
    "size" : 256,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -144,7 +144,7 @@
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
    "referenced_type" : "type-90",
-   "self_type" : "type-2179",
+   "self_type" : "type-2182",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -153,7 +153,7 @@
    "linker_set_key" : "unsigned char [64]",
    "name" : "unsigned char [64]",
    "referenced_type" : "type-90",
-   "self_type" : "type-2308",
+   "self_type" : "type-2311",
    "size" : 64,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -204,8 +204,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-1242",
-   "self_type" : "type-1242",
+   "referenced_type" : "type-1245",
+   "self_type" : "type-1245",
    "size" : 2
   },
   {
@@ -246,8 +246,8 @@
    "alignment" : 8,
    "linker_set_key" : "long double",
    "name" : "long double",
-   "referenced_type" : "type-1453",
-   "self_type" : "type-1453",
+   "referenced_type" : "type-1456",
+   "self_type" : "type-1456",
    "size" : 8
   },
   {
@@ -760,6 +760,9 @@
    "name" : "_ZN7android18BnProducerListener18needsReleaseNotifyEv"
   },
   {
+   "name" : "_ZN7android18BnProducerListener18onBuffersDiscardedERKNSt3__16vectorIiNS1_9allocatorIiEEEE"
+  },
+  {
    "name" : "_ZN7android18BpConsumerListenerD0Ev"
   },
   {
@@ -3200,8 +3203,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AACPROFILETYPE",
    "name" : "OMX_AUDIO_AACPROFILETYPE",
-   "referenced_type" : "type-1676",
-   "self_type" : "type-1676",
+   "referenced_type" : "type-1671",
+   "self_type" : "type-1671",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3254,8 +3257,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
    "name" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
-   "referenced_type" : "type-1668",
-   "self_type" : "type-1668",
+   "referenced_type" : "type-1670",
+   "self_type" : "type-1670",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3352,8 +3355,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRBANDMODETYPE",
    "name" : "OMX_AUDIO_AMRBANDMODETYPE",
-   "referenced_type" : "type-1890",
-   "self_type" : "type-1890",
+   "referenced_type" : "type-1881",
+   "self_type" : "type-1881",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3398,8 +3401,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRDTXMODETYPE",
    "name" : "OMX_AUDIO_AMRDTXMODETYPE",
-   "referenced_type" : "type-1901",
-   "self_type" : "type-1901",
+   "referenced_type" : "type-1892",
+   "self_type" : "type-1892",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3448,8 +3451,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
    "name" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
-   "referenced_type" : "type-1877",
-   "self_type" : "type-1877",
+   "referenced_type" : "type-1862",
+   "self_type" : "type-1862",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3498,8 +3501,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CDMARATETYPE",
    "name" : "OMX_AUDIO_CDMARATETYPE",
-   "referenced_type" : "type-2021",
-   "self_type" : "type-2021",
+   "referenced_type" : "type-2013",
+   "self_type" : "type-2013",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3540,8 +3543,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CHANNELMODETYPE",
    "name" : "OMX_AUDIO_CHANNELMODETYPE",
-   "referenced_type" : "type-1652",
-   "self_type" : "type-1652",
+   "referenced_type" : "type-1651",
+   "self_type" : "type-1651",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3606,8 +3609,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CHANNELTYPE",
    "name" : "OMX_AUDIO_CHANNELTYPE",
-   "referenced_type" : "type-1637",
-   "self_type" : "type-1637",
+   "referenced_type" : "type-1635",
+   "self_type" : "type-1635",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3748,8 +3751,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CODINGTYPE",
    "name" : "OMX_AUDIO_CODINGTYPE",
-   "referenced_type" : "type-1618",
-   "self_type" : "type-1618",
+   "referenced_type" : "type-1616",
+   "self_type" : "type-1616",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3790,8 +3793,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_ECHOCANTYPE",
    "name" : "OMX_AUDIO_ECHOCANTYPE",
-   "referenced_type" : "type-2196",
-   "self_type" : "type-2196",
+   "referenced_type" : "type-2199",
+   "self_type" : "type-2199",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3828,8 +3831,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G723RATE",
    "name" : "OMX_AUDIO_G723RATE",
-   "referenced_type" : "type-1808",
-   "self_type" : "type-1808",
+   "referenced_type" : "type-1799",
+   "self_type" : "type-1799",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3874,8 +3877,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G726MODE",
    "name" : "OMX_AUDIO_G726MODE",
-   "referenced_type" : "type-1831",
-   "self_type" : "type-1831",
+   "referenced_type" : "type-1822",
+   "self_type" : "type-1822",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3916,8 +3919,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G729TYPE",
    "name" : "OMX_AUDIO_G729TYPE",
-   "referenced_type" : "type-1851",
-   "self_type" : "type-1851",
+   "referenced_type" : "type-1845",
+   "self_type" : "type-1845",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3974,8 +3977,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDIFORMATTYPE",
    "name" : "OMX_AUDIO_MIDIFORMATTYPE",
-   "referenced_type" : "type-2087",
-   "self_type" : "type-2087",
+   "referenced_type" : "type-2079",
+   "self_type" : "type-2079",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4028,8 +4031,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
    "name" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
-   "referenced_type" : "type-2169",
-   "self_type" : "type-2169",
+   "referenced_type" : "type-2168",
+   "self_type" : "type-2168",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4070,8 +4073,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
    "name" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
-   "referenced_type" : "type-2121",
-   "self_type" : "type-2121",
+   "referenced_type" : "type-2113",
+   "self_type" : "type-2113",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4116,8 +4119,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
    "name" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
-   "referenced_type" : "type-2111",
-   "self_type" : "type-2111",
+   "referenced_type" : "type-2102",
+   "self_type" : "type-2102",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4154,8 +4157,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
    "name" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
-   "referenced_type" : "type-1660",
-   "self_type" : "type-1660",
+   "referenced_type" : "type-1656",
+   "self_type" : "type-1656",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4192,8 +4195,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PCMMODETYPE",
    "name" : "OMX_AUDIO_PCMMODETYPE",
-   "referenced_type" : "type-1633",
-   "self_type" : "type-1633",
+   "referenced_type" : "type-1628",
+   "self_type" : "type-1628",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4250,8 +4253,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_RAFORMATTYPE",
    "name" : "OMX_AUDIO_RAFORMATTYPE",
-   "referenced_type" : "type-1752",
-   "self_type" : "type-1752",
+   "referenced_type" : "type-1746",
+   "self_type" : "type-1746",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4284,8 +4287,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
    "name" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
-   "referenced_type" : "type-1775",
-   "self_type" : "type-1775",
+   "referenced_type" : "type-1766",
+   "self_type" : "type-1766",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4318,8 +4321,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_STEREOWIDENINGTYPE",
    "name" : "OMX_AUDIO_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-2192",
-   "self_type" : "type-2192",
+   "referenced_type" : "type-2195",
+   "self_type" : "type-2195",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4360,8 +4363,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_WMAFORMATTYPE",
    "name" : "OMX_AUDIO_WMAFORMATTYPE",
-   "referenced_type" : "type-1719",
-   "self_type" : "type-1719",
+   "referenced_type" : "type-1711",
+   "self_type" : "type-1711",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4402,8 +4405,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_WMAPROFILETYPE",
    "name" : "OMX_AUDIO_WMAPROFILETYPE",
-   "referenced_type" : "type-1732",
-   "self_type" : "type-1732",
+   "referenced_type" : "type-1722",
+   "self_type" : "type-1722",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4428,8 +4431,8 @@
    ],
    "linker_set_key" : "OMX_BOOL",
    "name" : "OMX_BOOL",
-   "referenced_type" : "type-1293",
-   "self_type" : "type-1293",
+   "referenced_type" : "type-1296",
+   "self_type" : "type-1296",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "underlying_type" : "type-2",
@@ -4466,8 +4469,8 @@
    ],
    "linker_set_key" : "OMX_BUFFERSUPPLIERTYPE",
    "name" : "OMX_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-1601",
-   "self_type" : "type-1601",
+   "referenced_type" : "type-1599",
+   "self_type" : "type-1599",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -4520,8 +4523,8 @@
    ],
    "linker_set_key" : "OMX_COLORBLENDTYPE",
    "name" : "OMX_COLORBLENDTYPE",
-   "referenced_type" : "type-2209",
-   "self_type" : "type-2209",
+   "referenced_type" : "type-2212",
+   "self_type" : "type-2212",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4762,8 +4765,8 @@
    ],
    "linker_set_key" : "OMX_COLOR_FORMATTYPE",
    "name" : "OMX_COLOR_FORMATTYPE",
-   "referenced_type" : "type-2199",
-   "self_type" : "type-2199",
+   "referenced_type" : "type-2202",
+   "self_type" : "type-2202",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4808,8 +4811,8 @@
    ],
    "linker_set_key" : "OMX_COMMANDTYPE",
    "name" : "OMX_COMMANDTYPE",
-   "referenced_type" : "type-1485",
-   "self_type" : "type-1485",
+   "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-2",
@@ -4846,8 +4849,8 @@
    ],
    "linker_set_key" : "OMX_DATAUNITENCAPSULATIONTYPE",
    "name" : "OMX_DATAUNITENCAPSULATIONTYPE",
-   "referenced_type" : "type-2236",
-   "self_type" : "type-2236",
+   "referenced_type" : "type-2239",
+   "self_type" : "type-2239",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4888,8 +4891,8 @@
    ],
    "linker_set_key" : "OMX_DATAUNITTYPE",
    "name" : "OMX_DATAUNITTYPE",
-   "referenced_type" : "type-2235",
-   "self_type" : "type-2235",
+   "referenced_type" : "type-2238",
+   "self_type" : "type-2238",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4914,8 +4917,8 @@
    ],
    "linker_set_key" : "OMX_DIRTYPE",
    "name" : "OMX_DIRTYPE",
-   "referenced_type" : "type-1452",
-   "self_type" : "type-1452",
+   "referenced_type" : "type-1455",
+   "self_type" : "type-1455",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "underlying_type" : "type-2",
@@ -4956,8 +4959,8 @@
    ],
    "linker_set_key" : "OMX_DITHERTYPE",
    "name" : "OMX_DITHERTYPE",
-   "referenced_type" : "type-2238",
-   "self_type" : "type-2238",
+   "referenced_type" : "type-2241",
+   "self_type" : "type-2241",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4982,8 +4985,8 @@
    ],
    "linker_set_key" : "OMX_ENDIANTYPE",
    "name" : "OMX_ENDIANTYPE",
-   "referenced_type" : "type-1460",
-   "self_type" : "type-1460",
+   "referenced_type" : "type-1459",
+   "self_type" : "type-1459",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "underlying_type" : "type-2",
@@ -5160,8 +5163,8 @@
    ],
    "linker_set_key" : "OMX_ERRORTYPE",
    "name" : "OMX_ERRORTYPE",
-   "referenced_type" : "type-1494",
-   "self_type" : "type-1494",
+   "referenced_type" : "type-1495",
+   "self_type" : "type-1495",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-4",
@@ -5234,8 +5237,8 @@
    ],
    "linker_set_key" : "OMX_EVENTTYPE",
    "name" : "OMX_EVENTTYPE",
-   "referenced_type" : "type-1588",
-   "self_type" : "type-1588",
+   "referenced_type" : "type-1589",
+   "self_type" : "type-1589",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -5300,8 +5303,8 @@
    ],
    "linker_set_key" : "OMX_EXPOSURECONTROLTYPE",
    "name" : "OMX_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-2221",
-   "self_type" : "type-2221",
+   "referenced_type" : "type-2224",
+   "self_type" : "type-2224",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -5334,8 +5337,8 @@
    ],
    "linker_set_key" : "OMX_EXTRADATATYPE",
    "name" : "OMX_EXTRADATATYPE",
-   "referenced_type" : "type-1561",
-   "self_type" : "type-1561",
+   "referenced_type" : "type-1556",
+   "self_type" : "type-1556",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -5380,8 +5383,8 @@
    ],
    "linker_set_key" : "OMX_FOCUSSTATUSTYPE",
    "name" : "OMX_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-2246",
-   "self_type" : "type-2246",
+   "referenced_type" : "type-2249",
+   "self_type" : "type-2249",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -5450,8 +5453,8 @@
    ],
    "linker_set_key" : "OMX_IMAGEFILTERTYPE",
    "name" : "OMX_IMAGEFILTERTYPE",
-   "referenced_type" : "type-2205",
-   "self_type" : "type-2205",
+   "referenced_type" : "type-2208",
+   "self_type" : "type-2208",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -5516,8 +5519,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_CODINGTYPE",
    "name" : "OMX_IMAGE_CODINGTYPE",
-   "referenced_type" : "type-2297",
-   "self_type" : "type-2297",
+   "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-2",
@@ -5566,8 +5569,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_FLASHCONTROLTYPE",
    "name" : "OMX_IMAGE_FLASHCONTROLTYPE",
-   "referenced_type" : "type-2300",
-   "self_type" : "type-2300",
+   "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-2",
@@ -5608,8 +5611,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_FOCUSCONTROLTYPE",
    "name" : "OMX_IMAGE_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-2303",
-   "self_type" : "type-2303",
+   "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-2",
@@ -5658,8 +5661,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_HUFFMANTABLETYPE",
    "name" : "OMX_IMAGE_HUFFMANTABLETYPE",
-   "referenced_type" : "type-2309",
-   "self_type" : "type-2309",
+   "referenced_type" : "type-2312",
+   "self_type" : "type-2312",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "underlying_type" : "type-2",
@@ -5700,8 +5703,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
    "name" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-2306",
-   "self_type" : "type-2306",
+   "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-2",
@@ -6560,8 +6563,8 @@
    ],
    "linker_set_key" : "OMX_METADATACHARSETTYPE",
    "name" : "OMX_METADATACHARSETTYPE",
-   "referenced_type" : "type-2345",
-   "self_type" : "type-2345",
+   "referenced_type" : "type-2348",
+   "self_type" : "type-2348",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6602,8 +6605,8 @@
    ],
    "linker_set_key" : "OMX_METADATASCOPETYPE",
    "name" : "OMX_METADATASCOPETYPE",
-   "referenced_type" : "type-2346",
-   "self_type" : "type-2346",
+   "referenced_type" : "type-2349",
+   "self_type" : "type-2349",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6640,8 +6643,8 @@
    ],
    "linker_set_key" : "OMX_METADATASEARCHMODETYPE",
    "name" : "OMX_METADATASEARCHMODETYPE",
-   "referenced_type" : "type-2347",
-   "self_type" : "type-2347",
+   "referenced_type" : "type-2350",
+   "self_type" : "type-2350",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6678,8 +6681,8 @@
    ],
    "linker_set_key" : "OMX_METERINGTYPE",
    "name" : "OMX_METERINGTYPE",
-   "referenced_type" : "type-2242",
-   "self_type" : "type-2242",
+   "referenced_type" : "type-2245",
+   "self_type" : "type-2245",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -6720,8 +6723,8 @@
    ],
    "linker_set_key" : "OMX_MIRRORTYPE",
    "name" : "OMX_MIRRORTYPE",
-   "referenced_type" : "type-2213",
-   "self_type" : "type-2213",
+   "referenced_type" : "type-2216",
+   "self_type" : "type-2216",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -6796,8 +6799,8 @@
    ],
    "linker_set_key" : "OMX_OTHER_FORMATTYPE",
    "name" : "OMX_OTHER_FORMATTYPE",
-   "referenced_type" : "type-2314",
-   "self_type" : "type-2314",
+   "referenced_type" : "type-2317",
+   "self_type" : "type-2317",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -6838,8 +6841,8 @@
    ],
    "linker_set_key" : "OMX_PORTDOMAINTYPE",
    "name" : "OMX_PORTDOMAINTYPE",
-   "referenced_type" : "type-2332",
-   "self_type" : "type-2332",
+   "referenced_type" : "type-2335",
+   "self_type" : "type-2335",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6888,8 +6891,8 @@
    ],
    "linker_set_key" : "OMX_STATETYPE",
    "name" : "OMX_STATETYPE",
-   "referenced_type" : "type-1488",
-   "self_type" : "type-1488",
+   "referenced_type" : "type-1490",
+   "self_type" : "type-1490",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -6922,8 +6925,8 @@
    ],
    "linker_set_key" : "OMX_SUSPENSIONPOLICYTYPE",
    "name" : "OMX_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-2336",
-   "self_type" : "type-2336",
+   "referenced_type" : "type-2339",
+   "self_type" : "type-2339",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6956,8 +6959,8 @@
    ],
    "linker_set_key" : "OMX_SUSPENSIONTYPE",
    "name" : "OMX_SUSPENSIONTYPE",
-   "referenced_type" : "type-2338",
-   "self_type" : "type-2338",
+   "referenced_type" : "type-2341",
+   "self_type" : "type-2341",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6994,8 +6997,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CLOCKSTATE",
    "name" : "OMX_TIME_CLOCKSTATE",
-   "referenced_type" : "type-2321",
-   "self_type" : "type-2321",
+   "referenced_type" : "type-2324",
+   "self_type" : "type-2324",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -7032,8 +7035,8 @@
    ],
    "linker_set_key" : "OMX_TIME_REFCLOCKTYPE",
    "name" : "OMX_TIME_REFCLOCKTYPE",
-   "referenced_type" : "type-2319",
-   "self_type" : "type-2319",
+   "referenced_type" : "type-2322",
+   "self_type" : "type-2322",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -7066,8 +7069,8 @@
    ],
    "linker_set_key" : "OMX_TIME_SEEKMODETYPE",
    "name" : "OMX_TIME_SEEKMODETYPE",
-   "referenced_type" : "type-2315",
-   "self_type" : "type-2315",
+   "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-2",
@@ -7104,8 +7107,8 @@
    ],
    "linker_set_key" : "OMX_TIME_UPDATETYPE",
    "name" : "OMX_TIME_UPDATETYPE",
-   "referenced_type" : "type-2318",
-   "self_type" : "type-2318",
+   "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-2",
@@ -7158,8 +7161,8 @@
    ],
    "linker_set_key" : "OMX_TRANSITIONEFFECTTYPE",
    "name" : "OMX_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-2233",
-   "self_type" : "type-2233",
+   "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-2",
@@ -7264,8 +7267,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCLEVELTYPE",
    "name" : "OMX_VIDEO_AVCLEVELTYPE",
-   "referenced_type" : "type-2280",
-   "self_type" : "type-2280",
+   "referenced_type" : "type-2283",
+   "self_type" : "type-2283",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7302,8 +7305,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
    "name" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
-   "referenced_type" : "type-2282",
-   "self_type" : "type-2282",
+   "referenced_type" : "type-2285",
+   "self_type" : "type-2285",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7356,8 +7359,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCPROFILETYPE",
    "name" : "OMX_VIDEO_AVCPROFILETYPE",
-   "referenced_type" : "type-2279",
-   "self_type" : "type-2279",
+   "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-2",
@@ -7394,8 +7397,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCSLICEMODETYPE",
    "name" : "OMX_VIDEO_AVCSLICEMODETYPE",
-   "referenced_type" : "type-2293",
-   "self_type" : "type-2293",
+   "referenced_type" : "type-2296",
+   "self_type" : "type-2296",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7476,8 +7479,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CODINGTYPE",
    "name" : "OMX_VIDEO_CODINGTYPE",
-   "referenced_type" : "type-2248",
-   "self_type" : "type-2248",
+   "referenced_type" : "type-2251",
+   "self_type" : "type-2251",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7526,8 +7529,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONTROLRATETYPE",
    "name" : "OMX_VIDEO_CONTROLRATETYPE",
-   "referenced_type" : "type-2253",
-   "self_type" : "type-2253",
+   "referenced_type" : "type-2256",
+   "self_type" : "type-2256",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7584,8 +7587,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_H263LEVELTYPE",
    "name" : "OMX_VIDEO_H263LEVELTYPE",
-   "referenced_type" : "type-2264",
-   "self_type" : "type-2264",
+   "referenced_type" : "type-2267",
+   "self_type" : "type-2267",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7646,8 +7649,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_H263PROFILETYPE",
    "name" : "OMX_VIDEO_H263PROFILETYPE",
-   "referenced_type" : "type-2263",
-   "self_type" : "type-2263",
+   "referenced_type" : "type-2266",
+   "self_type" : "type-2266",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7684,8 +7687,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_INTRAREFRESHTYPE",
    "name" : "OMX_VIDEO_INTRAREFRESHTYPE",
-   "referenced_type" : "type-2259",
-   "self_type" : "type-2259",
+   "referenced_type" : "type-2262",
+   "self_type" : "type-2262",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7726,8 +7729,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MOTIONVECTORTYPE",
    "name" : "OMX_VIDEO_MOTIONVECTORTYPE",
-   "referenced_type" : "type-2257",
-   "self_type" : "type-2257",
+   "referenced_type" : "type-2260",
+   "self_type" : "type-2260",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7772,8 +7775,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG2LEVELTYPE",
    "name" : "OMX_VIDEO_MPEG2LEVELTYPE",
-   "referenced_type" : "type-2269",
-   "self_type" : "type-2269",
+   "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-2",
@@ -7822,8 +7825,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG2PROFILETYPE",
    "name" : "OMX_VIDEO_MPEG2PROFILETYPE",
-   "referenced_type" : "type-2268",
-   "self_type" : "type-2268",
+   "referenced_type" : "type-2271",
+   "self_type" : "type-2271",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7888,8 +7891,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG4LEVELTYPE",
    "name" : "OMX_VIDEO_MPEG4LEVELTYPE",
-   "referenced_type" : "type-2272",
-   "self_type" : "type-2272",
+   "referenced_type" : "type-2275",
+   "self_type" : "type-2275",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7978,8 +7981,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG4PROFILETYPE",
    "name" : "OMX_VIDEO_MPEG4PROFILETYPE",
-   "referenced_type" : "type-2271",
-   "self_type" : "type-2271",
+   "referenced_type" : "type-2274",
+   "self_type" : "type-2274",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -8036,8 +8039,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PICTURETYPE",
    "name" : "OMX_VIDEO_PICTURETYPE",
-   "referenced_type" : "type-2265",
-   "self_type" : "type-2265",
+   "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-2",
@@ -8078,8 +8081,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_RVFORMATTYPE",
    "name" : "OMX_VIDEO_RVFORMATTYPE",
-   "referenced_type" : "type-2276",
-   "self_type" : "type-2276",
+   "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-2",
@@ -8120,8 +8123,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_WMVFORMATTYPE",
    "name" : "OMX_VIDEO_WMVFORMATTYPE",
-   "referenced_type" : "type-2274",
-   "self_type" : "type-2274",
+   "referenced_type" : "type-2277",
+   "self_type" : "type-2277",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -8186,8 +8189,8 @@
    ],
    "linker_set_key" : "OMX_WHITEBALCONTROLTYPE",
    "name" : "OMX_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-2219",
-   "self_type" : "type-2219",
+   "referenced_type" : "type-2222",
+   "self_type" : "type-2222",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -8228,8 +8231,8 @@
    ],
    "linker_set_key" : "android::ADebug::Level",
    "name" : "android::ADebug::Level",
-   "referenced_type" : "type-2292",
-   "self_type" : "type-2292",
+   "referenced_type" : "type-2295",
+   "self_type" : "type-2295",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
    "underlying_type" : "type-2",
@@ -8332,8 +8335,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::MatrixCoeffs",
    "name" : "android::ColorAspects::MatrixCoeffs",
-   "referenced_type" : "type-2432",
-   "self_type" : "type-2432",
+   "referenced_type" : "type-2435",
+   "self_type" : "type-2435",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8378,8 +8381,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::Primaries",
    "name" : "android::ColorAspects::Primaries",
-   "referenced_type" : "type-2430",
-   "self_type" : "type-2430",
+   "referenced_type" : "type-2433",
+   "self_type" : "type-2433",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8408,8 +8411,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::Range",
    "name" : "android::ColorAspects::Range",
-   "referenced_type" : "type-2429",
-   "self_type" : "type-2429",
+   "referenced_type" : "type-2432",
+   "self_type" : "type-2432",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8532,8 +8535,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::Transfer",
    "name" : "android::ColorAspects::Transfer",
-   "referenced_type" : "type-2431",
-   "self_type" : "type-2431",
+   "referenced_type" : "type-2434",
+   "self_type" : "type-2434",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8566,8 +8569,8 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorRange",
    "name" : "android::ColorUtils::ColorRange",
-   "referenced_type" : "type-1197",
-   "self_type" : "type-1197",
+   "referenced_type" : "type-1195",
+   "self_type" : "type-1195",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
    "underlying_type" : "type-2",
@@ -8632,8 +8635,8 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorStandard",
    "name" : "android::ColorUtils::ColorStandard",
-   "referenced_type" : "type-1187",
-   "self_type" : "type-1187",
+   "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-2",
@@ -8690,8 +8693,8 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorTransfer",
    "name" : "android::ColorUtils::ColorTransfer",
-   "referenced_type" : "type-1189",
-   "self_type" : "type-1189",
+   "referenced_type" : "type-1192",
+   "self_type" : "type-1192",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
    "underlying_type" : "type-2",
@@ -8756,8 +8759,8 @@
    ],
    "linker_set_key" : "android::HDRStaticInfo::ID",
    "name" : "android::HDRStaticInfo::ID",
-   "referenced_type" : "type-2436",
-   "self_type" : "type-2436",
+   "referenced_type" : "type-2439",
+   "self_type" : "type-2439",
    "size" : 1,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-90",
@@ -8840,8 +8843,8 @@
    ],
    "linker_set_key" : "android::MediaImage2::Type",
    "name" : "android::MediaImage2::Type",
-   "referenced_type" : "type-2421",
-   "self_type" : "type-2421",
+   "referenced_type" : "type-2424",
+   "self_type" : "type-2424",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8892,8 +8895,8 @@
    ],
    "linker_set_key" : "android::MediaImage::Type",
    "name" : "android::MediaImage::Type",
-   "referenced_type" : "type-2416",
-   "self_type" : "type-2416",
+   "referenced_type" : "type-2419",
+   "self_type" : "type-2419",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8926,8 +8929,8 @@
    ],
    "linker_set_key" : "android::MetadataBufferType",
    "name" : "android::MetadataBufferType",
-   "referenced_type" : "type-1234",
-   "self_type" : "type-1234",
+   "referenced_type" : "type-1235",
+   "self_type" : "type-1235",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/MetadataBufferType.h",
    "underlying_type" : "type-4",
@@ -8952,8 +8955,8 @@
    ],
    "linker_set_key" : "android::ProcessState::CallRestriction",
    "name" : "android::ProcessState::CallRestriction",
-   "referenced_type" : "type-1255",
-   "self_type" : "type-1255",
+   "referenced_type" : "type-1259",
+   "self_type" : "type-1259",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h",
    "underlying_type" : "type-4",
@@ -8970,8 +8973,8 @@
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-2657",
-   "self_type" : "type-2657",
+   "referenced_type" : "type-2660",
+   "self_type" : "type-2660",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "underlying_type" : "type-2",
@@ -8988,8 +8991,8 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-2652",
-   "self_type" : "type-2652",
+   "referenced_type" : "type-2655",
+   "self_type" : "type-2655",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "underlying_type" : "type-2",
@@ -9014,8 +9017,8 @@
    ],
    "linker_set_key" : "android::base::LogId",
    "name" : "android::base::LogId",
-   "referenced_type" : "type-4704",
-   "self_type" : "type-4704",
+   "referenced_type" : "type-4711",
+   "self_type" : "type-4711",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "type-2",
@@ -9056,8 +9059,8 @@
    ],
    "linker_set_key" : "android::base::LogSeverity",
    "name" : "android::base::LogSeverity",
-   "referenced_type" : "type-4654",
-   "self_type" : "type-4654",
+   "referenced_type" : "type-4661",
+   "self_type" : "type-4661",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "type-2",
@@ -9192,8 +9195,8 @@
    ],
    "linker_set_key" : "android::hardware::ProcessState::CallRestriction",
    "name" : "android::hardware::ProcessState::CallRestriction",
-   "referenced_type" : "type-1391",
-   "self_type" : "type-1391",
+   "referenced_type" : "type-1394",
+   "self_type" : "type-1394",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "underlying_type" : "type-4",
@@ -12186,8 +12189,8 @@
    ],
    "linker_set_key" : "log_id",
    "name" : "log_id",
-   "referenced_type" : "type-2411",
-   "self_type" : "type-2411",
+   "referenced_type" : "type-2414",
+   "self_type" : "type-2414",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
@@ -12206,9 +12209,9 @@
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1501",
-   "return_type" : "type-1494",
-   "self_type" : "type-1501",
+   "referenced_type" : "type-1500",
+   "return_type" : "type-1495",
+   "self_type" : "type-1500",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -12221,12 +12224,12 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1595"
+     "referenced_type" : "type-1598"
     }
    ],
-   "referenced_type" : "type-2382",
-   "return_type" : "type-1494",
-   "self_type" : "type-2382",
+   "referenced_type" : "type-2385",
+   "return_type" : "type-1495",
+   "self_type" : "type-2385",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12239,7 +12242,7 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-2376"
+     "referenced_type" : "type-2379"
     },
     {
      "referenced_type" : "type-2"
@@ -12251,9 +12254,9 @@
      "referenced_type" : "type-2"
     }
    ],
-   "referenced_type" : "type-2378",
-   "return_type" : "type-1494",
-   "self_type" : "type-2378",
+   "referenced_type" : "type-2381",
+   "return_type" : "type-1495",
+   "self_type" : "type-2381",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12266,7 +12269,7 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-2376"
+     "referenced_type" : "type-2379"
     },
     {
      "referenced_type" : "type-2"
@@ -12281,9 +12284,9 @@
      "referenced_type" : "type-89"
     }
    ],
-   "referenced_type" : "type-2375",
-   "return_type" : "type-1494",
-   "self_type" : "type-2375",
+   "referenced_type" : "type-2378",
+   "return_type" : "type-1495",
+   "self_type" : "type-2378",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12296,7 +12299,7 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-2376"
+     "referenced_type" : "type-2379"
     },
     {
      "referenced_type" : "type-2"
@@ -12308,9 +12311,9 @@
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-2387",
-   "return_type" : "type-1494",
-   "self_type" : "type-2387",
+   "referenced_type" : "type-2390",
+   "return_type" : "type-1495",
+   "self_type" : "type-2390",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12323,15 +12326,15 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-2385"
+     "referenced_type" : "type-2388"
     },
     {
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-2384",
-   "return_type" : "type-1494",
-   "self_type" : "type-2384",
+   "referenced_type" : "type-2387",
+   "return_type" : "type-1495",
+   "self_type" : "type-2387",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12344,7 +12347,7 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-1488"
     },
     {
      "referenced_type" : "type-2"
@@ -12353,9 +12356,9 @@
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-2362",
-   "return_type" : "type-1494",
-   "self_type" : "type-2362",
+   "referenced_type" : "type-2365",
+   "return_type" : "type-1495",
+   "self_type" : "type-2365",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12374,9 +12377,9 @@
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-2364",
-   "return_type" : "type-1494",
-   "self_type" : "type-2364",
+   "referenced_type" : "type-2367",
+   "return_type" : "type-1495",
+   "self_type" : "type-2367",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12389,12 +12392,12 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-2370"
+     "referenced_type" : "type-2373"
     }
    ],
-   "referenced_type" : "type-2369",
-   "return_type" : "type-1494",
-   "self_type" : "type-2369",
+   "referenced_type" : "type-2372",
+   "return_type" : "type-1495",
+   "self_type" : "type-2372",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12410,12 +12413,12 @@
      "referenced_type" : "type-254"
     },
     {
-     "referenced_type" : "type-2367"
+     "referenced_type" : "type-2370"
     }
    ],
-   "referenced_type" : "type-2366",
-   "return_type" : "type-1494",
-   "self_type" : "type-2366",
+   "referenced_type" : "type-2369",
+   "return_type" : "type-1495",
+   "self_type" : "type-2369",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12431,18 +12434,18 @@
      "referenced_type" : "type-254"
     },
     {
-     "referenced_type" : "type-2359"
+     "referenced_type" : "type-2362"
     },
     {
-     "referenced_type" : "type-2359"
+     "referenced_type" : "type-2362"
     },
     {
-     "referenced_type" : "type-2360"
+     "referenced_type" : "type-2363"
     }
    ],
-   "referenced_type" : "type-2358",
-   "return_type" : "type-1494",
-   "self_type" : "type-2358",
+   "referenced_type" : "type-2361",
+   "return_type" : "type-1495",
+   "self_type" : "type-2361",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12461,9 +12464,9 @@
      "referenced_type" : "type-2"
     }
    ],
-   "referenced_type" : "type-2389",
-   "return_type" : "type-1494",
-   "self_type" : "type-2389",
+   "referenced_type" : "type-2392",
+   "return_type" : "type-1495",
+   "self_type" : "type-2392",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12479,12 +12482,12 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1595"
+     "referenced_type" : "type-1598"
     }
    ],
-   "referenced_type" : "type-2380",
-   "return_type" : "type-1494",
-   "self_type" : "type-2380",
+   "referenced_type" : "type-2383",
+   "return_type" : "type-1495",
+   "self_type" : "type-2383",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12506,12 +12509,12 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-2373"
+     "referenced_type" : "type-2376"
     }
    ],
-   "referenced_type" : "type-2372",
-   "return_type" : "type-1494",
-   "self_type" : "type-2372",
+   "referenced_type" : "type-2375",
+   "return_type" : "type-1495",
+   "self_type" : "type-2375",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12527,12 +12530,12 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1595"
+     "referenced_type" : "type-1598"
     }
    ],
-   "referenced_type" : "type-1594",
-   "return_type" : "type-1494",
-   "self_type" : "type-1594",
+   "referenced_type" : "type-1597",
+   "return_type" : "type-1495",
+   "self_type" : "type-1597",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -12548,7 +12551,7 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1588"
+     "referenced_type" : "type-1589"
     },
     {
      "referenced_type" : "type-2"
@@ -12560,9 +12563,9 @@
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1592",
-   "return_type" : "type-1494",
-   "self_type" : "type-1592",
+   "referenced_type" : "type-1595",
+   "return_type" : "type-1495",
+   "self_type" : "type-1595",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -12572,18 +12575,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1247"
+     "referenced_type" : "type-1250"
     },
     {
-     "referenced_type" : "type-1037"
+     "referenced_type" : "type-1041"
     },
     {
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1246",
+   "referenced_type" : "type-1249",
    "return_type" : "type-93",
-   "self_type" : "type-1246",
+   "self_type" : "type-1249",
    "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h"
   },
   {
@@ -12593,18 +12596,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1247"
+     "referenced_type" : "type-1250"
     },
     {
-     "referenced_type" : "type-1388"
+     "referenced_type" : "type-1391"
     },
     {
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1387",
+   "referenced_type" : "type-1390",
    "return_type" : "type-93",
-   "self_type" : "type-1387",
+   "self_type" : "type-1390",
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
   {
@@ -12659,7 +12662,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1381"
+     "referenced_type" : "type-1384"
     },
     {
      "referenced_type" : "type-97"
@@ -12677,9 +12680,9 @@
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1380",
+   "referenced_type" : "type-1383",
    "return_type" : "type-9",
-   "self_type" : "type-1380",
+   "self_type" : "type-1383",
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   }
  ],
@@ -12707,7 +12710,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-4500"
+     "referenced_type" : "type-4506"
     }
    ],
    "return_type" : "type-50",
@@ -12735,7 +12738,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1271"
+     "referenced_type" : "type-1275"
     }
    ],
    "return_type" : "type-50",
@@ -13014,7 +13017,7 @@
      "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-2190"
+     "referenced_type" : "type-2193"
     }
    ],
    "return_type" : "type-9",
@@ -13360,7 +13363,7 @@
      "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-2492"
+     "referenced_type" : "type-2495"
     },
     {
      "referenced_type" : "type-4"
@@ -13469,13 +13472,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2522"
+     "referenced_type" : "type-2525"
     },
     {
      "referenced_type" : "type-725"
     }
    ],
-   "return_type" : "type-2525",
+   "return_type" : "type-2528",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -13485,13 +13488,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2522"
+     "referenced_type" : "type-2525"
     },
     {
-     "referenced_type" : "type-1862"
+     "referenced_type" : "type-1866"
     }
    ],
-   "return_type" : "type-2525",
+   "return_type" : "type-2528",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -13502,7 +13505,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2673"
+     "referenced_type" : "type-2676"
     },
     {
      "referenced_type" : "type-11"
@@ -13522,7 +13525,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2673"
+     "referenced_type" : "type-2676"
     },
     {
      "referenced_type" : "type-8"
@@ -13542,7 +13545,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2673"
+     "referenced_type" : "type-2676"
     },
     {
      "referenced_type" : "type-8"
@@ -13562,7 +13565,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2673"
+     "referenced_type" : "type-2676"
     },
     {
      "referenced_type" : "type-8"
@@ -13585,7 +13588,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2673"
+     "referenced_type" : "type-2676"
     },
     {
      "referenced_type" : "type-8"
@@ -13608,7 +13611,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2673"
+     "referenced_type" : "type-2676"
     },
     {
      "referenced_type" : "type-8"
@@ -13631,7 +13634,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2673"
+     "referenced_type" : "type-2676"
     },
     {
      "referenced_type" : "type-8"
@@ -13654,7 +13657,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2676"
+     "referenced_type" : "type-2679"
     },
     {
      "referenced_type" : "type-11"
@@ -13674,7 +13677,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2676"
+     "referenced_type" : "type-2679"
     },
     {
      "referenced_type" : "type-8"
@@ -13694,7 +13697,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2676"
+     "referenced_type" : "type-2679"
     },
     {
      "referenced_type" : "type-8"
@@ -13714,7 +13717,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2676"
+     "referenced_type" : "type-2679"
     },
     {
      "referenced_type" : "type-8"
@@ -13737,7 +13740,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2676"
+     "referenced_type" : "type-2679"
     },
     {
      "referenced_type" : "type-8"
@@ -13760,7 +13763,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2676"
+     "referenced_type" : "type-2679"
     },
     {
      "referenced_type" : "type-8"
@@ -13783,7 +13786,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2676"
+     "referenced_type" : "type-2679"
     },
     {
      "referenced_type" : "type-8"
@@ -13806,7 +13809,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2668"
+     "referenced_type" : "type-2671"
     },
     {
      "referenced_type" : "type-11"
@@ -13826,7 +13829,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2668"
+     "referenced_type" : "type-2671"
     },
     {
      "referenced_type" : "type-8"
@@ -13846,7 +13849,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2668"
+     "referenced_type" : "type-2671"
     },
     {
      "referenced_type" : "type-8"
@@ -13866,7 +13869,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2668"
+     "referenced_type" : "type-2671"
     },
     {
      "referenced_type" : "type-8"
@@ -13889,7 +13892,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2668"
+     "referenced_type" : "type-2671"
     },
     {
      "referenced_type" : "type-8"
@@ -13912,7 +13915,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2668"
+     "referenced_type" : "type-2671"
     },
     {
      "referenced_type" : "type-8"
@@ -13935,7 +13938,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2668"
+     "referenced_type" : "type-2671"
     },
     {
      "referenced_type" : "type-8"
@@ -13957,10 +13960,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2547"
+     "referenced_type" : "type-2550"
     }
    ],
-   "return_type" : "type-2476",
+   "return_type" : "type-2479",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -13970,7 +13973,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2547"
+     "referenced_type" : "type-2550"
     }
    ],
    "return_type" : "type-570",
@@ -13983,10 +13986,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2547"
+     "referenced_type" : "type-2550"
     }
    ],
-   "return_type" : "type-2463",
+   "return_type" : "type-2466",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -13997,18 +14000,18 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1513"
+     "referenced_type" : "type-1517"
     },
     {
-     "referenced_type" : "type-1648"
+     "referenced_type" : "type-1652"
     },
     {
-     "referenced_type" : "type-3128"
+     "referenced_type" : "type-3131"
     }
    ],
    "return_type" : "type-4",
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-3129", "type-83" ]
+   "template_args" : [ "type-3132", "type-83" ]
   },
   {
    "function_name" : "android::Parcel::readNullableStrongBinder",
@@ -14017,15 +14020,15 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1513"
+     "referenced_type" : "type-1517"
     },
     {
-     "referenced_type" : "type-2534"
+     "referenced_type" : "type-2537"
     }
    ],
    "return_type" : "type-4",
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-3130" ]
+   "template_args" : [ "type-3133" ]
   },
   {
    "access" : "protected",
@@ -14035,7 +14038,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-978"
+     "referenced_type" : "type-980"
     },
     {
      "referenced_type" : "type-8"
@@ -14055,7 +14058,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-978"
+     "referenced_type" : "type-980"
     },
     {
      "referenced_type" : "type-8"
@@ -14075,7 +14078,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-978"
+     "referenced_type" : "type-980"
     },
     {
      "referenced_type" : "type-8"
@@ -14098,7 +14101,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-978"
+     "referenced_type" : "type-980"
     },
     {
      "referenced_type" : "type-8"
@@ -14121,7 +14124,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-978"
+     "referenced_type" : "type-980"
     },
     {
      "referenced_type" : "type-8"
@@ -14144,7 +14147,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-978"
+     "referenced_type" : "type-980"
     },
     {
      "referenced_type" : "type-8"
@@ -14167,7 +14170,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1228"
+     "referenced_type" : "type-1232"
     },
     {
      "referenced_type" : "type-8"
@@ -14187,7 +14190,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1228"
+     "referenced_type" : "type-1232"
     },
     {
      "referenced_type" : "type-8"
@@ -14207,7 +14210,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1228"
+     "referenced_type" : "type-1232"
     },
     {
      "referenced_type" : "type-8"
@@ -14230,7 +14233,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1228"
+     "referenced_type" : "type-1232"
     },
     {
      "referenced_type" : "type-8"
@@ -14253,7 +14256,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1228"
+     "referenced_type" : "type-1232"
     },
     {
      "referenced_type" : "type-8"
@@ -14276,7 +14279,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1228"
+     "referenced_type" : "type-1232"
     },
     {
      "referenced_type" : "type-8"
@@ -14299,7 +14302,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2689"
+     "referenced_type" : "type-2692"
     },
     {
      "referenced_type" : "type-8"
@@ -14319,7 +14322,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2689"
+     "referenced_type" : "type-2692"
     },
     {
      "referenced_type" : "type-8"
@@ -14339,7 +14342,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2689"
+     "referenced_type" : "type-2692"
     },
     {
      "referenced_type" : "type-8"
@@ -14362,7 +14365,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2689"
+     "referenced_type" : "type-2692"
     },
     {
      "referenced_type" : "type-8"
@@ -14385,7 +14388,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2689"
+     "referenced_type" : "type-2692"
     },
     {
      "referenced_type" : "type-8"
@@ -14408,7 +14411,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2689"
+     "referenced_type" : "type-2692"
     },
     {
      "referenced_type" : "type-8"
@@ -14445,7 +14448,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-4500"
+     "referenced_type" : "type-4506"
     }
    ],
    "return_type" : "type-50",
@@ -14459,8 +14462,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem &",
    "name" : "android::BufferItem &",
-   "referenced_type" : "type-1224",
-   "self_type" : "type-1223",
+   "referenced_type" : "type-1227",
+   "self_type" : "type-1226",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14468,8 +14471,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem &",
    "name" : "android::BufferItem &",
-   "referenced_type" : "type-3796",
-   "self_type" : "type-3795",
+   "referenced_type" : "type-3802",
+   "self_type" : "type-3801",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14477,8 +14480,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem &",
    "name" : "android::BufferItem &",
-   "referenced_type" : "type-5717",
-   "self_type" : "type-5716",
+   "referenced_type" : "type-5726",
+   "self_type" : "type-5725",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14486,8 +14489,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem &",
    "name" : "android::BufferItem &",
-   "referenced_type" : "type-8033",
-   "self_type" : "type-8032",
+   "referenced_type" : "type-8057",
+   "self_type" : "type-8056",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14495,8 +14498,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem &",
    "name" : "android::BufferItem &",
-   "referenced_type" : "type-8578",
-   "self_type" : "type-8577",
+   "referenced_type" : "type-8605",
+   "self_type" : "type-8604",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14504,8 +14507,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *&",
    "name" : "android::BufferItem *&",
-   "referenced_type" : "type-1669",
-   "self_type" : "type-1853",
+   "referenced_type" : "type-1673",
+   "self_type" : "type-1857",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -14513,8 +14516,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *&",
    "name" : "android::BufferItem *&",
-   "referenced_type" : "type-4124",
-   "self_type" : "type-4132",
+   "referenced_type" : "type-4130",
+   "self_type" : "type-4138",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -14522,8 +14525,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *&",
    "name" : "android::BufferItem *&",
-   "referenced_type" : "type-6045",
-   "self_type" : "type-6053",
+   "referenced_type" : "type-6054",
+   "self_type" : "type-6062",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -14531,8 +14534,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *&",
    "name" : "android::BufferItem *&",
-   "referenced_type" : "type-8871",
-   "self_type" : "type-8885",
+   "referenced_type" : "type-8899",
+   "self_type" : "type-8913",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -14540,8 +14543,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::CompositorTiming &",
    "name" : "android::CompositorTiming &",
-   "referenced_type" : "type-1431",
-   "self_type" : "type-1430",
+   "referenced_type" : "type-1434",
+   "self_type" : "type-1433",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14549,8 +14552,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::CompositorTiming &",
    "name" : "android::CompositorTiming &",
-   "referenced_type" : "type-3961",
-   "self_type" : "type-3960",
+   "referenced_type" : "type-3967",
+   "self_type" : "type-3966",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14558,8 +14561,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::CompositorTiming &",
    "name" : "android::CompositorTiming &",
-   "referenced_type" : "type-5882",
-   "self_type" : "type-5881",
+   "referenced_type" : "type-5891",
+   "self_type" : "type-5890",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14567,8 +14570,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::CompositorTiming &",
    "name" : "android::CompositorTiming &",
-   "referenced_type" : "type-8714",
-   "self_type" : "type-8713",
+   "referenced_type" : "type-8741",
+   "self_type" : "type-8740",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14576,8 +14579,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-2528",
-   "self_type" : "type-2527",
+   "referenced_type" : "type-2531",
+   "self_type" : "type-2530",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14585,8 +14588,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-4415",
-   "self_type" : "type-4414",
+   "referenced_type" : "type-4417",
+   "self_type" : "type-4416",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14594,8 +14597,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-4671",
-   "self_type" : "type-4670",
+   "referenced_type" : "type-4677",
+   "self_type" : "type-4676",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14603,8 +14606,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-4939",
-   "self_type" : "type-4938",
+   "referenced_type" : "type-4945",
+   "self_type" : "type-4944",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14612,8 +14615,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-6312",
-   "self_type" : "type-6311",
+   "referenced_type" : "type-6317",
+   "self_type" : "type-6316",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14621,8 +14624,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-6552",
-   "self_type" : "type-6551",
+   "referenced_type" : "type-6561",
+   "self_type" : "type-6560",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14630,8 +14633,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-7044",
-   "self_type" : "type-7043",
+   "referenced_type" : "type-7052",
+   "self_type" : "type-7051",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14639,8 +14642,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-8175",
-   "self_type" : "type-8174",
+   "referenced_type" : "type-8199",
+   "self_type" : "type-8198",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14648,8 +14651,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-9180",
-   "self_type" : "type-9179",
+   "referenced_type" : "type-9204",
+   "self_type" : "type-9203",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14657,8 +14660,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-9362",
-   "self_type" : "type-9361",
+   "referenced_type" : "type-9389",
+   "self_type" : "type-9388",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14666,8 +14669,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-9474",
-   "self_type" : "type-9473",
+   "referenced_type" : "type-9501",
+   "self_type" : "type-9500",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14675,8 +14678,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot::State &",
    "name" : "android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-4585",
-   "self_type" : "type-4584",
+   "referenced_type" : "type-4591",
+   "self_type" : "type-4590",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14684,8 +14687,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot::State &",
    "name" : "android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-6469",
-   "self_type" : "type-6468",
+   "referenced_type" : "type-6478",
+   "self_type" : "type-6477",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14693,8 +14696,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot::State &",
    "name" : "android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-9382",
-   "self_type" : "type-9381",
+   "referenced_type" : "type-9411",
+   "self_type" : "type-9410",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14703,7 +14706,7 @@
    "linker_set_key" : "android::Flattenable<android::BufferItem> &",
    "name" : "android::Flattenable<android::BufferItem> &",
    "referenced_type" : "type-21",
-   "self_type" : "type-1514",
+   "self_type" : "type-1518",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14712,7 +14715,7 @@
    "linker_set_key" : "android::Flattenable<android::Fence> &",
    "name" : "android::Flattenable<android::Fence> &",
    "referenced_type" : "type-16",
-   "self_type" : "type-1651",
+   "self_type" : "type-1655",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14721,7 +14724,7 @@
    "linker_set_key" : "android::Flattenable<android::FrameEventHistoryDelta> &",
    "name" : "android::Flattenable<android::FrameEventHistoryDelta> &",
    "referenced_type" : "type-25",
-   "self_type" : "type-4324",
+   "self_type" : "type-4330",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14730,7 +14733,7 @@
    "linker_set_key" : "android::Flattenable<android::GraphicBuffer> &",
    "name" : "android::Flattenable<android::GraphicBuffer> &",
    "referenced_type" : "type-14",
-   "self_type" : "type-1650",
+   "self_type" : "type-1654",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14739,7 +14742,7 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> &",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> &",
    "referenced_type" : "type-32",
-   "self_type" : "type-4326",
+   "self_type" : "type-4333",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14748,7 +14751,7 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> &",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> &",
    "referenced_type" : "type-34",
-   "self_type" : "type-4325",
+   "self_type" : "type-4332",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14756,8 +14759,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-2391",
-   "self_type" : "type-2390",
+   "referenced_type" : "type-2394",
+   "self_type" : "type-2393",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14765,8 +14768,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-4217",
-   "self_type" : "type-4216",
+   "referenced_type" : "type-4223",
+   "self_type" : "type-4222",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14774,8 +14777,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-4678",
-   "self_type" : "type-4677",
+   "referenced_type" : "type-4685",
+   "self_type" : "type-4684",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14783,8 +14786,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-4769",
-   "self_type" : "type-4768",
+   "referenced_type" : "type-4775",
+   "self_type" : "type-4774",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14792,8 +14795,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-6138",
-   "self_type" : "type-6137",
+   "referenced_type" : "type-6147",
+   "self_type" : "type-6146",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14801,8 +14804,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-6559",
-   "self_type" : "type-6558",
+   "referenced_type" : "type-6569",
+   "self_type" : "type-6568",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14810,8 +14813,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-6635",
-   "self_type" : "type-6634",
+   "referenced_type" : "type-6644",
+   "self_type" : "type-6643",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14819,8 +14822,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-8149",
-   "self_type" : "type-8148",
+   "referenced_type" : "type-8173",
+   "self_type" : "type-8172",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14828,8 +14831,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-8973",
-   "self_type" : "type-8972",
+   "referenced_type" : "type-9000",
+   "self_type" : "type-8999",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14837,8 +14840,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-8994",
-   "self_type" : "type-8993",
+   "referenced_type" : "type-9022",
+   "self_type" : "type-9021",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14846,8 +14849,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-9481",
-   "self_type" : "type-9480",
+   "referenced_type" : "type-9508",
+   "self_type" : "type-9507",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14855,8 +14858,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1086",
-   "self_type" : "type-1085",
+   "referenced_type" : "type-1089",
+   "self_type" : "type-1088",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14864,8 +14867,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1268",
-   "self_type" : "type-1267",
+   "referenced_type" : "type-1271",
+   "self_type" : "type-1270",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14873,8 +14876,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1410",
-   "self_type" : "type-1409",
+   "referenced_type" : "type-1413",
+   "self_type" : "type-1412",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14882,8 +14885,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1446",
-   "self_type" : "type-1445",
+   "referenced_type" : "type-1449",
+   "self_type" : "type-1448",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14891,8 +14894,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-2172",
-   "self_type" : "type-2171",
+   "referenced_type" : "type-2176",
+   "self_type" : "type-2175",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14900,8 +14903,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3250",
-   "self_type" : "type-3249",
+   "referenced_type" : "type-3253",
+   "self_type" : "type-3252",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14918,8 +14921,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3463",
-   "self_type" : "type-3462",
+   "referenced_type" : "type-3466",
+   "self_type" : "type-3465",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14927,8 +14930,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3528",
-   "self_type" : "type-3527",
+   "referenced_type" : "type-3531",
+   "self_type" : "type-3530",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14936,8 +14939,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3639",
-   "self_type" : "type-3638",
+   "referenced_type" : "type-3642",
+   "self_type" : "type-3641",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14945,8 +14948,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3696",
-   "self_type" : "type-3695",
+   "referenced_type" : "type-3702",
+   "self_type" : "type-3701",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14954,8 +14957,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3821",
-   "self_type" : "type-3820",
+   "referenced_type" : "type-3827",
+   "self_type" : "type-3826",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14963,8 +14966,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3937",
-   "self_type" : "type-3936",
+   "referenced_type" : "type-3943",
+   "self_type" : "type-3942",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14972,8 +14975,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3978",
-   "self_type" : "type-3977",
+   "referenced_type" : "type-3985",
+   "self_type" : "type-3984",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14981,8 +14984,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-4207",
-   "self_type" : "type-4206",
+   "referenced_type" : "type-4214",
+   "self_type" : "type-4213",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14990,8 +14993,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-4386",
-   "self_type" : "type-4385",
+   "referenced_type" : "type-4392",
+   "self_type" : "type-4391",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14999,8 +15002,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-4597",
-   "self_type" : "type-4596",
+   "referenced_type" : "type-4604",
+   "self_type" : "type-4603",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15008,8 +15011,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-4764",
-   "self_type" : "type-4763",
+   "referenced_type" : "type-4771",
+   "self_type" : "type-4770",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15017,8 +15020,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5171",
-   "self_type" : "type-5170",
+   "referenced_type" : "type-5177",
+   "self_type" : "type-5176",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15026,8 +15029,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5384",
-   "self_type" : "type-5383",
+   "referenced_type" : "type-5390",
+   "self_type" : "type-5389",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15035,8 +15038,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5449",
-   "self_type" : "type-5448",
+   "referenced_type" : "type-5455",
+   "self_type" : "type-5454",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15044,8 +15047,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5560",
-   "self_type" : "type-5559",
+   "referenced_type" : "type-5566",
+   "self_type" : "type-5565",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15053,8 +15056,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5617",
-   "self_type" : "type-5616",
+   "referenced_type" : "type-5626",
+   "self_type" : "type-5625",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15062,8 +15065,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5742",
-   "self_type" : "type-5741",
+   "referenced_type" : "type-5751",
+   "self_type" : "type-5750",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15071,8 +15074,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5858",
-   "self_type" : "type-5857",
+   "referenced_type" : "type-5867",
+   "self_type" : "type-5866",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15080,8 +15083,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5899",
-   "self_type" : "type-5898",
+   "referenced_type" : "type-5909",
+   "self_type" : "type-5908",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15089,8 +15092,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6128",
-   "self_type" : "type-6127",
+   "referenced_type" : "type-6138",
+   "self_type" : "type-6137",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15098,8 +15101,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6283",
-   "self_type" : "type-6282",
+   "referenced_type" : "type-6292",
+   "self_type" : "type-6291",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15107,8 +15110,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6481",
-   "self_type" : "type-6480",
+   "referenced_type" : "type-6491",
+   "self_type" : "type-6490",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15116,8 +15119,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6630",
-   "self_type" : "type-6629",
+   "referenced_type" : "type-6640",
+   "self_type" : "type-6639",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15125,8 +15128,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6857",
-   "self_type" : "type-6856",
+   "referenced_type" : "type-6867",
+   "self_type" : "type-6866",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15134,8 +15137,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-7009",
-   "self_type" : "type-7008",
+   "referenced_type" : "type-7018",
+   "self_type" : "type-7017",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15143,8 +15146,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-7100",
-   "self_type" : "type-7099",
+   "referenced_type" : "type-7109",
+   "self_type" : "type-7108",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15152,8 +15155,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-7258",
-   "self_type" : "type-7257",
+   "referenced_type" : "type-7278",
+   "self_type" : "type-7277",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15161,8 +15164,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-7324",
-   "self_type" : "type-7323",
+   "referenced_type" : "type-7344",
+   "self_type" : "type-7343",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15170,8 +15173,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-7487",
-   "self_type" : "type-7486",
+   "referenced_type" : "type-7508",
+   "self_type" : "type-7507",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15188,8 +15191,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-7700",
-   "self_type" : "type-7699",
+   "referenced_type" : "type-7721",
+   "self_type" : "type-7720",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15197,8 +15200,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-7765",
-   "self_type" : "type-7764",
+   "referenced_type" : "type-7786",
+   "self_type" : "type-7785",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15206,8 +15209,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-7876",
-   "self_type" : "type-7875",
+   "referenced_type" : "type-7897",
+   "self_type" : "type-7896",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15215,8 +15218,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-7933",
-   "self_type" : "type-7932",
+   "referenced_type" : "type-7957",
+   "self_type" : "type-7956",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15224,8 +15227,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-8058",
-   "self_type" : "type-8057",
+   "referenced_type" : "type-8082",
+   "self_type" : "type-8081",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15233,8 +15236,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-8218",
-   "self_type" : "type-8217",
+   "referenced_type" : "type-8242",
+   "self_type" : "type-8241",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15242,8 +15245,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-8301",
-   "self_type" : "type-8300",
+   "referenced_type" : "type-8325",
+   "self_type" : "type-8324",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15251,8 +15254,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-8353",
-   "self_type" : "type-8352",
+   "referenced_type" : "type-8377",
+   "self_type" : "type-8376",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15269,8 +15272,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-8447",
-   "self_type" : "type-8446",
+   "referenced_type" : "type-8471",
+   "self_type" : "type-8470",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15278,8 +15281,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-8491",
-   "self_type" : "type-8490",
+   "referenced_type" : "type-8518",
+   "self_type" : "type-8517",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15287,8 +15290,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-8586",
-   "self_type" : "type-8585",
+   "referenced_type" : "type-8614",
+   "self_type" : "type-8613",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15296,8 +15299,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-8692",
-   "self_type" : "type-8691",
+   "referenced_type" : "type-8719",
+   "self_type" : "type-8718",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15305,8 +15308,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-8729",
-   "self_type" : "type-8728",
+   "referenced_type" : "type-8756",
+   "self_type" : "type-8755",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15314,8 +15317,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-8975",
-   "self_type" : "type-8974",
+   "referenced_type" : "type-9002",
+   "self_type" : "type-9001",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15323,8 +15326,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-9147",
-   "self_type" : "type-9146",
+   "referenced_type" : "type-9175",
+   "self_type" : "type-9174",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15332,8 +15335,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-9398",
-   "self_type" : "type-9397",
+   "referenced_type" : "type-9425",
+   "self_type" : "type-9424",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15341,8 +15344,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-9537",
-   "self_type" : "type-9536",
+   "referenced_type" : "type-9564",
+   "self_type" : "type-9563",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15350,8 +15353,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-9759",
-   "self_type" : "type-9758",
+   "referenced_type" : "type-9786",
+   "self_type" : "type-9785",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15431,8 +15434,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-3472",
-   "self_type" : "type-3471",
+   "referenced_type" : "type-3475",
+   "self_type" : "type-3474",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15440,8 +15443,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-4303",
-   "self_type" : "type-4302",
+   "referenced_type" : "type-4309",
+   "self_type" : "type-4308",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15449,8 +15452,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-4755",
-   "self_type" : "type-4754",
+   "referenced_type" : "type-4761",
+   "self_type" : "type-4760",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15458,8 +15461,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-5393",
-   "self_type" : "type-5392",
+   "referenced_type" : "type-5399",
+   "self_type" : "type-5398",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15467,8 +15470,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-6212",
-   "self_type" : "type-6211",
+   "referenced_type" : "type-6221",
+   "self_type" : "type-6220",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15476,8 +15479,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-6622",
-   "self_type" : "type-6621",
+   "referenced_type" : "type-6631",
+   "self_type" : "type-6630",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15494,8 +15497,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-7709",
-   "self_type" : "type-7708",
+   "referenced_type" : "type-7730",
+   "self_type" : "type-7729",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15503,8 +15506,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-8309",
-   "self_type" : "type-8308",
+   "referenced_type" : "type-8333",
+   "self_type" : "type-8332",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15512,8 +15515,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-9070",
-   "self_type" : "type-9069",
+   "referenced_type" : "type-9097",
+   "self_type" : "type-9096",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15521,8 +15524,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-9530",
-   "self_type" : "type-9529",
+   "referenced_type" : "type-9557",
+   "self_type" : "type-9556",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15530,8 +15533,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
-   "referenced_type" : "type-1239",
-   "self_type" : "type-2660",
+   "referenced_type" : "type-1242",
+   "self_type" : "type-2663",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -15540,7 +15543,7 @@
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
    "referenced_type" : "type-121",
-   "self_type" : "type-2654",
+   "self_type" : "type-2657",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -15548,8 +15551,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 *&",
    "name" : "android::String8 *&",
-   "referenced_type" : "type-1885",
-   "self_type" : "type-1884",
+   "referenced_type" : "type-1889",
+   "self_type" : "type-1888",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -15557,8 +15560,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1101",
-   "self_type" : "type-1100",
+   "referenced_type" : "type-1104",
+   "self_type" : "type-1103",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15575,8 +15578,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1237",
-   "self_type" : "type-1236",
+   "referenced_type" : "type-1240",
+   "self_type" : "type-1239",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15584,8 +15587,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1365",
-   "self_type" : "type-1364",
+   "referenced_type" : "type-1368",
+   "self_type" : "type-1367",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15593,8 +15596,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1451",
-   "self_type" : "type-1450",
+   "referenced_type" : "type-1454",
+   "self_type" : "type-1453",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15602,8 +15605,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1524",
-   "self_type" : "type-1523",
+   "referenced_type" : "type-1529",
+   "self_type" : "type-1528",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15611,8 +15614,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1665",
-   "self_type" : "type-1664",
+   "referenced_type" : "type-1669",
+   "self_type" : "type-1668",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15620,8 +15623,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3168",
-   "self_type" : "type-3167",
+   "referenced_type" : "type-3171",
+   "self_type" : "type-3170",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15629,8 +15632,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3532",
-   "self_type" : "type-3531",
+   "referenced_type" : "type-3535",
+   "self_type" : "type-3534",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15638,8 +15641,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3643",
-   "self_type" : "type-3642",
+   "referenced_type" : "type-3646",
+   "self_type" : "type-3645",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15647,8 +15650,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3705",
-   "self_type" : "type-3704",
+   "referenced_type" : "type-3711",
+   "self_type" : "type-3710",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15656,8 +15659,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3806",
-   "self_type" : "type-3805",
+   "referenced_type" : "type-3812",
+   "self_type" : "type-3811",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15665,8 +15668,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3911",
-   "self_type" : "type-3910",
+   "referenced_type" : "type-3918",
+   "self_type" : "type-3917",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15674,8 +15677,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3984",
-   "self_type" : "type-3983",
+   "referenced_type" : "type-3990",
+   "self_type" : "type-3989",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15683,8 +15686,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4036",
-   "self_type" : "type-4035",
+   "referenced_type" : "type-4042",
+   "self_type" : "type-4041",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15692,8 +15695,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4121",
-   "self_type" : "type-4120",
+   "referenced_type" : "type-4127",
+   "self_type" : "type-4126",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15701,8 +15704,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4345",
-   "self_type" : "type-4344",
+   "referenced_type" : "type-4351",
+   "self_type" : "type-4350",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15710,8 +15713,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4484",
-   "self_type" : "type-4483",
+   "referenced_type" : "type-4490",
+   "self_type" : "type-4489",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15719,8 +15722,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4531",
-   "self_type" : "type-4530",
+   "referenced_type" : "type-4537",
+   "self_type" : "type-4536",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15728,8 +15731,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4553",
-   "self_type" : "type-4552",
+   "referenced_type" : "type-4559",
+   "self_type" : "type-4558",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15737,8 +15740,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4592",
-   "self_type" : "type-4591",
+   "referenced_type" : "type-4599",
+   "self_type" : "type-4598",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15746,8 +15749,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4771",
-   "self_type" : "type-4770",
+   "referenced_type" : "type-4777",
+   "self_type" : "type-4776",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15755,8 +15758,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4858",
-   "self_type" : "type-4857",
+   "referenced_type" : "type-4864",
+   "self_type" : "type-4863",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15764,8 +15767,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5089",
-   "self_type" : "type-5088",
+   "referenced_type" : "type-5095",
+   "self_type" : "type-5094",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15773,8 +15776,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5453",
-   "self_type" : "type-5452",
+   "referenced_type" : "type-5459",
+   "self_type" : "type-5458",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15782,8 +15785,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5564",
-   "self_type" : "type-5563",
+   "referenced_type" : "type-5570",
+   "self_type" : "type-5569",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15791,8 +15794,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5626",
-   "self_type" : "type-5625",
+   "referenced_type" : "type-5635",
+   "self_type" : "type-5634",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15800,8 +15803,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5727",
-   "self_type" : "type-5726",
+   "referenced_type" : "type-5736",
+   "self_type" : "type-5735",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15809,8 +15812,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5832",
-   "self_type" : "type-5831",
+   "referenced_type" : "type-5842",
+   "self_type" : "type-5841",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15818,8 +15821,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5905",
-   "self_type" : "type-5904",
+   "referenced_type" : "type-5914",
+   "self_type" : "type-5913",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15827,8 +15830,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5957",
-   "self_type" : "type-5956",
+   "referenced_type" : "type-5966",
+   "self_type" : "type-5965",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15836,8 +15839,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6042",
-   "self_type" : "type-6041",
+   "referenced_type" : "type-6051",
+   "self_type" : "type-6050",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15845,8 +15848,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6245",
-   "self_type" : "type-6244",
+   "referenced_type" : "type-6254",
+   "self_type" : "type-6253",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15854,8 +15857,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6370",
-   "self_type" : "type-6369",
+   "referenced_type" : "type-6379",
+   "self_type" : "type-6378",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15863,8 +15866,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6415",
-   "self_type" : "type-6414",
+   "referenced_type" : "type-6424",
+   "self_type" : "type-6423",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15872,8 +15875,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6437",
-   "self_type" : "type-6436",
+   "referenced_type" : "type-6446",
+   "self_type" : "type-6445",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15881,8 +15884,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6476",
-   "self_type" : "type-6475",
+   "referenced_type" : "type-6486",
+   "self_type" : "type-6485",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15890,8 +15893,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6637",
-   "self_type" : "type-6636",
+   "referenced_type" : "type-6646",
+   "self_type" : "type-6645",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15899,8 +15902,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6722",
-   "self_type" : "type-6721",
+   "referenced_type" : "type-6731",
+   "self_type" : "type-6730",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15908,8 +15911,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6748",
-   "self_type" : "type-6747",
+   "referenced_type" : "type-6757",
+   "self_type" : "type-6756",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15917,8 +15920,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6854",
-   "self_type" : "type-6853",
+   "referenced_type" : "type-6864",
+   "self_type" : "type-6863",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15926,8 +15929,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6885",
-   "self_type" : "type-6884",
+   "referenced_type" : "type-6895",
+   "self_type" : "type-6894",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15935,8 +15938,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7007",
-   "self_type" : "type-7006",
+   "referenced_type" : "type-7015",
+   "self_type" : "type-7014",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15944,8 +15947,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7067",
-   "self_type" : "type-7066",
+   "referenced_type" : "type-7075",
+   "self_type" : "type-7074",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15953,8 +15956,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7105",
-   "self_type" : "type-7104",
+   "referenced_type" : "type-7113",
+   "self_type" : "type-7112",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15962,8 +15965,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7256",
-   "self_type" : "type-7255",
+   "referenced_type" : "type-7276",
+   "self_type" : "type-7275",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15971,8 +15974,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7294",
-   "self_type" : "type-7293",
+   "referenced_type" : "type-7314",
+   "self_type" : "type-7313",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15980,8 +15983,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7330",
-   "self_type" : "type-7329",
+   "referenced_type" : "type-7350",
+   "self_type" : "type-7349",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15989,8 +15992,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7405",
-   "self_type" : "type-7404",
+   "referenced_type" : "type-7426",
+   "self_type" : "type-7425",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15998,8 +16001,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7769",
-   "self_type" : "type-7768",
+   "referenced_type" : "type-7790",
+   "self_type" : "type-7789",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16007,8 +16010,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7880",
-   "self_type" : "type-7879",
+   "referenced_type" : "type-7901",
+   "self_type" : "type-7900",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16016,8 +16019,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7942",
-   "self_type" : "type-7941",
+   "referenced_type" : "type-7966",
+   "self_type" : "type-7965",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16025,8 +16028,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-8043",
-   "self_type" : "type-8042",
+   "referenced_type" : "type-8067",
+   "self_type" : "type-8066",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16034,8 +16037,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-8211",
-   "self_type" : "type-8210",
+   "referenced_type" : "type-8235",
+   "self_type" : "type-8234",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16043,8 +16046,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-8357",
-   "self_type" : "type-8356",
+   "referenced_type" : "type-8381",
+   "self_type" : "type-8380",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16061,8 +16064,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-8453",
-   "self_type" : "type-8452",
+   "referenced_type" : "type-8477",
+   "self_type" : "type-8476",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16070,8 +16073,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-8497",
-   "self_type" : "type-8496",
+   "referenced_type" : "type-8524",
+   "self_type" : "type-8523",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16079,8 +16082,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-8580",
-   "self_type" : "type-8579",
+   "referenced_type" : "type-8607",
+   "self_type" : "type-8606",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16088,8 +16091,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-8666",
-   "self_type" : "type-8665",
+   "referenced_type" : "type-8693",
+   "self_type" : "type-8692",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16097,8 +16100,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-8734",
-   "self_type" : "type-8733",
+   "referenced_type" : "type-8761",
+   "self_type" : "type-8760",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16106,8 +16109,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-8786",
-   "self_type" : "type-8785",
+   "referenced_type" : "type-8815",
+   "self_type" : "type-8814",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16115,8 +16118,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-8869",
-   "self_type" : "type-8868",
+   "referenced_type" : "type-8897",
+   "self_type" : "type-8896",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16124,8 +16127,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-9103",
-   "self_type" : "type-9102",
+   "referenced_type" : "type-9131",
+   "self_type" : "type-9130",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16133,8 +16136,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-9246",
-   "self_type" : "type-9245",
+   "referenced_type" : "type-9275",
+   "self_type" : "type-9274",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16142,8 +16145,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-9305",
-   "self_type" : "type-9304",
+   "referenced_type" : "type-9333",
+   "self_type" : "type-9332",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16151,8 +16154,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-9335",
-   "self_type" : "type-9334",
+   "referenced_type" : "type-9364",
+   "self_type" : "type-9363",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16160,8 +16163,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-9391",
-   "self_type" : "type-9390",
+   "referenced_type" : "type-9421",
+   "self_type" : "type-9420",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16169,8 +16172,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-9542",
-   "self_type" : "type-9541",
+   "referenced_type" : "type-9569",
+   "self_type" : "type-9568",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16178,8 +16181,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-9620",
-   "self_type" : "type-9619",
+   "referenced_type" : "type-9648",
+   "self_type" : "type-9647",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16187,8 +16190,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-9656",
-   "self_type" : "type-9655",
+   "referenced_type" : "type-9683",
+   "self_type" : "type-9682",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16196,8 +16199,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-9756",
-   "self_type" : "type-9755",
+   "referenced_type" : "type-9784",
+   "self_type" : "type-9783",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16205,8 +16208,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-9785",
-   "self_type" : "type-9784",
+   "referenced_type" : "type-9813",
+   "self_type" : "type-9812",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16232,8 +16235,8 @@
    "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",
+   "referenced_type" : "type-6779",
+   "self_type" : "type-6782",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16241,24 +16244,6 @@
    "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,
@@ -16266,8 +16251,8 @@
   },
   {
    "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> > &",
+   "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-4494",
    "self_type" : "type-4497",
    "size" : 4,
@@ -16275,10 +16260,28 @@
   },
   {
    "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-4371",
+   "self_type" : "type-4374",
+   "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-4500",
+   "self_type" : "type-4503",
+   "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-4356",
+   "referenced_type" : "type-4359",
+   "self_type" : "type-4362",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16295,8 +16298,8 @@
    "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",
+   "referenced_type" : "type-6783",
+   "self_type" : "type-6786",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16322,8 +16325,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1383",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1386",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16331,8 +16334,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-3921",
-   "self_type" : "type-3920",
+   "referenced_type" : "type-3927",
+   "self_type" : "type-3926",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16340,8 +16343,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-5842",
-   "self_type" : "type-5841",
+   "referenced_type" : "type-5851",
+   "self_type" : "type-5850",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16349,8 +16352,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-8675",
-   "self_type" : "type-8674",
+   "referenced_type" : "type-8703",
+   "self_type" : "type-8702",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16368,7 +16371,7 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> > &",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> > &",
    "referenced_type" : "type-381",
-   "self_type" : "type-6896",
+   "self_type" : "type-6905",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16377,7 +16380,7 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect> &",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect> &",
    "referenced_type" : "type-372",
-   "self_type" : "type-4594",
+   "self_type" : "type-4600",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16386,7 +16389,7 @@
    "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-4347",
+   "self_type" : "type-4353",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16395,7 +16398,7 @@
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming &",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming &",
    "referenced_type" : "type-588",
-   "self_type" : "type-4586",
+   "self_type" : "type-4592",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16404,7 +16407,7 @@
    "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-4590",
+   "self_type" : "type-4597",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16413,7 +16416,7 @@
    "linker_set_key" : "android::hardware::hidl_array<int, 4> &",
    "name" : "android::hardware::hidl_array<int, 4> &",
    "referenced_type" : "type-384",
-   "self_type" : "type-6897",
+   "self_type" : "type-7114",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16431,7 +16434,7 @@
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> &",
    "name" : "android::hardware::hidl_vec<unsigned char> &",
    "referenced_type" : "type-452",
-   "self_type" : "type-4379",
+   "self_type" : "type-4385",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16440,7 +16443,7 @@
    "linker_set_key" : "android::hardware::media::V1_0::Rect &",
    "name" : "android::hardware::media::V1_0::Rect &",
    "referenced_type" : "type-375",
-   "self_type" : "type-4598",
+   "self_type" : "type-4605",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16449,7 +16452,7 @@
    "linker_set_key" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > &",
    "name" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > &",
    "referenced_type" : "type-160",
-   "self_type" : "type-2642",
+   "self_type" : "type-2645",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16458,7 +16461,7 @@
    "linker_set_key" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > &",
    "name" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > &",
    "referenced_type" : "type-147",
-   "self_type" : "type-2638",
+   "self_type" : "type-2641",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16467,7 +16470,7 @@
    "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int> &",
    "name" : "android::key_value_pair_t<unsigned int, unsigned int> &",
    "referenced_type" : "type-143",
-   "self_type" : "type-2637",
+   "self_type" : "type-2640",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16476,7 +16479,7 @@
    "linker_set_key" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > &",
    "name" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > &",
    "referenced_type" : "type-581",
-   "self_type" : "type-2512",
+   "self_type" : "type-2515",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16485,7 +16488,7 @@
    "linker_set_key" : "android::sp<android::ALooper> &",
    "name" : "android::sp<android::ALooper> &",
    "referenced_type" : "type-321",
-   "self_type" : "type-2266",
+   "self_type" : "type-2269",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16494,7 +16497,7 @@
    "linker_set_key" : "android::sp<android::AMessage> &",
    "name" : "android::sp<android::AMessage> &",
    "referenced_type" : "type-259",
-   "self_type" : "type-2077",
+   "self_type" : "type-2068",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16503,7 +16506,7 @@
    "linker_set_key" : "android::sp<android::ComponentWrapper> &",
    "name" : "android::sp<android::ComponentWrapper> &",
    "referenced_type" : "type-567",
-   "self_type" : "type-2490",
+   "self_type" : "type-2493",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16511,8 +16514,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::Fence> &",
    "name" : "android::sp<android::Fence> &",
-   "referenced_type" : "type-1864",
-   "self_type" : "type-2525",
+   "referenced_type" : "type-1868",
+   "self_type" : "type-2528",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16521,7 +16524,7 @@
    "linker_set_key" : "android::sp<android::FrameDropper> &",
    "name" : "android::sp<android::FrameDropper> &",
    "referenced_type" : "type-578",
-   "self_type" : "type-2505",
+   "self_type" : "type-2508",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16539,7 +16542,7 @@
    "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy> &",
    "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy> &",
    "referenced_type" : "type-473",
-   "self_type" : "type-2497",
+   "self_type" : "type-2500",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16547,8 +16550,8 @@
    "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",
+   "referenced_type" : "type-4265",
+   "self_type" : "type-4268",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16556,8 +16559,8 @@
    "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",
+   "referenced_type" : "type-4274",
+   "self_type" : "type-4277",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16565,8 +16568,8 @@
    "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",
+   "referenced_type" : "type-4833",
+   "self_type" : "type-4844",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16574,8 +16577,8 @@
    "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",
+   "referenced_type" : "type-7038",
+   "self_type" : "type-7048",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16628,8 +16631,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::NativeHandle> *&",
    "name" : "android::sp<android::NativeHandle> *&",
-   "referenced_type" : "type-1880",
-   "self_type" : "type-1879",
+   "referenced_type" : "type-1884",
+   "self_type" : "type-1883",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16637,8 +16640,8 @@
    "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",
+   "referenced_type" : "type-2473",
+   "self_type" : "type-6916",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16656,7 +16659,7 @@
    "linker_set_key" : "android::wp<android::IBinder::DeathRecipient> &",
    "name" : "android::wp<android::IBinder::DeathRecipient> &",
    "referenced_type" : "type-172",
-   "self_type" : "type-4304",
+   "self_type" : "type-4310",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16665,7 +16668,7 @@
    "linker_set_key" : "android_cta861_3_metadata &",
    "name" : "android_cta861_3_metadata &",
    "referenced_type" : "type-305",
-   "self_type" : "type-1476",
+   "self_type" : "type-1480",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16683,7 +16686,7 @@
    "linker_set_key" : "android_smpte2086_metadata &",
    "name" : "android_smpte2086_metadata &",
    "referenced_type" : "type-304",
-   "self_type" : "type-1475",
+   "self_type" : "type-1479",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16700,8 +16703,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AString &",
    "name" : "const android::AString &",
-   "referenced_type" : "type-2110",
-   "self_type" : "type-2241",
+   "referenced_type" : "type-2101",
+   "self_type" : "type-2244",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -16709,8 +16712,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-1219",
-   "self_type" : "type-1222",
+   "referenced_type" : "type-1223",
+   "self_type" : "type-1225",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16718,8 +16721,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-1530",
-   "self_type" : "type-1532",
+   "referenced_type" : "type-1533",
+   "self_type" : "type-1535",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16727,8 +16730,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-1671",
-   "self_type" : "type-1673",
+   "referenced_type" : "type-1675",
+   "self_type" : "type-1677",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16736,8 +16739,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-3441",
-   "self_type" : "type-3443",
+   "referenced_type" : "type-3444",
+   "self_type" : "type-3446",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -16745,8 +16748,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-3633",
-   "self_type" : "type-3637",
+   "referenced_type" : "type-3636",
+   "self_type" : "type-3640",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16754,8 +16757,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-3791",
-   "self_type" : "type-3794",
+   "referenced_type" : "type-3798",
+   "self_type" : "type-3800",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16763,8 +16766,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-4040",
-   "self_type" : "type-4043",
+   "referenced_type" : "type-4047",
+   "self_type" : "type-4049",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16772,8 +16775,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-4126",
-   "self_type" : "type-4128",
+   "referenced_type" : "type-4132",
+   "self_type" : "type-4134",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16781,8 +16784,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-5362",
-   "self_type" : "type-5364",
+   "referenced_type" : "type-5368",
+   "self_type" : "type-5370",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -16790,8 +16793,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-5554",
-   "self_type" : "type-5558",
+   "referenced_type" : "type-5560",
+   "self_type" : "type-5564",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16799,8 +16802,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-5712",
-   "self_type" : "type-5715",
+   "referenced_type" : "type-5722",
+   "self_type" : "type-5724",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16808,8 +16811,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-5961",
-   "self_type" : "type-5964",
+   "referenced_type" : "type-5971",
+   "self_type" : "type-5973",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16817,8 +16820,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-6047",
-   "self_type" : "type-6049",
+   "referenced_type" : "type-6056",
+   "self_type" : "type-6058",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16835,8 +16838,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-7678",
-   "self_type" : "type-7680",
+   "referenced_type" : "type-7699",
+   "self_type" : "type-7701",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -16844,8 +16847,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-7870",
-   "self_type" : "type-7874",
+   "referenced_type" : "type-7891",
+   "self_type" : "type-7895",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16853,8 +16856,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-8028",
-   "self_type" : "type-8031",
+   "referenced_type" : "type-8053",
+   "self_type" : "type-8055",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16862,8 +16865,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-8282",
-   "self_type" : "type-8284",
+   "referenced_type" : "type-8306",
+   "self_type" : "type-8308",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -16871,8 +16874,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-8441",
-   "self_type" : "type-8445",
+   "referenced_type" : "type-8465",
+   "self_type" : "type-8469",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16880,8 +16883,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-8574",
-   "self_type" : "type-8576",
+   "referenced_type" : "type-8601",
+   "self_type" : "type-8603",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16889,8 +16892,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-8792",
-   "self_type" : "type-8794",
+   "referenced_type" : "type-8819",
+   "self_type" : "type-8821",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16898,8 +16901,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-8874",
-   "self_type" : "type-8876",
+   "referenced_type" : "type-8901",
+   "self_type" : "type-8903",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16916,8 +16919,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::CompositorTiming &",
    "name" : "const android::CompositorTiming &",
-   "referenced_type" : "type-1424",
-   "self_type" : "type-1426",
+   "referenced_type" : "type-1427",
+   "self_type" : "type-1429",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16925,8 +16928,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::CompositorTiming &",
    "name" : "const android::CompositorTiming &",
-   "referenced_type" : "type-3952",
-   "self_type" : "type-3954",
+   "referenced_type" : "type-3960",
+   "self_type" : "type-3962",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16934,8 +16937,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::CompositorTiming &",
    "name" : "const android::CompositorTiming &",
-   "referenced_type" : "type-5873",
-   "self_type" : "type-5875",
+   "referenced_type" : "type-5884",
+   "self_type" : "type-5886",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16943,8 +16946,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::CompositorTiming &",
    "name" : "const android::CompositorTiming &",
-   "referenced_type" : "type-8707",
-   "self_type" : "type-8709",
+   "referenced_type" : "type-8734",
+   "self_type" : "type-8736",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16952,8 +16955,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-4579",
-   "self_type" : "type-4581",
+   "referenced_type" : "type-4585",
+   "self_type" : "type-4587",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16961,8 +16964,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-4747",
-   "self_type" : "type-4749",
+   "referenced_type" : "type-4754",
+   "self_type" : "type-4756",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16970,8 +16973,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-6463",
-   "self_type" : "type-6465",
+   "referenced_type" : "type-6472",
+   "self_type" : "type-6474",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16979,8 +16982,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-6615",
-   "self_type" : "type-6617",
+   "referenced_type" : "type-6625",
+   "self_type" : "type-6627",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16988,8 +16991,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-9376",
-   "self_type" : "type-9378",
+   "referenced_type" : "type-9405",
+   "self_type" : "type-9407",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16997,8 +17000,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-9524",
-   "self_type" : "type-9526",
+   "referenced_type" : "type-9551",
+   "self_type" : "type-9553",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17006,8 +17009,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Flattenable<android::BufferItem> &",
    "name" : "const android::Flattenable<android::BufferItem> &",
-   "referenced_type" : "type-1506",
-   "self_type" : "type-1512",
+   "referenced_type" : "type-1509",
+   "self_type" : "type-1516",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17015,8 +17018,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Flattenable<android::Fence> &",
    "name" : "const android::Flattenable<android::Fence> &",
-   "referenced_type" : "type-1634",
-   "self_type" : "type-1647",
+   "referenced_type" : "type-1638",
+   "self_type" : "type-1650",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17024,8 +17027,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Flattenable<android::FrameEventHistoryDelta> &",
    "name" : "const android::Flattenable<android::FrameEventHistoryDelta> &",
-   "referenced_type" : "type-4306",
-   "self_type" : "type-4322",
+   "referenced_type" : "type-4312",
+   "self_type" : "type-4328",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17033,8 +17036,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Flattenable<android::GraphicBuffer> &",
    "name" : "const android::Flattenable<android::GraphicBuffer> &",
-   "referenced_type" : "type-1638",
-   "self_type" : "type-1646",
+   "referenced_type" : "type-1643",
+   "self_type" : "type-1649",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17042,8 +17045,8 @@
    "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",
+   "referenced_type" : "type-4315",
+   "self_type" : "type-4327",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17051,8 +17054,8 @@
    "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",
+   "referenced_type" : "type-4318",
+   "self_type" : "type-4329",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17114,8 +17117,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel &",
    "name" : "const android::Parcel &",
-   "referenced_type" : "type-4533",
-   "self_type" : "type-4532",
+   "referenced_type" : "type-4539",
+   "self_type" : "type-4538",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17123,8 +17126,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel &",
    "name" : "const android::Parcel &",
-   "referenced_type" : "type-6417",
-   "self_type" : "type-6416",
+   "referenced_type" : "type-6426",
+   "self_type" : "type-6425",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17132,8 +17135,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel &",
    "name" : "const android::Parcel &",
-   "referenced_type" : "type-9308",
-   "self_type" : "type-9307",
+   "referenced_type" : "type-9335",
+   "self_type" : "type-9334",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17150,8 +17153,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-1215",
-   "self_type" : "type-1217",
+   "referenced_type" : "type-1218",
+   "self_type" : "type-1220",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17159,8 +17162,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-1490",
-   "self_type" : "type-1492",
+   "referenced_type" : "type-1493",
+   "self_type" : "type-1496",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17168,8 +17171,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-1621",
-   "self_type" : "type-1623",
+   "referenced_type" : "type-1624",
+   "self_type" : "type-1626",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17177,8 +17180,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-2683",
-   "self_type" : "type-2685",
+   "referenced_type" : "type-2686",
+   "self_type" : "type-2688",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17186,8 +17189,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-3466",
-   "self_type" : "type-3468",
+   "referenced_type" : "type-3469",
+   "self_type" : "type-3471",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17195,8 +17198,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-3787",
-   "self_type" : "type-3789",
+   "referenced_type" : "type-3793",
+   "self_type" : "type-3795",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17204,8 +17207,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-4011",
-   "self_type" : "type-4013",
+   "referenced_type" : "type-4017",
+   "self_type" : "type-4019",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17213,8 +17216,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-4090",
-   "self_type" : "type-4092",
+   "referenced_type" : "type-4096",
+   "self_type" : "type-4098",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17222,8 +17225,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-4292",
-   "self_type" : "type-4294",
+   "referenced_type" : "type-4298",
+   "self_type" : "type-4300",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17231,8 +17234,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-4572",
-   "self_type" : "type-4574",
+   "referenced_type" : "type-4578",
+   "self_type" : "type-4580",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17240,8 +17243,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-4736",
-   "self_type" : "type-4738",
+   "referenced_type" : "type-4743",
+   "self_type" : "type-4745",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17249,8 +17252,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-5019",
-   "self_type" : "type-5021",
+   "referenced_type" : "type-5025",
+   "self_type" : "type-5027",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17258,8 +17261,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-5387",
-   "self_type" : "type-5389",
+   "referenced_type" : "type-5393",
+   "self_type" : "type-5395",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17267,8 +17270,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-5708",
-   "self_type" : "type-5710",
+   "referenced_type" : "type-5717",
+   "self_type" : "type-5719",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17276,8 +17279,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-5932",
-   "self_type" : "type-5934",
+   "referenced_type" : "type-5941",
+   "self_type" : "type-5943",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17285,8 +17288,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-6011",
-   "self_type" : "type-6013",
+   "referenced_type" : "type-6020",
+   "self_type" : "type-6022",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17294,8 +17297,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-6201",
-   "self_type" : "type-6203",
+   "referenced_type" : "type-6210",
+   "self_type" : "type-6212",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17303,8 +17306,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-6456",
-   "self_type" : "type-6458",
+   "referenced_type" : "type-6465",
+   "self_type" : "type-6467",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17312,8 +17315,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-6605",
-   "self_type" : "type-6607",
+   "referenced_type" : "type-6615",
+   "self_type" : "type-6617",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17321,8 +17324,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-6836",
-   "self_type" : "type-6839",
+   "referenced_type" : "type-6846",
+   "self_type" : "type-6849",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17330,8 +17333,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-6990",
-   "self_type" : "type-6992",
+   "referenced_type" : "type-6999",
+   "self_type" : "type-7001",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17339,8 +17342,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-7221",
-   "self_type" : "type-7223",
+   "referenced_type" : "type-7230",
+   "self_type" : "type-7232",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17348,8 +17351,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-7241",
-   "self_type" : "type-7243",
+   "referenced_type" : "type-7262",
+   "self_type" : "type-7265",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17366,8 +17369,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-7703",
-   "self_type" : "type-7705",
+   "referenced_type" : "type-7724",
+   "self_type" : "type-7726",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17375,8 +17378,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-8024",
-   "self_type" : "type-8026",
+   "referenced_type" : "type-8048",
+   "self_type" : "type-8050",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17384,8 +17387,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-8206",
-   "self_type" : "type-8208",
+   "referenced_type" : "type-8230",
+   "self_type" : "type-8232",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17393,8 +17396,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-8305",
-   "self_type" : "type-8307",
+   "referenced_type" : "type-8329",
+   "self_type" : "type-8331",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17402,8 +17405,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-8570",
-   "self_type" : "type-8572",
+   "referenced_type" : "type-8597",
+   "self_type" : "type-8599",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17411,8 +17414,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-8760",
-   "self_type" : "type-8762",
+   "referenced_type" : "type-8788",
+   "self_type" : "type-8790",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17420,8 +17423,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-8839",
-   "self_type" : "type-8841",
+   "referenced_type" : "type-8866",
+   "self_type" : "type-8868",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17429,8 +17432,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-9057",
-   "self_type" : "type-9060",
+   "referenced_type" : "type-9085",
+   "self_type" : "type-9087",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17438,8 +17441,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-9368",
-   "self_type" : "type-9370",
+   "referenced_type" : "type-9396",
+   "self_type" : "type-9398",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17447,8 +17450,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-9515",
-   "self_type" : "type-9517",
+   "referenced_type" : "type-9542",
+   "self_type" : "type-9544",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17456,8 +17459,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-9739",
-   "self_type" : "type-9741",
+   "referenced_type" : "type-9766",
+   "self_type" : "type-9768",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17465,8 +17468,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-9840",
-   "self_type" : "type-9843",
+   "referenced_type" : "type-9863",
+   "self_type" : "type-9869",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17474,8 +17477,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SafeInterface::ParcelHandler &",
    "name" : "const android::SafeInterface::ParcelHandler &",
-   "referenced_type" : "type-1256",
-   "self_type" : "type-1675",
+   "referenced_type" : "type-1254",
+   "self_type" : "type-1680",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -17483,8 +17486,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-1248",
-   "self_type" : "type-1247",
+   "referenced_type" : "type-1251",
+   "self_type" : "type-1250",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -17492,8 +17495,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 &",
    "name" : "const android::String8 &",
-   "referenced_type" : "type-1875",
-   "self_type" : "type-1874",
+   "referenced_type" : "type-1879",
+   "self_type" : "type-1878",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -17510,8 +17513,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1385",
-   "self_type" : "type-1386",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1389",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -17546,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-4348",
-   "self_type" : "type-4570",
+   "referenced_type" : "type-4354",
+   "self_type" : "type-4576",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17555,8 +17558,8 @@
    "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-4582",
-   "self_type" : "type-4583",
+   "referenced_type" : "type-4588",
+   "self_type" : "type-4589",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17663,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-2619",
-   "self_type" : "type-2620",
+   "referenced_type" : "type-2622",
+   "self_type" : "type-2623",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17672,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-2617",
-   "self_type" : "type-2618",
+   "referenced_type" : "type-2620",
+   "self_type" : "type-2621",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17681,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-2613",
-   "self_type" : "type-2614",
+   "referenced_type" : "type-2616",
+   "self_type" : "type-2617",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17690,8 +17693,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-2409",
-   "self_type" : "type-2408",
+   "referenced_type" : "type-2412",
+   "self_type" : "type-2411",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -17699,8 +17702,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-4845",
-   "self_type" : "type-4844",
+   "referenced_type" : "type-4851",
+   "self_type" : "type-4850",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -17708,8 +17711,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-6709",
-   "self_type" : "type-6708",
+   "referenced_type" : "type-6718",
+   "self_type" : "type-6717",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -17717,8 +17720,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-8154",
-   "self_type" : "type-8156",
+   "referenced_type" : "type-8178",
+   "self_type" : "type-8180",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -17726,8 +17729,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-8989",
-   "self_type" : "type-8988",
+   "referenced_type" : "type-9016",
+   "self_type" : "type-9015",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -17735,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-1304",
-   "self_type" : "type-1486",
+   "referenced_type" : "type-1301",
+   "self_type" : "type-1489",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17753,8 +17756,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::AMessage> &",
    "name" : "const android::sp<android::AMessage> &",
-   "referenced_type" : "type-2175",
-   "self_type" : "type-2190",
+   "referenced_type" : "type-2174",
+   "self_type" : "type-2193",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17762,8 +17765,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::BpGraphicBufferProducer> &",
    "name" : "const android::sp<android::BpGraphicBufferProducer> &",
-   "referenced_type" : "type-4227",
-   "self_type" : "type-4232",
+   "referenced_type" : "type-4233",
+   "self_type" : "type-4238",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17771,8 +17774,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::BpProducerListener> &",
    "name" : "const android::sp<android::BpProducerListener> &",
-   "referenced_type" : "type-4516",
-   "self_type" : "type-4517",
+   "referenced_type" : "type-4522",
+   "self_type" : "type-4523",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17789,8 +17792,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::ComponentWrapper> &",
    "name" : "const android::sp<android::ComponentWrapper> &",
-   "referenced_type" : "type-2491",
-   "self_type" : "type-2492",
+   "referenced_type" : "type-2494",
+   "self_type" : "type-2495",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17798,8 +17801,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::Fence> &",
    "name" : "const android::sp<android::Fence> &",
-   "referenced_type" : "type-1863",
-   "self_type" : "type-1862",
+   "referenced_type" : "type-1867",
+   "self_type" : "type-1866",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17807,8 +17810,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::GraphicBuffer> &",
    "name" : "const android::sp<android::GraphicBuffer> &",
-   "referenced_type" : "type-1196",
-   "self_type" : "type-1859",
+   "referenced_type" : "type-1200",
+   "self_type" : "type-1864",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17825,8 +17828,8 @@
    "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",
+   "referenced_type" : "type-4270",
+   "self_type" : "type-4396",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17834,8 +17837,8 @@
    "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",
+   "referenced_type" : "type-4279",
+   "self_type" : "type-4397",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17843,8 +17846,8 @@
    "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",
+   "referenced_type" : "type-4832",
+   "self_type" : "type-4837",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17852,8 +17855,8 @@
    "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",
+   "referenced_type" : "type-7037",
+   "self_type" : "type-7043",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17861,8 +17864,8 @@
    "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",
+   "referenced_type" : "type-4306",
+   "self_type" : "type-4307",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17870,8 +17873,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IBinder> &",
    "name" : "const android::sp<android::IBinder> &",
-   "referenced_type" : "type-1036",
-   "self_type" : "type-1037",
+   "referenced_type" : "type-1040",
+   "self_type" : "type-1041",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17897,8 +17900,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer> &",
    "name" : "const android::sp<android::IGraphicBufferProducer> &",
-   "referenced_type" : "type-2485",
-   "self_type" : "type-2486",
+   "referenced_type" : "type-2488",
+   "self_type" : "type-2489",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17915,8 +17918,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::ITransactionCompletedListener> &",
    "name" : "const android::sp<android::ITransactionCompletedListener> &",
-   "referenced_type" : "type-1046",
-   "self_type" : "type-1047",
+   "referenced_type" : "type-1049",
+   "self_type" : "type-1050",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17933,8 +17936,8 @@
    "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",
+   "referenced_type" : "type-1392",
+   "self_type" : "type-1391",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -17942,8 +17945,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-2468",
-   "self_type" : "type-4222",
+   "referenced_type" : "type-2471",
+   "self_type" : "type-4228",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17951,8 +17954,8 @@
    "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-2458",
-   "self_type" : "type-4510",
+   "referenced_type" : "type-2461",
+   "self_type" : "type-4516",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17960,8 +17963,8 @@
    "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",
+   "referenced_type" : "type-4245",
+   "self_type" : "type-4250",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17969,8 +17972,8 @@
    "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",
+   "referenced_type" : "type-4476",
+   "self_type" : "type-4525",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17978,8 +17981,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-2482",
-   "self_type" : "type-4223",
+   "referenced_type" : "type-2485",
+   "self_type" : "type-4229",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17987,8 +17990,8 @@
    "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",
+   "referenced_type" : "type-2477",
+   "self_type" : "type-4519",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17996,8 +17999,8 @@
    "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",
+   "referenced_type" : "type-4239",
+   "self_type" : "type-4244",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18005,8 +18008,8 @@
    "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",
+   "referenced_type" : "type-4469",
+   "self_type" : "type-4524",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18050,8 +18053,8 @@
    "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",
+   "referenced_type" : "type-4296",
+   "self_type" : "type-4301",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18059,8 +18062,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::IBinder> &",
    "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "type-4280",
-   "self_type" : "type-4281",
+   "referenced_type" : "type-4286",
+   "self_type" : "type-4287",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18068,8 +18071,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android_cta861_3_metadata &",
    "name" : "const android_cta861_3_metadata &",
-   "referenced_type" : "type-1473",
-   "self_type" : "type-1474",
+   "referenced_type" : "type-1477",
+   "self_type" : "type-1478",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18086,8 +18089,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android_smpte2086_metadata &",
    "name" : "const android_smpte2086_metadata &",
-   "referenced_type" : "type-1471",
-   "self_type" : "type-1472",
+   "referenced_type" : "type-1474",
+   "self_type" : "type-1476",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18104,8 +18107,8 @@
    "alignment" : 4,
    "linker_set_key" : "const double &",
    "name" : "const double &",
-   "referenced_type" : "type-1077",
-   "self_type" : "type-1124",
+   "referenced_type" : "type-1080",
+   "self_type" : "type-1123",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18132,7 +18135,7 @@
    "linker_set_key" : "const int *&",
    "name" : "const int *&",
    "referenced_type" : "type-479",
-   "self_type" : "type-1511",
+   "self_type" : "type-1514",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18146,57 +18149,57 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1109",
-   "self_type" : "type-1111",
+   "referenced_type" : "type-1112",
+   "self_type" : "type-1114",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1281",
-   "self_type" : "type-1283",
+   "referenced_type" : "type-1284",
+   "self_type" : "type-1286",
    "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",
+   "referenced_type" : "type-3309",
+   "self_type" : "type-3311",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3538",
-   "self_type" : "type-3540",
+   "referenced_type" : "type-3541",
+   "self_type" : "type-3543",
    "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",
+   "referenced_type" : "type-3650",
+   "self_type" : "type-3652",
    "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",
+   "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-3832",
-   "self_type" : "type-3834",
+   "referenced_type" : "type-3838",
+   "self_type" : "type-3840",
    "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",
+   "referenced_type" : "type-4378",
+   "self_type" : "type-4380",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -18209,239 +18212,232 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-4501",
-   "self_type" : "type-4503",
+   "referenced_type" : "type-4507",
+   "self_type" : "type-4509",
    "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",
+   "referenced_type" : "type-4544",
+   "self_type" : "type-4546",
    "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",
+   "referenced_type" : "type-4569",
+   "self_type" : "type-4571",
    "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",
+   "referenced_type" : "type-4723",
+   "self_type" : "type-4725",
    "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",
+   "referenced_type" : "type-4853",
+   "self_type" : "type-4855",
    "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",
+   "referenced_type" : "type-5233",
+   "self_type" : "type-5235",
    "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",
+   "referenced_type" : "type-5465",
+   "self_type" : "type-5467",
    "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",
+   "referenced_type" : "type-5574",
+   "self_type" : "type-5576",
    "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",
+   "referenced_type" : "type-5640",
+   "self_type" : "type-5642",
    "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",
+   "referenced_type" : "type-5762",
+   "self_type" : "type-5764",
    "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",
+   "referenced_type" : "type-6278",
+   "self_type" : "type-6280",
    "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",
+   "referenced_type" : "type-6394",
+   "self_type" : "type-6396",
    "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",
+   "referenced_type" : "type-6431",
+   "self_type" : "type-6433",
    "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",
+   "referenced_type" : "type-6456",
+   "self_type" : "type-6458",
    "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",
+   "referenced_type" : "type-6599",
+   "self_type" : "type-6601",
    "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",
+   "referenced_type" : "type-6720",
+   "self_type" : "type-6722",
    "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",
+   "referenced_type" : "type-6747",
+   "self_type" : "type-6749",
    "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",
+   "referenced_type" : "type-6792",
+   "self_type" : "type-6794",
    "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",
+   "referenced_type" : "type-6881",
+   "self_type" : "type-6883",
    "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",
+   "referenced_type" : "type-6944",
+   "self_type" : "type-6946",
    "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",
+   "referenced_type" : "type-7059",
+   "self_type" : "type-7061",
    "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",
+   "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-7284",
-   "self_type" : "type-7286",
+   "referenced_type" : "type-7304",
+   "self_type" : "type-7306",
    "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",
+   "referenced_type" : "type-7357",
+   "self_type" : "type-7359",
    "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",
+   "referenced_type" : "type-7564",
+   "self_type" : "type-7566",
    "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",
+   "referenced_type" : "type-7796",
+   "self_type" : "type-7798",
    "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",
+   "referenced_type" : "type-7905",
+   "self_type" : "type-7907",
    "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",
+   "referenced_type" : "type-7971",
+   "self_type" : "type-7973",
    "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",
+   "referenced_type" : "type-8093",
+   "self_type" : "type-8095",
    "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",
+   "referenced_type" : "type-8249",
+   "self_type" : "type-8254",
    "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",
+   "referenced_type" : "type-8385",
+   "self_type" : "type-8387",
    "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",
+   "referenced_type" : "type-8481",
+   "self_type" : "type-8483",
    "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",
+   "referenced_type" : "type-8528",
+   "self_type" : "type-8532",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -18454,79 +18450,86 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-9131",
-   "self_type" : "type-9133",
+   "referenced_type" : "type-8620",
+   "self_type" : "type-8622",
    "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",
+   "referenced_type" : "type-9159",
+   "self_type" : "type-9161",
    "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",
+   "referenced_type" : "type-9293",
+   "self_type" : "type-9296",
    "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",
+   "referenced_type" : "type-9346",
+   "self_type" : "type-9348",
    "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",
+   "referenced_type" : "type-9382",
+   "self_type" : "type-9384",
    "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",
+   "referenced_type" : "type-9531",
+   "self_type" : "type-9533",
    "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",
+   "referenced_type" : "type-9631",
+   "self_type" : "type-9633",
    "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",
+   "referenced_type" : "type-9669",
+   "self_type" : "type-9671",
    "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",
+   "referenced_type" : "type-9720",
+   "self_type" : "type-9722",
    "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",
+   "referenced_type" : "type-9800",
+   "self_type" : "type-9802",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-9865",
+   "self_type" : "type-9867",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const log_msg &",
    "name" : "const log_msg &",
-   "referenced_type" : "type-2313",
-   "self_type" : "type-2331",
+   "referenced_type" : "type-2316",
+   "self_type" : "type-2334",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -18561,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-2643",
-   "self_type" : "type-2646",
+   "referenced_type" : "type-2646",
+   "self_type" : "type-2649",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18570,8 +18573,8 @@
    "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",
+   "referenced_type" : "type-4993",
+   "self_type" : "type-4995",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18579,8 +18582,8 @@
    "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",
+   "referenced_type" : "type-7198",
+   "self_type" : "type-7200",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18588,8 +18591,8 @@
    "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",
+   "referenced_type" : "type-8221",
+   "self_type" : "type-8223",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18597,8 +18600,8 @@
    "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",
+   "referenced_type" : "type-9708",
+   "self_type" : "type-9716",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18606,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-2639",
-   "self_type" : "type-2641",
+   "referenced_type" : "type-2642",
+   "self_type" : "type-2644",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18615,8 +18618,8 @@
    "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",
+   "referenced_type" : "type-4989",
+   "self_type" : "type-4991",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18624,8 +18627,8 @@
    "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",
+   "referenced_type" : "type-7194",
+   "self_type" : "type-7196",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18633,8 +18636,8 @@
    "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",
+   "referenced_type" : "type-8216",
+   "self_type" : "type-8218",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18642,8 +18645,8 @@
    "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",
+   "referenced_type" : "type-9696",
+   "self_type" : "type-9704",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18651,8 +18654,8 @@
    "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",
+   "referenced_type" : "type-1646",
+   "self_type" : "type-1648",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -18660,8 +18663,8 @@
    "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",
+   "referenced_type" : "type-4111",
+   "self_type" : "type-4113",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -18669,8 +18672,8 @@
    "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",
+   "referenced_type" : "type-6035",
+   "self_type" : "type-6037",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -18678,8 +18681,8 @@
    "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",
+   "referenced_type" : "type-8880",
+   "self_type" : "type-8882",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -18696,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-1107",
-   "self_type" : "type-1106",
+   "referenced_type" : "type-1110",
+   "self_type" : "type-1109",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18705,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-1279",
-   "self_type" : "type-1278",
+   "referenced_type" : "type-1282",
+   "self_type" : "type-1281",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18714,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-3271",
-   "self_type" : "type-3270",
+   "referenced_type" : "type-3274",
+   "self_type" : "type-3273",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18723,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-3535",
-   "self_type" : "type-3534",
+   "referenced_type" : "type-3538",
+   "self_type" : "type-3537",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18732,8 +18735,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-3645",
-   "self_type" : "type-3644",
+   "referenced_type" : "type-3648",
+   "self_type" : "type-3647",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18741,8 +18744,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-3708",
-   "self_type" : "type-3707",
+   "referenced_type" : "type-3714",
+   "self_type" : "type-3713",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18750,8 +18753,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-3830",
-   "self_type" : "type-3829",
+   "referenced_type" : "type-3836",
+   "self_type" : "type-3835",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18768,8 +18771,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-4351",
-   "self_type" : "type-4350",
+   "referenced_type" : "type-4357",
+   "self_type" : "type-4356",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18777,8 +18780,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-4486",
-   "self_type" : "type-4485",
+   "referenced_type" : "type-4492",
+   "self_type" : "type-4491",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18786,8 +18789,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-4555",
-   "self_type" : "type-4554",
+   "referenced_type" : "type-4561",
+   "self_type" : "type-4560",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18795,8 +18798,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-4619",
-   "self_type" : "type-4618",
+   "referenced_type" : "type-4623",
+   "self_type" : "type-4622",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18804,8 +18807,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-4659",
-   "self_type" : "type-4658",
+   "referenced_type" : "type-4666",
+   "self_type" : "type-4665",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18813,8 +18816,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-4867",
-   "self_type" : "type-4866",
+   "referenced_type" : "type-4873",
+   "self_type" : "type-4872",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18822,8 +18825,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-5192",
-   "self_type" : "type-5191",
+   "referenced_type" : "type-5198",
+   "self_type" : "type-5197",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18831,8 +18834,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-5456",
-   "self_type" : "type-5455",
+   "referenced_type" : "type-5462",
+   "self_type" : "type-5461",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18840,8 +18843,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-5566",
-   "self_type" : "type-5565",
+   "referenced_type" : "type-5572",
+   "self_type" : "type-5571",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18849,8 +18852,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-5629",
-   "self_type" : "type-5628",
+   "referenced_type" : "type-5638",
+   "self_type" : "type-5637",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18858,8 +18861,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-5751",
-   "self_type" : "type-5750",
+   "referenced_type" : "type-5760",
+   "self_type" : "type-5759",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18867,8 +18870,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-6251",
-   "self_type" : "type-6250",
+   "referenced_type" : "type-6260",
+   "self_type" : "type-6259",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18876,8 +18879,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-6372",
-   "self_type" : "type-6371",
+   "referenced_type" : "type-6381",
+   "self_type" : "type-6380",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18885,8 +18888,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-6439",
-   "self_type" : "type-6438",
+   "referenced_type" : "type-6448",
+   "self_type" : "type-6447",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18894,8 +18897,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-6503",
-   "self_type" : "type-6502",
+   "referenced_type" : "type-6510",
+   "self_type" : "type-6509",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18903,8 +18906,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-6541",
-   "self_type" : "type-6540",
+   "referenced_type" : "type-6551",
+   "self_type" : "type-6550",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18912,8 +18915,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-6731",
-   "self_type" : "type-6730",
+   "referenced_type" : "type-6740",
+   "self_type" : "type-6739",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18921,8 +18924,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-6750",
-   "self_type" : "type-6749",
+   "referenced_type" : "type-6759",
+   "self_type" : "type-6758",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18930,8 +18933,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-6755",
-   "self_type" : "type-6754",
+   "referenced_type" : "type-6765",
+   "self_type" : "type-6764",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18939,8 +18942,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-6887",
-   "self_type" : "type-6886",
+   "referenced_type" : "type-6897",
+   "self_type" : "type-6896",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18948,8 +18951,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-6899",
-   "self_type" : "type-6898",
+   "referenced_type" : "type-6907",
+   "self_type" : "type-6906",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18957,8 +18960,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-7078",
-   "self_type" : "type-7077",
+   "referenced_type" : "type-7086",
+   "self_type" : "type-7085",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18966,8 +18969,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-7107",
-   "self_type" : "type-7106",
+   "referenced_type" : "type-7116",
+   "self_type" : "type-7115",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18975,8 +18978,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-7303",
-   "self_type" : "type-7302",
+   "referenced_type" : "type-7323",
+   "self_type" : "type-7322",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18984,8 +18987,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-7332",
-   "self_type" : "type-7331",
+   "referenced_type" : "type-7353",
+   "self_type" : "type-7352",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18993,8 +18996,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-7508",
-   "self_type" : "type-7507",
+   "referenced_type" : "type-7529",
+   "self_type" : "type-7528",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19002,8 +19005,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-7772",
-   "self_type" : "type-7771",
+   "referenced_type" : "type-7793",
+   "self_type" : "type-7792",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19011,8 +19014,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-7882",
-   "self_type" : "type-7881",
+   "referenced_type" : "type-7903",
+   "self_type" : "type-7902",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19020,8 +19023,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-7945",
-   "self_type" : "type-7944",
+   "referenced_type" : "type-7969",
+   "self_type" : "type-7968",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19029,8 +19032,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-8067",
-   "self_type" : "type-8066",
+   "referenced_type" : "type-8091",
+   "self_type" : "type-8090",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19038,8 +19041,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-8222",
-   "self_type" : "type-8221",
+   "referenced_type" : "type-8246",
+   "self_type" : "type-8245",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19047,8 +19050,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-8359",
-   "self_type" : "type-8358",
+   "referenced_type" : "type-8383",
+   "self_type" : "type-8382",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19056,8 +19059,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-8455",
-   "self_type" : "type-8454",
+   "referenced_type" : "type-8479",
+   "self_type" : "type-8478",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19065,8 +19068,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-8499",
-   "self_type" : "type-8498",
+   "referenced_type" : "type-8526",
+   "self_type" : "type-8525",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19083,8 +19086,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-8591",
-   "self_type" : "type-8590",
+   "referenced_type" : "type-8618",
+   "self_type" : "type-8617",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19092,8 +19095,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-9111",
-   "self_type" : "type-9110",
+   "referenced_type" : "type-9139",
+   "self_type" : "type-9138",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19101,8 +19104,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-9250",
-   "self_type" : "type-9249",
+   "referenced_type" : "type-9277",
+   "self_type" : "type-9276",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19110,8 +19113,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-9338",
-   "self_type" : "type-9337",
+   "referenced_type" : "type-9366",
+   "self_type" : "type-9365",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19119,8 +19122,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-9421",
-   "self_type" : "type-9420",
+   "referenced_type" : "type-9447",
+   "self_type" : "type-9446",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19128,8 +19131,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-9464",
-   "self_type" : "type-9463",
+   "referenced_type" : "type-9492",
+   "self_type" : "type-9491",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19137,8 +19140,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-9630",
-   "self_type" : "type-9629",
+   "referenced_type" : "type-9660",
+   "self_type" : "type-9659",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19146,8 +19149,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-9658",
-   "self_type" : "type-9657",
+   "referenced_type" : "type-9685",
+   "self_type" : "type-9684",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19155,8 +19158,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-9663",
-   "self_type" : "type-9662",
+   "referenced_type" : "type-9690",
+   "self_type" : "type-9689",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19164,8 +19167,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-9787",
-   "self_type" : "type-9786",
+   "referenced_type" : "type-9816",
+   "self_type" : "type-9815",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19173,8 +19176,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-9799",
-   "self_type" : "type-9798",
+   "referenced_type" : "type-9827",
+   "self_type" : "type-9826",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19182,8 +19185,8 @@
    "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",
+   "referenced_type" : "type-4382",
+   "self_type" : "type-4384",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19191,8 +19194,8 @@
    "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",
+   "referenced_type" : "type-4510",
+   "self_type" : "type-4512",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19200,8 +19203,8 @@
    "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",
+   "referenced_type" : "type-6282",
+   "self_type" : "type-6284",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19209,8 +19212,8 @@
    "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",
+   "referenced_type" : "type-6397",
+   "self_type" : "type-6399",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19218,8 +19221,8 @@
    "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",
+   "referenced_type" : "type-9163",
+   "self_type" : "type-9165",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19227,8 +19230,8 @@
    "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",
+   "referenced_type" : "type-9297",
+   "self_type" : "type-9299",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19263,8 +19266,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
-   "referenced_type" : "type-2520",
-   "self_type" : "type-2615",
+   "referenced_type" : "type-2523",
+   "self_type" : "type-2618",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19290,8 +19293,8 @@
    "alignment" : 4,
    "linker_set_key" : "int *&",
    "name" : "int *&",
-   "referenced_type" : "type-1509",
-   "self_type" : "type-1508",
+   "referenced_type" : "type-1512",
+   "self_type" : "type-1511",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -19300,7 +19303,7 @@
    "linker_set_key" : "long long &",
    "name" : "long long &",
    "referenced_type" : "type-169",
-   "self_type" : "type-1429",
+   "self_type" : "type-1432",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -19308,8 +19311,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-4758",
-   "self_type" : "type-4757",
+   "referenced_type" : "type-4765",
+   "self_type" : "type-4764",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -19317,8 +19320,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-4862",
-   "self_type" : "type-4861",
+   "referenced_type" : "type-4868",
+   "self_type" : "type-4867",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -19326,8 +19329,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-6624",
-   "self_type" : "type-6623",
+   "referenced_type" : "type-6634",
+   "self_type" : "type-6633",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -19335,8 +19338,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-6726",
-   "self_type" : "type-6725",
+   "referenced_type" : "type-6735",
+   "self_type" : "type-6734",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -19344,8 +19347,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-6848",
-   "self_type" : "type-6847",
+   "referenced_type" : "type-6858",
+   "self_type" : "type-6857",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -19353,8 +19356,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-6995",
-   "self_type" : "type-6994",
+   "referenced_type" : "type-7004",
+   "self_type" : "type-7003",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -19362,8 +19365,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-7071",
-   "self_type" : "type-7070",
+   "referenced_type" : "type-7081",
+   "self_type" : "type-7080",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -19371,8 +19374,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-7245",
-   "self_type" : "type-7244",
+   "referenced_type" : "type-7267",
+   "self_type" : "type-7266",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -19380,8 +19383,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-7298",
-   "self_type" : "type-7297",
+   "referenced_type" : "type-7318",
+   "self_type" : "type-7317",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -19389,8 +19392,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-9532",
-   "self_type" : "type-9531",
+   "referenced_type" : "type-9559",
+   "self_type" : "type-9558",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -19398,8 +19401,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-9625",
-   "self_type" : "type-9624",
+   "referenced_type" : "type-9652",
+   "self_type" : "type-9651",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -19407,8 +19410,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-9749",
-   "self_type" : "type-9748",
+   "referenced_type" : "type-9778",
+   "self_type" : "type-9777",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -19425,8 +19428,8 @@
    "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",
+   "referenced_type" : "type-3186",
+   "self_type" : "type-3185",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -19434,8 +19437,8 @@
    "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",
+   "referenced_type" : "type-5110",
+   "self_type" : "type-5109",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -19443,8 +19446,8 @@
    "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",
+   "referenced_type" : "type-7441",
+   "self_type" : "type-7440",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -19452,8 +19455,8 @@
    "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",
+   "referenced_type" : "type-8237",
+   "self_type" : "type-8236",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -19461,8 +19464,8 @@
    "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",
+   "referenced_type" : "type-1652",
+   "self_type" : "type-1886",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -19470,8 +19473,8 @@
    "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",
+   "referenced_type" : "type-4116",
+   "self_type" : "type-4142",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -19479,8 +19482,8 @@
    "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",
+   "referenced_type" : "type-6040",
+   "self_type" : "type-6066",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -19488,8 +19491,8 @@
    "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",
+   "referenced_type" : "type-8885",
+   "self_type" : "type-8917",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -19498,7 +19501,7 @@
    "linker_set_key" : "unsigned char &",
    "name" : "unsigned char &",
    "referenced_type" : "type-90",
-   "self_type" : "type-1428",
+   "self_type" : "type-1431",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -19525,7 +19528,7 @@
    "linker_set_key" : "unsigned long long *&",
    "name" : "unsigned long long *&",
    "referenced_type" : "type-91",
-   "self_type" : "type-1871",
+   "self_type" : "type-1875",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -19534,7 +19537,7 @@
    "linker_set_key" : "unsigned short &",
    "name" : "unsigned short &",
    "referenced_type" : "type-497",
-   "self_type" : "type-1427",
+   "self_type" : "type-1430",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -19542,8 +19545,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-1444",
-   "self_type" : "type-1443",
+   "referenced_type" : "type-1447",
+   "self_type" : "type-1446",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -19551,8 +19554,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-3976",
-   "self_type" : "type-3975",
+   "referenced_type" : "type-3982",
+   "self_type" : "type-3981",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -19560,8 +19563,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-5897",
-   "self_type" : "type-5896",
+   "referenced_type" : "type-5906",
+   "self_type" : "type-5905",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -19578,8 +19581,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-8727",
-   "self_type" : "type-8726",
+   "referenced_type" : "type-8754",
+   "self_type" : "type-8753",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   }
@@ -19590,8 +19593,8 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-2402",
-   "self_type" : "type-2401",
+   "referenced_type" : "type-2405",
+   "self_type" : "type-2404",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -19599,8 +19602,8 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-4833",
-   "self_type" : "type-4832",
+   "referenced_type" : "type-4839",
+   "self_type" : "type-4838",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -19608,8 +19611,8 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-6697",
-   "self_type" : "type-6696",
+   "referenced_type" : "type-6706",
+   "self_type" : "type-6705",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -19617,8 +19620,8 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-8151",
-   "self_type" : "type-8150",
+   "referenced_type" : "type-8175",
+   "self_type" : "type-8174",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -19626,8 +19629,8 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-8984",
-   "self_type" : "type-8983",
+   "referenced_type" : "type-9011",
+   "self_type" : "type-9010",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -19644,8 +19647,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1142",
-   "self_type" : "type-1141",
+   "referenced_type" : "type-1137",
+   "self_type" : "type-1136",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19653,8 +19656,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1165",
-   "self_type" : "type-1164",
+   "referenced_type" : "type-1170",
+   "self_type" : "type-1169",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19662,8 +19665,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1350",
-   "self_type" : "type-1349",
+   "referenced_type" : "type-1353",
+   "self_type" : "type-1352",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19671,8 +19674,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1407",
-   "self_type" : "type-1406",
+   "referenced_type" : "type-1410",
+   "self_type" : "type-1409",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19680,8 +19683,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1423",
-   "self_type" : "type-1422",
+   "referenced_type" : "type-1426",
+   "self_type" : "type-1425",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19689,8 +19692,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1439",
-   "self_type" : "type-1438",
+   "referenced_type" : "type-1442",
+   "self_type" : "type-1441",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19698,8 +19701,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1505",
-   "self_type" : "type-1504",
+   "referenced_type" : "type-1508",
+   "self_type" : "type-1507",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19707,8 +19710,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1632",
-   "self_type" : "type-1631",
+   "referenced_type" : "type-1637",
+   "self_type" : "type-1636",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19716,8 +19719,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2612",
-   "self_type" : "type-2611",
+   "referenced_type" : "type-2615",
+   "self_type" : "type-2614",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19725,8 +19728,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3478",
-   "self_type" : "type-3477",
+   "referenced_type" : "type-3481",
+   "self_type" : "type-3480",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19734,8 +19737,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3579",
-   "self_type" : "type-3578",
+   "referenced_type" : "type-3578",
+   "self_type" : "type-3577",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19743,8 +19746,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3655",
-   "self_type" : "type-3654",
+   "referenced_type" : "type-3658",
+   "self_type" : "type-3657",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19752,8 +19755,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3745",
-   "self_type" : "type-3744",
+   "referenced_type" : "type-3743",
+   "self_type" : "type-3742",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19761,8 +19764,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3770",
-   "self_type" : "type-3769",
+   "referenced_type" : "type-3777",
+   "self_type" : "type-3776",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19770,8 +19773,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3904",
-   "self_type" : "type-3903",
+   "referenced_type" : "type-3910",
+   "self_type" : "type-3909",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19779,8 +19782,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3935",
-   "self_type" : "type-3934",
+   "referenced_type" : "type-3941",
+   "self_type" : "type-3940",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19788,8 +19791,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3951",
-   "self_type" : "type-3950",
+   "referenced_type" : "type-3957",
+   "self_type" : "type-3956",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19797,8 +19800,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3971",
-   "self_type" : "type-3970",
+   "referenced_type" : "type-3977",
+   "self_type" : "type-3976",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19806,8 +19809,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4019",
-   "self_type" : "type-4018",
+   "referenced_type" : "type-4026",
+   "self_type" : "type-4025",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19815,8 +19818,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4097",
-   "self_type" : "type-4096",
+   "referenced_type" : "type-4103",
+   "self_type" : "type-4102",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19824,8 +19827,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4299",
-   "self_type" : "type-4298",
+   "referenced_type" : "type-4305",
+   "self_type" : "type-4304",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19833,8 +19836,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4472",
-   "self_type" : "type-4471",
+   "referenced_type" : "type-4478",
+   "self_type" : "type-4477",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19842,8 +19845,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4525",
-   "self_type" : "type-4524",
+   "referenced_type" : "type-4531",
+   "self_type" : "type-4530",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19851,8 +19854,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4551",
-   "self_type" : "type-4550",
+   "referenced_type" : "type-4557",
+   "self_type" : "type-4556",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19860,8 +19863,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4578",
-   "self_type" : "type-4577",
+   "referenced_type" : "type-4584",
+   "self_type" : "type-4583",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19869,8 +19872,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4745",
-   "self_type" : "type-4744",
+   "referenced_type" : "type-4752",
+   "self_type" : "type-4751",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19878,8 +19881,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4855",
-   "self_type" : "type-4854",
+   "referenced_type" : "type-4861",
+   "self_type" : "type-4860",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19887,8 +19890,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4967",
-   "self_type" : "type-4966",
+   "referenced_type" : "type-4973",
+   "self_type" : "type-4972",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19896,8 +19899,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5399",
-   "self_type" : "type-5398",
+   "referenced_type" : "type-5405",
+   "self_type" : "type-5404",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19905,8 +19908,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5500",
-   "self_type" : "type-5499",
+   "referenced_type" : "type-5502",
+   "self_type" : "type-5501",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19914,8 +19917,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5576",
-   "self_type" : "type-5575",
+   "referenced_type" : "type-5582",
+   "self_type" : "type-5581",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19923,8 +19926,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5666",
-   "self_type" : "type-5665",
+   "referenced_type" : "type-5667",
+   "self_type" : "type-5666",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19932,8 +19935,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5691",
-   "self_type" : "type-5690",
+   "referenced_type" : "type-5701",
+   "self_type" : "type-5700",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19941,8 +19944,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5825",
-   "self_type" : "type-5824",
+   "referenced_type" : "type-5834",
+   "self_type" : "type-5833",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19950,8 +19953,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5856",
-   "self_type" : "type-5855",
+   "referenced_type" : "type-5865",
+   "self_type" : "type-5864",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19959,8 +19962,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5872",
-   "self_type" : "type-5871",
+   "referenced_type" : "type-5881",
+   "self_type" : "type-5880",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19968,8 +19971,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5892",
-   "self_type" : "type-5891",
+   "referenced_type" : "type-5901",
+   "self_type" : "type-5900",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19977,8 +19980,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5940",
-   "self_type" : "type-5939",
+   "referenced_type" : "type-5950",
+   "self_type" : "type-5949",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19986,8 +19989,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6018",
-   "self_type" : "type-6017",
+   "referenced_type" : "type-6027",
+   "self_type" : "type-6026",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19995,8 +19998,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6208",
-   "self_type" : "type-6207",
+   "referenced_type" : "type-6217",
+   "self_type" : "type-6216",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20004,8 +20007,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6361",
-   "self_type" : "type-6360",
+   "referenced_type" : "type-6370",
+   "self_type" : "type-6369",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20013,8 +20016,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6409",
-   "self_type" : "type-6408",
+   "referenced_type" : "type-6418",
+   "self_type" : "type-6417",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20022,8 +20025,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6435",
-   "self_type" : "type-6434",
+   "referenced_type" : "type-6444",
+   "self_type" : "type-6443",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20031,8 +20034,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6462",
-   "self_type" : "type-6461",
+   "referenced_type" : "type-6471",
+   "self_type" : "type-6470",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20040,8 +20043,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6613",
-   "self_type" : "type-6612",
+   "referenced_type" : "type-6623",
+   "self_type" : "type-6622",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20049,8 +20052,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6719",
-   "self_type" : "type-6718",
+   "referenced_type" : "type-6728",
+   "self_type" : "type-6727",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20058,8 +20061,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6746",
-   "self_type" : "type-6745",
+   "referenced_type" : "type-6755",
+   "self_type" : "type-6754",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20067,8 +20070,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6846",
-   "self_type" : "type-6845",
+   "referenced_type" : "type-6856",
+   "self_type" : "type-6855",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20076,8 +20079,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6882",
-   "self_type" : "type-6881",
+   "referenced_type" : "type-6892",
+   "self_type" : "type-6891",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20085,8 +20088,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7003",
-   "self_type" : "type-7002",
+   "referenced_type" : "type-7011",
+   "self_type" : "type-7010",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20094,8 +20097,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7062",
-   "self_type" : "type-7061",
+   "referenced_type" : "type-7071",
+   "self_type" : "type-7070",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20103,8 +20106,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7162",
-   "self_type" : "type-7161",
+   "referenced_type" : "type-7171",
+   "self_type" : "type-7170",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20112,8 +20115,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7169",
-   "self_type" : "type-7168",
+   "referenced_type" : "type-7178",
+   "self_type" : "type-7177",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20121,8 +20124,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7253",
-   "self_type" : "type-7252",
+   "referenced_type" : "type-7273",
+   "self_type" : "type-7272",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20130,8 +20133,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7292",
-   "self_type" : "type-7291",
+   "referenced_type" : "type-7312",
+   "self_type" : "type-7311",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20139,8 +20142,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7396",
-   "self_type" : "type-7395",
+   "referenced_type" : "type-7419",
+   "self_type" : "type-7418",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20157,8 +20160,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7715",
-   "self_type" : "type-7714",
+   "referenced_type" : "type-7736",
+   "self_type" : "type-7735",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20166,8 +20169,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7816",
-   "self_type" : "type-7815",
+   "referenced_type" : "type-7833",
+   "self_type" : "type-7832",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20175,8 +20178,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7892",
-   "self_type" : "type-7891",
+   "referenced_type" : "type-7913",
+   "self_type" : "type-7912",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20184,8 +20187,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7982",
-   "self_type" : "type-7981",
+   "referenced_type" : "type-7998",
+   "self_type" : "type-7997",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20193,8 +20196,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-8007",
-   "self_type" : "type-8006",
+   "referenced_type" : "type-8032",
+   "self_type" : "type-8031",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20202,8 +20205,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-8190",
-   "self_type" : "type-8189",
+   "referenced_type" : "type-8215",
+   "self_type" : "type-8214",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20211,8 +20214,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-8314",
-   "self_type" : "type-8313",
+   "referenced_type" : "type-8338",
+   "self_type" : "type-8337",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20220,8 +20223,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-8402",
-   "self_type" : "type-8401",
+   "referenced_type" : "type-8422",
+   "self_type" : "type-8421",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20229,8 +20232,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-8465",
-   "self_type" : "type-8464",
+   "referenced_type" : "type-8489",
+   "self_type" : "type-8488",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20238,8 +20241,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-8537",
-   "self_type" : "type-8536",
+   "referenced_type" : "type-8556",
+   "self_type" : "type-8555",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20247,8 +20250,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-8559",
-   "self_type" : "type-8558",
+   "referenced_type" : "type-8586",
+   "self_type" : "type-8585",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20256,8 +20259,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-8658",
-   "self_type" : "type-8657",
+   "referenced_type" : "type-8685",
+   "self_type" : "type-8684",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20265,8 +20268,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-8689",
-   "self_type" : "type-8688",
+   "referenced_type" : "type-8717",
+   "self_type" : "type-8716",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20274,8 +20277,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-8706",
-   "self_type" : "type-8705",
+   "referenced_type" : "type-8733",
+   "self_type" : "type-8732",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20283,8 +20286,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-8722",
-   "self_type" : "type-8721",
+   "referenced_type" : "type-8749",
+   "self_type" : "type-8748",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20292,8 +20295,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-8769",
-   "self_type" : "type-8768",
+   "referenced_type" : "type-8796",
+   "self_type" : "type-8795",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20301,8 +20304,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-8846",
-   "self_type" : "type-8845",
+   "referenced_type" : "type-8873",
+   "self_type" : "type-8872",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20310,8 +20313,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-9065",
-   "self_type" : "type-9064",
+   "referenced_type" : "type-904",
+   "self_type" : "type-903",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20319,8 +20322,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-908",
-   "self_type" : "type-907",
+   "referenced_type" : "type-9092",
+   "self_type" : "type-9091",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20328,8 +20331,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-9233",
-   "self_type" : "type-9232",
+   "referenced_type" : "type-9261",
+   "self_type" : "type-9260",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20337,8 +20340,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-9296",
-   "self_type" : "type-9295",
+   "referenced_type" : "type-9325",
+   "self_type" : "type-9324",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20346,8 +20349,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-9331",
-   "self_type" : "type-9330",
+   "referenced_type" : "type-9360",
+   "self_type" : "type-9359",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20355,8 +20358,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-9375",
-   "self_type" : "type-9374",
+   "referenced_type" : "type-9402",
+   "self_type" : "type-9401",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20364,8 +20367,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-9522",
-   "self_type" : "type-9521",
+   "referenced_type" : "type-9549",
+   "self_type" : "type-9548",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20373,8 +20376,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-9615",
-   "self_type" : "type-9614",
+   "referenced_type" : "type-9640",
+   "self_type" : "type-9639",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20382,8 +20385,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-9617",
-   "self_type" : "type-9616",
+   "referenced_type" : "type-9644",
+   "self_type" : "type-9643",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20391,8 +20394,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-9653",
-   "self_type" : "type-9652",
+   "referenced_type" : "type-9681",
+   "self_type" : "type-9680",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20400,8 +20403,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-9747",
-   "self_type" : "type-9746",
+   "referenced_type" : "type-9776",
+   "self_type" : "type-9775",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20409,8 +20412,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-9782",
-   "self_type" : "type-9781",
+   "referenced_type" : "type-9809",
+   "self_type" : "type-9808",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20418,8 +20421,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE *",
    "name" : "OMX_BUFFERHEADERTYPE *",
-   "referenced_type" : "type-1540",
-   "self_type" : "type-1595",
+   "referenced_type" : "type-1536",
+   "self_type" : "type-1598",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -20427,8 +20430,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE **",
    "name" : "OMX_BUFFERHEADERTYPE **",
-   "referenced_type" : "type-1595",
-   "self_type" : "type-2376",
+   "referenced_type" : "type-1598",
+   "self_type" : "type-2379",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -20436,8 +20439,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_CALLBACKTYPE *",
    "name" : "OMX_CALLBACKTYPE *",
-   "referenced_type" : "type-1590",
-   "self_type" : "type-2385",
+   "referenced_type" : "type-1593",
+   "self_type" : "type-2388",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -20445,8 +20448,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *)",
    "name" : "OMX_ERRORTYPE (*)(void *)",
-   "referenced_type" : "type-1501",
-   "self_type" : "type-1500",
+   "referenced_type" : "type-1500",
+   "self_type" : "type-1499",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -20454,8 +20457,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-2382",
-   "self_type" : "type-2381",
+   "referenced_type" : "type-2385",
+   "self_type" : "type-2384",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -20463,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-2378",
-   "self_type" : "type-2377",
+   "referenced_type" : "type-2381",
+   "self_type" : "type-2380",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -20472,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-2375",
-   "self_type" : "type-2374",
+   "referenced_type" : "type-2378",
+   "self_type" : "type-2377",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -20481,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-2387",
-   "self_type" : "type-2386",
+   "referenced_type" : "type-2390",
+   "self_type" : "type-2389",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -20490,8 +20493,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
-   "referenced_type" : "type-2384",
-   "self_type" : "type-2383",
+   "referenced_type" : "type-2387",
+   "self_type" : "type-2386",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -20499,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-2362",
-   "self_type" : "type-2361",
+   "referenced_type" : "type-2365",
+   "self_type" : "type-2364",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -20508,8 +20511,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
-   "referenced_type" : "type-2364",
-   "self_type" : "type-2363",
+   "referenced_type" : "type-2367",
+   "self_type" : "type-2366",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -20517,51 +20520,6 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
-   "referenced_type" : "type-2369",
-   "self_type" : "type-2368",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, char *, OMX_INDEXTYPE *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, char *, OMX_INDEXTYPE *)",
-   "referenced_type" : "type-2366",
-   "self_type" : "type-2365",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-2358",
-   "self_type" : "type-2357",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, unsigned char *, unsigned int)",
-   "name" : "OMX_ERRORTYPE (*)(void *, unsigned char *, unsigned int)",
-   "referenced_type" : "type-2389",
-   "self_type" : "type-2388",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, unsigned int, OMX_BUFFERHEADERTYPE *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, unsigned int, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-2380",
-   "self_type" : "type-2379",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-2372",
    "self_type" : "type-2371",
    "size" : 4,
@@ -20569,10 +20527,55 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, char *, OMX_INDEXTYPE *)",
+   "name" : "OMX_ERRORTYPE (*)(void *, char *, OMX_INDEXTYPE *)",
+   "referenced_type" : "type-2369",
+   "self_type" : "type-2368",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "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-2361",
+   "self_type" : "type-2360",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, unsigned char *, unsigned int)",
+   "name" : "OMX_ERRORTYPE (*)(void *, unsigned char *, unsigned int)",
+   "referenced_type" : "type-2392",
+   "self_type" : "type-2391",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, unsigned int, OMX_BUFFERHEADERTYPE *)",
+   "name" : "OMX_ERRORTYPE (*)(void *, unsigned int, OMX_BUFFERHEADERTYPE *)",
+   "referenced_type" : "type-2383",
+   "self_type" : "type-2382",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "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-2375",
+   "self_type" : "type-2374",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, void *, OMX_BUFFERHEADERTYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, void *, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-1594",
-   "self_type" : "type-1593",
+   "referenced_type" : "type-1597",
+   "self_type" : "type-1596",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -20580,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-1592",
-   "self_type" : "type-1591",
+   "referenced_type" : "type-1595",
+   "self_type" : "type-1594",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -20590,7 +20593,7 @@
    "linker_set_key" : "OMX_INDEXTYPE *",
    "name" : "OMX_INDEXTYPE *",
    "referenced_type" : "type-1484",
-   "self_type" : "type-2367",
+   "self_type" : "type-2370",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -20598,8 +20601,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_STATETYPE *",
    "name" : "OMX_STATETYPE *",
-   "referenced_type" : "type-1488",
-   "self_type" : "type-2370",
+   "referenced_type" : "type-1490",
+   "self_type" : "type-2373",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -20607,8 +20610,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_TUNNELSETUPTYPE *",
    "name" : "OMX_TUNNELSETUPTYPE *",
-   "referenced_type" : "type-1612",
-   "self_type" : "type-2373",
+   "referenced_type" : "type-1613",
+   "self_type" : "type-2376",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -20616,8 +20619,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_VERSIONTYPE *",
    "name" : "OMX_VERSIONTYPE *",
-   "referenced_type" : "type-1478",
-   "self_type" : "type-2359",
+   "referenced_type" : "type-1481",
+   "self_type" : "type-2362",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -20634,8 +20637,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1115",
-   "self_type" : "type-1114",
+   "referenced_type" : "type-1118",
+   "self_type" : "type-1117",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20643,8 +20646,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1335",
-   "self_type" : "type-1334",
+   "referenced_type" : "type-1338",
+   "self_type" : "type-1337",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20652,8 +20655,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1402",
-   "self_type" : "type-1401",
+   "referenced_type" : "type-1405",
+   "self_type" : "type-1404",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20661,8 +20664,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1418",
-   "self_type" : "type-1417",
+   "referenced_type" : "type-1421",
+   "self_type" : "type-1420",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20670,8 +20673,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1435",
-   "self_type" : "type-1434",
+   "referenced_type" : "type-1438",
+   "self_type" : "type-1437",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20679,8 +20682,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1437",
-   "self_type" : "type-1436",
+   "referenced_type" : "type-1440",
+   "self_type" : "type-1439",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20688,8 +20691,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1503",
-   "self_type" : "type-1502",
+   "referenced_type" : "type-1506",
+   "self_type" : "type-1505",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20697,8 +20700,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1630",
-   "self_type" : "type-1629",
+   "referenced_type" : "type-1634",
+   "self_type" : "type-1633",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20706,8 +20709,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2609",
-   "self_type" : "type-2608",
+   "referenced_type" : "type-2612",
+   "self_type" : "type-2611",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20715,8 +20718,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3476",
-   "self_type" : "type-3475",
+   "referenced_type" : "type-3479",
+   "self_type" : "type-3478",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20724,8 +20727,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3548",
-   "self_type" : "type-3547",
+   "referenced_type" : "type-3547",
+   "self_type" : "type-3546",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20733,8 +20736,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3653",
-   "self_type" : "type-3652",
+   "referenced_type" : "type-3656",
+   "self_type" : "type-3655",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20742,8 +20745,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3718",
-   "self_type" : "type-3717",
+   "referenced_type" : "type-3724",
+   "self_type" : "type-3723",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20751,8 +20754,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3886",
-   "self_type" : "type-3885",
+   "referenced_type" : "type-3892",
+   "self_type" : "type-3891",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20760,8 +20763,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3929",
-   "self_type" : "type-3928",
+   "referenced_type" : "type-3936",
+   "self_type" : "type-3935",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20769,8 +20772,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3945",
-   "self_type" : "type-3944",
+   "referenced_type" : "type-3951",
+   "self_type" : "type-3950",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20778,8 +20781,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3965",
-   "self_type" : "type-3964",
+   "referenced_type" : "type-3971",
+   "self_type" : "type-3970",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20787,8 +20790,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3967",
-   "self_type" : "type-3966",
+   "referenced_type" : "type-3973",
+   "self_type" : "type-3972",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20796,8 +20799,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4017",
-   "self_type" : "type-4016",
+   "referenced_type" : "type-4023",
+   "self_type" : "type-4022",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20805,8 +20808,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4095",
-   "self_type" : "type-4094",
+   "referenced_type" : "type-4101",
+   "self_type" : "type-4100",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20814,8 +20817,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4297",
-   "self_type" : "type-4296",
+   "referenced_type" : "type-4303",
+   "self_type" : "type-4302",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20823,8 +20826,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4512",
-   "self_type" : "type-4511",
+   "referenced_type" : "type-4518",
+   "self_type" : "type-4517",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20832,8 +20835,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4523",
-   "self_type" : "type-4522",
+   "referenced_type" : "type-4529",
+   "self_type" : "type-4528",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20841,8 +20844,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4549",
-   "self_type" : "type-4548",
+   "referenced_type" : "type-4555",
+   "self_type" : "type-4554",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20850,8 +20853,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4576",
-   "self_type" : "type-4575",
+   "referenced_type" : "type-4582",
+   "self_type" : "type-4581",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20859,8 +20862,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4743",
-   "self_type" : "type-4742",
+   "referenced_type" : "type-4749",
+   "self_type" : "type-4748",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20868,8 +20871,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4853",
-   "self_type" : "type-4852",
+   "referenced_type" : "type-4859",
+   "self_type" : "type-4858",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20877,8 +20880,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4964",
-   "self_type" : "type-4963",
+   "referenced_type" : "type-4970",
+   "self_type" : "type-4969",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20886,8 +20889,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5397",
-   "self_type" : "type-5396",
+   "referenced_type" : "type-5403",
+   "self_type" : "type-5402",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20895,8 +20898,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5469",
-   "self_type" : "type-5468",
+   "referenced_type" : "type-5471",
+   "self_type" : "type-5470",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20904,8 +20907,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5574",
-   "self_type" : "type-5573",
+   "referenced_type" : "type-5580",
+   "self_type" : "type-5579",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20913,8 +20916,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5639",
-   "self_type" : "type-5638",
+   "referenced_type" : "type-5648",
+   "self_type" : "type-5647",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20922,8 +20925,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5807",
-   "self_type" : "type-5806",
+   "referenced_type" : "type-5816",
+   "self_type" : "type-5815",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20931,8 +20934,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5850",
-   "self_type" : "type-5849",
+   "referenced_type" : "type-5860",
+   "self_type" : "type-5859",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20940,8 +20943,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5866",
-   "self_type" : "type-5865",
+   "referenced_type" : "type-5875",
+   "self_type" : "type-5874",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20949,8 +20952,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5886",
-   "self_type" : "type-5885",
+   "referenced_type" : "type-5895",
+   "self_type" : "type-5894",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20958,8 +20961,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5888",
-   "self_type" : "type-5887",
+   "referenced_type" : "type-5897",
+   "self_type" : "type-5896",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20967,8 +20970,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5938",
-   "self_type" : "type-5937",
+   "referenced_type" : "type-5947",
+   "self_type" : "type-5946",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20976,8 +20979,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6016",
-   "self_type" : "type-6015",
+   "referenced_type" : "type-6025",
+   "self_type" : "type-6024",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20985,8 +20988,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6206",
-   "self_type" : "type-6205",
+   "referenced_type" : "type-6215",
+   "self_type" : "type-6214",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -20994,8 +20997,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6396",
-   "self_type" : "type-6395",
+   "referenced_type" : "type-6405",
+   "self_type" : "type-6404",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21003,8 +21006,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6407",
-   "self_type" : "type-6406",
+   "referenced_type" : "type-6416",
+   "self_type" : "type-6415",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21012,8 +21015,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6433",
-   "self_type" : "type-6432",
+   "referenced_type" : "type-6442",
+   "self_type" : "type-6441",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21021,8 +21024,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6460",
-   "self_type" : "type-6459",
+   "referenced_type" : "type-6469",
+   "self_type" : "type-6468",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21030,8 +21033,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6611",
-   "self_type" : "type-6610",
+   "referenced_type" : "type-6620",
+   "self_type" : "type-6619",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21039,8 +21042,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6717",
-   "self_type" : "type-6716",
+   "referenced_type" : "type-6726",
+   "self_type" : "type-6725",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21048,8 +21051,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6744",
-   "self_type" : "type-6743",
+   "referenced_type" : "type-6753",
+   "self_type" : "type-6752",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21057,8 +21060,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6844",
-   "self_type" : "type-6843",
+   "referenced_type" : "type-6854",
+   "self_type" : "type-6853",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21066,8 +21069,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6880",
-   "self_type" : "type-6879",
+   "referenced_type" : "type-6890",
+   "self_type" : "type-6889",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21075,8 +21078,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7000",
-   "self_type" : "type-6999",
+   "referenced_type" : "type-7009",
+   "self_type" : "type-7008",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21084,8 +21087,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7060",
-   "self_type" : "type-7059",
+   "referenced_type" : "type-7069",
+   "self_type" : "type-7068",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21093,8 +21096,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7150",
-   "self_type" : "type-7149",
+   "referenced_type" : "type-7159",
+   "self_type" : "type-7158",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21102,8 +21105,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7166",
-   "self_type" : "type-7165",
+   "referenced_type" : "type-7175",
+   "self_type" : "type-7174",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21111,8 +21114,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7251",
-   "self_type" : "type-7250",
+   "referenced_type" : "type-7271",
+   "self_type" : "type-7270",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21120,8 +21123,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7290",
-   "self_type" : "type-7289",
+   "referenced_type" : "type-7310",
+   "self_type" : "type-7309",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21129,8 +21132,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7383",
-   "self_type" : "type-7382",
+   "referenced_type" : "type-7405",
+   "self_type" : "type-7404",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21147,8 +21150,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7713",
-   "self_type" : "type-7712",
+   "referenced_type" : "type-7734",
+   "self_type" : "type-7733",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21156,8 +21159,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7785",
-   "self_type" : "type-7784",
+   "referenced_type" : "type-7802",
+   "self_type" : "type-7801",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21165,8 +21168,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7890",
-   "self_type" : "type-7889",
+   "referenced_type" : "type-7911",
+   "self_type" : "type-7910",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21174,8 +21177,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7955",
-   "self_type" : "type-7954",
+   "referenced_type" : "type-7979",
+   "self_type" : "type-7978",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21183,8 +21186,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-8123",
-   "self_type" : "type-8122",
+   "referenced_type" : "type-8147",
+   "self_type" : "type-8146",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21192,8 +21195,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-8188",
-   "self_type" : "type-8187",
+   "referenced_type" : "type-8212",
+   "self_type" : "type-8211",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21201,8 +21204,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-8312",
-   "self_type" : "type-8311",
+   "referenced_type" : "type-8336",
+   "self_type" : "type-8335",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21210,8 +21213,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-8371",
-   "self_type" : "type-8370",
+   "referenced_type" : "type-8391",
+   "self_type" : "type-8390",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21219,8 +21222,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-8463",
-   "self_type" : "type-8462",
+   "referenced_type" : "type-8487",
+   "self_type" : "type-8486",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21228,8 +21231,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-8510",
-   "self_type" : "type-8509",
+   "referenced_type" : "type-8538",
+   "self_type" : "type-8537",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21237,8 +21240,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-8642",
-   "self_type" : "type-8641",
+   "referenced_type" : "type-8669",
+   "self_type" : "type-8668",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21246,8 +21249,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-8684",
-   "self_type" : "type-8683",
+   "referenced_type" : "type-868",
+   "self_type" : "type-867",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21255,8 +21258,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-8700",
-   "self_type" : "type-8699",
+   "referenced_type" : "type-8711",
+   "self_type" : "type-8710",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21264,8 +21267,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-8718",
-   "self_type" : "type-8717",
+   "referenced_type" : "type-8727",
+   "self_type" : "type-8726",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21273,8 +21276,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-872",
-   "self_type" : "type-871",
+   "referenced_type" : "type-8745",
+   "self_type" : "type-8744",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21282,8 +21285,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-8720",
-   "self_type" : "type-8719",
+   "referenced_type" : "type-8747",
+   "self_type" : "type-8746",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21291,8 +21294,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-8767",
-   "self_type" : "type-8766",
+   "referenced_type" : "type-8794",
+   "self_type" : "type-8793",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21300,8 +21303,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-8844",
-   "self_type" : "type-8843",
+   "referenced_type" : "type-8871",
+   "self_type" : "type-8870",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21309,8 +21312,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-9063",
-   "self_type" : "type-9062",
+   "referenced_type" : "type-9090",
+   "self_type" : "type-9089",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21318,8 +21321,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-9279",
-   "self_type" : "type-9278",
+   "referenced_type" : "type-9307",
+   "self_type" : "type-9306",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21327,8 +21330,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-9294",
-   "self_type" : "type-9293",
+   "referenced_type" : "type-9322",
+   "self_type" : "type-9321",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21336,8 +21339,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-9329",
-   "self_type" : "type-9328",
+   "referenced_type" : "type-9358",
+   "self_type" : "type-9357",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21345,8 +21348,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-9373",
-   "self_type" : "type-9372",
+   "referenced_type" : "type-9400",
+   "self_type" : "type-9399",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21354,8 +21357,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-9520",
-   "self_type" : "type-9519",
+   "referenced_type" : "type-9547",
+   "self_type" : "type-9546",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21363,8 +21366,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-9610",
-   "self_type" : "type-9609",
+   "referenced_type" : "type-9635",
+   "self_type" : "type-9634",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21372,8 +21375,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-9613",
-   "self_type" : "type-9612",
+   "referenced_type" : "type-9642",
+   "self_type" : "type-9641",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21381,8 +21384,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-9651",
-   "self_type" : "type-9650",
+   "referenced_type" : "type-9679",
+   "self_type" : "type-9678",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21390,8 +21393,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-9745",
-   "self_type" : "type-9744",
+   "referenced_type" : "type-9774",
+   "self_type" : "type-9773",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21399,8 +21402,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-9780",
-   "self_type" : "type-9779",
+   "referenced_type" : "type-9807",
+   "self_type" : "type-9806",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -21444,8 +21447,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ALooper::LooperThread *",
    "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-3759",
-   "self_type" : "type-3758",
+   "referenced_type" : "type-3763",
+   "self_type" : "type-3762",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21453,8 +21456,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ALooper::LooperThread *",
    "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-5680",
-   "self_type" : "type-5679",
+   "referenced_type" : "type-5687",
+   "self_type" : "type-5686",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21462,8 +21465,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ALooper::LooperThread *",
    "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-7996",
-   "self_type" : "type-7995",
+   "referenced_type" : "type-8018",
+   "self_type" : "type-8017",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21471,8 +21474,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ALooper::LooperThread *",
    "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-8144",
-   "self_type" : "type-8143",
+   "referenced_type" : "type-8168",
+   "self_type" : "type-8167",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21489,8 +21492,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::AReplyToken *",
    "name" : "android::AReplyToken *",
-   "referenced_type" : "type-1044",
-   "self_type" : "type-1163",
+   "referenced_type" : "type-1043",
+   "self_type" : "type-1166",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -21508,7 +21511,7 @@
    "linker_set_key" : "android::BBinder *",
    "name" : "android::BBinder *",
    "referenced_type" : "type-67",
-   "self_type" : "type-1206",
+   "self_type" : "type-1209",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -21535,7 +21538,7 @@
    "linker_set_key" : "android::BnInterface<android::IGraphicBufferProducer> *",
    "name" : "android::BnInterface<android::IGraphicBufferProducer> *",
    "referenced_type" : "type-71",
-   "self_type" : "type-1271",
+   "self_type" : "type-1275",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21544,7 +21547,7 @@
    "linker_set_key" : "android::BnInterface<android::IProducerListener> *",
    "name" : "android::BnInterface<android::IProducerListener> *",
    "referenced_type" : "type-80",
-   "self_type" : "type-4500",
+   "self_type" : "type-4506",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21552,8 +21555,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BnInterface<android::ITransactionCompletedListener> *",
    "name" : "android::BnInterface<android::ITransactionCompletedListener> *",
-   "referenced_type" : "type-1031",
-   "self_type" : "type-1034",
+   "referenced_type" : "type-1034",
+   "self_type" : "type-1037",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21561,8 +21564,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpConsumerListener *",
    "name" : "android::BpConsumerListener *",
-   "referenced_type" : "type-1579",
-   "self_type" : "type-1578",
+   "referenced_type" : "type-1583",
+   "self_type" : "type-1582",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21570,8 +21573,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpConsumerListener *",
    "name" : "android::BpConsumerListener *",
-   "referenced_type" : "type-4059",
-   "self_type" : "type-4058",
+   "referenced_type" : "type-4065",
+   "self_type" : "type-4064",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21579,8 +21582,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpConsumerListener *",
    "name" : "android::BpConsumerListener *",
-   "referenced_type" : "type-5980",
-   "self_type" : "type-5979",
+   "referenced_type" : "type-5989",
+   "self_type" : "type-5988",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21588,8 +21591,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpConsumerListener *",
    "name" : "android::BpConsumerListener *",
-   "referenced_type" : "type-8808",
-   "self_type" : "type-8807",
+   "referenced_type" : "type-8835",
+   "self_type" : "type-8834",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21597,8 +21600,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpGraphicBufferConsumer *",
    "name" : "android::BpGraphicBufferConsumer *",
-   "referenced_type" : "type-1603",
-   "self_type" : "type-1602",
+   "referenced_type" : "type-1607",
+   "self_type" : "type-1606",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21606,8 +21609,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpGraphicBufferConsumer *",
    "name" : "android::BpGraphicBufferConsumer *",
-   "referenced_type" : "type-4076",
-   "self_type" : "type-4075",
+   "referenced_type" : "type-4082",
+   "self_type" : "type-4081",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21615,8 +21618,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpGraphicBufferConsumer *",
    "name" : "android::BpGraphicBufferConsumer *",
-   "referenced_type" : "type-5997",
-   "self_type" : "type-5996",
+   "referenced_type" : "type-6006",
+   "self_type" : "type-6005",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21624,8 +21627,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpGraphicBufferConsumer *",
    "name" : "android::BpGraphicBufferConsumer *",
-   "referenced_type" : "type-8823",
-   "self_type" : "type-8822",
+   "referenced_type" : "type-8850",
+   "self_type" : "type-8849",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21633,8 +21636,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpGraphicBufferProducer *",
    "name" : "android::BpGraphicBufferProducer *",
-   "referenced_type" : "type-4230",
-   "self_type" : "type-4229",
+   "referenced_type" : "type-4236",
+   "self_type" : "type-4235",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21642,8 +21645,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpGraphicBufferProducer *",
    "name" : "android::BpGraphicBufferProducer *",
-   "referenced_type" : "type-6150",
-   "self_type" : "type-6149",
+   "referenced_type" : "type-6159",
+   "self_type" : "type-6158",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21651,8 +21654,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpGraphicBufferProducer *",
    "name" : "android::BpGraphicBufferProducer *",
-   "referenced_type" : "type-9007",
-   "self_type" : "type-9006",
+   "referenced_type" : "type-9034",
+   "self_type" : "type-9033",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21660,8 +21663,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpInterface<android::IConsumerListener> *",
    "name" : "android::BpInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-1495",
-   "self_type" : "type-1498",
+   "referenced_type" : "type-1501",
+   "self_type" : "type-1504",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -21669,8 +21672,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpInterface<android::IGraphicBufferConsumer> *",
    "name" : "android::BpInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-1624",
-   "self_type" : "type-1628",
+   "referenced_type" : "type-1629",
+   "self_type" : "type-1632",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -21678,8 +21681,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpInterface<android::IGraphicBufferProducer> *",
    "name" : "android::BpInterface<android::IGraphicBufferProducer> *",
-   "referenced_type" : "type-4317",
-   "self_type" : "type-4320",
+   "referenced_type" : "type-4323",
+   "self_type" : "type-4326",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -21687,8 +21690,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpInterface<android::IProducerListener> *",
    "name" : "android::BpInterface<android::IProducerListener> *",
-   "referenced_type" : "type-4479",
-   "self_type" : "type-4482",
+   "referenced_type" : "type-4485",
+   "self_type" : "type-4488",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -21696,8 +21699,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpProducerListener *",
    "name" : "android::BpProducerListener *",
-   "referenced_type" : "type-4452",
-   "self_type" : "type-4451",
+   "referenced_type" : "type-4458",
+   "self_type" : "type-4457",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21705,8 +21708,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpProducerListener *",
    "name" : "android::BpProducerListener *",
-   "referenced_type" : "type-6349",
-   "self_type" : "type-6348",
+   "referenced_type" : "type-6358",
+   "self_type" : "type-6357",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21714,8 +21717,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpProducerListener *",
    "name" : "android::BpProducerListener *",
-   "referenced_type" : "type-9221",
-   "self_type" : "type-9220",
+   "referenced_type" : "type-9249",
+   "self_type" : "type-9248",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21732,8 +21735,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-1067",
-   "self_type" : "type-1066",
+   "referenced_type" : "type-1070",
+   "self_type" : "type-1069",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -21741,8 +21744,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-1529",
-   "self_type" : "type-1528",
+   "referenced_type" : "type-1532",
+   "self_type" : "type-1531",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -21750,8 +21753,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-1670",
-   "self_type" : "type-1669",
+   "referenced_type" : "type-1674",
+   "self_type" : "type-1673",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -21759,8 +21762,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-3636",
-   "self_type" : "type-3635",
+   "referenced_type" : "type-3639",
+   "self_type" : "type-3638",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -21768,8 +21771,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-3680",
-   "self_type" : "type-3679",
+   "referenced_type" : "type-3686",
+   "self_type" : "type-3685",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -21777,8 +21780,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-4039",
-   "self_type" : "type-4038",
+   "referenced_type" : "type-4046",
+   "self_type" : "type-4045",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -21786,8 +21789,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-4125",
-   "self_type" : "type-4124",
+   "referenced_type" : "type-4131",
+   "self_type" : "type-4130",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -21795,8 +21798,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-5557",
-   "self_type" : "type-5556",
+   "referenced_type" : "type-5563",
+   "self_type" : "type-5562",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -21804,8 +21807,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-5601",
-   "self_type" : "type-5600",
+   "referenced_type" : "type-5610",
+   "self_type" : "type-5609",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -21813,8 +21816,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-5960",
-   "self_type" : "type-5959",
+   "referenced_type" : "type-5970",
+   "self_type" : "type-5969",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -21822,8 +21825,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-6046",
-   "self_type" : "type-6045",
+   "referenced_type" : "type-6055",
+   "self_type" : "type-6054",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -21831,8 +21834,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-7873",
-   "self_type" : "type-7872",
+   "referenced_type" : "type-7894",
+   "self_type" : "type-7893",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -21840,8 +21843,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-7917",
-   "self_type" : "type-7916",
+   "referenced_type" : "type-7941",
+   "self_type" : "type-7940",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -21849,8 +21852,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-8444",
-   "self_type" : "type-8443",
+   "referenced_type" : "type-8468",
+   "self_type" : "type-8467",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -21858,8 +21861,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-8482",
-   "self_type" : "type-8481",
+   "referenced_type" : "type-8509",
+   "self_type" : "type-8508",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -21867,8 +21870,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-8791",
-   "self_type" : "type-8790",
+   "referenced_type" : "type-8818",
+   "self_type" : "type-8817",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -21876,8 +21879,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-8872",
-   "self_type" : "type-8871",
+   "referenced_type" : "type-8900",
+   "self_type" : "type-8899",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -21894,8 +21897,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
    "name" : "android::BufferQueue::ProxyConsumerListener *",
-   "referenced_type" : "type-2536",
-   "self_type" : "type-2535",
+   "referenced_type" : "type-2539",
+   "self_type" : "type-2538",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21903,8 +21906,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
    "name" : "android::BufferQueue::ProxyConsumerListener *",
-   "referenced_type" : "type-4948",
-   "self_type" : "type-4947",
+   "referenced_type" : "type-4954",
+   "self_type" : "type-4953",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21912,8 +21915,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
    "name" : "android::BufferQueue::ProxyConsumerListener *",
-   "referenced_type" : "type-7065",
-   "self_type" : "type-7064",
+   "referenced_type" : "type-7073",
+   "self_type" : "type-7072",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21921,8 +21924,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
    "name" : "android::BufferQueue::ProxyConsumerListener *",
-   "referenced_type" : "type-8182",
-   "self_type" : "type-8181",
+   "referenced_type" : "type-8206",
+   "self_type" : "type-8205",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21930,8 +21933,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
    "name" : "android::BufferQueue::ProxyConsumerListener *",
-   "referenced_type" : "type-9395",
-   "self_type" : "type-9394",
+   "referenced_type" : "type-9419",
+   "self_type" : "type-9418",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21939,8 +21942,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueConsumer *",
    "name" : "android::BufferQueueConsumer *",
-   "referenced_type" : "type-3491",
-   "self_type" : "type-3490",
+   "referenced_type" : "type-3494",
+   "self_type" : "type-3493",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21948,8 +21951,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueConsumer *",
    "name" : "android::BufferQueueConsumer *",
-   "referenced_type" : "type-5412",
-   "self_type" : "type-5411",
+   "referenced_type" : "type-5418",
+   "self_type" : "type-5417",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21957,8 +21960,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueConsumer *",
    "name" : "android::BufferQueueConsumer *",
-   "referenced_type" : "type-7728",
-   "self_type" : "type-7727",
+   "referenced_type" : "type-7749",
+   "self_type" : "type-7748",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21975,8 +21978,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueConsumer *",
    "name" : "android::BufferQueueConsumer *",
-   "referenced_type" : "type-8324",
-   "self_type" : "type-8323",
+   "referenced_type" : "type-8348",
+   "self_type" : "type-8347",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21984,8 +21987,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-1169",
-   "self_type" : "type-1168",
+   "referenced_type" : "type-1172",
+   "self_type" : "type-1171",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21993,8 +21996,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-3517",
-   "self_type" : "type-3516",
+   "referenced_type" : "type-3520",
+   "self_type" : "type-3519",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22002,8 +22005,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-3615",
-   "self_type" : "type-3614",
+   "referenced_type" : "type-3618",
+   "self_type" : "type-3617",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22011,8 +22014,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-3773",
-   "self_type" : "type-3772",
+   "referenced_type" : "type-3779",
+   "self_type" : "type-3778",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22020,8 +22023,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-5438",
-   "self_type" : "type-5437",
+   "referenced_type" : "type-5444",
+   "self_type" : "type-5443",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22029,8 +22032,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-5536",
-   "self_type" : "type-5535",
+   "referenced_type" : "type-5542",
+   "self_type" : "type-5541",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22038,8 +22041,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-5694",
-   "self_type" : "type-5693",
+   "referenced_type" : "type-5703",
+   "self_type" : "type-5702",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22047,8 +22050,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-7754",
-   "self_type" : "type-7753",
+   "referenced_type" : "type-7775",
+   "self_type" : "type-7774",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22056,8 +22059,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-7852",
-   "self_type" : "type-7851",
+   "referenced_type" : "type-7873",
+   "self_type" : "type-7872",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22065,8 +22068,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-8010",
-   "self_type" : "type-8009",
+   "referenced_type" : "type-8034",
+   "self_type" : "type-8033",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22083,8 +22086,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-8343",
-   "self_type" : "type-8342",
+   "referenced_type" : "type-8367",
+   "self_type" : "type-8366",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22092,8 +22095,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-8430",
-   "self_type" : "type-8429",
+   "referenced_type" : "type-8454",
+   "self_type" : "type-8453",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22101,8 +22104,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-8561",
-   "self_type" : "type-8560",
+   "referenced_type" : "type-8588",
+   "self_type" : "type-8587",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22119,8 +22122,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueProducer *",
    "name" : "android::BufferQueueProducer *",
-   "referenced_type" : "type-3502",
-   "self_type" : "type-3501",
+   "referenced_type" : "type-3505",
+   "self_type" : "type-3504",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22128,8 +22131,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueProducer *",
    "name" : "android::BufferQueueProducer *",
-   "referenced_type" : "type-5423",
-   "self_type" : "type-5422",
+   "referenced_type" : "type-5429",
+   "self_type" : "type-5428",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22137,8 +22140,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueProducer *",
    "name" : "android::BufferQueueProducer *",
-   "referenced_type" : "type-7739",
-   "self_type" : "type-7738",
+   "referenced_type" : "type-7760",
+   "self_type" : "type-7759",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22155,8 +22158,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueProducer *",
    "name" : "android::BufferQueueProducer *",
-   "referenced_type" : "type-8333",
-   "self_type" : "type-8332",
+   "referenced_type" : "type-8357",
+   "self_type" : "type-8356",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22173,8 +22176,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ComposerService *",
    "name" : "android::ComposerService *",
-   "referenced_type" : "type-1092",
-   "self_type" : "type-1091",
+   "referenced_type" : "type-1095",
+   "self_type" : "type-1094",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -22182,8 +22185,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ComposerService *",
    "name" : "android::ComposerService *",
-   "referenced_type" : "type-3700",
-   "self_type" : "type-3699",
+   "referenced_type" : "type-3706",
+   "self_type" : "type-3705",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -22191,8 +22194,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ComposerService *",
    "name" : "android::ComposerService *",
-   "referenced_type" : "type-5621",
-   "self_type" : "type-5620",
+   "referenced_type" : "type-5630",
+   "self_type" : "type-5629",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -22200,8 +22203,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ComposerService *",
    "name" : "android::ComposerService *",
-   "referenced_type" : "type-7937",
-   "self_type" : "type-7936",
+   "referenced_type" : "type-7961",
+   "self_type" : "type-7960",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -22209,8 +22212,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ComposerService *",
    "name" : "android::ComposerService *",
-   "referenced_type" : "type-8495",
-   "self_type" : "type-8494",
+   "referenced_type" : "type-8522",
+   "self_type" : "type-8521",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -22227,8 +22230,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-1253",
-   "self_type" : "type-1252",
+   "referenced_type" : "type-1257",
+   "self_type" : "type-1256",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22236,8 +22239,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-1455",
-   "self_type" : "type-1454",
+   "referenced_type" : "type-1458",
+   "self_type" : "type-1457",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22245,8 +22248,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-3813",
-   "self_type" : "type-3812",
+   "referenced_type" : "type-3820",
+   "self_type" : "type-3819",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22254,8 +22257,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-3986",
-   "self_type" : "type-3985",
+   "referenced_type" : "type-3992",
+   "self_type" : "type-3991",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22263,8 +22266,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-5734",
-   "self_type" : "type-5733",
+   "referenced_type" : "type-5744",
+   "self_type" : "type-5743",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22272,8 +22275,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-5907",
-   "self_type" : "type-5906",
+   "referenced_type" : "type-5916",
+   "self_type" : "type-5915",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22281,8 +22284,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-8050",
-   "self_type" : "type-8049",
+   "referenced_type" : "type-8075",
+   "self_type" : "type-8074",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22290,8 +22293,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-8584",
-   "self_type" : "type-8583",
+   "referenced_type" : "type-8611",
+   "self_type" : "type-8610",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22299,8 +22302,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-8736",
-   "self_type" : "type-8735",
+   "referenced_type" : "type-8763",
+   "self_type" : "type-8762",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22308,8 +22311,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-3291",
-   "self_type" : "type-3290",
+   "referenced_type" : "type-3294",
+   "self_type" : "type-3293",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22317,8 +22320,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-3480",
-   "self_type" : "type-3479",
+   "referenced_type" : "type-3483",
+   "self_type" : "type-3482",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22335,8 +22338,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-5212",
-   "self_type" : "type-5211",
+   "referenced_type" : "type-5218",
+   "self_type" : "type-5217",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22344,8 +22347,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-5401",
-   "self_type" : "type-5400",
+   "referenced_type" : "type-5407",
+   "self_type" : "type-5406",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22353,17 +22356,8 @@
    "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",
+   "referenced_type" : "type-7549",
+   "self_type" : "type-7548",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22380,8 +22374,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-8228",
-   "self_type" : "type-8227",
+   "referenced_type" : "type-7738",
+   "self_type" : "type-7737",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22389,8 +22383,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-8316",
-   "self_type" : "type-8315",
+   "referenced_type" : "type-8252",
+   "self_type" : "type-8251",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-8340",
+   "self_type" : "type-8339",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22416,8 +22419,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-1285",
-   "self_type" : "type-1284",
+   "referenced_type" : "type-1288",
+   "self_type" : "type-1287",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22425,8 +22428,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-1414",
-   "self_type" : "type-1413",
+   "referenced_type" : "type-1417",
+   "self_type" : "type-1416",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22434,8 +22437,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-1433",
-   "self_type" : "type-1432",
+   "referenced_type" : "type-1436",
+   "self_type" : "type-1435",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22443,8 +22446,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-1457",
-   "self_type" : "type-1456",
+   "referenced_type" : "type-1461",
+   "self_type" : "type-1460",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22452,8 +22455,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-1584",
-   "self_type" : "type-1583",
+   "referenced_type" : "type-1588",
+   "self_type" : "type-1587",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22461,8 +22464,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-1611",
-   "self_type" : "type-1610",
+   "referenced_type" : "type-1615",
+   "self_type" : "type-1614",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22470,8 +22473,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-1866",
-   "self_type" : "type-1865",
+   "referenced_type" : "type-1870",
+   "self_type" : "type-1869",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22479,8 +22482,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3447",
-   "self_type" : "type-3446",
+   "referenced_type" : "type-3450",
+   "self_type" : "type-3449",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22488,8 +22491,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3485",
-   "self_type" : "type-3484",
+   "referenced_type" : "type-3488",
+   "self_type" : "type-3487",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22497,8 +22500,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3658",
-   "self_type" : "type-3657",
+   "referenced_type" : "type-3661",
+   "self_type" : "type-3660",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22506,8 +22509,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3660",
-   "self_type" : "type-3659",
+   "referenced_type" : "type-3663",
+   "self_type" : "type-3662",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22515,8 +22518,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3836",
-   "self_type" : "type-3835",
+   "referenced_type" : "type-3842",
+   "self_type" : "type-3841",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22524,8 +22527,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3941",
-   "self_type" : "type-3940",
+   "referenced_type" : "type-3947",
+   "self_type" : "type-3946",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22533,8 +22536,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3963",
-   "self_type" : "type-3962",
+   "referenced_type" : "type-3969",
+   "self_type" : "type-3968",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22542,8 +22545,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3988",
-   "self_type" : "type-3987",
+   "referenced_type" : "type-3994",
+   "self_type" : "type-3993",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22551,8 +22554,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-4064",
-   "self_type" : "type-4063",
+   "referenced_type" : "type-4070",
+   "self_type" : "type-4069",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22560,8 +22563,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-4083",
-   "self_type" : "type-4082",
+   "referenced_type" : "type-4089",
+   "self_type" : "type-4088",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22569,8 +22572,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-4395",
-   "self_type" : "type-4394",
+   "referenced_type" : "type-4399",
+   "self_type" : "type-4398",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22578,8 +22581,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-4653",
-   "self_type" : "type-4652",
+   "referenced_type" : "type-4659",
+   "self_type" : "type-4658",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22587,8 +22590,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-4669",
-   "self_type" : "type-4668",
+   "referenced_type" : "type-4675",
+   "self_type" : "type-4674",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22596,8 +22599,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-4932",
-   "self_type" : "type-4931",
+   "referenced_type" : "type-4938",
+   "self_type" : "type-4937",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22605,8 +22608,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5368",
-   "self_type" : "type-5367",
+   "referenced_type" : "type-5374",
+   "self_type" : "type-5373",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22614,8 +22617,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5406",
-   "self_type" : "type-5405",
+   "referenced_type" : "type-5412",
+   "self_type" : "type-5411",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22623,8 +22626,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5579",
-   "self_type" : "type-5578",
+   "referenced_type" : "type-5585",
+   "self_type" : "type-5584",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22632,8 +22635,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5581",
-   "self_type" : "type-5580",
+   "referenced_type" : "type-5587",
+   "self_type" : "type-5586",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22641,8 +22644,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5757",
-   "self_type" : "type-5756",
+   "referenced_type" : "type-5766",
+   "self_type" : "type-5765",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22650,8 +22653,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5862",
-   "self_type" : "type-5861",
+   "referenced_type" : "type-5871",
+   "self_type" : "type-5870",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22659,8 +22662,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5884",
-   "self_type" : "type-5883",
+   "referenced_type" : "type-5893",
+   "self_type" : "type-5892",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22668,8 +22671,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5909",
-   "self_type" : "type-5908",
+   "referenced_type" : "type-5918",
+   "self_type" : "type-5917",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22677,8 +22680,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5985",
-   "self_type" : "type-5984",
+   "referenced_type" : "type-5994",
+   "self_type" : "type-5993",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22686,8 +22689,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6004",
-   "self_type" : "type-6003",
+   "referenced_type" : "type-6013",
+   "self_type" : "type-6012",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22695,8 +22698,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6292",
-   "self_type" : "type-6291",
+   "referenced_type" : "type-6299",
+   "self_type" : "type-6298",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22704,8 +22707,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6537",
-   "self_type" : "type-6536",
+   "referenced_type" : "type-6546",
+   "self_type" : "type-6545",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22713,8 +22716,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6550",
-   "self_type" : "type-6549",
+   "referenced_type" : "type-6559",
+   "self_type" : "type-6558",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22722,8 +22725,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6764",
-   "self_type" : "type-6763",
+   "referenced_type" : "type-6773",
+   "self_type" : "type-6772",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22731,8 +22734,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6914",
-   "self_type" : "type-6913",
+   "referenced_type" : "type-6923",
+   "self_type" : "type-6922",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22749,8 +22752,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-7081",
-   "self_type" : "type-7080",
+   "referenced_type" : "type-7089",
+   "self_type" : "type-7088",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22767,8 +22770,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-7306",
-   "self_type" : "type-7305",
+   "referenced_type" : "type-7327",
+   "self_type" : "type-7326",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22776,8 +22779,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-7684",
-   "self_type" : "type-7683",
+   "referenced_type" : "type-7705",
+   "self_type" : "type-7704",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22785,8 +22788,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-7722",
-   "self_type" : "type-7721",
+   "referenced_type" : "type-7743",
+   "self_type" : "type-7742",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22803,8 +22806,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-7895",
-   "self_type" : "type-7894",
+   "referenced_type" : "type-7916",
+   "self_type" : "type-7915",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22812,8 +22815,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-7897",
-   "self_type" : "type-7896",
+   "referenced_type" : "type-7918",
+   "self_type" : "type-7917",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22821,8 +22824,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-8073",
-   "self_type" : "type-8072",
+   "referenced_type" : "type-8097",
+   "self_type" : "type-8096",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22830,8 +22833,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-8173",
-   "self_type" : "type-8172",
+   "referenced_type" : "type-8197",
+   "self_type" : "type-8196",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22839,8 +22842,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-8286",
-   "self_type" : "type-8285",
+   "referenced_type" : "type-8310",
+   "self_type" : "type-8309",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22848,8 +22851,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-8318",
-   "self_type" : "type-8317",
+   "referenced_type" : "type-8342",
+   "self_type" : "type-8341",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22857,8 +22860,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-8468",
-   "self_type" : "type-8467",
+   "referenced_type" : "type-8492",
+   "self_type" : "type-8491",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22866,8 +22869,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-8470",
-   "self_type" : "type-8469",
+   "referenced_type" : "type-8494",
+   "self_type" : "type-8493",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22875,8 +22878,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-8597",
-   "self_type" : "type-8596",
+   "referenced_type" : "type-8624",
+   "self_type" : "type-8623",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22884,8 +22887,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-8696",
-   "self_type" : "type-8695",
+   "referenced_type" : "type-8723",
+   "self_type" : "type-8722",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22893,8 +22896,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-8716",
-   "self_type" : "type-8715",
+   "referenced_type" : "type-8743",
+   "self_type" : "type-8742",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22902,8 +22905,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-8738",
-   "self_type" : "type-8737",
+   "referenced_type" : "type-8765",
+   "self_type" : "type-8764",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22911,8 +22914,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-8813",
-   "self_type" : "type-8812",
+   "referenced_type" : "type-8840",
+   "self_type" : "type-8839",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22920,8 +22923,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-8830",
-   "self_type" : "type-8829",
+   "referenced_type" : "type-8857",
+   "self_type" : "type-8856",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22929,8 +22932,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-9157",
-   "self_type" : "type-9156",
+   "referenced_type" : "type-9183",
+   "self_type" : "type-9182",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22938,8 +22941,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-9347",
-   "self_type" : "type-9346",
+   "referenced_type" : "type-9374",
+   "self_type" : "type-9373",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22947,8 +22950,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-9459",
-   "self_type" : "type-9458",
+   "referenced_type" : "type-9487",
+   "self_type" : "type-9486",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22956,8 +22959,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-9472",
-   "self_type" : "type-9471",
+   "referenced_type" : "type-9499",
+   "self_type" : "type-9498",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22965,8 +22968,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-9672",
-   "self_type" : "type-9671",
+   "referenced_type" : "type-9701",
+   "self_type" : "type-9700",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22974,8 +22977,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-9816",
-   "self_type" : "type-9815",
+   "referenced_type" : "type-9843",
+   "self_type" : "type-9842",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22983,8 +22986,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FileDescriptor::Autoclose *",
    "name" : "android::FileDescriptor::Autoclose *",
-   "referenced_type" : "type-1204",
-   "self_type" : "type-1213",
+   "referenced_type" : "type-1203",
+   "self_type" : "type-1212",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h"
   },
@@ -22993,7 +22996,7 @@
    "linker_set_key" : "android::Flattenable<android::BufferItem> *",
    "name" : "android::Flattenable<android::BufferItem> *",
    "referenced_type" : "type-21",
-   "self_type" : "type-1510",
+   "self_type" : "type-1513",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -23002,7 +23005,7 @@
    "linker_set_key" : "android::Flattenable<android::Fence> *",
    "name" : "android::Flattenable<android::Fence> *",
    "referenced_type" : "type-16",
-   "self_type" : "type-1636",
+   "self_type" : "type-1642",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -23011,7 +23014,7 @@
    "linker_set_key" : "android::Flattenable<android::FrameEventHistoryDelta> *",
    "name" : "android::Flattenable<android::FrameEventHistoryDelta> *",
    "referenced_type" : "type-25",
-   "self_type" : "type-4308",
+   "self_type" : "type-4314",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -23020,7 +23023,7 @@
    "linker_set_key" : "android::Flattenable<android::GraphicBuffer> *",
    "name" : "android::Flattenable<android::GraphicBuffer> *",
    "referenced_type" : "type-14",
-   "self_type" : "type-1640",
+   "self_type" : "type-1645",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -23029,7 +23032,7 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> *",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> *",
    "referenced_type" : "type-32",
-   "self_type" : "type-4311",
+   "self_type" : "type-4317",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -23038,7 +23041,7 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> *",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> *",
    "referenced_type" : "type-34",
-   "self_type" : "type-4314",
+   "self_type" : "type-4320",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -23055,8 +23058,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-1175",
-   "self_type" : "type-1174",
+   "referenced_type" : "type-1178",
+   "self_type" : "type-1177",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23064,8 +23067,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-1468",
-   "self_type" : "type-1467",
+   "referenced_type" : "type-1472",
+   "self_type" : "type-1471",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23073,8 +23076,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-3778",
-   "self_type" : "type-3777",
+   "referenced_type" : "type-3784",
+   "self_type" : "type-3783",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23082,8 +23085,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-3997",
-   "self_type" : "type-3996",
+   "referenced_type" : "type-4003",
+   "self_type" : "type-4002",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23091,8 +23094,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-5699",
-   "self_type" : "type-5698",
+   "referenced_type" : "type-5708",
+   "self_type" : "type-5707",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23100,8 +23103,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-5918",
-   "self_type" : "type-5917",
+   "referenced_type" : "type-5927",
+   "self_type" : "type-5926",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23109,8 +23112,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-8015",
-   "self_type" : "type-8014",
+   "referenced_type" : "type-8039",
+   "self_type" : "type-8038",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23118,8 +23121,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-8565",
-   "self_type" : "type-8564",
+   "referenced_type" : "type-8592",
+   "self_type" : "type-8591",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23127,8 +23130,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-8747",
-   "self_type" : "type-8746",
+   "referenced_type" : "type-8774",
+   "self_type" : "type-8773",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23145,8 +23148,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1331",
-   "self_type" : "type-1330",
+   "referenced_type" : "type-1330",
+   "self_type" : "type-1329",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23154,8 +23157,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1416",
-   "self_type" : "type-1415",
+   "referenced_type" : "type-1419",
+   "self_type" : "type-1418",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23163,8 +23166,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1459",
-   "self_type" : "type-1458",
+   "referenced_type" : "type-1463",
+   "self_type" : "type-1462",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23172,8 +23175,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1587",
-   "self_type" : "type-1586",
+   "referenced_type" : "type-1591",
+   "self_type" : "type-1590",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23181,8 +23184,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1608",
-   "self_type" : "type-1607",
+   "referenced_type" : "type-1612",
+   "self_type" : "type-1611",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23190,8 +23193,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3452",
-   "self_type" : "type-3451",
+   "referenced_type" : "type-3455",
+   "self_type" : "type-3454",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23199,8 +23202,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3487",
-   "self_type" : "type-3486",
+   "referenced_type" : "type-3490",
+   "self_type" : "type-3489",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23208,8 +23211,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3597",
-   "self_type" : "type-3596",
+   "referenced_type" : "type-3600",
+   "self_type" : "type-3599",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23217,8 +23220,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3662",
-   "self_type" : "type-3661",
+   "referenced_type" : "type-3665",
+   "self_type" : "type-3664",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23226,8 +23229,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3882",
-   "self_type" : "type-3881",
+   "referenced_type" : "type-3884",
+   "self_type" : "type-3883",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23235,8 +23238,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3943",
-   "self_type" : "type-3942",
+   "referenced_type" : "type-3949",
+   "self_type" : "type-3948",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23244,8 +23247,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3990",
-   "self_type" : "type-3989",
+   "referenced_type" : "type-3996",
+   "self_type" : "type-3995",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23253,8 +23256,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-4066",
-   "self_type" : "type-4065",
+   "referenced_type" : "type-4072",
+   "self_type" : "type-4071",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23262,8 +23265,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-4081",
-   "self_type" : "type-4080",
+   "referenced_type" : "type-4087",
+   "self_type" : "type-4086",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23271,8 +23274,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-4447",
-   "self_type" : "type-4446",
+   "referenced_type" : "type-4453",
+   "self_type" : "type-4452",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23280,8 +23283,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-4547",
-   "self_type" : "type-4546",
+   "referenced_type" : "type-4551",
+   "self_type" : "type-4550",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23289,8 +23292,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-4676",
-   "self_type" : "type-4675",
+   "referenced_type" : "type-4683",
+   "self_type" : "type-4682",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23298,8 +23301,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5373",
-   "self_type" : "type-5372",
+   "referenced_type" : "type-5379",
+   "self_type" : "type-5378",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23307,8 +23310,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5408",
-   "self_type" : "type-5407",
+   "referenced_type" : "type-5414",
+   "self_type" : "type-5413",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23316,8 +23319,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5518",
-   "self_type" : "type-5517",
+   "referenced_type" : "type-5524",
+   "self_type" : "type-5523",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23325,8 +23328,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5583",
-   "self_type" : "type-5582",
+   "referenced_type" : "type-5589",
+   "self_type" : "type-5588",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23334,8 +23337,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5803",
-   "self_type" : "type-5802",
+   "referenced_type" : "type-5808",
+   "self_type" : "type-5807",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23343,8 +23346,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5864",
-   "self_type" : "type-5863",
+   "referenced_type" : "type-5873",
+   "self_type" : "type-5872",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23352,8 +23355,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5911",
-   "self_type" : "type-5910",
+   "referenced_type" : "type-5920",
+   "self_type" : "type-5919",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23361,8 +23364,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5987",
-   "self_type" : "type-5986",
+   "referenced_type" : "type-5996",
+   "self_type" : "type-5995",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23370,8 +23373,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6002",
-   "self_type" : "type-6001",
+   "referenced_type" : "type-6011",
+   "self_type" : "type-6010",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23379,8 +23382,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6344",
-   "self_type" : "type-6343",
+   "referenced_type" : "type-6353",
+   "self_type" : "type-6352",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23388,8 +23391,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6431",
-   "self_type" : "type-6430",
+   "referenced_type" : "type-6438",
+   "self_type" : "type-6437",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23397,8 +23400,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6557",
-   "self_type" : "type-6556",
+   "referenced_type" : "type-6567",
+   "self_type" : "type-6566",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23406,8 +23409,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6766",
-   "self_type" : "type-6765",
+   "referenced_type" : "type-6776",
+   "self_type" : "type-6775",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23415,8 +23418,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6917",
-   "self_type" : "type-6916",
+   "referenced_type" : "type-6926",
+   "self_type" : "type-6925",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23424,17 +23427,8 @@
    "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",
+   "referenced_type" : "type-7092",
+   "self_type" : "type-7091",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23451,6 +23445,15 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-7329",
+   "self_type" : "type-7328",
+   "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,
@@ -23460,8 +23463,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-7689",
-   "self_type" : "type-7688",
+   "referenced_type" : "type-7710",
+   "self_type" : "type-7709",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23469,8 +23472,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-7724",
-   "self_type" : "type-7723",
+   "referenced_type" : "type-7745",
+   "self_type" : "type-7744",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23487,8 +23490,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-7834",
-   "self_type" : "type-7833",
+   "referenced_type" : "type-7855",
+   "self_type" : "type-7854",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23496,8 +23499,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-7899",
-   "self_type" : "type-7898",
+   "referenced_type" : "type-7920",
+   "self_type" : "type-7919",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23505,8 +23508,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-8119",
-   "self_type" : "type-8118",
+   "referenced_type" : "type-8139",
+   "self_type" : "type-8138",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23514,8 +23517,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-8146",
-   "self_type" : "type-8145",
+   "referenced_type" : "type-8170",
+   "self_type" : "type-8169",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23523,8 +23526,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-8292",
-   "self_type" : "type-8291",
+   "referenced_type" : "type-8316",
+   "self_type" : "type-8315",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23532,8 +23535,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-8320",
-   "self_type" : "type-8319",
+   "referenced_type" : "type-8344",
+   "self_type" : "type-8343",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23541,8 +23544,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-8419",
-   "self_type" : "type-8418",
+   "referenced_type" : "type-8443",
+   "self_type" : "type-8442",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23550,8 +23553,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-8472",
-   "self_type" : "type-8471",
+   "referenced_type" : "type-8496",
+   "self_type" : "type-8495",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23559,8 +23562,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-8638",
-   "self_type" : "type-8637",
+   "referenced_type" : "type-8661",
+   "self_type" : "type-8660",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23568,8 +23571,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-8698",
-   "self_type" : "type-8697",
+   "referenced_type" : "type-8725",
+   "self_type" : "type-8724",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23577,8 +23580,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-8740",
-   "self_type" : "type-8739",
+   "referenced_type" : "type-8767",
+   "self_type" : "type-8766",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23586,8 +23589,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-8789",
-   "self_type" : "type-8788",
+   "referenced_type" : "type-8812",
+   "self_type" : "type-8811",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23595,8 +23598,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-8815",
-   "self_type" : "type-8814",
+   "referenced_type" : "type-8842",
+   "self_type" : "type-8841",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23604,8 +23607,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-8828",
-   "self_type" : "type-8827",
+   "referenced_type" : "type-8855",
+   "self_type" : "type-8854",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23613,8 +23616,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-9215",
-   "self_type" : "type-9214",
+   "referenced_type" : "type-9242",
+   "self_type" : "type-9241",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23631,8 +23634,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-9479",
-   "self_type" : "type-9478",
+   "referenced_type" : "type-9506",
+   "self_type" : "type-9505",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23640,8 +23643,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-9676",
-   "self_type" : "type-9675",
+   "referenced_type" : "type-9703",
+   "self_type" : "type-9702",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23649,8 +23652,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-9819",
-   "self_type" : "type-9818",
+   "referenced_type" : "type-9846",
+   "self_type" : "type-9845",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23658,8 +23661,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1088",
-   "self_type" : "type-1087",
+   "referenced_type" : "type-1091",
+   "self_type" : "type-1090",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23667,8 +23670,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1270",
-   "self_type" : "type-1269",
+   "referenced_type" : "type-1273",
+   "self_type" : "type-1272",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23676,8 +23679,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1412",
-   "self_type" : "type-1411",
+   "referenced_type" : "type-1415",
+   "self_type" : "type-1414",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23685,8 +23688,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1448",
-   "self_type" : "type-1447",
+   "referenced_type" : "type-1451",
+   "self_type" : "type-1450",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23694,8 +23697,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-2174",
-   "self_type" : "type-2173",
+   "referenced_type" : "type-2178",
+   "self_type" : "type-2177",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23703,8 +23706,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3252",
-   "self_type" : "type-3251",
+   "referenced_type" : "type-3255",
+   "self_type" : "type-3254",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23721,8 +23724,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3465",
-   "self_type" : "type-3464",
+   "referenced_type" : "type-3468",
+   "self_type" : "type-3467",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23730,8 +23733,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3530",
-   "self_type" : "type-3529",
+   "referenced_type" : "type-3533",
+   "self_type" : "type-3532",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23739,8 +23742,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3641",
-   "self_type" : "type-3640",
+   "referenced_type" : "type-3644",
+   "self_type" : "type-3643",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23748,8 +23751,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3698",
-   "self_type" : "type-3697",
+   "referenced_type" : "type-3704",
+   "self_type" : "type-3703",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23757,8 +23760,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3823",
-   "self_type" : "type-3822",
+   "referenced_type" : "type-3829",
+   "self_type" : "type-3828",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23766,8 +23769,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3939",
-   "self_type" : "type-3938",
+   "referenced_type" : "type-3945",
+   "self_type" : "type-3944",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23775,8 +23778,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3980",
-   "self_type" : "type-3979",
+   "referenced_type" : "type-3987",
+   "self_type" : "type-3986",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23784,8 +23787,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-4209",
-   "self_type" : "type-4208",
+   "referenced_type" : "type-4216",
+   "self_type" : "type-4215",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23793,8 +23796,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-4388",
-   "self_type" : "type-4387",
+   "referenced_type" : "type-4394",
+   "self_type" : "type-4393",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23802,8 +23805,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-4600",
-   "self_type" : "type-4599",
+   "referenced_type" : "type-4607",
+   "self_type" : "type-4606",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23811,8 +23814,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-4766",
-   "self_type" : "type-4765",
+   "referenced_type" : "type-4773",
+   "self_type" : "type-4772",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23820,8 +23823,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5173",
-   "self_type" : "type-5172",
+   "referenced_type" : "type-5179",
+   "self_type" : "type-5178",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23829,8 +23832,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5386",
-   "self_type" : "type-5385",
+   "referenced_type" : "type-5392",
+   "self_type" : "type-5391",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23838,8 +23841,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5451",
-   "self_type" : "type-5450",
+   "referenced_type" : "type-5457",
+   "self_type" : "type-5456",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23847,8 +23850,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5562",
-   "self_type" : "type-5561",
+   "referenced_type" : "type-5568",
+   "self_type" : "type-5567",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23856,8 +23859,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5619",
-   "self_type" : "type-5618",
+   "referenced_type" : "type-5628",
+   "self_type" : "type-5627",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23865,8 +23868,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5744",
-   "self_type" : "type-5743",
+   "referenced_type" : "type-5753",
+   "self_type" : "type-5752",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23874,8 +23877,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5860",
-   "self_type" : "type-5859",
+   "referenced_type" : "type-5869",
+   "self_type" : "type-5868",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23883,8 +23886,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5901",
-   "self_type" : "type-5900",
+   "referenced_type" : "type-5911",
+   "self_type" : "type-5910",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23892,8 +23895,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6130",
-   "self_type" : "type-6129",
+   "referenced_type" : "type-6140",
+   "self_type" : "type-6139",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23901,8 +23904,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6285",
-   "self_type" : "type-6284",
+   "referenced_type" : "type-6294",
+   "self_type" : "type-6293",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23910,8 +23913,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6484",
-   "self_type" : "type-6483",
+   "referenced_type" : "type-6494",
+   "self_type" : "type-6493",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23919,8 +23922,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6632",
-   "self_type" : "type-6631",
+   "referenced_type" : "type-6642",
+   "self_type" : "type-6641",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23928,8 +23931,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6859",
-   "self_type" : "type-6858",
+   "referenced_type" : "type-6869",
+   "self_type" : "type-6868",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23937,8 +23940,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-7011",
-   "self_type" : "type-7010",
+   "referenced_type" : "type-7020",
+   "self_type" : "type-7019",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23946,8 +23949,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-7102",
-   "self_type" : "type-7101",
+   "referenced_type" : "type-7111",
+   "self_type" : "type-7110",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23955,8 +23958,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-7260",
-   "self_type" : "type-7259",
+   "referenced_type" : "type-7280",
+   "self_type" : "type-7279",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23964,8 +23967,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-7326",
-   "self_type" : "type-7325",
+   "referenced_type" : "type-7346",
+   "self_type" : "type-7345",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23973,8 +23976,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-7489",
-   "self_type" : "type-7488",
+   "referenced_type" : "type-7510",
+   "self_type" : "type-7509",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -23991,8 +23994,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-7702",
-   "self_type" : "type-7701",
+   "referenced_type" : "type-7723",
+   "self_type" : "type-7722",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -24000,8 +24003,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-7767",
-   "self_type" : "type-7766",
+   "referenced_type" : "type-7788",
+   "self_type" : "type-7787",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -24009,8 +24012,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-7878",
-   "self_type" : "type-7877",
+   "referenced_type" : "type-7899",
+   "self_type" : "type-7898",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -24018,8 +24021,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-7935",
-   "self_type" : "type-7934",
+   "referenced_type" : "type-7959",
+   "self_type" : "type-7958",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -24027,8 +24030,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-8060",
-   "self_type" : "type-8059",
+   "referenced_type" : "type-8084",
+   "self_type" : "type-8083",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -24036,8 +24039,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-8220",
-   "self_type" : "type-8219",
+   "referenced_type" : "type-8244",
+   "self_type" : "type-8243",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -24045,8 +24048,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-8303",
-   "self_type" : "type-8302",
+   "referenced_type" : "type-8328",
+   "self_type" : "type-8327",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -24054,8 +24057,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-8355",
-   "self_type" : "type-8354",
+   "referenced_type" : "type-8379",
+   "self_type" : "type-8378",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -24072,8 +24075,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-8449",
-   "self_type" : "type-8448",
+   "referenced_type" : "type-8473",
+   "self_type" : "type-8472",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -24081,8 +24084,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-8493",
-   "self_type" : "type-8492",
+   "referenced_type" : "type-8520",
+   "self_type" : "type-8519",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -24090,8 +24093,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-8588",
-   "self_type" : "type-8587",
+   "referenced_type" : "type-8616",
+   "self_type" : "type-8615",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -24099,8 +24102,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-8694",
-   "self_type" : "type-8693",
+   "referenced_type" : "type-8721",
+   "self_type" : "type-8720",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -24108,8 +24111,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-8731",
-   "self_type" : "type-8730",
+   "referenced_type" : "type-8758",
+   "self_type" : "type-8757",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -24117,8 +24120,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-8977",
-   "self_type" : "type-8976",
+   "referenced_type" : "type-9004",
+   "self_type" : "type-9003",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -24126,8 +24129,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-9149",
-   "self_type" : "type-9148",
+   "referenced_type" : "type-9177",
+   "self_type" : "type-9176",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -24135,8 +24138,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-9401",
-   "self_type" : "type-9400",
+   "referenced_type" : "type-9428",
+   "self_type" : "type-9427",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -24144,8 +24147,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-9539",
-   "self_type" : "type-9538",
+   "referenced_type" : "type-9567",
+   "self_type" : "type-9566",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -24153,8 +24156,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-9761",
-   "self_type" : "type-9760",
+   "referenced_type" : "type-9788",
+   "self_type" : "type-9787",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -24189,8 +24192,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
    "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-3902",
-   "self_type" : "type-3901",
+   "referenced_type" : "type-3908",
+   "self_type" : "type-3907",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24207,8 +24210,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
    "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-5823",
-   "self_type" : "type-5822",
+   "referenced_type" : "type-5832",
+   "self_type" : "type-5831",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24216,8 +24219,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
    "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-8139",
-   "self_type" : "type-8138",
+   "referenced_type" : "type-8163",
+   "self_type" : "type-8162",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24225,8 +24228,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
    "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-8166",
-   "self_type" : "type-8165",
+   "referenced_type" : "type-8190",
+   "self_type" : "type-8189",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24243,8 +24246,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-4257",
-   "self_type" : "type-4256",
+   "referenced_type" : "type-4263",
+   "self_type" : "type-4262",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24252,8 +24255,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-4266",
-   "self_type" : "type-4265",
+   "referenced_type" : "type-4272",
+   "self_type" : "type-4271",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24261,8 +24264,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-4693",
-   "self_type" : "type-4692",
+   "referenced_type" : "type-4700",
+   "self_type" : "type-4699",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24270,8 +24273,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-6172",
-   "self_type" : "type-6171",
+   "referenced_type" : "type-6181",
+   "self_type" : "type-6180",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24279,8 +24282,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-6178",
-   "self_type" : "type-6177",
+   "referenced_type" : "type-6187",
+   "self_type" : "type-6186",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24288,8 +24291,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-6573",
-   "self_type" : "type-6572",
+   "referenced_type" : "type-6583",
+   "self_type" : "type-6582",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24297,8 +24300,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-6920",
-   "self_type" : "type-6919",
+   "referenced_type" : "type-6929",
+   "self_type" : "type-6928",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24306,8 +24309,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-9029",
-   "self_type" : "type-9028",
+   "referenced_type" : "type-9056",
+   "self_type" : "type-9055",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24315,8 +24318,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-9035",
-   "self_type" : "type-9034",
+   "referenced_type" : "type-9062",
+   "self_type" : "type-9061",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24324,8 +24327,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-9492",
-   "self_type" : "type-9491",
+   "referenced_type" : "type-9519",
+   "self_type" : "type-9518",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24333,8 +24336,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-9822",
-   "self_type" : "type-9821",
+   "referenced_type" : "type-9849",
+   "self_type" : "type-9848",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24342,8 +24345,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
    "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
-   "referenced_type" : "type-4829",
-   "self_type" : "type-4828",
+   "referenced_type" : "type-4835",
+   "self_type" : "type-4834",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24351,8 +24354,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
    "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
-   "referenced_type" : "type-6694",
-   "self_type" : "type-6693",
+   "referenced_type" : "type-6703",
+   "self_type" : "type-6702",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24360,8 +24363,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
    "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
-   "referenced_type" : "type-7031",
-   "self_type" : "type-7030",
+   "referenced_type" : "type-7040",
+   "self_type" : "type-7039",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24369,8 +24372,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
    "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
-   "referenced_type" : "type-7275",
-   "self_type" : "type-7274",
+   "referenced_type" : "type-7295",
+   "self_type" : "type-7294",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24378,8 +24381,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
    "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
-   "referenced_type" : "type-9594",
-   "self_type" : "type-9593",
+   "referenced_type" : "type-9622",
+   "self_type" : "type-9621",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24387,8 +24390,8 @@
    "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",
+   "referenced_type" : "type-4289",
+   "self_type" : "type-4288",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24396,8 +24399,8 @@
    "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",
+   "referenced_type" : "type-4671",
+   "self_type" : "type-4670",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24405,8 +24408,8 @@
    "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",
+   "referenced_type" : "type-6201",
+   "self_type" : "type-6200",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24414,8 +24417,8 @@
    "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",
+   "referenced_type" : "type-6556",
+   "self_type" : "type-6555",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24423,8 +24426,8 @@
    "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",
+   "referenced_type" : "type-9076",
+   "self_type" : "type-9075",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24432,8 +24435,8 @@
    "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",
+   "referenced_type" : "type-9497",
+   "self_type" : "type-9496",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24441,8 +24444,8 @@
    "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",
+   "referenced_type" : "type-4831",
+   "self_type" : "type-4830",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24450,8 +24453,8 @@
    "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",
+   "referenced_type" : "type-6700",
+   "self_type" : "type-6699",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24459,8 +24462,8 @@
    "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",
+   "referenced_type" : "type-9618",
+   "self_type" : "type-9617",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24468,8 +24471,8 @@
    "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",
+   "referenced_type" : "type-4291",
+   "self_type" : "type-4290",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24477,8 +24480,8 @@
    "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",
+   "referenced_type" : "type-6203",
+   "self_type" : "type-6202",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24486,8 +24489,8 @@
    "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",
+   "referenced_type" : "type-6911",
+   "self_type" : "type-6910",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24495,8 +24498,8 @@
    "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",
+   "referenced_type" : "type-9078",
+   "self_type" : "type-9077",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24504,8 +24507,8 @@
    "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",
+   "referenced_type" : "type-9831",
+   "self_type" : "type-9830",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24513,8 +24516,8 @@
    "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",
+   "referenced_type" : "type-7035",
+   "self_type" : "type-7034",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24522,8 +24525,8 @@
    "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",
+   "referenced_type" : "type-7292",
+   "self_type" : "type-7291",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24531,8 +24534,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::HpGraphicBufferProducer *",
    "name" : "android::HpGraphicBufferProducer *",
-   "referenced_type" : "type-4246",
-   "self_type" : "type-4245",
+   "referenced_type" : "type-4252",
+   "self_type" : "type-4251",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24540,8 +24543,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::HpGraphicBufferProducer *",
    "name" : "android::HpGraphicBufferProducer *",
-   "referenced_type" : "type-6161",
-   "self_type" : "type-6160",
+   "referenced_type" : "type-6170",
+   "self_type" : "type-6169",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24549,8 +24552,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::HpGraphicBufferProducer *",
    "name" : "android::HpGraphicBufferProducer *",
-   "referenced_type" : "type-9018",
-   "self_type" : "type-9017",
+   "referenced_type" : "type-9045",
+   "self_type" : "type-9044",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24558,8 +24561,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::HpProducerListener *",
    "name" : "android::HpProducerListener *",
-   "referenced_type" : "type-4521",
-   "self_type" : "type-4520",
+   "referenced_type" : "type-4527",
+   "self_type" : "type-4526",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24567,8 +24570,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::HpProducerListener *",
    "name" : "android::HpProducerListener *",
-   "referenced_type" : "type-6405",
-   "self_type" : "type-6404",
+   "referenced_type" : "type-6414",
+   "self_type" : "type-6413",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24576,8 +24579,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::HpProducerListener *",
    "name" : "android::HpProducerListener *",
-   "referenced_type" : "type-9290",
-   "self_type" : "type-9289",
+   "referenced_type" : "type-9318",
+   "self_type" : "type-9317",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24612,8 +24615,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-1154",
-   "self_type" : "type-1153",
+   "referenced_type" : "type-1157",
+   "self_type" : "type-1156",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24621,8 +24624,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-1576",
-   "self_type" : "type-1575",
+   "referenced_type" : "type-1579",
+   "self_type" : "type-1578",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24630,8 +24633,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-1614",
-   "self_type" : "type-1613",
+   "referenced_type" : "type-1618",
+   "self_type" : "type-1617",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24639,8 +24642,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-3498",
-   "self_type" : "type-3497",
+   "referenced_type" : "type-3501",
+   "self_type" : "type-3500",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24648,8 +24651,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-3605",
-   "self_type" : "type-3604",
+   "referenced_type" : "type-3608",
+   "self_type" : "type-3607",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24657,8 +24660,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-3664",
-   "self_type" : "type-3663",
+   "referenced_type" : "type-3667",
+   "self_type" : "type-3666",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24666,8 +24669,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-3757",
-   "self_type" : "type-3756",
+   "referenced_type" : "type-3765",
+   "self_type" : "type-3764",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24675,8 +24678,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-4055",
-   "self_type" : "type-4054",
+   "referenced_type" : "type-4062",
+   "self_type" : "type-4061",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24684,8 +24687,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-4085",
-   "self_type" : "type-4084",
+   "referenced_type" : "type-4091",
+   "self_type" : "type-4090",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24693,8 +24696,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-4945",
-   "self_type" : "type-4944",
+   "referenced_type" : "type-4951",
+   "self_type" : "type-4950",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24702,8 +24705,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-5419",
-   "self_type" : "type-5418",
+   "referenced_type" : "type-5425",
+   "self_type" : "type-5424",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24711,8 +24714,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-5526",
-   "self_type" : "type-5525",
+   "referenced_type" : "type-5532",
+   "self_type" : "type-5531",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24720,8 +24723,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-5585",
-   "self_type" : "type-5584",
+   "referenced_type" : "type-5591",
+   "self_type" : "type-5590",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24729,8 +24732,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-5678",
-   "self_type" : "type-5677",
+   "referenced_type" : "type-5689",
+   "self_type" : "type-5688",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24738,8 +24741,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-5976",
-   "self_type" : "type-5975",
+   "referenced_type" : "type-5986",
+   "self_type" : "type-5985",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24747,8 +24750,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-6006",
-   "self_type" : "type-6005",
+   "referenced_type" : "type-6015",
+   "self_type" : "type-6014",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24756,8 +24759,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-7058",
-   "self_type" : "type-7057",
+   "referenced_type" : "type-7066",
+   "self_type" : "type-7065",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24765,8 +24768,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-7086",
-   "self_type" : "type-7085",
+   "referenced_type" : "type-7096",
+   "self_type" : "type-7095",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24774,8 +24777,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-7311",
-   "self_type" : "type-7310",
+   "referenced_type" : "type-7331",
+   "self_type" : "type-7330",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24783,8 +24786,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-7735",
-   "self_type" : "type-7734",
+   "referenced_type" : "type-7756",
+   "self_type" : "type-7755",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24792,8 +24795,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-7842",
-   "self_type" : "type-7841",
+   "referenced_type" : "type-7863",
+   "self_type" : "type-7862",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24801,8 +24804,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-7901",
-   "self_type" : "type-7900",
+   "referenced_type" : "type-7922",
+   "self_type" : "type-7921",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24819,8 +24822,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-7994",
-   "self_type" : "type-7993",
+   "referenced_type" : "type-8020",
+   "self_type" : "type-8019",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24828,8 +24831,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-8180",
-   "self_type" : "type-8179",
+   "referenced_type" : "type-8204",
+   "self_type" : "type-8203",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24837,8 +24840,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-8329",
-   "self_type" : "type-8328",
+   "referenced_type" : "type-8353",
+   "self_type" : "type-8352",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24846,8 +24849,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-8424",
-   "self_type" : "type-8423",
+   "referenced_type" : "type-8449",
+   "self_type" : "type-8448",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24855,8 +24858,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-8474",
-   "self_type" : "type-8473",
+   "referenced_type" : "type-8498",
+   "self_type" : "type-8497",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24864,17 +24867,8 @@
    "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",
+   "referenced_type" : "type-8576",
+   "self_type" : "type-8575",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24891,6 +24885,15 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-8859",
+   "self_type" : "type-8858",
+   "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,
@@ -24900,8 +24903,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-9384",
-   "self_type" : "type-9383",
+   "referenced_type" : "type-9404",
+   "self_type" : "type-9403",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24918,8 +24921,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-1172",
-   "self_type" : "type-1171",
+   "referenced_type" : "type-1175",
+   "self_type" : "type-1174",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24927,8 +24930,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-1466",
-   "self_type" : "type-1465",
+   "referenced_type" : "type-1470",
+   "self_type" : "type-1469",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24936,8 +24939,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-1599",
-   "self_type" : "type-1598",
+   "referenced_type" : "type-1603",
+   "self_type" : "type-1602",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24945,8 +24948,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-3489",
-   "self_type" : "type-3488",
+   "referenced_type" : "type-3492",
+   "self_type" : "type-3491",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24954,8 +24957,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-3776",
-   "self_type" : "type-3775",
+   "referenced_type" : "type-3782",
+   "self_type" : "type-3781",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24963,8 +24966,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-3969",
-   "self_type" : "type-3968",
+   "referenced_type" : "type-3975",
+   "self_type" : "type-3974",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24972,8 +24975,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-3995",
-   "self_type" : "type-3994",
+   "referenced_type" : "type-4001",
+   "self_type" : "type-4000",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24981,8 +24984,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-4073",
-   "self_type" : "type-4072",
+   "referenced_type" : "type-4079",
+   "self_type" : "type-4078",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24990,8 +24993,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-5410",
-   "self_type" : "type-5409",
+   "referenced_type" : "type-5416",
+   "self_type" : "type-5415",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24999,8 +25002,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-5697",
-   "self_type" : "type-5696",
+   "referenced_type" : "type-5706",
+   "self_type" : "type-5705",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25017,8 +25020,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-5890",
-   "self_type" : "type-5889",
+   "referenced_type" : "type-5899",
+   "self_type" : "type-5898",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25026,8 +25029,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-5916",
-   "self_type" : "type-5915",
+   "referenced_type" : "type-5925",
+   "self_type" : "type-5924",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25035,8 +25038,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-5994",
-   "self_type" : "type-5993",
+   "referenced_type" : "type-6003",
+   "self_type" : "type-6002",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25044,8 +25047,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-7726",
-   "self_type" : "type-7725",
+   "referenced_type" : "type-7747",
+   "self_type" : "type-7746",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25062,8 +25065,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-8013",
-   "self_type" : "type-8012",
+   "referenced_type" : "type-8037",
+   "self_type" : "type-8036",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25071,8 +25074,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-8168",
-   "self_type" : "type-8167",
+   "referenced_type" : "type-8192",
+   "self_type" : "type-8191",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25080,8 +25083,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-8204",
-   "self_type" : "type-8203",
+   "referenced_type" : "type-8228",
+   "self_type" : "type-8227",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25089,8 +25092,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-8322",
-   "self_type" : "type-8321",
+   "referenced_type" : "type-8346",
+   "self_type" : "type-8345",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25098,8 +25101,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-8563",
-   "self_type" : "type-8562",
+   "referenced_type" : "type-8590",
+   "self_type" : "type-8589",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25107,8 +25110,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-8745",
-   "self_type" : "type-8744",
+   "referenced_type" : "type-8772",
+   "self_type" : "type-8771",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25116,8 +25119,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-8820",
-   "self_type" : "type-8819",
+   "referenced_type" : "type-8847",
+   "self_type" : "type-8846",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25125,8 +25128,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-3500",
-   "self_type" : "type-3499",
+   "referenced_type" : "type-3503",
+   "self_type" : "type-3502",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25134,8 +25137,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-3956",
-   "self_type" : "type-3955",
+   "referenced_type" : "type-3959",
+   "self_type" : "type-3958",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25143,8 +25146,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-4225",
-   "self_type" : "type-4224",
+   "referenced_type" : "type-4231",
+   "self_type" : "type-4230",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25152,8 +25155,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-5421",
-   "self_type" : "type-5420",
+   "referenced_type" : "type-5427",
+   "self_type" : "type-5426",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25170,8 +25173,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-5877",
-   "self_type" : "type-5876",
+   "referenced_type" : "type-5883",
+   "self_type" : "type-5882",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25179,8 +25182,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-6146",
-   "self_type" : "type-6145",
+   "referenced_type" : "type-6155",
+   "self_type" : "type-6154",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25188,8 +25191,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-6769",
-   "self_type" : "type-6768",
+   "referenced_type" : "type-6778",
+   "self_type" : "type-6777",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25197,8 +25200,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-7737",
-   "self_type" : "type-7736",
+   "referenced_type" : "type-7758",
+   "self_type" : "type-7757",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25215,8 +25218,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-8164",
-   "self_type" : "type-8163",
+   "referenced_type" : "type-8188",
+   "self_type" : "type-8187",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25224,8 +25227,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-8199",
-   "self_type" : "type-8198",
+   "referenced_type" : "type-8220",
+   "self_type" : "type-8219",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25233,8 +25236,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-8331",
-   "self_type" : "type-8330",
+   "referenced_type" : "type-8355",
+   "self_type" : "type-8354",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25242,8 +25245,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-9003",
-   "self_type" : "type-9002",
+   "referenced_type" : "type-9030",
+   "self_type" : "type-9029",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25251,8 +25254,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-9678",
-   "self_type" : "type-9677",
+   "referenced_type" : "type-9706",
+   "self_type" : "type-9705",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25269,8 +25272,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1265",
-   "self_type" : "type-1264",
+   "referenced_type" : "type-1268",
+   "self_type" : "type-1267",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -25278,8 +25281,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1369",
-   "self_type" : "type-1368",
+   "referenced_type" : "type-1372",
+   "self_type" : "type-1371",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -25287,8 +25290,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-3818",
-   "self_type" : "type-3817",
+   "referenced_type" : "type-3825",
+   "self_type" : "type-3824",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -25296,8 +25299,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-3914",
-   "self_type" : "type-3913",
+   "referenced_type" : "type-3920",
+   "self_type" : "type-3919",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -25305,8 +25308,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-5739",
-   "self_type" : "type-5738",
+   "referenced_type" : "type-5749",
+   "self_type" : "type-5748",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -25314,8 +25317,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-5835",
-   "self_type" : "type-5834",
+   "referenced_type" : "type-5844",
+   "self_type" : "type-5843",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -25323,8 +25326,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-8055",
-   "self_type" : "type-8054",
+   "referenced_type" : "type-8080",
+   "self_type" : "type-8079",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -25332,8 +25335,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-8582",
-   "self_type" : "type-8581",
+   "referenced_type" : "type-8609",
+   "self_type" : "type-8608",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -25341,8 +25344,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-8668",
-   "self_type" : "type-8667",
+   "referenced_type" : "type-8695",
+   "self_type" : "type-8694",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -25359,8 +25362,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-1159",
-   "self_type" : "type-1158",
+   "referenced_type" : "type-1162",
+   "self_type" : "type-1161",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25368,8 +25371,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-3508",
-   "self_type" : "type-3507",
+   "referenced_type" : "type-3511",
+   "self_type" : "type-3510",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25377,8 +25380,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-3618",
-   "self_type" : "type-3617",
+   "referenced_type" : "type-3621",
+   "self_type" : "type-3620",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25386,8 +25389,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-3666",
-   "self_type" : "type-3665",
+   "referenced_type" : "type-3669",
+   "self_type" : "type-3668",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25395,8 +25398,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-3764",
-   "self_type" : "type-3763",
+   "referenced_type" : "type-3770",
+   "self_type" : "type-3769",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25404,8 +25407,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-4251",
-   "self_type" : "type-4250",
+   "referenced_type" : "type-4257",
+   "self_type" : "type-4256",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25413,8 +25416,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-4515",
-   "self_type" : "type-4514",
+   "referenced_type" : "type-4521",
+   "self_type" : "type-4520",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25422,8 +25425,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-4558",
-   "self_type" : "type-4557",
+   "referenced_type" : "type-4564",
+   "self_type" : "type-4563",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25431,8 +25434,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-4688",
-   "self_type" : "type-4687",
+   "referenced_type" : "type-4694",
+   "self_type" : "type-4693",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25440,8 +25443,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-4950",
-   "self_type" : "type-4949",
+   "referenced_type" : "type-4956",
+   "self_type" : "type-4955",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25449,8 +25452,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-5429",
-   "self_type" : "type-5428",
+   "referenced_type" : "type-5435",
+   "self_type" : "type-5434",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25458,8 +25461,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-5539",
-   "self_type" : "type-5538",
+   "referenced_type" : "type-5545",
+   "self_type" : "type-5544",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25467,8 +25470,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-5587",
-   "self_type" : "type-5586",
+   "referenced_type" : "type-5593",
+   "self_type" : "type-5592",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25476,8 +25479,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-5685",
-   "self_type" : "type-5684",
+   "referenced_type" : "type-5694",
+   "self_type" : "type-5693",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25485,8 +25488,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6166",
-   "self_type" : "type-6165",
+   "referenced_type" : "type-6175",
+   "self_type" : "type-6174",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25494,8 +25497,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6399",
-   "self_type" : "type-6398",
+   "referenced_type" : "type-6408",
+   "self_type" : "type-6407",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25503,8 +25506,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6442",
-   "self_type" : "type-6441",
+   "referenced_type" : "type-6451",
+   "self_type" : "type-6450",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25512,8 +25515,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6568",
-   "self_type" : "type-6567",
+   "referenced_type" : "type-6577",
+   "self_type" : "type-6576",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25521,8 +25524,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6753",
-   "self_type" : "type-6752",
+   "referenced_type" : "type-6762",
+   "self_type" : "type-6761",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25530,8 +25533,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6759",
-   "self_type" : "type-6758",
+   "referenced_type" : "type-6769",
+   "self_type" : "type-6768",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25539,8 +25542,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6893",
-   "self_type" : "type-6892",
+   "referenced_type" : "type-6902",
+   "self_type" : "type-6901",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25548,8 +25551,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6912",
-   "self_type" : "type-6911",
+   "referenced_type" : "type-6921",
+   "self_type" : "type-6920",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25557,8 +25560,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7076",
-   "self_type" : "type-7075",
+   "referenced_type" : "type-7079",
+   "self_type" : "type-7078",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25566,8 +25569,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7088",
-   "self_type" : "type-7087",
+   "referenced_type" : "type-7098",
+   "self_type" : "type-7097",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25575,8 +25578,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7313",
-   "self_type" : "type-7312",
+   "referenced_type" : "type-7333",
+   "self_type" : "type-7332",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25584,8 +25587,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7745",
-   "self_type" : "type-7744",
+   "referenced_type" : "type-7766",
+   "self_type" : "type-7765",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25593,8 +25596,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7855",
-   "self_type" : "type-7854",
+   "referenced_type" : "type-7876",
+   "self_type" : "type-7875",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25602,8 +25605,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7903",
-   "self_type" : "type-7902",
+   "referenced_type" : "type-7924",
+   "self_type" : "type-7923",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25611,8 +25614,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-8001",
-   "self_type" : "type-8000",
+   "referenced_type" : "type-8025",
+   "self_type" : "type-8024",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25629,8 +25632,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-8184",
-   "self_type" : "type-8183",
+   "referenced_type" : "type-8208",
+   "self_type" : "type-8207",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25638,8 +25641,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-8338",
-   "self_type" : "type-8337",
+   "referenced_type" : "type-8362",
+   "self_type" : "type-8361",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25647,8 +25650,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-8432",
-   "self_type" : "type-8431",
+   "referenced_type" : "type-8456",
+   "self_type" : "type-8455",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25656,8 +25659,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-8476",
-   "self_type" : "type-8475",
+   "referenced_type" : "type-8500",
+   "self_type" : "type-8499",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25665,8 +25668,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-8554",
-   "self_type" : "type-8553",
+   "referenced_type" : "type-8581",
+   "self_type" : "type-8580",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25674,8 +25677,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-9023",
-   "self_type" : "type-9022",
+   "referenced_type" : "type-9050",
+   "self_type" : "type-9049",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25683,8 +25686,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-9283",
-   "self_type" : "type-9282",
+   "referenced_type" : "type-9311",
+   "self_type" : "type-9310",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25692,8 +25695,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-9342",
-   "self_type" : "type-9341",
+   "referenced_type" : "type-9370",
+   "self_type" : "type-9369",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25701,8 +25704,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-9405",
-   "self_type" : "type-9404",
+   "referenced_type" : "type-9430",
+   "self_type" : "type-9429",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25710,8 +25713,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-9487",
-   "self_type" : "type-9486",
+   "referenced_type" : "type-9514",
+   "self_type" : "type-9513",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25737,8 +25740,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-9661",
-   "self_type" : "type-9660",
+   "referenced_type" : "type-9688",
+   "self_type" : "type-9687",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25746,8 +25749,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-9667",
-   "self_type" : "type-9666",
+   "referenced_type" : "type-9695",
+   "self_type" : "type-9694",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25755,8 +25758,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-9793",
-   "self_type" : "type-9792",
+   "referenced_type" : "type-9821",
+   "self_type" : "type-9820",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25764,8 +25767,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-9814",
-   "self_type" : "type-9813",
+   "referenced_type" : "type-9841",
+   "self_type" : "type-9840",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25773,8 +25776,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ISurfaceComposer *",
    "name" : "android::ISurfaceComposer *",
-   "referenced_type" : "type-1050",
-   "self_type" : "type-1049",
+   "referenced_type" : "type-1053",
+   "self_type" : "type-1052",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25782,8 +25785,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ISurfaceComposer *",
    "name" : "android::ISurfaceComposer *",
-   "referenced_type" : "type-3677",
-   "self_type" : "type-3676",
+   "referenced_type" : "type-3683",
+   "self_type" : "type-3682",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25791,8 +25794,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ISurfaceComposer *",
    "name" : "android::ISurfaceComposer *",
-   "referenced_type" : "type-5598",
-   "self_type" : "type-5597",
+   "referenced_type" : "type-5607",
+   "self_type" : "type-5606",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25800,8 +25803,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ISurfaceComposer *",
    "name" : "android::ISurfaceComposer *",
-   "referenced_type" : "type-7914",
-   "self_type" : "type-7913",
+   "referenced_type" : "type-7938",
+   "self_type" : "type-7937",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25809,8 +25812,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ISurfaceComposer *",
    "name" : "android::ISurfaceComposer *",
-   "referenced_type" : "type-8480",
-   "self_type" : "type-8479",
+   "referenced_type" : "type-8507",
+   "self_type" : "type-8506",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25818,8 +25821,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ITransactionCompletedListener *",
    "name" : "android::ITransactionCompletedListener *",
-   "referenced_type" : "type-1042",
-   "self_type" : "type-1041",
+   "referenced_type" : "type-1046",
+   "self_type" : "type-1045",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25827,8 +25830,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ITransactionCompletedListener *",
    "name" : "android::ITransactionCompletedListener *",
-   "referenced_type" : "type-3672",
-   "self_type" : "type-3671",
+   "referenced_type" : "type-3678",
+   "self_type" : "type-3677",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25836,8 +25839,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ITransactionCompletedListener *",
    "name" : "android::ITransactionCompletedListener *",
-   "referenced_type" : "type-5593",
-   "self_type" : "type-5592",
+   "referenced_type" : "type-5602",
+   "self_type" : "type-5601",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25845,8 +25848,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ITransactionCompletedListener *",
    "name" : "android::ITransactionCompletedListener *",
-   "referenced_type" : "type-7909",
-   "self_type" : "type-7908",
+   "referenced_type" : "type-7933",
+   "self_type" : "type-7932",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25854,8 +25857,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ITransactionCompletedListener *",
    "name" : "android::ITransactionCompletedListener *",
-   "referenced_type" : "type-8478",
-   "self_type" : "type-8477",
+   "referenced_type" : "type-8505",
+   "self_type" : "type-8504",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25890,8 +25893,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::LWProducerListener *",
    "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-2539",
-   "self_type" : "type-2538",
+   "referenced_type" : "type-2542",
+   "self_type" : "type-2541",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25899,8 +25902,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::LWProducerListener *",
    "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-4953",
-   "self_type" : "type-4952",
+   "referenced_type" : "type-4959",
+   "self_type" : "type-4958",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25908,8 +25911,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::LWProducerListener *",
    "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-7090",
-   "self_type" : "type-7089",
+   "referenced_type" : "type-7094",
+   "self_type" : "type-7093",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25917,8 +25920,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::LWProducerListener *",
    "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-8186",
-   "self_type" : "type-8185",
+   "referenced_type" : "type-8210",
+   "self_type" : "type-8209",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25926,8 +25929,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::LWProducerListener *",
    "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-9431",
-   "self_type" : "type-9430",
+   "referenced_type" : "type-9452",
+   "self_type" : "type-9451",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25936,7 +25939,7 @@
    "linker_set_key" : "android::LightFlattenablePod<android::Rect> *",
    "name" : "android::LightFlattenablePod<android::Rect> *",
    "referenced_type" : "type-46",
-   "self_type" : "type-4589",
+   "self_type" : "type-4595",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -25980,8 +25983,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::List<Event>::_Node *",
    "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-3687",
-   "self_type" : "type-3686",
+   "referenced_type" : "type-3693",
+   "self_type" : "type-3692",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -25989,8 +25992,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::List<Event>::_Node *",
    "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-5608",
-   "self_type" : "type-5607",
+   "referenced_type" : "type-5617",
+   "self_type" : "type-5616",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -25998,8 +26001,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::List<Event>::_Node *",
    "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-7924",
-   "self_type" : "type-7923",
+   "referenced_type" : "type-7948",
+   "self_type" : "type-7947",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -26007,8 +26010,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::List<Event>::_Node *",
    "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-8215",
-   "self_type" : "type-8214",
+   "referenced_type" : "type-8240",
+   "self_type" : "type-8239",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -26124,8 +26127,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::OMXPluginBase *",
    "name" : "android::OMXPluginBase *",
-   "referenced_type" : "type-2393",
-   "self_type" : "type-2394",
+   "referenced_type" : "type-2396",
+   "self_type" : "type-2397",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h"
   },
@@ -26142,8 +26145,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel::FlattenableHelper<android::BufferItem> *",
    "name" : "android::Parcel::FlattenableHelper<android::BufferItem> *",
-   "referenced_type" : "type-1516",
-   "self_type" : "type-1518",
+   "referenced_type" : "type-1520",
+   "self_type" : "type-1522",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -26151,8 +26154,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel::FlattenableHelper<android::Fence> *",
    "name" : "android::Parcel::FlattenableHelper<android::Fence> *",
-   "referenced_type" : "type-1658",
-   "self_type" : "type-1661",
+   "referenced_type" : "type-1662",
+   "self_type" : "type-1665",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -26160,8 +26163,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta> *",
    "name" : "android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta> *",
-   "referenced_type" : "type-4328",
-   "self_type" : "type-4330",
+   "referenced_type" : "type-4334",
+   "self_type" : "type-4336",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -26169,8 +26172,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel::FlattenableHelper<android::GraphicBuffer> *",
    "name" : "android::Parcel::FlattenableHelper<android::GraphicBuffer> *",
-   "referenced_type" : "type-1653",
-   "self_type" : "type-1655",
+   "referenced_type" : "type-1657",
+   "self_type" : "type-1659",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -26178,8 +26181,8 @@
    "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",
+   "referenced_type" : "type-4339",
+   "self_type" : "type-4342",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -26187,8 +26190,8 @@
    "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",
+   "referenced_type" : "type-4345",
+   "self_type" : "type-4347",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -26232,8 +26235,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ProcessState *",
    "name" : "android::ProcessState *",
-   "referenced_type" : "type-1261",
-   "self_type" : "type-1260",
+   "referenced_type" : "type-1264",
+   "self_type" : "type-1263",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26277,8 +26280,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1079",
-   "self_type" : "type-1078",
+   "referenced_type" : "type-1082",
+   "self_type" : "type-1081",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26286,8 +26289,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1191",
-   "self_type" : "type-1190",
+   "referenced_type" : "type-1194",
+   "self_type" : "type-1193",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26295,8 +26298,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1352",
-   "self_type" : "type-1351",
+   "referenced_type" : "type-1355",
+   "self_type" : "type-1354",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26304,8 +26307,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1404",
-   "self_type" : "type-1403",
+   "referenced_type" : "type-1407",
+   "self_type" : "type-1406",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26313,8 +26316,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1419",
+   "referenced_type" : "type-1423",
+   "self_type" : "type-1422",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26322,8 +26325,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1441",
-   "self_type" : "type-1440",
+   "referenced_type" : "type-1444",
+   "self_type" : "type-1443",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26331,8 +26334,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1482",
-   "self_type" : "type-1481",
+   "referenced_type" : "type-1486",
+   "self_type" : "type-1485",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26340,8 +26343,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1616",
-   "self_type" : "type-1615",
+   "referenced_type" : "type-1620",
+   "self_type" : "type-1619",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26349,8 +26352,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2649",
-   "self_type" : "type-2648",
+   "referenced_type" : "type-2652",
+   "self_type" : "type-2651",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26358,8 +26361,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3459",
-   "self_type" : "type-3458",
+   "referenced_type" : "type-3462",
+   "self_type" : "type-3461",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26367,8 +26370,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3525",
-   "self_type" : "type-3524",
+   "referenced_type" : "type-3528",
+   "self_type" : "type-3527",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26376,8 +26379,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3627",
-   "self_type" : "type-3626",
+   "referenced_type" : "type-3630",
+   "self_type" : "type-3629",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26385,8 +26388,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3689",
-   "self_type" : "type-3688",
+   "referenced_type" : "type-3695",
+   "self_type" : "type-3694",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26394,8 +26397,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3781",
-   "self_type" : "type-3780",
+   "referenced_type" : "type-3787",
+   "self_type" : "type-3786",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26403,8 +26406,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3842",
-   "self_type" : "type-3841",
+   "referenced_type" : "type-3848",
+   "self_type" : "type-3847",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26412,8 +26415,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3906",
-   "self_type" : "type-3905",
+   "referenced_type" : "type-3912",
+   "self_type" : "type-3911",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26421,8 +26424,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3932",
-   "self_type" : "type-3931",
+   "referenced_type" : "type-3938",
+   "self_type" : "type-3937",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26430,8 +26433,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3947",
-   "self_type" : "type-3946",
+   "referenced_type" : "type-3954",
+   "self_type" : "type-3953",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26439,8 +26442,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3973",
-   "self_type" : "type-3972",
+   "referenced_type" : "type-3979",
+   "self_type" : "type-3978",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26448,8 +26451,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4006",
-   "self_type" : "type-4005",
+   "referenced_type" : "type-4012",
+   "self_type" : "type-4011",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26457,8 +26460,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4087",
-   "self_type" : "type-4086",
+   "referenced_type" : "type-4093",
+   "self_type" : "type-4092",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26466,8 +26469,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4287",
-   "self_type" : "type-4286",
+   "referenced_type" : "type-4293",
+   "self_type" : "type-4292",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26475,8 +26478,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4474",
-   "self_type" : "type-4473",
+   "referenced_type" : "type-4480",
+   "self_type" : "type-4479",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26484,8 +26487,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4527",
-   "self_type" : "type-4526",
+   "referenced_type" : "type-4533",
+   "self_type" : "type-4532",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26493,8 +26496,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4535",
-   "self_type" : "type-4534",
+   "referenced_type" : "type-4542",
+   "self_type" : "type-4541",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26502,8 +26505,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4561",
-   "self_type" : "type-4560",
+   "referenced_type" : "type-4567",
+   "self_type" : "type-4566",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26511,8 +26514,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4711",
-   "self_type" : "type-4710",
+   "referenced_type" : "type-4718",
+   "self_type" : "type-4717",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26520,8 +26523,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4842",
-   "self_type" : "type-4841",
+   "referenced_type" : "type-4848",
+   "self_type" : "type-4847",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26529,8 +26532,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4991",
-   "self_type" : "type-4990",
+   "referenced_type" : "type-4997",
+   "self_type" : "type-4996",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26538,8 +26541,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5380",
-   "self_type" : "type-5379",
+   "referenced_type" : "type-5386",
+   "self_type" : "type-5385",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26547,8 +26550,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5446",
-   "self_type" : "type-5445",
+   "referenced_type" : "type-5452",
+   "self_type" : "type-5451",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26565,8 +26568,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5548",
-   "self_type" : "type-5547",
+   "referenced_type" : "type-5554",
+   "self_type" : "type-5553",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26574,8 +26577,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5610",
-   "self_type" : "type-5609",
+   "referenced_type" : "type-5619",
+   "self_type" : "type-5618",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26583,8 +26586,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5702",
-   "self_type" : "type-5701",
+   "referenced_type" : "type-5711",
+   "self_type" : "type-5710",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26592,8 +26595,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5763",
-   "self_type" : "type-5762",
+   "referenced_type" : "type-5772",
+   "self_type" : "type-5771",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26601,8 +26604,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5827",
-   "self_type" : "type-5826",
+   "referenced_type" : "type-5836",
+   "self_type" : "type-5835",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26610,8 +26613,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5853",
-   "self_type" : "type-5852",
+   "referenced_type" : "type-5862",
+   "self_type" : "type-5861",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26619,8 +26622,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5868",
-   "self_type" : "type-5867",
+   "referenced_type" : "type-5878",
+   "self_type" : "type-5877",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26628,8 +26631,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5894",
-   "self_type" : "type-5893",
+   "referenced_type" : "type-5903",
+   "self_type" : "type-5902",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26637,8 +26640,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5927",
-   "self_type" : "type-5926",
+   "referenced_type" : "type-5936",
+   "self_type" : "type-5935",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26646,8 +26649,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6008",
-   "self_type" : "type-6007",
+   "referenced_type" : "type-6017",
+   "self_type" : "type-6016",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26655,8 +26658,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6196",
-   "self_type" : "type-6195",
+   "referenced_type" : "type-6205",
+   "self_type" : "type-6204",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26664,8 +26667,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6363",
-   "self_type" : "type-6362",
+   "referenced_type" : "type-6372",
+   "self_type" : "type-6371",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26673,8 +26676,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6411",
-   "self_type" : "type-6410",
+   "referenced_type" : "type-6420",
+   "self_type" : "type-6419",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26682,8 +26685,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6419",
-   "self_type" : "type-6418",
+   "referenced_type" : "type-6429",
+   "self_type" : "type-6428",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26691,8 +26694,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6445",
-   "self_type" : "type-6444",
+   "referenced_type" : "type-6454",
+   "self_type" : "type-6453",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26700,8 +26703,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6585",
-   "self_type" : "type-6584",
+   "referenced_type" : "type-6595",
+   "self_type" : "type-6594",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26709,8 +26712,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6706",
-   "self_type" : "type-6705",
+   "referenced_type" : "type-6715",
+   "self_type" : "type-6714",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26718,8 +26721,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6736",
-   "self_type" : "type-6735",
+   "referenced_type" : "type-6745",
+   "self_type" : "type-6744",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26727,8 +26730,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6779",
-   "self_type" : "type-6778",
+   "referenced_type" : "type-6789",
+   "self_type" : "type-6788",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26736,8 +26739,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6869",
-   "self_type" : "type-6868",
+   "referenced_type" : "type-6878",
+   "self_type" : "type-6877",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26745,8 +26748,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6932",
-   "self_type" : "type-6931",
+   "referenced_type" : "type-6941",
+   "self_type" : "type-6940",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26754,8 +26757,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7047",
-   "self_type" : "type-7046",
+   "referenced_type" : "type-7057",
+   "self_type" : "type-7056",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26763,8 +26766,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7094",
-   "self_type" : "type-7093",
+   "referenced_type" : "type-7103",
+   "self_type" : "type-7102",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26772,8 +26775,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7193",
-   "self_type" : "type-7192",
+   "referenced_type" : "type-7202",
+   "self_type" : "type-7201",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26781,8 +26784,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7282",
-   "self_type" : "type-7281",
+   "referenced_type" : "type-7302",
+   "self_type" : "type-7301",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26790,8 +26793,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7319",
-   "self_type" : "type-7318",
+   "referenced_type" : "type-7341",
+   "self_type" : "type-7340",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26808,8 +26811,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7696",
-   "self_type" : "type-7695",
+   "referenced_type" : "type-7717",
+   "self_type" : "type-7716",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26817,8 +26820,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7762",
-   "self_type" : "type-7761",
+   "referenced_type" : "type-7783",
+   "self_type" : "type-7782",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26826,8 +26829,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7864",
-   "self_type" : "type-7863",
+   "referenced_type" : "type-7885",
+   "self_type" : "type-7884",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26835,8 +26838,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7926",
-   "self_type" : "type-7925",
+   "referenced_type" : "type-7950",
+   "self_type" : "type-7949",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26844,8 +26847,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-8018",
-   "self_type" : "type-8017",
+   "referenced_type" : "type-8042",
+   "self_type" : "type-8041",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26853,8 +26856,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-8079",
-   "self_type" : "type-8078",
+   "referenced_type" : "type-8103",
+   "self_type" : "type-8102",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26862,8 +26865,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-8141",
-   "self_type" : "type-8140",
+   "referenced_type" : "type-8165",
+   "self_type" : "type-8164",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26871,8 +26874,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-8201",
-   "self_type" : "type-8200",
+   "referenced_type" : "type-8225",
+   "self_type" : "type-8224",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26880,17 +26883,8 @@
    "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",
+   "referenced_type" : "type-8321",
+   "self_type" : "type-8320",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26907,8 +26901,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-8438",
-   "self_type" : "type-8437",
+   "referenced_type" : "type-8373",
+   "self_type" : "type-8372",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26916,8 +26910,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-8487",
-   "self_type" : "type-8486",
+   "referenced_type" : "type-8462",
+   "self_type" : "type-8461",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26925,8 +26919,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-8567",
-   "self_type" : "type-8566",
+   "referenced_type" : "type-8514",
+   "self_type" : "type-8513",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26934,8 +26928,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-8660",
-   "self_type" : "type-8659",
+   "referenced_type" : "type-8594",
+   "self_type" : "type-8593",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26943,8 +26937,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-8686",
-   "self_type" : "type-8685",
+   "referenced_type" : "type-8687",
+   "self_type" : "type-8686",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26952,8 +26946,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-8702",
-   "self_type" : "type-8701",
+   "referenced_type" : "type-8713",
+   "self_type" : "type-8712",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26961,8 +26955,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-8724",
-   "self_type" : "type-8723",
+   "referenced_type" : "type-8730",
+   "self_type" : "type-8729",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26970,8 +26964,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-8756",
-   "self_type" : "type-8755",
+   "referenced_type" : "type-8751",
+   "self_type" : "type-8750",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26979,8 +26973,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-8834",
-   "self_type" : "type-8833",
+   "referenced_type" : "type-8783",
+   "self_type" : "type-8782",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26988,8 +26982,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-9053",
-   "self_type" : "type-9052",
+   "referenced_type" : "type-8863",
+   "self_type" : "type-8862",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26997,8 +26991,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-9237",
-   "self_type" : "type-9236",
+   "referenced_type" : "type-9080",
+   "self_type" : "type-9079",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27006,8 +27000,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-9299",
-   "self_type" : "type-9298",
+   "referenced_type" : "type-9265",
+   "self_type" : "type-9264",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27015,8 +27009,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-9314",
-   "self_type" : "type-9313",
+   "referenced_type" : "type-9327",
+   "self_type" : "type-9326",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27024,8 +27018,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-9351",
-   "self_type" : "type-9350",
+   "referenced_type" : "type-9342",
+   "self_type" : "type-9341",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27033,8 +27027,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-9500",
-   "self_type" : "type-9499",
+   "referenced_type" : "type-9378",
+   "self_type" : "type-9377",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27042,8 +27036,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-9602",
-   "self_type" : "type-9601",
+   "referenced_type" : "type-9528",
+   "self_type" : "type-9527",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27051,8 +27045,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-9637",
-   "self_type" : "type-9636",
+   "referenced_type" : "type-9629",
+   "self_type" : "type-9628",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27060,8 +27054,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-9691",
-   "self_type" : "type-9690",
+   "referenced_type" : "type-9666",
+   "self_type" : "type-9665",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-9718",
+   "self_type" : "type-9717",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27078,8 +27081,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-9751",
-   "self_type" : "type-9750",
+   "referenced_type" : "type-9770",
+   "self_type" : "type-9769",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27087,8 +27090,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-9769",
-   "self_type" : "type-9768",
+   "referenced_type" : "type-9798",
+   "self_type" : "type-9797",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27096,8 +27099,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-9832",
-   "self_type" : "type-9831",
+   "referenced_type" : "type-9860",
+   "self_type" : "type-9859",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27114,8 +27117,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ReferenceRenamer *",
    "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-1166",
-   "self_type" : "type-1212",
+   "referenced_type" : "type-1167",
+   "self_type" : "type-1211",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27123,8 +27126,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> > *",
    "name" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> > *",
-   "referenced_type" : "type-1563",
-   "self_type" : "type-1564",
+   "referenced_type" : "type-1568",
+   "self_type" : "type-1569",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -27132,8 +27135,8 @@
    "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",
+   "referenced_type" : "type-1572",
+   "self_type" : "type-1573",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -27141,132 +27144,6 @@
    "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,
@@ -27274,8 +27151,17 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long> > *",
-   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long> > *",
+   "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-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<android_dataspace_t> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<android_dataspace_t> > *",
    "referenced_type" : "type-2091",
    "self_type" : "type-2092",
    "size" : 4,
@@ -27283,116 +27169,125 @@
   },
   {
    "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-2111",
+   "self_type" : "type-2112",
+   "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-2097",
+   "self_type" : "type-2098",
+   "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-2116",
+   "self_type" : "type-2117",
+   "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-2086",
+   "self_type" : "type-2087",
+   "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-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<int *, const sp<GraphicBuffer> &> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int *, const sp<GraphicBuffer> &> > *",
+   "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, unsigned long long, const sp<Fence> &> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int, unsigned long long, const sp<Fence> &> > *",
+   "referenced_type" : "type-2064",
+   "self_type" : "type-2065",
+   "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-2055",
+   "self_type" : "type-2056",
+   "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-2107",
+   "self_type" : "type-2108",
+   "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-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<unsigned int> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned int> > *",
+   "referenced_type" : "type-2103",
+   "self_type" : "type-2104",
+   "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-2077",
+   "self_type" : "type-2078",
+   "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-2095",
+   "self_type" : "type-2096",
+   "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,
@@ -27400,17 +27295,62 @@
   },
   {
    "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",
+   "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-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<unsigned long long *> > *",
-   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long *> > *",
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<android_dataspace_t> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<android_dataspace_t> > *",
+   "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<bool, vector<Segment, allocator<Segment> > *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool, vector<Segment, allocator<Segment> > *> > *",
+   "referenced_type" : "type-2169",
+   "self_type" : "type-2170",
+   "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-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<const String8 &, String8 *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &, String8 *> > *",
+   "referenced_type" : "type-2171",
+   "self_type" : "type-2172",
+   "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-2155",
+   "self_type" : "type-2156",
+   "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-2147",
    "self_type" : "type-2148",
    "size" : 4,
@@ -27418,10 +27358,73 @@
   },
   {
    "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-2142",
+   "self_type" : "type-2143",
+   "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-2144",
+   "self_type" : "type-2145",
+   "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-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<sp<NativeHandle> *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<sp<NativeHandle> *> > *",
+   "referenced_type" : "type-2166",
+   "self_type" : "type-2167",
+   "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-2153",
+   "self_type" : "type-2154",
+   "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-2164",
+   "self_type" : "type-2165",
+   "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-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<unsigned long long> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long> > *",
-   "referenced_type" : "type-2156",
-   "self_type" : "type-2157",
+   "referenced_type" : "type-2160",
+   "self_type" : "type-2161",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -27429,8 +27432,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::SafeBnInterface<android::IConsumerListener> *",
    "name" : "android::SafeBnInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-1287",
-   "self_type" : "type-1292",
+   "referenced_type" : "type-1290",
+   "self_type" : "type-1295",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -27438,8 +27441,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
    "name" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-1276",
-   "self_type" : "type-1286",
+   "referenced_type" : "type-1279",
+   "self_type" : "type-1289",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -27447,8 +27450,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::SafeBnInterface<android::ITransactionCompletedListener> *",
    "name" : "android::SafeBnInterface<android::ITransactionCompletedListener> *",
-   "referenced_type" : "type-1102",
-   "self_type" : "type-1105",
+   "referenced_type" : "type-1105",
+   "self_type" : "type-1108",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -27456,8 +27459,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::SafeBpInterface<android::IConsumerListener> *",
    "name" : "android::SafeBpInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-1537",
-   "self_type" : "type-1539",
+   "referenced_type" : "type-1541",
+   "self_type" : "type-1543",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -27465,8 +27468,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::SafeBpInterface<android::IGraphicBufferConsumer> *",
    "name" : "android::SafeBpInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-1716",
-   "self_type" : "type-1718",
+   "referenced_type" : "type-1720",
+   "self_type" : "type-1723",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -27474,8 +27477,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::SafeInterface::ParcelHandler *",
    "name" : "android::SafeInterface::ParcelHandler *",
-   "referenced_type" : "type-1235",
-   "self_type" : "type-1245",
+   "referenced_type" : "type-1238",
+   "self_type" : "type-1247",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -27493,7 +27496,7 @@
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > > *",
    "name" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > > *",
    "referenced_type" : "type-159",
-   "self_type" : "type-2674",
+   "self_type" : "type-2677",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27502,7 +27505,7 @@
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > > *",
    "name" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > > *",
    "referenced_type" : "type-146",
-   "self_type" : "type-2669",
+   "self_type" : "type-2672",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27511,7 +27514,7 @@
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
    "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
    "referenced_type" : "type-139",
-   "self_type" : "type-2666",
+   "self_type" : "type-2669",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27519,8 +27522,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 *",
    "name" : "android::String16 *",
-   "referenced_type" : "type-1239",
-   "self_type" : "type-2661",
+   "referenced_type" : "type-1242",
+   "self_type" : "type-2664",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -27529,7 +27532,7 @@
    "linker_set_key" : "android::String8 *",
    "name" : "android::String8 *",
    "referenced_type" : "type-121",
-   "self_type" : "type-1885",
+   "self_type" : "type-1889",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -27537,8 +27540,8 @@
    "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",
+   "referenced_type" : "type-2470",
+   "self_type" : "type-2469",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27546,8 +27549,8 @@
    "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",
+   "referenced_type" : "type-4895",
+   "self_type" : "type-4894",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27555,8 +27558,8 @@
    "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",
+   "referenced_type" : "type-6871",
+   "self_type" : "type-6870",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27564,8 +27567,8 @@
    "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",
+   "referenced_type" : "type-8183",
+   "self_type" : "type-8182",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27573,8 +27576,8 @@
    "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",
+   "referenced_type" : "type-9219",
+   "self_type" : "type-9218",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27592,7 +27595,7 @@
    "linker_set_key" : "android::Vector<android::BufferItem> *",
    "name" : "android::Vector<android::BufferItem> *",
    "referenced_type" : "type-837",
-   "self_type" : "type-976",
+   "self_type" : "type-978",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27600,8 +27603,8 @@
    "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",
+   "referenced_type" : "type-1228",
+   "self_type" : "type-1230",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27609,8 +27612,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<int> *",
    "name" : "android::Vector<int> *",
-   "referenced_type" : "type-2686",
-   "self_type" : "type-2687",
+   "referenced_type" : "type-2689",
+   "self_type" : "type-2690",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27618,8 +27621,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<long long> *",
    "name" : "android::Vector<long long> *",
-   "referenced_type" : "type-1081",
-   "self_type" : "type-1082",
+   "referenced_type" : "type-1084",
+   "self_type" : "type-1085",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27627,8 +27630,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::VirtualLightRefBase *",
    "name" : "android::VirtualLightRefBase *",
-   "referenced_type" : "type-2354",
-   "self_type" : "type-2392",
+   "referenced_type" : "type-2357",
+   "self_type" : "type-2395",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -27636,8 +27639,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::base::EagerEvaluator<char *, char *> *",
    "name" : "android::base::EagerEvaluator<char *, char *> *",
-   "referenced_type" : "type-4699",
-   "self_type" : "type-4701",
+   "referenced_type" : "type-4705",
+   "self_type" : "type-4708",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27645,8 +27648,8 @@
    "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",
+   "referenced_type" : "type-4702",
+   "self_type" : "type-4703",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27654,8 +27657,8 @@
    "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",
+   "referenced_type" : "type-4689",
+   "self_type" : "type-4692",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27663,8 +27666,8 @@
    "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",
+   "referenced_type" : "type-4672",
+   "self_type" : "type-4687",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27672,8 +27675,8 @@
    "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",
+   "referenced_type" : "type-4729",
+   "self_type" : "type-4735",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27681,8 +27684,8 @@
    "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",
+   "referenced_type" : "type-4736",
+   "self_type" : "type-4739",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27690,8 +27693,8 @@
    "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",
+   "referenced_type" : "type-4710",
+   "self_type" : "type-4712",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27699,8 +27702,8 @@
    "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",
+   "referenced_type" : "type-4713",
+   "self_type" : "type-4714",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27708,8 +27711,8 @@
    "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",
+   "referenced_type" : "type-4740",
+   "self_type" : "type-4746",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27717,8 +27720,8 @@
    "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",
+   "referenced_type" : "type-4747",
+   "self_type" : "type-4753",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27726,8 +27729,8 @@
    "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",
+   "referenced_type" : "type-4716",
+   "self_type" : "type-4721",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27735,8 +27738,8 @@
    "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",
+   "referenced_type" : "type-4722",
+   "self_type" : "type-4727",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27744,8 +27747,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::base::ErrnoRestorer *",
    "name" : "android::base::ErrnoRestorer *",
-   "referenced_type" : "type-4656",
-   "self_type" : "type-4822",
+   "referenced_type" : "type-4663",
+   "self_type" : "type-4828",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27753,8 +27756,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
    "name" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
-   "referenced_type" : "type-2553",
-   "self_type" : "type-2565",
+   "referenced_type" : "type-2556",
+   "self_type" : "type-2568",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -27771,8 +27774,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1362",
-   "self_type" : "type-1361",
+   "referenced_type" : "type-1365",
+   "self_type" : "type-1364",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27789,8 +27792,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1359",
-   "self_type" : "type-1358",
+   "referenced_type" : "type-1362",
+   "self_type" : "type-1361",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27798,8 +27801,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1377",
-   "self_type" : "type-1381",
+   "referenced_type" : "type-1380",
+   "self_type" : "type-1384",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -27807,8 +27810,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1396",
-   "self_type" : "type-1395",
+   "referenced_type" : "type-1399",
+   "self_type" : "type-1398",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27816,8 +27819,8 @@
    "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",
+   "referenced_type" : "type-6779",
+   "self_type" : "type-6780",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27825,24 +27828,6 @@
    "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,
@@ -27850,8 +27835,8 @@
   },
   {
    "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> > *",
+   "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-4494",
    "self_type" : "type-4495",
    "size" : 4,
@@ -27859,10 +27844,28 @@
   },
   {
    "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-4371",
+   "self_type" : "type-4372",
+   "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-4500",
+   "self_type" : "type-4501",
+   "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",
+   "referenced_type" : "type-4359",
+   "self_type" : "type-4360",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27879,8 +27882,8 @@
    "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",
+   "referenced_type" : "type-6783",
+   "self_type" : "type-6784",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27943,7 +27946,7 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> > *",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> > *",
    "referenced_type" : "type-381",
-   "self_type" : "type-6895",
+   "self_type" : "type-6904",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -27952,7 +27955,7 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect> *",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect> *",
    "referenced_type" : "type-372",
-   "self_type" : "type-4595",
+   "self_type" : "type-4601",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -27961,7 +27964,7 @@
    "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",
+   "self_type" : "type-4352",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -27979,7 +27982,7 @@
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
    "referenced_type" : "type-595",
-   "self_type" : "type-2464",
+   "self_type" : "type-2467",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27996,8 +27999,8 @@
    "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",
+   "referenced_type" : "type-2459",
+   "self_type" : "type-2458",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28005,8 +28008,8 @@
    "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",
+   "referenced_type" : "type-4691",
+   "self_type" : "type-4690",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28014,8 +28017,8 @@
    "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",
+   "referenced_type" : "type-6574",
+   "self_type" : "type-6573",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28023,8 +28026,8 @@
    "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",
+   "referenced_type" : "type-9511",
+   "self_type" : "type-9510",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28032,8 +28035,8 @@
    "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",
+   "referenced_type" : "type-4248",
+   "self_type" : "type-4247",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28041,8 +28044,8 @@
    "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",
+   "referenced_type" : "type-6167",
+   "self_type" : "type-6166",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28050,8 +28053,8 @@
    "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",
+   "referenced_type" : "type-9042",
+   "self_type" : "type-9041",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28059,8 +28062,8 @@
    "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",
+   "referenced_type" : "type-4471",
+   "self_type" : "type-4470",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28068,8 +28071,8 @@
    "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",
+   "referenced_type" : "type-6366",
+   "self_type" : "type-6365",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28077,8 +28080,8 @@
    "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",
+   "referenced_type" : "type-9256",
+   "self_type" : "type-9255",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28087,7 +28090,7 @@
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
    "referenced_type" : "type-677",
-   "self_type" : "type-2477",
+   "self_type" : "type-2480",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28096,7 +28099,7 @@
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
    "referenced_type" : "type-604",
-   "self_type" : "type-2471",
+   "self_type" : "type-2474",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28104,8 +28107,8 @@
    "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",
+   "referenced_type" : "type-2483",
+   "self_type" : "type-2482",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28113,8 +28116,8 @@
    "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",
+   "referenced_type" : "type-4903",
+   "self_type" : "type-4902",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28122,8 +28125,8 @@
    "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",
+   "referenced_type" : "type-6900",
+   "self_type" : "type-6899",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28131,8 +28134,8 @@
    "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",
+   "referenced_type" : "type-8186",
+   "self_type" : "type-8185",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28140,8 +28143,8 @@
    "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",
+   "referenced_type" : "type-9273",
+   "self_type" : "type-9272",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28149,8 +28152,8 @@
    "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",
+   "referenced_type" : "type-6918",
+   "self_type" : "type-6917",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28158,8 +28161,8 @@
    "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",
+   "referenced_type" : "type-9839",
+   "self_type" : "type-9838",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28167,8 +28170,8 @@
    "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",
+   "referenced_type" : "type-4242",
+   "self_type" : "type-4241",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28176,8 +28179,8 @@
    "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",
+   "referenced_type" : "type-6163",
+   "self_type" : "type-6162",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28185,8 +28188,8 @@
    "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",
+   "referenced_type" : "type-9038",
+   "self_type" : "type-9037",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28194,8 +28197,8 @@
    "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",
+   "referenced_type" : "type-4463",
+   "self_type" : "type-4462",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28203,8 +28206,8 @@
    "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",
+   "referenced_type" : "type-6361",
+   "self_type" : "type-6360",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28212,8 +28215,8 @@
    "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",
+   "referenced_type" : "type-6771",
+   "self_type" : "type-6770",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28221,8 +28224,8 @@
    "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",
+   "referenced_type" : "type-9252",
+   "self_type" : "type-9251",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28230,8 +28233,8 @@
    "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",
+   "referenced_type" : "type-9699",
+   "self_type" : "type-9698",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28294,7 +28297,7 @@
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > *",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > *",
    "referenced_type" : "type-462",
-   "self_type" : "type-6939",
+   "self_type" : "type-6949",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -28303,7 +28306,7 @@
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::media::V1_0::Rect> *",
    "name" : "android::hardware::hidl_vec<android::hardware::media::V1_0::Rect> *",
    "referenced_type" : "type-453",
-   "self_type" : "type-4567",
+   "self_type" : "type-4573",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -28312,7 +28315,7 @@
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> *",
    "name" : "android::hardware::hidl_vec<unsigned char> *",
    "referenced_type" : "type-452",
-   "self_type" : "type-4374",
+   "self_type" : "type-4381",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -28339,7 +28342,7 @@
    "linker_set_key" : "android::hidl::base::V1_0::IBase *",
    "name" : "android::hidl::base::V1_0::IBase *",
    "referenced_type" : "type-530",
-   "self_type" : "type-2445",
+   "self_type" : "type-2448",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28348,7 +28351,7 @@
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "android::hidl::manager::V1_0::IServiceNotification *",
    "referenced_type" : "type-533",
-   "self_type" : "type-2449",
+   "self_type" : "type-2452",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28357,7 +28360,7 @@
    "linker_set_key" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
    "name" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
    "referenced_type" : "type-160",
-   "self_type" : "type-2623",
+   "self_type" : "type-2626",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28366,7 +28369,7 @@
    "linker_set_key" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
    "name" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
    "referenced_type" : "type-147",
-   "self_type" : "type-2622",
+   "self_type" : "type-2625",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28375,7 +28378,7 @@
    "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int> *",
    "name" : "android::key_value_pair_t<unsigned int, unsigned int> *",
    "referenced_type" : "type-143",
-   "self_type" : "type-2621",
+   "self_type" : "type-2624",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28383,8 +28386,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::AHandler> *",
    "name" : "android::sp<android::AHandler> *",
-   "referenced_type" : "type-1188",
-   "self_type" : "type-1243",
+   "referenced_type" : "type-1191",
+   "self_type" : "type-1246",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28393,7 +28396,7 @@
    "linker_set_key" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
    "name" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
    "referenced_type" : "type-581",
-   "self_type" : "type-2511",
+   "self_type" : "type-2514",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28402,7 +28405,7 @@
    "linker_set_key" : "android::sp<android::ALooper> *",
    "name" : "android::sp<android::ALooper> *",
    "referenced_type" : "type-321",
-   "self_type" : "type-2244",
+   "self_type" : "type-2247",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28411,7 +28414,7 @@
    "linker_set_key" : "android::sp<android::AMessage> *",
    "name" : "android::sp<android::AMessage> *",
    "referenced_type" : "type-259",
-   "self_type" : "type-1956",
+   "self_type" : "type-1947",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28419,8 +28422,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::BpGraphicBufferProducer> *",
    "name" : "android::sp<android::BpGraphicBufferProducer> *",
-   "referenced_type" : "type-4228",
-   "self_type" : "type-4274",
+   "referenced_type" : "type-4234",
+   "self_type" : "type-4280",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28428,8 +28431,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::BpProducerListener> *",
    "name" : "android::sp<android::BpProducerListener> *",
-   "referenced_type" : "type-4454",
-   "self_type" : "type-4453",
+   "referenced_type" : "type-4460",
+   "self_type" : "type-4459",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28447,7 +28450,7 @@
    "linker_set_key" : "android::sp<android::ComponentWrapper> *",
    "name" : "android::sp<android::ComponentWrapper> *",
    "referenced_type" : "type-567",
-   "self_type" : "type-2488",
+   "self_type" : "type-2491",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28464,8 +28467,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::Fence> *",
    "name" : "android::sp<android::Fence> *",
-   "referenced_type" : "type-1864",
-   "self_type" : "type-2522",
+   "referenced_type" : "type-1868",
+   "self_type" : "type-2525",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28474,7 +28477,7 @@
    "linker_set_key" : "android::sp<android::FrameDropper> *",
    "name" : "android::sp<android::FrameDropper> *",
    "referenced_type" : "type-578",
-   "self_type" : "type-2504",
+   "self_type" : "type-2507",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28482,8 +28485,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::GLConsumer::EglImage> *",
    "name" : "android::sp<android::GLConsumer::EglImage> *",
-   "referenced_type" : "type-1173",
-   "self_type" : "type-1177",
+   "referenced_type" : "type-1176",
+   "self_type" : "type-1181",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28492,7 +28495,7 @@
    "linker_set_key" : "android::sp<android::GraphicBuffer> *",
    "name" : "android::sp<android::GraphicBuffer> *",
    "referenced_type" : "type-733",
-   "self_type" : "type-1194",
+   "self_type" : "type-1198",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28501,7 +28504,7 @@
    "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy> *",
    "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy> *",
    "referenced_type" : "type-473",
-   "self_type" : "type-2496",
+   "self_type" : "type-2499",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28509,8 +28512,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::GraphicBufferSource> *",
    "name" : "android::sp<android::GraphicBufferSource> *",
-   "referenced_type" : "type-2542",
-   "self_type" : "type-2541",
+   "referenced_type" : "type-2545",
+   "self_type" : "type-2544",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28518,8 +28521,8 @@
    "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",
+   "referenced_type" : "type-4265",
+   "self_type" : "type-4264",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28527,8 +28530,8 @@
    "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",
+   "referenced_type" : "type-4274",
+   "self_type" : "type-4273",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28536,8 +28539,8 @@
    "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",
+   "referenced_type" : "type-4833",
+   "self_type" : "type-4842",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28545,8 +28548,8 @@
    "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",
+   "referenced_type" : "type-7038",
+   "self_type" : "type-7046",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28555,7 +28558,7 @@
    "linker_set_key" : "android::sp<android::IBinder::DeathRecipient> *",
    "name" : "android::sp<android::IBinder::DeathRecipient> *",
    "referenced_type" : "type-843",
-   "self_type" : "type-1274",
+   "self_type" : "type-1278",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28564,7 +28567,7 @@
    "linker_set_key" : "android::sp<android::IBinder> *",
    "name" : "android::sp<android::IBinder> *",
    "referenced_type" : "type-795",
-   "self_type" : "type-1035",
+   "self_type" : "type-1039",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28573,7 +28576,7 @@
    "linker_set_key" : "android::sp<android::IConsumerListener> *",
    "name" : "android::sp<android::IConsumerListener> *",
    "referenced_type" : "type-939",
-   "self_type" : "type-2534",
+   "self_type" : "type-2537",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28582,7 +28585,7 @@
    "linker_set_key" : "android::sp<android::IGraphicBufferConsumer> *",
    "name" : "android::sp<android::IGraphicBufferConsumer> *",
    "referenced_type" : "type-574",
-   "self_type" : "type-2498",
+   "self_type" : "type-2501",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28591,7 +28594,7 @@
    "linker_set_key" : "android::sp<android::IGraphicBufferProducer> *",
    "name" : "android::sp<android::IGraphicBufferProducer> *",
    "referenced_type" : "type-570",
-   "self_type" : "type-2484",
+   "self_type" : "type-2487",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28609,7 +28612,7 @@
    "linker_set_key" : "android::sp<android::IProducerListener> *",
    "name" : "android::sp<android::IProducerListener> *",
    "referenced_type" : "type-957",
-   "self_type" : "type-2537",
+   "self_type" : "type-2540",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28617,8 +28620,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::ITransactionCompletedListener> *",
    "name" : "android::sp<android::ITransactionCompletedListener> *",
-   "referenced_type" : "type-1040",
-   "self_type" : "type-1045",
+   "referenced_type" : "type-1044",
+   "self_type" : "type-1048",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28627,7 +28630,7 @@
    "linker_set_key" : "android::sp<android::NativeHandle> *",
    "name" : "android::sp<android::NativeHandle> *",
    "referenced_type" : "type-932",
-   "self_type" : "type-1880",
+   "self_type" : "type-1884",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28635,8 +28638,8 @@
    "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",
+   "referenced_type" : "type-2466",
+   "self_type" : "type-2468",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28644,8 +28647,8 @@
    "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",
+   "referenced_type" : "type-2457",
+   "self_type" : "type-2460",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28653,8 +28656,8 @@
    "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",
+   "referenced_type" : "type-4246",
+   "self_type" : "type-4283",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28662,8 +28665,8 @@
    "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",
+   "referenced_type" : "type-4473",
+   "self_type" : "type-4472",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28671,8 +28674,8 @@
    "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",
+   "referenced_type" : "type-2479",
+   "self_type" : "type-2481",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28680,8 +28683,8 @@
    "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",
+   "referenced_type" : "type-2473",
+   "self_type" : "type-2476",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28689,8 +28692,8 @@
    "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",
+   "referenced_type" : "type-4240",
+   "self_type" : "type-4281",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28698,8 +28701,8 @@
    "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",
+   "referenced_type" : "type-4466",
+   "self_type" : "type-4465",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28708,7 +28711,7 @@
    "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",
+   "self_type" : "type-4395",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28716,8 +28719,8 @@
    "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",
+   "referenced_type" : "type-2447",
+   "self_type" : "type-4227",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28725,8 +28728,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "referenced_type" : "type-2448",
-   "self_type" : "type-2450",
+   "referenced_type" : "type-2451",
+   "self_type" : "type-2453",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28734,8 +28737,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<const android::AHandler> *",
    "name" : "android::sp<const android::AHandler> *",
-   "referenced_type" : "type-2516",
-   "self_type" : "type-2519",
+   "referenced_type" : "type-2519",
+   "self_type" : "type-2522",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28780,7 +28783,7 @@
    "linker_set_key" : "android::wp<android::IBinder::DeathRecipient> *",
    "name" : "android::wp<android::IBinder::DeathRecipient> *",
    "referenced_type" : "type-172",
-   "self_type" : "type-1244",
+   "self_type" : "type-1248",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28789,7 +28792,7 @@
    "linker_set_key" : "android::wp<android::IBinder> *",
    "name" : "android::wp<android::IBinder> *",
    "referenced_type" : "type-130",
-   "self_type" : "type-4279",
+   "self_type" : "type-4285",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28798,7 +28801,7 @@
    "linker_set_key" : "android_dataspace_t *",
    "name" : "android_dataspace_t *",
    "referenced_type" : "type-170",
-   "self_type" : "type-1667",
+   "self_type" : "type-1672",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28815,8 +28818,8 @@
    "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",
+   "referenced_type" : "type-1249",
+   "self_type" : "type-1252",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h"
   },
@@ -28824,8 +28827,8 @@
    "alignment" : 4,
    "linker_set_key" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
    "name" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
-   "referenced_type" : "type-1387",
-   "self_type" : "type-1390",
+   "referenced_type" : "type-1390",
+   "self_type" : "type-1393",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -28834,7 +28837,7 @@
    "linker_set_key" : "bool *",
    "name" : "bool *",
    "referenced_type" : "type-93",
-   "self_type" : "type-1272",
+   "self_type" : "type-1274",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28851,8 +28854,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AHandler *",
    "name" : "const android::AHandler *",
-   "referenced_type" : "type-2518",
-   "self_type" : "type-2517",
+   "referenced_type" : "type-2521",
+   "self_type" : "type-2520",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28860,8 +28863,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AHandlerReflector<android::GraphicBufferSource> *",
    "name" : "const android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-2514",
-   "self_type" : "type-2515",
+   "referenced_type" : "type-2517",
+   "self_type" : "type-2518",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28869,8 +28872,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ALooper *",
    "name" : "const android::ALooper *",
-   "referenced_type" : "type-2289",
-   "self_type" : "type-2301",
+   "referenced_type" : "type-2292",
+   "self_type" : "type-2304",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28878,8 +28881,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AReplyToken *",
    "name" : "const android::AReplyToken *",
-   "referenced_type" : "type-1167",
-   "self_type" : "type-1170",
+   "referenced_type" : "type-1168",
+   "self_type" : "type-1173",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -28887,8 +28890,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AString *",
    "name" : "const android::AString *",
-   "referenced_type" : "type-2110",
-   "self_type" : "type-2230",
+   "referenced_type" : "type-2101",
+   "self_type" : "type-2233",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -28914,8 +28917,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BnInterface<android::IGraphicBufferProducer> *",
    "name" : "const android::BnInterface<android::IGraphicBufferProducer> *",
-   "referenced_type" : "type-1232",
-   "self_type" : "type-1233",
+   "referenced_type" : "type-1236",
+   "self_type" : "type-1237",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -28923,8 +28926,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BnInterface<android::IProducerListener> *",
    "name" : "const android::BnInterface<android::IProducerListener> *",
-   "referenced_type" : "type-4477",
-   "self_type" : "type-4478",
+   "referenced_type" : "type-4483",
+   "self_type" : "type-4484",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -28932,8 +28935,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BnInterface<android::ITransactionCompletedListener> *",
    "name" : "const android::BnInterface<android::ITransactionCompletedListener> *",
-   "referenced_type" : "type-1093",
-   "self_type" : "type-1094",
+   "referenced_type" : "type-1096",
+   "self_type" : "type-1097",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -28950,8 +28953,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-1069",
-   "self_type" : "type-1071",
+   "referenced_type" : "type-1072",
+   "self_type" : "type-1074",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28959,8 +28962,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-1219",
-   "self_type" : "type-1218",
+   "referenced_type" : "type-1223",
+   "self_type" : "type-1222",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -28968,8 +28971,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-3633",
-   "self_type" : "type-3632",
+   "referenced_type" : "type-3636",
+   "self_type" : "type-3635",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -28977,8 +28980,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-3682",
-   "self_type" : "type-3684",
+   "referenced_type" : "type-3688",
+   "self_type" : "type-3690",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28986,8 +28989,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-3791",
-   "self_type" : "type-3790",
+   "referenced_type" : "type-3798",
+   "self_type" : "type-3797",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -28995,8 +28998,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-5554",
-   "self_type" : "type-5553",
+   "referenced_type" : "type-5560",
+   "self_type" : "type-5559",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -29004,8 +29007,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-5603",
-   "self_type" : "type-5605",
+   "referenced_type" : "type-5612",
+   "self_type" : "type-5614",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -29013,8 +29016,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-5712",
-   "self_type" : "type-5711",
+   "referenced_type" : "type-5722",
+   "self_type" : "type-5721",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -29022,8 +29025,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-7870",
-   "self_type" : "type-7869",
+   "referenced_type" : "type-7891",
+   "self_type" : "type-7890",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -29031,8 +29034,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-7919",
-   "self_type" : "type-7921",
+   "referenced_type" : "type-7943",
+   "self_type" : "type-7945",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -29040,8 +29043,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-8028",
-   "self_type" : "type-8027",
+   "referenced_type" : "type-8053",
+   "self_type" : "type-8052",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -29049,8 +29052,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-8441",
-   "self_type" : "type-8440",
+   "referenced_type" : "type-8465",
+   "self_type" : "type-8464",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -29058,8 +29061,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-8483",
-   "self_type" : "type-8485",
+   "referenced_type" : "type-8510",
+   "self_type" : "type-8512",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -29067,8 +29070,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-8574",
-   "self_type" : "type-8573",
+   "referenced_type" : "type-8601",
+   "self_type" : "type-8600",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -29085,8 +29088,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferQueueCore *",
    "name" : "const android::BufferQueueCore *",
-   "referenced_type" : "type-3521",
-   "self_type" : "type-3523",
+   "referenced_type" : "type-3524",
+   "self_type" : "type-3526",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29094,8 +29097,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferQueueCore *",
    "name" : "const android::BufferQueueCore *",
-   "referenced_type" : "type-5442",
-   "self_type" : "type-5444",
+   "referenced_type" : "type-5448",
+   "self_type" : "type-5450",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29103,8 +29106,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferQueueCore *",
    "name" : "const android::BufferQueueCore *",
-   "referenced_type" : "type-7758",
-   "self_type" : "type-7760",
+   "referenced_type" : "type-7779",
+   "self_type" : "type-7781",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29121,8 +29124,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferQueueCore *",
    "name" : "const android::BufferQueueCore *",
-   "referenced_type" : "type-8344",
-   "self_type" : "type-8346",
+   "referenced_type" : "type-8368",
+   "self_type" : "type-8370",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29130,8 +29133,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ComponentWrapper *",
    "name" : "const android::ComponentWrapper *",
-   "referenced_type" : "type-2494",
-   "self_type" : "type-2495",
+   "referenced_type" : "type-2497",
+   "self_type" : "type-2498",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29139,8 +29142,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ConsumerListener *",
    "name" : "const android::ConsumerListener *",
-   "referenced_type" : "type-3513",
-   "self_type" : "type-3515",
+   "referenced_type" : "type-3516",
+   "self_type" : "type-3518",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29148,8 +29151,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ConsumerListener *",
    "name" : "const android::ConsumerListener *",
-   "referenced_type" : "type-5434",
-   "self_type" : "type-5436",
+   "referenced_type" : "type-5440",
+   "self_type" : "type-5442",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29157,8 +29160,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ConsumerListener *",
    "name" : "const android::ConsumerListener *",
-   "referenced_type" : "type-7750",
-   "self_type" : "type-7752",
+   "referenced_type" : "type-7771",
+   "self_type" : "type-7773",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29175,8 +29178,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ConsumerListener *",
    "name" : "const android::ConsumerListener *",
-   "referenced_type" : "type-8339",
-   "self_type" : "type-8341",
+   "referenced_type" : "type-8363",
+   "self_type" : "type-8365",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29184,8 +29187,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-1309",
-   "self_type" : "type-1315",
+   "referenced_type" : "type-1312",
+   "self_type" : "type-1316",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29193,8 +29196,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-2530",
-   "self_type" : "type-2532",
+   "referenced_type" : "type-2533",
+   "self_type" : "type-2535",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29202,8 +29205,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-3448",
-   "self_type" : "type-3450",
+   "referenced_type" : "type-3451",
+   "self_type" : "type-3453",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29211,8 +29214,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-3593",
-   "self_type" : "type-3595",
+   "referenced_type" : "type-3596",
+   "self_type" : "type-3598",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29220,8 +29223,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-3859",
-   "self_type" : "type-3865",
+   "referenced_type" : "type-3865",
+   "self_type" : "type-3869",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29229,8 +29232,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-4422",
-   "self_type" : "type-4430",
+   "referenced_type" : "type-4428",
+   "self_type" : "type-4432",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29238,8 +29241,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-4672",
-   "self_type" : "type-4674",
+   "referenced_type" : "type-4679",
+   "self_type" : "type-4681",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29247,8 +29250,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-4941",
-   "self_type" : "type-4943",
+   "referenced_type" : "type-4947",
+   "self_type" : "type-4949",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29256,8 +29259,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-5369",
-   "self_type" : "type-5371",
+   "referenced_type" : "type-5375",
+   "self_type" : "type-5377",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29265,8 +29268,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-5514",
-   "self_type" : "type-5516",
+   "referenced_type" : "type-5520",
+   "self_type" : "type-5522",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29274,8 +29277,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-5780",
-   "self_type" : "type-5786",
+   "referenced_type" : "type-5789",
+   "self_type" : "type-5793",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29283,8 +29286,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-6319",
-   "self_type" : "type-6327",
+   "referenced_type" : "type-6328",
+   "self_type" : "type-6332",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29292,8 +29295,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-6553",
-   "self_type" : "type-6555",
+   "referenced_type" : "type-6563",
+   "self_type" : "type-6565",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29301,8 +29304,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-7049",
-   "self_type" : "type-7054",
+   "referenced_type" : "type-7054",
+   "self_type" : "type-7062",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29319,8 +29322,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-7685",
-   "self_type" : "type-7687",
+   "referenced_type" : "type-7706",
+   "self_type" : "type-7708",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29328,8 +29331,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-7830",
-   "self_type" : "type-7832",
+   "referenced_type" : "type-7851",
+   "self_type" : "type-7853",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29337,8 +29340,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-8096",
-   "self_type" : "type-8102",
+   "referenced_type" : "type-8120",
+   "self_type" : "type-8124",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29346,8 +29349,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-8176",
-   "self_type" : "type-8178",
+   "referenced_type" : "type-8200",
+   "self_type" : "type-8202",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29355,8 +29358,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-8287",
-   "self_type" : "type-8290",
+   "referenced_type" : "type-8312",
+   "self_type" : "type-8314",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29364,8 +29367,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-8415",
-   "self_type" : "type-8417",
+   "referenced_type" : "type-8439",
+   "self_type" : "type-8441",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29373,8 +29376,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-8616",
-   "self_type" : "type-8622",
+   "referenced_type" : "type-8643",
+   "self_type" : "type-8647",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29382,8 +29385,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-9188",
-   "self_type" : "type-9197",
+   "referenced_type" : "type-9216",
+   "self_type" : "type-9222",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29400,8 +29403,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-9365",
-   "self_type" : "type-9371",
+   "referenced_type" : "type-9392",
+   "self_type" : "type-9394",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29409,8 +29412,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-9475",
-   "self_type" : "type-9477",
+   "referenced_type" : "type-9502",
+   "self_type" : "type-9504",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29419,7 +29422,7 @@
    "linker_set_key" : "const android::FileDescriptor::Autoclose *",
    "name" : "const android::FileDescriptor::Autoclose *",
    "referenced_type" : "type-1221",
-   "self_type" : "type-1230",
+   "self_type" : "type-1229",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h"
   },
@@ -29427,8 +29430,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Flattenable<android::BufferItem> *",
    "name" : "const android::Flattenable<android::BufferItem> *",
-   "referenced_type" : "type-1506",
-   "self_type" : "type-1507",
+   "referenced_type" : "type-1509",
+   "self_type" : "type-1510",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -29436,24 +29439,6 @@
    "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,
@@ -29461,17 +29446,8 @@
   },
   {
    "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> *",
+   "linker_set_key" : "const android::Flattenable<android::FrameEventHistoryDelta> *",
+   "name" : "const android::Flattenable<android::FrameEventHistoryDelta> *",
    "referenced_type" : "type-4312",
    "self_type" : "type-4313",
    "size" : 4,
@@ -29479,10 +29455,37 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::GraphicBuffer> *",
+   "name" : "const android::Flattenable<android::GraphicBuffer> *",
+   "referenced_type" : "type-1643",
+   "self_type" : "type-1644",
+   "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-4315",
+   "self_type" : "type-4316",
+   "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-4318",
+   "self_type" : "type-4319",
+   "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",
+   "referenced_type" : "type-2511",
+   "self_type" : "type-2513",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29490,8 +29493,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-1346",
-   "self_type" : "type-1348",
+   "referenced_type" : "type-1349",
+   "self_type" : "type-1351",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29499,8 +29502,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-1461",
-   "self_type" : "type-1463",
+   "referenced_type" : "type-1465",
+   "self_type" : "type-1467",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29508,8 +29511,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-2403",
-   "self_type" : "type-2425",
+   "referenced_type" : "type-2406",
+   "self_type" : "type-2428",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29517,8 +29520,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-3454",
-   "self_type" : "type-3456",
+   "referenced_type" : "type-3457",
+   "self_type" : "type-3459",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29526,8 +29529,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-3598",
-   "self_type" : "type-3600",
+   "referenced_type" : "type-3601",
+   "self_type" : "type-3603",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29535,8 +29538,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-3898",
-   "self_type" : "type-3900",
+   "referenced_type" : "type-3904",
+   "self_type" : "type-3906",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29544,8 +29547,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-3991",
-   "self_type" : "type-3993",
+   "referenced_type" : "type-3997",
+   "self_type" : "type-3999",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29553,8 +29556,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-4218",
-   "self_type" : "type-4220",
+   "referenced_type" : "type-4224",
+   "self_type" : "type-4226",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29562,8 +29565,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-4838",
-   "self_type" : "type-4870",
+   "referenced_type" : "type-4840",
+   "self_type" : "type-4876",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29571,8 +29574,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-5375",
-   "self_type" : "type-5377",
+   "referenced_type" : "type-5381",
+   "self_type" : "type-5383",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29580,8 +29583,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-5519",
-   "self_type" : "type-5521",
+   "referenced_type" : "type-5525",
+   "self_type" : "type-5527",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29589,8 +29592,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-5819",
-   "self_type" : "type-5821",
+   "referenced_type" : "type-5828",
+   "self_type" : "type-5830",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29598,8 +29601,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-5912",
-   "self_type" : "type-5914",
+   "referenced_type" : "type-5921",
+   "self_type" : "type-5923",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29607,8 +29610,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-6139",
-   "self_type" : "type-6141",
+   "referenced_type" : "type-6148",
+   "self_type" : "type-6150",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29616,8 +29619,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-6702",
-   "self_type" : "type-6734",
+   "referenced_type" : "type-6707",
+   "self_type" : "type-6743",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29634,8 +29637,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-7691",
-   "self_type" : "type-7693",
+   "referenced_type" : "type-7712",
+   "self_type" : "type-7714",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29643,8 +29646,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-7835",
-   "self_type" : "type-7837",
+   "referenced_type" : "type-7856",
+   "self_type" : "type-7858",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29652,8 +29655,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-8135",
-   "self_type" : "type-8137",
+   "referenced_type" : "type-8159",
+   "self_type" : "type-8161",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29661,8 +29664,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-8152",
-   "self_type" : "type-8157",
+   "referenced_type" : "type-8176",
+   "self_type" : "type-8181",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29670,8 +29673,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-8293",
-   "self_type" : "type-8295",
+   "referenced_type" : "type-8317",
+   "self_type" : "type-8319",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29679,8 +29682,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-8420",
-   "self_type" : "type-8422",
+   "referenced_type" : "type-8444",
+   "self_type" : "type-8446",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29688,8 +29691,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-8653",
-   "self_type" : "type-8655",
+   "referenced_type" : "type-8680",
+   "self_type" : "type-8683",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29697,8 +29700,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-8741",
-   "self_type" : "type-8743",
+   "referenced_type" : "type-8768",
+   "self_type" : "type-8770",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29706,8 +29709,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-8985",
-   "self_type" : "type-8995",
+   "referenced_type" : "type-9012",
+   "self_type" : "type-9020",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29715,8 +29718,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-8996",
-   "self_type" : "type-8998",
+   "referenced_type" : "type-9023",
+   "self_type" : "type-9025",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29733,8 +29736,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBufferSource *",
    "name" : "const android::GraphicBufferSource *",
-   "referenced_type" : "type-2546",
-   "self_type" : "type-2547",
+   "referenced_type" : "type-2549",
+   "self_type" : "type-2550",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29742,8 +29745,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IBinder *",
    "name" : "const android::IBinder *",
-   "referenced_type" : "type-1520",
-   "self_type" : "type-1525",
+   "referenced_type" : "type-1524",
+   "self_type" : "type-1530",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29751,8 +29754,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IBinder::DeathRecipient *",
    "name" : "const android::IBinder::DeathRecipient *",
-   "referenced_type" : "type-4315",
-   "self_type" : "type-4316",
+   "referenced_type" : "type-4321",
+   "self_type" : "type-4322",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29760,8 +29763,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-1155",
-   "self_type" : "type-1157",
+   "referenced_type" : "type-1158",
+   "self_type" : "type-1160",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29769,8 +29772,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-1580",
-   "self_type" : "type-1582",
+   "referenced_type" : "type-1584",
+   "self_type" : "type-1586",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29778,8 +29781,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-3611",
-   "self_type" : "type-3613",
+   "referenced_type" : "type-3614",
+   "self_type" : "type-3616",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29787,8 +29790,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-3760",
-   "self_type" : "type-3762",
+   "referenced_type" : "type-3766",
+   "self_type" : "type-3768",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29796,8 +29799,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-4060",
-   "self_type" : "type-4062",
+   "referenced_type" : "type-4066",
+   "self_type" : "type-4068",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29805,8 +29808,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-5532",
-   "self_type" : "type-5534",
+   "referenced_type" : "type-5538",
+   "self_type" : "type-5540",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29814,8 +29817,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-5681",
-   "self_type" : "type-5683",
+   "referenced_type" : "type-5690",
+   "self_type" : "type-5692",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29823,8 +29826,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-5981",
-   "self_type" : "type-5983",
+   "referenced_type" : "type-5990",
+   "self_type" : "type-5992",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29832,8 +29835,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-7848",
-   "self_type" : "type-7850",
+   "referenced_type" : "type-7869",
+   "self_type" : "type-7871",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29841,8 +29844,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-7997",
-   "self_type" : "type-7999",
+   "referenced_type" : "type-8021",
+   "self_type" : "type-8023",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29850,8 +29853,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-8426",
-   "self_type" : "type-8428",
+   "referenced_type" : "type-8450",
+   "self_type" : "type-8452",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29859,8 +29862,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-8550",
-   "self_type" : "type-8552",
+   "referenced_type" : "type-8577",
+   "self_type" : "type-8579",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29868,8 +29871,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-8809",
-   "self_type" : "type-8811",
+   "referenced_type" : "type-8836",
+   "self_type" : "type-8838",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29886,8 +29889,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-1604",
-   "self_type" : "type-1606",
+   "referenced_type" : "type-1608",
+   "self_type" : "type-1610",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29895,8 +29898,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-2501",
-   "self_type" : "type-2503",
+   "referenced_type" : "type-2504",
+   "self_type" : "type-2506",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29904,8 +29907,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-3494",
-   "self_type" : "type-3496",
+   "referenced_type" : "type-3497",
+   "self_type" : "type-3499",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29913,8 +29916,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-4077",
-   "self_type" : "type-4079",
+   "referenced_type" : "type-4083",
+   "self_type" : "type-4085",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29922,8 +29925,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-4914",
-   "self_type" : "type-4916",
+   "referenced_type" : "type-4920",
+   "self_type" : "type-4922",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29931,8 +29934,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-5415",
-   "self_type" : "type-5417",
+   "referenced_type" : "type-5421",
+   "self_type" : "type-5423",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29940,8 +29943,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-5998",
-   "self_type" : "type-6000",
+   "referenced_type" : "type-6007",
+   "self_type" : "type-6009",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29949,8 +29952,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6940",
-   "self_type" : "type-6942",
+   "referenced_type" : "type-6947",
+   "self_type" : "type-6950",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29958,8 +29961,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-7731",
-   "self_type" : "type-7733",
+   "referenced_type" : "type-7752",
+   "self_type" : "type-7754",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29976,8 +29979,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-8169",
-   "self_type" : "type-8171",
+   "referenced_type" : "type-8193",
+   "self_type" : "type-8195",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29985,8 +29988,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-8325",
-   "self_type" : "type-8327",
+   "referenced_type" : "type-8349",
+   "self_type" : "type-8351",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29994,8 +29997,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-8824",
-   "self_type" : "type-8826",
+   "referenced_type" : "type-8851",
+   "self_type" : "type-8853",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30003,8 +30006,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-9310",
-   "self_type" : "type-9312",
+   "referenced_type" : "type-9337",
+   "self_type" : "type-9339",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30012,8 +30015,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferProducer *",
    "name" : "const android::IGraphicBufferProducer *",
-   "referenced_type" : "type-3504",
-   "self_type" : "type-3506",
+   "referenced_type" : "type-3507",
+   "self_type" : "type-3509",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30021,8 +30024,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferProducer *",
    "name" : "const android::IGraphicBufferProducer *",
-   "referenced_type" : "type-4247",
-   "self_type" : "type-4249",
+   "referenced_type" : "type-4253",
+   "self_type" : "type-4255",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30030,8 +30033,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferProducer *",
    "name" : "const android::IGraphicBufferProducer *",
-   "referenced_type" : "type-5425",
-   "self_type" : "type-5427",
+   "referenced_type" : "type-5431",
+   "self_type" : "type-5433",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30039,8 +30042,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferProducer *",
    "name" : "const android::IGraphicBufferProducer *",
-   "referenced_type" : "type-6162",
-   "self_type" : "type-6164",
+   "referenced_type" : "type-6171",
+   "self_type" : "type-6173",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30048,8 +30051,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferProducer *",
    "name" : "const android::IGraphicBufferProducer *",
-   "referenced_type" : "type-7741",
-   "self_type" : "type-7743",
+   "referenced_type" : "type-7762",
+   "self_type" : "type-7764",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30066,8 +30069,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferProducer *",
    "name" : "const android::IGraphicBufferProducer *",
-   "referenced_type" : "type-8334",
-   "self_type" : "type-8336",
+   "referenced_type" : "type-8358",
+   "self_type" : "type-8360",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30075,8 +30078,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferProducer *",
    "name" : "const android::IGraphicBufferProducer *",
-   "referenced_type" : "type-9019",
-   "self_type" : "type-9021",
+   "referenced_type" : "type-9046",
+   "self_type" : "type-9048",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30084,8 +30087,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-1160",
-   "self_type" : "type-1162",
+   "referenced_type" : "type-1031",
+   "self_type" : "type-1033",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30093,8 +30096,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-3623",
-   "self_type" : "type-3625",
+   "referenced_type" : "type-1163",
+   "self_type" : "type-1165",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30102,8 +30105,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-3765",
-   "self_type" : "type-3767",
+   "referenced_type" : "type-3626",
+   "self_type" : "type-3628",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30111,8 +30114,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-4253",
-   "self_type" : "type-4255",
+   "referenced_type" : "type-3670",
+   "self_type" : "type-3672",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30120,8 +30123,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-4449",
-   "self_type" : "type-4448",
+   "referenced_type" : "type-3771",
+   "self_type" : "type-3773",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30129,8 +30132,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-4689",
-   "self_type" : "type-4691",
+   "referenced_type" : "type-4259",
+   "self_type" : "type-4261",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30138,8 +30141,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-5544",
-   "self_type" : "type-5546",
+   "referenced_type" : "type-4455",
+   "self_type" : "type-4454",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30147,8 +30150,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-5686",
-   "self_type" : "type-5688",
+   "referenced_type" : "type-4696",
+   "self_type" : "type-4698",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30156,8 +30159,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-6168",
-   "self_type" : "type-6170",
+   "referenced_type" : "type-5550",
+   "self_type" : "type-5552",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30165,8 +30168,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-6346",
-   "self_type" : "type-6345",
+   "referenced_type" : "type-5594",
+   "self_type" : "type-5596",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30174,8 +30177,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-6569",
-   "self_type" : "type-6571",
+   "referenced_type" : "type-5695",
+   "self_type" : "type-5697",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30183,8 +30186,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-7860",
-   "self_type" : "type-7862",
+   "referenced_type" : "type-6177",
+   "self_type" : "type-6179",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30192,8 +30195,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-8002",
-   "self_type" : "type-8004",
+   "referenced_type" : "type-6355",
+   "self_type" : "type-6354",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30201,8 +30204,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-8433",
-   "self_type" : "type-8435",
+   "referenced_type" : "type-6579",
+   "self_type" : "type-6581",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30210,8 +30213,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-8555",
-   "self_type" : "type-8557",
+   "referenced_type" : "type-7881",
+   "self_type" : "type-7883",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30219,8 +30222,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-9025",
-   "self_type" : "type-9027",
+   "referenced_type" : "type-7925",
+   "self_type" : "type-7927",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30228,8 +30231,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-9218",
-   "self_type" : "type-9217",
+   "referenced_type" : "type-8026",
+   "self_type" : "type-8028",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30237,8 +30240,53 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-9488",
-   "self_type" : "type-9490",
+   "referenced_type" : "type-8457",
+   "self_type" : "type-8459",
+   "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-8501",
+   "self_type" : "type-8503",
+   "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-8582",
+   "self_type" : "type-8584",
+   "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-9052",
+   "self_type" : "type-9054",
+   "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-9246",
+   "self_type" : "type-9245",
+   "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-9515",
+   "self_type" : "type-9517",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30273,8 +30321,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect> *",
    "name" : "const android::LightFlattenablePod<android::Rect> *",
-   "referenced_type" : "type-4587",
-   "self_type" : "type-4588",
+   "referenced_type" : "type-4593",
+   "self_type" : "type-4594",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30291,8 +30339,8 @@
    "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",
+   "referenced_type" : "type-1233",
+   "self_type" : "type-1234",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -30300,8 +30348,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::LightRefBase<android::NativeHandle> *",
    "name" : "const android::LightRefBase<android::NativeHandle> *",
-   "referenced_type" : "type-2663",
-   "self_type" : "type-2672",
+   "referenced_type" : "type-2666",
+   "self_type" : "type-2675",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -30418,7 +30466,7 @@
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
    "referenced_type" : "type-118",
-   "self_type" : "type-1513",
+   "self_type" : "type-1517",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -30435,8 +30483,8 @@
    "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",
+   "referenced_type" : "type-1523",
+   "self_type" : "type-1525",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -30444,8 +30492,8 @@
    "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",
+   "referenced_type" : "type-1666",
+   "self_type" : "type-1667",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -30453,8 +30501,8 @@
    "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",
+   "referenced_type" : "type-4337",
+   "self_type" : "type-4338",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -30462,8 +30510,8 @@
    "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",
+   "referenced_type" : "type-1660",
+   "self_type" : "type-1661",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -30471,8 +30519,8 @@
    "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",
+   "referenced_type" : "type-4343",
+   "self_type" : "type-4344",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -30480,8 +30528,8 @@
    "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",
+   "referenced_type" : "type-4348",
+   "self_type" : "type-4349",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -30498,8 +30546,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1215",
-   "self_type" : "type-1214",
+   "referenced_type" : "type-1218",
+   "self_type" : "type-1217",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30507,8 +30555,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1490",
-   "self_type" : "type-1489",
+   "referenced_type" : "type-1493",
+   "self_type" : "type-1492",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30516,8 +30564,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1621",
-   "self_type" : "type-1620",
+   "referenced_type" : "type-1624",
+   "self_type" : "type-1623",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30525,8 +30573,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-2683",
-   "self_type" : "type-2682",
+   "referenced_type" : "type-2686",
+   "self_type" : "type-2685",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30534,8 +30582,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-3787",
-   "self_type" : "type-3786",
+   "referenced_type" : "type-3793",
+   "self_type" : "type-3792",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30543,8 +30591,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4011",
-   "self_type" : "type-4010",
+   "referenced_type" : "type-4017",
+   "self_type" : "type-4016",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30552,8 +30600,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4090",
-   "self_type" : "type-4089",
+   "referenced_type" : "type-4096",
+   "self_type" : "type-4095",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30561,8 +30609,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4292",
-   "self_type" : "type-4291",
+   "referenced_type" : "type-4298",
+   "self_type" : "type-4297",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30570,8 +30618,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4572",
-   "self_type" : "type-4571",
+   "referenced_type" : "type-4578",
+   "self_type" : "type-4577",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30579,8 +30627,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4736",
-   "self_type" : "type-4735",
+   "referenced_type" : "type-4743",
+   "self_type" : "type-4742",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30588,8 +30636,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-5019",
-   "self_type" : "type-5018",
+   "referenced_type" : "type-5025",
+   "self_type" : "type-5024",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30597,8 +30645,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-5708",
-   "self_type" : "type-5707",
+   "referenced_type" : "type-5717",
+   "self_type" : "type-5716",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30606,8 +30654,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-5932",
-   "self_type" : "type-5931",
+   "referenced_type" : "type-5941",
+   "self_type" : "type-5940",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30615,8 +30663,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-6011",
-   "self_type" : "type-6010",
+   "referenced_type" : "type-6020",
+   "self_type" : "type-6019",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30624,8 +30672,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-6201",
-   "self_type" : "type-6200",
+   "referenced_type" : "type-6210",
+   "self_type" : "type-6209",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30633,8 +30681,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-6456",
-   "self_type" : "type-6455",
+   "referenced_type" : "type-6465",
+   "self_type" : "type-6464",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30642,8 +30690,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-6605",
-   "self_type" : "type-6604",
+   "referenced_type" : "type-6615",
+   "self_type" : "type-6614",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30651,8 +30699,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-6836",
-   "self_type" : "type-6835",
+   "referenced_type" : "type-6846",
+   "self_type" : "type-6845",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30660,8 +30708,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-6990",
-   "self_type" : "type-6989",
+   "referenced_type" : "type-6999",
+   "self_type" : "type-6998",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30669,8 +30717,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-7221",
-   "self_type" : "type-7220",
+   "referenced_type" : "type-7230",
+   "self_type" : "type-7229",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30678,8 +30726,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-7241",
-   "self_type" : "type-7240",
+   "referenced_type" : "type-7262",
+   "self_type" : "type-7261",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30687,8 +30735,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-8024",
-   "self_type" : "type-8023",
+   "referenced_type" : "type-8048",
+   "self_type" : "type-8047",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30696,8 +30744,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-8206",
-   "self_type" : "type-8205",
+   "referenced_type" : "type-8230",
+   "self_type" : "type-8229",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30705,8 +30753,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-8570",
-   "self_type" : "type-8569",
+   "referenced_type" : "type-8597",
+   "self_type" : "type-8596",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30714,8 +30762,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-8760",
-   "self_type" : "type-8759",
+   "referenced_type" : "type-8788",
+   "self_type" : "type-8787",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30723,8 +30771,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-8839",
-   "self_type" : "type-8838",
+   "referenced_type" : "type-8866",
+   "self_type" : "type-8865",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30732,8 +30780,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-9057",
-   "self_type" : "type-9056",
+   "referenced_type" : "type-9085",
+   "self_type" : "type-9084",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30741,8 +30789,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-9368",
-   "self_type" : "type-9367",
+   "referenced_type" : "type-9396",
+   "self_type" : "type-9395",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30750,8 +30798,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-9515",
-   "self_type" : "type-9514",
+   "referenced_type" : "type-9542",
+   "self_type" : "type-9541",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30759,8 +30807,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-9739",
-   "self_type" : "type-9738",
+   "referenced_type" : "type-9766",
+   "self_type" : "type-9765",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30768,8 +30816,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-9840",
-   "self_type" : "type-9839",
+   "referenced_type" : "type-9863",
+   "self_type" : "type-9862",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30777,8 +30825,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::RefBase *",
    "name" : "const android::RefBase *",
-   "referenced_type" : "type-1449",
-   "self_type" : "type-1480",
+   "referenced_type" : "type-1452",
+   "self_type" : "type-1483",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -30786,8 +30834,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SafeBpInterface<android::IConsumerListener> *",
    "name" : "const android::SafeBpInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-1551",
-   "self_type" : "type-1552",
+   "referenced_type" : "type-1554",
+   "self_type" : "type-1555",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -30795,8 +30843,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SafeBpInterface<android::IGraphicBufferConsumer> *",
    "name" : "const android::SafeBpInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-1886",
-   "self_type" : "type-1887",
+   "referenced_type" : "type-1890",
+   "self_type" : "type-1891",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -30804,8 +30852,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SafeInterface::ParcelHandler *",
    "name" : "const android::SafeInterface::ParcelHandler *",
-   "referenced_type" : "type-1256",
-   "self_type" : "type-1266",
+   "referenced_type" : "type-1254",
+   "self_type" : "type-1269",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -30813,8 +30861,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-2675",
-   "self_type" : "type-2676",
+   "referenced_type" : "type-2678",
+   "self_type" : "type-2679",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -30822,8 +30870,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-2671",
-   "self_type" : "type-2673",
+   "referenced_type" : "type-2674",
+   "self_type" : "type-2676",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -30831,8 +30879,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-2667",
-   "self_type" : "type-2668",
+   "referenced_type" : "type-2670",
+   "self_type" : "type-2671",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -30840,8 +30888,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 *",
    "name" : "const android::String16 *",
-   "referenced_type" : "type-1248",
-   "self_type" : "type-2658",
+   "referenced_type" : "type-1251",
+   "self_type" : "type-2661",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -30849,8 +30897,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 *",
    "name" : "const android::String8 *",
-   "referenced_type" : "type-1875",
-   "self_type" : "type-2653",
+   "referenced_type" : "type-1879",
+   "self_type" : "type-2656",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -30858,8 +30906,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::BufferItem> *",
    "name" : "const android::Vector<android::BufferItem> *",
-   "referenced_type" : "type-977",
-   "self_type" : "type-978",
+   "referenced_type" : "type-979",
+   "self_type" : "type-980",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30867,8 +30915,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::Rect> *",
    "name" : "const android::Vector<android::Rect> *",
-   "referenced_type" : "type-2679",
-   "self_type" : "type-2680",
+   "referenced_type" : "type-2682",
+   "self_type" : "type-2683",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30876,8 +30924,8 @@
    "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",
+   "referenced_type" : "type-1231",
+   "self_type" : "type-1232",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30885,8 +30933,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<int> *",
    "name" : "const android::Vector<int> *",
-   "referenced_type" : "type-2688",
-   "self_type" : "type-2689",
+   "referenced_type" : "type-2691",
+   "self_type" : "type-2692",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30894,8 +30942,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<long long> *",
    "name" : "const android::Vector<long long> *",
-   "referenced_type" : "type-1083",
-   "self_type" : "type-1084",
+   "referenced_type" : "type-1086",
+   "self_type" : "type-1087",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30903,8 +30951,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::VectorImpl *",
    "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-2664",
-   "self_type" : "type-2665",
+   "referenced_type" : "type-2667",
+   "self_type" : "type-2668",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -30912,8 +30960,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::base::ErrnoRestorer *",
    "name" : "const android::base::ErrnoRestorer *",
-   "referenced_type" : "type-4655",
-   "self_type" : "type-4661",
+   "referenced_type" : "type-4662",
+   "self_type" : "type-4668",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -30921,8 +30969,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser> *",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser> *",
-   "referenced_type" : "type-2580",
-   "self_type" : "type-2595",
+   "referenced_type" : "type-2583",
+   "self_type" : "type-2598",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -30939,8 +30987,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::BpHwRefBase *",
    "name" : "const android::hardware::BpHwRefBase *",
-   "referenced_type" : "type-1374",
-   "self_type" : "type-1375",
+   "referenced_type" : "type-1377",
+   "self_type" : "type-1378",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -30948,8 +30996,8 @@
    "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",
+   "referenced_type" : "type-6932",
+   "self_type" : "type-6933",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -30957,24 +31005,6 @@
    "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,
@@ -30982,8 +31012,8 @@
   },
   {
    "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> > *",
+   "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-4498",
    "self_type" : "type-4499",
    "size" : 4,
@@ -30991,10 +31021,28 @@
   },
   {
    "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-4375",
+   "self_type" : "type-4376",
+   "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-4504",
+   "self_type" : "type-4505",
+   "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-4357",
-   "self_type" : "type-4358",
+   "referenced_type" : "type-4363",
+   "self_type" : "type-4364",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -31002,8 +31050,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<int> *",
    "name" : "const android::hardware::Return<int> *",
-   "referenced_type" : "type-4698",
-   "self_type" : "type-4700",
+   "referenced_type" : "type-4704",
+   "self_type" : "type-4706",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -31011,8 +31059,8 @@
    "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",
+   "referenced_type" : "type-6935",
+   "self_type" : "type-6936",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -31074,8 +31122,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-4348",
-   "self_type" : "type-4349",
+   "referenced_type" : "type-4354",
+   "self_type" : "type-4355",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -31101,8 +31149,8 @@
    "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-2460",
-   "self_type" : "type-2461",
+   "referenced_type" : "type-2463",
+   "self_type" : "type-2464",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31128,8 +31176,8 @@
    "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",
+   "referenced_type" : "type-4732",
+   "self_type" : "type-4733",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -31191,8 +31239,8 @@
    "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",
+   "referenced_type" : "type-4386",
+   "self_type" : "type-4387",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -31227,8 +31275,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-2619",
-   "self_type" : "type-2627",
+   "referenced_type" : "type-2622",
+   "self_type" : "type-2630",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -31236,8 +31284,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-2617",
-   "self_type" : "type-2626",
+   "referenced_type" : "type-2620",
+   "self_type" : "type-2629",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -31245,8 +31293,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-2613",
-   "self_type" : "type-2625",
+   "referenced_type" : "type-2616",
+   "self_type" : "type-2628",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -31254,8 +31302,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
    "name" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
-   "referenced_type" : "type-1304",
-   "self_type" : "type-2513",
+   "referenced_type" : "type-1301",
+   "self_type" : "type-2516",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31264,7 +31312,7 @@
    "linker_set_key" : "const android::sp<android::ALooper> *",
    "name" : "const android::sp<android::ALooper> *",
    "referenced_type" : "type-320",
-   "self_type" : "type-2277",
+   "self_type" : "type-2280",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31272,8 +31320,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::AMessage> *",
    "name" : "const android::sp<android::AMessage> *",
-   "referenced_type" : "type-2175",
-   "self_type" : "type-2203",
+   "referenced_type" : "type-2174",
+   "self_type" : "type-2206",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31290,8 +31338,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::ComponentWrapper> *",
    "name" : "const android::sp<android::ComponentWrapper> *",
-   "referenced_type" : "type-2491",
-   "self_type" : "type-2493",
+   "referenced_type" : "type-2494",
+   "self_type" : "type-2496",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31308,8 +31356,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::Fence> *",
    "name" : "const android::sp<android::Fence> *",
-   "referenced_type" : "type-1863",
-   "self_type" : "type-2529",
+   "referenced_type" : "type-1867",
+   "self_type" : "type-2532",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31317,8 +31365,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::FrameDropper> *",
    "name" : "const android::sp<android::FrameDropper> *",
-   "referenced_type" : "type-2506",
-   "self_type" : "type-2507",
+   "referenced_type" : "type-2509",
+   "self_type" : "type-2510",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31326,8 +31374,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::GraphicBuffer> *",
    "name" : "const android::sp<android::GraphicBuffer> *",
-   "referenced_type" : "type-1196",
-   "self_type" : "type-1195",
+   "referenced_type" : "type-1200",
+   "self_type" : "type-1199",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31335,8 +31383,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::GraphicBufferSource> *",
    "name" : "const android::sp<android::GraphicBufferSource> *",
-   "referenced_type" : "type-2544",
-   "self_type" : "type-2545",
+   "referenced_type" : "type-2547",
+   "self_type" : "type-2548",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31344,8 +31392,8 @@
    "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",
+   "referenced_type" : "type-4270",
+   "self_type" : "type-4269",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31353,8 +31401,8 @@
    "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",
+   "referenced_type" : "type-4279",
+   "self_type" : "type-4278",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31362,8 +31410,8 @@
    "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",
+   "referenced_type" : "type-4832",
+   "self_type" : "type-4845",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31371,8 +31419,8 @@
    "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",
+   "referenced_type" : "type-7037",
+   "self_type" : "type-7049",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31380,8 +31428,8 @@
    "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",
+   "referenced_type" : "type-4306",
+   "self_type" : "type-4390",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31389,8 +31437,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IBinder> *",
    "name" : "const android::sp<android::IBinder> *",
-   "referenced_type" : "type-1036",
-   "self_type" : "type-1273",
+   "referenced_type" : "type-1040",
+   "self_type" : "type-1277",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31408,7 +31456,7 @@
    "linker_set_key" : "const android::sp<android::IGraphicBufferConsumer> *",
    "name" : "const android::sp<android::IGraphicBufferConsumer> *",
    "referenced_type" : "type-789",
-   "self_type" : "type-2500",
+   "self_type" : "type-2503",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31416,8 +31464,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer> *",
    "name" : "const android::sp<android::IGraphicBufferProducer> *",
-   "referenced_type" : "type-2485",
-   "self_type" : "type-2487",
+   "referenced_type" : "type-2488",
+   "self_type" : "type-2490",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31425,8 +31473,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IInterface> *",
    "name" : "const android::sp<android::IInterface> *",
-   "referenced_type" : "type-1487",
-   "self_type" : "type-1493",
+   "referenced_type" : "type-1491",
+   "self_type" : "type-1497",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31444,7 +31492,7 @@
    "linker_set_key" : "const android::sp<android::NativeHandle> *",
    "name" : "const android::sp<android::NativeHandle> *",
    "referenced_type" : "type-934",
-   "self_type" : "type-1597",
+   "self_type" : "type-1601",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31452,8 +31500,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-2468",
-   "self_type" : "type-2469",
+   "referenced_type" : "type-2471",
+   "self_type" : "type-2472",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31461,8 +31509,8 @@
    "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-2458",
-   "self_type" : "type-2459",
+   "referenced_type" : "type-2461",
+   "self_type" : "type-2462",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31470,8 +31518,8 @@
    "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",
+   "referenced_type" : "type-4245",
+   "self_type" : "type-4284",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31479,8 +31527,8 @@
    "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",
+   "referenced_type" : "type-4476",
+   "self_type" : "type-4475",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31488,8 +31536,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-2482",
-   "self_type" : "type-2483",
+   "referenced_type" : "type-2485",
+   "self_type" : "type-2486",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31497,8 +31545,8 @@
    "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-2475",
+   "referenced_type" : "type-2477",
+   "self_type" : "type-2478",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31506,8 +31554,8 @@
    "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",
+   "referenced_type" : "type-4239",
+   "self_type" : "type-4282",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31515,8 +31563,8 @@
    "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",
+   "referenced_type" : "type-4469",
+   "self_type" : "type-4468",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31525,7 +31573,7 @@
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient> *",
    "name" : "const android::sp<android::hardware::hidl_death_recipient> *",
    "referenced_type" : "type-513",
-   "self_type" : "type-2442",
+   "self_type" : "type-2445",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31533,8 +31581,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-2446",
-   "self_type" : "type-2447",
+   "referenced_type" : "type-2449",
+   "self_type" : "type-2450",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31542,8 +31590,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "referenced_type" : "type-2451",
-   "self_type" : "type-2453",
+   "referenced_type" : "type-2454",
+   "self_type" : "type-2456",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31578,8 +31626,8 @@
    "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",
+   "referenced_type" : "type-4296",
+   "self_type" : "type-4311",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -31596,8 +31644,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-1241",
-   "self_type" : "type-1240",
+   "referenced_type" : "type-1244",
+   "self_type" : "type-1243",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -31623,8 +31671,8 @@
    "alignment" : 4,
    "linker_set_key" : "const log_msg *",
    "name" : "const log_msg *",
-   "referenced_type" : "type-2313",
-   "self_type" : "type-2320",
+   "referenced_type" : "type-2316",
+   "self_type" : "type-2323",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -31633,7 +31681,7 @@
    "linker_set_key" : "const long long *",
    "name" : "const long long *",
    "referenced_type" : "type-560",
-   "self_type" : "type-1068",
+   "self_type" : "type-1071",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -31651,7 +31699,7 @@
    "linker_set_key" : "const signed char *",
    "name" : "const signed char *",
    "referenced_type" : "type-437",
-   "self_type" : "type-4723",
+   "self_type" : "type-4730",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -31659,8 +31707,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-4759",
-   "self_type" : "type-4761",
+   "referenced_type" : "type-4766",
+   "self_type" : "type-4768",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -31668,8 +31716,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-4863",
-   "self_type" : "type-4865",
+   "referenced_type" : "type-4869",
+   "self_type" : "type-4871",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -31677,8 +31725,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-6625",
-   "self_type" : "type-6627",
+   "referenced_type" : "type-6635",
+   "self_type" : "type-6637",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -31686,8 +31734,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-6727",
-   "self_type" : "type-6729",
+   "referenced_type" : "type-6736",
+   "self_type" : "type-6738",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -31695,8 +31743,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-6850",
-   "self_type" : "type-6852",
+   "referenced_type" : "type-6859",
+   "self_type" : "type-6862",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -31704,8 +31752,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-6997",
-   "self_type" : "type-7004",
+   "referenced_type" : "type-7006",
+   "self_type" : "type-7012",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -31713,8 +31761,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-7072",
-   "self_type" : "type-7074",
+   "referenced_type" : "type-7082",
+   "self_type" : "type-7084",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -31722,8 +31770,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-7248",
-   "self_type" : "type-7254",
+   "referenced_type" : "type-7268",
+   "self_type" : "type-7274",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -31731,8 +31779,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-7299",
-   "self_type" : "type-7301",
+   "referenced_type" : "type-7319",
+   "self_type" : "type-7321",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -31740,8 +31788,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-9533",
-   "self_type" : "type-9535",
+   "referenced_type" : "type-9560",
+   "self_type" : "type-9562",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -31749,8 +31797,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-9626",
-   "self_type" : "type-9628",
+   "referenced_type" : "type-9655",
+   "self_type" : "type-9657",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -31758,8 +31806,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-9752",
-   "self_type" : "type-9754",
+   "referenced_type" : "type-9780",
+   "self_type" : "type-9782",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -31804,7 +31852,7 @@
    "linker_set_key" : "float *",
    "name" : "float *",
    "referenced_type" : "type-268",
-   "self_type" : "type-1275",
+   "self_type" : "type-1276",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -31822,7 +31870,7 @@
    "linker_set_key" : "int *",
    "name" : "int *",
    "referenced_type" : "type-4",
-   "self_type" : "type-1509",
+   "self_type" : "type-1512",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -31830,8 +31878,8 @@
    "alignment" : 4,
    "linker_set_key" : "log_msg *",
    "name" : "log_msg *",
-   "referenced_type" : "type-2177",
-   "self_type" : "type-2342",
+   "referenced_type" : "type-2180",
+   "self_type" : "type-2345",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -31858,7 +31906,7 @@
    "linker_set_key" : "signed char *",
    "name" : "signed char *",
    "referenced_type" : "type-438",
-   "self_type" : "type-4731",
+   "self_type" : "type-4737",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -31866,8 +31914,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::tuple<> *",
    "name" : "std::tuple<> *",
-   "referenced_type" : "type-1566",
-   "self_type" : "type-1565",
+   "referenced_type" : "type-1571",
+   "self_type" : "type-1570",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -31875,573 +31923,6 @@
    "alignment" : 4,
    "linker_set_key" : "std::tuple<> *",
    "name" : "std::tuple<> *",
-   "referenced_type" : "type-2072",
-   "self_type" : "type-2071",
-   "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-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-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,
@@ -32449,17 +31930,368 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "std::tuple<unsigned long long> *",
-   "name" : "std::tuple<unsigned long long> *",
-   "referenced_type" : "type-4162",
-   "self_type" : "type-4161",
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-4056",
+   "self_type" : "type-4055",
    "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> *",
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "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<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-5980",
+   "self_type" : "type-5979",
+   "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-6090",
+   "self_type" : "type-6089",
+   "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-8827",
+   "self_type" : "type-8826",
+   "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-8949",
+   "self_type" : "type-8948",
+   "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-2054",
+   "self_type" : "type-2053",
+   "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-4150",
+   "self_type" : "type-4149",
+   "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-6074",
+   "self_type" : "type-6073",
+   "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-8933",
+   "self_type" : "type-8932",
+   "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-1575",
+   "self_type" : "type-1574",
+   "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-4059",
+   "self_type" : "type-4058",
+   "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-5983",
+   "self_type" : "type-5982",
+   "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-8830",
+   "self_type" : "type-8829",
+   "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-2119",
+   "self_type" : "type-2118",
+   "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-4195",
+   "self_type" : "type-4194",
+   "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-6119",
+   "self_type" : "type-6118",
+   "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-8979",
+   "self_type" : "type-8978",
+   "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-2089",
+   "self_type" : "type-2088",
+   "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-4175",
+   "self_type" : "type-4174",
+   "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-6099",
+   "self_type" : "type-6098",
+   "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-8958",
+   "self_type" : "type-8957",
+   "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-2094",
+   "self_type" : "type-2093",
+   "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-4178",
+   "self_type" : "type-4177",
+   "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-6102",
+   "self_type" : "type-6101",
+   "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-8961",
+   "self_type" : "type-8960",
+   "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-2115",
+   "self_type" : "type-2114",
+   "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-4192",
+   "self_type" : "type-4191",
+   "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-6116",
+   "self_type" : "type-6115",
+   "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-8976",
+   "self_type" : "type-8975",
+   "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-2100",
+   "self_type" : "type-2099",
+   "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-4182",
+   "self_type" : "type-4181",
+   "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-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> *",
+   "name" : "std::tuple<bool> *",
+   "referenced_type" : "type-8966",
+   "self_type" : "type-8965",
+   "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-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, sp<GraphicBuffer> > *",
+   "name" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "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<int, sp<GraphicBuffer> > *",
+   "name" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "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<int, sp<GraphicBuffer> > *",
+   "name" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "referenced_type" : "type-8939",
+   "self_type" : "type-8938",
+   "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-2067",
+   "self_type" : "type-2066",
+   "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-4159",
+   "self_type" : "type-4158",
+   "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-6083",
    "self_type" : "type-6082",
    "size" : 4,
@@ -32467,10 +32299,226 @@
   },
   {
    "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-8942",
+   "self_type" : "type-8941",
+   "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-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> *",
+   "name" : "std::tuple<int> *",
+   "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> *",
+   "name" : "std::tuple<int> *",
+   "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<int> *",
+   "name" : "std::tuple<int> *",
+   "referenced_type" : "type-8936",
+   "self_type" : "type-8935",
+   "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-2072",
+   "self_type" : "type-2071",
+   "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-4163",
+   "self_type" : "type-4162",
+   "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-6087",
+   "self_type" : "type-6086",
+   "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-8945",
+   "self_type" : "type-8944",
+   "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-2110",
+   "self_type" : "type-2109",
+   "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-4189",
+   "self_type" : "type-4188",
+   "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-6113",
+   "self_type" : "type-6112",
+   "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-8973",
+   "self_type" : "type-8972",
+   "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-2085",
+   "self_type" : "type-2084",
+   "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-4172",
+   "self_type" : "type-4171",
+   "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-6096",
+   "self_type" : "type-6095",
+   "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-8955",
+   "self_type" : "type-8954",
+   "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-2106",
+   "self_type" : "type-2105",
+   "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-4186",
+   "self_type" : "type-4185",
+   "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-6110",
+   "self_type" : "type-6109",
+   "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-8969",
+   "self_type" : "type-8968",
+   "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",
+   "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 long long> *",
+   "name" : "std::tuple<unsigned long long> *",
+   "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<unsigned long long> *",
+   "name" : "std::tuple<unsigned long long> *",
+   "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<unsigned long long> *",
+   "name" : "std::tuple<unsigned long long> *",
+   "referenced_type" : "type-8952",
+   "self_type" : "type-8951",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -32478,8 +32526,8 @@
    "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",
+   "referenced_type" : "type-1653",
+   "self_type" : "type-1652",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -32487,8 +32535,8 @@
    "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",
+   "referenced_type" : "type-4117",
+   "self_type" : "type-4116",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -32496,8 +32544,8 @@
    "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",
+   "referenced_type" : "type-6041",
+   "self_type" : "type-6040",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -32505,8 +32553,8 @@
    "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",
+   "referenced_type" : "type-8886",
+   "self_type" : "type-8885",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -32515,7 +32563,7 @@
    "linker_set_key" : "unsigned char (*)[128]",
    "name" : "unsigned char (*)[128]",
    "referenced_type" : "type-1527",
-   "self_type" : "type-2360",
+   "self_type" : "type-2363",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -32533,7 +32581,7 @@
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
    "referenced_type" : "type-2",
-   "self_type" : "type-1680",
+   "self_type" : "type-1684",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -32559,8 +32607,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
    "name" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
-   "referenced_type" : "type-1380",
-   "self_type" : "type-1379",
+   "referenced_type" : "type-1383",
+   "self_type" : "type-1382",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -32600,8 +32648,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1078",
-   "self_type" : "type-1080",
+   "referenced_type" : "type-1081",
+   "self_type" : "type-1083",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32610,8 +32658,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1190",
-   "self_type" : "type-1192",
+   "referenced_type" : "type-1193",
+   "self_type" : "type-1196",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32620,8 +32668,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1351",
-   "self_type" : "type-1353",
+   "referenced_type" : "type-1354",
+   "self_type" : "type-1356",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32630,8 +32678,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1403",
-   "self_type" : "type-1405",
+   "referenced_type" : "type-1406",
+   "self_type" : "type-1408",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32640,8 +32688,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1419",
-   "self_type" : "type-1421",
+   "referenced_type" : "type-1422",
+   "self_type" : "type-1424",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32650,8 +32698,8 @@
    "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",
+   "referenced_type" : "type-1443",
+   "self_type" : "type-1445",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32660,8 +32708,8 @@
    "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",
+   "referenced_type" : "type-1485",
+   "self_type" : "type-1487",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32670,8 +32718,8 @@
    "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",
+   "referenced_type" : "type-1619",
+   "self_type" : "type-1622",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32680,8 +32728,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2648",
-   "self_type" : "type-2651",
+   "referenced_type" : "type-2651",
+   "self_type" : "type-2654",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32690,8 +32738,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",
+   "referenced_type" : "type-3461",
+   "self_type" : "type-3463",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32700,8 +32748,8 @@
    "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",
+   "referenced_type" : "type-3527",
+   "self_type" : "type-3529",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32710,8 +32758,8 @@
    "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",
+   "referenced_type" : "type-3629",
+   "self_type" : "type-3631",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32720,8 +32768,8 @@
    "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",
+   "referenced_type" : "type-3694",
+   "self_type" : "type-3696",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32730,8 +32778,8 @@
    "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",
+   "referenced_type" : "type-3786",
+   "self_type" : "type-3788",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32740,8 +32788,8 @@
    "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",
+   "referenced_type" : "type-3847",
+   "self_type" : "type-3846",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32750,8 +32798,8 @@
    "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",
+   "referenced_type" : "type-3911",
+   "self_type" : "type-3913",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32760,8 +32808,8 @@
    "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",
+   "referenced_type" : "type-3937",
+   "self_type" : "type-3939",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32770,8 +32818,8 @@
    "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",
+   "referenced_type" : "type-3953",
+   "self_type" : "type-3955",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32780,8 +32828,8 @@
    "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",
+   "referenced_type" : "type-3978",
+   "self_type" : "type-3980",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32790,8 +32838,8 @@
    "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",
+   "referenced_type" : "type-4011",
+   "self_type" : "type-4013",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32800,8 +32848,8 @@
    "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",
+   "referenced_type" : "type-4092",
+   "self_type" : "type-4094",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32810,8 +32858,8 @@
    "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",
+   "referenced_type" : "type-4292",
+   "self_type" : "type-4294",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32820,8 +32868,8 @@
    "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",
+   "referenced_type" : "type-4479",
+   "self_type" : "type-4481",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32830,8 +32878,8 @@
    "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",
+   "referenced_type" : "type-4532",
+   "self_type" : "type-4534",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32840,8 +32888,8 @@
    "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",
+   "referenced_type" : "type-4541",
+   "self_type" : "type-4543",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32850,8 +32898,8 @@
    "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",
+   "referenced_type" : "type-4566",
+   "self_type" : "type-4568",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32860,8 +32908,8 @@
    "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",
+   "referenced_type" : "type-4717",
+   "self_type" : "type-4720",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32870,8 +32918,8 @@
    "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",
+   "referenced_type" : "type-4847",
+   "self_type" : "type-4849",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32880,8 +32928,8 @@
    "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",
+   "referenced_type" : "type-4996",
+   "self_type" : "type-4998",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32890,8 +32938,8 @@
    "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",
+   "referenced_type" : "type-5385",
+   "self_type" : "type-5387",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32900,8 +32948,8 @@
    "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",
+   "referenced_type" : "type-5451",
+   "self_type" : "type-5453",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32920,8 +32968,8 @@
    "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",
+   "referenced_type" : "type-5553",
+   "self_type" : "type-5555",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32930,8 +32978,8 @@
    "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",
+   "referenced_type" : "type-5618",
+   "self_type" : "type-5620",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32940,8 +32988,8 @@
    "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",
+   "referenced_type" : "type-5710",
+   "self_type" : "type-5712",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32950,8 +32998,8 @@
    "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",
+   "referenced_type" : "type-5771",
+   "self_type" : "type-5770",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32960,8 +33008,8 @@
    "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",
+   "referenced_type" : "type-5835",
+   "self_type" : "type-5837",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32970,8 +33018,8 @@
    "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",
+   "referenced_type" : "type-5861",
+   "self_type" : "type-5863",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32980,8 +33028,8 @@
    "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",
+   "referenced_type" : "type-5877",
+   "self_type" : "type-5879",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32990,8 +33038,8 @@
    "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",
+   "referenced_type" : "type-5902",
+   "self_type" : "type-5904",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33000,8 +33048,8 @@
    "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",
+   "referenced_type" : "type-5935",
+   "self_type" : "type-5937",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33010,8 +33058,8 @@
    "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",
+   "referenced_type" : "type-6016",
+   "self_type" : "type-6018",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33020,8 +33068,8 @@
    "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",
+   "referenced_type" : "type-6204",
+   "self_type" : "type-6206",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33030,8 +33078,8 @@
    "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",
+   "referenced_type" : "type-6371",
+   "self_type" : "type-6373",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33040,8 +33088,8 @@
    "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",
+   "referenced_type" : "type-6419",
+   "self_type" : "type-6421",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33050,8 +33098,8 @@
    "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",
+   "referenced_type" : "type-6428",
+   "self_type" : "type-6430",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33060,8 +33108,8 @@
    "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",
+   "referenced_type" : "type-6453",
+   "self_type" : "type-6455",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33070,8 +33118,8 @@
    "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",
+   "referenced_type" : "type-6594",
+   "self_type" : "type-6597",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33080,8 +33128,8 @@
    "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",
+   "referenced_type" : "type-6714",
+   "self_type" : "type-6716",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33090,8 +33138,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-6735",
-   "self_type" : "type-6737",
+   "referenced_type" : "type-6744",
+   "self_type" : "type-6746",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33100,8 +33148,8 @@
    "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",
+   "referenced_type" : "type-6788",
+   "self_type" : "type-6790",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33110,8 +33158,8 @@
    "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",
+   "referenced_type" : "type-6877",
+   "self_type" : "type-6880",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33120,8 +33168,8 @@
    "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",
+   "referenced_type" : "type-6940",
+   "self_type" : "type-6942",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33130,8 +33178,8 @@
    "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",
+   "referenced_type" : "type-7056",
+   "self_type" : "type-7058",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33140,8 +33188,8 @@
    "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",
+   "referenced_type" : "type-7102",
+   "self_type" : "type-7105",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33150,8 +33198,8 @@
    "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",
+   "referenced_type" : "type-7201",
+   "self_type" : "type-7203",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33160,8 +33208,8 @@
    "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",
+   "referenced_type" : "type-7301",
+   "self_type" : "type-7303",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33170,8 +33218,8 @@
    "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",
+   "referenced_type" : "type-7340",
+   "self_type" : "type-7342",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33190,8 +33238,8 @@
    "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",
+   "referenced_type" : "type-7716",
+   "self_type" : "type-7718",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33200,8 +33248,8 @@
    "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",
+   "referenced_type" : "type-7782",
+   "self_type" : "type-7784",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33210,8 +33258,8 @@
    "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",
+   "referenced_type" : "type-7884",
+   "self_type" : "type-7886",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33220,8 +33268,8 @@
    "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",
+   "referenced_type" : "type-7949",
+   "self_type" : "type-7951",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33230,8 +33278,8 @@
    "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",
+   "referenced_type" : "type-8041",
+   "self_type" : "type-8043",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33240,8 +33288,8 @@
    "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",
+   "referenced_type" : "type-8102",
+   "self_type" : "type-8101",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33250,8 +33298,8 @@
    "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",
+   "referenced_type" : "type-8164",
+   "self_type" : "type-8166",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33260,8 +33308,8 @@
    "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",
+   "referenced_type" : "type-8224",
+   "self_type" : "type-8226",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33270,18 +33318,8 @@
    "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",
+   "referenced_type" : "type-8320",
+   "self_type" : "type-8322",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33300,8 +33338,8 @@
    "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",
+   "referenced_type" : "type-8372",
+   "self_type" : "type-8374",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33310,8 +33348,8 @@
    "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",
+   "referenced_type" : "type-8461",
+   "self_type" : "type-8463",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33320,8 +33358,8 @@
    "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",
+   "referenced_type" : "type-8513",
+   "self_type" : "type-8515",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33330,8 +33368,8 @@
    "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",
+   "referenced_type" : "type-8593",
+   "self_type" : "type-8595",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33340,8 +33378,8 @@
    "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",
+   "referenced_type" : "type-8686",
+   "self_type" : "type-8688",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33350,8 +33388,8 @@
    "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",
+   "referenced_type" : "type-8712",
+   "self_type" : "type-8714",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33360,8 +33398,8 @@
    "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",
+   "referenced_type" : "type-8729",
+   "self_type" : "type-8731",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33370,8 +33408,8 @@
    "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",
+   "referenced_type" : "type-8750",
+   "self_type" : "type-8752",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33380,8 +33418,8 @@
    "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",
+   "referenced_type" : "type-8782",
+   "self_type" : "type-8784",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33390,8 +33428,8 @@
    "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",
+   "referenced_type" : "type-8862",
+   "self_type" : "type-8864",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33400,8 +33438,8 @@
    "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",
+   "referenced_type" : "type-9079",
+   "self_type" : "type-9081",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33410,8 +33448,8 @@
    "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",
+   "referenced_type" : "type-9264",
+   "self_type" : "type-9266",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33420,8 +33458,8 @@
    "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",
+   "referenced_type" : "type-9326",
+   "self_type" : "type-9329",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33430,8 +33468,8 @@
    "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",
+   "referenced_type" : "type-9341",
+   "self_type" : "type-9344",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33440,8 +33478,8 @@
    "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",
+   "referenced_type" : "type-9377",
+   "self_type" : "type-9379",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33450,8 +33488,8 @@
    "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",
+   "referenced_type" : "type-9527",
+   "self_type" : "type-9529",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33460,8 +33498,8 @@
    "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",
+   "referenced_type" : "type-9628",
+   "self_type" : "type-9630",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33470,8 +33508,18 @@
    "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",
+   "referenced_type" : "type-9665",
+   "self_type" : "type-9667",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-9717",
+   "self_type" : "type-9719",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33490,8 +33538,8 @@
    "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",
+   "referenced_type" : "type-9769",
+   "self_type" : "type-9779",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33500,8 +33548,8 @@
    "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",
+   "referenced_type" : "type-9797",
+   "self_type" : "type-9799",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33510,8 +33558,8 @@
    "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",
+   "referenced_type" : "type-9859",
+   "self_type" : "type-9861",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33520,8 +33568,8 @@
    "is_const" : true,
    "linker_set_key" : "android::hardware::IBinder *const",
    "name" : "android::hardware::IBinder *const",
-   "referenced_type" : "type-1358",
-   "self_type" : "type-1372",
+   "referenced_type" : "type-1361",
+   "self_type" : "type-1375",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -33531,7 +33579,7 @@
    "linker_set_key" : "const android::AHandler",
    "name" : "const android::AHandler",
    "referenced_type" : "type-264",
-   "self_type" : "type-2518",
+   "self_type" : "type-2521",
    "size" : 48,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33541,7 +33589,7 @@
    "linker_set_key" : "const android::AHandlerReflector<android::GraphicBufferSource>",
    "name" : "const android::AHandlerReflector<android::GraphicBufferSource>",
    "referenced_type" : "type-583",
-   "self_type" : "type-2514",
+   "self_type" : "type-2517",
    "size" : 56,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33551,7 +33599,7 @@
    "linker_set_key" : "const android::ALooper",
    "name" : "const android::ALooper",
    "referenced_type" : "type-248",
-   "self_type" : "type-2289",
+   "self_type" : "type-2292",
    "size" : 52,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33560,8 +33608,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AReplyToken",
    "name" : "const android::AReplyToken",
-   "referenced_type" : "type-1044",
-   "self_type" : "type-1167",
+   "referenced_type" : "type-1043",
+   "self_type" : "type-1168",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -33571,7 +33619,7 @@
    "linker_set_key" : "const android::AString",
    "name" : "const android::AString",
    "referenced_type" : "type-253",
-   "self_type" : "type-2110",
+   "self_type" : "type-2101",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -33601,7 +33649,7 @@
    "linker_set_key" : "const android::BnInterface<android::IGraphicBufferProducer>",
    "name" : "const android::BnInterface<android::IGraphicBufferProducer>",
    "referenced_type" : "type-71",
-   "self_type" : "type-1232",
+   "self_type" : "type-1236",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -33611,7 +33659,7 @@
    "linker_set_key" : "const android::BnInterface<android::IProducerListener>",
    "name" : "const android::BnInterface<android::IProducerListener>",
    "referenced_type" : "type-80",
-   "self_type" : "type-4477",
+   "self_type" : "type-4483",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -33620,8 +33668,8 @@
    "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",
+   "referenced_type" : "type-1034",
+   "self_type" : "type-1096",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -33640,8 +33688,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-1070",
-   "self_type" : "type-1069",
+   "referenced_type" : "type-1073",
+   "self_type" : "type-1072",
    "size" : 168,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -33650,8 +33698,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-1220",
-   "self_type" : "type-1219",
+   "referenced_type" : "type-1224",
+   "self_type" : "type-1223",
    "size" : 168,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -33660,8 +33708,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-1531",
-   "self_type" : "type-1530",
+   "referenced_type" : "type-1534",
+   "self_type" : "type-1533",
    "size" : 168,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -33670,8 +33718,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-1672",
-   "self_type" : "type-1671",
+   "referenced_type" : "type-1676",
+   "self_type" : "type-1675",
    "size" : 168,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -33680,8 +33728,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-3442",
-   "self_type" : "type-3441",
+   "referenced_type" : "type-3445",
+   "self_type" : "type-3444",
    "size" : 168,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -33690,8 +33738,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-3634",
-   "self_type" : "type-3633",
+   "referenced_type" : "type-3637",
+   "self_type" : "type-3636",
    "size" : 168,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -33700,8 +33748,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-3683",
-   "self_type" : "type-3682",
+   "referenced_type" : "type-3689",
+   "self_type" : "type-3688",
    "size" : 168,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -33710,8 +33758,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-3792",
-   "self_type" : "type-3791",
+   "referenced_type" : "type-3799",
+   "self_type" : "type-3798",
    "size" : 168,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -33720,8 +33768,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-4041",
-   "self_type" : "type-4040",
+   "referenced_type" : "type-4048",
+   "self_type" : "type-4047",
    "size" : 168,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -33730,8 +33778,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-4127",
-   "self_type" : "type-4126",
+   "referenced_type" : "type-4133",
+   "self_type" : "type-4132",
    "size" : 168,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -33740,8 +33788,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-5363",
-   "self_type" : "type-5362",
+   "referenced_type" : "type-5369",
+   "self_type" : "type-5368",
    "size" : 168,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -33750,8 +33798,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-5555",
-   "self_type" : "type-5554",
+   "referenced_type" : "type-5561",
+   "self_type" : "type-5560",
    "size" : 168,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -33760,8 +33808,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-5604",
-   "self_type" : "type-5603",
+   "referenced_type" : "type-5613",
+   "self_type" : "type-5612",
    "size" : 168,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -33770,8 +33818,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-5713",
-   "self_type" : "type-5712",
+   "referenced_type" : "type-5723",
+   "self_type" : "type-5722",
    "size" : 168,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -33780,8 +33828,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-5962",
-   "self_type" : "type-5961",
+   "referenced_type" : "type-5972",
+   "self_type" : "type-5971",
    "size" : 168,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -33790,8 +33838,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-6048",
-   "self_type" : "type-6047",
+   "referenced_type" : "type-6057",
+   "self_type" : "type-6056",
    "size" : 168,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -33810,8 +33858,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-7679",
-   "self_type" : "type-7678",
+   "referenced_type" : "type-7700",
+   "self_type" : "type-7699",
    "size" : 168,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -33820,8 +33868,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-7871",
-   "self_type" : "type-7870",
+   "referenced_type" : "type-7892",
+   "self_type" : "type-7891",
    "size" : 168,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -33830,8 +33878,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-7920",
-   "self_type" : "type-7919",
+   "referenced_type" : "type-7944",
+   "self_type" : "type-7943",
    "size" : 168,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -33840,8 +33888,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-8029",
-   "self_type" : "type-8028",
+   "referenced_type" : "type-8054",
+   "self_type" : "type-8053",
    "size" : 168,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -33850,8 +33898,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-8283",
-   "self_type" : "type-8282",
+   "referenced_type" : "type-8307",
+   "self_type" : "type-8306",
    "size" : 168,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -33860,8 +33908,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-8442",
-   "self_type" : "type-8441",
+   "referenced_type" : "type-8466",
+   "self_type" : "type-8465",
    "size" : 168,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -33870,8 +33918,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-8484",
-   "self_type" : "type-8483",
+   "referenced_type" : "type-8511",
+   "self_type" : "type-8510",
    "size" : 168,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -33880,8 +33928,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-8575",
-   "self_type" : "type-8574",
+   "referenced_type" : "type-8602",
+   "self_type" : "type-8601",
    "size" : 168,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -33890,8 +33938,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-8793",
-   "self_type" : "type-8792",
+   "referenced_type" : "type-8820",
+   "self_type" : "type-8819",
    "size" : 168,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -33900,8 +33948,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-8875",
-   "self_type" : "type-8874",
+   "referenced_type" : "type-8902",
+   "self_type" : "type-8901",
    "size" : 168,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -33920,8 +33968,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferQueueCore",
    "name" : "const android::BufferQueueCore",
-   "referenced_type" : "type-3522",
-   "self_type" : "type-3521",
+   "referenced_type" : "type-3525",
+   "self_type" : "type-3524",
    "size" : 3928,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33930,8 +33978,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferQueueCore",
    "name" : "const android::BufferQueueCore",
-   "referenced_type" : "type-5443",
-   "self_type" : "type-5442",
+   "referenced_type" : "type-5449",
+   "self_type" : "type-5448",
    "size" : 3928,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33940,8 +33988,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferQueueCore",
    "name" : "const android::BufferQueueCore",
-   "referenced_type" : "type-7759",
-   "self_type" : "type-7758",
+   "referenced_type" : "type-7780",
+   "self_type" : "type-7779",
    "size" : 3928,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33960,8 +34008,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferQueueCore",
    "name" : "const android::BufferQueueCore",
-   "referenced_type" : "type-8345",
-   "self_type" : "type-8344",
+   "referenced_type" : "type-8369",
+   "self_type" : "type-8368",
    "size" : 3928,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33971,7 +34019,7 @@
    "linker_set_key" : "const android::ComponentWrapper",
    "name" : "const android::ComponentWrapper",
    "referenced_type" : "type-569",
-   "self_type" : "type-2494",
+   "self_type" : "type-2497",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33980,8 +34028,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::CompositorTiming",
    "name" : "const android::CompositorTiming",
-   "referenced_type" : "type-1425",
-   "self_type" : "type-1424",
+   "referenced_type" : "type-1428",
+   "self_type" : "type-1427",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -33990,8 +34038,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::CompositorTiming",
    "name" : "const android::CompositorTiming",
-   "referenced_type" : "type-3953",
-   "self_type" : "type-3952",
+   "referenced_type" : "type-3961",
+   "self_type" : "type-3960",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -34000,8 +34048,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::CompositorTiming",
    "name" : "const android::CompositorTiming",
-   "referenced_type" : "type-5874",
-   "self_type" : "type-5873",
+   "referenced_type" : "type-5885",
+   "self_type" : "type-5884",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -34010,8 +34058,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::CompositorTiming",
    "name" : "const android::CompositorTiming",
-   "referenced_type" : "type-8708",
-   "self_type" : "type-8707",
+   "referenced_type" : "type-8735",
+   "self_type" : "type-8734",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -34020,8 +34068,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ConsumerListener",
    "name" : "const android::ConsumerListener",
-   "referenced_type" : "type-3514",
-   "self_type" : "type-3513",
+   "referenced_type" : "type-3517",
+   "self_type" : "type-3516",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34030,8 +34078,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ConsumerListener",
    "name" : "const android::ConsumerListener",
-   "referenced_type" : "type-5435",
-   "self_type" : "type-5434",
+   "referenced_type" : "type-5441",
+   "self_type" : "type-5440",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34040,8 +34088,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ConsumerListener",
    "name" : "const android::ConsumerListener",
-   "referenced_type" : "type-7751",
-   "self_type" : "type-7750",
+   "referenced_type" : "type-7772",
+   "self_type" : "type-7771",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34060,8 +34108,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ConsumerListener",
    "name" : "const android::ConsumerListener",
-   "referenced_type" : "type-8340",
-   "self_type" : "type-8339",
+   "referenced_type" : "type-8364",
+   "self_type" : "type-8363",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34070,8 +34118,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-1310",
-   "self_type" : "type-1309",
+   "referenced_type" : "type-1313",
+   "self_type" : "type-1312",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34080,8 +34128,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-2531",
-   "self_type" : "type-2530",
+   "referenced_type" : "type-2534",
+   "self_type" : "type-2533",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34090,8 +34138,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-3449",
-   "self_type" : "type-3448",
+   "referenced_type" : "type-3452",
+   "self_type" : "type-3451",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34100,8 +34148,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-3594",
-   "self_type" : "type-3593",
+   "referenced_type" : "type-3597",
+   "self_type" : "type-3596",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34110,8 +34158,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-3860",
-   "self_type" : "type-3859",
+   "referenced_type" : "type-3866",
+   "self_type" : "type-3865",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34120,8 +34168,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-4423",
-   "self_type" : "type-4422",
+   "referenced_type" : "type-4429",
+   "self_type" : "type-4428",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34130,8 +34178,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-4673",
-   "self_type" : "type-4672",
+   "referenced_type" : "type-4680",
+   "self_type" : "type-4679",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34140,8 +34188,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-4942",
-   "self_type" : "type-4941",
+   "referenced_type" : "type-4948",
+   "self_type" : "type-4947",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34150,8 +34198,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-5370",
-   "self_type" : "type-5369",
+   "referenced_type" : "type-5376",
+   "self_type" : "type-5375",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34160,8 +34208,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-5515",
-   "self_type" : "type-5514",
+   "referenced_type" : "type-5521",
+   "self_type" : "type-5520",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34170,8 +34218,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-5781",
-   "self_type" : "type-5780",
+   "referenced_type" : "type-5790",
+   "self_type" : "type-5789",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34180,8 +34228,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-6320",
-   "self_type" : "type-6319",
+   "referenced_type" : "type-6329",
+   "self_type" : "type-6328",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34190,8 +34238,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-6554",
-   "self_type" : "type-6553",
+   "referenced_type" : "type-6564",
+   "self_type" : "type-6563",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34200,8 +34248,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-7050",
-   "self_type" : "type-7049",
+   "referenced_type" : "type-7055",
+   "self_type" : "type-7054",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34220,8 +34268,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-7686",
-   "self_type" : "type-7685",
+   "referenced_type" : "type-7707",
+   "self_type" : "type-7706",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34230,8 +34278,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-7831",
-   "self_type" : "type-7830",
+   "referenced_type" : "type-7852",
+   "self_type" : "type-7851",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34240,8 +34288,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-8097",
-   "self_type" : "type-8096",
+   "referenced_type" : "type-8121",
+   "self_type" : "type-8120",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34250,8 +34298,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-8177",
-   "self_type" : "type-8176",
+   "referenced_type" : "type-8201",
+   "self_type" : "type-8200",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34260,8 +34308,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-8288",
-   "self_type" : "type-8287",
+   "referenced_type" : "type-8313",
+   "self_type" : "type-8312",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34270,8 +34318,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-8416",
-   "self_type" : "type-8415",
+   "referenced_type" : "type-8440",
+   "self_type" : "type-8439",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34280,8 +34328,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-8617",
-   "self_type" : "type-8616",
+   "referenced_type" : "type-8644",
+   "self_type" : "type-8643",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34290,8 +34338,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-9189",
-   "self_type" : "type-9188",
+   "referenced_type" : "type-9217",
+   "self_type" : "type-9216",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34310,8 +34358,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-9366",
-   "self_type" : "type-9365",
+   "referenced_type" : "type-9393",
+   "self_type" : "type-9392",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34320,8 +34368,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-9476",
-   "self_type" : "type-9475",
+   "referenced_type" : "type-9503",
+   "self_type" : "type-9502",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34330,8 +34378,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot::State",
    "name" : "const android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-4580",
-   "self_type" : "type-4579",
+   "referenced_type" : "type-4586",
+   "self_type" : "type-4585",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -34340,8 +34388,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot::State",
    "name" : "const android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-4748",
-   "self_type" : "type-4747",
+   "referenced_type" : "type-4755",
+   "self_type" : "type-4754",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -34350,8 +34398,8 @@
    "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",
+   "referenced_type" : "type-6473",
+   "self_type" : "type-6472",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -34360,8 +34408,8 @@
    "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",
+   "referenced_type" : "type-6626",
+   "self_type" : "type-6625",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -34370,8 +34418,8 @@
    "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",
+   "referenced_type" : "type-9406",
+   "self_type" : "type-9405",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -34380,8 +34428,8 @@
    "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",
+   "referenced_type" : "type-9552",
+   "self_type" : "type-9551",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -34390,7 +34438,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::FileDescriptor::Autoclose",
    "name" : "const android::FileDescriptor::Autoclose",
-   "referenced_type" : "type-1204",
+   "referenced_type" : "type-1203",
    "self_type" : "type-1221",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h"
@@ -34401,7 +34449,7 @@
    "linker_set_key" : "const android::Flattenable<android::BufferItem>",
    "name" : "const android::Flattenable<android::BufferItem>",
    "referenced_type" : "type-21",
-   "self_type" : "type-1506",
+   "self_type" : "type-1509",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -34411,7 +34459,7 @@
    "linker_set_key" : "const android::Flattenable<android::Fence>",
    "name" : "const android::Flattenable<android::Fence>",
    "referenced_type" : "type-16",
-   "self_type" : "type-1634",
+   "self_type" : "type-1638",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -34421,7 +34469,7 @@
    "linker_set_key" : "const android::Flattenable<android::FrameEventHistoryDelta>",
    "name" : "const android::Flattenable<android::FrameEventHistoryDelta>",
    "referenced_type" : "type-25",
-   "self_type" : "type-4306",
+   "self_type" : "type-4312",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -34431,7 +34479,7 @@
    "linker_set_key" : "const android::Flattenable<android::GraphicBuffer>",
    "name" : "const android::Flattenable<android::GraphicBuffer>",
    "referenced_type" : "type-14",
-   "self_type" : "type-1638",
+   "self_type" : "type-1643",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -34441,7 +34489,7 @@
    "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
    "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
    "referenced_type" : "type-32",
-   "self_type" : "type-4309",
+   "self_type" : "type-4315",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -34451,7 +34499,7 @@
    "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
    "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
    "referenced_type" : "type-34",
-   "self_type" : "type-4312",
+   "self_type" : "type-4318",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -34461,7 +34509,7 @@
    "linker_set_key" : "const android::FrameDropper",
    "name" : "const android::FrameDropper",
    "referenced_type" : "type-580",
-   "self_type" : "type-2508",
+   "self_type" : "type-2511",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34470,8 +34518,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-1347",
-   "self_type" : "type-1346",
+   "referenced_type" : "type-1350",
+   "self_type" : "type-1349",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34480,8 +34528,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-1462",
-   "self_type" : "type-1461",
+   "referenced_type" : "type-1466",
+   "self_type" : "type-1465",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34490,8 +34538,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-2404",
-   "self_type" : "type-2403",
+   "referenced_type" : "type-2407",
+   "self_type" : "type-2406",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34500,8 +34548,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-3455",
-   "self_type" : "type-3454",
+   "referenced_type" : "type-3458",
+   "self_type" : "type-3457",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34510,8 +34558,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-3599",
-   "self_type" : "type-3598",
+   "referenced_type" : "type-3602",
+   "self_type" : "type-3601",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34520,8 +34568,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-3899",
-   "self_type" : "type-3898",
+   "referenced_type" : "type-3905",
+   "self_type" : "type-3904",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34530,8 +34578,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-3992",
-   "self_type" : "type-3991",
+   "referenced_type" : "type-3998",
+   "self_type" : "type-3997",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34540,8 +34588,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-4219",
-   "self_type" : "type-4218",
+   "referenced_type" : "type-4225",
+   "self_type" : "type-4224",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34550,8 +34598,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-4839",
-   "self_type" : "type-4838",
+   "referenced_type" : "type-4841",
+   "self_type" : "type-4840",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34560,8 +34608,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-5376",
-   "self_type" : "type-5375",
+   "referenced_type" : "type-5382",
+   "self_type" : "type-5381",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34570,8 +34618,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-5520",
-   "self_type" : "type-5519",
+   "referenced_type" : "type-5526",
+   "self_type" : "type-5525",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34580,8 +34628,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-5820",
-   "self_type" : "type-5819",
+   "referenced_type" : "type-5829",
+   "self_type" : "type-5828",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34590,8 +34638,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-5913",
-   "self_type" : "type-5912",
+   "referenced_type" : "type-5922",
+   "self_type" : "type-5921",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34600,8 +34648,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-6140",
-   "self_type" : "type-6139",
+   "referenced_type" : "type-6149",
+   "self_type" : "type-6148",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34610,8 +34658,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-6703",
-   "self_type" : "type-6702",
+   "referenced_type" : "type-6708",
+   "self_type" : "type-6707",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34630,8 +34678,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-7692",
-   "self_type" : "type-7691",
+   "referenced_type" : "type-7713",
+   "self_type" : "type-7712",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34640,8 +34688,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-7836",
-   "self_type" : "type-7835",
+   "referenced_type" : "type-7857",
+   "self_type" : "type-7856",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34650,8 +34698,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-8136",
-   "self_type" : "type-8135",
+   "referenced_type" : "type-8160",
+   "self_type" : "type-8159",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34660,8 +34708,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-8153",
-   "self_type" : "type-8152",
+   "referenced_type" : "type-8177",
+   "self_type" : "type-8176",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34670,8 +34718,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-8294",
-   "self_type" : "type-8293",
+   "referenced_type" : "type-8318",
+   "self_type" : "type-8317",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34680,8 +34728,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-8421",
-   "self_type" : "type-8420",
+   "referenced_type" : "type-8445",
+   "self_type" : "type-8444",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34690,8 +34738,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-8654",
-   "self_type" : "type-8653",
+   "referenced_type" : "type-8681",
+   "self_type" : "type-8680",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34700,8 +34748,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-8742",
-   "self_type" : "type-8741",
+   "referenced_type" : "type-8769",
+   "self_type" : "type-8768",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34710,8 +34758,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-8986",
-   "self_type" : "type-8985",
+   "referenced_type" : "type-9013",
+   "self_type" : "type-9012",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34720,8 +34768,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-8997",
-   "self_type" : "type-8996",
+   "referenced_type" : "type-9024",
+   "self_type" : "type-9023",
    "size" : 160,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34741,7 +34789,7 @@
    "linker_set_key" : "const android::GraphicBufferSource",
    "name" : "const android::GraphicBufferSource",
    "referenced_type" : "type-566",
-   "self_type" : "type-2546",
+   "self_type" : "type-2549",
    "size" : 280,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34771,7 +34819,7 @@
    "linker_set_key" : "const android::IBinder",
    "name" : "const android::IBinder",
    "referenced_type" : "type-51",
-   "self_type" : "type-1520",
+   "self_type" : "type-1524",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34781,7 +34829,7 @@
    "linker_set_key" : "const android::IBinder::DeathRecipient",
    "name" : "const android::IBinder::DeathRecipient",
    "referenced_type" : "type-174",
-   "self_type" : "type-4315",
+   "self_type" : "type-4321",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -34790,8 +34838,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-1156",
-   "self_type" : "type-1155",
+   "referenced_type" : "type-1159",
+   "self_type" : "type-1158",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34800,8 +34848,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-1581",
-   "self_type" : "type-1580",
+   "referenced_type" : "type-1585",
+   "self_type" : "type-1584",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34810,8 +34858,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-3612",
-   "self_type" : "type-3611",
+   "referenced_type" : "type-3615",
+   "self_type" : "type-3614",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34820,8 +34868,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-3761",
-   "self_type" : "type-3760",
+   "referenced_type" : "type-3767",
+   "self_type" : "type-3766",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34830,8 +34878,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-4061",
-   "self_type" : "type-4060",
+   "referenced_type" : "type-4067",
+   "self_type" : "type-4066",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34840,8 +34888,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-5533",
-   "self_type" : "type-5532",
+   "referenced_type" : "type-5539",
+   "self_type" : "type-5538",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34850,8 +34898,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-5682",
-   "self_type" : "type-5681",
+   "referenced_type" : "type-5691",
+   "self_type" : "type-5690",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34860,8 +34908,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-5982",
-   "self_type" : "type-5981",
+   "referenced_type" : "type-5991",
+   "self_type" : "type-5990",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34870,8 +34918,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-7849",
-   "self_type" : "type-7848",
+   "referenced_type" : "type-7870",
+   "self_type" : "type-7869",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34880,8 +34928,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-7998",
-   "self_type" : "type-7997",
+   "referenced_type" : "type-8022",
+   "self_type" : "type-8021",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34890,8 +34938,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-8427",
-   "self_type" : "type-8426",
+   "referenced_type" : "type-8451",
+   "self_type" : "type-8450",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34900,8 +34948,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-8551",
-   "self_type" : "type-8550",
+   "referenced_type" : "type-8578",
+   "self_type" : "type-8577",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34910,8 +34958,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-8810",
-   "self_type" : "type-8809",
+   "referenced_type" : "type-8837",
+   "self_type" : "type-8836",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34930,8 +34978,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-1605",
-   "self_type" : "type-1604",
+   "referenced_type" : "type-1609",
+   "self_type" : "type-1608",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34940,8 +34988,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-2502",
-   "self_type" : "type-2501",
+   "referenced_type" : "type-2505",
+   "self_type" : "type-2504",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34950,8 +34998,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-3495",
-   "self_type" : "type-3494",
+   "referenced_type" : "type-3498",
+   "self_type" : "type-3497",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34960,8 +35008,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-4078",
-   "self_type" : "type-4077",
+   "referenced_type" : "type-4084",
+   "self_type" : "type-4083",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34970,8 +35018,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-4915",
-   "self_type" : "type-4914",
+   "referenced_type" : "type-4921",
+   "self_type" : "type-4920",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34980,8 +35028,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-5416",
-   "self_type" : "type-5415",
+   "referenced_type" : "type-5422",
+   "self_type" : "type-5421",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -34990,8 +35038,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-5999",
-   "self_type" : "type-5998",
+   "referenced_type" : "type-6008",
+   "self_type" : "type-6007",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35000,8 +35048,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-6941",
-   "self_type" : "type-6940",
+   "referenced_type" : "type-6948",
+   "self_type" : "type-6947",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35010,8 +35058,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-7732",
-   "self_type" : "type-7731",
+   "referenced_type" : "type-7753",
+   "self_type" : "type-7752",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35030,8 +35078,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-8170",
-   "self_type" : "type-8169",
+   "referenced_type" : "type-8194",
+   "self_type" : "type-8193",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35040,8 +35088,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-8326",
-   "self_type" : "type-8325",
+   "referenced_type" : "type-8350",
+   "self_type" : "type-8349",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35050,8 +35098,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-8825",
-   "self_type" : "type-8824",
+   "referenced_type" : "type-8852",
+   "self_type" : "type-8851",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35060,8 +35108,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-9311",
-   "self_type" : "type-9310",
+   "referenced_type" : "type-9338",
+   "self_type" : "type-9337",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35070,8 +35118,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferProducer",
    "name" : "const android::IGraphicBufferProducer",
-   "referenced_type" : "type-3505",
-   "self_type" : "type-3504",
+   "referenced_type" : "type-3508",
+   "self_type" : "type-3507",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35080,8 +35128,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferProducer",
    "name" : "const android::IGraphicBufferProducer",
-   "referenced_type" : "type-4248",
-   "self_type" : "type-4247",
+   "referenced_type" : "type-4254",
+   "self_type" : "type-4253",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35090,8 +35138,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferProducer",
    "name" : "const android::IGraphicBufferProducer",
-   "referenced_type" : "type-5426",
-   "self_type" : "type-5425",
+   "referenced_type" : "type-5432",
+   "self_type" : "type-5431",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35100,8 +35148,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferProducer",
    "name" : "const android::IGraphicBufferProducer",
-   "referenced_type" : "type-6163",
-   "self_type" : "type-6162",
+   "referenced_type" : "type-6172",
+   "self_type" : "type-6171",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35110,8 +35158,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferProducer",
    "name" : "const android::IGraphicBufferProducer",
-   "referenced_type" : "type-7742",
-   "self_type" : "type-7741",
+   "referenced_type" : "type-7763",
+   "self_type" : "type-7762",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35130,8 +35178,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferProducer",
    "name" : "const android::IGraphicBufferProducer",
-   "referenced_type" : "type-8335",
-   "self_type" : "type-8334",
+   "referenced_type" : "type-8359",
+   "self_type" : "type-8358",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35140,8 +35188,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferProducer",
    "name" : "const android::IGraphicBufferProducer",
-   "referenced_type" : "type-9020",
-   "self_type" : "type-9019",
+   "referenced_type" : "type-9047",
+   "self_type" : "type-9046",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35150,8 +35198,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-1161",
-   "self_type" : "type-1160",
+   "referenced_type" : "type-1032",
+   "self_type" : "type-1031",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35160,8 +35208,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-3624",
-   "self_type" : "type-3623",
+   "referenced_type" : "type-1164",
+   "self_type" : "type-1163",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35170,8 +35218,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-3766",
-   "self_type" : "type-3765",
+   "referenced_type" : "type-3627",
+   "self_type" : "type-3626",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35180,8 +35228,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-4254",
-   "self_type" : "type-4253",
+   "referenced_type" : "type-3671",
+   "self_type" : "type-3670",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35190,8 +35238,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-4450",
-   "self_type" : "type-4449",
+   "referenced_type" : "type-3772",
+   "self_type" : "type-3771",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35200,8 +35248,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-4690",
-   "self_type" : "type-4689",
+   "referenced_type" : "type-4260",
+   "self_type" : "type-4259",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35210,8 +35258,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-5545",
-   "self_type" : "type-5544",
+   "referenced_type" : "type-4456",
+   "self_type" : "type-4455",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35220,8 +35268,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-5687",
-   "self_type" : "type-5686",
+   "referenced_type" : "type-4697",
+   "self_type" : "type-4696",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35230,8 +35278,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-6169",
-   "self_type" : "type-6168",
+   "referenced_type" : "type-5551",
+   "self_type" : "type-5550",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35240,8 +35288,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-6347",
-   "self_type" : "type-6346",
+   "referenced_type" : "type-5595",
+   "self_type" : "type-5594",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35250,8 +35298,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-6570",
-   "self_type" : "type-6569",
+   "referenced_type" : "type-5696",
+   "self_type" : "type-5695",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35260,8 +35308,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-7861",
-   "self_type" : "type-7860",
+   "referenced_type" : "type-6178",
+   "self_type" : "type-6177",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35270,8 +35318,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-8003",
-   "self_type" : "type-8002",
+   "referenced_type" : "type-6356",
+   "self_type" : "type-6355",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35280,8 +35328,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-8434",
-   "self_type" : "type-8433",
+   "referenced_type" : "type-6580",
+   "self_type" : "type-6579",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35290,8 +35338,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-8556",
-   "self_type" : "type-8555",
+   "referenced_type" : "type-7882",
+   "self_type" : "type-7881",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35300,8 +35348,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-9026",
-   "self_type" : "type-9025",
+   "referenced_type" : "type-7926",
+   "self_type" : "type-7925",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35310,8 +35358,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-9219",
-   "self_type" : "type-9218",
+   "referenced_type" : "type-8027",
+   "self_type" : "type-8026",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35320,8 +35368,58 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-9489",
-   "self_type" : "type-9488",
+   "referenced_type" : "type-8458",
+   "self_type" : "type-8457",
+   "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-8502",
+   "self_type" : "type-8501",
+   "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-8583",
+   "self_type" : "type-8582",
+   "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-9053",
+   "self_type" : "type-9052",
+   "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-9247",
+   "self_type" : "type-9246",
+   "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-9516",
+   "self_type" : "type-9515",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -35361,7 +35459,7 @@
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect>",
    "name" : "const android::LightFlattenablePod<android::Rect>",
    "referenced_type" : "type-46",
-   "self_type" : "type-4587",
+   "self_type" : "type-4593",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -35380,8 +35478,8 @@
    "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",
+   "referenced_type" : "type-1214",
+   "self_type" : "type-1233",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -35391,7 +35489,7 @@
    "linker_set_key" : "const android::LightRefBase<android::NativeHandle>",
    "name" : "const android::LightRefBase<android::NativeHandle>",
    "referenced_type" : "type-521",
-   "self_type" : "type-2663",
+   "self_type" : "type-2666",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -35540,8 +35638,8 @@
    "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",
+   "referenced_type" : "type-1520",
+   "self_type" : "type-1523",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -35550,8 +35648,8 @@
    "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",
+   "referenced_type" : "type-1662",
+   "self_type" : "type-1666",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -35560,8 +35658,8 @@
    "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",
+   "referenced_type" : "type-4334",
+   "self_type" : "type-4337",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -35570,8 +35668,8 @@
    "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",
+   "referenced_type" : "type-1657",
+   "self_type" : "type-1660",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -35580,8 +35678,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-4333",
-   "self_type" : "type-4336",
+   "referenced_type" : "type-4339",
+   "self_type" : "type-4343",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -35590,8 +35688,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-4338",
-   "self_type" : "type-4341",
+   "referenced_type" : "type-4345",
+   "self_type" : "type-4348",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -35620,8 +35718,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-1216",
-   "self_type" : "type-1215",
+   "referenced_type" : "type-1219",
+   "self_type" : "type-1218",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35630,8 +35728,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-1491",
-   "self_type" : "type-1490",
+   "referenced_type" : "type-1494",
+   "self_type" : "type-1493",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35640,8 +35738,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-1622",
-   "self_type" : "type-1621",
+   "referenced_type" : "type-1625",
+   "self_type" : "type-1624",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35650,8 +35748,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-2684",
-   "self_type" : "type-2683",
+   "referenced_type" : "type-2687",
+   "self_type" : "type-2686",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35660,8 +35758,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-3467",
-   "self_type" : "type-3466",
+   "referenced_type" : "type-3470",
+   "self_type" : "type-3469",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -35670,8 +35768,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-3788",
-   "self_type" : "type-3787",
+   "referenced_type" : "type-3794",
+   "self_type" : "type-3793",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35680,8 +35778,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4012",
-   "self_type" : "type-4011",
+   "referenced_type" : "type-4018",
+   "self_type" : "type-4017",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35690,8 +35788,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4091",
-   "self_type" : "type-4090",
+   "referenced_type" : "type-4097",
+   "self_type" : "type-4096",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35700,8 +35798,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4293",
-   "self_type" : "type-4292",
+   "referenced_type" : "type-4299",
+   "self_type" : "type-4298",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35710,8 +35808,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4573",
-   "self_type" : "type-4572",
+   "referenced_type" : "type-4579",
+   "self_type" : "type-4578",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35720,8 +35818,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4737",
-   "self_type" : "type-4736",
+   "referenced_type" : "type-4744",
+   "self_type" : "type-4743",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35730,8 +35828,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-5020",
-   "self_type" : "type-5019",
+   "referenced_type" : "type-5026",
+   "self_type" : "type-5025",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35740,8 +35838,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-5388",
-   "self_type" : "type-5387",
+   "referenced_type" : "type-5394",
+   "self_type" : "type-5393",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -35750,8 +35848,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-5709",
-   "self_type" : "type-5708",
+   "referenced_type" : "type-5718",
+   "self_type" : "type-5717",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35760,8 +35858,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-5933",
-   "self_type" : "type-5932",
+   "referenced_type" : "type-5942",
+   "self_type" : "type-5941",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35770,8 +35868,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-6012",
-   "self_type" : "type-6011",
+   "referenced_type" : "type-6021",
+   "self_type" : "type-6020",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35780,8 +35878,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-6202",
-   "self_type" : "type-6201",
+   "referenced_type" : "type-6211",
+   "self_type" : "type-6210",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35790,8 +35888,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-6457",
-   "self_type" : "type-6456",
+   "referenced_type" : "type-6466",
+   "self_type" : "type-6465",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35800,8 +35898,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-6606",
-   "self_type" : "type-6605",
+   "referenced_type" : "type-6616",
+   "self_type" : "type-6615",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35810,8 +35908,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-6837",
-   "self_type" : "type-6836",
+   "referenced_type" : "type-6847",
+   "self_type" : "type-6846",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35820,8 +35918,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-6991",
-   "self_type" : "type-6990",
+   "referenced_type" : "type-7000",
+   "self_type" : "type-6999",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35830,8 +35928,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-7222",
-   "self_type" : "type-7221",
+   "referenced_type" : "type-7231",
+   "self_type" : "type-7230",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35840,8 +35938,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-7242",
-   "self_type" : "type-7241",
+   "referenced_type" : "type-7263",
+   "self_type" : "type-7262",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35860,8 +35958,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-7704",
-   "self_type" : "type-7703",
+   "referenced_type" : "type-7725",
+   "self_type" : "type-7724",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -35870,8 +35968,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-8025",
-   "self_type" : "type-8024",
+   "referenced_type" : "type-8049",
+   "self_type" : "type-8048",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35880,8 +35978,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-8207",
-   "self_type" : "type-8206",
+   "referenced_type" : "type-8231",
+   "self_type" : "type-8230",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35890,8 +35988,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-8306",
-   "self_type" : "type-8305",
+   "referenced_type" : "type-8330",
+   "self_type" : "type-8329",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -35900,8 +35998,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-8571",
-   "self_type" : "type-8570",
+   "referenced_type" : "type-8598",
+   "self_type" : "type-8597",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35910,8 +36008,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-8761",
-   "self_type" : "type-8760",
+   "referenced_type" : "type-8789",
+   "self_type" : "type-8788",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35920,8 +36018,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-8840",
-   "self_type" : "type-8839",
+   "referenced_type" : "type-8867",
+   "self_type" : "type-8866",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35930,8 +36028,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-9058",
-   "self_type" : "type-9057",
+   "referenced_type" : "type-9086",
+   "self_type" : "type-9085",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35940,8 +36038,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-9369",
-   "self_type" : "type-9368",
+   "referenced_type" : "type-9397",
+   "self_type" : "type-9396",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35950,8 +36048,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-9516",
-   "self_type" : "type-9515",
+   "referenced_type" : "type-9543",
+   "self_type" : "type-9542",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35960,8 +36058,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-9740",
-   "self_type" : "type-9739",
+   "referenced_type" : "type-9767",
+   "self_type" : "type-9766",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35970,8 +36068,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-9841",
-   "self_type" : "type-9840",
+   "referenced_type" : "type-9864",
+   "self_type" : "type-9863",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -35981,7 +36079,7 @@
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
    "referenced_type" : "type-52",
-   "self_type" : "type-1449",
+   "self_type" : "type-1452",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -35990,8 +36088,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SafeBpInterface<android::IConsumerListener>",
    "name" : "const android::SafeBpInterface<android::IConsumerListener>",
-   "referenced_type" : "type-1537",
-   "self_type" : "type-1551",
+   "referenced_type" : "type-1541",
+   "self_type" : "type-1554",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -36000,8 +36098,8 @@
    "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",
+   "referenced_type" : "type-1720",
+   "self_type" : "type-1890",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -36010,8 +36108,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SafeInterface::ParcelHandler",
    "name" : "const android::SafeInterface::ParcelHandler",
-   "referenced_type" : "type-1235",
-   "self_type" : "type-1256",
+   "referenced_type" : "type-1238",
+   "self_type" : "type-1254",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -36021,7 +36119,7 @@
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
    "name" : "const android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
    "referenced_type" : "type-159",
-   "self_type" : "type-2675",
+   "self_type" : "type-2678",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -36031,7 +36129,7 @@
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "const android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "referenced_type" : "type-146",
-   "self_type" : "type-2671",
+   "self_type" : "type-2674",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -36041,7 +36139,7 @@
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "const android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
    "referenced_type" : "type-139",
-   "self_type" : "type-2667",
+   "self_type" : "type-2670",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -36050,8 +36148,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-1239",
-   "self_type" : "type-1248",
+   "referenced_type" : "type-1242",
+   "self_type" : "type-1251",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -36061,7 +36159,7 @@
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
    "referenced_type" : "type-121",
-   "self_type" : "type-1875",
+   "self_type" : "type-1879",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -36071,7 +36169,7 @@
    "linker_set_key" : "const android::Vector<android::BufferItem>",
    "name" : "const android::Vector<android::BufferItem>",
    "referenced_type" : "type-837",
-   "self_type" : "type-977",
+   "self_type" : "type-979",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -36080,8 +36178,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<android::Rect>",
    "name" : "const android::Vector<android::Rect>",
-   "referenced_type" : "type-2677",
-   "self_type" : "type-2679",
+   "referenced_type" : "type-2680",
+   "self_type" : "type-2682",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -36090,8 +36188,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",
+   "referenced_type" : "type-1228",
+   "self_type" : "type-1231",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -36100,8 +36198,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<int>",
    "name" : "const android::Vector<int>",
-   "referenced_type" : "type-2686",
-   "self_type" : "type-2688",
+   "referenced_type" : "type-2689",
+   "self_type" : "type-2691",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -36110,8 +36208,8 @@
    "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",
+   "referenced_type" : "type-1084",
+   "self_type" : "type-1086",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -36121,7 +36219,7 @@
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
    "referenced_type" : "type-141",
-   "self_type" : "type-2664",
+   "self_type" : "type-2667",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -36130,8 +36228,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::base::ErrnoRestorer",
    "name" : "const android::base::ErrnoRestorer",
-   "referenced_type" : "type-4656",
-   "self_type" : "type-4655",
+   "referenced_type" : "type-4663",
+   "self_type" : "type-4662",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -36140,8 +36238,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
-   "referenced_type" : "type-2553",
-   "self_type" : "type-2580",
+   "referenced_type" : "type-2556",
+   "self_type" : "type-2583",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -36160,8 +36258,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::BpHwRefBase",
    "name" : "const android::hardware::BpHwRefBase",
-   "referenced_type" : "type-1371",
-   "self_type" : "type-1374",
+   "referenced_type" : "type-1374",
+   "self_type" : "type-1377",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -36170,8 +36268,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1377",
-   "self_type" : "type-1385",
+   "referenced_type" : "type-1380",
+   "self_type" : "type-1388",
    "size" : 68,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -36180,8 +36278,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-6770",
-   "self_type" : "type-6923",
+   "referenced_type" : "type-6779",
+   "self_type" : "type-6932",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -36190,26 +36288,6 @@
    "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,
@@ -36218,8 +36296,8 @@
   {
    "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> >",
+   "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-4494",
    "self_type" : "type-4498",
    "size" : 28,
@@ -36228,10 +36306,30 @@
   {
    "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-4371",
+   "self_type" : "type-4375",
+   "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-4500",
+   "self_type" : "type-4504",
+   "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-4353",
-   "self_type" : "type-4357",
+   "referenced_type" : "type-4359",
+   "self_type" : "type-4363",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -36241,7 +36339,7 @@
    "linker_set_key" : "const android::hardware::Return<int>",
    "name" : "const android::hardware::Return<int>",
    "referenced_type" : "type-413",
-   "self_type" : "type-4698",
+   "self_type" : "type-4704",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -36250,8 +36348,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",
+   "referenced_type" : "type-6783",
+   "self_type" : "type-6935",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -36321,7 +36419,7 @@
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned char>",
    "name" : "const android::hardware::details::hidl_pointer<unsigned char>",
    "referenced_type" : "type-390",
-   "self_type" : "type-4348",
+   "self_type" : "type-4354",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -36351,7 +36449,7 @@
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming",
    "referenced_type" : "type-588",
-   "self_type" : "type-4582",
+   "self_type" : "type-4588",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -36390,8 +36488,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-2456",
-   "self_type" : "type-2460",
+   "referenced_type" : "type-2459",
+   "self_type" : "type-2463",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -36621,7 +36719,7 @@
    "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",
+   "self_type" : "type-4732",
    "size" : 64,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -36711,7 +36809,7 @@
    "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",
+   "self_type" : "type-4386",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -36771,7 +36869,7 @@
    "linker_set_key" : "const android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "const android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "referenced_type" : "type-160",
-   "self_type" : "type-2619",
+   "self_type" : "type-2622",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -36781,7 +36879,7 @@
    "linker_set_key" : "const android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "name" : "const android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "referenced_type" : "type-147",
-   "self_type" : "type-2617",
+   "self_type" : "type-2620",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -36791,7 +36889,7 @@
    "linker_set_key" : "const android::key_value_pair_t<unsigned int, unsigned int>",
    "name" : "const android::key_value_pair_t<unsigned int, unsigned int>",
    "referenced_type" : "type-143",
-   "self_type" : "type-2613",
+   "self_type" : "type-2616",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -36799,40 +36897,40 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer>",
    "name" : "const android::sp<ANativeWindowBuffer>",
-   "referenced_type" : "type-2410",
-   "self_type" : "type-2409",
+   "referenced_type" : "type-2413",
+   "self_type" : "type-2412",
    "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",
+   "referenced_type" : "type-4852",
+   "self_type" : "type-4851",
    "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",
+   "referenced_type" : "type-6719",
+   "self_type" : "type-6718",
    "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",
+   "referenced_type" : "type-8179",
+   "self_type" : "type-8178",
    "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",
+   "referenced_type" : "type-9017",
+   "self_type" : "type-9016",
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
   {
@@ -36841,7 +36939,7 @@
    "linker_set_key" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
    "name" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
    "referenced_type" : "type-581",
-   "self_type" : "type-1304",
+   "self_type" : "type-1301",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -36861,7 +36959,7 @@
    "linker_set_key" : "const android::sp<android::AMessage>",
    "name" : "const android::sp<android::AMessage>",
    "referenced_type" : "type-259",
-   "self_type" : "type-2175",
+   "self_type" : "type-2174",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -36870,8 +36968,8 @@
    "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",
+   "referenced_type" : "type-4234",
+   "self_type" : "type-4233",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -36880,8 +36978,8 @@
    "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",
+   "referenced_type" : "type-4460",
+   "self_type" : "type-4522",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -36901,7 +36999,7 @@
    "linker_set_key" : "const android::sp<android::ComponentWrapper>",
    "name" : "const android::sp<android::ComponentWrapper>",
    "referenced_type" : "type-567",
-   "self_type" : "type-2491",
+   "self_type" : "type-2494",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -36920,8 +37018,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::Fence>",
    "name" : "const android::sp<android::Fence>",
-   "referenced_type" : "type-1864",
-   "self_type" : "type-1863",
+   "referenced_type" : "type-1868",
+   "self_type" : "type-1867",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -36931,7 +37029,7 @@
    "linker_set_key" : "const android::sp<android::FrameDropper>",
    "name" : "const android::sp<android::FrameDropper>",
    "referenced_type" : "type-578",
-   "self_type" : "type-2506",
+   "self_type" : "type-2509",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -36941,7 +37039,7 @@
    "linker_set_key" : "const android::sp<android::GraphicBuffer>",
    "name" : "const android::sp<android::GraphicBuffer>",
    "referenced_type" : "type-733",
-   "self_type" : "type-1196",
+   "self_type" : "type-1200",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -36960,8 +37058,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::GraphicBufferSource>",
    "name" : "const android::sp<android::GraphicBufferSource>",
-   "referenced_type" : "type-2542",
-   "self_type" : "type-2544",
+   "referenced_type" : "type-2545",
+   "self_type" : "type-2547",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -36970,8 +37068,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-4259",
-   "self_type" : "type-4264",
+   "referenced_type" : "type-4265",
+   "self_type" : "type-4270",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -36980,8 +37078,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-4268",
-   "self_type" : "type-4273",
+   "referenced_type" : "type-4274",
+   "self_type" : "type-4279",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -36990,8 +37088,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-4827",
-   "self_type" : "type-4826",
+   "referenced_type" : "type-4833",
+   "self_type" : "type-4832",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -37000,8 +37098,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-7029",
-   "self_type" : "type-7028",
+   "referenced_type" : "type-7038",
+   "self_type" : "type-7037",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -37011,7 +37109,7 @@
    "linker_set_key" : "const android::sp<android::IBinder::DeathRecipient>",
    "name" : "const android::sp<android::IBinder::DeathRecipient>",
    "referenced_type" : "type-843",
-   "self_type" : "type-4300",
+   "self_type" : "type-4306",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -37021,7 +37119,7 @@
    "linker_set_key" : "const android::sp<android::IBinder>",
    "name" : "const android::sp<android::IBinder>",
    "referenced_type" : "type-795",
-   "self_type" : "type-1036",
+   "self_type" : "type-1040",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -37051,7 +37149,7 @@
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer>",
    "name" : "const android::sp<android::IGraphicBufferProducer>",
    "referenced_type" : "type-570",
-   "self_type" : "type-2485",
+   "self_type" : "type-2488",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -37061,7 +37159,7 @@
    "linker_set_key" : "const android::sp<android::IInterface>",
    "name" : "const android::sp<android::IInterface>",
    "referenced_type" : "type-646",
-   "self_type" : "type-1487",
+   "self_type" : "type-1491",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -37080,8 +37178,8 @@
    "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",
+   "referenced_type" : "type-1044",
+   "self_type" : "type-1049",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -37100,8 +37198,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",
+   "referenced_type" : "type-1262",
+   "self_type" : "type-1261",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -37110,8 +37208,8 @@
    "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",
+   "referenced_type" : "type-1370",
+   "self_type" : "type-1392",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -37120,8 +37218,8 @@
    "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",
+   "referenced_type" : "type-1397",
+   "self_type" : "type-1396",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -37130,8 +37228,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-2463",
-   "self_type" : "type-2468",
+   "referenced_type" : "type-2466",
+   "self_type" : "type-2471",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -37140,8 +37238,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener>",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener>",
-   "referenced_type" : "type-2454",
-   "self_type" : "type-2458",
+   "referenced_type" : "type-2457",
+   "self_type" : "type-2461",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -37150,8 +37248,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-4240",
-   "self_type" : "type-4239",
+   "referenced_type" : "type-4246",
+   "self_type" : "type-4245",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -37160,8 +37258,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-4466",
-   "self_type" : "type-4469",
+   "referenced_type" : "type-4473",
+   "self_type" : "type-4476",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -37170,8 +37268,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-2476",
-   "self_type" : "type-2482",
+   "referenced_type" : "type-2479",
+   "self_type" : "type-2485",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -37180,8 +37278,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener>",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener>",
-   "referenced_type" : "type-2470",
-   "self_type" : "type-2474",
+   "referenced_type" : "type-2473",
+   "self_type" : "type-2477",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -37190,8 +37288,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-4234",
-   "self_type" : "type-4233",
+   "referenced_type" : "type-4240",
+   "self_type" : "type-4239",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -37200,8 +37298,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-4459",
-   "self_type" : "type-4462",
+   "referenced_type" : "type-4466",
+   "self_type" : "type-4469",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -37220,8 +37318,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-2444",
-   "self_type" : "type-2446",
+   "referenced_type" : "type-2447",
+   "self_type" : "type-2449",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -37230,8 +37328,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification>",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification>",
-   "referenced_type" : "type-2448",
-   "self_type" : "type-2451",
+   "referenced_type" : "type-2451",
+   "self_type" : "type-2454",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -37271,7 +37369,7 @@
    "linker_set_key" : "const android::wp<android::IBinder::DeathRecipient>",
    "name" : "const android::wp<android::IBinder::DeathRecipient>",
    "referenced_type" : "type-172",
-   "self_type" : "type-4289",
+   "self_type" : "type-4296",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -37281,7 +37379,7 @@
    "linker_set_key" : "const android::wp<android::IBinder>",
    "name" : "const android::wp<android::IBinder>",
    "referenced_type" : "type-130",
-   "self_type" : "type-4280",
+   "self_type" : "type-4286",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -37291,7 +37389,7 @@
    "linker_set_key" : "const android_cta861_3_metadata",
    "name" : "const android_cta861_3_metadata",
    "referenced_type" : "type-305",
-   "self_type" : "type-1473",
+   "self_type" : "type-1477",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -37311,7 +37409,7 @@
    "linker_set_key" : "const android_smpte2086_metadata",
    "name" : "const android_smpte2086_metadata",
    "referenced_type" : "type-304",
-   "self_type" : "type-1471",
+   "self_type" : "type-1474",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -37341,7 +37439,7 @@
    "linker_set_key" : "const char *const",
    "name" : "const char *const",
    "referenced_type" : "type-122",
-   "self_type" : "type-1103",
+   "self_type" : "type-1106",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -37350,8 +37448,8 @@
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-1242",
-   "self_type" : "type-1241",
+   "referenced_type" : "type-1245",
+   "self_type" : "type-1244",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -37361,7 +37459,7 @@
    "linker_set_key" : "const double",
    "name" : "const double",
    "referenced_type" : "type-269",
-   "self_type" : "type-1077",
+   "self_type" : "type-1080",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -37397,64 +37495,64 @@
    "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-1113",
+   "self_type" : "type-1112",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1282",
-   "self_type" : "type-1281",
+   "referenced_type" : "type-1285",
+   "self_type" : "type-1284",
    "source_file" : "/system/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",
+   "referenced_type" : "type-3310",
+   "self_type" : "type-3309",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3539",
-   "self_type" : "type-3538",
+   "referenced_type" : "type-3542",
+   "self_type" : "type-3541",
    "source_file" : "/system/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",
+   "referenced_type" : "type-3651",
+   "self_type" : "type-3650",
    "source_file" : "/system/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",
+   "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-3833",
-   "self_type" : "type-3832",
+   "referenced_type" : "type-3839",
+   "self_type" : "type-3838",
    "source_file" : "/system/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",
+   "referenced_type" : "type-4379",
+   "self_type" : "type-4378",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -37469,272 +37567,272 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-4502",
-   "self_type" : "type-4501",
+   "referenced_type" : "type-4508",
+   "self_type" : "type-4507",
    "source_file" : "/system/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",
+   "referenced_type" : "type-4545",
+   "self_type" : "type-4544",
    "source_file" : "/system/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",
+   "referenced_type" : "type-4570",
+   "self_type" : "type-4569",
    "source_file" : "/system/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",
+   "referenced_type" : "type-4724",
+   "self_type" : "type-4723",
    "source_file" : "/system/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",
+   "referenced_type" : "type-4854",
+   "self_type" : "type-4853",
    "source_file" : "/system/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",
+   "referenced_type" : "type-5234",
+   "self_type" : "type-5233",
    "source_file" : "/system/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",
+   "referenced_type" : "type-5466",
+   "self_type" : "type-5465",
    "source_file" : "/system/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",
+   "referenced_type" : "type-5575",
+   "self_type" : "type-5574",
    "source_file" : "/system/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",
+   "referenced_type" : "type-5641",
+   "self_type" : "type-5640",
    "source_file" : "/system/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",
+   "referenced_type" : "type-5763",
+   "self_type" : "type-5762",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6279",
+   "self_type" : "type-6278",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6395",
+   "self_type" : "type-6394",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6432",
+   "self_type" : "type-6431",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6457",
+   "self_type" : "type-6456",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6600",
+   "self_type" : "type-6599",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6721",
+   "self_type" : "type-6720",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6748",
+   "self_type" : "type-6747",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6793",
+   "self_type" : "type-6792",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6882",
+   "self_type" : "type-6881",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6945",
+   "self_type" : "type-6944",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7060",
+   "self_type" : "type-7059",
    "source_file" : "/system/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",
+   "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-7285",
-   "self_type" : "type-7284",
+   "referenced_type" : "type-7305",
+   "self_type" : "type-7304",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7358",
+   "self_type" : "type-7357",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7565",
+   "self_type" : "type-7564",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7797",
+   "self_type" : "type-7796",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7906",
+   "self_type" : "type-7905",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7972",
+   "self_type" : "type-7971",
    "source_file" : "/system/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",
+   "referenced_type" : "type-8094",
+   "self_type" : "type-8093",
    "source_file" : "/system/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",
+   "referenced_type" : "type-8250",
+   "self_type" : "type-8249",
    "source_file" : "/system/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",
+   "referenced_type" : "type-8386",
+   "self_type" : "type-8385",
    "source_file" : "/system/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",
+   "referenced_type" : "type-8482",
+   "self_type" : "type-8481",
    "source_file" : "/system/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",
+   "referenced_type" : "type-8529",
+   "self_type" : "type-8528",
    "source_file" : "/system/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",
+   "referenced_type" : "type-8621",
+   "self_type" : "type-8620",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -37749,80 +37847,80 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-9132",
-   "self_type" : "type-9131",
+   "referenced_type" : "type-9160",
+   "self_type" : "type-9159",
    "source_file" : "/system/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",
+   "referenced_type" : "type-9294",
+   "self_type" : "type-9293",
    "source_file" : "/system/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",
+   "referenced_type" : "type-9347",
+   "self_type" : "type-9346",
    "source_file" : "/system/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",
+   "referenced_type" : "type-9383",
+   "self_type" : "type-9382",
    "source_file" : "/system/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",
+   "referenced_type" : "type-9532",
+   "self_type" : "type-9531",
    "source_file" : "/system/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",
+   "referenced_type" : "type-9632",
+   "self_type" : "type-9631",
    "source_file" : "/system/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",
+   "referenced_type" : "type-9670",
+   "self_type" : "type-9669",
    "source_file" : "/system/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",
+   "referenced_type" : "type-9721",
+   "self_type" : "type-9720",
    "source_file" : "/system/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",
+   "referenced_type" : "type-9801",
+   "self_type" : "type-9800",
    "source_file" : "/system/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",
+   "referenced_type" : "type-9866",
+   "self_type" : "type-9865",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -37830,8 +37928,8 @@
    "is_const" : true,
    "linker_set_key" : "const log_msg",
    "name" : "const log_msg",
-   "referenced_type" : "type-2177",
-   "self_type" : "type-2313",
+   "referenced_type" : "type-2180",
+   "self_type" : "type-2316",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -37880,8 +37978,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-1314",
-   "self_type" : "type-1313",
+   "referenced_type" : "type-1318",
+   "self_type" : "type-1317",
    "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"
   },
@@ -37890,8 +37988,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-3392",
-   "self_type" : "type-3391",
+   "referenced_type" : "type-3395",
+   "self_type" : "type-3394",
    "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"
   },
@@ -37900,8 +37998,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-3562",
-   "self_type" : "type-3561",
+   "referenced_type" : "type-3565",
+   "self_type" : "type-3564",
    "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"
   },
@@ -37910,8 +38008,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-3864",
-   "self_type" : "type-3863",
+   "referenced_type" : "type-3871",
+   "self_type" : "type-3870",
    "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"
   },
@@ -37920,8 +38018,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-4413",
-   "self_type" : "type-4412",
+   "referenced_type" : "type-4421",
+   "self_type" : "type-4420",
    "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"
   },
@@ -37930,8 +38028,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-4624",
-   "self_type" : "type-4623",
+   "referenced_type" : "type-4630",
+   "self_type" : "type-4629",
    "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"
   },
@@ -37940,8 +38038,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-4794",
-   "self_type" : "type-4793",
+   "referenced_type" : "type-4800",
+   "self_type" : "type-4799",
    "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"
   },
@@ -37950,8 +38048,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-5313",
-   "self_type" : "type-5312",
+   "referenced_type" : "type-5319",
+   "self_type" : "type-5318",
    "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"
   },
@@ -37960,8 +38058,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-5483",
-   "self_type" : "type-5482",
+   "referenced_type" : "type-5489",
+   "self_type" : "type-5488",
    "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"
   },
@@ -37970,8 +38068,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-5785",
-   "self_type" : "type-5784",
+   "referenced_type" : "type-5795",
+   "self_type" : "type-5794",
    "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"
   },
@@ -37990,8 +38088,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-6310",
-   "self_type" : "type-6309",
+   "referenced_type" : "type-6321",
+   "self_type" : "type-6320",
    "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"
   },
@@ -38000,8 +38098,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-6508",
-   "self_type" : "type-6507",
+   "referenced_type" : "type-6517",
+   "self_type" : "type-6516",
    "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"
   },
@@ -38010,8 +38108,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-6660",
-   "self_type" : "type-6659",
+   "referenced_type" : "type-6669",
+   "self_type" : "type-6668",
    "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"
   },
@@ -38020,8 +38118,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-6864",
-   "self_type" : "type-6863",
+   "referenced_type" : "type-6875",
+   "self_type" : "type-6874",
    "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"
   },
@@ -38030,8 +38128,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-7017",
-   "self_type" : "type-7016",
+   "referenced_type" : "type-7027",
+   "self_type" : "type-7026",
    "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"
   },
@@ -38040,8 +38138,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-7131",
-   "self_type" : "type-7130",
+   "referenced_type" : "type-7141",
+   "self_type" : "type-7140",
    "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"
   },
@@ -38050,8 +38148,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-7264",
-   "self_type" : "type-7263",
+   "referenced_type" : "type-7284",
+   "self_type" : "type-7283",
    "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"
   },
@@ -38060,8 +38158,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-7362",
-   "self_type" : "type-7361",
+   "referenced_type" : "type-7384",
+   "self_type" : "type-7383",
    "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"
   },
@@ -38070,8 +38168,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-7629",
-   "self_type" : "type-7628",
+   "referenced_type" : "type-7650",
+   "self_type" : "type-7649",
    "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"
   },
@@ -38080,8 +38178,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-7799",
-   "self_type" : "type-7798",
+   "referenced_type" : "type-7820",
+   "self_type" : "type-7819",
    "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"
   },
@@ -38090,8 +38188,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-8101",
-   "self_type" : "type-8100",
+   "referenced_type" : "type-8126",
+   "self_type" : "type-8125",
    "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"
   },
@@ -38100,8 +38198,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-8253",
-   "self_type" : "type-8252",
+   "referenced_type" : "type-8277",
+   "self_type" : "type-8276",
    "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"
   },
@@ -38110,8 +38208,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-8385",
-   "self_type" : "type-8384",
+   "referenced_type" : "type-8409",
+   "self_type" : "type-8408",
    "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"
   },
@@ -38120,8 +38218,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-8621",
-   "self_type" : "type-8620",
+   "referenced_type" : "type-8649",
+   "self_type" : "type-8648",
    "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"
   },
@@ -38140,8 +38238,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-9178",
-   "self_type" : "type-9177",
+   "referenced_type" : "type-9208",
+   "self_type" : "type-9207",
    "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"
   },
@@ -38150,8 +38248,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-9427",
-   "self_type" : "type-9426",
+   "referenced_type" : "type-9456",
+   "self_type" : "type-9455",
    "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"
   },
@@ -38160,8 +38258,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-9562",
-   "self_type" : "type-9561",
+   "referenced_type" : "type-9589",
+   "self_type" : "type-9588",
    "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"
   },
@@ -38170,8 +38268,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-9765",
-   "self_type" : "type-9764",
+   "referenced_type" : "type-9792",
+   "self_type" : "type-9791",
    "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"
   },
@@ -38180,8 +38278,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-1312",
-   "self_type" : "type-1311",
+   "referenced_type" : "type-1315",
+   "self_type" : "type-1314",
    "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"
   },
@@ -38190,8 +38288,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-3390",
-   "self_type" : "type-3389",
+   "referenced_type" : "type-3393",
+   "self_type" : "type-3392",
    "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"
   },
@@ -38200,8 +38298,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-3560",
-   "self_type" : "type-3559",
+   "referenced_type" : "type-3563",
+   "self_type" : "type-3562",
    "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"
   },
@@ -38210,8 +38308,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-3862",
-   "self_type" : "type-3861",
+   "referenced_type" : "type-3868",
+   "self_type" : "type-3867",
    "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"
   },
@@ -38220,8 +38318,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-4411",
-   "self_type" : "type-4410",
+   "referenced_type" : "type-4419",
+   "self_type" : "type-4418",
    "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"
   },
@@ -38230,8 +38328,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-4622",
-   "self_type" : "type-4621",
+   "referenced_type" : "type-4628",
+   "self_type" : "type-4627",
    "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"
   },
@@ -38240,8 +38338,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-4792",
-   "self_type" : "type-4791",
+   "referenced_type" : "type-4798",
+   "self_type" : "type-4797",
    "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"
   },
@@ -38250,8 +38348,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-5311",
-   "self_type" : "type-5310",
+   "referenced_type" : "type-5317",
+   "self_type" : "type-5316",
    "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"
   },
@@ -38260,8 +38358,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-5481",
-   "self_type" : "type-5480",
+   "referenced_type" : "type-5487",
+   "self_type" : "type-5486",
    "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"
   },
@@ -38270,8 +38368,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-5783",
-   "self_type" : "type-5782",
+   "referenced_type" : "type-5792",
+   "self_type" : "type-5791",
    "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"
   },
@@ -38290,8 +38388,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-6308",
-   "self_type" : "type-6307",
+   "referenced_type" : "type-6319",
+   "self_type" : "type-6318",
    "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"
   },
@@ -38300,8 +38398,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-6506",
-   "self_type" : "type-6505",
+   "referenced_type" : "type-6515",
+   "self_type" : "type-6514",
    "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"
   },
@@ -38310,8 +38408,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-6658",
-   "self_type" : "type-6657",
+   "referenced_type" : "type-6667",
+   "self_type" : "type-6666",
    "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"
   },
@@ -38320,8 +38418,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-6862",
-   "self_type" : "type-6861",
+   "referenced_type" : "type-6873",
+   "self_type" : "type-6872",
    "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"
   },
@@ -38330,8 +38428,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-7014",
-   "self_type" : "type-7013",
+   "referenced_type" : "type-7023",
+   "self_type" : "type-7022",
    "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"
   },
@@ -38340,8 +38438,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-7129",
-   "self_type" : "type-7128",
+   "referenced_type" : "type-7139",
+   "self_type" : "type-7138",
    "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"
   },
@@ -38350,8 +38448,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-7262",
-   "self_type" : "type-7261",
+   "referenced_type" : "type-7282",
+   "self_type" : "type-7281",
    "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"
   },
@@ -38360,8 +38458,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-7360",
-   "self_type" : "type-7359",
+   "referenced_type" : "type-7382",
+   "self_type" : "type-7381",
    "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"
   },
@@ -38370,8 +38468,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-7627",
-   "self_type" : "type-7626",
+   "referenced_type" : "type-7648",
+   "self_type" : "type-7647",
    "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"
   },
@@ -38380,8 +38478,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-7797",
-   "self_type" : "type-7796",
+   "referenced_type" : "type-7818",
+   "self_type" : "type-7817",
    "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"
   },
@@ -38390,8 +38488,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-8099",
-   "self_type" : "type-8098",
+   "referenced_type" : "type-8123",
+   "self_type" : "type-8122",
    "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"
   },
@@ -38400,8 +38498,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-8251",
-   "self_type" : "type-8250",
+   "referenced_type" : "type-8275",
+   "self_type" : "type-8274",
    "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"
   },
@@ -38410,8 +38508,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-8383",
-   "self_type" : "type-8382",
+   "referenced_type" : "type-8407",
+   "self_type" : "type-8406",
    "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"
   },
@@ -38420,8 +38518,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-8619",
-   "self_type" : "type-8618",
+   "referenced_type" : "type-8646",
+   "self_type" : "type-8645",
    "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"
   },
@@ -38440,8 +38538,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-9176",
-   "self_type" : "type-9175",
+   "referenced_type" : "type-9206",
+   "self_type" : "type-9205",
    "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"
   },
@@ -38450,8 +38548,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-9424",
-   "self_type" : "type-9423",
+   "referenced_type" : "type-9454",
+   "self_type" : "type-9453",
    "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"
   },
@@ -38460,8 +38558,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-9560",
-   "self_type" : "type-9559",
+   "referenced_type" : "type-9587",
+   "self_type" : "type-9586",
    "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"
   },
@@ -38470,8 +38568,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-9763",
-   "self_type" : "type-9762",
+   "referenced_type" : "type-9790",
+   "self_type" : "type-9789",
    "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"
   },
@@ -38480,8 +38578,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-1321",
-   "self_type" : "type-1320",
+   "referenced_type" : "type-1324",
+   "self_type" : "type-1323",
    "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"
   },
@@ -38490,8 +38588,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-3404",
-   "self_type" : "type-3403",
+   "referenced_type" : "type-3407",
+   "self_type" : "type-3406",
    "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"
   },
@@ -38500,8 +38598,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-3568",
-   "self_type" : "type-3567",
+   "referenced_type" : "type-3571",
+   "self_type" : "type-3570",
    "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"
   },
@@ -38510,8 +38608,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-3872",
-   "self_type" : "type-3871",
+   "referenced_type" : "type-3878",
+   "self_type" : "type-3877",
    "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"
   },
@@ -38520,8 +38618,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-4421",
-   "self_type" : "type-4420",
+   "referenced_type" : "type-4427",
+   "self_type" : "type-4426",
    "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"
   },
@@ -38530,8 +38628,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-4630",
-   "self_type" : "type-4629",
+   "referenced_type" : "type-4636",
+   "self_type" : "type-4635",
    "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"
   },
@@ -38540,8 +38638,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-4800",
-   "self_type" : "type-4799",
+   "referenced_type" : "type-4806",
+   "self_type" : "type-4805",
    "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"
   },
@@ -38550,8 +38648,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-5325",
-   "self_type" : "type-5324",
+   "referenced_type" : "type-5331",
+   "self_type" : "type-5330",
    "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"
   },
@@ -38560,8 +38658,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-5489",
-   "self_type" : "type-5488",
+   "referenced_type" : "type-5495",
+   "self_type" : "type-5494",
    "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"
   },
@@ -38570,8 +38668,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-5793",
-   "self_type" : "type-5792",
+   "referenced_type" : "type-5802",
+   "self_type" : "type-5801",
    "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"
   },
@@ -38590,8 +38688,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-6318",
-   "self_type" : "type-6317",
+   "referenced_type" : "type-6327",
+   "self_type" : "type-6326",
    "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"
   },
@@ -38600,8 +38698,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-6514",
-   "self_type" : "type-6513",
+   "referenced_type" : "type-6523",
+   "self_type" : "type-6522",
    "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"
   },
@@ -38610,8 +38708,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-6666",
-   "self_type" : "type-6665",
+   "referenced_type" : "type-6675",
+   "self_type" : "type-6674",
    "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"
   },
@@ -38620,8 +38718,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-6793",
-   "self_type" : "type-6792",
+   "referenced_type" : "type-6803",
+   "self_type" : "type-6802",
    "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"
   },
@@ -38630,8 +38728,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-7023",
-   "self_type" : "type-7022",
+   "referenced_type" : "type-7033",
+   "self_type" : "type-7032",
    "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"
   },
@@ -38640,8 +38738,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-7138",
-   "self_type" : "type-7137",
+   "referenced_type" : "type-7147",
+   "self_type" : "type-7146",
    "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"
   },
@@ -38650,8 +38748,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-7270",
-   "self_type" : "type-7269",
+   "referenced_type" : "type-7290",
+   "self_type" : "type-7289",
    "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"
   },
@@ -38660,8 +38758,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-7369",
-   "self_type" : "type-7368",
+   "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"
   },
@@ -38670,8 +38768,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-7641",
-   "self_type" : "type-7640",
+   "referenced_type" : "type-7662",
+   "self_type" : "type-7661",
    "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"
   },
@@ -38680,8 +38778,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-7805",
-   "self_type" : "type-7804",
+   "referenced_type" : "type-7826",
+   "self_type" : "type-7825",
    "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"
   },
@@ -38690,8 +38788,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-8109",
-   "self_type" : "type-8108",
+   "referenced_type" : "type-8133",
+   "self_type" : "type-8132",
    "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"
   },
@@ -38700,8 +38798,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-8259",
-   "self_type" : "type-8258",
+   "referenced_type" : "type-8284",
+   "self_type" : "type-8283",
    "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"
   },
@@ -38710,8 +38808,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-8391",
-   "self_type" : "type-8390",
+   "referenced_type" : "type-8415",
+   "self_type" : "type-8414",
    "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"
   },
@@ -38720,8 +38818,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-8628",
-   "self_type" : "type-8627",
+   "referenced_type" : "type-8655",
+   "self_type" : "type-8654",
    "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"
   },
@@ -38740,8 +38838,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-9187",
-   "self_type" : "type-9186",
+   "referenced_type" : "type-9215",
+   "self_type" : "type-9214",
    "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"
   },
@@ -38750,8 +38848,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-9435",
-   "self_type" : "type-9434",
+   "referenced_type" : "type-9462",
+   "self_type" : "type-9461",
    "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"
   },
@@ -38760,8 +38858,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-9568",
-   "self_type" : "type-9567",
+   "referenced_type" : "type-9595",
+   "self_type" : "type-9594",
    "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"
   },
@@ -38770,8 +38868,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-9701",
-   "self_type" : "type-9700",
+   "referenced_type" : "type-9728",
+   "self_type" : "type-9727",
    "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"
   },
@@ -38780,8 +38878,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-1319",
-   "self_type" : "type-1318",
+   "referenced_type" : "type-1322",
+   "self_type" : "type-1321",
    "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"
   },
@@ -38790,8 +38888,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-3402",
-   "self_type" : "type-3401",
+   "referenced_type" : "type-3405",
+   "self_type" : "type-3404",
    "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"
   },
@@ -38800,8 +38898,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-3566",
-   "self_type" : "type-3565",
+   "referenced_type" : "type-3569",
+   "self_type" : "type-3568",
    "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"
   },
@@ -38810,8 +38908,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-3870",
-   "self_type" : "type-3869",
+   "referenced_type" : "type-3876",
+   "self_type" : "type-3875",
    "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"
   },
@@ -38820,8 +38918,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-4419",
-   "self_type" : "type-4418",
+   "referenced_type" : "type-4425",
+   "self_type" : "type-4424",
    "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"
   },
@@ -38830,8 +38928,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-4628",
-   "self_type" : "type-4627",
+   "referenced_type" : "type-4634",
+   "self_type" : "type-4633",
    "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"
   },
@@ -38840,8 +38938,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-4798",
-   "self_type" : "type-4797",
+   "referenced_type" : "type-4804",
+   "self_type" : "type-4803",
    "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"
   },
@@ -38850,8 +38948,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-5323",
-   "self_type" : "type-5322",
+   "referenced_type" : "type-5329",
+   "self_type" : "type-5328",
    "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"
   },
@@ -38860,8 +38958,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-5487",
-   "self_type" : "type-5486",
+   "referenced_type" : "type-5493",
+   "self_type" : "type-5492",
    "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"
   },
@@ -38870,8 +38968,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-5791",
-   "self_type" : "type-5790",
+   "referenced_type" : "type-5800",
+   "self_type" : "type-5799",
    "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"
   },
@@ -38890,8 +38988,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-6316",
-   "self_type" : "type-6315",
+   "referenced_type" : "type-6325",
+   "self_type" : "type-6324",
    "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"
   },
@@ -38900,8 +38998,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-6512",
-   "self_type" : "type-6511",
+   "referenced_type" : "type-6521",
+   "self_type" : "type-6520",
    "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"
   },
@@ -38910,8 +39008,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-6664",
-   "self_type" : "type-6663",
+   "referenced_type" : "type-6673",
+   "self_type" : "type-6672",
    "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"
   },
@@ -38920,8 +39018,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-6791",
-   "self_type" : "type-6790",
+   "referenced_type" : "type-6801",
+   "self_type" : "type-6800",
    "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"
   },
@@ -38930,8 +39028,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-7021",
-   "self_type" : "type-7020",
+   "referenced_type" : "type-7031",
+   "self_type" : "type-7030",
    "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"
   },
@@ -38940,8 +39038,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-7136",
-   "self_type" : "type-7135",
+   "referenced_type" : "type-7145",
+   "self_type" : "type-7144",
    "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"
   },
@@ -38950,8 +39048,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-7268",
-   "self_type" : "type-7267",
+   "referenced_type" : "type-7288",
+   "self_type" : "type-7287",
    "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"
   },
@@ -38960,8 +39058,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-7367",
-   "self_type" : "type-7366",
+   "referenced_type" : "type-7389",
+   "self_type" : "type-7388",
    "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"
   },
@@ -38970,8 +39068,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-7639",
-   "self_type" : "type-7638",
+   "referenced_type" : "type-7660",
+   "self_type" : "type-7659",
    "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"
   },
@@ -38980,8 +39078,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-7803",
-   "self_type" : "type-7802",
+   "referenced_type" : "type-7824",
+   "self_type" : "type-7823",
    "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"
   },
@@ -38990,8 +39088,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-8107",
-   "self_type" : "type-8106",
+   "referenced_type" : "type-8131",
+   "self_type" : "type-8130",
    "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"
   },
@@ -39000,8 +39098,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-8257",
-   "self_type" : "type-8256",
+   "referenced_type" : "type-8282",
+   "self_type" : "type-8281",
    "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"
   },
@@ -39010,8 +39108,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-8389",
-   "self_type" : "type-8388",
+   "referenced_type" : "type-8413",
+   "self_type" : "type-8412",
    "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"
   },
@@ -39020,8 +39118,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-8626",
-   "self_type" : "type-8625",
+   "referenced_type" : "type-8653",
+   "self_type" : "type-8652",
    "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"
   },
@@ -39040,8 +39138,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-9185",
-   "self_type" : "type-9184",
+   "referenced_type" : "type-9213",
+   "self_type" : "type-9212",
    "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"
   },
@@ -39050,8 +39148,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-9433",
-   "self_type" : "type-9432",
+   "referenced_type" : "type-9460",
+   "self_type" : "type-9459",
    "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"
   },
@@ -39060,8 +39158,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-9566",
-   "self_type" : "type-9565",
+   "referenced_type" : "type-9593",
+   "self_type" : "type-9592",
    "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"
   },
@@ -39070,8 +39168,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-9699",
-   "self_type" : "type-9698",
+   "referenced_type" : "type-9726",
+   "self_type" : "type-9725",
    "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"
   },
@@ -39080,8 +39178,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-1317",
-   "self_type" : "type-1316",
+   "referenced_type" : "type-1320",
+   "self_type" : "type-1319",
    "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"
   },
@@ -39090,8 +39188,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-3400",
-   "self_type" : "type-3399",
+   "referenced_type" : "type-3403",
+   "self_type" : "type-3402",
    "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"
   },
@@ -39100,8 +39198,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-3564",
-   "self_type" : "type-3563",
+   "referenced_type" : "type-3567",
+   "self_type" : "type-3566",
    "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"
   },
@@ -39110,8 +39208,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-3868",
-   "self_type" : "type-3867",
+   "referenced_type" : "type-3874",
+   "self_type" : "type-3873",
    "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"
   },
@@ -39120,8 +39218,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-4417",
-   "self_type" : "type-4416",
+   "referenced_type" : "type-4423",
+   "self_type" : "type-4422",
    "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"
   },
@@ -39130,8 +39228,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-4626",
-   "self_type" : "type-4625",
+   "referenced_type" : "type-4632",
+   "self_type" : "type-4631",
    "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"
   },
@@ -39140,8 +39238,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-4796",
-   "self_type" : "type-4795",
+   "referenced_type" : "type-4802",
+   "self_type" : "type-4801",
    "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"
   },
@@ -39150,8 +39248,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-5321",
-   "self_type" : "type-5320",
+   "referenced_type" : "type-5327",
+   "self_type" : "type-5326",
    "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"
   },
@@ -39160,8 +39258,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-5485",
-   "self_type" : "type-5484",
+   "referenced_type" : "type-5491",
+   "self_type" : "type-5490",
    "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"
   },
@@ -39170,8 +39268,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-5789",
-   "self_type" : "type-5788",
+   "referenced_type" : "type-5798",
+   "self_type" : "type-5797",
    "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"
   },
@@ -39190,8 +39288,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-6314",
-   "self_type" : "type-6313",
+   "referenced_type" : "type-6323",
+   "self_type" : "type-6322",
    "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"
   },
@@ -39200,8 +39298,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-6510",
-   "self_type" : "type-6509",
+   "referenced_type" : "type-6519",
+   "self_type" : "type-6518",
    "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"
   },
@@ -39210,8 +39308,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-6662",
-   "self_type" : "type-6661",
+   "referenced_type" : "type-6671",
+   "self_type" : "type-6670",
    "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"
   },
@@ -39220,8 +39318,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-6789",
-   "self_type" : "type-6788",
+   "referenced_type" : "type-6799",
+   "self_type" : "type-6798",
    "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"
   },
@@ -39230,8 +39328,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-7019",
-   "self_type" : "type-7018",
+   "referenced_type" : "type-7029",
+   "self_type" : "type-7028",
    "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"
   },
@@ -39240,8 +39338,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-7134",
-   "self_type" : "type-7133",
+   "referenced_type" : "type-7143",
+   "self_type" : "type-7142",
    "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"
   },
@@ -39250,8 +39348,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-7266",
-   "self_type" : "type-7265",
+   "referenced_type" : "type-7286",
+   "self_type" : "type-7285",
    "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"
   },
@@ -39260,8 +39358,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-7365",
-   "self_type" : "type-7364",
+   "referenced_type" : "type-7387",
+   "self_type" : "type-7386",
    "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"
   },
@@ -39270,8 +39368,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-7637",
-   "self_type" : "type-7636",
+   "referenced_type" : "type-7658",
+   "self_type" : "type-7657",
    "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"
   },
@@ -39280,8 +39378,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-7801",
-   "self_type" : "type-7800",
+   "referenced_type" : "type-7822",
+   "self_type" : "type-7821",
    "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"
   },
@@ -39290,8 +39388,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-8105",
-   "self_type" : "type-8104",
+   "referenced_type" : "type-8129",
+   "self_type" : "type-8128",
    "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"
   },
@@ -39300,8 +39398,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-8255",
-   "self_type" : "type-8254",
+   "referenced_type" : "type-8279",
+   "self_type" : "type-8278",
    "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"
   },
@@ -39310,8 +39408,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-8387",
-   "self_type" : "type-8386",
+   "referenced_type" : "type-8411",
+   "self_type" : "type-8410",
    "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"
   },
@@ -39320,8 +39418,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-8624",
-   "self_type" : "type-8623",
+   "referenced_type" : "type-8651",
+   "self_type" : "type-8650",
    "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"
   },
@@ -39340,8 +39438,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-9183",
-   "self_type" : "type-9182",
+   "referenced_type" : "type-9210",
+   "self_type" : "type-9209",
    "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"
   },
@@ -39350,8 +39448,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-9429",
-   "self_type" : "type-9428",
+   "referenced_type" : "type-9458",
+   "self_type" : "type-9457",
    "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"
   },
@@ -39360,8 +39458,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-9564",
-   "self_type" : "type-9563",
+   "referenced_type" : "type-9591",
+   "self_type" : "type-9590",
    "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"
   },
@@ -39370,8 +39468,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-9697",
-   "self_type" : "type-9696",
+   "referenced_type" : "type-9724",
+   "self_type" : "type-9723",
    "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"
   },
@@ -39380,8 +39478,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1119",
-   "self_type" : "type-1118",
+   "referenced_type" : "type-1122",
+   "self_type" : "type-1121",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39390,8 +39488,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1297",
-   "self_type" : "type-1296",
+   "referenced_type" : "type-1300",
+   "self_type" : "type-1299",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39400,8 +39498,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3374",
+   "self_type" : "type-3373",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39410,8 +39508,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3551",
+   "self_type" : "type-3550",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39420,8 +39518,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3728",
+   "self_type" : "type-3727",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39430,8 +39528,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3853",
+   "self_type" : "type-3852",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39440,8 +39538,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4405",
+   "self_type" : "type-4404",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39450,8 +39548,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4613",
+   "self_type" : "type-4612",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39460,8 +39558,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4786",
+   "self_type" : "type-4785",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39470,8 +39568,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5298",
+   "self_type" : "type-5297",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39480,8 +39578,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5475",
+   "self_type" : "type-5474",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39500,8 +39598,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5652",
+   "self_type" : "type-5651",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39510,8 +39608,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5777",
+   "self_type" : "type-5776",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39520,8 +39618,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6305",
+   "self_type" : "type-6304",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39530,8 +39628,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6500",
+   "self_type" : "type-6499",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39540,8 +39638,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6655",
+   "self_type" : "type-6654",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39550,8 +39648,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6808",
+   "self_type" : "type-6807",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39560,8 +39658,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6955",
+   "self_type" : "type-6954",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39570,8 +39668,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7126",
+   "self_type" : "type-7125",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39580,8 +39678,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7369",
+   "self_type" : "type-7368",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39590,8 +39688,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7629",
+   "self_type" : "type-7628",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39600,8 +39698,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7806",
+   "self_type" : "type-7805",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39610,8 +39708,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7983",
+   "self_type" : "type-7982",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39620,8 +39718,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8108",
+   "self_type" : "type-8107",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39630,8 +39728,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8262",
+   "self_type" : "type-8261",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39640,8 +39738,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8395",
+   "self_type" : "type-8394",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39650,8 +39748,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8542",
+   "self_type" : "type-8541",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39660,8 +39758,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8632",
+   "self_type" : "type-8631",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39670,8 +39768,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-872",
+   "self_type" : "type-871",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39680,8 +39778,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-9191",
+   "self_type" : "type-9190",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39690,8 +39788,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-9436",
+   "self_type" : "type-9435",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39700,8 +39798,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-9575",
+   "self_type" : "type-9574",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39710,8 +39808,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-9732",
+   "self_type" : "type-9731",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39720,8 +39818,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-9874",
+   "self_type" : "type-9873",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39730,8 +39828,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-1126",
-   "self_type" : "type-1125",
+   "referenced_type" : "type-1129",
+   "self_type" : "type-1128",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39740,8 +39838,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-1303",
-   "self_type" : "type-1302",
+   "referenced_type" : "type-1307",
+   "self_type" : "type-1306",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39750,8 +39848,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-3377",
-   "self_type" : "type-3376",
+   "referenced_type" : "type-3380",
+   "self_type" : "type-3379",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39760,8 +39858,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-3554",
-   "self_type" : "type-3553",
+   "referenced_type" : "type-3557",
+   "self_type" : "type-3556",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39770,8 +39868,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-3729",
-   "self_type" : "type-3728",
+   "referenced_type" : "type-3735",
+   "self_type" : "type-3734",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39780,8 +39878,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-3853",
-   "self_type" : "type-3852",
+   "referenced_type" : "type-3860",
+   "self_type" : "type-3859",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39790,8 +39888,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-4405",
-   "self_type" : "type-4404",
+   "referenced_type" : "type-4411",
+   "self_type" : "type-4410",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39800,8 +39898,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-4613",
-   "self_type" : "type-4612",
+   "referenced_type" : "type-4619",
+   "self_type" : "type-4618",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39810,8 +39908,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-4785",
-   "self_type" : "type-4784",
+   "referenced_type" : "type-4792",
+   "self_type" : "type-4791",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39820,8 +39918,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-5298",
-   "self_type" : "type-5297",
+   "referenced_type" : "type-5304",
+   "self_type" : "type-5303",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39830,8 +39928,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-5475",
-   "self_type" : "type-5474",
+   "referenced_type" : "type-5481",
+   "self_type" : "type-5480",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39850,8 +39948,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-5650",
-   "self_type" : "type-5649",
+   "referenced_type" : "type-5659",
+   "self_type" : "type-5658",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39860,8 +39958,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-5774",
-   "self_type" : "type-5773",
+   "referenced_type" : "type-5784",
+   "self_type" : "type-5783",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39870,8 +39968,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-6302",
-   "self_type" : "type-6301",
+   "referenced_type" : "type-6311",
+   "self_type" : "type-6310",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39880,8 +39978,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-6497",
-   "self_type" : "type-6496",
+   "referenced_type" : "type-6506",
+   "self_type" : "type-6505",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39890,8 +39988,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-6651",
-   "self_type" : "type-6650",
+   "referenced_type" : "type-6661",
+   "self_type" : "type-6660",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39900,8 +39998,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-6805",
-   "self_type" : "type-6804",
+   "referenced_type" : "type-6815",
+   "self_type" : "type-6814",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39910,8 +40008,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-6953",
-   "self_type" : "type-6952",
+   "referenced_type" : "type-6962",
+   "self_type" : "type-6961",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39920,8 +40018,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-7123",
-   "self_type" : "type-7122",
+   "referenced_type" : "type-7132",
+   "self_type" : "type-7131",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39930,8 +40028,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-7354",
-   "self_type" : "type-7353",
+   "referenced_type" : "type-7375",
+   "self_type" : "type-7374",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39940,8 +40038,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-7614",
-   "self_type" : "type-7613",
+   "referenced_type" : "type-7635",
+   "self_type" : "type-7634",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39950,8 +40048,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-7791",
-   "self_type" : "type-7790",
+   "referenced_type" : "type-7812",
+   "self_type" : "type-7811",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39960,8 +40058,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-7966",
-   "self_type" : "type-7965",
+   "referenced_type" : "type-7990",
+   "self_type" : "type-7989",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39970,8 +40068,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-8090",
-   "self_type" : "type-8089",
+   "referenced_type" : "type-8115",
+   "self_type" : "type-8114",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39980,8 +40078,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-8244",
-   "self_type" : "type-8243",
+   "referenced_type" : "type-8268",
+   "self_type" : "type-8267",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -39990,8 +40088,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-8377",
-   "self_type" : "type-8376",
+   "referenced_type" : "type-8401",
+   "self_type" : "type-8400",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40000,8 +40098,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-8521",
-   "self_type" : "type-8520",
+   "referenced_type" : "type-8548",
+   "self_type" : "type-8547",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40010,8 +40108,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-8611",
-   "self_type" : "type-8610",
+   "referenced_type" : "type-8638",
+   "self_type" : "type-8637",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40030,8 +40128,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-9169",
-   "self_type" : "type-9168",
+   "referenced_type" : "type-9197",
+   "self_type" : "type-9196",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40040,8 +40138,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-9415",
-   "self_type" : "type-9414",
+   "referenced_type" : "type-9443",
+   "self_type" : "type-9442",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40050,8 +40148,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-9554",
-   "self_type" : "type-9553",
+   "referenced_type" : "type-9581",
+   "self_type" : "type-9580",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40060,8 +40158,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-9711",
-   "self_type" : "type-9710",
+   "referenced_type" : "type-9738",
+   "self_type" : "type-9737",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40070,8 +40168,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-9853",
-   "self_type" : "type-9852",
+   "referenced_type" : "type-9880",
+   "self_type" : "type-9879",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40080,8 +40178,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-1128",
-   "self_type" : "type-1127",
+   "referenced_type" : "type-1131",
+   "self_type" : "type-1130",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40090,8 +40188,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-1306",
-   "self_type" : "type-1305",
+   "referenced_type" : "type-1309",
+   "self_type" : "type-1308",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40100,8 +40198,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-3380",
-   "self_type" : "type-3379",
+   "referenced_type" : "type-3383",
+   "self_type" : "type-3382",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40110,8 +40208,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-3556",
-   "self_type" : "type-3555",
+   "referenced_type" : "type-3559",
+   "self_type" : "type-3558",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40120,8 +40218,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-3731",
-   "self_type" : "type-3730",
+   "referenced_type" : "type-3737",
+   "self_type" : "type-3736",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40130,8 +40228,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-3856",
-   "self_type" : "type-3855",
+   "referenced_type" : "type-3862",
+   "self_type" : "type-3861",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40140,8 +40238,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-4407",
-   "self_type" : "type-4406",
+   "referenced_type" : "type-4413",
+   "self_type" : "type-4412",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40150,8 +40248,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-4615",
-   "self_type" : "type-4614",
+   "referenced_type" : "type-4621",
+   "self_type" : "type-4620",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40160,8 +40258,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-4787",
-   "self_type" : "type-4786",
+   "referenced_type" : "type-4794",
+   "self_type" : "type-4793",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40170,8 +40268,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-5301",
-   "self_type" : "type-5300",
+   "referenced_type" : "type-5307",
+   "self_type" : "type-5306",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40180,8 +40278,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-5477",
-   "self_type" : "type-5476",
+   "referenced_type" : "type-5483",
+   "self_type" : "type-5482",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40200,8 +40298,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-5652",
-   "self_type" : "type-5651",
+   "referenced_type" : "type-5661",
+   "self_type" : "type-5660",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40210,8 +40308,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-5777",
-   "self_type" : "type-5776",
+   "referenced_type" : "type-5786",
+   "self_type" : "type-5785",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40220,8 +40318,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-6304",
-   "self_type" : "type-6303",
+   "referenced_type" : "type-6313",
+   "self_type" : "type-6312",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40230,8 +40328,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-6499",
-   "self_type" : "type-6498",
+   "referenced_type" : "type-6508",
+   "self_type" : "type-6507",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40240,8 +40338,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-6653",
-   "self_type" : "type-6652",
+   "referenced_type" : "type-6663",
+   "self_type" : "type-6662",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40250,8 +40348,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-6807",
-   "self_type" : "type-6806",
+   "referenced_type" : "type-6817",
+   "self_type" : "type-6816",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40260,8 +40358,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-6955",
-   "self_type" : "type-6954",
+   "referenced_type" : "type-6964",
+   "self_type" : "type-6963",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40270,8 +40368,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-7125",
-   "self_type" : "type-7124",
+   "referenced_type" : "type-7134",
+   "self_type" : "type-7133",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40280,8 +40378,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-7356",
-   "self_type" : "type-7355",
+   "referenced_type" : "type-7377",
+   "self_type" : "type-7376",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40290,8 +40388,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-7617",
-   "self_type" : "type-7616",
+   "referenced_type" : "type-7638",
+   "self_type" : "type-7637",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40300,8 +40398,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-7793",
-   "self_type" : "type-7792",
+   "referenced_type" : "type-7814",
+   "self_type" : "type-7813",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40310,8 +40408,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-7968",
-   "self_type" : "type-7967",
+   "referenced_type" : "type-7992",
+   "self_type" : "type-7991",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40320,8 +40418,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-8093",
-   "self_type" : "type-8092",
+   "referenced_type" : "type-8117",
+   "self_type" : "type-8116",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40330,8 +40428,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-8246",
-   "self_type" : "type-8245",
+   "referenced_type" : "type-8270",
+   "self_type" : "type-8269",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40340,8 +40438,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-8379",
-   "self_type" : "type-8378",
+   "referenced_type" : "type-8403",
+   "self_type" : "type-8402",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40350,8 +40448,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-8523",
-   "self_type" : "type-8522",
+   "referenced_type" : "type-8550",
+   "self_type" : "type-8549",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40360,8 +40458,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-8613",
-   "self_type" : "type-8612",
+   "referenced_type" : "type-8640",
+   "self_type" : "type-8639",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40380,8 +40478,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-9172",
-   "self_type" : "type-9171",
+   "referenced_type" : "type-9199",
+   "self_type" : "type-9198",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40390,8 +40488,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-9417",
-   "self_type" : "type-9416",
+   "referenced_type" : "type-9445",
+   "self_type" : "type-9444",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40400,8 +40498,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-9556",
-   "self_type" : "type-9555",
+   "referenced_type" : "type-9583",
+   "self_type" : "type-9582",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40410,8 +40508,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-9713",
-   "self_type" : "type-9712",
+   "referenced_type" : "type-9740",
+   "self_type" : "type-9739",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40420,8 +40518,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-9855",
-   "self_type" : "type-9854",
+   "referenced_type" : "type-9883",
+   "self_type" : "type-9882",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40430,8 +40528,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-1123",
-   "self_type" : "type-1122",
+   "referenced_type" : "type-1127",
+   "self_type" : "type-1126",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40440,8 +40538,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-1301",
-   "self_type" : "type-1300",
+   "referenced_type" : "type-1305",
+   "self_type" : "type-1304",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40450,8 +40548,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-3375",
-   "self_type" : "type-3374",
+   "referenced_type" : "type-3378",
+   "self_type" : "type-3377",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40460,8 +40558,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-3552",
-   "self_type" : "type-3551",
+   "referenced_type" : "type-3555",
+   "self_type" : "type-3554",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40470,8 +40568,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-3726",
-   "self_type" : "type-3725",
+   "referenced_type" : "type-3733",
+   "self_type" : "type-3732",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40480,8 +40578,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-3851",
-   "self_type" : "type-3850",
+   "referenced_type" : "type-3858",
+   "self_type" : "type-3857",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40490,8 +40588,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-4403",
-   "self_type" : "type-4402",
+   "referenced_type" : "type-4409",
+   "self_type" : "type-4408",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40500,8 +40598,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-4611",
-   "self_type" : "type-4610",
+   "referenced_type" : "type-4617",
+   "self_type" : "type-4616",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40510,8 +40608,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-4783",
-   "self_type" : "type-4782",
+   "referenced_type" : "type-4790",
+   "self_type" : "type-4789",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40520,8 +40618,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-5296",
-   "self_type" : "type-5295",
+   "referenced_type" : "type-5302",
+   "self_type" : "type-5301",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40530,8 +40628,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-5473",
-   "self_type" : "type-5472",
+   "referenced_type" : "type-5479",
+   "self_type" : "type-5478",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40550,8 +40648,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-5647",
-   "self_type" : "type-5646",
+   "referenced_type" : "type-5657",
+   "self_type" : "type-5656",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40560,8 +40658,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-5772",
-   "self_type" : "type-5771",
+   "referenced_type" : "type-5782",
+   "self_type" : "type-5781",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40570,8 +40668,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-6300",
-   "self_type" : "type-6299",
+   "referenced_type" : "type-6309",
+   "self_type" : "type-6308",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40580,8 +40678,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-6495",
-   "self_type" : "type-6494",
+   "referenced_type" : "type-6504",
+   "self_type" : "type-6503",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40590,8 +40688,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-6649",
-   "self_type" : "type-6648",
+   "referenced_type" : "type-6659",
+   "self_type" : "type-6658",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40600,8 +40698,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-6803",
-   "self_type" : "type-6802",
+   "referenced_type" : "type-6813",
+   "self_type" : "type-6812",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40610,8 +40708,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-6951",
-   "self_type" : "type-6950",
+   "referenced_type" : "type-6960",
+   "self_type" : "type-6959",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40620,8 +40718,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-7121",
-   "self_type" : "type-7120",
+   "referenced_type" : "type-7130",
+   "self_type" : "type-7129",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40630,8 +40728,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-7352",
-   "self_type" : "type-7351",
+   "referenced_type" : "type-7373",
+   "self_type" : "type-7372",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40640,8 +40738,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-7612",
-   "self_type" : "type-7611",
+   "referenced_type" : "type-7633",
+   "self_type" : "type-7632",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40650,8 +40748,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-7789",
-   "self_type" : "type-7788",
+   "referenced_type" : "type-7810",
+   "self_type" : "type-7809",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40660,8 +40758,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-7963",
-   "self_type" : "type-7962",
+   "referenced_type" : "type-7988",
+   "self_type" : "type-7987",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40670,8 +40768,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-8088",
-   "self_type" : "type-8087",
+   "referenced_type" : "type-8113",
+   "self_type" : "type-8112",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40680,8 +40778,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-8241",
-   "self_type" : "type-8240",
+   "referenced_type" : "type-8266",
+   "self_type" : "type-8265",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40690,8 +40788,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-8375",
-   "self_type" : "type-8374",
+   "referenced_type" : "type-8399",
+   "self_type" : "type-8398",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40700,8 +40798,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-8519",
-   "self_type" : "type-8518",
+   "referenced_type" : "type-8546",
+   "self_type" : "type-8545",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40710,8 +40808,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-8608",
-   "self_type" : "type-8607",
+   "referenced_type" : "type-8636",
+   "self_type" : "type-8635",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40730,8 +40828,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-9167",
-   "self_type" : "type-9166",
+   "referenced_type" : "type-9195",
+   "self_type" : "type-9194",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40740,8 +40838,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-9413",
-   "self_type" : "type-9412",
+   "referenced_type" : "type-9440",
+   "self_type" : "type-9439",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40750,8 +40848,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-9552",
-   "self_type" : "type-9551",
+   "referenced_type" : "type-9579",
+   "self_type" : "type-9578",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40760,8 +40858,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-9709",
-   "self_type" : "type-9708",
+   "referenced_type" : "type-9736",
+   "self_type" : "type-9735",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40770,8 +40868,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-9851",
-   "self_type" : "type-9850",
+   "referenced_type" : "type-9878",
+   "self_type" : "type-9877",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40780,8 +40878,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-1130",
-   "self_type" : "type-1129",
+   "referenced_type" : "type-1133",
+   "self_type" : "type-1132",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40790,8 +40888,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-1308",
-   "self_type" : "type-1307",
+   "referenced_type" : "type-1311",
+   "self_type" : "type-1310",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40800,8 +40898,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-3383",
-   "self_type" : "type-3382",
+   "referenced_type" : "type-3386",
+   "self_type" : "type-3385",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40810,8 +40908,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-3558",
-   "self_type" : "type-3557",
+   "referenced_type" : "type-3561",
+   "self_type" : "type-3560",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40820,8 +40918,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-3733",
-   "self_type" : "type-3732",
+   "referenced_type" : "type-3739",
+   "self_type" : "type-3738",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40830,8 +40928,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-3858",
-   "self_type" : "type-3857",
+   "referenced_type" : "type-3864",
+   "self_type" : "type-3863",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40840,8 +40938,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-4409",
-   "self_type" : "type-4408",
+   "referenced_type" : "type-4415",
+   "self_type" : "type-4414",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40850,8 +40948,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-4617",
-   "self_type" : "type-4616",
+   "referenced_type" : "type-4626",
+   "self_type" : "type-4625",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40860,8 +40958,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-4789",
-   "self_type" : "type-4788",
+   "referenced_type" : "type-4796",
+   "self_type" : "type-4795",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40870,8 +40968,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-5304",
-   "self_type" : "type-5303",
+   "referenced_type" : "type-5310",
+   "self_type" : "type-5309",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40880,8 +40978,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-5479",
-   "self_type" : "type-5478",
+   "referenced_type" : "type-5485",
+   "self_type" : "type-5484",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40890,8 +40988,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-5654",
-   "self_type" : "type-5653",
+   "referenced_type" : "type-5663",
+   "self_type" : "type-5662",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40900,8 +40998,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-5779",
-   "self_type" : "type-5778",
+   "referenced_type" : "type-5788",
+   "self_type" : "type-5787",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40920,8 +41018,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-6306",
-   "self_type" : "type-6305",
+   "referenced_type" : "type-6315",
+   "self_type" : "type-6314",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40930,8 +41028,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-6501",
-   "self_type" : "type-6500",
+   "referenced_type" : "type-6513",
+   "self_type" : "type-6512",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40940,8 +41038,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-6655",
-   "self_type" : "type-6654",
+   "referenced_type" : "type-6665",
+   "self_type" : "type-6664",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40950,8 +41048,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-6809",
-   "self_type" : "type-6808",
+   "referenced_type" : "type-6819",
+   "self_type" : "type-6818",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40960,8 +41058,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-6958",
-   "self_type" : "type-6957",
+   "referenced_type" : "type-6967",
+   "self_type" : "type-6966",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40970,8 +41068,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-7127",
-   "self_type" : "type-7126",
+   "referenced_type" : "type-7136",
+   "self_type" : "type-7135",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40980,8 +41078,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-7358",
-   "self_type" : "type-7357",
+   "referenced_type" : "type-7380",
+   "self_type" : "type-7379",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -40990,8 +41088,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-7620",
-   "self_type" : "type-7619",
+   "referenced_type" : "type-7641",
+   "self_type" : "type-7640",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41000,8 +41098,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-7795",
-   "self_type" : "type-7794",
+   "referenced_type" : "type-7816",
+   "self_type" : "type-7815",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41010,8 +41108,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-7970",
-   "self_type" : "type-7969",
+   "referenced_type" : "type-7994",
+   "self_type" : "type-7993",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41020,8 +41118,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-8095",
-   "self_type" : "type-8094",
+   "referenced_type" : "type-8119",
+   "self_type" : "type-8118",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41030,8 +41128,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-8248",
-   "self_type" : "type-8247",
+   "referenced_type" : "type-8273",
+   "self_type" : "type-8272",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41040,8 +41138,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-8381",
-   "self_type" : "type-8380",
+   "referenced_type" : "type-8405",
+   "self_type" : "type-8404",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41050,8 +41148,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-8525",
-   "self_type" : "type-8524",
+   "referenced_type" : "type-8552",
+   "self_type" : "type-8551",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41060,8 +41158,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-8615",
-   "self_type" : "type-8614",
+   "referenced_type" : "type-8642",
+   "self_type" : "type-8641",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41080,8 +41178,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-9174",
-   "self_type" : "type-9173",
+   "referenced_type" : "type-9201",
+   "self_type" : "type-9200",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41090,8 +41188,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-9419",
-   "self_type" : "type-9418",
+   "referenced_type" : "type-9450",
+   "self_type" : "type-9449",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41100,8 +41198,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-9558",
-   "self_type" : "type-9557",
+   "referenced_type" : "type-9585",
+   "self_type" : "type-9584",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41110,8 +41208,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-9715",
-   "self_type" : "type-9714",
+   "referenced_type" : "type-9742",
+   "self_type" : "type-9741",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41120,8 +41218,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-9857",
-   "self_type" : "type-9856",
+   "referenced_type" : "type-9885",
+   "self_type" : "type-9884",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41130,8 +41228,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-1117",
-   "self_type" : "type-1116",
+   "referenced_type" : "type-1120",
+   "self_type" : "type-1119",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41140,8 +41238,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-1295",
-   "self_type" : "type-1294",
+   "referenced_type" : "type-1298",
+   "self_type" : "type-1297",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41150,8 +41248,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-3369",
-   "self_type" : "type-3368",
+   "referenced_type" : "type-3372",
+   "self_type" : "type-3371",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41160,8 +41258,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-3544",
-   "self_type" : "type-3543",
+   "referenced_type" : "type-3549",
+   "self_type" : "type-3548",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41170,8 +41268,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-3720",
-   "self_type" : "type-3719",
+   "referenced_type" : "type-3726",
+   "self_type" : "type-3725",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41180,8 +41278,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-3845",
-   "self_type" : "type-3844",
+   "referenced_type" : "type-3851",
+   "self_type" : "type-3850",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41190,8 +41288,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-4397",
-   "self_type" : "type-4396",
+   "referenced_type" : "type-4403",
+   "self_type" : "type-4402",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41200,8 +41298,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-4605",
-   "self_type" : "type-4604",
+   "referenced_type" : "type-4611",
+   "self_type" : "type-4610",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41210,8 +41308,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-4776",
-   "self_type" : "type-4775",
+   "referenced_type" : "type-4783",
+   "self_type" : "type-4782",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41220,8 +41318,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-5290",
-   "self_type" : "type-5289",
+   "referenced_type" : "type-5296",
+   "self_type" : "type-5295",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41230,8 +41328,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-5465",
-   "self_type" : "type-5464",
+   "referenced_type" : "type-5473",
+   "self_type" : "type-5472",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41250,8 +41348,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-5641",
-   "self_type" : "type-5640",
+   "referenced_type" : "type-5650",
+   "self_type" : "type-5649",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41260,8 +41358,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-5766",
-   "self_type" : "type-5765",
+   "referenced_type" : "type-5775",
+   "self_type" : "type-5774",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41270,8 +41368,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-6294",
-   "self_type" : "type-6293",
+   "referenced_type" : "type-6303",
+   "self_type" : "type-6302",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41280,8 +41378,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-6489",
-   "self_type" : "type-6488",
+   "referenced_type" : "type-6498",
+   "self_type" : "type-6497",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41290,8 +41388,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-6642",
-   "self_type" : "type-6641",
+   "referenced_type" : "type-6652",
+   "self_type" : "type-6651",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41300,8 +41398,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-6796",
-   "self_type" : "type-6795",
+   "referenced_type" : "type-6806",
+   "self_type" : "type-6805",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41310,8 +41408,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-6944",
-   "self_type" : "type-6943",
+   "referenced_type" : "type-6953",
+   "self_type" : "type-6952",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41320,8 +41418,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-7115",
-   "self_type" : "type-7114",
+   "referenced_type" : "type-7124",
+   "self_type" : "type-7123",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41330,8 +41428,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-7345",
-   "self_type" : "type-7344",
+   "referenced_type" : "type-7367",
+   "self_type" : "type-7366",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41340,8 +41438,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-7606",
-   "self_type" : "type-7605",
+   "referenced_type" : "type-7627",
+   "self_type" : "type-7626",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41350,8 +41448,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-7781",
-   "self_type" : "type-7780",
+   "referenced_type" : "type-7804",
+   "self_type" : "type-7803",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41360,8 +41458,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-7957",
-   "self_type" : "type-7956",
+   "referenced_type" : "type-7981",
+   "self_type" : "type-7980",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41370,8 +41468,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-8082",
-   "self_type" : "type-8081",
+   "referenced_type" : "type-8106",
+   "self_type" : "type-8105",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41380,8 +41478,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-8235",
-   "self_type" : "type-8234",
+   "referenced_type" : "type-8259",
+   "self_type" : "type-8258",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41390,8 +41488,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-8367",
-   "self_type" : "type-8366",
+   "referenced_type" : "type-8393",
+   "self_type" : "type-8392",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41400,8 +41498,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-8513",
-   "self_type" : "type-8512",
+   "referenced_type" : "type-8540",
+   "self_type" : "type-8539",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41410,8 +41508,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-8602",
-   "self_type" : "type-8601",
+   "referenced_type" : "type-8630",
+   "self_type" : "type-8629",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41420,8 +41518,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-868",
-   "self_type" : "type-867",
+   "referenced_type" : "type-870",
+   "self_type" : "type-869",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41430,8 +41528,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-9161",
-   "self_type" : "type-9160",
+   "referenced_type" : "type-9189",
+   "self_type" : "type-9188",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41440,8 +41538,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-9407",
-   "self_type" : "type-9406",
+   "referenced_type" : "type-9434",
+   "self_type" : "type-9433",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41450,8 +41548,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-9546",
-   "self_type" : "type-9545",
+   "referenced_type" : "type-9573",
+   "self_type" : "type-9572",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41460,8 +41558,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-9703",
-   "self_type" : "type-9702",
+   "referenced_type" : "type-9730",
+   "self_type" : "type-9729",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41470,8 +41568,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-9845",
-   "self_type" : "type-9844",
+   "referenced_type" : "type-9872",
+   "self_type" : "type-9871",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41480,8 +41578,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-1121",
-   "self_type" : "type-1120",
+   "referenced_type" : "type-1125",
+   "self_type" : "type-1124",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41490,8 +41588,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-1299",
-   "self_type" : "type-1298",
+   "referenced_type" : "type-1303",
+   "self_type" : "type-1302",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41500,8 +41598,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-3373",
-   "self_type" : "type-3372",
+   "referenced_type" : "type-3376",
+   "self_type" : "type-3375",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41510,8 +41608,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-3550",
-   "self_type" : "type-3549",
+   "referenced_type" : "type-3553",
+   "self_type" : "type-3552",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41520,8 +41618,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-3724",
-   "self_type" : "type-3723",
+   "referenced_type" : "type-3731",
+   "self_type" : "type-3730",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41530,8 +41628,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-3849",
-   "self_type" : "type-3848",
+   "referenced_type" : "type-3856",
+   "self_type" : "type-3855",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41540,8 +41638,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-4401",
-   "self_type" : "type-4400",
+   "referenced_type" : "type-4407",
+   "self_type" : "type-4406",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41550,8 +41648,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-4609",
-   "self_type" : "type-4608",
+   "referenced_type" : "type-4615",
+   "self_type" : "type-4614",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41560,8 +41658,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-4781",
-   "self_type" : "type-4780",
+   "referenced_type" : "type-4788",
+   "self_type" : "type-4787",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41570,8 +41668,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-5294",
-   "self_type" : "type-5293",
+   "referenced_type" : "type-5300",
+   "self_type" : "type-5299",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41580,8 +41678,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-5471",
-   "self_type" : "type-5470",
+   "referenced_type" : "type-5477",
+   "self_type" : "type-5476",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41600,8 +41698,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-5645",
-   "self_type" : "type-5644",
+   "referenced_type" : "type-5655",
+   "self_type" : "type-5654",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41610,8 +41708,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-5770",
-   "self_type" : "type-5769",
+   "referenced_type" : "type-5780",
+   "self_type" : "type-5779",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41620,8 +41718,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-6298",
-   "self_type" : "type-6297",
+   "referenced_type" : "type-6307",
+   "self_type" : "type-6306",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41630,8 +41728,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-6493",
-   "self_type" : "type-6492",
+   "referenced_type" : "type-6502",
+   "self_type" : "type-6501",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41640,8 +41738,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-6647",
-   "self_type" : "type-6646",
+   "referenced_type" : "type-6657",
+   "self_type" : "type-6656",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41650,8 +41748,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-6800",
-   "self_type" : "type-6799",
+   "referenced_type" : "type-6810",
+   "self_type" : "type-6809",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41660,8 +41758,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-6949",
-   "self_type" : "type-6948",
+   "referenced_type" : "type-6958",
+   "self_type" : "type-6957",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41670,8 +41768,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-7119",
-   "self_type" : "type-7118",
+   "referenced_type" : "type-7128",
+   "self_type" : "type-7127",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41680,8 +41778,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-7349",
-   "self_type" : "type-7348",
+   "referenced_type" : "type-7371",
+   "self_type" : "type-7370",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41690,8 +41788,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-7610",
-   "self_type" : "type-7609",
+   "referenced_type" : "type-7631",
+   "self_type" : "type-7630",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41700,8 +41798,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-7787",
-   "self_type" : "type-7786",
+   "referenced_type" : "type-7808",
+   "self_type" : "type-7807",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41710,8 +41808,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-7961",
-   "self_type" : "type-7960",
+   "referenced_type" : "type-7986",
+   "self_type" : "type-7985",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41720,8 +41818,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-8086",
-   "self_type" : "type-8085",
+   "referenced_type" : "type-8111",
+   "self_type" : "type-8110",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41730,8 +41828,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-8239",
-   "self_type" : "type-8238",
+   "referenced_type" : "type-8264",
+   "self_type" : "type-8263",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41740,8 +41838,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-8373",
-   "self_type" : "type-8372",
+   "referenced_type" : "type-8397",
+   "self_type" : "type-8396",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41750,8 +41848,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-8517",
-   "self_type" : "type-8516",
+   "referenced_type" : "type-8544",
+   "self_type" : "type-8543",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41760,8 +41858,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-8606",
-   "self_type" : "type-8605",
+   "referenced_type" : "type-8634",
+   "self_type" : "type-8633",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41780,8 +41878,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-9165",
-   "self_type" : "type-9164",
+   "referenced_type" : "type-9193",
+   "self_type" : "type-9192",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41790,8 +41888,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-9411",
-   "self_type" : "type-9410",
+   "referenced_type" : "type-9438",
+   "self_type" : "type-9437",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41800,8 +41898,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-9550",
-   "self_type" : "type-9549",
+   "referenced_type" : "type-9577",
+   "self_type" : "type-9576",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41810,8 +41908,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-9707",
-   "self_type" : "type-9706",
+   "referenced_type" : "type-9734",
+   "self_type" : "type-9733",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41820,8 +41918,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-9849",
-   "self_type" : "type-9848",
+   "referenced_type" : "type-9876",
+   "self_type" : "type-9875",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -41830,8 +41928,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-1139",
+   "self_type" : "type-1138",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -41840,8 +41938,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-1328",
+   "self_type" : "type-1327",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -41850,8 +41948,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3417",
+   "self_type" : "type-3416",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -41860,8 +41958,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3576",
+   "self_type" : "type-3575",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -41870,8 +41968,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3745",
+   "self_type" : "type-3744",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -41880,8 +41978,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3882",
+   "self_type" : "type-3881",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -41890,8 +41988,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4435",
+   "self_type" : "type-4434",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -41900,8 +41998,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4640",
+   "self_type" : "type-4639",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -41910,8 +42008,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4811",
+   "self_type" : "type-4810",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -41920,8 +42018,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5341",
+   "self_type" : "type-5340",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -41930,8 +42028,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5500",
+   "self_type" : "type-5499",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -41940,8 +42038,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5669",
+   "self_type" : "type-5668",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -41950,8 +42048,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5806",
+   "self_type" : "type-5805",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -41960,8 +42058,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6335",
+   "self_type" : "type-6334",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -41980,8 +42078,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6527",
+   "self_type" : "type-6526",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -41990,8 +42088,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6680",
+   "self_type" : "type-6679",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42000,8 +42098,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6823",
+   "self_type" : "type-6822",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42010,8 +42108,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6972",
+   "self_type" : "type-6971",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42020,8 +42118,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7151",
+   "self_type" : "type-7150",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42030,8 +42128,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "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"
   },
@@ -42040,8 +42138,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7672",
+   "self_type" : "type-7671",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42050,8 +42148,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7831",
+   "self_type" : "type-7830",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42060,8 +42158,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8000",
+   "self_type" : "type-7999",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42070,8 +42168,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8137",
+   "self_type" : "type-8136",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42080,8 +42178,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8288",
+   "self_type" : "type-8287",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42090,8 +42188,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8420",
+   "self_type" : "type-8419",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42100,8 +42198,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8558",
+   "self_type" : "type-8557",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42110,8 +42208,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8659",
+   "self_type" : "type-8658",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42130,8 +42228,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-9224",
+   "self_type" : "type-9223",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42140,8 +42238,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-9467",
+   "self_type" : "type-9466",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42150,8 +42248,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-9599",
+   "self_type" : "type-9598",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42160,8 +42258,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-9746",
+   "self_type" : "type-9745",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42170,8 +42268,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-9890",
+   "self_type" : "type-9889",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42180,8 +42278,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-1138",
-   "self_type" : "type-1137",
+   "referenced_type" : "type-1143",
+   "self_type" : "type-1142",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42190,8 +42288,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-1329",
-   "self_type" : "type-1328",
+   "referenced_type" : "type-1334",
+   "self_type" : "type-1333",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42200,8 +42298,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-3418",
-   "self_type" : "type-3417",
+   "referenced_type" : "type-3421",
+   "self_type" : "type-3420",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42210,8 +42308,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-3577",
-   "self_type" : "type-3576",
+   "referenced_type" : "type-3582",
+   "self_type" : "type-3581",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42220,8 +42318,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-3741",
-   "self_type" : "type-3740",
+   "referenced_type" : "type-3749",
+   "self_type" : "type-3748",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42230,8 +42328,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-3880",
-   "self_type" : "type-3879",
+   "referenced_type" : "type-3888",
+   "self_type" : "type-3887",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42240,8 +42338,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-4432",
-   "self_type" : "type-4431",
+   "referenced_type" : "type-4439",
+   "self_type" : "type-4438",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42250,8 +42348,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-4638",
-   "self_type" : "type-4637",
+   "referenced_type" : "type-4644",
+   "self_type" : "type-4643",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42260,8 +42358,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-4808",
-   "self_type" : "type-4807",
+   "referenced_type" : "type-4815",
+   "self_type" : "type-4814",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42270,8 +42368,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-5339",
-   "self_type" : "type-5338",
+   "referenced_type" : "type-5345",
+   "self_type" : "type-5344",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42280,8 +42378,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-5498",
-   "self_type" : "type-5497",
+   "referenced_type" : "type-5506",
+   "self_type" : "type-5505",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42290,8 +42388,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-5662",
-   "self_type" : "type-5661",
+   "referenced_type" : "type-5673",
+   "self_type" : "type-5672",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42300,8 +42398,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-5801",
-   "self_type" : "type-5800",
+   "referenced_type" : "type-5812",
+   "self_type" : "type-5811",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42310,8 +42408,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-6329",
-   "self_type" : "type-6328",
+   "referenced_type" : "type-6339",
+   "self_type" : "type-6338",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42330,8 +42428,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-6522",
-   "self_type" : "type-6521",
+   "referenced_type" : "type-6531",
+   "self_type" : "type-6530",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42340,8 +42438,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-6674",
-   "self_type" : "type-6673",
+   "referenced_type" : "type-6684",
+   "self_type" : "type-6683",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42350,8 +42448,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-6818",
-   "self_type" : "type-6817",
+   "referenced_type" : "type-6828",
+   "self_type" : "type-6827",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42360,8 +42458,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-6967",
-   "self_type" : "type-6966",
+   "referenced_type" : "type-6976",
+   "self_type" : "type-6975",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42370,8 +42468,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-7146",
-   "self_type" : "type-7145",
+   "referenced_type" : "type-7155",
+   "self_type" : "type-7154",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42380,8 +42478,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-7379",
-   "self_type" : "type-7378",
+   "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"
   },
@@ -42390,8 +42488,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-7655",
-   "self_type" : "type-7654",
+   "referenced_type" : "type-7676",
+   "self_type" : "type-7675",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42400,8 +42498,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-7814",
-   "self_type" : "type-7813",
+   "referenced_type" : "type-7837",
+   "self_type" : "type-7836",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42410,8 +42508,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-7978",
-   "self_type" : "type-7977",
+   "referenced_type" : "type-8004",
+   "self_type" : "type-8003",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42420,8 +42518,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-8117",
-   "self_type" : "type-8116",
+   "referenced_type" : "type-8143",
+   "self_type" : "type-8142",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42430,8 +42528,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-8268",
-   "self_type" : "type-8267",
+   "referenced_type" : "type-8292",
+   "self_type" : "type-8291",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42440,8 +42538,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-8400",
-   "self_type" : "type-8399",
+   "referenced_type" : "type-8426",
+   "self_type" : "type-8425",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42450,8 +42548,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-8533",
-   "self_type" : "type-8532",
+   "referenced_type" : "type-8562",
+   "self_type" : "type-8561",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42460,8 +42558,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-8636",
-   "self_type" : "type-8635",
+   "referenced_type" : "type-8665",
+   "self_type" : "type-8664",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42470,8 +42568,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-906",
-   "self_type" : "type-905",
+   "referenced_type" : "type-908",
+   "self_type" : "type-907",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42480,8 +42578,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-9199",
-   "self_type" : "type-9198",
+   "referenced_type" : "type-9228",
+   "self_type" : "type-9227",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42490,8 +42588,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-9443",
-   "self_type" : "type-9442",
+   "referenced_type" : "type-9471",
+   "self_type" : "type-9470",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42500,8 +42598,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-9576",
-   "self_type" : "type-9575",
+   "referenced_type" : "type-9603",
+   "self_type" : "type-9602",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42510,8 +42608,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-9723",
-   "self_type" : "type-9722",
+   "referenced_type" : "type-9750",
+   "self_type" : "type-9749",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42520,8 +42618,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-9867",
-   "self_type" : "type-9866",
+   "referenced_type" : "type-9894",
+   "self_type" : "type-9893",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42530,8 +42628,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-1136",
-   "self_type" : "type-1135",
+   "referenced_type" : "type-1141",
+   "self_type" : "type-1140",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42540,8 +42638,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-1327",
-   "self_type" : "type-1326",
+   "referenced_type" : "type-1332",
+   "self_type" : "type-1331",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42550,8 +42648,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-3416",
-   "self_type" : "type-3415",
+   "referenced_type" : "type-3419",
+   "self_type" : "type-3418",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42560,8 +42658,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-3575",
-   "self_type" : "type-3574",
+   "referenced_type" : "type-3580",
+   "self_type" : "type-3579",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42570,8 +42668,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-3739",
-   "self_type" : "type-3738",
+   "referenced_type" : "type-3747",
+   "self_type" : "type-3746",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42580,8 +42678,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-3878",
-   "self_type" : "type-3877",
+   "referenced_type" : "type-3886",
+   "self_type" : "type-3885",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42590,8 +42688,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-4429",
-   "self_type" : "type-4428",
+   "referenced_type" : "type-4437",
+   "self_type" : "type-4436",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42600,8 +42698,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-4636",
-   "self_type" : "type-4635",
+   "referenced_type" : "type-4642",
+   "self_type" : "type-4641",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42610,8 +42708,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-4806",
-   "self_type" : "type-4805",
+   "referenced_type" : "type-4813",
+   "self_type" : "type-4812",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42620,8 +42718,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-5337",
-   "self_type" : "type-5336",
+   "referenced_type" : "type-5343",
+   "self_type" : "type-5342",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42630,8 +42728,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-5496",
-   "self_type" : "type-5495",
+   "referenced_type" : "type-5504",
+   "self_type" : "type-5503",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42640,8 +42738,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-5660",
-   "self_type" : "type-5659",
+   "referenced_type" : "type-5671",
+   "self_type" : "type-5670",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42650,8 +42748,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-5799",
-   "self_type" : "type-5798",
+   "referenced_type" : "type-5810",
+   "self_type" : "type-5809",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42660,8 +42758,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-6326",
-   "self_type" : "type-6325",
+   "referenced_type" : "type-6337",
+   "self_type" : "type-6336",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42680,8 +42778,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-6520",
-   "self_type" : "type-6519",
+   "referenced_type" : "type-6529",
+   "self_type" : "type-6528",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42690,8 +42788,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-6672",
-   "self_type" : "type-6671",
+   "referenced_type" : "type-6682",
+   "self_type" : "type-6681",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42700,8 +42798,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-6816",
-   "self_type" : "type-6815",
+   "referenced_type" : "type-6825",
+   "self_type" : "type-6824",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42710,8 +42808,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-6965",
-   "self_type" : "type-6964",
+   "referenced_type" : "type-6974",
+   "self_type" : "type-6973",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42720,8 +42818,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-7144",
-   "self_type" : "type-7143",
+   "referenced_type" : "type-7153",
+   "self_type" : "type-7152",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42730,8 +42828,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-7376",
-   "self_type" : "type-7375",
+   "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"
   },
@@ -42740,8 +42838,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-7653",
-   "self_type" : "type-7652",
+   "referenced_type" : "type-7674",
+   "self_type" : "type-7673",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42750,8 +42848,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-7812",
-   "self_type" : "type-7811",
+   "referenced_type" : "type-7835",
+   "self_type" : "type-7834",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42760,8 +42858,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-7976",
-   "self_type" : "type-7975",
+   "referenced_type" : "type-8002",
+   "self_type" : "type-8001",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42770,8 +42868,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-8115",
-   "self_type" : "type-8114",
+   "referenced_type" : "type-8141",
+   "self_type" : "type-8140",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42780,8 +42878,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-8266",
-   "self_type" : "type-8265",
+   "referenced_type" : "type-8290",
+   "self_type" : "type-8289",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42790,8 +42888,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-8397",
-   "self_type" : "type-8396",
+   "referenced_type" : "type-8424",
+   "self_type" : "type-8423",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42800,8 +42898,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-8531",
-   "self_type" : "type-8530",
+   "referenced_type" : "type-8560",
+   "self_type" : "type-8559",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42810,8 +42908,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-8634",
-   "self_type" : "type-8633",
+   "referenced_type" : "type-8663",
+   "self_type" : "type-8662",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42820,8 +42918,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-904",
-   "self_type" : "type-903",
+   "referenced_type" : "type-906",
+   "self_type" : "type-905",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42830,8 +42928,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-9195",
-   "self_type" : "type-9194",
+   "referenced_type" : "type-9226",
+   "self_type" : "type-9225",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42840,8 +42938,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-9441",
-   "self_type" : "type-9440",
+   "referenced_type" : "type-9469",
+   "self_type" : "type-9468",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42850,8 +42948,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-9574",
-   "self_type" : "type-9573",
+   "referenced_type" : "type-9601",
+   "self_type" : "type-9600",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42860,8 +42958,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-9721",
-   "self_type" : "type-9720",
+   "referenced_type" : "type-9748",
+   "self_type" : "type-9747",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42870,8 +42968,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-9865",
-   "self_type" : "type-9864",
+   "referenced_type" : "type-9892",
+   "self_type" : "type-9891",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42880,8 +42978,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-1132",
-   "self_type" : "type-1131",
+   "referenced_type" : "type-1135",
+   "self_type" : "type-1134",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42890,8 +42988,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-1323",
-   "self_type" : "type-1322",
+   "referenced_type" : "type-1326",
+   "self_type" : "type-1325",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42900,8 +42998,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-3412",
-   "self_type" : "type-3411",
+   "referenced_type" : "type-3415",
+   "self_type" : "type-3414",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42910,8 +43008,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-3571",
-   "self_type" : "type-3570",
+   "referenced_type" : "type-3574",
+   "self_type" : "type-3573",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42920,8 +43018,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-3735",
-   "self_type" : "type-3734",
+   "referenced_type" : "type-3741",
+   "self_type" : "type-3740",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42930,8 +43028,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-3874",
-   "self_type" : "type-3873",
+   "referenced_type" : "type-3880",
+   "self_type" : "type-3879",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42940,8 +43038,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-4425",
-   "self_type" : "type-4424",
+   "referenced_type" : "type-4431",
+   "self_type" : "type-4430",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42950,8 +43048,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-4632",
-   "self_type" : "type-4631",
+   "referenced_type" : "type-4638",
+   "self_type" : "type-4637",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42960,8 +43058,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-4802",
-   "self_type" : "type-4801",
+   "referenced_type" : "type-4809",
+   "self_type" : "type-4808",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42970,8 +43068,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-5333",
-   "self_type" : "type-5332",
+   "referenced_type" : "type-5339",
+   "self_type" : "type-5338",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42980,8 +43078,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-5492",
-   "self_type" : "type-5491",
+   "referenced_type" : "type-5498",
+   "self_type" : "type-5497",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -42990,8 +43088,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-5656",
-   "self_type" : "type-5655",
+   "referenced_type" : "type-5665",
+   "self_type" : "type-5664",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43000,8 +43098,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-5795",
-   "self_type" : "type-5794",
+   "referenced_type" : "type-5804",
+   "self_type" : "type-5803",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43010,8 +43108,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-6322",
-   "self_type" : "type-6321",
+   "referenced_type" : "type-6331",
+   "self_type" : "type-6330",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43030,8 +43128,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-6516",
-   "self_type" : "type-6515",
+   "referenced_type" : "type-6525",
+   "self_type" : "type-6524",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43040,8 +43138,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-6668",
-   "self_type" : "type-6667",
+   "referenced_type" : "type-6678",
+   "self_type" : "type-6677",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43050,8 +43148,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-6812",
-   "self_type" : "type-6811",
+   "referenced_type" : "type-6821",
+   "self_type" : "type-6820",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43060,8 +43158,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-6960",
-   "self_type" : "type-6959",
+   "referenced_type" : "type-6969",
+   "self_type" : "type-6968",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43070,8 +43168,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-7140",
-   "self_type" : "type-7139",
+   "referenced_type" : "type-7149",
+   "self_type" : "type-7148",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43080,8 +43178,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-7372",
-   "self_type" : "type-7371",
+   "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"
   },
@@ -43090,8 +43188,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-7649",
-   "self_type" : "type-7648",
+   "referenced_type" : "type-7670",
+   "self_type" : "type-7669",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43100,8 +43198,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-7808",
-   "self_type" : "type-7807",
+   "referenced_type" : "type-7829",
+   "self_type" : "type-7828",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43110,8 +43208,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-7972",
-   "self_type" : "type-7971",
+   "referenced_type" : "type-7996",
+   "self_type" : "type-7995",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43120,8 +43218,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-8111",
-   "self_type" : "type-8110",
+   "referenced_type" : "type-8135",
+   "self_type" : "type-8134",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43130,8 +43228,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-8262",
-   "self_type" : "type-8261",
+   "referenced_type" : "type-8286",
+   "self_type" : "type-8285",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43140,8 +43238,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-8393",
-   "self_type" : "type-8392",
+   "referenced_type" : "type-8418",
+   "self_type" : "type-8417",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43150,8 +43248,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-8527",
-   "self_type" : "type-8526",
+   "referenced_type" : "type-8554",
+   "self_type" : "type-8553",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43160,8 +43258,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-8630",
-   "self_type" : "type-8629",
+   "referenced_type" : "type-8657",
+   "self_type" : "type-8656",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43180,8 +43278,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-9191",
-   "self_type" : "type-9190",
+   "referenced_type" : "type-9221",
+   "self_type" : "type-9220",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43190,8 +43288,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-9437",
-   "self_type" : "type-9436",
+   "referenced_type" : "type-9465",
+   "self_type" : "type-9464",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43200,8 +43298,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-9570",
-   "self_type" : "type-9569",
+   "referenced_type" : "type-9597",
+   "self_type" : "type-9596",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43210,8 +43308,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-9717",
-   "self_type" : "type-9716",
+   "referenced_type" : "type-9744",
+   "self_type" : "type-9743",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43220,8 +43318,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-9860",
-   "self_type" : "type-9859",
+   "referenced_type" : "type-9888",
+   "self_type" : "type-9887",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43230,8 +43328,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-1140",
-   "self_type" : "type-1139",
+   "referenced_type" : "type-1145",
+   "self_type" : "type-1144",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43240,8 +43338,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-1333",
-   "self_type" : "type-1332",
+   "referenced_type" : "type-1336",
+   "self_type" : "type-1335",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43250,8 +43348,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-3421",
-   "self_type" : "type-3420",
+   "referenced_type" : "type-3424",
+   "self_type" : "type-3423",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43260,8 +43358,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-3581",
-   "self_type" : "type-3580",
+   "referenced_type" : "type-3584",
+   "self_type" : "type-3583",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43270,8 +43368,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-3743",
-   "self_type" : "type-3742",
+   "referenced_type" : "type-3751",
+   "self_type" : "type-3750",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43280,8 +43378,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-3884",
-   "self_type" : "type-3883",
+   "referenced_type" : "type-3890",
+   "self_type" : "type-3889",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43290,8 +43388,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-4434",
-   "self_type" : "type-4433",
+   "referenced_type" : "type-4441",
+   "self_type" : "type-4440",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43300,8 +43398,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-4640",
-   "self_type" : "type-4639",
+   "referenced_type" : "type-4646",
+   "self_type" : "type-4645",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43310,8 +43408,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-4810",
-   "self_type" : "type-4809",
+   "referenced_type" : "type-4817",
+   "self_type" : "type-4816",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43320,8 +43418,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-5342",
-   "self_type" : "type-5341",
+   "referenced_type" : "type-5348",
+   "self_type" : "type-5347",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43330,8 +43428,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-5502",
-   "self_type" : "type-5501",
+   "referenced_type" : "type-5508",
+   "self_type" : "type-5507",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43340,8 +43438,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-5664",
-   "self_type" : "type-5663",
+   "referenced_type" : "type-5675",
+   "self_type" : "type-5674",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43350,8 +43448,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-5805",
-   "self_type" : "type-5804",
+   "referenced_type" : "type-5814",
+   "self_type" : "type-5813",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43360,8 +43458,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-6331",
-   "self_type" : "type-6330",
+   "referenced_type" : "type-6341",
+   "self_type" : "type-6340",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43380,8 +43478,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-6524",
-   "self_type" : "type-6523",
+   "referenced_type" : "type-6533",
+   "self_type" : "type-6532",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43390,8 +43488,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-6676",
-   "self_type" : "type-6675",
+   "referenced_type" : "type-6686",
+   "self_type" : "type-6685",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43400,8 +43498,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-6820",
-   "self_type" : "type-6819",
+   "referenced_type" : "type-6830",
+   "self_type" : "type-6829",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43410,8 +43508,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-6969",
-   "self_type" : "type-6968",
+   "referenced_type" : "type-6978",
+   "self_type" : "type-6977",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43420,8 +43518,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-7148",
-   "self_type" : "type-7147",
+   "referenced_type" : "type-7157",
+   "self_type" : "type-7156",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43430,8 +43528,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-7381",
-   "self_type" : "type-7380",
+   "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"
   },
@@ -43440,8 +43538,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-7658",
-   "self_type" : "type-7657",
+   "referenced_type" : "type-7679",
+   "self_type" : "type-7678",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43450,8 +43548,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-7818",
-   "self_type" : "type-7817",
+   "referenced_type" : "type-7839",
+   "self_type" : "type-7838",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43460,8 +43558,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-7980",
-   "self_type" : "type-7979",
+   "referenced_type" : "type-8006",
+   "self_type" : "type-8005",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43470,8 +43568,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-8121",
-   "self_type" : "type-8120",
+   "referenced_type" : "type-8145",
+   "self_type" : "type-8144",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43480,8 +43578,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-8270",
-   "self_type" : "type-8269",
+   "referenced_type" : "type-8294",
+   "self_type" : "type-8293",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43490,8 +43588,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-8404",
-   "self_type" : "type-8403",
+   "referenced_type" : "type-8428",
+   "self_type" : "type-8427",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43500,8 +43598,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-8535",
-   "self_type" : "type-8534",
+   "referenced_type" : "type-8564",
+   "self_type" : "type-8563",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43510,8 +43608,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-8640",
-   "self_type" : "type-8639",
+   "referenced_type" : "type-8667",
+   "self_type" : "type-8666",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43530,8 +43628,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-9201",
-   "self_type" : "type-9200",
+   "referenced_type" : "type-9230",
+   "self_type" : "type-9229",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43540,8 +43638,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-9445",
-   "self_type" : "type-9444",
+   "referenced_type" : "type-9473",
+   "self_type" : "type-9472",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43550,8 +43648,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-9578",
-   "self_type" : "type-9577",
+   "referenced_type" : "type-9605",
+   "self_type" : "type-9604",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43560,8 +43658,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-9725",
-   "self_type" : "type-9724",
+   "referenced_type" : "type-9752",
+   "self_type" : "type-9751",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43570,8 +43668,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-9869",
-   "self_type" : "type-9868",
+   "referenced_type" : "type-9896",
+   "self_type" : "type-9895",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -43580,8 +43678,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-1153",
+   "self_type" : "type-1152",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43590,8 +43688,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-1346",
+   "self_type" : "type-1345",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43600,8 +43698,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3437",
+   "self_type" : "type-3436",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43610,8 +43708,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3592",
+   "self_type" : "type-3591",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43620,8 +43718,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3759",
+   "self_type" : "type-3758",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43630,8 +43728,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3901",
+   "self_type" : "type-3900",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43640,8 +43738,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4449",
+   "self_type" : "type-4448",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43650,8 +43748,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4655",
+   "self_type" : "type-4654",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43660,8 +43758,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4825",
+   "self_type" : "type-4824",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43670,8 +43768,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5361",
+   "self_type" : "type-5360",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43680,8 +43778,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5516",
+   "self_type" : "type-5515",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43690,8 +43788,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5683",
+   "self_type" : "type-5682",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43700,8 +43798,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5825",
+   "self_type" : "type-5824",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43710,8 +43808,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6349",
+   "self_type" : "type-6348",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43720,8 +43818,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6542",
+   "self_type" : "type-6541",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43730,8 +43828,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6694",
+   "self_type" : "type-6693",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43750,8 +43848,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6838",
+   "self_type" : "type-6837",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43760,8 +43858,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6988",
+   "self_type" : "type-6987",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43770,8 +43868,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7167",
+   "self_type" : "type-7166",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43780,8 +43878,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7251",
+   "self_type" : "type-7250",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43790,8 +43888,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7414",
+   "self_type" : "type-7413",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43800,8 +43898,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7692",
+   "self_type" : "type-7691",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43810,8 +43908,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7847",
+   "self_type" : "type-7846",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43820,8 +43918,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8014",
+   "self_type" : "type-8013",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43830,8 +43928,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8156",
+   "self_type" : "type-8155",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43840,8 +43938,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8303",
+   "self_type" : "type-8302",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43850,8 +43948,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8436",
+   "self_type" : "type-8435",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43860,8 +43958,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8572",
+   "self_type" : "type-8571",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/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-8677",
+   "self_type" : "type-8676",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43880,8 +43988,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-9238",
+   "self_type" : "type-9237",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43890,8 +43998,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-9482",
+   "self_type" : "type-9481",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43900,8 +44008,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-9613",
+   "self_type" : "type-9612",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43910,18 +44018,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-9760",
+   "self_type" : "type-9759",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43930,8 +44028,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-1148",
-   "self_type" : "type-1147",
+   "referenced_type" : "type-1151",
+   "self_type" : "type-1150",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43940,8 +44038,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-1341",
-   "self_type" : "type-1340",
+   "referenced_type" : "type-1344",
+   "self_type" : "type-1343",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43950,8 +44048,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-3432",
-   "self_type" : "type-3431",
+   "referenced_type" : "type-3435",
+   "self_type" : "type-3434",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43960,8 +44058,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-3587",
-   "self_type" : "type-3586",
+   "referenced_type" : "type-3590",
+   "self_type" : "type-3589",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43970,8 +44068,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-3751",
-   "self_type" : "type-3750",
+   "referenced_type" : "type-3757",
+   "self_type" : "type-3756",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43980,8 +44078,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-3893",
-   "self_type" : "type-3892",
+   "referenced_type" : "type-3899",
+   "self_type" : "type-3898",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -43990,8 +44088,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-4441",
-   "self_type" : "type-4440",
+   "referenced_type" : "type-4447",
+   "self_type" : "type-4446",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44000,8 +44098,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-4646",
-   "self_type" : "type-4645",
+   "referenced_type" : "type-4653",
+   "self_type" : "type-4652",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44010,8 +44108,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-4817",
-   "self_type" : "type-4816",
+   "referenced_type" : "type-4823",
+   "self_type" : "type-4822",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44020,8 +44118,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-5353",
-   "self_type" : "type-5352",
+   "referenced_type" : "type-5359",
+   "self_type" : "type-5358",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44030,8 +44128,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-5508",
-   "self_type" : "type-5507",
+   "referenced_type" : "type-5514",
+   "self_type" : "type-5513",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44040,8 +44138,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-5672",
-   "self_type" : "type-5671",
+   "referenced_type" : "type-5681",
+   "self_type" : "type-5680",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44050,8 +44148,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-5814",
-   "self_type" : "type-5813",
+   "referenced_type" : "type-5823",
+   "self_type" : "type-5822",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44060,8 +44158,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-6338",
-   "self_type" : "type-6337",
+   "referenced_type" : "type-6347",
+   "self_type" : "type-6346",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44070,8 +44168,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-6530",
-   "self_type" : "type-6529",
+   "referenced_type" : "type-6540",
+   "self_type" : "type-6539",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44090,8 +44188,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-6683",
-   "self_type" : "type-6682",
+   "referenced_type" : "type-6692",
+   "self_type" : "type-6691",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44100,8 +44198,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-6827",
-   "self_type" : "type-6826",
+   "referenced_type" : "type-6836",
+   "self_type" : "type-6835",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44110,8 +44208,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-6976",
-   "self_type" : "type-6975",
+   "referenced_type" : "type-6985",
+   "self_type" : "type-6984",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44120,8 +44218,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-7156",
-   "self_type" : "type-7155",
+   "referenced_type" : "type-7165",
+   "self_type" : "type-7164",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44130,8 +44228,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-7389",
-   "self_type" : "type-7388",
+   "referenced_type" : "type-7249",
+   "self_type" : "type-7248",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44140,8 +44238,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-7669",
-   "self_type" : "type-7668",
+   "referenced_type" : "type-7412",
+   "self_type" : "type-7411",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44150,8 +44248,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-7824",
-   "self_type" : "type-7823",
+   "referenced_type" : "type-7690",
+   "self_type" : "type-7689",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44160,8 +44258,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-7988",
-   "self_type" : "type-7987",
+   "referenced_type" : "type-7845",
+   "self_type" : "type-7844",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44170,8 +44268,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-8130",
-   "self_type" : "type-8129",
+   "referenced_type" : "type-8012",
+   "self_type" : "type-8011",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44180,8 +44278,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-8277",
-   "self_type" : "type-8276",
+   "referenced_type" : "type-8154",
+   "self_type" : "type-8153",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44190,8 +44288,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-8410",
-   "self_type" : "type-8409",
+   "referenced_type" : "type-8301",
+   "self_type" : "type-8300",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44200,8 +44298,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-8543",
-   "self_type" : "type-8542",
+   "referenced_type" : "type-8434",
+   "self_type" : "type-8433",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44210,8 +44308,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8570",
+   "self_type" : "type-8569",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-8675",
+   "self_type" : "type-8674",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44230,8 +44338,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-9209",
-   "self_type" : "type-9208",
+   "referenced_type" : "type-9236",
+   "self_type" : "type-9235",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44240,8 +44348,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-9452",
-   "self_type" : "type-9451",
+   "referenced_type" : "type-9480",
+   "self_type" : "type-9479",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44250,8 +44358,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-9584",
-   "self_type" : "type-9583",
+   "referenced_type" : "type-9611",
+   "self_type" : "type-9610",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44260,18 +44368,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-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",
+   "referenced_type" : "type-9758",
+   "self_type" : "type-9757",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44280,8 +44378,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-1146",
-   "self_type" : "type-1145",
+   "referenced_type" : "type-1149",
+   "self_type" : "type-1148",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44290,8 +44388,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-1339",
-   "self_type" : "type-1338",
+   "referenced_type" : "type-1342",
+   "self_type" : "type-1341",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44300,8 +44398,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-3430",
-   "self_type" : "type-3429",
+   "referenced_type" : "type-3433",
+   "self_type" : "type-3432",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44310,8 +44408,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-3585",
-   "self_type" : "type-3584",
+   "referenced_type" : "type-3588",
+   "self_type" : "type-3587",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44320,8 +44418,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-3749",
-   "self_type" : "type-3748",
+   "referenced_type" : "type-3755",
+   "self_type" : "type-3754",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44330,8 +44428,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-3891",
-   "self_type" : "type-3890",
+   "referenced_type" : "type-3897",
+   "self_type" : "type-3896",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44340,8 +44438,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-4439",
-   "self_type" : "type-4438",
+   "referenced_type" : "type-4445",
+   "self_type" : "type-4444",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44350,8 +44448,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-4644",
-   "self_type" : "type-4643",
+   "referenced_type" : "type-4650",
+   "self_type" : "type-4649",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44360,8 +44458,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-4815",
-   "self_type" : "type-4814",
+   "referenced_type" : "type-4821",
+   "self_type" : "type-4820",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44370,8 +44468,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-5351",
-   "self_type" : "type-5350",
+   "referenced_type" : "type-5357",
+   "self_type" : "type-5356",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44380,8 +44478,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-5506",
-   "self_type" : "type-5505",
+   "referenced_type" : "type-5512",
+   "self_type" : "type-5511",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44390,8 +44488,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-5670",
-   "self_type" : "type-5669",
+   "referenced_type" : "type-5679",
+   "self_type" : "type-5678",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44400,8 +44498,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-5812",
-   "self_type" : "type-5811",
+   "referenced_type" : "type-5821",
+   "self_type" : "type-5820",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44410,8 +44508,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-6336",
-   "self_type" : "type-6335",
+   "referenced_type" : "type-6345",
+   "self_type" : "type-6344",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44420,8 +44518,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-6528",
-   "self_type" : "type-6527",
+   "referenced_type" : "type-6537",
+   "self_type" : "type-6536",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44440,8 +44538,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-6681",
-   "self_type" : "type-6680",
+   "referenced_type" : "type-6690",
+   "self_type" : "type-6689",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44450,8 +44548,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-6825",
-   "self_type" : "type-6824",
+   "referenced_type" : "type-6834",
+   "self_type" : "type-6833",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44460,8 +44558,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-6974",
-   "self_type" : "type-6973",
+   "referenced_type" : "type-6983",
+   "self_type" : "type-6982",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44470,8 +44568,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-7154",
-   "self_type" : "type-7153",
+   "referenced_type" : "type-7163",
+   "self_type" : "type-7162",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44480,8 +44578,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-7387",
-   "self_type" : "type-7386",
+   "referenced_type" : "type-7247",
+   "self_type" : "type-7246",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44490,8 +44588,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-7667",
-   "self_type" : "type-7666",
+   "referenced_type" : "type-7409",
+   "self_type" : "type-7408",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44500,8 +44598,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-7822",
-   "self_type" : "type-7821",
+   "referenced_type" : "type-7688",
+   "self_type" : "type-7687",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44510,8 +44608,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-7986",
-   "self_type" : "type-7985",
+   "referenced_type" : "type-7843",
+   "self_type" : "type-7842",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44520,8 +44618,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-8128",
-   "self_type" : "type-8127",
+   "referenced_type" : "type-8010",
+   "self_type" : "type-8009",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44530,8 +44628,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-8275",
-   "self_type" : "type-8274",
+   "referenced_type" : "type-8152",
+   "self_type" : "type-8151",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44540,8 +44638,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-8408",
-   "self_type" : "type-8407",
+   "referenced_type" : "type-8299",
+   "self_type" : "type-8298",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44550,8 +44648,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-8541",
-   "self_type" : "type-8540",
+   "referenced_type" : "type-8432",
+   "self_type" : "type-8431",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44560,8 +44658,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8568",
+   "self_type" : "type-8567",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-8673",
+   "self_type" : "type-8672",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44580,8 +44688,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-9207",
-   "self_type" : "type-9206",
+   "referenced_type" : "type-9234",
+   "self_type" : "type-9233",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44590,8 +44698,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-9450",
-   "self_type" : "type-9449",
+   "referenced_type" : "type-9478",
+   "self_type" : "type-9477",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44600,8 +44708,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-9582",
-   "self_type" : "type-9581",
+   "referenced_type" : "type-9609",
+   "self_type" : "type-9608",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44610,18 +44718,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-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",
+   "referenced_type" : "type-9756",
+   "self_type" : "type-9755",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44630,8 +44728,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-1144",
-   "self_type" : "type-1143",
+   "referenced_type" : "type-1147",
+   "self_type" : "type-1146",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44640,8 +44738,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-1337",
-   "self_type" : "type-1336",
+   "referenced_type" : "type-1340",
+   "self_type" : "type-1339",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44650,8 +44748,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-3428",
-   "self_type" : "type-3427",
+   "referenced_type" : "type-3431",
+   "self_type" : "type-3430",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44660,8 +44758,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-3583",
-   "self_type" : "type-3582",
+   "referenced_type" : "type-3586",
+   "self_type" : "type-3585",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44670,8 +44768,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-3747",
-   "self_type" : "type-3746",
+   "referenced_type" : "type-3753",
+   "self_type" : "type-3752",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44680,8 +44778,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-3889",
-   "self_type" : "type-3888",
+   "referenced_type" : "type-3895",
+   "self_type" : "type-3894",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44690,8 +44788,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-4437",
-   "self_type" : "type-4436",
+   "referenced_type" : "type-4443",
+   "self_type" : "type-4442",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44700,8 +44798,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-4642",
-   "self_type" : "type-4641",
+   "referenced_type" : "type-4648",
+   "self_type" : "type-4647",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44710,8 +44808,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-4813",
-   "self_type" : "type-4812",
+   "referenced_type" : "type-4819",
+   "self_type" : "type-4818",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44720,8 +44818,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-5349",
-   "self_type" : "type-5348",
+   "referenced_type" : "type-5355",
+   "self_type" : "type-5354",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44730,8 +44828,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-5504",
-   "self_type" : "type-5503",
+   "referenced_type" : "type-5510",
+   "self_type" : "type-5509",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44740,8 +44838,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-5668",
-   "self_type" : "type-5667",
+   "referenced_type" : "type-5677",
+   "self_type" : "type-5676",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44750,8 +44848,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-5810",
-   "self_type" : "type-5809",
+   "referenced_type" : "type-5819",
+   "self_type" : "type-5818",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44760,8 +44858,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-6334",
-   "self_type" : "type-6333",
+   "referenced_type" : "type-6343",
+   "self_type" : "type-6342",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44770,8 +44868,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-6526",
-   "self_type" : "type-6525",
+   "referenced_type" : "type-6535",
+   "self_type" : "type-6534",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44790,8 +44888,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-6679",
-   "self_type" : "type-6678",
+   "referenced_type" : "type-6688",
+   "self_type" : "type-6687",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44800,8 +44898,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-6822",
-   "self_type" : "type-6821",
+   "referenced_type" : "type-6832",
+   "self_type" : "type-6831",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44810,8 +44908,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-6972",
-   "self_type" : "type-6971",
+   "referenced_type" : "type-6981",
+   "self_type" : "type-6980",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44820,8 +44918,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-7152",
-   "self_type" : "type-7151",
+   "referenced_type" : "type-7161",
+   "self_type" : "type-7160",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44830,8 +44928,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-7385",
-   "self_type" : "type-7384",
+   "referenced_type" : "type-7407",
+   "self_type" : "type-7406",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44840,8 +44938,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-7665",
-   "self_type" : "type-7664",
+   "referenced_type" : "type-7686",
+   "self_type" : "type-7685",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44850,8 +44948,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-7820",
-   "self_type" : "type-7819",
+   "referenced_type" : "type-7841",
+   "self_type" : "type-7840",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44860,8 +44958,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-7984",
-   "self_type" : "type-7983",
+   "referenced_type" : "type-8008",
+   "self_type" : "type-8007",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44870,8 +44968,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-8126",
-   "self_type" : "type-8125",
+   "referenced_type" : "type-8150",
+   "self_type" : "type-8149",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44880,8 +44978,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-8273",
-   "self_type" : "type-8272",
+   "referenced_type" : "type-8297",
+   "self_type" : "type-8296",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44890,8 +44988,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-8406",
-   "self_type" : "type-8405",
+   "referenced_type" : "type-8430",
+   "self_type" : "type-8429",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44900,8 +44998,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-8539",
-   "self_type" : "type-8538",
+   "referenced_type" : "type-8566",
+   "self_type" : "type-8565",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44910,8 +45008,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-8644",
-   "self_type" : "type-8643",
+   "referenced_type" : "type-8671",
+   "self_type" : "type-8670",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44930,8 +45028,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-9205",
-   "self_type" : "type-9204",
+   "referenced_type" : "type-9232",
+   "self_type" : "type-9231",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44940,8 +45038,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-9448",
-   "self_type" : "type-9447",
+   "referenced_type" : "type-9476",
+   "self_type" : "type-9475",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44950,8 +45048,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-9580",
-   "self_type" : "type-9579",
+   "referenced_type" : "type-9607",
+   "self_type" : "type-9606",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44960,8 +45058,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-9727",
-   "self_type" : "type-9726",
+   "referenced_type" : "type-9754",
+   "self_type" : "type-9753",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44970,8 +45068,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-9872",
-   "self_type" : "type-9871",
+   "referenced_type" : "type-9898",
+   "self_type" : "type-9897",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44980,8 +45078,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-1152",
-   "self_type" : "type-1151",
+   "referenced_type" : "type-1155",
+   "self_type" : "type-1154",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -44990,8 +45088,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-1345",
-   "self_type" : "type-1344",
+   "referenced_type" : "type-1348",
+   "self_type" : "type-1347",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45000,8 +45098,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-3436",
-   "self_type" : "type-3435",
+   "referenced_type" : "type-3439",
+   "self_type" : "type-3438",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45010,8 +45108,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-3591",
-   "self_type" : "type-3590",
+   "referenced_type" : "type-3594",
+   "self_type" : "type-3593",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45020,8 +45118,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-3755",
-   "self_type" : "type-3754",
+   "referenced_type" : "type-3761",
+   "self_type" : "type-3760",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45030,8 +45128,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-3897",
-   "self_type" : "type-3896",
+   "referenced_type" : "type-3903",
+   "self_type" : "type-3902",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45040,8 +45138,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-4445",
-   "self_type" : "type-4444",
+   "referenced_type" : "type-4451",
+   "self_type" : "type-4450",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45050,8 +45148,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-4650",
-   "self_type" : "type-4649",
+   "referenced_type" : "type-4657",
+   "self_type" : "type-4656",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45060,8 +45158,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-4821",
-   "self_type" : "type-4820",
+   "referenced_type" : "type-4827",
+   "self_type" : "type-4826",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45070,8 +45168,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-5357",
-   "self_type" : "type-5356",
+   "referenced_type" : "type-5363",
+   "self_type" : "type-5362",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45080,8 +45178,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-5512",
-   "self_type" : "type-5511",
+   "referenced_type" : "type-5518",
+   "self_type" : "type-5517",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45090,8 +45188,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-5676",
-   "self_type" : "type-5675",
+   "referenced_type" : "type-5685",
+   "self_type" : "type-5684",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45100,8 +45198,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-5818",
-   "self_type" : "type-5817",
+   "referenced_type" : "type-5827",
+   "self_type" : "type-5826",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45110,8 +45208,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-6342",
-   "self_type" : "type-6341",
+   "referenced_type" : "type-6351",
+   "self_type" : "type-6350",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45120,8 +45218,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-6534",
-   "self_type" : "type-6533",
+   "referenced_type" : "type-6544",
+   "self_type" : "type-6543",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45130,8 +45228,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-6687",
-   "self_type" : "type-6686",
+   "referenced_type" : "type-6696",
+   "self_type" : "type-6695",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45150,8 +45248,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-6831",
-   "self_type" : "type-6830",
+   "referenced_type" : "type-6840",
+   "self_type" : "type-6839",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45160,8 +45258,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-6981",
-   "self_type" : "type-6980",
+   "referenced_type" : "type-6990",
+   "self_type" : "type-6989",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45170,8 +45268,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-7160",
-   "self_type" : "type-7159",
+   "referenced_type" : "type-7169",
+   "self_type" : "type-7168",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45180,8 +45278,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-7394",
-   "self_type" : "type-7393",
+   "referenced_type" : "type-7253",
+   "self_type" : "type-7252",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45190,8 +45288,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-7673",
-   "self_type" : "type-7672",
+   "referenced_type" : "type-7416",
+   "self_type" : "type-7415",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45200,8 +45298,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-7828",
-   "self_type" : "type-7827",
+   "referenced_type" : "type-7694",
+   "self_type" : "type-7693",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45210,8 +45308,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-7992",
-   "self_type" : "type-7991",
+   "referenced_type" : "type-7849",
+   "self_type" : "type-7848",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45220,8 +45318,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-8134",
-   "self_type" : "type-8133",
+   "referenced_type" : "type-8016",
+   "self_type" : "type-8015",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45230,8 +45328,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-8281",
-   "self_type" : "type-8280",
+   "referenced_type" : "type-8158",
+   "self_type" : "type-8157",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45240,8 +45338,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-8414",
-   "self_type" : "type-8413",
+   "referenced_type" : "type-8305",
+   "self_type" : "type-8304",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45250,8 +45348,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-8547",
-   "self_type" : "type-8546",
+   "referenced_type" : "type-8438",
+   "self_type" : "type-8437",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45260,8 +45358,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8574",
+   "self_type" : "type-8573",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/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-8679",
+   "self_type" : "type-8678",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45280,8 +45388,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-9213",
-   "self_type" : "type-9212",
+   "referenced_type" : "type-9240",
+   "self_type" : "type-9239",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45290,8 +45398,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-9456",
-   "self_type" : "type-9455",
+   "referenced_type" : "type-9484",
+   "self_type" : "type-9483",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45300,8 +45408,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-9588",
-   "self_type" : "type-9587",
+   "referenced_type" : "type-9615",
+   "self_type" : "type-9614",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45310,18 +45418,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-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",
+   "referenced_type" : "type-9762",
+   "self_type" : "type-9761",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -45340,8 +45438,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-1113",
-   "self_type" : "type-1112",
+   "referenced_type" : "type-1116",
+   "self_type" : "type-1115",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45350,8 +45448,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-1290",
-   "self_type" : "type-1289",
+   "referenced_type" : "type-1293",
+   "self_type" : "type-1292",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45360,8 +45458,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-3355",
-   "self_type" : "type-3354",
+   "referenced_type" : "type-3358",
+   "self_type" : "type-3357",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45370,8 +45468,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-3542",
-   "self_type" : "type-3541",
+   "referenced_type" : "type-3545",
+   "self_type" : "type-3544",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45380,8 +45478,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-3651",
-   "self_type" : "type-3650",
+   "referenced_type" : "type-3654",
+   "self_type" : "type-3653",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45390,8 +45488,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-3715",
-   "self_type" : "type-3714",
+   "referenced_type" : "type-3722",
+   "self_type" : "type-3721",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45400,8 +45498,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-3839",
-   "self_type" : "type-3838",
+   "referenced_type" : "type-3845",
+   "self_type" : "type-3844",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45410,8 +45508,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-4393",
-   "self_type" : "type-4392",
+   "referenced_type" : "type-4401",
+   "self_type" : "type-4400",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45420,8 +45518,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-4508",
-   "self_type" : "type-4507",
+   "referenced_type" : "type-4515",
+   "self_type" : "type-4514",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45430,8 +45528,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-4544",
-   "self_type" : "type-4543",
+   "referenced_type" : "type-4553",
+   "self_type" : "type-4552",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45440,8 +45538,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-4603",
-   "self_type" : "type-4602",
+   "referenced_type" : "type-4609",
+   "self_type" : "type-4608",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45450,8 +45548,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-4773",
-   "self_type" : "type-4772",
+   "referenced_type" : "type-4780",
+   "self_type" : "type-4779",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45460,8 +45558,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-4851",
-   "self_type" : "type-4850",
+   "referenced_type" : "type-4857",
+   "self_type" : "type-4856",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45470,8 +45568,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-5276",
-   "self_type" : "type-5275",
+   "referenced_type" : "type-5282",
+   "self_type" : "type-5281",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45490,8 +45588,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-5463",
-   "self_type" : "type-5462",
+   "referenced_type" : "type-5469",
+   "self_type" : "type-5468",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45500,8 +45598,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-5572",
-   "self_type" : "type-5571",
+   "referenced_type" : "type-5578",
+   "self_type" : "type-5577",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45510,8 +45608,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-5636",
-   "self_type" : "type-5635",
+   "referenced_type" : "type-5646",
+   "self_type" : "type-5645",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45520,8 +45618,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-5760",
-   "self_type" : "type-5759",
+   "referenced_type" : "type-5769",
+   "self_type" : "type-5768",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45530,8 +45628,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-6290",
-   "self_type" : "type-6289",
+   "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"
   },
@@ -45540,8 +45638,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-6392",
-   "self_type" : "type-6391",
+   "referenced_type" : "type-6402",
+   "self_type" : "type-6401",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45550,8 +45648,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-6428",
-   "self_type" : "type-6427",
+   "referenced_type" : "type-6440",
+   "self_type" : "type-6439",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45560,8 +45658,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-6487",
-   "self_type" : "type-6486",
+   "referenced_type" : "type-6496",
+   "self_type" : "type-6495",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45570,8 +45668,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-6639",
-   "self_type" : "type-6638",
+   "referenced_type" : "type-6649",
+   "self_type" : "type-6648",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45580,8 +45678,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-6715",
-   "self_type" : "type-6714",
+   "referenced_type" : "type-6724",
+   "self_type" : "type-6723",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45590,8 +45688,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-6742",
-   "self_type" : "type-6741",
+   "referenced_type" : "type-6751",
+   "self_type" : "type-6750",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45600,8 +45698,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-6833",
-   "self_type" : "type-6832",
+   "referenced_type" : "type-6842",
+   "self_type" : "type-6841",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45610,8 +45708,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-6877",
-   "self_type" : "type-6876",
+   "referenced_type" : "type-6886",
+   "self_type" : "type-6885",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45620,8 +45718,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-6983",
-   "self_type" : "type-6982",
+   "referenced_type" : "type-6992",
+   "self_type" : "type-6991",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45630,8 +45728,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-7056",
-   "self_type" : "type-7055",
+   "referenced_type" : "type-7064",
+   "self_type" : "type-7063",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45640,8 +45738,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-7113",
-   "self_type" : "type-7112",
+   "referenced_type" : "type-7122",
+   "self_type" : "type-7121",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45650,8 +45748,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-7288",
-   "self_type" : "type-7287",
+   "referenced_type" : "type-7255",
+   "self_type" : "type-7254",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45660,8 +45758,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-7342",
-   "self_type" : "type-7341",
+   "referenced_type" : "type-7308",
+   "self_type" : "type-7307",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45670,8 +45768,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-7592",
-   "self_type" : "type-7591",
+   "referenced_type" : "type-7364",
+   "self_type" : "type-7363",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45680,8 +45778,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-7779",
-   "self_type" : "type-7778",
+   "referenced_type" : "type-7613",
+   "self_type" : "type-7612",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45690,8 +45788,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-7888",
-   "self_type" : "type-7887",
+   "referenced_type" : "type-7800",
+   "self_type" : "type-7799",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45700,8 +45798,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-7952",
-   "self_type" : "type-7951",
+   "referenced_type" : "type-7909",
+   "self_type" : "type-7908",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45710,8 +45808,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-8076",
-   "self_type" : "type-8075",
+   "referenced_type" : "type-7977",
+   "self_type" : "type-7976",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45720,8 +45818,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-8232",
-   "self_type" : "type-8231",
+   "referenced_type" : "type-8100",
+   "self_type" : "type-8099",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45730,8 +45828,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-8365",
-   "self_type" : "type-8364",
+   "referenced_type" : "type-8257",
+   "self_type" : "type-8256",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45740,8 +45838,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-8461",
-   "self_type" : "type-8460",
+   "referenced_type" : "type-8389",
+   "self_type" : "type-8388",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45750,8 +45848,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-8507",
-   "self_type" : "type-8506",
+   "referenced_type" : "type-8485",
+   "self_type" : "type-8484",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45760,8 +45858,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-8535",
+   "self_type" : "type-8534",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-8627",
+   "self_type" : "type-8626",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45780,8 +45888,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-9155",
-   "self_type" : "type-9154",
+   "referenced_type" : "type-9185",
+   "self_type" : "type-9184",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45790,8 +45898,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-9274",
-   "self_type" : "type-9273",
+   "referenced_type" : "type-9303",
+   "self_type" : "type-9302",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45800,8 +45908,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-9325",
-   "self_type" : "type-9324",
+   "referenced_type" : "type-9354",
+   "self_type" : "type-9353",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45810,8 +45918,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-9403",
-   "self_type" : "type-9402",
+   "referenced_type" : "type-9432",
+   "self_type" : "type-9431",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45820,8 +45928,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-9544",
-   "self_type" : "type-9543",
+   "referenced_type" : "type-9571",
+   "self_type" : "type-9570",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45830,8 +45938,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-9608",
-   "self_type" : "type-9607",
+   "referenced_type" : "type-9637",
+   "self_type" : "type-9636",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45840,8 +45948,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-9648",
-   "self_type" : "type-9647",
+   "referenced_type" : "type-9676",
+   "self_type" : "type-9675",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45850,8 +45958,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-9737",
-   "self_type" : "type-9736",
+   "referenced_type" : "type-9764",
+   "self_type" : "type-9763",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45860,18 +45968,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-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",
+   "referenced_type" : "type-9804",
+   "self_type" : "type-9803",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -45880,8 +45978,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-4760",
-   "self_type" : "type-4759",
+   "referenced_type" : "type-4767",
+   "self_type" : "type-4766",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -45890,8 +45988,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-4864",
-   "self_type" : "type-4863",
+   "referenced_type" : "type-4870",
+   "self_type" : "type-4869",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -45900,8 +45998,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-6626",
-   "self_type" : "type-6625",
+   "referenced_type" : "type-6636",
+   "self_type" : "type-6635",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -45910,8 +46008,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-6728",
-   "self_type" : "type-6727",
+   "referenced_type" : "type-6737",
+   "self_type" : "type-6736",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -45920,188 +46018,228 @@
    "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-6860",
+   "self_type" : "type-6859",
+   "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-7007",
+   "self_type" : "type-7006",
+   "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-7083",
+   "self_type" : "type-7082",
+   "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-7269",
+   "self_type" : "type-7268",
+   "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-7320",
+   "self_type" : "type-7319",
+   "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-9561",
+   "self_type" : "type-9560",
+   "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-9656",
+   "self_type" : "type-9655",
+   "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-9781",
+   "self_type" : "type-9780",
+   "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-2647",
+   "self_type" : "type-2646",
+   "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-4994",
+   "self_type" : "type-4993",
+   "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-7199",
+   "self_type" : "type-7198",
+   "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-8222",
+   "self_type" : "type-8221",
+   "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-9709",
+   "self_type" : "type-9708",
+   "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-2643",
+   "self_type" : "type-2642",
+   "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-4990",
+   "self_type" : "type-4989",
+   "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-7195",
+   "self_type" : "type-7194",
+   "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-8217",
+   "self_type" : "type-8216",
+   "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-9697",
+   "self_type" : "type-9696",
+   "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-4759",
+   "self_type" : "type-4758",
+   "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-4866",
+   "self_type" : "type-4865",
+   "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-6629",
+   "self_type" : "type-6628",
+   "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-6733",
+   "self_type" : "type-6732",
+   "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-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"
   },
@@ -46110,8 +46248,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-4860",
-   "self_type" : "type-4859",
+   "referenced_type" : "type-6996",
+   "self_type" : "type-6995",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -46120,8 +46258,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-6620",
-   "self_type" : "type-6619",
+   "referenced_type" : "type-7077",
+   "self_type" : "type-7076",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -46130,8 +46268,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-6724",
-   "self_type" : "type-6723",
+   "referenced_type" : "type-7259",
+   "self_type" : "type-7258",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -46140,8 +46278,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-6841",
-   "self_type" : "type-6840",
+   "referenced_type" : "type-7316",
+   "self_type" : "type-7315",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -46150,8 +46288,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-6987",
-   "self_type" : "type-6986",
+   "referenced_type" : "type-9555",
+   "self_type" : "type-9554",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -46160,8 +46298,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-7069",
-   "self_type" : "type-7068",
+   "referenced_type" : "type-9650",
+   "self_type" : "type-9649",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -46170,48 +46308,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-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",
+   "referenced_type" : "type-9772",
+   "self_type" : "type-9771",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -46220,8 +46318,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-1644",
-   "self_type" : "type-1643",
+   "referenced_type" : "type-1647",
+   "self_type" : "type-1646",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -46230,8 +46328,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-4105",
-   "self_type" : "type-4104",
+   "referenced_type" : "type-4112",
+   "self_type" : "type-4111",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -46240,8 +46338,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-6026",
-   "self_type" : "type-6025",
+   "referenced_type" : "type-6036",
+   "self_type" : "type-6035",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -46250,8 +46348,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-8854",
-   "self_type" : "type-8853",
+   "referenced_type" : "type-8881",
+   "self_type" : "type-8880",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -46270,8 +46368,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1108",
-   "self_type" : "type-1107",
+   "referenced_type" : "type-1111",
+   "self_type" : "type-1110",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46280,8 +46378,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1280",
-   "self_type" : "type-1279",
+   "referenced_type" : "type-1283",
+   "self_type" : "type-1282",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46290,8 +46388,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-3275",
+   "self_type" : "type-3274",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46300,8 +46398,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-3539",
+   "self_type" : "type-3538",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46310,8 +46408,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-3649",
+   "self_type" : "type-3648",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46320,8 +46418,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-3715",
+   "self_type" : "type-3714",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46330,8 +46428,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-3837",
+   "self_type" : "type-3836",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46350,8 +46448,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-4358",
+   "self_type" : "type-4357",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46360,8 +46458,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-4493",
+   "self_type" : "type-4492",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46370,8 +46468,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-4562",
+   "self_type" : "type-4561",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46380,8 +46478,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-4624",
+   "self_type" : "type-4623",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46390,8 +46488,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-4667",
+   "self_type" : "type-4666",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46400,8 +46498,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-4874",
+   "self_type" : "type-4873",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46410,8 +46508,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-5199",
+   "self_type" : "type-5198",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46420,8 +46518,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-5463",
+   "self_type" : "type-5462",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46430,8 +46528,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-5573",
+   "self_type" : "type-5572",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46440,8 +46538,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-5639",
+   "self_type" : "type-5638",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46450,8 +46548,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-5761",
+   "self_type" : "type-5760",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46460,8 +46558,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6261",
+   "self_type" : "type-6260",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46470,8 +46568,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6382",
+   "self_type" : "type-6381",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46480,8 +46578,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6449",
+   "self_type" : "type-6448",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46490,8 +46588,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6511",
+   "self_type" : "type-6510",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46500,8 +46598,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6552",
+   "self_type" : "type-6551",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46510,8 +46608,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6741",
+   "self_type" : "type-6740",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46520,8 +46618,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6760",
+   "self_type" : "type-6759",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46530,8 +46628,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6766",
+   "self_type" : "type-6765",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46540,8 +46638,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6898",
+   "self_type" : "type-6897",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46550,8 +46648,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6908",
+   "self_type" : "type-6907",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46560,8 +46658,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7087",
+   "self_type" : "type-7086",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46570,8 +46668,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7117",
+   "self_type" : "type-7116",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46580,8 +46678,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7324",
+   "self_type" : "type-7323",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46590,8 +46688,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7354",
+   "self_type" : "type-7353",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46600,8 +46698,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7530",
+   "self_type" : "type-7529",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46610,8 +46708,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7794",
+   "self_type" : "type-7793",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46620,8 +46718,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7904",
+   "self_type" : "type-7903",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46630,8 +46728,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7970",
+   "self_type" : "type-7969",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46640,8 +46738,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-8092",
+   "self_type" : "type-8091",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46650,8 +46748,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-8247",
+   "self_type" : "type-8246",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46660,8 +46758,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-8384",
+   "self_type" : "type-8383",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46670,8 +46768,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-8480",
+   "self_type" : "type-8479",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46680,18 +46778,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-8527",
+   "self_type" : "type-8526",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46710,8 +46798,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-8619",
+   "self_type" : "type-8618",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46720,8 +46808,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-9140",
+   "self_type" : "type-9139",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46730,8 +46818,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-9278",
+   "self_type" : "type-9277",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46740,8 +46828,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-9367",
+   "self_type" : "type-9366",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46750,8 +46838,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-9448",
+   "self_type" : "type-9447",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46760,8 +46848,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-9493",
+   "self_type" : "type-9492",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46770,8 +46858,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-9661",
+   "self_type" : "type-9660",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46780,8 +46868,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-9686",
+   "self_type" : "type-9685",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46790,8 +46878,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-9691",
+   "self_type" : "type-9690",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46800,8 +46888,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-9800",
-   "self_type" : "type-9799",
+   "referenced_type" : "type-9817",
+   "self_type" : "type-9816",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-9828",
+   "self_type" : "type-9827",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -46810,8 +46908,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-4376",
-   "self_type" : "type-4375",
+   "referenced_type" : "type-4383",
+   "self_type" : "type-4382",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -46820,8 +46918,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-4505",
-   "self_type" : "type-4504",
+   "referenced_type" : "type-4511",
+   "self_type" : "type-4510",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -46830,8 +46928,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-6273",
-   "self_type" : "type-6272",
+   "referenced_type" : "type-6283",
+   "self_type" : "type-6282",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -46840,8 +46938,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-6389",
-   "self_type" : "type-6388",
+   "referenced_type" : "type-6398",
+   "self_type" : "type-6397",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -46850,8 +46948,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-9136",
-   "self_type" : "type-9135",
+   "referenced_type" : "type-9164",
+   "self_type" : "type-9163",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -46860,8 +46958,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-9269",
-   "self_type" : "type-9268",
+   "referenced_type" : "type-9298",
+   "self_type" : "type-9297",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -46901,7 +46999,7 @@
    "linker_set_key" : "const unsigned short",
    "name" : "const unsigned short",
    "referenced_type" : "type-497",
-   "self_type" : "type-2520",
+   "self_type" : "type-2523",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -46929,7 +47027,7 @@
    "linker_set_key" : "volatile int",
    "name" : "volatile int",
    "referenced_type" : "type-4",
-   "self_type" : "type-1250",
+   "self_type" : "type-1253",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h"
   }
@@ -46947,7 +47045,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -46962,8 +47060,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_BALANCETYPE",
    "name" : "OMX_AUDIO_CONFIG_BALANCETYPE",
-   "referenced_type" : "type-2184",
-   "self_type" : "type-2184",
+   "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_BALANCETYPE"
@@ -46979,7 +47077,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -46989,7 +47087,7 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nBass",
@@ -46999,8 +47097,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_BASSTYPE",
    "name" : "OMX_AUDIO_CONFIG_BASSTYPE",
-   "referenced_type" : "type-2188",
-   "self_type" : "type-2188",
+   "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_BASSTYPE"
@@ -47016,7 +47114,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47031,18 +47129,18 @@
     {
      "field_name" : "bMute",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bIsMIDI",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
    "name" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
-   "referenced_type" : "type-2186",
-   "self_type" : "type-2186",
+   "referenced_type" : "type-2189",
+   "self_type" : "type-2189",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE"
@@ -47058,7 +47156,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47073,23 +47171,23 @@
     {
      "field_name" : "bLinear",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "sVolume",
      "field_offset" : 160,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     },
     {
      "field_name" : "bIsMIDI",
      "field_offset" : 256,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
    "name" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
-   "referenced_type" : "type-2183",
-   "self_type" : "type-2183",
+   "referenced_type" : "type-2186",
+   "self_type" : "type-2186",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE"
@@ -47105,7 +47203,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47115,17 +47213,17 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "sDelay",
      "field_offset" : 128,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "sModulationRate",
      "field_offset" : 224,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "nModulationDepth",
@@ -47135,13 +47233,13 @@
     {
      "field_name" : "nFeedback",
      "field_offset" : 352,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
    "name" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
-   "referenced_type" : "type-2194",
-   "self_type" : "type-2194",
+   "referenced_type" : "type-2197",
+   "self_type" : "type-2197",
    "size" : 56,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHORUSTYPE"
@@ -47157,7 +47255,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47167,13 +47265,13 @@
     {
      "field_name" : "eEchoCancelation",
      "field_offset" : 96,
-     "referenced_type" : "type-2196"
+     "referenced_type" : "type-2199"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
-   "referenced_type" : "type-2197",
-   "self_type" : "type-2197",
+   "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_ECHOCANCELATIONTYPE"
@@ -47189,7 +47287,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47199,28 +47297,28 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "sBandIndex",
      "field_offset" : 128,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "sCenterFreq",
      "field_offset" : 224,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "sBandLevel",
      "field_offset" : 320,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
    "name" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
-   "referenced_type" : "type-2191",
-   "self_type" : "type-2191",
+   "referenced_type" : "type-2194",
+   "self_type" : "type-2194",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE"
@@ -47236,7 +47334,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47246,13 +47344,13 @@
     {
      "field_name" : "bLoudness",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
    "name" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
-   "referenced_type" : "type-2187",
-   "self_type" : "type-2187",
+   "referenced_type" : "type-2190",
+   "self_type" : "type-2190",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE"
@@ -47268,7 +47366,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47278,17 +47376,17 @@
     {
      "field_name" : "sPitchTransposition",
      "field_offset" : 96,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     },
     {
      "field_name" : "sPlayBackRate",
      "field_offset" : 192,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "sTempo",
      "field_offset" : 288,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "nMaxPolyphony",
@@ -47338,8 +47436,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
-   "referenced_type" : "type-2165",
-   "self_type" : "type-2165",
+   "referenced_type" : "type-2157",
+   "self_type" : "type-2157",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE"
@@ -47355,7 +47453,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47370,13 +47468,13 @@
     {
      "field_name" : "nMidiEvents",
      "field_offset" : 128,
-     "referenced_type" : "type-1572"
+     "referenced_type" : "type-1567"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
-   "referenced_type" : "type-2143",
-   "self_type" : "type-2143",
+   "referenced_type" : "type-2135",
+   "self_type" : "type-2135",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE"
@@ -47392,7 +47490,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47412,13 +47510,13 @@
     {
      "field_name" : "nData",
      "field_offset" : 160,
-     "referenced_type" : "type-1572"
+     "referenced_type" : "type-1567"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
-   "referenced_type" : "type-2181",
-   "self_type" : "type-2181",
+   "referenced_type" : "type-2184",
+   "self_type" : "type-2184",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE"
@@ -47434,7 +47532,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47469,8 +47567,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
-   "referenced_type" : "type-2176",
-   "self_type" : "type-2176",
+   "referenced_type" : "type-2179",
+   "self_type" : "type-2179",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE"
@@ -47486,7 +47584,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47516,8 +47614,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
-   "referenced_type" : "type-2154",
-   "self_type" : "type-2154",
+   "referenced_type" : "type-2146",
+   "self_type" : "type-2146",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE"
@@ -47533,7 +47631,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47558,7 +47656,7 @@
     {
      "field_name" : "bVibra",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nNumMetaEvents",
@@ -47573,13 +47671,13 @@
     {
      "field_name" : "eMIDIPlayBackState",
      "field_offset" : 288,
-     "referenced_type" : "type-2169"
+     "referenced_type" : "type-2168"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
-   "referenced_type" : "type-2170",
-   "self_type" : "type-2170",
+   "referenced_type" : "type-2173",
+   "self_type" : "type-2173",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE"
@@ -47595,7 +47693,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47605,13 +47703,13 @@
     {
      "field_name" : "bMute",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MUTETYPE",
    "name" : "OMX_AUDIO_CONFIG_MUTETYPE",
-   "referenced_type" : "type-2185",
-   "self_type" : "type-2185",
+   "referenced_type" : "type-2188",
+   "self_type" : "type-2188",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MUTETYPE"
@@ -47627,7 +47725,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47637,13 +47735,13 @@
     {
      "field_name" : "bNoiseReduction",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
-   "referenced_type" : "type-2198",
-   "self_type" : "type-2198",
+   "referenced_type" : "type-2201",
+   "self_type" : "type-2201",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE"
@@ -47659,7 +47757,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47669,47 +47767,47 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "sRoomLevel",
      "field_offset" : 128,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     },
     {
      "field_name" : "sRoomHighFreqLevel",
      "field_offset" : 224,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     },
     {
      "field_name" : "sReflectionsLevel",
      "field_offset" : 320,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     },
     {
      "field_name" : "sReflectionsDelay",
      "field_offset" : 416,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "sReverbLevel",
      "field_offset" : 512,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     },
     {
      "field_name" : "sReverbDelay",
      "field_offset" : 608,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "sDecayTime",
      "field_offset" : 704,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "nDecayHighFreqRatio",
      "field_offset" : 800,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "nDensity",
@@ -47724,13 +47822,13 @@
     {
      "field_name" : "sReferenceHighFreq",
      "field_offset" : 960,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
-   "referenced_type" : "type-2195",
-   "self_type" : "type-2195",
+   "referenced_type" : "type-2198",
+   "self_type" : "type-2198",
    "size" : 132,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE"
@@ -47746,7 +47844,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47756,12 +47854,12 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eWideningType",
      "field_offset" : 128,
-     "referenced_type" : "type-2192"
+     "referenced_type" : "type-2195"
     },
     {
      "field_name" : "nStereoWidening",
@@ -47771,8 +47869,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
    "name" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-2193",
-   "self_type" : "type-2193",
+   "referenced_type" : "type-2196",
+   "self_type" : "type-2196",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE"
@@ -47788,7 +47886,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47798,7 +47896,7 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nTreble",
@@ -47808,8 +47906,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_TREBLETYPE",
    "name" : "OMX_AUDIO_CONFIG_TREBLETYPE",
-   "referenced_type" : "type-2189",
-   "self_type" : "type-2189",
+   "referenced_type" : "type-2192",
+   "self_type" : "type-2192",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_TREBLETYPE"
@@ -47825,7 +47923,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47835,18 +47933,18 @@
     {
      "field_name" : "bLinear",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "sVolume",
      "field_offset" : 128,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
    "name" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
-   "referenced_type" : "type-2182",
-   "self_type" : "type-2182",
+   "referenced_type" : "type-2185",
+   "self_type" : "type-2185",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_VOLUMETYPE"
@@ -47862,7 +47960,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47907,23 +48005,23 @@
     {
      "field_name" : "eAACProfile",
      "field_offset" : 320,
-     "referenced_type" : "type-1676"
+     "referenced_type" : "type-1671"
     },
     {
      "field_name" : "eAACStreamFormat",
      "field_offset" : 352,
-     "referenced_type" : "type-1668"
+     "referenced_type" : "type-1670"
     },
     {
      "field_name" : "eChannelMode",
      "field_offset" : 384,
-     "referenced_type" : "type-1652"
+     "referenced_type" : "type-1651"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
    "name" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
-   "referenced_type" : "type-1687",
-   "self_type" : "type-1687",
+   "referenced_type" : "type-1679",
+   "self_type" : "type-1679",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_AACPROFILETYPE"
@@ -47939,7 +48037,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -47964,8 +48062,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_ADPCMTYPE",
    "name" : "OMX_AUDIO_PARAM_ADPCMTYPE",
-   "referenced_type" : "type-1798",
-   "self_type" : "type-1798",
+   "referenced_type" : "type-1789",
+   "self_type" : "type-1789",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_ADPCMTYPE"
@@ -47981,7 +48079,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48001,23 +48099,23 @@
     {
      "field_name" : "eAMRBandMode",
      "field_offset" : 160,
-     "referenced_type" : "type-1890"
+     "referenced_type" : "type-1881"
     },
     {
      "field_name" : "eAMRDTXMode",
      "field_offset" : 192,
-     "referenced_type" : "type-1901"
+     "referenced_type" : "type-1892"
     },
     {
      "field_name" : "eAMRFrameFormat",
      "field_offset" : 224,
-     "referenced_type" : "type-1877"
+     "referenced_type" : "type-1862"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_AMRTYPE",
    "name" : "OMX_AUDIO_PARAM_AMRTYPE",
-   "referenced_type" : "type-1912",
-   "self_type" : "type-1912",
+   "referenced_type" : "type-1903",
+   "self_type" : "type-1903",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_AMRTYPE"
@@ -48033,7 +48131,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48048,12 +48146,12 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-2021"
+     "referenced_type" : "type-2013"
     },
     {
      "field_name" : "bRATE_REDUCon",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nMinBitRate",
@@ -48068,23 +48166,23 @@
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 256,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bNoiseSuppressor",
      "field_offset" : 288,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_EVRCTYPE",
    "name" : "OMX_AUDIO_PARAM_EVRCTYPE",
-   "referenced_type" : "type-2055",
-   "self_type" : "type-2055",
+   "referenced_type" : "type-2046",
+   "self_type" : "type-2046",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_EVRCTYPE"
@@ -48100,7 +48198,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48125,8 +48223,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_FLACTYPE",
    "name" : "OMX_AUDIO_PARAM_FLACTYPE",
-   "referenced_type" : "type-1709",
-   "self_type" : "type-1709",
+   "referenced_type" : "type-1700",
+   "self_type" : "type-1700",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_FLACTYPE"
@@ -48142,7 +48240,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48157,28 +48255,28 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eBitRate",
      "field_offset" : 160,
-     "referenced_type" : "type-1808"
+     "referenced_type" : "type-1799"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G723TYPE",
    "name" : "OMX_AUDIO_PARAM_G723TYPE",
-   "referenced_type" : "type-1818",
-   "self_type" : "type-1818",
+   "referenced_type" : "type-1812",
+   "self_type" : "type-1812",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G723TYPE"
@@ -48194,7 +48292,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48209,13 +48307,13 @@
     {
      "field_name" : "eG726Mode",
      "field_offset" : 128,
-     "referenced_type" : "type-1831"
+     "referenced_type" : "type-1822"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G726TYPE",
    "name" : "OMX_AUDIO_PARAM_G726TYPE",
-   "referenced_type" : "type-1841",
-   "self_type" : "type-1841",
+   "referenced_type" : "type-1832",
+   "self_type" : "type-1832",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G726TYPE"
@@ -48231,7 +48329,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48246,18 +48344,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eBitType",
      "field_offset" : 160,
-     "referenced_type" : "type-1851"
+     "referenced_type" : "type-1845"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G729TYPE",
    "name" : "OMX_AUDIO_PARAM_G729TYPE",
-   "referenced_type" : "type-1860",
-   "self_type" : "type-1860",
+   "referenced_type" : "type-1855",
+   "self_type" : "type-1855",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G729TYPE"
@@ -48273,7 +48371,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48283,18 +48381,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
-   "referenced_type" : "type-1945",
-   "self_type" : "type-1945",
+   "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_GSMEFRTYPE"
@@ -48310,7 +48408,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48320,18 +48418,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMFRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMFRTYPE",
-   "referenced_type" : "type-1923",
-   "self_type" : "type-1923",
+   "referenced_type" : "type-1914",
+   "self_type" : "type-1914",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_GSMFRTYPE"
@@ -48347,7 +48445,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48357,18 +48455,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMHRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMHRTYPE",
-   "referenced_type" : "type-1934",
-   "self_type" : "type-1934",
+   "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_GSMHRTYPE"
@@ -48384,7 +48482,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48409,18 +48507,18 @@
     {
      "field_name" : "eMidiSoundBank",
      "field_offset" : 192,
-     "referenced_type" : "type-2111"
+     "referenced_type" : "type-2102"
     },
     {
      "field_name" : "eMidiSoundBankLayout",
      "field_offset" : 224,
-     "referenced_type" : "type-2121"
+     "referenced_type" : "type-2113"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
    "name" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
-   "referenced_type" : "type-2132",
-   "self_type" : "type-2132",
+   "referenced_type" : "type-2124",
+   "self_type" : "type-2124",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE"
@@ -48436,7 +48534,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48451,23 +48549,23 @@
     {
      "field_name" : "sMaxPolyphony",
      "field_offset" : 128,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "bLoadDefaultSound",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eMidiFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-2087"
+     "referenced_type" : "type-2079"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MIDITYPE",
    "name" : "OMX_AUDIO_PARAM_MIDITYPE",
-   "referenced_type" : "type-2098",
-   "self_type" : "type-2098",
+   "referenced_type" : "type-2090",
+   "self_type" : "type-2090",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MIDITYPE"
@@ -48483,7 +48581,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48513,18 +48611,18 @@
     {
      "field_name" : "eChannelMode",
      "field_offset" : 224,
-     "referenced_type" : "type-1652"
+     "referenced_type" : "type-1651"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-1660"
+     "referenced_type" : "type-1656"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MP3TYPE",
    "name" : "OMX_AUDIO_PARAM_MP3TYPE",
-   "referenced_type" : "type-1666",
-   "self_type" : "type-1666",
+   "referenced_type" : "type-1664",
+   "self_type" : "type-1664",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MP3TYPE"
@@ -48540,7 +48638,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48560,12 +48658,12 @@
     {
      "field_name" : "eEndian",
      "field_offset" : 160,
-     "referenced_type" : "type-1460"
+     "referenced_type" : "type-1459"
     },
     {
      "field_name" : "bInterleaved",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nBitPerSample",
@@ -48580,18 +48678,18 @@
     {
      "field_name" : "ePCMMode",
      "field_offset" : 288,
-     "referenced_type" : "type-1633"
+     "referenced_type" : "type-1628"
     },
     {
      "field_name" : "eChannelMapping",
      "field_offset" : 320,
-     "referenced_type" : "type-1642"
+     "referenced_type" : "type-1641"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PCMMODETYPE",
    "name" : "OMX_AUDIO_PARAM_PCMMODETYPE",
-   "referenced_type" : "type-1641",
-   "self_type" : "type-1641",
+   "referenced_type" : "type-1640",
+   "self_type" : "type-1640",
    "size" : 104,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PCMMODETYPE"
@@ -48607,7 +48705,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48622,18 +48720,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
-   "referenced_type" : "type-2000",
-   "self_type" : "type-2000",
+   "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_PDCEFRTYPE"
@@ -48649,7 +48747,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48664,18 +48762,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCFRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCFRTYPE",
-   "referenced_type" : "type-1989",
-   "self_type" : "type-1989",
+   "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_PDCFRTYPE"
@@ -48691,7 +48789,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48706,18 +48804,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCHRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCHRTYPE",
-   "referenced_type" : "type-2011",
-   "self_type" : "type-2011",
+   "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_PDCHRTYPE"
@@ -48733,7 +48831,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48748,7 +48846,7 @@
     {
      "field_name" : "eEncoding",
      "field_offset" : 128,
-     "referenced_type" : "type-1618"
+     "referenced_type" : "type-1616"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PORTFORMATTYPE",
@@ -48770,7 +48868,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48785,7 +48883,7 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-2021"
+     "referenced_type" : "type-2013"
     },
     {
      "field_name" : "nMinBitRate",
@@ -48800,8 +48898,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_QCELP13TYPE",
    "name" : "OMX_AUDIO_PARAM_QCELP13TYPE",
-   "referenced_type" : "type-2043",
-   "self_type" : "type-2043",
+   "referenced_type" : "type-2035",
+   "self_type" : "type-2035",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_QCELP13TYPE"
@@ -48817,7 +48915,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48837,7 +48935,7 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 160,
-     "referenced_type" : "type-2021"
+     "referenced_type" : "type-2013"
     },
     {
      "field_name" : "nMinBitRate",
@@ -48852,8 +48950,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_QCELP8TYPE",
    "name" : "OMX_AUDIO_PARAM_QCELP8TYPE",
-   "referenced_type" : "type-2032",
-   "self_type" : "type-2032",
+   "referenced_type" : "type-2024",
+   "self_type" : "type-2024",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_QCELP8TYPE"
@@ -48869,7 +48967,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48914,13 +49012,13 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 320,
-     "referenced_type" : "type-1752"
+     "referenced_type" : "type-1746"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_RATYPE",
    "name" : "OMX_AUDIO_PARAM_RATYPE",
-   "referenced_type" : "type-1765",
-   "self_type" : "type-1765",
+   "referenced_type" : "type-1756",
+   "self_type" : "type-1756",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_RATYPE"
@@ -48936,7 +49034,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -48976,23 +49074,23 @@
     {
      "field_name" : "bEnableBitrate",
      "field_offset" : 288,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eChannelMode",
      "field_offset" : 320,
-     "referenced_type" : "type-1652"
+     "referenced_type" : "type-1651"
     },
     {
      "field_name" : "eSBCAllocType",
      "field_offset" : 352,
-     "referenced_type" : "type-1775"
+     "referenced_type" : "type-1766"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_SBCTYPE",
    "name" : "OMX_AUDIO_PARAM_SBCTYPE",
-   "referenced_type" : "type-1785",
-   "self_type" : "type-1785",
+   "referenced_type" : "type-1779",
+   "self_type" : "type-1779",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_SBCTYPE"
@@ -49008,7 +49106,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -49023,12 +49121,12 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-2021"
+     "referenced_type" : "type-2013"
     },
     {
      "field_name" : "bRATE_REDUCon",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nMinBitRate",
@@ -49043,23 +49141,23 @@
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 256,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bNoiseSuppressor",
      "field_offset" : 288,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_SMVTYPE",
    "name" : "OMX_AUDIO_PARAM_SMVTYPE",
-   "referenced_type" : "type-2065",
-   "self_type" : "type-2065",
+   "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_SMVTYPE"
@@ -49075,7 +49173,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -49090,18 +49188,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
-   "referenced_type" : "type-1978",
-   "self_type" : "type-1978",
+   "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_TDMAEFRTYPE"
@@ -49117,7 +49215,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -49132,18 +49230,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
    "name" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
-   "referenced_type" : "type-1967",
-   "self_type" : "type-1967",
+   "referenced_type" : "type-1958",
+   "self_type" : "type-1958",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_TDMAFRTYPE"
@@ -49159,7 +49257,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -49204,18 +49302,18 @@
     {
      "field_name" : "bManaged",
      "field_offset" : 320,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bDownmix",
      "field_offset" : 352,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_VORBISTYPE",
    "name" : "OMX_AUDIO_PARAM_VORBISTYPE",
-   "referenced_type" : "type-1698",
-   "self_type" : "type-1698",
+   "referenced_type" : "type-1689",
+   "self_type" : "type-1689",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_VORBISTYPE"
@@ -49231,7 +49329,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -49251,12 +49349,12 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-1719"
+     "referenced_type" : "type-1711"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 192,
-     "referenced_type" : "type-1732"
+     "referenced_type" : "type-1722"
     },
     {
      "field_name" : "nSamplingRate",
@@ -49281,8 +49379,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_WMATYPE",
    "name" : "OMX_AUDIO_PARAM_WMATYPE",
-   "referenced_type" : "type-1742",
-   "self_type" : "type-1742",
+   "referenced_type" : "type-1733",
+   "self_type" : "type-1733",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_WMATYPE"
@@ -49303,18 +49401,18 @@
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 64,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eEncoding",
      "field_offset" : 96,
-     "referenced_type" : "type-1618"
+     "referenced_type" : "type-1616"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PORTDEFINITIONTYPE",
    "name" : "OMX_AUDIO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-1619",
-   "self_type" : "type-1619",
+   "referenced_type" : "type-1621",
+   "self_type" : "type-1621",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PORTDEFINITIONTYPE"
@@ -49340,8 +49438,8 @@
    ],
    "linker_set_key" : "OMX_BS32",
    "name" : "OMX_BS32",
-   "referenced_type" : "type-1470",
-   "self_type" : "type-1470",
+   "referenced_type" : "type-1473",
+   "self_type" : "type-1473",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_BS32"
@@ -49367,8 +49465,8 @@
    ],
    "linker_set_key" : "OMX_BU32",
    "name" : "OMX_BU32",
-   "referenced_type" : "type-1469",
-   "self_type" : "type-1469",
+   "referenced_type" : "type-1468",
+   "self_type" : "type-1468",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_BU32"
@@ -49384,7 +49482,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "pBuffer",
@@ -49464,8 +49562,8 @@
    ],
    "linker_set_key" : "OMX_BUFFERHEADERTYPE",
    "name" : "OMX_BUFFERHEADERTYPE",
-   "referenced_type" : "type-1540",
-   "self_type" : "type-1540",
+   "referenced_type" : "type-1536",
+   "self_type" : "type-1536",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_BUFFERHEADERTYPE"
@@ -49476,23 +49574,23 @@
    [
     {
      "field_name" : "EventHandler",
-     "referenced_type" : "type-1591"
+     "referenced_type" : "type-1594"
     },
     {
      "field_name" : "EmptyBufferDone",
      "field_offset" : 32,
-     "referenced_type" : "type-1593"
+     "referenced_type" : "type-1596"
     },
     {
      "field_name" : "FillBufferDone",
      "field_offset" : 64,
-     "referenced_type" : "type-1593"
+     "referenced_type" : "type-1596"
     }
    ],
    "linker_set_key" : "OMX_CALLBACKTYPE",
    "name" : "OMX_CALLBACKTYPE",
-   "referenced_type" : "type-1590",
-   "self_type" : "type-1590",
+   "referenced_type" : "type-1593",
+   "self_type" : "type-1593",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_CALLBACKTYPE"
@@ -49508,13 +49606,13 @@
     {
      "field_name" : "pInitialize",
      "field_offset" : 32,
-     "referenced_type" : "type-1500"
+     "referenced_type" : "type-1499"
     }
    ],
    "linker_set_key" : "OMX_COMPONENTREGISTERTYPE",
    "name" : "OMX_COMPONENTREGISTERTYPE",
-   "referenced_type" : "type-1499",
-   "self_type" : "type-1499",
+   "referenced_type" : "type-1498",
+   "self_type" : "type-1498",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_COMPONENTREGISTERTYPE"
@@ -49530,7 +49628,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "pComponentPrivate",
@@ -49545,98 +49643,98 @@
     {
      "field_name" : "GetComponentVersion",
      "field_offset" : 128,
-     "referenced_type" : "type-2357"
+     "referenced_type" : "type-2360"
     },
     {
      "field_name" : "SendCommand",
      "field_offset" : 160,
-     "referenced_type" : "type-2361"
+     "referenced_type" : "type-2364"
     },
     {
      "field_name" : "GetParameter",
      "field_offset" : 192,
-     "referenced_type" : "type-2363"
+     "referenced_type" : "type-2366"
     },
     {
      "field_name" : "SetParameter",
      "field_offset" : 224,
-     "referenced_type" : "type-2363"
+     "referenced_type" : "type-2366"
     },
     {
      "field_name" : "GetConfig",
      "field_offset" : 256,
-     "referenced_type" : "type-2363"
+     "referenced_type" : "type-2366"
     },
     {
      "field_name" : "SetConfig",
      "field_offset" : 288,
-     "referenced_type" : "type-2363"
+     "referenced_type" : "type-2366"
     },
     {
      "field_name" : "GetExtensionIndex",
      "field_offset" : 320,
-     "referenced_type" : "type-2365"
+     "referenced_type" : "type-2368"
     },
     {
      "field_name" : "GetState",
      "field_offset" : 352,
-     "referenced_type" : "type-2368"
+     "referenced_type" : "type-2371"
     },
     {
      "field_name" : "ComponentTunnelRequest",
      "field_offset" : 384,
-     "referenced_type" : "type-2371"
+     "referenced_type" : "type-2374"
     },
     {
      "field_name" : "UseBuffer",
      "field_offset" : 416,
-     "referenced_type" : "type-2374"
+     "referenced_type" : "type-2377"
     },
     {
      "field_name" : "AllocateBuffer",
      "field_offset" : 448,
-     "referenced_type" : "type-2377"
+     "referenced_type" : "type-2380"
     },
     {
      "field_name" : "FreeBuffer",
      "field_offset" : 480,
-     "referenced_type" : "type-2379"
+     "referenced_type" : "type-2382"
     },
     {
      "field_name" : "EmptyThisBuffer",
      "field_offset" : 512,
-     "referenced_type" : "type-2381"
+     "referenced_type" : "type-2384"
     },
     {
      "field_name" : "FillThisBuffer",
      "field_offset" : 544,
-     "referenced_type" : "type-2381"
+     "referenced_type" : "type-2384"
     },
     {
      "field_name" : "SetCallbacks",
      "field_offset" : 576,
-     "referenced_type" : "type-2383"
+     "referenced_type" : "type-2386"
     },
     {
      "field_name" : "ComponentDeInit",
      "field_offset" : 608,
-     "referenced_type" : "type-1500"
+     "referenced_type" : "type-1499"
     },
     {
      "field_name" : "UseEGLImage",
      "field_offset" : 640,
-     "referenced_type" : "type-2386"
+     "referenced_type" : "type-2389"
     },
     {
      "field_name" : "ComponentRoleEnum",
      "field_offset" : 672,
-     "referenced_type" : "type-2388"
+     "referenced_type" : "type-2391"
     }
    ],
    "linker_set_key" : "OMX_COMPONENTTYPE",
    "name" : "OMX_COMPONENTTYPE",
-   "referenced_type" : "type-2356",
-   "self_type" : "type-2356",
+   "referenced_type" : "type-2359",
+   "self_type" : "type-2359",
    "size" : 88,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_COMPONENTTYPE"
@@ -49652,7 +49750,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -49672,8 +49770,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_BACKLIGHTTYPE",
    "name" : "OMX_CONFIG_BACKLIGHTTYPE",
-   "referenced_type" : "type-2226",
-   "self_type" : "type-2226",
+   "referenced_type" : "type-2229",
+   "self_type" : "type-2229",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_BACKLIGHTTYPE"
@@ -49689,18 +49787,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "bEnabled",
      "field_offset" : 64,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_BOOLEANTYPE",
    "name" : "OMX_CONFIG_BOOLEANTYPE",
-   "referenced_type" : "type-2340",
-   "self_type" : "type-2340",
+   "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_CONFIG_BOOLEANTYPE"
@@ -49716,7 +49814,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -49731,8 +49829,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_BRIGHTNESSTYPE",
    "name" : "OMX_CONFIG_BRIGHTNESSTYPE",
-   "referenced_type" : "type-2225",
-   "self_type" : "type-2225",
+   "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_BRIGHTNESSTYPE"
@@ -49748,7 +49846,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -49758,12 +49856,12 @@
     {
      "field_name" : "bContinuous",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bFrameLimited",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nFrameLimit",
@@ -49773,8 +49871,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_CAPTUREMODETYPE",
    "name" : "OMX_CONFIG_CAPTUREMODETYPE",
-   "referenced_type" : "type-2240",
-   "self_type" : "type-2240",
+   "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"
@@ -49790,7 +49888,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -49805,13 +49903,13 @@
     {
      "field_name" : "eColorBlend",
      "field_offset" : 128,
-     "referenced_type" : "type-2209"
+     "referenced_type" : "type-2212"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_COLORBLENDTYPE",
    "name" : "OMX_CONFIG_COLORBLENDTYPE",
-   "referenced_type" : "type-2210",
-   "self_type" : "type-2210",
+   "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_CONFIG_COLORBLENDTYPE"
@@ -49827,7 +49925,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -49837,7 +49935,7 @@
     {
      "field_name" : "xColorMatrix",
      "field_offset" : 96,
-     "referenced_type" : "type-2201"
+     "referenced_type" : "type-2204"
     },
     {
      "field_name" : "xColorOffset",
@@ -49847,8 +49945,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_COLORCONVERSIONTYPE",
    "name" : "OMX_CONFIG_COLORCONVERSIONTYPE",
-   "referenced_type" : "type-2200",
-   "self_type" : "type-2200",
+   "referenced_type" : "type-2203",
+   "self_type" : "type-2203",
    "size" : 64,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORCONVERSIONTYPE"
@@ -49864,7 +49962,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -49874,7 +49972,7 @@
     {
      "field_name" : "bColorEnhancement",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nCustomizedU",
@@ -49889,8 +49987,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
    "name" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
-   "referenced_type" : "type-2207",
-   "self_type" : "type-2207",
+   "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_COLORENHANCEMENTTYPE"
@@ -49906,7 +50004,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -49926,8 +50024,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_COLORKEYTYPE",
    "name" : "OMX_CONFIG_COLORKEYTYPE",
-   "referenced_type" : "type-2208",
-   "self_type" : "type-2208",
+   "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_CONFIG_COLORKEYTYPE"
@@ -49943,12 +50041,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nParentNodeID",
@@ -49963,8 +50061,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
    "name" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
-   "referenced_type" : "type-2350",
-   "self_type" : "type-2350",
+   "referenced_type" : "type-2353",
+   "self_type" : "type-2353",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE"
@@ -49980,12 +50078,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nParentNodeID",
@@ -50010,13 +50108,13 @@
     {
      "field_name" : "bIsLeafType",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
    "name" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
-   "referenced_type" : "type-2351",
-   "self_type" : "type-2351",
+   "referenced_type" : "type-2354",
+   "self_type" : "type-2354",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_CONTAINERNODEIDTYPE"
@@ -50032,7 +50130,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50047,8 +50145,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_CONTRASTTYPE",
    "name" : "OMX_CONFIG_CONTRASTTYPE",
-   "referenced_type" : "type-2224",
-   "self_type" : "type-2224",
+   "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_CONTRASTTYPE"
@@ -50064,7 +50162,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50074,13 +50172,13 @@
     {
      "field_name" : "eDither",
      "field_offset" : 96,
-     "referenced_type" : "type-2238"
+     "referenced_type" : "type-2241"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_DITHERTYPE",
    "name" : "OMX_CONFIG_DITHERTYPE",
-   "referenced_type" : "type-2239",
-   "self_type" : "type-2239",
+   "referenced_type" : "type-2242",
+   "self_type" : "type-2242",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_DITHERTYPE"
@@ -50096,7 +50194,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50106,13 +50204,13 @@
     {
      "field_name" : "eExposureControl",
      "field_offset" : 96,
-     "referenced_type" : "type-2221"
+     "referenced_type" : "type-2224"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
    "name" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-2222",
-   "self_type" : "type-2222",
+   "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_EXPOSURECONTROLTYPE"
@@ -50128,7 +50226,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50138,7 +50236,7 @@
     {
      "field_name" : "eMetering",
      "field_offset" : 96,
-     "referenced_type" : "type-2242"
+     "referenced_type" : "type-2245"
     },
     {
      "field_name" : "xEVCompensation",
@@ -50153,7 +50251,7 @@
     {
      "field_name" : "bAutoAperture",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nShutterSpeedMsec",
@@ -50163,7 +50261,7 @@
     {
      "field_name" : "bAutoShutterSpeed",
      "field_offset" : 256,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nSensitivity",
@@ -50173,13 +50271,13 @@
     {
      "field_name" : "bAutoSensitivity",
      "field_offset" : 320,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_EXPOSUREVALUETYPE",
    "name" : "OMX_CONFIG_EXPOSUREVALUETYPE",
-   "referenced_type" : "type-2243",
-   "self_type" : "type-2243",
+   "referenced_type" : "type-2246",
+   "self_type" : "type-2246",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_EXPOSUREVALUETYPE"
@@ -50195,7 +50293,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50205,53 +50303,53 @@
     {
      "field_name" : "bCenter",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bLeft",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bRight",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bTop",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bBottom",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bTopLeft",
      "field_offset" : 256,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bTopRight",
      "field_offset" : 288,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bBottomLeft",
      "field_offset" : 320,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bBottomRight",
      "field_offset" : 352,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_FOCUSREGIONTYPE",
    "name" : "OMX_CONFIG_FOCUSREGIONTYPE",
-   "referenced_type" : "type-2245",
-   "self_type" : "type-2245",
+   "referenced_type" : "type-2248",
+   "self_type" : "type-2248",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_FOCUSREGIONTYPE"
@@ -50267,7 +50365,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50282,8 +50380,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_FRAMERATETYPE",
    "name" : "OMX_CONFIG_FRAMERATETYPE",
-   "referenced_type" : "type-2286",
-   "self_type" : "type-2286",
+   "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_FRAMERATETYPE"
@@ -50299,7 +50397,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50309,13 +50407,13 @@
     {
      "field_name" : "bStab",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_FRAMESTABTYPE",
    "name" : "OMX_CONFIG_FRAMESTABTYPE",
-   "referenced_type" : "type-2218",
-   "self_type" : "type-2218",
+   "referenced_type" : "type-2221",
+   "self_type" : "type-2221",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_FRAMESTABTYPE"
@@ -50331,7 +50429,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50346,8 +50444,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_GAMMATYPE",
    "name" : "OMX_CONFIG_GAMMATYPE",
-   "referenced_type" : "type-2227",
-   "self_type" : "type-2227",
+   "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_GAMMATYPE"
@@ -50363,7 +50461,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50373,13 +50471,13 @@
     {
      "field_name" : "eImageFilter",
      "field_offset" : 96,
-     "referenced_type" : "type-2205"
+     "referenced_type" : "type-2208"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_IMAGEFILTERTYPE",
    "name" : "OMX_CONFIG_IMAGEFILTERTYPE",
-   "referenced_type" : "type-2206",
-   "self_type" : "type-2206",
+   "referenced_type" : "type-2209",
+   "self_type" : "type-2209",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_IMAGEFILTERTYPE"
@@ -50395,7 +50493,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50405,13 +50503,13 @@
     {
      "field_name" : "IntraRefreshVOP",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
    "name" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
-   "referenced_type" : "type-2287",
-   "self_type" : "type-2287",
+   "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_INTRAREFRESHVOPTYPE"
@@ -50427,7 +50525,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50442,8 +50540,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_LIGHTNESSTYPE",
    "name" : "OMX_CONFIG_LIGHTNESSTYPE",
-   "referenced_type" : "type-2229",
-   "self_type" : "type-2229",
+   "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"
@@ -50459,7 +50557,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50474,13 +50572,13 @@
     {
      "field_name" : "ErrMap",
      "field_offset" : 128,
-     "referenced_type" : "type-1572"
+     "referenced_type" : "type-1567"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
    "name" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
-   "referenced_type" : "type-2288",
-   "self_type" : "type-2288",
+   "referenced_type" : "type-2291",
+   "self_type" : "type-2291",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE"
@@ -50496,7 +50594,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50506,13 +50604,13 @@
     {
      "field_name" : "bEnabled",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
    "name" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
-   "referenced_type" : "type-2290",
-   "self_type" : "type-2290",
+   "referenced_type" : "type-2293",
+   "self_type" : "type-2293",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_MBERRORREPORTINGTYPE"
@@ -50528,12 +50626,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "eScopeMode",
      "field_offset" : 64,
-     "referenced_type" : "type-2346"
+     "referenced_type" : "type-2349"
     },
     {
      "field_name" : "nScopeSpecifier",
@@ -50548,8 +50646,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
    "name" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
-   "referenced_type" : "type-2348",
-   "self_type" : "type-2348",
+   "referenced_type" : "type-2351",
+   "self_type" : "type-2351",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_METADATAITEMCOUNTTYPE"
@@ -50565,12 +50663,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "eScopeMode",
      "field_offset" : 64,
-     "referenced_type" : "type-2346"
+     "referenced_type" : "type-2349"
     },
     {
      "field_name" : "nScopeSpecifier",
@@ -50585,12 +50683,12 @@
     {
      "field_name" : "eSearchMode",
      "field_offset" : 160,
-     "referenced_type" : "type-2347"
+     "referenced_type" : "type-2350"
     },
     {
      "field_name" : "eKeyCharset",
      "field_offset" : 192,
-     "referenced_type" : "type-2345"
+     "referenced_type" : "type-2348"
     },
     {
      "field_name" : "nKeySizeUsed",
@@ -50605,7 +50703,7 @@
     {
      "field_name" : "eValueCharset",
      "field_offset" : 1280,
-     "referenced_type" : "type-2345"
+     "referenced_type" : "type-2348"
     },
     {
      "field_name" : "sLanguageCountry",
@@ -50625,13 +50723,13 @@
     {
      "field_name" : "nValue",
      "field_offset" : 1408,
-     "referenced_type" : "type-1572"
+     "referenced_type" : "type-1567"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_METADATAITEMTYPE",
    "name" : "OMX_CONFIG_METADATAITEMTYPE",
-   "referenced_type" : "type-2349",
-   "self_type" : "type-2349",
+   "referenced_type" : "type-2352",
+   "self_type" : "type-2352",
    "size" : 180,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_METADATAITEMTYPE"
@@ -50647,7 +50745,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50657,13 +50755,13 @@
     {
      "field_name" : "eMirror",
      "field_offset" : 96,
-     "referenced_type" : "type-2213"
+     "referenced_type" : "type-2216"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MIRRORTYPE",
    "name" : "OMX_CONFIG_MIRRORTYPE",
-   "referenced_type" : "type-2214",
-   "self_type" : "type-2214",
+   "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_CONFIG_MIRRORTYPE"
@@ -50679,7 +50777,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50699,8 +50797,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_PLANEBLENDTYPE",
    "name" : "OMX_CONFIG_PLANEBLENDTYPE",
-   "referenced_type" : "type-2231",
-   "self_type" : "type-2231",
+   "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_CONFIG_PLANEBLENDTYPE"
@@ -50716,7 +50814,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50736,8 +50834,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_POINTTYPE",
    "name" : "OMX_CONFIG_POINTTYPE",
-   "referenced_type" : "type-2215",
-   "self_type" : "type-2215",
+   "referenced_type" : "type-2218",
+   "self_type" : "type-2218",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_POINTTYPE"
@@ -50753,7 +50851,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50783,8 +50881,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_RECTTYPE",
    "name" : "OMX_CONFIG_RECTTYPE",
-   "referenced_type" : "type-2216",
-   "self_type" : "type-2216",
+   "referenced_type" : "type-2219",
+   "self_type" : "type-2219",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_RECTTYPE"
@@ -50800,7 +50898,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50815,8 +50913,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_ROTATIONTYPE",
    "name" : "OMX_CONFIG_ROTATIONTYPE",
-   "referenced_type" : "type-2212",
-   "self_type" : "type-2212",
+   "referenced_type" : "type-2215",
+   "self_type" : "type-2215",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_ROTATIONTYPE"
@@ -50832,7 +50930,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50847,8 +50945,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_SATURATIONTYPE",
    "name" : "OMX_CONFIG_SATURATIONTYPE",
-   "referenced_type" : "type-2228",
-   "self_type" : "type-2228",
+   "referenced_type" : "type-2231",
+   "self_type" : "type-2231",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_SATURATIONTYPE"
@@ -50864,7 +50962,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50884,8 +50982,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_SCALEFACTORTYPE",
    "name" : "OMX_CONFIG_SCALEFACTORTYPE",
-   "referenced_type" : "type-2204",
-   "self_type" : "type-2204",
+   "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_SCALEFACTORTYPE"
@@ -50901,7 +50999,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50911,13 +51009,13 @@
     {
      "field_name" : "eEffect",
      "field_offset" : 96,
-     "referenced_type" : "type-2233"
+     "referenced_type" : "type-2236"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
    "name" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-2234",
-   "self_type" : "type-2234",
+   "referenced_type" : "type-2237",
+   "self_type" : "type-2237",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_TRANSITIONEFFECTTYPE"
@@ -50933,7 +51031,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50943,13 +51041,13 @@
     {
      "field_name" : "eWhiteBalControl",
      "field_offset" : 96,
-     "referenced_type" : "type-2219"
+     "referenced_type" : "type-2222"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
    "name" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-2220",
-   "self_type" : "type-2220",
+   "referenced_type" : "type-2223",
+   "self_type" : "type-2223",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_WHITEBALCONTROLTYPE"
@@ -50965,7 +51063,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50985,8 +51083,8 @@
    ],
    "linker_set_key" : "OMX_FRAMESIZETYPE",
    "name" : "OMX_FRAMESIZETYPE",
-   "referenced_type" : "type-2211",
-   "self_type" : "type-2211",
+   "referenced_type" : "type-2214",
+   "self_type" : "type-2214",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_FRAMESIZETYPE"
@@ -51002,7 +51100,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -51012,7 +51110,7 @@
     {
      "field_name" : "eFocusControl",
      "field_offset" : 96,
-     "referenced_type" : "type-2303"
+     "referenced_type" : "type-2306"
     },
     {
      "field_name" : "nFocusSteps",
@@ -51027,8 +51125,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
    "name" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-2304",
-   "self_type" : "type-2304",
+   "referenced_type" : "type-2307",
+   "self_type" : "type-2307",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE"
@@ -51044,7 +51142,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -51054,13 +51152,13 @@
     {
      "field_name" : "eFlashControl",
      "field_offset" : 96,
-     "referenced_type" : "type-2300"
+     "referenced_type" : "type-2303"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
    "name" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
-   "referenced_type" : "type-2302",
-   "self_type" : "type-2302",
+   "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_FLASHCONTROLTYPE"
@@ -51076,7 +51174,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -51086,23 +51184,23 @@
     {
      "field_name" : "eHuffmanTable",
      "field_offset" : 96,
-     "referenced_type" : "type-2309"
+     "referenced_type" : "type-2312"
     },
     {
      "field_name" : "nNumberOfHuffmanCodeOfLength",
      "field_offset" : 128,
-     "referenced_type" : "type-2311"
+     "referenced_type" : "type-2314"
     },
     {
      "field_name" : "nHuffmanTable",
      "field_offset" : 256,
-     "referenced_type" : "type-2312"
+     "referenced_type" : "type-2315"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
    "name" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
-   "referenced_type" : "type-2310",
-   "self_type" : "type-2310",
+   "referenced_type" : "type-2313",
+   "self_type" : "type-2313",
    "size" : 288,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE"
@@ -51118,7 +51216,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -51133,18 +51231,18 @@
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-2297"
+     "referenced_type" : "type-2300"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-2199"
+     "referenced_type" : "type-2202"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
    "name" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-2299",
-   "self_type" : "type-2299",
+   "referenced_type" : "type-2302",
+   "self_type" : "type-2302",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_PORTFORMATTYPE"
@@ -51160,7 +51258,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -51175,8 +51273,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_QFACTORTYPE",
    "name" : "OMX_IMAGE_PARAM_QFACTORTYPE",
-   "referenced_type" : "type-2305",
-   "self_type" : "type-2305",
+   "referenced_type" : "type-2308",
+   "self_type" : "type-2308",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_QFACTORTYPE"
@@ -51192,7 +51290,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -51202,18 +51300,18 @@
     {
      "field_name" : "eQuantizationTable",
      "field_offset" : 96,
-     "referenced_type" : "type-2306"
+     "referenced_type" : "type-2309"
     },
     {
      "field_name" : "nQuantizationMatrix",
      "field_offset" : 128,
-     "referenced_type" : "type-2308"
+     "referenced_type" : "type-2311"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
    "name" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-2307",
-   "self_type" : "type-2307",
+   "referenced_type" : "type-2310",
+   "self_type" : "type-2310",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE"
@@ -51254,17 +51352,17 @@
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 224,
-     "referenced_type" : "type-2297"
+     "referenced_type" : "type-2300"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-2199"
+     "referenced_type" : "type-2202"
     },
     {
      "field_name" : "pNativeWindow",
@@ -51274,8 +51372,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_PORTDEFINITIONTYPE",
    "name" : "OMX_IMAGE_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-2298",
-   "self_type" : "type-2298",
+   "referenced_type" : "type-2301",
+   "self_type" : "type-2301",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PORTDEFINITIONTYPE"
@@ -51296,8 +51394,8 @@
    ],
    "linker_set_key" : "OMX_MARKTYPE",
    "name" : "OMX_MARKTYPE",
-   "referenced_type" : "type-1477",
-   "self_type" : "type-1477",
+   "referenced_type" : "type-1475",
+   "self_type" : "type-1475",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_MARKTYPE"
@@ -51313,18 +51411,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "bEnablePM",
      "field_offset" : 64,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_OTHER_CONFIG_POWERTYPE",
    "name" : "OMX_OTHER_CONFIG_POWERTYPE",
-   "referenced_type" : "type-2327",
-   "self_type" : "type-2327",
+   "referenced_type" : "type-2330",
+   "self_type" : "type-2330",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_CONFIG_POWERTYPE"
@@ -51340,13 +51438,13 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     }
    ],
    "linker_set_key" : "OMX_OTHER_CONFIG_STATSTYPE",
    "name" : "OMX_OTHER_CONFIG_STATSTYPE",
-   "referenced_type" : "type-2328",
-   "self_type" : "type-2328",
+   "referenced_type" : "type-2331",
+   "self_type" : "type-2331",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_CONFIG_STATSTYPE"
@@ -51362,7 +51460,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -51372,7 +51470,7 @@
     {
      "field_name" : "eType",
      "field_offset" : 96,
-     "referenced_type" : "type-1561"
+     "referenced_type" : "type-1556"
     },
     {
      "field_name" : "nDataSize",
@@ -51382,13 +51480,13 @@
     {
      "field_name" : "data",
      "field_offset" : 160,
-     "referenced_type" : "type-1572"
+     "referenced_type" : "type-1567"
     }
    ],
    "linker_set_key" : "OMX_OTHER_EXTRADATATYPE",
    "name" : "OMX_OTHER_EXTRADATATYPE",
-   "referenced_type" : "type-1571",
-   "self_type" : "type-1571",
+   "referenced_type" : "type-1566",
+   "self_type" : "type-1566",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_OTHER_EXTRADATATYPE"
@@ -51404,7 +51502,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -51419,13 +51517,13 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-2314"
+     "referenced_type" : "type-2317"
     }
    ],
    "linker_set_key" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
    "name" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-2330",
-   "self_type" : "type-2330",
+   "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"
@@ -51436,13 +51534,13 @@
    [
     {
      "field_name" : "eFormat",
-     "referenced_type" : "type-2314"
+     "referenced_type" : "type-2317"
     }
    ],
    "linker_set_key" : "OMX_OTHER_PORTDEFINITIONTYPE",
    "name" : "OMX_OTHER_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-2329",
-   "self_type" : "type-2329",
+   "referenced_type" : "type-2332",
+   "self_type" : "type-2332",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_PORTDEFINITIONTYPE"
@@ -51458,7 +51556,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -51468,13 +51566,13 @@
     {
      "field_name" : "eBufferSupplier",
      "field_offset" : 96,
-     "referenced_type" : "type-1601"
+     "referenced_type" : "type-1599"
     }
    ],
    "linker_set_key" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
    "name" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-1609",
-   "self_type" : "type-1609",
+   "referenced_type" : "type-1605",
+   "self_type" : "type-1605",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PARAM_BUFFERSUPPLIERTYPE"
@@ -51490,7 +51588,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "cRole",
@@ -51517,7 +51615,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "hPipe",
@@ -51527,8 +51625,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_CONTENTPIPETYPE",
    "name" : "OMX_PARAM_CONTENTPIPETYPE",
-   "referenced_type" : "type-2343",
-   "self_type" : "type-2343",
+   "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_PARAM_CONTENTPIPETYPE"
@@ -51544,18 +51642,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "contentURI",
      "field_offset" : 64,
-     "referenced_type" : "type-1572"
+     "referenced_type" : "type-1567"
     }
    ],
    "linker_set_key" : "OMX_PARAM_CONTENTURITYPE",
    "name" : "OMX_PARAM_CONTENTURITYPE",
-   "referenced_type" : "type-2341",
-   "self_type" : "type-2341",
+   "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"
@@ -51571,7 +51669,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -51581,18 +51679,18 @@
     {
      "field_name" : "eUnitType",
      "field_offset" : 96,
-     "referenced_type" : "type-2235"
+     "referenced_type" : "type-2238"
     },
     {
      "field_name" : "eEncapsulationType",
      "field_offset" : 128,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2239"
     }
    ],
    "linker_set_key" : "OMX_PARAM_DATAUNITTYPE",
    "name" : "OMX_PARAM_DATAUNITTYPE",
-   "referenced_type" : "type-2237",
-   "self_type" : "type-2237",
+   "referenced_type" : "type-2240",
+   "self_type" : "type-2240",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_DATAUNITTYPE"
@@ -51608,7 +51706,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -51618,13 +51716,13 @@
     {
      "field_name" : "bDeblocking",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_PARAM_DEBLOCKINGTYPE",
    "name" : "OMX_PARAM_DEBLOCKINGTYPE",
-   "referenced_type" : "type-2217",
-   "self_type" : "type-2217",
+   "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_PARAM_DEBLOCKINGTYPE"
@@ -51640,7 +51738,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -51650,58 +51748,58 @@
     {
      "field_name" : "eFocusStatus",
      "field_offset" : 96,
-     "referenced_type" : "type-2246"
+     "referenced_type" : "type-2249"
     },
     {
      "field_name" : "bCenterStatus",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bLeftStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bRightStatus",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bTopStatus",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bBottomStatus",
      "field_offset" : 256,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bTopLeftStatus",
      "field_offset" : 288,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bTopRightStatus",
      "field_offset" : 320,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bBottomLeftStatus",
      "field_offset" : 352,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bBottomRightStatus",
      "field_offset" : 384,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_PARAM_FOCUSSTATUSTYPE",
    "name" : "OMX_PARAM_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-2247",
-   "self_type" : "type-2247",
+   "referenced_type" : "type-2250",
+   "self_type" : "type-2250",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_FOCUSSTATUSTYPE"
@@ -51717,7 +51815,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -51727,7 +51825,7 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nInterleavePortIndex",
@@ -51737,8 +51835,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_INTERLEAVETYPE",
    "name" : "OMX_PARAM_INTERLEAVETYPE",
-   "referenced_type" : "type-2232",
-   "self_type" : "type-2232",
+   "referenced_type" : "type-2235",
+   "self_type" : "type-2235",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_INTERLEAVETYPE"
@@ -51754,7 +51852,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -51769,8 +51867,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_MACROBLOCKSTYPE",
    "name" : "OMX_PARAM_MACROBLOCKSTYPE",
-   "referenced_type" : "type-2291",
-   "self_type" : "type-2291",
+   "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"
@@ -51786,17 +51884,17 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eKeyCharset",
      "field_offset" : 96,
-     "referenced_type" : "type-2345"
+     "referenced_type" : "type-2348"
     },
     {
      "field_name" : "nKeySizeUsed",
@@ -51821,13 +51919,13 @@
     {
      "field_name" : "bEnabled",
      "field_offset" : 2240,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_PARAM_METADATAFILTERTYPE",
    "name" : "OMX_PARAM_METADATAFILTERTYPE",
-   "referenced_type" : "type-2355",
-   "self_type" : "type-2355",
+   "referenced_type" : "type-2358",
+   "self_type" : "type-2358",
    "size" : 284,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_METADATAFILTERTYPE"
@@ -51843,7 +51941,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -51853,7 +51951,7 @@
     {
      "field_name" : "eDir",
      "field_offset" : 96,
-     "referenced_type" : "type-1452"
+     "referenced_type" : "type-1455"
     },
     {
      "field_name" : "nBufferCountActual",
@@ -51873,27 +51971,27 @@
     {
      "field_name" : "bEnabled",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bPopulated",
      "field_offset" : 256,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eDomain",
      "field_offset" : 288,
-     "referenced_type" : "type-2332"
+     "referenced_type" : "type-2335"
     },
     {
      "field_name" : "format",
      "field_offset" : 320,
-     "referenced_type" : "type-2334"
+     "referenced_type" : "type-2337"
     },
     {
      "field_name" : "bBuffersContiguous",
      "field_offset" : 704,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nBufferAlignment",
@@ -51903,8 +52001,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_PORTDEFINITIONTYPE",
    "name" : "OMX_PARAM_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-2333",
-   "self_type" : "type-2333",
+   "referenced_type" : "type-2336",
+   "self_type" : "type-2336",
    "size" : 96,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_PORTDEFINITIONTYPE"
@@ -51915,27 +52013,27 @@
    [
     {
      "field_name" : "audio",
-     "referenced_type" : "type-1619"
+     "referenced_type" : "type-1621"
     },
     {
      "field_name" : "video",
-     "referenced_type" : "type-2249"
+     "referenced_type" : "type-2252"
     },
     {
      "field_name" : "image",
-     "referenced_type" : "type-2298"
+     "referenced_type" : "type-2301"
     },
     {
      "field_name" : "other",
-     "referenced_type" : "type-2329"
+     "referenced_type" : "type-2332"
     }
    ],
    "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-2334",
-   "self_type" : "type-2334",
+   "referenced_type" : "type-2337",
+   "self_type" : "type-2337",
    "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)"
@@ -51951,7 +52049,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -51966,18 +52064,18 @@
     {
      "field_name" : "bOneShot",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "sFrameSize",
      "field_offset" : 160,
-     "referenced_type" : "type-2211"
+     "referenced_type" : "type-2214"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SENSORMODETYPE",
    "name" : "OMX_PARAM_SENSORMODETYPE",
-   "referenced_type" : "type-2223",
-   "self_type" : "type-2223",
+   "referenced_type" : "type-2226",
+   "self_type" : "type-2226",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_SENSORMODETYPE"
@@ -51993,18 +52091,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "ePolicy",
      "field_offset" : 64,
-     "referenced_type" : "type-2336"
+     "referenced_type" : "type-2339"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
    "name" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-2337",
-   "self_type" : "type-2337",
+   "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_PARAM_SUSPENSIONPOLICYTYPE"
@@ -52020,18 +52118,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "eType",
      "field_offset" : 64,
-     "referenced_type" : "type-2338"
+     "referenced_type" : "type-2341"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SUSPENSIONTYPE",
    "name" : "OMX_PARAM_SUSPENSIONTYPE",
-   "referenced_type" : "type-2339",
-   "self_type" : "type-2339",
+   "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_PARAM_SUSPENSIONTYPE"
@@ -52047,7 +52145,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -52062,8 +52160,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_U32TYPE",
    "name" : "OMX_PARAM_U32TYPE",
-   "referenced_type" : "type-2335",
-   "self_type" : "type-2335",
+   "referenced_type" : "type-2338",
+   "self_type" : "type-2338",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_U32TYPE"
@@ -52079,7 +52177,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPorts",
@@ -52094,8 +52192,8 @@
    ],
    "linker_set_key" : "OMX_PORT_PARAM_TYPE",
    "name" : "OMX_PORT_PARAM_TYPE",
-   "referenced_type" : "type-1585",
-   "self_type" : "type-1585",
+   "referenced_type" : "type-1581",
+   "self_type" : "type-1581",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PORT_PARAM_TYPE"
@@ -52111,7 +52209,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nGroupPriority",
@@ -52126,8 +52224,8 @@
    ],
    "linker_set_key" : "OMX_PRIORITYMGMTTYPE",
    "name" : "OMX_PRIORITYMGMTTYPE",
-   "referenced_type" : "type-1522",
-   "self_type" : "type-1522",
+   "referenced_type" : "type-1519",
+   "self_type" : "type-1519",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PRIORITYMGMTTYPE"
@@ -52143,18 +52241,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "bResourceConcealmentForbidden",
      "field_offset" : 64,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_RESOURCECONCEALMENTTYPE",
    "name" : "OMX_RESOURCECONCEALMENTTYPE",
-   "referenced_type" : "type-2344",
-   "self_type" : "type-2344",
+   "referenced_type" : "type-2347",
+   "self_type" : "type-2347",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_RESOURCECONCEALMENTTYPE"
@@ -52170,18 +52268,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "eClock",
      "field_offset" : 64,
-     "referenced_type" : "type-2319"
+     "referenced_type" : "type-2322"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
    "name" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
-   "referenced_type" : "type-2326",
-   "self_type" : "type-2326",
+   "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_TIME_CONFIG_ACTIVEREFCLOCKTYPE"
@@ -52197,12 +52295,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "eState",
      "field_offset" : 64,
-     "referenced_type" : "type-2321"
+     "referenced_type" : "type-2324"
     },
     {
      "field_name" : "nStartTime",
@@ -52222,8 +52320,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
    "name" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
-   "referenced_type" : "type-2325",
-   "self_type" : "type-2325",
+   "referenced_type" : "type-2328",
+   "self_type" : "type-2328",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_CLOCKSTATETYPE"
@@ -52239,7 +52337,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -52264,8 +52362,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
    "name" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
-   "referenced_type" : "type-2322",
-   "self_type" : "type-2322",
+   "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_MEDIATIMEREQUESTTYPE"
@@ -52281,7 +52379,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "xScale",
@@ -52291,8 +52389,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_SCALETYPE",
    "name" : "OMX_TIME_CONFIG_SCALETYPE",
-   "referenced_type" : "type-2324",
-   "self_type" : "type-2324",
+   "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_TIME_CONFIG_SCALETYPE"
@@ -52308,18 +52406,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "eType",
      "field_offset" : 64,
-     "referenced_type" : "type-2315"
+     "referenced_type" : "type-2318"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_SEEKMODETYPE",
    "name" : "OMX_TIME_CONFIG_SEEKMODETYPE",
-   "referenced_type" : "type-2316",
-   "self_type" : "type-2316",
+   "referenced_type" : "type-2319",
+   "self_type" : "type-2319",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_SEEKMODETYPE"
@@ -52335,7 +52433,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -52350,8 +52448,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
    "name" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
-   "referenced_type" : "type-2317",
-   "self_type" : "type-2317",
+   "referenced_type" : "type-2320",
+   "self_type" : "type-2320",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_TIMESTAMPTYPE"
@@ -52367,7 +52465,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nClientPrivate",
@@ -52377,7 +52475,7 @@
     {
      "field_name" : "eUpdateType",
      "field_offset" : 96,
-     "referenced_type" : "type-2318"
+     "referenced_type" : "type-2321"
     },
     {
      "field_name" : "nMediaTimestamp",
@@ -52402,13 +52500,13 @@
     {
      "field_name" : "eState",
      "field_offset" : 352,
-     "referenced_type" : "type-2321"
+     "referenced_type" : "type-2324"
     }
    ],
    "linker_set_key" : "OMX_TIME_MEDIATIMETYPE",
    "name" : "OMX_TIME_MEDIATIMETYPE",
-   "referenced_type" : "type-2323",
-   "self_type" : "type-2323",
+   "referenced_type" : "type-2326",
+   "self_type" : "type-2326",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_MEDIATIMETYPE"
@@ -52424,13 +52522,13 @@
     {
      "field_name" : "eSupplier",
      "field_offset" : 32,
-     "referenced_type" : "type-1601"
+     "referenced_type" : "type-1599"
     }
    ],
    "linker_set_key" : "OMX_TUNNELSETUPTYPE",
    "name" : "OMX_TUNNELSETUPTYPE",
-   "referenced_type" : "type-1612",
-   "self_type" : "type-1612",
+   "referenced_type" : "type-1613",
+   "self_type" : "type-1613",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_TUNNELSETUPTYPE"
@@ -52441,7 +52539,7 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-1479"
+     "referenced_type" : "type-1482"
     },
     {
      "field_name" : "nVersion",
@@ -52451,8 +52549,8 @@
    "linker_set_key" : "OMX_VERSIONTYPE",
    "name" : "OMX_VERSIONTYPE",
    "record_kind" : "union",
-   "referenced_type" : "type-1478",
-   "self_type" : "type-1478",
+   "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"
@@ -52484,8 +52582,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "OMX_VERSIONTYPE::(anonymous struct at frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h:376:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h:376:5",
    "name" : "OMX_VERSIONTYPE::(anonymous struct at frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h:376:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h:376:5",
-   "referenced_type" : "type-1479",
-   "self_type" : "type-1479",
+   "referenced_type" : "type-1482",
+   "self_type" : "type-1482",
    "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)"
@@ -52501,7 +52599,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -52521,8 +52619,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
    "name" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
-   "referenced_type" : "type-2295",
-   "self_type" : "type-2295",
+   "referenced_type" : "type-2298",
+   "self_type" : "type-2298",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD"
@@ -52538,7 +52636,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -52553,8 +52651,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_BITRATETYPE",
    "name" : "OMX_VIDEO_CONFIG_BITRATETYPE",
-   "referenced_type" : "type-2285",
-   "self_type" : "type-2285",
+   "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_VIDEO_CONFIG_BITRATETYPE"
@@ -52570,7 +52668,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -52585,8 +52683,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_NALSIZE",
    "name" : "OMX_VIDEO_CONFIG_NALSIZE",
-   "referenced_type" : "type-2296",
-   "self_type" : "type-2296",
+   "referenced_type" : "type-2299",
+   "self_type" : "type-2299",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_NALSIZE"
@@ -52602,7 +52700,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -52622,13 +52720,13 @@
     {
      "field_name" : "eSliceMode",
      "field_offset" : 128,
-     "referenced_type" : "type-2293"
+     "referenced_type" : "type-2296"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
    "name" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
-   "referenced_type" : "type-2294",
-   "self_type" : "type-2294",
+   "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_PARAM_AVCSLICEFMO"
@@ -52644,7 +52742,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -52669,7 +52767,7 @@
     {
      "field_name" : "bUseHadamard",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nRefFrames",
@@ -52689,32 +52787,32 @@
     {
      "field_name" : "bEnableUEP",
      "field_offset" : 320,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bEnableFMO",
      "field_offset" : 352,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bEnableASO",
      "field_offset" : 384,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bEnableRS",
      "field_offset" : 416,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 448,
-     "referenced_type" : "type-2279"
+     "referenced_type" : "type-2282"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 480,
-     "referenced_type" : "type-2280"
+     "referenced_type" : "type-2283"
     },
     {
      "field_name" : "nAllowedPictureTypes",
@@ -52724,22 +52822,22 @@
     {
      "field_name" : "bFrameMBsOnly",
      "field_offset" : 544,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bMBAFF",
      "field_offset" : 576,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bEntropyCodingCABAC",
      "field_offset" : 608,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bWeightedPPrediction",
      "field_offset" : 640,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nWeightedBipredicitonMode",
@@ -52749,17 +52847,17 @@
     {
      "field_name" : "bconstIpred",
      "field_offset" : 704,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bDirect8x8Inference",
      "field_offset" : 736,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bDirectSpatialTemporal",
      "field_offset" : 768,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nCabacInitIdc",
@@ -52769,13 +52867,13 @@
     {
      "field_name" : "eLoopFilterMode",
      "field_offset" : 832,
-     "referenced_type" : "type-2282"
+     "referenced_type" : "type-2285"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_AVCTYPE",
    "name" : "OMX_VIDEO_PARAM_AVCTYPE",
-   "referenced_type" : "type-2283",
-   "self_type" : "type-2283",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2286",
    "size" : 108,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_AVCTYPE"
@@ -52791,7 +52889,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -52801,17 +52899,17 @@
     {
      "field_name" : "eControlRate",
      "field_offset" : 96,
-     "referenced_type" : "type-2253"
+     "referenced_type" : "type-2256"
     },
     {
      "field_offset" : 128,
-     "referenced_type" : "type-2255"
+     "referenced_type" : "type-2258"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_BITRATETYPE",
    "name" : "OMX_VIDEO_PARAM_BITRATETYPE",
-   "referenced_type" : "type-2254",
-   "self_type" : "type-2254",
+   "referenced_type" : "type-2257",
+   "self_type" : "type-2257",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_BITRATETYPE"
@@ -52833,8 +52931,8 @@
    "linker_set_key" : "OMX_VIDEO_PARAM_BITRATETYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5",
    "name" : "OMX_VIDEO_PARAM_BITRATETYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5",
    "record_kind" : "union",
-   "referenced_type" : "type-2255",
-   "self_type" : "type-2255",
+   "referenced_type" : "type-2258",
+   "self_type" : "type-2258",
    "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)"
@@ -52850,7 +52948,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -52860,12 +52958,12 @@
     {
      "field_name" : "bEnableHEC",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bEnableResync",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nResynchMarkerSpacing",
@@ -52875,18 +52973,18 @@
     {
      "field_name" : "bEnableDataPartitioning",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bEnableRVLC",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE",
    "name" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE",
-   "referenced_type" : "type-2261",
-   "self_type" : "type-2261",
+   "referenced_type" : "type-2264",
+   "self_type" : "type-2264",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE"
@@ -52902,7 +53000,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -52922,17 +53020,17 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 160,
-     "referenced_type" : "type-2263"
+     "referenced_type" : "type-2266"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 192,
-     "referenced_type" : "type-2264"
+     "referenced_type" : "type-2267"
     },
     {
      "field_name" : "bPLUSPTYPEAllowed",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nAllowedPictureTypes",
@@ -52942,7 +53040,7 @@
     {
      "field_name" : "bForceRoundingTypeToZero",
      "field_offset" : 288,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nPictureHeaderRepetition",
@@ -52957,8 +53055,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_H263TYPE",
    "name" : "OMX_VIDEO_PARAM_H263TYPE",
-   "referenced_type" : "type-2267",
-   "self_type" : "type-2267",
+   "referenced_type" : "type-2270",
+   "self_type" : "type-2270",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_H263TYPE"
@@ -52974,7 +53072,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -52984,7 +53082,7 @@
     {
      "field_name" : "eRefreshMode",
      "field_offset" : 96,
-     "referenced_type" : "type-2259"
+     "referenced_type" : "type-2262"
     },
     {
      "field_name" : "nAirMBs",
@@ -53004,8 +53102,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
    "name" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
-   "referenced_type" : "type-2260",
-   "self_type" : "type-2260",
+   "referenced_type" : "type-2263",
+   "self_type" : "type-2263",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE"
@@ -53021,7 +53119,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -53031,17 +53129,17 @@
     {
      "field_name" : "eAccuracy",
      "field_offset" : 96,
-     "referenced_type" : "type-2257"
+     "referenced_type" : "type-2260"
     },
     {
      "field_name" : "bUnrestrictedMVs",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bFourMV",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "sXSearchRange",
@@ -53056,8 +53154,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
    "name" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
-   "referenced_type" : "type-2258",
-   "self_type" : "type-2258",
+   "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_MOTIONVECTORTYPE"
@@ -53073,7 +53171,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -53093,18 +53191,18 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 160,
-     "referenced_type" : "type-2268"
+     "referenced_type" : "type-2271"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 192,
-     "referenced_type" : "type-2269"
+     "referenced_type" : "type-2272"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MPEG2TYPE",
    "name" : "OMX_VIDEO_PARAM_MPEG2TYPE",
-   "referenced_type" : "type-2270",
-   "self_type" : "type-2270",
+   "referenced_type" : "type-2273",
+   "self_type" : "type-2273",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MPEG2TYPE"
@@ -53120,7 +53218,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -53135,12 +53233,12 @@
     {
      "field_name" : "bSVH",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bGov",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nPFrames",
@@ -53160,7 +53258,7 @@
     {
      "field_name" : "bACPred",
      "field_offset" : 288,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nMaxPacketSize",
@@ -53175,12 +53273,12 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 384,
-     "referenced_type" : "type-2271"
+     "referenced_type" : "type-2274"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 416,
-     "referenced_type" : "type-2272"
+     "referenced_type" : "type-2275"
     },
     {
      "field_name" : "nAllowedPictureTypes",
@@ -53195,13 +53293,13 @@
     {
      "field_name" : "bReversibleVLC",
      "field_offset" : 512,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MPEG4TYPE",
    "name" : "OMX_VIDEO_PARAM_MPEG4TYPE",
-   "referenced_type" : "type-2273",
-   "self_type" : "type-2273",
+   "referenced_type" : "type-2276",
+   "self_type" : "type-2276",
    "size" : 68,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MPEG4TYPE"
@@ -53217,7 +53315,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -53232,12 +53330,12 @@
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-2248"
+     "referenced_type" : "type-2251"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-2199"
+     "referenced_type" : "type-2202"
     },
     {
      "field_name" : "xFramerate",
@@ -53247,8 +53345,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
    "name" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-2250",
-   "self_type" : "type-2250",
+   "referenced_type" : "type-2253",
+   "self_type" : "type-2253",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_PORTFORMATTYPE"
@@ -53264,7 +53362,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -53289,8 +53387,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
    "name" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
-   "referenced_type" : "type-2284",
-   "self_type" : "type-2284",
+   "referenced_type" : "type-2287",
+   "self_type" : "type-2287",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE"
@@ -53306,7 +53404,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -53331,8 +53429,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
    "name" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
-   "referenced_type" : "type-2251",
-   "self_type" : "type-2251",
+   "referenced_type" : "type-2254",
+   "self_type" : "type-2254",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE"
@@ -53348,7 +53446,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -53358,7 +53456,7 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 96,
-     "referenced_type" : "type-2276"
+     "referenced_type" : "type-2279"
     },
     {
      "field_name" : "nBitsPerPixel",
@@ -53398,23 +53496,23 @@
     {
      "field_name" : "bEnablePostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bEnableTemporalInterpolation",
      "field_offset" : 352,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bEnableLatencyMode",
      "field_offset" : 384,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_RVTYPE",
    "name" : "OMX_VIDEO_PARAM_RVTYPE",
-   "referenced_type" : "type-2278",
-   "self_type" : "type-2278",
+   "referenced_type" : "type-2281",
+   "self_type" : "type-2281",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_RVTYPE"
@@ -53430,7 +53528,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -53440,43 +53538,43 @@
     {
      "field_name" : "b16x16",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "b16x8",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "b8x16",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "b8x8",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "b8x4",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "b4x8",
      "field_offset" : 256,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "b4x4",
      "field_offset" : 288,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VBSMCTYPE",
    "name" : "OMX_VIDEO_PARAM_VBSMCTYPE",
-   "referenced_type" : "type-2262",
-   "self_type" : "type-2262",
+   "referenced_type" : "type-2265",
+   "self_type" : "type-2265",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_VBSMCTYPE"
@@ -53492,7 +53590,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -53502,7 +53600,7 @@
     {
      "field_name" : "bEnableVFU",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nFirstGOB",
@@ -53522,8 +53620,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
    "name" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
-   "referenced_type" : "type-2252",
-   "self_type" : "type-2252",
+   "referenced_type" : "type-2255",
+   "self_type" : "type-2255",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE"
@@ -53539,7 +53637,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -53549,13 +53647,13 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 96,
-     "referenced_type" : "type-2274"
+     "referenced_type" : "type-2277"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_WMVTYPE",
    "name" : "OMX_VIDEO_PARAM_WMVTYPE",
-   "referenced_type" : "type-2275",
-   "self_type" : "type-2275",
+   "referenced_type" : "type-2278",
+   "self_type" : "type-2278",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_WMVTYPE"
@@ -53606,17 +53704,17 @@
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 256,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 288,
-     "referenced_type" : "type-2248"
+     "referenced_type" : "type-2251"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 320,
-     "referenced_type" : "type-2199"
+     "referenced_type" : "type-2202"
     },
     {
      "field_name" : "pNativeWindow",
@@ -53626,8 +53724,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PORTDEFINITIONTYPE",
    "name" : "OMX_VIDEO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-2249",
-   "self_type" : "type-2249",
+   "referenced_type" : "type-2252",
+   "self_type" : "type-2252",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PORTDEFINITIONTYPE"
@@ -53637,7 +53735,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1166"
+     "referenced_type" : "type-1167"
     }
    ],
    "fields" :
@@ -53646,20 +53744,20 @@
      "access" : "private",
      "field_name" : "d_",
      "field_offset" : 32,
-     "referenced_type" : "type-1194"
+     "referenced_type" : "type-1198"
     },
     {
      "access" : "private",
      "field_name" : "s_",
      "field_offset" : 64,
-     "referenced_type" : "type-1195"
+     "referenced_type" : "type-1199"
     }
    ],
    "linker_set_key" : "Renamer",
    "name" : "Renamer",
    "record_kind" : "class",
-   "referenced_type" : "type-1193",
-   "self_type" : "type-1193",
+   "referenced_type" : "type-1197",
+   "self_type" : "type-1197",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSZN7android14ReferenceMover15move_referencesINS_13GraphicBufferEEEvPNS_2spIT_EEPKS5_jE7Renamer",
@@ -53689,8 +53787,8 @@
    "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-1039",
-   "self_type" : "type-1039",
+   "referenced_type" : "type-1042",
+   "self_type" : "type-1042",
    "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"
@@ -53699,8 +53797,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::ADebug",
    "name" : "android::ADebug",
-   "referenced_type" : "type-2281",
-   "self_type" : "type-2281",
+   "referenced_type" : "type-2284",
+   "self_type" : "type-2284",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
    "unique_id" : "_ZTSN7android6ADebugE"
@@ -54199,8 +54297,8 @@
    ],
    "linker_set_key" : "android::AReplyToken",
    "name" : "android::AReplyToken",
-   "referenced_type" : "type-1044",
-   "self_type" : "type-1044",
+   "referenced_type" : "type-1043",
+   "self_type" : "type-1043",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android11AReplyTokenE",
@@ -55169,6 +55267,10 @@
      "mangled_component_name" : "_ZN7android16ProducerListener18needsReleaseNotifyEv"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ProducerListener18onBuffersDiscardedERKNSt3__16vectorIiNS1_9allocatorIiEEEE"
+    },
+    {
      "mangled_component_name" : "_ZNK7android17IProducerListener13getHalVariantEv"
     },
     {
@@ -55319,7 +55421,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1096"
+     "referenced_type" : "type-1099"
     },
     {
      "referenced_type" : "type-67"
@@ -55328,11 +55430,11 @@
    "linker_set_key" : "android::BnInterface<android::ISurfaceComposer>",
    "name" : "android::BnInterface<android::ISurfaceComposer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1095",
-   "self_type" : "type-1095",
+   "referenced_type" : "type-1098",
+   "self_type" : "type-1098",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-1097" ],
+   "template_args" : [ "type-1100" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_16ISurfaceComposerEEE",
    "vtable_components" :
    [
@@ -55367,7 +55469,7 @@
     },
     {
      "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ISurfaceComposer28createDisplayEventConnectionENS0_11VsyncSourceE"
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer28createDisplayEventConnectionENS0_11VsyncSourceENS0_13ConfigChangedE"
     },
     {
      "is_pure" : true,
@@ -55446,6 +55548,10 @@
     },
     {
      "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer13captureScreenEyPNS_8hardware8graphics6common4V1_29DataspaceEPNS_2spINS_13GraphicBufferEEE"
+    },
+    {
+     "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"
     },
     {
@@ -55525,6 +55631,10 @@
      "mangled_component_name" : "_ZNK7android16ISurfaceComposer20setDisplayBrightnessERKNS_2spINS_7IBinderEEEf"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer15notifyPowerHintEi"
+    },
+    {
      "mangled_component_name" : "_ZN7android11BnInterfaceINS_16ISurfaceComposerEE19queryLocalInterfaceERKNS_8String16E"
     },
     {
@@ -55643,7 +55753,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1032"
+     "referenced_type" : "type-1035"
     },
     {
      "referenced_type" : "type-67"
@@ -55652,11 +55762,11 @@
    "linker_set_key" : "android::BnInterface<android::ITransactionCompletedListener>",
    "name" : "android::BnInterface<android::ITransactionCompletedListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1031",
-   "self_type" : "type-1031",
+   "referenced_type" : "type-1034",
+   "self_type" : "type-1034",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-1033" ],
+   "template_args" : [ "type-1036" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_29ITransactionCompletedListenerEEE",
    "vtable_components" :
    [
@@ -55808,7 +55918,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1496"
+     "referenced_type" : "type-1502"
     },
     {
      "referenced_type" : "type-48"
@@ -55817,11 +55927,11 @@
    "linker_set_key" : "android::BpInterface<android::IConsumerListener>",
    "name" : "android::BpInterface<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1495",
-   "self_type" : "type-1495",
+   "referenced_type" : "type-1501",
+   "self_type" : "type-1501",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-1497" ],
+   "template_args" : [ "type-1503" ],
    "unique_id" : "_ZTSN7android11BpInterfaceINS_17IConsumerListenerEEE",
    "vtable_components" :
    [
@@ -55977,7 +56087,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1625"
+     "referenced_type" : "type-1630"
     },
     {
      "referenced_type" : "type-48"
@@ -55986,11 +56096,11 @@
    "linker_set_key" : "android::BpInterface<android::IGraphicBufferConsumer>",
    "name" : "android::BpInterface<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1624",
-   "self_type" : "type-1624",
+   "referenced_type" : "type-1629",
+   "self_type" : "type-1629",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-1626" ],
+   "template_args" : [ "type-1631" ],
    "unique_id" : "_ZTSN7android11BpInterfaceINS_22IGraphicBufferConsumerEEE",
    "vtable_components" :
    [
@@ -56182,7 +56292,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-4318"
+     "referenced_type" : "type-4324"
     },
     {
      "referenced_type" : "type-48"
@@ -56191,11 +56301,11 @@
    "linker_set_key" : "android::BpInterface<android::IGraphicBufferProducer>",
    "name" : "android::BpInterface<android::IGraphicBufferProducer>",
    "record_kind" : "class",
-   "referenced_type" : "type-4317",
-   "self_type" : "type-4317",
+   "referenced_type" : "type-4323",
+   "self_type" : "type-4323",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-4319" ],
+   "template_args" : [ "type-4325" ],
    "unique_id" : "_ZTSN7android11BpInterfaceINS_22IGraphicBufferProducerEEE",
    "vtable_components" :
    [
@@ -56411,7 +56521,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-4480"
+     "referenced_type" : "type-4486"
     },
     {
      "referenced_type" : "type-48"
@@ -56420,11 +56530,11 @@
    "linker_set_key" : "android::BpInterface<android::IProducerListener>",
    "name" : "android::BpInterface<android::IProducerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-4479",
-   "self_type" : "type-4479",
+   "referenced_type" : "type-4485",
+   "self_type" : "type-4485",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-4481" ],
+   "template_args" : [ "type-4487" ],
    "unique_id" : "_ZTSN7android11BpInterfaceINS_17IProducerListenerEEE",
    "vtable_components" :
    [
@@ -56456,6 +56566,10 @@
      "mangled_component_name" : "_ZN7android16ProducerListener18needsReleaseNotifyEv"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ProducerListener18onBuffersDiscardedERKNSt3__16vectorIiNS1_9allocatorIiEEEE"
+    },
+    {
      "mangled_component_name" : "_ZNK7android17IProducerListener13getHalVariantEv"
     },
     {
@@ -56688,28 +56802,28 @@
    [
     {
      "field_name" : "mRange",
-     "referenced_type" : "type-2429"
+     "referenced_type" : "type-2432"
     },
     {
      "field_name" : "mPrimaries",
      "field_offset" : 32,
-     "referenced_type" : "type-2430"
+     "referenced_type" : "type-2433"
     },
     {
      "field_name" : "mTransfer",
      "field_offset" : 64,
-     "referenced_type" : "type-2431"
+     "referenced_type" : "type-2434"
     },
     {
      "field_name" : "mMatrixCoeffs",
      "field_offset" : 96,
-     "referenced_type" : "type-2432"
+     "referenced_type" : "type-2435"
     }
    ],
    "linker_set_key" : "android::ColorAspects",
    "name" : "android::ColorAspects",
-   "referenced_type" : "type-2428",
-   "self_type" : "type-2428",
+   "referenced_type" : "type-2431",
+   "self_type" : "type-2431",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android12ColorAspectsE"
@@ -56718,8 +56832,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::ColorUtils",
    "name" : "android::ColorUtils",
-   "referenced_type" : "type-1181",
-   "self_type" : "type-1181",
+   "referenced_type" : "type-1180",
+   "self_type" : "type-1180",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
    "unique_id" : "_ZTSN7android10ColorUtilsE"
@@ -56728,8 +56842,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::CompileTimeAssert<true>",
    "name" : "android::CompileTimeAssert<true>",
-   "referenced_type" : "type-2690",
-   "self_type" : "type-2690",
+   "referenced_type" : "type-2693",
+   "self_type" : "type-2693",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Debug.h",
    "unique_id" : "_ZTSN7android17CompileTimeAssertILb1EEE"
@@ -56822,7 +56936,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -56832,7 +56946,7 @@
     {
      "field_name" : "bTunneled",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nAudioHwSync",
@@ -56847,8 +56961,8 @@
    ],
    "linker_set_key" : "android::ConfigureVideoTunnelModeParams",
    "name" : "android::ConfigureVideoTunnelModeParams",
-   "referenced_type" : "type-2426",
-   "self_type" : "type-2426",
+   "referenced_type" : "type-2429",
+   "self_type" : "type-2429",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android30ConfigureVideoTunnelModeParamsE"
@@ -56864,7 +56978,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -56874,12 +56988,12 @@
     {
      "field_name" : "bRequestingDataSpace",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bDataSpaceChanged",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nPixelFormat",
@@ -56894,13 +57008,13 @@
     {
      "field_name" : "sAspects",
      "field_offset" : 224,
-     "referenced_type" : "type-2428"
+     "referenced_type" : "type-2431"
     }
    ],
    "linker_set_key" : "android::DescribeColorAspectsParams",
    "name" : "android::DescribeColorAspectsParams",
-   "referenced_type" : "type-2427",
-   "self_type" : "type-2427",
+   "referenced_type" : "type-2430",
+   "self_type" : "type-2430",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26DescribeColorAspectsParamsE"
@@ -56916,12 +57030,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 64,
-     "referenced_type" : "type-2199"
+     "referenced_type" : "type-2202"
     },
     {
      "field_name" : "nFrameWidth",
@@ -56946,18 +57060,18 @@
     {
      "field_name" : "bUsingNativeBuffers",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "sMediaImage",
      "field_offset" : 256,
-     "referenced_type" : "type-2420"
+     "referenced_type" : "type-2423"
     }
    ],
    "linker_set_key" : "android::DescribeColorFormat2Params",
    "name" : "android::DescribeColorFormat2Params",
-   "referenced_type" : "type-2419",
-   "self_type" : "type-2419",
+   "referenced_type" : "type-2422",
+   "self_type" : "type-2422",
    "size" : 136,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26DescribeColorFormat2ParamsE"
@@ -56973,12 +57087,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 64,
-     "referenced_type" : "type-2199"
+     "referenced_type" : "type-2202"
     },
     {
      "field_name" : "nFrameWidth",
@@ -57003,18 +57117,18 @@
     {
      "field_name" : "bUsingNativeBuffers",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "sMediaImage",
      "field_offset" : 256,
-     "referenced_type" : "type-2415"
+     "referenced_type" : "type-2418"
     }
    ],
    "linker_set_key" : "android::DescribeColorFormatParams",
    "name" : "android::DescribeColorFormatParams",
-   "referenced_type" : "type-2414",
-   "self_type" : "type-2414",
+   "referenced_type" : "type-2417",
+   "self_type" : "type-2417",
    "size" : 112,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android25DescribeColorFormatParamsE"
@@ -57030,7 +57144,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -57050,13 +57164,13 @@
     {
      "field_name" : "nValue",
      "field_offset" : 160,
-     "referenced_type" : "type-1572"
+     "referenced_type" : "type-1567"
     }
    ],
    "linker_set_key" : "android::DescribeHDR10PlusInfoParams",
    "name" : "android::DescribeHDR10PlusInfoParams",
-   "referenced_type" : "type-2440",
-   "self_type" : "type-2440",
+   "referenced_type" : "type-2443",
+   "self_type" : "type-2443",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android27DescribeHDR10PlusInfoParamsE"
@@ -57072,7 +57186,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -57082,13 +57196,13 @@
     {
      "field_name" : "sInfo",
      "field_offset" : 96,
-     "referenced_type" : "type-2435"
+     "referenced_type" : "type-2438"
     }
    ],
    "linker_set_key" : "android::DescribeHDRStaticInfoParams",
    "name" : "android::DescribeHDRStaticInfoParams",
-   "referenced_type" : "type-2434",
-   "self_type" : "type-2434",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2437",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android27DescribeHDRStaticInfoParamsE"
@@ -57104,7 +57218,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -57114,13 +57228,13 @@
     {
      "field_name" : "enable",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "android::EnableAndroidNativeBuffersParams",
    "name" : "android::EnableAndroidNativeBuffersParams",
-   "referenced_type" : "type-2395",
-   "self_type" : "type-2395",
+   "referenced_type" : "type-2398",
+   "self_type" : "type-2398",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android32EnableAndroidNativeBuffersParamsE"
@@ -57132,13 +57246,13 @@
     {
      "access" : "private",
      "field_name" : "mSharedFd",
-     "referenced_type" : "type-1199"
+     "referenced_type" : "type-1202"
     }
    ],
    "linker_set_key" : "android::FileDescriptor",
    "name" : "android::FileDescriptor",
-   "referenced_type" : "type-1198",
-   "self_type" : "type-1198",
+   "referenced_type" : "type-1201",
+   "self_type" : "type-1201",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h",
    "unique_id" : "_ZTSN7android14FileDescriptorE"
@@ -57155,8 +57269,8 @@
    ],
    "linker_set_key" : "android::FileDescriptor::Autoclose",
    "name" : "android::FileDescriptor::Autoclose",
-   "referenced_type" : "type-1204",
-   "self_type" : "type-1204",
+   "referenced_type" : "type-1203",
+   "self_type" : "type-1203",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h",
    "unique_id" : "_ZTSN7android14FileDescriptor9AutocloseE"
@@ -57340,7 +57454,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -57355,8 +57469,8 @@
    ],
    "linker_set_key" : "android::GetAndroidNativeBufferUsageParams",
    "name" : "android::GetAndroidNativeBufferUsageParams",
-   "referenced_type" : "type-2412",
-   "self_type" : "type-2412",
+   "referenced_type" : "type-2415",
+   "self_type" : "type-2415",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android33GetAndroidNativeBufferUsageParamsE"
@@ -57702,17 +57816,17 @@
    [
     {
      "field_name" : "mID",
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2439"
     },
     {
      "field_offset" : 8,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2440"
     }
    ],
    "linker_set_key" : "android::HDRStaticInfo",
    "name" : "android::HDRStaticInfo",
-   "referenced_type" : "type-2435",
-   "self_type" : "type-2435",
+   "referenced_type" : "type-2438",
+   "self_type" : "type-2438",
    "size" : 25,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfoE"
@@ -57723,15 +57837,15 @@
    [
     {
      "field_name" : "sType1",
-     "referenced_type" : "type-2438"
+     "referenced_type" : "type-2441"
     }
    ],
    "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-2437",
-   "self_type" : "type-2437",
+   "referenced_type" : "type-2440",
+   "self_type" : "type-2440",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfoUt_E"
@@ -57752,8 +57866,8 @@
    ],
    "linker_set_key" : "android::HDRStaticInfo::Primaries1",
    "name" : "android::HDRStaticInfo::Primaries1",
-   "referenced_type" : "type-2439",
-   "self_type" : "type-2439",
+   "referenced_type" : "type-2442",
+   "self_type" : "type-2442",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfo10Primaries1E"
@@ -57764,22 +57878,22 @@
    [
     {
      "field_name" : "mR",
-     "referenced_type" : "type-2439"
+     "referenced_type" : "type-2442"
     },
     {
      "field_name" : "mG",
      "field_offset" : 32,
-     "referenced_type" : "type-2439"
+     "referenced_type" : "type-2442"
     },
     {
      "field_name" : "mB",
      "field_offset" : 64,
-     "referenced_type" : "type-2439"
+     "referenced_type" : "type-2442"
     },
     {
      "field_name" : "mW",
      "field_offset" : 96,
-     "referenced_type" : "type-2439"
+     "referenced_type" : "type-2442"
     },
     {
      "field_name" : "mMaxDisplayLuminance",
@@ -57804,8 +57918,8 @@
    ],
    "linker_set_key" : "android::HDRStaticInfo::Type1",
    "name" : "android::HDRStaticInfo::Type1",
-   "referenced_type" : "type-2438",
-   "self_type" : "type-2438",
+   "referenced_type" : "type-2441",
+   "self_type" : "type-2441",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfo5Type1E"
@@ -58129,31 +58243,31 @@
     {
      "access" : "private",
      "field_name" : "mProcess",
-     "referenced_type" : "type-1258"
+     "referenced_type" : "type-1261"
     },
     {
      "access" : "private",
      "field_name" : "mPendingStrongDerefs",
      "field_offset" : 32,
-     "referenced_type" : "type-1205"
+     "referenced_type" : "type-1208"
     },
     {
      "access" : "private",
      "field_name" : "mPendingWeakDerefs",
      "field_offset" : 192,
-     "referenced_type" : "type-1207"
+     "referenced_type" : "type-1210"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteStrongDerefs",
      "field_offset" : 352,
-     "referenced_type" : "type-1208"
+     "referenced_type" : "type-1213"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteWeakDerefs",
      "field_offset" : 512,
-     "referenced_type" : "type-1207"
+     "referenced_type" : "type-1210"
     },
     {
      "access" : "private",
@@ -58219,20 +58333,20 @@
      "access" : "private",
      "field_name" : "mIPCThreadStateBase",
      "field_offset" : 1888,
-     "referenced_type" : "type-1264"
+     "referenced_type" : "type-1267"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 1920,
-     "referenced_type" : "type-1255"
+     "referenced_type" : "type-1259"
     }
    ],
    "linker_set_key" : "android::IPCThreadState",
    "name" : "android::IPCThreadState",
    "record_kind" : "class",
-   "referenced_type" : "type-1257",
-   "self_type" : "type-1257",
+   "referenced_type" : "type-1260",
+   "self_type" : "type-1260",
    "size" : 244,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h",
    "unique_id" : "_ZTSN7android14IPCThreadStateE"
@@ -58244,17 +58358,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-1200"
+     "referenced_type" : "type-1204"
     }
    ],
    "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",
+   "referenced_type" : "type-1241",
+   "self_type" : "type-1241",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-1239", "type-795" ],
+   "template_args" : [ "type-1242", "type-795" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_7IBinderEEEEE"
   },
   {
@@ -58264,17 +58378,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-1354"
+     "referenced_type" : "type-1357"
     }
    ],
    "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",
+   "referenced_type" : "type-1369",
+   "self_type" : "type-1369",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-1239", "type-1367" ],
+   "template_args" : [ "type-1242", "type-1370" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
   },
   {
@@ -58342,11 +58456,11 @@
    "linker_set_key" : "android::LightFlattenable<android::FrameStats>",
    "name" : "android::LightFlattenable<android::FrameStats>",
    "record_kind" : "class",
-   "referenced_type" : "type-1098",
-   "self_type" : "type-1098",
+   "referenced_type" : "type-1101",
+   "self_type" : "type-1101",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1099" ],
+   "template_args" : [ "type-1102" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_10FrameStatsEEE"
   },
   {
@@ -58460,17 +58574,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-1210"
+     "referenced_type" : "type-1215"
     }
    ],
    "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",
+   "referenced_type" : "type-1214",
+   "self_type" : "type-1214",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-1211" ],
+   "template_args" : [ "type-1216" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_10GLConsumer8EglImageEEE"
   },
   {
@@ -58500,17 +58614,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-2353"
+     "referenced_type" : "type-2356"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
    "name" : "android::LightRefBase<android::VirtualLightRefBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-2352",
-   "self_type" : "type-2352",
+   "referenced_type" : "type-2355",
+   "self_type" : "type-2355",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-2354" ],
+   "template_args" : [ "type-2357" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
   },
   {
@@ -58921,7 +59035,7 @@
    [
     {
      "field_name" : "mType",
-     "referenced_type" : "type-2416"
+     "referenced_type" : "type-2419"
     },
     {
      "field_name" : "mNumPlanes",
@@ -58946,13 +59060,13 @@
     {
      "field_name" : "mPlane",
      "field_offset" : 160,
-     "referenced_type" : "type-2417"
+     "referenced_type" : "type-2420"
     }
    ],
    "linker_set_key" : "android::MediaImage",
    "name" : "android::MediaImage",
-   "referenced_type" : "type-2415",
-   "self_type" : "type-2415",
+   "referenced_type" : "type-2418",
+   "self_type" : "type-2418",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android10MediaImageE"
@@ -58963,7 +59077,7 @@
    [
     {
      "field_name" : "mType",
-     "referenced_type" : "type-2421"
+     "referenced_type" : "type-2424"
     },
     {
      "field_name" : "mNumPlanes",
@@ -58993,13 +59107,13 @@
     {
      "field_name" : "mPlane",
      "field_offset" : 192,
-     "referenced_type" : "type-2422"
+     "referenced_type" : "type-2425"
     }
    ],
    "linker_set_key" : "android::MediaImage2",
    "name" : "android::MediaImage2",
-   "referenced_type" : "type-2420",
-   "self_type" : "type-2420",
+   "referenced_type" : "type-2423",
+   "self_type" : "type-2423",
    "size" : 104,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android11MediaImage2E"
@@ -59035,8 +59149,8 @@
    ],
    "linker_set_key" : "android::MediaImage2::PlaneInfo",
    "name" : "android::MediaImage2::PlaneInfo",
-   "referenced_type" : "type-2423",
-   "self_type" : "type-2423",
+   "referenced_type" : "type-2426",
+   "self_type" : "type-2426",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android11MediaImage29PlaneInfoE"
@@ -59072,8 +59186,8 @@
    ],
    "linker_set_key" : "android::MediaImage::PlaneInfo",
    "name" : "android::MediaImage::PlaneInfo",
-   "referenced_type" : "type-2418",
-   "self_type" : "type-2418",
+   "referenced_type" : "type-2421",
+   "self_type" : "type-2421",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android10MediaImage9PlaneInfoE"
@@ -59152,8 +59266,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::OMXPluginBase",
    "name" : "android::OMXPluginBase",
-   "referenced_type" : "type-2393",
-   "self_type" : "type-2393",
+   "referenced_type" : "type-2396",
+   "self_type" : "type-2396",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h",
    "unique_id" : "_ZTSN7android13OMXPluginBaseE",
@@ -59365,17 +59479,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 32,
-     "referenced_type" : "type-1512"
+     "referenced_type" : "type-1516"
     }
    ],
    "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",
+   "referenced_type" : "type-1520",
+   "self_type" : "type-1520",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-1517" ],
+   "template_args" : [ "type-1521" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_10BufferItemEEE",
    "vtable_components" :
    [
@@ -59414,17 +59528,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 32,
-     "referenced_type" : "type-1647"
+     "referenced_type" : "type-1650"
     }
    ],
    "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",
+   "referenced_type" : "type-1662",
+   "self_type" : "type-1662",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-1659" ],
+   "template_args" : [ "type-1663" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_5FenceEEE",
    "vtable_components" :
    [
@@ -59463,17 +59577,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 32,
-     "referenced_type" : "type-4322"
+     "referenced_type" : "type-4328"
     }
    ],
    "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",
+   "referenced_type" : "type-4334",
+   "self_type" : "type-4334",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-4329" ],
+   "template_args" : [ "type-4335" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEEE",
    "vtable_components" :
    [
@@ -59512,17 +59626,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 32,
-     "referenced_type" : "type-1646"
+     "referenced_type" : "type-1649"
     }
    ],
    "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",
+   "referenced_type" : "type-1657",
+   "self_type" : "type-1657",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-1654" ],
+   "template_args" : [ "type-1658" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_13GraphicBufferEEE",
    "vtable_components" :
    [
@@ -59561,17 +59675,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 32,
-     "referenced_type" : "type-4321"
+     "referenced_type" : "type-4327"
     }
    ],
    "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",
+   "referenced_type" : "type-4339",
+   "self_type" : "type-4339",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-4334" ],
+   "template_args" : [ "type-4340" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEEE",
    "vtable_components" :
    [
@@ -59610,17 +59724,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 32,
-     "referenced_type" : "type-4323"
+     "referenced_type" : "type-4329"
     }
    ],
    "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",
+   "referenced_type" : "type-4345",
+   "self_type" : "type-4345",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-4339" ],
+   "template_args" : [ "type-4346" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEEE",
    "vtable_components" :
    [
@@ -59765,7 +59879,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -59775,7 +59889,7 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nMaxFrameWidth",
@@ -59790,8 +59904,8 @@
    ],
    "linker_set_key" : "android::PrepareForAdaptivePlaybackParams",
    "name" : "android::PrepareForAdaptivePlaybackParams",
-   "referenced_type" : "type-2406",
-   "self_type" : "type-2406",
+   "referenced_type" : "type-2409",
+   "self_type" : "type-2409",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android32PrepareForAdaptivePlaybackParamsE"
@@ -59807,18 +59921,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 64,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "android::PrependSPSPPSToIDRFramesParams",
    "name" : "android::PrependSPSPPSToIDRFramesParams",
-   "referenced_type" : "type-2413",
-   "self_type" : "type-2413",
+   "referenced_type" : "type-2416",
+   "self_type" : "type-2416",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android30PrependSPSPPSToIDRFramesParamsE"
@@ -59856,13 +59970,13 @@
      "access" : "private",
      "field_name" : "mThreadCountLock",
      "field_offset" : 128,
-     "referenced_type" : "type-1262"
+     "referenced_type" : "type-1265"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountDecrement",
      "field_offset" : 160,
-     "referenced_type" : "type-1263"
+     "referenced_type" : "type-1266"
     },
     {
      "access" : "private",
@@ -59892,7 +60006,7 @@
      "access" : "private",
      "field_name" : "mHandleToObject",
      "field_offset" : 352,
-     "referenced_type" : "type-1202"
+     "referenced_type" : "type-1206"
     },
     {
      "access" : "private",
@@ -59904,7 +60018,7 @@
      "access" : "private",
      "field_name" : "mBinderContextCheckFunc",
      "field_offset" : 544,
-     "referenced_type" : "type-1249"
+     "referenced_type" : "type-1252"
     },
     {
      "access" : "private",
@@ -59916,7 +60030,7 @@
      "access" : "private",
      "field_name" : "mContexts",
      "field_offset" : 608,
-     "referenced_type" : "type-1238"
+     "referenced_type" : "type-1241"
     },
     {
      "access" : "private",
@@ -59934,20 +60048,20 @@
      "access" : "private",
      "field_name" : "mThreadPoolSeq",
      "field_offset" : 832,
-     "referenced_type" : "type-1250"
+     "referenced_type" : "type-1253"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 864,
-     "referenced_type" : "type-1255"
+     "referenced_type" : "type-1259"
     }
    ],
    "linker_set_key" : "android::ProcessState",
    "name" : "android::ProcessState",
    "record_kind" : "class",
-   "referenced_type" : "type-1261",
-   "self_type" : "type-1261",
+   "referenced_type" : "type-1264",
+   "self_type" : "type-1264",
    "size" : 120,
    "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h",
    "unique_id" : "_ZTSN7android12ProcessStateE",
@@ -60035,8 +60149,8 @@
    ],
    "linker_set_key" : "android::ProcessState::handle_entry",
    "name" : "android::ProcessState::handle_entry",
-   "referenced_type" : "type-1203",
-   "self_type" : "type-1203",
+   "referenced_type" : "type-1207",
+   "self_type" : "type-1207",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h",
    "unique_id" : "_ZTSN7android12ProcessState12handle_entryE"
@@ -60164,8 +60278,8 @@
    "linker_set_key" : "android::ReferenceMover",
    "name" : "android::ReferenceMover",
    "record_kind" : "class",
-   "referenced_type" : "type-1589",
-   "self_type" : "type-1589",
+   "referenced_type" : "type-1592",
+   "self_type" : "type-1592",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android14ReferenceMoverE"
@@ -60175,8 +60289,8 @@
    "linker_set_key" : "android::ReferenceRenamer",
    "name" : "android::ReferenceRenamer",
    "record_kind" : "class",
-   "referenced_type" : "type-1166",
-   "self_type" : "type-1166",
+   "referenced_type" : "type-1167",
+   "self_type" : "type-1167",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android16ReferenceRenamerE",
@@ -60199,8 +60313,8 @@
    "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",
+   "referenced_type" : "type-1565",
+   "self_type" : "type-1565",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE16ElementIsPointerILj0EJRKNS_10BufferItemEEEE"
@@ -60212,14 +60326,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> >",
    "name" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> >",
    "record_kind" : "class",
-   "referenced_type" : "type-1563",
-   "self_type" : "type-1563",
+   "referenced_type" : "type-1568",
+   "self_type" : "type-1568",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE11InputReaderIJNSt3__15tupleIJEEEEEE"
@@ -60231,14 +60345,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-1572",
+   "self_type" : "type-1572",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE11InputReaderIJNSt3__15tupleIJRKNS_10BufferItemEEEEEEE"
@@ -60247,8 +60361,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::MethodCaller<tuple<> >",
    "name" : "android::SafeBnInterface<IConsumerListener>::MethodCaller<tuple<> >",
-   "referenced_type" : "type-1573",
-   "self_type" : "type-1573",
+   "referenced_type" : "type-1576",
+   "self_type" : "type-1576",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE12MethodCallerIJNSt3__15tupleIJEEEEEE"
@@ -60257,8 +60371,8 @@
    "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",
+   "referenced_type" : "type-1577",
+   "self_type" : "type-1577",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE12MethodCallerIJNSt3__15tupleIJRKNS_10BufferItemEEEEEEE"
@@ -60267,52 +60381,52 @@
    "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",
+   "referenced_type" : "type-1559",
+   "self_type" : "type-1559",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1556" ],
+   "template_args" : [ "type-1560" ],
    "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",
+   "referenced_type" : "type-1561",
+   "self_type" : "type-1561",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1558" ],
+   "template_args" : [ "type-1562" ],
    "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",
+   "referenced_type" : "type-1563",
+   "self_type" : "type-1563",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1560" ],
+   "template_args" : [ "type-1564" ],
    "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",
+   "referenced_type" : "type-1557",
+   "self_type" : "type-1557",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1554" ],
+   "template_args" : [ "type-1558" ],
    "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",
+   "referenced_type" : "type-2025",
+   "self_type" : "type-2025",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJPNS_10BufferItemExyEEE"
@@ -60321,8 +60435,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, android_dataspace_t>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, android_dataspace_t>",
-   "referenced_type" : "type-2037",
-   "self_type" : "type-2037",
+   "referenced_type" : "type-2041",
+   "self_type" : "type-2041",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJ19android_dataspace_tEEE"
@@ -60331,8 +60445,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, bool, vector<Segment, allocator<Segment> > *>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, bool, vector<Segment, allocator<Segment> > *>",
-   "referenced_type" : "type-2042",
-   "self_type" : "type-2042",
+   "referenced_type" : "type-2047",
+   "self_type" : "type-2047",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS7_EEEEEEE"
@@ -60341,8 +60455,8 @@
    "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",
+   "referenced_type" : "type-2043",
+   "self_type" : "type-2043",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJbEEE"
@@ -60351,8 +60465,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, const String8 &, String8 *>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, const String8 &, String8 *>",
-   "referenced_type" : "type-2045",
-   "self_type" : "type-2045",
+   "referenced_type" : "type-2049",
+   "self_type" : "type-2049",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJRKNS_7String8EPS4_EEE"
@@ -60361,8 +60475,8 @@
    "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",
+   "referenced_type" : "type-2040",
+   "self_type" : "type-2040",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJRKNS_7String8EEEE"
@@ -60371,8 +60485,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, const sp<IConsumerListener> &, bool>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, const sp<IConsumerListener> &, bool>",
-   "referenced_type" : "type-2030",
-   "self_type" : "type-2030",
+   "referenced_type" : "type-2034",
+   "self_type" : "type-2034",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJRKNS_2spINS_17IConsumerListenerEEEbEEE"
@@ -60381,8 +60495,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, int *, const sp<GraphicBuffer> &>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, int *, const sp<GraphicBuffer> &>",
-   "referenced_type" : "type-2025",
-   "self_type" : "type-2025",
+   "referenced_type" : "type-2029",
+   "self_type" : "type-2029",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJPiRKNS_2spINS_13GraphicBufferEEEEEE"
@@ -60391,8 +60505,8 @@
    "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",
+   "referenced_type" : "type-2031",
+   "self_type" : "type-2031",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJiyRKNS_2spINS_5FenceEEEEEE"
@@ -60401,8 +60515,8 @@
    "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",
+   "referenced_type" : "type-2028",
+   "self_type" : "type-2028",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJiEEE"
@@ -60411,8 +60525,8 @@
    "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",
+   "referenced_type" : "type-2045",
+   "self_type" : "type-2045",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJPNS_2spINS_12NativeHandleEEEEEE"
@@ -60421,8 +60535,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned int, unsigned int>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned int, unsigned int>",
-   "referenced_type" : "type-2034",
-   "self_type" : "type-2034",
+   "referenced_type" : "type-2038",
+   "self_type" : "type-2038",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJjjEEE"
@@ -60431,8 +60545,8 @@
    "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",
+   "referenced_type" : "type-2044",
+   "self_type" : "type-2044",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJjEEE"
@@ -60441,8 +60555,8 @@
    "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",
+   "referenced_type" : "type-2037",
+   "self_type" : "type-2037",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJPyEEE"
@@ -60451,8 +60565,8 @@
    "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",
+   "referenced_type" : "type-2042",
+   "self_type" : "type-2042",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJyEEE"
@@ -60461,8 +60575,8 @@
    "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",
+   "referenced_type" : "type-2026",
+   "self_type" : "type-2026",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJPNS_10BufferItemExyEEE"
@@ -60471,8 +60585,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, bool, vector<Segment, allocator<Segment> > *>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, bool, vector<Segment, allocator<Segment> > *>",
-   "referenced_type" : "type-2044",
-   "self_type" : "type-2044",
+   "referenced_type" : "type-2048",
+   "self_type" : "type-2048",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS7_EEEEEEE"
@@ -60481,8 +60595,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, const String8 &, String8 *>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, const String8 &, String8 *>",
-   "referenced_type" : "type-2046",
-   "self_type" : "type-2046",
+   "referenced_type" : "type-2050",
+   "self_type" : "type-2050",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJRKNS_7String8EPS4_EEE"
@@ -60491,8 +60605,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, const sp<IConsumerListener> &, bool>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, const sp<IConsumerListener> &, bool>",
-   "referenced_type" : "type-2031",
-   "self_type" : "type-2031",
+   "referenced_type" : "type-2036",
+   "self_type" : "type-2036",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJRKNS_2spINS_17IConsumerListenerEEEbEEE"
@@ -60501,8 +60615,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, int *, const sp<GraphicBuffer> &>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, int *, const sp<GraphicBuffer> &>",
-   "referenced_type" : "type-2026",
-   "self_type" : "type-2026",
+   "referenced_type" : "type-2030",
+   "self_type" : "type-2030",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJPiRKNS_2spINS_13GraphicBufferEEEEEE"
@@ -60511,8 +60625,8 @@
    "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",
+   "referenced_type" : "type-2032",
+   "self_type" : "type-2032",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJiyRKNS_2spINS_5FenceEEEEEE"
@@ -60521,8 +60635,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, unsigned int, unsigned int>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, unsigned int, unsigned int>",
-   "referenced_type" : "type-2035",
-   "self_type" : "type-2035",
+   "referenced_type" : "type-2039",
+   "self_type" : "type-2039",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJjjEEE"
@@ -60531,8 +60645,8 @@
    "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",
+   "referenced_type" : "type-2027",
+   "self_type" : "type-2027",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj2EJPNS_10BufferItemExyEEE"
@@ -60541,8 +60655,8 @@
    "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",
+   "referenced_type" : "type-2033",
+   "self_type" : "type-2033",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj2EJiyRKNS_2spINS_5FenceEEEEEE"
@@ -60554,14 +60668,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2073",
+   "self_type" : "type-2073",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJEEEEEE"
@@ -60573,14 +60687,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2051",
+   "self_type" : "type-2051",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPNS_10BufferItemExyEEEEEE"
@@ -60592,14 +60706,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2091",
+   "self_type" : "type-2091",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJ19android_dataspace_tEEEEEE"
@@ -60611,14 +60725,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2111",
+   "self_type" : "type-2111",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJbPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEEEE"
@@ -60630,14 +60744,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2097",
+   "self_type" : "type-2097",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJbEEEEEE"
@@ -60649,14 +60763,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2116",
+   "self_type" : "type-2116",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJRKNS_7String8EPS6_EEEEEE"
@@ -60668,14 +60782,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2086",
+   "self_type" : "type-2086",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJRKNS_7String8EEEEEEE"
@@ -60687,14 +60801,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2069",
+   "self_type" : "type-2069",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEEbEEEEEE"
@@ -60706,14 +60820,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2060",
+   "self_type" : "type-2060",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
@@ -60725,14 +60839,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2064",
+   "self_type" : "type-2064",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJiyRKNS_2spINS_5FenceEEEEEEEEE"
@@ -60744,14 +60858,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2055",
+   "self_type" : "type-2055",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJiEEEEEE"
@@ -60763,14 +60877,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2107",
+   "self_type" : "type-2107",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPNS_2spINS_12NativeHandleEEEEEEEEE"
@@ -60782,14 +60896,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2082",
+   "self_type" : "type-2082",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJjjEEEEEE"
@@ -60801,14 +60915,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2103",
+   "self_type" : "type-2103",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJjEEEEEE"
@@ -60820,14 +60934,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2077",
+   "self_type" : "type-2077",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPyEEEEEE"
@@ -60839,14 +60953,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2095",
+   "self_type" : "type-2095",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJyEEEEEE"
@@ -60855,8 +60969,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<> >",
-   "referenced_type" : "type-2122",
-   "self_type" : "type-2122",
+   "referenced_type" : "type-2126",
+   "self_type" : "type-2126",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJEEEEEE"
@@ -60865,8 +60979,8 @@
    "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",
+   "referenced_type" : "type-2120",
+   "self_type" : "type-2120",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPNS_10BufferItemExyEEEEEE"
@@ -60875,8 +60989,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<android_dataspace_t> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<android_dataspace_t> >",
-   "referenced_type" : "type-2126",
-   "self_type" : "type-2126",
+   "referenced_type" : "type-2130",
+   "self_type" : "type-2130",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJ19android_dataspace_tEEEEEE"
@@ -60885,8 +60999,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<bool, vector<Segment, allocator<Segment> > *> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<bool, vector<Segment, allocator<Segment> > *> >",
-   "referenced_type" : "type-2131",
-   "self_type" : "type-2131",
+   "referenced_type" : "type-2136",
+   "self_type" : "type-2136",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJbPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEEEE"
@@ -60895,8 +61009,8 @@
    "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",
+   "referenced_type" : "type-2132",
+   "self_type" : "type-2132",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJbEEEEEE"
@@ -60905,8 +61019,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<const String8 &, String8 *> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<const String8 &, String8 *> >",
-   "referenced_type" : "type-2133",
-   "self_type" : "type-2133",
+   "referenced_type" : "type-2137",
+   "self_type" : "type-2137",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJRKNS_7String8EPS6_EEEEEE"
@@ -60915,8 +61029,8 @@
    "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",
+   "referenced_type" : "type-2129",
+   "self_type" : "type-2129",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJRKNS_7String8EEEEEEE"
@@ -60925,8 +61039,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<const sp<IConsumerListener> &, bool> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<const sp<IConsumerListener> &, bool> >",
-   "referenced_type" : "type-2120",
-   "self_type" : "type-2120",
+   "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_2spINS_17IConsumerListenerEEEbEEEEEE"
@@ -60935,8 +61049,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<int *, const sp<GraphicBuffer> &> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<int *, const sp<GraphicBuffer> &> >",
-   "referenced_type" : "type-2118",
-   "self_type" : "type-2118",
+   "referenced_type" : "type-2122",
+   "self_type" : "type-2122",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
@@ -60945,8 +61059,8 @@
    "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",
+   "referenced_type" : "type-2123",
+   "self_type" : "type-2123",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJiyRKNS_2spINS_5FenceEEEEEEEEE"
@@ -60955,8 +61069,8 @@
    "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",
+   "referenced_type" : "type-2121",
+   "self_type" : "type-2121",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJiEEEEEE"
@@ -60965,8 +61079,8 @@
    "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",
+   "referenced_type" : "type-2134",
+   "self_type" : "type-2134",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPNS_2spINS_12NativeHandleEEEEEEEEE"
@@ -60975,8 +61089,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned int, unsigned int> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned int, unsigned int> >",
-   "referenced_type" : "type-2124",
-   "self_type" : "type-2124",
+   "referenced_type" : "type-2128",
+   "self_type" : "type-2128",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJjjEEEEEE"
@@ -60985,8 +61099,8 @@
    "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",
+   "referenced_type" : "type-2133",
+   "self_type" : "type-2133",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJjEEEEEE"
@@ -60995,8 +61109,8 @@
    "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",
+   "referenced_type" : "type-2127",
+   "self_type" : "type-2127",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPyEEEEEE"
@@ -61005,8 +61119,8 @@
    "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",
+   "referenced_type" : "type-2131",
+   "self_type" : "type-2131",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJyEEEEEE"
@@ -61018,13 +61132,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<> >",
-   "referenced_type" : "type-2145",
-   "self_type" : "type-2145",
+   "referenced_type" : "type-2149",
+   "self_type" : "type-2149",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJEEEEEE"
@@ -61036,13 +61150,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2138",
+   "self_type" : "type-2138",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPNS_10BufferItemExyEEEEEE"
@@ -61054,13 +61168,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2158",
+   "self_type" : "type-2158",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJ19android_dataspace_tEEEEEE"
@@ -61072,13 +61186,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2169",
+   "self_type" : "type-2169",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJbPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEEEE"
@@ -61090,13 +61204,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool> >",
-   "referenced_type" : "type-2158",
-   "self_type" : "type-2158",
+   "referenced_type" : "type-2162",
+   "self_type" : "type-2162",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJbEEEEEE"
@@ -61108,13 +61222,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2171",
+   "self_type" : "type-2171",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJRKNS_7String8EPS6_EEEEEE"
@@ -61126,13 +61240,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2155",
+   "self_type" : "type-2155",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJRKNS_7String8EEEEEEE"
@@ -61144,13 +61258,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2147",
+   "self_type" : "type-2147",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEEbEEEEEE"
@@ -61162,13 +61276,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2142",
+   "self_type" : "type-2142",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
@@ -61180,13 +61294,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2144",
+   "self_type" : "type-2144",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJiyRKNS_2spINS_5FenceEEEEEEEEE"
@@ -61198,13 +61312,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int> >",
-   "referenced_type" : "type-2136",
-   "self_type" : "type-2136",
+   "referenced_type" : "type-2140",
+   "self_type" : "type-2140",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJiEEEEEE"
@@ -61216,13 +61330,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2166",
+   "self_type" : "type-2166",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPNS_2spINS_12NativeHandleEEEEEEEEE"
@@ -61234,13 +61348,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2153",
+   "self_type" : "type-2153",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJjjEEEEEE"
@@ -61252,13 +61366,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2164",
+   "self_type" : "type-2164",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJjEEEEEE"
@@ -61270,13 +61384,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2151",
+   "self_type" : "type-2151",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPyEEEEEE"
@@ -61288,13 +61402,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2160",
+   "self_type" : "type-2160",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJyEEEEEE"
@@ -61303,660 +61417,660 @@
    "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",
+   "referenced_type" : "type-1974",
+   "self_type" : "type-1974",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1971" ],
+   "template_args" : [ "type-1975" ],
    "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",
+   "referenced_type" : "type-1939",
+   "self_type" : "type-1939",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1936" ],
+   "template_args" : [ "type-1940" ],
    "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",
+   "referenced_type" : "type-1992",
+   "self_type" : "type-1992",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1988" ],
+   "template_args" : [ "type-1993" ],
    "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",
+   "referenced_type" : "type-2011",
+   "self_type" : "type-2011",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2008" ],
+   "template_args" : [ "type-2012" ],
    "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",
+   "referenced_type" : "type-1998",
+   "self_type" : "type-1998",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1995" ],
+   "template_args" : [ "type-1999" ],
    "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",
+   "referenced_type" : "type-2018",
+   "self_type" : "type-2018",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2015" ],
+   "template_args" : [ "type-2019" ],
    "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",
+   "referenced_type" : "type-1987",
+   "self_type" : "type-1987",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1984" ],
+   "template_args" : [ "type-1988" ],
    "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",
+   "referenced_type" : "type-1967",
+   "self_type" : "type-1967",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1964" ],
+   "template_args" : [ "type-1968" ],
    "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",
+   "referenced_type" : "type-1952",
+   "self_type" : "type-1952",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1949" ],
+   "template_args" : [ "type-1953" ],
    "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",
+   "referenced_type" : "type-1959",
+   "self_type" : "type-1959",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1955" ],
+   "template_args" : [ "type-1960" ],
    "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",
+   "referenced_type" : "type-1948",
+   "self_type" : "type-1948",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1944" ],
+   "template_args" : [ "type-1949" ],
    "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",
+   "referenced_type" : "type-2007",
+   "self_type" : "type-2007",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2004" ],
+   "template_args" : [ "type-2008" ],
    "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",
+   "referenced_type" : "type-1981",
+   "self_type" : "type-1981",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1977" ],
+   "template_args" : [ "type-1982" ],
    "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",
+   "referenced_type" : "type-2003",
+   "self_type" : "type-2003",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1999" ],
+   "template_args" : [ "type-2004" ],
    "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",
+   "referenced_type" : "type-1976",
+   "self_type" : "type-1976",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1973" ],
+   "template_args" : [ "type-1977" ],
    "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",
+   "referenced_type" : "type-1996",
+   "self_type" : "type-1996",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1993" ],
+   "template_args" : [ "type-1997" ],
    "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",
+   "referenced_type" : "type-1945",
+   "self_type" : "type-1945",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1942" ],
+   "template_args" : [ "type-1946" ],
    "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",
+   "referenced_type" : "type-1943",
+   "self_type" : "type-1943",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1940" ],
+   "template_args" : [ "type-1944" ],
    "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",
+   "referenced_type" : "type-1941",
+   "self_type" : "type-1941",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1938" ],
+   "template_args" : [ "type-1942" ],
    "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",
+   "referenced_type" : "type-2022",
+   "self_type" : "type-2022",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2019" ],
+   "template_args" : [ "type-2023" ],
    "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",
+   "referenced_type" : "type-1989",
+   "self_type" : "type-1989",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1986" ],
+   "template_args" : [ "type-1990" ],
    "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",
+   "referenced_type" : "type-2020",
+   "self_type" : "type-2020",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2017" ],
+   "template_args" : [ "type-2021" ],
    "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",
+   "referenced_type" : "type-1994",
+   "self_type" : "type-1994",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1991" ],
+   "template_args" : [ "type-1995" ],
    "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",
+   "referenced_type" : "type-2016",
+   "self_type" : "type-2016",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2013" ],
+   "template_args" : [ "type-2017" ],
    "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",
+   "referenced_type" : "type-2000",
+   "self_type" : "type-2000",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1997" ],
+   "template_args" : [ "type-2001" ],
    "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",
+   "referenced_type" : "type-2014",
+   "self_type" : "type-2014",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2010" ],
+   "template_args" : [ "type-2015" ],
    "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",
+   "referenced_type" : "type-1956",
+   "self_type" : "type-1956",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1953" ],
+   "template_args" : [ "type-1957" ],
    "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",
+   "referenced_type" : "type-1965",
+   "self_type" : "type-1965",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1962" ],
+   "template_args" : [ "type-1966" ],
    "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",
+   "referenced_type" : "type-1963",
+   "self_type" : "type-1963",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1960" ],
+   "template_args" : [ "type-1964" ],
    "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",
+   "referenced_type" : "type-1950",
+   "self_type" : "type-1950",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1947" ],
+   "template_args" : [ "type-1951" ],
    "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",
+   "referenced_type" : "type-1954",
+   "self_type" : "type-1954",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1951" ],
+   "template_args" : [ "type-1955" ],
    "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",
+   "referenced_type" : "type-1961",
+   "self_type" : "type-1961",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1958" ],
+   "template_args" : [ "type-1962" ],
    "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",
+   "referenced_type" : "type-1970",
+   "self_type" : "type-1970",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1966" ],
+   "template_args" : [ "type-1971" ],
    "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",
+   "referenced_type" : "type-1972",
+   "self_type" : "type-1972",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1969" ],
+   "template_args" : [ "type-1973" ],
    "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",
+   "referenced_type" : "type-2009",
+   "self_type" : "type-2009",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2006" ],
+   "template_args" : [ "type-2010" ],
    "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",
+   "referenced_type" : "type-1985",
+   "self_type" : "type-1985",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1982" ],
+   "template_args" : [ "type-1986" ],
    "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",
+   "referenced_type" : "type-2005",
+   "self_type" : "type-2005",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2002" ],
+   "template_args" : [ "type-2006" ],
    "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",
+   "referenced_type" : "type-1983",
+   "self_type" : "type-1983",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1980" ],
+   "template_args" : [ "type-1984" ],
    "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",
+   "referenced_type" : "type-1978",
+   "self_type" : "type-1978",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1975" ],
+   "template_args" : [ "type-1979" ],
    "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",
+   "referenced_type" : "type-1893",
+   "self_type" : "type-1893",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1889" ],
+   "template_args" : [ "type-1894" ],
    "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",
+   "referenced_type" : "type-1937",
+   "self_type" : "type-1937",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1933" ],
+   "template_args" : [ "type-1938" ],
    "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",
+   "referenced_type" : "type-1926",
+   "self_type" : "type-1926",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1922" ],
+   "template_args" : [ "type-1927" ],
    "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",
+   "referenced_type" : "type-1930",
+   "self_type" : "type-1930",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1927" ],
+   "template_args" : [ "type-1931" ],
    "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",
+   "referenced_type" : "type-1915",
+   "self_type" : "type-1915",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1911" ],
+   "template_args" : [ "type-1916" ],
    "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",
+   "referenced_type" : "type-1934",
+   "self_type" : "type-1934",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1931" ],
+   "template_args" : [ "type-1935" ],
    "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",
+   "referenced_type" : "type-1923",
+   "self_type" : "type-1923",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1920" ],
+   "template_args" : [ "type-1924" ],
    "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",
+   "referenced_type" : "type-1910",
+   "self_type" : "type-1910",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1907" ],
+   "template_args" : [ "type-1911" ],
    "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",
+   "referenced_type" : "type-1904",
+   "self_type" : "type-1904",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1900" ],
+   "template_args" : [ "type-1905" ],
    "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",
+   "referenced_type" : "type-1912",
+   "self_type" : "type-1912",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1909" ],
+   "template_args" : [ "type-1913" ],
    "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",
+   "referenced_type" : "type-1901",
+   "self_type" : "type-1901",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1898" ],
+   "template_args" : [ "type-1902" ],
    "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",
+   "referenced_type" : "type-1906",
+   "self_type" : "type-1906",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1903" ],
+   "template_args" : [ "type-1907" ],
    "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",
+   "referenced_type" : "type-1899",
+   "self_type" : "type-1899",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1896" ],
+   "template_args" : [ "type-1900" ],
    "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",
+   "referenced_type" : "type-1895",
+   "self_type" : "type-1895",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1892" ],
+   "template_args" : [ "type-1896" ],
    "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",
+   "referenced_type" : "type-1928",
+   "self_type" : "type-1928",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1925" ],
+   "template_args" : [ "type-1929" ],
    "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",
+   "referenced_type" : "type-1919",
+   "self_type" : "type-1919",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1916" ],
+   "template_args" : [ "type-1920" ],
    "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",
+   "referenced_type" : "type-1921",
+   "self_type" : "type-1921",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1918" ],
+   "template_args" : [ "type-1922" ],
    "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",
+   "referenced_type" : "type-1917",
+   "self_type" : "type-1917",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1914" ],
+   "template_args" : [ "type-1918" ],
    "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",
+   "referenced_type" : "type-1908",
+   "self_type" : "type-1908",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1905" ],
+   "template_args" : [ "type-1909" ],
    "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",
+   "referenced_type" : "type-1897",
+   "self_type" : "type-1897",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1894" ],
+   "template_args" : [ "type-1898" ],
    "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",
+   "referenced_type" : "type-1932",
+   "self_type" : "type-1932",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1929" ],
+   "template_args" : [ "type-1933" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEJEEE"
   },
   {
@@ -61973,17 +62087,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 160,
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<android::IConsumerListener>",
    "name" : "android::SafeBnInterface<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1287",
-   "self_type" : "type-1287",
+   "referenced_type" : "type-1290",
+   "self_type" : "type-1290",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1288" ],
+   "template_args" : [ "type-1291" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEEE",
    "vtable_components" :
    [
@@ -62184,17 +62298,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 128,
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<android::IGraphicBufferConsumer>",
    "name" : "android::SafeBnInterface<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1276",
-   "self_type" : "type-1276",
+   "referenced_type" : "type-1279",
+   "self_type" : "type-1279",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1277" ],
+   "template_args" : [ "type-1280" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEEE",
    "vtable_components" :
    [
@@ -62422,7 +62536,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1031"
+     "referenced_type" : "type-1034"
     }
    ],
    "fields" :
@@ -62431,17 +62545,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 128,
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<android::ITransactionCompletedListener>",
    "name" : "android::SafeBnInterface<android::ITransactionCompletedListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1102",
-   "self_type" : "type-1102",
+   "referenced_type" : "type-1105",
+   "self_type" : "type-1105",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1104" ],
+   "template_args" : [ "type-1107" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEEE",
    "vtable_components" :
    [
@@ -62592,525 +62706,525 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IConsumerListener>::ArgsMatchParams<std::tuple<>, std::tuple<> >",
    "name" : "android::SafeBpInterface<IConsumerListener>::ArgsMatchParams<std::tuple<>, std::tuple<> >",
-   "referenced_type" : "type-1544",
-   "self_type" : "type-1544",
+   "referenced_type" : "type-1547",
+   "self_type" : "type-1547",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1545", "type-1546" ],
+   "template_args" : [ "type-1548", "type-1549" ],
    "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",
+   "referenced_type" : "type-1550",
+   "self_type" : "type-1550",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1548", "type-1549" ],
+   "template_args" : [ "type-1551", "type-1552" ],
    "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",
+   "referenced_type" : "type-1544",
+   "self_type" : "type-1544",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1542", "type-1543" ],
+   "template_args" : [ "type-1545", "type-1546" ],
    "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",
+   "referenced_type" : "type-1553",
+   "self_type" : "type-1553",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1532" ],
+   "template_args" : [ "type-1535" ],
    "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",
+   "referenced_type" : "type-1819",
+   "self_type" : "type-1819",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1816", "type-1817" ],
+   "template_args" : [ "type-1820", "type-1821" ],
    "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",
+   "referenced_type" : "type-1803",
+   "self_type" : "type-1803",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1800", "type-1801" ],
+   "template_args" : [ "type-1804", "type-1805" ],
    "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",
+   "referenced_type" : "type-1833",
+   "self_type" : "type-1833",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1829", "type-1830" ],
+   "template_args" : [ "type-1834", "type-1835" ],
    "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",
+   "referenced_type" : "type-1849",
+   "self_type" : "type-1849",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1846", "type-1847" ],
+   "template_args" : [ "type-1850", "type-1851" ],
    "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",
+   "referenced_type" : "type-1839",
+   "self_type" : "type-1839",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1836", "type-1837" ],
+   "template_args" : [ "type-1840", "type-1841" ],
    "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",
+   "referenced_type" : "type-1852",
+   "self_type" : "type-1852",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1849", "type-1850" ],
+   "template_args" : [ "type-1853", "type-1854" ],
    "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",
+   "referenced_type" : "type-1829",
+   "self_type" : "type-1829",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1826", "type-1827" ],
+   "template_args" : [ "type-1830", "type-1831" ],
    "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",
+   "referenced_type" : "type-1816",
+   "self_type" : "type-1816",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1813", "type-1814" ],
+   "template_args" : [ "type-1817", "type-1818" ],
    "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",
+   "referenced_type" : "type-1813",
+   "self_type" : "type-1813",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1810", "type-1811" ],
+   "template_args" : [ "type-1814", "type-1815" ],
    "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",
+   "referenced_type" : "type-1806",
+   "self_type" : "type-1806",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1803", "type-1804" ],
+   "template_args" : [ "type-1807", "type-1808" ],
    "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",
+   "referenced_type" : "type-1809",
+   "self_type" : "type-1809",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1806", "type-1807" ],
+   "template_args" : [ "type-1810", "type-1811" ],
    "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",
+   "referenced_type" : "type-1846",
+   "self_type" : "type-1846",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1843", "type-1844" ],
+   "template_args" : [ "type-1847", "type-1848" ],
    "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",
+   "referenced_type" : "type-1826",
+   "self_type" : "type-1826",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1823", "type-1824" ],
+   "template_args" : [ "type-1827", "type-1828" ],
    "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",
+   "referenced_type" : "type-1842",
+   "self_type" : "type-1842",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1839", "type-1840" ],
+   "template_args" : [ "type-1843", "type-1844" ],
    "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",
+   "referenced_type" : "type-1836",
+   "self_type" : "type-1836",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1833", "type-1834" ],
+   "template_args" : [ "type-1837", "type-1838" ],
    "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",
+   "referenced_type" : "type-1823",
+   "self_type" : "type-1823",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1820", "type-1821" ],
+   "template_args" : [ "type-1824", "type-1825" ],
    "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",
+   "referenced_type" : "type-1724",
+   "self_type" : "type-1724",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1721", "type-1722" ],
+   "template_args" : [ "type-1725", "type-1726" ],
    "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",
+   "referenced_type" : "type-1773",
+   "self_type" : "type-1773",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1770", "type-1771" ],
+   "template_args" : [ "type-1774", "type-1775" ],
    "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",
+   "referenced_type" : "type-1790",
+   "self_type" : "type-1790",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1787", "type-1788" ],
+   "template_args" : [ "type-1791", "type-1792" ],
    "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",
+   "referenced_type" : "type-1780",
+   "self_type" : "type-1780",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1777", "type-1778" ],
+   "template_args" : [ "type-1781", "type-1782" ],
    "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",
+   "referenced_type" : "type-1796",
+   "self_type" : "type-1796",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1793", "type-1794" ],
+   "template_args" : [ "type-1797", "type-1798" ],
    "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",
+   "referenced_type" : "type-1770",
+   "self_type" : "type-1770",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1767", "type-1768" ],
+   "template_args" : [ "type-1771", "type-1772" ],
    "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",
+   "referenced_type" : "type-1753",
+   "self_type" : "type-1753",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1750", "type-1751" ],
+   "template_args" : [ "type-1754", "type-1755" ],
    "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",
+   "referenced_type" : "type-1743",
+   "self_type" : "type-1743",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1740", "type-1741" ],
+   "template_args" : [ "type-1744", "type-1745" ],
    "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",
+   "referenced_type" : "type-1734",
+   "self_type" : "type-1734",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1730", "type-1731" ],
+   "template_args" : [ "type-1735", "type-1736" ],
    "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",
+   "referenced_type" : "type-1737",
+   "self_type" : "type-1737",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1734", "type-1735" ],
+   "template_args" : [ "type-1738", "type-1739" ],
    "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",
+   "referenced_type" : "type-1786",
+   "self_type" : "type-1786",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1783", "type-1784" ],
+   "template_args" : [ "type-1787", "type-1788" ],
    "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",
+   "referenced_type" : "type-1763",
+   "self_type" : "type-1763",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1760", "type-1761" ],
+   "template_args" : [ "type-1764", "type-1765" ],
    "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",
+   "referenced_type" : "type-1783",
+   "self_type" : "type-1783",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1780", "type-1781" ],
+   "template_args" : [ "type-1784", "type-1785" ],
    "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",
+   "referenced_type" : "type-1776",
+   "self_type" : "type-1776",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1773", "type-1774" ],
+   "template_args" : [ "type-1777", "type-1778" ],
    "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",
+   "referenced_type" : "type-1760",
+   "self_type" : "type-1760",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1757", "type-1758" ],
+   "template_args" : [ "type-1761", "type-1762" ],
    "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",
+   "referenced_type" : "type-1727",
+   "self_type" : "type-1727",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1724", "type-1725" ],
+   "template_args" : [ "type-1728", "type-1729" ],
    "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",
+   "referenced_type" : "type-1793",
+   "self_type" : "type-1793",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1790", "type-1791" ],
+   "template_args" : [ "type-1794", "type-1795" ],
    "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",
+   "referenced_type" : "type-1800",
+   "self_type" : "type-1800",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1796", "type-1797" ],
+   "template_args" : [ "type-1801", "type-1802" ],
    "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",
+   "referenced_type" : "type-1757",
+   "self_type" : "type-1757",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1754", "type-1755" ],
+   "template_args" : [ "type-1758", "type-1759" ],
    "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",
+   "referenced_type" : "type-1747",
+   "self_type" : "type-1747",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1744", "type-1745" ],
+   "template_args" : [ "type-1748", "type-1749" ],
    "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",
+   "referenced_type" : "type-1740",
+   "self_type" : "type-1740",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1737", "type-1738" ],
+   "template_args" : [ "type-1741", "type-1742" ],
    "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",
+   "referenced_type" : "type-1767",
+   "self_type" : "type-1767",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1763", "type-1764" ],
+   "template_args" : [ "type-1768", "type-1769" ],
    "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",
+   "referenced_type" : "type-1730",
+   "self_type" : "type-1730",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1727", "type-1728" ],
+   "template_args" : [ "type-1731", "type-1732" ],
    "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",
+   "referenced_type" : "type-1750",
+   "self_type" : "type-1750",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1747", "type-1748" ],
+   "template_args" : [ "type-1751", "type-1752" ],
    "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",
+   "referenced_type" : "type-1856",
+   "self_type" : "type-1856",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1853" ],
+   "template_args" : [ "type-1857" ],
    "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",
+   "referenced_type" : "type-1887",
+   "self_type" : "type-1887",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1884" ],
+   "template_args" : [ "type-1888" ],
    "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",
+   "referenced_type" : "type-1882",
+   "self_type" : "type-1882",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1879" ],
+   "template_args" : [ "type-1883" ],
    "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",
+   "referenced_type" : "type-1880",
+   "self_type" : "type-1880",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-767" ],
@@ -63120,8 +63234,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<bool &>",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<bool &>",
-   "referenced_type" : "type-1869",
-   "self_type" : "type-1869",
+   "referenced_type" : "type-1873",
+   "self_type" : "type-1873",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-766" ],
@@ -63131,41 +63245,41 @@
    "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",
+   "referenced_type" : "type-1877",
+   "self_type" : "type-1877",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1874" ],
+   "template_args" : [ "type-1878" ],
    "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",
+   "referenced_type" : "type-1865",
+   "self_type" : "type-1865",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1862" ],
+   "template_args" : [ "type-1866" ],
    "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",
+   "referenced_type" : "type-1863",
+   "self_type" : "type-1863",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1859" ],
+   "template_args" : [ "type-1864" ],
    "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",
+   "referenced_type" : "type-1872",
+   "self_type" : "type-1872",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-944" ],
@@ -63175,8 +63289,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int &>",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int &>",
-   "referenced_type" : "type-1856",
-   "self_type" : "type-1856",
+   "referenced_type" : "type-1860",
+   "self_type" : "type-1860",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-198" ],
@@ -63186,41 +63300,41 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int *&>",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int *&>",
-   "referenced_type" : "type-1857",
-   "self_type" : "type-1857",
+   "referenced_type" : "type-1861",
+   "self_type" : "type-1861",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1508" ],
+   "template_args" : [ "type-1511" ],
    "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",
+   "referenced_type" : "type-1858",
+   "self_type" : "type-1858",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1429" ],
+   "template_args" : [ "type-1432" ],
    "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",
+   "referenced_type" : "type-1885",
+   "self_type" : "type-1885",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1882" ],
+   "template_args" : [ "type-1886" ],
    "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",
+   "referenced_type" : "type-1876",
+   "self_type" : "type-1876",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-10" ],
@@ -63230,8 +63344,8 @@
    "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",
+   "referenced_type" : "type-1859",
+   "self_type" : "type-1859",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-544" ],
@@ -63241,11 +63355,11 @@
    "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",
+   "referenced_type" : "type-1874",
+   "self_type" : "type-1874",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1871" ],
+   "template_args" : [ "type-1875" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRPyEE"
   },
   {
@@ -63253,7 +63367,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1495"
+     "referenced_type" : "type-1501"
     }
    ],
    "fields" :
@@ -63262,17 +63376,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 192,
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeBpInterface<android::IConsumerListener>",
    "name" : "android::SafeBpInterface<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1537",
-   "self_type" : "type-1537",
+   "referenced_type" : "type-1541",
+   "self_type" : "type-1541",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1538" ],
+   "template_args" : [ "type-1542" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_17IConsumerListenerEEE",
    "vtable_components" :
    [
@@ -63428,7 +63542,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1624"
+     "referenced_type" : "type-1629"
     }
    ],
    "fields" :
@@ -63437,17 +63551,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 160,
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeBpInterface<android::IGraphicBufferConsumer>",
    "name" : "android::SafeBpInterface<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1716",
-   "self_type" : "type-1716",
+   "referenced_type" : "type-1720",
+   "self_type" : "type-1720",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1717" ],
+   "template_args" : [ "type-1721" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEEE",
    "vtable_components" :
    [
@@ -63638,198 +63752,198 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)()>",
    "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)()>",
-   "referenced_type" : "type-1692",
-   "self_type" : "type-1692",
+   "referenced_type" : "type-1696",
+   "self_type" : "type-1696",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1693" ],
+   "template_args" : [ "type-1697" ],
    "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",
+   "referenced_type" : "type-1685",
+   "self_type" : "type-1685",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1682" ],
+   "template_args" : [ "type-1686" ],
    "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",
+   "referenced_type" : "type-1705",
+   "self_type" : "type-1705",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1702" ],
+   "template_args" : [ "type-1706" ],
    "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",
+   "referenced_type" : "type-1709",
+   "self_type" : "type-1709",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1706" ],
+   "template_args" : [ "type-1710" ],
    "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",
+   "referenced_type" : "type-1716",
+   "self_type" : "type-1716",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1713" ],
+   "template_args" : [ "type-1717" ],
    "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",
+   "referenced_type" : "type-1703",
+   "self_type" : "type-1703",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1700" ],
+   "template_args" : [ "type-1704" ],
    "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",
+   "referenced_type" : "type-1718",
+   "self_type" : "type-1718",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1715" ],
+   "template_args" : [ "type-1719" ],
    "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",
+   "referenced_type" : "type-1694",
+   "self_type" : "type-1694",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1691" ],
+   "template_args" : [ "type-1695" ],
    "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",
+   "referenced_type" : "type-1690",
+   "self_type" : "type-1690",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1686" ],
+   "template_args" : [ "type-1691" ],
    "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",
+   "referenced_type" : "type-1687",
+   "self_type" : "type-1687",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1684" ],
+   "template_args" : [ "type-1688" ],
    "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",
+   "referenced_type" : "type-1692",
+   "self_type" : "type-1692",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1689" ],
+   "template_args" : [ "type-1693" ],
    "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",
+   "referenced_type" : "type-1714",
+   "self_type" : "type-1714",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1711" ],
+   "template_args" : [ "type-1715" ],
    "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",
+   "referenced_type" : "type-1712",
+   "self_type" : "type-1712",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1708" ],
+   "template_args" : [ "type-1713" ],
    "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",
+   "referenced_type" : "type-1701",
+   "self_type" : "type-1701",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1697" ],
+   "template_args" : [ "type-1702" ],
    "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",
+   "referenced_type" : "type-1698",
+   "self_type" : "type-1698",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1695" ],
+   "template_args" : [ "type-1699" ],
    "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",
+   "referenced_type" : "type-1707",
+   "self_type" : "type-1707",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1704" ],
+   "template_args" : [ "type-1708" ],
    "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",
+   "referenced_type" : "type-1537",
+   "self_type" : "type-1537",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1534" ],
+   "template_args" : [ "type-1538" ],
    "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",
+   "referenced_type" : "type-1539",
+   "self_type" : "type-1539",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1536" ],
+   "template_args" : [ "type-1540" ],
    "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_16ConsumerListenerEFvRKNS_10BufferItemEEEE"
   },
   {
@@ -63839,14 +63953,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeInterface::ParcelHandler",
    "name" : "android::SafeInterface::ParcelHandler",
    "record_kind" : "class",
-   "referenced_type" : "type-1235",
-   "self_type" : "type-1235",
+   "referenced_type" : "type-1238",
+   "self_type" : "type-1238",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android13SafeInterface13ParcelHandlerE"
@@ -63855,8 +63969,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParcelHandler::HandleInt<false, 4, unsigned int>",
    "name" : "android::SafeInterface::ParcelHandler::HandleInt<false, 4, unsigned int>",
-   "referenced_type" : "type-1679",
-   "self_type" : "type-1679",
+   "referenced_type" : "type-1683",
+   "self_type" : "type-1683",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-2" ],
@@ -63866,8 +63980,8 @@
    "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",
+   "referenced_type" : "type-1681",
+   "self_type" : "type-1681",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-92" ],
@@ -63877,8 +63991,8 @@
    "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",
+   "referenced_type" : "type-1682",
+   "self_type" : "type-1682",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-4" ],
@@ -63888,8 +64002,8 @@
    "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",
+   "referenced_type" : "type-1678",
+   "self_type" : "type-1678",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-169" ],
@@ -63919,11 +64033,11 @@
    "linker_set_key" : "android::Singleton<android::ComposerService>",
    "name" : "android::Singleton<android::ComposerService>",
    "record_kind" : "class",
-   "referenced_type" : "type-1089",
-   "self_type" : "type-1089",
+   "referenced_type" : "type-1092",
+   "self_type" : "type-1092",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-1090" ],
+   "template_args" : [ "type-1093" ],
    "unique_id" : "_ZTSN7android9SingletonINS_15ComposerServiceEEE"
   },
   {
@@ -63950,11 +64064,11 @@
    "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",
+   "referenced_type" : "type-1204",
+   "self_type" : "type-1204",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-1201" ],
+   "template_args" : [ "type-1205" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEEE",
    "vtable_components" :
    [
@@ -64008,11 +64122,11 @@
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
    "name" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-1354",
-   "self_type" : "type-1354",
+   "referenced_type" : "type-1357",
+   "self_type" : "type-1357",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-1355" ],
+   "template_args" : [ "type-1358" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
    "vtable_components" :
    [
@@ -64302,7 +64416,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -64312,13 +64426,13 @@
     {
      "field_name" : "bStoreMetaData",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "android::StoreMetaDataInBuffersParams",
    "name" : "android::StoreMetaDataInBuffersParams",
-   "referenced_type" : "type-2396",
-   "self_type" : "type-2396",
+   "referenced_type" : "type-2399",
+   "self_type" : "type-2399",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android28StoreMetaDataInBuffersParamsE"
@@ -64330,14 +64444,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-1240"
+     "referenced_type" : "type-1243"
     }
    ],
    "linker_set_key" : "android::String16",
    "name" : "android::String16",
    "record_kind" : "class",
-   "referenced_type" : "type-1239",
-   "self_type" : "type-1239",
+   "referenced_type" : "type-1242",
+   "self_type" : "type-1242",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "unique_id" : "_ZTSN7android8String16E"
@@ -64526,7 +64640,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -64541,18 +64655,18 @@
     {
      "field_name" : "bufferHeader",
      "field_offset" : 128,
-     "referenced_type" : "type-2376"
+     "referenced_type" : "type-2379"
     },
     {
      "field_name" : "nativeBuffer",
      "field_offset" : 160,
-     "referenced_type" : "type-2408"
+     "referenced_type" : "type-2411"
     }
    ],
    "linker_set_key" : "android::UseAndroidNativeBufferParams",
    "name" : "android::UseAndroidNativeBufferParams",
-   "referenced_type" : "type-2407",
-   "self_type" : "type-2407",
+   "referenced_type" : "type-2410",
+   "self_type" : "type-2410",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android28UseAndroidNativeBufferParamsE"
@@ -64569,11 +64683,11 @@
    "linker_set_key" : "android::Vector<android::BBinder *>",
    "name" : "android::Vector<android::BBinder *>",
    "record_kind" : "class",
-   "referenced_type" : "type-1205",
-   "self_type" : "type-1205",
+   "referenced_type" : "type-1208",
+   "self_type" : "type-1208",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-1206" ],
+   "template_args" : [ "type-1209" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7BBinderEEE",
    "vtable_components" :
    [
@@ -64679,11 +64793,11 @@
    "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",
+   "referenced_type" : "type-1206",
+   "self_type" : "type-1206",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-1203" ],
+   "template_args" : [ "type-1207" ],
    "unique_id" : "_ZTSN7android6VectorINS_12ProcessState12handle_entryEEE",
    "vtable_components" :
    [
@@ -64734,11 +64848,11 @@
    "linker_set_key" : "android::Vector<android::Rect>",
    "name" : "android::Vector<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-2677",
-   "self_type" : "type-2677",
+   "referenced_type" : "type-2680",
+   "self_type" : "type-2680",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-2678" ],
+   "template_args" : [ "type-2681" ],
    "unique_id" : "_ZTSN7android6VectorINS_4RectEEE",
    "vtable_components" :
    [
@@ -64789,8 +64903,8 @@
    "linker_set_key" : "android::Vector<android::RefBase *>",
    "name" : "android::Vector<android::RefBase *>",
    "record_kind" : "class",
-   "referenced_type" : "type-1208",
-   "self_type" : "type-1208",
+   "referenced_type" : "type-1213",
+   "self_type" : "type-1213",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-270" ],
@@ -64844,8 +64958,8 @@
    "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",
+   "referenced_type" : "type-1210",
+   "self_type" : "type-1210",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-56" ],
@@ -64899,11 +65013,11 @@
    "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",
+   "referenced_type" : "type-1363",
+   "self_type" : "type-1363",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-1361" ],
+   "template_args" : [ "type-1364" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_8hardware9BHwBinderEEE",
    "vtable_components" :
    [
@@ -64954,11 +65068,11 @@
    "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "record_kind" : "class",
-   "referenced_type" : "type-1356",
-   "self_type" : "type-1356",
+   "referenced_type" : "type-1359",
+   "self_type" : "type-1359",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-1357" ],
+   "template_args" : [ "type-1360" ],
    "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
    "vtable_components" :
    [
@@ -65009,8 +65123,8 @@
    "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",
+   "referenced_type" : "type-1228",
+   "self_type" : "type-1228",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-733" ],
@@ -65064,8 +65178,8 @@
    "linker_set_key" : "android::Vector<int>",
    "name" : "android::Vector<int>",
    "record_kind" : "class",
-   "referenced_type" : "type-2686",
-   "self_type" : "type-2686",
+   "referenced_type" : "type-2689",
+   "self_type" : "type-2689",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-4" ],
@@ -65119,8 +65233,8 @@
    "linker_set_key" : "android::Vector<long long>",
    "name" : "android::Vector<long long>",
    "record_kind" : "class",
-   "referenced_type" : "type-1081",
-   "self_type" : "type-1081",
+   "referenced_type" : "type-1084",
+   "self_type" : "type-1084",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-169" ],
@@ -65247,13 +65361,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2397"
+     "referenced_type" : "type-2400"
     }
    ],
    "linker_set_key" : "android::VideoDecoderOutputMetaData",
    "name" : "android::VideoDecoderOutputMetaData",
-   "referenced_type" : "type-2398",
-   "self_type" : "type-2398",
+   "referenced_type" : "type-2401",
+   "self_type" : "type-2401",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26VideoDecoderOutputMetaDataE"
@@ -65264,7 +65378,7 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-1234"
+     "referenced_type" : "type-1235"
     },
     {
      "field_name" : "pHandle",
@@ -65274,8 +65388,8 @@
    ],
    "linker_set_key" : "android::VideoGrallocMetadata",
    "name" : "android::VideoGrallocMetadata",
-   "referenced_type" : "type-2397",
-   "self_type" : "type-2397",
+   "referenced_type" : "type-2400",
+   "self_type" : "type-2400",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android20VideoGrallocMetadataE"
@@ -65286,7 +65400,7 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-1234"
+     "referenced_type" : "type-1235"
     },
     {
      "field_name" : "pHandle",
@@ -65296,8 +65410,8 @@
    ],
    "linker_set_key" : "android::VideoNativeHandleMetadata",
    "name" : "android::VideoNativeHandleMetadata",
-   "referenced_type" : "type-2405",
-   "self_type" : "type-2405",
+   "referenced_type" : "type-2408",
+   "self_type" : "type-2408",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android25VideoNativeHandleMetadataE"
@@ -65308,12 +65422,12 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-1234"
+     "referenced_type" : "type-1235"
     },
     {
      "field_name" : "pBuffer",
      "field_offset" : 32,
-     "referenced_type" : "type-2401"
+     "referenced_type" : "type-2404"
     },
     {
      "field_name" : "nFenceFd",
@@ -65323,8 +65437,8 @@
    ],
    "linker_set_key" : "android::VideoNativeMetadata",
    "name" : "android::VideoNativeMetadata",
-   "referenced_type" : "type-2400",
-   "self_type" : "type-2400",
+   "referenced_type" : "type-2403",
+   "self_type" : "type-2403",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android19VideoNativeMetadataE"
@@ -65334,14 +65448,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2352"
+     "referenced_type" : "type-2355"
     }
    ],
    "linker_set_key" : "android::VirtualLightRefBase",
    "name" : "android::VirtualLightRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-2354",
-   "self_type" : "type-2354",
+   "referenced_type" : "type-2357",
+   "self_type" : "type-2357",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
    "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
@@ -65388,30 +65502,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::aggregate_traits<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-2606",
-   "self_type" : "type-2606",
+   "referenced_type" : "type-2609",
+   "self_type" : "type-2609",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-4", "type-2607" ],
+   "template_args" : [ "type-4", "type-2610" ],
    "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-2603",
-   "self_type" : "type-2603",
+   "referenced_type" : "type-2606",
+   "self_type" : "type-2606",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-4", "type-2604" ],
+   "template_args" : [ "type-4", "type-2607" ],
    "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-2602",
-   "self_type" : "type-2602",
+   "referenced_type" : "type-2605",
+   "self_type" : "type-2605",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2", "type-2" ],
@@ -65470,13 +65584,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-980"
+     "referenced_type" : "type-977"
     }
    ],
    "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-979",
-   "self_type" : "type-979",
+   "referenced_type" : "type-976",
+   "self_type" : "type-976",
    "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"
@@ -65613,8 +65727,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::base::DefaultCloser",
    "name" : "android::base::DefaultCloser",
-   "referenced_type" : "type-2523",
-   "self_type" : "type-2523",
+   "referenced_type" : "type-2526",
+   "self_type" : "type-2526",
    "size" : 1,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "unique_id" : "_ZTSN7android4base13DefaultCloserE"
@@ -65635,8 +65749,8 @@
    ],
    "linker_set_key" : "android::base::EagerEvaluator<char *, char *>",
    "name" : "android::base::EagerEvaluator<char *, char *>",
-   "referenced_type" : "type-4699",
-   "self_type" : "type-4699",
+   "referenced_type" : "type-4705",
+   "self_type" : "type-4705",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-254", "type-254" ],
@@ -65658,8 +65772,8 @@
    ],
    "linker_set_key" : "android::base::EagerEvaluator<char *, const char *>",
    "name" : "android::base::EagerEvaluator<char *, const char *>",
-   "referenced_type" : "type-4695",
-   "self_type" : "type-4695",
+   "referenced_type" : "type-4702",
+   "self_type" : "type-4702",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-254", "type-122" ],
@@ -65681,8 +65795,8 @@
    ],
    "linker_set_key" : "android::base::EagerEvaluator<const char *, char *>",
    "name" : "android::base::EagerEvaluator<const char *, char *>",
-   "referenced_type" : "type-4681",
-   "self_type" : "type-4681",
+   "referenced_type" : "type-4689",
+   "self_type" : "type-4689",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-122", "type-254" ],
@@ -65704,8 +65818,8 @@
    ],
    "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",
+   "referenced_type" : "type-4672",
+   "self_type" : "type-4672",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-122", "type-122" ],
@@ -65727,11 +65841,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",
+   "referenced_type" : "type-4729",
+   "self_type" : "type-4729",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-4723", "type-4723" ],
+   "template_args" : [ "type-4730", "type-4730" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaS3_EE"
   },
   {
@@ -65750,11 +65864,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",
+   "referenced_type" : "type-4736",
+   "self_type" : "type-4736",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-4723", "type-4731" ],
+   "template_args" : [ "type-4730", "type-4737" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaPaEE"
   },
   {
@@ -65773,8 +65887,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-4703",
-   "self_type" : "type-4703",
+   "referenced_type" : "type-4710",
+   "self_type" : "type-4710",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-97", "type-97" ],
@@ -65796,8 +65910,8 @@
    ],
    "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",
+   "referenced_type" : "type-4713",
+   "self_type" : "type-4713",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-97", "type-89" ],
@@ -65819,11 +65933,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",
+   "referenced_type" : "type-4740",
+   "self_type" : "type-4740",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-4731", "type-4723" ],
+   "template_args" : [ "type-4737", "type-4730" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaPKaEE"
   },
   {
@@ -65842,11 +65956,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",
+   "referenced_type" : "type-4747",
+   "self_type" : "type-4747",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-4731", "type-4731" ],
+   "template_args" : [ "type-4737", "type-4737" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaS2_EE"
   },
   {
@@ -65865,8 +65979,8 @@
    ],
    "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",
+   "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-97" ],
@@ -65888,8 +66002,8 @@
    ],
    "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",
+   "referenced_type" : "type-4722",
+   "self_type" : "type-4722",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-89", "type-89" ],
@@ -65908,8 +66022,8 @@
    "linker_set_key" : "android::base::ErrnoRestorer",
    "name" : "android::base::ErrnoRestorer",
    "record_kind" : "class",
-   "referenced_type" : "type-4656",
-   "self_type" : "type-4656",
+   "referenced_type" : "type-4663",
+   "self_type" : "type-4663",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base13ErrnoRestorerE"
@@ -65921,14 +66035,14 @@
     {
      "access" : "private",
      "field_name" : "data_",
-     "referenced_type" : "type-4752"
+     "referenced_type" : "type-4758"
     }
    ],
    "linker_set_key" : "android::base::LogMessage",
    "name" : "android::base::LogMessage",
    "record_kind" : "class",
-   "referenced_type" : "type-4751",
-   "self_type" : "type-4751",
+   "referenced_type" : "type-4757",
+   "self_type" : "type-4757",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base10LogMessageE"
@@ -65940,14 +66054,14 @@
     {
      "access" : "private",
      "field_name" : "default_log_id_",
-     "referenced_type" : "type-4704"
+     "referenced_type" : "type-4711"
     }
    ],
    "linker_set_key" : "android::base::LogdLogger",
    "name" : "android::base::LogdLogger",
    "record_kind" : "class",
-   "referenced_type" : "type-4721",
-   "self_type" : "type-4721",
+   "referenced_type" : "type-4728",
+   "self_type" : "type-4728",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base10LogdLoggerE"
@@ -65959,14 +66073,14 @@
     {
      "access" : "private",
      "field_name" : "old_",
-     "referenced_type" : "type-4654"
+     "referenced_type" : "type-4661"
     }
    ],
    "linker_set_key" : "android::base::ScopedLogSeverity",
    "name" : "android::base::ScopedLogSeverity",
    "record_kind" : "class",
-   "referenced_type" : "type-4756",
-   "self_type" : "type-4756",
+   "referenced_type" : "type-4763",
+   "self_type" : "type-4763",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base17ScopedLogSeverityE"
@@ -65984,11 +66098,11 @@
    "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser>",
    "name" : "android::base::unique_fd_impl<android::base::DefaultCloser>",
    "record_kind" : "class",
-   "referenced_type" : "type-2553",
-   "self_type" : "type-2553",
+   "referenced_type" : "type-2556",
+   "self_type" : "type-2556",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h",
-   "template_args" : [ "type-2523" ],
+   "template_args" : [ "type-2526" ],
    "unique_id" : "_ZTSN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
   },
   {
@@ -66027,7 +66141,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1362"
     }
    ],
    "fields" :
@@ -66048,7 +66162,7 @@
      "access" : "private",
      "field_name" : "mExtras",
      "field_offset" : 96,
-     "referenced_type" : "type-1363"
+     "referenced_type" : "type-1366"
     },
     {
      "access" : "private",
@@ -66060,8 +66174,8 @@
    "linker_set_key" : "android::hardware::BHwBinder",
    "name" : "android::hardware::BHwBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-1362",
-   "self_type" : "type-1362",
+   "referenced_type" : "type-1365",
+   "self_type" : "type-1365",
    "size" : 28,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware9BHwBinderE",
@@ -66177,7 +66291,7 @@
      "access" : "private",
      "field_name" : "mRemote",
      "field_offset" : 32,
-     "referenced_type" : "type-1372"
+     "referenced_type" : "type-1375"
     },
     {
      "access" : "private",
@@ -66189,14 +66303,14 @@
      "access" : "private",
      "field_name" : "mState",
      "field_offset" : 96,
-     "referenced_type" : "type-1373"
+     "referenced_type" : "type-1376"
     }
    ],
    "linker_set_key" : "android::hardware::BpHwRefBase",
    "name" : "android::hardware::BpHwRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-1371",
-   "self_type" : "type-1371",
+   "referenced_type" : "type-1374",
+   "self_type" : "type-1374",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE",
@@ -66415,8 +66529,8 @@
    "linker_set_key" : "android::hardware::IBinder",
    "name" : "android::hardware::IBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-1359",
-   "self_type" : "type-1359",
+   "referenced_type" : "type-1362",
+   "self_type" : "type-1362",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinderE",
@@ -66532,8 +66646,8 @@
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient",
    "name" : "android::hardware::IBinder::DeathRecipient",
    "record_kind" : "class",
-   "referenced_type" : "type-1370",
-   "self_type" : "type-1370",
+   "referenced_type" : "type-1373",
+   "self_type" : "type-1373",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinder14DeathRecipientE",
@@ -66620,8 +66734,8 @@
    "linker_set_key" : "android::hardware::IInterface",
    "name" : "android::hardware::IInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1376",
+   "referenced_type" : "type-1379",
+   "self_type" : "type-1379",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
    "unique_id" : "_ZTSN7android8hardware10IInterfaceE",
@@ -66703,43 +66817,43 @@
     {
      "access" : "private",
      "field_name" : "mProcess",
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1396"
     },
     {
      "access" : "private",
      "field_name" : "mPendingStrongDerefs",
      "field_offset" : 32,
-     "referenced_type" : "type-1360"
+     "referenced_type" : "type-1363"
     },
     {
      "access" : "private",
      "field_name" : "mPendingWeakDerefs",
      "field_offset" : 192,
-     "referenced_type" : "type-1207"
+     "referenced_type" : "type-1210"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteStrongDerefs",
      "field_offset" : 352,
-     "referenced_type" : "type-1208"
+     "referenced_type" : "type-1213"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteWeakDerefs",
      "field_offset" : 512,
-     "referenced_type" : "type-1207"
+     "referenced_type" : "type-1210"
     },
     {
      "access" : "private",
      "field_name" : "mIn",
      "field_offset" : 672,
-     "referenced_type" : "type-1377"
+     "referenced_type" : "type-1380"
     },
     {
      "access" : "private",
      "field_name" : "mOut",
      "field_offset" : 1216,
-     "referenced_type" : "type-1377"
+     "referenced_type" : "type-1380"
     },
     {
      "access" : "private",
@@ -66781,7 +66895,7 @@
      "access" : "private",
      "field_name" : "mContextObject",
      "field_offset" : 1952,
-     "referenced_type" : "type-1399"
+     "referenced_type" : "type-1402"
     },
     {
      "access" : "private",
@@ -66799,26 +66913,26 @@
      "access" : "private",
      "field_name" : "mPostCommandTasks",
      "field_offset" : 2016,
-     "referenced_type" : "type-1400"
+     "referenced_type" : "type-1403"
     },
     {
      "access" : "private",
      "field_name" : "mIPCThreadStateBase",
      "field_offset" : 2112,
-     "referenced_type" : "type-1368"
+     "referenced_type" : "type-1371"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 2144,
-     "referenced_type" : "type-1391"
+     "referenced_type" : "type-1394"
     }
    ],
    "linker_set_key" : "android::hardware::IPCThreadState",
    "name" : "android::hardware::IPCThreadState",
    "record_kind" : "class",
-   "referenced_type" : "type-1392",
-   "self_type" : "type-1392",
+   "referenced_type" : "type-1395",
+   "self_type" : "type-1395",
    "size" : 272,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h",
    "unique_id" : "_ZTSN7android8hardware14IPCThreadStateE"
@@ -66836,7 +66950,7 @@
      "access" : "private",
      "field_name" : "mBufCache",
      "field_offset" : 32,
-     "referenced_type" : "type-1378"
+     "referenced_type" : "type-1381"
     },
     {
      "access" : "private",
@@ -66920,7 +67034,7 @@
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 480,
-     "referenced_type" : "type-1379"
+     "referenced_type" : "type-1382"
     },
     {
      "access" : "private",
@@ -66932,8 +67046,8 @@
    "linker_set_key" : "android::hardware::Parcel",
    "name" : "android::hardware::Parcel",
    "record_kind" : "class",
-   "referenced_type" : "type-1377",
-   "self_type" : "type-1377",
+   "referenced_type" : "type-1380",
+   "self_type" : "type-1380",
    "size" : 68,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6ParcelE"
@@ -66960,8 +67074,8 @@
    ],
    "linker_set_key" : "android::hardware::Parcel::BufferInfo",
    "name" : "android::hardware::Parcel::BufferInfo",
-   "referenced_type" : "type-1382",
-   "self_type" : "type-1382",
+   "referenced_type" : "type-1385",
+   "self_type" : "type-1385",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE"
@@ -66993,13 +67107,13 @@
      "access" : "private",
      "field_name" : "mThreadCountLock",
      "field_offset" : 96,
-     "referenced_type" : "type-1397"
+     "referenced_type" : "type-1400"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountDecrement",
      "field_offset" : 128,
-     "referenced_type" : "type-1398"
+     "referenced_type" : "type-1401"
     },
     {
      "access" : "private",
@@ -67029,7 +67143,7 @@
      "access" : "private",
      "field_name" : "mHandleToObject",
      "field_offset" : 352,
-     "referenced_type" : "type-1356"
+     "referenced_type" : "type-1359"
     },
     {
      "access" : "private",
@@ -67041,7 +67155,7 @@
      "access" : "private",
      "field_name" : "mBinderContextCheckFunc",
      "field_offset" : 544,
-     "referenced_type" : "type-1390"
+     "referenced_type" : "type-1393"
     },
     {
      "access" : "private",
@@ -67053,7 +67167,7 @@
      "access" : "private",
      "field_name" : "mContexts",
      "field_offset" : 608,
-     "referenced_type" : "type-1366"
+     "referenced_type" : "type-1369"
     },
     {
      "access" : "private",
@@ -67077,7 +67191,7 @@
      "access" : "private",
      "field_name" : "mThreadPoolSeq",
      "field_offset" : 832,
-     "referenced_type" : "type-1250"
+     "referenced_type" : "type-1253"
     },
     {
      "access" : "private",
@@ -67089,14 +67203,14 @@
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 896,
-     "referenced_type" : "type-1391"
+     "referenced_type" : "type-1394"
     }
    ],
    "linker_set_key" : "android::hardware::ProcessState",
    "name" : "android::hardware::ProcessState",
    "record_kind" : "class",
-   "referenced_type" : "type-1396",
-   "self_type" : "type-1396",
+   "referenced_type" : "type-1399",
+   "self_type" : "type-1399",
    "size" : 128,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessStateE",
@@ -67174,7 +67288,7 @@
    [
     {
      "field_name" : "binder",
-     "referenced_type" : "type-1358"
+     "referenced_type" : "type-1361"
     },
     {
      "field_name" : "refs",
@@ -67184,8 +67298,8 @@
    ],
    "linker_set_key" : "android::hardware::ProcessState::handle_entry",
    "name" : "android::hardware::ProcessState::handle_entry",
-   "referenced_type" : "type-1357",
-   "self_type" : "type-1357",
+   "referenced_type" : "type-1360",
+   "self_type" : "type-1360",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE"
@@ -67210,8 +67324,8 @@
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::bufferqueue::V2_0::Status>",
    "name" : "android::hardware::Return<android::hardware::graphics::bufferqueue::V2_0::Status>",
    "record_kind" : "class",
-   "referenced_type" : "type-6770",
-   "self_type" : "type-6770",
+   "referenced_type" : "type-6779",
+   "self_type" : "type-6779",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "template_args" : [ "type-607" ],
@@ -67231,17 +67345,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-2463"
+     "referenced_type" : "type-2466"
     }
    ],
    "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",
+   "referenced_type" : "type-4365",
+   "self_type" : "type-4365",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-2463" ],
+   "template_args" : [ "type-2466" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducerEEEEE"
   },
   {
@@ -67258,17 +67372,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-2454"
+     "referenced_type" : "type-2457"
     }
    ],
    "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",
+   "referenced_type" : "type-4494",
+   "self_type" : "type-4494",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-2454" ],
+   "template_args" : [ "type-2457" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V1_017IProducerListenerEEEEE"
   },
   {
@@ -67285,17 +67399,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-2476"
+     "referenced_type" : "type-2479"
     }
    ],
    "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",
+   "referenced_type" : "type-4371",
+   "self_type" : "type-4371",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-2476" ],
+   "template_args" : [ "type-2479" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V2_022IGraphicBufferProducerEEEEE"
   },
   {
@@ -67312,17 +67426,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-2470"
+     "referenced_type" : "type-2473"
     }
    ],
    "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",
+   "referenced_type" : "type-4500",
+   "self_type" : "type-4500",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-2470" ],
+   "template_args" : [ "type-2473" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V2_017IProducerListenerEEEEE"
   },
   {
@@ -67345,8 +67459,8 @@
    "linker_set_key" : "android::hardware::Return<bool>",
    "name" : "android::hardware::Return<bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-4353",
-   "self_type" : "type-4353",
+   "referenced_type" : "type-4359",
+   "self_type" : "type-4359",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "template_args" : [ "type-93" ],
@@ -67399,8 +67513,8 @@
    "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",
+   "referenced_type" : "type-6783",
+   "self_type" : "type-6783",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "template_args" : [ "type-92" ],
@@ -68471,8 +68585,8 @@
    ],
    "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-2456",
+   "referenced_type" : "type-2459",
+   "self_type" : "type-2459",
    "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",
@@ -71049,8 +71163,8 @@
    "linker_set_key" : "android::sp<android::AHandler>",
    "name" : "android::sp<android::AHandler>",
    "record_kind" : "class",
-   "referenced_type" : "type-1188",
-   "self_type" : "type-1188",
+   "referenced_type" : "type-1191",
+   "self_type" : "type-1191",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-264" ],
@@ -71143,17 +71257,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4229"
+     "referenced_type" : "type-4235"
     }
    ],
    "linker_set_key" : "android::sp<android::BpGraphicBufferProducer>",
    "name" : "android::sp<android::BpGraphicBufferProducer>",
    "record_kind" : "class",
-   "referenced_type" : "type-4228",
-   "self_type" : "type-4228",
+   "referenced_type" : "type-4234",
+   "self_type" : "type-4234",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4231" ],
+   "template_args" : [ "type-4237" ],
    "unique_id" : "_ZTSN7android2spINS_23BpGraphicBufferProducerEEE"
   },
   {
@@ -71163,17 +71277,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4451"
+     "referenced_type" : "type-4457"
     }
    ],
    "linker_set_key" : "android::sp<android::BpProducerListener>",
    "name" : "android::sp<android::BpProducerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-4454",
-   "self_type" : "type-4454",
+   "referenced_type" : "type-4460",
+   "self_type" : "type-4460",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4455" ],
+   "template_args" : [ "type-4461" ],
    "unique_id" : "_ZTSN7android2spINS_18BpProducerListenerEEE"
   },
   {
@@ -71243,17 +71357,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1865"
+     "referenced_type" : "type-1869"
     }
    ],
    "linker_set_key" : "android::sp<android::Fence>",
    "name" : "android::sp<android::Fence>",
    "record_kind" : "class",
-   "referenced_type" : "type-1864",
-   "self_type" : "type-1864",
+   "referenced_type" : "type-1868",
+   "self_type" : "type-1868",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1867" ],
+   "template_args" : [ "type-1871" ],
    "unique_id" : "_ZTSN7android2spINS_5FenceEEE"
   },
   {
@@ -71283,17 +71397,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1174"
+     "referenced_type" : "type-1177"
     }
    ],
    "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",
+   "referenced_type" : "type-1176",
+   "self_type" : "type-1176",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1176" ],
+   "template_args" : [ "type-1179" ],
    "unique_id" : "_ZTSN7android2spINS_10GLConsumer8EglImageEEE"
   },
   {
@@ -71349,8 +71463,8 @@
    "linker_set_key" : "android::sp<android::GraphicBufferSource>",
    "name" : "android::sp<android::GraphicBufferSource>",
    "record_kind" : "class",
-   "referenced_type" : "type-2542",
-   "self_type" : "type-2542",
+   "referenced_type" : "type-2545",
+   "self_type" : "type-2545",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-566" ],
@@ -71363,17 +71477,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4256"
+     "referenced_type" : "type-4262"
     }
    ],
    "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",
+   "referenced_type" : "type-4265",
+   "self_type" : "type-4265",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4260" ],
+   "template_args" : [ "type-4266" ],
    "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE8ObituaryEEE"
   },
   {
@@ -71383,17 +71497,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4265"
+     "referenced_type" : "type-4271"
     }
    ],
    "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",
+   "referenced_type" : "type-4274",
+   "self_type" : "type-4274",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4269" ],
+   "template_args" : [ "type-4275" ],
    "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE8ObituaryEEE"
   },
   {
@@ -71403,17 +71517,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4828"
+     "referenced_type" : "type-4834"
     }
    ],
    "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",
+   "referenced_type" : "type-4833",
+   "self_type" : "type-4833",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4830" ],
+   "template_args" : [ "type-4836" ],
    "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE8ObituaryEEE"
   },
   {
@@ -71423,17 +71537,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-7030"
+     "referenced_type" : "type-7039"
     }
    ],
    "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",
+   "referenced_type" : "type-7038",
+   "self_type" : "type-7038",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-7032" ],
+   "template_args" : [ "type-7041" ],
    "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE8ObituaryEEE"
   },
   {
@@ -71583,17 +71697,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1049"
+     "referenced_type" : "type-1052"
     }
    ],
    "linker_set_key" : "android::sp<android::ISurfaceComposer>",
    "name" : "android::sp<android::ISurfaceComposer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1048",
-   "self_type" : "type-1048",
+   "referenced_type" : "type-1051",
+   "self_type" : "type-1051",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1051" ],
+   "template_args" : [ "type-1054" ],
    "unique_id" : "_ZTSN7android2spINS_16ISurfaceComposerEEE"
   },
   {
@@ -71603,17 +71717,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1041"
+     "referenced_type" : "type-1045"
     }
    ],
    "linker_set_key" : "android::sp<android::ITransactionCompletedListener>",
    "name" : "android::sp<android::ITransactionCompletedListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1040",
-   "self_type" : "type-1040",
+   "referenced_type" : "type-1044",
+   "self_type" : "type-1044",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1043" ],
+   "template_args" : [ "type-1047" ],
    "unique_id" : "_ZTSN7android2spINS_29ITransactionCompletedListenerEEE"
   },
   {
@@ -71643,17 +71757,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1260"
+     "referenced_type" : "type-1263"
     }
    ],
    "linker_set_key" : "android::sp<android::ProcessState>",
    "name" : "android::sp<android::ProcessState>",
    "record_kind" : "class",
-   "referenced_type" : "type-1259",
-   "self_type" : "type-1259",
+   "referenced_type" : "type-1262",
+   "self_type" : "type-1262",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1261" ],
+   "template_args" : [ "type-1264" ],
    "unique_id" : "_ZTSN7android2spINS_12ProcessStateEEE"
   },
   {
@@ -71683,17 +71797,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1361"
+     "referenced_type" : "type-1364"
     }
    ],
    "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",
+   "referenced_type" : "type-1402",
+   "self_type" : "type-1402",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1362" ],
+   "template_args" : [ "type-1365" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
   },
   {
@@ -71703,17 +71817,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1358"
+     "referenced_type" : "type-1361"
     }
    ],
    "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",
+   "referenced_type" : "type-1370",
+   "self_type" : "type-1370",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1359" ],
+   "template_args" : [ "type-1362" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
   },
   {
@@ -71723,17 +71837,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1395"
+     "referenced_type" : "type-1398"
     }
    ],
    "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",
+   "referenced_type" : "type-1397",
+   "self_type" : "type-1397",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1396" ],
+   "template_args" : [ "type-1399" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
   },
   {
@@ -71743,14 +71857,14 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2464"
+     "referenced_type" : "type-2467"
     }
    ],
    "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-2463",
-   "self_type" : "type-2463",
+   "referenced_type" : "type-2466",
+   "self_type" : "type-2466",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-595" ],
@@ -71763,17 +71877,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2455"
+     "referenced_type" : "type-2458"
     }
    ],
    "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-2454",
-   "self_type" : "type-2454",
+   "referenced_type" : "type-2457",
+   "self_type" : "type-2457",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-2456" ],
+   "template_args" : [ "type-2459" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerEEE"
   },
   {
@@ -71783,17 +71897,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4241"
+     "referenced_type" : "type-4247"
     }
    ],
    "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",
+   "referenced_type" : "type-4246",
+   "self_type" : "type-4246",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4243" ],
+   "template_args" : [ "type-4249" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerEEE"
   },
   {
@@ -71803,17 +71917,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4463"
+     "referenced_type" : "type-4470"
     }
    ],
    "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",
+   "referenced_type" : "type-4473",
+   "self_type" : "type-4473",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4467" ],
+   "template_args" : [ "type-4474" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerEEE"
   },
   {
@@ -71823,14 +71937,14 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2477"
+     "referenced_type" : "type-2480"
     }
    ],
    "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-2476",
-   "self_type" : "type-2476",
+   "referenced_type" : "type-2479",
+   "self_type" : "type-2479",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-677" ],
@@ -71843,14 +71957,14 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2471"
+     "referenced_type" : "type-2474"
     }
    ],
    "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-2470",
-   "self_type" : "type-2470",
+   "referenced_type" : "type-2473",
+   "self_type" : "type-2473",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-604" ],
@@ -71863,17 +71977,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4235"
+     "referenced_type" : "type-4241"
     }
    ],
    "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",
+   "referenced_type" : "type-4240",
+   "self_type" : "type-4240",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4237" ],
+   "template_args" : [ "type-4243" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerEEE"
   },
   {
@@ -71883,17 +71997,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4456"
+     "referenced_type" : "type-4462"
     }
    ],
    "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",
+   "referenced_type" : "type-4466",
+   "self_type" : "type-4466",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4460" ],
+   "template_args" : [ "type-4467" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerEEE"
   },
   {
@@ -71923,14 +72037,14 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2445"
+     "referenced_type" : "type-2448"
     }
    ],
    "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-2444",
-   "self_type" : "type-2444",
+   "referenced_type" : "type-2447",
+   "self_type" : "type-2447",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-530" ],
@@ -71943,14 +72057,14 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2449"
+     "referenced_type" : "type-2452"
     }
    ],
    "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-2448",
-   "self_type" : "type-2448",
+   "referenced_type" : "type-2451",
+   "self_type" : "type-2451",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-533" ],
@@ -71963,36 +72077,36 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2517"
+     "referenced_type" : "type-2520"
     }
    ],
    "linker_set_key" : "android::sp<const android::AHandler>",
    "name" : "android::sp<const android::AHandler>",
    "record_kind" : "class",
-   "referenced_type" : "type-2516",
-   "self_type" : "type-2516",
+   "referenced_type" : "type-2519",
+   "self_type" : "type-2519",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-2518" ],
+   "template_args" : [ "type-2521" ],
    "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",
+   "referenced_type" : "type-1064",
+   "self_type" : "type-1064",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1062" ],
+   "template_args" : [ "type-1065" ],
    "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-2588",
-   "self_type" : "type-2588",
+   "referenced_type" : "type-2591",
+   "self_type" : "type-2591",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-160" ],
@@ -72002,8 +72116,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::trait_pointer<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-2585",
-   "self_type" : "type-2585",
+   "referenced_type" : "type-2588",
+   "self_type" : "type-2588",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-147" ],
@@ -72013,8 +72127,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::trait_pointer<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-2581",
-   "self_type" : "type-2581",
+   "referenced_type" : "type-2584",
+   "self_type" : "type-2584",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-143" ],
@@ -72024,8 +72138,8 @@
    "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",
+   "referenced_type" : "type-1186",
+   "self_type" : "type-1186",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-733" ],
@@ -72035,8 +72149,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<int>",
    "name" : "android::trait_pointer<int>",
-   "referenced_type" : "type-2584",
-   "self_type" : "type-2584",
+   "referenced_type" : "type-2587",
+   "self_type" : "type-2587",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -72046,8 +72160,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<long long>",
    "name" : "android::trait_pointer<long long>",
-   "referenced_type" : "type-1060",
-   "self_type" : "type-1060",
+   "referenced_type" : "type-1063",
+   "self_type" : "type-1063",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-169" ],
@@ -72057,30 +72171,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::trait_pointer<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-2589",
-   "self_type" : "type-2589",
+   "referenced_type" : "type-2592",
+   "self_type" : "type-2592",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2590" ],
+   "template_args" : [ "type-2593" ],
    "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-2586",
-   "self_type" : "type-2586",
+   "referenced_type" : "type-2589",
+   "self_type" : "type-2589",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2587" ],
+   "template_args" : [ "type-2590" ],
    "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-2582",
-   "self_type" : "type-2582",
+   "referenced_type" : "type-2585",
+   "self_type" : "type-2585",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -72090,19 +72204,19 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::BufferItem>",
    "name" : "android::trait_trivial_copy<android::BufferItem>",
-   "referenced_type" : "type-1056",
-   "self_type" : "type-1056",
+   "referenced_type" : "type-1059",
+   "self_type" : "type-1059",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1057" ],
+   "template_args" : [ "type-1060" ],
    "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-2572",
-   "self_type" : "type-2572",
+   "referenced_type" : "type-2575",
+   "self_type" : "type-2575",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-160" ],
@@ -72112,8 +72226,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-2569",
-   "self_type" : "type-2569",
+   "referenced_type" : "type-2572",
+   "self_type" : "type-2572",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-147" ],
@@ -72123,8 +72237,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-2566",
-   "self_type" : "type-2566",
+   "referenced_type" : "type-2569",
+   "self_type" : "type-2569",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-143" ],
@@ -72134,8 +72248,8 @@
    "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",
+   "referenced_type" : "type-1184",
+   "self_type" : "type-1184",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-733" ],
@@ -72145,8 +72259,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-2462",
-   "self_type" : "type-2462",
+   "referenced_type" : "type-2465",
+   "self_type" : "type-2465",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-93" ],
@@ -72156,8 +72270,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-2499",
-   "self_type" : "type-2499",
+   "referenced_type" : "type-2502",
+   "self_type" : "type-2502",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-124" ],
@@ -72189,8 +72303,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-2655",
-   "self_type" : "type-2655",
+   "referenced_type" : "type-2658",
+   "self_type" : "type-2658",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -72222,8 +72336,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<short>",
    "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-2594",
-   "self_type" : "type-2594",
+   "referenced_type" : "type-2597",
+   "self_type" : "type-2597",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-499" ],
@@ -72233,30 +72347,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::trait_trivial_copy<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-2570",
-   "self_type" : "type-2570",
+   "referenced_type" : "type-2573",
+   "self_type" : "type-2573",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2571" ],
+   "template_args" : [ "type-2574" ],
    "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-2567",
-   "self_type" : "type-2567",
+   "referenced_type" : "type-2570",
+   "self_type" : "type-2570",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2568" ],
+   "template_args" : [ "type-2571" ],
    "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-2540",
-   "self_type" : "type-2540",
+   "referenced_type" : "type-2543",
+   "self_type" : "type-2543",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-90" ],
@@ -72299,8 +72413,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
    "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-2634",
-   "self_type" : "type-2634",
+   "referenced_type" : "type-2637",
+   "self_type" : "type-2637",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-497" ],
@@ -72310,8 +72424,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-2433",
-   "self_type" : "type-2433",
+   "referenced_type" : "type-2436",
+   "self_type" : "type-2436",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-9" ],
@@ -72321,19 +72435,19 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::BufferItem>",
    "name" : "android::trait_trivial_ctor<android::BufferItem>",
-   "referenced_type" : "type-1052",
-   "self_type" : "type-1052",
+   "referenced_type" : "type-1055",
+   "self_type" : "type-1055",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1053" ],
+   "template_args" : [ "type-1056" ],
    "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-2554",
-   "self_type" : "type-2554",
+   "referenced_type" : "type-2557",
+   "self_type" : "type-2557",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-160" ],
@@ -72343,8 +72457,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-2549",
-   "self_type" : "type-2549",
+   "referenced_type" : "type-2552",
+   "self_type" : "type-2552",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-147" ],
@@ -72354,8 +72468,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-2548",
-   "self_type" : "type-2548",
+   "referenced_type" : "type-2551",
+   "self_type" : "type-2551",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-143" ],
@@ -72365,8 +72479,8 @@
    "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",
+   "referenced_type" : "type-1182",
+   "self_type" : "type-1182",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-733" ],
@@ -72376,8 +72490,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-2443",
-   "self_type" : "type-2443",
+   "referenced_type" : "type-2446",
+   "self_type" : "type-2446",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-93" ],
@@ -72387,8 +72501,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-2481",
-   "self_type" : "type-2481",
+   "referenced_type" : "type-2484",
+   "self_type" : "type-2484",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-124" ],
@@ -72420,8 +72534,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-2647",
-   "self_type" : "type-2647",
+   "referenced_type" : "type-2650",
+   "self_type" : "type-2650",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -72453,8 +72567,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<short>",
    "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-2563",
-   "self_type" : "type-2563",
+   "referenced_type" : "type-2566",
+   "self_type" : "type-2566",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-499" ],
@@ -72464,30 +72578,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::trait_trivial_ctor<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-2555",
-   "self_type" : "type-2555",
+   "referenced_type" : "type-2558",
+   "self_type" : "type-2558",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2556" ],
+   "template_args" : [ "type-2559" ],
    "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-2550",
-   "self_type" : "type-2550",
+   "referenced_type" : "type-2553",
+   "self_type" : "type-2553",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2551" ],
+   "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-2526",
-   "self_type" : "type-2526",
+   "referenced_type" : "type-2529",
+   "self_type" : "type-2529",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-90" ],
@@ -72497,8 +72611,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
    "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-2670",
-   "self_type" : "type-2670",
+   "referenced_type" : "type-2673",
+   "self_type" : "type-2673",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -72530,8 +72644,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned short>",
    "name" : "android::trait_trivial_ctor<unsigned short>",
-   "referenced_type" : "type-2616",
-   "self_type" : "type-2616",
+   "referenced_type" : "type-2619",
+   "self_type" : "type-2619",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-497" ],
@@ -72541,8 +72655,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-2399",
-   "self_type" : "type-2399",
+   "referenced_type" : "type-2402",
+   "self_type" : "type-2402",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-9" ],
@@ -72552,19 +72666,19 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::BufferItem>",
    "name" : "android::trait_trivial_dtor<android::BufferItem>",
-   "referenced_type" : "type-1054",
-   "self_type" : "type-1054",
+   "referenced_type" : "type-1057",
+   "self_type" : "type-1057",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1055" ],
+   "template_args" : [ "type-1058" ],
    "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-2564",
-   "self_type" : "type-2564",
+   "referenced_type" : "type-2567",
+   "self_type" : "type-2567",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-160" ],
@@ -72574,8 +72688,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-2560",
-   "self_type" : "type-2560",
+   "referenced_type" : "type-2563",
+   "self_type" : "type-2563",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-147" ],
@@ -72585,8 +72699,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-2557",
-   "self_type" : "type-2557",
+   "referenced_type" : "type-2560",
+   "self_type" : "type-2560",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-143" ],
@@ -72596,8 +72710,8 @@
    "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",
+   "referenced_type" : "type-1183",
+   "self_type" : "type-1183",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-733" ],
@@ -72607,8 +72721,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<bool>",
    "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-2452",
-   "self_type" : "type-2452",
+   "referenced_type" : "type-2455",
+   "self_type" : "type-2455",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-93" ],
@@ -72618,8 +72732,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-2489",
-   "self_type" : "type-2489",
+   "referenced_type" : "type-2492",
+   "self_type" : "type-2492",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-124" ],
@@ -72651,8 +72765,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<int>",
    "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-2650",
-   "self_type" : "type-2650",
+   "referenced_type" : "type-2653",
+   "self_type" : "type-2653",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -72684,8 +72798,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<short>",
    "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-2583",
-   "self_type" : "type-2583",
+   "referenced_type" : "type-2586",
+   "self_type" : "type-2586",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-499" ],
@@ -72695,30 +72809,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::trait_trivial_dtor<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-2561",
-   "self_type" : "type-2561",
+   "referenced_type" : "type-2564",
+   "self_type" : "type-2564",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2562" ],
+   "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-2558",
-   "self_type" : "type-2558",
+   "referenced_type" : "type-2561",
+   "self_type" : "type-2561",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2559" ],
+   "template_args" : [ "type-2562" ],
    "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-2533",
-   "self_type" : "type-2533",
+   "referenced_type" : "type-2536",
+   "self_type" : "type-2536",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-90" ],
@@ -72728,8 +72842,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
    "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-2681",
-   "self_type" : "type-2681",
+   "referenced_type" : "type-2684",
+   "self_type" : "type-2684",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -72761,8 +72875,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned short>",
    "name" : "android::trait_trivial_dtor<unsigned short>",
-   "referenced_type" : "type-2624",
-   "self_type" : "type-2624",
+   "referenced_type" : "type-2627",
+   "self_type" : "type-2627",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-497" ],
@@ -72772,8 +72886,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-2424",
-   "self_type" : "type-2424",
+   "referenced_type" : "type-2427",
+   "self_type" : "type-2427",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-9" ],
@@ -72783,30 +72897,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::BufferItem>",
    "name" : "android::trait_trivial_move<android::BufferItem>",
-   "referenced_type" : "type-1058",
-   "self_type" : "type-1058",
+   "referenced_type" : "type-1061",
+   "self_type" : "type-1061",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1059" ],
+   "template_args" : [ "type-1062" ],
    "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-2662",
-   "self_type" : "type-2662",
+   "referenced_type" : "type-2665",
+   "self_type" : "type-2665",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-1239" ],
+   "template_args" : [ "type-1242" ],
    "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-2656",
-   "self_type" : "type-2656",
+   "referenced_type" : "type-2659",
+   "self_type" : "type-2659",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "template_args" : [ "type-121" ],
@@ -72816,8 +72930,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
-   "referenced_type" : "type-2579",
-   "self_type" : "type-2579",
+   "referenced_type" : "type-2582",
+   "self_type" : "type-2582",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-160" ],
@@ -72827,8 +72941,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-2576",
-   "self_type" : "type-2576",
+   "referenced_type" : "type-2579",
+   "self_type" : "type-2579",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-147" ],
@@ -72838,8 +72952,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-2573",
-   "self_type" : "type-2573",
+   "referenced_type" : "type-2576",
+   "self_type" : "type-2576",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-143" ],
@@ -72849,8 +72963,8 @@
    "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",
+   "referenced_type" : "type-1185",
+   "self_type" : "type-1185",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-733" ],
@@ -72860,8 +72974,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<bool>",
    "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-2472",
-   "self_type" : "type-2472",
+   "referenced_type" : "type-2475",
+   "self_type" : "type-2475",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-93" ],
@@ -72871,8 +72985,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-2521",
-   "self_type" : "type-2521",
+   "referenced_type" : "type-2524",
+   "self_type" : "type-2524",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-124" ],
@@ -72904,8 +73018,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-2659",
-   "self_type" : "type-2659",
+   "referenced_type" : "type-2662",
+   "self_type" : "type-2662",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -72937,8 +73051,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<short>",
    "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-2605",
-   "self_type" : "type-2605",
+   "referenced_type" : "type-2608",
+   "self_type" : "type-2608",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-499" ],
@@ -72948,30 +73062,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::trait_trivial_move<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-2577",
-   "self_type" : "type-2577",
+   "referenced_type" : "type-2580",
+   "self_type" : "type-2580",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2578" ],
+   "template_args" : [ "type-2581" ],
    "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-2574",
-   "self_type" : "type-2574",
+   "referenced_type" : "type-2577",
+   "self_type" : "type-2577",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2575" ],
+   "template_args" : [ "type-2578" ],
    "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-2552",
-   "self_type" : "type-2552",
+   "referenced_type" : "type-2555",
+   "self_type" : "type-2555",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-90" ],
@@ -73014,8 +73128,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned short>",
    "name" : "android::trait_trivial_move<unsigned short>",
-   "referenced_type" : "type-2645",
-   "self_type" : "type-2645",
+   "referenced_type" : "type-2648",
+   "self_type" : "type-2648",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-497" ],
@@ -73025,8 +73139,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-2441",
-   "self_type" : "type-2441",
+   "referenced_type" : "type-2444",
+   "self_type" : "type-2444",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-9" ],
@@ -73036,19 +73150,19 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::BufferItem>",
    "name" : "android::traits<android::BufferItem>",
-   "referenced_type" : "type-1064",
-   "self_type" : "type-1064",
+   "referenced_type" : "type-1067",
+   "self_type" : "type-1067",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1065" ],
+   "template_args" : [ "type-1068" ],
    "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-2599",
-   "self_type" : "type-2599",
+   "referenced_type" : "type-2602",
+   "self_type" : "type-2602",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-160" ],
@@ -73058,8 +73172,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::traits<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-2596",
-   "self_type" : "type-2596",
+   "referenced_type" : "type-2599",
+   "self_type" : "type-2599",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-147" ],
@@ -73069,8 +73183,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::traits<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-2591",
-   "self_type" : "type-2591",
+   "referenced_type" : "type-2594",
+   "self_type" : "type-2594",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-143" ],
@@ -73080,8 +73194,8 @@
    "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",
+   "referenced_type" : "type-1187",
+   "self_type" : "type-1187",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-733" ],
@@ -73091,8 +73205,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<int>",
    "name" : "android::traits<int>",
-   "referenced_type" : "type-2593",
-   "self_type" : "type-2593",
+   "referenced_type" : "type-2596",
+   "self_type" : "type-2596",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -73102,8 +73216,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<long long>",
    "name" : "android::traits<long long>",
-   "referenced_type" : "type-1063",
-   "self_type" : "type-1063",
+   "referenced_type" : "type-1066",
+   "self_type" : "type-1066",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-169" ],
@@ -73113,30 +73227,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::traits<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-2600",
-   "self_type" : "type-2600",
+   "referenced_type" : "type-2603",
+   "self_type" : "type-2603",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2601" ],
+   "template_args" : [ "type-2604" ],
    "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-2597",
-   "self_type" : "type-2597",
+   "referenced_type" : "type-2600",
+   "self_type" : "type-2600",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2598" ],
+   "template_args" : [ "type-2601" ],
    "unique_id" : "_ZTSN7android6traitsINSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<unsigned int>",
    "name" : "android::traits<unsigned int>",
-   "referenced_type" : "type-2592",
-   "self_type" : "type-2592",
+   "referenced_type" : "type-2595",
+   "self_type" : "type-2595",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -73147,16 +73261,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1075"
+     "referenced_type" : "type-1078"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::BufferItem>",
    "name" : "android::use_trivial_move<android::BufferItem>",
-   "referenced_type" : "type-1074",
-   "self_type" : "type-1074",
+   "referenced_type" : "type-1077",
+   "self_type" : "type-1077",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1076" ],
+   "template_args" : [ "type-1079" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_10BufferItemEEE"
   },
   {
@@ -73164,13 +73278,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2636"
+     "referenced_type" : "type-2639"
     }
    ],
    "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-2635",
-   "self_type" : "type-2635",
+   "referenced_type" : "type-2638",
+   "self_type" : "type-2638",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-160" ],
@@ -73181,13 +73295,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2633"
+     "referenced_type" : "type-2636"
     }
    ],
    "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-2632",
-   "self_type" : "type-2632",
+   "referenced_type" : "type-2635",
+   "self_type" : "type-2635",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-147" ],
@@ -73198,13 +73312,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2629"
+     "referenced_type" : "type-2632"
     }
    ],
    "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-2628",
-   "self_type" : "type-2628",
+   "referenced_type" : "type-2631",
+   "self_type" : "type-2631",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-143" ],
@@ -73215,13 +73329,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1186"
+     "referenced_type" : "type-1190"
     }
    ],
    "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",
+   "referenced_type" : "type-1189",
+   "self_type" : "type-1189",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-733" ],
@@ -73232,13 +73346,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2631"
+     "referenced_type" : "type-2634"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<int>",
    "name" : "android::use_trivial_move<int>",
-   "referenced_type" : "type-2630",
-   "self_type" : "type-2630",
+   "referenced_type" : "type-2633",
+   "self_type" : "type-2633",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -73249,13 +73363,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1073"
+     "referenced_type" : "type-1076"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<long long>",
    "name" : "android::use_trivial_move<long long>",
-   "referenced_type" : "type-1072",
-   "self_type" : "type-1072",
+   "referenced_type" : "type-1075",
+   "self_type" : "type-1075",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-169" ],
@@ -73320,7 +73434,7 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1252"
+     "referenced_type" : "type-1256"
     },
     {
      "access" : "private",
@@ -73332,11 +73446,11 @@
    "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",
+   "referenced_type" : "type-1255",
+   "self_type" : "type-1255",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-1254" ],
+   "template_args" : [ "type-1258" ],
    "unique_id" : "_ZTSN7android2wpINS_12ConsumerBase22FrameAvailableListenerEEE"
   },
   {
@@ -73687,13 +73801,13 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-2178"
+     "referenced_type" : "type-2181"
     }
    ],
    "linker_set_key" : "log_msg",
    "name" : "log_msg",
-   "referenced_type" : "type-2177",
-   "self_type" : "type-2177",
+   "referenced_type" : "type-2180",
+   "self_type" : "type-2180",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
@@ -73704,15 +73818,15 @@
    [
     {
      "field_name" : "buf",
-     "referenced_type" : "type-2179"
+     "referenced_type" : "type-2182"
     },
     {
      "field_name" : "entry",
-     "referenced_type" : "type-1408"
+     "referenced_type" : "type-1411"
     },
     {
      "field_name" : "entry_v4",
-     "referenced_type" : "type-1408"
+     "referenced_type" : "type-1411"
     },
     {
      "field_name" : "entry_v3",
@@ -73720,19 +73834,19 @@
     },
     {
      "field_name" : "entry_v2",
-     "referenced_type" : "type-1291"
+     "referenced_type" : "type-1294"
     },
     {
      "field_name" : "entry_v1",
-     "referenced_type" : "type-2180"
+     "referenced_type" : "type-2183"
     }
    ],
    "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-2178",
-   "self_type" : "type-2178",
+   "referenced_type" : "type-2181",
+   "self_type" : "type-2181",
    "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)"
@@ -73753,8 +73867,8 @@
    ],
    "linker_set_key" : "log_time",
    "name" : "log_time",
-   "referenced_type" : "type-2509",
-   "self_type" : "type-2509",
+   "referenced_type" : "type-2512",
+   "self_type" : "type-2512",
    "size" : 8,
    "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
    "unique_id" : "_ZTS8log_time"
@@ -73800,8 +73914,8 @@
    ],
    "linker_set_key" : "logger_entry",
    "name" : "logger_entry",
-   "referenced_type" : "type-2180",
-   "self_type" : "type-2180",
+   "referenced_type" : "type-2183",
+   "self_type" : "type-2183",
    "size" : 20,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
@@ -73852,8 +73966,8 @@
    ],
    "linker_set_key" : "logger_entry_v2",
    "name" : "logger_entry_v2",
-   "referenced_type" : "type-1291",
-   "self_type" : "type-1291",
+   "referenced_type" : "type-1294",
+   "self_type" : "type-1294",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
@@ -73961,8 +74075,8 @@
    ],
    "linker_set_key" : "logger_entry_v4",
    "name" : "logger_entry_v4",
-   "referenced_type" : "type-1408",
-   "self_type" : "type-1408",
+   "referenced_type" : "type-1411",
+   "self_type" : "type-1411",
    "size" : 28,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
@@ -74006,8 +74120,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser> &&",
    "name" : "android::base::unique_fd_impl<android::base::DefaultCloser> &&",
-   "referenced_type" : "type-2553",
-   "self_type" : "type-2610",
+   "referenced_type" : "type-2556",
+   "self_type" : "type-2613",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -74024,8 +74138,8 @@
    "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",
+   "referenced_type" : "type-6779",
+   "self_type" : "type-6781",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -74033,24 +74147,6 @@
    "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,
@@ -74058,8 +74154,8 @@
   },
   {
    "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> > &&",
+   "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-4494",
    "self_type" : "type-4496",
    "size" : 4,
@@ -74067,10 +74163,28 @@
   },
   {
    "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-4371",
+   "self_type" : "type-4373",
+   "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-4500",
+   "self_type" : "type-4502",
+   "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-4355",
+   "referenced_type" : "type-4359",
+   "self_type" : "type-4361",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -74087,8 +74201,8 @@
    "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",
+   "referenced_type" : "type-6783",
+   "self_type" : "type-6785",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -74142,7 +74256,7 @@
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> &&",
    "name" : "android::hardware::hidl_vec<unsigned char> &&",
    "referenced_type" : "type-452",
-   "self_type" : "type-4566",
+   "self_type" : "type-4572",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -74151,7 +74265,7 @@
    "linker_set_key" : "android::sp<android::ALooper> &&",
    "name" : "android::sp<android::ALooper> &&",
    "referenced_type" : "type-321",
-   "self_type" : "type-2256",
+   "self_type" : "type-2259",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -74168,8 +74282,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::Fence> &&",
    "name" : "android::sp<android::Fence> &&",
-   "referenced_type" : "type-1864",
-   "self_type" : "type-2524",
+   "referenced_type" : "type-1868",
+   "self_type" : "type-2527",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -74177,8 +74291,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::GraphicBufferSource> &&",
    "name" : "android::sp<android::GraphicBufferSource> &&",
-   "referenced_type" : "type-2542",
-   "self_type" : "type-2543",
+   "referenced_type" : "type-2545",
+   "self_type" : "type-2546",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -74186,8 +74300,8 @@
    "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-4261",
+   "referenced_type" : "type-4265",
+   "self_type" : "type-4267",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -74195,8 +74309,8 @@
    "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",
+   "referenced_type" : "type-4274",
+   "self_type" : "type-4276",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -74204,8 +74318,8 @@
    "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",
+   "referenced_type" : "type-4833",
+   "self_type" : "type-4843",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -74213,8 +74327,8 @@
    "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",
+   "referenced_type" : "type-7038",
+   "self_type" : "type-7047",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -74223,7 +74337,7 @@
    "linker_set_key" : "android::sp<android::IBinder::DeathRecipient> &&",
    "name" : "android::sp<android::IBinder::DeathRecipient> &&",
    "referenced_type" : "type-843",
-   "self_type" : "type-4383",
+   "self_type" : "type-4389",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -74232,7 +74346,7 @@
    "linker_set_key" : "android::sp<android::IConsumerListener> &&",
    "name" : "android::sp<android::IConsumerListener> &&",
    "referenced_type" : "type-939",
-   "self_type" : "type-1577",
+   "self_type" : "type-1580",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -74241,7 +74355,7 @@
    "linker_set_key" : "android::sp<android::IGraphicBufferConsumer> &&",
    "name" : "android::sp<android::IGraphicBufferConsumer> &&",
    "referenced_type" : "type-574",
-   "self_type" : "type-1600",
+   "self_type" : "type-1604",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -74250,7 +74364,7 @@
    "linker_set_key" : "android::sp<android::IGraphicBufferProducer> &&",
    "name" : "android::sp<android::IGraphicBufferProducer> &&",
    "referenced_type" : "type-570",
-   "self_type" : "type-4226",
+   "self_type" : "type-4232",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -74259,7 +74373,7 @@
    "linker_set_key" : "android::sp<android::IProducerListener> &&",
    "name" : "android::sp<android::IProducerListener> &&",
    "referenced_type" : "type-957",
-   "self_type" : "type-4252",
+   "self_type" : "type-4258",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -74268,7 +74382,7 @@
    "linker_set_key" : "android::sp<android::NativeHandle> &&",
    "name" : "android::sp<android::NativeHandle> &&",
    "referenced_type" : "type-932",
-   "self_type" : "type-1596",
+   "self_type" : "type-1600",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   }
diff --git a/29/64/arm_armv8-a/source-based/libui.so.lsdump b/29/64/arm_armv8-a/source-based/libui.so.lsdump
index e0db418..7f50189 100644
--- a/29/64/arm_armv8-a/source-based/libui.so.lsdump
+++ b/29/64/arm_armv8-a/source-based/libui.so.lsdump
@@ -5,8 +5,8 @@
    "alignment" : 4,
    "linker_set_key" : "AHardwareBuffer_Plane [4]",
    "name" : "AHardwareBuffer_Plane [4]",
-   "referenced_type" : "type-509",
-   "self_type" : "type-508",
+   "referenced_type" : "type-506",
+   "self_type" : "type-505",
    "size" : 48,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h"
   },
@@ -14,7 +14,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<float> [3]",
    "name" : "android::details::TVec3<float> [3]",
-   "referenced_type" : "type-17",
+   "referenced_type" : "type-18",
    "self_type" : "type-904",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
@@ -23,8 +23,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<float> [4]",
    "name" : "android::details::TVec4<float> [4]",
-   "referenced_type" : "type-200",
-   "self_type" : "type-2277",
+   "referenced_type" : "type-192",
+   "self_type" : "type-2279",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -32,7 +32,7 @@
    "alignment" : 1,
    "linker_set_key" : "char [0]",
    "name" : "char [0]",
-   "referenced_type" : "type-288",
+   "referenced_type" : "type-285",
    "self_type" : "type-1261",
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -47,16 +47,16 @@
    "alignment" : 4,
    "linker_set_key" : "int [0]",
    "name" : "int [0]",
-   "referenced_type" : "type-103",
-   "self_type" : "type-145",
+   "referenced_type" : "type-105",
+   "self_type" : "type-148",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int [7]",
    "name" : "int [7]",
-   "referenced_type" : "type-103",
-   "self_type" : "type-564",
+   "referenced_type" : "type-105",
+   "self_type" : "type-561",
    "size" : 28,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -64,7 +64,7 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
-   "referenced_type" : "type-218",
+   "referenced_type" : "type-220",
    "self_type" : "type-1270",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
@@ -73,7 +73,7 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [10]",
    "name" : "unsigned int [10]",
-   "referenced_type" : "type-123",
+   "referenced_type" : "type-125",
    "self_type" : "type-1109",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -82,8 +82,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [12]",
    "name" : "unsigned int [12]",
-   "referenced_type" : "type-123",
-   "self_type" : "type-559",
+   "referenced_type" : "type-125",
+   "self_type" : "type-556",
    "size" : 48,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -91,8 +91,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [25]",
    "name" : "unsigned int [25]",
-   "referenced_type" : "type-123",
-   "self_type" : "type-558",
+   "referenced_type" : "type-125",
+   "self_type" : "type-555",
    "size" : 100,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -100,8 +100,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [3]",
    "name" : "unsigned int [3]",
-   "referenced_type" : "type-123",
-   "self_type" : "type-941",
+   "referenced_type" : "type-125",
+   "self_type" : "type-935",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -109,8 +109,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [8]",
    "name" : "unsigned int [8]",
-   "referenced_type" : "type-123",
-   "self_type" : "type-349",
+   "referenced_type" : "type-125",
+   "self_type" : "type-346",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -118,26 +118,17 @@
    "alignment" : 4,
    "linker_set_key" : "void *[1]",
    "name" : "void *[1]",
-   "referenced_type" : "type-227",
-   "self_type" : "type-523",
+   "referenced_type" : "type-229",
+   "self_type" : "type-521",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void *[3]",
-   "name" : "void *[3]",
-   "referenced_type" : "type-227",
-   "self_type" : "type-596",
-   "size" : 12,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "void *[4]",
    "name" : "void *[4]",
-   "referenced_type" : "type-227",
-   "self_type" : "type-519",
+   "referenced_type" : "type-229",
+   "self_type" : "type-517",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -145,8 +136,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *[6]",
    "name" : "void *[6]",
-   "referenced_type" : "type-227",
-   "self_type" : "type-524",
+   "referenced_type" : "type-229",
+   "self_type" : "type-522",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -154,7 +145,7 @@
    "alignment" : 4,
    "linker_set_key" : "void *[7]",
    "name" : "void *[7]",
-   "referenced_type" : "type-227",
+   "referenced_type" : "type-229",
    "self_type" : "type-609",
    "size" : 28,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
@@ -178,8 +169,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-288",
-   "self_type" : "type-288",
+   "referenced_type" : "type-285",
+   "self_type" : "type-285",
    "size" : 1
   },
   {
@@ -188,16 +179,16 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-182",
-   "self_type" : "type-182",
+   "referenced_type" : "type-185",
+   "self_type" : "type-185",
    "size" : 2
   },
   {
    "alignment" : 8,
    "linker_set_key" : "double",
    "name" : "double",
-   "referenced_type" : "type-41",
-   "self_type" : "type-41",
+   "referenced_type" : "type-43",
+   "self_type" : "type-43",
    "size" : 8
   },
   {
@@ -213,8 +204,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-103",
-   "self_type" : "type-103",
+   "referenced_type" : "type-105",
+   "self_type" : "type-105",
    "size" : 4
   },
   {
@@ -222,16 +213,16 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-687",
-   "self_type" : "type-687",
+   "referenced_type" : "type-684",
+   "self_type" : "type-684",
    "size" : 4
   },
   {
    "alignment" : 8,
    "linker_set_key" : "long double",
    "name" : "long double",
-   "referenced_type" : "type-298",
-   "self_type" : "type-298",
+   "referenced_type" : "type-295",
+   "self_type" : "type-295",
    "size" : 8
   },
   {
@@ -239,8 +230,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-284",
-   "self_type" : "type-284",
+   "referenced_type" : "type-12",
+   "self_type" : "type-12",
    "size" : 8
   },
   {
@@ -267,8 +258,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned char",
    "name" : "unsigned char",
-   "referenced_type" : "type-218",
-   "self_type" : "type-218",
+   "referenced_type" : "type-220",
+   "self_type" : "type-220",
    "size" : 1
   },
   {
@@ -277,8 +268,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned int",
    "name" : "unsigned int",
-   "referenced_type" : "type-123",
-   "self_type" : "type-123",
+   "referenced_type" : "type-125",
+   "self_type" : "type-125",
    "size" : 4
   },
   {
@@ -297,8 +288,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-124",
-   "self_type" : "type-124",
+   "referenced_type" : "type-126",
+   "self_type" : "type-126",
    "size" : 8
   },
   {
@@ -314,8 +305,8 @@
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-151",
-   "self_type" : "type-151"
+   "referenced_type" : "type-154",
+   "self_type" : "type-154"
   }
  ],
  "elf_functions" :
@@ -1842,11 +1833,11 @@
    ],
    "linker_set_key" : "AHardwareBuffer_Format",
    "name" : "AHardwareBuffer_Format",
-   "referenced_type" : "type-616",
-   "self_type" : "type-616",
+   "referenced_type" : "type-617",
+   "self_type" : "type-617",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "AHardwareBuffer_Format"
   },
   {
@@ -2008,11 +1999,11 @@
    ],
    "linker_set_key" : "AHardwareBuffer_UsageFlags",
    "name" : "AHardwareBuffer_UsageFlags",
-   "referenced_type" : "type-678",
-   "self_type" : "type-678",
+   "referenced_type" : "type-676",
+   "self_type" : "type-676",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "AHardwareBuffer_UsageFlags"
   },
   {
@@ -2030,11 +2021,11 @@
    ],
    "linker_set_key" : "android::Condition::WakeUpType",
    "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-260",
-   "self_type" : "type-260",
+   "referenced_type" : "type-256",
+   "self_type" : "type-256",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android9Condition10WakeUpTypeE"
   },
   {
@@ -2060,7 +2051,7 @@
    "self_type" : "type-1346",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android5Fence6StatusE"
   },
   {
@@ -2082,11 +2073,11 @@
    ],
    "linker_set_key" : "android::FenceTime::Snapshot::State",
    "name" : "android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1384",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1388",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android9FenceTime8Snapshot5StateE"
   },
   {
@@ -2109,11 +2100,11 @@
    ],
    "linker_set_key" : "android::FenceTime::State",
    "name" : "android::FenceTime::State",
-   "referenced_type" : "type-1378",
-   "self_type" : "type-1378",
+   "referenced_type" : "type-1383",
+   "self_type" : "type-1383",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android9FenceTime5StateE"
   },
   {
@@ -2139,11 +2130,11 @@
    ],
    "linker_set_key" : "android::GraphicBuffer::HandleWrapMethod",
    "name" : "android::GraphicBuffer::HandleWrapMethod",
-   "referenced_type" : "type-629",
-   "self_type" : "type-629",
+   "referenced_type" : "type-630",
+   "self_type" : "type-630",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h",
-   "underlying_type" : "type-218",
+   "underlying_type" : "type-220",
    "unique_id" : "_ZTSN7android13GraphicBuffer16HandleWrapMethodE"
   },
   {
@@ -2161,11 +2152,11 @@
    ],
    "linker_set_key" : "android::GraphicBufferMapper::Version",
    "name" : "android::GraphicBufferMapper::Version",
-   "referenced_type" : "type-529",
-   "self_type" : "type-529",
+   "referenced_type" : "type-527",
+   "self_type" : "type-527",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android19GraphicBufferMapper7VersionE"
   },
   {
@@ -2179,11 +2170,11 @@
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-183",
-   "self_type" : "type-183",
+   "referenced_type" : "type-186",
+   "self_type" : "type-186",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android8String1613StaticLinkageE"
   },
   {
@@ -2197,11 +2188,11 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-864",
-   "self_type" : "type-864",
+   "referenced_type" : "type-862",
+   "self_type" : "type-862",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7String813StaticLinkageE"
   },
   {
@@ -2219,7 +2210,7 @@
    "self_type" : "type-975",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details6TMat33IfE7no_initE"
   },
   {
@@ -2233,11 +2224,11 @@
    ],
    "linker_set_key" : "android::details::TMat44<float>::no_init",
    "name" : "android::details::TMat44<float>::no_init",
-   "referenced_type" : "type-2278",
-   "self_type" : "type-2278",
+   "referenced_type" : "type-2281",
+   "self_type" : "type-2281",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details6TMat44IfE7no_initE"
   },
   {
@@ -2251,11 +2242,11 @@
    ],
    "linker_set_key" : "android::details::TQuaternion<double>::no_init",
    "name" : "android::details::TQuaternion<double>::no_init",
-   "referenced_type" : "type-389",
-   "self_type" : "type-389",
+   "referenced_type" : "type-386",
+   "self_type" : "type-386",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details11TQuaternionIdE7no_initE"
   },
   {
@@ -2269,11 +2260,11 @@
    ],
    "linker_set_key" : "android::details::TQuaternion<float>::no_init",
    "name" : "android::details::TQuaternion<float>::no_init",
-   "referenced_type" : "type-428",
-   "self_type" : "type-428",
+   "referenced_type" : "type-425",
+   "self_type" : "type-425",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details11TQuaternionIfE7no_initE"
   },
   {
@@ -2291,7 +2282,7 @@
    "self_type" : "type-1255",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec2IbE7no_initE"
   },
   {
@@ -2309,7 +2300,7 @@
    "self_type" : "type-1068",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec2IdE7no_initE"
   },
   {
@@ -2327,7 +2318,7 @@
    "self_type" : "type-1135",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec2IfE7no_initE"
   },
   {
@@ -2345,7 +2336,7 @@
    "self_type" : "type-1365",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec3IdE7no_initE"
   },
   {
@@ -2359,11 +2350,11 @@
    ],
    "linker_set_key" : "android::details::TVec3<float>::no_init",
    "name" : "android::details::TVec3<float>::no_init",
-   "referenced_type" : "type-1412",
-   "self_type" : "type-1412",
+   "referenced_type" : "type-1414",
+   "self_type" : "type-1414",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec3IfE7no_initE"
   },
   {
@@ -2377,11 +2368,11 @@
    ],
    "linker_set_key" : "android::details::TVec4<double>::no_init",
    "name" : "android::details::TVec4<double>::no_init",
-   "referenced_type" : "type-148",
-   "self_type" : "type-148",
+   "referenced_type" : "type-137",
+   "self_type" : "type-137",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec4IdE7no_initE"
   },
   {
@@ -2395,11 +2386,11 @@
    ],
    "linker_set_key" : "android::details::TVec4<float>::no_init",
    "name" : "android::details::TVec4<float>::no_init",
-   "referenced_type" : "type-309",
-   "self_type" : "type-309",
+   "referenced_type" : "type-304",
+   "self_type" : "type-304",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec4IfE7no_initE"
   },
   {
@@ -2414,11 +2405,11 @@
    ],
    "linker_set_key" : "android::half::Binary",
    "name" : "android::half::Binary",
-   "referenced_type" : "type-403",
-   "self_type" : "type-403",
+   "referenced_type" : "type-399",
+   "self_type" : "type-399",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android4half6BinaryE"
   },
   {
@@ -2444,7 +2435,7 @@
    "self_type" : "type-1321",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware21HidlReturnRestrictionE"
   },
   {
@@ -2466,7 +2457,7 @@
    "self_type" : "type-1129",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android8hardware8MQFlavorE"
   },
   {
@@ -2488,11 +2479,11 @@
    ],
    "linker_set_key" : "android::hardware::ProcessState::CallRestriction",
    "name" : "android::hardware::ProcessState::CallRestriction",
-   "referenced_type" : "type-276",
-   "self_type" : "type-276",
+   "referenced_type" : "type-272",
+   "self_type" : "type-272",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware12ProcessState15CallRestrictionE"
   },
   {
@@ -2546,7 +2537,7 @@
    "self_type" : "type-1308",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware6Status9ExceptionE"
   },
   {
@@ -2600,7 +2591,7 @@
    "self_type" : "type-1223",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentor20InstrumentationEventE"
   },
   {
@@ -2702,11 +2693,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_0::BufferUsage",
-   "referenced_type" : "type-150",
-   "self_type" : "type-150",
+   "referenced_type" : "type-153",
+   "self_type" : "type-153",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_011BufferUsageE"
   },
   {
@@ -2760,7 +2751,7 @@
    "self_type" : "type-1140",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09ColorModeE"
   },
   {
@@ -2802,7 +2793,7 @@
    "self_type" : "type-1141",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_014ColorTransformE"
   },
   {
@@ -3044,7 +3035,7 @@
    "self_type" : "type-1139",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09DataspaceE"
   },
   {
@@ -3070,7 +3061,7 @@
    "self_type" : "type-1143",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_03HdrE"
   },
   {
@@ -3164,7 +3155,7 @@
    "self_type" : "type-1137",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_011PixelFormatE"
   },
   {
@@ -3198,7 +3189,7 @@
    "self_type" : "type-1138",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09TransformE"
   },
   {
@@ -3308,11 +3299,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_1::BufferUsage",
-   "referenced_type" : "type-158",
-   "self_type" : "type-158",
+   "referenced_type" : "type-160",
+   "self_type" : "type-160",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_111BufferUsageE"
   },
   {
@@ -3378,7 +3369,7 @@
    "self_type" : "type-1170",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_19ColorModeE"
   },
   {
@@ -3636,7 +3627,7 @@
    "self_type" : "type-1169",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_19DataspaceE"
   },
   {
@@ -3758,7 +3749,7 @@
    "self_type" : "type-1168",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_111PixelFormatE"
   },
   {
@@ -3788,7 +3779,7 @@
    "self_type" : "type-1171",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_112RenderIntentE"
   },
   {
@@ -3902,11 +3893,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_2::BufferUsage",
-   "referenced_type" : "type-420",
-   "self_type" : "type-420",
+   "referenced_type" : "type-417",
+   "self_type" : "type-417",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_211BufferUsageE"
   },
   {
@@ -3976,7 +3967,7 @@
    "self_type" : "type-1192",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_29ColorModeE"
   },
   {
@@ -4250,7 +4241,7 @@
    "self_type" : "type-1191",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_29DataspaceE"
   },
   {
@@ -4280,7 +4271,7 @@
    "self_type" : "type-1190",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_23HdrE"
   },
   {
@@ -4406,7 +4397,7 @@
    "self_type" : "type-1194",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_211PixelFormatE"
   },
   {
@@ -4428,11 +4419,11 @@
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-164",
-   "self_type" : "type-164",
+   "referenced_type" : "type-167",
+   "self_type" : "type-167",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfo12ArchitectureE"
   },
   {
@@ -4470,11 +4461,11 @@
    ],
    "linker_set_key" : "android::ui::Transform::orientation_flags",
    "name" : "android::ui::Transform::orientation_flags",
-   "referenced_type" : "type-2289",
-   "self_type" : "type-2289",
+   "referenced_type" : "type-2291",
+   "self_type" : "type-2291",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android2ui9Transform17orientation_flagsE"
   },
   {
@@ -4504,11 +4495,11 @@
    ],
    "linker_set_key" : "android::ui::Transform::type_mask",
    "name" : "android::ui::Transform::type_mask",
-   "referenced_type" : "type-2290",
-   "self_type" : "type-2290",
+   "referenced_type" : "type-2292",
+   "self_type" : "type-2292",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android2ui9Transform9type_maskE"
   },
   {
@@ -4558,7 +4549,7 @@
    "self_type" : "type-1257",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_LogPriority"
   },
   {
@@ -4612,7 +4603,7 @@
    "self_type" : "type-1212",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_color_mode_t"
   },
   {
@@ -4638,7 +4629,7 @@
    "self_type" : "type-1217",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_color_mode_v1_1_t"
   },
   {
@@ -4680,7 +4671,7 @@
    "self_type" : "type-1213",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_color_transform_t"
   },
   {
@@ -4922,7 +4913,7 @@
    "self_type" : "type-1211",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_dataspace_t"
   },
   {
@@ -4952,7 +4943,7 @@
    "self_type" : "type-1216",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_dataspace_v1_1_t"
   },
   {
@@ -4982,7 +4973,7 @@
    "self_type" : "type-1221",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_dataspace_v1_2_t"
   },
   {
@@ -5024,7 +5015,7 @@
    "self_type" : "type-1225",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_flex_component"
   },
   {
@@ -5062,7 +5053,7 @@
    "self_type" : "type-1227",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_flex_format"
   },
   {
@@ -5088,7 +5079,7 @@
    "self_type" : "type-1214",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_hdr_t"
   },
   {
@@ -5106,7 +5097,7 @@
    "self_type" : "type-1220",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_hdr_v1_2_t"
   },
   {
@@ -5136,7 +5127,7 @@
    "self_type" : "type-1224",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTS25android_pixel_format_sw_t"
   },
   {
@@ -5230,7 +5221,7 @@
    "self_type" : "type-1209",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_pixel_format_t"
   },
   {
@@ -5272,7 +5263,7 @@
    "self_type" : "type-1215",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_pixel_format_v1_1_t"
   },
   {
@@ -5290,7 +5281,7 @@
    "self_type" : "type-1222",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_pixel_format_v1_2_t"
   },
   {
@@ -5320,7 +5311,7 @@
    "self_type" : "type-1219",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_render_intent_v1_1_t"
   },
   {
@@ -5354,7 +5345,7 @@
    "self_type" : "type-1210",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_transform_t"
   },
   {
@@ -5408,7 +5399,7 @@
    "self_type" : "type-1258",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "log_id"
   }
  ],
@@ -5421,18 +5412,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-272"
+     "referenced_type" : "type-268"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
-   "referenced_type" : "type-271",
+   "referenced_type" : "type-267",
    "return_type" : "type-6",
-   "self_type" : "type-271",
+   "self_type" : "type-267",
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
   {
@@ -5445,11 +5436,11 @@
      "referenced_type" : "type-604"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
    "referenced_type" : "type-606",
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "self_type" : "type-606",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -5463,26 +5454,26 @@
      "referenced_type" : "type-604"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-343"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
    "referenced_type" : "type-603",
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "self_type" : "type-603",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -5493,15 +5484,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "referenced_type" : "type-580",
-   "return_type" : "type-103",
-   "self_type" : "type-580",
+   "referenced_type" : "type-578",
+   "return_type" : "type-105",
+   "self_type" : "type-578",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5511,18 +5502,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "referenced_type" : "type-592",
-   "return_type" : "type-103",
-   "self_type" : "type-592",
+   "referenced_type" : "type-590",
+   "return_type" : "type-105",
+   "self_type" : "type-590",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5532,33 +5523,33 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "referenced_type" : "type-588",
-   "return_type" : "type-103",
-   "self_type" : "type-588",
+   "referenced_type" : "type-586",
+   "return_type" : "type-105",
+   "self_type" : "type-586",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5568,36 +5559,36 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-595",
-   "return_type" : "type-103",
-   "self_type" : "type-595",
+   "referenced_type" : "type-593",
+   "return_type" : "type-105",
+   "self_type" : "type-593",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5607,33 +5598,33 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     }
    ],
-   "referenced_type" : "type-584",
-   "return_type" : "type-103",
-   "self_type" : "type-584",
+   "referenced_type" : "type-582",
+   "return_type" : "type-105",
+   "self_type" : "type-582",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5643,36 +5634,93 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-590",
-   "return_type" : "type-103",
-   "self_type" : "type-590",
+   "referenced_type" : "type-588",
+   "return_type" : "type-105",
+   "self_type" : "type-588",
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "name" : "int (const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-579"
+    },
+    {
+     "referenced_type" : "type-145"
+    },
+    {
+     "referenced_type" : "type-124"
+    },
+    {
+     "referenced_type" : "type-124"
+    }
+   ],
+   "referenced_type" : "type-595",
+   "return_type" : "type-105",
+   "self_type" : "type-595",
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "name" : "int (const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-579"
+    },
+    {
+     "referenced_type" : "type-145"
+    },
+    {
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-105"
+    },
+    {
+     "referenced_type" : "type-105"
+    },
+    {
+     "referenced_type" : "type-125"
+    }
+   ],
+   "referenced_type" : "type-597",
+   "return_type" : "type-105",
+   "self_type" : "type-597",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5682,15 +5730,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-586",
-   "return_type" : "type-103",
-   "self_type" : "type-586",
+   "referenced_type" : "type-584",
+   "return_type" : "type-105",
+   "self_type" : "type-584",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5700,18 +5748,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-554"
+     "referenced_type" : "type-551"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
-     "referenced_type" : "type-556"
+     "referenced_type" : "type-553"
     }
    ],
-   "referenced_type" : "type-553",
-   "return_type" : "type-103",
-   "self_type" : "type-553",
+   "referenced_type" : "type-550",
+   "return_type" : "type-105",
+   "self_type" : "type-550",
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
   {
@@ -5721,12 +5769,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     }
    ],
-   "referenced_type" : "type-573",
-   "return_type" : "type-103",
-   "self_type" : "type-573",
+   "referenced_type" : "type-570",
+   "return_type" : "type-105",
+   "self_type" : "type-570",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5736,15 +5784,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "referenced_type" : "type-571",
-   "return_type" : "type-103",
-   "self_type" : "type-571",
+   "referenced_type" : "type-568",
+   "return_type" : "type-105",
+   "self_type" : "type-568",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5754,15 +5802,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-566",
-   "return_type" : "type-103",
-   "self_type" : "type-566",
+   "referenced_type" : "type-563",
+   "return_type" : "type-105",
+   "self_type" : "type-563",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5772,24 +5820,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-569",
-   "return_type" : "type-103",
-   "self_type" : "type-569",
+   "referenced_type" : "type-566",
+   "return_type" : "type-105",
+   "self_type" : "type-566",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5799,12 +5847,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-557"
+     "referenced_type" : "type-554"
     }
    ],
-   "referenced_type" : "type-561",
-   "return_type" : "type-103",
-   "self_type" : "type-561",
+   "referenced_type" : "type-558",
+   "return_type" : "type-105",
+   "self_type" : "type-558",
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
   {
@@ -5814,12 +5862,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
-   "referenced_type" : "type-249",
-   "return_type" : "type-103",
-   "self_type" : "type-249",
+   "referenced_type" : "type-251",
+   "return_type" : "type-105",
+   "self_type" : "type-251",
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
   {
@@ -5832,14 +5880,14 @@
      "referenced_type" : "type-604"
     },
     {
-     "referenced_type" : "type-576"
+     "referenced_type" : "type-573"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "referenced_type" : "type-608",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "self_type" : "type-608",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -5850,27 +5898,27 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-222"
-    },
-    {
-     "referenced_type" : "type-223"
-    },
-    {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-224"
     },
     {
      "referenced_type" : "type-225"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-227"
+    },
+    {
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-229"
     }
    ],
-   "referenced_type" : "type-221",
-   "return_type" : "type-151",
-   "self_type" : "type-221",
+   "referenced_type" : "type-223",
+   "return_type" : "type-154",
+   "self_type" : "type-223",
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
   {
@@ -5880,12 +5928,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-522"
+     "referenced_type" : "type-520"
     }
    ],
-   "referenced_type" : "type-521",
-   "return_type" : "type-151",
-   "self_type" : "type-521",
+   "referenced_type" : "type-519",
+   "return_type" : "type-154",
+   "self_type" : "type-519",
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
   {
@@ -5895,18 +5943,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     },
     {
-     "referenced_type" : "type-576"
+     "referenced_type" : "type-573"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-575",
-   "return_type" : "type-151",
-   "self_type" : "type-575",
+   "referenced_type" : "type-572",
+   "return_type" : "type-154",
+   "self_type" : "type-572",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   }
  ],
@@ -5921,7 +5969,7 @@
      "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-1433",
+   "return_type" : "type-1436",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5933,7 +5981,7 @@
      "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-1434",
+   "return_type" : "type-1437",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5945,7 +5993,7 @@
      "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-1435",
+   "return_type" : "type-1438",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5957,7 +6005,7 @@
      "referenced_type" : "type-1192"
     }
    ],
-   "return_type" : "type-1436",
+   "return_type" : "type-1439",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5969,7 +6017,7 @@
      "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-1437",
+   "return_type" : "type-1440",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5978,10 +6026,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-1438",
+   "return_type" : "type-1441",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5993,7 +6041,7 @@
      "referenced_type" : "type-1171"
     }
    ],
-   "return_type" : "type-1439",
+   "return_type" : "type-1442",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -6005,7 +6053,7 @@
      "referenced_type" : "type-1213"
     }
    ],
-   "return_type" : "type-1440",
+   "return_type" : "type-1443",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -6017,7 +6065,7 @@
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-1441",
+   "return_type" : "type-1444",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -6104,7 +6152,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1042"
@@ -6113,7 +6161,7 @@
      "referenced_type" : "type-1042"
     }
    ],
-   "return_type" : "type-1442",
+   "return_type" : "type-1445",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6123,10 +6171,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6135,14 +6183,14 @@
      "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-1030"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1443"
+     "referenced_type" : "type-1446"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6152,10 +6200,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6165,18 +6213,18 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1444"
+     "referenced_type" : "type-1447"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1445"
+     "referenced_type" : "type-1448"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1446"
+     "referenced_type" : "type-1449"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6186,10 +6234,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6202,10 +6250,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1447"
+     "referenced_type" : "type-1450"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6215,23 +6263,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-1030"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1448"
+     "referenced_type" : "type-1451"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6241,28 +6289,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1449"
+     "referenced_type" : "type-1452"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1450"
+     "referenced_type" : "type-1453"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1451"
+     "referenced_type" : "type-1454"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6272,23 +6320,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
      "referenced_type" : "type-10"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1452"
+     "referenced_type" : "type-1455"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6298,10 +6346,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6310,14 +6358,14 @@
      "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-1030"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1453"
+     "referenced_type" : "type-1456"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6327,10 +6375,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6340,18 +6388,18 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1454"
+     "referenced_type" : "type-1457"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1455"
+     "referenced_type" : "type-1458"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1456"
+     "referenced_type" : "type-1459"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6361,10 +6409,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6377,10 +6425,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1457"
+     "referenced_type" : "type-1460"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6390,23 +6438,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-1030"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1458"
+     "referenced_type" : "type-1461"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6416,28 +6464,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1459"
+     "referenced_type" : "type-1462"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1460"
+     "referenced_type" : "type-1463"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1464"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6447,23 +6495,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
      "referenced_type" : "type-10"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1462"
+     "referenced_type" : "type-1465"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6473,16 +6521,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1427"
+     "referenced_type" : "type-1431"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
   {
@@ -6491,10 +6539,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/PixelFormat.h"
   },
   {
@@ -6504,10 +6552,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1400"
+     "referenced_type" : "type-1404"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -6517,13 +6565,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1400"
+     "referenced_type" : "type-1404"
     },
     {
-     "referenced_type" : "type-1401"
+     "referenced_type" : "type-1405"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -6533,25 +6581,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6562,10 +6610,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6575,13 +6623,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6592,28 +6640,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-1463"
+     "referenced_type" : "type-1466"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6624,34 +6672,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-629"
+     "referenced_type" : "type-630"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6661,19 +6709,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6683,22 +6731,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6708,16 +6756,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-1464"
+     "referenced_type" : "type-1467"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6727,22 +6775,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "return_type" : "type-6",
@@ -6755,10 +6803,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-621",
+   "return_type" : "type-622",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6767,10 +6815,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-621"
+     "referenced_type" : "type-622"
     }
    ],
-   "return_type" : "type-680",
+   "return_type" : "type-679",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6782,13 +6830,13 @@
      "referenced_type" : "type-628"
     }
    ],
-   "return_type" : "type-623",
+   "return_type" : "type-624",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
    "function_name" : "android::GraphicBuffer::dumpAllocationsToSystemLog",
    "linker_set_key" : "_ZN7android13GraphicBuffer26dumpAllocationsToSystemLogEv",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6800,7 +6848,7 @@
      "referenced_type" : "type-636"
     }
    ],
-   "return_type" : "type-679",
+   "return_type" : "type-678",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6810,24 +6858,24 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6837,27 +6885,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6867,10 +6915,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6880,27 +6928,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6910,30 +6958,30 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6943,33 +6991,33 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6979,16 +7027,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6998,19 +7046,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7020,7 +7068,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
      "referenced_type" : "type-1251"
@@ -7035,7 +7083,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7045,34 +7093,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-629"
+     "referenced_type" : "type-630"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7082,26 +7130,26 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1465"
+     "referenced_type" : "type-1468"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7111,25 +7159,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1132"
@@ -7138,7 +7186,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7148,29 +7196,29 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1466"
+     "referenced_type" : "type-1469"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7180,10 +7228,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7193,34 +7241,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-629"
+     "referenced_type" : "type-630"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7230,26 +7278,26 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1467"
+     "referenced_type" : "type-1470"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7259,25 +7307,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1132"
@@ -7286,7 +7334,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7296,29 +7344,29 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1468"
+     "referenced_type" : "type-1471"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7328,10 +7376,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7342,10 +7390,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7356,10 +7404,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7370,10 +7418,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7382,16 +7430,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/PixelFormat.h"
   },
   {
    "function_name" : "android::Gralloc2Mapper::preload",
    "linker_set_key" : "_ZN7android14Gralloc2Mapper7preloadEv",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7401,10 +7449,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-343"
+     "referenced_type" : "type-340"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7414,10 +7462,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-343"
+     "referenced_type" : "type-340"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7433,10 +7481,10 @@
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7452,7 +7500,7 @@
      "referenced_type" : "type-970"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7468,7 +7516,7 @@
      "referenced_type" : "type-970"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7481,7 +7529,7 @@
      "referenced_type" : "type-966"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7494,7 +7542,7 @@
      "referenced_type" : "type-966"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7520,13 +7568,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-360"
+     "referenced_type" : "type-357"
     },
     {
-     "referenced_type" : "type-354"
+     "referenced_type" : "type-351"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7536,13 +7584,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-360"
+     "referenced_type" : "type-357"
     },
     {
-     "referenced_type" : "type-354"
+     "referenced_type" : "type-351"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7561,7 +7609,7 @@
      "referenced_type" : "type-1042"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -7580,7 +7628,7 @@
      "referenced_type" : "type-1042"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -7590,16 +7638,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1405"
+     "referenced_type" : "type-1409"
     },
     {
      "referenced_type" : "type-1361"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -7610,10 +7658,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1405"
+     "referenced_type" : "type-1409"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -7623,13 +7671,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1405"
+     "referenced_type" : "type-1409"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-1469",
+   "return_type" : "type-1472",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -7639,19 +7687,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
    "function_name" : "android::GraphicBufferMapper::preloadHal",
    "linker_set_key" : "_ZN7android19GraphicBufferMapper10preloadHalEv",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7661,28 +7709,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-350"
+     "referenced_type" : "type-347"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7692,16 +7740,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7711,34 +7759,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-343"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7748,25 +7796,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7776,19 +7824,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7798,30 +7846,30 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7831,13 +7879,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7847,33 +7895,33 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7883,36 +7931,36 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7922,22 +7970,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7948,10 +7996,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7962,10 +8010,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7974,16 +8022,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2298"
+     "referenced_type" : "type-2300"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/UiConfig.h"
   },
   {
    "function_name" : "android::GraphicBufferAllocator::dumpToSystemLog",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocator15dumpToSystemLogEv",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -7993,13 +8041,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -8009,93 +8057,93 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-126"
+    },
+    {
+     "referenced_type" : "type-343"
     },
     {
      "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-122"
-    },
-    {
-     "referenced_type" : "type-124"
-    },
-    {
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorC1Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorC2Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::~GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorD1Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::~GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorD2Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -8108,7 +8156,7 @@
      "referenced_type" : "type-1359"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -8121,7 +8169,7 @@
      "referenced_type" : "type-1359"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -8131,7 +8179,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     },
     {
      "referenced_type" : "type-10"
@@ -8140,7 +8188,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8150,7 +8198,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     },
     {
      "referenced_type" : "type-10"
@@ -8165,7 +8213,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8175,10 +8223,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-10"
@@ -8187,7 +8235,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8197,10 +8245,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8236,13 +8284,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     },
     {
-     "referenced_type" : "type-2288"
+     "referenced_type" : "type-2290"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8252,13 +8300,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8268,10 +8316,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8281,13 +8329,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     },
     {
-     "referenced_type" : "type-2288"
+     "referenced_type" : "type-2290"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8297,13 +8345,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8313,10 +8361,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8326,10 +8374,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8339,10 +8387,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8352,13 +8400,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     },
     {
-     "referenced_type" : "type-2288"
+     "referenced_type" : "type-2290"
     }
    ],
-   "return_type" : "type-2292",
+   "return_type" : "type-2294",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8371,7 +8419,7 @@
      "referenced_type" : "type-1296"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
   },
   {
@@ -8384,16 +8432,16 @@
      "referenced_type" : "type-1296"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1300",
@@ -8409,10 +8457,10 @@
      "referenced_type" : "type-1296"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1300",
@@ -8428,10 +8476,10 @@
      "referenced_type" : "type-1296"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1300",
@@ -8447,10 +8495,10 @@
      "referenced_type" : "type-1358"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8463,10 +8511,10 @@
      "referenced_type" : "type-1358"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8475,7 +8523,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "referenced_type" : "type-1361"
@@ -8493,7 +8541,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-889"
+     "referenced_type" : "type-879"
     },
     {
      "referenced_type" : "type-1361"
@@ -8527,7 +8575,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8543,7 +8591,7 @@
      "referenced_type" : "type-1341"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8556,10 +8604,10 @@
      "referenced_type" : "type-1358"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8575,7 +8623,7 @@
      "referenced_type" : "type-1341"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8588,10 +8636,10 @@
      "referenced_type" : "type-1358"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8601,13 +8649,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8617,13 +8665,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8633,19 +8681,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8656,16 +8704,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8676,22 +8724,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8702,16 +8750,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8721,16 +8769,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8740,10 +8788,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8753,22 +8801,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8778,19 +8826,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2225"
+     "referenced_type" : "type-2228"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8800,25 +8848,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2225"
+     "referenced_type" : "type-2228"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8828,19 +8876,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2225"
+     "referenced_type" : "type-2228"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8850,25 +8898,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2225"
+     "referenced_type" : "type-2228"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8877,10 +8925,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2221",
+   "return_type" : "type-2224",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8890,13 +8938,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8906,16 +8954,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8925,16 +8973,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8944,10 +8992,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8957,13 +9005,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8973,13 +9021,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8989,19 +9037,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9011,13 +9059,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9027,13 +9075,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9043,19 +9091,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9065,13 +9113,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9081,13 +9129,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9097,19 +9145,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9119,10 +9167,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "default_arg" : true,
@@ -9139,7 +9187,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-10"
@@ -9148,7 +9196,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9158,19 +9206,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2225"
+     "referenced_type" : "type-2228"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9180,16 +9228,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2225"
+     "referenced_type" : "type-2228"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9199,16 +9247,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9218,13 +9266,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9234,13 +9282,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9250,10 +9298,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9263,13 +9311,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9279,13 +9327,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9295,10 +9343,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9308,10 +9356,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9321,10 +9369,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9334,13 +9382,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9350,10 +9398,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     }
    ],
-   "return_type" : "type-284",
+   "return_type" : "type-12",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9363,13 +9411,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9379,13 +9427,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-1394"
+     "referenced_type" : "type-1398"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9395,7 +9443,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
      "referenced_type" : "type-1251"
@@ -9410,7 +9458,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9420,13 +9468,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9436,13 +9484,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9452,13 +9500,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9468,13 +9516,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9484,13 +9532,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-1410"
+     "referenced_type" : "type-1415"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9500,13 +9548,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9517,7 +9565,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
      "referenced_type" : "type-1361"
@@ -9526,7 +9574,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9536,13 +9584,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9552,13 +9600,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-1410"
+     "referenced_type" : "type-1415"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9568,13 +9616,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9585,7 +9633,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
      "referenced_type" : "type-1361"
@@ -9594,7 +9642,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9604,25 +9652,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
    "function_name" : "android::Singleton<android::GraphicBufferMapper>::getInstance",
    "linker_set_key" : "_ZN7android9SingletonINS_19GraphicBufferMapperEE11getInstanceEv",
-   "return_type" : "type-526",
+   "return_type" : "type-524",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "function_name" : "android::Singleton<android::GraphicBufferAllocator>::getInstance",
    "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11getInstanceEv",
-   "return_type" : "type-544",
+   "return_type" : "type-541",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
@@ -9632,7 +9680,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1429"
+     "referenced_type" : "type-1433"
     }
    ],
    "return_type" : "type-6",
@@ -9645,10 +9693,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1429"
+     "referenced_type" : "type-1433"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
   {
@@ -9658,16 +9706,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1429"
+     "referenced_type" : "type-1433"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
   {
@@ -9687,7 +9735,7 @@
      "referenced_type" : "type-1119"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9701,13 +9749,13 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9721,13 +9769,13 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9741,16 +9789,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9764,16 +9812,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9787,16 +9835,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9810,16 +9858,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9829,10 +9877,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9842,28 +9890,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-350"
+     "referenced_type" : "type-347"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9873,7 +9921,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
    "return_type" : "type-636",
@@ -9886,10 +9934,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9899,7 +9947,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
    "return_type" : "type-628",
@@ -9912,7 +9960,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     },
     {
      "referenced_type" : "type-1249"
@@ -9927,7 +9975,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9937,10 +9985,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9950,13 +9998,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -9966,28 +10014,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-350"
+     "referenced_type" : "type-347"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -9997,16 +10045,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
      "referenced_type" : "type-1122"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-343"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10016,16 +10064,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10035,19 +10083,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10057,31 +10105,31 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10092,13 +10140,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-351"
+     "referenced_type" : "type-348"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10108,25 +10156,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10136,31 +10184,31 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10170,13 +10218,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10186,7 +10234,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     }
    ],
    "return_type" : "type-6",
@@ -10199,10 +10247,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-973"
+     "referenced_type" : "type-974"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -10212,16 +10260,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-973"
+     "referenced_type" : "type-974"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -10231,10 +10279,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-362"
+     "referenced_type" : "type-359"
     }
    ],
-   "return_type" : "type-1566",
+   "return_type" : "type-1569",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10244,34 +10292,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-362"
+     "referenced_type" : "type-359"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-126"
+    },
+    {
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-123"
-    },
-    {
-     "referenced_type" : "type-122"
-    },
-    {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-343"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10281,7 +10329,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-362"
+     "referenced_type" : "type-359"
     }
    ],
    "return_type" : "type-6",
@@ -10294,10 +10342,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-721"
+     "referenced_type" : "type-722"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -10307,13 +10355,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-721"
+     "referenced_type" : "type-722"
     },
     {
      "referenced_type" : "type-723"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -10323,13 +10371,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1241",
@@ -10342,7 +10390,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
    "return_type" : "type-6",
@@ -10355,10 +10403,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10368,7 +10416,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
    "return_type" : "type-10",
@@ -10381,7 +10429,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
    "return_type" : "type-10",
@@ -10394,7 +10442,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
    "return_type" : "type-10",
@@ -10407,7 +10455,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
    "return_type" : "type-10",
@@ -10420,13 +10468,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10436,16 +10484,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
-    },
-    {
      "referenced_type" : "type-2293"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-2295"
+    },
+    {
+     "referenced_type" : "type-283"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10456,10 +10504,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10469,10 +10517,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10482,10 +10530,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
-   "return_type" : "type-2283",
+   "return_type" : "type-2286",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10495,10 +10543,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
-   "return_type" : "type-2276",
+   "return_type" : "type-2278",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10508,7 +10556,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
      "referenced_type" : "type-1246"
@@ -10528,13 +10576,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2221",
+   "return_type" : "type-2224",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10544,13 +10592,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
      "referenced_type" : "type-1050"
     }
    ],
-   "return_type" : "type-22",
+   "return_type" : "type-23",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10560,13 +10608,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
      "referenced_type" : "type-1054"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-18",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10576,7 +10624,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
      "referenced_type" : "type-1280"
@@ -10592,16 +10640,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-22",
+   "return_type" : "type-23",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10611,10 +10659,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "return_type" : "type-1054",
@@ -10627,13 +10675,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
-     "referenced_type" : "type-2288"
+     "referenced_type" : "type-2290"
     }
    ],
-   "return_type" : "type-2283",
+   "return_type" : "type-2286",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10681,13 +10729,13 @@
      "referenced_type" : "type-1299"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1241",
@@ -10751,7 +10799,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10764,7 +10812,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-284",
+   "return_type" : "type-12",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10777,7 +10825,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10790,7 +10838,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10815,7 +10863,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10825,13 +10873,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10841,13 +10889,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10857,19 +10905,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10879,10 +10927,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10892,10 +10940,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
    "return_type" : "type-6",
@@ -10908,7 +10956,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     }
    ],
    "return_type" : "type-1299",
@@ -10921,17 +10969,17 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10941,20 +10989,20 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2228"
+     "referenced_type" : "type-2231"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10964,7 +11012,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     }
    ],
    "return_type" : "type-1299",
@@ -10977,13 +11025,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10993,13 +11041,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11009,19 +11057,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11031,16 +11079,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11050,7 +11098,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
      "referenced_type" : "type-1284"
@@ -11066,13 +11114,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-6",
@@ -11085,10 +11133,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     }
    ],
    "return_type" : "type-1299",
@@ -11101,13 +11149,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11117,13 +11165,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11133,19 +11181,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11155,13 +11203,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11171,13 +11219,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11187,19 +11235,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11210,16 +11258,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11230,22 +11278,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11256,16 +11304,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11275,16 +11323,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11295,16 +11343,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2219"
+     "referenced_type" : "type-2222"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11315,16 +11363,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2219"
+     "referenced_type" : "type-2222"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11335,19 +11383,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2219"
+     "referenced_type" : "type-2222"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11358,19 +11406,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2219"
+     "referenced_type" : "type-2222"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11381,19 +11429,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2219"
+     "referenced_type" : "type-2222"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11404,19 +11452,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2219"
+     "referenced_type" : "type-2222"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11426,10 +11474,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1396"
+     "referenced_type" : "type-1400"
     }
    ],
-   "return_type" : "type-1383",
+   "return_type" : "type-1387",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11439,10 +11487,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1396"
+     "referenced_type" : "type-1400"
     }
    ],
-   "return_type" : "type-284",
+   "return_type" : "type-12",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11452,7 +11500,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1396"
+     "referenced_type" : "type-1400"
     }
    ],
    "return_type" : "type-6",
@@ -11465,10 +11513,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1394"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11478,10 +11526,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1394"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11491,7 +11539,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1394"
     },
     {
      "referenced_type" : "type-1249"
@@ -11506,24 +11554,24 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   }
  ],
  "global_vars" :
  [
   {
-   "access" : "private",
+   "access" : "protected",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocator10sAllocListE",
    "name" : "android::GraphicBufferAllocator::sAllocList",
-   "referenced_type" : "type-1570",
+   "referenced_type" : "type-1573",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocator5sLockE",
    "name" : "android::GraphicBufferAllocator::sLock",
-   "referenced_type" : "type-252",
+   "referenced_type" : "type-280",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -11559,41 +11607,41 @@
   {
    "linker_set_key" : "_ZN7android6Region14INVALID_REGIONE",
    "name" : "android::Region::INVALID_REGION",
-   "referenced_type" : "type-2220",
+   "referenced_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
    "linker_set_key" : "_ZN7android9FenceTime8NO_FENCEE",
    "name" : "android::FenceTime::NO_FENCE",
-   "referenced_type" : "type-1391",
+   "referenced_type" : "type-1395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_19GraphicBufferMapperEE5sLockE",
    "name" : "android::Singleton<android::GraphicBufferMapper>::sLock",
-   "referenced_type" : "type-252",
+   "referenced_type" : "type-280",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_19GraphicBufferMapperEE9sInstanceE",
    "name" : "android::Singleton<android::GraphicBufferMapper>::sInstance",
-   "referenced_type" : "type-539",
+   "referenced_type" : "type-537",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE5sLockE",
    "name" : "android::Singleton<android::GraphicBufferAllocator>::sLock",
-   "referenced_type" : "type-252",
+   "referenced_type" : "type-280",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE9sInstanceE",
    "name" : "android::Singleton<android::GraphicBufferAllocator>::sInstance",
-   "referenced_type" : "type-545",
+   "referenced_type" : "type-542",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   }
  ],
@@ -11603,8 +11651,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot &",
    "name" : "android::FenceTime::Snapshot &",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1387",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1392",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -11612,8 +11660,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot::State &",
    "name" : "android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1408",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1412",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -11621,8 +11669,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferAllocator &",
    "name" : "android::GraphicBufferAllocator &",
-   "referenced_type" : "type-542",
-   "self_type" : "type-544",
+   "referenced_type" : "type-539",
+   "self_type" : "type-541",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -11630,8 +11678,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-527",
-   "self_type" : "type-526",
+   "referenced_type" : "type-525",
+   "self_type" : "type-524",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -11648,8 +11696,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex &",
    "name" : "android::Mutex &",
-   "referenced_type" : "type-252",
-   "self_type" : "type-256",
+   "referenced_type" : "type-280",
+   "self_type" : "type-1379",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -11666,8 +11714,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock &",
    "name" : "android::RWLock &",
-   "referenced_type" : "type-262",
-   "self_type" : "type-266",
+   "referenced_type" : "type-258",
+   "self_type" : "type-262",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -11684,8 +11732,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Region &",
    "name" : "android::Region &",
-   "referenced_type" : "type-2221",
-   "self_type" : "type-2225",
+   "referenced_type" : "type-2224",
+   "self_type" : "type-2228",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -11693,8 +11741,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
-   "referenced_type" : "type-179",
-   "self_type" : "type-188",
+   "referenced_type" : "type-182",
+   "self_type" : "type-190",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -11702,8 +11750,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
-   "referenced_type" : "type-285",
-   "self_type" : "type-890",
+   "referenced_type" : "type-282",
+   "self_type" : "type-888",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -11711,8 +11759,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<android::Rect> &",
    "name" : "android::Vector<android::Rect> &",
-   "referenced_type" : "type-2213",
-   "self_type" : "type-2217",
+   "referenced_type" : "type-2216",
+   "self_type" : "type-2220",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -11729,8 +11777,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TMat44<float> &",
    "name" : "android::details::TMat44<float> &",
-   "referenced_type" : "type-2276",
-   "self_type" : "type-2282",
+   "referenced_type" : "type-2278",
+   "self_type" : "type-2285",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -11738,8 +11786,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TQuaternion<double> &",
    "name" : "android::details::TQuaternion<double> &",
-   "referenced_type" : "type-331",
-   "self_type" : "type-406",
+   "referenced_type" : "type-328",
+   "self_type" : "type-403",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -11747,8 +11795,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TQuaternion<float> &",
    "name" : "android::details::TQuaternion<float> &",
-   "referenced_type" : "type-410",
-   "self_type" : "type-438",
+   "referenced_type" : "type-407",
+   "self_type" : "type-435",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -11765,7 +11813,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec2<double> &",
    "name" : "android::details::TVec2<double> &",
-   "referenced_type" : "type-55",
+   "referenced_type" : "type-57",
    "self_type" : "type-1081",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -11774,7 +11822,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec2<float> &",
    "name" : "android::details::TVec2<float> &",
-   "referenced_type" : "type-22",
+   "referenced_type" : "type-23",
    "self_type" : "type-1048",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -11783,7 +11831,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<double> &",
    "name" : "android::details::TVec3<double> &",
-   "referenced_type" : "type-66",
+   "referenced_type" : "type-68",
    "self_type" : "type-1390",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
@@ -11792,7 +11840,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<float> &",
    "name" : "android::details::TVec3<float> &",
-   "referenced_type" : "type-17",
+   "referenced_type" : "type-18",
    "self_type" : "type-1052",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -11801,8 +11849,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<double> &",
    "name" : "android::details::TVec4<double> &",
-   "referenced_type" : "type-50",
-   "self_type" : "type-185",
+   "referenced_type" : "type-52",
+   "self_type" : "type-181",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -11810,8 +11858,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<float> &",
    "name" : "android::details::TVec4<float> &",
-   "referenced_type" : "type-200",
-   "self_type" : "type-330",
+   "referenced_type" : "type-192",
+   "self_type" : "type-327",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -11819,8 +11867,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &",
-   "referenced_type" : "type-99",
-   "self_type" : "type-108",
+   "referenced_type" : "type-101",
+   "self_type" : "type-110",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11828,8 +11876,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &",
-   "referenced_type" : "type-393",
-   "self_type" : "type-400",
+   "referenced_type" : "type-392",
+   "self_type" : "type-397",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11837,8 +11885,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &",
-   "referenced_type" : "type-111",
-   "self_type" : "type-114",
+   "referenced_type" : "type-113",
+   "self_type" : "type-116",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11855,7 +11903,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status &",
    "name" : "android::hardware::Status &",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1313",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -11864,8 +11912,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1658",
-   "self_type" : "type-1657",
+   "referenced_type" : "type-1662",
+   "self_type" : "type-1661",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11873,8 +11921,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1777",
-   "self_type" : "type-1776",
+   "referenced_type" : "type-1778",
+   "self_type" : "type-1777",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11882,8 +11930,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-230",
-   "self_type" : "type-229",
+   "referenced_type" : "type-232",
+   "self_type" : "type-231",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11891,8 +11939,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-2627",
-   "self_type" : "type-2626",
+   "referenced_type" : "type-2632",
+   "self_type" : "type-2631",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11900,8 +11948,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-2841",
-   "self_type" : "type-2840",
+   "referenced_type" : "type-2843",
+   "self_type" : "type-2842",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11909,8 +11957,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-2917",
-   "self_type" : "type-2916",
+   "referenced_type" : "type-2920",
+   "self_type" : "type-2919",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11918,8 +11966,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-431",
-   "self_type" : "type-430",
+   "referenced_type" : "type-428",
+   "self_type" : "type-427",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11927,8 +11975,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int> &",
    "name" : "android::hardware::details::hidl_pointer<unsigned int> &",
-   "referenced_type" : "type-120",
-   "self_type" : "type-178",
+   "referenced_type" : "type-122",
+   "self_type" : "type-180",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11945,8 +11993,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned int> &",
    "name" : "android::hardware::hidl_vec<unsigned int> &",
-   "referenced_type" : "type-128",
-   "self_type" : "type-131",
+   "referenced_type" : "type-131",
+   "self_type" : "type-133",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11964,7 +12012,7 @@
    "linker_set_key" : "android::sp<android::Fence> &",
    "name" : "android::sp<android::Fence> &",
    "referenced_type" : "type-1357",
-   "self_type" : "type-1411",
+   "self_type" : "type-1416",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11972,8 +12020,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &",
-   "referenced_type" : "type-355",
-   "self_type" : "type-377",
+   "referenced_type" : "type-352",
+   "self_type" : "type-374",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11981,8 +12029,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &",
-   "referenced_type" : "type-484",
-   "self_type" : "type-489",
+   "referenced_type" : "type-481",
+   "self_type" : "type-487",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11990,8 +12038,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &",
-   "referenced_type" : "type-338",
-   "self_type" : "type-385",
+   "referenced_type" : "type-335",
+   "self_type" : "type-382",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11999,8 +12047,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
-   "referenced_type" : "type-86",
-   "self_type" : "type-93",
+   "referenced_type" : "type-88",
+   "self_type" : "type-95",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12008,8 +12056,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &",
-   "referenced_type" : "type-497",
-   "self_type" : "type-503",
+   "referenced_type" : "type-494",
+   "self_type" : "type-500",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12017,8 +12065,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ui::Transform &",
    "name" : "android::ui::Transform &",
-   "referenced_type" : "type-2283",
-   "self_type" : "type-2292",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2294",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -12041,78 +12089,78 @@
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-2204",
+   "referenced_type" : "type-2206",
    "self_type" : "type-2230",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-2249",
-   "self_type" : "type-2251",
+   "referenced_type" : "type-2252",
+   "self_type" : "type-2254",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-2740",
-   "self_type" : "type-2742",
+   "referenced_type" : "type-2742",
+   "self_type" : "type-2744",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
    "referenced_type" : "type-3102",
-   "self_type" : "type-3134",
+   "self_type" : "type-3137",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-3368",
-   "self_type" : "type-3370",
+   "referenced_type" : "type-3371",
+   "self_type" : "type-3373",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-2139",
+   "referenced_type" : "type-2138",
    "self_type" : "type-2149",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-2273",
-   "self_type" : "type-2275",
+   "referenced_type" : "type-2275",
+   "self_type" : "type-2277",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-2731",
-   "self_type" : "type-2733",
+   "referenced_type" : "type-2733",
+   "self_type" : "type-2735",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-3015",
-   "self_type" : "type-3025",
+   "referenced_type" : "type-3014",
+   "self_type" : "type-3024",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-3378",
-   "self_type" : "type-3380",
+   "referenced_type" : "type-3381",
+   "self_type" : "type-3383",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-961",
-   "self_type" : "type-974",
+   "referenced_type" : "type-958",
+   "self_type" : "type-972",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
@@ -12128,7 +12176,7 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ColorSpace::TransferParameters &",
    "name" : "const android::ColorSpace::TransferParameters &",
-   "referenced_type" : "type-1033",
+   "referenced_type" : "type-1030",
    "self_type" : "type-1041",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
@@ -12137,8 +12185,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot &",
    "name" : "const android::FenceTime::Snapshot &",
-   "referenced_type" : "type-1388",
-   "self_type" : "type-1394",
+   "referenced_type" : "type-1393",
+   "self_type" : "type-1398",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -12146,8 +12194,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-1406",
-   "self_type" : "type-1407",
+   "referenced_type" : "type-1410",
+   "self_type" : "type-1411",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -12164,8 +12212,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Gralloc2Mapper &",
    "name" : "const android::Gralloc2Mapper &",
-   "referenced_type" : "type-344",
-   "self_type" : "type-354",
+   "referenced_type" : "type-341",
+   "self_type" : "type-351",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -12173,8 +12221,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-1875",
-   "self_type" : "type-1874",
+   "referenced_type" : "type-1877",
+   "self_type" : "type-1876",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12182,8 +12230,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-2009",
-   "self_type" : "type-2008",
+   "referenced_type" : "type-2012",
+   "self_type" : "type-2011",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12191,8 +12239,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-2015",
-   "self_type" : "type-2014",
+   "referenced_type" : "type-2018",
+   "self_type" : "type-2017",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12200,17 +12248,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-3028",
-   "self_type" : "type-3027",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::GrallocMapper &",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-3194",
-   "self_type" : "type-3193",
+   "referenced_type" : "type-3031",
+   "self_type" : "type-3030",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12227,6 +12266,15 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
+   "referenced_type" : "type-3201",
+   "self_type" : "type-3200",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GrallocMapper &",
+   "name" : "const android::GrallocMapper &",
    "referenced_type" : "type-612",
    "self_type" : "type-611",
    "size" : 4,
@@ -12236,8 +12284,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-802",
-   "self_type" : "type-801",
+   "referenced_type" : "type-803",
+   "self_type" : "type-802",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12245,8 +12293,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-827",
-   "self_type" : "type-826",
+   "referenced_type" : "type-828",
+   "self_type" : "type-827",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12255,7 +12303,7 @@
    "linker_set_key" : "const android::GraphicBufferAllocator::alloc_rec_t &",
    "name" : "const android::GraphicBufferAllocator::alloc_rec_t &",
    "referenced_type" : "type-706",
-   "self_type" : "type-707",
+   "self_type" : "type-708",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12263,8 +12311,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBufferMapper &",
    "name" : "const android::GraphicBufferMapper &",
-   "referenced_type" : "type-614",
-   "self_type" : "type-630",
+   "referenced_type" : "type-615",
+   "self_type" : "type-631",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -12290,8 +12338,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Region &",
    "name" : "const android::Region &",
-   "referenced_type" : "type-2220",
-   "self_type" : "type-2224",
+   "referenced_type" : "type-2223",
+   "self_type" : "type-2227",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -12299,8 +12347,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-184",
-   "self_type" : "type-187",
+   "referenced_type" : "type-187",
+   "self_type" : "type-189",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -12308,8 +12356,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 &",
    "name" : "const android::String8 &",
-   "referenced_type" : "type-873",
-   "self_type" : "type-889",
+   "referenced_type" : "type-863",
+   "self_type" : "type-879",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -12317,8 +12365,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::Rect> &",
    "name" : "const android::Vector<android::Rect> &",
-   "referenced_type" : "type-2215",
-   "self_type" : "type-2216",
+   "referenced_type" : "type-2218",
+   "self_type" : "type-2219",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -12326,8 +12374,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TMat33<float> &",
    "name" : "const android::details::TMat33<float> &",
-   "referenced_type" : "type-925",
-   "self_type" : "type-934",
+   "referenced_type" : "type-919",
+   "self_type" : "type-926",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -12335,8 +12383,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TMat44<float> &",
    "name" : "const android::details::TMat44<float> &",
-   "referenced_type" : "type-2280",
-   "self_type" : "type-2281",
+   "referenced_type" : "type-2283",
+   "self_type" : "type-2284",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -12344,8 +12392,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TQuaternion<double> &",
    "name" : "const android::details::TQuaternion<double> &",
-   "referenced_type" : "type-404",
-   "self_type" : "type-405",
+   "referenced_type" : "type-401",
+   "self_type" : "type-402",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -12353,8 +12401,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TQuaternion<float> &",
    "name" : "const android::details::TQuaternion<float> &",
-   "referenced_type" : "type-432",
-   "self_type" : "type-433",
+   "referenced_type" : "type-429",
+   "self_type" : "type-430",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -12407,8 +12455,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TVec4<double> &",
    "name" : "const android::details::TVec4<double> &",
-   "referenced_type" : "type-166",
-   "self_type" : "type-177",
+   "referenced_type" : "type-164",
+   "self_type" : "type-171",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -12416,8 +12464,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TVec4<float> &",
    "name" : "const android::details::TVec4<float> &",
-   "referenced_type" : "type-325",
-   "self_type" : "type-326",
+   "referenced_type" : "type-322",
+   "self_type" : "type-323",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -12425,8 +12473,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-231",
-   "self_type" : "type-232",
+   "referenced_type" : "type-233",
+   "self_type" : "type-234",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -12488,8 +12536,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned int> &",
    "name" : "const android::hardware::hidl_vec<unsigned int> &",
-   "referenced_type" : "type-132",
-   "self_type" : "type-133",
+   "referenced_type" : "type-134",
+   "self_type" : "type-135",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12507,7 +12555,7 @@
    "linker_set_key" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> &",
    "name" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> &",
    "referenced_type" : "type-693",
-   "self_type" : "type-695",
+   "self_type" : "type-698",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12524,8 +12572,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
    "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-273",
-   "self_type" : "type-272",
+   "referenced_type" : "type-269",
+   "self_type" : "type-268",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -12533,8 +12581,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
-   "referenced_type" : "type-91",
-   "self_type" : "type-92",
+   "referenced_type" : "type-93",
+   "self_type" : "type-94",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12560,8 +12608,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ui::Transform &",
    "name" : "const android::ui::Transform &",
-   "referenced_type" : "type-2286",
-   "self_type" : "type-2288",
+   "referenced_type" : "type-2289",
+   "self_type" : "type-2290",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -12569,7 +12617,7 @@
    "alignment" : 4,
    "linker_set_key" : "const bool &",
    "name" : "const bool &",
-   "referenced_type" : "type-370",
+   "referenced_type" : "type-367",
    "self_type" : "type-1276",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -12578,7 +12626,7 @@
    "alignment" : 4,
    "linker_set_key" : "const double &",
    "name" : "const double &",
-   "referenced_type" : "type-853",
+   "referenced_type" : "type-850",
    "self_type" : "type-859",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -12587,7 +12635,7 @@
    "alignment" : 4,
    "linker_set_key" : "const float &",
    "name" : "const float &",
-   "referenced_type" : "type-563",
+   "referenced_type" : "type-560",
    "self_type" : "type-1218",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -12602,44 +12650,44 @@
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-2256",
-   "self_type" : "type-2258",
+   "referenced_type" : "type-2259",
+   "self_type" : "type-2261",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-2262",
-   "self_type" : "type-2264",
+   "referenced_type" : "type-2264",
+   "self_type" : "type-2266",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-2743",
-   "self_type" : "type-2745",
+   "referenced_type" : "type-2745",
+   "self_type" : "type-2747",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-3178",
-   "self_type" : "type-3190",
+   "referenced_type" : "type-3177",
+   "self_type" : "type-3191",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-3371",
-   "self_type" : "type-3373",
+   "referenced_type" : "type-3374",
+   "self_type" : "type-3376",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const int &",
    "name" : "const int &",
-   "referenced_type" : "type-562",
-   "self_type" : "type-837",
+   "referenced_type" : "type-559",
+   "self_type" : "type-835",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12662,169 +12710,169 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-125",
-   "self_type" : "type-127",
+   "referenced_type" : "type-128",
+   "self_type" : "type-130",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1576",
-   "self_type" : "type-1578",
+   "referenced_type" : "type-1580",
+   "self_type" : "type-1582",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1611",
-   "self_type" : "type-1613",
+   "referenced_type" : "type-1616",
+   "self_type" : "type-1618",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1767",
-   "self_type" : "type-1769",
+   "referenced_type" : "type-1768",
+   "self_type" : "type-1770",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1892",
-   "self_type" : "type-1894",
+   "referenced_type" : "type-1894",
+   "self_type" : "type-1896",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1966",
-   "self_type" : "type-1968",
+   "referenced_type" : "type-1968",
+   "self_type" : "type-1970",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2042",
-   "self_type" : "type-2044",
+   "referenced_type" : "type-2046",
+   "self_type" : "type-2048",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2094",
-   "self_type" : "type-2096",
+   "referenced_type" : "type-2096",
+   "self_type" : "type-2098",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2156",
-   "self_type" : "type-2158",
+   "referenced_type" : "type-2158",
+   "self_type" : "type-2160",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2322",
-   "self_type" : "type-2324",
+   "referenced_type" : "type-2324",
+   "self_type" : "type-2326",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2545",
-   "self_type" : "type-2547",
+   "referenced_type" : "type-2550",
+   "self_type" : "type-2552",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2580",
-   "self_type" : "type-2582",
+   "referenced_type" : "type-2586",
+   "self_type" : "type-2588",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2755",
-   "self_type" : "type-2757",
+   "referenced_type" : "type-2757",
+   "self_type" : "type-2759",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2816",
-   "self_type" : "type-2818",
+   "referenced_type" : "type-2818",
+   "self_type" : "type-2820",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2835",
-   "self_type" : "type-2837",
+   "referenced_type" : "type-2837",
+   "self_type" : "type-2839",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2902",
-   "self_type" : "type-2904",
+   "referenced_type" : "type-2905",
+   "self_type" : "type-2907",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3048",
-   "self_type" : "type-3050",
+   "referenced_type" : "type-3051",
+   "self_type" : "type-3053",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3139",
-   "self_type" : "type-3142",
+   "referenced_type" : "type-3143",
+   "self_type" : "type-3146",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3216",
-   "self_type" : "type-3218",
+   "referenced_type" : "type-3219",
+   "self_type" : "type-3221",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3258",
-   "self_type" : "type-3260",
+   "referenced_type" : "type-3261",
+   "self_type" : "type-3263",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3309",
-   "self_type" : "type-3311",
+   "referenced_type" : "type-3312",
+   "self_type" : "type-3314",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3419",
-   "self_type" : "type-3421",
+   "referenced_type" : "type-3422",
+   "self_type" : "type-3424",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-36",
-   "self_type" : "type-39",
+   "referenced_type" : "type-39",
+   "self_type" : "type-41",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-416",
-   "self_type" : "type-418",
+   "referenced_type" : "type-413",
+   "self_type" : "type-415",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12837,15 +12885,15 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-747",
+   "referenced_type" : "type-748",
    "self_type" : "type-750",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-854",
-   "self_type" : "type-856",
+   "referenced_type" : "type-856",
+   "self_type" : "type-858",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12884,8 +12932,8 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle *const &",
    "name" : "const native_handle *const &",
-   "referenced_type" : "type-696",
-   "self_type" : "type-697",
+   "referenced_type" : "type-699",
+   "self_type" : "type-700",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12893,8 +12941,8 @@
    "alignment" : 4,
    "linker_set_key" : "const short &",
    "name" : "const short &",
-   "referenced_type" : "type-825",
-   "self_type" : "type-829",
+   "referenced_type" : "type-823",
+   "self_type" : "type-826",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12903,7 +12951,7 @@
    "linker_set_key" : "const signed char &",
    "name" : "const signed char &",
    "referenced_type" : "type-799",
-   "self_type" : "type-804",
+   "self_type" : "type-801",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12920,8 +12968,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3> &",
    "name" : "const std::array<android::details::TVec2<float>, 3> &",
-   "referenced_type" : "type-2201",
-   "self_type" : "type-2203",
+   "referenced_type" : "type-2203",
+   "self_type" : "type-2205",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12929,8 +12977,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3> &",
    "name" : "const std::array<android::details::TVec2<float>, 3> &",
-   "referenced_type" : "type-2737",
-   "self_type" : "type-2739",
+   "referenced_type" : "type-2739",
+   "self_type" : "type-2741",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12938,8 +12986,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3> &",
    "name" : "const std::array<android::details::TVec2<float>, 3> &",
-   "referenced_type" : "type-3090",
-   "self_type" : "type-3098",
+   "referenced_type" : "type-3089",
+   "self_type" : "type-3095",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12947,8 +12995,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1015",
-   "self_type" : "type-1029",
+   "referenced_type" : "type-1007",
+   "self_type" : "type-1021",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12956,8 +13004,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2182",
-   "self_type" : "type-2196",
+   "referenced_type" : "type-2176",
+   "self_type" : "type-2190",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12965,8 +13013,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2734",
-   "self_type" : "type-2736",
+   "referenced_type" : "type-2736",
+   "self_type" : "type-2738",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12974,8 +13022,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-3072",
-   "self_type" : "type-3082",
+   "referenced_type" : "type-3069",
+   "self_type" : "type-3083",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12992,8 +13040,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<float (float)> &",
    "name" : "const std::function<float (float)> &",
-   "referenced_type" : "type-2266",
-   "self_type" : "type-2287",
+   "referenced_type" : "type-2267",
+   "self_type" : "type-2280",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13001,8 +13049,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<float (float)> &",
    "name" : "const std::function<float (float)> &",
-   "referenced_type" : "type-2746",
-   "self_type" : "type-2748",
+   "referenced_type" : "type-2748",
+   "self_type" : "type-2750",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13010,7 +13058,7 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<float (float)> &",
    "name" : "const std::function<float (float)> &",
-   "referenced_type" : "type-3191",
+   "referenced_type" : "type-3194",
    "self_type" : "type-3196",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -13019,8 +13067,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-1391",
-   "self_type" : "type-1401",
+   "referenced_type" : "type-1395",
+   "self_type" : "type-1405",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13028,8 +13076,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-2513",
-   "self_type" : "type-2520",
+   "referenced_type" : "type-2518",
+   "self_type" : "type-2525",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13037,8 +13085,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-2808",
-   "self_type" : "type-2810",
+   "referenced_type" : "type-2810",
+   "self_type" : "type-2812",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13046,8 +13094,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-3610",
-   "self_type" : "type-3617",
+   "referenced_type" : "type-3616",
+   "self_type" : "type-3623",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13055,8 +13103,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> > &",
    "name" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> > &",
-   "referenced_type" : "type-2142",
-   "self_type" : "type-2144",
+   "referenced_type" : "type-2144",
+   "self_type" : "type-2146",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -13064,8 +13112,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> > &",
    "name" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> > &",
-   "referenced_type" : "type-3299",
-   "self_type" : "type-3301",
+   "referenced_type" : "type-3302",
+   "self_type" : "type-3304",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -13082,8 +13130,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1031",
-   "self_type" : "type-1030",
+   "referenced_type" : "type-1032",
+   "self_type" : "type-1031",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13100,8 +13148,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1581",
-   "self_type" : "type-1580",
+   "referenced_type" : "type-1585",
+   "self_type" : "type-1584",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13109,8 +13157,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1712",
-   "self_type" : "type-1711",
+   "referenced_type" : "type-1713",
+   "self_type" : "type-1712",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13118,8 +13166,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1818",
-   "self_type" : "type-1817",
+   "referenced_type" : "type-1819",
+   "self_type" : "type-1818",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13127,8 +13175,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1887",
-   "self_type" : "type-1886",
+   "referenced_type" : "type-1889",
+   "self_type" : "type-1888",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13136,8 +13184,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1951",
-   "self_type" : "type-1950",
+   "referenced_type" : "type-1953",
+   "self_type" : "type-1952",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13145,8 +13193,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2020",
-   "self_type" : "type-2019",
+   "referenced_type" : "type-2023",
+   "self_type" : "type-2022",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13154,8 +13202,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2137",
-   "self_type" : "type-2136",
+   "referenced_type" : "type-2141",
+   "self_type" : "type-2140",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13163,8 +13211,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2198",
-   "self_type" : "type-2197",
+   "referenced_type" : "type-2201",
+   "self_type" : "type-2200",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13172,8 +13220,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2416",
-   "self_type" : "type-2415",
+   "referenced_type" : "type-2418",
+   "self_type" : "type-2417",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13181,8 +13229,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2550",
-   "self_type" : "type-2549",
+   "referenced_type" : "type-2555",
+   "self_type" : "type-2554",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13190,8 +13238,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2681",
-   "self_type" : "type-2680",
+   "referenced_type" : "type-2683",
+   "self_type" : "type-2682",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13199,8 +13247,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2794",
-   "self_type" : "type-2793",
+   "referenced_type" : "type-2796",
+   "self_type" : "type-2795",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13208,8 +13256,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2820",
-   "self_type" : "type-2819",
+   "referenced_type" : "type-2822",
+   "self_type" : "type-2821",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13217,8 +13265,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2871",
-   "self_type" : "type-2870",
+   "referenced_type" : "type-2873",
+   "self_type" : "type-2872",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13226,8 +13274,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2962",
-   "self_type" : "type-2961",
+   "referenced_type" : "type-2964",
+   "self_type" : "type-2963",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13235,8 +13283,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3043",
-   "self_type" : "type-3042",
+   "referenced_type" : "type-3046",
+   "self_type" : "type-3045",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13244,8 +13292,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3118",
-   "self_type" : "type-3117",
+   "referenced_type" : "type-3122",
+   "self_type" : "type-3121",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13253,8 +13301,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3201",
-   "self_type" : "type-3200",
+   "referenced_type" : "type-3204",
+   "self_type" : "type-3203",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13262,8 +13310,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-328",
-   "self_type" : "type-327",
+   "referenced_type" : "type-325",
+   "self_type" : "type-324",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13271,8 +13319,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3296",
-   "self_type" : "type-3295",
+   "referenced_type" : "type-3299",
+   "self_type" : "type-3298",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13280,8 +13328,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3347",
-   "self_type" : "type-3346",
+   "referenced_type" : "type-3350",
+   "self_type" : "type-3349",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13289,8 +13337,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3513",
-   "self_type" : "type-3512",
+   "referenced_type" : "type-3516",
+   "self_type" : "type-3515",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13298,8 +13346,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-45",
-   "self_type" : "type-44",
+   "referenced_type" : "type-47",
+   "self_type" : "type-46",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13307,8 +13355,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-478",
-   "self_type" : "type-477",
+   "referenced_type" : "type-475",
+   "self_type" : "type-474",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13325,8 +13373,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-726",
-   "self_type" : "type-725",
+   "referenced_type" : "type-727",
+   "self_type" : "type-726",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13334,8 +13382,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-832",
-   "self_type" : "type-831",
+   "referenced_type" : "type-833",
+   "self_type" : "type-832",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13343,8 +13391,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-959",
-   "self_type" : "type-958",
+   "referenced_type" : "type-961",
+   "self_type" : "type-960",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13352,8 +13400,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned char &",
    "name" : "const unsigned char &",
-   "referenced_type" : "type-224",
-   "self_type" : "type-821",
+   "referenced_type" : "type-226",
+   "self_type" : "type-812",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13361,8 +13409,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned int &",
    "name" : "const unsigned int &",
-   "referenced_type" : "type-236",
-   "self_type" : "type-846",
+   "referenced_type" : "type-238",
+   "self_type" : "type-842",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13370,7 +13418,7 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long &",
    "name" : "const unsigned long long &",
-   "referenced_type" : "type-226",
+   "referenced_type" : "type-228",
    "self_type" : "type-849",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -13380,7 +13428,7 @@
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
    "referenced_type" : "type-830",
-   "self_type" : "type-834",
+   "self_type" : "type-831",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13406,7 +13454,7 @@
    "alignment" : 4,
    "linker_set_key" : "int &",
    "name" : "int &",
-   "referenced_type" : "type-103",
+   "referenced_type" : "type-105",
    "self_type" : "type-1145",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
@@ -13415,7 +13463,7 @@
    "alignment" : 4,
    "linker_set_key" : "int *&",
    "name" : "int *&",
-   "referenced_type" : "type-593",
+   "referenced_type" : "type-591",
    "self_type" : "type-1347",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
@@ -13424,8 +13472,8 @@
    "alignment" : 4,
    "linker_set_key" : "long long &",
    "name" : "long long &",
-   "referenced_type" : "type-284",
-   "self_type" : "type-1409",
+   "referenced_type" : "type-12",
+   "self_type" : "type-1413",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -13433,8 +13481,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-1936",
-   "self_type" : "type-1935",
+   "referenced_type" : "type-1933",
+   "self_type" : "type-1932",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13442,8 +13490,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-2260",
-   "self_type" : "type-2259",
+   "referenced_type" : "type-2263",
+   "self_type" : "type-2262",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13451,8 +13499,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-2722",
-   "self_type" : "type-2721",
+   "referenced_type" : "type-2724",
+   "self_type" : "type-2723",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13460,8 +13508,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-2823",
-   "self_type" : "type-2822",
+   "referenced_type" : "type-2825",
+   "self_type" : "type-2824",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13469,8 +13517,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-3375",
-   "self_type" : "type-3374",
+   "referenced_type" : "type-3378",
+   "self_type" : "type-3377",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13478,8 +13526,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-703",
-   "self_type" : "type-702",
+   "referenced_type" : "type-696",
+   "self_type" : "type-695",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13487,8 +13535,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1949",
-   "self_type" : "type-1948",
+   "referenced_type" : "type-1951",
+   "self_type" : "type-1950",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -13496,8 +13544,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2229",
-   "self_type" : "type-2228",
+   "referenced_type" : "type-2232",
+   "self_type" : "type-2231",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -13505,8 +13553,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2294",
-   "self_type" : "type-2293",
+   "referenced_type" : "type-2296",
+   "self_type" : "type-2295",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -13514,8 +13562,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2299",
-   "self_type" : "type-2298",
+   "referenced_type" : "type-2301",
+   "self_type" : "type-2300",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/UiConfig.h"
   },
@@ -13523,8 +13571,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-3116",
-   "self_type" : "type-3115",
+   "referenced_type" : "type-3120",
+   "self_type" : "type-3119",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -13532,8 +13580,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-3360",
-   "self_type" : "type-3359",
+   "referenced_type" : "type-3363",
+   "self_type" : "type-3362",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -13541,8 +13589,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-3392",
-   "self_type" : "type-3391",
+   "referenced_type" : "type-3395",
+   "self_type" : "type-3394",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -13550,8 +13598,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-3397",
-   "self_type" : "type-3396",
+   "referenced_type" : "type-3400",
+   "self_type" : "type-3399",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/UiConfig.h"
   },
@@ -13568,7 +13616,7 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int &",
    "name" : "unsigned int &",
-   "referenced_type" : "type-123",
+   "referenced_type" : "type-125",
    "self_type" : "type-1250",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
@@ -13577,7 +13625,7 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned long long &",
    "name" : "unsigned long long &",
-   "referenced_type" : "type-124",
+   "referenced_type" : "type-126",
    "self_type" : "type-1146",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
@@ -13586,7 +13634,7 @@
    "alignment" : 4,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-227",
+   "referenced_type" : "type-229",
    "self_type" : "type-1249",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
@@ -13598,8 +13646,8 @@
    "alignment" : 4,
    "linker_set_key" : "AHardwareBuffer *",
    "name" : "AHardwareBuffer *",
-   "referenced_type" : "type-1880",
-   "self_type" : "type-1879",
+   "referenced_type" : "type-1882",
+   "self_type" : "type-1881",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -13607,8 +13655,8 @@
    "alignment" : 4,
    "linker_set_key" : "AHardwareBuffer *",
    "name" : "AHardwareBuffer *",
-   "referenced_type" : "type-3035",
-   "self_type" : "type-3034",
+   "referenced_type" : "type-3039",
+   "self_type" : "type-3038",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -13616,8 +13664,8 @@
    "alignment" : 4,
    "linker_set_key" : "AHardwareBuffer *",
    "name" : "AHardwareBuffer *",
-   "referenced_type" : "type-622",
-   "self_type" : "type-621",
+   "referenced_type" : "type-623",
+   "self_type" : "type-622",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -13625,7 +13673,7 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-517",
+   "referenced_type" : "type-515",
    "self_type" : "type-636",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
@@ -13652,8 +13700,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2482",
-   "self_type" : "type-2481",
+   "referenced_type" : "type-2484",
+   "self_type" : "type-2483",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13661,8 +13709,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2504",
-   "self_type" : "type-2503",
+   "referenced_type" : "type-2506",
+   "self_type" : "type-2505",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13670,8 +13718,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2802",
-   "self_type" : "type-2801",
+   "referenced_type" : "type-2804",
+   "self_type" : "type-2803",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13679,8 +13727,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2807",
-   "self_type" : "type-2806",
+   "referenced_type" : "type-2809",
+   "self_type" : "type-2808",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13688,8 +13736,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3579",
-   "self_type" : "type-3578",
+   "referenced_type" : "type-3582",
+   "self_type" : "type-3581",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13697,8 +13745,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3601",
-   "self_type" : "type-3600",
+   "referenced_type" : "type-3604",
+   "self_type" : "type-3603",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13715,8 +13763,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1414",
-   "self_type" : "type-1413",
+   "referenced_type" : "type-1418",
+   "self_type" : "type-1417",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13724,8 +13772,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2472",
-   "self_type" : "type-2471",
+   "referenced_type" : "type-2474",
+   "self_type" : "type-2473",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13733,8 +13781,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2529",
-   "self_type" : "type-2528",
+   "referenced_type" : "type-2534",
+   "self_type" : "type-2533",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13742,8 +13790,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2797",
-   "self_type" : "type-2796",
+   "referenced_type" : "type-2799",
+   "self_type" : "type-2798",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13751,8 +13799,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2812",
-   "self_type" : "type-2811",
+   "referenced_type" : "type-2814",
+   "self_type" : "type-2813",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13760,8 +13808,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3569",
-   "self_type" : "type-3568",
+   "referenced_type" : "type-3572",
+   "self_type" : "type-3571",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13769,8 +13817,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3626",
-   "self_type" : "type-3625",
+   "referenced_type" : "type-3632",
+   "self_type" : "type-3631",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13787,8 +13835,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
    "name" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
-   "referenced_type" : "type-516",
-   "self_type" : "type-537",
+   "referenced_type" : "type-514",
+   "self_type" : "type-534",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
   },
@@ -13797,7 +13845,7 @@
    "linker_set_key" : "android::ColorSpace *",
    "name" : "android::ColorSpace *",
    "referenced_type" : "type-979",
-   "self_type" : "type-1006",
+   "self_type" : "type-1000",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -13814,8 +13862,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Condition *",
    "name" : "android::Condition *",
-   "referenced_type" : "type-258",
-   "self_type" : "type-261",
+   "referenced_type" : "type-254",
+   "self_type" : "type-257",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h"
   },
@@ -13832,8 +13880,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime *",
    "name" : "android::FenceTime *",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1393",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1397",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13841,8 +13889,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot *",
    "name" : "android::FenceTime::Snapshot *",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1382",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1386",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13850,8 +13898,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTimeline *",
    "name" : "android::FenceTimeline *",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1400",
+   "referenced_type" : "type-1401",
+   "self_type" : "type-1404",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13859,8 +13907,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceToFenceTimeMap *",
    "name" : "android::FenceToFenceTimeMap *",
-   "referenced_type" : "type-1402",
-   "self_type" : "type-1405",
+   "referenced_type" : "type-1406",
+   "self_type" : "type-1409",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13877,8 +13925,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FrameStats *",
    "name" : "android::FrameStats *",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1427",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1431",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
@@ -13886,8 +13934,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Gralloc2Allocator *",
    "name" : "android::Gralloc2Allocator *",
-   "referenced_type" : "type-353",
-   "self_type" : "type-360",
+   "referenced_type" : "type-350",
+   "self_type" : "type-357",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -13895,8 +13943,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Gralloc2Mapper *",
    "name" : "android::Gralloc2Mapper *",
-   "referenced_type" : "type-337",
-   "self_type" : "type-343",
+   "referenced_type" : "type-334",
+   "self_type" : "type-340",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -13904,8 +13952,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-525",
-   "self_type" : "type-680",
+   "referenced_type" : "type-523",
+   "self_type" : "type-679",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13913,8 +13961,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferAllocator *",
    "name" : "android::GraphicBufferAllocator *",
-   "referenced_type" : "type-542",
-   "self_type" : "type-545",
+   "referenced_type" : "type-539",
+   "self_type" : "type-542",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -13922,8 +13970,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-527",
-   "self_type" : "type-539",
+   "referenced_type" : "type-525",
+   "self_type" : "type-537",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -13940,8 +13988,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1679",
-   "self_type" : "type-1678",
+   "referenced_type" : "type-1680",
+   "self_type" : "type-1679",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13949,8 +13997,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1781",
-   "self_type" : "type-1780",
+   "referenced_type" : "type-1782",
+   "self_type" : "type-1781",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13958,8 +14006,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-2648",
-   "self_type" : "type-2647",
+   "referenced_type" : "type-2650",
+   "self_type" : "type-2649",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13967,8 +14015,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-2843",
-   "self_type" : "type-2842",
+   "referenced_type" : "type-2845",
+   "self_type" : "type-2844",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13976,8 +14024,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-292",
-   "self_type" : "type-291",
+   "referenced_type" : "type-289",
+   "self_type" : "type-288",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13985,8 +14033,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-2921",
-   "self_type" : "type-2920",
+   "referenced_type" : "type-2923",
+   "self_type" : "type-2922",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13994,8 +14042,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-437",
-   "self_type" : "type-436",
+   "referenced_type" : "type-434",
+   "self_type" : "type-433",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -14003,8 +14051,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
-   "referenced_type" : "type-715",
-   "self_type" : "type-716",
+   "referenced_type" : "type-716",
+   "self_type" : "type-717",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -14013,7 +14061,7 @@
    "linker_set_key" : "android::LightFlattenablePod<android::Rect> *",
    "name" : "android::LightFlattenablePod<android::Rect> *",
    "referenced_type" : "type-1243",
-   "self_type" : "type-2233",
+   "self_type" : "type-2236",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14030,8 +14078,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex *",
    "name" : "android::Mutex *",
-   "referenced_type" : "type-252",
-   "self_type" : "type-254",
+   "referenced_type" : "type-280",
+   "self_type" : "type-1376",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -14039,8 +14087,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex::Autolock *",
    "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-255",
-   "self_type" : "type-257",
+   "referenced_type" : "type-1378",
+   "self_type" : "type-1380",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -14057,8 +14105,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock *",
    "name" : "android::RWLock *",
-   "referenced_type" : "type-262",
-   "self_type" : "type-264",
+   "referenced_type" : "type-258",
+   "self_type" : "type-260",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -14066,8 +14114,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock::AutoRLock *",
    "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-265",
-   "self_type" : "type-267",
+   "referenced_type" : "type-261",
+   "self_type" : "type-263",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -14075,8 +14123,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock::AutoWLock *",
    "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-268",
-   "self_type" : "type-269",
+   "referenced_type" : "type-264",
+   "self_type" : "type-265",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -14093,8 +14141,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase *",
    "name" : "android::RefBase *",
-   "referenced_type" : "type-172",
-   "self_type" : "type-246",
+   "referenced_type" : "type-175",
+   "self_type" : "type-248",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14102,8 +14150,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-118",
-   "self_type" : "type-117",
+   "referenced_type" : "type-120",
+   "self_type" : "type-119",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14129,8 +14177,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-14",
-   "self_type" : "type-13",
+   "referenced_type" : "type-1577",
+   "self_type" : "type-1576",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14138,8 +14186,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1573",
-   "self_type" : "type-1572",
+   "referenced_type" : "type-16",
+   "self_type" : "type-15",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14147,8 +14195,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1608",
-   "self_type" : "type-1607",
+   "referenced_type" : "type-1612",
+   "self_type" : "type-1611",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14156,8 +14204,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-175",
-   "self_type" : "type-174",
+   "referenced_type" : "type-1766",
+   "self_type" : "type-1765",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14165,8 +14213,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1765",
-   "self_type" : "type-1764",
+   "referenced_type" : "type-178",
+   "self_type" : "type-177",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14174,8 +14222,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1839",
-   "self_type" : "type-1838",
+   "referenced_type" : "type-1840",
+   "self_type" : "type-1839",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14183,8 +14231,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1964",
-   "self_type" : "type-1963",
+   "referenced_type" : "type-1966",
+   "self_type" : "type-1965",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14192,8 +14240,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2039",
-   "self_type" : "type-2038",
+   "referenced_type" : "type-2042",
+   "self_type" : "type-2041",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14201,8 +14249,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2092",
-   "self_type" : "type-2091",
+   "referenced_type" : "type-2094",
+   "self_type" : "type-2093",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14210,8 +14258,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2154",
-   "self_type" : "type-2153",
+   "referenced_type" : "type-2156",
+   "self_type" : "type-2155",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14219,8 +14267,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2308",
-   "self_type" : "type-2307",
+   "referenced_type" : "type-2310",
+   "self_type" : "type-2309",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14228,8 +14276,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2474",
-   "self_type" : "type-2473",
+   "referenced_type" : "type-2476",
+   "self_type" : "type-2475",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14237,8 +14285,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2500",
-   "self_type" : "type-2499",
+   "referenced_type" : "type-2502",
+   "self_type" : "type-2501",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14246,8 +14294,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2542",
-   "self_type" : "type-2541",
+   "referenced_type" : "type-2547",
+   "self_type" : "type-2546",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14255,8 +14303,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2577",
-   "self_type" : "type-2576",
+   "referenced_type" : "type-2582",
+   "self_type" : "type-2581",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14264,8 +14312,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2752",
-   "self_type" : "type-2751",
+   "referenced_type" : "type-2754",
+   "self_type" : "type-2753",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14273,8 +14321,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2799",
-   "self_type" : "type-2798",
+   "referenced_type" : "type-2801",
+   "self_type" : "type-2800",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14282,8 +14330,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2804",
-   "self_type" : "type-2803",
+   "referenced_type" : "type-2806",
+   "self_type" : "type-2805",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14291,8 +14339,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2814",
-   "self_type" : "type-2813",
+   "referenced_type" : "type-2816",
+   "self_type" : "type-2815",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14300,8 +14348,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2833",
-   "self_type" : "type-2832",
+   "referenced_type" : "type-2835",
+   "self_type" : "type-2834",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14309,8 +14357,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2899",
-   "self_type" : "type-2898",
+   "referenced_type" : "type-2901",
+   "self_type" : "type-2900",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14318,8 +14366,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2984",
-   "self_type" : "type-2983",
+   "referenced_type" : "type-2986",
+   "self_type" : "type-2985",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14327,8 +14375,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3136",
-   "self_type" : "type-3135",
+   "referenced_type" : "type-3140",
+   "self_type" : "type-3139",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14336,8 +14384,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3214",
-   "self_type" : "type-3213",
+   "referenced_type" : "type-3217",
+   "self_type" : "type-3216",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14345,8 +14393,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3256",
-   "self_type" : "type-3255",
+   "referenced_type" : "type-3259",
+   "self_type" : "type-3258",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14354,8 +14402,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3307",
-   "self_type" : "type-3306",
+   "referenced_type" : "type-3310",
+   "self_type" : "type-3309",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14363,8 +14411,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3405",
-   "self_type" : "type-3404",
+   "referenced_type" : "type-3408",
+   "self_type" : "type-3407",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14372,8 +14420,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3571",
-   "self_type" : "type-3570",
+   "referenced_type" : "type-3574",
+   "self_type" : "type-3573",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14381,8 +14429,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3597",
-   "self_type" : "type-3596",
+   "referenced_type" : "type-3600",
+   "self_type" : "type-3599",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14390,8 +14438,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-408",
-   "self_type" : "type-407",
+   "referenced_type" : "type-405",
+   "self_type" : "type-404",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14399,8 +14447,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-514",
-   "self_type" : "type-513",
+   "referenced_type" : "type-511",
+   "self_type" : "type-510",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14408,8 +14456,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-744",
-   "self_type" : "type-743",
+   "referenced_type" : "type-745",
+   "self_type" : "type-744",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14417,8 +14465,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-851",
-   "self_type" : "type-850",
+   "referenced_type" : "type-852",
+   "self_type" : "type-851",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14444,8 +14492,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_type *",
    "name" : "android::RefBase::weakref_type *",
-   "referenced_type" : "type-198",
-   "self_type" : "type-197",
+   "referenced_type" : "type-211",
+   "self_type" : "type-210",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -14462,8 +14510,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Region *",
    "name" : "android::Region *",
-   "referenced_type" : "type-2221",
-   "self_type" : "type-2223",
+   "referenced_type" : "type-2224",
+   "self_type" : "type-2226",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -14489,8 +14537,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 *",
    "name" : "android::String16 *",
-   "referenced_type" : "type-179",
-   "self_type" : "type-189",
+   "referenced_type" : "type-182",
+   "self_type" : "type-191",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -14498,8 +14546,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 *",
    "name" : "android::String8 *",
-   "referenced_type" : "type-285",
-   "self_type" : "type-901",
+   "referenced_type" : "type-282",
+   "self_type" : "type-891",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -14507,8 +14555,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Thread *",
    "name" : "android::Thread *",
-   "referenced_type" : "type-369",
-   "self_type" : "type-368",
+   "referenced_type" : "type-366",
+   "self_type" : "type-365",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14516,8 +14564,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<android::Rect> *",
    "name" : "android::Vector<android::Rect> *",
-   "referenced_type" : "type-2213",
-   "self_type" : "type-2214",
+   "referenced_type" : "type-2216",
+   "self_type" : "type-2217",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14525,8 +14573,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<long long> *",
    "name" : "android::Vector<long long> *",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1424",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1428",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14561,8 +14609,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TMat44<float> *",
    "name" : "android::details::TMat44<float> *",
-   "referenced_type" : "type-2276",
-   "self_type" : "type-2279",
+   "referenced_type" : "type-2278",
+   "self_type" : "type-2282",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -14571,7 +14619,7 @@
    "linker_set_key" : "android::details::TMatTransform<android::details::TMat33, float> *",
    "name" : "android::details::TMatTransform<android::details::TMat33, float> *",
    "referenced_type" : "type-910",
-   "self_type" : "type-957",
+   "self_type" : "type-949",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -14579,8 +14627,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TMatTransform<android::details::TMat44, float> *",
    "name" : "android::details::TMatTransform<android::details::TMat44, float> *",
-   "referenced_type" : "type-2270",
-   "self_type" : "type-2271",
+   "referenced_type" : "type-2272",
+   "self_type" : "type-2273",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -14588,8 +14636,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TQuaternion<double> *",
    "name" : "android::details::TQuaternion<double> *",
-   "referenced_type" : "type-331",
-   "self_type" : "type-397",
+   "referenced_type" : "type-328",
+   "self_type" : "type-391",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -14597,8 +14645,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TQuaternion<float> *",
    "name" : "android::details::TQuaternion<float> *",
-   "referenced_type" : "type-410",
-   "self_type" : "type-429",
+   "referenced_type" : "type-407",
+   "self_type" : "type-426",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -14615,7 +14663,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec2<double> *",
    "name" : "android::details::TVec2<double> *",
-   "referenced_type" : "type-55",
+   "referenced_type" : "type-57",
    "self_type" : "type-1069",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -14624,7 +14672,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec2<float> *",
    "name" : "android::details::TVec2<float> *",
-   "referenced_type" : "type-22",
+   "referenced_type" : "type-23",
    "self_type" : "type-1245",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -14633,7 +14681,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<double> *",
    "name" : "android::details::TVec3<double> *",
-   "referenced_type" : "type-66",
+   "referenced_type" : "type-68",
    "self_type" : "type-1368",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
@@ -14642,8 +14690,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<float> *",
    "name" : "android::details::TVec3<float> *",
-   "referenced_type" : "type-17",
-   "self_type" : "type-16",
+   "referenced_type" : "type-18",
+   "self_type" : "type-17",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
   },
@@ -14651,8 +14699,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<double> *",
    "name" : "android::details::TVec4<double> *",
-   "referenced_type" : "type-50",
-   "self_type" : "type-155",
+   "referenced_type" : "type-52",
+   "self_type" : "type-151",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -14660,8 +14708,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<float> *",
    "name" : "android::details::TVec4<float> *",
-   "referenced_type" : "type-200",
-   "self_type" : "type-316",
+   "referenced_type" : "type-192",
+   "self_type" : "type-311",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -14669,7 +14717,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec2, float> *",
    "name" : "android::details::TVecAddOperators<android::details::TVec2, float> *",
-   "referenced_type" : "type-28",
+   "referenced_type" : "type-29",
    "self_type" : "type-1049",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -14678,7 +14726,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec3, float> *",
    "name" : "android::details::TVecAddOperators<android::details::TVec3, float> *",
-   "referenced_type" : "type-34",
+   "referenced_type" : "type-35",
    "self_type" : "type-1053",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -14687,7 +14735,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec2, float> *",
    "name" : "android::details::TVecProductOperators<android::details::TVec2, float> *",
-   "referenced_type" : "type-27",
+   "referenced_type" : "type-28",
    "self_type" : "type-1057",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -14696,7 +14744,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec3, float> *",
    "name" : "android::details::TVecProductOperators<android::details::TVec3, float> *",
-   "referenced_type" : "type-33",
+   "referenced_type" : "type-34",
    "self_type" : "type-1058",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -14706,7 +14754,7 @@
    "linker_set_key" : "android::half *",
    "name" : "android::half *",
    "referenced_type" : "type-1",
-   "self_type" : "type-1381",
+   "self_type" : "type-1377",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -14732,8 +14780,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-242",
-   "self_type" : "type-241",
+   "referenced_type" : "type-244",
+   "self_type" : "type-243",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14750,8 +14798,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-196",
-   "self_type" : "type-195",
+   "referenced_type" : "type-209",
+   "self_type" : "type-208",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14759,8 +14807,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-215",
-   "self_type" : "type-222",
+   "referenced_type" : "type-217",
+   "self_type" : "type-224",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -14768,8 +14816,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-281",
-   "self_type" : "type-280",
+   "referenced_type" : "type-277",
+   "self_type" : "type-276",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14777,8 +14825,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
-   "referenced_type" : "type-99",
-   "self_type" : "type-106",
+   "referenced_type" : "type-101",
+   "self_type" : "type-108",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14786,8 +14834,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
-   "referenced_type" : "type-393",
-   "self_type" : "type-398",
+   "referenced_type" : "type-392",
+   "self_type" : "type-395",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14795,8 +14843,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
-   "referenced_type" : "type-111",
-   "self_type" : "type-112",
+   "referenced_type" : "type-113",
+   "self_type" : "type-114",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14813,7 +14861,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status *",
    "name" : "android::hardware::Status *",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1309",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -14840,8 +14888,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int> *",
    "name" : "android::hardware::details::hidl_pointer<unsigned int> *",
-   "referenced_type" : "type-120",
-   "self_type" : "type-169",
+   "referenced_type" : "type-122",
+   "self_type" : "type-172",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14849,7 +14897,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status *",
    "name" : "android::hardware::details::return_status *",
-   "referenced_type" : "type-101",
+   "referenced_type" : "type-103",
    "self_type" : "type-1315",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -14858,8 +14906,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1727",
-   "self_type" : "type-1726",
+   "referenced_type" : "type-1728",
+   "self_type" : "type-1727",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14867,8 +14915,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1924",
-   "self_type" : "type-1923",
+   "referenced_type" : "type-1926",
+   "self_type" : "type-1925",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14876,8 +14924,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1954",
-   "self_type" : "type-1953",
+   "referenced_type" : "type-1956",
+   "self_type" : "type-1955",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14885,8 +14933,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2024",
-   "self_type" : "type-2023",
+   "referenced_type" : "type-2027",
+   "self_type" : "type-2026",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14894,8 +14942,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2696",
-   "self_type" : "type-2695",
+   "referenced_type" : "type-2698",
+   "self_type" : "type-2697",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14903,8 +14951,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2878",
-   "self_type" : "type-2877",
+   "referenced_type" : "type-2880",
+   "self_type" : "type-2879",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14912,8 +14960,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-3084",
-   "self_type" : "type-3083",
+   "referenced_type" : "type-3088",
+   "self_type" : "type-3087",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14921,8 +14969,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-3122",
-   "self_type" : "type-3121",
+   "referenced_type" : "type-3126",
+   "self_type" : "type-3125",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14930,8 +14978,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-3204",
-   "self_type" : "type-3203",
+   "referenced_type" : "type-3207",
+   "self_type" : "type-3206",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14939,8 +14987,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-357",
-   "self_type" : "type-356",
+   "referenced_type" : "type-354",
+   "self_type" : "type-353",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14948,8 +14996,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-685",
-   "self_type" : "type-684",
+   "referenced_type" : "type-687",
+   "self_type" : "type-686",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14966,8 +15014,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-836",
-   "self_type" : "type-835",
+   "referenced_type" : "type-837",
+   "self_type" : "type-836",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14975,8 +15023,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-1821",
-   "self_type" : "type-1820",
+   "referenced_type" : "type-1822",
+   "self_type" : "type-1821",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14984,8 +15032,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-1960",
-   "self_type" : "type-1959",
+   "referenced_type" : "type-1962",
+   "self_type" : "type-1961",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14993,8 +15041,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-2031",
-   "self_type" : "type-2030",
+   "referenced_type" : "type-2034",
+   "self_type" : "type-2033",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15002,8 +15050,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-2966",
-   "self_type" : "type-2965",
+   "referenced_type" : "type-2968",
+   "self_type" : "type-2967",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15011,8 +15059,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-3129",
-   "self_type" : "type-3128",
+   "referenced_type" : "type-3133",
+   "self_type" : "type-3132",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15020,8 +15068,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-3210",
-   "self_type" : "type-3209",
+   "referenced_type" : "type-3213",
+   "self_type" : "type-3212",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15029,8 +15077,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-486",
-   "self_type" : "type-485",
+   "referenced_type" : "type-483",
+   "self_type" : "type-482",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15038,8 +15086,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-737",
-   "self_type" : "type-736",
+   "referenced_type" : "type-738",
+   "self_type" : "type-737",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15047,8 +15095,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-843",
-   "self_type" : "type-842",
+   "referenced_type" : "type-844",
+   "self_type" : "type-843",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15056,8 +15104,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1716",
-   "self_type" : "type-1715",
+   "referenced_type" : "type-1717",
+   "self_type" : "type-1716",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15065,8 +15113,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1926",
-   "self_type" : "type-1925",
+   "referenced_type" : "type-1928",
+   "self_type" : "type-1927",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15074,8 +15122,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1956",
-   "self_type" : "type-1955",
+   "referenced_type" : "type-1958",
+   "self_type" : "type-1957",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15083,8 +15131,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2027",
-   "self_type" : "type-2026",
+   "referenced_type" : "type-2029",
+   "self_type" : "type-2028",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15092,8 +15140,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2685",
-   "self_type" : "type-2684",
+   "referenced_type" : "type-2687",
+   "self_type" : "type-2686",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15101,8 +15149,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2884",
-   "self_type" : "type-2883",
+   "referenced_type" : "type-2886",
+   "self_type" : "type-2885",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15110,8 +15158,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-3087",
-   "self_type" : "type-3086",
+   "referenced_type" : "type-3092",
+   "self_type" : "type-3091",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15119,8 +15167,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-3124",
-   "self_type" : "type-3123",
+   "referenced_type" : "type-3128",
+   "self_type" : "type-3127",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15128,8 +15176,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-3206",
-   "self_type" : "type-3205",
+   "referenced_type" : "type-3209",
+   "self_type" : "type-3208",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15137,8 +15185,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-340",
-   "self_type" : "type-339",
+   "referenced_type" : "type-337",
+   "self_type" : "type-336",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15173,8 +15221,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1587",
-   "self_type" : "type-1586",
+   "referenced_type" : "type-1591",
+   "self_type" : "type-1590",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15182,8 +15230,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1928",
-   "self_type" : "type-1927",
+   "referenced_type" : "type-1930",
+   "self_type" : "type-1929",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15191,8 +15239,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1958",
-   "self_type" : "type-1957",
+   "referenced_type" : "type-1960",
+   "self_type" : "type-1959",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15200,8 +15248,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2029",
-   "self_type" : "type-2028",
+   "referenced_type" : "type-2031",
+   "self_type" : "type-2030",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15209,8 +15257,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2556",
-   "self_type" : "type-2555",
+   "referenced_type" : "type-2561",
+   "self_type" : "type-2560",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15218,8 +15266,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2828",
-   "self_type" : "type-2827",
+   "referenced_type" : "type-2830",
+   "self_type" : "type-2829",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15227,8 +15275,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-3089",
-   "self_type" : "type-3088",
+   "referenced_type" : "type-3094",
+   "self_type" : "type-3093",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15236,8 +15284,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-3127",
-   "self_type" : "type-3126",
+   "referenced_type" : "type-3131",
+   "self_type" : "type-3130",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15245,8 +15293,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-3208",
-   "self_type" : "type-3207",
+   "referenced_type" : "type-3211",
+   "self_type" : "type-3210",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15281,8 +15329,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-88",
-   "self_type" : "type-87",
+   "referenced_type" : "type-90",
+   "self_type" : "type-89",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15290,8 +15338,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
-   "referenced_type" : "type-1724",
-   "self_type" : "type-1723",
+   "referenced_type" : "type-1725",
+   "self_type" : "type-1724",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15299,8 +15347,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
-   "referenced_type" : "type-2693",
-   "self_type" : "type-2692",
+   "referenced_type" : "type-2695",
+   "self_type" : "type-2694",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15308,8 +15356,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
-   "referenced_type" : "type-2875",
-   "self_type" : "type-2874",
+   "referenced_type" : "type-2878",
+   "self_type" : "type-2877",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15317,8 +15365,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
-   "referenced_type" : "type-352",
-   "self_type" : "type-351",
+   "referenced_type" : "type-349",
+   "self_type" : "type-348",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15326,8 +15374,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-1831",
-   "self_type" : "type-1830",
+   "referenced_type" : "type-1832",
+   "self_type" : "type-1831",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15335,8 +15383,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-1962",
-   "self_type" : "type-1961",
+   "referenced_type" : "type-1964",
+   "self_type" : "type-1963",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15344,8 +15392,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-2033",
-   "self_type" : "type-2032",
+   "referenced_type" : "type-2036",
+   "self_type" : "type-2035",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15353,8 +15401,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-2976",
-   "self_type" : "type-2975",
+   "referenced_type" : "type-2978",
+   "self_type" : "type-2977",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15362,8 +15410,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-3132",
-   "self_type" : "type-3131",
+   "referenced_type" : "type-3136",
+   "self_type" : "type-3135",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15371,8 +15419,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-3212",
-   "self_type" : "type-3211",
+   "referenced_type" : "type-3215",
+   "self_type" : "type-3214",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15380,8 +15428,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-499",
-   "self_type" : "type-498",
+   "referenced_type" : "type-496",
+   "self_type" : "type-495",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15398,8 +15446,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-845",
-   "self_type" : "type-844",
+   "referenced_type" : "type-846",
+   "self_type" : "type-845",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15425,8 +15473,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_handle *",
    "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-139",
-   "self_type" : "type-138",
+   "referenced_type" : "type-142",
+   "self_type" : "type-141",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15443,8 +15491,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned int> *",
    "name" : "android::hardware::hidl_vec<unsigned int> *",
-   "referenced_type" : "type-128",
-   "self_type" : "type-129",
+   "referenced_type" : "type-131",
+   "self_type" : "type-132",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15461,8 +15509,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::base::V1_0::IBase *",
    "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-171",
-   "self_type" : "type-364",
+   "referenced_type" : "type-174",
+   "self_type" : "type-361",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15470,8 +15518,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-295",
-   "self_type" : "type-372",
+   "referenced_type" : "type-292",
+   "self_type" : "type-369",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15480,7 +15528,7 @@
    "linker_set_key" : "android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "referenced_type" : "type-694",
-   "self_type" : "type-698",
+   "self_type" : "type-701",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15497,8 +15545,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::GraphicBuffer> *",
    "name" : "android::sp<android::GraphicBuffer> *",
-   "referenced_type" : "type-679",
-   "self_type" : "type-681",
+   "referenced_type" : "type-678",
+   "self_type" : "type-682",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15506,8 +15554,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
-   "referenced_type" : "type-355",
-   "self_type" : "type-376",
+   "referenced_type" : "type-352",
+   "self_type" : "type-373",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15515,8 +15563,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
-   "referenced_type" : "type-484",
-   "self_type" : "type-488",
+   "referenced_type" : "type-481",
+   "self_type" : "type-486",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15524,8 +15572,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
-   "referenced_type" : "type-338",
-   "self_type" : "type-384",
+   "referenced_type" : "type-335",
+   "self_type" : "type-381",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15533,8 +15581,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
-   "referenced_type" : "type-86",
-   "self_type" : "type-90",
+   "referenced_type" : "type-88",
+   "self_type" : "type-92",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15542,8 +15590,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
-   "referenced_type" : "type-497",
-   "self_type" : "type-502",
+   "referenced_type" : "type-494",
+   "self_type" : "type-499",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15551,8 +15599,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "referenced_type" : "type-371",
-   "self_type" : "type-373",
+   "referenced_type" : "type-368",
+   "self_type" : "type-370",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15569,8 +15617,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ui::Transform *",
    "name" : "android::ui::Transform *",
-   "referenced_type" : "type-2283",
-   "self_type" : "type-2285",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2288",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -15578,8 +15626,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ui::Transform::mat33 *",
    "name" : "android::ui::Transform::mat33 *",
-   "referenced_type" : "type-2284",
-   "self_type" : "type-2297",
+   "referenced_type" : "type-2287",
+   "self_type" : "type-2299",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -15596,8 +15644,8 @@
    "alignment" : 4,
    "linker_set_key" : "android_native_base_t *",
    "name" : "android_native_base_t *",
-   "referenced_type" : "type-518",
-   "self_type" : "type-522",
+   "referenced_type" : "type-516",
+   "self_type" : "type-520",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -15605,8 +15653,8 @@
    "alignment" : 4,
    "linker_set_key" : "android_ycbcr *",
    "name" : "android_ycbcr *",
-   "referenced_type" : "type-348",
-   "self_type" : "type-347",
+   "referenced_type" : "type-345",
+   "self_type" : "type-344",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15614,8 +15662,8 @@
    "alignment" : 4,
    "linker_set_key" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
    "name" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
-   "referenced_type" : "type-271",
-   "self_type" : "type-274",
+   "referenced_type" : "type-267",
+   "self_type" : "type-270",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -15624,7 +15672,7 @@
    "linker_set_key" : "bool *",
    "name" : "bool *",
    "referenced_type" : "type-6",
-   "self_type" : "type-350",
+   "self_type" : "type-347",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15632,8 +15680,8 @@
    "alignment" : 4,
    "linker_set_key" : "char *",
    "name" : "char *",
-   "referenced_type" : "type-288",
-   "self_type" : "type-576",
+   "referenced_type" : "type-285",
+   "self_type" : "type-573",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -15641,8 +15689,8 @@
    "alignment" : 4,
    "linker_set_key" : "const AHardwareBuffer *",
    "name" : "const AHardwareBuffer *",
-   "referenced_type" : "type-1882",
-   "self_type" : "type-1884",
+   "referenced_type" : "type-1884",
+   "self_type" : "type-1886",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -15650,8 +15698,8 @@
    "alignment" : 4,
    "linker_set_key" : "const AHardwareBuffer *",
    "name" : "const AHardwareBuffer *",
-   "referenced_type" : "type-3038",
-   "self_type" : "type-3040",
+   "referenced_type" : "type-3041",
+   "self_type" : "type-3043",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -15668,7 +15716,7 @@
    "alignment" : 4,
    "linker_set_key" : "const ANativeWindowBuffer *",
    "name" : "const ANativeWindowBuffer *",
-   "referenced_type" : "type-637",
+   "referenced_type" : "type-638",
    "self_type" : "type-639",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
@@ -15677,8 +15725,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
    "name" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
-   "referenced_type" : "type-535",
-   "self_type" : "type-536",
+   "referenced_type" : "type-532",
+   "self_type" : "type-533",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
   },
@@ -15713,8 +15761,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime *",
    "name" : "const android::FenceTime *",
-   "referenced_type" : "type-1395",
-   "self_type" : "type-1396",
+   "referenced_type" : "type-1399",
+   "self_type" : "type-1400",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -15722,8 +15770,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot *",
    "name" : "const android::FenceTime::Snapshot *",
-   "referenced_type" : "type-1388",
-   "self_type" : "type-1389",
+   "referenced_type" : "type-1393",
+   "self_type" : "type-1394",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -15740,8 +15788,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FrameStats *",
    "name" : "const android::FrameStats *",
-   "referenced_type" : "type-1428",
-   "self_type" : "type-1429",
+   "referenced_type" : "type-1432",
+   "self_type" : "type-1433",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
@@ -15749,8 +15797,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Gralloc2Allocator *",
    "name" : "const android::Gralloc2Allocator *",
-   "referenced_type" : "type-361",
-   "self_type" : "type-362",
+   "referenced_type" : "type-358",
+   "self_type" : "type-359",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15758,8 +15806,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Gralloc2Mapper *",
    "name" : "const android::Gralloc2Mapper *",
-   "referenced_type" : "type-344",
-   "self_type" : "type-345",
+   "referenced_type" : "type-341",
+   "self_type" : "type-342",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15767,8 +15815,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-624",
-   "self_type" : "type-623",
+   "referenced_type" : "type-625",
+   "self_type" : "type-624",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -15776,8 +15824,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBufferAllocator *",
    "name" : "const android::GraphicBufferAllocator *",
-   "referenced_type" : "type-720",
-   "self_type" : "type-721",
+   "referenced_type" : "type-721",
+   "self_type" : "type-722",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -15785,8 +15833,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBufferMapper *",
    "name" : "const android::GraphicBufferMapper *",
-   "referenced_type" : "type-614",
-   "self_type" : "type-615",
+   "referenced_type" : "type-615",
+   "self_type" : "type-616",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -15794,8 +15842,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::HdrCapabilities *",
    "name" : "const android::HdrCapabilities *",
-   "referenced_type" : "type-972",
-   "self_type" : "type-973",
+   "referenced_type" : "type-973",
+   "self_type" : "type-974",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -15803,8 +15851,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
-   "referenced_type" : "type-717",
-   "self_type" : "type-718",
+   "referenced_type" : "type-718",
+   "self_type" : "type-719",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -15812,8 +15860,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect> *",
    "name" : "const android::LightFlattenablePod<android::Rect> *",
-   "referenced_type" : "type-2231",
-   "self_type" : "type-2232",
+   "referenced_type" : "type-2234",
+   "self_type" : "type-2235",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15866,8 +15914,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Region *",
    "name" : "const android::Region *",
-   "referenced_type" : "type-2220",
-   "self_type" : "type-2226",
+   "referenced_type" : "type-2223",
+   "self_type" : "type-2229",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -15884,8 +15932,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 *",
    "name" : "const android::String16 *",
-   "referenced_type" : "type-184",
-   "self_type" : "type-186",
+   "referenced_type" : "type-187",
+   "self_type" : "type-188",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -15893,8 +15941,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 *",
    "name" : "const android::String8 *",
-   "referenced_type" : "type-873",
-   "self_type" : "type-878",
+   "referenced_type" : "type-863",
+   "self_type" : "type-874",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -15902,8 +15950,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::Rect> *",
    "name" : "const android::Vector<android::Rect> *",
-   "referenced_type" : "type-2215",
-   "self_type" : "type-2219",
+   "referenced_type" : "type-2218",
+   "self_type" : "type-2222",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -15911,8 +15959,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<long long> *",
    "name" : "const android::Vector<long long> *",
-   "referenced_type" : "type-1425",
-   "self_type" : "type-1426",
+   "referenced_type" : "type-1429",
+   "self_type" : "type-1430",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -15920,8 +15968,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::VectorImpl *",
    "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-1422",
-   "self_type" : "type-1423",
+   "referenced_type" : "type-1426",
+   "self_type" : "type-1427",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -15938,7 +15986,7 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TMat33<float> *",
    "name" : "const android::details::TMat33<float> *",
-   "referenced_type" : "type-925",
+   "referenced_type" : "type-919",
    "self_type" : "type-976",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
@@ -15966,7 +16014,7 @@
    "linker_set_key" : "const android::details::TVec3<float> *",
    "name" : "const android::details::TVec3<float> *",
    "referenced_type" : "type-1055",
-   "self_type" : "type-1418",
+   "self_type" : "type-1419",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
   },
@@ -15974,8 +16022,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::half *",
    "name" : "const android::half *",
-   "referenced_type" : "type-42",
-   "self_type" : "type-130",
+   "referenced_type" : "type-44",
+   "self_type" : "type-127",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -16001,8 +16049,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::BpHwRefBase *",
    "name" : "const android::hardware::BpHwRefBase *",
-   "referenced_type" : "type-211",
-   "self_type" : "type-212",
+   "referenced_type" : "type-213",
+   "self_type" : "type-214",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -16010,8 +16058,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
-   "referenced_type" : "type-109",
-   "self_type" : "type-110",
+   "referenced_type" : "type-111",
+   "self_type" : "type-112",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16019,8 +16067,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
-   "referenced_type" : "type-401",
-   "self_type" : "type-402",
+   "referenced_type" : "type-398",
+   "self_type" : "type-400",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16028,8 +16076,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
-   "referenced_type" : "type-115",
-   "self_type" : "type-116",
+   "referenced_type" : "type-117",
+   "self_type" : "type-118",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16055,8 +16103,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle> *",
-   "referenced_type" : "type-293",
-   "self_type" : "type-297",
+   "referenced_type" : "type-290",
+   "self_type" : "type-294",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16064,8 +16112,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned int> *",
    "name" : "const android::hardware::details::hidl_pointer<unsigned int> *",
-   "referenced_type" : "type-190",
-   "self_type" : "type-214",
+   "referenced_type" : "type-203",
+   "self_type" : "type-216",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16082,8 +16130,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1744",
-   "self_type" : "type-1746",
+   "referenced_type" : "type-1745",
+   "self_type" : "type-1747",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16091,8 +16139,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2713",
-   "self_type" : "type-2715",
+   "referenced_type" : "type-2715",
+   "self_type" : "type-2717",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16100,8 +16148,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2879",
-   "self_type" : "type-2882",
+   "referenced_type" : "type-2882",
+   "self_type" : "type-2884",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16109,8 +16157,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-381",
-   "self_type" : "type-383",
+   "referenced_type" : "type-378",
+   "self_type" : "type-380",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16118,8 +16166,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-1827",
-   "self_type" : "type-1829",
+   "referenced_type" : "type-1828",
+   "self_type" : "type-1830",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16127,8 +16175,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-2972",
-   "self_type" : "type-2974",
+   "referenced_type" : "type-2974",
+   "self_type" : "type-2976",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16136,8 +16184,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-494",
-   "self_type" : "type-496",
+   "referenced_type" : "type-491",
+   "self_type" : "type-493",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16145,8 +16193,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::BufferUsage *",
    "name" : "const android::hardware::graphics::common::V1_0::BufferUsage *",
-   "referenced_type" : "type-153",
-   "self_type" : "type-152",
+   "referenced_type" : "type-156",
+   "self_type" : "type-155",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16154,8 +16202,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::BufferUsage *",
    "name" : "const android::hardware::graphics::common::V1_1::BufferUsage *",
-   "referenced_type" : "type-160",
-   "self_type" : "type-159",
+   "referenced_type" : "type-162",
+   "self_type" : "type-161",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16163,8 +16211,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::BufferUsage *",
    "name" : "const android::hardware::graphics::common::V1_2::BufferUsage *",
-   "referenced_type" : "type-422",
-   "self_type" : "type-421",
+   "referenced_type" : "type-419",
+   "self_type" : "type-418",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16172,8 +16220,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1584",
-   "self_type" : "type-1583",
+   "referenced_type" : "type-1588",
+   "self_type" : "type-1587",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16181,8 +16229,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2553",
-   "self_type" : "type-2552",
+   "referenced_type" : "type-2558",
+   "self_type" : "type-2557",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16190,8 +16238,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2825",
-   "self_type" : "type-2824",
+   "referenced_type" : "type-2827",
+   "self_type" : "type-2826",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16199,8 +16247,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-84",
-   "self_type" : "type-83",
+   "referenced_type" : "type-86",
+   "self_type" : "type-85",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16208,8 +16256,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1594",
-   "self_type" : "type-1596",
+   "referenced_type" : "type-1598",
+   "self_type" : "type-1600",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16217,8 +16265,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2563",
-   "self_type" : "type-2565",
+   "referenced_type" : "type-2568",
+   "self_type" : "type-2570",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16226,8 +16274,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2829",
-   "self_type" : "type-2831",
+   "referenced_type" : "type-2831",
+   "self_type" : "type-2833",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16235,8 +16283,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-96",
-   "self_type" : "type-98",
+   "referenced_type" : "type-98",
+   "self_type" : "type-100",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16244,8 +16292,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-1753",
-   "self_type" : "type-1752",
+   "referenced_type" : "type-1754",
+   "self_type" : "type-1753",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16253,8 +16301,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-2887",
-   "self_type" : "type-2886",
+   "referenced_type" : "type-2889",
+   "self_type" : "type-2888",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16262,8 +16310,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-391",
-   "self_type" : "type-390",
+   "referenced_type" : "type-388",
+   "self_type" : "type-387",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16280,8 +16328,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void> *",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void> *",
-   "referenced_type" : "type-154",
-   "self_type" : "type-156",
+   "referenced_type" : "type-157",
+   "self_type" : "type-158",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16289,8 +16337,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void> *",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void> *",
-   "referenced_type" : "type-161",
-   "self_type" : "type-162",
+   "referenced_type" : "type-163",
+   "self_type" : "type-165",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16298,8 +16346,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void> *",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void> *",
-   "referenced_type" : "type-423",
-   "self_type" : "type-424",
+   "referenced_type" : "type-420",
+   "self_type" : "type-421",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16316,8 +16364,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_handle> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_handle> *",
-   "referenced_type" : "type-146",
-   "self_type" : "type-147",
+   "referenced_type" : "type-149",
+   "self_type" : "type-150",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16325,8 +16373,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned int> *",
    "name" : "const android::hardware::hidl_vec<unsigned int> *",
-   "referenced_type" : "type-132",
-   "self_type" : "type-134",
+   "referenced_type" : "type-134",
+   "self_type" : "type-136",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16343,8 +16391,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
    "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-170",
-   "self_type" : "type-176",
+   "referenced_type" : "type-173",
+   "self_type" : "type-179",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
@@ -16352,8 +16400,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-294",
-   "self_type" : "type-296",
+   "referenced_type" : "type-291",
+   "self_type" : "type-293",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
@@ -16362,7 +16410,7 @@
    "linker_set_key" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "referenced_type" : "type-693",
-   "self_type" : "type-699",
+   "self_type" : "type-702",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16379,8 +16427,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
    "name" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
-   "referenced_type" : "type-379",
-   "self_type" : "type-380",
+   "referenced_type" : "type-376",
+   "self_type" : "type-377",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16388,8 +16436,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
    "name" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
-   "referenced_type" : "type-492",
-   "self_type" : "type-493",
+   "referenced_type" : "type-489",
+   "self_type" : "type-490",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16397,8 +16445,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
-   "referenced_type" : "type-387",
-   "self_type" : "type-388",
+   "referenced_type" : "type-384",
+   "self_type" : "type-385",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16406,8 +16454,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
-   "referenced_type" : "type-91",
-   "self_type" : "type-95",
+   "referenced_type" : "type-93",
+   "self_type" : "type-97",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16415,8 +16463,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
    "name" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
-   "referenced_type" : "type-505",
-   "self_type" : "type-506",
+   "referenced_type" : "type-502",
+   "self_type" : "type-503",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16433,8 +16481,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::base::V1_0::IBase> *",
    "name" : "const android::sp<android::hidl::base::V1_0::IBase> *",
-   "referenced_type" : "type-365",
-   "self_type" : "type-366",
+   "referenced_type" : "type-362",
+   "self_type" : "type-363",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16442,8 +16490,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "referenced_type" : "type-374",
-   "self_type" : "type-375",
+   "referenced_type" : "type-371",
+   "self_type" : "type-372",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16460,8 +16508,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ui::Transform *",
    "name" : "const android::ui::Transform *",
-   "referenced_type" : "type-2286",
-   "self_type" : "type-2291",
+   "referenced_type" : "type-2289",
+   "self_type" : "type-2293",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -16469,8 +16517,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ui::Transform::mat33 *",
    "name" : "const android::ui::Transform::mat33 *",
-   "referenced_type" : "type-2295",
-   "self_type" : "type-2296",
+   "referenced_type" : "type-2297",
+   "self_type" : "type-2298",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -16478,8 +16526,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-287",
-   "self_type" : "type-286",
+   "referenced_type" : "type-284",
+   "self_type" : "type-283",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -16487,8 +16535,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-181",
-   "self_type" : "type-180",
+   "referenced_type" : "type-184",
+   "self_type" : "type-183",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -16496,8 +16544,8 @@
    "alignment" : 4,
    "linker_set_key" : "const gralloc_module_t *",
    "name" : "const gralloc_module_t *",
-   "referenced_type" : "type-582",
-   "self_type" : "type-581",
+   "referenced_type" : "type-580",
+   "self_type" : "type-579",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -16505,8 +16553,8 @@
    "alignment" : 4,
    "linker_set_key" : "const hw_module_t *",
    "name" : "const hw_module_t *",
-   "referenced_type" : "type-555",
-   "self_type" : "type-554",
+   "referenced_type" : "type-552",
+   "self_type" : "type-551",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -16514,7 +16562,7 @@
    "alignment" : 4,
    "linker_set_key" : "const int *",
    "name" : "const int *",
-   "referenced_type" : "type-562",
+   "referenced_type" : "type-559",
    "self_type" : "type-1348",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
@@ -16533,7 +16581,7 @@
    "linker_set_key" : "const long long *",
    "name" : "const long long *",
    "referenced_type" : "type-847",
-   "self_type" : "type-1415",
+   "self_type" : "type-1420",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16541,8 +16589,8 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle *",
    "name" : "const native_handle *",
-   "referenced_type" : "type-143",
-   "self_type" : "type-142",
+   "referenced_type" : "type-146",
+   "self_type" : "type-145",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16550,8 +16598,8 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle **",
    "name" : "const native_handle **",
-   "referenced_type" : "type-142",
-   "self_type" : "type-346",
+   "referenced_type" : "type-145",
+   "self_type" : "type-343",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -16559,8 +16607,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned char *",
    "name" : "const unsigned char *",
-   "referenced_type" : "type-224",
-   "self_type" : "type-223",
+   "referenced_type" : "type-226",
+   "self_type" : "type-225",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16568,7 +16616,7 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned int *",
    "name" : "const unsigned int *",
-   "referenced_type" : "type-236",
+   "referenced_type" : "type-238",
    "self_type" : "type-1104",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -16577,8 +16625,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long *",
    "name" : "const unsigned long long *",
-   "referenced_type" : "type-226",
-   "self_type" : "type-225",
+   "referenced_type" : "type-228",
+   "self_type" : "type-227",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16595,8 +16643,8 @@
    "alignment" : 4,
    "linker_set_key" : "framebuffer_device_t *",
    "name" : "framebuffer_device_t *",
-   "referenced_type" : "type-546",
-   "self_type" : "type-567",
+   "referenced_type" : "type-543",
+   "self_type" : "type-564",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16604,8 +16652,8 @@
    "alignment" : 4,
    "linker_set_key" : "hw_device_t *",
    "name" : "hw_device_t *",
-   "referenced_type" : "type-547",
-   "self_type" : "type-557",
+   "referenced_type" : "type-544",
+   "self_type" : "type-554",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -16613,8 +16661,8 @@
    "alignment" : 4,
    "linker_set_key" : "hw_device_t **",
    "name" : "hw_device_t **",
-   "referenced_type" : "type-557",
-   "self_type" : "type-556",
+   "referenced_type" : "type-554",
+   "self_type" : "type-553",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -16622,8 +16670,8 @@
    "alignment" : 4,
    "linker_set_key" : "hw_module_methods_t *",
    "name" : "hw_module_methods_t *",
-   "referenced_type" : "type-551",
-   "self_type" : "type-550",
+   "referenced_type" : "type-548",
+   "self_type" : "type-547",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -16631,8 +16679,8 @@
    "alignment" : 4,
    "linker_set_key" : "hw_module_t *",
    "name" : "hw_module_t *",
-   "referenced_type" : "type-549",
-   "self_type" : "type-548",
+   "referenced_type" : "type-546",
+   "self_type" : "type-545",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -16658,8 +16706,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *)",
    "name" : "int (*)(const gralloc_module_t *, const native_handle *)",
-   "referenced_type" : "type-580",
-   "self_type" : "type-579",
+   "referenced_type" : "type-578",
+   "self_type" : "type-577",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -16667,42 +16715,6 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int *)",
    "name" : "int (*)(const gralloc_module_t *, const native_handle *, int *)",
-   "referenced_type" : "type-592",
-   "self_type" : "type-591",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "referenced_type" : "type-588",
-   "self_type" : "type-587",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "referenced_type" : "type-595",
-   "self_type" : "type-594",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "referenced_type" : "type-584",
-   "self_type" : "type-583",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
    "referenced_type" : "type-590",
    "self_type" : "type-589",
    "size" : 4,
@@ -16710,8 +16722,8 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, int, ...)",
-   "name" : "int (*)(const gralloc_module_t *, int, ...)",
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
    "referenced_type" : "type-586",
    "self_type" : "type-585",
    "size" : 4,
@@ -16719,10 +16731,64 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
+   "referenced_type" : "type-593",
+   "self_type" : "type-592",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
+   "referenced_type" : "type-582",
+   "self_type" : "type-581",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
+   "referenced_type" : "type-588",
+   "self_type" : "type-587",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "referenced_type" : "type-595",
+   "self_type" : "type-594",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "referenced_type" : "type-597",
+   "self_type" : "type-596",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, int, ...)",
+   "name" : "int (*)(const gralloc_module_t *, int, ...)",
+   "referenced_type" : "type-584",
+   "self_type" : "type-583",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "int (*)(const hw_module_t *, const char *, hw_device_t **)",
    "name" : "int (*)(const hw_module_t *, const char *, hw_device_t **)",
-   "referenced_type" : "type-553",
-   "self_type" : "type-552",
+   "referenced_type" : "type-550",
+   "self_type" : "type-549",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -16730,8 +16796,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(framebuffer_device_t *)",
    "name" : "int (*)(framebuffer_device_t *)",
-   "referenced_type" : "type-573",
-   "self_type" : "type-572",
+   "referenced_type" : "type-570",
+   "self_type" : "type-569",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16739,8 +16805,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(framebuffer_device_t *, const native_handle *)",
    "name" : "int (*)(framebuffer_device_t *, const native_handle *)",
-   "referenced_type" : "type-571",
-   "self_type" : "type-570",
+   "referenced_type" : "type-568",
+   "self_type" : "type-567",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16748,8 +16814,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(framebuffer_device_t *, int)",
    "name" : "int (*)(framebuffer_device_t *, int)",
-   "referenced_type" : "type-566",
-   "self_type" : "type-565",
+   "referenced_type" : "type-563",
+   "self_type" : "type-562",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16757,8 +16823,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(framebuffer_device_t *, int, int, int, int)",
    "name" : "int (*)(framebuffer_device_t *, int, int, int, int)",
-   "referenced_type" : "type-569",
-   "self_type" : "type-568",
+   "referenced_type" : "type-566",
+   "self_type" : "type-565",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16766,8 +16832,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(hw_device_t *)",
    "name" : "int (*)(hw_device_t *)",
-   "referenced_type" : "type-561",
-   "self_type" : "type-560",
+   "referenced_type" : "type-558",
+   "self_type" : "type-557",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -16775,8 +16841,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
-   "referenced_type" : "type-249",
-   "self_type" : "type-250",
+   "referenced_type" : "type-251",
+   "self_type" : "type-252",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
@@ -16784,8 +16850,8 @@
    "alignment" : 4,
    "linker_set_key" : "int *",
    "name" : "int *",
-   "referenced_type" : "type-103",
-   "self_type" : "type-593",
+   "referenced_type" : "type-105",
+   "self_type" : "type-591",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
@@ -16802,8 +16868,8 @@
    "alignment" : 4,
    "linker_set_key" : "long long *",
    "name" : "long long *",
-   "referenced_type" : "type-284",
-   "self_type" : "type-1432",
+   "referenced_type" : "type-12",
+   "self_type" : "type-11",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16811,7 +16877,7 @@
    "alignment" : 4,
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
-   "referenced_type" : "type-144",
+   "referenced_type" : "type-147",
    "self_type" : "type-1132",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
@@ -16820,8 +16886,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned char *",
    "name" : "unsigned char *",
-   "referenced_type" : "type-218",
-   "self_type" : "type-217",
+   "referenced_type" : "type-220",
+   "self_type" : "type-219",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -16829,8 +16895,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
-   "referenced_type" : "type-123",
-   "self_type" : "type-122",
+   "referenced_type" : "type-125",
+   "self_type" : "type-124",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16838,8 +16904,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned long long *",
    "name" : "unsigned long long *",
-   "referenced_type" : "type-124",
-   "self_type" : "type-219",
+   "referenced_type" : "type-126",
+   "self_type" : "type-221",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16856,8 +16922,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
    "name" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
-   "referenced_type" : "type-221",
-   "self_type" : "type-220",
+   "referenced_type" : "type-223",
+   "self_type" : "type-222",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16865,8 +16931,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(android_native_base_t *)",
    "name" : "void (*)(android_native_base_t *)",
-   "referenced_type" : "type-521",
-   "self_type" : "type-520",
+   "referenced_type" : "type-519",
+   "self_type" : "type-518",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -16874,8 +16940,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(framebuffer_device_t *, char *, int)",
    "name" : "void (*)(framebuffer_device_t *, char *, int)",
-   "referenced_type" : "type-575",
-   "self_type" : "type-574",
+   "referenced_type" : "type-572",
+   "self_type" : "type-571",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16883,8 +16949,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *",
    "name" : "void *",
-   "referenced_type" : "type-151",
-   "self_type" : "type-227",
+   "referenced_type" : "type-154",
+   "self_type" : "type-229",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -16892,8 +16958,8 @@
    "alignment" : 4,
    "linker_set_key" : "void **",
    "name" : "void **",
-   "referenced_type" : "type-227",
-   "self_type" : "type-251",
+   "referenced_type" : "type-229",
+   "self_type" : "type-253",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   }
@@ -16905,8 +16971,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-117",
-   "self_type" : "type-119",
+   "referenced_type" : "type-119",
+   "self_type" : "type-121",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16935,8 +17001,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-13",
-   "self_type" : "type-15",
+   "referenced_type" : "type-1576",
+   "self_type" : "type-1579",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16945,8 +17011,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1572",
-   "self_type" : "type-1574",
+   "referenced_type" : "type-15",
+   "self_type" : "type-37",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16955,8 +17021,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1607",
-   "self_type" : "type-1609",
+   "referenced_type" : "type-1611",
+   "self_type" : "type-1613",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16965,8 +17031,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-174",
-   "self_type" : "type-173",
+   "referenced_type" : "type-1765",
+   "self_type" : "type-1767",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16975,8 +17041,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1764",
-   "self_type" : "type-1766",
+   "referenced_type" : "type-177",
+   "self_type" : "type-176",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16985,8 +17051,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1838",
-   "self_type" : "type-1840",
+   "referenced_type" : "type-1839",
+   "self_type" : "type-1841",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16995,8 +17061,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1963",
-   "self_type" : "type-1965",
+   "referenced_type" : "type-1965",
+   "self_type" : "type-1967",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17005,8 +17071,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2038",
-   "self_type" : "type-2040",
+   "referenced_type" : "type-2041",
+   "self_type" : "type-2043",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17015,8 +17081,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2091",
-   "self_type" : "type-2093",
+   "referenced_type" : "type-2093",
+   "self_type" : "type-2095",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17025,8 +17091,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2153",
-   "self_type" : "type-2155",
+   "referenced_type" : "type-2155",
+   "self_type" : "type-2157",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17035,8 +17101,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2307",
-   "self_type" : "type-2306",
+   "referenced_type" : "type-2309",
+   "self_type" : "type-2308",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17045,8 +17111,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2473",
-   "self_type" : "type-2475",
+   "referenced_type" : "type-2475",
+   "self_type" : "type-2477",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17055,8 +17121,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2499",
-   "self_type" : "type-2501",
+   "referenced_type" : "type-2501",
+   "self_type" : "type-2503",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17065,8 +17131,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2541",
-   "self_type" : "type-2543",
+   "referenced_type" : "type-2546",
+   "self_type" : "type-2549",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17075,8 +17141,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2576",
-   "self_type" : "type-2578",
+   "referenced_type" : "type-2581",
+   "self_type" : "type-2583",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17085,8 +17151,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2751",
-   "self_type" : "type-2753",
+   "referenced_type" : "type-2753",
+   "self_type" : "type-2755",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17095,8 +17161,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2798",
-   "self_type" : "type-2800",
+   "referenced_type" : "type-2800",
+   "self_type" : "type-2802",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17105,8 +17171,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2803",
-   "self_type" : "type-2805",
+   "referenced_type" : "type-2805",
+   "self_type" : "type-2807",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17115,8 +17181,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2813",
-   "self_type" : "type-2815",
+   "referenced_type" : "type-2815",
+   "self_type" : "type-2817",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17125,8 +17191,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2832",
-   "self_type" : "type-2834",
+   "referenced_type" : "type-2834",
+   "self_type" : "type-2836",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17135,8 +17201,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2898",
-   "self_type" : "type-2900",
+   "referenced_type" : "type-2900",
+   "self_type" : "type-2902",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17145,8 +17211,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2983",
-   "self_type" : "type-2985",
+   "referenced_type" : "type-2985",
+   "self_type" : "type-2987",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17155,8 +17221,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3135",
-   "self_type" : "type-3137",
+   "referenced_type" : "type-3139",
+   "self_type" : "type-3141",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17165,8 +17231,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3213",
-   "self_type" : "type-3215",
+   "referenced_type" : "type-3216",
+   "self_type" : "type-3218",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17175,8 +17241,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3255",
-   "self_type" : "type-3257",
+   "referenced_type" : "type-3258",
+   "self_type" : "type-3260",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17185,8 +17251,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3306",
-   "self_type" : "type-3308",
+   "referenced_type" : "type-3309",
+   "self_type" : "type-3311",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17195,8 +17261,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3404",
-   "self_type" : "type-3403",
+   "referenced_type" : "type-3407",
+   "self_type" : "type-3406",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17205,8 +17271,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3570",
-   "self_type" : "type-3572",
+   "referenced_type" : "type-3573",
+   "self_type" : "type-3575",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17215,8 +17281,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3596",
-   "self_type" : "type-3598",
+   "referenced_type" : "type-3599",
+   "self_type" : "type-3601",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17225,8 +17291,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-407",
-   "self_type" : "type-409",
+   "referenced_type" : "type-404",
+   "self_type" : "type-406",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17235,8 +17301,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-513",
-   "self_type" : "type-515",
+   "referenced_type" : "type-510",
+   "self_type" : "type-512",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17245,8 +17311,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-743",
-   "self_type" : "type-745",
+   "referenced_type" : "type-744",
+   "self_type" : "type-746",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17255,8 +17321,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-850",
-   "self_type" : "type-852",
+   "referenced_type" : "type-851",
+   "self_type" : "type-853",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17285,8 +17351,8 @@
    "is_const" : true,
    "linker_set_key" : "android::hardware::IBinder *const",
    "name" : "android::hardware::IBinder *const",
-   "referenced_type" : "type-195",
-   "self_type" : "type-194",
+   "referenced_type" : "type-208",
+   "self_type" : "type-207",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -17302,24 +17368,24 @@
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-2205",
-   "self_type" : "type-2204",
+   "referenced_type" : "type-2207",
+   "self_type" : "type-2206",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-2250",
-   "self_type" : "type-2249",
+   "referenced_type" : "type-2253",
+   "self_type" : "type-2252",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-2741",
-   "self_type" : "type-2740",
+   "referenced_type" : "type-2743",
+   "self_type" : "type-2742",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
@@ -17334,24 +17400,24 @@
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-3369",
-   "self_type" : "type-3368",
+   "referenced_type" : "type-3372",
+   "self_type" : "type-3371",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const AHardwareBuffer",
    "name" : "const AHardwareBuffer",
-   "referenced_type" : "type-1883",
-   "self_type" : "type-1882",
+   "referenced_type" : "type-1885",
+   "self_type" : "type-1884",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const AHardwareBuffer",
    "name" : "const AHardwareBuffer",
-   "referenced_type" : "type-3039",
-   "self_type" : "type-3038",
+   "referenced_type" : "type-3042",
+   "self_type" : "type-3041",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -17367,8 +17433,8 @@
    "is_const" : true,
    "linker_set_key" : "const ANativeWindowBuffer",
    "name" : "const ANativeWindowBuffer",
-   "referenced_type" : "type-517",
-   "self_type" : "type-637",
+   "referenced_type" : "type-515",
+   "self_type" : "type-638",
    "size" : 96,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -17376,48 +17442,48 @@
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-2140",
-   "self_type" : "type-2139",
+   "referenced_type" : "type-2139",
+   "self_type" : "type-2138",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-2274",
-   "self_type" : "type-2273",
+   "referenced_type" : "type-2276",
+   "self_type" : "type-2275",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-2732",
-   "self_type" : "type-2731",
+   "referenced_type" : "type-2734",
+   "self_type" : "type-2733",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-3016",
-   "self_type" : "type-3015",
+   "referenced_type" : "type-3015",
+   "self_type" : "type-3014",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-3379",
-   "self_type" : "type-3378",
+   "referenced_type" : "type-3382",
+   "self_type" : "type-3381",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-962",
-   "self_type" : "type-961",
+   "referenced_type" : "type-959",
+   "self_type" : "type-958",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
@@ -17425,8 +17491,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
    "name" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
-   "referenced_type" : "type-516",
-   "self_type" : "type-535",
+   "referenced_type" : "type-514",
+   "self_type" : "type-532",
    "size" : 104,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
   },
@@ -17446,7 +17512,7 @@
    "linker_set_key" : "const android::ColorSpace::TransferParameters",
    "name" : "const android::ColorSpace::TransferParameters",
    "referenced_type" : "type-981",
-   "self_type" : "type-1033",
+   "self_type" : "type-1030",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -17475,8 +17541,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime",
    "name" : "const android::FenceTime",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1395",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1399",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -17485,8 +17551,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot",
    "name" : "const android::FenceTime::Snapshot",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1388",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1393",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -17495,8 +17561,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot::State",
    "name" : "const android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1406",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1410",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17505,8 +17571,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::State",
    "name" : "const android::FenceTime::State",
-   "referenced_type" : "type-1378",
-   "self_type" : "type-1377",
+   "referenced_type" : "type-1383",
+   "self_type" : "type-1382",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -17525,8 +17591,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FrameStats",
    "name" : "const android::FrameStats",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1428",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1432",
    "size" : 72,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
@@ -17535,8 +17601,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Gralloc2Allocator",
    "name" : "const android::Gralloc2Allocator",
-   "referenced_type" : "type-353",
-   "self_type" : "type-361",
+   "referenced_type" : "type-350",
+   "self_type" : "type-358",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -17545,8 +17611,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Gralloc2Mapper",
    "name" : "const android::Gralloc2Mapper",
-   "referenced_type" : "type-337",
-   "self_type" : "type-344",
+   "referenced_type" : "type-334",
+   "self_type" : "type-341",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -17555,8 +17621,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-1876",
-   "self_type" : "type-1875",
+   "referenced_type" : "type-1878",
+   "self_type" : "type-1877",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -17565,8 +17631,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-2010",
-   "self_type" : "type-2009",
+   "referenced_type" : "type-2013",
+   "self_type" : "type-2012",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -17575,8 +17641,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-2016",
-   "self_type" : "type-2015",
+   "referenced_type" : "type-2019",
+   "self_type" : "type-2018",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -17585,18 +17651,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-3029",
-   "self_type" : "type-3028",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::GrallocMapper",
-   "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-3195",
-   "self_type" : "type-3194",
+   "referenced_type" : "type-3032",
+   "self_type" : "type-3031",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -17615,6 +17671,16 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
+   "referenced_type" : "type-3202",
+   "self_type" : "type-3201",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GrallocMapper",
+   "name" : "const android::GrallocMapper",
    "referenced_type" : "type-613",
    "self_type" : "type-612",
    "size" : 4,
@@ -17625,8 +17691,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-803",
-   "self_type" : "type-802",
+   "referenced_type" : "type-804",
+   "self_type" : "type-803",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -17635,8 +17701,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-828",
-   "self_type" : "type-827",
+   "referenced_type" : "type-829",
+   "self_type" : "type-828",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -17645,8 +17711,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-525",
-   "self_type" : "type-624",
+   "referenced_type" : "type-523",
+   "self_type" : "type-625",
    "size" : 160,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -17655,8 +17721,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferAllocator",
    "name" : "const android::GraphicBufferAllocator",
-   "referenced_type" : "type-542",
-   "self_type" : "type-720",
+   "referenced_type" : "type-539",
+   "self_type" : "type-721",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -17665,7 +17731,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferAllocator::alloc_rec_t",
    "name" : "const android::GraphicBufferAllocator::alloc_rec_t",
-   "referenced_type" : "type-676",
+   "referenced_type" : "type-680",
    "self_type" : "type-706",
    "size" : 48,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -17675,8 +17741,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferMapper",
    "name" : "const android::GraphicBufferMapper",
-   "referenced_type" : "type-527",
-   "self_type" : "type-614",
+   "referenced_type" : "type-525",
+   "self_type" : "type-615",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -17686,7 +17752,7 @@
    "linker_set_key" : "const android::HdrCapabilities",
    "name" : "const android::HdrCapabilities",
    "referenced_type" : "type-964",
-   "self_type" : "type-972",
+   "self_type" : "type-973",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -17695,8 +17761,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-715",
-   "self_type" : "type-717",
+   "referenced_type" : "type-716",
+   "self_type" : "type-718",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -17706,7 +17772,7 @@
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect>",
    "name" : "const android::LightFlattenablePod<android::Rect>",
    "referenced_type" : "type-1243",
-   "self_type" : "type-2231",
+   "self_type" : "type-2234",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17755,7 +17821,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
-   "referenced_type" : "type-172",
+   "referenced_type" : "type-175",
    "self_type" : "type-1078",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
@@ -17765,8 +17831,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Region",
    "name" : "const android::Region",
-   "referenced_type" : "type-2221",
-   "self_type" : "type-2220",
+   "referenced_type" : "type-2224",
+   "self_type" : "type-2223",
    "size" : 20,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -17785,8 +17851,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-179",
-   "self_type" : "type-184",
+   "referenced_type" : "type-182",
+   "self_type" : "type-187",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -17795,8 +17861,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
-   "referenced_type" : "type-285",
-   "self_type" : "type-873",
+   "referenced_type" : "type-282",
+   "self_type" : "type-863",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -17805,8 +17871,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<android::Rect>",
    "name" : "const android::Vector<android::Rect>",
-   "referenced_type" : "type-2213",
-   "self_type" : "type-2215",
+   "referenced_type" : "type-2216",
+   "self_type" : "type-2218",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17815,8 +17881,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<long long>",
    "name" : "const android::Vector<long long>",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1425",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1429",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17825,8 +17891,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
-   "referenced_type" : "type-235",
-   "self_type" : "type-1422",
+   "referenced_type" : "type-237",
+   "self_type" : "type-1426",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -17846,7 +17912,7 @@
    "linker_set_key" : "const android::details::TMat33<float>",
    "name" : "const android::details::TMat33<float>",
    "referenced_type" : "type-903",
-   "self_type" : "type-925",
+   "self_type" : "type-919",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -17855,8 +17921,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TMat44<float>",
    "name" : "const android::details::TMat44<float>",
-   "referenced_type" : "type-2276",
-   "self_type" : "type-2280",
+   "referenced_type" : "type-2278",
+   "self_type" : "type-2283",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -17865,8 +17931,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TQuaternion<double>",
    "name" : "const android::details::TQuaternion<double>",
-   "referenced_type" : "type-331",
-   "self_type" : "type-404",
+   "referenced_type" : "type-328",
+   "self_type" : "type-401",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -17875,8 +17941,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TQuaternion<float>",
    "name" : "const android::details::TQuaternion<float>",
-   "referenced_type" : "type-410",
-   "self_type" : "type-432",
+   "referenced_type" : "type-407",
+   "self_type" : "type-429",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -17895,7 +17961,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec2<double>",
    "name" : "const android::details::TVec2<double>",
-   "referenced_type" : "type-55",
+   "referenced_type" : "type-57",
    "self_type" : "type-1070",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -17905,7 +17971,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec2<float>",
    "name" : "const android::details::TVec2<float>",
-   "referenced_type" : "type-22",
+   "referenced_type" : "type-23",
    "self_type" : "type-1051",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -17915,7 +17981,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec3<double>",
    "name" : "const android::details::TVec3<double>",
-   "referenced_type" : "type-66",
+   "referenced_type" : "type-68",
    "self_type" : "type-1369",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
@@ -17925,7 +17991,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec3<float>",
    "name" : "const android::details::TVec3<float>",
-   "referenced_type" : "type-17",
+   "referenced_type" : "type-18",
    "self_type" : "type-1055",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -17935,8 +18001,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec4<double>",
    "name" : "const android::details::TVec4<double>",
-   "referenced_type" : "type-50",
-   "self_type" : "type-166",
+   "referenced_type" : "type-52",
+   "self_type" : "type-164",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -17945,8 +18011,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec4<float>",
    "name" : "const android::details::TVec4<float>",
-   "referenced_type" : "type-200",
-   "self_type" : "type-325",
+   "referenced_type" : "type-192",
+   "self_type" : "type-322",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -17956,7 +18022,7 @@
    "linker_set_key" : "const android::half",
    "name" : "const android::half",
    "referenced_type" : "type-1",
-   "self_type" : "type-42",
+   "self_type" : "type-44",
    "size" : 2,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -17985,8 +18051,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::BpHwRefBase",
    "name" : "const android::hardware::BpHwRefBase",
-   "referenced_type" : "type-193",
-   "self_type" : "type-211",
+   "referenced_type" : "type-206",
+   "self_type" : "type-213",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -17995,8 +18061,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-215",
-   "self_type" : "type-231",
+   "referenced_type" : "type-217",
+   "self_type" : "type-233",
    "size" : 68,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -18005,8 +18071,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
-   "referenced_type" : "type-99",
-   "self_type" : "type-109",
+   "referenced_type" : "type-101",
+   "self_type" : "type-111",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -18015,8 +18081,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
-   "referenced_type" : "type-393",
-   "self_type" : "type-401",
+   "referenced_type" : "type-392",
+   "self_type" : "type-398",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -18025,8 +18091,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
-   "referenced_type" : "type-111",
-   "self_type" : "type-115",
+   "referenced_type" : "type-113",
+   "self_type" : "type-117",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -18035,7 +18101,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Status",
    "name" : "const android::hardware::Status",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1310",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -18055,8 +18121,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
-   "referenced_type" : "type-136",
-   "self_type" : "type-293",
+   "referenced_type" : "type-139",
+   "self_type" : "type-290",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18065,8 +18131,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned int>",
    "name" : "const android::hardware::details::hidl_pointer<unsigned int>",
-   "referenced_type" : "type-120",
-   "self_type" : "type-190",
+   "referenced_type" : "type-122",
+   "self_type" : "type-203",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18075,7 +18141,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::return_status",
    "name" : "const android::hardware::details::return_status",
-   "referenced_type" : "type-101",
+   "referenced_type" : "type-103",
    "self_type" : "type-1319",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -18085,8 +18151,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
-   "referenced_type" : "type-1745",
-   "self_type" : "type-1744",
+   "referenced_type" : "type-1746",
+   "self_type" : "type-1745",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18095,8 +18161,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
-   "referenced_type" : "type-2714",
-   "self_type" : "type-2713",
+   "referenced_type" : "type-2716",
+   "self_type" : "type-2715",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18105,8 +18171,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
-   "referenced_type" : "type-2880",
-   "self_type" : "type-2879",
+   "referenced_type" : "type-2883",
+   "self_type" : "type-2882",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18115,8 +18181,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
-   "referenced_type" : "type-382",
-   "self_type" : "type-381",
+   "referenced_type" : "type-379",
+   "self_type" : "type-378",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18125,8 +18191,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
-   "referenced_type" : "type-1828",
-   "self_type" : "type-1827",
+   "referenced_type" : "type-1829",
+   "self_type" : "type-1828",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18135,8 +18201,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
-   "referenced_type" : "type-2973",
-   "self_type" : "type-2972",
+   "referenced_type" : "type-2975",
+   "self_type" : "type-2974",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18145,8 +18211,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
-   "referenced_type" : "type-495",
-   "self_type" : "type-494",
+   "referenced_type" : "type-492",
+   "self_type" : "type-491",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18155,8 +18221,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_0::BufferUsage",
-   "referenced_type" : "type-150",
-   "self_type" : "type-153",
+   "referenced_type" : "type-153",
+   "self_type" : "type-156",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18225,8 +18291,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_1::BufferUsage",
-   "referenced_type" : "type-158",
-   "self_type" : "type-160",
+   "referenced_type" : "type-160",
+   "self_type" : "type-162",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -18275,8 +18341,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_2::BufferUsage",
-   "referenced_type" : "type-420",
-   "self_type" : "type-422",
+   "referenced_type" : "type-417",
+   "self_type" : "type-419",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -18325,8 +18391,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper",
-   "referenced_type" : "type-1585",
-   "self_type" : "type-1584",
+   "referenced_type" : "type-1589",
+   "self_type" : "type-1588",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18335,8 +18401,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper",
-   "referenced_type" : "type-2554",
-   "self_type" : "type-2553",
+   "referenced_type" : "type-2559",
+   "self_type" : "type-2558",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18345,8 +18411,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper",
-   "referenced_type" : "type-2826",
-   "self_type" : "type-2825",
+   "referenced_type" : "type-2828",
+   "self_type" : "type-2827",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18355,8 +18421,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper",
-   "referenced_type" : "type-85",
-   "self_type" : "type-84",
+   "referenced_type" : "type-87",
+   "self_type" : "type-86",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18365,8 +18431,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper",
-   "referenced_type" : "type-1595",
-   "self_type" : "type-1594",
+   "referenced_type" : "type-1599",
+   "self_type" : "type-1598",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18375,8 +18441,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper",
-   "referenced_type" : "type-2564",
-   "self_type" : "type-2563",
+   "referenced_type" : "type-2569",
+   "self_type" : "type-2568",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18385,8 +18451,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper",
-   "referenced_type" : "type-2830",
-   "self_type" : "type-2829",
+   "referenced_type" : "type-2832",
+   "self_type" : "type-2831",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18395,8 +18461,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper",
-   "referenced_type" : "type-97",
-   "self_type" : "type-96",
+   "referenced_type" : "type-99",
+   "self_type" : "type-98",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18405,8 +18471,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper",
-   "referenced_type" : "type-1754",
-   "self_type" : "type-1753",
+   "referenced_type" : "type-1755",
+   "self_type" : "type-1754",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18415,8 +18481,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper",
-   "referenced_type" : "type-2888",
-   "self_type" : "type-2887",
+   "referenced_type" : "type-2890",
+   "self_type" : "type-2889",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18425,8 +18491,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper",
-   "referenced_type" : "type-392",
-   "self_type" : "type-391",
+   "referenced_type" : "type-389",
+   "self_type" : "type-388",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18445,8 +18511,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
-   "referenced_type" : "type-149",
-   "self_type" : "type-154",
+   "referenced_type" : "type-152",
+   "self_type" : "type-157",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18455,8 +18521,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
-   "referenced_type" : "type-157",
-   "self_type" : "type-161",
+   "referenced_type" : "type-159",
+   "self_type" : "type-163",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18465,8 +18531,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
-   "referenced_type" : "type-419",
-   "self_type" : "type-423",
+   "referenced_type" : "type-416",
+   "self_type" : "type-420",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18475,7 +18541,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-139",
+   "referenced_type" : "type-142",
    "self_type" : "type-1121",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -18505,8 +18571,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_handle>",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_handle>",
-   "referenced_type" : "type-135",
-   "self_type" : "type-146",
+   "referenced_type" : "type-138",
+   "self_type" : "type-149",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18515,8 +18581,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned int>",
    "name" : "const android::hardware::hidl_vec<unsigned int>",
-   "referenced_type" : "type-128",
-   "self_type" : "type-132",
+   "referenced_type" : "type-131",
+   "self_type" : "type-134",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18535,8 +18601,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "const android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-164",
-   "self_type" : "type-165",
+   "referenced_type" : "type-167",
+   "self_type" : "type-168",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -18545,8 +18611,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase",
    "name" : "const android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-171",
-   "self_type" : "type-170",
+   "referenced_type" : "type-174",
+   "self_type" : "type-173",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
@@ -18555,8 +18621,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-295",
-   "self_type" : "type-294",
+   "referenced_type" : "type-292",
+   "self_type" : "type-291",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
@@ -18585,8 +18651,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::IBinder>",
    "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-248",
-   "self_type" : "type-273",
+   "referenced_type" : "type-250",
+   "self_type" : "type-269",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -18595,8 +18661,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::ProcessState>",
    "name" : "const android::sp<android::hardware::ProcessState>",
-   "referenced_type" : "type-279",
-   "self_type" : "type-278",
+   "referenced_type" : "type-275",
+   "self_type" : "type-274",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -18605,8 +18671,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
    "name" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
-   "referenced_type" : "type-355",
-   "self_type" : "type-379",
+   "referenced_type" : "type-352",
+   "self_type" : "type-376",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18615,8 +18681,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
    "name" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
-   "referenced_type" : "type-484",
-   "self_type" : "type-492",
+   "referenced_type" : "type-481",
+   "self_type" : "type-489",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18625,8 +18691,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
-   "referenced_type" : "type-338",
-   "self_type" : "type-387",
+   "referenced_type" : "type-335",
+   "self_type" : "type-384",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18635,8 +18701,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
-   "referenced_type" : "type-86",
-   "self_type" : "type-91",
+   "referenced_type" : "type-88",
+   "self_type" : "type-93",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18645,8 +18711,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
    "name" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
-   "referenced_type" : "type-497",
-   "self_type" : "type-505",
+   "referenced_type" : "type-494",
+   "self_type" : "type-502",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18665,8 +18731,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::base::V1_0::IBase>",
    "name" : "const android::sp<android::hidl::base::V1_0::IBase>",
-   "referenced_type" : "type-363",
-   "self_type" : "type-365",
+   "referenced_type" : "type-360",
+   "self_type" : "type-362",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18675,8 +18741,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification>",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification>",
-   "referenced_type" : "type-371",
-   "self_type" : "type-374",
+   "referenced_type" : "type-368",
+   "self_type" : "type-371",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18695,8 +18761,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ui::Transform",
    "name" : "const android::ui::Transform",
-   "referenced_type" : "type-2283",
-   "self_type" : "type-2286",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2289",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -18705,8 +18771,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ui::Transform::mat33",
    "name" : "const android::ui::Transform::mat33",
-   "referenced_type" : "type-2284",
-   "self_type" : "type-2295",
+   "referenced_type" : "type-2287",
+   "self_type" : "type-2297",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -18716,7 +18782,7 @@
    "linker_set_key" : "const bool",
    "name" : "const bool",
    "referenced_type" : "type-6",
-   "self_type" : "type-370",
+   "self_type" : "type-367",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -18725,8 +18791,8 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-288",
-   "self_type" : "type-287",
+   "referenced_type" : "type-285",
+   "self_type" : "type-284",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -18735,8 +18801,8 @@
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-182",
-   "self_type" : "type-181",
+   "referenced_type" : "type-185",
+   "self_type" : "type-184",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -18745,8 +18811,8 @@
    "is_const" : true,
    "linker_set_key" : "const double",
    "name" : "const double",
-   "referenced_type" : "type-41",
-   "self_type" : "type-853",
+   "referenced_type" : "type-43",
+   "self_type" : "type-850",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18756,7 +18822,7 @@
    "linker_set_key" : "const float",
    "name" : "const float",
    "referenced_type" : "type-10",
-   "self_type" : "type-563",
+   "self_type" : "type-560",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
   },
@@ -18772,40 +18838,40 @@
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-2257",
-   "self_type" : "type-2256",
+   "referenced_type" : "type-2260",
+   "self_type" : "type-2259",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-2263",
-   "self_type" : "type-2262",
+   "referenced_type" : "type-2265",
+   "self_type" : "type-2264",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-2744",
-   "self_type" : "type-2743",
+   "referenced_type" : "type-2746",
+   "self_type" : "type-2745",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-3179",
-   "self_type" : "type-3178",
+   "referenced_type" : "type-3178",
+   "self_type" : "type-3177",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-3372",
-   "self_type" : "type-3371",
+   "referenced_type" : "type-3375",
+   "self_type" : "type-3374",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
@@ -18813,8 +18879,8 @@
    "is_const" : true,
    "linker_set_key" : "const gralloc_module_t",
    "name" : "const gralloc_module_t",
-   "referenced_type" : "type-578",
-   "self_type" : "type-582",
+   "referenced_type" : "type-576",
+   "self_type" : "type-580",
    "size" : 176,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -18823,8 +18889,8 @@
    "is_const" : true,
    "linker_set_key" : "const hw_module_t",
    "name" : "const hw_module_t",
-   "referenced_type" : "type-549",
-   "self_type" : "type-555",
+   "referenced_type" : "type-546",
+   "self_type" : "type-552",
    "size" : 128,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -18833,8 +18899,8 @@
    "is_const" : true,
    "linker_set_key" : "const int",
    "name" : "const int",
-   "referenced_type" : "type-103",
-   "self_type" : "type-562",
+   "referenced_type" : "type-105",
+   "self_type" : "type-559",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -18850,192 +18916,192 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-126",
-   "self_type" : "type-125",
+   "referenced_type" : "type-129",
+   "self_type" : "type-128",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1577",
-   "self_type" : "type-1576",
+   "referenced_type" : "type-1581",
+   "self_type" : "type-1580",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1612",
-   "self_type" : "type-1611",
+   "referenced_type" : "type-1617",
+   "self_type" : "type-1616",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1768",
-   "self_type" : "type-1767",
+   "referenced_type" : "type-1769",
+   "self_type" : "type-1768",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1893",
-   "self_type" : "type-1892",
+   "referenced_type" : "type-1895",
+   "self_type" : "type-1894",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1967",
-   "self_type" : "type-1966",
+   "referenced_type" : "type-1969",
+   "self_type" : "type-1968",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2043",
-   "self_type" : "type-2042",
+   "referenced_type" : "type-2047",
+   "self_type" : "type-2046",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2095",
-   "self_type" : "type-2094",
+   "referenced_type" : "type-2097",
+   "self_type" : "type-2096",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2157",
-   "self_type" : "type-2156",
+   "referenced_type" : "type-2159",
+   "self_type" : "type-2158",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2323",
-   "self_type" : "type-2322",
+   "referenced_type" : "type-2325",
+   "self_type" : "type-2324",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2546",
-   "self_type" : "type-2545",
+   "referenced_type" : "type-2551",
+   "self_type" : "type-2550",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2581",
-   "self_type" : "type-2580",
+   "referenced_type" : "type-2587",
+   "self_type" : "type-2586",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2756",
-   "self_type" : "type-2755",
+   "referenced_type" : "type-2758",
+   "self_type" : "type-2757",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2817",
-   "self_type" : "type-2816",
+   "referenced_type" : "type-2819",
+   "self_type" : "type-2818",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2836",
-   "self_type" : "type-2835",
+   "referenced_type" : "type-2838",
+   "self_type" : "type-2837",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2903",
-   "self_type" : "type-2902",
+   "referenced_type" : "type-2906",
+   "self_type" : "type-2905",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3049",
-   "self_type" : "type-3048",
+   "referenced_type" : "type-3052",
+   "self_type" : "type-3051",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3140",
-   "self_type" : "type-3139",
+   "referenced_type" : "type-3144",
+   "self_type" : "type-3143",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3217",
-   "self_type" : "type-3216",
+   "referenced_type" : "type-3220",
+   "self_type" : "type-3219",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3259",
-   "self_type" : "type-3258",
+   "referenced_type" : "type-3262",
+   "self_type" : "type-3261",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3310",
-   "self_type" : "type-3309",
+   "referenced_type" : "type-3313",
+   "self_type" : "type-3312",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3420",
-   "self_type" : "type-3419",
+   "referenced_type" : "type-3423",
+   "self_type" : "type-3422",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-37",
-   "self_type" : "type-36",
+   "referenced_type" : "type-40",
+   "self_type" : "type-39",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-417",
-   "self_type" : "type-416",
+   "referenced_type" : "type-414",
+   "self_type" : "type-413",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -19050,16 +19116,16 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-748",
-   "self_type" : "type-747",
+   "referenced_type" : "type-749",
+   "self_type" : "type-748",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-855",
-   "self_type" : "type-854",
+   "referenced_type" : "type-857",
+   "self_type" : "type-856",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -19093,7 +19159,7 @@
    "is_const" : true,
    "linker_set_key" : "const long long",
    "name" : "const long long",
-   "referenced_type" : "type-284",
+   "referenced_type" : "type-12",
    "self_type" : "type-847",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -19103,8 +19169,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle",
    "name" : "const native_handle",
-   "referenced_type" : "type-144",
-   "self_type" : "type-143",
+   "referenced_type" : "type-147",
+   "self_type" : "type-146",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19113,8 +19179,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle *const",
    "name" : "const native_handle *const",
-   "referenced_type" : "type-142",
-   "self_type" : "type-696",
+   "referenced_type" : "type-145",
+   "self_type" : "type-699",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19124,7 +19190,7 @@
    "linker_set_key" : "const short",
    "name" : "const short",
    "referenced_type" : "type-599",
-   "self_type" : "type-825",
+   "self_type" : "type-823",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19153,8 +19219,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3>",
    "name" : "const std::array<android::details::TVec2<float>, 3>",
-   "referenced_type" : "type-2202",
-   "self_type" : "type-2201",
+   "referenced_type" : "type-2204",
+   "self_type" : "type-2203",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -19163,8 +19229,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3>",
    "name" : "const std::array<android::details::TVec2<float>, 3>",
-   "referenced_type" : "type-2738",
-   "self_type" : "type-2737",
+   "referenced_type" : "type-2740",
+   "self_type" : "type-2739",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -19173,8 +19239,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3>",
    "name" : "const std::array<android::details::TVec2<float>, 3>",
-   "referenced_type" : "type-3091",
-   "self_type" : "type-3090",
+   "referenced_type" : "type-3090",
+   "self_type" : "type-3089",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -19193,8 +19259,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1687",
-   "self_type" : "type-1686",
+   "referenced_type" : "type-1688",
+   "self_type" : "type-1687",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19203,8 +19269,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1786",
-   "self_type" : "type-1785",
+   "referenced_type" : "type-1787",
+   "self_type" : "type-1786",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19213,8 +19279,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1900",
-   "self_type" : "type-1899",
+   "referenced_type" : "type-1902",
+   "self_type" : "type-1901",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19223,8 +19289,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1974",
-   "self_type" : "type-1973",
+   "referenced_type" : "type-1978",
+   "self_type" : "type-1977",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19233,8 +19299,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2054",
-   "self_type" : "type-2053",
+   "referenced_type" : "type-2057",
+   "self_type" : "type-2056",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19243,8 +19309,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2100",
-   "self_type" : "type-2099",
+   "referenced_type" : "type-2103",
+   "self_type" : "type-2102",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19253,8 +19319,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2162",
-   "self_type" : "type-2161",
+   "referenced_type" : "type-2164",
+   "self_type" : "type-2163",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19263,8 +19329,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2361",
-   "self_type" : "type-2360",
+   "referenced_type" : "type-2363",
+   "self_type" : "type-2362",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19273,8 +19339,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2656",
-   "self_type" : "type-2655",
+   "referenced_type" : "type-2658",
+   "self_type" : "type-2657",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19283,8 +19349,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2762",
-   "self_type" : "type-2761",
+   "referenced_type" : "type-2764",
+   "self_type" : "type-2763",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19293,8 +19359,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2849",
-   "self_type" : "type-2848",
+   "referenced_type" : "type-2851",
+   "self_type" : "type-2850",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19303,8 +19369,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2925",
-   "self_type" : "type-2924",
+   "referenced_type" : "type-2928",
+   "self_type" : "type-2927",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19313,8 +19379,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-302",
-   "self_type" : "type-301",
+   "referenced_type" : "type-299",
+   "self_type" : "type-298",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19323,8 +19389,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-3056",
-   "self_type" : "type-3055",
+   "referenced_type" : "type-3060",
+   "self_type" : "type-3059",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19333,8 +19399,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-3154",
-   "self_type" : "type-3153",
+   "referenced_type" : "type-3158",
+   "self_type" : "type-3157",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19343,8 +19409,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-3224",
-   "self_type" : "type-3223",
+   "referenced_type" : "type-3227",
+   "self_type" : "type-3226",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19353,8 +19419,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-3264",
-   "self_type" : "type-3263",
+   "referenced_type" : "type-3267",
+   "self_type" : "type-3266",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19363,8 +19429,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-3315",
-   "self_type" : "type-3314",
+   "referenced_type" : "type-3318",
+   "self_type" : "type-3317",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19373,8 +19439,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-3458",
-   "self_type" : "type-3457",
+   "referenced_type" : "type-3461",
+   "self_type" : "type-3460",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19383,8 +19449,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-442",
-   "self_type" : "type-441",
+   "referenced_type" : "type-439",
+   "self_type" : "type-438",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19403,8 +19469,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-762",
-   "self_type" : "type-761",
+   "referenced_type" : "type-764",
+   "self_type" : "type-763",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19413,8 +19479,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-866",
-   "self_type" : "type-865",
+   "referenced_type" : "type-867",
+   "self_type" : "type-866",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19423,8 +19489,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-922",
-   "self_type" : "type-921",
+   "referenced_type" : "type-923",
+   "self_type" : "type-922",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19443,8 +19509,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1001",
-   "self_type" : "type-1000",
+   "referenced_type" : "type-1002",
+   "self_type" : "type-1001",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19463,8 +19529,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1693",
-   "self_type" : "type-1692",
+   "referenced_type" : "type-1694",
+   "self_type" : "type-1693",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19473,8 +19539,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1792",
-   "self_type" : "type-1791",
+   "referenced_type" : "type-1793",
+   "self_type" : "type-1792",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19483,8 +19549,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1906",
-   "self_type" : "type-1905",
+   "referenced_type" : "type-1908",
+   "self_type" : "type-1907",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19493,8 +19559,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1982",
-   "self_type" : "type-1981",
+   "referenced_type" : "type-1984",
+   "self_type" : "type-1983",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19503,8 +19569,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2060",
-   "self_type" : "type-2059",
+   "referenced_type" : "type-2063",
+   "self_type" : "type-2062",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19513,8 +19579,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2107",
-   "self_type" : "type-2106",
+   "referenced_type" : "type-2110",
+   "self_type" : "type-2109",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19523,8 +19589,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2168",
-   "self_type" : "type-2167",
+   "referenced_type" : "type-2171",
+   "self_type" : "type-2170",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19533,8 +19599,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2367",
-   "self_type" : "type-2366",
+   "referenced_type" : "type-2369",
+   "self_type" : "type-2368",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19543,8 +19609,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2662",
-   "self_type" : "type-2661",
+   "referenced_type" : "type-2664",
+   "self_type" : "type-2663",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19553,8 +19619,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2768",
-   "self_type" : "type-2767",
+   "referenced_type" : "type-2770",
+   "self_type" : "type-2769",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19563,8 +19629,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2855",
-   "self_type" : "type-2854",
+   "referenced_type" : "type-2857",
+   "self_type" : "type-2856",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19573,8 +19639,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2932",
-   "self_type" : "type-2931",
+   "referenced_type" : "type-2934",
+   "self_type" : "type-2933",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19583,8 +19649,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-3062",
-   "self_type" : "type-3061",
+   "referenced_type" : "type-3066",
+   "self_type" : "type-3065",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19593,8 +19659,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-308",
-   "self_type" : "type-307",
+   "referenced_type" : "type-306",
+   "self_type" : "type-305",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19603,8 +19669,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-3161",
-   "self_type" : "type-3160",
+   "referenced_type" : "type-3165",
+   "self_type" : "type-3164",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19613,8 +19679,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-3230",
-   "self_type" : "type-3229",
+   "referenced_type" : "type-3233",
+   "self_type" : "type-3232",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19623,8 +19689,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-3270",
-   "self_type" : "type-3269",
+   "referenced_type" : "type-3273",
+   "self_type" : "type-3272",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19633,8 +19699,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-3321",
-   "self_type" : "type-3320",
+   "referenced_type" : "type-3324",
+   "self_type" : "type-3323",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19643,8 +19709,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-3464",
-   "self_type" : "type-3463",
+   "referenced_type" : "type-3467",
+   "self_type" : "type-3466",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19653,8 +19719,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-448",
-   "self_type" : "type-447",
+   "referenced_type" : "type-445",
+   "self_type" : "type-444",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19663,8 +19729,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-658",
-   "self_type" : "type-657",
+   "referenced_type" : "type-659",
+   "self_type" : "type-658",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19683,8 +19749,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-872",
-   "self_type" : "type-871",
+   "referenced_type" : "type-873",
+   "self_type" : "type-872",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19693,8 +19759,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-929",
-   "self_type" : "type-928",
+   "referenced_type" : "type-930",
+   "self_type" : "type-929",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19703,8 +19769,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1003",
-   "self_type" : "type-1002",
+   "referenced_type" : "type-1004",
+   "self_type" : "type-1003",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19723,8 +19789,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1695",
-   "self_type" : "type-1694",
+   "referenced_type" : "type-1696",
+   "self_type" : "type-1695",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19733,8 +19799,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1794",
-   "self_type" : "type-1793",
+   "referenced_type" : "type-1795",
+   "self_type" : "type-1794",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19743,8 +19809,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1908",
-   "self_type" : "type-1907",
+   "referenced_type" : "type-1910",
+   "self_type" : "type-1909",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19753,8 +19819,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1984",
-   "self_type" : "type-1983",
+   "referenced_type" : "type-1986",
+   "self_type" : "type-1985",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19763,8 +19829,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2063",
-   "self_type" : "type-2062",
+   "referenced_type" : "type-2066",
+   "self_type" : "type-2065",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19773,8 +19839,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2109",
-   "self_type" : "type-2108",
+   "referenced_type" : "type-2112",
+   "self_type" : "type-2111",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19783,8 +19849,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2170",
-   "self_type" : "type-2169",
+   "referenced_type" : "type-2173",
+   "self_type" : "type-2172",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19793,8 +19859,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2369",
-   "self_type" : "type-2368",
+   "referenced_type" : "type-2371",
+   "self_type" : "type-2370",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19803,8 +19869,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2664",
-   "self_type" : "type-2663",
+   "referenced_type" : "type-2666",
+   "self_type" : "type-2665",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19813,8 +19879,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2770",
-   "self_type" : "type-2769",
+   "referenced_type" : "type-2772",
+   "self_type" : "type-2771",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19823,8 +19889,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2857",
-   "self_type" : "type-2856",
+   "referenced_type" : "type-2859",
+   "self_type" : "type-2858",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19833,8 +19899,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2934",
-   "self_type" : "type-2933",
+   "referenced_type" : "type-2937",
+   "self_type" : "type-2936",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19843,8 +19909,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-3064",
-   "self_type" : "type-3063",
+   "referenced_type" : "type-3068",
+   "self_type" : "type-3067",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19853,8 +19919,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-311",
-   "self_type" : "type-310",
+   "referenced_type" : "type-308",
+   "self_type" : "type-307",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19863,8 +19929,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-3163",
-   "self_type" : "type-3162",
+   "referenced_type" : "type-3167",
+   "self_type" : "type-3166",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19873,8 +19939,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-3232",
-   "self_type" : "type-3231",
+   "referenced_type" : "type-3235",
+   "self_type" : "type-3234",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19883,8 +19949,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-3272",
-   "self_type" : "type-3271",
+   "referenced_type" : "type-3275",
+   "self_type" : "type-3274",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19893,8 +19959,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-3323",
-   "self_type" : "type-3322",
+   "referenced_type" : "type-3326",
+   "self_type" : "type-3325",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19903,8 +19969,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-3466",
-   "self_type" : "type-3465",
+   "referenced_type" : "type-3469",
+   "self_type" : "type-3468",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19913,8 +19979,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-450",
-   "self_type" : "type-449",
+   "referenced_type" : "type-447",
+   "self_type" : "type-446",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19923,8 +19989,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-660",
-   "self_type" : "type-659",
+   "referenced_type" : "type-661",
+   "self_type" : "type-660",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19943,8 +20009,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-875",
-   "self_type" : "type-874",
+   "referenced_type" : "type-876",
+   "self_type" : "type-875",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19953,8 +20019,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-931",
-   "self_type" : "type-930",
+   "referenced_type" : "type-932",
+   "self_type" : "type-931",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19973,8 +20039,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1691",
-   "self_type" : "type-1690",
+   "referenced_type" : "type-1692",
+   "self_type" : "type-1691",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19983,8 +20049,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1790",
-   "self_type" : "type-1789",
+   "referenced_type" : "type-1791",
+   "self_type" : "type-1790",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19993,8 +20059,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1904",
-   "self_type" : "type-1903",
+   "referenced_type" : "type-1906",
+   "self_type" : "type-1905",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20003,8 +20069,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1978",
-   "self_type" : "type-1977",
+   "referenced_type" : "type-1982",
+   "self_type" : "type-1981",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20013,8 +20079,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2058",
-   "self_type" : "type-2057",
+   "referenced_type" : "type-2061",
+   "self_type" : "type-2060",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20023,8 +20089,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2105",
-   "self_type" : "type-2104",
+   "referenced_type" : "type-2108",
+   "self_type" : "type-2107",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20033,8 +20099,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2166",
-   "self_type" : "type-2165",
+   "referenced_type" : "type-2168",
+   "self_type" : "type-2167",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20043,8 +20109,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2365",
-   "self_type" : "type-2364",
+   "referenced_type" : "type-2367",
+   "self_type" : "type-2366",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20053,8 +20119,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2660",
-   "self_type" : "type-2659",
+   "referenced_type" : "type-2662",
+   "self_type" : "type-2661",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20063,8 +20129,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2766",
-   "self_type" : "type-2765",
+   "referenced_type" : "type-2768",
+   "self_type" : "type-2767",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20073,8 +20139,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2853",
-   "self_type" : "type-2852",
+   "referenced_type" : "type-2855",
+   "self_type" : "type-2854",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20083,8 +20149,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2930",
-   "self_type" : "type-2929",
+   "referenced_type" : "type-2932",
+   "self_type" : "type-2931",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20093,8 +20159,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-3060",
-   "self_type" : "type-3059",
+   "referenced_type" : "type-303",
+   "self_type" : "type-302",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20103,8 +20169,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-306",
-   "self_type" : "type-305",
+   "referenced_type" : "type-3064",
+   "self_type" : "type-3063",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20113,8 +20179,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-3158",
-   "self_type" : "type-3157",
+   "referenced_type" : "type-3162",
+   "self_type" : "type-3161",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20123,8 +20189,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-3228",
-   "self_type" : "type-3227",
+   "referenced_type" : "type-3231",
+   "self_type" : "type-3230",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20133,8 +20199,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-3268",
-   "self_type" : "type-3267",
+   "referenced_type" : "type-3271",
+   "self_type" : "type-3270",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20143,8 +20209,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-3319",
-   "self_type" : "type-3318",
+   "referenced_type" : "type-3322",
+   "self_type" : "type-3321",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20153,8 +20219,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-3462",
-   "self_type" : "type-3461",
+   "referenced_type" : "type-3465",
+   "self_type" : "type-3464",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20163,8 +20229,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-446",
-   "self_type" : "type-445",
+   "referenced_type" : "type-443",
+   "self_type" : "type-442",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20173,8 +20239,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-656",
-   "self_type" : "type-655",
+   "referenced_type" : "type-657",
+   "self_type" : "type-656",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20183,8 +20249,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-766",
-   "self_type" : "type-765",
+   "referenced_type" : "type-768",
+   "self_type" : "type-767",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20193,8 +20259,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-870",
-   "self_type" : "type-869",
+   "referenced_type" : "type-871",
+   "self_type" : "type-870",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20203,8 +20269,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-927",
-   "self_type" : "type-926",
+   "referenced_type" : "type-928",
+   "self_type" : "type-927",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20223,8 +20289,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1005",
-   "self_type" : "type-1004",
+   "referenced_type" : "type-1006",
+   "self_type" : "type-1005",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20243,8 +20309,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1697",
-   "self_type" : "type-1696",
+   "referenced_type" : "type-1698",
+   "self_type" : "type-1697",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20253,8 +20319,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1796",
-   "self_type" : "type-1795",
+   "referenced_type" : "type-1797",
+   "self_type" : "type-1796",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20263,8 +20329,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1910",
-   "self_type" : "type-1909",
+   "referenced_type" : "type-1912",
+   "self_type" : "type-1911",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20273,8 +20339,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1986",
-   "self_type" : "type-1985",
+   "referenced_type" : "type-1988",
+   "self_type" : "type-1987",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20283,8 +20349,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2065",
-   "self_type" : "type-2064",
+   "referenced_type" : "type-2068",
+   "self_type" : "type-2067",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20293,8 +20359,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2111",
-   "self_type" : "type-2110",
+   "referenced_type" : "type-2114",
+   "self_type" : "type-2113",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20303,8 +20369,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2172",
-   "self_type" : "type-2171",
+   "referenced_type" : "type-2175",
+   "self_type" : "type-2174",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20313,8 +20379,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2371",
-   "self_type" : "type-2370",
+   "referenced_type" : "type-2373",
+   "self_type" : "type-2372",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20323,8 +20389,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2666",
-   "self_type" : "type-2665",
+   "referenced_type" : "type-2668",
+   "self_type" : "type-2667",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20333,8 +20399,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2772",
-   "self_type" : "type-2771",
+   "referenced_type" : "type-2774",
+   "self_type" : "type-2773",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20343,8 +20409,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2859",
-   "self_type" : "type-2858",
+   "referenced_type" : "type-2861",
+   "self_type" : "type-2860",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20353,8 +20419,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2936",
-   "self_type" : "type-2935",
+   "referenced_type" : "type-2939",
+   "self_type" : "type-2938",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20363,8 +20429,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-3067",
-   "self_type" : "type-3066",
+   "referenced_type" : "type-3072",
+   "self_type" : "type-3071",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20373,8 +20439,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-313",
-   "self_type" : "type-312",
+   "referenced_type" : "type-310",
+   "self_type" : "type-309",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20383,8 +20449,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-3165",
-   "self_type" : "type-3164",
+   "referenced_type" : "type-3169",
+   "self_type" : "type-3168",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20393,8 +20459,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-3234",
-   "self_type" : "type-3233",
+   "referenced_type" : "type-3237",
+   "self_type" : "type-3236",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20403,8 +20469,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-3274",
-   "self_type" : "type-3273",
+   "referenced_type" : "type-3277",
+   "self_type" : "type-3276",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20413,8 +20479,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-3325",
-   "self_type" : "type-3324",
+   "referenced_type" : "type-3328",
+   "self_type" : "type-3327",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20423,8 +20489,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-3468",
-   "self_type" : "type-3467",
+   "referenced_type" : "type-3471",
+   "self_type" : "type-3470",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20433,8 +20499,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-452",
-   "self_type" : "type-451",
+   "referenced_type" : "type-449",
+   "self_type" : "type-448",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20463,8 +20529,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-877",
-   "self_type" : "type-876",
+   "referenced_type" : "type-878",
+   "self_type" : "type-877",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20473,8 +20539,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-933",
-   "self_type" : "type-932",
+   "referenced_type" : "type-934",
+   "self_type" : "type-933",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20493,8 +20559,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1685",
-   "self_type" : "type-1684",
+   "referenced_type" : "type-1686",
+   "self_type" : "type-1685",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20503,8 +20569,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1784",
-   "self_type" : "type-1783",
+   "referenced_type" : "type-1785",
+   "self_type" : "type-1784",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20513,8 +20579,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1898",
-   "self_type" : "type-1897",
+   "referenced_type" : "type-1900",
+   "self_type" : "type-1899",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20523,8 +20589,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1972",
-   "self_type" : "type-1971",
+   "referenced_type" : "type-1974",
+   "self_type" : "type-1973",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20533,8 +20599,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2052",
-   "self_type" : "type-2051",
+   "referenced_type" : "type-2055",
+   "self_type" : "type-2054",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20543,8 +20609,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2098",
-   "self_type" : "type-2097",
+   "referenced_type" : "type-2101",
+   "self_type" : "type-2100",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20553,8 +20619,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2160",
-   "self_type" : "type-2159",
+   "referenced_type" : "type-2162",
+   "self_type" : "type-2161",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20563,8 +20629,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2359",
-   "self_type" : "type-2358",
+   "referenced_type" : "type-2361",
+   "self_type" : "type-2360",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20573,8 +20639,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2654",
-   "self_type" : "type-2653",
+   "referenced_type" : "type-2656",
+   "self_type" : "type-2655",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20583,8 +20649,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2760",
-   "self_type" : "type-2759",
+   "referenced_type" : "type-2762",
+   "self_type" : "type-2761",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20593,8 +20659,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2847",
-   "self_type" : "type-2846",
+   "referenced_type" : "type-2849",
+   "self_type" : "type-2848",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20603,8 +20669,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2923",
-   "self_type" : "type-2922",
+   "referenced_type" : "type-2925",
+   "self_type" : "type-2924",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20613,8 +20679,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-300",
-   "self_type" : "type-299",
+   "referenced_type" : "type-297",
+   "self_type" : "type-296",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20623,8 +20689,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-3054",
-   "self_type" : "type-3053",
+   "referenced_type" : "type-3057",
+   "self_type" : "type-3056",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20633,8 +20699,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-3152",
-   "self_type" : "type-3151",
+   "referenced_type" : "type-3156",
+   "self_type" : "type-3155",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20643,8 +20709,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-3222",
-   "self_type" : "type-3221",
+   "referenced_type" : "type-3225",
+   "self_type" : "type-3224",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20653,8 +20719,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-3262",
-   "self_type" : "type-3261",
+   "referenced_type" : "type-3265",
+   "self_type" : "type-3264",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20663,8 +20729,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-3313",
-   "self_type" : "type-3312",
+   "referenced_type" : "type-3316",
+   "self_type" : "type-3315",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20673,8 +20739,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-3456",
-   "self_type" : "type-3455",
+   "referenced_type" : "type-3459",
+   "self_type" : "type-3458",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20683,8 +20749,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-440",
-   "self_type" : "type-439",
+   "referenced_type" : "type-437",
+   "self_type" : "type-436",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20693,8 +20759,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-649",
-   "self_type" : "type-648",
+   "referenced_type" : "type-650",
+   "self_type" : "type-649",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20713,8 +20779,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-863",
-   "self_type" : "type-862",
+   "referenced_type" : "type-865",
+   "self_type" : "type-864",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20723,8 +20789,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-920",
-   "self_type" : "type-919",
+   "referenced_type" : "type-921",
+   "self_type" : "type-920",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20753,8 +20819,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1689",
-   "self_type" : "type-1688",
+   "referenced_type" : "type-1690",
+   "self_type" : "type-1689",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20763,8 +20829,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1788",
-   "self_type" : "type-1787",
+   "referenced_type" : "type-1789",
+   "self_type" : "type-1788",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20773,8 +20839,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1902",
-   "self_type" : "type-1901",
+   "referenced_type" : "type-1904",
+   "self_type" : "type-1903",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20783,8 +20849,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1976",
-   "self_type" : "type-1975",
+   "referenced_type" : "type-1980",
+   "self_type" : "type-1979",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20793,8 +20859,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2056",
-   "self_type" : "type-2055",
+   "referenced_type" : "type-2059",
+   "self_type" : "type-2058",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20803,8 +20869,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2102",
-   "self_type" : "type-2101",
+   "referenced_type" : "type-2105",
+   "self_type" : "type-2104",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20813,8 +20879,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2164",
-   "self_type" : "type-2163",
+   "referenced_type" : "type-2166",
+   "self_type" : "type-2165",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20823,8 +20889,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2363",
-   "self_type" : "type-2362",
+   "referenced_type" : "type-2365",
+   "self_type" : "type-2364",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20833,8 +20899,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2658",
-   "self_type" : "type-2657",
+   "referenced_type" : "type-2660",
+   "self_type" : "type-2659",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20843,8 +20909,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2764",
-   "self_type" : "type-2763",
+   "referenced_type" : "type-2766",
+   "self_type" : "type-2765",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20853,8 +20919,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2851",
-   "self_type" : "type-2850",
+   "referenced_type" : "type-2853",
+   "self_type" : "type-2852",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20863,8 +20929,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2927",
-   "self_type" : "type-2926",
+   "referenced_type" : "type-2930",
+   "self_type" : "type-2929",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20873,8 +20939,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-304",
-   "self_type" : "type-303",
+   "referenced_type" : "type-301",
+   "self_type" : "type-300",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20883,8 +20949,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-3058",
-   "self_type" : "type-3057",
+   "referenced_type" : "type-3062",
+   "self_type" : "type-3061",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20893,8 +20959,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-3156",
-   "self_type" : "type-3155",
+   "referenced_type" : "type-3160",
+   "self_type" : "type-3159",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20903,8 +20969,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-3226",
-   "self_type" : "type-3225",
+   "referenced_type" : "type-3229",
+   "self_type" : "type-3228",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20913,8 +20979,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-3266",
-   "self_type" : "type-3265",
+   "referenced_type" : "type-3269",
+   "self_type" : "type-3268",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20923,8 +20989,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-3317",
-   "self_type" : "type-3316",
+   "referenced_type" : "type-3320",
+   "self_type" : "type-3319",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20933,8 +20999,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-3460",
-   "self_type" : "type-3459",
+   "referenced_type" : "type-3463",
+   "self_type" : "type-3462",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20943,8 +21009,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-444",
-   "self_type" : "type-443",
+   "referenced_type" : "type-441",
+   "self_type" : "type-440",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20963,8 +21029,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-764",
-   "self_type" : "type-763",
+   "referenced_type" : "type-766",
+   "self_type" : "type-765",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20973,8 +21039,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-868",
-   "self_type" : "type-867",
+   "referenced_type" : "type-869",
+   "self_type" : "type-868",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20983,8 +21049,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-924",
-   "self_type" : "type-923",
+   "referenced_type" : "type-925",
+   "self_type" : "type-924",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -21003,8 +21069,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1010",
-   "self_type" : "type-1009",
+   "referenced_type" : "type-1012",
+   "self_type" : "type-1011",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21023,8 +21089,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1702",
-   "self_type" : "type-1701",
+   "referenced_type" : "type-1703",
+   "self_type" : "type-1702",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21033,8 +21099,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1800",
-   "self_type" : "type-1799",
+   "referenced_type" : "type-1801",
+   "self_type" : "type-1800",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21043,8 +21109,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1914",
-   "self_type" : "type-1913",
+   "referenced_type" : "type-1916",
+   "self_type" : "type-1915",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21053,8 +21119,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1990",
-   "self_type" : "type-1989",
+   "referenced_type" : "type-1992",
+   "self_type" : "type-1991",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21063,8 +21129,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2070",
-   "self_type" : "type-2069",
+   "referenced_type" : "type-2073",
+   "self_type" : "type-2072",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21073,8 +21139,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2116",
-   "self_type" : "type-2115",
+   "referenced_type" : "type-2119",
+   "self_type" : "type-2118",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21083,8 +21149,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2177",
-   "self_type" : "type-2176",
+   "referenced_type" : "type-2181",
+   "self_type" : "type-2180",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21093,8 +21159,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2379",
-   "self_type" : "type-2378",
+   "referenced_type" : "type-2381",
+   "self_type" : "type-2380",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21103,8 +21169,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2671",
-   "self_type" : "type-2670",
+   "referenced_type" : "type-2673",
+   "self_type" : "type-2672",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21113,8 +21179,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2776",
-   "self_type" : "type-2775",
+   "referenced_type" : "type-2778",
+   "self_type" : "type-2777",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21123,8 +21189,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2863",
-   "self_type" : "type-2862",
+   "referenced_type" : "type-2865",
+   "self_type" : "type-2864",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21133,8 +21199,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2941",
-   "self_type" : "type-2940",
+   "referenced_type" : "type-2944",
+   "self_type" : "type-2943",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21143,8 +21209,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-3071",
-   "self_type" : "type-3070",
+   "referenced_type" : "type-3076",
+   "self_type" : "type-3075",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21153,8 +21219,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-3170",
-   "self_type" : "type-3169",
+   "referenced_type" : "type-315",
+   "self_type" : "type-314",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21163,8 +21229,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-318",
-   "self_type" : "type-317",
+   "referenced_type" : "type-3174",
+   "self_type" : "type-3173",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21173,8 +21239,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-3238",
-   "self_type" : "type-3237",
+   "referenced_type" : "type-3241",
+   "self_type" : "type-3240",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21183,8 +21249,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-3278",
-   "self_type" : "type-3277",
+   "referenced_type" : "type-3281",
+   "self_type" : "type-3280",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21193,8 +21259,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-3329",
-   "self_type" : "type-3328",
+   "referenced_type" : "type-3332",
+   "self_type" : "type-3331",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21203,8 +21269,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-3476",
-   "self_type" : "type-3475",
+   "referenced_type" : "type-3479",
+   "self_type" : "type-3478",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21213,8 +21279,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-457",
-   "self_type" : "type-456",
+   "referenced_type" : "type-454",
+   "self_type" : "type-453",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21223,8 +21289,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-667",
-   "self_type" : "type-666",
+   "referenced_type" : "type-668",
+   "self_type" : "type-667",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21233,8 +21299,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-778",
-   "self_type" : "type-777",
+   "referenced_type" : "type-779",
+   "self_type" : "type-778",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21243,8 +21309,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-882",
-   "self_type" : "type-881",
+   "referenced_type" : "type-883",
+   "self_type" : "type-882",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21253,8 +21319,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-938",
-   "self_type" : "type-937",
+   "referenced_type" : "type-939",
+   "self_type" : "type-938",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21263,8 +21329,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1013",
+   "referenced_type" : "type-1016",
+   "self_type" : "type-1015",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21283,8 +21349,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1706",
-   "self_type" : "type-1705",
+   "referenced_type" : "type-1707",
+   "self_type" : "type-1706",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21293,8 +21359,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1804",
-   "self_type" : "type-1803",
+   "referenced_type" : "type-1805",
+   "self_type" : "type-1804",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21303,8 +21369,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1918",
-   "self_type" : "type-1917",
+   "referenced_type" : "type-1920",
+   "self_type" : "type-1919",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21313,8 +21379,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1994",
-   "self_type" : "type-1993",
+   "referenced_type" : "type-1996",
+   "self_type" : "type-1995",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21323,8 +21389,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2074",
-   "self_type" : "type-2073",
+   "referenced_type" : "type-2077",
+   "self_type" : "type-2076",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21333,8 +21399,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2121",
-   "self_type" : "type-2120",
+   "referenced_type" : "type-2124",
+   "self_type" : "type-2123",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21343,8 +21409,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2181",
-   "self_type" : "type-2180",
+   "referenced_type" : "type-2185",
+   "self_type" : "type-2184",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21353,8 +21419,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2383",
-   "self_type" : "type-2382",
+   "referenced_type" : "type-2385",
+   "self_type" : "type-2384",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21363,8 +21429,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2675",
-   "self_type" : "type-2674",
+   "referenced_type" : "type-2677",
+   "self_type" : "type-2676",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21373,8 +21439,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2780",
-   "self_type" : "type-2779",
+   "referenced_type" : "type-2782",
+   "self_type" : "type-2781",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21383,8 +21449,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2867",
-   "self_type" : "type-2866",
+   "referenced_type" : "type-2869",
+   "self_type" : "type-2868",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21393,8 +21459,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2945",
-   "self_type" : "type-2944",
+   "referenced_type" : "type-2948",
+   "self_type" : "type-2947",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21403,8 +21469,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-3077",
-   "self_type" : "type-3076",
+   "referenced_type" : "type-3080",
+   "self_type" : "type-3079",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21413,8 +21479,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-3175",
-   "self_type" : "type-3174",
+   "referenced_type" : "type-3180",
+   "self_type" : "type-3179",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21423,8 +21489,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-322",
-   "self_type" : "type-321",
+   "referenced_type" : "type-319",
+   "self_type" : "type-318",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21433,8 +21499,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-3242",
-   "self_type" : "type-3241",
+   "referenced_type" : "type-3245",
+   "self_type" : "type-3244",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21443,8 +21509,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-3282",
-   "self_type" : "type-3281",
+   "referenced_type" : "type-3285",
+   "self_type" : "type-3284",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21453,8 +21519,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-3333",
-   "self_type" : "type-3332",
+   "referenced_type" : "type-3336",
+   "self_type" : "type-3335",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21463,8 +21529,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-3480",
-   "self_type" : "type-3479",
+   "referenced_type" : "type-3483",
+   "self_type" : "type-3482",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21473,8 +21539,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-461",
-   "self_type" : "type-460",
+   "referenced_type" : "type-459",
+   "self_type" : "type-458",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21483,8 +21549,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-672",
-   "self_type" : "type-671",
+   "referenced_type" : "type-673",
+   "self_type" : "type-672",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21503,8 +21569,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-886",
-   "self_type" : "type-885",
+   "referenced_type" : "type-887",
+   "self_type" : "type-886",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21513,8 +21579,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-943",
-   "self_type" : "type-942",
+   "referenced_type" : "type-944",
+   "self_type" : "type-943",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21523,8 +21589,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1012",
-   "self_type" : "type-1011",
+   "referenced_type" : "type-1014",
+   "self_type" : "type-1013",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21543,8 +21609,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1704",
-   "self_type" : "type-1703",
+   "referenced_type" : "type-1705",
+   "self_type" : "type-1704",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21553,8 +21619,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1802",
-   "self_type" : "type-1801",
+   "referenced_type" : "type-1803",
+   "self_type" : "type-1802",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21563,8 +21629,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1916",
-   "self_type" : "type-1915",
+   "referenced_type" : "type-1918",
+   "self_type" : "type-1917",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21573,8 +21639,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1992",
-   "self_type" : "type-1991",
+   "referenced_type" : "type-1994",
+   "self_type" : "type-1993",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21583,8 +21649,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2072",
-   "self_type" : "type-2071",
+   "referenced_type" : "type-2075",
+   "self_type" : "type-2074",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21593,8 +21659,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2118",
-   "self_type" : "type-2117",
+   "referenced_type" : "type-2121",
+   "self_type" : "type-2120",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21603,8 +21669,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2179",
-   "self_type" : "type-2178",
+   "referenced_type" : "type-2183",
+   "self_type" : "type-2182",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21613,8 +21679,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2381",
-   "self_type" : "type-2380",
+   "referenced_type" : "type-2383",
+   "self_type" : "type-2382",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21623,8 +21689,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2673",
-   "self_type" : "type-2672",
+   "referenced_type" : "type-2675",
+   "self_type" : "type-2674",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21633,8 +21699,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2778",
-   "self_type" : "type-2777",
+   "referenced_type" : "type-2780",
+   "self_type" : "type-2779",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21643,8 +21709,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2865",
-   "self_type" : "type-2864",
+   "referenced_type" : "type-2867",
+   "self_type" : "type-2866",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21653,8 +21719,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2943",
-   "self_type" : "type-2942",
+   "referenced_type" : "type-2946",
+   "self_type" : "type-2945",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21663,8 +21729,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-3075",
-   "self_type" : "type-3074",
+   "referenced_type" : "type-3078",
+   "self_type" : "type-3077",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21673,8 +21739,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-3172",
-   "self_type" : "type-3171",
+   "referenced_type" : "type-3176",
+   "self_type" : "type-3175",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21683,8 +21749,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-320",
-   "self_type" : "type-319",
+   "referenced_type" : "type-317",
+   "self_type" : "type-316",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21693,8 +21759,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-3240",
-   "self_type" : "type-3239",
+   "referenced_type" : "type-3243",
+   "self_type" : "type-3242",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21703,8 +21769,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-3280",
-   "self_type" : "type-3279",
+   "referenced_type" : "type-3283",
+   "self_type" : "type-3282",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21713,8 +21779,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-3331",
-   "self_type" : "type-3330",
+   "referenced_type" : "type-3334",
+   "self_type" : "type-3333",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21723,8 +21789,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-3478",
-   "self_type" : "type-3477",
+   "referenced_type" : "type-3481",
+   "self_type" : "type-3480",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21733,8 +21799,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-459",
-   "self_type" : "type-458",
+   "referenced_type" : "type-457",
+   "self_type" : "type-456",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21753,8 +21819,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-780",
-   "self_type" : "type-779",
+   "referenced_type" : "type-781",
+   "self_type" : "type-780",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21763,8 +21829,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-884",
-   "self_type" : "type-883",
+   "referenced_type" : "type-885",
+   "self_type" : "type-884",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21773,8 +21839,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-940",
-   "self_type" : "type-939",
+   "referenced_type" : "type-941",
+   "self_type" : "type-940",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21783,8 +21849,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1008",
-   "self_type" : "type-1007",
+   "referenced_type" : "type-1010",
+   "self_type" : "type-1009",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21803,8 +21869,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1699",
-   "self_type" : "type-1698",
+   "referenced_type" : "type-1701",
+   "self_type" : "type-1700",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21813,8 +21879,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1798",
-   "self_type" : "type-1797",
+   "referenced_type" : "type-1799",
+   "self_type" : "type-1798",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21823,8 +21889,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1912",
-   "self_type" : "type-1911",
+   "referenced_type" : "type-1914",
+   "self_type" : "type-1913",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21833,8 +21899,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1988",
-   "self_type" : "type-1987",
+   "referenced_type" : "type-1990",
+   "self_type" : "type-1989",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21843,8 +21909,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2068",
-   "self_type" : "type-2067",
+   "referenced_type" : "type-2071",
+   "self_type" : "type-2070",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21853,8 +21919,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2114",
-   "self_type" : "type-2113",
+   "referenced_type" : "type-2117",
+   "self_type" : "type-2116",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21863,8 +21929,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2175",
-   "self_type" : "type-2174",
+   "referenced_type" : "type-2179",
+   "self_type" : "type-2178",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21873,8 +21939,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2377",
-   "self_type" : "type-2376",
+   "referenced_type" : "type-2379",
+   "self_type" : "type-2378",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21883,8 +21949,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2668",
-   "self_type" : "type-2667",
+   "referenced_type" : "type-2671",
+   "self_type" : "type-2670",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21893,8 +21959,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2774",
-   "self_type" : "type-2773",
+   "referenced_type" : "type-2776",
+   "self_type" : "type-2775",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21903,8 +21969,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2861",
-   "self_type" : "type-2860",
+   "referenced_type" : "type-2863",
+   "self_type" : "type-2862",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21913,8 +21979,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2939",
-   "self_type" : "type-2938",
+   "referenced_type" : "type-2941",
+   "self_type" : "type-2940",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21923,8 +21989,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-3069",
-   "self_type" : "type-3068",
+   "referenced_type" : "type-3074",
+   "self_type" : "type-3073",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21933,8 +21999,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-315",
-   "self_type" : "type-314",
+   "referenced_type" : "type-313",
+   "self_type" : "type-312",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21943,8 +22009,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-3168",
-   "self_type" : "type-3167",
+   "referenced_type" : "type-3172",
+   "self_type" : "type-3171",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21953,8 +22019,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-3236",
-   "self_type" : "type-3235",
+   "referenced_type" : "type-3239",
+   "self_type" : "type-3238",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21963,8 +22029,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-3276",
-   "self_type" : "type-3275",
+   "referenced_type" : "type-3279",
+   "self_type" : "type-3278",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21973,8 +22039,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-3327",
-   "self_type" : "type-3326",
+   "referenced_type" : "type-3330",
+   "self_type" : "type-3329",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21983,8 +22049,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-3474",
-   "self_type" : "type-3473",
+   "referenced_type" : "type-3477",
+   "self_type" : "type-3476",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21993,8 +22059,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-455",
-   "self_type" : "type-454",
+   "referenced_type" : "type-452",
+   "self_type" : "type-451",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22003,8 +22069,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-665",
-   "self_type" : "type-664",
+   "referenced_type" : "type-666",
+   "self_type" : "type-665",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22013,8 +22079,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-776",
-   "self_type" : "type-775",
+   "referenced_type" : "type-777",
+   "self_type" : "type-776",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22023,8 +22089,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-880",
-   "self_type" : "type-879",
+   "referenced_type" : "type-881",
+   "self_type" : "type-880",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22033,8 +22099,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-936",
-   "self_type" : "type-935",
+   "referenced_type" : "type-937",
+   "self_type" : "type-936",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22063,8 +22129,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1708",
-   "self_type" : "type-1707",
+   "referenced_type" : "type-1709",
+   "self_type" : "type-1708",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22073,8 +22139,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1806",
-   "self_type" : "type-1805",
+   "referenced_type" : "type-1807",
+   "self_type" : "type-1806",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22083,8 +22149,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1920",
-   "self_type" : "type-1919",
+   "referenced_type" : "type-1922",
+   "self_type" : "type-1921",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22093,8 +22159,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1996",
-   "self_type" : "type-1995",
+   "referenced_type" : "type-1998",
+   "self_type" : "type-1997",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22103,8 +22169,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2076",
-   "self_type" : "type-2075",
+   "referenced_type" : "type-2080",
+   "self_type" : "type-2079",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22113,8 +22179,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2123",
-   "self_type" : "type-2122",
+   "referenced_type" : "type-2126",
+   "self_type" : "type-2125",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22123,8 +22189,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2185",
-   "self_type" : "type-2184",
+   "referenced_type" : "type-2187",
+   "self_type" : "type-2186",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22133,8 +22199,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2385",
-   "self_type" : "type-2384",
+   "referenced_type" : "type-2387",
+   "self_type" : "type-2386",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22143,8 +22209,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2677",
-   "self_type" : "type-2676",
+   "referenced_type" : "type-2679",
+   "self_type" : "type-2678",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22153,8 +22219,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2782",
-   "self_type" : "type-2781",
+   "referenced_type" : "type-2784",
+   "self_type" : "type-2783",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22163,8 +22229,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2869",
-   "self_type" : "type-2868",
+   "referenced_type" : "type-2871",
+   "self_type" : "type-2870",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22173,8 +22239,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2948",
-   "self_type" : "type-2947",
+   "referenced_type" : "type-2950",
+   "self_type" : "type-2949",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22183,8 +22249,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-3079",
-   "self_type" : "type-3078",
+   "referenced_type" : "type-3082",
+   "self_type" : "type-3081",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22193,8 +22259,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-3177",
-   "self_type" : "type-3176",
+   "referenced_type" : "type-3182",
+   "self_type" : "type-3181",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22203,8 +22269,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-3244",
-   "self_type" : "type-3243",
+   "referenced_type" : "type-321",
+   "self_type" : "type-320",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22213,8 +22279,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-324",
-   "self_type" : "type-323",
+   "referenced_type" : "type-3247",
+   "self_type" : "type-3246",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22223,8 +22289,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-3284",
-   "self_type" : "type-3283",
+   "referenced_type" : "type-3287",
+   "self_type" : "type-3286",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22233,8 +22299,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-3335",
-   "self_type" : "type-3334",
+   "referenced_type" : "type-3338",
+   "self_type" : "type-3337",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22243,8 +22309,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-3482",
-   "self_type" : "type-3481",
+   "referenced_type" : "type-3485",
+   "self_type" : "type-3484",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22253,8 +22319,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-464",
-   "self_type" : "type-463",
+   "referenced_type" : "type-461",
+   "self_type" : "type-460",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22263,8 +22329,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-674",
-   "self_type" : "type-673",
+   "referenced_type" : "type-675",
+   "self_type" : "type-674",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22283,8 +22349,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-888",
-   "self_type" : "type-887",
+   "referenced_type" : "type-890",
+   "self_type" : "type-889",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22293,8 +22359,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-945",
-   "self_type" : "type-944",
+   "referenced_type" : "type-946",
+   "self_type" : "type-945",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22303,8 +22369,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1026",
-   "self_type" : "type-1025",
+   "referenced_type" : "type-1027",
+   "self_type" : "type-1026",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22323,8 +22389,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1814",
-   "self_type" : "type-1813",
+   "referenced_type" : "type-1815",
+   "self_type" : "type-1814",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22333,8 +22399,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2004",
-   "self_type" : "type-2003",
+   "referenced_type" : "type-2006",
+   "self_type" : "type-2005",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22343,8 +22409,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2086",
-   "self_type" : "type-2085",
+   "referenced_type" : "type-2089",
+   "self_type" : "type-2088",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22353,8 +22419,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2132",
-   "self_type" : "type-2131",
+   "referenced_type" : "type-2135",
+   "self_type" : "type-2134",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22363,8 +22429,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2193",
-   "self_type" : "type-2192",
+   "referenced_type" : "type-2196",
+   "self_type" : "type-2195",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22373,8 +22439,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2397",
-   "self_type" : "type-2396",
+   "referenced_type" : "type-2399",
+   "self_type" : "type-2398",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22383,8 +22449,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2790",
-   "self_type" : "type-2789",
+   "referenced_type" : "type-2792",
+   "self_type" : "type-2791",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22393,8 +22459,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2957",
-   "self_type" : "type-2956",
+   "referenced_type" : "type-2959",
+   "self_type" : "type-2958",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22403,8 +22469,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-3187",
-   "self_type" : "type-3186",
+   "referenced_type" : "type-3190",
+   "self_type" : "type-3189",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22413,8 +22479,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-3252",
-   "self_type" : "type-3251",
+   "referenced_type" : "type-3255",
+   "self_type" : "type-3254",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22423,8 +22489,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-3292",
-   "self_type" : "type-3291",
+   "referenced_type" : "type-3295",
+   "self_type" : "type-3294",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22433,8 +22499,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-3343",
-   "self_type" : "type-3342",
+   "referenced_type" : "type-3346",
+   "self_type" : "type-3345",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22443,8 +22509,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-3494",
-   "self_type" : "type-3493",
+   "referenced_type" : "type-3497",
+   "self_type" : "type-3496",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22453,8 +22519,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-473",
-   "self_type" : "type-472",
+   "referenced_type" : "type-470",
+   "self_type" : "type-469",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22463,8 +22529,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-794",
-   "self_type" : "type-793",
+   "referenced_type" : "type-795",
+   "self_type" : "type-794",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22473,8 +22539,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-898",
-   "self_type" : "type-897",
+   "referenced_type" : "type-899",
+   "self_type" : "type-898",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22483,8 +22549,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-954",
-   "self_type" : "type-953",
+   "referenced_type" : "type-955",
+   "self_type" : "type-954",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22493,8 +22559,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-1024",
-   "self_type" : "type-1023",
+   "referenced_type" : "type-1025",
+   "self_type" : "type-1024",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22513,8 +22579,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-1812",
-   "self_type" : "type-1811",
+   "referenced_type" : "type-1813",
+   "self_type" : "type-1812",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22523,8 +22589,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2002",
-   "self_type" : "type-2001",
+   "referenced_type" : "type-2004",
+   "self_type" : "type-2003",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22533,8 +22599,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2084",
-   "self_type" : "type-2083",
+   "referenced_type" : "type-2087",
+   "self_type" : "type-2086",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22543,8 +22609,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2130",
-   "self_type" : "type-2129",
+   "referenced_type" : "type-2133",
+   "self_type" : "type-2132",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22553,8 +22619,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2191",
-   "self_type" : "type-2190",
+   "referenced_type" : "type-2194",
+   "self_type" : "type-2193",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22563,8 +22629,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2395",
-   "self_type" : "type-2394",
+   "referenced_type" : "type-2397",
+   "self_type" : "type-2396",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22573,8 +22639,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2788",
-   "self_type" : "type-2787",
+   "referenced_type" : "type-2790",
+   "self_type" : "type-2789",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22583,8 +22649,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2955",
-   "self_type" : "type-2954",
+   "referenced_type" : "type-2957",
+   "self_type" : "type-2956",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22593,8 +22659,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-3185",
-   "self_type" : "type-3184",
+   "referenced_type" : "type-3188",
+   "self_type" : "type-3187",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22603,8 +22669,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-3250",
-   "self_type" : "type-3249",
+   "referenced_type" : "type-3253",
+   "self_type" : "type-3252",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22613,8 +22679,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-3290",
-   "self_type" : "type-3289",
+   "referenced_type" : "type-3293",
+   "self_type" : "type-3292",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22623,8 +22689,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-3341",
-   "self_type" : "type-3340",
+   "referenced_type" : "type-3344",
+   "self_type" : "type-3343",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22633,8 +22699,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-3492",
-   "self_type" : "type-3491",
+   "referenced_type" : "type-3495",
+   "self_type" : "type-3494",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22643,8 +22709,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-471",
-   "self_type" : "type-470",
+   "referenced_type" : "type-468",
+   "self_type" : "type-467",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22653,8 +22719,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-792",
-   "self_type" : "type-791",
+   "referenced_type" : "type-793",
+   "self_type" : "type-792",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22663,8 +22729,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-896",
-   "self_type" : "type-895",
+   "referenced_type" : "type-897",
+   "self_type" : "type-896",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22673,8 +22739,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-952",
-   "self_type" : "type-951",
+   "referenced_type" : "type-953",
+   "self_type" : "type-952",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22683,8 +22749,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-1022",
-   "self_type" : "type-1021",
+   "referenced_type" : "type-1023",
+   "self_type" : "type-1022",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22703,8 +22769,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-1810",
-   "self_type" : "type-1809",
+   "referenced_type" : "type-1811",
+   "self_type" : "type-1810",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22713,8 +22779,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2000",
-   "self_type" : "type-1999",
+   "referenced_type" : "type-2002",
+   "self_type" : "type-2001",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22723,8 +22789,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2082",
-   "self_type" : "type-2081",
+   "referenced_type" : "type-2085",
+   "self_type" : "type-2084",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22733,8 +22799,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2128",
-   "self_type" : "type-2127",
+   "referenced_type" : "type-2131",
+   "self_type" : "type-2130",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22743,8 +22809,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2189",
-   "self_type" : "type-2188",
+   "referenced_type" : "type-2192",
+   "self_type" : "type-2191",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22753,8 +22819,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2393",
-   "self_type" : "type-2392",
+   "referenced_type" : "type-2395",
+   "self_type" : "type-2394",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22763,8 +22829,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2786",
-   "self_type" : "type-2785",
+   "referenced_type" : "type-2788",
+   "self_type" : "type-2787",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22773,8 +22839,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2952",
-   "self_type" : "type-2951",
+   "referenced_type" : "type-2955",
+   "self_type" : "type-2954",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22783,8 +22849,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-3183",
-   "self_type" : "type-3182",
+   "referenced_type" : "type-3186",
+   "self_type" : "type-3185",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22793,8 +22859,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-3248",
-   "self_type" : "type-3247",
+   "referenced_type" : "type-3251",
+   "self_type" : "type-3250",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22803,8 +22869,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-3288",
-   "self_type" : "type-3287",
+   "referenced_type" : "type-3291",
+   "self_type" : "type-3290",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22813,8 +22879,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-3339",
-   "self_type" : "type-3338",
+   "referenced_type" : "type-3342",
+   "self_type" : "type-3341",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22823,8 +22889,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-3490",
-   "self_type" : "type-3489",
+   "referenced_type" : "type-3493",
+   "self_type" : "type-3492",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22833,8 +22899,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-468",
-   "self_type" : "type-467",
+   "referenced_type" : "type-466",
+   "self_type" : "type-465",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22843,8 +22909,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-790",
-   "self_type" : "type-789",
+   "referenced_type" : "type-791",
+   "self_type" : "type-790",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22853,8 +22919,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-894",
-   "self_type" : "type-893",
+   "referenced_type" : "type-895",
+   "self_type" : "type-894",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22863,8 +22929,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-950",
-   "self_type" : "type-949",
+   "referenced_type" : "type-951",
+   "self_type" : "type-950",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22893,8 +22959,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-1808",
-   "self_type" : "type-1807",
+   "referenced_type" : "type-1809",
+   "self_type" : "type-1808",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22903,8 +22969,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-1998",
-   "self_type" : "type-1997",
+   "referenced_type" : "type-2000",
+   "self_type" : "type-1999",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22913,8 +22979,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2080",
-   "self_type" : "type-2079",
+   "referenced_type" : "type-2083",
+   "self_type" : "type-2082",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22923,8 +22989,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2125",
-   "self_type" : "type-2124",
+   "referenced_type" : "type-2128",
+   "self_type" : "type-2127",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22933,8 +22999,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2187",
-   "self_type" : "type-2186",
+   "referenced_type" : "type-2189",
+   "self_type" : "type-2188",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22943,8 +23009,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2391",
-   "self_type" : "type-2390",
+   "referenced_type" : "type-2393",
+   "self_type" : "type-2392",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22953,8 +23019,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2784",
-   "self_type" : "type-2783",
+   "referenced_type" : "type-2786",
+   "self_type" : "type-2785",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22963,8 +23029,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2950",
-   "self_type" : "type-2949",
+   "referenced_type" : "type-2953",
+   "self_type" : "type-2952",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22973,8 +23039,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-3181",
-   "self_type" : "type-3180",
+   "referenced_type" : "type-3184",
+   "self_type" : "type-3183",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22983,8 +23049,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-3246",
-   "self_type" : "type-3245",
+   "referenced_type" : "type-3249",
+   "self_type" : "type-3248",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22993,8 +23059,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-3286",
-   "self_type" : "type-3285",
+   "referenced_type" : "type-3289",
+   "self_type" : "type-3288",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23003,8 +23069,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-3337",
-   "self_type" : "type-3336",
+   "referenced_type" : "type-3340",
+   "self_type" : "type-3339",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23013,8 +23079,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-3488",
-   "self_type" : "type-3487",
+   "referenced_type" : "type-3491",
+   "self_type" : "type-3490",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23023,8 +23089,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-466",
-   "self_type" : "type-465",
+   "referenced_type" : "type-464",
+   "self_type" : "type-463",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23033,8 +23099,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-788",
-   "self_type" : "type-787",
+   "referenced_type" : "type-789",
+   "self_type" : "type-788",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23043,8 +23109,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-892",
-   "self_type" : "type-891",
+   "referenced_type" : "type-893",
+   "self_type" : "type-892",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23053,8 +23119,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-947",
-   "self_type" : "type-946",
+   "referenced_type" : "type-948",
+   "self_type" : "type-947",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23063,8 +23129,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1028",
-   "self_type" : "type-1027",
+   "referenced_type" : "type-1029",
+   "self_type" : "type-1028",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23083,8 +23149,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1816",
-   "self_type" : "type-1815",
+   "referenced_type" : "type-1817",
+   "self_type" : "type-1816",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23093,8 +23159,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2006",
-   "self_type" : "type-2005",
+   "referenced_type" : "type-2008",
+   "self_type" : "type-2007",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23103,8 +23169,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2088",
-   "self_type" : "type-2087",
+   "referenced_type" : "type-2091",
+   "self_type" : "type-2090",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23113,8 +23179,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2134",
-   "self_type" : "type-2133",
+   "referenced_type" : "type-2137",
+   "self_type" : "type-2136",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23123,8 +23189,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2195",
-   "self_type" : "type-2194",
+   "referenced_type" : "type-2198",
+   "self_type" : "type-2197",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23133,8 +23199,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2399",
-   "self_type" : "type-2398",
+   "referenced_type" : "type-2401",
+   "self_type" : "type-2400",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23143,8 +23209,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2792",
-   "self_type" : "type-2791",
+   "referenced_type" : "type-2794",
+   "self_type" : "type-2793",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23153,8 +23219,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2959",
-   "self_type" : "type-2958",
+   "referenced_type" : "type-2962",
+   "self_type" : "type-2961",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23163,8 +23229,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-3189",
-   "self_type" : "type-3188",
+   "referenced_type" : "type-3193",
+   "self_type" : "type-3192",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23173,8 +23239,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-3254",
-   "self_type" : "type-3253",
+   "referenced_type" : "type-3257",
+   "self_type" : "type-3256",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23183,8 +23249,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-3294",
-   "self_type" : "type-3293",
+   "referenced_type" : "type-3297",
+   "self_type" : "type-3296",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23193,8 +23259,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-3345",
-   "self_type" : "type-3344",
+   "referenced_type" : "type-3348",
+   "self_type" : "type-3347",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23203,8 +23269,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-3496",
-   "self_type" : "type-3495",
+   "referenced_type" : "type-3499",
+   "self_type" : "type-3498",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23213,8 +23279,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-475",
-   "self_type" : "type-474",
+   "referenced_type" : "type-472",
+   "self_type" : "type-471",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23233,8 +23299,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-900",
-   "self_type" : "type-899",
+   "referenced_type" : "type-901",
+   "self_type" : "type-900",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23243,8 +23309,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-956",
-   "self_type" : "type-955",
+   "referenced_type" : "type-957",
+   "self_type" : "type-956",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23253,8 +23319,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1633",
-   "self_type" : "type-1632",
+   "referenced_type" : "type-1637",
+   "self_type" : "type-1636",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23263,8 +23329,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-168",
-   "self_type" : "type-167",
+   "referenced_type" : "type-170",
+   "self_type" : "type-169",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23273,8 +23339,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1774",
-   "self_type" : "type-1773",
+   "referenced_type" : "type-1775",
+   "self_type" : "type-1774",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23283,8 +23349,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1896",
-   "self_type" : "type-1895",
+   "referenced_type" : "type-1898",
+   "self_type" : "type-1897",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23293,8 +23359,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1970",
-   "self_type" : "type-1969",
+   "referenced_type" : "type-1972",
+   "self_type" : "type-1971",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23303,8 +23369,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2050",
-   "self_type" : "type-2049",
+   "referenced_type" : "type-2052",
+   "self_type" : "type-2051",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23313,8 +23379,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2602",
-   "self_type" : "type-2601",
+   "referenced_type" : "type-2607",
+   "self_type" : "type-2606",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23323,8 +23389,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2839",
-   "self_type" : "type-2838",
+   "referenced_type" : "type-2841",
+   "self_type" : "type-2840",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23333,8 +23399,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2912",
-   "self_type" : "type-2911",
+   "referenced_type" : "type-2914",
+   "self_type" : "type-2913",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23343,8 +23409,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-3052",
-   "self_type" : "type-3051",
+   "referenced_type" : "type-3055",
+   "self_type" : "type-3054",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23353,8 +23419,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-3148",
-   "self_type" : "type-3147",
+   "referenced_type" : "type-3152",
+   "self_type" : "type-3151",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23363,8 +23429,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-3220",
-   "self_type" : "type-3219",
+   "referenced_type" : "type-3223",
+   "self_type" : "type-3222",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23373,8 +23439,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-426",
-   "self_type" : "type-425",
+   "referenced_type" : "type-423",
+   "self_type" : "type-422",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23383,8 +23449,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-646",
-   "self_type" : "type-645",
+   "referenced_type" : "type-647",
+   "self_type" : "type-646",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23393,8 +23459,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-756",
-   "self_type" : "type-755",
+   "referenced_type" : "type-757",
+   "self_type" : "type-756",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23413,8 +23479,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1016",
-   "self_type" : "type-1015",
+   "referenced_type" : "type-1008",
+   "self_type" : "type-1007",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -23423,8 +23489,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2183",
-   "self_type" : "type-2182",
+   "referenced_type" : "type-2177",
+   "self_type" : "type-2176",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -23433,8 +23499,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2735",
-   "self_type" : "type-2734",
+   "referenced_type" : "type-2737",
+   "self_type" : "type-2736",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -23443,8 +23509,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-3073",
-   "self_type" : "type-3072",
+   "referenced_type" : "type-3070",
+   "self_type" : "type-3069",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -23453,8 +23519,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-1980",
-   "self_type" : "type-1979",
+   "referenced_type" : "type-1976",
+   "self_type" : "type-1975",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23463,8 +23529,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-2246",
-   "self_type" : "type-2245",
+   "referenced_type" : "type-2249",
+   "self_type" : "type-2248",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23473,8 +23539,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-2727",
-   "self_type" : "type-2726",
+   "referenced_type" : "type-2729",
+   "self_type" : "type-2728",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23483,8 +23549,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-2845",
-   "self_type" : "type-2844",
+   "referenced_type" : "type-2847",
+   "self_type" : "type-2846",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23493,8 +23559,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-3365",
-   "self_type" : "type-3364",
+   "referenced_type" : "type-3368",
+   "self_type" : "type-3367",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23503,8 +23569,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-768",
-   "self_type" : "type-767",
+   "referenced_type" : "type-762",
+   "self_type" : "type-761",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23513,8 +23579,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_round_style",
    "name" : "const std::float_round_style",
-   "referenced_type" : "type-2046",
-   "self_type" : "type-2045",
+   "referenced_type" : "type-2045",
+   "self_type" : "type-2044",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23523,8 +23589,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_round_style",
    "name" : "const std::float_round_style",
-   "referenced_type" : "type-2248",
-   "self_type" : "type-2247",
+   "referenced_type" : "type-2251",
+   "self_type" : "type-2250",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23533,8 +23599,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_round_style",
    "name" : "const std::float_round_style",
-   "referenced_type" : "type-2730",
-   "self_type" : "type-2729",
+   "referenced_type" : "type-2732",
+   "self_type" : "type-2731",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23543,8 +23609,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_round_style",
    "name" : "const std::float_round_style",
-   "referenced_type" : "type-2915",
-   "self_type" : "type-2914",
+   "referenced_type" : "type-2917",
+   "self_type" : "type-2916",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23553,8 +23619,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_round_style",
    "name" : "const std::float_round_style",
-   "referenced_type" : "type-3367",
-   "self_type" : "type-3366",
+   "referenced_type" : "type-3370",
+   "self_type" : "type-3369",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23563,8 +23629,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_round_style",
    "name" : "const std::float_round_style",
-   "referenced_type" : "type-858",
-   "self_type" : "type-857",
+   "referenced_type" : "type-855",
+   "self_type" : "type-854",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23583,8 +23649,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<float (float)>",
    "name" : "const std::function<float (float)>",
-   "referenced_type" : "type-2267",
-   "self_type" : "type-2266",
+   "referenced_type" : "type-2268",
+   "self_type" : "type-2267",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -23593,8 +23659,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<float (float)>",
    "name" : "const std::function<float (float)>",
-   "referenced_type" : "type-2747",
-   "self_type" : "type-2746",
+   "referenced_type" : "type-2749",
+   "self_type" : "type-2748",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -23603,8 +23669,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<float (float)>",
    "name" : "const std::function<float (float)>",
-   "referenced_type" : "type-3192",
-   "self_type" : "type-3191",
+   "referenced_type" : "type-3195",
+   "self_type" : "type-3194",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -23613,8 +23679,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-1392",
-   "self_type" : "type-1391",
+   "referenced_type" : "type-1396",
+   "self_type" : "type-1395",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -23623,8 +23689,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-2514",
-   "self_type" : "type-2513",
+   "referenced_type" : "type-2519",
+   "self_type" : "type-2518",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -23633,8 +23699,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-2809",
-   "self_type" : "type-2808",
+   "referenced_type" : "type-2811",
+   "self_type" : "type-2810",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -23643,8 +23709,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-3611",
-   "self_type" : "type-3610",
+   "referenced_type" : "type-3617",
+   "self_type" : "type-3616",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -23653,8 +23719,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> >",
    "name" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> >",
-   "referenced_type" : "type-2143",
-   "self_type" : "type-2142",
+   "referenced_type" : "type-2145",
+   "self_type" : "type-2144",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -23663,8 +23729,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> >",
    "name" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> >",
-   "referenced_type" : "type-3300",
-   "self_type" : "type-3299",
+   "referenced_type" : "type-3303",
+   "self_type" : "type-3302",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -23683,8 +23749,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1032",
-   "self_type" : "type-1031",
+   "referenced_type" : "type-1033",
+   "self_type" : "type-1032",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23703,8 +23769,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1582",
-   "self_type" : "type-1581",
+   "referenced_type" : "type-1586",
+   "self_type" : "type-1585",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23713,8 +23779,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1713",
-   "self_type" : "type-1712",
+   "referenced_type" : "type-1714",
+   "self_type" : "type-1713",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23723,8 +23789,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1819",
-   "self_type" : "type-1818",
+   "referenced_type" : "type-1820",
+   "self_type" : "type-1819",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23733,8 +23799,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1888",
-   "self_type" : "type-1887",
+   "referenced_type" : "type-1890",
+   "self_type" : "type-1889",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23743,8 +23809,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1952",
-   "self_type" : "type-1951",
+   "referenced_type" : "type-1954",
+   "self_type" : "type-1953",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23753,8 +23819,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2021",
-   "self_type" : "type-2020",
+   "referenced_type" : "type-2024",
+   "self_type" : "type-2023",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23763,8 +23829,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2138",
-   "self_type" : "type-2137",
+   "referenced_type" : "type-2142",
+   "self_type" : "type-2141",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23773,8 +23839,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2199",
-   "self_type" : "type-2198",
+   "referenced_type" : "type-2202",
+   "self_type" : "type-2201",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23783,8 +23849,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2417",
-   "self_type" : "type-2416",
+   "referenced_type" : "type-2419",
+   "self_type" : "type-2418",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23793,8 +23859,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2551",
-   "self_type" : "type-2550",
+   "referenced_type" : "type-2556",
+   "self_type" : "type-2555",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23803,8 +23869,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2682",
-   "self_type" : "type-2681",
+   "referenced_type" : "type-2684",
+   "self_type" : "type-2683",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23813,8 +23879,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2795",
-   "self_type" : "type-2794",
+   "referenced_type" : "type-2797",
+   "self_type" : "type-2796",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23823,8 +23889,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2821",
-   "self_type" : "type-2820",
+   "referenced_type" : "type-2823",
+   "self_type" : "type-2822",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23833,8 +23899,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2872",
-   "self_type" : "type-2871",
+   "referenced_type" : "type-2874",
+   "self_type" : "type-2873",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23843,8 +23909,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2963",
-   "self_type" : "type-2962",
+   "referenced_type" : "type-2965",
+   "self_type" : "type-2964",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23853,8 +23919,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3044",
-   "self_type" : "type-3043",
+   "referenced_type" : "type-3047",
+   "self_type" : "type-3046",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23863,8 +23929,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3119",
-   "self_type" : "type-3118",
+   "referenced_type" : "type-3123",
+   "self_type" : "type-3122",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23873,8 +23939,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3202",
-   "self_type" : "type-3201",
+   "referenced_type" : "type-3205",
+   "self_type" : "type-3204",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23883,8 +23949,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3297",
-   "self_type" : "type-3296",
+   "referenced_type" : "type-326",
+   "self_type" : "type-325",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23893,8 +23959,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-329",
-   "self_type" : "type-328",
+   "referenced_type" : "type-3300",
+   "self_type" : "type-3299",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23903,8 +23969,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3348",
-   "self_type" : "type-3347",
+   "referenced_type" : "type-3351",
+   "self_type" : "type-3350",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23913,8 +23979,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3514",
-   "self_type" : "type-3513",
+   "referenced_type" : "type-3517",
+   "self_type" : "type-3516",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23923,8 +23989,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-46",
-   "self_type" : "type-45",
+   "referenced_type" : "type-476",
+   "self_type" : "type-475",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23933,8 +23999,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-479",
-   "self_type" : "type-478",
+   "referenced_type" : "type-48",
+   "self_type" : "type-47",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23953,8 +24019,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-727",
-   "self_type" : "type-726",
+   "referenced_type" : "type-728",
+   "self_type" : "type-727",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23963,8 +24029,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-833",
-   "self_type" : "type-832",
+   "referenced_type" : "type-834",
+   "self_type" : "type-833",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23973,8 +24039,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-960",
-   "self_type" : "type-959",
+   "referenced_type" : "type-962",
+   "self_type" : "type-961",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23983,8 +24049,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned char",
    "name" : "const unsigned char",
-   "referenced_type" : "type-218",
-   "self_type" : "type-224",
+   "referenced_type" : "type-220",
+   "self_type" : "type-226",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -23993,8 +24059,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned int",
    "name" : "const unsigned int",
-   "referenced_type" : "type-123",
-   "self_type" : "type-236",
+   "referenced_type" : "type-125",
+   "self_type" : "type-238",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
   },
@@ -24003,8 +24069,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned long long",
    "name" : "const unsigned long long",
-   "referenced_type" : "type-124",
-   "self_type" : "type-226",
+   "referenced_type" : "type-126",
+   "self_type" : "type-228",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -24022,7 +24088,7 @@
    "is_const" : true,
    "linker_set_key" : "const void",
    "name" : "const void",
-   "referenced_type" : "type-151",
+   "referenced_type" : "type-154",
    "self_type" : "type-1118",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -24031,8 +24097,8 @@
    "is_const" : true,
    "linker_set_key" : "unsigned int const[3]",
    "name" : "unsigned int const[3]",
-   "referenced_type" : "type-941",
-   "self_type" : "type-948",
+   "referenced_type" : "type-935",
+   "self_type" : "type-942",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -24042,7 +24108,7 @@
    "linker_set_key" : "volatile bool",
    "name" : "volatile bool",
    "referenced_type" : "type-6",
-   "self_type" : "type-270",
+   "self_type" : "type-266",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Thread.h"
   },
@@ -24051,8 +24117,8 @@
    "is_volatile" : true,
    "linker_set_key" : "volatile int",
    "name" : "volatile int",
-   "referenced_type" : "type-103",
-   "self_type" : "type-275",
+   "referenced_type" : "type-105",
+   "self_type" : "type-271",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   }
@@ -24065,48 +24131,48 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "layers",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "format",
      "field_offset" : 96,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "usage",
      "field_offset" : 128,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "stride",
      "field_offset" : 192,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "rfu0",
      "field_offset" : 224,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "rfu1",
      "field_offset" : 256,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "AHardwareBuffer_Desc",
    "name" : "AHardwareBuffer_Desc",
-   "referenced_type" : "type-683",
-   "self_type" : "type-683",
+   "referenced_type" : "type-685",
+   "self_type" : "type-685",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
    "unique_id" : "AHardwareBuffer_Desc"
@@ -24117,23 +24183,23 @@
    [
     {
      "field_name" : "data",
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "pixelStride",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "rowStride",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "linker_set_key" : "AHardwareBuffer_Plane",
    "name" : "AHardwareBuffer_Plane",
-   "referenced_type" : "type-509",
-   "self_type" : "type-509",
+   "referenced_type" : "type-506",
+   "self_type" : "type-506",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
    "unique_id" : "AHardwareBuffer_Plane"
@@ -24144,18 +24210,18 @@
    [
     {
      "field_name" : "planeCount",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "planes",
      "field_offset" : 32,
-     "referenced_type" : "type-508"
+     "referenced_type" : "type-505"
     }
    ],
    "linker_set_key" : "AHardwareBuffer_Planes",
    "name" : "AHardwareBuffer_Planes",
-   "referenced_type" : "type-507",
-   "self_type" : "type-507",
+   "referenced_type" : "type-504",
+   "self_type" : "type-504",
    "size" : 52,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
    "unique_id" : "AHardwareBuffer_Planes"
@@ -24166,63 +24232,63 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-518"
+     "referenced_type" : "type-516"
     },
     {
      "field_name" : "width",
      "field_offset" : 256,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "height",
      "field_offset" : 288,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "stride",
      "field_offset" : 320,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "format",
      "field_offset" : 352,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "usage_deprecated",
      "field_offset" : 384,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "layerCount",
      "field_offset" : 416,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 448,
-     "referenced_type" : "type-523"
+     "referenced_type" : "type-521"
     },
     {
      "field_name" : "handle",
      "field_offset" : 480,
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
      "field_name" : "usage",
      "field_offset" : 512,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "reserved_proc",
      "field_offset" : 576,
-     "referenced_type" : "type-524"
+     "referenced_type" : "type-522"
     }
    ],
    "linker_set_key" : "ANativeWindowBuffer",
    "name" : "ANativeWindowBuffer",
-   "referenced_type" : "type-517",
-   "self_type" : "type-517",
+   "referenced_type" : "type-515",
+   "self_type" : "type-515",
    "size" : 96,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
    "unique_id" : "ANativeWindowBuffer"
@@ -24233,22 +24299,22 @@
    [
     {
      "field_name" : "left",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "top",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "right",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "bottom",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "ARect",
@@ -24265,7 +24331,7 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-547"
+     "referenced_type" : "type-544"
     },
     {
      "field_name" : "alloc",
@@ -24301,20 +24367,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-517"
+     "referenced_type" : "type-515"
     },
     {
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
    "name" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
    "record_kind" : "class",
-   "referenced_type" : "type-516",
-   "self_type" : "type-516",
+   "referenced_type" : "type-514",
+   "self_type" : "type-514",
    "size" : 104,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h",
-   "template_args" : [ "type-517", "type-525", "type-172", "type-518" ],
+   "template_args" : [ "type-515", "type-523", "type-175", "type-516" ],
    "unique_id" : "_ZTSN7android17ANativeObjectBaseI19ANativeWindowBufferNS_13GraphicBufferENS_7RefBaseE21android_native_base_tEE",
    "vtable_components" :
    [
@@ -24402,7 +24468,7 @@
      "access" : "private",
      "field_name" : "mWhitePoint",
      "field_offset" : 1664,
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     }
    ],
    "linker_set_key" : "android::ColorSpace",
@@ -24509,14 +24575,14 @@
     {
      "access" : "private",
      "field_name" : "mCond",
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-255"
     }
    ],
    "linker_set_key" : "android::Condition",
    "name" : "android::Condition",
    "record_kind" : "class",
-   "referenced_type" : "type-258",
-   "self_type" : "type-258",
+   "referenced_type" : "type-254",
+   "self_type" : "type-254",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "unique_id" : "_ZTSN7android9ConditionE"
@@ -24557,13 +24623,13 @@
     {
      "access" : "private",
      "field_name" : "mState",
-     "referenced_type" : "type-1377"
+     "referenced_type" : "type-1382"
     },
     {
      "access" : "private",
      "field_name" : "mMutex",
      "field_offset" : 32,
-     "referenced_type" : "type-1379"
+     "referenced_type" : "type-1384"
     },
     {
      "access" : "private",
@@ -24575,14 +24641,14 @@
      "access" : "private",
      "field_name" : "mSignalTime",
      "field_offset" : 128,
-     "referenced_type" : "type-1380"
+     "referenced_type" : "type-1385"
     }
    ],
    "linker_set_key" : "android::FenceTime",
    "name" : "android::FenceTime",
    "record_kind" : "class",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1376",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1381",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android9FenceTimeE"
@@ -24592,14 +24658,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1385"
+     "referenced_type" : "type-1389"
     }
    ],
    "fields" :
    [
     {
      "field_name" : "state",
-     "referenced_type" : "type-1384"
+     "referenced_type" : "type-1388"
     },
     {
      "field_name" : "fence",
@@ -24609,13 +24675,13 @@
     {
      "field_name" : "signalTime",
      "field_offset" : 64,
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
    "linker_set_key" : "android::FenceTime::Snapshot",
    "name" : "android::FenceTime::Snapshot",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1383",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1387",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android9FenceTime8SnapshotE"
@@ -24627,20 +24693,20 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-1398"
+     "referenced_type" : "type-1402"
     },
     {
      "access" : "private",
      "field_name" : "mQueue",
      "field_offset" : 32,
-     "referenced_type" : "type-1399"
+     "referenced_type" : "type-1403"
     }
    ],
    "linker_set_key" : "android::FenceTimeline",
    "name" : "android::FenceTimeline",
    "record_kind" : "class",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1397",
+   "referenced_type" : "type-1401",
+   "self_type" : "type-1401",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android13FenceTimelineE"
@@ -24652,20 +24718,20 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-1403"
+     "referenced_type" : "type-1407"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-1404"
+     "referenced_type" : "type-1408"
     }
    ],
    "linker_set_key" : "android::FenceToFenceTimeMap",
    "name" : "android::FenceToFenceTimeMap",
    "record_kind" : "class",
-   "referenced_type" : "type-1402",
-   "self_type" : "type-1402",
+   "referenced_type" : "type-1406",
+   "self_type" : "type-1406",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android19FenceToFenceTimeMapE"
@@ -24687,11 +24753,11 @@
    "linker_set_key" : "android::Flattenable<android::FenceTime::Snapshot>",
    "name" : "android::Flattenable<android::FenceTime::Snapshot>",
    "record_kind" : "class",
-   "referenced_type" : "type-1385",
-   "self_type" : "type-1385",
+   "referenced_type" : "type-1389",
+   "self_type" : "type-1389",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1383" ],
+   "template_args" : [ "type-1387" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_9FenceTime8SnapshotEEE"
   },
   {
@@ -24699,11 +24765,11 @@
    "linker_set_key" : "android::Flattenable<android::GraphicBuffer>",
    "name" : "android::Flattenable<android::GraphicBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-532",
-   "self_type" : "type-532",
+   "referenced_type" : "type-530",
+   "self_type" : "type-530",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-525" ],
+   "template_args" : [ "type-523" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_13GraphicBufferEEE"
   },
   {
@@ -24755,36 +24821,36 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1419"
+     "referenced_type" : "type-1423"
     }
    ],
    "fields" :
    [
     {
      "field_name" : "refreshPeriodNano",
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     },
     {
      "field_name" : "desiredPresentTimesNano",
      "field_offset" : 64,
-     "referenced_type" : "type-1421"
+     "referenced_type" : "type-1425"
     },
     {
      "field_name" : "actualPresentTimesNano",
      "field_offset" : 224,
-     "referenced_type" : "type-1421"
+     "referenced_type" : "type-1425"
     },
     {
      "field_name" : "frameReadyTimesNano",
      "field_offset" : 384,
-     "referenced_type" : "type-1421"
+     "referenced_type" : "type-1425"
     }
    ],
    "linker_set_key" : "android::FrameStats",
    "name" : "android::FrameStats",
    "record_kind" : "class",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1420",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1424",
    "size" : 72,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h",
    "unique_id" : "_ZTSN7android10FrameStatsE"
@@ -24794,7 +24860,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-359"
+     "referenced_type" : "type-356"
     }
    ],
    "fields" :
@@ -24803,20 +24869,20 @@
      "access" : "private",
      "field_name" : "mMapper",
      "field_offset" : 32,
-     "referenced_type" : "type-354"
+     "referenced_type" : "type-351"
     },
     {
      "access" : "private",
      "field_name" : "mAllocator",
      "field_offset" : 64,
-     "referenced_type" : "type-355"
+     "referenced_type" : "type-352"
     }
    ],
    "linker_set_key" : "android::Gralloc2Allocator",
    "name" : "android::Gralloc2Allocator",
    "record_kind" : "class",
-   "referenced_type" : "type-353",
-   "self_type" : "type-353",
+   "referenced_type" : "type-350",
+   "self_type" : "type-350",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h",
    "unique_id" : "_ZTSN7android17Gralloc2AllocatorE",
@@ -24853,7 +24919,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-342"
+     "referenced_type" : "type-339"
     }
    ],
    "fields" :
@@ -24862,20 +24928,20 @@
      "access" : "private",
      "field_name" : "mMapper",
      "field_offset" : 32,
-     "referenced_type" : "type-338"
+     "referenced_type" : "type-335"
     },
     {
      "access" : "private",
      "field_name" : "mMapperV2_1",
      "field_offset" : 64,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-88"
     }
    ],
    "linker_set_key" : "android::Gralloc2Mapper",
    "name" : "android::Gralloc2Mapper",
    "record_kind" : "class",
-   "referenced_type" : "type-337",
-   "self_type" : "type-337",
+   "referenced_type" : "type-334",
+   "self_type" : "type-334",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h",
    "unique_id" : "_ZTSN7android14Gralloc2MapperE",
@@ -24933,10 +24999,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-516"
+     "referenced_type" : "type-514"
     },
     {
-     "referenced_type" : "type-532"
+     "referenced_type" : "type-530"
     }
    ],
    "fields" :
@@ -24945,62 +25011,62 @@
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 832,
-     "referenced_type" : "type-218"
+     "referenced_type" : "type-220"
     },
     {
      "access" : "private",
      "field_name" : "mBufferMapper",
      "field_offset" : 864,
-     "referenced_type" : "type-526"
+     "referenced_type" : "type-524"
     },
     {
      "access" : "private",
      "field_name" : "mInitCheck",
      "field_offset" : 896,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mTransportNumFds",
      "field_offset" : 928,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mTransportNumInts",
      "field_offset" : 960,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mId",
      "field_offset" : 1024,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
      "field_name" : "mBufferId",
      "field_offset" : 1088,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mGenerationNumber",
      "field_offset" : 1120,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mDeathCallbacks",
      "field_offset" : 1152,
-     "referenced_type" : "type-531"
+     "referenced_type" : "type-529"
     }
    ],
    "linker_set_key" : "android::GraphicBuffer",
    "name" : "android::GraphicBuffer",
    "record_kind" : "class",
-   "referenced_type" : "type-525",
-   "self_type" : "type-525",
+   "referenced_type" : "type-523",
+   "self_type" : "type-523",
    "size" : 160,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h",
    "unique_id" : "_ZTSN7android13GraphicBufferE",
@@ -25040,7 +25106,91 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "protected",
+     "field_name" : "mMapper",
+     "referenced_type" : "type-524"
+    },
+    {
+     "access" : "protected",
+     "field_name" : "mAllocator",
+     "field_offset" : 32,
+     "referenced_type" : "type-540"
+    }
+   ],
+   "linker_set_key" : "android::GraphicBufferAllocator",
+   "name" : "android::GraphicBufferAllocator",
+   "record_kind" : "class",
+   "referenced_type" : "type-539",
+   "self_type" : "type-539",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h",
+   "unique_id" : "_ZTSN7android22GraphicBufferAllocatorE"
+  },
+  {
+   "access" : "protected",
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "width",
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "height",
+     "field_offset" : 32,
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "stride",
+     "field_offset" : 64,
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "format",
+     "field_offset" : 96,
+     "referenced_type" : "type-105"
+    },
+    {
+     "field_name" : "layerCount",
+     "field_offset" : 128,
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "usage",
+     "field_offset" : 192,
+     "referenced_type" : "type-126"
+    },
+    {
+     "field_name" : "size",
+     "field_offset" : 256,
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "requestorName",
+     "field_offset" : 288,
+     "referenced_type" : "type-681"
+    }
+   ],
+   "linker_set_key" : "android::GraphicBufferAllocator::alloc_rec_t",
+   "name" : "android::GraphicBufferAllocator::alloc_rec_t",
+   "referenced_type" : "type-680",
+   "self_type" : "type-680",
+   "size" : 48,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h",
+   "unique_id" : "_ZTSN7android22GraphicBufferAllocator11alloc_rec_tE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-528"
     }
    ],
    "fields" :
@@ -25052,100 +25202,16 @@
     },
     {
      "access" : "private",
-     "field_name" : "mAllocator",
-     "field_offset" : 32,
-     "referenced_type" : "type-543"
-    }
-   ],
-   "linker_set_key" : "android::GraphicBufferAllocator",
-   "name" : "android::GraphicBufferAllocator",
-   "record_kind" : "class",
-   "referenced_type" : "type-542",
-   "self_type" : "type-542",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h",
-   "unique_id" : "_ZTSN7android22GraphicBufferAllocatorE"
-  },
-  {
-   "access" : "private",
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "width",
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "height",
-     "field_offset" : 32,
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "stride",
-     "field_offset" : 64,
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "format",
-     "field_offset" : 96,
-     "referenced_type" : "type-103"
-    },
-    {
-     "field_name" : "layerCount",
-     "field_offset" : 128,
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "usage",
-     "field_offset" : 192,
-     "referenced_type" : "type-124"
-    },
-    {
-     "field_name" : "size",
-     "field_offset" : 256,
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "requestorName",
-     "field_offset" : 288,
-     "referenced_type" : "type-677"
-    }
-   ],
-   "linker_set_key" : "android::GraphicBufferAllocator::alloc_rec_t",
-   "name" : "android::GraphicBufferAllocator::alloc_rec_t",
-   "referenced_type" : "type-676",
-   "self_type" : "type-676",
-   "size" : 48,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h",
-   "unique_id" : "_ZTSN7android22GraphicBufferAllocator11alloc_rec_tE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-530"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMapper",
-     "referenced_type" : "type-528"
-    },
-    {
-     "access" : "private",
      "field_name" : "mMapperVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-529"
+     "referenced_type" : "type-527"
     }
    ],
    "linker_set_key" : "android::GraphicBufferMapper",
    "name" : "android::GraphicBufferMapper",
    "record_kind" : "class",
-   "referenced_type" : "type-527",
-   "self_type" : "type-527",
+   "referenced_type" : "type-525",
+   "self_type" : "type-525",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h",
    "unique_id" : "_ZTSN7android19GraphicBufferMapperE"
@@ -25200,17 +25266,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-235"
     }
    ],
    "linker_set_key" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
    "name" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
    "record_kind" : "class",
-   "referenced_type" : "type-247",
-   "self_type" : "type-247",
+   "referenced_type" : "type-249",
+   "self_type" : "type-249",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-179", "type-248" ],
+   "template_args" : [ "type-182", "type-250" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
   },
   {
@@ -25226,11 +25292,11 @@
    "linker_set_key" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "record_kind" : "class",
-   "referenced_type" : "type-715",
-   "self_type" : "type-715",
+   "referenced_type" : "type-716",
+   "self_type" : "type-716",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-142", "type-676" ],
+   "template_args" : [ "type-145", "type-680" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -25238,11 +25304,11 @@
    "linker_set_key" : "android::LightFlattenable<android::FrameStats>",
    "name" : "android::LightFlattenable<android::FrameStats>",
    "record_kind" : "class",
-   "referenced_type" : "type-1419",
-   "self_type" : "type-1419",
+   "referenced_type" : "type-1423",
+   "self_type" : "type-1423",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1420" ],
+   "template_args" : [ "type-1424" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_10FrameStatsEEE"
   },
   {
@@ -25286,11 +25352,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Region>",
    "name" : "android::LightFlattenable<android::Region>",
    "record_kind" : "class",
-   "referenced_type" : "type-2222",
-   "self_type" : "type-2222",
+   "referenced_type" : "type-2225",
+   "self_type" : "type-2225",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-2221" ],
+   "template_args" : [ "type-2224" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_6RegionEEE"
   },
   {
@@ -25396,14 +25462,14 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-281"
     }
    ],
    "linker_set_key" : "android::Mutex",
    "name" : "android::Mutex",
    "record_kind" : "class",
-   "referenced_type" : "type-252",
-   "self_type" : "type-252",
+   "referenced_type" : "type-280",
+   "self_type" : "type-280",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5MutexE"
@@ -25415,14 +25481,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-256"
+     "referenced_type" : "type-1379"
     }
    ],
    "linker_set_key" : "android::Mutex::Autolock",
    "name" : "android::Mutex::Autolock",
    "record_kind" : "class",
-   "referenced_type" : "type-255",
-   "self_type" : "type-255",
+   "referenced_type" : "type-1378",
+   "self_type" : "type-1378",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5Mutex8AutolockE"
@@ -25471,12 +25537,12 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "y",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::Point",
@@ -25495,14 +25561,14 @@
     {
      "access" : "private",
      "field_name" : "mRWLock",
-     "referenced_type" : "type-263"
+     "referenced_type" : "type-259"
     }
    ],
    "linker_set_key" : "android::RWLock",
    "name" : "android::RWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-262",
-   "self_type" : "type-262",
+   "referenced_type" : "type-258",
+   "self_type" : "type-258",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLockE"
@@ -25514,14 +25580,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-262"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoRLock",
    "name" : "android::RWLock::AutoRLock",
    "record_kind" : "class",
-   "referenced_type" : "type-265",
-   "self_type" : "type-265",
+   "referenced_type" : "type-261",
+   "self_type" : "type-261",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
@@ -25533,14 +25599,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-262"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoWLock",
    "name" : "android::RWLock::AutoWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-268",
-   "self_type" : "type-268",
+   "referenced_type" : "type-264",
+   "self_type" : "type-264",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
@@ -25573,14 +25639,14 @@
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 32,
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-176"
     }
    ],
    "linker_set_key" : "android::RefBase",
    "name" : "android::RefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-172",
-   "self_type" : "type-172",
+   "referenced_type" : "type-175",
+   "self_type" : "type-175",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBaseE",
@@ -25620,8 +25686,8 @@
    "linker_set_key" : "android::RefBase::weakref_type",
    "name" : "android::RefBase::weakref_type",
    "record_kind" : "class",
-   "referenced_type" : "type-198",
-   "self_type" : "type-198",
+   "referenced_type" : "type-211",
+   "self_type" : "type-211",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBase12weakref_typeE"
@@ -25667,7 +25733,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2222"
+     "referenced_type" : "type-2225"
     }
    ],
    "fields" :
@@ -25675,14 +25741,14 @@
     {
      "access" : "private",
      "field_name" : "mStorage",
-     "referenced_type" : "type-2213"
+     "referenced_type" : "type-2216"
     }
    ],
    "linker_set_key" : "android::Region",
    "name" : "android::Region",
    "record_kind" : "class",
-   "referenced_type" : "type-2221",
-   "self_type" : "type-2221",
+   "referenced_type" : "type-2224",
+   "self_type" : "type-2224",
    "size" : 20,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h",
    "unique_id" : "_ZTSN7android6RegionE"
@@ -25694,7 +25760,7 @@
     {
      "access" : "private",
      "field_name" : "mTag",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "android::ScopedTrace",
@@ -25711,11 +25777,11 @@
    "linker_set_key" : "android::Singleton<android::GraphicBufferAllocator>",
    "name" : "android::Singleton<android::GraphicBufferAllocator>",
    "record_kind" : "class",
-   "referenced_type" : "type-541",
-   "self_type" : "type-541",
+   "referenced_type" : "type-538",
+   "self_type" : "type-538",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-542" ],
+   "template_args" : [ "type-539" ],
    "unique_id" : "_ZTSN7android9SingletonINS_22GraphicBufferAllocatorEEE"
   },
   {
@@ -25723,11 +25789,11 @@
    "linker_set_key" : "android::Singleton<android::GraphicBufferMapper>",
    "name" : "android::Singleton<android::GraphicBufferMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-530",
-   "self_type" : "type-530",
+   "referenced_type" : "type-528",
+   "self_type" : "type-528",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-527" ],
+   "template_args" : [ "type-525" ],
    "unique_id" : "_ZTSN7android9SingletonINS_19GraphicBufferMapperEEE"
   },
   {
@@ -25736,17 +25802,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-234"
+     "referenced_type" : "type-236"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
    "name" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-233",
-   "self_type" : "type-233",
+   "referenced_type" : "type-235",
+   "self_type" : "type-235",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-237" ],
+   "template_args" : [ "type-239" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
    "vtable_components" :
    [
@@ -25794,7 +25860,7 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-234"
+     "referenced_type" : "type-236"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
@@ -25851,14 +25917,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::SortedVectorImpl",
    "name" : "android::SortedVectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-234",
-   "self_type" : "type-234",
+   "referenced_type" : "type-236",
+   "self_type" : "type-236",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android16SortedVectorImplE",
@@ -25916,14 +25982,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-180"
+     "referenced_type" : "type-183"
     }
    ],
    "linker_set_key" : "android::String16",
    "name" : "android::String16",
    "record_kind" : "class",
-   "referenced_type" : "type-179",
-   "self_type" : "type-179",
+   "referenced_type" : "type-182",
+   "self_type" : "type-182",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "unique_id" : "_ZTSN7android8String16E"
@@ -25935,14 +26001,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     }
    ],
    "linker_set_key" : "android::String8",
    "name" : "android::String8",
    "record_kind" : "class",
-   "referenced_type" : "type-285",
-   "self_type" : "type-285",
+   "referenced_type" : "type-282",
+   "self_type" : "type-282",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "unique_id" : "_ZTSN7android7String8E"
@@ -25953,7 +26019,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "fields" :
@@ -25962,62 +26028,62 @@
      "access" : "private",
      "field_name" : "mCanCallJava",
      "field_offset" : 32,
-     "referenced_type" : "type-370"
+     "referenced_type" : "type-367"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 64,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 96,
-     "referenced_type" : "type-252"
+     "referenced_type" : "type-280"
     },
     {
      "access" : "private",
      "field_name" : "mThreadExitedCondition",
      "field_offset" : 128,
-     "referenced_type" : "type-258"
+     "referenced_type" : "type-254"
     },
     {
      "access" : "private",
      "field_name" : "mStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mExitPending",
      "field_offset" : 192,
-     "referenced_type" : "type-270"
+     "referenced_type" : "type-266"
     },
     {
      "access" : "private",
      "field_name" : "mRunning",
      "field_offset" : 200,
-     "referenced_type" : "type-270"
+     "referenced_type" : "type-266"
     },
     {
      "access" : "private",
      "field_name" : "mHoldSelf",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-364"
     },
     {
      "access" : "private",
      "field_name" : "mTid",
      "field_offset" : 256,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::Thread",
    "name" : "android::Thread",
    "record_kind" : "class",
-   "referenced_type" : "type-369",
-   "self_type" : "type-369",
+   "referenced_type" : "type-366",
+   "self_type" : "type-366",
    "size" : 44,
    "source_file" : "/system/core/libutils/include/utils/Thread.h",
    "unique_id" : "_ZTSN7android6ThreadE",
@@ -26107,14 +26173,14 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::Rect>",
    "name" : "android::Vector<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-2213",
-   "self_type" : "type-2213",
+   "referenced_type" : "type-2216",
+   "self_type" : "type-2216",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-1241" ],
@@ -26162,17 +26228,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::RefBase *>",
    "name" : "android::Vector<android::RefBase *>",
    "record_kind" : "class",
-   "referenced_type" : "type-245",
-   "self_type" : "type-245",
+   "referenced_type" : "type-247",
+   "self_type" : "type-247",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-246" ],
+   "template_args" : [ "type-248" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7RefBaseEEE",
    "vtable_components" :
    [
@@ -26217,17 +26283,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::RefBase::weakref_type *>",
    "name" : "android::Vector<android::RefBase::weakref_type *>",
    "record_kind" : "class",
-   "referenced_type" : "type-244",
-   "self_type" : "type-244",
+   "referenced_type" : "type-246",
+   "self_type" : "type-246",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-197" ],
+   "template_args" : [ "type-210" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7RefBase12weakref_typeEEE",
    "vtable_components" :
    [
@@ -26272,17 +26338,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::BHwBinder *>",
    "name" : "android::Vector<android::hardware::BHwBinder *>",
    "record_kind" : "class",
-   "referenced_type" : "type-240",
-   "self_type" : "type-240",
+   "referenced_type" : "type-242",
+   "self_type" : "type-242",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-241" ],
+   "template_args" : [ "type-243" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_8hardware9BHwBinderEEE",
    "vtable_components" :
    [
@@ -26327,17 +26393,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "record_kind" : "class",
-   "referenced_type" : "type-238",
-   "self_type" : "type-238",
+   "referenced_type" : "type-240",
+   "self_type" : "type-240",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-239" ],
+   "template_args" : [ "type-241" ],
    "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
    "vtable_components" :
    [
@@ -26382,17 +26448,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<long long>",
    "name" : "android::Vector<long long>",
    "record_kind" : "class",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1421",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1425",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android6VectorIxEE",
    "vtable_components" :
    [
@@ -26439,32 +26505,32 @@
      "access" : "private",
      "field_name" : "mStorage",
      "field_offset" : 32,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "access" : "private",
      "field_name" : "mCount",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mFlags",
      "field_offset" : 96,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "access" : "private",
      "field_name" : "mItemSize",
      "field_offset" : 128,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     }
    ],
    "linker_set_key" : "android::VectorImpl",
    "name" : "android::VectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-235",
-   "self_type" : "type-235",
+   "referenced_type" : "type-237",
+   "self_type" : "type-237",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android10VectorImplE",
@@ -26550,11 +26616,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::aggregate_traits<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-824",
-   "self_type" : "type-824",
+   "referenced_type" : "type-825",
+   "self_type" : "type-825",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142", "type-676" ],
+   "template_args" : [ "type-145", "type-680" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -26574,7 +26640,7 @@
     {
      "access" : "private",
      "field_name" : "fd_",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser>",
@@ -26639,28 +26705,28 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2254"
+     "referenced_type" : "type-2257"
+    },
+    {
+     "referenced_type" : "type-2258"
     },
     {
      "referenced_type" : "type-2255"
     },
     {
-     "referenced_type" : "type-2252"
-    },
-    {
-     "referenced_type" : "type-2265"
-    },
-    {
-     "referenced_type" : "type-2268"
+     "referenced_type" : "type-2269"
     },
     {
      "referenced_type" : "type-2270"
     },
     {
-     "referenced_type" : "type-2269"
+     "referenced_type" : "type-2272"
     },
     {
-     "referenced_type" : "type-2272"
+     "referenced_type" : "type-2271"
+    },
+    {
+     "referenced_type" : "type-2274"
     }
    ],
    "fields" :
@@ -26668,14 +26734,14 @@
     {
      "access" : "private",
      "field_name" : "m_value",
-     "referenced_type" : "type-2277"
+     "referenced_type" : "type-2279"
     }
    ],
    "linker_set_key" : "android::details::TMat44<float>",
    "name" : "android::details::TMat44<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2276",
-   "self_type" : "type-2276",
+   "referenced_type" : "type-2278",
+   "self_type" : "type-2278",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h",
    "template_args" : [ "type-10" ],
@@ -26698,8 +26764,8 @@
    "linker_set_key" : "android::details::TMatDebug<android::details::TMat44, float>",
    "name" : "android::details::TMatDebug<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2272",
-   "self_type" : "type-2272",
+   "referenced_type" : "type-2274",
+   "self_type" : "type-2274",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26722,8 +26788,8 @@
    "linker_set_key" : "android::details::TMatHelpers<android::details::TMat44, float>",
    "name" : "android::details::TMatHelpers<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2269",
-   "self_type" : "type-2269",
+   "referenced_type" : "type-2271",
+   "self_type" : "type-2271",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26746,8 +26812,8 @@
    "linker_set_key" : "android::details::TMatProductOperators<android::details::TMat44, float>",
    "name" : "android::details::TMatProductOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2265",
-   "self_type" : "type-2265",
+   "referenced_type" : "type-2269",
+   "self_type" : "type-2269",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26770,8 +26836,8 @@
    "linker_set_key" : "android::details::TMatSquareFunctions<android::details::TMat44, float>",
    "name" : "android::details::TMatSquareFunctions<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2268",
-   "self_type" : "type-2268",
+   "referenced_type" : "type-2270",
+   "self_type" : "type-2270",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26794,8 +26860,8 @@
    "linker_set_key" : "android::details::TMatTransform<android::details::TMat44, float>",
    "name" : "android::details::TMatTransform<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2270",
-   "self_type" : "type-2270",
+   "referenced_type" : "type-2272",
+   "self_type" : "type-2272",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26806,11 +26872,11 @@
    "linker_set_key" : "android::details::TQuatDebug<android::details::TQuaternion, double>",
    "name" : "android::details::TQuatDebug<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-49",
-   "self_type" : "type-49",
+   "referenced_type" : "type-51",
+   "self_type" : "type-51",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details10TQuatDebugINS0_11TQuaternionEdEE"
   },
   {
@@ -26818,8 +26884,8 @@
    "linker_set_key" : "android::details::TQuatDebug<android::details::TQuaternion, float>",
    "name" : "android::details::TQuatDebug<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-48",
-   "self_type" : "type-48",
+   "referenced_type" : "type-50",
+   "self_type" : "type-50",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26830,11 +26896,11 @@
    "linker_set_key" : "android::details::TQuatFunctions<android::details::TQuaternion, double>",
    "name" : "android::details::TQuatFunctions<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-47",
-   "self_type" : "type-47",
+   "referenced_type" : "type-49",
+   "self_type" : "type-49",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details14TQuatFunctionsINS0_11TQuaternionEdEE"
   },
   {
@@ -26842,8 +26908,8 @@
    "linker_set_key" : "android::details::TQuatFunctions<android::details::TQuaternion, float>",
    "name" : "android::details::TQuatFunctions<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-43",
-   "self_type" : "type-43",
+   "referenced_type" : "type-45",
+   "self_type" : "type-45",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26854,11 +26920,11 @@
    "linker_set_key" : "android::details::TQuatProductOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TQuatProductOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-40",
-   "self_type" : "type-40",
+   "referenced_type" : "type-42",
+   "self_type" : "type-42",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details21TQuatProductOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -26878,38 +26944,38 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-334"
+     "referenced_type" : "type-331"
     },
     {
-     "referenced_type" : "type-335"
+     "referenced_type" : "type-332"
     },
     {
-     "referenced_type" : "type-336"
+     "referenced_type" : "type-333"
     },
     {
-     "referenced_type" : "type-40"
-    },
-    {
-     "referenced_type" : "type-47"
+     "referenced_type" : "type-42"
     },
     {
      "referenced_type" : "type-49"
+    },
+    {
+     "referenced_type" : "type-51"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-332"
+     "referenced_type" : "type-329"
     }
    ],
    "linker_set_key" : "android::details::TQuaternion<double>",
    "name" : "android::details::TQuaternion<double>",
    "record_kind" : "class",
-   "referenced_type" : "type-331",
-   "self_type" : "type-331",
+   "referenced_type" : "type-328",
+   "self_type" : "type-328",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details11TQuaternionIdEE"
   },
   {
@@ -26917,27 +26983,27 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-330"
     },
     {
      "field_name" : "xyzw",
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-52"
     },
     {
      "field_name" : "xyz",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-68"
     },
     {
      "field_name" : "xy",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "name" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "record_kind" : "union",
-   "referenced_type" : "type-332",
-   "self_type" : "type-332",
+   "referenced_type" : "type-329",
+   "self_type" : "type-329",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIdEUt_E"
@@ -26948,29 +27014,29 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "z",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "w",
      "field_offset" : 192,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
    "name" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
-   "referenced_type" : "type-333",
-   "self_type" : "type-333",
+   "referenced_type" : "type-330",
+   "self_type" : "type-330",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIdEUt_Ut_E"
@@ -26980,35 +27046,35 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-413"
+     "referenced_type" : "type-410"
     },
     {
-     "referenced_type" : "type-414"
+     "referenced_type" : "type-411"
     },
     {
-     "referenced_type" : "type-415"
+     "referenced_type" : "type-412"
     },
     {
      "referenced_type" : "type-38"
     },
     {
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-50"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-411"
+     "referenced_type" : "type-408"
     }
    ],
    "linker_set_key" : "android::details::TQuaternion<float>",
    "name" : "android::details::TQuaternion<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-410",
-   "self_type" : "type-410",
+   "referenced_type" : "type-407",
+   "self_type" : "type-407",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "template_args" : [ "type-10" ],
@@ -27019,27 +27085,27 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-412"
+     "referenced_type" : "type-409"
     },
     {
      "field_name" : "xyzw",
-     "referenced_type" : "type-200"
+     "referenced_type" : "type-192"
     },
     {
      "field_name" : "xyz",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-18"
     },
     {
      "field_name" : "xy",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "name" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "record_kind" : "union",
-   "referenced_type" : "type-411",
-   "self_type" : "type-411",
+   "referenced_type" : "type-408",
+   "self_type" : "type-408",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIfEUt_E"
@@ -27071,8 +27137,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
    "name" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
-   "referenced_type" : "type-412",
-   "self_type" : "type-412",
+   "referenced_type" : "type-409",
+   "self_type" : "type-409",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIfEUt_Ut_E"
@@ -27082,16 +27148,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-396"
+     "referenced_type" : "type-390"
     },
     {
-     "referenced_type" : "type-427"
+     "referenced_type" : "type-424"
     },
     {
-     "referenced_type" : "type-462"
+     "referenced_type" : "type-455"
     },
     {
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-507"
     },
     {
      "referenced_type" : "type-600"
@@ -27214,12 +27280,6 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-61"
-    },
-    {
      "referenced_type" : "type-62"
     },
     {
@@ -27230,22 +27290,28 @@
     },
     {
      "referenced_type" : "type-65"
+    },
+    {
+     "referenced_type" : "type-66"
+    },
+    {
+     "referenced_type" : "type-67"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-58"
     }
    ],
    "linker_set_key" : "android::details::TVec2<double>",
    "name" : "android::details::TVec2<double>",
    "record_kind" : "class",
-   "referenced_type" : "type-55",
-   "self_type" : "type-55",
+   "referenced_type" : "type-57",
+   "self_type" : "type-57",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details5TVec2IdEE"
   },
   {
@@ -27253,21 +27319,21 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-57"
-    },
-    {
-     "referenced_type" : "type-58"
-    },
-    {
      "referenced_type" : "type-59"
+    },
+    {
+     "referenced_type" : "type-60"
+    },
+    {
+     "referenced_type" : "type-61"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5) at frameworks/native/libs/math/include/math/vec2.h:49:5",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5) at frameworks/native/libs/math/include/math/vec2.h:49:5",
    "record_kind" : "union",
-   "referenced_type" : "type-56",
-   "self_type" : "type-56",
+   "referenced_type" : "type-58",
+   "self_type" : "type-58",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_E"
@@ -27278,19 +27344,19 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:50:9) at frameworks/native/libs/math/include/math/vec2.h:50:9",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:50:9) at frameworks/native/libs/math/include/math/vec2.h:50:9",
-   "referenced_type" : "type-57",
-   "self_type" : "type-57",
+   "referenced_type" : "type-59",
+   "self_type" : "type-59",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_Ut_E"
@@ -27301,19 +27367,19 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "t",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:51:9) at frameworks/native/libs/math/include/math/vec2.h:51:9",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:51:9) at frameworks/native/libs/math/include/math/vec2.h:51:9",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
+   "referenced_type" : "type-60",
+   "self_type" : "type-60",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_Ut0_E"
@@ -27324,19 +27390,19 @@
    [
     {
      "field_name" : "r",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "g",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:52:9) at frameworks/native/libs/math/include/math/vec2.h:52:9",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:52:9) at frameworks/native/libs/math/include/math/vec2.h:52:9",
-   "referenced_type" : "type-59",
-   "self_type" : "type-59",
+   "referenced_type" : "type-61",
+   "self_type" : "type-61",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_Ut1_E"
@@ -27346,9 +27412,6 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-27"
-    },
-    {
      "referenced_type" : "type-28"
     },
     {
@@ -27362,19 +27425,22 @@
     },
     {
      "referenced_type" : "type-32"
+    },
+    {
+     "referenced_type" : "type-33"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-24"
     }
    ],
    "linker_set_key" : "android::details::TVec2<float>",
    "name" : "android::details::TVec2<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-22",
-   "self_type" : "type-22",
+   "referenced_type" : "type-23",
+   "self_type" : "type-23",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "template_args" : [ "type-10" ],
@@ -27385,21 +27451,21 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-24"
-    },
-    {
      "referenced_type" : "type-25"
     },
     {
      "referenced_type" : "type-26"
+    },
+    {
+     "referenced_type" : "type-27"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5) at frameworks/native/libs/math/include/math/vec2.h:49:5",
    "name" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5) at frameworks/native/libs/math/include/math/vec2.h:49:5",
    "record_kind" : "union",
-   "referenced_type" : "type-23",
-   "self_type" : "type-23",
+   "referenced_type" : "type-24",
+   "self_type" : "type-24",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IfEUt_E"
@@ -27421,8 +27487,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:50:9) at frameworks/native/libs/math/include/math/vec2.h:50:9",
    "name" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:50:9) at frameworks/native/libs/math/include/math/vec2.h:50:9",
-   "referenced_type" : "type-24",
-   "self_type" : "type-24",
+   "referenced_type" : "type-25",
+   "self_type" : "type-25",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IfEUt_Ut_E"
@@ -27444,8 +27510,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:51:9) at frameworks/native/libs/math/include/math/vec2.h:51:9",
    "name" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:51:9) at frameworks/native/libs/math/include/math/vec2.h:51:9",
-   "referenced_type" : "type-25",
-   "self_type" : "type-25",
+   "referenced_type" : "type-26",
+   "self_type" : "type-26",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IfEUt_Ut0_E"
@@ -27467,8 +27533,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:52:9) at frameworks/native/libs/math/include/math/vec2.h:52:9",
    "name" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:52:9) at frameworks/native/libs/math/include/math/vec2.h:52:9",
-   "referenced_type" : "type-26",
-   "self_type" : "type-26",
+   "referenced_type" : "type-27",
+   "self_type" : "type-27",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IfEUt_Ut1_E"
@@ -27478,12 +27544,6 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-72"
-    },
-    {
      "referenced_type" : "type-73"
     },
     {
@@ -27494,22 +27554,28 @@
     },
     {
      "referenced_type" : "type-76"
+    },
+    {
+     "referenced_type" : "type-77"
+    },
+    {
+     "referenced_type" : "type-78"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-69"
     }
    ],
    "linker_set_key" : "android::details::TVec3<double>",
    "name" : "android::details::TVec3<double>",
    "record_kind" : "class",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
+   "referenced_type" : "type-68",
+   "self_type" : "type-68",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details5TVec3IdEE"
   },
   {
@@ -27517,33 +27583,33 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-68"
-    },
-    {
-     "referenced_type" : "type-69"
-    },
-    {
      "referenced_type" : "type-70"
     },
     {
+     "referenced_type" : "type-71"
+    },
+    {
+     "referenced_type" : "type-72"
+    },
+    {
      "field_name" : "xy",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "st",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "rg",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5) at frameworks/native/libs/math/include/math/vec3.h:47:5",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5) at frameworks/native/libs/math/include/math/vec3.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-67",
-   "self_type" : "type-67",
+   "referenced_type" : "type-69",
+   "self_type" : "type-69",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_E"
@@ -27554,24 +27620,24 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "z",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:48:9) at frameworks/native/libs/math/include/math/vec3.h:48:9",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:48:9) at frameworks/native/libs/math/include/math/vec3.h:48:9",
-   "referenced_type" : "type-68",
-   "self_type" : "type-68",
+   "referenced_type" : "type-70",
+   "self_type" : "type-70",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_Ut_E"
@@ -27582,24 +27648,24 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "t",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "p",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:49:9) at frameworks/native/libs/math/include/math/vec3.h:49:9",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:49:9) at frameworks/native/libs/math/include/math/vec3.h:49:9",
-   "referenced_type" : "type-69",
-   "self_type" : "type-69",
+   "referenced_type" : "type-71",
+   "self_type" : "type-71",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_Ut0_E"
@@ -27610,24 +27676,24 @@
    [
     {
      "field_name" : "r",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "g",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "b",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:50:9) at frameworks/native/libs/math/include/math/vec3.h:50:9",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:50:9) at frameworks/native/libs/math/include/math/vec3.h:50:9",
-   "referenced_type" : "type-70",
-   "self_type" : "type-70",
+   "referenced_type" : "type-72",
+   "self_type" : "type-72",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_Ut1_E"
@@ -27637,35 +27703,35 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-33"
+     "referenced_type" : "type-34"
     },
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-35"
     },
     {
      "referenced_type" : "type-9"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-13"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "type-36"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-19"
     }
    ],
    "linker_set_key" : "android::details::TVec3<float>",
    "name" : "android::details::TVec3<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-17",
-   "self_type" : "type-17",
+   "referenced_type" : "type-18",
+   "self_type" : "type-18",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "template_args" : [ "type-10" ],
@@ -27676,33 +27742,33 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-19"
-    },
-    {
      "referenced_type" : "type-20"
     },
     {
      "referenced_type" : "type-21"
     },
     {
-     "field_name" : "xy",
      "referenced_type" : "type-22"
     },
     {
+     "field_name" : "xy",
+     "referenced_type" : "type-23"
+    },
+    {
      "field_name" : "st",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "rg",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5) at frameworks/native/libs/math/include/math/vec3.h:47:5",
    "name" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5) at frameworks/native/libs/math/include/math/vec3.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-18",
-   "self_type" : "type-18",
+   "referenced_type" : "type-19",
+   "self_type" : "type-19",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IfEUt_E"
@@ -27729,8 +27795,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:48:9) at frameworks/native/libs/math/include/math/vec3.h:48:9",
    "name" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:48:9) at frameworks/native/libs/math/include/math/vec3.h:48:9",
-   "referenced_type" : "type-19",
-   "self_type" : "type-19",
+   "referenced_type" : "type-20",
+   "self_type" : "type-20",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IfEUt_Ut_E"
@@ -27757,8 +27823,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:49:9) at frameworks/native/libs/math/include/math/vec3.h:49:9",
    "name" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:49:9) at frameworks/native/libs/math/include/math/vec3.h:49:9",
-   "referenced_type" : "type-20",
-   "self_type" : "type-20",
+   "referenced_type" : "type-21",
+   "self_type" : "type-21",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IfEUt_Ut0_E"
@@ -27785,8 +27851,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:50:9) at frameworks/native/libs/math/include/math/vec3.h:50:9",
    "name" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:50:9) at frameworks/native/libs/math/include/math/vec3.h:50:9",
-   "referenced_type" : "type-21",
-   "self_type" : "type-21",
+   "referenced_type" : "type-22",
+   "self_type" : "type-22",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IfEUt_Ut1_E"
@@ -27796,12 +27862,6 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-78"
-    },
-    {
      "referenced_type" : "type-79"
     },
     {
@@ -27812,22 +27872,28 @@
     },
     {
      "referenced_type" : "type-82"
+    },
+    {
+     "referenced_type" : "type-83"
+    },
+    {
+     "referenced_type" : "type-84"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-53"
     }
    ],
    "linker_set_key" : "android::details::TVec4<double>",
    "name" : "android::details::TVec4<double>",
    "record_kind" : "class",
-   "referenced_type" : "type-50",
-   "self_type" : "type-50",
+   "referenced_type" : "type-52",
+   "self_type" : "type-52",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details5TVec4IdEE"
   },
   {
@@ -27835,45 +27901,45 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-52"
-    },
-    {
-     "referenced_type" : "type-53"
-    },
-    {
      "referenced_type" : "type-54"
     },
     {
-     "field_name" : "xy",
      "referenced_type" : "type-55"
     },
     {
+     "referenced_type" : "type-56"
+    },
+    {
+     "field_name" : "xy",
+     "referenced_type" : "type-57"
+    },
+    {
      "field_name" : "st",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "rg",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "xyz",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-68"
     },
     {
      "field_name" : "stp",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-68"
     },
     {
      "field_name" : "rgb",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-68"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-51",
-   "self_type" : "type-51",
+   "referenced_type" : "type-53",
+   "self_type" : "type-53",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_E"
@@ -27884,29 +27950,29 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "z",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "w",
      "field_offset" : 192,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
-   "referenced_type" : "type-52",
-   "self_type" : "type-52",
+   "referenced_type" : "type-54",
+   "self_type" : "type-54",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_Ut_E"
@@ -27917,29 +27983,29 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "t",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "p",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "q",
      "field_offset" : 192,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
-   "referenced_type" : "type-53",
-   "self_type" : "type-53",
+   "referenced_type" : "type-55",
+   "self_type" : "type-55",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_Ut0_E"
@@ -27950,29 +28016,29 @@
    [
     {
      "field_name" : "r",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "g",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "b",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "a",
      "field_offset" : 192,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
-   "referenced_type" : "type-54",
-   "self_type" : "type-54",
+   "referenced_type" : "type-56",
+   "self_type" : "type-56",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_Ut1_E"
@@ -27982,35 +28048,35 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-205"
+     "referenced_type" : "type-197"
     },
     {
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-198"
     },
     {
-     "referenced_type" : "type-207"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-200"
     },
     {
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-201"
     },
     {
-     "referenced_type" : "type-210"
+     "referenced_type" : "type-202"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-193"
     }
    ],
    "linker_set_key" : "android::details::TVec4<float>",
    "name" : "android::details::TVec4<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-200",
-   "self_type" : "type-200",
+   "referenced_type" : "type-192",
+   "self_type" : "type-192",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "template_args" : [ "type-10" ],
@@ -28021,45 +28087,45 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-202"
+     "referenced_type" : "type-194"
     },
     {
-     "referenced_type" : "type-203"
+     "referenced_type" : "type-195"
     },
     {
-     "referenced_type" : "type-204"
+     "referenced_type" : "type-196"
     },
     {
      "field_name" : "xy",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "st",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "rg",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "xyz",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-18"
     },
     {
      "field_name" : "stp",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-18"
     },
     {
      "field_name" : "rgb",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-18"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-201",
-   "self_type" : "type-201",
+   "referenced_type" : "type-193",
+   "self_type" : "type-193",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_E"
@@ -28091,8 +28157,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
-   "referenced_type" : "type-202",
-   "self_type" : "type-202",
+   "referenced_type" : "type-194",
+   "self_type" : "type-194",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_Ut_E"
@@ -28124,8 +28190,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
-   "referenced_type" : "type-203",
-   "self_type" : "type-203",
+   "referenced_type" : "type-195",
+   "self_type" : "type-195",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_Ut0_E"
@@ -28157,8 +28223,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
-   "referenced_type" : "type-204",
-   "self_type" : "type-204",
+   "referenced_type" : "type-196",
+   "self_type" : "type-196",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_Ut1_E"
@@ -28180,8 +28246,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TMat44, float>",
    "name" : "android::details::TVecAddOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2252",
-   "self_type" : "type-2252",
+   "referenced_type" : "type-2255",
+   "self_type" : "type-2255",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28192,11 +28258,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TVecAddOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-334",
-   "self_type" : "type-334",
+   "referenced_type" : "type-331",
+   "self_type" : "type-331",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -28204,8 +28270,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TQuaternion, float>",
    "name" : "android::details::TVecAddOperators<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-413",
-   "self_type" : "type-413",
+   "referenced_type" : "type-410",
+   "self_type" : "type-410",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28216,8 +28282,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecAddOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-427",
-   "self_type" : "type-427",
+   "referenced_type" : "type-424",
+   "self_type" : "type-424",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -28228,11 +28294,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecAddOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-61",
-   "self_type" : "type-61",
+   "referenced_type" : "type-63",
+   "self_type" : "type-63",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -28240,8 +28306,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec2, float>",
    "name" : "android::details::TVecAddOperators<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-28",
-   "self_type" : "type-28",
+   "referenced_type" : "type-29",
+   "self_type" : "type-29",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28252,11 +28318,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecAddOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-72",
-   "self_type" : "type-72",
+   "referenced_type" : "type-74",
+   "self_type" : "type-74",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -28264,8 +28330,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec3, float>",
    "name" : "android::details::TVecAddOperators<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-34",
-   "self_type" : "type-34",
+   "referenced_type" : "type-35",
+   "self_type" : "type-35",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28276,11 +28342,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecAddOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-78",
-   "self_type" : "type-78",
+   "referenced_type" : "type-80",
+   "self_type" : "type-80",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -28288,8 +28354,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecAddOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-206",
-   "self_type" : "type-206",
+   "referenced_type" : "type-198",
+   "self_type" : "type-198",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28312,8 +28378,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TMat44, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2255",
-   "self_type" : "type-2255",
+   "referenced_type" : "type-2258",
+   "self_type" : "type-2258",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28324,11 +28390,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-336",
-   "self_type" : "type-336",
+   "referenced_type" : "type-333",
+   "self_type" : "type-333",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -28336,8 +28402,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TQuaternion, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-415",
-   "self_type" : "type-415",
+   "referenced_type" : "type-412",
+   "self_type" : "type-412",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28348,8 +28414,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-510",
-   "self_type" : "type-510",
+   "referenced_type" : "type-507",
+   "self_type" : "type-507",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -28360,11 +28426,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-63",
-   "self_type" : "type-63",
+   "referenced_type" : "type-65",
+   "self_type" : "type-65",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -28372,8 +28438,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec2, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-30",
-   "self_type" : "type-30",
+   "referenced_type" : "type-31",
+   "self_type" : "type-31",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28384,11 +28450,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-74",
-   "self_type" : "type-74",
+   "referenced_type" : "type-76",
+   "self_type" : "type-76",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -28396,8 +28462,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec3, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-11",
-   "self_type" : "type-11",
+   "referenced_type" : "type-13",
+   "self_type" : "type-13",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28408,11 +28474,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-80",
-   "self_type" : "type-80",
+   "referenced_type" : "type-82",
+   "self_type" : "type-82",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -28420,8 +28486,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-208",
-   "self_type" : "type-208",
+   "referenced_type" : "type-200",
+   "self_type" : "type-200",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28444,11 +28510,11 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec2, double>",
    "name" : "android::details::TVecDebug<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-65",
-   "self_type" : "type-65",
+   "referenced_type" : "type-67",
+   "self_type" : "type-67",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details9TVecDebugINS0_5TVec2EdEE"
   },
   {
@@ -28456,8 +28522,8 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec2, float>",
    "name" : "android::details::TVecDebug<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-32",
-   "self_type" : "type-32",
+   "referenced_type" : "type-33",
+   "self_type" : "type-33",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28468,11 +28534,11 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec3, double>",
    "name" : "android::details::TVecDebug<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-76",
-   "self_type" : "type-76",
+   "referenced_type" : "type-78",
+   "self_type" : "type-78",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details9TVecDebugINS0_5TVec3EdEE"
   },
   {
@@ -28480,8 +28546,8 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec3, float>",
    "name" : "android::details::TVecDebug<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-35",
-   "self_type" : "type-35",
+   "referenced_type" : "type-36",
+   "self_type" : "type-36",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28492,11 +28558,11 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec4, double>",
    "name" : "android::details::TVecDebug<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-82",
-   "self_type" : "type-82",
+   "referenced_type" : "type-84",
+   "self_type" : "type-84",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details9TVecDebugINS0_5TVec4EdEE"
   },
   {
@@ -28504,8 +28570,8 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec4, float>",
    "name" : "android::details::TVecDebug<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-210",
-   "self_type" : "type-210",
+   "referenced_type" : "type-202",
+   "self_type" : "type-202",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28528,11 +28594,11 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec2, double>",
    "name" : "android::details::TVecFunctions<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-64",
-   "self_type" : "type-64",
+   "referenced_type" : "type-66",
+   "self_type" : "type-66",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details13TVecFunctionsINS0_5TVec2EdEE"
   },
   {
@@ -28540,8 +28606,8 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec2, float>",
    "name" : "android::details::TVecFunctions<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-31",
-   "self_type" : "type-31",
+   "referenced_type" : "type-32",
+   "self_type" : "type-32",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28552,11 +28618,11 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec3, double>",
    "name" : "android::details::TVecFunctions<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-75",
-   "self_type" : "type-75",
+   "referenced_type" : "type-77",
+   "self_type" : "type-77",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details13TVecFunctionsINS0_5TVec3EdEE"
   },
   {
@@ -28564,8 +28630,8 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec3, float>",
    "name" : "android::details::TVecFunctions<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-12",
-   "self_type" : "type-12",
+   "referenced_type" : "type-14",
+   "self_type" : "type-14",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28576,11 +28642,11 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec4, double>",
    "name" : "android::details::TVecFunctions<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-81",
-   "self_type" : "type-81",
+   "referenced_type" : "type-83",
+   "self_type" : "type-83",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details13TVecFunctionsINS0_5TVec4EdEE"
   },
   {
@@ -28588,8 +28654,8 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec4, float>",
    "name" : "android::details::TVecFunctions<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-209",
-   "self_type" : "type-209",
+   "referenced_type" : "type-201",
+   "self_type" : "type-201",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28600,8 +28666,8 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecProductOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-396",
-   "self_type" : "type-396",
+   "referenced_type" : "type-390",
+   "self_type" : "type-390",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -28612,11 +28678,11 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecProductOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-60",
-   "self_type" : "type-60",
+   "referenced_type" : "type-62",
+   "self_type" : "type-62",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details20TVecProductOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -28624,8 +28690,8 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec2, float>",
    "name" : "android::details::TVecProductOperators<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-27",
-   "self_type" : "type-27",
+   "referenced_type" : "type-28",
+   "self_type" : "type-28",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28636,11 +28702,11 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecProductOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-71",
-   "self_type" : "type-71",
+   "referenced_type" : "type-73",
+   "self_type" : "type-73",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details20TVecProductOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -28648,8 +28714,8 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec3, float>",
    "name" : "android::details::TVecProductOperators<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-33",
-   "self_type" : "type-33",
+   "referenced_type" : "type-34",
+   "self_type" : "type-34",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28660,11 +28726,11 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecProductOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-77",
-   "self_type" : "type-77",
+   "referenced_type" : "type-79",
+   "self_type" : "type-79",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details20TVecProductOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -28672,8 +28738,8 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecProductOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-205",
-   "self_type" : "type-205",
+   "referenced_type" : "type-197",
+   "self_type" : "type-197",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28696,8 +28762,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TMat44, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2254",
-   "self_type" : "type-2254",
+   "referenced_type" : "type-2257",
+   "self_type" : "type-2257",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28708,11 +28774,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-335",
-   "self_type" : "type-335",
+   "referenced_type" : "type-332",
+   "self_type" : "type-332",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -28720,8 +28786,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TQuaternion, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-414",
-   "self_type" : "type-414",
+   "referenced_type" : "type-411",
+   "self_type" : "type-411",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28732,8 +28798,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-462",
-   "self_type" : "type-462",
+   "referenced_type" : "type-455",
+   "self_type" : "type-455",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -28744,11 +28810,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-62",
-   "self_type" : "type-62",
+   "referenced_type" : "type-64",
+   "self_type" : "type-64",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -28756,8 +28822,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec2, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-29",
-   "self_type" : "type-29",
+   "referenced_type" : "type-30",
+   "self_type" : "type-30",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28768,11 +28834,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-73",
-   "self_type" : "type-73",
+   "referenced_type" : "type-75",
+   "self_type" : "type-75",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -28792,11 +28858,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-79",
-   "self_type" : "type-79",
+   "referenced_type" : "type-81",
+   "self_type" : "type-81",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -28804,8 +28870,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-207",
-   "self_type" : "type-207",
+   "referenced_type" : "type-199",
+   "self_type" : "type-199",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28871,7 +28937,7 @@
    [
     {
      "field_name" : "bits",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "fp",
@@ -28893,7 +28959,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-196"
+     "referenced_type" : "type-209"
     }
    ],
    "fields" :
@@ -28902,32 +28968,32 @@
      "access" : "protected",
      "field_name" : "mSchedPolicy",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "protected",
      "field_name" : "mSchedPriority",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mExtras",
      "field_offset" : 96,
-     "referenced_type" : "type-243"
+     "referenced_type" : "type-245"
     },
     {
      "access" : "private",
      "field_name" : "mReserved0",
      "field_offset" : 128,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
    "linker_set_key" : "android::hardware::BHwBinder",
    "name" : "android::hardware::BHwBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-242",
-   "self_type" : "type-242",
+   "referenced_type" : "type-244",
+   "self_type" : "type-244",
    "size" : 28,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware9BHwBinderE",
@@ -29034,7 +29100,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "fields" :
@@ -29043,26 +29109,26 @@
      "access" : "private",
      "field_name" : "mRemote",
      "field_offset" : 32,
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-207"
     },
     {
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 64,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-210"
     },
     {
      "access" : "private",
      "field_name" : "mState",
      "field_offset" : 96,
-     "referenced_type" : "type-199"
+     "referenced_type" : "type-212"
     }
    ],
    "linker_set_key" : "android::hardware::BpHwRefBase",
    "name" : "android::hardware::BpHwRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-193",
-   "self_type" : "type-193",
+   "referenced_type" : "type-206",
+   "self_type" : "type-206",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE",
@@ -29151,22 +29217,22 @@
    [
     {
      "field_name" : "flags",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "fdIndex",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "offset",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "extent",
      "field_offset" : 128,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "android::hardware::GrantorDescriptor",
@@ -29187,7 +29253,7 @@
     },
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::HidlMemory",
@@ -29275,14 +29341,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::IBinder",
    "name" : "android::hardware::IBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-196",
-   "self_type" : "type-196",
+   "referenced_type" : "type-209",
+   "self_type" : "type-209",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinderE",
@@ -29392,14 +29458,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient",
    "name" : "android::hardware::IBinder::DeathRecipient",
    "record_kind" : "class",
-   "referenced_type" : "type-192",
-   "self_type" : "type-192",
+   "referenced_type" : "type-205",
+   "self_type" : "type-205",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinder14DeathRecipientE",
@@ -29480,14 +29546,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::IInterface",
    "name" : "android::hardware::IInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-213",
-   "self_type" : "type-213",
+   "referenced_type" : "type-215",
+   "self_type" : "type-215",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
    "unique_id" : "_ZTSN7android8hardware10IInterfaceE",
@@ -29569,85 +29635,85 @@
     {
      "access" : "private",
      "field_name" : "mProcess",
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-274"
     },
     {
      "access" : "private",
      "field_name" : "mPendingStrongDerefs",
      "field_offset" : 32,
-     "referenced_type" : "type-240"
+     "referenced_type" : "type-242"
     },
     {
      "access" : "private",
      "field_name" : "mPendingWeakDerefs",
      "field_offset" : 192,
-     "referenced_type" : "type-244"
+     "referenced_type" : "type-246"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteStrongDerefs",
      "field_offset" : 352,
-     "referenced_type" : "type-245"
+     "referenced_type" : "type-247"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteWeakDerefs",
      "field_offset" : 512,
-     "referenced_type" : "type-244"
+     "referenced_type" : "type-246"
     },
     {
      "access" : "private",
      "field_name" : "mIn",
      "field_offset" : 672,
-     "referenced_type" : "type-215"
+     "referenced_type" : "type-217"
     },
     {
      "access" : "private",
      "field_name" : "mOut",
      "field_offset" : 1216,
-     "referenced_type" : "type-215"
+     "referenced_type" : "type-217"
     },
     {
      "access" : "private",
      "field_name" : "mLastError",
      "field_offset" : 1760,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mCallingPid",
      "field_offset" : 1792,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mCallingSid",
      "field_offset" : 1824,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "access" : "private",
      "field_name" : "mCallingUid",
      "field_offset" : 1856,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mStrictModePolicy",
      "field_offset" : 1888,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mLastTransactionBinderFlags",
      "field_offset" : 1920,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mContextObject",
      "field_offset" : 1952,
-     "referenced_type" : "type-289"
+     "referenced_type" : "type-286"
     },
     {
      "access" : "private",
@@ -29665,26 +29731,26 @@
      "access" : "private",
      "field_name" : "mPostCommandTasks",
      "field_offset" : 2016,
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-287"
     },
     {
      "access" : "private",
      "field_name" : "mIPCThreadStateBase",
      "field_offset" : 2112,
-     "referenced_type" : "type-291"
+     "referenced_type" : "type-288"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 2144,
-     "referenced_type" : "type-276"
+     "referenced_type" : "type-272"
     }
    ],
    "linker_set_key" : "android::hardware::IPCThreadState",
    "name" : "android::hardware::IPCThreadState",
    "record_kind" : "class",
-   "referenced_type" : "type-277",
-   "self_type" : "type-277",
+   "referenced_type" : "type-273",
+   "self_type" : "type-273",
    "size" : 272,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h",
    "unique_id" : "_ZTSN7android8hardware14IPCThreadStateE"
@@ -29696,73 +29762,73 @@
     {
      "access" : "private",
      "field_name" : "mBufCachePos",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mBufCache",
      "field_offset" : 32,
-     "referenced_type" : "type-216"
+     "referenced_type" : "type-218"
     },
     {
      "access" : "private",
      "field_name" : "mError",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mData",
      "field_offset" : 160,
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-219"
     },
     {
      "access" : "private",
      "field_name" : "mDataSize",
      "field_offset" : 192,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mDataCapacity",
      "field_offset" : 224,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mDataPos",
      "field_offset" : 256,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mObjects",
      "field_offset" : 288,
-     "referenced_type" : "type-219"
+     "referenced_type" : "type-221"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsSize",
      "field_offset" : 320,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsCapacity",
      "field_offset" : 352,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mNextObjectHint",
      "field_offset" : 384,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mNumRef",
      "field_offset" : 416,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -29786,20 +29852,20 @@
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 480,
-     "referenced_type" : "type-220"
+     "referenced_type" : "type-222"
     },
     {
      "access" : "private",
      "field_name" : "mOwnerCookie",
      "field_offset" : 512,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
    "linker_set_key" : "android::hardware::Parcel",
    "name" : "android::hardware::Parcel",
    "record_kind" : "class",
-   "referenced_type" : "type-215",
-   "self_type" : "type-215",
+   "referenced_type" : "type-217",
+   "self_type" : "type-217",
    "size" : 68,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6ParcelE"
@@ -29811,23 +29877,23 @@
    [
     {
      "field_name" : "index",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "buffer",
      "field_offset" : 64,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "bufend",
      "field_offset" : 128,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "android::hardware::Parcel::BufferInfo",
    "name" : "android::hardware::Parcel::BufferInfo",
-   "referenced_type" : "type-228",
-   "self_type" : "type-228",
+   "referenced_type" : "type-230",
+   "self_type" : "type-230",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE"
@@ -29838,7 +29904,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "fields" :
@@ -29847,55 +29913,55 @@
      "access" : "private",
      "field_name" : "mDriverFD",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mVMStart",
      "field_offset" : 64,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountLock",
      "field_offset" : 96,
-     "referenced_type" : "type-282"
+     "referenced_type" : "type-278"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountDecrement",
      "field_offset" : 128,
-     "referenced_type" : "type-283"
+     "referenced_type" : "type-279"
     },
     {
      "access" : "private",
      "field_name" : "mExecutingThreadsCount",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mMaxThreads",
      "field_offset" : 192,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mStarvationStartTimeMs",
      "field_offset" : 256,
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 320,
-     "referenced_type" : "type-252"
+     "referenced_type" : "type-280"
     },
     {
      "access" : "private",
      "field_name" : "mHandleToObject",
      "field_offset" : 352,
-     "referenced_type" : "type-238"
+     "referenced_type" : "type-240"
     },
     {
      "access" : "private",
@@ -29907,25 +29973,25 @@
      "access" : "private",
      "field_name" : "mBinderContextCheckFunc",
      "field_offset" : 544,
-     "referenced_type" : "type-274"
+     "referenced_type" : "type-270"
     },
     {
      "access" : "private",
      "field_name" : "mBinderContextUserData",
      "field_offset" : 576,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "access" : "private",
      "field_name" : "mContexts",
      "field_offset" : 608,
-     "referenced_type" : "type-247"
+     "referenced_type" : "type-249"
     },
     {
      "access" : "private",
      "field_name" : "mRootDir",
      "field_offset" : 768,
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-282"
     },
     {
      "access" : "private",
@@ -29943,26 +30009,26 @@
      "access" : "private",
      "field_name" : "mThreadPoolSeq",
      "field_offset" : 832,
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-271"
     },
     {
      "access" : "private",
      "field_name" : "mMmapSize",
      "field_offset" : 864,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 896,
-     "referenced_type" : "type-276"
+     "referenced_type" : "type-272"
     }
    ],
    "linker_set_key" : "android::hardware::ProcessState",
    "name" : "android::hardware::ProcessState",
    "record_kind" : "class",
-   "referenced_type" : "type-281",
-   "self_type" : "type-281",
+   "referenced_type" : "type-277",
+   "self_type" : "type-277",
    "size" : 128,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessStateE",
@@ -30040,18 +30106,18 @@
    [
     {
      "field_name" : "binder",
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-208"
     },
     {
      "field_name" : "refs",
      "field_offset" : 32,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-210"
     }
    ],
    "linker_set_key" : "android::hardware::ProcessState::handle_entry",
    "name" : "android::hardware::ProcessState::handle_entry",
-   "referenced_type" : "type-239",
-   "self_type" : "type-239",
+   "referenced_type" : "type-241",
+   "self_type" : "type-241",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE"
@@ -30061,7 +30127,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "fields" :
@@ -30070,17 +30136,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-102"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
    "record_kind" : "class",
-   "referenced_type" : "type-99",
-   "self_type" : "type-99",
+   "referenced_type" : "type-101",
+   "self_type" : "type-101",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-105" ],
+   "template_args" : [ "type-107" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS0_8graphics6mapper4V2_05ErrorEEE"
   },
   {
@@ -30088,7 +30154,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "fields" :
@@ -30097,17 +30163,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-393"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
    "record_kind" : "class",
-   "referenced_type" : "type-393",
-   "self_type" : "type-393",
+   "referenced_type" : "type-392",
+   "self_type" : "type-392",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-395" ],
+   "template_args" : [ "type-394" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS0_8graphics6mapper4V3_05ErrorEEE"
   },
   {
@@ -30115,7 +30181,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "fields" :
@@ -30124,17 +30190,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-88"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
    "record_kind" : "class",
-   "referenced_type" : "type-111",
-   "self_type" : "type-111",
+   "referenced_type" : "type-113",
+   "self_type" : "type-113",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-88" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics6mapper4V2_17IMapperEEEEE"
   },
   {
@@ -30142,7 +30208,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "linker_set_key" : "android::hardware::Return<void>",
@@ -30152,7 +30218,7 @@
    "self_type" : "type-1322",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIvEE"
   },
   {
@@ -30162,26 +30228,26 @@
     {
      "access" : "private",
      "field_name" : "mException",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mErrorCode",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-106"
     }
    ],
    "linker_set_key" : "android::hardware::Status",
    "name" : "android::hardware::Status",
    "record_kind" : "class",
-   "referenced_type" : "type-102",
-   "self_type" : "type-102",
+   "referenced_type" : "type-104",
+   "self_type" : "type-104",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware6StatusE"
@@ -30287,7 +30353,7 @@
    "self_type" : "type-1103",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware7details14const_accessorIjLj10EJEEE"
   },
   {
@@ -30301,12 +30367,12 @@
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-1099",
    "self_type" : "type-1099",
@@ -30338,16 +30404,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-137"
+     "referenced_type" : "type-140"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
-   "referenced_type" : "type-136",
-   "self_type" : "type-136",
+   "referenced_type" : "type-139",
+   "self_type" : "type-139",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-139" ],
+   "template_args" : [ "type-142" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_handleEEE"
   },
   {
@@ -30365,7 +30431,7 @@
    "self_type" : "type-1071",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-287" ],
+   "template_args" : [ "type-284" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEE"
   },
   {
@@ -30375,16 +30441,16 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-1072",
    "self_type" : "type-1072",
@@ -30398,16 +30464,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-144"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>",
-   "referenced_type" : "type-140",
-   "self_type" : "type-140",
+   "referenced_type" : "type-143",
+   "self_type" : "type-143",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-143" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEE"
   },
   {
@@ -30417,19 +30483,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-141",
-   "self_type" : "type-141",
+   "referenced_type" : "type-144",
+   "self_type" : "type-144",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEUt_E"
@@ -30441,19 +30507,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-141"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<hidl_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<hidl_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-137",
-   "self_type" : "type-137",
+   "referenced_type" : "type-140",
+   "self_type" : "type-140",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_handleEEUt_E"
@@ -30473,7 +30539,7 @@
    "self_type" : "type-1150",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-144" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEE"
   },
   {
@@ -30487,12 +30553,12 @@
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-1151",
    "self_type" : "type-1151",
@@ -30506,16 +30572,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-121"
+     "referenced_type" : "type-123"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int>",
    "name" : "android::hardware::details::hidl_pointer<unsigned int>",
-   "referenced_type" : "type-120",
-   "self_type" : "type-120",
+   "referenced_type" : "type-122",
+   "self_type" : "type-122",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIjEE"
   },
   {
@@ -30525,19 +30591,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<unsigned int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<unsigned int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-121",
-   "self_type" : "type-121",
+   "referenced_type" : "type-123",
+   "self_type" : "type-123",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIjEUt_E"
@@ -30559,7 +30625,7 @@
     {
      "access" : "private",
      "field_name" : "mStatus",
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-104"
     },
     {
      "access" : "private",
@@ -30571,8 +30637,8 @@
    "linker_set_key" : "android::hardware::details::return_status",
    "name" : "android::hardware::details::return_status",
    "record_kind" : "class",
-   "referenced_type" : "type-101",
-   "self_type" : "type-101",
+   "referenced_type" : "type-103",
+   "self_type" : "type-103",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware7details13return_statusE"
@@ -30585,7 +30651,7 @@
    "self_type" : "type-1102",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware7details9std_arrayIjLj10EJEEE"
   },
   {
@@ -30599,7 +30665,7 @@
     {
      "field_name" : "nativeHandle",
      "field_offset" : 320,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-142"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::HardwareBuffer",
@@ -30626,7 +30692,7 @@
    "self_type" : "type-1108",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware10hidl_arrayIjLj10EJEEE"
   },
   {
@@ -30635,7 +30701,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_death_recipient",
@@ -30720,33 +30786,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
    "name" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
-   "referenced_type" : "type-149",
-   "self_type" : "type-149",
+   "referenced_type" : "type-152",
+   "self_type" : "type-152",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-150", "type-151" ],
+   "template_args" : [ "type-153", "type-154" ],
    "unique_id" : "_ZTSN7android8hardware15hidl_enum_rangeINS0_8graphics6common4V1_011BufferUsageEvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
    "name" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
-   "referenced_type" : "type-157",
-   "self_type" : "type-157",
+   "referenced_type" : "type-159",
+   "self_type" : "type-159",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-158", "type-151" ],
+   "template_args" : [ "type-160", "type-154" ],
    "unique_id" : "_ZTSN7android8hardware15hidl_enum_rangeINS0_8graphics6common4V1_111BufferUsageEvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
    "name" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
-   "referenced_type" : "type-419",
-   "self_type" : "type-419",
+   "referenced_type" : "type-416",
+   "self_type" : "type-416",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-420", "type-151" ],
+   "template_args" : [ "type-417", "type-154" ],
    "unique_id" : "_ZTSN7android8hardware15hidl_enum_rangeINS0_8graphics6common4V1_211BufferUsageEvEE"
   },
   {
@@ -30756,7 +30822,7 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-140"
+     "referenced_type" : "type-143"
     },
     {
      "access" : "private",
@@ -30767,8 +30833,8 @@
    ],
    "linker_set_key" : "android::hardware::hidl_handle",
    "name" : "android::hardware::hidl_handle",
-   "referenced_type" : "type-139",
-   "self_type" : "type-139",
+   "referenced_type" : "type-142",
+   "self_type" : "type-142",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_handleE"
@@ -30780,13 +30846,13 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-142"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 128,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
@@ -30816,7 +30882,7 @@
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -30846,7 +30912,7 @@
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -30871,13 +30937,13 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-136"
+     "referenced_type" : "type-139"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -30888,11 +30954,11 @@
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_handle>",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_handle>",
-   "referenced_type" : "type-135",
-   "self_type" : "type-135",
+   "referenced_type" : "type-138",
+   "self_type" : "type-138",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-139" ],
+   "template_args" : [ "type-142" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_11hidl_handleEEE"
   },
   {
@@ -30902,13 +30968,13 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-120"
+     "referenced_type" : "type-122"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -30919,11 +30985,11 @@
    ],
    "linker_set_key" : "android::hardware::hidl_vec<unsigned int>",
    "name" : "android::hardware::hidl_vec<unsigned int>",
-   "referenced_type" : "type-128",
-   "self_type" : "type-128",
+   "referenced_type" : "type-131",
+   "self_type" : "type-131",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecIjEE"
   },
   {
@@ -30956,23 +31022,23 @@
    [
     {
      "field_name" : "pid",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "ptr",
      "field_offset" : 64,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "arch",
      "field_offset" : 128,
-     "referenced_type" : "type-164"
+     "referenced_type" : "type-167"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo",
    "name" : "android::hidl::base::V1_0::DebugInfo",
-   "referenced_type" : "type-163",
-   "self_type" : "type-163",
+   "referenced_type" : "type-166",
+   "self_type" : "type-166",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfoE"
@@ -30983,13 +31049,13 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::IBase",
    "name" : "android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-171",
-   "self_type" : "type-171",
+   "referenced_type" : "type-174",
+   "self_type" : "type-174",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_05IBaseE",
@@ -31098,13 +31164,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-174"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification",
    "name" : "android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-295",
-   "self_type" : "type-295",
+   "referenced_type" : "type-292",
+   "self_type" : "type-292",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_020IServiceNotificationE",
@@ -31218,12 +31284,12 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
      "field_name" : "value",
      "field_offset" : 64,
-     "referenced_type" : "type-676"
+     "referenced_type" : "type-680"
     }
    ],
    "linker_set_key" : "android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
@@ -31232,7 +31298,7 @@
    "self_type" : "type-694",
    "size" : 56,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142", "type-676" ],
+   "template_args" : [ "type-145", "type-680" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -31262,17 +31328,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
    "linker_set_key" : "android::sp<android::GraphicBuffer>",
    "name" : "android::sp<android::GraphicBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-679",
-   "self_type" : "type-679",
+   "referenced_type" : "type-678",
+   "self_type" : "type-678",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-525" ],
+   "template_args" : [ "type-523" ],
    "unique_id" : "_ZTSN7android2spINS_13GraphicBufferEEE"
   },
   {
@@ -31282,17 +31348,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-365"
     }
    ],
    "linker_set_key" : "android::sp<android::Thread>",
    "name" : "android::sp<android::Thread>",
    "record_kind" : "class",
-   "referenced_type" : "type-367",
-   "self_type" : "type-367",
+   "referenced_type" : "type-364",
+   "self_type" : "type-364",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-369" ],
+   "template_args" : [ "type-366" ],
    "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
   },
   {
@@ -31302,17 +31368,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-241"
+     "referenced_type" : "type-243"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::BHwBinder>",
    "name" : "android::sp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-289",
-   "self_type" : "type-289",
+   "referenced_type" : "type-286",
+   "self_type" : "type-286",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-242" ],
+   "template_args" : [ "type-244" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
   },
   {
@@ -31322,17 +31388,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-208"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IBinder>",
    "name" : "android::sp<android::hardware::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-248",
-   "self_type" : "type-248",
+   "referenced_type" : "type-250",
+   "self_type" : "type-250",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-196" ],
+   "template_args" : [ "type-209" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
   },
   {
@@ -31342,17 +31408,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-280"
+     "referenced_type" : "type-276"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::ProcessState>",
    "name" : "android::sp<android::hardware::ProcessState>",
    "record_kind" : "class",
-   "referenced_type" : "type-279",
-   "self_type" : "type-279",
+   "referenced_type" : "type-275",
+   "self_type" : "type-275",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-281" ],
+   "template_args" : [ "type-277" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
   },
   {
@@ -31362,17 +31428,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-356"
+     "referenced_type" : "type-353"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
    "record_kind" : "class",
-   "referenced_type" : "type-355",
-   "self_type" : "type-355",
+   "referenced_type" : "type-352",
+   "self_type" : "type-352",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-358" ],
+   "template_args" : [ "type-355" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics9allocator4V2_010IAllocatorEEE"
   },
   {
@@ -31382,17 +31448,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-485"
+     "referenced_type" : "type-482"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
    "record_kind" : "class",
-   "referenced_type" : "type-484",
-   "self_type" : "type-484",
+   "referenced_type" : "type-481",
+   "self_type" : "type-481",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-487" ],
+   "template_args" : [ "type-484" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics9allocator4V3_010IAllocatorEEE"
   },
   {
@@ -31402,17 +31468,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-339"
+     "referenced_type" : "type-336"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-338",
-   "self_type" : "type-338",
+   "referenced_type" : "type-335",
+   "self_type" : "type-335",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-341" ],
+   "template_args" : [ "type-338" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics6mapper4V2_07IMapperEEE"
   },
   {
@@ -31422,17 +31488,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-87"
+     "referenced_type" : "type-89"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-86",
-   "self_type" : "type-86",
+   "referenced_type" : "type-88",
+   "self_type" : "type-88",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-89" ],
+   "template_args" : [ "type-91" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics6mapper4V2_17IMapperEEE"
   },
   {
@@ -31442,17 +31508,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-498"
+     "referenced_type" : "type-495"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-497",
-   "self_type" : "type-497",
+   "referenced_type" : "type-494",
+   "self_type" : "type-494",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-500" ],
+   "template_args" : [ "type-497" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics6mapper4V3_07IMapperEEE"
   },
   {
@@ -31482,17 +31548,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-364"
+     "referenced_type" : "type-361"
     }
    ],
    "linker_set_key" : "android::sp<android::hidl::base::V1_0::IBase>",
    "name" : "android::sp<android::hidl::base::V1_0::IBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-363",
-   "self_type" : "type-363",
+   "referenced_type" : "type-360",
+   "self_type" : "type-360",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-171" ],
+   "template_args" : [ "type-174" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl4base4V1_05IBaseEEE"
   },
   {
@@ -31502,36 +31568,36 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-369"
     }
    ],
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceNotification>",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification>",
    "record_kind" : "class",
-   "referenced_type" : "type-371",
-   "self_type" : "type-371",
+   "referenced_type" : "type-368",
+   "self_type" : "type-368",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-295" ],
+   "template_args" : [ "type-292" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::trait_pointer<android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-819",
-   "self_type" : "type-819",
+   "referenced_type" : "type-820",
+   "self_type" : "type-820",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::Rect>",
    "name" : "android::trait_pointer<android::Rect>",
-   "referenced_type" : "type-2234",
-   "self_type" : "type-2234",
+   "referenced_type" : "type-2237",
+   "self_type" : "type-2237",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -31541,8 +31607,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::trait_pointer<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-817",
-   "self_type" : "type-817",
+   "referenced_type" : "type-818",
+   "self_type" : "type-818",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -31552,33 +31618,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<const native_handle *>",
    "name" : "android::trait_pointer<const native_handle *>",
-   "referenced_type" : "type-818",
-   "self_type" : "type-818",
+   "referenced_type" : "type-819",
+   "self_type" : "type-819",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android13trait_pointerIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<long long>",
    "name" : "android::trait_pointer<long long>",
-   "referenced_type" : "type-1430",
-   "self_type" : "type-1430",
+   "referenced_type" : "type-1434",
+   "self_type" : "type-1434",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android13trait_pointerIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::trait_trivial_copy<android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-812",
-   "self_type" : "type-812",
+   "referenced_type" : "type-813",
+   "self_type" : "type-813",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -31607,8 +31673,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-813",
-   "self_type" : "type-813",
+   "referenced_type" : "type-814",
+   "self_type" : "type-814",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -31618,8 +31684,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-483",
-   "self_type" : "type-483",
+   "referenced_type" : "type-480",
+   "self_type" : "type-480",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -31629,11 +31695,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-512",
-   "self_type" : "type-512",
+   "referenced_type" : "type-509",
+   "self_type" : "type-509",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-288" ],
+   "template_args" : [ "type-285" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
   },
   {
@@ -31644,26 +31710,26 @@
    "self_type" : "type-811",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<double>",
    "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-795",
-   "self_type" : "type-795",
+   "referenced_type" : "type-787",
+   "self_type" : "type-787",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<float>",
    "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-757",
-   "self_type" : "type-757",
+   "referenced_type" : "type-755",
+   "self_type" : "type-755",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-10" ],
@@ -31673,11 +31739,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-647",
-   "self_type" : "type-647",
+   "referenced_type" : "type-645",
+   "self_type" : "type-645",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIiEE"
   },
   {
@@ -31688,26 +31754,26 @@
    "self_type" : "type-741",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long>",
    "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-704",
-   "self_type" : "type-704",
+   "referenced_type" : "type-697",
+   "self_type" : "type-697",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-687" ],
+   "template_args" : [ "type-684" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<short>",
    "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-617",
-   "self_type" : "type-617",
+   "referenced_type" : "type-614",
+   "self_type" : "type-614",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-599" ],
@@ -31717,22 +31783,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned char>",
    "name" : "android::trait_trivial_copy<unsigned char>",
-   "referenced_type" : "type-540",
-   "self_type" : "type-540",
+   "referenced_type" : "type-536",
+   "self_type" : "type-536",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-218" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned int>",
    "name" : "android::trait_trivial_copy<unsigned int>",
-   "referenced_type" : "type-675",
-   "self_type" : "type-675",
+   "referenced_type" : "type-671",
+   "self_type" : "type-671",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIjEE"
   },
   {
@@ -31743,15 +31809,15 @@
    "self_type" : "type-751",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long>",
    "name" : "android::trait_trivial_copy<unsigned long>",
-   "referenced_type" : "type-722",
-   "self_type" : "type-722",
+   "referenced_type" : "type-720",
+   "self_type" : "type-720",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-710" ],
@@ -31761,8 +31827,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
    "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-631",
-   "self_type" : "type-631",
+   "referenced_type" : "type-629",
+   "self_type" : "type-629",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-3" ],
@@ -31772,11 +31838,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-476",
-   "self_type" : "type-476",
+   "referenced_type" : "type-473",
+   "self_type" : "type-473",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
   },
   {
@@ -31787,7 +31853,7 @@
    "self_type" : "type-807",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -31827,8 +31893,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-481",
-   "self_type" : "type-481",
+   "referenced_type" : "type-478",
+   "self_type" : "type-478",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -31838,11 +31904,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-501",
-   "self_type" : "type-501",
+   "referenced_type" : "type-498",
+   "self_type" : "type-498",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-288" ],
+   "template_args" : [ "type-285" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
   },
   {
@@ -31853,18 +31919,18 @@
    "self_type" : "type-806",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<double>",
    "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-781",
-   "self_type" : "type-781",
+   "referenced_type" : "type-775",
+   "self_type" : "type-775",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIdEE"
   },
   {
@@ -31882,11 +31948,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-638",
-   "self_type" : "type-638",
+   "referenced_type" : "type-637",
+   "self_type" : "type-637",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIiEE"
   },
   {
@@ -31897,18 +31963,18 @@
    "self_type" : "type-729",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long>",
    "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-686",
-   "self_type" : "type-686",
+   "referenced_type" : "type-683",
+   "self_type" : "type-683",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-687" ],
+   "template_args" : [ "type-684" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
   },
   {
@@ -31926,33 +31992,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned char>",
    "name" : "android::trait_trivial_ctor<unsigned char>",
-   "referenced_type" : "type-534",
-   "self_type" : "type-534",
+   "referenced_type" : "type-531",
+   "self_type" : "type-531",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-218" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
    "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-661",
-   "self_type" : "type-661",
+   "referenced_type" : "type-655",
+   "self_type" : "type-655",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
    "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-746",
-   "self_type" : "type-746",
+   "referenced_type" : "type-743",
+   "self_type" : "type-743",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIyEE"
   },
   {
@@ -31970,8 +32036,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned short>",
    "name" : "android::trait_trivial_ctor<unsigned short>",
-   "referenced_type" : "type-620",
-   "self_type" : "type-620",
+   "referenced_type" : "type-619",
+   "self_type" : "type-619",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-3" ],
@@ -31981,11 +32047,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-453",
-   "self_type" : "type-453",
+   "referenced_type" : "type-450",
+   "self_type" : "type-450",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
   },
   {
@@ -31996,7 +32062,7 @@
    "self_type" : "type-809",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -32036,8 +32102,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<bool>",
    "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-482",
-   "self_type" : "type-482",
+   "referenced_type" : "type-479",
+   "self_type" : "type-479",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -32047,11 +32113,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-511",
-   "self_type" : "type-511",
+   "referenced_type" : "type-508",
+   "self_type" : "type-508",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-288" ],
+   "template_args" : [ "type-285" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
   },
   {
@@ -32062,7 +32128,7 @@
    "self_type" : "type-808",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIPK13native_handleEE"
   },
   {
@@ -32073,7 +32139,7 @@
    "self_type" : "type-786",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIdEE"
   },
   {
@@ -32095,18 +32161,18 @@
    "self_type" : "type-644",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long long>",
    "name" : "android::trait_trivial_dtor<long long>",
-   "referenced_type" : "type-738",
-   "self_type" : "type-738",
+   "referenced_type" : "type-736",
+   "self_type" : "type-736",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
   },
   {
@@ -32117,7 +32183,7 @@
    "self_type" : "type-692",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-687" ],
+   "template_args" : [ "type-684" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
   },
   {
@@ -32135,41 +32201,41 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned char>",
    "name" : "android::trait_trivial_dtor<unsigned char>",
-   "referenced_type" : "type-538",
-   "self_type" : "type-538",
+   "referenced_type" : "type-535",
+   "self_type" : "type-535",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-218" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
    "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-668",
-   "self_type" : "type-668",
+   "referenced_type" : "type-664",
+   "self_type" : "type-664",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
    "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-749",
-   "self_type" : "type-749",
+   "referenced_type" : "type-747",
+   "self_type" : "type-747",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long>",
    "name" : "android::trait_trivial_dtor<unsigned long>",
-   "referenced_type" : "type-719",
-   "self_type" : "type-719",
+   "referenced_type" : "type-715",
+   "self_type" : "type-715",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-710" ],
@@ -32179,8 +32245,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned short>",
    "name" : "android::trait_trivial_dtor<unsigned short>",
-   "referenced_type" : "type-625",
-   "self_type" : "type-625",
+   "referenced_type" : "type-621",
+   "self_type" : "type-621",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-3" ],
@@ -32190,22 +32256,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-469",
-   "self_type" : "type-469",
+   "referenced_type" : "type-462",
+   "self_type" : "type-462",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::trait_trivial_move<android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-815",
-   "self_type" : "type-815",
+   "referenced_type" : "type-816",
+   "self_type" : "type-816",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -32234,11 +32300,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String16>",
    "name" : "android::trait_trivial_move<android::String16>",
-   "referenced_type" : "type-191",
-   "self_type" : "type-191",
+   "referenced_type" : "type-204",
+   "self_type" : "type-204",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-179" ],
+   "template_args" : [ "type-182" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8String16EEE"
   },
   {
@@ -32249,15 +32315,15 @@
    "self_type" : "type-902",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-285" ],
+   "template_args" : [ "type-282" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-816",
-   "self_type" : "type-816",
+   "referenced_type" : "type-817",
+   "self_type" : "type-817",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -32267,8 +32333,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<bool>",
    "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-490",
-   "self_type" : "type-490",
+   "referenced_type" : "type-485",
+   "self_type" : "type-485",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -32278,22 +32344,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-533",
-   "self_type" : "type-533",
+   "referenced_type" : "type-513",
+   "self_type" : "type-513",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-288" ],
+   "template_args" : [ "type-285" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<const native_handle *>",
    "name" : "android::trait_trivial_move<const native_handle *>",
-   "referenced_type" : "type-814",
-   "self_type" : "type-814",
+   "referenced_type" : "type-815",
+   "self_type" : "type-815",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIPK13native_handleEE"
   },
   {
@@ -32304,7 +32370,7 @@
    "self_type" : "type-798",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIdEE"
   },
   {
@@ -32322,11 +32388,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-650",
-   "self_type" : "type-650",
+   "referenced_type" : "type-648",
+   "self_type" : "type-648",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIiEE"
   },
   {
@@ -32337,18 +32403,18 @@
    "self_type" : "type-742",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long>",
    "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-708",
-   "self_type" : "type-708",
+   "referenced_type" : "type-707",
+   "self_type" : "type-707",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-687" ],
+   "template_args" : [ "type-684" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
   },
   {
@@ -32366,22 +32432,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned char>",
    "name" : "android::trait_trivial_move<unsigned char>",
-   "referenced_type" : "type-577",
-   "self_type" : "type-577",
+   "referenced_type" : "type-574",
+   "self_type" : "type-574",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-218" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned int>",
    "name" : "android::trait_trivial_move<unsigned int>",
-   "referenced_type" : "type-682",
-   "self_type" : "type-682",
+   "referenced_type" : "type-677",
+   "self_type" : "type-677",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIjEE"
   },
   {
@@ -32392,15 +32458,15 @@
    "self_type" : "type-752",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long>",
    "name" : "android::trait_trivial_move<unsigned long>",
-   "referenced_type" : "type-728",
-   "self_type" : "type-728",
+   "referenced_type" : "type-725",
+   "self_type" : "type-725",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-710" ],
@@ -32421,30 +32487,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-480",
-   "self_type" : "type-480",
+   "referenced_type" : "type-477",
+   "self_type" : "type-477",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::traits<android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-823",
-   "self_type" : "type-823",
+   "referenced_type" : "type-824",
+   "self_type" : "type-824",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android6traitsINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::Rect>",
    "name" : "android::traits<android::Rect>",
-   "referenced_type" : "type-2235",
-   "self_type" : "type-2235",
+   "referenced_type" : "type-2238",
+   "self_type" : "type-2238",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -32454,8 +32520,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::traits<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-820",
-   "self_type" : "type-820",
+   "referenced_type" : "type-821",
+   "self_type" : "type-821",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -32469,18 +32535,18 @@
    "self_type" : "type-822",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android6traitsIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<long long>",
    "name" : "android::traits<long long>",
-   "referenced_type" : "type-1431",
-   "self_type" : "type-1431",
+   "referenced_type" : "type-1435",
+   "self_type" : "type-1435",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android6traitsIxEE"
   },
   {
@@ -32489,12 +32555,12 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::ui::Size",
@@ -32512,20 +32578,20 @@
     {
      "access" : "private",
      "field_name" : "mMatrix",
-     "referenced_type" : "type-2284"
+     "referenced_type" : "type-2287"
     },
     {
      "access" : "private",
      "field_name" : "mType",
      "field_offset" : 288,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "linker_set_key" : "android::ui::Transform",
    "name" : "android::ui::Transform",
    "record_kind" : "class",
-   "referenced_type" : "type-2283",
-   "self_type" : "type-2283",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2286",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "unique_id" : "_ZTSN7android2ui9TransformE"
@@ -32542,8 +32608,8 @@
    ],
    "linker_set_key" : "android::ui::Transform::mat33",
    "name" : "android::ui::Transform::mat33",
-   "referenced_type" : "type-2284",
-   "self_type" : "type-2284",
+   "referenced_type" : "type-2287",
+   "self_type" : "type-2287",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "unique_id" : "_ZTSN7android2ui9Transform5mat33E"
@@ -32553,13 +32619,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2209"
+     "referenced_type" : "type-2212"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::Rect>",
    "name" : "android::use_trivial_move<android::Rect>",
-   "referenced_type" : "type-2208",
-   "self_type" : "type-2208",
+   "referenced_type" : "type-2211",
+   "self_type" : "type-2211",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -32570,13 +32636,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-701"
+     "referenced_type" : "type-704"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-700",
-   "self_type" : "type-700",
+   "referenced_type" : "type-703",
+   "self_type" : "type-703",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -32587,16 +32653,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1417"
+     "referenced_type" : "type-1422"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<long long>",
    "name" : "android::use_trivial_move<long long>",
-   "referenced_type" : "type-1416",
-   "self_type" : "type-1416",
+   "referenced_type" : "type-1421",
+   "self_type" : "type-1421",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveIxEE"
   },
   {
@@ -32627,12 +32693,12 @@
    [
     {
      "field_name" : "num_points",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 32,
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     },
     {
      "field_name" : "xyzc_points",
@@ -32659,7 +32725,7 @@
     {
      "field_name" : "num_planes",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "planes",
@@ -32681,7 +32747,7 @@
    [
     {
      "field_name" : "top_left",
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-219"
     },
     {
      "field_name" : "component",
@@ -32691,32 +32757,32 @@
     {
      "field_name" : "bits_per_component",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "bits_used",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "h_increment",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "v_increment",
      "field_offset" : 160,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "h_subsampling",
      "field_offset" : 192,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "v_subsampling",
      "field_offset" : 224,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android_flex_plane",
@@ -32733,33 +32799,33 @@
    [
     {
      "field_name" : "magic",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "version",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 64,
-     "referenced_type" : "type-519"
+     "referenced_type" : "type-517"
     },
     {
      "field_name" : "incRef",
      "field_offset" : 192,
-     "referenced_type" : "type-520"
+     "referenced_type" : "type-518"
     },
     {
      "field_name" : "decRef",
      "field_offset" : 224,
-     "referenced_type" : "type-520"
+     "referenced_type" : "type-518"
     }
    ],
    "linker_set_key" : "android_native_base_t",
    "name" : "android_native_base_t",
-   "referenced_type" : "type-518",
-   "self_type" : "type-518",
+   "referenced_type" : "type-516",
+   "self_type" : "type-516",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
    "unique_id" : "android_native_base_t"
@@ -32770,28 +32836,28 @@
    [
     {
      "field_name" : "left",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "top",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "right",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "bottom",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android_native_rect_t",
    "name" : "android_native_rect_t",
-   "referenced_type" : "type-619",
-   "self_type" : "type-619",
+   "referenced_type" : "type-620",
+   "self_type" : "type-620",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
    "unique_id" : "android_native_rect_t"
@@ -32866,43 +32932,43 @@
    [
     {
      "field_name" : "y",
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "cb",
      "field_offset" : 32,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "cr",
      "field_offset" : 64,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "ystride",
      "field_offset" : 96,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "cstride",
      "field_offset" : 128,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "chroma_step",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 192,
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     }
    ],
    "linker_set_key" : "android_ycbcr",
    "name" : "android_ycbcr",
-   "referenced_type" : "type-348",
-   "self_type" : "type-348",
+   "referenced_type" : "type-345",
+   "self_type" : "type-345",
    "size" : 56,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_ycbcr"
@@ -32913,108 +32979,108 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-547"
+     "referenced_type" : "type-544"
     },
     {
      "field_name" : "flags",
      "field_offset" : 512,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "field_name" : "width",
      "field_offset" : 544,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "field_name" : "height",
      "field_offset" : 576,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "field_name" : "stride",
      "field_offset" : 608,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "format",
      "field_offset" : 640,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "xdpi",
      "field_offset" : 672,
-     "referenced_type" : "type-563"
+     "referenced_type" : "type-560"
     },
     {
      "field_name" : "ydpi",
      "field_offset" : 704,
-     "referenced_type" : "type-563"
+     "referenced_type" : "type-560"
     },
     {
      "field_name" : "fps",
      "field_offset" : 736,
-     "referenced_type" : "type-563"
+     "referenced_type" : "type-560"
     },
     {
      "field_name" : "minSwapInterval",
      "field_offset" : 768,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "maxSwapInterval",
      "field_offset" : 800,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "numFramebuffers",
      "field_offset" : 832,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 864,
-     "referenced_type" : "type-564"
+     "referenced_type" : "type-561"
     },
     {
      "field_name" : "setSwapInterval",
      "field_offset" : 1088,
-     "referenced_type" : "type-565"
+     "referenced_type" : "type-562"
     },
     {
      "field_name" : "setUpdateRect",
      "field_offset" : 1120,
-     "referenced_type" : "type-568"
+     "referenced_type" : "type-565"
     },
     {
      "field_name" : "post",
      "field_offset" : 1152,
-     "referenced_type" : "type-570"
+     "referenced_type" : "type-567"
     },
     {
      "field_name" : "compositionComplete",
      "field_offset" : 1184,
-     "referenced_type" : "type-572"
+     "referenced_type" : "type-569"
     },
     {
      "field_name" : "dump",
      "field_offset" : 1216,
-     "referenced_type" : "type-574"
+     "referenced_type" : "type-571"
     },
     {
      "field_name" : "enableScreen",
      "field_offset" : 1248,
-     "referenced_type" : "type-565"
+     "referenced_type" : "type-562"
     },
     {
      "field_name" : "reserved_proc",
      "field_offset" : 1280,
-     "referenced_type" : "type-524"
+     "referenced_type" : "type-522"
     }
    ],
    "linker_set_key" : "framebuffer_device_t",
    "name" : "framebuffer_device_t",
-   "referenced_type" : "type-546",
-   "self_type" : "type-546",
+   "referenced_type" : "type-543",
+   "self_type" : "type-543",
    "size" : 184,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h",
    "unique_id" : "framebuffer_device_t"
@@ -33025,63 +33091,73 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-549"
+     "referenced_type" : "type-546"
     },
     {
      "field_name" : "registerBuffer",
      "field_offset" : 1024,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-577"
     },
     {
      "field_name" : "unregisterBuffer",
      "field_offset" : 1056,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-577"
     },
     {
      "field_name" : "lock",
      "field_offset" : 1088,
-     "referenced_type" : "type-583"
+     "referenced_type" : "type-581"
     },
     {
      "field_name" : "unlock",
      "field_offset" : 1120,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-577"
     },
     {
      "field_name" : "perform",
      "field_offset" : 1152,
-     "referenced_type" : "type-585"
+     "referenced_type" : "type-583"
     },
     {
      "field_name" : "lock_ycbcr",
      "field_offset" : 1184,
-     "referenced_type" : "type-587"
+     "referenced_type" : "type-585"
     },
     {
      "field_name" : "lockAsync",
      "field_offset" : 1216,
-     "referenced_type" : "type-589"
+     "referenced_type" : "type-587"
     },
     {
      "field_name" : "unlockAsync",
      "field_offset" : 1248,
-     "referenced_type" : "type-591"
+     "referenced_type" : "type-589"
     },
     {
      "field_name" : "lockAsync_ycbcr",
      "field_offset" : 1280,
+     "referenced_type" : "type-592"
+    },
+    {
+     "field_name" : "getTransportSize",
+     "field_offset" : 1312,
      "referenced_type" : "type-594"
     },
     {
-     "field_name" : "reserved_proc",
-     "field_offset" : 1312,
+     "field_name" : "validateBufferSize",
+     "field_offset" : 1344,
      "referenced_type" : "type-596"
+    },
+    {
+     "field_name" : "reserved_proc",
+     "field_offset" : 1376,
+     "referenced_type" : "type-521"
     }
    ],
    "linker_set_key" : "gralloc_module_t",
    "name" : "gralloc_module_t",
-   "referenced_type" : "type-578",
-   "self_type" : "type-578",
+   "referenced_type" : "type-576",
+   "self_type" : "type-576",
    "size" : 176,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h",
    "unique_id" : "gralloc_module_t"
@@ -33092,33 +33168,33 @@
    [
     {
      "field_name" : "tag",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "version",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "module",
      "field_offset" : 64,
-     "referenced_type" : "type-548"
+     "referenced_type" : "type-545"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 96,
-     "referenced_type" : "type-559"
+     "referenced_type" : "type-556"
     },
     {
      "field_name" : "close",
      "field_offset" : 480,
-     "referenced_type" : "type-560"
+     "referenced_type" : "type-557"
     }
    ],
    "linker_set_key" : "hw_device_t",
    "name" : "hw_device_t",
-   "referenced_type" : "type-547",
-   "self_type" : "type-547",
+   "referenced_type" : "type-544",
+   "self_type" : "type-544",
    "size" : 64,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
    "unique_id" : "hw_device_t"
@@ -33129,13 +33205,13 @@
    [
     {
      "field_name" : "open",
-     "referenced_type" : "type-552"
+     "referenced_type" : "type-549"
     }
    ],
    "linker_set_key" : "hw_module_methods_t",
    "name" : "hw_module_methods_t",
-   "referenced_type" : "type-551",
-   "self_type" : "type-551",
+   "referenced_type" : "type-548",
+   "self_type" : "type-548",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
    "unique_id" : "hw_module_methods_t"
@@ -33146,7 +33222,7 @@
    [
     {
      "field_name" : "tag",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "module_api_version",
@@ -33161,38 +33237,38 @@
     {
      "field_name" : "id",
      "field_offset" : 64,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "field_name" : "name",
      "field_offset" : 96,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "field_name" : "author",
      "field_offset" : 128,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "field_name" : "methods",
      "field_offset" : 160,
-     "referenced_type" : "type-550"
+     "referenced_type" : "type-547"
     },
     {
      "field_name" : "dso",
      "field_offset" : 192,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 224,
-     "referenced_type" : "type-558"
+     "referenced_type" : "type-555"
     }
    ],
    "linker_set_key" : "hw_module_t",
    "name" : "hw_module_t",
-   "referenced_type" : "type-549",
-   "self_type" : "type-549",
+   "referenced_type" : "type-546",
+   "self_type" : "type-546",
    "size" : 128,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
    "unique_id" : "hw_module_t"
@@ -33258,12 +33334,12 @@
    [
     {
      "field_name" : "tv_sec",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "tv_nsec",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "linker_set_key" : "log_time",
@@ -33290,22 +33366,22 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "msg",
@@ -33337,27 +33413,27 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "euid",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "msg",
@@ -33389,27 +33465,27 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "lid",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "msg",
@@ -33441,32 +33517,32 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "lid",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "uid",
      "field_offset" : 192,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "msg",
@@ -33488,28 +33564,28 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "numFds",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "numInts",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "data",
      "field_offset" : 96,
-     "referenced_type" : "type-145"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "native_handle",
    "name" : "native_handle",
-   "referenced_type" : "type-144",
-   "self_type" : "type-144",
+   "referenced_type" : "type-147",
+   "self_type" : "type-147",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
    "unique_id" : "native_handle"
@@ -33519,13 +33595,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-435"
+     "referenced_type" : "type-432"
     }
    ],
    "linker_set_key" : "std::is_floating_point<android::half>",
    "name" : "std::is_floating_point<android::half>",
-   "referenced_type" : "type-434",
-   "self_type" : "type-434",
+   "referenced_type" : "type-431",
+   "self_type" : "type-431",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h",
    "template_args" : [ "type-1" ],
@@ -33536,8 +33612,8 @@
    "linker_set_key" : "std::numeric_limits<android::half>",
    "name" : "std::numeric_limits<android::half>",
    "record_kind" : "class",
-   "referenced_type" : "type-597",
-   "self_type" : "type-597",
+   "referenced_type" : "type-575",
+   "self_type" : "type-575",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h",
    "template_args" : [ "type-1" ],
@@ -33550,8 +33626,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot &&",
    "name" : "android::FenceTime::Snapshot &&",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1386",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1391",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -33577,8 +33653,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &&",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &&",
-   "referenced_type" : "type-99",
-   "self_type" : "type-107",
+   "referenced_type" : "type-101",
+   "self_type" : "type-109",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -33586,8 +33662,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &&",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &&",
-   "referenced_type" : "type-393",
-   "self_type" : "type-399",
+   "referenced_type" : "type-392",
+   "self_type" : "type-396",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -33595,8 +33671,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &&",
-   "referenced_type" : "type-111",
-   "self_type" : "type-113",
+   "referenced_type" : "type-113",
+   "self_type" : "type-115",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -33613,7 +33689,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status &&",
    "name" : "android::hardware::Status &&",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1312",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -33622,7 +33698,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status &&",
    "name" : "android::hardware::details::return_status &&",
-   "referenced_type" : "type-101",
+   "referenced_type" : "type-103",
    "self_type" : "type-1318",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -33631,7 +33707,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_handle &&",
    "name" : "android::hardware::hidl_handle &&",
-   "referenced_type" : "type-139",
+   "referenced_type" : "type-142",
    "self_type" : "type-1087",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -33650,7 +33726,7 @@
    "linker_set_key" : "android::sp<android::Fence> &&",
    "name" : "android::sp<android::Fence> &&",
    "referenced_type" : "type-1357",
-   "self_type" : "type-1410",
+   "self_type" : "type-1415",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33658,8 +33734,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &&",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &&",
-   "referenced_type" : "type-355",
-   "self_type" : "type-378",
+   "referenced_type" : "type-352",
+   "self_type" : "type-375",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33667,8 +33743,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &&",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &&",
-   "referenced_type" : "type-484",
-   "self_type" : "type-491",
+   "referenced_type" : "type-481",
+   "self_type" : "type-488",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33676,8 +33752,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &&",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &&",
-   "referenced_type" : "type-338",
-   "self_type" : "type-386",
+   "referenced_type" : "type-335",
+   "self_type" : "type-383",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33685,8 +33761,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &&",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &&",
-   "referenced_type" : "type-86",
-   "self_type" : "type-94",
+   "referenced_type" : "type-88",
+   "self_type" : "type-96",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33694,8 +33770,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &&",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &&",
-   "referenced_type" : "type-497",
-   "self_type" : "type-504",
+   "referenced_type" : "type-494",
+   "self_type" : "type-501",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33703,7 +33779,7 @@
    "alignment" : 4,
    "linker_set_key" : "int &&",
    "name" : "int &&",
-   "referenced_type" : "type-103",
+   "referenced_type" : "type-105",
    "self_type" : "type-1294",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
diff --git a/29/64/x86/source-based/libstagefright_bufferqueue_helper.so.lsdump b/29/64/x86/source-based/libstagefright_bufferqueue_helper.so.lsdump
index 01acb53..ae1a1d3 100644
--- a/29/64/x86/source-based/libstagefright_bufferqueue_helper.so.lsdump
+++ b/29/64/x86/source-based/libstagefright_bufferqueue_helper.so.lsdump
@@ -5,15 +5,15 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_AUDIO_CHANNELTYPE [16]",
    "name" : "OMX_AUDIO_CHANNELTYPE [16]",
-   "referenced_type" : "type-1637",
-   "self_type" : "type-1642",
+   "referenced_type" : "type-1635",
+   "self_type" : "type-1641",
    "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-1499",
+   "referenced_type" : "type-1498",
    "self_type" : "type-1515",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -30,8 +30,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::MediaImage2::PlaneInfo [4]",
    "name" : "android::MediaImage2::PlaneInfo [4]",
-   "referenced_type" : "type-2423",
-   "self_type" : "type-2422",
+   "referenced_type" : "type-2426",
+   "self_type" : "type-2425",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
@@ -39,8 +39,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::MediaImage::PlaneInfo [3]",
    "name" : "android::MediaImage::PlaneInfo [3]",
-   "referenced_type" : "type-2418",
-   "self_type" : "type-2417",
+   "referenced_type" : "type-2421",
+   "self_type" : "type-2420",
    "size" : 60,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
@@ -81,7 +81,7 @@
    "linker_set_key" : "int [3]",
    "name" : "int [3]",
    "referenced_type" : "type-4",
-   "self_type" : "type-2202",
+   "self_type" : "type-2205",
    "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-2202",
-   "self_type" : "type-2201",
+   "referenced_type" : "type-2205",
+   "self_type" : "type-2204",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
   },
@@ -117,7 +117,7 @@
    "linker_set_key" : "unsigned char [16]",
    "name" : "unsigned char [16]",
    "referenced_type" : "type-90",
-   "self_type" : "type-2311",
+   "self_type" : "type-2314",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -126,7 +126,7 @@
    "linker_set_key" : "unsigned char [1]",
    "name" : "unsigned char [1]",
    "referenced_type" : "type-90",
-   "self_type" : "type-1572",
+   "self_type" : "type-1567",
    "size" : 1,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -135,7 +135,7 @@
    "linker_set_key" : "unsigned char [256]",
    "name" : "unsigned char [256]",
    "referenced_type" : "type-90",
-   "self_type" : "type-2312",
+   "self_type" : "type-2315",
    "size" : 256,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -144,7 +144,7 @@
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
    "referenced_type" : "type-90",
-   "self_type" : "type-2179",
+   "self_type" : "type-2182",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -153,7 +153,7 @@
    "linker_set_key" : "unsigned char [64]",
    "name" : "unsigned char [64]",
    "referenced_type" : "type-90",
-   "self_type" : "type-2308",
+   "self_type" : "type-2311",
    "size" : 64,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -203,8 +203,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-1242",
-   "self_type" : "type-1242",
+   "referenced_type" : "type-1245",
+   "self_type" : "type-1245",
    "size" : 2
   },
   {
@@ -245,8 +245,8 @@
    "alignment" : 4,
    "linker_set_key" : "long double",
    "name" : "long double",
-   "referenced_type" : "type-1453",
-   "self_type" : "type-1453",
+   "referenced_type" : "type-1456",
+   "self_type" : "type-1456",
    "size" : 8
   },
   {
@@ -759,6 +759,9 @@
    "name" : "_ZN7android18BnProducerListener18needsReleaseNotifyEv"
   },
   {
+   "name" : "_ZN7android18BnProducerListener18onBuffersDiscardedERKNSt3__16vectorIiNS1_9allocatorIiEEEE"
+  },
+  {
    "name" : "_ZN7android18BpConsumerListenerD0Ev"
   },
   {
@@ -3121,8 +3124,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AACPROFILETYPE",
    "name" : "OMX_AUDIO_AACPROFILETYPE",
-   "referenced_type" : "type-1676",
-   "self_type" : "type-1676",
+   "referenced_type" : "type-1671",
+   "self_type" : "type-1671",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3175,8 +3178,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
    "name" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
-   "referenced_type" : "type-1668",
-   "self_type" : "type-1668",
+   "referenced_type" : "type-1670",
+   "self_type" : "type-1670",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3273,8 +3276,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRBANDMODETYPE",
    "name" : "OMX_AUDIO_AMRBANDMODETYPE",
-   "referenced_type" : "type-1890",
-   "self_type" : "type-1890",
+   "referenced_type" : "type-1881",
+   "self_type" : "type-1881",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3319,8 +3322,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRDTXMODETYPE",
    "name" : "OMX_AUDIO_AMRDTXMODETYPE",
-   "referenced_type" : "type-1901",
-   "self_type" : "type-1901",
+   "referenced_type" : "type-1892",
+   "self_type" : "type-1892",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3369,8 +3372,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
    "name" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
-   "referenced_type" : "type-1877",
-   "self_type" : "type-1877",
+   "referenced_type" : "type-1862",
+   "self_type" : "type-1862",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3419,8 +3422,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CDMARATETYPE",
    "name" : "OMX_AUDIO_CDMARATETYPE",
-   "referenced_type" : "type-2021",
-   "self_type" : "type-2021",
+   "referenced_type" : "type-2013",
+   "self_type" : "type-2013",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3461,8 +3464,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CHANNELMODETYPE",
    "name" : "OMX_AUDIO_CHANNELMODETYPE",
-   "referenced_type" : "type-1652",
-   "self_type" : "type-1652",
+   "referenced_type" : "type-1651",
+   "self_type" : "type-1651",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3527,8 +3530,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CHANNELTYPE",
    "name" : "OMX_AUDIO_CHANNELTYPE",
-   "referenced_type" : "type-1637",
-   "self_type" : "type-1637",
+   "referenced_type" : "type-1635",
+   "self_type" : "type-1635",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3669,8 +3672,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CODINGTYPE",
    "name" : "OMX_AUDIO_CODINGTYPE",
-   "referenced_type" : "type-1618",
-   "self_type" : "type-1618",
+   "referenced_type" : "type-1616",
+   "self_type" : "type-1616",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3711,8 +3714,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_ECHOCANTYPE",
    "name" : "OMX_AUDIO_ECHOCANTYPE",
-   "referenced_type" : "type-2196",
-   "self_type" : "type-2196",
+   "referenced_type" : "type-2199",
+   "self_type" : "type-2199",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3749,8 +3752,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G723RATE",
    "name" : "OMX_AUDIO_G723RATE",
-   "referenced_type" : "type-1808",
-   "self_type" : "type-1808",
+   "referenced_type" : "type-1799",
+   "self_type" : "type-1799",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3795,8 +3798,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G726MODE",
    "name" : "OMX_AUDIO_G726MODE",
-   "referenced_type" : "type-1831",
-   "self_type" : "type-1831",
+   "referenced_type" : "type-1822",
+   "self_type" : "type-1822",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3837,8 +3840,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G729TYPE",
    "name" : "OMX_AUDIO_G729TYPE",
-   "referenced_type" : "type-1851",
-   "self_type" : "type-1851",
+   "referenced_type" : "type-1845",
+   "self_type" : "type-1845",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3895,8 +3898,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDIFORMATTYPE",
    "name" : "OMX_AUDIO_MIDIFORMATTYPE",
-   "referenced_type" : "type-2087",
-   "self_type" : "type-2087",
+   "referenced_type" : "type-2079",
+   "self_type" : "type-2079",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3949,8 +3952,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
    "name" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
-   "referenced_type" : "type-2169",
-   "self_type" : "type-2169",
+   "referenced_type" : "type-2168",
+   "self_type" : "type-2168",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3991,8 +3994,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
    "name" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
-   "referenced_type" : "type-2121",
-   "self_type" : "type-2121",
+   "referenced_type" : "type-2113",
+   "self_type" : "type-2113",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4037,8 +4040,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
    "name" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
-   "referenced_type" : "type-2111",
-   "self_type" : "type-2111",
+   "referenced_type" : "type-2102",
+   "self_type" : "type-2102",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4075,8 +4078,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
    "name" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
-   "referenced_type" : "type-1660",
-   "self_type" : "type-1660",
+   "referenced_type" : "type-1656",
+   "self_type" : "type-1656",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4113,8 +4116,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PCMMODETYPE",
    "name" : "OMX_AUDIO_PCMMODETYPE",
-   "referenced_type" : "type-1633",
-   "self_type" : "type-1633",
+   "referenced_type" : "type-1628",
+   "self_type" : "type-1628",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4171,8 +4174,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_RAFORMATTYPE",
    "name" : "OMX_AUDIO_RAFORMATTYPE",
-   "referenced_type" : "type-1752",
-   "self_type" : "type-1752",
+   "referenced_type" : "type-1746",
+   "self_type" : "type-1746",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4205,8 +4208,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
    "name" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
-   "referenced_type" : "type-1775",
-   "self_type" : "type-1775",
+   "referenced_type" : "type-1766",
+   "self_type" : "type-1766",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4239,8 +4242,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_STEREOWIDENINGTYPE",
    "name" : "OMX_AUDIO_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-2192",
-   "self_type" : "type-2192",
+   "referenced_type" : "type-2195",
+   "self_type" : "type-2195",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4281,8 +4284,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_WMAFORMATTYPE",
    "name" : "OMX_AUDIO_WMAFORMATTYPE",
-   "referenced_type" : "type-1719",
-   "self_type" : "type-1719",
+   "referenced_type" : "type-1711",
+   "self_type" : "type-1711",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4323,8 +4326,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_WMAPROFILETYPE",
    "name" : "OMX_AUDIO_WMAPROFILETYPE",
-   "referenced_type" : "type-1732",
-   "self_type" : "type-1732",
+   "referenced_type" : "type-1722",
+   "self_type" : "type-1722",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4349,8 +4352,8 @@
    ],
    "linker_set_key" : "OMX_BOOL",
    "name" : "OMX_BOOL",
-   "referenced_type" : "type-1293",
-   "self_type" : "type-1293",
+   "referenced_type" : "type-1296",
+   "self_type" : "type-1296",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "underlying_type" : "type-2",
@@ -4387,8 +4390,8 @@
    ],
    "linker_set_key" : "OMX_BUFFERSUPPLIERTYPE",
    "name" : "OMX_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-1601",
-   "self_type" : "type-1601",
+   "referenced_type" : "type-1599",
+   "self_type" : "type-1599",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -4441,8 +4444,8 @@
    ],
    "linker_set_key" : "OMX_COLORBLENDTYPE",
    "name" : "OMX_COLORBLENDTYPE",
-   "referenced_type" : "type-2209",
-   "self_type" : "type-2209",
+   "referenced_type" : "type-2212",
+   "self_type" : "type-2212",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4683,8 +4686,8 @@
    ],
    "linker_set_key" : "OMX_COLOR_FORMATTYPE",
    "name" : "OMX_COLOR_FORMATTYPE",
-   "referenced_type" : "type-2199",
-   "self_type" : "type-2199",
+   "referenced_type" : "type-2202",
+   "self_type" : "type-2202",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4729,8 +4732,8 @@
    ],
    "linker_set_key" : "OMX_COMMANDTYPE",
    "name" : "OMX_COMMANDTYPE",
-   "referenced_type" : "type-1485",
-   "self_type" : "type-1485",
+   "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-2",
@@ -4767,8 +4770,8 @@
    ],
    "linker_set_key" : "OMX_DATAUNITENCAPSULATIONTYPE",
    "name" : "OMX_DATAUNITENCAPSULATIONTYPE",
-   "referenced_type" : "type-2236",
-   "self_type" : "type-2236",
+   "referenced_type" : "type-2239",
+   "self_type" : "type-2239",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4809,8 +4812,8 @@
    ],
    "linker_set_key" : "OMX_DATAUNITTYPE",
    "name" : "OMX_DATAUNITTYPE",
-   "referenced_type" : "type-2235",
-   "self_type" : "type-2235",
+   "referenced_type" : "type-2238",
+   "self_type" : "type-2238",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4835,8 +4838,8 @@
    ],
    "linker_set_key" : "OMX_DIRTYPE",
    "name" : "OMX_DIRTYPE",
-   "referenced_type" : "type-1452",
-   "self_type" : "type-1452",
+   "referenced_type" : "type-1455",
+   "self_type" : "type-1455",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "underlying_type" : "type-2",
@@ -4877,8 +4880,8 @@
    ],
    "linker_set_key" : "OMX_DITHERTYPE",
    "name" : "OMX_DITHERTYPE",
-   "referenced_type" : "type-2238",
-   "self_type" : "type-2238",
+   "referenced_type" : "type-2241",
+   "self_type" : "type-2241",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4903,8 +4906,8 @@
    ],
    "linker_set_key" : "OMX_ENDIANTYPE",
    "name" : "OMX_ENDIANTYPE",
-   "referenced_type" : "type-1460",
-   "self_type" : "type-1460",
+   "referenced_type" : "type-1459",
+   "self_type" : "type-1459",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "underlying_type" : "type-2",
@@ -5081,8 +5084,8 @@
    ],
    "linker_set_key" : "OMX_ERRORTYPE",
    "name" : "OMX_ERRORTYPE",
-   "referenced_type" : "type-1494",
-   "self_type" : "type-1494",
+   "referenced_type" : "type-1495",
+   "self_type" : "type-1495",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-4",
@@ -5155,8 +5158,8 @@
    ],
    "linker_set_key" : "OMX_EVENTTYPE",
    "name" : "OMX_EVENTTYPE",
-   "referenced_type" : "type-1588",
-   "self_type" : "type-1588",
+   "referenced_type" : "type-1589",
+   "self_type" : "type-1589",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -5221,8 +5224,8 @@
    ],
    "linker_set_key" : "OMX_EXPOSURECONTROLTYPE",
    "name" : "OMX_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-2221",
-   "self_type" : "type-2221",
+   "referenced_type" : "type-2224",
+   "self_type" : "type-2224",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -5255,8 +5258,8 @@
    ],
    "linker_set_key" : "OMX_EXTRADATATYPE",
    "name" : "OMX_EXTRADATATYPE",
-   "referenced_type" : "type-1561",
-   "self_type" : "type-1561",
+   "referenced_type" : "type-1556",
+   "self_type" : "type-1556",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -5301,8 +5304,8 @@
    ],
    "linker_set_key" : "OMX_FOCUSSTATUSTYPE",
    "name" : "OMX_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-2246",
-   "self_type" : "type-2246",
+   "referenced_type" : "type-2249",
+   "self_type" : "type-2249",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -5371,8 +5374,8 @@
    ],
    "linker_set_key" : "OMX_IMAGEFILTERTYPE",
    "name" : "OMX_IMAGEFILTERTYPE",
-   "referenced_type" : "type-2205",
-   "self_type" : "type-2205",
+   "referenced_type" : "type-2208",
+   "self_type" : "type-2208",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -5437,8 +5440,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_CODINGTYPE",
    "name" : "OMX_IMAGE_CODINGTYPE",
-   "referenced_type" : "type-2297",
-   "self_type" : "type-2297",
+   "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-2",
@@ -5487,8 +5490,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_FLASHCONTROLTYPE",
    "name" : "OMX_IMAGE_FLASHCONTROLTYPE",
-   "referenced_type" : "type-2300",
-   "self_type" : "type-2300",
+   "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-2",
@@ -5529,8 +5532,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_FOCUSCONTROLTYPE",
    "name" : "OMX_IMAGE_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-2303",
-   "self_type" : "type-2303",
+   "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-2",
@@ -5579,8 +5582,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_HUFFMANTABLETYPE",
    "name" : "OMX_IMAGE_HUFFMANTABLETYPE",
-   "referenced_type" : "type-2309",
-   "self_type" : "type-2309",
+   "referenced_type" : "type-2312",
+   "self_type" : "type-2312",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "underlying_type" : "type-2",
@@ -5621,8 +5624,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
    "name" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-2306",
-   "self_type" : "type-2306",
+   "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-2",
@@ -6481,8 +6484,8 @@
    ],
    "linker_set_key" : "OMX_METADATACHARSETTYPE",
    "name" : "OMX_METADATACHARSETTYPE",
-   "referenced_type" : "type-2345",
-   "self_type" : "type-2345",
+   "referenced_type" : "type-2348",
+   "self_type" : "type-2348",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6523,8 +6526,8 @@
    ],
    "linker_set_key" : "OMX_METADATASCOPETYPE",
    "name" : "OMX_METADATASCOPETYPE",
-   "referenced_type" : "type-2346",
-   "self_type" : "type-2346",
+   "referenced_type" : "type-2349",
+   "self_type" : "type-2349",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6561,8 +6564,8 @@
    ],
    "linker_set_key" : "OMX_METADATASEARCHMODETYPE",
    "name" : "OMX_METADATASEARCHMODETYPE",
-   "referenced_type" : "type-2347",
-   "self_type" : "type-2347",
+   "referenced_type" : "type-2350",
+   "self_type" : "type-2350",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6599,8 +6602,8 @@
    ],
    "linker_set_key" : "OMX_METERINGTYPE",
    "name" : "OMX_METERINGTYPE",
-   "referenced_type" : "type-2242",
-   "self_type" : "type-2242",
+   "referenced_type" : "type-2245",
+   "self_type" : "type-2245",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -6641,8 +6644,8 @@
    ],
    "linker_set_key" : "OMX_MIRRORTYPE",
    "name" : "OMX_MIRRORTYPE",
-   "referenced_type" : "type-2213",
-   "self_type" : "type-2213",
+   "referenced_type" : "type-2216",
+   "self_type" : "type-2216",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -6717,8 +6720,8 @@
    ],
    "linker_set_key" : "OMX_OTHER_FORMATTYPE",
    "name" : "OMX_OTHER_FORMATTYPE",
-   "referenced_type" : "type-2314",
-   "self_type" : "type-2314",
+   "referenced_type" : "type-2317",
+   "self_type" : "type-2317",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -6759,8 +6762,8 @@
    ],
    "linker_set_key" : "OMX_PORTDOMAINTYPE",
    "name" : "OMX_PORTDOMAINTYPE",
-   "referenced_type" : "type-2332",
-   "self_type" : "type-2332",
+   "referenced_type" : "type-2335",
+   "self_type" : "type-2335",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6809,8 +6812,8 @@
    ],
    "linker_set_key" : "OMX_STATETYPE",
    "name" : "OMX_STATETYPE",
-   "referenced_type" : "type-1488",
-   "self_type" : "type-1488",
+   "referenced_type" : "type-1490",
+   "self_type" : "type-1490",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -6843,8 +6846,8 @@
    ],
    "linker_set_key" : "OMX_SUSPENSIONPOLICYTYPE",
    "name" : "OMX_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-2336",
-   "self_type" : "type-2336",
+   "referenced_type" : "type-2339",
+   "self_type" : "type-2339",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6877,8 +6880,8 @@
    ],
    "linker_set_key" : "OMX_SUSPENSIONTYPE",
    "name" : "OMX_SUSPENSIONTYPE",
-   "referenced_type" : "type-2338",
-   "self_type" : "type-2338",
+   "referenced_type" : "type-2341",
+   "self_type" : "type-2341",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6915,8 +6918,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CLOCKSTATE",
    "name" : "OMX_TIME_CLOCKSTATE",
-   "referenced_type" : "type-2321",
-   "self_type" : "type-2321",
+   "referenced_type" : "type-2324",
+   "self_type" : "type-2324",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -6953,8 +6956,8 @@
    ],
    "linker_set_key" : "OMX_TIME_REFCLOCKTYPE",
    "name" : "OMX_TIME_REFCLOCKTYPE",
-   "referenced_type" : "type-2319",
-   "self_type" : "type-2319",
+   "referenced_type" : "type-2322",
+   "self_type" : "type-2322",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -6987,8 +6990,8 @@
    ],
    "linker_set_key" : "OMX_TIME_SEEKMODETYPE",
    "name" : "OMX_TIME_SEEKMODETYPE",
-   "referenced_type" : "type-2315",
-   "self_type" : "type-2315",
+   "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-2",
@@ -7025,8 +7028,8 @@
    ],
    "linker_set_key" : "OMX_TIME_UPDATETYPE",
    "name" : "OMX_TIME_UPDATETYPE",
-   "referenced_type" : "type-2318",
-   "self_type" : "type-2318",
+   "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-2",
@@ -7079,8 +7082,8 @@
    ],
    "linker_set_key" : "OMX_TRANSITIONEFFECTTYPE",
    "name" : "OMX_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-2233",
-   "self_type" : "type-2233",
+   "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-2",
@@ -7185,8 +7188,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCLEVELTYPE",
    "name" : "OMX_VIDEO_AVCLEVELTYPE",
-   "referenced_type" : "type-2280",
-   "self_type" : "type-2280",
+   "referenced_type" : "type-2283",
+   "self_type" : "type-2283",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7223,8 +7226,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
    "name" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
-   "referenced_type" : "type-2282",
-   "self_type" : "type-2282",
+   "referenced_type" : "type-2285",
+   "self_type" : "type-2285",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7277,8 +7280,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCPROFILETYPE",
    "name" : "OMX_VIDEO_AVCPROFILETYPE",
-   "referenced_type" : "type-2279",
-   "self_type" : "type-2279",
+   "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-2",
@@ -7315,8 +7318,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCSLICEMODETYPE",
    "name" : "OMX_VIDEO_AVCSLICEMODETYPE",
-   "referenced_type" : "type-2293",
-   "self_type" : "type-2293",
+   "referenced_type" : "type-2296",
+   "self_type" : "type-2296",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7397,8 +7400,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CODINGTYPE",
    "name" : "OMX_VIDEO_CODINGTYPE",
-   "referenced_type" : "type-2248",
-   "self_type" : "type-2248",
+   "referenced_type" : "type-2251",
+   "self_type" : "type-2251",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7447,8 +7450,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONTROLRATETYPE",
    "name" : "OMX_VIDEO_CONTROLRATETYPE",
-   "referenced_type" : "type-2253",
-   "self_type" : "type-2253",
+   "referenced_type" : "type-2256",
+   "self_type" : "type-2256",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7505,8 +7508,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_H263LEVELTYPE",
    "name" : "OMX_VIDEO_H263LEVELTYPE",
-   "referenced_type" : "type-2264",
-   "self_type" : "type-2264",
+   "referenced_type" : "type-2267",
+   "self_type" : "type-2267",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7567,8 +7570,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_H263PROFILETYPE",
    "name" : "OMX_VIDEO_H263PROFILETYPE",
-   "referenced_type" : "type-2263",
-   "self_type" : "type-2263",
+   "referenced_type" : "type-2266",
+   "self_type" : "type-2266",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7605,8 +7608,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_INTRAREFRESHTYPE",
    "name" : "OMX_VIDEO_INTRAREFRESHTYPE",
-   "referenced_type" : "type-2259",
-   "self_type" : "type-2259",
+   "referenced_type" : "type-2262",
+   "self_type" : "type-2262",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7647,8 +7650,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MOTIONVECTORTYPE",
    "name" : "OMX_VIDEO_MOTIONVECTORTYPE",
-   "referenced_type" : "type-2257",
-   "self_type" : "type-2257",
+   "referenced_type" : "type-2260",
+   "self_type" : "type-2260",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7693,8 +7696,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG2LEVELTYPE",
    "name" : "OMX_VIDEO_MPEG2LEVELTYPE",
-   "referenced_type" : "type-2269",
-   "self_type" : "type-2269",
+   "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-2",
@@ -7743,8 +7746,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG2PROFILETYPE",
    "name" : "OMX_VIDEO_MPEG2PROFILETYPE",
-   "referenced_type" : "type-2268",
-   "self_type" : "type-2268",
+   "referenced_type" : "type-2271",
+   "self_type" : "type-2271",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7809,8 +7812,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG4LEVELTYPE",
    "name" : "OMX_VIDEO_MPEG4LEVELTYPE",
-   "referenced_type" : "type-2272",
-   "self_type" : "type-2272",
+   "referenced_type" : "type-2275",
+   "self_type" : "type-2275",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7899,8 +7902,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG4PROFILETYPE",
    "name" : "OMX_VIDEO_MPEG4PROFILETYPE",
-   "referenced_type" : "type-2271",
-   "self_type" : "type-2271",
+   "referenced_type" : "type-2274",
+   "self_type" : "type-2274",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7957,8 +7960,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PICTURETYPE",
    "name" : "OMX_VIDEO_PICTURETYPE",
-   "referenced_type" : "type-2265",
-   "self_type" : "type-2265",
+   "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-2",
@@ -7999,8 +8002,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_RVFORMATTYPE",
    "name" : "OMX_VIDEO_RVFORMATTYPE",
-   "referenced_type" : "type-2276",
-   "self_type" : "type-2276",
+   "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-2",
@@ -8041,8 +8044,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_WMVFORMATTYPE",
    "name" : "OMX_VIDEO_WMVFORMATTYPE",
-   "referenced_type" : "type-2274",
-   "self_type" : "type-2274",
+   "referenced_type" : "type-2277",
+   "self_type" : "type-2277",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -8107,8 +8110,8 @@
    ],
    "linker_set_key" : "OMX_WHITEBALCONTROLTYPE",
    "name" : "OMX_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-2219",
-   "self_type" : "type-2219",
+   "referenced_type" : "type-2222",
+   "self_type" : "type-2222",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -8149,8 +8152,8 @@
    ],
    "linker_set_key" : "android::ADebug::Level",
    "name" : "android::ADebug::Level",
-   "referenced_type" : "type-2292",
-   "self_type" : "type-2292",
+   "referenced_type" : "type-2295",
+   "self_type" : "type-2295",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
    "underlying_type" : "type-2",
@@ -8253,8 +8256,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::MatrixCoeffs",
    "name" : "android::ColorAspects::MatrixCoeffs",
-   "referenced_type" : "type-2432",
-   "self_type" : "type-2432",
+   "referenced_type" : "type-2435",
+   "self_type" : "type-2435",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8299,8 +8302,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::Primaries",
    "name" : "android::ColorAspects::Primaries",
-   "referenced_type" : "type-2430",
-   "self_type" : "type-2430",
+   "referenced_type" : "type-2433",
+   "self_type" : "type-2433",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8329,8 +8332,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::Range",
    "name" : "android::ColorAspects::Range",
-   "referenced_type" : "type-2429",
-   "self_type" : "type-2429",
+   "referenced_type" : "type-2432",
+   "self_type" : "type-2432",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8453,8 +8456,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::Transfer",
    "name" : "android::ColorAspects::Transfer",
-   "referenced_type" : "type-2431",
-   "self_type" : "type-2431",
+   "referenced_type" : "type-2434",
+   "self_type" : "type-2434",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8487,8 +8490,8 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorRange",
    "name" : "android::ColorUtils::ColorRange",
-   "referenced_type" : "type-1197",
-   "self_type" : "type-1197",
+   "referenced_type" : "type-1195",
+   "self_type" : "type-1195",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
    "underlying_type" : "type-2",
@@ -8553,8 +8556,8 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorStandard",
    "name" : "android::ColorUtils::ColorStandard",
-   "referenced_type" : "type-1187",
-   "self_type" : "type-1187",
+   "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-2",
@@ -8611,8 +8614,8 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorTransfer",
    "name" : "android::ColorUtils::ColorTransfer",
-   "referenced_type" : "type-1189",
-   "self_type" : "type-1189",
+   "referenced_type" : "type-1192",
+   "self_type" : "type-1192",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
    "underlying_type" : "type-2",
@@ -8677,8 +8680,8 @@
    ],
    "linker_set_key" : "android::HDRStaticInfo::ID",
    "name" : "android::HDRStaticInfo::ID",
-   "referenced_type" : "type-2436",
-   "self_type" : "type-2436",
+   "referenced_type" : "type-2439",
+   "self_type" : "type-2439",
    "size" : 1,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-90",
@@ -8761,8 +8764,8 @@
    ],
    "linker_set_key" : "android::MediaImage2::Type",
    "name" : "android::MediaImage2::Type",
-   "referenced_type" : "type-2421",
-   "self_type" : "type-2421",
+   "referenced_type" : "type-2424",
+   "self_type" : "type-2424",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8813,8 +8816,8 @@
    ],
    "linker_set_key" : "android::MediaImage::Type",
    "name" : "android::MediaImage::Type",
-   "referenced_type" : "type-2416",
-   "self_type" : "type-2416",
+   "referenced_type" : "type-2419",
+   "self_type" : "type-2419",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8847,8 +8850,8 @@
    ],
    "linker_set_key" : "android::MetadataBufferType",
    "name" : "android::MetadataBufferType",
-   "referenced_type" : "type-1234",
-   "self_type" : "type-1234",
+   "referenced_type" : "type-1235",
+   "self_type" : "type-1235",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/MetadataBufferType.h",
    "underlying_type" : "type-4",
@@ -8873,8 +8876,8 @@
    ],
    "linker_set_key" : "android::ProcessState::CallRestriction",
    "name" : "android::ProcessState::CallRestriction",
-   "referenced_type" : "type-1255",
-   "self_type" : "type-1255",
+   "referenced_type" : "type-1259",
+   "self_type" : "type-1259",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h",
    "underlying_type" : "type-4",
@@ -8891,8 +8894,8 @@
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-2657",
-   "self_type" : "type-2657",
+   "referenced_type" : "type-2660",
+   "self_type" : "type-2660",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "underlying_type" : "type-2",
@@ -8909,8 +8912,8 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-2652",
-   "self_type" : "type-2652",
+   "referenced_type" : "type-2655",
+   "self_type" : "type-2655",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "underlying_type" : "type-2",
@@ -8935,8 +8938,8 @@
    ],
    "linker_set_key" : "android::base::LogId",
    "name" : "android::base::LogId",
-   "referenced_type" : "type-4704",
-   "self_type" : "type-4704",
+   "referenced_type" : "type-4711",
+   "self_type" : "type-4711",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "type-2",
@@ -8977,8 +8980,8 @@
    ],
    "linker_set_key" : "android::base::LogSeverity",
    "name" : "android::base::LogSeverity",
-   "referenced_type" : "type-4654",
-   "self_type" : "type-4654",
+   "referenced_type" : "type-4661",
+   "self_type" : "type-4661",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "type-2",
@@ -9113,8 +9116,8 @@
    ],
    "linker_set_key" : "android::hardware::ProcessState::CallRestriction",
    "name" : "android::hardware::ProcessState::CallRestriction",
-   "referenced_type" : "type-1391",
-   "self_type" : "type-1391",
+   "referenced_type" : "type-1394",
+   "self_type" : "type-1394",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "underlying_type" : "type-4",
@@ -12107,8 +12110,8 @@
    ],
    "linker_set_key" : "log_id",
    "name" : "log_id",
-   "referenced_type" : "type-2411",
-   "self_type" : "type-2411",
+   "referenced_type" : "type-2414",
+   "self_type" : "type-2414",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
@@ -12127,9 +12130,9 @@
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1501",
-   "return_type" : "type-1494",
-   "self_type" : "type-1501",
+   "referenced_type" : "type-1500",
+   "return_type" : "type-1495",
+   "self_type" : "type-1500",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -12142,12 +12145,12 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1595"
+     "referenced_type" : "type-1598"
     }
    ],
-   "referenced_type" : "type-2382",
-   "return_type" : "type-1494",
-   "self_type" : "type-2382",
+   "referenced_type" : "type-2385",
+   "return_type" : "type-1495",
+   "self_type" : "type-2385",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12160,7 +12163,7 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-2376"
+     "referenced_type" : "type-2379"
     },
     {
      "referenced_type" : "type-2"
@@ -12172,9 +12175,9 @@
      "referenced_type" : "type-2"
     }
    ],
-   "referenced_type" : "type-2378",
-   "return_type" : "type-1494",
-   "self_type" : "type-2378",
+   "referenced_type" : "type-2381",
+   "return_type" : "type-1495",
+   "self_type" : "type-2381",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12187,7 +12190,7 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-2376"
+     "referenced_type" : "type-2379"
     },
     {
      "referenced_type" : "type-2"
@@ -12202,9 +12205,9 @@
      "referenced_type" : "type-89"
     }
    ],
-   "referenced_type" : "type-2375",
-   "return_type" : "type-1494",
-   "self_type" : "type-2375",
+   "referenced_type" : "type-2378",
+   "return_type" : "type-1495",
+   "self_type" : "type-2378",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12217,7 +12220,7 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-2376"
+     "referenced_type" : "type-2379"
     },
     {
      "referenced_type" : "type-2"
@@ -12229,9 +12232,9 @@
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-2387",
-   "return_type" : "type-1494",
-   "self_type" : "type-2387",
+   "referenced_type" : "type-2390",
+   "return_type" : "type-1495",
+   "self_type" : "type-2390",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12244,15 +12247,15 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-2385"
+     "referenced_type" : "type-2388"
     },
     {
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-2384",
-   "return_type" : "type-1494",
-   "self_type" : "type-2384",
+   "referenced_type" : "type-2387",
+   "return_type" : "type-1495",
+   "self_type" : "type-2387",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12265,7 +12268,7 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-1488"
     },
     {
      "referenced_type" : "type-2"
@@ -12274,9 +12277,9 @@
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-2362",
-   "return_type" : "type-1494",
-   "self_type" : "type-2362",
+   "referenced_type" : "type-2365",
+   "return_type" : "type-1495",
+   "self_type" : "type-2365",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12295,9 +12298,9 @@
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-2364",
-   "return_type" : "type-1494",
-   "self_type" : "type-2364",
+   "referenced_type" : "type-2367",
+   "return_type" : "type-1495",
+   "self_type" : "type-2367",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12310,12 +12313,12 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-2370"
+     "referenced_type" : "type-2373"
     }
    ],
-   "referenced_type" : "type-2369",
-   "return_type" : "type-1494",
-   "self_type" : "type-2369",
+   "referenced_type" : "type-2372",
+   "return_type" : "type-1495",
+   "self_type" : "type-2372",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12331,12 +12334,12 @@
      "referenced_type" : "type-254"
     },
     {
-     "referenced_type" : "type-2367"
+     "referenced_type" : "type-2370"
     }
    ],
-   "referenced_type" : "type-2366",
-   "return_type" : "type-1494",
-   "self_type" : "type-2366",
+   "referenced_type" : "type-2369",
+   "return_type" : "type-1495",
+   "self_type" : "type-2369",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12352,18 +12355,18 @@
      "referenced_type" : "type-254"
     },
     {
-     "referenced_type" : "type-2359"
+     "referenced_type" : "type-2362"
     },
     {
-     "referenced_type" : "type-2359"
+     "referenced_type" : "type-2362"
     },
     {
-     "referenced_type" : "type-2360"
+     "referenced_type" : "type-2363"
     }
    ],
-   "referenced_type" : "type-2358",
-   "return_type" : "type-1494",
-   "self_type" : "type-2358",
+   "referenced_type" : "type-2361",
+   "return_type" : "type-1495",
+   "self_type" : "type-2361",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12382,9 +12385,9 @@
      "referenced_type" : "type-2"
     }
    ],
-   "referenced_type" : "type-2389",
-   "return_type" : "type-1494",
-   "self_type" : "type-2389",
+   "referenced_type" : "type-2392",
+   "return_type" : "type-1495",
+   "self_type" : "type-2392",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12400,12 +12403,12 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1595"
+     "referenced_type" : "type-1598"
     }
    ],
-   "referenced_type" : "type-2380",
-   "return_type" : "type-1494",
-   "self_type" : "type-2380",
+   "referenced_type" : "type-2383",
+   "return_type" : "type-1495",
+   "self_type" : "type-2383",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12427,12 +12430,12 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-2373"
+     "referenced_type" : "type-2376"
     }
    ],
-   "referenced_type" : "type-2372",
-   "return_type" : "type-1494",
-   "self_type" : "type-2372",
+   "referenced_type" : "type-2375",
+   "return_type" : "type-1495",
+   "self_type" : "type-2375",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12448,12 +12451,12 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1595"
+     "referenced_type" : "type-1598"
     }
    ],
-   "referenced_type" : "type-1594",
-   "return_type" : "type-1494",
-   "self_type" : "type-1594",
+   "referenced_type" : "type-1597",
+   "return_type" : "type-1495",
+   "self_type" : "type-1597",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -12469,7 +12472,7 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1588"
+     "referenced_type" : "type-1589"
     },
     {
      "referenced_type" : "type-2"
@@ -12481,9 +12484,9 @@
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1592",
-   "return_type" : "type-1494",
-   "self_type" : "type-1592",
+   "referenced_type" : "type-1595",
+   "return_type" : "type-1495",
+   "self_type" : "type-1595",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -12493,18 +12496,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1247"
+     "referenced_type" : "type-1250"
     },
     {
-     "referenced_type" : "type-1037"
+     "referenced_type" : "type-1041"
     },
     {
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1246",
+   "referenced_type" : "type-1249",
    "return_type" : "type-93",
-   "self_type" : "type-1246",
+   "self_type" : "type-1249",
    "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h"
   },
   {
@@ -12514,18 +12517,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1247"
+     "referenced_type" : "type-1250"
     },
     {
-     "referenced_type" : "type-1388"
+     "referenced_type" : "type-1391"
     },
     {
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1387",
+   "referenced_type" : "type-1390",
    "return_type" : "type-93",
-   "self_type" : "type-1387",
+   "self_type" : "type-1390",
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
   {
@@ -12580,7 +12583,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1381"
+     "referenced_type" : "type-1384"
     },
     {
      "referenced_type" : "type-97"
@@ -12598,9 +12601,9 @@
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1380",
+   "referenced_type" : "type-1383",
    "return_type" : "type-9",
-   "self_type" : "type-1380",
+   "self_type" : "type-1383",
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   }
  ],
@@ -12628,7 +12631,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-4500"
+     "referenced_type" : "type-4506"
     }
    ],
    "return_type" : "type-50",
@@ -12656,7 +12659,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1271"
+     "referenced_type" : "type-1275"
     }
    ],
    "return_type" : "type-50",
@@ -12935,7 +12938,7 @@
      "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-2190"
+     "referenced_type" : "type-2193"
     }
    ],
    "return_type" : "type-9",
@@ -13281,7 +13284,7 @@
      "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-2492"
+     "referenced_type" : "type-2495"
     },
     {
      "referenced_type" : "type-4"
@@ -13390,13 +13393,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2522"
+     "referenced_type" : "type-2525"
     },
     {
      "referenced_type" : "type-725"
     }
    ],
-   "return_type" : "type-2525",
+   "return_type" : "type-2528",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -13406,13 +13409,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2522"
+     "referenced_type" : "type-2525"
     },
     {
-     "referenced_type" : "type-1862"
+     "referenced_type" : "type-1866"
     }
    ],
-   "return_type" : "type-2525",
+   "return_type" : "type-2528",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -13423,7 +13426,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2673"
+     "referenced_type" : "type-2676"
     },
     {
      "referenced_type" : "type-11"
@@ -13443,7 +13446,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2673"
+     "referenced_type" : "type-2676"
     },
     {
      "referenced_type" : "type-8"
@@ -13463,7 +13466,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2673"
+     "referenced_type" : "type-2676"
     },
     {
      "referenced_type" : "type-8"
@@ -13483,7 +13486,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2673"
+     "referenced_type" : "type-2676"
     },
     {
      "referenced_type" : "type-8"
@@ -13506,7 +13509,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2673"
+     "referenced_type" : "type-2676"
     },
     {
      "referenced_type" : "type-8"
@@ -13529,7 +13532,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2673"
+     "referenced_type" : "type-2676"
     },
     {
      "referenced_type" : "type-8"
@@ -13552,7 +13555,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2673"
+     "referenced_type" : "type-2676"
     },
     {
      "referenced_type" : "type-8"
@@ -13575,7 +13578,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2676"
+     "referenced_type" : "type-2679"
     },
     {
      "referenced_type" : "type-11"
@@ -13595,7 +13598,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2676"
+     "referenced_type" : "type-2679"
     },
     {
      "referenced_type" : "type-8"
@@ -13615,7 +13618,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2676"
+     "referenced_type" : "type-2679"
     },
     {
      "referenced_type" : "type-8"
@@ -13635,7 +13638,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2676"
+     "referenced_type" : "type-2679"
     },
     {
      "referenced_type" : "type-8"
@@ -13658,7 +13661,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2676"
+     "referenced_type" : "type-2679"
     },
     {
      "referenced_type" : "type-8"
@@ -13681,7 +13684,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2676"
+     "referenced_type" : "type-2679"
     },
     {
      "referenced_type" : "type-8"
@@ -13704,7 +13707,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2676"
+     "referenced_type" : "type-2679"
     },
     {
      "referenced_type" : "type-8"
@@ -13727,7 +13730,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2668"
+     "referenced_type" : "type-2671"
     },
     {
      "referenced_type" : "type-11"
@@ -13747,7 +13750,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2668"
+     "referenced_type" : "type-2671"
     },
     {
      "referenced_type" : "type-8"
@@ -13767,7 +13770,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2668"
+     "referenced_type" : "type-2671"
     },
     {
      "referenced_type" : "type-8"
@@ -13787,7 +13790,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2668"
+     "referenced_type" : "type-2671"
     },
     {
      "referenced_type" : "type-8"
@@ -13810,7 +13813,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2668"
+     "referenced_type" : "type-2671"
     },
     {
      "referenced_type" : "type-8"
@@ -13833,7 +13836,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2668"
+     "referenced_type" : "type-2671"
     },
     {
      "referenced_type" : "type-8"
@@ -13856,7 +13859,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2668"
+     "referenced_type" : "type-2671"
     },
     {
      "referenced_type" : "type-8"
@@ -13878,10 +13881,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2547"
+     "referenced_type" : "type-2550"
     }
    ],
-   "return_type" : "type-2476",
+   "return_type" : "type-2479",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -13891,7 +13894,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2547"
+     "referenced_type" : "type-2550"
     }
    ],
    "return_type" : "type-570",
@@ -13904,10 +13907,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2547"
+     "referenced_type" : "type-2550"
     }
    ],
-   "return_type" : "type-2463",
+   "return_type" : "type-2466",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -13918,18 +13921,18 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1513"
+     "referenced_type" : "type-1517"
     },
     {
-     "referenced_type" : "type-1648"
+     "referenced_type" : "type-1652"
     },
     {
-     "referenced_type" : "type-3128"
+     "referenced_type" : "type-3131"
     }
    ],
    "return_type" : "type-4",
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-3129", "type-83" ]
+   "template_args" : [ "type-3132", "type-83" ]
   },
   {
    "function_name" : "android::Parcel::readNullableStrongBinder",
@@ -13938,15 +13941,15 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1513"
+     "referenced_type" : "type-1517"
     },
     {
-     "referenced_type" : "type-2534"
+     "referenced_type" : "type-2537"
     }
    ],
    "return_type" : "type-4",
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-3130" ]
+   "template_args" : [ "type-3133" ]
   },
   {
    "access" : "protected",
@@ -13956,7 +13959,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-978"
+     "referenced_type" : "type-980"
     },
     {
      "referenced_type" : "type-8"
@@ -13976,7 +13979,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-978"
+     "referenced_type" : "type-980"
     },
     {
      "referenced_type" : "type-8"
@@ -13996,7 +13999,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-978"
+     "referenced_type" : "type-980"
     },
     {
      "referenced_type" : "type-8"
@@ -14019,7 +14022,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-978"
+     "referenced_type" : "type-980"
     },
     {
      "referenced_type" : "type-8"
@@ -14042,7 +14045,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-978"
+     "referenced_type" : "type-980"
     },
     {
      "referenced_type" : "type-8"
@@ -14065,7 +14068,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-978"
+     "referenced_type" : "type-980"
     },
     {
      "referenced_type" : "type-8"
@@ -14088,7 +14091,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1228"
+     "referenced_type" : "type-1232"
     },
     {
      "referenced_type" : "type-8"
@@ -14108,7 +14111,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1228"
+     "referenced_type" : "type-1232"
     },
     {
      "referenced_type" : "type-8"
@@ -14128,7 +14131,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1228"
+     "referenced_type" : "type-1232"
     },
     {
      "referenced_type" : "type-8"
@@ -14151,7 +14154,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1228"
+     "referenced_type" : "type-1232"
     },
     {
      "referenced_type" : "type-8"
@@ -14174,7 +14177,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1228"
+     "referenced_type" : "type-1232"
     },
     {
      "referenced_type" : "type-8"
@@ -14197,7 +14200,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1228"
+     "referenced_type" : "type-1232"
     },
     {
      "referenced_type" : "type-8"
@@ -14220,7 +14223,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2689"
+     "referenced_type" : "type-2692"
     },
     {
      "referenced_type" : "type-8"
@@ -14240,7 +14243,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2689"
+     "referenced_type" : "type-2692"
     },
     {
      "referenced_type" : "type-8"
@@ -14260,7 +14263,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2689"
+     "referenced_type" : "type-2692"
     },
     {
      "referenced_type" : "type-8"
@@ -14283,7 +14286,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2689"
+     "referenced_type" : "type-2692"
     },
     {
      "referenced_type" : "type-8"
@@ -14306,7 +14309,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2689"
+     "referenced_type" : "type-2692"
     },
     {
      "referenced_type" : "type-8"
@@ -14329,7 +14332,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2689"
+     "referenced_type" : "type-2692"
     },
     {
      "referenced_type" : "type-8"
@@ -14366,7 +14369,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-4500"
+     "referenced_type" : "type-4506"
     }
    ],
    "return_type" : "type-50",
@@ -14380,8 +14383,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem &",
    "name" : "android::BufferItem &",
-   "referenced_type" : "type-1224",
-   "self_type" : "type-1223",
+   "referenced_type" : "type-1227",
+   "self_type" : "type-1226",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14389,8 +14392,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem &",
    "name" : "android::BufferItem &",
-   "referenced_type" : "type-3796",
-   "self_type" : "type-3795",
+   "referenced_type" : "type-3802",
+   "self_type" : "type-3801",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14398,8 +14401,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem &",
    "name" : "android::BufferItem &",
-   "referenced_type" : "type-5857",
-   "self_type" : "type-5856",
+   "referenced_type" : "type-5877",
+   "self_type" : "type-5876",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14407,8 +14410,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem &",
    "name" : "android::BufferItem &",
-   "referenced_type" : "type-6402",
-   "self_type" : "type-6401",
+   "referenced_type" : "type-6425",
+   "self_type" : "type-6424",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14416,8 +14419,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *&",
    "name" : "android::BufferItem *&",
-   "referenced_type" : "type-1669",
-   "self_type" : "type-1853",
+   "referenced_type" : "type-1673",
+   "self_type" : "type-1857",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -14425,8 +14428,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *&",
    "name" : "android::BufferItem *&",
-   "referenced_type" : "type-4124",
-   "self_type" : "type-4132",
+   "referenced_type" : "type-4130",
+   "self_type" : "type-4138",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -14434,8 +14437,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *&",
    "name" : "android::BufferItem *&",
-   "referenced_type" : "type-6695",
-   "self_type" : "type-6709",
+   "referenced_type" : "type-6719",
+   "self_type" : "type-6733",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -14443,8 +14446,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::CompositorTiming &",
    "name" : "android::CompositorTiming &",
-   "referenced_type" : "type-1431",
-   "self_type" : "type-1430",
+   "referenced_type" : "type-1434",
+   "self_type" : "type-1433",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14452,8 +14455,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::CompositorTiming &",
    "name" : "android::CompositorTiming &",
-   "referenced_type" : "type-3961",
-   "self_type" : "type-3960",
+   "referenced_type" : "type-3967",
+   "self_type" : "type-3966",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14461,8 +14464,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::CompositorTiming &",
    "name" : "android::CompositorTiming &",
-   "referenced_type" : "type-6538",
-   "self_type" : "type-6537",
+   "referenced_type" : "type-6561",
+   "self_type" : "type-6560",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14470,8 +14473,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-2528",
-   "self_type" : "type-2527",
+   "referenced_type" : "type-2531",
+   "self_type" : "type-2530",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14479,8 +14482,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-4415",
-   "self_type" : "type-4414",
+   "referenced_type" : "type-4417",
+   "self_type" : "type-4416",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14488,8 +14491,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-4671",
-   "self_type" : "type-4670",
+   "referenced_type" : "type-4677",
+   "self_type" : "type-4676",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14497,8 +14500,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-4939",
-   "self_type" : "type-4938",
+   "referenced_type" : "type-4945",
+   "self_type" : "type-4944",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14506,8 +14509,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-5999",
-   "self_type" : "type-5998",
+   "referenced_type" : "type-6019",
+   "self_type" : "type-6018",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14515,8 +14518,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-7004",
-   "self_type" : "type-7003",
+   "referenced_type" : "type-7024",
+   "self_type" : "type-7023",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14524,8 +14527,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-7186",
-   "self_type" : "type-7185",
+   "referenced_type" : "type-7209",
+   "self_type" : "type-7208",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14533,8 +14536,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-7298",
-   "self_type" : "type-7297",
+   "referenced_type" : "type-7321",
+   "self_type" : "type-7320",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14542,8 +14545,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot::State &",
    "name" : "android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-4585",
-   "self_type" : "type-4584",
+   "referenced_type" : "type-4591",
+   "self_type" : "type-4590",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14551,8 +14554,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot::State &",
    "name" : "android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-7206",
-   "self_type" : "type-7205",
+   "referenced_type" : "type-7231",
+   "self_type" : "type-7230",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14561,7 +14564,7 @@
    "linker_set_key" : "android::Flattenable<android::BufferItem> &",
    "name" : "android::Flattenable<android::BufferItem> &",
    "referenced_type" : "type-21",
-   "self_type" : "type-1514",
+   "self_type" : "type-1518",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14570,7 +14573,7 @@
    "linker_set_key" : "android::Flattenable<android::Fence> &",
    "name" : "android::Flattenable<android::Fence> &",
    "referenced_type" : "type-16",
-   "self_type" : "type-1651",
+   "self_type" : "type-1655",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14579,7 +14582,7 @@
    "linker_set_key" : "android::Flattenable<android::FrameEventHistoryDelta> &",
    "name" : "android::Flattenable<android::FrameEventHistoryDelta> &",
    "referenced_type" : "type-25",
-   "self_type" : "type-4324",
+   "self_type" : "type-4330",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14588,7 +14591,7 @@
    "linker_set_key" : "android::Flattenable<android::GraphicBuffer> &",
    "name" : "android::Flattenable<android::GraphicBuffer> &",
    "referenced_type" : "type-14",
-   "self_type" : "type-1650",
+   "self_type" : "type-1654",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14597,7 +14600,7 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> &",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> &",
    "referenced_type" : "type-32",
-   "self_type" : "type-4326",
+   "self_type" : "type-4333",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14606,7 +14609,7 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> &",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> &",
    "referenced_type" : "type-34",
-   "self_type" : "type-4325",
+   "self_type" : "type-4332",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14614,8 +14617,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-2391",
-   "self_type" : "type-2390",
+   "referenced_type" : "type-2394",
+   "self_type" : "type-2393",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14623,8 +14626,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-4217",
-   "self_type" : "type-4216",
+   "referenced_type" : "type-4223",
+   "self_type" : "type-4222",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14632,8 +14635,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-4678",
-   "self_type" : "type-4677",
+   "referenced_type" : "type-4685",
+   "self_type" : "type-4684",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14641,8 +14644,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-4769",
-   "self_type" : "type-4768",
+   "referenced_type" : "type-4775",
+   "self_type" : "type-4774",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14650,8 +14653,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-5973",
-   "self_type" : "type-5972",
+   "referenced_type" : "type-5993",
+   "self_type" : "type-5992",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14659,8 +14662,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-6797",
-   "self_type" : "type-6796",
+   "referenced_type" : "type-6820",
+   "self_type" : "type-6819",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14668,8 +14671,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-6818",
-   "self_type" : "type-6817",
+   "referenced_type" : "type-6842",
+   "self_type" : "type-6841",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14677,8 +14680,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-7305",
-   "self_type" : "type-7304",
+   "referenced_type" : "type-7328",
+   "self_type" : "type-7327",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14686,8 +14689,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1086",
-   "self_type" : "type-1085",
+   "referenced_type" : "type-1089",
+   "self_type" : "type-1088",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14695,8 +14698,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1268",
-   "self_type" : "type-1267",
+   "referenced_type" : "type-1271",
+   "self_type" : "type-1270",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14704,8 +14707,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1410",
-   "self_type" : "type-1409",
+   "referenced_type" : "type-1413",
+   "self_type" : "type-1412",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14713,8 +14716,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1446",
-   "self_type" : "type-1445",
+   "referenced_type" : "type-1449",
+   "self_type" : "type-1448",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14722,8 +14725,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-2172",
-   "self_type" : "type-2171",
+   "referenced_type" : "type-2176",
+   "self_type" : "type-2175",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14731,8 +14734,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3250",
-   "self_type" : "type-3249",
+   "referenced_type" : "type-3253",
+   "self_type" : "type-3252",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14749,8 +14752,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3463",
-   "self_type" : "type-3462",
+   "referenced_type" : "type-3466",
+   "self_type" : "type-3465",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14758,8 +14761,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3528",
-   "self_type" : "type-3527",
+   "referenced_type" : "type-3531",
+   "self_type" : "type-3530",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14767,8 +14770,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3639",
-   "self_type" : "type-3638",
+   "referenced_type" : "type-3642",
+   "self_type" : "type-3641",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14776,8 +14779,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3696",
-   "self_type" : "type-3695",
+   "referenced_type" : "type-3702",
+   "self_type" : "type-3701",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14785,8 +14788,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3821",
-   "self_type" : "type-3820",
+   "referenced_type" : "type-3827",
+   "self_type" : "type-3826",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14794,8 +14797,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3937",
-   "self_type" : "type-3936",
+   "referenced_type" : "type-3943",
+   "self_type" : "type-3942",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14803,8 +14806,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3978",
-   "self_type" : "type-3977",
+   "referenced_type" : "type-3985",
+   "self_type" : "type-3984",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14812,8 +14815,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-4207",
-   "self_type" : "type-4206",
+   "referenced_type" : "type-4214",
+   "self_type" : "type-4213",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14821,8 +14824,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-4386",
-   "self_type" : "type-4385",
+   "referenced_type" : "type-4392",
+   "self_type" : "type-4391",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14830,8 +14833,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-4597",
-   "self_type" : "type-4596",
+   "referenced_type" : "type-4604",
+   "self_type" : "type-4603",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14839,8 +14842,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-4764",
-   "self_type" : "type-4763",
+   "referenced_type" : "type-4771",
+   "self_type" : "type-4770",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14848,8 +14851,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5080",
-   "self_type" : "type-5079",
+   "referenced_type" : "type-5096",
+   "self_type" : "type-5095",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14857,8 +14860,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5148",
-   "self_type" : "type-5147",
+   "referenced_type" : "type-5164",
+   "self_type" : "type-5163",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14866,8 +14869,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5311",
-   "self_type" : "type-5310",
+   "referenced_type" : "type-5328",
+   "self_type" : "type-5327",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14875,8 +14878,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5524",
-   "self_type" : "type-5523",
+   "referenced_type" : "type-5541",
+   "self_type" : "type-5540",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14884,8 +14887,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5589",
-   "self_type" : "type-5588",
+   "referenced_type" : "type-5606",
+   "self_type" : "type-5605",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14893,8 +14896,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5700",
-   "self_type" : "type-5699",
+   "referenced_type" : "type-5717",
+   "self_type" : "type-5716",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14902,8 +14905,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5757",
-   "self_type" : "type-5756",
+   "referenced_type" : "type-5777",
+   "self_type" : "type-5776",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14911,8 +14914,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5882",
-   "self_type" : "type-5881",
+   "referenced_type" : "type-5902",
+   "self_type" : "type-5901",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14920,8 +14923,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6042",
-   "self_type" : "type-6041",
+   "referenced_type" : "type-6062",
+   "self_type" : "type-6061",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14929,8 +14932,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6125",
-   "self_type" : "type-6124",
+   "referenced_type" : "type-6145",
+   "self_type" : "type-6144",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14938,8 +14941,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6177",
-   "self_type" : "type-6176",
+   "referenced_type" : "type-6197",
+   "self_type" : "type-6196",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14947,8 +14950,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6271",
-   "self_type" : "type-6270",
+   "referenced_type" : "type-6291",
+   "self_type" : "type-6290",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14956,8 +14959,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6315",
-   "self_type" : "type-6314",
+   "referenced_type" : "type-6338",
+   "self_type" : "type-6337",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14965,8 +14968,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6410",
-   "self_type" : "type-6409",
+   "referenced_type" : "type-6434",
+   "self_type" : "type-6433",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14974,8 +14977,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6516",
-   "self_type" : "type-6515",
+   "referenced_type" : "type-6539",
+   "self_type" : "type-6538",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14983,8 +14986,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6553",
-   "self_type" : "type-6552",
+   "referenced_type" : "type-6576",
+   "self_type" : "type-6575",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14992,8 +14995,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6799",
-   "self_type" : "type-6798",
+   "referenced_type" : "type-6822",
+   "self_type" : "type-6821",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15001,8 +15004,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6971",
-   "self_type" : "type-6970",
+   "referenced_type" : "type-6995",
+   "self_type" : "type-6994",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15010,8 +15013,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-7222",
-   "self_type" : "type-7221",
+   "referenced_type" : "type-7245",
+   "self_type" : "type-7244",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15019,8 +15022,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-7361",
-   "self_type" : "type-7360",
+   "referenced_type" : "type-7384",
+   "self_type" : "type-7383",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15037,8 +15040,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-7585",
-   "self_type" : "type-7584",
+   "referenced_type" : "type-7608",
+   "self_type" : "type-7607",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15127,8 +15130,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-3472",
-   "self_type" : "type-3471",
+   "referenced_type" : "type-3475",
+   "self_type" : "type-3474",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15136,8 +15139,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-4303",
-   "self_type" : "type-4302",
+   "referenced_type" : "type-4309",
+   "self_type" : "type-4308",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15145,8 +15148,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-4755",
-   "self_type" : "type-4754",
+   "referenced_type" : "type-4761",
+   "self_type" : "type-4760",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15154,8 +15157,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-5533",
-   "self_type" : "type-5532",
+   "referenced_type" : "type-5550",
+   "self_type" : "type-5549",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15163,8 +15166,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-6133",
-   "self_type" : "type-6132",
+   "referenced_type" : "type-6153",
+   "self_type" : "type-6152",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15172,8 +15175,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-6894",
-   "self_type" : "type-6893",
+   "referenced_type" : "type-6917",
+   "self_type" : "type-6916",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15181,8 +15184,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-7354",
-   "self_type" : "type-7353",
+   "referenced_type" : "type-7377",
+   "self_type" : "type-7376",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15199,8 +15202,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
-   "referenced_type" : "type-1239",
-   "self_type" : "type-2660",
+   "referenced_type" : "type-1242",
+   "self_type" : "type-2663",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -15209,7 +15212,7 @@
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
    "referenced_type" : "type-121",
-   "self_type" : "type-2654",
+   "self_type" : "type-2657",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -15217,8 +15220,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 *&",
    "name" : "android::String8 *&",
-   "referenced_type" : "type-1885",
-   "self_type" : "type-1884",
+   "referenced_type" : "type-1889",
+   "self_type" : "type-1888",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -15226,8 +15229,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1101",
-   "self_type" : "type-1100",
+   "referenced_type" : "type-1104",
+   "self_type" : "type-1103",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15244,8 +15247,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1237",
-   "self_type" : "type-1236",
+   "referenced_type" : "type-1240",
+   "self_type" : "type-1239",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15253,8 +15256,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1365",
-   "self_type" : "type-1364",
+   "referenced_type" : "type-1368",
+   "self_type" : "type-1367",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15262,8 +15265,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1451",
-   "self_type" : "type-1450",
+   "referenced_type" : "type-1454",
+   "self_type" : "type-1453",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15271,8 +15274,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1524",
-   "self_type" : "type-1523",
+   "referenced_type" : "type-1529",
+   "self_type" : "type-1528",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15280,8 +15283,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1665",
-   "self_type" : "type-1664",
+   "referenced_type" : "type-1669",
+   "self_type" : "type-1668",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15289,8 +15292,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3168",
-   "self_type" : "type-3167",
+   "referenced_type" : "type-3171",
+   "self_type" : "type-3170",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15298,8 +15301,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3532",
-   "self_type" : "type-3531",
+   "referenced_type" : "type-3535",
+   "self_type" : "type-3534",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15307,8 +15310,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3643",
-   "self_type" : "type-3642",
+   "referenced_type" : "type-3646",
+   "self_type" : "type-3645",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15316,8 +15319,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3705",
-   "self_type" : "type-3704",
+   "referenced_type" : "type-3711",
+   "self_type" : "type-3710",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15325,8 +15328,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3806",
-   "self_type" : "type-3805",
+   "referenced_type" : "type-3812",
+   "self_type" : "type-3811",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15334,8 +15337,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3911",
-   "self_type" : "type-3910",
+   "referenced_type" : "type-3918",
+   "self_type" : "type-3917",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15343,8 +15346,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3984",
-   "self_type" : "type-3983",
+   "referenced_type" : "type-3990",
+   "self_type" : "type-3989",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15352,8 +15355,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4036",
-   "self_type" : "type-4035",
+   "referenced_type" : "type-4042",
+   "self_type" : "type-4041",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15361,8 +15364,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4121",
-   "self_type" : "type-4120",
+   "referenced_type" : "type-4127",
+   "self_type" : "type-4126",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15370,8 +15373,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4345",
-   "self_type" : "type-4344",
+   "referenced_type" : "type-4351",
+   "self_type" : "type-4350",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15379,8 +15382,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4484",
-   "self_type" : "type-4483",
+   "referenced_type" : "type-4490",
+   "self_type" : "type-4489",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15388,8 +15391,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4531",
-   "self_type" : "type-4530",
+   "referenced_type" : "type-4537",
+   "self_type" : "type-4536",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15397,8 +15400,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4553",
-   "self_type" : "type-4552",
+   "referenced_type" : "type-4559",
+   "self_type" : "type-4558",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15406,8 +15409,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4592",
-   "self_type" : "type-4591",
+   "referenced_type" : "type-4599",
+   "self_type" : "type-4598",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15415,8 +15418,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4771",
-   "self_type" : "type-4770",
+   "referenced_type" : "type-4777",
+   "self_type" : "type-4776",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15424,8 +15427,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4858",
-   "self_type" : "type-4857",
+   "referenced_type" : "type-4864",
+   "self_type" : "type-4863",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15433,8 +15436,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5078",
-   "self_type" : "type-5077",
+   "referenced_type" : "type-5094",
+   "self_type" : "type-5093",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15442,8 +15445,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5118",
-   "self_type" : "type-5117",
+   "referenced_type" : "type-5134",
+   "self_type" : "type-5133",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15451,8 +15454,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5154",
-   "self_type" : "type-5153",
+   "referenced_type" : "type-5170",
+   "self_type" : "type-5169",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15460,8 +15463,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5229",
-   "self_type" : "type-5228",
+   "referenced_type" : "type-5246",
+   "self_type" : "type-5245",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15469,8 +15472,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5593",
-   "self_type" : "type-5592",
+   "referenced_type" : "type-5610",
+   "self_type" : "type-5609",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15478,8 +15481,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5704",
-   "self_type" : "type-5703",
+   "referenced_type" : "type-5721",
+   "self_type" : "type-5720",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15487,8 +15490,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5766",
-   "self_type" : "type-5765",
+   "referenced_type" : "type-5786",
+   "self_type" : "type-5785",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15496,8 +15499,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5867",
-   "self_type" : "type-5866",
+   "referenced_type" : "type-5887",
+   "self_type" : "type-5886",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15505,8 +15508,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6035",
-   "self_type" : "type-6034",
+   "referenced_type" : "type-6055",
+   "self_type" : "type-6054",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15514,8 +15517,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6181",
-   "self_type" : "type-6180",
+   "referenced_type" : "type-6201",
+   "self_type" : "type-6200",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15523,8 +15526,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6277",
-   "self_type" : "type-6276",
+   "referenced_type" : "type-6297",
+   "self_type" : "type-6296",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15532,8 +15535,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6321",
-   "self_type" : "type-6320",
+   "referenced_type" : "type-6344",
+   "self_type" : "type-6343",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15541,8 +15544,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6404",
-   "self_type" : "type-6403",
+   "referenced_type" : "type-6427",
+   "self_type" : "type-6426",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15550,8 +15553,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6490",
-   "self_type" : "type-6489",
+   "referenced_type" : "type-6513",
+   "self_type" : "type-6512",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15559,8 +15562,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6558",
-   "self_type" : "type-6557",
+   "referenced_type" : "type-6581",
+   "self_type" : "type-6580",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15568,8 +15571,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6610",
-   "self_type" : "type-6609",
+   "referenced_type" : "type-6635",
+   "self_type" : "type-6634",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15577,8 +15580,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6693",
-   "self_type" : "type-6692",
+   "referenced_type" : "type-6717",
+   "self_type" : "type-6716",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15586,8 +15589,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6927",
-   "self_type" : "type-6926",
+   "referenced_type" : "type-6951",
+   "self_type" : "type-6950",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15595,8 +15598,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7070",
-   "self_type" : "type-7069",
+   "referenced_type" : "type-7095",
+   "self_type" : "type-7094",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15604,8 +15607,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7129",
-   "self_type" : "type-7128",
+   "referenced_type" : "type-7153",
+   "self_type" : "type-7152",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15613,8 +15616,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7159",
-   "self_type" : "type-7158",
+   "referenced_type" : "type-7184",
+   "self_type" : "type-7183",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15622,8 +15625,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7215",
-   "self_type" : "type-7214",
+   "referenced_type" : "type-7241",
+   "self_type" : "type-7240",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15631,8 +15634,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7366",
-   "self_type" : "type-7365",
+   "referenced_type" : "type-7389",
+   "self_type" : "type-7388",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15640,8 +15643,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7444",
-   "self_type" : "type-7443",
+   "referenced_type" : "type-7468",
+   "self_type" : "type-7467",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15649,8 +15652,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7480",
-   "self_type" : "type-7479",
+   "referenced_type" : "type-7503",
+   "self_type" : "type-7502",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15658,8 +15661,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7582",
-   "self_type" : "type-7581",
+   "referenced_type" : "type-7606",
+   "self_type" : "type-7605",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15667,8 +15670,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7611",
-   "self_type" : "type-7610",
+   "referenced_type" : "type-7635",
+   "self_type" : "type-7634",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15703,8 +15706,8 @@
    "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",
+   "referenced_type" : "type-7528",
+   "self_type" : "type-7533",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15712,24 +15715,6 @@
    "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,
@@ -15737,8 +15722,8 @@
   },
   {
    "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> > &",
+   "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-4494",
    "self_type" : "type-4497",
    "size" : 4,
@@ -15746,10 +15731,28 @@
   },
   {
    "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-4371",
+   "self_type" : "type-4374",
+   "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-4500",
+   "self_type" : "type-4503",
+   "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-4356",
+   "referenced_type" : "type-4359",
+   "self_type" : "type-4362",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15766,8 +15769,8 @@
    "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",
+   "referenced_type" : "type-7534",
+   "self_type" : "type-7537",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15793,8 +15796,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1383",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1386",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -15802,8 +15805,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-3921",
-   "self_type" : "type-3920",
+   "referenced_type" : "type-3927",
+   "self_type" : "type-3926",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -15811,8 +15814,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-6499",
-   "self_type" : "type-6498",
+   "referenced_type" : "type-6523",
+   "self_type" : "type-6522",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -15830,7 +15833,7 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> > &",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> > &",
    "referenced_type" : "type-381",
-   "self_type" : "type-7622",
+   "self_type" : "type-7646",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15839,7 +15842,7 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect> &",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect> &",
    "referenced_type" : "type-372",
-   "self_type" : "type-4594",
+   "self_type" : "type-4600",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15848,7 +15851,7 @@
    "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-4347",
+   "self_type" : "type-4353",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15857,7 +15860,7 @@
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming &",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming &",
    "referenced_type" : "type-588",
-   "self_type" : "type-4586",
+   "self_type" : "type-4592",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15866,7 +15869,7 @@
    "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-4590",
+   "self_type" : "type-4597",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15875,7 +15878,7 @@
    "linker_set_key" : "android::hardware::hidl_array<int, 4> &",
    "name" : "android::hardware::hidl_array<int, 4> &",
    "referenced_type" : "type-384",
-   "self_type" : "type-7623",
+   "self_type" : "type-5171",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15893,7 +15896,7 @@
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> &",
    "name" : "android::hardware::hidl_vec<unsigned char> &",
    "referenced_type" : "type-452",
-   "self_type" : "type-4379",
+   "self_type" : "type-4385",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15902,7 +15905,7 @@
    "linker_set_key" : "android::hardware::media::V1_0::Rect &",
    "name" : "android::hardware::media::V1_0::Rect &",
    "referenced_type" : "type-375",
-   "self_type" : "type-4598",
+   "self_type" : "type-4605",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15911,7 +15914,7 @@
    "linker_set_key" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > &",
    "name" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > &",
    "referenced_type" : "type-160",
-   "self_type" : "type-2642",
+   "self_type" : "type-2645",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15920,7 +15923,7 @@
    "linker_set_key" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > &",
    "name" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > &",
    "referenced_type" : "type-147",
-   "self_type" : "type-2638",
+   "self_type" : "type-2641",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15929,7 +15932,7 @@
    "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int> &",
    "name" : "android::key_value_pair_t<unsigned int, unsigned int> &",
    "referenced_type" : "type-143",
-   "self_type" : "type-2637",
+   "self_type" : "type-2640",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15938,7 +15941,7 @@
    "linker_set_key" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > &",
    "name" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > &",
    "referenced_type" : "type-581",
-   "self_type" : "type-2512",
+   "self_type" : "type-2515",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15947,7 +15950,7 @@
    "linker_set_key" : "android::sp<android::ALooper> &",
    "name" : "android::sp<android::ALooper> &",
    "referenced_type" : "type-321",
-   "self_type" : "type-2266",
+   "self_type" : "type-2269",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15956,7 +15959,7 @@
    "linker_set_key" : "android::sp<android::AMessage> &",
    "name" : "android::sp<android::AMessage> &",
    "referenced_type" : "type-259",
-   "self_type" : "type-2077",
+   "self_type" : "type-2068",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15965,7 +15968,7 @@
    "linker_set_key" : "android::sp<android::ComponentWrapper> &",
    "name" : "android::sp<android::ComponentWrapper> &",
    "referenced_type" : "type-567",
-   "self_type" : "type-2490",
+   "self_type" : "type-2493",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15973,8 +15976,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::Fence> &",
    "name" : "android::sp<android::Fence> &",
-   "referenced_type" : "type-1864",
-   "self_type" : "type-2525",
+   "referenced_type" : "type-1868",
+   "self_type" : "type-2528",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15983,7 +15986,7 @@
    "linker_set_key" : "android::sp<android::FrameDropper> &",
    "name" : "android::sp<android::FrameDropper> &",
    "referenced_type" : "type-578",
-   "self_type" : "type-2505",
+   "self_type" : "type-2508",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16001,7 +16004,7 @@
    "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy> &",
    "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy> &",
    "referenced_type" : "type-473",
-   "self_type" : "type-2497",
+   "self_type" : "type-2500",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16009,8 +16012,8 @@
    "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",
+   "referenced_type" : "type-4265",
+   "self_type" : "type-4268",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16018,8 +16021,8 @@
    "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",
+   "referenced_type" : "type-4274",
+   "self_type" : "type-4277",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16027,8 +16030,8 @@
    "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",
+   "referenced_type" : "type-4833",
+   "self_type" : "type-4844",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16036,8 +16039,8 @@
    "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",
+   "referenced_type" : "type-5112",
+   "self_type" : "type-5119",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16090,8 +16093,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::NativeHandle> *&",
    "name" : "android::sp<android::NativeHandle> *&",
-   "referenced_type" : "type-1880",
-   "self_type" : "type-1879",
+   "referenced_type" : "type-1884",
+   "self_type" : "type-1883",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16099,8 +16102,8 @@
    "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",
+   "referenced_type" : "type-2473",
+   "self_type" : "type-7658",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16118,7 +16121,7 @@
    "linker_set_key" : "android::wp<android::IBinder::DeathRecipient> &",
    "name" : "android::wp<android::IBinder::DeathRecipient> &",
    "referenced_type" : "type-172",
-   "self_type" : "type-4304",
+   "self_type" : "type-4310",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16127,7 +16130,7 @@
    "linker_set_key" : "android_cta861_3_metadata &",
    "name" : "android_cta861_3_metadata &",
    "referenced_type" : "type-305",
-   "self_type" : "type-1476",
+   "self_type" : "type-1480",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16145,7 +16148,7 @@
    "linker_set_key" : "android_smpte2086_metadata &",
    "name" : "android_smpte2086_metadata &",
    "referenced_type" : "type-304",
-   "self_type" : "type-1475",
+   "self_type" : "type-1479",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16162,8 +16165,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AString &",
    "name" : "const android::AString &",
-   "referenced_type" : "type-2110",
-   "self_type" : "type-2241",
+   "referenced_type" : "type-2101",
+   "self_type" : "type-2244",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -16171,8 +16174,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-1219",
-   "self_type" : "type-1222",
+   "referenced_type" : "type-1223",
+   "self_type" : "type-1225",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16180,8 +16183,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-1530",
-   "self_type" : "type-1532",
+   "referenced_type" : "type-1533",
+   "self_type" : "type-1535",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16189,8 +16192,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-1671",
-   "self_type" : "type-1673",
+   "referenced_type" : "type-1675",
+   "self_type" : "type-1677",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16198,8 +16201,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-3441",
-   "self_type" : "type-3443",
+   "referenced_type" : "type-3444",
+   "self_type" : "type-3446",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -16207,8 +16210,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-3633",
-   "self_type" : "type-3637",
+   "referenced_type" : "type-3636",
+   "self_type" : "type-3640",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16216,8 +16219,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-3791",
-   "self_type" : "type-3794",
+   "referenced_type" : "type-3798",
+   "self_type" : "type-3800",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16225,8 +16228,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-4040",
-   "self_type" : "type-4043",
+   "referenced_type" : "type-4047",
+   "self_type" : "type-4049",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16234,8 +16237,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-4126",
-   "self_type" : "type-4128",
+   "referenced_type" : "type-4132",
+   "self_type" : "type-4134",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16243,8 +16246,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-5502",
-   "self_type" : "type-5504",
+   "referenced_type" : "type-5519",
+   "self_type" : "type-5521",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -16252,8 +16255,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-5694",
-   "self_type" : "type-5698",
+   "referenced_type" : "type-5711",
+   "self_type" : "type-5715",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16261,8 +16264,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-5852",
-   "self_type" : "type-5855",
+   "referenced_type" : "type-5873",
+   "self_type" : "type-5875",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16270,8 +16273,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-6106",
-   "self_type" : "type-6108",
+   "referenced_type" : "type-6126",
+   "self_type" : "type-6128",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -16279,8 +16282,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-6265",
-   "self_type" : "type-6269",
+   "referenced_type" : "type-6285",
+   "self_type" : "type-6289",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16288,8 +16291,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-6398",
-   "self_type" : "type-6400",
+   "referenced_type" : "type-6421",
+   "self_type" : "type-6423",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16297,8 +16300,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-6616",
-   "self_type" : "type-6618",
+   "referenced_type" : "type-6639",
+   "self_type" : "type-6641",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16306,8 +16309,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-6698",
-   "self_type" : "type-6700",
+   "referenced_type" : "type-6721",
+   "self_type" : "type-6723",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16333,8 +16336,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::CompositorTiming &",
    "name" : "const android::CompositorTiming &",
-   "referenced_type" : "type-1424",
-   "self_type" : "type-1426",
+   "referenced_type" : "type-1427",
+   "self_type" : "type-1429",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16342,8 +16345,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::CompositorTiming &",
    "name" : "const android::CompositorTiming &",
-   "referenced_type" : "type-3952",
-   "self_type" : "type-3954",
+   "referenced_type" : "type-3960",
+   "self_type" : "type-3962",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16351,8 +16354,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::CompositorTiming &",
    "name" : "const android::CompositorTiming &",
-   "referenced_type" : "type-6531",
-   "self_type" : "type-6533",
+   "referenced_type" : "type-6554",
+   "self_type" : "type-6556",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16360,8 +16363,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-4579",
-   "self_type" : "type-4581",
+   "referenced_type" : "type-4585",
+   "self_type" : "type-4587",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16369,8 +16372,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-4747",
-   "self_type" : "type-4749",
+   "referenced_type" : "type-4754",
+   "self_type" : "type-4756",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16378,8 +16381,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-7200",
-   "self_type" : "type-7202",
+   "referenced_type" : "type-7225",
+   "self_type" : "type-7227",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16387,8 +16390,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-7348",
-   "self_type" : "type-7350",
+   "referenced_type" : "type-7371",
+   "self_type" : "type-7373",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16396,8 +16399,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Flattenable<android::BufferItem> &",
    "name" : "const android::Flattenable<android::BufferItem> &",
-   "referenced_type" : "type-1506",
-   "self_type" : "type-1512",
+   "referenced_type" : "type-1509",
+   "self_type" : "type-1516",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16405,8 +16408,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Flattenable<android::Fence> &",
    "name" : "const android::Flattenable<android::Fence> &",
-   "referenced_type" : "type-1634",
-   "self_type" : "type-1647",
+   "referenced_type" : "type-1638",
+   "self_type" : "type-1650",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16414,8 +16417,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Flattenable<android::FrameEventHistoryDelta> &",
    "name" : "const android::Flattenable<android::FrameEventHistoryDelta> &",
-   "referenced_type" : "type-4306",
-   "self_type" : "type-4322",
+   "referenced_type" : "type-4312",
+   "self_type" : "type-4328",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16423,8 +16426,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Flattenable<android::GraphicBuffer> &",
    "name" : "const android::Flattenable<android::GraphicBuffer> &",
-   "referenced_type" : "type-1638",
-   "self_type" : "type-1646",
+   "referenced_type" : "type-1643",
+   "self_type" : "type-1649",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16432,8 +16435,8 @@
    "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",
+   "referenced_type" : "type-4315",
+   "self_type" : "type-4327",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16441,8 +16444,8 @@
    "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",
+   "referenced_type" : "type-4318",
+   "self_type" : "type-4329",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16504,8 +16507,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel &",
    "name" : "const android::Parcel &",
-   "referenced_type" : "type-4533",
-   "self_type" : "type-4532",
+   "referenced_type" : "type-4539",
+   "self_type" : "type-4538",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16513,8 +16516,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel &",
    "name" : "const android::Parcel &",
-   "referenced_type" : "type-7132",
-   "self_type" : "type-7131",
+   "referenced_type" : "type-7155",
+   "self_type" : "type-7154",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16531,8 +16534,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-1215",
-   "self_type" : "type-1217",
+   "referenced_type" : "type-1218",
+   "self_type" : "type-1220",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16540,8 +16543,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-1490",
-   "self_type" : "type-1492",
+   "referenced_type" : "type-1493",
+   "self_type" : "type-1496",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16549,8 +16552,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-1621",
-   "self_type" : "type-1623",
+   "referenced_type" : "type-1624",
+   "self_type" : "type-1626",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16558,8 +16561,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-2683",
-   "self_type" : "type-2685",
+   "referenced_type" : "type-2686",
+   "self_type" : "type-2688",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16567,8 +16570,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-3466",
-   "self_type" : "type-3468",
+   "referenced_type" : "type-3469",
+   "self_type" : "type-3471",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16576,8 +16579,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-3787",
-   "self_type" : "type-3789",
+   "referenced_type" : "type-3793",
+   "self_type" : "type-3795",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16585,8 +16588,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-4011",
-   "self_type" : "type-4013",
+   "referenced_type" : "type-4017",
+   "self_type" : "type-4019",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16594,8 +16597,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-4090",
-   "self_type" : "type-4092",
+   "referenced_type" : "type-4096",
+   "self_type" : "type-4098",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16603,8 +16606,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-4292",
-   "self_type" : "type-4294",
+   "referenced_type" : "type-4298",
+   "self_type" : "type-4300",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16612,8 +16615,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-4572",
-   "self_type" : "type-4574",
+   "referenced_type" : "type-4578",
+   "self_type" : "type-4580",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16621,8 +16624,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-4736",
-   "self_type" : "type-4738",
+   "referenced_type" : "type-4743",
+   "self_type" : "type-4745",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16630,8 +16633,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-5019",
-   "self_type" : "type-5021",
+   "referenced_type" : "type-5025",
+   "self_type" : "type-5027",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16639,8 +16642,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-5063",
-   "self_type" : "type-5065",
+   "referenced_type" : "type-5080",
+   "self_type" : "type-5083",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16648,8 +16651,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-5527",
-   "self_type" : "type-5529",
+   "referenced_type" : "type-5544",
+   "self_type" : "type-5546",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16657,8 +16660,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-5848",
-   "self_type" : "type-5850",
+   "referenced_type" : "type-5868",
+   "self_type" : "type-5870",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16666,8 +16669,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-6030",
-   "self_type" : "type-6032",
+   "referenced_type" : "type-6050",
+   "self_type" : "type-6052",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16675,8 +16678,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-6129",
-   "self_type" : "type-6131",
+   "referenced_type" : "type-6149",
+   "self_type" : "type-6151",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16684,8 +16687,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-6394",
-   "self_type" : "type-6396",
+   "referenced_type" : "type-6417",
+   "self_type" : "type-6419",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16693,8 +16696,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-6584",
-   "self_type" : "type-6586",
+   "referenced_type" : "type-6608",
+   "self_type" : "type-6610",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16702,8 +16705,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-6663",
-   "self_type" : "type-6665",
+   "referenced_type" : "type-6686",
+   "self_type" : "type-6688",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16711,8 +16714,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-6881",
-   "self_type" : "type-6884",
+   "referenced_type" : "type-6905",
+   "self_type" : "type-6907",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16720,8 +16723,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-7192",
-   "self_type" : "type-7194",
+   "referenced_type" : "type-7216",
+   "self_type" : "type-7218",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16729,8 +16732,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-7339",
-   "self_type" : "type-7341",
+   "referenced_type" : "type-7362",
+   "self_type" : "type-7364",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16738,8 +16741,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-7565",
-   "self_type" : "type-7567",
+   "referenced_type" : "type-7588",
+   "self_type" : "type-7590",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16756,8 +16759,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-7666",
-   "self_type" : "type-7669",
+   "referenced_type" : "type-7685",
+   "self_type" : "type-7691",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16765,8 +16768,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SafeInterface::ParcelHandler &",
    "name" : "const android::SafeInterface::ParcelHandler &",
-   "referenced_type" : "type-1256",
-   "self_type" : "type-1675",
+   "referenced_type" : "type-1254",
+   "self_type" : "type-1680",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16774,8 +16777,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-1248",
-   "self_type" : "type-1247",
+   "referenced_type" : "type-1251",
+   "self_type" : "type-1250",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -16783,8 +16786,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 &",
    "name" : "const android::String8 &",
-   "referenced_type" : "type-1875",
-   "self_type" : "type-1874",
+   "referenced_type" : "type-1879",
+   "self_type" : "type-1878",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -16801,8 +16804,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1385",
-   "self_type" : "type-1386",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1389",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16837,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-4348",
-   "self_type" : "type-4570",
+   "referenced_type" : "type-4354",
+   "self_type" : "type-4576",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16846,8 +16849,8 @@
    "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-4582",
-   "self_type" : "type-4583",
+   "referenced_type" : "type-4588",
+   "self_type" : "type-4589",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16954,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-2619",
-   "self_type" : "type-2620",
+   "referenced_type" : "type-2622",
+   "self_type" : "type-2623",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16963,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-2617",
-   "self_type" : "type-2618",
+   "referenced_type" : "type-2620",
+   "self_type" : "type-2621",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16972,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-2613",
-   "self_type" : "type-2614",
+   "referenced_type" : "type-2616",
+   "self_type" : "type-2617",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16981,8 +16984,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-2409",
-   "self_type" : "type-2408",
+   "referenced_type" : "type-2412",
+   "self_type" : "type-2411",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -16990,8 +16993,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-4845",
-   "self_type" : "type-4844",
+   "referenced_type" : "type-4851",
+   "self_type" : "type-4850",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -16999,8 +17002,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-5978",
-   "self_type" : "type-5980",
+   "referenced_type" : "type-5998",
+   "self_type" : "type-6000",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -17008,8 +17011,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-6813",
-   "self_type" : "type-6812",
+   "referenced_type" : "type-6836",
+   "self_type" : "type-6835",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -17017,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-1304",
-   "self_type" : "type-1486",
+   "referenced_type" : "type-1301",
+   "self_type" : "type-1489",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17035,8 +17038,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::AMessage> &",
    "name" : "const android::sp<android::AMessage> &",
-   "referenced_type" : "type-2175",
-   "self_type" : "type-2190",
+   "referenced_type" : "type-2174",
+   "self_type" : "type-2193",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17044,8 +17047,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::BpGraphicBufferProducer> &",
    "name" : "const android::sp<android::BpGraphicBufferProducer> &",
-   "referenced_type" : "type-4227",
-   "self_type" : "type-4232",
+   "referenced_type" : "type-4233",
+   "self_type" : "type-4238",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17053,8 +17056,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::BpProducerListener> &",
    "name" : "const android::sp<android::BpProducerListener> &",
-   "referenced_type" : "type-4516",
-   "self_type" : "type-4517",
+   "referenced_type" : "type-4522",
+   "self_type" : "type-4523",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17071,8 +17074,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::ComponentWrapper> &",
    "name" : "const android::sp<android::ComponentWrapper> &",
-   "referenced_type" : "type-2491",
-   "self_type" : "type-2492",
+   "referenced_type" : "type-2494",
+   "self_type" : "type-2495",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17080,8 +17083,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::Fence> &",
    "name" : "const android::sp<android::Fence> &",
-   "referenced_type" : "type-1863",
-   "self_type" : "type-1862",
+   "referenced_type" : "type-1867",
+   "self_type" : "type-1866",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17089,8 +17092,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::GraphicBuffer> &",
    "name" : "const android::sp<android::GraphicBuffer> &",
-   "referenced_type" : "type-1196",
-   "self_type" : "type-1859",
+   "referenced_type" : "type-1200",
+   "self_type" : "type-1864",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17107,8 +17110,8 @@
    "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",
+   "referenced_type" : "type-4270",
+   "self_type" : "type-4396",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17116,8 +17119,8 @@
    "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",
+   "referenced_type" : "type-4279",
+   "self_type" : "type-4397",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17125,8 +17128,8 @@
    "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",
+   "referenced_type" : "type-4832",
+   "self_type" : "type-4837",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17134,8 +17137,8 @@
    "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",
+   "referenced_type" : "type-5111",
+   "self_type" : "type-5116",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17143,8 +17146,8 @@
    "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",
+   "referenced_type" : "type-4306",
+   "self_type" : "type-4307",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17152,8 +17155,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IBinder> &",
    "name" : "const android::sp<android::IBinder> &",
-   "referenced_type" : "type-1036",
-   "self_type" : "type-1037",
+   "referenced_type" : "type-1040",
+   "self_type" : "type-1041",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17179,8 +17182,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer> &",
    "name" : "const android::sp<android::IGraphicBufferProducer> &",
-   "referenced_type" : "type-2485",
-   "self_type" : "type-2486",
+   "referenced_type" : "type-2488",
+   "self_type" : "type-2489",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17197,8 +17200,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::ITransactionCompletedListener> &",
    "name" : "const android::sp<android::ITransactionCompletedListener> &",
-   "referenced_type" : "type-1046",
-   "self_type" : "type-1047",
+   "referenced_type" : "type-1049",
+   "self_type" : "type-1050",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17215,8 +17218,8 @@
    "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",
+   "referenced_type" : "type-1392",
+   "self_type" : "type-1391",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -17224,8 +17227,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-2468",
-   "self_type" : "type-4222",
+   "referenced_type" : "type-2471",
+   "self_type" : "type-4228",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17233,8 +17236,8 @@
    "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-2458",
-   "self_type" : "type-4510",
+   "referenced_type" : "type-2461",
+   "self_type" : "type-4516",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17242,8 +17245,8 @@
    "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",
+   "referenced_type" : "type-4245",
+   "self_type" : "type-4250",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17251,8 +17254,8 @@
    "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",
+   "referenced_type" : "type-4476",
+   "self_type" : "type-4525",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17260,8 +17263,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-2482",
-   "self_type" : "type-4223",
+   "referenced_type" : "type-2485",
+   "self_type" : "type-4229",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17269,8 +17272,8 @@
    "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",
+   "referenced_type" : "type-2477",
+   "self_type" : "type-4519",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17278,8 +17281,8 @@
    "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",
+   "referenced_type" : "type-4239",
+   "self_type" : "type-4244",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17287,8 +17290,8 @@
    "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",
+   "referenced_type" : "type-4469",
+   "self_type" : "type-4524",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17332,8 +17335,8 @@
    "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",
+   "referenced_type" : "type-4296",
+   "self_type" : "type-4301",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17341,8 +17344,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::IBinder> &",
    "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "type-4280",
-   "self_type" : "type-4281",
+   "referenced_type" : "type-4286",
+   "self_type" : "type-4287",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17350,8 +17353,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android_cta861_3_metadata &",
    "name" : "const android_cta861_3_metadata &",
-   "referenced_type" : "type-1473",
-   "self_type" : "type-1474",
+   "referenced_type" : "type-1477",
+   "self_type" : "type-1478",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17368,8 +17371,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android_smpte2086_metadata &",
    "name" : "const android_smpte2086_metadata &",
-   "referenced_type" : "type-1471",
-   "self_type" : "type-1472",
+   "referenced_type" : "type-1474",
+   "self_type" : "type-1476",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17386,8 +17389,8 @@
    "alignment" : 4,
    "linker_set_key" : "const double &",
    "name" : "const double &",
-   "referenced_type" : "type-1077",
-   "self_type" : "type-1124",
+   "referenced_type" : "type-1080",
+   "self_type" : "type-1123",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17414,7 +17417,7 @@
    "linker_set_key" : "const int *&",
    "name" : "const int *&",
    "referenced_type" : "type-479",
-   "self_type" : "type-1511",
+   "self_type" : "type-1514",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17428,57 +17431,57 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1109",
-   "self_type" : "type-1111",
+   "referenced_type" : "type-1112",
+   "self_type" : "type-1114",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1281",
-   "self_type" : "type-1283",
+   "referenced_type" : "type-1284",
+   "self_type" : "type-1286",
    "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",
+   "referenced_type" : "type-3309",
+   "self_type" : "type-3311",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3538",
-   "self_type" : "type-3540",
+   "referenced_type" : "type-3541",
+   "self_type" : "type-3543",
    "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",
+   "referenced_type" : "type-3650",
+   "self_type" : "type-3652",
    "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",
+   "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-3832",
-   "self_type" : "type-3834",
+   "referenced_type" : "type-3838",
+   "self_type" : "type-3840",
    "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",
+   "referenced_type" : "type-4378",
+   "self_type" : "type-4380",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -17491,190 +17494,190 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-4501",
-   "self_type" : "type-4503",
+   "referenced_type" : "type-4507",
+   "self_type" : "type-4509",
    "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",
+   "referenced_type" : "type-4544",
+   "self_type" : "type-4546",
    "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",
+   "referenced_type" : "type-4569",
+   "self_type" : "type-4571",
    "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",
+   "referenced_type" : "type-4723",
+   "self_type" : "type-4725",
    "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",
+   "referenced_type" : "type-4853",
+   "self_type" : "type-4855",
    "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",
+   "referenced_type" : "type-5124",
+   "self_type" : "type-5126",
    "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",
+   "referenced_type" : "type-5177",
+   "self_type" : "type-5179",
    "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",
+   "referenced_type" : "type-5384",
+   "self_type" : "type-5386",
    "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",
+   "referenced_type" : "type-5616",
+   "self_type" : "type-5618",
    "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",
+   "referenced_type" : "type-5725",
+   "self_type" : "type-5727",
    "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",
+   "referenced_type" : "type-5791",
+   "self_type" : "type-5793",
    "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",
+   "referenced_type" : "type-5913",
+   "self_type" : "type-5915",
    "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",
+   "referenced_type" : "type-6069",
+   "self_type" : "type-6074",
    "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",
+   "referenced_type" : "type-6205",
+   "self_type" : "type-6207",
    "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",
+   "referenced_type" : "type-6301",
+   "self_type" : "type-6303",
    "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",
+   "referenced_type" : "type-6348",
+   "self_type" : "type-6352",
    "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",
+   "referenced_type" : "type-6440",
+   "self_type" : "type-6442",
    "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",
+   "referenced_type" : "type-6979",
+   "self_type" : "type-6981",
    "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",
+   "referenced_type" : "type-7113",
+   "self_type" : "type-7116",
    "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",
+   "referenced_type" : "type-7166",
+   "self_type" : "type-7168",
    "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",
+   "referenced_type" : "type-7202",
+   "self_type" : "type-7204",
    "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",
+   "referenced_type" : "type-7351",
+   "self_type" : "type-7353",
    "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",
+   "referenced_type" : "type-7451",
+   "self_type" : "type-7453",
    "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",
+   "referenced_type" : "type-7489",
+   "self_type" : "type-7491",
    "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",
+   "referenced_type" : "type-7542",
+   "self_type" : "type-7544",
    "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",
+   "referenced_type" : "type-7622",
+   "self_type" : "type-7624",
    "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",
+   "referenced_type" : "type-7687",
+   "self_type" : "type-7689",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -17688,8 +17691,8 @@
    "alignment" : 4,
    "linker_set_key" : "const log_msg &",
    "name" : "const log_msg &",
-   "referenced_type" : "type-2313",
-   "self_type" : "type-2331",
+   "referenced_type" : "type-2316",
+   "self_type" : "type-2334",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -17724,8 +17727,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
-   "referenced_type" : "type-2643",
-   "self_type" : "type-2646",
+   "referenced_type" : "type-2646",
+   "self_type" : "type-2649",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17733,8 +17736,8 @@
    "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",
+   "referenced_type" : "type-4993",
+   "self_type" : "type-4995",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17742,8 +17745,8 @@
    "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",
+   "referenced_type" : "type-6041",
+   "self_type" : "type-6043",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17751,8 +17754,8 @@
    "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",
+   "referenced_type" : "type-7529",
+   "self_type" : "type-7538",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17760,8 +17763,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
-   "referenced_type" : "type-2639",
-   "self_type" : "type-2641",
+   "referenced_type" : "type-2642",
+   "self_type" : "type-2644",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17769,8 +17772,8 @@
    "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",
+   "referenced_type" : "type-4989",
+   "self_type" : "type-4991",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17778,8 +17781,8 @@
    "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",
+   "referenced_type" : "type-6036",
+   "self_type" : "type-6038",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17787,8 +17790,8 @@
    "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",
+   "referenced_type" : "type-7516",
+   "self_type" : "type-7524",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17796,8 +17799,8 @@
    "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",
+   "referenced_type" : "type-1646",
+   "self_type" : "type-1648",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17805,8 +17808,8 @@
    "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",
+   "referenced_type" : "type-4111",
+   "self_type" : "type-4113",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17814,8 +17817,8 @@
    "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",
+   "referenced_type" : "type-6700",
+   "self_type" : "type-6702",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17832,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-1107",
-   "self_type" : "type-1106",
+   "referenced_type" : "type-1110",
+   "self_type" : "type-1109",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17841,8 +17844,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-1279",
-   "self_type" : "type-1278",
+   "referenced_type" : "type-1282",
+   "self_type" : "type-1281",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17850,8 +17853,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-3271",
-   "self_type" : "type-3270",
+   "referenced_type" : "type-3274",
+   "self_type" : "type-3273",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17859,8 +17862,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-3535",
-   "self_type" : "type-3534",
+   "referenced_type" : "type-3538",
+   "self_type" : "type-3537",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17868,8 +17871,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-3645",
-   "self_type" : "type-3644",
+   "referenced_type" : "type-3648",
+   "self_type" : "type-3647",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17877,8 +17880,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-3708",
-   "self_type" : "type-3707",
+   "referenced_type" : "type-3714",
+   "self_type" : "type-3713",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17886,8 +17889,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-3830",
-   "self_type" : "type-3829",
+   "referenced_type" : "type-3836",
+   "self_type" : "type-3835",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17904,8 +17907,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-4351",
-   "self_type" : "type-4350",
+   "referenced_type" : "type-4357",
+   "self_type" : "type-4356",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17913,8 +17916,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-4486",
-   "self_type" : "type-4485",
+   "referenced_type" : "type-4492",
+   "self_type" : "type-4491",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17922,8 +17925,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-4555",
-   "self_type" : "type-4554",
+   "referenced_type" : "type-4561",
+   "self_type" : "type-4560",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17931,8 +17934,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-4619",
-   "self_type" : "type-4618",
+   "referenced_type" : "type-4623",
+   "self_type" : "type-4622",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17940,8 +17943,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-4659",
-   "self_type" : "type-4658",
+   "referenced_type" : "type-4666",
+   "self_type" : "type-4665",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17949,8 +17952,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-4867",
-   "self_type" : "type-4866",
+   "referenced_type" : "type-4873",
+   "self_type" : "type-4872",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17958,8 +17961,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-5127",
-   "self_type" : "type-5126",
+   "referenced_type" : "type-5143",
+   "self_type" : "type-5142",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17967,8 +17970,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-5156",
-   "self_type" : "type-5155",
+   "referenced_type" : "type-5173",
+   "self_type" : "type-5172",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17976,8 +17979,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-5332",
-   "self_type" : "type-5331",
+   "referenced_type" : "type-5349",
+   "self_type" : "type-5348",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17985,8 +17988,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-5596",
-   "self_type" : "type-5595",
+   "referenced_type" : "type-5613",
+   "self_type" : "type-5612",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17994,8 +17997,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-5706",
-   "self_type" : "type-5705",
+   "referenced_type" : "type-5723",
+   "self_type" : "type-5722",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18003,8 +18006,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-5769",
-   "self_type" : "type-5768",
+   "referenced_type" : "type-5789",
+   "self_type" : "type-5788",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18012,8 +18015,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-5891",
-   "self_type" : "type-5890",
+   "referenced_type" : "type-5911",
+   "self_type" : "type-5910",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18021,8 +18024,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-6046",
-   "self_type" : "type-6045",
+   "referenced_type" : "type-6066",
+   "self_type" : "type-6065",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18030,8 +18033,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-6183",
-   "self_type" : "type-6182",
+   "referenced_type" : "type-6203",
+   "self_type" : "type-6202",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18039,8 +18042,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-6279",
-   "self_type" : "type-6278",
+   "referenced_type" : "type-6299",
+   "self_type" : "type-6298",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18048,8 +18051,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-6323",
-   "self_type" : "type-6322",
+   "referenced_type" : "type-6346",
+   "self_type" : "type-6345",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18057,8 +18060,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-6415",
-   "self_type" : "type-6414",
+   "referenced_type" : "type-6438",
+   "self_type" : "type-6437",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18066,8 +18069,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-6935",
-   "self_type" : "type-6934",
+   "referenced_type" : "type-6959",
+   "self_type" : "type-6958",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18075,8 +18078,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-7074",
-   "self_type" : "type-7073",
+   "referenced_type" : "type-7097",
+   "self_type" : "type-7096",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18084,8 +18087,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-7162",
-   "self_type" : "type-7161",
+   "referenced_type" : "type-7186",
+   "self_type" : "type-7185",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18093,8 +18096,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-7245",
-   "self_type" : "type-7244",
+   "referenced_type" : "type-7267",
+   "self_type" : "type-7266",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18102,8 +18105,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-7288",
-   "self_type" : "type-7287",
+   "referenced_type" : "type-7312",
+   "self_type" : "type-7311",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18111,8 +18114,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-7454",
-   "self_type" : "type-7453",
+   "referenced_type" : "type-7480",
+   "self_type" : "type-7479",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18120,8 +18123,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-7482",
-   "self_type" : "type-7481",
+   "referenced_type" : "type-7505",
+   "self_type" : "type-7504",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18129,8 +18132,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-7487",
-   "self_type" : "type-7486",
+   "referenced_type" : "type-7510",
+   "self_type" : "type-7509",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18138,8 +18141,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-7613",
-   "self_type" : "type-7612",
+   "referenced_type" : "type-7638",
+   "self_type" : "type-7637",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18147,8 +18150,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-7625",
-   "self_type" : "type-7624",
+   "referenced_type" : "type-7649",
+   "self_type" : "type-7648",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18165,8 +18168,8 @@
    "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",
+   "referenced_type" : "type-4382",
+   "self_type" : "type-4384",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18174,8 +18177,8 @@
    "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",
+   "referenced_type" : "type-4510",
+   "self_type" : "type-4512",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18183,8 +18186,8 @@
    "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",
+   "referenced_type" : "type-6983",
+   "self_type" : "type-6985",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18192,8 +18195,8 @@
    "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",
+   "referenced_type" : "type-7117",
+   "self_type" : "type-7119",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18228,8 +18231,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
-   "referenced_type" : "type-2520",
-   "self_type" : "type-2615",
+   "referenced_type" : "type-2523",
+   "self_type" : "type-2618",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18255,8 +18258,8 @@
    "alignment" : 4,
    "linker_set_key" : "int *&",
    "name" : "int *&",
-   "referenced_type" : "type-1509",
-   "self_type" : "type-1508",
+   "referenced_type" : "type-1512",
+   "self_type" : "type-1511",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18265,7 +18268,7 @@
    "linker_set_key" : "long long &",
    "name" : "long long &",
    "referenced_type" : "type-169",
-   "self_type" : "type-1429",
+   "self_type" : "type-1432",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18273,8 +18276,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-4758",
-   "self_type" : "type-4757",
+   "referenced_type" : "type-4765",
+   "self_type" : "type-4764",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18282,8 +18285,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-4862",
-   "self_type" : "type-4861",
+   "referenced_type" : "type-4868",
+   "self_type" : "type-4867",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18291,8 +18294,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-5067",
-   "self_type" : "type-5066",
+   "referenced_type" : "type-5085",
+   "self_type" : "type-5084",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18300,8 +18303,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-5122",
-   "self_type" : "type-5121",
+   "referenced_type" : "type-5138",
+   "self_type" : "type-5137",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18309,8 +18312,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-7356",
-   "self_type" : "type-7355",
+   "referenced_type" : "type-7379",
+   "self_type" : "type-7378",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18318,8 +18321,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-7449",
-   "self_type" : "type-7448",
+   "referenced_type" : "type-7472",
+   "self_type" : "type-7471",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18327,8 +18330,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-7575",
-   "self_type" : "type-7574",
+   "referenced_type" : "type-7600",
+   "self_type" : "type-7599",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18345,8 +18348,8 @@
    "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",
+   "referenced_type" : "type-3186",
+   "self_type" : "type-3185",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -18354,8 +18357,8 @@
    "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",
+   "referenced_type" : "type-5261",
+   "self_type" : "type-5260",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -18363,8 +18366,8 @@
    "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",
+   "referenced_type" : "type-6057",
+   "self_type" : "type-6056",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -18372,8 +18375,8 @@
    "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",
+   "referenced_type" : "type-1652",
+   "self_type" : "type-1886",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -18381,8 +18384,8 @@
    "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",
+   "referenced_type" : "type-4116",
+   "self_type" : "type-4142",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -18390,8 +18393,8 @@
    "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",
+   "referenced_type" : "type-6705",
+   "self_type" : "type-6737",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -18400,7 +18403,7 @@
    "linker_set_key" : "unsigned char &",
    "name" : "unsigned char &",
    "referenced_type" : "type-90",
-   "self_type" : "type-1428",
+   "self_type" : "type-1431",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18427,7 +18430,7 @@
    "linker_set_key" : "unsigned long long *&",
    "name" : "unsigned long long *&",
    "referenced_type" : "type-91",
-   "self_type" : "type-1871",
+   "self_type" : "type-1875",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -18436,7 +18439,7 @@
    "linker_set_key" : "unsigned short &",
    "name" : "unsigned short &",
    "referenced_type" : "type-497",
-   "self_type" : "type-1427",
+   "self_type" : "type-1430",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18444,8 +18447,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-1444",
-   "self_type" : "type-1443",
+   "referenced_type" : "type-1447",
+   "self_type" : "type-1446",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18453,8 +18456,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-3976",
-   "self_type" : "type-3975",
+   "referenced_type" : "type-3982",
+   "self_type" : "type-3981",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18462,8 +18465,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-6551",
-   "self_type" : "type-6550",
+   "referenced_type" : "type-6574",
+   "self_type" : "type-6573",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18483,8 +18486,8 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-2402",
-   "self_type" : "type-2401",
+   "referenced_type" : "type-2405",
+   "self_type" : "type-2404",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -18492,8 +18495,8 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-4833",
-   "self_type" : "type-4832",
+   "referenced_type" : "type-4839",
+   "self_type" : "type-4838",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -18501,8 +18504,8 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-5975",
-   "self_type" : "type-5974",
+   "referenced_type" : "type-5995",
+   "self_type" : "type-5994",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -18510,8 +18513,8 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-6808",
-   "self_type" : "type-6807",
+   "referenced_type" : "type-6831",
+   "self_type" : "type-6830",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -18528,8 +18531,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1142",
-   "self_type" : "type-1141",
+   "referenced_type" : "type-1137",
+   "self_type" : "type-1136",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18537,8 +18540,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1165",
-   "self_type" : "type-1164",
+   "referenced_type" : "type-1170",
+   "self_type" : "type-1169",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18546,8 +18549,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1350",
-   "self_type" : "type-1349",
+   "referenced_type" : "type-1353",
+   "self_type" : "type-1352",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18555,8 +18558,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1407",
-   "self_type" : "type-1406",
+   "referenced_type" : "type-1410",
+   "self_type" : "type-1409",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18564,8 +18567,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1423",
-   "self_type" : "type-1422",
+   "referenced_type" : "type-1426",
+   "self_type" : "type-1425",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18573,8 +18576,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1439",
-   "self_type" : "type-1438",
+   "referenced_type" : "type-1442",
+   "self_type" : "type-1441",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18582,8 +18585,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1505",
-   "self_type" : "type-1504",
+   "referenced_type" : "type-1508",
+   "self_type" : "type-1507",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18591,8 +18594,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1632",
-   "self_type" : "type-1631",
+   "referenced_type" : "type-1637",
+   "self_type" : "type-1636",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18600,8 +18603,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2612",
-   "self_type" : "type-2611",
+   "referenced_type" : "type-2615",
+   "self_type" : "type-2614",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18609,8 +18612,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3478",
-   "self_type" : "type-3477",
+   "referenced_type" : "type-3481",
+   "self_type" : "type-3480",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18618,8 +18621,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3579",
-   "self_type" : "type-3578",
+   "referenced_type" : "type-3578",
+   "self_type" : "type-3577",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18627,8 +18630,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3655",
-   "self_type" : "type-3654",
+   "referenced_type" : "type-3658",
+   "self_type" : "type-3657",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18636,8 +18639,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3745",
-   "self_type" : "type-3744",
+   "referenced_type" : "type-3743",
+   "self_type" : "type-3742",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18645,8 +18648,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3770",
-   "self_type" : "type-3769",
+   "referenced_type" : "type-3777",
+   "self_type" : "type-3776",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18654,8 +18657,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3904",
-   "self_type" : "type-3903",
+   "referenced_type" : "type-3910",
+   "self_type" : "type-3909",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18663,8 +18666,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3935",
-   "self_type" : "type-3934",
+   "referenced_type" : "type-3941",
+   "self_type" : "type-3940",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18672,8 +18675,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3951",
-   "self_type" : "type-3950",
+   "referenced_type" : "type-3957",
+   "self_type" : "type-3956",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18681,8 +18684,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3971",
-   "self_type" : "type-3970",
+   "referenced_type" : "type-3977",
+   "self_type" : "type-3976",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18690,8 +18693,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4019",
-   "self_type" : "type-4018",
+   "referenced_type" : "type-4026",
+   "self_type" : "type-4025",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18699,8 +18702,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4097",
-   "self_type" : "type-4096",
+   "referenced_type" : "type-4103",
+   "self_type" : "type-4102",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18708,8 +18711,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4299",
-   "self_type" : "type-4298",
+   "referenced_type" : "type-4305",
+   "self_type" : "type-4304",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18717,8 +18720,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4472",
-   "self_type" : "type-4471",
+   "referenced_type" : "type-4478",
+   "self_type" : "type-4477",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18726,8 +18729,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4525",
-   "self_type" : "type-4524",
+   "referenced_type" : "type-4531",
+   "self_type" : "type-4530",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18735,8 +18738,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4551",
-   "self_type" : "type-4550",
+   "referenced_type" : "type-4557",
+   "self_type" : "type-4556",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18744,8 +18747,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4578",
-   "self_type" : "type-4577",
+   "referenced_type" : "type-4584",
+   "self_type" : "type-4583",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18753,8 +18756,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4745",
-   "self_type" : "type-4744",
+   "referenced_type" : "type-4752",
+   "self_type" : "type-4751",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18762,8 +18765,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4855",
-   "self_type" : "type-4854",
+   "referenced_type" : "type-4861",
+   "self_type" : "type-4860",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18771,8 +18774,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4967",
-   "self_type" : "type-4966",
+   "referenced_type" : "type-4973",
+   "self_type" : "type-4972",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18780,8 +18783,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5075",
-   "self_type" : "type-5074",
+   "referenced_type" : "type-5091",
+   "self_type" : "type-5090",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18789,8 +18792,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5116",
-   "self_type" : "type-5115",
+   "referenced_type" : "type-5132",
+   "self_type" : "type-5131",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18798,8 +18801,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5220",
-   "self_type" : "type-5219",
+   "referenced_type" : "type-5239",
+   "self_type" : "type-5238",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18807,8 +18810,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5539",
-   "self_type" : "type-5538",
+   "referenced_type" : "type-5556",
+   "self_type" : "type-5555",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18816,8 +18819,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5640",
-   "self_type" : "type-5639",
+   "referenced_type" : "type-5653",
+   "self_type" : "type-5652",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18825,8 +18828,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5716",
-   "self_type" : "type-5715",
+   "referenced_type" : "type-5733",
+   "self_type" : "type-5732",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18834,8 +18837,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5806",
-   "self_type" : "type-5805",
+   "referenced_type" : "type-5818",
+   "self_type" : "type-5817",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18843,8 +18846,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5831",
-   "self_type" : "type-5830",
+   "referenced_type" : "type-5852",
+   "self_type" : "type-5851",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18852,8 +18855,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6014",
-   "self_type" : "type-6013",
+   "referenced_type" : "type-6035",
+   "self_type" : "type-6034",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18861,8 +18864,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6138",
-   "self_type" : "type-6137",
+   "referenced_type" : "type-6158",
+   "self_type" : "type-6157",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18870,8 +18873,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6226",
-   "self_type" : "type-6225",
+   "referenced_type" : "type-6242",
+   "self_type" : "type-6241",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18879,8 +18882,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6289",
-   "self_type" : "type-6288",
+   "referenced_type" : "type-6309",
+   "self_type" : "type-6308",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18888,8 +18891,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6361",
-   "self_type" : "type-6360",
+   "referenced_type" : "type-6376",
+   "self_type" : "type-6375",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18897,8 +18900,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6383",
-   "self_type" : "type-6382",
+   "referenced_type" : "type-6406",
+   "self_type" : "type-6405",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18906,8 +18909,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6482",
-   "self_type" : "type-6481",
+   "referenced_type" : "type-6505",
+   "self_type" : "type-6504",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18915,8 +18918,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6513",
-   "self_type" : "type-6512",
+   "referenced_type" : "type-6537",
+   "self_type" : "type-6536",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18924,8 +18927,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6530",
-   "self_type" : "type-6529",
+   "referenced_type" : "type-6553",
+   "self_type" : "type-6552",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18933,8 +18936,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6546",
-   "self_type" : "type-6545",
+   "referenced_type" : "type-6569",
+   "self_type" : "type-6568",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18942,8 +18945,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6593",
-   "self_type" : "type-6592",
+   "referenced_type" : "type-6616",
+   "self_type" : "type-6615",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18951,8 +18954,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6670",
-   "self_type" : "type-6669",
+   "referenced_type" : "type-6693",
+   "self_type" : "type-6692",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18960,8 +18963,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6889",
-   "self_type" : "type-6888",
+   "referenced_type" : "type-6912",
+   "self_type" : "type-6911",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18969,8 +18972,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7057",
-   "self_type" : "type-7056",
+   "referenced_type" : "type-7081",
+   "self_type" : "type-7080",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18978,8 +18981,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7120",
-   "self_type" : "type-7119",
+   "referenced_type" : "type-7145",
+   "self_type" : "type-7144",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18987,8 +18990,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7155",
-   "self_type" : "type-7154",
+   "referenced_type" : "type-7180",
+   "self_type" : "type-7179",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18996,8 +18999,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7199",
-   "self_type" : "type-7198",
+   "referenced_type" : "type-7222",
+   "self_type" : "type-7221",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19005,8 +19008,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7346",
-   "self_type" : "type-7345",
+   "referenced_type" : "type-7369",
+   "self_type" : "type-7368",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19014,8 +19017,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7439",
-   "self_type" : "type-7438",
+   "referenced_type" : "type-7460",
+   "self_type" : "type-7459",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19023,8 +19026,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7441",
-   "self_type" : "type-7440",
+   "referenced_type" : "type-7464",
+   "self_type" : "type-7463",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19032,8 +19035,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7477",
-   "self_type" : "type-7476",
+   "referenced_type" : "type-7501",
+   "self_type" : "type-7500",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19041,8 +19044,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7573",
-   "self_type" : "type-7572",
+   "referenced_type" : "type-7598",
+   "self_type" : "type-7597",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19050,8 +19053,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7608",
-   "self_type" : "type-7607",
+   "referenced_type" : "type-7631",
+   "self_type" : "type-7630",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19068,8 +19071,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-908",
-   "self_type" : "type-907",
+   "referenced_type" : "type-904",
+   "self_type" : "type-903",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19077,8 +19080,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE *",
    "name" : "OMX_BUFFERHEADERTYPE *",
-   "referenced_type" : "type-1540",
-   "self_type" : "type-1595",
+   "referenced_type" : "type-1536",
+   "self_type" : "type-1598",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -19086,8 +19089,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE **",
    "name" : "OMX_BUFFERHEADERTYPE **",
-   "referenced_type" : "type-1595",
-   "self_type" : "type-2376",
+   "referenced_type" : "type-1598",
+   "self_type" : "type-2379",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19095,8 +19098,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_CALLBACKTYPE *",
    "name" : "OMX_CALLBACKTYPE *",
-   "referenced_type" : "type-1590",
-   "self_type" : "type-2385",
+   "referenced_type" : "type-1593",
+   "self_type" : "type-2388",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19104,8 +19107,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *)",
    "name" : "OMX_ERRORTYPE (*)(void *)",
-   "referenced_type" : "type-1501",
-   "self_type" : "type-1500",
+   "referenced_type" : "type-1500",
+   "self_type" : "type-1499",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -19113,8 +19116,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-2382",
-   "self_type" : "type-2381",
+   "referenced_type" : "type-2385",
+   "self_type" : "type-2384",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19122,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-2378",
-   "self_type" : "type-2377",
+   "referenced_type" : "type-2381",
+   "self_type" : "type-2380",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19131,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-2375",
-   "self_type" : "type-2374",
+   "referenced_type" : "type-2378",
+   "self_type" : "type-2377",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19140,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-2387",
-   "self_type" : "type-2386",
+   "referenced_type" : "type-2390",
+   "self_type" : "type-2389",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19149,8 +19152,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
-   "referenced_type" : "type-2384",
-   "self_type" : "type-2383",
+   "referenced_type" : "type-2387",
+   "self_type" : "type-2386",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19158,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-2362",
-   "self_type" : "type-2361",
+   "referenced_type" : "type-2365",
+   "self_type" : "type-2364",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19167,8 +19170,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
-   "referenced_type" : "type-2364",
-   "self_type" : "type-2363",
+   "referenced_type" : "type-2367",
+   "self_type" : "type-2366",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19176,51 +19179,6 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
-   "referenced_type" : "type-2369",
-   "self_type" : "type-2368",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, char *, OMX_INDEXTYPE *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, char *, OMX_INDEXTYPE *)",
-   "referenced_type" : "type-2366",
-   "self_type" : "type-2365",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-2358",
-   "self_type" : "type-2357",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, unsigned char *, unsigned int)",
-   "name" : "OMX_ERRORTYPE (*)(void *, unsigned char *, unsigned int)",
-   "referenced_type" : "type-2389",
-   "self_type" : "type-2388",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, unsigned int, OMX_BUFFERHEADERTYPE *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, unsigned int, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-2380",
-   "self_type" : "type-2379",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-2372",
    "self_type" : "type-2371",
    "size" : 4,
@@ -19228,10 +19186,55 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, char *, OMX_INDEXTYPE *)",
+   "name" : "OMX_ERRORTYPE (*)(void *, char *, OMX_INDEXTYPE *)",
+   "referenced_type" : "type-2369",
+   "self_type" : "type-2368",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "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-2361",
+   "self_type" : "type-2360",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, unsigned char *, unsigned int)",
+   "name" : "OMX_ERRORTYPE (*)(void *, unsigned char *, unsigned int)",
+   "referenced_type" : "type-2392",
+   "self_type" : "type-2391",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, unsigned int, OMX_BUFFERHEADERTYPE *)",
+   "name" : "OMX_ERRORTYPE (*)(void *, unsigned int, OMX_BUFFERHEADERTYPE *)",
+   "referenced_type" : "type-2383",
+   "self_type" : "type-2382",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "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-2375",
+   "self_type" : "type-2374",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, void *, OMX_BUFFERHEADERTYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, void *, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-1594",
-   "self_type" : "type-1593",
+   "referenced_type" : "type-1597",
+   "self_type" : "type-1596",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -19239,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-1592",
-   "self_type" : "type-1591",
+   "referenced_type" : "type-1595",
+   "self_type" : "type-1594",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -19249,7 +19252,7 @@
    "linker_set_key" : "OMX_INDEXTYPE *",
    "name" : "OMX_INDEXTYPE *",
    "referenced_type" : "type-1484",
-   "self_type" : "type-2367",
+   "self_type" : "type-2370",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19257,8 +19260,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_STATETYPE *",
    "name" : "OMX_STATETYPE *",
-   "referenced_type" : "type-1488",
-   "self_type" : "type-2370",
+   "referenced_type" : "type-1490",
+   "self_type" : "type-2373",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19266,8 +19269,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_TUNNELSETUPTYPE *",
    "name" : "OMX_TUNNELSETUPTYPE *",
-   "referenced_type" : "type-1612",
-   "self_type" : "type-2373",
+   "referenced_type" : "type-1613",
+   "self_type" : "type-2376",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19275,8 +19278,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_VERSIONTYPE *",
    "name" : "OMX_VERSIONTYPE *",
-   "referenced_type" : "type-1478",
-   "self_type" : "type-2359",
+   "referenced_type" : "type-1481",
+   "self_type" : "type-2362",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19293,8 +19296,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1115",
-   "self_type" : "type-1114",
+   "referenced_type" : "type-1118",
+   "self_type" : "type-1117",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19302,8 +19305,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1335",
-   "self_type" : "type-1334",
+   "referenced_type" : "type-1338",
+   "self_type" : "type-1337",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19311,8 +19314,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1402",
-   "self_type" : "type-1401",
+   "referenced_type" : "type-1405",
+   "self_type" : "type-1404",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19320,8 +19323,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1418",
-   "self_type" : "type-1417",
+   "referenced_type" : "type-1421",
+   "self_type" : "type-1420",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19329,8 +19332,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1435",
-   "self_type" : "type-1434",
+   "referenced_type" : "type-1438",
+   "self_type" : "type-1437",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19338,8 +19341,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1437",
-   "self_type" : "type-1436",
+   "referenced_type" : "type-1440",
+   "self_type" : "type-1439",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19347,8 +19350,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1503",
-   "self_type" : "type-1502",
+   "referenced_type" : "type-1506",
+   "self_type" : "type-1505",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19356,8 +19359,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1630",
-   "self_type" : "type-1629",
+   "referenced_type" : "type-1634",
+   "self_type" : "type-1633",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19365,8 +19368,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2609",
-   "self_type" : "type-2608",
+   "referenced_type" : "type-2612",
+   "self_type" : "type-2611",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19374,8 +19377,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3476",
-   "self_type" : "type-3475",
+   "referenced_type" : "type-3479",
+   "self_type" : "type-3478",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19383,8 +19386,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3548",
-   "self_type" : "type-3547",
+   "referenced_type" : "type-3547",
+   "self_type" : "type-3546",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19392,8 +19395,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3653",
-   "self_type" : "type-3652",
+   "referenced_type" : "type-3656",
+   "self_type" : "type-3655",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19401,8 +19404,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3718",
-   "self_type" : "type-3717",
+   "referenced_type" : "type-3724",
+   "self_type" : "type-3723",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19410,8 +19413,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3886",
-   "self_type" : "type-3885",
+   "referenced_type" : "type-3892",
+   "self_type" : "type-3891",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19419,8 +19422,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3929",
-   "self_type" : "type-3928",
+   "referenced_type" : "type-3936",
+   "self_type" : "type-3935",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19428,8 +19431,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3945",
-   "self_type" : "type-3944",
+   "referenced_type" : "type-3951",
+   "self_type" : "type-3950",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19437,8 +19440,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3965",
-   "self_type" : "type-3964",
+   "referenced_type" : "type-3971",
+   "self_type" : "type-3970",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19446,8 +19449,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3967",
-   "self_type" : "type-3966",
+   "referenced_type" : "type-3973",
+   "self_type" : "type-3972",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19455,8 +19458,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4017",
-   "self_type" : "type-4016",
+   "referenced_type" : "type-4023",
+   "self_type" : "type-4022",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19464,8 +19467,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4095",
-   "self_type" : "type-4094",
+   "referenced_type" : "type-4101",
+   "self_type" : "type-4100",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19473,8 +19476,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4297",
-   "self_type" : "type-4296",
+   "referenced_type" : "type-4303",
+   "self_type" : "type-4302",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19482,8 +19485,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4512",
-   "self_type" : "type-4511",
+   "referenced_type" : "type-4518",
+   "self_type" : "type-4517",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19491,8 +19494,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4523",
-   "self_type" : "type-4522",
+   "referenced_type" : "type-4529",
+   "self_type" : "type-4528",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19500,8 +19503,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4549",
-   "self_type" : "type-4548",
+   "referenced_type" : "type-4555",
+   "self_type" : "type-4554",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19509,8 +19512,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4576",
-   "self_type" : "type-4575",
+   "referenced_type" : "type-4582",
+   "self_type" : "type-4581",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19518,8 +19521,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4743",
-   "self_type" : "type-4742",
+   "referenced_type" : "type-4749",
+   "self_type" : "type-4748",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19527,8 +19530,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4853",
-   "self_type" : "type-4852",
+   "referenced_type" : "type-4859",
+   "self_type" : "type-4858",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19536,8 +19539,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4964",
-   "self_type" : "type-4963",
+   "referenced_type" : "type-4970",
+   "self_type" : "type-4969",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19545,8 +19548,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5073",
-   "self_type" : "type-5072",
+   "referenced_type" : "type-5089",
+   "self_type" : "type-5088",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19554,8 +19557,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5114",
-   "self_type" : "type-5113",
+   "referenced_type" : "type-5130",
+   "self_type" : "type-5129",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19563,8 +19566,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5207",
-   "self_type" : "type-5206",
+   "referenced_type" : "type-5225",
+   "self_type" : "type-5224",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19572,8 +19575,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5537",
-   "self_type" : "type-5536",
+   "referenced_type" : "type-5554",
+   "self_type" : "type-5553",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19581,8 +19584,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5609",
-   "self_type" : "type-5608",
+   "referenced_type" : "type-5622",
+   "self_type" : "type-5621",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19590,8 +19593,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5714",
-   "self_type" : "type-5713",
+   "referenced_type" : "type-5731",
+   "self_type" : "type-5730",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19599,8 +19602,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5779",
-   "self_type" : "type-5778",
+   "referenced_type" : "type-5799",
+   "self_type" : "type-5798",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19608,8 +19611,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5947",
-   "self_type" : "type-5946",
+   "referenced_type" : "type-5967",
+   "self_type" : "type-5966",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19617,8 +19620,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6012",
-   "self_type" : "type-6011",
+   "referenced_type" : "type-6032",
+   "self_type" : "type-6031",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19626,8 +19629,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6136",
-   "self_type" : "type-6135",
+   "referenced_type" : "type-6156",
+   "self_type" : "type-6155",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19635,8 +19638,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6195",
-   "self_type" : "type-6194",
+   "referenced_type" : "type-6211",
+   "self_type" : "type-6210",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19644,8 +19647,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6287",
-   "self_type" : "type-6286",
+   "referenced_type" : "type-6307",
+   "self_type" : "type-6306",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19653,8 +19656,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6334",
-   "self_type" : "type-6333",
+   "referenced_type" : "type-6358",
+   "self_type" : "type-6357",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19662,8 +19665,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6466",
-   "self_type" : "type-6465",
+   "referenced_type" : "type-6489",
+   "self_type" : "type-6488",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19671,8 +19674,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6508",
-   "self_type" : "type-6507",
+   "referenced_type" : "type-6531",
+   "self_type" : "type-6530",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19680,8 +19683,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6524",
-   "self_type" : "type-6523",
+   "referenced_type" : "type-6547",
+   "self_type" : "type-6546",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19689,8 +19692,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6542",
-   "self_type" : "type-6541",
+   "referenced_type" : "type-6565",
+   "self_type" : "type-6564",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19698,8 +19701,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6544",
-   "self_type" : "type-6543",
+   "referenced_type" : "type-6567",
+   "self_type" : "type-6566",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19707,8 +19710,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6591",
-   "self_type" : "type-6590",
+   "referenced_type" : "type-6614",
+   "self_type" : "type-6613",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19716,8 +19719,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6668",
-   "self_type" : "type-6667",
+   "referenced_type" : "type-6691",
+   "self_type" : "type-6690",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19725,8 +19728,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6887",
-   "self_type" : "type-6886",
+   "referenced_type" : "type-6910",
+   "self_type" : "type-6909",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19734,8 +19737,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7103",
-   "self_type" : "type-7102",
+   "referenced_type" : "type-7127",
+   "self_type" : "type-7126",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19743,8 +19746,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7118",
-   "self_type" : "type-7117",
+   "referenced_type" : "type-7142",
+   "self_type" : "type-7141",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19752,8 +19755,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7153",
-   "self_type" : "type-7152",
+   "referenced_type" : "type-7178",
+   "self_type" : "type-7177",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19761,8 +19764,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7197",
-   "self_type" : "type-7196",
+   "referenced_type" : "type-7220",
+   "self_type" : "type-7219",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19770,8 +19773,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7344",
-   "self_type" : "type-7343",
+   "referenced_type" : "type-7367",
+   "self_type" : "type-7366",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19779,8 +19782,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7434",
-   "self_type" : "type-7433",
+   "referenced_type" : "type-7455",
+   "self_type" : "type-7454",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19788,8 +19791,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7437",
-   "self_type" : "type-7436",
+   "referenced_type" : "type-7462",
+   "self_type" : "type-7461",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19797,8 +19800,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7475",
-   "self_type" : "type-7474",
+   "referenced_type" : "type-7499",
+   "self_type" : "type-7498",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19806,8 +19809,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7571",
-   "self_type" : "type-7570",
+   "referenced_type" : "type-7596",
+   "self_type" : "type-7595",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19815,8 +19818,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7606",
-   "self_type" : "type-7605",
+   "referenced_type" : "type-7629",
+   "self_type" : "type-7628",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19833,8 +19836,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-872",
-   "self_type" : "type-871",
+   "referenced_type" : "type-868",
+   "self_type" : "type-867",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19878,8 +19881,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ALooper::LooperThread *",
    "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-3759",
-   "self_type" : "type-3758",
+   "referenced_type" : "type-3763",
+   "self_type" : "type-3762",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19887,8 +19890,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ALooper::LooperThread *",
    "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-5820",
-   "self_type" : "type-5819",
+   "referenced_type" : "type-5838",
+   "self_type" : "type-5837",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19896,8 +19899,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ALooper::LooperThread *",
    "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-5968",
-   "self_type" : "type-5967",
+   "referenced_type" : "type-5988",
+   "self_type" : "type-5987",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19914,8 +19917,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::AReplyToken *",
    "name" : "android::AReplyToken *",
-   "referenced_type" : "type-1044",
-   "self_type" : "type-1163",
+   "referenced_type" : "type-1043",
+   "self_type" : "type-1166",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -19933,7 +19936,7 @@
    "linker_set_key" : "android::BBinder *",
    "name" : "android::BBinder *",
    "referenced_type" : "type-67",
-   "self_type" : "type-1206",
+   "self_type" : "type-1209",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -19960,7 +19963,7 @@
    "linker_set_key" : "android::BnInterface<android::IGraphicBufferProducer> *",
    "name" : "android::BnInterface<android::IGraphicBufferProducer> *",
    "referenced_type" : "type-71",
-   "self_type" : "type-1271",
+   "self_type" : "type-1275",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19969,7 +19972,7 @@
    "linker_set_key" : "android::BnInterface<android::IProducerListener> *",
    "name" : "android::BnInterface<android::IProducerListener> *",
    "referenced_type" : "type-80",
-   "self_type" : "type-4500",
+   "self_type" : "type-4506",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19977,8 +19980,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BnInterface<android::ITransactionCompletedListener> *",
    "name" : "android::BnInterface<android::ITransactionCompletedListener> *",
-   "referenced_type" : "type-1031",
-   "self_type" : "type-1034",
+   "referenced_type" : "type-1034",
+   "self_type" : "type-1037",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19986,8 +19989,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpConsumerListener *",
    "name" : "android::BpConsumerListener *",
-   "referenced_type" : "type-1579",
-   "self_type" : "type-1578",
+   "referenced_type" : "type-1583",
+   "self_type" : "type-1582",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19995,8 +19998,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpConsumerListener *",
    "name" : "android::BpConsumerListener *",
-   "referenced_type" : "type-4059",
-   "self_type" : "type-4058",
+   "referenced_type" : "type-4065",
+   "self_type" : "type-4064",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20004,8 +20007,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpConsumerListener *",
    "name" : "android::BpConsumerListener *",
-   "referenced_type" : "type-6632",
-   "self_type" : "type-6631",
+   "referenced_type" : "type-6655",
+   "self_type" : "type-6654",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20013,8 +20016,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpGraphicBufferConsumer *",
    "name" : "android::BpGraphicBufferConsumer *",
-   "referenced_type" : "type-1603",
-   "self_type" : "type-1602",
+   "referenced_type" : "type-1607",
+   "self_type" : "type-1606",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20022,8 +20025,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpGraphicBufferConsumer *",
    "name" : "android::BpGraphicBufferConsumer *",
-   "referenced_type" : "type-4076",
-   "self_type" : "type-4075",
+   "referenced_type" : "type-4082",
+   "self_type" : "type-4081",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20031,8 +20034,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpGraphicBufferConsumer *",
    "name" : "android::BpGraphicBufferConsumer *",
-   "referenced_type" : "type-6647",
-   "self_type" : "type-6646",
+   "referenced_type" : "type-6670",
+   "self_type" : "type-6669",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20040,8 +20043,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpGraphicBufferProducer *",
    "name" : "android::BpGraphicBufferProducer *",
-   "referenced_type" : "type-4230",
-   "self_type" : "type-4229",
+   "referenced_type" : "type-4236",
+   "self_type" : "type-4235",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20049,8 +20052,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpGraphicBufferProducer *",
    "name" : "android::BpGraphicBufferProducer *",
-   "referenced_type" : "type-6831",
-   "self_type" : "type-6830",
+   "referenced_type" : "type-6854",
+   "self_type" : "type-6853",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20058,8 +20061,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpInterface<android::IConsumerListener> *",
    "name" : "android::BpInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-1495",
-   "self_type" : "type-1498",
+   "referenced_type" : "type-1501",
+   "self_type" : "type-1504",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -20067,8 +20070,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpInterface<android::IGraphicBufferConsumer> *",
    "name" : "android::BpInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-1624",
-   "self_type" : "type-1628",
+   "referenced_type" : "type-1629",
+   "self_type" : "type-1632",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -20076,8 +20079,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpInterface<android::IGraphicBufferProducer> *",
    "name" : "android::BpInterface<android::IGraphicBufferProducer> *",
-   "referenced_type" : "type-4317",
-   "self_type" : "type-4320",
+   "referenced_type" : "type-4323",
+   "self_type" : "type-4326",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -20085,8 +20088,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpInterface<android::IProducerListener> *",
    "name" : "android::BpInterface<android::IProducerListener> *",
-   "referenced_type" : "type-4479",
-   "self_type" : "type-4482",
+   "referenced_type" : "type-4485",
+   "self_type" : "type-4488",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -20094,8 +20097,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpProducerListener *",
    "name" : "android::BpProducerListener *",
-   "referenced_type" : "type-4452",
-   "self_type" : "type-4451",
+   "referenced_type" : "type-4458",
+   "self_type" : "type-4457",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20103,8 +20106,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpProducerListener *",
    "name" : "android::BpProducerListener *",
-   "referenced_type" : "type-7045",
-   "self_type" : "type-7044",
+   "referenced_type" : "type-7069",
+   "self_type" : "type-7068",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20121,8 +20124,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-1067",
-   "self_type" : "type-1066",
+   "referenced_type" : "type-1070",
+   "self_type" : "type-1069",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20130,8 +20133,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-1529",
-   "self_type" : "type-1528",
+   "referenced_type" : "type-1532",
+   "self_type" : "type-1531",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -20139,8 +20142,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-1670",
-   "self_type" : "type-1669",
+   "referenced_type" : "type-1674",
+   "self_type" : "type-1673",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -20148,8 +20151,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-3636",
-   "self_type" : "type-3635",
+   "referenced_type" : "type-3639",
+   "self_type" : "type-3638",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -20157,8 +20160,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-3680",
-   "self_type" : "type-3679",
+   "referenced_type" : "type-3686",
+   "self_type" : "type-3685",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20166,8 +20169,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-4039",
-   "self_type" : "type-4038",
+   "referenced_type" : "type-4046",
+   "self_type" : "type-4045",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -20175,8 +20178,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-4125",
-   "self_type" : "type-4124",
+   "referenced_type" : "type-4131",
+   "self_type" : "type-4130",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -20184,8 +20187,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-5697",
-   "self_type" : "type-5696",
+   "referenced_type" : "type-5714",
+   "self_type" : "type-5713",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -20193,8 +20196,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-5741",
-   "self_type" : "type-5740",
+   "referenced_type" : "type-5761",
+   "self_type" : "type-5760",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20202,8 +20205,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-6268",
-   "self_type" : "type-6267",
+   "referenced_type" : "type-6288",
+   "self_type" : "type-6287",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -20211,8 +20214,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-6306",
-   "self_type" : "type-6305",
+   "referenced_type" : "type-6329",
+   "self_type" : "type-6328",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20220,8 +20223,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-6615",
-   "self_type" : "type-6614",
+   "referenced_type" : "type-6638",
+   "self_type" : "type-6637",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -20229,8 +20232,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-6696",
-   "self_type" : "type-6695",
+   "referenced_type" : "type-6720",
+   "self_type" : "type-6719",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -20247,8 +20250,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
    "name" : "android::BufferQueue::ProxyConsumerListener *",
-   "referenced_type" : "type-2536",
-   "self_type" : "type-2535",
+   "referenced_type" : "type-2539",
+   "self_type" : "type-2538",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20256,8 +20259,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
    "name" : "android::BufferQueue::ProxyConsumerListener *",
-   "referenced_type" : "type-4948",
-   "self_type" : "type-4947",
+   "referenced_type" : "type-4954",
+   "self_type" : "type-4953",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20265,8 +20268,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
    "name" : "android::BufferQueue::ProxyConsumerListener *",
-   "referenced_type" : "type-6006",
-   "self_type" : "type-6005",
+   "referenced_type" : "type-6026",
+   "self_type" : "type-6025",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20274,8 +20277,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
    "name" : "android::BufferQueue::ProxyConsumerListener *",
-   "referenced_type" : "type-7219",
-   "self_type" : "type-7218",
+   "referenced_type" : "type-7239",
+   "self_type" : "type-7238",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20283,8 +20286,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueConsumer *",
    "name" : "android::BufferQueueConsumer *",
-   "referenced_type" : "type-3491",
-   "self_type" : "type-3490",
+   "referenced_type" : "type-3494",
+   "self_type" : "type-3493",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20292,8 +20295,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueConsumer *",
    "name" : "android::BufferQueueConsumer *",
-   "referenced_type" : "type-5552",
-   "self_type" : "type-5551",
+   "referenced_type" : "type-5569",
+   "self_type" : "type-5568",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20301,8 +20304,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueConsumer *",
    "name" : "android::BufferQueueConsumer *",
-   "referenced_type" : "type-6148",
-   "self_type" : "type-6147",
+   "referenced_type" : "type-6168",
+   "self_type" : "type-6167",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20319,8 +20322,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-1169",
-   "self_type" : "type-1168",
+   "referenced_type" : "type-1172",
+   "self_type" : "type-1171",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20328,8 +20331,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-3517",
-   "self_type" : "type-3516",
+   "referenced_type" : "type-3520",
+   "self_type" : "type-3519",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20337,8 +20340,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-3615",
-   "self_type" : "type-3614",
+   "referenced_type" : "type-3618",
+   "self_type" : "type-3617",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20346,8 +20349,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-3773",
-   "self_type" : "type-3772",
+   "referenced_type" : "type-3779",
+   "self_type" : "type-3778",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20355,8 +20358,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-5578",
-   "self_type" : "type-5577",
+   "referenced_type" : "type-5595",
+   "self_type" : "type-5594",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20364,8 +20367,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-5676",
-   "self_type" : "type-5675",
+   "referenced_type" : "type-5693",
+   "self_type" : "type-5692",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20373,8 +20376,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-5834",
-   "self_type" : "type-5833",
+   "referenced_type" : "type-5854",
+   "self_type" : "type-5853",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20382,8 +20385,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-6167",
-   "self_type" : "type-6166",
+   "referenced_type" : "type-6187",
+   "self_type" : "type-6186",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20391,8 +20394,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-6254",
-   "self_type" : "type-6253",
+   "referenced_type" : "type-6274",
+   "self_type" : "type-6273",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20400,8 +20403,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-6385",
-   "self_type" : "type-6384",
+   "referenced_type" : "type-6408",
+   "self_type" : "type-6407",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20427,8 +20430,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueProducer *",
    "name" : "android::BufferQueueProducer *",
-   "referenced_type" : "type-3502",
-   "self_type" : "type-3501",
+   "referenced_type" : "type-3505",
+   "self_type" : "type-3504",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20436,8 +20439,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueProducer *",
    "name" : "android::BufferQueueProducer *",
-   "referenced_type" : "type-5563",
-   "self_type" : "type-5562",
+   "referenced_type" : "type-5580",
+   "self_type" : "type-5579",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20445,8 +20448,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueProducer *",
    "name" : "android::BufferQueueProducer *",
-   "referenced_type" : "type-6157",
-   "self_type" : "type-6156",
+   "referenced_type" : "type-6177",
+   "self_type" : "type-6176",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20472,8 +20475,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ComposerService *",
    "name" : "android::ComposerService *",
-   "referenced_type" : "type-1092",
-   "self_type" : "type-1091",
+   "referenced_type" : "type-1095",
+   "self_type" : "type-1094",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -20481,8 +20484,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ComposerService *",
    "name" : "android::ComposerService *",
-   "referenced_type" : "type-3700",
-   "self_type" : "type-3699",
+   "referenced_type" : "type-3706",
+   "self_type" : "type-3705",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -20490,8 +20493,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ComposerService *",
    "name" : "android::ComposerService *",
-   "referenced_type" : "type-5761",
-   "self_type" : "type-5760",
+   "referenced_type" : "type-5781",
+   "self_type" : "type-5780",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -20499,8 +20502,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ComposerService *",
    "name" : "android::ComposerService *",
-   "referenced_type" : "type-6319",
-   "self_type" : "type-6318",
+   "referenced_type" : "type-6342",
+   "self_type" : "type-6341",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -20517,8 +20520,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-1253",
-   "self_type" : "type-1252",
+   "referenced_type" : "type-1257",
+   "self_type" : "type-1256",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20526,8 +20529,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-1455",
-   "self_type" : "type-1454",
+   "referenced_type" : "type-1458",
+   "self_type" : "type-1457",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20535,8 +20538,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-3813",
-   "self_type" : "type-3812",
+   "referenced_type" : "type-3820",
+   "self_type" : "type-3819",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20544,8 +20547,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-3986",
-   "self_type" : "type-3985",
+   "referenced_type" : "type-3992",
+   "self_type" : "type-3991",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20553,8 +20556,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-5874",
-   "self_type" : "type-5873",
+   "referenced_type" : "type-5895",
+   "self_type" : "type-5894",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20562,8 +20565,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-6408",
-   "self_type" : "type-6407",
+   "referenced_type" : "type-6431",
+   "self_type" : "type-6430",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20571,8 +20574,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-6560",
-   "self_type" : "type-6559",
+   "referenced_type" : "type-6583",
+   "self_type" : "type-6582",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20580,8 +20583,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-3291",
-   "self_type" : "type-3290",
+   "referenced_type" : "type-3294",
+   "self_type" : "type-3293",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20589,8 +20592,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-3480",
-   "self_type" : "type-3479",
+   "referenced_type" : "type-3483",
+   "self_type" : "type-3482",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20607,8 +20610,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-5352",
-   "self_type" : "type-5351",
+   "referenced_type" : "type-5369",
+   "self_type" : "type-5368",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20616,8 +20619,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-5541",
-   "self_type" : "type-5540",
+   "referenced_type" : "type-5558",
+   "self_type" : "type-5557",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20625,8 +20628,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-6052",
-   "self_type" : "type-6051",
+   "referenced_type" : "type-6072",
+   "self_type" : "type-6071",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20634,8 +20637,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-6140",
-   "self_type" : "type-6139",
+   "referenced_type" : "type-6160",
+   "self_type" : "type-6159",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20670,8 +20673,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-1285",
-   "self_type" : "type-1284",
+   "referenced_type" : "type-1288",
+   "self_type" : "type-1287",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20679,8 +20682,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-1414",
-   "self_type" : "type-1413",
+   "referenced_type" : "type-1417",
+   "self_type" : "type-1416",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20688,8 +20691,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-1433",
-   "self_type" : "type-1432",
+   "referenced_type" : "type-1436",
+   "self_type" : "type-1435",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20697,8 +20700,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-1457",
-   "self_type" : "type-1456",
+   "referenced_type" : "type-1461",
+   "self_type" : "type-1460",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20706,8 +20709,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-1584",
-   "self_type" : "type-1583",
+   "referenced_type" : "type-1588",
+   "self_type" : "type-1587",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20715,8 +20718,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-1611",
-   "self_type" : "type-1610",
+   "referenced_type" : "type-1615",
+   "self_type" : "type-1614",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20724,8 +20727,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-1866",
-   "self_type" : "type-1865",
+   "referenced_type" : "type-1870",
+   "self_type" : "type-1869",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20733,8 +20736,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3447",
-   "self_type" : "type-3446",
+   "referenced_type" : "type-3450",
+   "self_type" : "type-3449",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20742,8 +20745,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3485",
-   "self_type" : "type-3484",
+   "referenced_type" : "type-3488",
+   "self_type" : "type-3487",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20751,8 +20754,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3658",
-   "self_type" : "type-3657",
+   "referenced_type" : "type-3661",
+   "self_type" : "type-3660",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20760,8 +20763,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3660",
-   "self_type" : "type-3659",
+   "referenced_type" : "type-3663",
+   "self_type" : "type-3662",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20769,8 +20772,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3836",
-   "self_type" : "type-3835",
+   "referenced_type" : "type-3842",
+   "self_type" : "type-3841",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20778,8 +20781,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3941",
-   "self_type" : "type-3940",
+   "referenced_type" : "type-3947",
+   "self_type" : "type-3946",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20787,8 +20790,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3963",
-   "self_type" : "type-3962",
+   "referenced_type" : "type-3969",
+   "self_type" : "type-3968",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20796,8 +20799,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3988",
-   "self_type" : "type-3987",
+   "referenced_type" : "type-3994",
+   "self_type" : "type-3993",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20805,8 +20808,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-4064",
-   "self_type" : "type-4063",
+   "referenced_type" : "type-4070",
+   "self_type" : "type-4069",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20814,8 +20817,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-4083",
-   "self_type" : "type-4082",
+   "referenced_type" : "type-4089",
+   "self_type" : "type-4088",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20823,8 +20826,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-4395",
-   "self_type" : "type-4394",
+   "referenced_type" : "type-4399",
+   "self_type" : "type-4398",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20832,8 +20835,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-4653",
-   "self_type" : "type-4652",
+   "referenced_type" : "type-4659",
+   "self_type" : "type-4658",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20841,8 +20844,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-4669",
-   "self_type" : "type-4668",
+   "referenced_type" : "type-4675",
+   "self_type" : "type-4674",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20850,8 +20853,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-4932",
-   "self_type" : "type-4931",
+   "referenced_type" : "type-4938",
+   "self_type" : "type-4937",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20859,8 +20862,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5130",
-   "self_type" : "type-5129",
+   "referenced_type" : "type-5147",
+   "self_type" : "type-5146",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20868,8 +20871,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5508",
-   "self_type" : "type-5507",
+   "referenced_type" : "type-5525",
+   "self_type" : "type-5524",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20877,8 +20880,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5546",
-   "self_type" : "type-5545",
+   "referenced_type" : "type-5563",
+   "self_type" : "type-5562",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20886,8 +20889,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5719",
-   "self_type" : "type-5718",
+   "referenced_type" : "type-5736",
+   "self_type" : "type-5735",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20895,8 +20898,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5721",
-   "self_type" : "type-5720",
+   "referenced_type" : "type-5738",
+   "self_type" : "type-5737",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20904,8 +20907,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5897",
-   "self_type" : "type-5896",
+   "referenced_type" : "type-5917",
+   "self_type" : "type-5916",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20913,8 +20916,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5997",
-   "self_type" : "type-5996",
+   "referenced_type" : "type-6017",
+   "self_type" : "type-6016",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20922,8 +20925,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6110",
-   "self_type" : "type-6109",
+   "referenced_type" : "type-6130",
+   "self_type" : "type-6129",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20931,8 +20934,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6142",
-   "self_type" : "type-6141",
+   "referenced_type" : "type-6162",
+   "self_type" : "type-6161",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20940,8 +20943,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6292",
-   "self_type" : "type-6291",
+   "referenced_type" : "type-6312",
+   "self_type" : "type-6311",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20949,8 +20952,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6294",
-   "self_type" : "type-6293",
+   "referenced_type" : "type-6314",
+   "self_type" : "type-6313",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20958,8 +20961,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6421",
-   "self_type" : "type-6420",
+   "referenced_type" : "type-6444",
+   "self_type" : "type-6443",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20967,8 +20970,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6520",
-   "self_type" : "type-6519",
+   "referenced_type" : "type-6543",
+   "self_type" : "type-6542",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20976,8 +20979,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6540",
-   "self_type" : "type-6539",
+   "referenced_type" : "type-6563",
+   "self_type" : "type-6562",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20985,8 +20988,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6562",
-   "self_type" : "type-6561",
+   "referenced_type" : "type-6585",
+   "self_type" : "type-6584",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20994,8 +20997,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6637",
-   "self_type" : "type-6636",
+   "referenced_type" : "type-6660",
+   "self_type" : "type-6659",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21003,8 +21006,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6654",
-   "self_type" : "type-6653",
+   "referenced_type" : "type-6677",
+   "self_type" : "type-6676",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21012,8 +21015,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6981",
-   "self_type" : "type-6980",
+   "referenced_type" : "type-7003",
+   "self_type" : "type-7002",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21021,8 +21024,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-7171",
-   "self_type" : "type-7170",
+   "referenced_type" : "type-7194",
+   "self_type" : "type-7193",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21039,8 +21042,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-7283",
-   "self_type" : "type-7282",
+   "referenced_type" : "type-7307",
+   "self_type" : "type-7306",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21048,8 +21051,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-7296",
-   "self_type" : "type-7295",
+   "referenced_type" : "type-7319",
+   "self_type" : "type-7318",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21057,8 +21060,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-7496",
-   "self_type" : "type-7495",
+   "referenced_type" : "type-7521",
+   "self_type" : "type-7520",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21066,8 +21069,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-7642",
-   "self_type" : "type-7641",
+   "referenced_type" : "type-7665",
+   "self_type" : "type-7664",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21084,8 +21087,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FileDescriptor::Autoclose *",
    "name" : "android::FileDescriptor::Autoclose *",
-   "referenced_type" : "type-1204",
-   "self_type" : "type-1213",
+   "referenced_type" : "type-1203",
+   "self_type" : "type-1212",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h"
   },
@@ -21094,7 +21097,7 @@
    "linker_set_key" : "android::Flattenable<android::BufferItem> *",
    "name" : "android::Flattenable<android::BufferItem> *",
    "referenced_type" : "type-21",
-   "self_type" : "type-1510",
+   "self_type" : "type-1513",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -21103,7 +21106,7 @@
    "linker_set_key" : "android::Flattenable<android::Fence> *",
    "name" : "android::Flattenable<android::Fence> *",
    "referenced_type" : "type-16",
-   "self_type" : "type-1636",
+   "self_type" : "type-1642",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -21112,7 +21115,7 @@
    "linker_set_key" : "android::Flattenable<android::FrameEventHistoryDelta> *",
    "name" : "android::Flattenable<android::FrameEventHistoryDelta> *",
    "referenced_type" : "type-25",
-   "self_type" : "type-4308",
+   "self_type" : "type-4314",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -21121,7 +21124,7 @@
    "linker_set_key" : "android::Flattenable<android::GraphicBuffer> *",
    "name" : "android::Flattenable<android::GraphicBuffer> *",
    "referenced_type" : "type-14",
-   "self_type" : "type-1640",
+   "self_type" : "type-1645",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -21130,7 +21133,7 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> *",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> *",
    "referenced_type" : "type-32",
-   "self_type" : "type-4311",
+   "self_type" : "type-4317",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -21139,7 +21142,7 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> *",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> *",
    "referenced_type" : "type-34",
-   "self_type" : "type-4314",
+   "self_type" : "type-4320",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -21156,8 +21159,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-1175",
-   "self_type" : "type-1174",
+   "referenced_type" : "type-1178",
+   "self_type" : "type-1177",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21165,8 +21168,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-1468",
-   "self_type" : "type-1467",
+   "referenced_type" : "type-1472",
+   "self_type" : "type-1471",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21174,8 +21177,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-3778",
-   "self_type" : "type-3777",
+   "referenced_type" : "type-3784",
+   "self_type" : "type-3783",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21183,8 +21186,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-3997",
-   "self_type" : "type-3996",
+   "referenced_type" : "type-4003",
+   "self_type" : "type-4002",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21192,8 +21195,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-5839",
-   "self_type" : "type-5838",
+   "referenced_type" : "type-5859",
+   "self_type" : "type-5858",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21201,8 +21204,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-6389",
-   "self_type" : "type-6388",
+   "referenced_type" : "type-6412",
+   "self_type" : "type-6411",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21210,8 +21213,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-6571",
-   "self_type" : "type-6570",
+   "referenced_type" : "type-6594",
+   "self_type" : "type-6593",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21228,8 +21231,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1331",
-   "self_type" : "type-1330",
+   "referenced_type" : "type-1330",
+   "self_type" : "type-1329",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21237,8 +21240,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1416",
-   "self_type" : "type-1415",
+   "referenced_type" : "type-1419",
+   "self_type" : "type-1418",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21246,8 +21249,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1459",
-   "self_type" : "type-1458",
+   "referenced_type" : "type-1463",
+   "self_type" : "type-1462",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21255,8 +21258,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1587",
-   "self_type" : "type-1586",
+   "referenced_type" : "type-1591",
+   "self_type" : "type-1590",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21264,8 +21267,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1608",
-   "self_type" : "type-1607",
+   "referenced_type" : "type-1612",
+   "self_type" : "type-1611",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21273,8 +21276,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3452",
-   "self_type" : "type-3451",
+   "referenced_type" : "type-3455",
+   "self_type" : "type-3454",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21282,8 +21285,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3487",
-   "self_type" : "type-3486",
+   "referenced_type" : "type-3490",
+   "self_type" : "type-3489",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21291,8 +21294,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3597",
-   "self_type" : "type-3596",
+   "referenced_type" : "type-3600",
+   "self_type" : "type-3599",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21300,8 +21303,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3662",
-   "self_type" : "type-3661",
+   "referenced_type" : "type-3665",
+   "self_type" : "type-3664",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21309,8 +21312,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3882",
-   "self_type" : "type-3881",
+   "referenced_type" : "type-3884",
+   "self_type" : "type-3883",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21318,8 +21321,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3943",
-   "self_type" : "type-3942",
+   "referenced_type" : "type-3949",
+   "self_type" : "type-3948",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21327,8 +21330,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3990",
-   "self_type" : "type-3989",
+   "referenced_type" : "type-3996",
+   "self_type" : "type-3995",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21336,8 +21339,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-4066",
-   "self_type" : "type-4065",
+   "referenced_type" : "type-4072",
+   "self_type" : "type-4071",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21345,8 +21348,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-4081",
-   "self_type" : "type-4080",
+   "referenced_type" : "type-4087",
+   "self_type" : "type-4086",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21354,8 +21357,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-4447",
-   "self_type" : "type-4446",
+   "referenced_type" : "type-4453",
+   "self_type" : "type-4452",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21363,8 +21366,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-4547",
-   "self_type" : "type-4546",
+   "referenced_type" : "type-4551",
+   "self_type" : "type-4550",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21372,8 +21375,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-4676",
-   "self_type" : "type-4675",
+   "referenced_type" : "type-4683",
+   "self_type" : "type-4682",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21381,8 +21384,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5132",
-   "self_type" : "type-5131",
+   "referenced_type" : "type-5149",
+   "self_type" : "type-5148",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21390,8 +21393,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5513",
-   "self_type" : "type-5512",
+   "referenced_type" : "type-5530",
+   "self_type" : "type-5529",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21399,8 +21402,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5548",
-   "self_type" : "type-5547",
+   "referenced_type" : "type-5565",
+   "self_type" : "type-5564",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21408,8 +21411,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5658",
-   "self_type" : "type-5657",
+   "referenced_type" : "type-5675",
+   "self_type" : "type-5674",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21417,8 +21420,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5723",
-   "self_type" : "type-5722",
+   "referenced_type" : "type-5740",
+   "self_type" : "type-5739",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21426,8 +21429,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5943",
-   "self_type" : "type-5942",
+   "referenced_type" : "type-5959",
+   "self_type" : "type-5958",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21435,8 +21438,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5970",
-   "self_type" : "type-5969",
+   "referenced_type" : "type-5990",
+   "self_type" : "type-5989",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21444,8 +21447,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6116",
-   "self_type" : "type-6115",
+   "referenced_type" : "type-6136",
+   "self_type" : "type-6135",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21453,8 +21456,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6144",
-   "self_type" : "type-6143",
+   "referenced_type" : "type-6164",
+   "self_type" : "type-6163",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21462,8 +21465,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6243",
-   "self_type" : "type-6242",
+   "referenced_type" : "type-6263",
+   "self_type" : "type-6262",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21471,8 +21474,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6296",
-   "self_type" : "type-6295",
+   "referenced_type" : "type-6316",
+   "self_type" : "type-6315",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21480,8 +21483,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6462",
-   "self_type" : "type-6461",
+   "referenced_type" : "type-6481",
+   "self_type" : "type-6480",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21489,8 +21492,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6522",
-   "self_type" : "type-6521",
+   "referenced_type" : "type-6545",
+   "self_type" : "type-6544",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21498,8 +21501,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6564",
-   "self_type" : "type-6563",
+   "referenced_type" : "type-6587",
+   "self_type" : "type-6586",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21507,8 +21510,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6613",
-   "self_type" : "type-6612",
+   "referenced_type" : "type-6632",
+   "self_type" : "type-6631",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21516,8 +21519,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6639",
-   "self_type" : "type-6638",
+   "referenced_type" : "type-6662",
+   "self_type" : "type-6661",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21525,8 +21528,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6652",
-   "self_type" : "type-6651",
+   "referenced_type" : "type-6675",
+   "self_type" : "type-6674",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21534,17 +21537,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-7039",
-   "self_type" : "type-7038",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-7303",
-   "self_type" : "type-7302",
+   "referenced_type" : "type-7062",
+   "self_type" : "type-7061",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21561,6 +21555,15 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-7326",
+   "self_type" : "type-7325",
+   "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,
@@ -21570,8 +21573,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-7500",
-   "self_type" : "type-7499",
+   "referenced_type" : "type-7523",
+   "self_type" : "type-7522",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21579,8 +21582,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-7645",
-   "self_type" : "type-7644",
+   "referenced_type" : "type-7668",
+   "self_type" : "type-7667",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21606,8 +21609,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1088",
-   "self_type" : "type-1087",
+   "referenced_type" : "type-1091",
+   "self_type" : "type-1090",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21615,8 +21618,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1270",
-   "self_type" : "type-1269",
+   "referenced_type" : "type-1273",
+   "self_type" : "type-1272",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21624,8 +21627,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1412",
-   "self_type" : "type-1411",
+   "referenced_type" : "type-1415",
+   "self_type" : "type-1414",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21633,8 +21636,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1448",
-   "self_type" : "type-1447",
+   "referenced_type" : "type-1451",
+   "self_type" : "type-1450",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21642,8 +21645,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-2174",
-   "self_type" : "type-2173",
+   "referenced_type" : "type-2178",
+   "self_type" : "type-2177",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21651,8 +21654,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3252",
-   "self_type" : "type-3251",
+   "referenced_type" : "type-3255",
+   "self_type" : "type-3254",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21669,8 +21672,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3465",
-   "self_type" : "type-3464",
+   "referenced_type" : "type-3468",
+   "self_type" : "type-3467",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21678,8 +21681,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3530",
-   "self_type" : "type-3529",
+   "referenced_type" : "type-3533",
+   "self_type" : "type-3532",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21687,8 +21690,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3641",
-   "self_type" : "type-3640",
+   "referenced_type" : "type-3644",
+   "self_type" : "type-3643",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21696,8 +21699,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3698",
-   "self_type" : "type-3697",
+   "referenced_type" : "type-3704",
+   "self_type" : "type-3703",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21705,8 +21708,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3823",
-   "self_type" : "type-3822",
+   "referenced_type" : "type-3829",
+   "self_type" : "type-3828",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21714,8 +21717,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3939",
-   "self_type" : "type-3938",
+   "referenced_type" : "type-3945",
+   "self_type" : "type-3944",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21723,8 +21726,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3980",
-   "self_type" : "type-3979",
+   "referenced_type" : "type-3987",
+   "self_type" : "type-3986",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21732,8 +21735,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-4209",
-   "self_type" : "type-4208",
+   "referenced_type" : "type-4216",
+   "self_type" : "type-4215",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21741,8 +21744,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-4388",
-   "self_type" : "type-4387",
+   "referenced_type" : "type-4394",
+   "self_type" : "type-4393",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21750,8 +21753,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-4600",
-   "self_type" : "type-4599",
+   "referenced_type" : "type-4607",
+   "self_type" : "type-4606",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21759,8 +21762,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-4766",
-   "self_type" : "type-4765",
+   "referenced_type" : "type-4773",
+   "self_type" : "type-4772",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21768,8 +21771,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5082",
-   "self_type" : "type-5081",
+   "referenced_type" : "type-5098",
+   "self_type" : "type-5097",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21777,8 +21780,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5150",
-   "self_type" : "type-5149",
+   "referenced_type" : "type-5166",
+   "self_type" : "type-5165",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21786,8 +21789,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5313",
-   "self_type" : "type-5312",
+   "referenced_type" : "type-5330",
+   "self_type" : "type-5329",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21795,8 +21798,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5526",
-   "self_type" : "type-5525",
+   "referenced_type" : "type-5543",
+   "self_type" : "type-5542",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21804,8 +21807,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5591",
-   "self_type" : "type-5590",
+   "referenced_type" : "type-5608",
+   "self_type" : "type-5607",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21813,8 +21816,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5702",
-   "self_type" : "type-5701",
+   "referenced_type" : "type-5719",
+   "self_type" : "type-5718",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21822,8 +21825,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5759",
-   "self_type" : "type-5758",
+   "referenced_type" : "type-5779",
+   "self_type" : "type-5778",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21831,8 +21834,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5884",
-   "self_type" : "type-5883",
+   "referenced_type" : "type-5904",
+   "self_type" : "type-5903",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21840,8 +21843,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6044",
-   "self_type" : "type-6043",
+   "referenced_type" : "type-6064",
+   "self_type" : "type-6063",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21849,8 +21852,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6127",
-   "self_type" : "type-6126",
+   "referenced_type" : "type-6148",
+   "self_type" : "type-6147",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21858,8 +21861,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6179",
-   "self_type" : "type-6178",
+   "referenced_type" : "type-6199",
+   "self_type" : "type-6198",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21867,8 +21870,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6273",
-   "self_type" : "type-6272",
+   "referenced_type" : "type-6293",
+   "self_type" : "type-6292",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21876,8 +21879,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6317",
-   "self_type" : "type-6316",
+   "referenced_type" : "type-6340",
+   "self_type" : "type-6339",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21885,8 +21888,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6412",
-   "self_type" : "type-6411",
+   "referenced_type" : "type-6436",
+   "self_type" : "type-6435",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21894,8 +21897,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6518",
-   "self_type" : "type-6517",
+   "referenced_type" : "type-6541",
+   "self_type" : "type-6540",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21903,8 +21906,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6555",
-   "self_type" : "type-6554",
+   "referenced_type" : "type-6578",
+   "self_type" : "type-6577",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21912,8 +21915,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6801",
-   "self_type" : "type-6800",
+   "referenced_type" : "type-6824",
+   "self_type" : "type-6823",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21921,8 +21924,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6973",
-   "self_type" : "type-6972",
+   "referenced_type" : "type-6997",
+   "self_type" : "type-6996",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21930,8 +21933,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-7225",
-   "self_type" : "type-7224",
+   "referenced_type" : "type-7248",
+   "self_type" : "type-7247",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21939,8 +21942,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-7363",
-   "self_type" : "type-7362",
+   "referenced_type" : "type-7387",
+   "self_type" : "type-7386",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21957,8 +21960,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-7587",
-   "self_type" : "type-7586",
+   "referenced_type" : "type-7610",
+   "self_type" : "type-7609",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -22002,8 +22005,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
    "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-3902",
-   "self_type" : "type-3901",
+   "referenced_type" : "type-3908",
+   "self_type" : "type-3907",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22020,8 +22023,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
    "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-5963",
-   "self_type" : "type-5962",
+   "referenced_type" : "type-5983",
+   "self_type" : "type-5982",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22029,8 +22032,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
    "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-5990",
-   "self_type" : "type-5989",
+   "referenced_type" : "type-6010",
+   "self_type" : "type-6009",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22047,8 +22050,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-4257",
-   "self_type" : "type-4256",
+   "referenced_type" : "type-4263",
+   "self_type" : "type-4262",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22056,8 +22059,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-4266",
-   "self_type" : "type-4265",
+   "referenced_type" : "type-4272",
+   "self_type" : "type-4271",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22065,8 +22068,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-4693",
-   "self_type" : "type-4692",
+   "referenced_type" : "type-4700",
+   "self_type" : "type-4699",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22074,8 +22077,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-6853",
-   "self_type" : "type-6852",
+   "referenced_type" : "type-6876",
+   "self_type" : "type-6875",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22083,8 +22086,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-6859",
-   "self_type" : "type-6858",
+   "referenced_type" : "type-6882",
+   "self_type" : "type-6881",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22092,8 +22095,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-7316",
-   "self_type" : "type-7315",
+   "referenced_type" : "type-7339",
+   "self_type" : "type-7338",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22101,8 +22104,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-7648",
-   "self_type" : "type-7647",
+   "referenced_type" : "type-7671",
+   "self_type" : "type-7670",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22110,8 +22113,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
    "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
-   "referenced_type" : "type-4829",
-   "self_type" : "type-4828",
+   "referenced_type" : "type-4835",
+   "self_type" : "type-4834",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22119,8 +22122,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
    "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
-   "referenced_type" : "type-5098",
-   "self_type" : "type-5097",
+   "referenced_type" : "type-5114",
+   "self_type" : "type-5113",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22128,8 +22131,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
    "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
-   "referenced_type" : "type-7418",
-   "self_type" : "type-7417",
+   "referenced_type" : "type-7442",
+   "self_type" : "type-7441",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22137,8 +22140,8 @@
    "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",
+   "referenced_type" : "type-4289",
+   "self_type" : "type-4288",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22146,8 +22149,8 @@
    "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",
+   "referenced_type" : "type-4671",
+   "self_type" : "type-4670",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22155,8 +22158,8 @@
    "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",
+   "referenced_type" : "type-6896",
+   "self_type" : "type-6895",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22164,8 +22167,8 @@
    "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",
+   "referenced_type" : "type-7317",
+   "self_type" : "type-7316",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22173,8 +22176,8 @@
    "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",
+   "referenced_type" : "type-4831",
+   "self_type" : "type-4830",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22182,8 +22185,8 @@
    "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",
+   "referenced_type" : "type-7438",
+   "self_type" : "type-7437",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22191,8 +22194,8 @@
    "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",
+   "referenced_type" : "type-4291",
+   "self_type" : "type-4290",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22200,8 +22203,8 @@
    "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",
+   "referenced_type" : "type-6898",
+   "self_type" : "type-6897",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22209,8 +22212,8 @@
    "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",
+   "referenced_type" : "type-7653",
+   "self_type" : "type-7652",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22218,8 +22221,8 @@
    "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",
+   "referenced_type" : "type-5110",
+   "self_type" : "type-5109",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22227,8 +22230,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::HpGraphicBufferProducer *",
    "name" : "android::HpGraphicBufferProducer *",
-   "referenced_type" : "type-4246",
-   "self_type" : "type-4245",
+   "referenced_type" : "type-4252",
+   "self_type" : "type-4251",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22236,8 +22239,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::HpGraphicBufferProducer *",
    "name" : "android::HpGraphicBufferProducer *",
-   "referenced_type" : "type-6842",
-   "self_type" : "type-6841",
+   "referenced_type" : "type-6865",
+   "self_type" : "type-6864",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22245,8 +22248,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::HpProducerListener *",
    "name" : "android::HpProducerListener *",
-   "referenced_type" : "type-4521",
-   "self_type" : "type-4520",
+   "referenced_type" : "type-4527",
+   "self_type" : "type-4526",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22254,8 +22257,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::HpProducerListener *",
    "name" : "android::HpProducerListener *",
-   "referenced_type" : "type-7114",
-   "self_type" : "type-7113",
+   "referenced_type" : "type-7138",
+   "self_type" : "type-7137",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22290,8 +22293,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-1154",
-   "self_type" : "type-1153",
+   "referenced_type" : "type-1157",
+   "self_type" : "type-1156",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22299,8 +22302,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-1576",
-   "self_type" : "type-1575",
+   "referenced_type" : "type-1579",
+   "self_type" : "type-1578",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22308,8 +22311,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-1614",
-   "self_type" : "type-1613",
+   "referenced_type" : "type-1618",
+   "self_type" : "type-1617",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22317,8 +22320,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-3498",
-   "self_type" : "type-3497",
+   "referenced_type" : "type-3501",
+   "self_type" : "type-3500",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22326,8 +22329,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-3605",
-   "self_type" : "type-3604",
+   "referenced_type" : "type-3608",
+   "self_type" : "type-3607",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22335,8 +22338,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-3664",
-   "self_type" : "type-3663",
+   "referenced_type" : "type-3667",
+   "self_type" : "type-3666",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22344,8 +22347,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-3757",
-   "self_type" : "type-3756",
+   "referenced_type" : "type-3765",
+   "self_type" : "type-3764",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22353,8 +22356,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-4055",
-   "self_type" : "type-4054",
+   "referenced_type" : "type-4062",
+   "self_type" : "type-4061",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22362,8 +22365,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-4085",
-   "self_type" : "type-4084",
+   "referenced_type" : "type-4091",
+   "self_type" : "type-4090",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22371,8 +22374,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-4945",
-   "self_type" : "type-4944",
+   "referenced_type" : "type-4951",
+   "self_type" : "type-4950",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22380,8 +22383,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-5135",
-   "self_type" : "type-5134",
+   "referenced_type" : "type-5151",
+   "self_type" : "type-5150",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22389,8 +22392,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-5559",
-   "self_type" : "type-5558",
+   "referenced_type" : "type-5576",
+   "self_type" : "type-5575",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22398,8 +22401,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-5666",
-   "self_type" : "type-5665",
+   "referenced_type" : "type-5683",
+   "self_type" : "type-5682",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22407,8 +22410,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-5725",
-   "self_type" : "type-5724",
+   "referenced_type" : "type-5742",
+   "self_type" : "type-5741",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22416,8 +22419,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-5818",
-   "self_type" : "type-5817",
+   "referenced_type" : "type-5840",
+   "self_type" : "type-5839",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22425,8 +22428,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-6004",
-   "self_type" : "type-6003",
+   "referenced_type" : "type-6024",
+   "self_type" : "type-6023",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22434,8 +22437,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-6153",
-   "self_type" : "type-6152",
+   "referenced_type" : "type-6173",
+   "self_type" : "type-6172",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22443,8 +22446,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-6248",
-   "self_type" : "type-6247",
+   "referenced_type" : "type-6269",
+   "self_type" : "type-6268",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22452,8 +22455,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-6298",
-   "self_type" : "type-6297",
+   "referenced_type" : "type-6318",
+   "self_type" : "type-6317",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22461,8 +22464,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-6373",
-   "self_type" : "type-6372",
+   "referenced_type" : "type-6396",
+   "self_type" : "type-6395",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22470,8 +22473,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-6629",
-   "self_type" : "type-6628",
+   "referenced_type" : "type-6652",
+   "self_type" : "type-6651",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22479,8 +22482,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-6656",
-   "self_type" : "type-6655",
+   "referenced_type" : "type-6679",
+   "self_type" : "type-6678",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22488,8 +22491,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-7208",
-   "self_type" : "type-7207",
+   "referenced_type" : "type-7224",
+   "self_type" : "type-7223",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22524,8 +22527,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-1172",
-   "self_type" : "type-1171",
+   "referenced_type" : "type-1175",
+   "self_type" : "type-1174",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22533,8 +22536,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-1466",
-   "self_type" : "type-1465",
+   "referenced_type" : "type-1470",
+   "self_type" : "type-1469",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22542,8 +22545,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-1599",
-   "self_type" : "type-1598",
+   "referenced_type" : "type-1603",
+   "self_type" : "type-1602",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22551,8 +22554,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-3489",
-   "self_type" : "type-3488",
+   "referenced_type" : "type-3492",
+   "self_type" : "type-3491",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22560,8 +22563,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-3776",
-   "self_type" : "type-3775",
+   "referenced_type" : "type-3782",
+   "self_type" : "type-3781",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22569,8 +22572,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-3969",
-   "self_type" : "type-3968",
+   "referenced_type" : "type-3975",
+   "self_type" : "type-3974",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22578,8 +22581,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-3995",
-   "self_type" : "type-3994",
+   "referenced_type" : "type-4001",
+   "self_type" : "type-4000",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22587,8 +22590,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-4073",
-   "self_type" : "type-4072",
+   "referenced_type" : "type-4079",
+   "self_type" : "type-4078",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22596,8 +22599,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-5550",
-   "self_type" : "type-5549",
+   "referenced_type" : "type-5567",
+   "self_type" : "type-5566",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22614,8 +22617,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-5837",
-   "self_type" : "type-5836",
+   "referenced_type" : "type-5857",
+   "self_type" : "type-5856",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22623,8 +22626,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-5992",
-   "self_type" : "type-5991",
+   "referenced_type" : "type-6012",
+   "self_type" : "type-6011",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22632,8 +22635,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6028",
-   "self_type" : "type-6027",
+   "referenced_type" : "type-6048",
+   "self_type" : "type-6047",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22641,8 +22644,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6146",
-   "self_type" : "type-6145",
+   "referenced_type" : "type-6166",
+   "self_type" : "type-6165",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22650,8 +22653,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6387",
-   "self_type" : "type-6386",
+   "referenced_type" : "type-6410",
+   "self_type" : "type-6409",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22659,8 +22662,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6569",
-   "self_type" : "type-6568",
+   "referenced_type" : "type-6592",
+   "self_type" : "type-6591",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22668,8 +22671,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6644",
-   "self_type" : "type-6643",
+   "referenced_type" : "type-6667",
+   "self_type" : "type-6666",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22686,8 +22689,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-3500",
-   "self_type" : "type-3499",
+   "referenced_type" : "type-3503",
+   "self_type" : "type-3502",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22695,8 +22698,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-3956",
-   "self_type" : "type-3955",
+   "referenced_type" : "type-3959",
+   "self_type" : "type-3958",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22704,8 +22707,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-4225",
-   "self_type" : "type-4224",
+   "referenced_type" : "type-4231",
+   "self_type" : "type-4230",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22713,8 +22716,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-5561",
-   "self_type" : "type-5560",
+   "referenced_type" : "type-5578",
+   "self_type" : "type-5577",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22731,8 +22734,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-5988",
-   "self_type" : "type-5987",
+   "referenced_type" : "type-6008",
+   "self_type" : "type-6007",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22740,8 +22743,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-6023",
-   "self_type" : "type-6022",
+   "referenced_type" : "type-6040",
+   "self_type" : "type-6039",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22749,8 +22752,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-6155",
-   "self_type" : "type-6154",
+   "referenced_type" : "type-6175",
+   "self_type" : "type-6174",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22758,8 +22761,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-6827",
-   "self_type" : "type-6826",
+   "referenced_type" : "type-6850",
+   "self_type" : "type-6849",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22767,8 +22770,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-7502",
-   "self_type" : "type-7501",
+   "referenced_type" : "type-7526",
+   "self_type" : "type-7525",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22794,8 +22797,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1265",
-   "self_type" : "type-1264",
+   "referenced_type" : "type-1268",
+   "self_type" : "type-1267",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -22803,8 +22806,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1369",
-   "self_type" : "type-1368",
+   "referenced_type" : "type-1372",
+   "self_type" : "type-1371",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -22812,8 +22815,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-3818",
-   "self_type" : "type-3817",
+   "referenced_type" : "type-3825",
+   "self_type" : "type-3824",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -22821,8 +22824,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-3914",
-   "self_type" : "type-3913",
+   "referenced_type" : "type-3920",
+   "self_type" : "type-3919",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -22830,8 +22833,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-5879",
-   "self_type" : "type-5878",
+   "referenced_type" : "type-5900",
+   "self_type" : "type-5899",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -22839,8 +22842,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-6406",
-   "self_type" : "type-6405",
+   "referenced_type" : "type-6429",
+   "self_type" : "type-6428",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -22848,8 +22851,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-6492",
-   "self_type" : "type-6491",
+   "referenced_type" : "type-6515",
+   "self_type" : "type-6514",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -22866,8 +22869,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-1159",
-   "self_type" : "type-1158",
+   "referenced_type" : "type-1162",
+   "self_type" : "type-1161",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22875,8 +22878,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-3508",
-   "self_type" : "type-3507",
+   "referenced_type" : "type-3511",
+   "self_type" : "type-3510",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22884,8 +22887,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-3618",
-   "self_type" : "type-3617",
+   "referenced_type" : "type-3621",
+   "self_type" : "type-3620",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22893,8 +22896,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-3666",
-   "self_type" : "type-3665",
+   "referenced_type" : "type-3669",
+   "self_type" : "type-3668",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22902,8 +22905,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-3764",
-   "self_type" : "type-3763",
+   "referenced_type" : "type-3770",
+   "self_type" : "type-3769",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22911,8 +22914,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-4251",
-   "self_type" : "type-4250",
+   "referenced_type" : "type-4257",
+   "self_type" : "type-4256",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22920,8 +22923,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-4515",
-   "self_type" : "type-4514",
+   "referenced_type" : "type-4521",
+   "self_type" : "type-4520",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22929,8 +22932,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-4558",
-   "self_type" : "type-4557",
+   "referenced_type" : "type-4564",
+   "self_type" : "type-4563",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22938,8 +22941,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-4688",
-   "self_type" : "type-4687",
+   "referenced_type" : "type-4694",
+   "self_type" : "type-4693",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22947,8 +22950,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-4950",
-   "self_type" : "type-4949",
+   "referenced_type" : "type-4956",
+   "self_type" : "type-4955",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22956,8 +22959,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-5137",
-   "self_type" : "type-5136",
+   "referenced_type" : "type-5153",
+   "self_type" : "type-5152",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22965,8 +22968,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-5569",
-   "self_type" : "type-5568",
+   "referenced_type" : "type-5586",
+   "self_type" : "type-5585",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22974,8 +22977,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-5679",
-   "self_type" : "type-5678",
+   "referenced_type" : "type-5696",
+   "self_type" : "type-5695",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22983,8 +22986,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-5727",
-   "self_type" : "type-5726",
+   "referenced_type" : "type-5744",
+   "self_type" : "type-5743",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22992,8 +22995,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-5825",
-   "self_type" : "type-5824",
+   "referenced_type" : "type-5845",
+   "self_type" : "type-5844",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23001,8 +23004,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6008",
-   "self_type" : "type-6007",
+   "referenced_type" : "type-6028",
+   "self_type" : "type-6027",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23010,8 +23013,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6162",
-   "self_type" : "type-6161",
+   "referenced_type" : "type-6182",
+   "self_type" : "type-6181",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23019,8 +23022,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6256",
-   "self_type" : "type-6255",
+   "referenced_type" : "type-6276",
+   "self_type" : "type-6275",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23028,8 +23031,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6300",
-   "self_type" : "type-6299",
+   "referenced_type" : "type-6320",
+   "self_type" : "type-6319",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23037,8 +23040,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6378",
-   "self_type" : "type-6377",
+   "referenced_type" : "type-6401",
+   "self_type" : "type-6400",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23046,8 +23049,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6847",
-   "self_type" : "type-6846",
+   "referenced_type" : "type-6870",
+   "self_type" : "type-6869",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23055,8 +23058,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7107",
-   "self_type" : "type-7106",
+   "referenced_type" : "type-7131",
+   "self_type" : "type-7130",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23064,8 +23067,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7166",
-   "self_type" : "type-7165",
+   "referenced_type" : "type-7190",
+   "self_type" : "type-7189",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23073,8 +23076,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7229",
-   "self_type" : "type-7228",
+   "referenced_type" : "type-7250",
+   "self_type" : "type-7249",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23082,8 +23085,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7311",
-   "self_type" : "type-7310",
+   "referenced_type" : "type-7334",
+   "self_type" : "type-7333",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23091,8 +23094,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7485",
-   "self_type" : "type-7484",
+   "referenced_type" : "type-7508",
+   "self_type" : "type-7507",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23100,8 +23103,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7491",
-   "self_type" : "type-7490",
+   "referenced_type" : "type-7515",
+   "self_type" : "type-7514",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23109,8 +23112,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7619",
-   "self_type" : "type-7618",
+   "referenced_type" : "type-7643",
+   "self_type" : "type-7642",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23118,8 +23121,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7640",
-   "self_type" : "type-7639",
+   "referenced_type" : "type-7663",
+   "self_type" : "type-7662",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23154,8 +23157,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ISurfaceComposer *",
    "name" : "android::ISurfaceComposer *",
-   "referenced_type" : "type-1050",
-   "self_type" : "type-1049",
+   "referenced_type" : "type-1053",
+   "self_type" : "type-1052",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23163,8 +23166,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ISurfaceComposer *",
    "name" : "android::ISurfaceComposer *",
-   "referenced_type" : "type-3677",
-   "self_type" : "type-3676",
+   "referenced_type" : "type-3683",
+   "self_type" : "type-3682",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23172,8 +23175,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ISurfaceComposer *",
    "name" : "android::ISurfaceComposer *",
-   "referenced_type" : "type-5738",
-   "self_type" : "type-5737",
+   "referenced_type" : "type-5758",
+   "self_type" : "type-5757",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23181,8 +23184,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ISurfaceComposer *",
    "name" : "android::ISurfaceComposer *",
-   "referenced_type" : "type-6304",
-   "self_type" : "type-6303",
+   "referenced_type" : "type-6327",
+   "self_type" : "type-6326",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23190,8 +23193,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ITransactionCompletedListener *",
    "name" : "android::ITransactionCompletedListener *",
-   "referenced_type" : "type-1042",
-   "self_type" : "type-1041",
+   "referenced_type" : "type-1046",
+   "self_type" : "type-1045",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23199,8 +23202,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ITransactionCompletedListener *",
    "name" : "android::ITransactionCompletedListener *",
-   "referenced_type" : "type-3672",
-   "self_type" : "type-3671",
+   "referenced_type" : "type-3678",
+   "self_type" : "type-3677",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23208,8 +23211,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ITransactionCompletedListener *",
    "name" : "android::ITransactionCompletedListener *",
-   "referenced_type" : "type-5733",
-   "self_type" : "type-5732",
+   "referenced_type" : "type-5753",
+   "self_type" : "type-5752",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23217,8 +23220,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ITransactionCompletedListener *",
    "name" : "android::ITransactionCompletedListener *",
-   "referenced_type" : "type-6302",
-   "self_type" : "type-6301",
+   "referenced_type" : "type-6325",
+   "self_type" : "type-6324",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23253,8 +23256,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::LWProducerListener *",
    "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-2539",
-   "self_type" : "type-2538",
+   "referenced_type" : "type-2542",
+   "self_type" : "type-2541",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23262,8 +23265,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::LWProducerListener *",
    "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-4953",
-   "self_type" : "type-4952",
+   "referenced_type" : "type-4959",
+   "self_type" : "type-4958",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23271,8 +23274,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::LWProducerListener *",
    "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-6010",
-   "self_type" : "type-6009",
+   "referenced_type" : "type-6030",
+   "self_type" : "type-6029",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23280,8 +23283,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::LWProducerListener *",
    "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-7255",
-   "self_type" : "type-7254",
+   "referenced_type" : "type-7272",
+   "self_type" : "type-7271",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23290,7 +23293,7 @@
    "linker_set_key" : "android::LightFlattenablePod<android::Rect> *",
    "name" : "android::LightFlattenablePod<android::Rect> *",
    "referenced_type" : "type-46",
-   "self_type" : "type-4589",
+   "self_type" : "type-4595",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -23334,8 +23337,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::List<Event>::_Node *",
    "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-3687",
-   "self_type" : "type-3686",
+   "referenced_type" : "type-3693",
+   "self_type" : "type-3692",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -23343,8 +23346,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::List<Event>::_Node *",
    "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-5748",
-   "self_type" : "type-5747",
+   "referenced_type" : "type-5768",
+   "self_type" : "type-5767",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -23352,8 +23355,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::List<Event>::_Node *",
    "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-6039",
-   "self_type" : "type-6038",
+   "referenced_type" : "type-6060",
+   "self_type" : "type-6059",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -23469,8 +23472,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::OMXPluginBase *",
    "name" : "android::OMXPluginBase *",
-   "referenced_type" : "type-2393",
-   "self_type" : "type-2394",
+   "referenced_type" : "type-2396",
+   "self_type" : "type-2397",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h"
   },
@@ -23487,8 +23490,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel::FlattenableHelper<android::BufferItem> *",
    "name" : "android::Parcel::FlattenableHelper<android::BufferItem> *",
-   "referenced_type" : "type-1516",
-   "self_type" : "type-1518",
+   "referenced_type" : "type-1520",
+   "self_type" : "type-1522",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -23496,8 +23499,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel::FlattenableHelper<android::Fence> *",
    "name" : "android::Parcel::FlattenableHelper<android::Fence> *",
-   "referenced_type" : "type-1658",
-   "self_type" : "type-1661",
+   "referenced_type" : "type-1662",
+   "self_type" : "type-1665",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -23505,8 +23508,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta> *",
    "name" : "android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta> *",
-   "referenced_type" : "type-4328",
-   "self_type" : "type-4330",
+   "referenced_type" : "type-4334",
+   "self_type" : "type-4336",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -23514,8 +23517,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel::FlattenableHelper<android::GraphicBuffer> *",
    "name" : "android::Parcel::FlattenableHelper<android::GraphicBuffer> *",
-   "referenced_type" : "type-1653",
-   "self_type" : "type-1655",
+   "referenced_type" : "type-1657",
+   "self_type" : "type-1659",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -23523,8 +23526,8 @@
    "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",
+   "referenced_type" : "type-4339",
+   "self_type" : "type-4342",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -23532,8 +23535,8 @@
    "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",
+   "referenced_type" : "type-4345",
+   "self_type" : "type-4347",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -23577,8 +23580,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ProcessState *",
    "name" : "android::ProcessState *",
-   "referenced_type" : "type-1261",
-   "self_type" : "type-1260",
+   "referenced_type" : "type-1264",
+   "self_type" : "type-1263",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23622,8 +23625,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1079",
-   "self_type" : "type-1078",
+   "referenced_type" : "type-1082",
+   "self_type" : "type-1081",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23631,8 +23634,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1191",
-   "self_type" : "type-1190",
+   "referenced_type" : "type-1194",
+   "self_type" : "type-1193",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23640,8 +23643,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1352",
-   "self_type" : "type-1351",
+   "referenced_type" : "type-1355",
+   "self_type" : "type-1354",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23649,8 +23652,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1404",
-   "self_type" : "type-1403",
+   "referenced_type" : "type-1407",
+   "self_type" : "type-1406",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23658,8 +23661,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1419",
+   "referenced_type" : "type-1423",
+   "self_type" : "type-1422",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23667,8 +23670,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1441",
-   "self_type" : "type-1440",
+   "referenced_type" : "type-1444",
+   "self_type" : "type-1443",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23676,8 +23679,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1482",
-   "self_type" : "type-1481",
+   "referenced_type" : "type-1486",
+   "self_type" : "type-1485",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23685,8 +23688,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1616",
-   "self_type" : "type-1615",
+   "referenced_type" : "type-1620",
+   "self_type" : "type-1619",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23694,8 +23697,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2649",
-   "self_type" : "type-2648",
+   "referenced_type" : "type-2652",
+   "self_type" : "type-2651",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23703,8 +23706,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3459",
-   "self_type" : "type-3458",
+   "referenced_type" : "type-3462",
+   "self_type" : "type-3461",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23712,8 +23715,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3525",
-   "self_type" : "type-3524",
+   "referenced_type" : "type-3528",
+   "self_type" : "type-3527",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23721,8 +23724,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3627",
-   "self_type" : "type-3626",
+   "referenced_type" : "type-3630",
+   "self_type" : "type-3629",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23730,8 +23733,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3689",
-   "self_type" : "type-3688",
+   "referenced_type" : "type-3695",
+   "self_type" : "type-3694",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23739,8 +23742,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3781",
-   "self_type" : "type-3780",
+   "referenced_type" : "type-3787",
+   "self_type" : "type-3786",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23748,8 +23751,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3842",
-   "self_type" : "type-3841",
+   "referenced_type" : "type-3848",
+   "self_type" : "type-3847",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23757,8 +23760,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3906",
-   "self_type" : "type-3905",
+   "referenced_type" : "type-3912",
+   "self_type" : "type-3911",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23766,8 +23769,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3932",
-   "self_type" : "type-3931",
+   "referenced_type" : "type-3938",
+   "self_type" : "type-3937",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23775,8 +23778,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3947",
-   "self_type" : "type-3946",
+   "referenced_type" : "type-3954",
+   "self_type" : "type-3953",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23784,8 +23787,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3973",
-   "self_type" : "type-3972",
+   "referenced_type" : "type-3979",
+   "self_type" : "type-3978",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23793,8 +23796,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4006",
-   "self_type" : "type-4005",
+   "referenced_type" : "type-4012",
+   "self_type" : "type-4011",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23802,8 +23805,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4087",
-   "self_type" : "type-4086",
+   "referenced_type" : "type-4093",
+   "self_type" : "type-4092",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23811,8 +23814,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4287",
-   "self_type" : "type-4286",
+   "referenced_type" : "type-4293",
+   "self_type" : "type-4292",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23820,8 +23823,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4474",
-   "self_type" : "type-4473",
+   "referenced_type" : "type-4480",
+   "self_type" : "type-4479",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23829,8 +23832,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4527",
-   "self_type" : "type-4526",
+   "referenced_type" : "type-4533",
+   "self_type" : "type-4532",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23838,8 +23841,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4535",
-   "self_type" : "type-4534",
+   "referenced_type" : "type-4542",
+   "self_type" : "type-4541",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23847,8 +23850,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4561",
-   "self_type" : "type-4560",
+   "referenced_type" : "type-4567",
+   "self_type" : "type-4566",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23856,8 +23859,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4711",
-   "self_type" : "type-4710",
+   "referenced_type" : "type-4718",
+   "self_type" : "type-4717",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23865,8 +23868,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4842",
-   "self_type" : "type-4841",
+   "referenced_type" : "type-4848",
+   "self_type" : "type-4847",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23874,8 +23877,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4991",
-   "self_type" : "type-4990",
+   "referenced_type" : "type-4997",
+   "self_type" : "type-4996",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23883,8 +23886,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5106",
-   "self_type" : "type-5105",
+   "referenced_type" : "type-5122",
+   "self_type" : "type-5121",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23892,8 +23895,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5143",
-   "self_type" : "type-5142",
+   "referenced_type" : "type-5161",
+   "self_type" : "type-5160",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23910,8 +23913,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5520",
-   "self_type" : "type-5519",
+   "referenced_type" : "type-5537",
+   "self_type" : "type-5536",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23919,8 +23922,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5586",
-   "self_type" : "type-5585",
+   "referenced_type" : "type-5603",
+   "self_type" : "type-5602",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23928,8 +23931,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5688",
-   "self_type" : "type-5687",
+   "referenced_type" : "type-5705",
+   "self_type" : "type-5704",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23937,8 +23940,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5750",
-   "self_type" : "type-5749",
+   "referenced_type" : "type-5770",
+   "self_type" : "type-5769",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23946,8 +23949,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5842",
-   "self_type" : "type-5841",
+   "referenced_type" : "type-5862",
+   "self_type" : "type-5861",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23955,8 +23958,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5903",
-   "self_type" : "type-5902",
+   "referenced_type" : "type-5923",
+   "self_type" : "type-5922",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23964,8 +23967,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5965",
-   "self_type" : "type-5964",
+   "referenced_type" : "type-5985",
+   "self_type" : "type-5984",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23973,8 +23976,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6025",
-   "self_type" : "type-6024",
+   "referenced_type" : "type-6045",
+   "self_type" : "type-6044",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23982,8 +23985,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6121",
-   "self_type" : "type-6120",
+   "referenced_type" : "type-6141",
+   "self_type" : "type-6140",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23991,8 +23994,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6173",
-   "self_type" : "type-6172",
+   "referenced_type" : "type-6193",
+   "self_type" : "type-6192",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24000,8 +24003,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6262",
-   "self_type" : "type-6261",
+   "referenced_type" : "type-6282",
+   "self_type" : "type-6281",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24009,8 +24012,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6311",
-   "self_type" : "type-6310",
+   "referenced_type" : "type-6334",
+   "self_type" : "type-6333",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24018,8 +24021,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6391",
-   "self_type" : "type-6390",
+   "referenced_type" : "type-6414",
+   "self_type" : "type-6413",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24027,8 +24030,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6484",
-   "self_type" : "type-6483",
+   "referenced_type" : "type-6507",
+   "self_type" : "type-6506",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24036,8 +24039,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6510",
-   "self_type" : "type-6509",
+   "referenced_type" : "type-6533",
+   "self_type" : "type-6532",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24045,8 +24048,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6526",
-   "self_type" : "type-6525",
+   "referenced_type" : "type-6550",
+   "self_type" : "type-6549",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24054,8 +24057,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6548",
-   "self_type" : "type-6547",
+   "referenced_type" : "type-6571",
+   "self_type" : "type-6570",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24063,8 +24066,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6580",
-   "self_type" : "type-6579",
+   "referenced_type" : "type-6603",
+   "self_type" : "type-6602",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24072,8 +24075,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6658",
-   "self_type" : "type-6657",
+   "referenced_type" : "type-6683",
+   "self_type" : "type-6682",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24081,8 +24084,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6877",
-   "self_type" : "type-6876",
+   "referenced_type" : "type-6900",
+   "self_type" : "type-6899",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24090,8 +24093,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7061",
-   "self_type" : "type-7060",
+   "referenced_type" : "type-7085",
+   "self_type" : "type-7084",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24099,8 +24102,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7123",
-   "self_type" : "type-7122",
+   "referenced_type" : "type-7147",
+   "self_type" : "type-7146",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24108,8 +24111,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7138",
-   "self_type" : "type-7137",
+   "referenced_type" : "type-7162",
+   "self_type" : "type-7161",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24117,8 +24120,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7175",
-   "self_type" : "type-7174",
+   "referenced_type" : "type-7198",
+   "self_type" : "type-7197",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24126,8 +24129,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7324",
-   "self_type" : "type-7323",
+   "referenced_type" : "type-7348",
+   "self_type" : "type-7347",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24144,8 +24147,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7426",
-   "self_type" : "type-7425",
+   "referenced_type" : "type-7449",
+   "self_type" : "type-7448",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24153,8 +24156,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7461",
-   "self_type" : "type-7460",
+   "referenced_type" : "type-7486",
+   "self_type" : "type-7485",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24162,8 +24165,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7517",
-   "self_type" : "type-7516",
+   "referenced_type" : "type-7540",
+   "self_type" : "type-7539",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24171,8 +24174,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7577",
-   "self_type" : "type-7576",
+   "referenced_type" : "type-7592",
+   "self_type" : "type-7591",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24180,8 +24183,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7595",
-   "self_type" : "type-7594",
+   "referenced_type" : "type-7620",
+   "self_type" : "type-7619",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24189,8 +24192,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7658",
-   "self_type" : "type-7657",
+   "referenced_type" : "type-7682",
+   "self_type" : "type-7681",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24225,8 +24228,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ReferenceRenamer *",
    "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-1166",
-   "self_type" : "type-1212",
+   "referenced_type" : "type-1167",
+   "self_type" : "type-1211",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24234,8 +24237,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> > *",
    "name" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> > *",
-   "referenced_type" : "type-1563",
-   "self_type" : "type-1564",
+   "referenced_type" : "type-1568",
+   "self_type" : "type-1569",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24243,8 +24246,8 @@
    "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",
+   "referenced_type" : "type-1572",
+   "self_type" : "type-1573",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24252,132 +24255,6 @@
    "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,
@@ -24385,8 +24262,17 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long> > *",
-   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long> > *",
+   "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-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<android_dataspace_t> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<android_dataspace_t> > *",
    "referenced_type" : "type-2091",
    "self_type" : "type-2092",
    "size" : 4,
@@ -24394,116 +24280,125 @@
   },
   {
    "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-2111",
+   "self_type" : "type-2112",
+   "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-2097",
+   "self_type" : "type-2098",
+   "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-2116",
+   "self_type" : "type-2117",
+   "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-2086",
+   "self_type" : "type-2087",
+   "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-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<int *, const sp<GraphicBuffer> &> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int *, const sp<GraphicBuffer> &> > *",
+   "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, unsigned long long, const sp<Fence> &> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int, unsigned long long, const sp<Fence> &> > *",
+   "referenced_type" : "type-2064",
+   "self_type" : "type-2065",
+   "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-2055",
+   "self_type" : "type-2056",
+   "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-2107",
+   "self_type" : "type-2108",
+   "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-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<unsigned int> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned int> > *",
+   "referenced_type" : "type-2103",
+   "self_type" : "type-2104",
+   "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-2077",
+   "self_type" : "type-2078",
+   "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-2095",
+   "self_type" : "type-2096",
+   "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,
@@ -24511,17 +24406,62 @@
   },
   {
    "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",
+   "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-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<unsigned long long *> > *",
-   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long *> > *",
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<android_dataspace_t> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<android_dataspace_t> > *",
+   "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<bool, vector<Segment, allocator<Segment> > *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool, vector<Segment, allocator<Segment> > *> > *",
+   "referenced_type" : "type-2169",
+   "self_type" : "type-2170",
+   "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-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<const String8 &, String8 *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &, String8 *> > *",
+   "referenced_type" : "type-2171",
+   "self_type" : "type-2172",
+   "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-2155",
+   "self_type" : "type-2156",
+   "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-2147",
    "self_type" : "type-2148",
    "size" : 4,
@@ -24529,10 +24469,73 @@
   },
   {
    "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-2142",
+   "self_type" : "type-2143",
+   "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-2144",
+   "self_type" : "type-2145",
+   "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-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<sp<NativeHandle> *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<sp<NativeHandle> *> > *",
+   "referenced_type" : "type-2166",
+   "self_type" : "type-2167",
+   "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-2153",
+   "self_type" : "type-2154",
+   "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-2164",
+   "self_type" : "type-2165",
+   "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-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<unsigned long long> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long> > *",
-   "referenced_type" : "type-2156",
-   "self_type" : "type-2157",
+   "referenced_type" : "type-2160",
+   "self_type" : "type-2161",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24540,8 +24543,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::SafeBnInterface<android::IConsumerListener> *",
    "name" : "android::SafeBnInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-1287",
-   "self_type" : "type-1292",
+   "referenced_type" : "type-1290",
+   "self_type" : "type-1295",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24549,8 +24552,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
    "name" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-1276",
-   "self_type" : "type-1286",
+   "referenced_type" : "type-1279",
+   "self_type" : "type-1289",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24558,8 +24561,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::SafeBnInterface<android::ITransactionCompletedListener> *",
    "name" : "android::SafeBnInterface<android::ITransactionCompletedListener> *",
-   "referenced_type" : "type-1102",
-   "self_type" : "type-1105",
+   "referenced_type" : "type-1105",
+   "self_type" : "type-1108",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24567,8 +24570,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::SafeBpInterface<android::IConsumerListener> *",
    "name" : "android::SafeBpInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-1537",
-   "self_type" : "type-1539",
+   "referenced_type" : "type-1541",
+   "self_type" : "type-1543",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24576,8 +24579,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::SafeBpInterface<android::IGraphicBufferConsumer> *",
    "name" : "android::SafeBpInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-1716",
-   "self_type" : "type-1718",
+   "referenced_type" : "type-1720",
+   "self_type" : "type-1723",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24585,8 +24588,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::SafeInterface::ParcelHandler *",
    "name" : "android::SafeInterface::ParcelHandler *",
-   "referenced_type" : "type-1235",
-   "self_type" : "type-1245",
+   "referenced_type" : "type-1238",
+   "self_type" : "type-1247",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24604,7 +24607,7 @@
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > > *",
    "name" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > > *",
    "referenced_type" : "type-159",
-   "self_type" : "type-2674",
+   "self_type" : "type-2677",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -24613,7 +24616,7 @@
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > > *",
    "name" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > > *",
    "referenced_type" : "type-146",
-   "self_type" : "type-2669",
+   "self_type" : "type-2672",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -24622,7 +24625,7 @@
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
    "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
    "referenced_type" : "type-139",
-   "self_type" : "type-2666",
+   "self_type" : "type-2669",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -24630,8 +24633,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 *",
    "name" : "android::String16 *",
-   "referenced_type" : "type-1239",
-   "self_type" : "type-2661",
+   "referenced_type" : "type-1242",
+   "self_type" : "type-2664",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -24640,7 +24643,7 @@
    "linker_set_key" : "android::String8 *",
    "name" : "android::String8 *",
    "referenced_type" : "type-121",
-   "self_type" : "type-1885",
+   "self_type" : "type-1889",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -24648,8 +24651,8 @@
    "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",
+   "referenced_type" : "type-2470",
+   "self_type" : "type-2469",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24657,8 +24660,8 @@
    "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",
+   "referenced_type" : "type-4895",
+   "self_type" : "type-4894",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24666,8 +24669,8 @@
    "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",
+   "referenced_type" : "type-6003",
+   "self_type" : "type-6002",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24675,8 +24678,8 @@
    "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",
+   "referenced_type" : "type-7039",
+   "self_type" : "type-7038",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24694,7 +24697,7 @@
    "linker_set_key" : "android::Vector<android::BufferItem> *",
    "name" : "android::Vector<android::BufferItem> *",
    "referenced_type" : "type-837",
-   "self_type" : "type-976",
+   "self_type" : "type-978",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -24702,8 +24705,8 @@
    "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",
+   "referenced_type" : "type-1228",
+   "self_type" : "type-1230",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -24711,8 +24714,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<int> *",
    "name" : "android::Vector<int> *",
-   "referenced_type" : "type-2686",
-   "self_type" : "type-2687",
+   "referenced_type" : "type-2689",
+   "self_type" : "type-2690",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -24720,8 +24723,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<long long> *",
    "name" : "android::Vector<long long> *",
-   "referenced_type" : "type-1081",
-   "self_type" : "type-1082",
+   "referenced_type" : "type-1084",
+   "self_type" : "type-1085",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -24729,8 +24732,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::VirtualLightRefBase *",
    "name" : "android::VirtualLightRefBase *",
-   "referenced_type" : "type-2354",
-   "self_type" : "type-2392",
+   "referenced_type" : "type-2357",
+   "self_type" : "type-2395",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -24738,8 +24741,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::base::EagerEvaluator<char *, char *> *",
    "name" : "android::base::EagerEvaluator<char *, char *> *",
-   "referenced_type" : "type-4699",
-   "self_type" : "type-4701",
+   "referenced_type" : "type-4705",
+   "self_type" : "type-4708",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24747,8 +24750,8 @@
    "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",
+   "referenced_type" : "type-4702",
+   "self_type" : "type-4703",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24756,8 +24759,8 @@
    "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",
+   "referenced_type" : "type-4689",
+   "self_type" : "type-4692",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24765,8 +24768,8 @@
    "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",
+   "referenced_type" : "type-4672",
+   "self_type" : "type-4687",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24774,8 +24777,8 @@
    "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",
+   "referenced_type" : "type-4729",
+   "self_type" : "type-4735",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24783,8 +24786,8 @@
    "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",
+   "referenced_type" : "type-4736",
+   "self_type" : "type-4739",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24792,8 +24795,8 @@
    "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",
+   "referenced_type" : "type-4710",
+   "self_type" : "type-4712",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24801,8 +24804,8 @@
    "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",
+   "referenced_type" : "type-4713",
+   "self_type" : "type-4714",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24810,8 +24813,8 @@
    "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",
+   "referenced_type" : "type-4740",
+   "self_type" : "type-4746",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24819,8 +24822,8 @@
    "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",
+   "referenced_type" : "type-4747",
+   "self_type" : "type-4753",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24828,8 +24831,8 @@
    "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",
+   "referenced_type" : "type-4716",
+   "self_type" : "type-4721",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24837,8 +24840,8 @@
    "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",
+   "referenced_type" : "type-4722",
+   "self_type" : "type-4727",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24846,8 +24849,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::base::ErrnoRestorer *",
    "name" : "android::base::ErrnoRestorer *",
-   "referenced_type" : "type-4656",
-   "self_type" : "type-4822",
+   "referenced_type" : "type-4663",
+   "self_type" : "type-4828",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24855,8 +24858,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
    "name" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
-   "referenced_type" : "type-2553",
-   "self_type" : "type-2565",
+   "referenced_type" : "type-2556",
+   "self_type" : "type-2568",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -24873,8 +24876,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1362",
-   "self_type" : "type-1361",
+   "referenced_type" : "type-1365",
+   "self_type" : "type-1364",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24891,8 +24894,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1359",
-   "self_type" : "type-1358",
+   "referenced_type" : "type-1362",
+   "self_type" : "type-1361",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24900,8 +24903,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1377",
-   "self_type" : "type-1381",
+   "referenced_type" : "type-1380",
+   "self_type" : "type-1384",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -24909,8 +24912,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1396",
-   "self_type" : "type-1395",
+   "referenced_type" : "type-1399",
+   "self_type" : "type-1398",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24918,8 +24921,8 @@
    "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",
+   "referenced_type" : "type-7528",
+   "self_type" : "type-7531",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24927,24 +24930,6 @@
    "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,
@@ -24952,8 +24937,8 @@
   },
   {
    "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> > *",
+   "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-4494",
    "self_type" : "type-4495",
    "size" : 4,
@@ -24961,10 +24946,28 @@
   },
   {
    "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-4371",
+   "self_type" : "type-4372",
+   "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-4500",
+   "self_type" : "type-4501",
+   "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",
+   "referenced_type" : "type-4359",
+   "self_type" : "type-4360",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24981,8 +24984,8 @@
    "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",
+   "referenced_type" : "type-7534",
+   "self_type" : "type-7535",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -25045,7 +25048,7 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> > *",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> > *",
    "referenced_type" : "type-381",
-   "self_type" : "type-7621",
+   "self_type" : "type-7645",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -25054,7 +25057,7 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect> *",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect> *",
    "referenced_type" : "type-372",
-   "self_type" : "type-4595",
+   "self_type" : "type-4601",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -25063,7 +25066,7 @@
    "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",
+   "self_type" : "type-4352",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -25081,7 +25084,7 @@
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
    "referenced_type" : "type-595",
-   "self_type" : "type-2464",
+   "self_type" : "type-2467",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25098,8 +25101,8 @@
    "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",
+   "referenced_type" : "type-2459",
+   "self_type" : "type-2458",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25107,8 +25110,8 @@
    "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",
+   "referenced_type" : "type-4691",
+   "self_type" : "type-4690",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25116,8 +25119,8 @@
    "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",
+   "referenced_type" : "type-7331",
+   "self_type" : "type-7330",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25125,8 +25128,8 @@
    "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",
+   "referenced_type" : "type-4248",
+   "self_type" : "type-4247",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25134,8 +25137,8 @@
    "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",
+   "referenced_type" : "type-6862",
+   "self_type" : "type-6861",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25143,8 +25146,8 @@
    "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",
+   "referenced_type" : "type-4471",
+   "self_type" : "type-4470",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25152,8 +25155,8 @@
    "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",
+   "referenced_type" : "type-7076",
+   "self_type" : "type-7075",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25162,7 +25165,7 @@
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
    "referenced_type" : "type-677",
-   "self_type" : "type-2477",
+   "self_type" : "type-2480",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25171,7 +25174,7 @@
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
    "referenced_type" : "type-604",
-   "self_type" : "type-2471",
+   "self_type" : "type-2474",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25179,8 +25182,8 @@
    "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",
+   "referenced_type" : "type-2483",
+   "self_type" : "type-2482",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25188,8 +25191,8 @@
    "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",
+   "referenced_type" : "type-4903",
+   "self_type" : "type-4902",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25197,8 +25200,8 @@
    "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",
+   "referenced_type" : "type-6006",
+   "self_type" : "type-6005",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25206,8 +25209,8 @@
    "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",
+   "referenced_type" : "type-7093",
+   "self_type" : "type-7092",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25215,8 +25218,8 @@
    "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",
+   "referenced_type" : "type-7661",
+   "self_type" : "type-7660",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25224,8 +25227,8 @@
    "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",
+   "referenced_type" : "type-4242",
+   "self_type" : "type-4241",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25233,8 +25236,8 @@
    "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",
+   "referenced_type" : "type-6858",
+   "self_type" : "type-6857",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25242,8 +25245,8 @@
    "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",
+   "referenced_type" : "type-4463",
+   "self_type" : "type-4462",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25251,8 +25254,8 @@
    "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",
+   "referenced_type" : "type-7072",
+   "self_type" : "type-7071",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25260,8 +25263,8 @@
    "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",
+   "referenced_type" : "type-7519",
+   "self_type" : "type-7518",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25324,7 +25327,7 @@
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > *",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > *",
    "referenced_type" : "type-462",
-   "self_type" : "type-7668",
+   "self_type" : "type-7690",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -25333,7 +25336,7 @@
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::media::V1_0::Rect> *",
    "name" : "android::hardware::hidl_vec<android::hardware::media::V1_0::Rect> *",
    "referenced_type" : "type-453",
-   "self_type" : "type-4567",
+   "self_type" : "type-4573",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -25342,7 +25345,7 @@
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> *",
    "name" : "android::hardware::hidl_vec<unsigned char> *",
    "referenced_type" : "type-452",
-   "self_type" : "type-4374",
+   "self_type" : "type-4381",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -25369,7 +25372,7 @@
    "linker_set_key" : "android::hidl::base::V1_0::IBase *",
    "name" : "android::hidl::base::V1_0::IBase *",
    "referenced_type" : "type-530",
-   "self_type" : "type-2445",
+   "self_type" : "type-2448",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25378,7 +25381,7 @@
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "android::hidl::manager::V1_0::IServiceNotification *",
    "referenced_type" : "type-533",
-   "self_type" : "type-2449",
+   "self_type" : "type-2452",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25387,7 +25390,7 @@
    "linker_set_key" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
    "name" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
    "referenced_type" : "type-160",
-   "self_type" : "type-2623",
+   "self_type" : "type-2626",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -25396,7 +25399,7 @@
    "linker_set_key" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
    "name" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
    "referenced_type" : "type-147",
-   "self_type" : "type-2622",
+   "self_type" : "type-2625",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -25405,7 +25408,7 @@
    "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int> *",
    "name" : "android::key_value_pair_t<unsigned int, unsigned int> *",
    "referenced_type" : "type-143",
-   "self_type" : "type-2621",
+   "self_type" : "type-2624",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -25413,8 +25416,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::AHandler> *",
    "name" : "android::sp<android::AHandler> *",
-   "referenced_type" : "type-1188",
-   "self_type" : "type-1243",
+   "referenced_type" : "type-1191",
+   "self_type" : "type-1246",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25423,7 +25426,7 @@
    "linker_set_key" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
    "name" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
    "referenced_type" : "type-581",
-   "self_type" : "type-2511",
+   "self_type" : "type-2514",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25432,7 +25435,7 @@
    "linker_set_key" : "android::sp<android::ALooper> *",
    "name" : "android::sp<android::ALooper> *",
    "referenced_type" : "type-321",
-   "self_type" : "type-2244",
+   "self_type" : "type-2247",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25441,7 +25444,7 @@
    "linker_set_key" : "android::sp<android::AMessage> *",
    "name" : "android::sp<android::AMessage> *",
    "referenced_type" : "type-259",
-   "self_type" : "type-1956",
+   "self_type" : "type-1947",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25449,8 +25452,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::BpGraphicBufferProducer> *",
    "name" : "android::sp<android::BpGraphicBufferProducer> *",
-   "referenced_type" : "type-4228",
-   "self_type" : "type-4274",
+   "referenced_type" : "type-4234",
+   "self_type" : "type-4280",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25458,8 +25461,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::BpProducerListener> *",
    "name" : "android::sp<android::BpProducerListener> *",
-   "referenced_type" : "type-4454",
-   "self_type" : "type-4453",
+   "referenced_type" : "type-4460",
+   "self_type" : "type-4459",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25477,7 +25480,7 @@
    "linker_set_key" : "android::sp<android::ComponentWrapper> *",
    "name" : "android::sp<android::ComponentWrapper> *",
    "referenced_type" : "type-567",
-   "self_type" : "type-2488",
+   "self_type" : "type-2491",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25494,8 +25497,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::Fence> *",
    "name" : "android::sp<android::Fence> *",
-   "referenced_type" : "type-1864",
-   "self_type" : "type-2522",
+   "referenced_type" : "type-1868",
+   "self_type" : "type-2525",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25504,7 +25507,7 @@
    "linker_set_key" : "android::sp<android::FrameDropper> *",
    "name" : "android::sp<android::FrameDropper> *",
    "referenced_type" : "type-578",
-   "self_type" : "type-2504",
+   "self_type" : "type-2507",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25512,8 +25515,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::GLConsumer::EglImage> *",
    "name" : "android::sp<android::GLConsumer::EglImage> *",
-   "referenced_type" : "type-1173",
-   "self_type" : "type-1177",
+   "referenced_type" : "type-1176",
+   "self_type" : "type-1181",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25522,7 +25525,7 @@
    "linker_set_key" : "android::sp<android::GraphicBuffer> *",
    "name" : "android::sp<android::GraphicBuffer> *",
    "referenced_type" : "type-733",
-   "self_type" : "type-1194",
+   "self_type" : "type-1198",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25531,7 +25534,7 @@
    "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy> *",
    "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy> *",
    "referenced_type" : "type-473",
-   "self_type" : "type-2496",
+   "self_type" : "type-2499",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25539,8 +25542,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::GraphicBufferSource> *",
    "name" : "android::sp<android::GraphicBufferSource> *",
-   "referenced_type" : "type-2542",
-   "self_type" : "type-2541",
+   "referenced_type" : "type-2545",
+   "self_type" : "type-2544",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25548,8 +25551,8 @@
    "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",
+   "referenced_type" : "type-4265",
+   "self_type" : "type-4264",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25557,8 +25560,8 @@
    "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",
+   "referenced_type" : "type-4274",
+   "self_type" : "type-4273",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25566,8 +25569,8 @@
    "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",
+   "referenced_type" : "type-4833",
+   "self_type" : "type-4842",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25575,8 +25578,8 @@
    "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",
+   "referenced_type" : "type-5112",
+   "self_type" : "type-5117",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25585,7 +25588,7 @@
    "linker_set_key" : "android::sp<android::IBinder::DeathRecipient> *",
    "name" : "android::sp<android::IBinder::DeathRecipient> *",
    "referenced_type" : "type-843",
-   "self_type" : "type-1274",
+   "self_type" : "type-1278",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25594,7 +25597,7 @@
    "linker_set_key" : "android::sp<android::IBinder> *",
    "name" : "android::sp<android::IBinder> *",
    "referenced_type" : "type-795",
-   "self_type" : "type-1035",
+   "self_type" : "type-1039",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25603,7 +25606,7 @@
    "linker_set_key" : "android::sp<android::IConsumerListener> *",
    "name" : "android::sp<android::IConsumerListener> *",
    "referenced_type" : "type-939",
-   "self_type" : "type-2534",
+   "self_type" : "type-2537",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25612,7 +25615,7 @@
    "linker_set_key" : "android::sp<android::IGraphicBufferConsumer> *",
    "name" : "android::sp<android::IGraphicBufferConsumer> *",
    "referenced_type" : "type-574",
-   "self_type" : "type-2498",
+   "self_type" : "type-2501",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25621,7 +25624,7 @@
    "linker_set_key" : "android::sp<android::IGraphicBufferProducer> *",
    "name" : "android::sp<android::IGraphicBufferProducer> *",
    "referenced_type" : "type-570",
-   "self_type" : "type-2484",
+   "self_type" : "type-2487",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25639,7 +25642,7 @@
    "linker_set_key" : "android::sp<android::IProducerListener> *",
    "name" : "android::sp<android::IProducerListener> *",
    "referenced_type" : "type-957",
-   "self_type" : "type-2537",
+   "self_type" : "type-2540",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25647,8 +25650,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::ITransactionCompletedListener> *",
    "name" : "android::sp<android::ITransactionCompletedListener> *",
-   "referenced_type" : "type-1040",
-   "self_type" : "type-1045",
+   "referenced_type" : "type-1044",
+   "self_type" : "type-1048",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25657,7 +25660,7 @@
    "linker_set_key" : "android::sp<android::NativeHandle> *",
    "name" : "android::sp<android::NativeHandle> *",
    "referenced_type" : "type-932",
-   "self_type" : "type-1880",
+   "self_type" : "type-1884",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25665,8 +25668,8 @@
    "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",
+   "referenced_type" : "type-2466",
+   "self_type" : "type-2468",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25674,8 +25677,8 @@
    "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",
+   "referenced_type" : "type-2457",
+   "self_type" : "type-2460",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25683,8 +25686,8 @@
    "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",
+   "referenced_type" : "type-4246",
+   "self_type" : "type-4283",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25692,8 +25695,8 @@
    "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",
+   "referenced_type" : "type-4473",
+   "self_type" : "type-4472",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25701,8 +25704,8 @@
    "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",
+   "referenced_type" : "type-2479",
+   "self_type" : "type-2481",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25710,8 +25713,8 @@
    "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",
+   "referenced_type" : "type-2473",
+   "self_type" : "type-2476",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25719,8 +25722,8 @@
    "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",
+   "referenced_type" : "type-4240",
+   "self_type" : "type-4281",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25728,8 +25731,8 @@
    "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",
+   "referenced_type" : "type-4466",
+   "self_type" : "type-4465",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25738,7 +25741,7 @@
    "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",
+   "self_type" : "type-4395",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25746,8 +25749,8 @@
    "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",
+   "referenced_type" : "type-2447",
+   "self_type" : "type-4227",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25755,8 +25758,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "referenced_type" : "type-2448",
-   "self_type" : "type-2450",
+   "referenced_type" : "type-2451",
+   "self_type" : "type-2453",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25764,8 +25767,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<const android::AHandler> *",
    "name" : "android::sp<const android::AHandler> *",
-   "referenced_type" : "type-2516",
-   "self_type" : "type-2519",
+   "referenced_type" : "type-2519",
+   "self_type" : "type-2522",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25810,7 +25813,7 @@
    "linker_set_key" : "android::wp<android::IBinder::DeathRecipient> *",
    "name" : "android::wp<android::IBinder::DeathRecipient> *",
    "referenced_type" : "type-172",
-   "self_type" : "type-1244",
+   "self_type" : "type-1248",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -25819,7 +25822,7 @@
    "linker_set_key" : "android::wp<android::IBinder> *",
    "name" : "android::wp<android::IBinder> *",
    "referenced_type" : "type-130",
-   "self_type" : "type-4279",
+   "self_type" : "type-4285",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -25828,7 +25831,7 @@
    "linker_set_key" : "android_dataspace_t *",
    "name" : "android_dataspace_t *",
    "referenced_type" : "type-170",
-   "self_type" : "type-1667",
+   "self_type" : "type-1672",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -25845,8 +25848,8 @@
    "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",
+   "referenced_type" : "type-1249",
+   "self_type" : "type-1252",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h"
   },
@@ -25854,8 +25857,8 @@
    "alignment" : 4,
    "linker_set_key" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
    "name" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
-   "referenced_type" : "type-1387",
-   "self_type" : "type-1390",
+   "referenced_type" : "type-1390",
+   "self_type" : "type-1393",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -25864,7 +25867,7 @@
    "linker_set_key" : "bool *",
    "name" : "bool *",
    "referenced_type" : "type-93",
-   "self_type" : "type-1272",
+   "self_type" : "type-1274",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -25881,8 +25884,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AHandler *",
    "name" : "const android::AHandler *",
-   "referenced_type" : "type-2518",
-   "self_type" : "type-2517",
+   "referenced_type" : "type-2521",
+   "self_type" : "type-2520",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25890,8 +25893,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AHandlerReflector<android::GraphicBufferSource> *",
    "name" : "const android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-2514",
-   "self_type" : "type-2515",
+   "referenced_type" : "type-2517",
+   "self_type" : "type-2518",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25899,8 +25902,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ALooper *",
    "name" : "const android::ALooper *",
-   "referenced_type" : "type-2289",
-   "self_type" : "type-2301",
+   "referenced_type" : "type-2292",
+   "self_type" : "type-2304",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25908,8 +25911,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AReplyToken *",
    "name" : "const android::AReplyToken *",
-   "referenced_type" : "type-1167",
-   "self_type" : "type-1170",
+   "referenced_type" : "type-1168",
+   "self_type" : "type-1173",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -25917,8 +25920,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AString *",
    "name" : "const android::AString *",
-   "referenced_type" : "type-2110",
-   "self_type" : "type-2230",
+   "referenced_type" : "type-2101",
+   "self_type" : "type-2233",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -25944,8 +25947,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BnInterface<android::IGraphicBufferProducer> *",
    "name" : "const android::BnInterface<android::IGraphicBufferProducer> *",
-   "referenced_type" : "type-1232",
-   "self_type" : "type-1233",
+   "referenced_type" : "type-1236",
+   "self_type" : "type-1237",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -25953,8 +25956,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BnInterface<android::IProducerListener> *",
    "name" : "const android::BnInterface<android::IProducerListener> *",
-   "referenced_type" : "type-4477",
-   "self_type" : "type-4478",
+   "referenced_type" : "type-4483",
+   "self_type" : "type-4484",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -25962,8 +25965,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BnInterface<android::ITransactionCompletedListener> *",
    "name" : "const android::BnInterface<android::ITransactionCompletedListener> *",
-   "referenced_type" : "type-1093",
-   "self_type" : "type-1094",
+   "referenced_type" : "type-1096",
+   "self_type" : "type-1097",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -25980,8 +25983,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-1069",
-   "self_type" : "type-1071",
+   "referenced_type" : "type-1072",
+   "self_type" : "type-1074",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -25989,8 +25992,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-1219",
-   "self_type" : "type-1218",
+   "referenced_type" : "type-1223",
+   "self_type" : "type-1222",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -25998,8 +26001,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-3633",
-   "self_type" : "type-3632",
+   "referenced_type" : "type-3636",
+   "self_type" : "type-3635",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26007,8 +26010,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-3682",
-   "self_type" : "type-3684",
+   "referenced_type" : "type-3688",
+   "self_type" : "type-3690",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -26016,8 +26019,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-3791",
-   "self_type" : "type-3790",
+   "referenced_type" : "type-3798",
+   "self_type" : "type-3797",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26025,8 +26028,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-5694",
-   "self_type" : "type-5693",
+   "referenced_type" : "type-5711",
+   "self_type" : "type-5710",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26034,8 +26037,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-5743",
-   "self_type" : "type-5745",
+   "referenced_type" : "type-5763",
+   "self_type" : "type-5765",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -26043,8 +26046,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-5852",
-   "self_type" : "type-5851",
+   "referenced_type" : "type-5873",
+   "self_type" : "type-5872",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26052,8 +26055,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-6265",
-   "self_type" : "type-6264",
+   "referenced_type" : "type-6285",
+   "self_type" : "type-6284",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26061,8 +26064,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-6307",
-   "self_type" : "type-6309",
+   "referenced_type" : "type-6330",
+   "self_type" : "type-6332",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -26070,8 +26073,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-6398",
-   "self_type" : "type-6397",
+   "referenced_type" : "type-6421",
+   "self_type" : "type-6420",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26088,8 +26091,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferQueueCore *",
    "name" : "const android::BufferQueueCore *",
-   "referenced_type" : "type-3521",
-   "self_type" : "type-3523",
+   "referenced_type" : "type-3524",
+   "self_type" : "type-3526",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26097,8 +26100,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferQueueCore *",
    "name" : "const android::BufferQueueCore *",
-   "referenced_type" : "type-5582",
-   "self_type" : "type-5584",
+   "referenced_type" : "type-5599",
+   "self_type" : "type-5601",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26106,8 +26109,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferQueueCore *",
    "name" : "const android::BufferQueueCore *",
-   "referenced_type" : "type-6168",
-   "self_type" : "type-6170",
+   "referenced_type" : "type-6188",
+   "self_type" : "type-6190",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26124,8 +26127,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ComponentWrapper *",
    "name" : "const android::ComponentWrapper *",
-   "referenced_type" : "type-2494",
-   "self_type" : "type-2495",
+   "referenced_type" : "type-2497",
+   "self_type" : "type-2498",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26133,8 +26136,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ConsumerListener *",
    "name" : "const android::ConsumerListener *",
-   "referenced_type" : "type-3513",
-   "self_type" : "type-3515",
+   "referenced_type" : "type-3516",
+   "self_type" : "type-3518",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26142,8 +26145,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ConsumerListener *",
    "name" : "const android::ConsumerListener *",
-   "referenced_type" : "type-5574",
-   "self_type" : "type-5576",
+   "referenced_type" : "type-5591",
+   "self_type" : "type-5593",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26151,8 +26154,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ConsumerListener *",
    "name" : "const android::ConsumerListener *",
-   "referenced_type" : "type-6163",
-   "self_type" : "type-6165",
+   "referenced_type" : "type-6183",
+   "self_type" : "type-6185",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26169,8 +26172,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-1309",
-   "self_type" : "type-1315",
+   "referenced_type" : "type-1312",
+   "self_type" : "type-1316",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26178,8 +26181,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-2530",
-   "self_type" : "type-2532",
+   "referenced_type" : "type-2533",
+   "self_type" : "type-2535",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26187,8 +26190,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-3448",
-   "self_type" : "type-3450",
+   "referenced_type" : "type-3451",
+   "self_type" : "type-3453",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26196,8 +26199,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-3593",
-   "self_type" : "type-3595",
+   "referenced_type" : "type-3596",
+   "self_type" : "type-3598",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26205,8 +26208,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-3859",
-   "self_type" : "type-3865",
+   "referenced_type" : "type-3865",
+   "self_type" : "type-3869",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26214,8 +26217,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-4422",
-   "self_type" : "type-4430",
+   "referenced_type" : "type-4428",
+   "self_type" : "type-4432",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26223,8 +26226,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-4672",
-   "self_type" : "type-4674",
+   "referenced_type" : "type-4679",
+   "self_type" : "type-4681",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26232,8 +26235,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-4941",
-   "self_type" : "type-4943",
+   "referenced_type" : "type-4947",
+   "self_type" : "type-4949",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26241,8 +26244,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-5509",
-   "self_type" : "type-5511",
+   "referenced_type" : "type-5526",
+   "self_type" : "type-5528",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26250,8 +26253,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-5654",
-   "self_type" : "type-5656",
+   "referenced_type" : "type-5671",
+   "self_type" : "type-5673",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26259,8 +26262,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-5920",
-   "self_type" : "type-5926",
+   "referenced_type" : "type-5940",
+   "self_type" : "type-5944",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26268,8 +26271,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-6000",
-   "self_type" : "type-6002",
+   "referenced_type" : "type-6020",
+   "self_type" : "type-6022",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26277,8 +26280,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-6111",
-   "self_type" : "type-6114",
+   "referenced_type" : "type-6132",
+   "self_type" : "type-6134",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26286,8 +26289,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-6239",
-   "self_type" : "type-6241",
+   "referenced_type" : "type-6259",
+   "self_type" : "type-6261",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26295,8 +26298,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-6440",
-   "self_type" : "type-6446",
+   "referenced_type" : "type-6463",
+   "self_type" : "type-6467",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26304,8 +26307,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-7012",
-   "self_type" : "type-7021",
+   "referenced_type" : "type-7036",
+   "self_type" : "type-7042",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26313,8 +26316,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-7189",
-   "self_type" : "type-7195",
+   "referenced_type" : "type-7212",
+   "self_type" : "type-7214",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26331,8 +26334,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-7299",
-   "self_type" : "type-7301",
+   "referenced_type" : "type-7322",
+   "self_type" : "type-7324",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26350,7 +26353,7 @@
    "linker_set_key" : "const android::FileDescriptor::Autoclose *",
    "name" : "const android::FileDescriptor::Autoclose *",
    "referenced_type" : "type-1221",
-   "self_type" : "type-1230",
+   "self_type" : "type-1229",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h"
   },
@@ -26358,8 +26361,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Flattenable<android::BufferItem> *",
    "name" : "const android::Flattenable<android::BufferItem> *",
-   "referenced_type" : "type-1506",
-   "self_type" : "type-1507",
+   "referenced_type" : "type-1509",
+   "self_type" : "type-1510",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -26367,24 +26370,6 @@
    "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,
@@ -26392,17 +26377,8 @@
   },
   {
    "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> *",
+   "linker_set_key" : "const android::Flattenable<android::FrameEventHistoryDelta> *",
+   "name" : "const android::Flattenable<android::FrameEventHistoryDelta> *",
    "referenced_type" : "type-4312",
    "self_type" : "type-4313",
    "size" : 4,
@@ -26410,10 +26386,37 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::GraphicBuffer> *",
+   "name" : "const android::Flattenable<android::GraphicBuffer> *",
+   "referenced_type" : "type-1643",
+   "self_type" : "type-1644",
+   "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-4315",
+   "self_type" : "type-4316",
+   "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-4318",
+   "self_type" : "type-4319",
+   "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",
+   "referenced_type" : "type-2511",
+   "self_type" : "type-2513",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26421,8 +26424,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-1346",
-   "self_type" : "type-1348",
+   "referenced_type" : "type-1349",
+   "self_type" : "type-1351",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26430,8 +26433,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-1461",
-   "self_type" : "type-1463",
+   "referenced_type" : "type-1465",
+   "self_type" : "type-1467",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26439,8 +26442,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-2403",
-   "self_type" : "type-2425",
+   "referenced_type" : "type-2406",
+   "self_type" : "type-2428",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26448,8 +26451,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-3454",
-   "self_type" : "type-3456",
+   "referenced_type" : "type-3457",
+   "self_type" : "type-3459",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26457,8 +26460,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-3598",
-   "self_type" : "type-3600",
+   "referenced_type" : "type-3601",
+   "self_type" : "type-3603",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26466,8 +26469,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-3898",
-   "self_type" : "type-3900",
+   "referenced_type" : "type-3904",
+   "self_type" : "type-3906",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26475,8 +26478,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-3991",
-   "self_type" : "type-3993",
+   "referenced_type" : "type-3997",
+   "self_type" : "type-3999",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26484,8 +26487,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-4218",
-   "self_type" : "type-4220",
+   "referenced_type" : "type-4224",
+   "self_type" : "type-4226",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26493,8 +26496,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-4838",
-   "self_type" : "type-4870",
+   "referenced_type" : "type-4840",
+   "self_type" : "type-4876",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26502,8 +26505,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-5515",
-   "self_type" : "type-5517",
+   "referenced_type" : "type-5532",
+   "self_type" : "type-5534",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26511,8 +26514,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-5659",
-   "self_type" : "type-5661",
+   "referenced_type" : "type-5676",
+   "self_type" : "type-5678",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26520,16 +26523,7 @@
    "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",
+   "referenced_type" : "type-5979",
    "self_type" : "type-5981",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
@@ -26538,8 +26532,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-6117",
-   "self_type" : "type-6119",
+   "referenced_type" : "type-5996",
+   "self_type" : "type-6001",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26547,8 +26541,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-6244",
-   "self_type" : "type-6246",
+   "referenced_type" : "type-6137",
+   "self_type" : "type-6139",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26556,8 +26550,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-6477",
-   "self_type" : "type-6479",
+   "referenced_type" : "type-6264",
+   "self_type" : "type-6266",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26565,8 +26559,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-6565",
-   "self_type" : "type-6567",
+   "referenced_type" : "type-6500",
+   "self_type" : "type-6503",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26574,8 +26568,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-6809",
-   "self_type" : "type-6819",
+   "referenced_type" : "type-6588",
+   "self_type" : "type-6590",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26583,8 +26577,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-6820",
-   "self_type" : "type-6822",
+   "referenced_type" : "type-6832",
+   "self_type" : "type-6840",
+   "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-6843",
+   "self_type" : "type-6845",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26610,8 +26613,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBufferSource *",
    "name" : "const android::GraphicBufferSource *",
-   "referenced_type" : "type-2546",
-   "self_type" : "type-2547",
+   "referenced_type" : "type-2549",
+   "self_type" : "type-2550",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26619,8 +26622,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IBinder *",
    "name" : "const android::IBinder *",
-   "referenced_type" : "type-1520",
-   "self_type" : "type-1525",
+   "referenced_type" : "type-1524",
+   "self_type" : "type-1530",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26628,8 +26631,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IBinder::DeathRecipient *",
    "name" : "const android::IBinder::DeathRecipient *",
-   "referenced_type" : "type-4315",
-   "self_type" : "type-4316",
+   "referenced_type" : "type-4321",
+   "self_type" : "type-4322",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26637,8 +26640,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-1155",
-   "self_type" : "type-1157",
+   "referenced_type" : "type-1158",
+   "self_type" : "type-1160",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26646,8 +26649,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-1580",
-   "self_type" : "type-1582",
+   "referenced_type" : "type-1584",
+   "self_type" : "type-1586",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26655,8 +26658,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-3611",
-   "self_type" : "type-3613",
+   "referenced_type" : "type-3614",
+   "self_type" : "type-3616",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26664,8 +26667,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-3760",
-   "self_type" : "type-3762",
+   "referenced_type" : "type-3766",
+   "self_type" : "type-3768",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26673,8 +26676,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-4060",
-   "self_type" : "type-4062",
+   "referenced_type" : "type-4066",
+   "self_type" : "type-4068",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26682,8 +26685,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-5672",
-   "self_type" : "type-5674",
+   "referenced_type" : "type-5689",
+   "self_type" : "type-5691",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26691,8 +26694,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-5821",
-   "self_type" : "type-5823",
+   "referenced_type" : "type-5841",
+   "self_type" : "type-5843",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26700,8 +26703,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-6250",
-   "self_type" : "type-6252",
+   "referenced_type" : "type-6270",
+   "self_type" : "type-6272",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26709,8 +26712,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-6374",
-   "self_type" : "type-6376",
+   "referenced_type" : "type-6397",
+   "self_type" : "type-6399",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26718,8 +26721,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-6633",
-   "self_type" : "type-6635",
+   "referenced_type" : "type-6656",
+   "self_type" : "type-6658",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26736,8 +26739,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-1604",
-   "self_type" : "type-1606",
+   "referenced_type" : "type-1608",
+   "self_type" : "type-1610",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26745,8 +26748,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-2501",
-   "self_type" : "type-2503",
+   "referenced_type" : "type-2504",
+   "self_type" : "type-2506",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26754,8 +26757,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-3494",
-   "self_type" : "type-3496",
+   "referenced_type" : "type-3497",
+   "self_type" : "type-3499",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26763,8 +26766,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-4077",
-   "self_type" : "type-4079",
+   "referenced_type" : "type-4083",
+   "self_type" : "type-4085",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26772,8 +26775,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-4914",
-   "self_type" : "type-4916",
+   "referenced_type" : "type-4920",
+   "self_type" : "type-4922",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26781,8 +26784,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-5555",
-   "self_type" : "type-5557",
+   "referenced_type" : "type-5572",
+   "self_type" : "type-5574",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26790,8 +26793,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-5993",
-   "self_type" : "type-5995",
+   "referenced_type" : "type-6013",
+   "self_type" : "type-6015",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26799,8 +26802,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6149",
-   "self_type" : "type-6151",
+   "referenced_type" : "type-6169",
+   "self_type" : "type-6171",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26808,8 +26811,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6648",
-   "self_type" : "type-6650",
+   "referenced_type" : "type-6671",
+   "self_type" : "type-6673",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26817,8 +26820,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-7134",
-   "self_type" : "type-7136",
+   "referenced_type" : "type-7157",
+   "self_type" : "type-7159",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26835,8 +26838,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferProducer *",
    "name" : "const android::IGraphicBufferProducer *",
-   "referenced_type" : "type-3504",
-   "self_type" : "type-3506",
+   "referenced_type" : "type-3507",
+   "self_type" : "type-3509",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26844,8 +26847,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferProducer *",
    "name" : "const android::IGraphicBufferProducer *",
-   "referenced_type" : "type-4247",
-   "self_type" : "type-4249",
+   "referenced_type" : "type-4253",
+   "self_type" : "type-4255",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26853,8 +26856,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferProducer *",
    "name" : "const android::IGraphicBufferProducer *",
-   "referenced_type" : "type-5565",
-   "self_type" : "type-5567",
+   "referenced_type" : "type-5582",
+   "self_type" : "type-5584",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26862,8 +26865,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferProducer *",
    "name" : "const android::IGraphicBufferProducer *",
-   "referenced_type" : "type-6158",
-   "self_type" : "type-6160",
+   "referenced_type" : "type-6178",
+   "self_type" : "type-6180",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26871,8 +26874,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferProducer *",
    "name" : "const android::IGraphicBufferProducer *",
-   "referenced_type" : "type-6843",
-   "self_type" : "type-6845",
+   "referenced_type" : "type-6866",
+   "self_type" : "type-6868",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26889,8 +26892,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-1160",
-   "self_type" : "type-1162",
+   "referenced_type" : "type-1031",
+   "self_type" : "type-1033",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26898,8 +26901,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-3623",
-   "self_type" : "type-3625",
+   "referenced_type" : "type-1163",
+   "self_type" : "type-1165",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26907,8 +26910,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-3765",
-   "self_type" : "type-3767",
+   "referenced_type" : "type-3626",
+   "self_type" : "type-3628",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26916,8 +26919,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-4253",
-   "self_type" : "type-4255",
+   "referenced_type" : "type-3670",
+   "self_type" : "type-3672",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26925,8 +26928,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-4449",
-   "self_type" : "type-4448",
+   "referenced_type" : "type-3771",
+   "self_type" : "type-3773",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26934,8 +26937,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-4689",
-   "self_type" : "type-4691",
+   "referenced_type" : "type-4259",
+   "self_type" : "type-4261",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26943,8 +26946,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-5684",
-   "self_type" : "type-5686",
+   "referenced_type" : "type-4455",
+   "self_type" : "type-4454",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26952,8 +26955,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-5826",
-   "self_type" : "type-5828",
+   "referenced_type" : "type-4696",
+   "self_type" : "type-4698",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26961,8 +26964,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-6257",
-   "self_type" : "type-6259",
+   "referenced_type" : "type-5701",
+   "self_type" : "type-5703",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26970,8 +26973,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-6379",
-   "self_type" : "type-6381",
+   "referenced_type" : "type-5745",
+   "self_type" : "type-5747",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26979,8 +26982,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-6849",
-   "self_type" : "type-6851",
+   "referenced_type" : "type-5846",
+   "self_type" : "type-5848",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26988,8 +26991,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-7042",
-   "self_type" : "type-7041",
+   "referenced_type" : "type-6277",
+   "self_type" : "type-6279",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26997,8 +27000,44 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-7312",
-   "self_type" : "type-7314",
+   "referenced_type" : "type-6321",
+   "self_type" : "type-6323",
+   "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-6402",
+   "self_type" : "type-6404",
+   "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-6872",
+   "self_type" : "type-6874",
+   "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-7066",
+   "self_type" : "type-7065",
+   "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-7335",
+   "self_type" : "type-7337",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27033,8 +27072,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect> *",
    "name" : "const android::LightFlattenablePod<android::Rect> *",
-   "referenced_type" : "type-4587",
-   "self_type" : "type-4588",
+   "referenced_type" : "type-4593",
+   "self_type" : "type-4594",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -27051,8 +27090,8 @@
    "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",
+   "referenced_type" : "type-1233",
+   "self_type" : "type-1234",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -27060,8 +27099,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::LightRefBase<android::NativeHandle> *",
    "name" : "const android::LightRefBase<android::NativeHandle> *",
-   "referenced_type" : "type-2663",
-   "self_type" : "type-2672",
+   "referenced_type" : "type-2666",
+   "self_type" : "type-2675",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -27178,7 +27217,7 @@
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
    "referenced_type" : "type-118",
-   "self_type" : "type-1513",
+   "self_type" : "type-1517",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -27195,8 +27234,8 @@
    "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",
+   "referenced_type" : "type-1523",
+   "self_type" : "type-1525",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -27204,8 +27243,8 @@
    "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",
+   "referenced_type" : "type-1666",
+   "self_type" : "type-1667",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -27213,8 +27252,8 @@
    "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",
+   "referenced_type" : "type-4337",
+   "self_type" : "type-4338",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -27222,8 +27261,8 @@
    "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",
+   "referenced_type" : "type-1660",
+   "self_type" : "type-1661",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -27231,8 +27270,8 @@
    "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",
+   "referenced_type" : "type-4343",
+   "self_type" : "type-4344",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -27240,8 +27279,8 @@
    "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",
+   "referenced_type" : "type-4348",
+   "self_type" : "type-4349",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -27258,8 +27297,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1215",
-   "self_type" : "type-1214",
+   "referenced_type" : "type-1218",
+   "self_type" : "type-1217",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27267,8 +27306,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1490",
-   "self_type" : "type-1489",
+   "referenced_type" : "type-1493",
+   "self_type" : "type-1492",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27276,8 +27315,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1621",
-   "self_type" : "type-1620",
+   "referenced_type" : "type-1624",
+   "self_type" : "type-1623",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27285,8 +27324,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-2683",
-   "self_type" : "type-2682",
+   "referenced_type" : "type-2686",
+   "self_type" : "type-2685",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27294,8 +27333,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-3787",
-   "self_type" : "type-3786",
+   "referenced_type" : "type-3793",
+   "self_type" : "type-3792",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27303,8 +27342,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4011",
-   "self_type" : "type-4010",
+   "referenced_type" : "type-4017",
+   "self_type" : "type-4016",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27312,8 +27351,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4090",
-   "self_type" : "type-4089",
+   "referenced_type" : "type-4096",
+   "self_type" : "type-4095",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27321,8 +27360,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4292",
-   "self_type" : "type-4291",
+   "referenced_type" : "type-4298",
+   "self_type" : "type-4297",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27330,8 +27369,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4572",
-   "self_type" : "type-4571",
+   "referenced_type" : "type-4578",
+   "self_type" : "type-4577",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27339,8 +27378,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4736",
-   "self_type" : "type-4735",
+   "referenced_type" : "type-4743",
+   "self_type" : "type-4742",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27348,8 +27387,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-5019",
-   "self_type" : "type-5018",
+   "referenced_type" : "type-5025",
+   "self_type" : "type-5024",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27357,8 +27396,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-5063",
-   "self_type" : "type-5062",
+   "referenced_type" : "type-5080",
+   "self_type" : "type-5079",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27366,8 +27405,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-5848",
-   "self_type" : "type-5847",
+   "referenced_type" : "type-5868",
+   "self_type" : "type-5867",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27375,8 +27414,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-6030",
-   "self_type" : "type-6029",
+   "referenced_type" : "type-6050",
+   "self_type" : "type-6049",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27384,8 +27423,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-6394",
-   "self_type" : "type-6393",
+   "referenced_type" : "type-6417",
+   "self_type" : "type-6416",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27393,8 +27432,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-6584",
-   "self_type" : "type-6583",
+   "referenced_type" : "type-6608",
+   "self_type" : "type-6607",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27402,8 +27441,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-6663",
-   "self_type" : "type-6662",
+   "referenced_type" : "type-6686",
+   "self_type" : "type-6685",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27411,8 +27450,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-6881",
-   "self_type" : "type-6880",
+   "referenced_type" : "type-6905",
+   "self_type" : "type-6904",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27420,8 +27459,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-7192",
-   "self_type" : "type-7191",
+   "referenced_type" : "type-7216",
+   "self_type" : "type-7215",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27429,8 +27468,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-7339",
-   "self_type" : "type-7338",
+   "referenced_type" : "type-7362",
+   "self_type" : "type-7361",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27438,8 +27477,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-7565",
-   "self_type" : "type-7564",
+   "referenced_type" : "type-7588",
+   "self_type" : "type-7587",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27447,8 +27486,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-7666",
-   "self_type" : "type-7665",
+   "referenced_type" : "type-7685",
+   "self_type" : "type-7684",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27456,8 +27495,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::RefBase *",
    "name" : "const android::RefBase *",
-   "referenced_type" : "type-1449",
-   "self_type" : "type-1480",
+   "referenced_type" : "type-1452",
+   "self_type" : "type-1483",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27465,8 +27504,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SafeBpInterface<android::IConsumerListener> *",
    "name" : "const android::SafeBpInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-1551",
-   "self_type" : "type-1552",
+   "referenced_type" : "type-1554",
+   "self_type" : "type-1555",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -27474,8 +27513,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SafeBpInterface<android::IGraphicBufferConsumer> *",
    "name" : "const android::SafeBpInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-1886",
-   "self_type" : "type-1887",
+   "referenced_type" : "type-1890",
+   "self_type" : "type-1891",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -27483,8 +27522,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SafeInterface::ParcelHandler *",
    "name" : "const android::SafeInterface::ParcelHandler *",
-   "referenced_type" : "type-1256",
-   "self_type" : "type-1266",
+   "referenced_type" : "type-1254",
+   "self_type" : "type-1269",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -27492,8 +27531,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-2675",
-   "self_type" : "type-2676",
+   "referenced_type" : "type-2678",
+   "self_type" : "type-2679",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27501,8 +27540,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-2671",
-   "self_type" : "type-2673",
+   "referenced_type" : "type-2674",
+   "self_type" : "type-2676",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27510,8 +27549,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-2667",
-   "self_type" : "type-2668",
+   "referenced_type" : "type-2670",
+   "self_type" : "type-2671",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27519,8 +27558,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 *",
    "name" : "const android::String16 *",
-   "referenced_type" : "type-1248",
-   "self_type" : "type-2658",
+   "referenced_type" : "type-1251",
+   "self_type" : "type-2661",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -27528,8 +27567,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 *",
    "name" : "const android::String8 *",
-   "referenced_type" : "type-1875",
-   "self_type" : "type-2653",
+   "referenced_type" : "type-1879",
+   "self_type" : "type-2656",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -27537,8 +27576,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::BufferItem> *",
    "name" : "const android::Vector<android::BufferItem> *",
-   "referenced_type" : "type-977",
-   "self_type" : "type-978",
+   "referenced_type" : "type-979",
+   "self_type" : "type-980",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27546,8 +27585,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::Rect> *",
    "name" : "const android::Vector<android::Rect> *",
-   "referenced_type" : "type-2679",
-   "self_type" : "type-2680",
+   "referenced_type" : "type-2682",
+   "self_type" : "type-2683",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27555,8 +27594,8 @@
    "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",
+   "referenced_type" : "type-1231",
+   "self_type" : "type-1232",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27564,8 +27603,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<int> *",
    "name" : "const android::Vector<int> *",
-   "referenced_type" : "type-2688",
-   "self_type" : "type-2689",
+   "referenced_type" : "type-2691",
+   "self_type" : "type-2692",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27573,8 +27612,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<long long> *",
    "name" : "const android::Vector<long long> *",
-   "referenced_type" : "type-1083",
-   "self_type" : "type-1084",
+   "referenced_type" : "type-1086",
+   "self_type" : "type-1087",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27582,8 +27621,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::VectorImpl *",
    "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-2664",
-   "self_type" : "type-2665",
+   "referenced_type" : "type-2667",
+   "self_type" : "type-2668",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -27591,8 +27630,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::base::ErrnoRestorer *",
    "name" : "const android::base::ErrnoRestorer *",
-   "referenced_type" : "type-4655",
-   "self_type" : "type-4661",
+   "referenced_type" : "type-4662",
+   "self_type" : "type-4668",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27600,8 +27639,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser> *",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser> *",
-   "referenced_type" : "type-2580",
-   "self_type" : "type-2595",
+   "referenced_type" : "type-2583",
+   "self_type" : "type-2598",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -27618,8 +27657,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::BpHwRefBase *",
    "name" : "const android::hardware::BpHwRefBase *",
-   "referenced_type" : "type-1374",
-   "self_type" : "type-1375",
+   "referenced_type" : "type-1377",
+   "self_type" : "type-1378",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -27627,8 +27666,8 @@
    "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",
+   "referenced_type" : "type-7674",
+   "self_type" : "type-7676",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27636,24 +27675,6 @@
    "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,
@@ -27661,8 +27682,8 @@
   },
   {
    "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> > *",
+   "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-4498",
    "self_type" : "type-4499",
    "size" : 4,
@@ -27670,10 +27691,28 @@
   },
   {
    "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-4375",
+   "self_type" : "type-4376",
+   "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-4504",
+   "self_type" : "type-4505",
+   "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-4357",
-   "self_type" : "type-4358",
+   "referenced_type" : "type-4363",
+   "self_type" : "type-4364",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27681,8 +27720,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<int> *",
    "name" : "const android::hardware::Return<int> *",
-   "referenced_type" : "type-4698",
-   "self_type" : "type-4700",
+   "referenced_type" : "type-4704",
+   "self_type" : "type-4706",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27690,8 +27729,8 @@
    "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",
+   "referenced_type" : "type-7677",
+   "self_type" : "type-7678",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27753,8 +27792,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-4348",
-   "self_type" : "type-4349",
+   "referenced_type" : "type-4354",
+   "self_type" : "type-4355",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -27780,8 +27819,8 @@
    "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-2460",
-   "self_type" : "type-2461",
+   "referenced_type" : "type-2463",
+   "self_type" : "type-2464",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27807,8 +27846,8 @@
    "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",
+   "referenced_type" : "type-4732",
+   "self_type" : "type-4733",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -27870,8 +27909,8 @@
    "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",
+   "referenced_type" : "type-4386",
+   "self_type" : "type-4387",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -27906,8 +27945,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-2619",
-   "self_type" : "type-2627",
+   "referenced_type" : "type-2622",
+   "self_type" : "type-2630",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27915,8 +27954,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-2617",
-   "self_type" : "type-2626",
+   "referenced_type" : "type-2620",
+   "self_type" : "type-2629",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27924,8 +27963,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-2613",
-   "self_type" : "type-2625",
+   "referenced_type" : "type-2616",
+   "self_type" : "type-2628",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27933,8 +27972,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
    "name" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
-   "referenced_type" : "type-1304",
-   "self_type" : "type-2513",
+   "referenced_type" : "type-1301",
+   "self_type" : "type-2516",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27943,7 +27982,7 @@
    "linker_set_key" : "const android::sp<android::ALooper> *",
    "name" : "const android::sp<android::ALooper> *",
    "referenced_type" : "type-320",
-   "self_type" : "type-2277",
+   "self_type" : "type-2280",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27951,8 +27990,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::AMessage> *",
    "name" : "const android::sp<android::AMessage> *",
-   "referenced_type" : "type-2175",
-   "self_type" : "type-2203",
+   "referenced_type" : "type-2174",
+   "self_type" : "type-2206",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27969,8 +28008,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::ComponentWrapper> *",
    "name" : "const android::sp<android::ComponentWrapper> *",
-   "referenced_type" : "type-2491",
-   "self_type" : "type-2493",
+   "referenced_type" : "type-2494",
+   "self_type" : "type-2496",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27987,8 +28026,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::Fence> *",
    "name" : "const android::sp<android::Fence> *",
-   "referenced_type" : "type-1863",
-   "self_type" : "type-2529",
+   "referenced_type" : "type-1867",
+   "self_type" : "type-2532",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27996,8 +28035,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::FrameDropper> *",
    "name" : "const android::sp<android::FrameDropper> *",
-   "referenced_type" : "type-2506",
-   "self_type" : "type-2507",
+   "referenced_type" : "type-2509",
+   "self_type" : "type-2510",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28005,8 +28044,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::GraphicBuffer> *",
    "name" : "const android::sp<android::GraphicBuffer> *",
-   "referenced_type" : "type-1196",
-   "self_type" : "type-1195",
+   "referenced_type" : "type-1200",
+   "self_type" : "type-1199",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28014,8 +28053,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::GraphicBufferSource> *",
    "name" : "const android::sp<android::GraphicBufferSource> *",
-   "referenced_type" : "type-2544",
-   "self_type" : "type-2545",
+   "referenced_type" : "type-2547",
+   "self_type" : "type-2548",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28023,8 +28062,8 @@
    "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",
+   "referenced_type" : "type-4270",
+   "self_type" : "type-4269",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28032,8 +28071,8 @@
    "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",
+   "referenced_type" : "type-4279",
+   "self_type" : "type-4278",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28041,8 +28080,8 @@
    "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",
+   "referenced_type" : "type-4832",
+   "self_type" : "type-4845",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28050,8 +28089,8 @@
    "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",
+   "referenced_type" : "type-5111",
+   "self_type" : "type-5120",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28059,8 +28098,8 @@
    "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",
+   "referenced_type" : "type-4306",
+   "self_type" : "type-4390",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28068,8 +28107,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IBinder> *",
    "name" : "const android::sp<android::IBinder> *",
-   "referenced_type" : "type-1036",
-   "self_type" : "type-1273",
+   "referenced_type" : "type-1040",
+   "self_type" : "type-1277",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28087,7 +28126,7 @@
    "linker_set_key" : "const android::sp<android::IGraphicBufferConsumer> *",
    "name" : "const android::sp<android::IGraphicBufferConsumer> *",
    "referenced_type" : "type-789",
-   "self_type" : "type-2500",
+   "self_type" : "type-2503",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28095,8 +28134,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer> *",
    "name" : "const android::sp<android::IGraphicBufferProducer> *",
-   "referenced_type" : "type-2485",
-   "self_type" : "type-2487",
+   "referenced_type" : "type-2488",
+   "self_type" : "type-2490",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28104,8 +28143,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IInterface> *",
    "name" : "const android::sp<android::IInterface> *",
-   "referenced_type" : "type-1487",
-   "self_type" : "type-1493",
+   "referenced_type" : "type-1491",
+   "self_type" : "type-1497",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28123,7 +28162,7 @@
    "linker_set_key" : "const android::sp<android::NativeHandle> *",
    "name" : "const android::sp<android::NativeHandle> *",
    "referenced_type" : "type-934",
-   "self_type" : "type-1597",
+   "self_type" : "type-1601",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28131,8 +28170,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-2468",
-   "self_type" : "type-2469",
+   "referenced_type" : "type-2471",
+   "self_type" : "type-2472",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28140,8 +28179,8 @@
    "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-2458",
-   "self_type" : "type-2459",
+   "referenced_type" : "type-2461",
+   "self_type" : "type-2462",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28149,8 +28188,8 @@
    "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",
+   "referenced_type" : "type-4245",
+   "self_type" : "type-4284",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28158,8 +28197,8 @@
    "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",
+   "referenced_type" : "type-4476",
+   "self_type" : "type-4475",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28167,8 +28206,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-2482",
-   "self_type" : "type-2483",
+   "referenced_type" : "type-2485",
+   "self_type" : "type-2486",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28176,8 +28215,8 @@
    "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-2475",
+   "referenced_type" : "type-2477",
+   "self_type" : "type-2478",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28185,8 +28224,8 @@
    "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",
+   "referenced_type" : "type-4239",
+   "self_type" : "type-4282",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28194,8 +28233,8 @@
    "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",
+   "referenced_type" : "type-4469",
+   "self_type" : "type-4468",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28204,7 +28243,7 @@
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient> *",
    "name" : "const android::sp<android::hardware::hidl_death_recipient> *",
    "referenced_type" : "type-513",
-   "self_type" : "type-2442",
+   "self_type" : "type-2445",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28212,8 +28251,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-2446",
-   "self_type" : "type-2447",
+   "referenced_type" : "type-2449",
+   "self_type" : "type-2450",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28221,8 +28260,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "referenced_type" : "type-2451",
-   "self_type" : "type-2453",
+   "referenced_type" : "type-2454",
+   "self_type" : "type-2456",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28257,8 +28296,8 @@
    "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",
+   "referenced_type" : "type-4296",
+   "self_type" : "type-4311",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28275,8 +28314,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-1241",
-   "self_type" : "type-1240",
+   "referenced_type" : "type-1244",
+   "self_type" : "type-1243",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -28302,8 +28341,8 @@
    "alignment" : 4,
    "linker_set_key" : "const log_msg *",
    "name" : "const log_msg *",
-   "referenced_type" : "type-2313",
-   "self_type" : "type-2320",
+   "referenced_type" : "type-2316",
+   "self_type" : "type-2323",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -28312,7 +28351,7 @@
    "linker_set_key" : "const long long *",
    "name" : "const long long *",
    "referenced_type" : "type-560",
-   "self_type" : "type-1068",
+   "self_type" : "type-1071",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28330,7 +28369,7 @@
    "linker_set_key" : "const signed char *",
    "name" : "const signed char *",
    "referenced_type" : "type-437",
-   "self_type" : "type-4723",
+   "self_type" : "type-4730",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28338,8 +28377,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-4759",
-   "self_type" : "type-4761",
+   "referenced_type" : "type-4766",
+   "self_type" : "type-4768",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28347,8 +28386,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-4863",
-   "self_type" : "type-4865",
+   "referenced_type" : "type-4869",
+   "self_type" : "type-4871",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28356,8 +28395,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-5070",
-   "self_type" : "type-5076",
+   "referenced_type" : "type-5086",
+   "self_type" : "type-5092",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28365,8 +28404,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-5123",
-   "self_type" : "type-5125",
+   "referenced_type" : "type-5139",
+   "self_type" : "type-5141",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28374,8 +28413,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-7357",
-   "self_type" : "type-7359",
+   "referenced_type" : "type-7380",
+   "self_type" : "type-7382",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28383,8 +28422,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-7450",
-   "self_type" : "type-7452",
+   "referenced_type" : "type-7475",
+   "self_type" : "type-7477",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28392,8 +28431,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-7578",
-   "self_type" : "type-7580",
+   "referenced_type" : "type-7602",
+   "self_type" : "type-7604",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28438,7 +28477,7 @@
    "linker_set_key" : "float *",
    "name" : "float *",
    "referenced_type" : "type-268",
-   "self_type" : "type-1275",
+   "self_type" : "type-1276",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28456,7 +28495,7 @@
    "linker_set_key" : "int *",
    "name" : "int *",
    "referenced_type" : "type-4",
-   "self_type" : "type-1509",
+   "self_type" : "type-1512",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28464,8 +28503,8 @@
    "alignment" : 4,
    "linker_set_key" : "log_msg *",
    "name" : "log_msg *",
-   "referenced_type" : "type-2177",
-   "self_type" : "type-2342",
+   "referenced_type" : "type-2180",
+   "self_type" : "type-2345",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -28492,7 +28531,7 @@
    "linker_set_key" : "signed char *",
    "name" : "signed char *",
    "referenced_type" : "type-438",
-   "self_type" : "type-4731",
+   "self_type" : "type-4737",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28500,8 +28539,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::tuple<> *",
    "name" : "std::tuple<> *",
-   "referenced_type" : "type-1566",
-   "self_type" : "type-1565",
+   "referenced_type" : "type-1571",
+   "self_type" : "type-1570",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28509,429 +28548,6 @@
    "alignment" : 4,
    "linker_set_key" : "std::tuple<> *",
    "name" : "std::tuple<> *",
-   "referenced_type" : "type-2072",
-   "self_type" : "type-2071",
-   "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-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,
@@ -28939,10 +28555,415 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "std::tuple<unsigned long long> *",
-   "name" : "std::tuple<unsigned long long> *",
-   "referenced_type" : "type-4162",
-   "self_type" : "type-4161",
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-4056",
+   "self_type" : "type-4055",
+   "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-4166",
+   "self_type" : "type-4165",
+   "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-6647",
+   "self_type" : "type-6646",
+   "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-6769",
+   "self_type" : "type-6768",
+   "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-2054",
+   "self_type" : "type-2053",
+   "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-4150",
+   "self_type" : "type-4149",
+   "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-6753",
+   "self_type" : "type-6752",
+   "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-1575",
+   "self_type" : "type-1574",
+   "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-4059",
+   "self_type" : "type-4058",
+   "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-6650",
+   "self_type" : "type-6649",
+   "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-2119",
+   "self_type" : "type-2118",
+   "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-4195",
+   "self_type" : "type-4194",
+   "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-6799",
+   "self_type" : "type-6798",
+   "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-2089",
+   "self_type" : "type-2088",
+   "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-4175",
+   "self_type" : "type-4174",
+   "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-6778",
+   "self_type" : "type-6777",
+   "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-2094",
+   "self_type" : "type-2093",
+   "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-4178",
+   "self_type" : "type-4177",
+   "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-6781",
+   "self_type" : "type-6780",
+   "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-2115",
+   "self_type" : "type-2114",
+   "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-4192",
+   "self_type" : "type-4191",
+   "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-6796",
+   "self_type" : "type-6795",
+   "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-2100",
+   "self_type" : "type-2099",
+   "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-4182",
+   "self_type" : "type-4181",
+   "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-6786",
+   "self_type" : "type-6785",
+   "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-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, sp<GraphicBuffer> > *",
+   "name" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "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<int, sp<GraphicBuffer> > *",
+   "name" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "referenced_type" : "type-6759",
+   "self_type" : "type-6758",
+   "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-2067",
+   "self_type" : "type-2066",
+   "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-4159",
+   "self_type" : "type-4158",
+   "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-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> *",
+   "name" : "std::tuple<int> *",
+   "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> *",
+   "name" : "std::tuple<int> *",
+   "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> *",
+   "name" : "std::tuple<int> *",
+   "referenced_type" : "type-6756",
+   "self_type" : "type-6755",
+   "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-2072",
+   "self_type" : "type-2071",
+   "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-4163",
+   "self_type" : "type-4162",
+   "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-6765",
+   "self_type" : "type-6764",
+   "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-2110",
+   "self_type" : "type-2109",
+   "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-4189",
+   "self_type" : "type-4188",
+   "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-6793",
+   "self_type" : "type-6792",
+   "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-2085",
+   "self_type" : "type-2084",
+   "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-4172",
+   "self_type" : "type-4171",
+   "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-6775",
+   "self_type" : "type-6774",
+   "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-2106",
+   "self_type" : "type-2105",
+   "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-4186",
+   "self_type" : "type-4185",
+   "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-6789",
+   "self_type" : "type-6788",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28950,8 +28971,26 @@
    "alignment" : 4,
    "linker_set_key" : "std::tuple<unsigned long long> *",
    "name" : "std::tuple<unsigned long long> *",
-   "referenced_type" : "type-6748",
-   "self_type" : "type-6747",
+   "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 long long> *",
+   "name" : "std::tuple<unsigned long long> *",
+   "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<unsigned long long> *",
+   "name" : "std::tuple<unsigned long long> *",
+   "referenced_type" : "type-6772",
+   "self_type" : "type-6771",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28959,8 +28998,8 @@
    "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",
+   "referenced_type" : "type-1653",
+   "self_type" : "type-1652",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -28968,8 +29007,8 @@
    "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",
+   "referenced_type" : "type-4117",
+   "self_type" : "type-4116",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -28977,8 +29016,8 @@
    "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",
+   "referenced_type" : "type-6706",
+   "self_type" : "type-6705",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -28987,7 +29026,7 @@
    "linker_set_key" : "unsigned char (*)[128]",
    "name" : "unsigned char (*)[128]",
    "referenced_type" : "type-1527",
-   "self_type" : "type-2360",
+   "self_type" : "type-2363",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -29005,7 +29044,7 @@
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
    "referenced_type" : "type-2",
-   "self_type" : "type-1680",
+   "self_type" : "type-1684",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -29031,8 +29070,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
    "name" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
-   "referenced_type" : "type-1380",
-   "self_type" : "type-1379",
+   "referenced_type" : "type-1383",
+   "self_type" : "type-1382",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -29072,8 +29111,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1078",
-   "self_type" : "type-1080",
+   "referenced_type" : "type-1081",
+   "self_type" : "type-1083",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29082,8 +29121,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1190",
-   "self_type" : "type-1192",
+   "referenced_type" : "type-1193",
+   "self_type" : "type-1196",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29092,8 +29131,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1351",
-   "self_type" : "type-1353",
+   "referenced_type" : "type-1354",
+   "self_type" : "type-1356",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29102,8 +29141,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1403",
-   "self_type" : "type-1405",
+   "referenced_type" : "type-1406",
+   "self_type" : "type-1408",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29112,8 +29151,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1419",
-   "self_type" : "type-1421",
+   "referenced_type" : "type-1422",
+   "self_type" : "type-1424",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29122,8 +29161,8 @@
    "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",
+   "referenced_type" : "type-1443",
+   "self_type" : "type-1445",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29132,8 +29171,8 @@
    "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",
+   "referenced_type" : "type-1485",
+   "self_type" : "type-1487",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29142,8 +29181,8 @@
    "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",
+   "referenced_type" : "type-1619",
+   "self_type" : "type-1622",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29152,8 +29191,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2648",
-   "self_type" : "type-2651",
+   "referenced_type" : "type-2651",
+   "self_type" : "type-2654",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29162,8 +29201,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",
+   "referenced_type" : "type-3461",
+   "self_type" : "type-3463",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29172,8 +29211,8 @@
    "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",
+   "referenced_type" : "type-3527",
+   "self_type" : "type-3529",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29182,8 +29221,8 @@
    "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",
+   "referenced_type" : "type-3629",
+   "self_type" : "type-3631",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29192,8 +29231,8 @@
    "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",
+   "referenced_type" : "type-3694",
+   "self_type" : "type-3696",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29202,8 +29241,8 @@
    "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",
+   "referenced_type" : "type-3786",
+   "self_type" : "type-3788",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29212,8 +29251,8 @@
    "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",
+   "referenced_type" : "type-3847",
+   "self_type" : "type-3846",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29222,8 +29261,8 @@
    "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",
+   "referenced_type" : "type-3911",
+   "self_type" : "type-3913",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29232,8 +29271,8 @@
    "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",
+   "referenced_type" : "type-3937",
+   "self_type" : "type-3939",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29242,8 +29281,8 @@
    "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",
+   "referenced_type" : "type-3953",
+   "self_type" : "type-3955",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29252,8 +29291,8 @@
    "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",
+   "referenced_type" : "type-3978",
+   "self_type" : "type-3980",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29262,8 +29301,8 @@
    "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",
+   "referenced_type" : "type-4011",
+   "self_type" : "type-4013",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29272,8 +29311,8 @@
    "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",
+   "referenced_type" : "type-4092",
+   "self_type" : "type-4094",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29282,8 +29321,8 @@
    "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",
+   "referenced_type" : "type-4292",
+   "self_type" : "type-4294",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29292,8 +29331,8 @@
    "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",
+   "referenced_type" : "type-4479",
+   "self_type" : "type-4481",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29302,8 +29341,8 @@
    "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",
+   "referenced_type" : "type-4532",
+   "self_type" : "type-4534",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29312,8 +29351,8 @@
    "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",
+   "referenced_type" : "type-4541",
+   "self_type" : "type-4543",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29322,8 +29361,8 @@
    "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",
+   "referenced_type" : "type-4566",
+   "self_type" : "type-4568",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29332,8 +29371,8 @@
    "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",
+   "referenced_type" : "type-4717",
+   "self_type" : "type-4720",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29342,8 +29381,8 @@
    "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",
+   "referenced_type" : "type-4847",
+   "self_type" : "type-4849",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29352,8 +29391,8 @@
    "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",
+   "referenced_type" : "type-4996",
+   "self_type" : "type-4998",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29362,8 +29401,8 @@
    "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",
+   "referenced_type" : "type-5121",
+   "self_type" : "type-5123",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29372,8 +29411,8 @@
    "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",
+   "referenced_type" : "type-5160",
+   "self_type" : "type-5162",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29392,8 +29431,8 @@
    "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",
+   "referenced_type" : "type-5536",
+   "self_type" : "type-5538",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29402,8 +29441,8 @@
    "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",
+   "referenced_type" : "type-5602",
+   "self_type" : "type-5604",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29412,8 +29451,8 @@
    "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",
+   "referenced_type" : "type-5704",
+   "self_type" : "type-5706",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29422,8 +29461,8 @@
    "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",
+   "referenced_type" : "type-5769",
+   "self_type" : "type-5771",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29432,8 +29471,8 @@
    "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",
+   "referenced_type" : "type-5861",
+   "self_type" : "type-5863",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29442,8 +29481,8 @@
    "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",
+   "referenced_type" : "type-5922",
+   "self_type" : "type-5921",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29452,8 +29491,8 @@
    "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",
+   "referenced_type" : "type-5984",
+   "self_type" : "type-5986",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29462,8 +29501,8 @@
    "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",
+   "referenced_type" : "type-6044",
+   "self_type" : "type-6046",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29472,8 +29511,8 @@
    "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",
+   "referenced_type" : "type-6140",
+   "self_type" : "type-6142",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29482,8 +29521,8 @@
    "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",
+   "referenced_type" : "type-6192",
+   "self_type" : "type-6194",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29492,8 +29531,8 @@
    "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",
+   "referenced_type" : "type-6281",
+   "self_type" : "type-6283",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29502,8 +29541,8 @@
    "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",
+   "referenced_type" : "type-6333",
+   "self_type" : "type-6335",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29512,8 +29551,8 @@
    "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",
+   "referenced_type" : "type-6413",
+   "self_type" : "type-6415",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29522,8 +29561,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-6483",
-   "self_type" : "type-6485",
+   "referenced_type" : "type-6506",
+   "self_type" : "type-6508",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29532,8 +29571,8 @@
    "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",
+   "referenced_type" : "type-6532",
+   "self_type" : "type-6534",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29542,8 +29581,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",
+   "referenced_type" : "type-6549",
+   "self_type" : "type-6551",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29552,8 +29591,8 @@
    "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",
+   "referenced_type" : "type-6570",
+   "self_type" : "type-6572",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29562,8 +29601,8 @@
    "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",
+   "referenced_type" : "type-6602",
+   "self_type" : "type-6604",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29572,8 +29611,8 @@
    "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",
+   "referenced_type" : "type-6682",
+   "self_type" : "type-6684",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29582,8 +29621,8 @@
    "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",
+   "referenced_type" : "type-6899",
+   "self_type" : "type-6901",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29592,8 +29631,8 @@
    "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",
+   "referenced_type" : "type-7084",
+   "self_type" : "type-7086",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29602,8 +29641,8 @@
    "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",
+   "referenced_type" : "type-7146",
+   "self_type" : "type-7149",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29612,8 +29651,8 @@
    "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",
+   "referenced_type" : "type-7161",
+   "self_type" : "type-7164",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29622,8 +29661,8 @@
    "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",
+   "referenced_type" : "type-7197",
+   "self_type" : "type-7199",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29632,8 +29671,8 @@
    "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",
+   "referenced_type" : "type-7347",
+   "self_type" : "type-7349",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29652,8 +29691,8 @@
    "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",
+   "referenced_type" : "type-7448",
+   "self_type" : "type-7450",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29662,8 +29701,8 @@
    "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",
+   "referenced_type" : "type-7485",
+   "self_type" : "type-7487",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29672,8 +29711,8 @@
    "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",
+   "referenced_type" : "type-7539",
+   "self_type" : "type-7541",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29682,8 +29721,8 @@
    "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",
+   "referenced_type" : "type-7591",
+   "self_type" : "type-7601",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29692,8 +29731,8 @@
    "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",
+   "referenced_type" : "type-7619",
+   "self_type" : "type-7621",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29702,8 +29741,8 @@
    "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",
+   "referenced_type" : "type-7681",
+   "self_type" : "type-7683",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29732,8 +29771,8 @@
    "is_const" : true,
    "linker_set_key" : "android::hardware::IBinder *const",
    "name" : "android::hardware::IBinder *const",
-   "referenced_type" : "type-1358",
-   "self_type" : "type-1372",
+   "referenced_type" : "type-1361",
+   "self_type" : "type-1375",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -29743,7 +29782,7 @@
    "linker_set_key" : "const android::AHandler",
    "name" : "const android::AHandler",
    "referenced_type" : "type-264",
-   "self_type" : "type-2518",
+   "self_type" : "type-2521",
    "size" : 48,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29753,7 +29792,7 @@
    "linker_set_key" : "const android::AHandlerReflector<android::GraphicBufferSource>",
    "name" : "const android::AHandlerReflector<android::GraphicBufferSource>",
    "referenced_type" : "type-583",
-   "self_type" : "type-2514",
+   "self_type" : "type-2517",
    "size" : 56,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29763,7 +29802,7 @@
    "linker_set_key" : "const android::ALooper",
    "name" : "const android::ALooper",
    "referenced_type" : "type-248",
-   "self_type" : "type-2289",
+   "self_type" : "type-2292",
    "size" : 52,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29772,8 +29811,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AReplyToken",
    "name" : "const android::AReplyToken",
-   "referenced_type" : "type-1044",
-   "self_type" : "type-1167",
+   "referenced_type" : "type-1043",
+   "self_type" : "type-1168",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -29783,7 +29822,7 @@
    "linker_set_key" : "const android::AString",
    "name" : "const android::AString",
    "referenced_type" : "type-253",
-   "self_type" : "type-2110",
+   "self_type" : "type-2101",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -29813,7 +29852,7 @@
    "linker_set_key" : "const android::BnInterface<android::IGraphicBufferProducer>",
    "name" : "const android::BnInterface<android::IGraphicBufferProducer>",
    "referenced_type" : "type-71",
-   "self_type" : "type-1232",
+   "self_type" : "type-1236",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -29823,7 +29862,7 @@
    "linker_set_key" : "const android::BnInterface<android::IProducerListener>",
    "name" : "const android::BnInterface<android::IProducerListener>",
    "referenced_type" : "type-80",
-   "self_type" : "type-4477",
+   "self_type" : "type-4483",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -29832,8 +29871,8 @@
    "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",
+   "referenced_type" : "type-1034",
+   "self_type" : "type-1096",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -29852,8 +29891,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-1070",
-   "self_type" : "type-1069",
+   "referenced_type" : "type-1073",
+   "self_type" : "type-1072",
    "size" : 164,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -29862,8 +29901,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-1220",
-   "self_type" : "type-1219",
+   "referenced_type" : "type-1224",
+   "self_type" : "type-1223",
    "size" : 164,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -29872,8 +29911,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-1531",
-   "self_type" : "type-1530",
+   "referenced_type" : "type-1534",
+   "self_type" : "type-1533",
    "size" : 164,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -29882,8 +29921,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-1672",
-   "self_type" : "type-1671",
+   "referenced_type" : "type-1676",
+   "self_type" : "type-1675",
    "size" : 164,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -29892,8 +29931,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-3442",
-   "self_type" : "type-3441",
+   "referenced_type" : "type-3445",
+   "self_type" : "type-3444",
    "size" : 164,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -29902,8 +29941,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-3634",
-   "self_type" : "type-3633",
+   "referenced_type" : "type-3637",
+   "self_type" : "type-3636",
    "size" : 164,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -29912,8 +29951,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-3683",
-   "self_type" : "type-3682",
+   "referenced_type" : "type-3689",
+   "self_type" : "type-3688",
    "size" : 164,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -29922,8 +29961,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-3792",
-   "self_type" : "type-3791",
+   "referenced_type" : "type-3799",
+   "self_type" : "type-3798",
    "size" : 164,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -29932,8 +29971,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-4041",
-   "self_type" : "type-4040",
+   "referenced_type" : "type-4048",
+   "self_type" : "type-4047",
    "size" : 164,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -29942,8 +29981,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-4127",
-   "self_type" : "type-4126",
+   "referenced_type" : "type-4133",
+   "self_type" : "type-4132",
    "size" : 164,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -29952,8 +29991,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-5503",
-   "self_type" : "type-5502",
+   "referenced_type" : "type-5520",
+   "self_type" : "type-5519",
    "size" : 164,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -29962,8 +30001,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-5695",
-   "self_type" : "type-5694",
+   "referenced_type" : "type-5712",
+   "self_type" : "type-5711",
    "size" : 164,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -29972,8 +30011,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-5744",
-   "self_type" : "type-5743",
+   "referenced_type" : "type-5764",
+   "self_type" : "type-5763",
    "size" : 164,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -29982,8 +30021,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-5853",
-   "self_type" : "type-5852",
+   "referenced_type" : "type-5874",
+   "self_type" : "type-5873",
    "size" : 164,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -29992,8 +30031,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-6107",
-   "self_type" : "type-6106",
+   "referenced_type" : "type-6127",
+   "self_type" : "type-6126",
    "size" : 164,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -30002,8 +30041,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-6266",
-   "self_type" : "type-6265",
+   "referenced_type" : "type-6286",
+   "self_type" : "type-6285",
    "size" : 164,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30012,8 +30051,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-6308",
-   "self_type" : "type-6307",
+   "referenced_type" : "type-6331",
+   "self_type" : "type-6330",
    "size" : 164,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -30022,8 +30061,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-6399",
-   "self_type" : "type-6398",
+   "referenced_type" : "type-6422",
+   "self_type" : "type-6421",
    "size" : 164,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30032,8 +30071,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-6617",
-   "self_type" : "type-6616",
+   "referenced_type" : "type-6640",
+   "self_type" : "type-6639",
    "size" : 164,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -30042,8 +30081,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-6699",
-   "self_type" : "type-6698",
+   "referenced_type" : "type-6722",
+   "self_type" : "type-6721",
    "size" : 164,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -30072,9 +30111,9 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferQueueCore",
    "name" : "const android::BufferQueueCore",
-   "referenced_type" : "type-3522",
-   "self_type" : "type-3521",
-   "size" : 3392,
+   "referenced_type" : "type-3525",
+   "self_type" : "type-3524",
+   "size" : 3396,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -30082,9 +30121,9 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferQueueCore",
    "name" : "const android::BufferQueueCore",
-   "referenced_type" : "type-5583",
-   "self_type" : "type-5582",
-   "size" : 3392,
+   "referenced_type" : "type-5600",
+   "self_type" : "type-5599",
+   "size" : 3396,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -30092,9 +30131,9 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferQueueCore",
    "name" : "const android::BufferQueueCore",
-   "referenced_type" : "type-6169",
-   "self_type" : "type-6168",
-   "size" : 3392,
+   "referenced_type" : "type-6189",
+   "self_type" : "type-6188",
+   "size" : 3396,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -30104,7 +30143,7 @@
    "name" : "const android::BufferQueueCore",
    "referenced_type" : "type-832",
    "self_type" : "type-831",
-   "size" : 3392,
+   "size" : 3396,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -30113,7 +30152,7 @@
    "linker_set_key" : "const android::ComponentWrapper",
    "name" : "const android::ComponentWrapper",
    "referenced_type" : "type-569",
-   "self_type" : "type-2494",
+   "self_type" : "type-2497",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30122,8 +30161,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::CompositorTiming",
    "name" : "const android::CompositorTiming",
-   "referenced_type" : "type-1425",
-   "self_type" : "type-1424",
+   "referenced_type" : "type-1428",
+   "self_type" : "type-1427",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30132,8 +30171,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::CompositorTiming",
    "name" : "const android::CompositorTiming",
-   "referenced_type" : "type-3953",
-   "self_type" : "type-3952",
+   "referenced_type" : "type-3961",
+   "self_type" : "type-3960",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30142,8 +30181,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::CompositorTiming",
    "name" : "const android::CompositorTiming",
-   "referenced_type" : "type-6532",
-   "self_type" : "type-6531",
+   "referenced_type" : "type-6555",
+   "self_type" : "type-6554",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30152,8 +30191,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ConsumerListener",
    "name" : "const android::ConsumerListener",
-   "referenced_type" : "type-3514",
-   "self_type" : "type-3513",
+   "referenced_type" : "type-3517",
+   "self_type" : "type-3516",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30162,8 +30201,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ConsumerListener",
    "name" : "const android::ConsumerListener",
-   "referenced_type" : "type-5575",
-   "self_type" : "type-5574",
+   "referenced_type" : "type-5592",
+   "self_type" : "type-5591",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30172,8 +30211,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ConsumerListener",
    "name" : "const android::ConsumerListener",
-   "referenced_type" : "type-6164",
-   "self_type" : "type-6163",
+   "referenced_type" : "type-6184",
+   "self_type" : "type-6183",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30192,8 +30231,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-1310",
-   "self_type" : "type-1309",
+   "referenced_type" : "type-1313",
+   "self_type" : "type-1312",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30202,8 +30241,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-2531",
-   "self_type" : "type-2530",
+   "referenced_type" : "type-2534",
+   "self_type" : "type-2533",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30212,8 +30251,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-3449",
-   "self_type" : "type-3448",
+   "referenced_type" : "type-3452",
+   "self_type" : "type-3451",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30222,8 +30261,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-3594",
-   "self_type" : "type-3593",
+   "referenced_type" : "type-3597",
+   "self_type" : "type-3596",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30232,8 +30271,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-3860",
-   "self_type" : "type-3859",
+   "referenced_type" : "type-3866",
+   "self_type" : "type-3865",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30242,8 +30281,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-4423",
-   "self_type" : "type-4422",
+   "referenced_type" : "type-4429",
+   "self_type" : "type-4428",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30252,8 +30291,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-4673",
-   "self_type" : "type-4672",
+   "referenced_type" : "type-4680",
+   "self_type" : "type-4679",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30262,8 +30301,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-4942",
-   "self_type" : "type-4941",
+   "referenced_type" : "type-4948",
+   "self_type" : "type-4947",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30272,8 +30311,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-5510",
-   "self_type" : "type-5509",
+   "referenced_type" : "type-5527",
+   "self_type" : "type-5526",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30282,8 +30321,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-5655",
-   "self_type" : "type-5654",
+   "referenced_type" : "type-5672",
+   "self_type" : "type-5671",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30292,8 +30331,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-5921",
-   "self_type" : "type-5920",
+   "referenced_type" : "type-5941",
+   "self_type" : "type-5940",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30302,8 +30341,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-6001",
-   "self_type" : "type-6000",
+   "referenced_type" : "type-6021",
+   "self_type" : "type-6020",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30312,8 +30351,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-6112",
-   "self_type" : "type-6111",
+   "referenced_type" : "type-6133",
+   "self_type" : "type-6132",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30322,8 +30361,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-6240",
-   "self_type" : "type-6239",
+   "referenced_type" : "type-6260",
+   "self_type" : "type-6259",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30332,8 +30371,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-6441",
-   "self_type" : "type-6440",
+   "referenced_type" : "type-6464",
+   "self_type" : "type-6463",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30342,8 +30381,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-7013",
-   "self_type" : "type-7012",
+   "referenced_type" : "type-7037",
+   "self_type" : "type-7036",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30352,8 +30391,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-7190",
-   "self_type" : "type-7189",
+   "referenced_type" : "type-7213",
+   "self_type" : "type-7212",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30372,8 +30411,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-7300",
-   "self_type" : "type-7299",
+   "referenced_type" : "type-7323",
+   "self_type" : "type-7322",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30392,8 +30431,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot::State",
    "name" : "const android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-4580",
-   "self_type" : "type-4579",
+   "referenced_type" : "type-4586",
+   "self_type" : "type-4585",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30402,8 +30441,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot::State",
    "name" : "const android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-4748",
-   "self_type" : "type-4747",
+   "referenced_type" : "type-4755",
+   "self_type" : "type-4754",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30412,8 +30451,8 @@
    "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",
+   "referenced_type" : "type-7226",
+   "self_type" : "type-7225",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30422,8 +30461,8 @@
    "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",
+   "referenced_type" : "type-7372",
+   "self_type" : "type-7371",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30432,7 +30471,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::FileDescriptor::Autoclose",
    "name" : "const android::FileDescriptor::Autoclose",
-   "referenced_type" : "type-1204",
+   "referenced_type" : "type-1203",
    "self_type" : "type-1221",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h"
@@ -30443,7 +30482,7 @@
    "linker_set_key" : "const android::Flattenable<android::BufferItem>",
    "name" : "const android::Flattenable<android::BufferItem>",
    "referenced_type" : "type-21",
-   "self_type" : "type-1506",
+   "self_type" : "type-1509",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30453,7 +30492,7 @@
    "linker_set_key" : "const android::Flattenable<android::Fence>",
    "name" : "const android::Flattenable<android::Fence>",
    "referenced_type" : "type-16",
-   "self_type" : "type-1634",
+   "self_type" : "type-1638",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30463,7 +30502,7 @@
    "linker_set_key" : "const android::Flattenable<android::FrameEventHistoryDelta>",
    "name" : "const android::Flattenable<android::FrameEventHistoryDelta>",
    "referenced_type" : "type-25",
-   "self_type" : "type-4306",
+   "self_type" : "type-4312",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30473,7 +30512,7 @@
    "linker_set_key" : "const android::Flattenable<android::GraphicBuffer>",
    "name" : "const android::Flattenable<android::GraphicBuffer>",
    "referenced_type" : "type-14",
-   "self_type" : "type-1638",
+   "self_type" : "type-1643",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30483,7 +30522,7 @@
    "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
    "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
    "referenced_type" : "type-32",
-   "self_type" : "type-4309",
+   "self_type" : "type-4315",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30493,7 +30532,7 @@
    "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
    "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
    "referenced_type" : "type-34",
-   "self_type" : "type-4312",
+   "self_type" : "type-4318",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30503,7 +30542,7 @@
    "linker_set_key" : "const android::FrameDropper",
    "name" : "const android::FrameDropper",
    "referenced_type" : "type-580",
-   "self_type" : "type-2508",
+   "self_type" : "type-2511",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30512,8 +30551,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-1347",
-   "self_type" : "type-1346",
+   "referenced_type" : "type-1350",
+   "self_type" : "type-1349",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30522,8 +30561,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-1462",
-   "self_type" : "type-1461",
+   "referenced_type" : "type-1466",
+   "self_type" : "type-1465",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30532,8 +30571,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-2404",
-   "self_type" : "type-2403",
+   "referenced_type" : "type-2407",
+   "self_type" : "type-2406",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30542,8 +30581,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-3455",
-   "self_type" : "type-3454",
+   "referenced_type" : "type-3458",
+   "self_type" : "type-3457",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30552,8 +30591,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-3599",
-   "self_type" : "type-3598",
+   "referenced_type" : "type-3602",
+   "self_type" : "type-3601",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30562,8 +30601,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-3899",
-   "self_type" : "type-3898",
+   "referenced_type" : "type-3905",
+   "self_type" : "type-3904",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30572,8 +30611,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-3992",
-   "self_type" : "type-3991",
+   "referenced_type" : "type-3998",
+   "self_type" : "type-3997",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30582,8 +30621,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-4219",
-   "self_type" : "type-4218",
+   "referenced_type" : "type-4225",
+   "self_type" : "type-4224",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30592,8 +30631,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-4839",
-   "self_type" : "type-4838",
+   "referenced_type" : "type-4841",
+   "self_type" : "type-4840",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30602,8 +30641,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-5516",
-   "self_type" : "type-5515",
+   "referenced_type" : "type-5533",
+   "self_type" : "type-5532",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30612,8 +30651,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-5660",
-   "self_type" : "type-5659",
+   "referenced_type" : "type-5677",
+   "self_type" : "type-5676",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30622,8 +30661,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-5960",
-   "self_type" : "type-5959",
+   "referenced_type" : "type-5980",
+   "self_type" : "type-5979",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30632,8 +30671,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-5977",
-   "self_type" : "type-5976",
+   "referenced_type" : "type-5997",
+   "self_type" : "type-5996",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30642,8 +30681,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-6118",
-   "self_type" : "type-6117",
+   "referenced_type" : "type-6138",
+   "self_type" : "type-6137",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30652,8 +30691,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-6245",
-   "self_type" : "type-6244",
+   "referenced_type" : "type-6265",
+   "self_type" : "type-6264",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30662,8 +30701,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-6478",
-   "self_type" : "type-6477",
+   "referenced_type" : "type-6501",
+   "self_type" : "type-6500",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30672,8 +30711,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-6566",
-   "self_type" : "type-6565",
+   "referenced_type" : "type-6589",
+   "self_type" : "type-6588",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30682,8 +30721,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-6810",
-   "self_type" : "type-6809",
+   "referenced_type" : "type-6833",
+   "self_type" : "type-6832",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30692,8 +30731,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-6821",
-   "self_type" : "type-6820",
+   "referenced_type" : "type-6844",
+   "self_type" : "type-6843",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30723,7 +30762,7 @@
    "linker_set_key" : "const android::GraphicBufferSource",
    "name" : "const android::GraphicBufferSource",
    "referenced_type" : "type-566",
-   "self_type" : "type-2546",
+   "self_type" : "type-2549",
    "size" : 268,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30753,7 +30792,7 @@
    "linker_set_key" : "const android::IBinder",
    "name" : "const android::IBinder",
    "referenced_type" : "type-51",
-   "self_type" : "type-1520",
+   "self_type" : "type-1524",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30763,7 +30802,7 @@
    "linker_set_key" : "const android::IBinder::DeathRecipient",
    "name" : "const android::IBinder::DeathRecipient",
    "referenced_type" : "type-174",
-   "self_type" : "type-4315",
+   "self_type" : "type-4321",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -30772,8 +30811,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-1156",
-   "self_type" : "type-1155",
+   "referenced_type" : "type-1159",
+   "self_type" : "type-1158",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30782,8 +30821,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-1581",
-   "self_type" : "type-1580",
+   "referenced_type" : "type-1585",
+   "self_type" : "type-1584",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30792,8 +30831,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-3612",
-   "self_type" : "type-3611",
+   "referenced_type" : "type-3615",
+   "self_type" : "type-3614",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30802,8 +30841,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-3761",
-   "self_type" : "type-3760",
+   "referenced_type" : "type-3767",
+   "self_type" : "type-3766",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30812,8 +30851,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-4061",
-   "self_type" : "type-4060",
+   "referenced_type" : "type-4067",
+   "self_type" : "type-4066",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30822,8 +30861,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-5673",
-   "self_type" : "type-5672",
+   "referenced_type" : "type-5690",
+   "self_type" : "type-5689",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30832,8 +30871,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-5822",
-   "self_type" : "type-5821",
+   "referenced_type" : "type-5842",
+   "self_type" : "type-5841",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30842,8 +30881,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-6251",
-   "self_type" : "type-6250",
+   "referenced_type" : "type-6271",
+   "self_type" : "type-6270",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30852,8 +30891,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-6375",
-   "self_type" : "type-6374",
+   "referenced_type" : "type-6398",
+   "self_type" : "type-6397",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30862,8 +30901,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-6634",
-   "self_type" : "type-6633",
+   "referenced_type" : "type-6657",
+   "self_type" : "type-6656",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30882,8 +30921,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-1605",
-   "self_type" : "type-1604",
+   "referenced_type" : "type-1609",
+   "self_type" : "type-1608",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30892,8 +30931,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-2502",
-   "self_type" : "type-2501",
+   "referenced_type" : "type-2505",
+   "self_type" : "type-2504",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30902,8 +30941,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-3495",
-   "self_type" : "type-3494",
+   "referenced_type" : "type-3498",
+   "self_type" : "type-3497",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30912,8 +30951,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-4078",
-   "self_type" : "type-4077",
+   "referenced_type" : "type-4084",
+   "self_type" : "type-4083",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30922,8 +30961,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-4915",
-   "self_type" : "type-4914",
+   "referenced_type" : "type-4921",
+   "self_type" : "type-4920",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30932,8 +30971,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-5556",
-   "self_type" : "type-5555",
+   "referenced_type" : "type-5573",
+   "self_type" : "type-5572",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30942,8 +30981,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-5994",
-   "self_type" : "type-5993",
+   "referenced_type" : "type-6014",
+   "self_type" : "type-6013",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30952,8 +30991,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-6150",
-   "self_type" : "type-6149",
+   "referenced_type" : "type-6170",
+   "self_type" : "type-6169",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30962,8 +31001,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-6649",
-   "self_type" : "type-6648",
+   "referenced_type" : "type-6672",
+   "self_type" : "type-6671",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30972,8 +31011,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-7135",
-   "self_type" : "type-7134",
+   "referenced_type" : "type-7158",
+   "self_type" : "type-7157",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30992,8 +31031,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferProducer",
    "name" : "const android::IGraphicBufferProducer",
-   "referenced_type" : "type-3505",
-   "self_type" : "type-3504",
+   "referenced_type" : "type-3508",
+   "self_type" : "type-3507",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31002,8 +31041,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferProducer",
    "name" : "const android::IGraphicBufferProducer",
-   "referenced_type" : "type-4248",
-   "self_type" : "type-4247",
+   "referenced_type" : "type-4254",
+   "self_type" : "type-4253",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31012,8 +31051,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferProducer",
    "name" : "const android::IGraphicBufferProducer",
-   "referenced_type" : "type-5566",
-   "self_type" : "type-5565",
+   "referenced_type" : "type-5583",
+   "self_type" : "type-5582",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31022,8 +31061,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferProducer",
    "name" : "const android::IGraphicBufferProducer",
-   "referenced_type" : "type-6159",
-   "self_type" : "type-6158",
+   "referenced_type" : "type-6179",
+   "self_type" : "type-6178",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31032,8 +31071,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferProducer",
    "name" : "const android::IGraphicBufferProducer",
-   "referenced_type" : "type-6844",
-   "self_type" : "type-6843",
+   "referenced_type" : "type-6867",
+   "self_type" : "type-6866",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31052,8 +31091,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-1161",
-   "self_type" : "type-1160",
+   "referenced_type" : "type-1032",
+   "self_type" : "type-1031",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31062,8 +31101,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-3624",
-   "self_type" : "type-3623",
+   "referenced_type" : "type-1164",
+   "self_type" : "type-1163",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31072,8 +31111,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-3766",
-   "self_type" : "type-3765",
+   "referenced_type" : "type-3627",
+   "self_type" : "type-3626",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31082,8 +31121,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-4254",
-   "self_type" : "type-4253",
+   "referenced_type" : "type-3671",
+   "self_type" : "type-3670",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31092,8 +31131,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-4450",
-   "self_type" : "type-4449",
+   "referenced_type" : "type-3772",
+   "self_type" : "type-3771",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31102,8 +31141,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-4690",
-   "self_type" : "type-4689",
+   "referenced_type" : "type-4260",
+   "self_type" : "type-4259",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31112,8 +31151,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-5685",
-   "self_type" : "type-5684",
+   "referenced_type" : "type-4456",
+   "self_type" : "type-4455",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31122,8 +31161,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-5827",
-   "self_type" : "type-5826",
+   "referenced_type" : "type-4697",
+   "self_type" : "type-4696",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31132,8 +31171,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-6258",
-   "self_type" : "type-6257",
+   "referenced_type" : "type-5702",
+   "self_type" : "type-5701",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31142,8 +31181,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-6380",
-   "self_type" : "type-6379",
+   "referenced_type" : "type-5746",
+   "self_type" : "type-5745",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31152,8 +31191,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-6850",
-   "self_type" : "type-6849",
+   "referenced_type" : "type-5847",
+   "self_type" : "type-5846",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31162,8 +31201,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-7043",
-   "self_type" : "type-7042",
+   "referenced_type" : "type-6278",
+   "self_type" : "type-6277",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31172,8 +31211,48 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-7313",
-   "self_type" : "type-7312",
+   "referenced_type" : "type-6322",
+   "self_type" : "type-6321",
+   "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-6403",
+   "self_type" : "type-6402",
+   "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-6873",
+   "self_type" : "type-6872",
+   "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-7067",
+   "self_type" : "type-7066",
+   "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-7336",
+   "self_type" : "type-7335",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31213,7 +31292,7 @@
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect>",
    "name" : "const android::LightFlattenablePod<android::Rect>",
    "referenced_type" : "type-46",
-   "self_type" : "type-4587",
+   "self_type" : "type-4593",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -31232,8 +31311,8 @@
    "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",
+   "referenced_type" : "type-1214",
+   "self_type" : "type-1233",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -31243,7 +31322,7 @@
    "linker_set_key" : "const android::LightRefBase<android::NativeHandle>",
    "name" : "const android::LightRefBase<android::NativeHandle>",
    "referenced_type" : "type-521",
-   "self_type" : "type-2663",
+   "self_type" : "type-2666",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -31392,8 +31471,8 @@
    "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",
+   "referenced_type" : "type-1520",
+   "self_type" : "type-1523",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -31402,8 +31481,8 @@
    "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",
+   "referenced_type" : "type-1662",
+   "self_type" : "type-1666",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -31412,8 +31491,8 @@
    "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",
+   "referenced_type" : "type-4334",
+   "self_type" : "type-4337",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -31422,8 +31501,8 @@
    "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",
+   "referenced_type" : "type-1657",
+   "self_type" : "type-1660",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -31432,8 +31511,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-4333",
-   "self_type" : "type-4336",
+   "referenced_type" : "type-4339",
+   "self_type" : "type-4343",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -31442,8 +31521,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-4338",
-   "self_type" : "type-4341",
+   "referenced_type" : "type-4345",
+   "self_type" : "type-4348",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -31472,8 +31551,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-1216",
-   "self_type" : "type-1215",
+   "referenced_type" : "type-1219",
+   "self_type" : "type-1218",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31482,8 +31561,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-1491",
-   "self_type" : "type-1490",
+   "referenced_type" : "type-1494",
+   "self_type" : "type-1493",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31492,8 +31571,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-1622",
-   "self_type" : "type-1621",
+   "referenced_type" : "type-1625",
+   "self_type" : "type-1624",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31502,8 +31581,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-2684",
-   "self_type" : "type-2683",
+   "referenced_type" : "type-2687",
+   "self_type" : "type-2686",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31512,8 +31591,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-3467",
-   "self_type" : "type-3466",
+   "referenced_type" : "type-3470",
+   "self_type" : "type-3469",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -31522,8 +31601,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-3788",
-   "self_type" : "type-3787",
+   "referenced_type" : "type-3794",
+   "self_type" : "type-3793",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31532,8 +31611,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4012",
-   "self_type" : "type-4011",
+   "referenced_type" : "type-4018",
+   "self_type" : "type-4017",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31542,8 +31621,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4091",
-   "self_type" : "type-4090",
+   "referenced_type" : "type-4097",
+   "self_type" : "type-4096",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31552,8 +31631,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4293",
-   "self_type" : "type-4292",
+   "referenced_type" : "type-4299",
+   "self_type" : "type-4298",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31562,8 +31641,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4573",
-   "self_type" : "type-4572",
+   "referenced_type" : "type-4579",
+   "self_type" : "type-4578",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31572,8 +31651,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4737",
-   "self_type" : "type-4736",
+   "referenced_type" : "type-4744",
+   "self_type" : "type-4743",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31582,8 +31661,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-5020",
-   "self_type" : "type-5019",
+   "referenced_type" : "type-5026",
+   "self_type" : "type-5025",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31592,8 +31671,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-5064",
-   "self_type" : "type-5063",
+   "referenced_type" : "type-5081",
+   "self_type" : "type-5080",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31602,8 +31681,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-5528",
-   "self_type" : "type-5527",
+   "referenced_type" : "type-5545",
+   "self_type" : "type-5544",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -31612,8 +31691,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-5849",
-   "self_type" : "type-5848",
+   "referenced_type" : "type-5869",
+   "self_type" : "type-5868",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31622,8 +31701,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-6031",
-   "self_type" : "type-6030",
+   "referenced_type" : "type-6051",
+   "self_type" : "type-6050",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31632,8 +31711,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-6130",
-   "self_type" : "type-6129",
+   "referenced_type" : "type-6150",
+   "self_type" : "type-6149",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -31642,8 +31721,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-6395",
-   "self_type" : "type-6394",
+   "referenced_type" : "type-6418",
+   "self_type" : "type-6417",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31652,8 +31731,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-6585",
-   "self_type" : "type-6584",
+   "referenced_type" : "type-6609",
+   "self_type" : "type-6608",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31662,8 +31741,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-6664",
-   "self_type" : "type-6663",
+   "referenced_type" : "type-6687",
+   "self_type" : "type-6686",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31672,8 +31751,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-6882",
-   "self_type" : "type-6881",
+   "referenced_type" : "type-6906",
+   "self_type" : "type-6905",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31682,8 +31761,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-7193",
-   "self_type" : "type-7192",
+   "referenced_type" : "type-7217",
+   "self_type" : "type-7216",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31692,8 +31771,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-7340",
-   "self_type" : "type-7339",
+   "referenced_type" : "type-7363",
+   "self_type" : "type-7362",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31702,8 +31781,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-7566",
-   "self_type" : "type-7565",
+   "referenced_type" : "type-7589",
+   "self_type" : "type-7588",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31722,8 +31801,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-7667",
-   "self_type" : "type-7666",
+   "referenced_type" : "type-7686",
+   "self_type" : "type-7685",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31733,7 +31812,7 @@
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
    "referenced_type" : "type-52",
-   "self_type" : "type-1449",
+   "self_type" : "type-1452",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -31742,8 +31821,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SafeBpInterface<android::IConsumerListener>",
    "name" : "const android::SafeBpInterface<android::IConsumerListener>",
-   "referenced_type" : "type-1537",
-   "self_type" : "type-1551",
+   "referenced_type" : "type-1541",
+   "self_type" : "type-1554",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -31752,8 +31831,8 @@
    "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",
+   "referenced_type" : "type-1720",
+   "self_type" : "type-1890",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -31762,8 +31841,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SafeInterface::ParcelHandler",
    "name" : "const android::SafeInterface::ParcelHandler",
-   "referenced_type" : "type-1235",
-   "self_type" : "type-1256",
+   "referenced_type" : "type-1238",
+   "self_type" : "type-1254",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -31773,7 +31852,7 @@
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
    "name" : "const android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
    "referenced_type" : "type-159",
-   "self_type" : "type-2675",
+   "self_type" : "type-2678",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -31783,7 +31862,7 @@
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "const android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "referenced_type" : "type-146",
-   "self_type" : "type-2671",
+   "self_type" : "type-2674",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -31793,7 +31872,7 @@
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "const android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
    "referenced_type" : "type-139",
-   "self_type" : "type-2667",
+   "self_type" : "type-2670",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -31802,8 +31881,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-1239",
-   "self_type" : "type-1248",
+   "referenced_type" : "type-1242",
+   "self_type" : "type-1251",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -31813,7 +31892,7 @@
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
    "referenced_type" : "type-121",
-   "self_type" : "type-1875",
+   "self_type" : "type-1879",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -31823,7 +31902,7 @@
    "linker_set_key" : "const android::Vector<android::BufferItem>",
    "name" : "const android::Vector<android::BufferItem>",
    "referenced_type" : "type-837",
-   "self_type" : "type-977",
+   "self_type" : "type-979",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31832,8 +31911,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<android::Rect>",
    "name" : "const android::Vector<android::Rect>",
-   "referenced_type" : "type-2677",
-   "self_type" : "type-2679",
+   "referenced_type" : "type-2680",
+   "self_type" : "type-2682",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31842,8 +31921,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",
+   "referenced_type" : "type-1228",
+   "self_type" : "type-1231",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31852,8 +31931,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<int>",
    "name" : "const android::Vector<int>",
-   "referenced_type" : "type-2686",
-   "self_type" : "type-2688",
+   "referenced_type" : "type-2689",
+   "self_type" : "type-2691",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31862,8 +31941,8 @@
    "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",
+   "referenced_type" : "type-1084",
+   "self_type" : "type-1086",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31873,7 +31952,7 @@
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
    "referenced_type" : "type-141",
-   "self_type" : "type-2664",
+   "self_type" : "type-2667",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -31882,8 +31961,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::base::ErrnoRestorer",
    "name" : "const android::base::ErrnoRestorer",
-   "referenced_type" : "type-4656",
-   "self_type" : "type-4655",
+   "referenced_type" : "type-4663",
+   "self_type" : "type-4662",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -31892,8 +31971,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
-   "referenced_type" : "type-2553",
-   "self_type" : "type-2580",
+   "referenced_type" : "type-2556",
+   "self_type" : "type-2583",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -31912,8 +31991,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::BpHwRefBase",
    "name" : "const android::hardware::BpHwRefBase",
-   "referenced_type" : "type-1371",
-   "self_type" : "type-1374",
+   "referenced_type" : "type-1374",
+   "self_type" : "type-1377",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -31922,8 +32001,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1377",
-   "self_type" : "type-1385",
+   "referenced_type" : "type-1380",
+   "self_type" : "type-1388",
    "size" : 68,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -31932,8 +32011,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-7504",
-   "self_type" : "type-7651",
+   "referenced_type" : "type-7528",
+   "self_type" : "type-7674",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -31942,26 +32021,6 @@
    "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,
@@ -31970,8 +32029,8 @@
   {
    "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> >",
+   "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-4494",
    "self_type" : "type-4498",
    "size" : 28,
@@ -31980,10 +32039,30 @@
   {
    "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-4371",
+   "self_type" : "type-4375",
+   "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-4500",
+   "self_type" : "type-4504",
+   "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-4353",
-   "self_type" : "type-4357",
+   "referenced_type" : "type-4359",
+   "self_type" : "type-4363",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -31993,7 +32072,7 @@
    "linker_set_key" : "const android::hardware::Return<int>",
    "name" : "const android::hardware::Return<int>",
    "referenced_type" : "type-413",
-   "self_type" : "type-4698",
+   "self_type" : "type-4704",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32002,8 +32081,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-7508",
-   "self_type" : "type-7653",
+   "referenced_type" : "type-7534",
+   "self_type" : "type-7677",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32073,7 +32152,7 @@
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned char>",
    "name" : "const android::hardware::details::hidl_pointer<unsigned char>",
    "referenced_type" : "type-390",
-   "self_type" : "type-4348",
+   "self_type" : "type-4354",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -32103,7 +32182,7 @@
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming",
    "referenced_type" : "type-588",
-   "self_type" : "type-4582",
+   "self_type" : "type-4588",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -32142,8 +32221,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-2456",
-   "self_type" : "type-2460",
+   "referenced_type" : "type-2459",
+   "self_type" : "type-2463",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32373,7 +32452,7 @@
    "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",
+   "self_type" : "type-4732",
    "size" : 64,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -32463,7 +32542,7 @@
    "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",
+   "self_type" : "type-4386",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -32523,7 +32602,7 @@
    "linker_set_key" : "const android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "const android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "referenced_type" : "type-160",
-   "self_type" : "type-2619",
+   "self_type" : "type-2622",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32533,7 +32612,7 @@
    "linker_set_key" : "const android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "name" : "const android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "referenced_type" : "type-147",
-   "self_type" : "type-2617",
+   "self_type" : "type-2620",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32543,7 +32622,7 @@
    "linker_set_key" : "const android::key_value_pair_t<unsigned int, unsigned int>",
    "name" : "const android::key_value_pair_t<unsigned int, unsigned int>",
    "referenced_type" : "type-143",
-   "self_type" : "type-2613",
+   "self_type" : "type-2616",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32551,32 +32630,32 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer>",
    "name" : "const android::sp<ANativeWindowBuffer>",
-   "referenced_type" : "type-2410",
-   "self_type" : "type-2409",
+   "referenced_type" : "type-2413",
+   "self_type" : "type-2412",
    "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",
+   "referenced_type" : "type-4852",
+   "self_type" : "type-4851",
    "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",
+   "referenced_type" : "type-5999",
+   "self_type" : "type-5998",
    "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",
+   "referenced_type" : "type-6837",
+   "self_type" : "type-6836",
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
   {
@@ -32585,7 +32664,7 @@
    "linker_set_key" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
    "name" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
    "referenced_type" : "type-581",
-   "self_type" : "type-1304",
+   "self_type" : "type-1301",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32605,7 +32684,7 @@
    "linker_set_key" : "const android::sp<android::AMessage>",
    "name" : "const android::sp<android::AMessage>",
    "referenced_type" : "type-259",
-   "self_type" : "type-2175",
+   "self_type" : "type-2174",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32614,8 +32693,8 @@
    "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",
+   "referenced_type" : "type-4234",
+   "self_type" : "type-4233",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32624,8 +32703,8 @@
    "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",
+   "referenced_type" : "type-4460",
+   "self_type" : "type-4522",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32645,7 +32724,7 @@
    "linker_set_key" : "const android::sp<android::ComponentWrapper>",
    "name" : "const android::sp<android::ComponentWrapper>",
    "referenced_type" : "type-567",
-   "self_type" : "type-2491",
+   "self_type" : "type-2494",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32664,8 +32743,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::Fence>",
    "name" : "const android::sp<android::Fence>",
-   "referenced_type" : "type-1864",
-   "self_type" : "type-1863",
+   "referenced_type" : "type-1868",
+   "self_type" : "type-1867",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32675,7 +32754,7 @@
    "linker_set_key" : "const android::sp<android::FrameDropper>",
    "name" : "const android::sp<android::FrameDropper>",
    "referenced_type" : "type-578",
-   "self_type" : "type-2506",
+   "self_type" : "type-2509",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32685,7 +32764,7 @@
    "linker_set_key" : "const android::sp<android::GraphicBuffer>",
    "name" : "const android::sp<android::GraphicBuffer>",
    "referenced_type" : "type-733",
-   "self_type" : "type-1196",
+   "self_type" : "type-1200",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32704,8 +32783,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::GraphicBufferSource>",
    "name" : "const android::sp<android::GraphicBufferSource>",
-   "referenced_type" : "type-2542",
-   "self_type" : "type-2544",
+   "referenced_type" : "type-2545",
+   "self_type" : "type-2547",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32714,8 +32793,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-4259",
-   "self_type" : "type-4264",
+   "referenced_type" : "type-4265",
+   "self_type" : "type-4270",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32724,8 +32803,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-4268",
-   "self_type" : "type-4273",
+   "referenced_type" : "type-4274",
+   "self_type" : "type-4279",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32734,8 +32813,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-4827",
-   "self_type" : "type-4826",
+   "referenced_type" : "type-4833",
+   "self_type" : "type-4832",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32744,8 +32823,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-5096",
-   "self_type" : "type-5095",
+   "referenced_type" : "type-5112",
+   "self_type" : "type-5111",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32755,7 +32834,7 @@
    "linker_set_key" : "const android::sp<android::IBinder::DeathRecipient>",
    "name" : "const android::sp<android::IBinder::DeathRecipient>",
    "referenced_type" : "type-843",
-   "self_type" : "type-4300",
+   "self_type" : "type-4306",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32765,7 +32844,7 @@
    "linker_set_key" : "const android::sp<android::IBinder>",
    "name" : "const android::sp<android::IBinder>",
    "referenced_type" : "type-795",
-   "self_type" : "type-1036",
+   "self_type" : "type-1040",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32795,7 +32874,7 @@
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer>",
    "name" : "const android::sp<android::IGraphicBufferProducer>",
    "referenced_type" : "type-570",
-   "self_type" : "type-2485",
+   "self_type" : "type-2488",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32805,7 +32884,7 @@
    "linker_set_key" : "const android::sp<android::IInterface>",
    "name" : "const android::sp<android::IInterface>",
    "referenced_type" : "type-646",
-   "self_type" : "type-1487",
+   "self_type" : "type-1491",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32824,8 +32903,8 @@
    "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",
+   "referenced_type" : "type-1044",
+   "self_type" : "type-1049",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32844,8 +32923,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",
+   "referenced_type" : "type-1262",
+   "self_type" : "type-1261",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -32854,8 +32933,8 @@
    "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",
+   "referenced_type" : "type-1370",
+   "self_type" : "type-1392",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -32864,8 +32943,8 @@
    "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",
+   "referenced_type" : "type-1397",
+   "self_type" : "type-1396",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -32874,8 +32953,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-2463",
-   "self_type" : "type-2468",
+   "referenced_type" : "type-2466",
+   "self_type" : "type-2471",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32884,8 +32963,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener>",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener>",
-   "referenced_type" : "type-2454",
-   "self_type" : "type-2458",
+   "referenced_type" : "type-2457",
+   "self_type" : "type-2461",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32894,8 +32973,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-4240",
-   "self_type" : "type-4239",
+   "referenced_type" : "type-4246",
+   "self_type" : "type-4245",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32904,8 +32983,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-4466",
-   "self_type" : "type-4469",
+   "referenced_type" : "type-4473",
+   "self_type" : "type-4476",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32914,8 +32993,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-2476",
-   "self_type" : "type-2482",
+   "referenced_type" : "type-2479",
+   "self_type" : "type-2485",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32924,8 +33003,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener>",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener>",
-   "referenced_type" : "type-2470",
-   "self_type" : "type-2474",
+   "referenced_type" : "type-2473",
+   "self_type" : "type-2477",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32934,8 +33013,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-4234",
-   "self_type" : "type-4233",
+   "referenced_type" : "type-4240",
+   "self_type" : "type-4239",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32944,8 +33023,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-4459",
-   "self_type" : "type-4462",
+   "referenced_type" : "type-4466",
+   "self_type" : "type-4469",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32964,8 +33043,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-2444",
-   "self_type" : "type-2446",
+   "referenced_type" : "type-2447",
+   "self_type" : "type-2449",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32974,8 +33053,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification>",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification>",
-   "referenced_type" : "type-2448",
-   "self_type" : "type-2451",
+   "referenced_type" : "type-2451",
+   "self_type" : "type-2454",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33015,7 +33094,7 @@
    "linker_set_key" : "const android::wp<android::IBinder::DeathRecipient>",
    "name" : "const android::wp<android::IBinder::DeathRecipient>",
    "referenced_type" : "type-172",
-   "self_type" : "type-4289",
+   "self_type" : "type-4296",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33025,7 +33104,7 @@
    "linker_set_key" : "const android::wp<android::IBinder>",
    "name" : "const android::wp<android::IBinder>",
    "referenced_type" : "type-130",
-   "self_type" : "type-4280",
+   "self_type" : "type-4286",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33035,7 +33114,7 @@
    "linker_set_key" : "const android_cta861_3_metadata",
    "name" : "const android_cta861_3_metadata",
    "referenced_type" : "type-305",
-   "self_type" : "type-1473",
+   "self_type" : "type-1477",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -33055,7 +33134,7 @@
    "linker_set_key" : "const android_smpte2086_metadata",
    "name" : "const android_smpte2086_metadata",
    "referenced_type" : "type-304",
-   "self_type" : "type-1471",
+   "self_type" : "type-1474",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -33085,7 +33164,7 @@
    "linker_set_key" : "const char *const",
    "name" : "const char *const",
    "referenced_type" : "type-122",
-   "self_type" : "type-1103",
+   "self_type" : "type-1106",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -33094,8 +33173,8 @@
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-1242",
-   "self_type" : "type-1241",
+   "referenced_type" : "type-1245",
+   "self_type" : "type-1244",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -33105,7 +33184,7 @@
    "linker_set_key" : "const double",
    "name" : "const double",
    "referenced_type" : "type-269",
-   "self_type" : "type-1077",
+   "self_type" : "type-1080",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -33141,64 +33220,64 @@
    "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-1113",
+   "self_type" : "type-1112",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1282",
-   "self_type" : "type-1281",
+   "referenced_type" : "type-1285",
+   "self_type" : "type-1284",
    "source_file" : "/system/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",
+   "referenced_type" : "type-3310",
+   "self_type" : "type-3309",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3539",
-   "self_type" : "type-3538",
+   "referenced_type" : "type-3542",
+   "self_type" : "type-3541",
    "source_file" : "/system/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",
+   "referenced_type" : "type-3651",
+   "self_type" : "type-3650",
    "source_file" : "/system/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",
+   "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-3833",
-   "self_type" : "type-3832",
+   "referenced_type" : "type-3839",
+   "self_type" : "type-3838",
    "source_file" : "/system/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",
+   "referenced_type" : "type-4379",
+   "self_type" : "type-4378",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -33213,216 +33292,216 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-4502",
-   "self_type" : "type-4501",
+   "referenced_type" : "type-4508",
+   "self_type" : "type-4507",
    "source_file" : "/system/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",
+   "referenced_type" : "type-4545",
+   "self_type" : "type-4544",
    "source_file" : "/system/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",
+   "referenced_type" : "type-4570",
+   "self_type" : "type-4569",
    "source_file" : "/system/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",
+   "referenced_type" : "type-4724",
+   "self_type" : "type-4723",
    "source_file" : "/system/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",
+   "referenced_type" : "type-4854",
+   "self_type" : "type-4853",
    "source_file" : "/system/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",
+   "referenced_type" : "type-5125",
+   "self_type" : "type-5124",
    "source_file" : "/system/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",
+   "referenced_type" : "type-5178",
+   "self_type" : "type-5177",
    "source_file" : "/system/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",
+   "referenced_type" : "type-5385",
+   "self_type" : "type-5384",
    "source_file" : "/system/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",
+   "referenced_type" : "type-5617",
+   "self_type" : "type-5616",
    "source_file" : "/system/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",
+   "referenced_type" : "type-5726",
+   "self_type" : "type-5725",
    "source_file" : "/system/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",
+   "referenced_type" : "type-5792",
+   "self_type" : "type-5791",
    "source_file" : "/system/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",
+   "referenced_type" : "type-5914",
+   "self_type" : "type-5913",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6070",
+   "self_type" : "type-6069",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6206",
+   "self_type" : "type-6205",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6302",
+   "self_type" : "type-6301",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6349",
+   "self_type" : "type-6348",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6441",
+   "self_type" : "type-6440",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6980",
+   "self_type" : "type-6979",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7114",
+   "self_type" : "type-7113",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7167",
+   "self_type" : "type-7166",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7203",
+   "self_type" : "type-7202",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7352",
+   "self_type" : "type-7351",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7452",
+   "self_type" : "type-7451",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7490",
+   "self_type" : "type-7489",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7543",
+   "self_type" : "type-7542",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7623",
+   "self_type" : "type-7622",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7688",
+   "self_type" : "type-7687",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -33438,8 +33517,8 @@
    "is_const" : true,
    "linker_set_key" : "const log_msg",
    "name" : "const log_msg",
-   "referenced_type" : "type-2177",
-   "self_type" : "type-2313",
+   "referenced_type" : "type-2180",
+   "self_type" : "type-2316",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -33488,8 +33567,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-1314",
-   "self_type" : "type-1313",
+   "referenced_type" : "type-1318",
+   "self_type" : "type-1317",
    "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"
   },
@@ -33498,8 +33577,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-3392",
-   "self_type" : "type-3391",
+   "referenced_type" : "type-3395",
+   "self_type" : "type-3394",
    "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"
   },
@@ -33508,8 +33587,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-3562",
-   "self_type" : "type-3561",
+   "referenced_type" : "type-3565",
+   "self_type" : "type-3564",
    "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"
   },
@@ -33518,8 +33597,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-3864",
-   "self_type" : "type-3863",
+   "referenced_type" : "type-3871",
+   "self_type" : "type-3870",
    "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"
   },
@@ -33528,8 +33607,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-4413",
-   "self_type" : "type-4412",
+   "referenced_type" : "type-4421",
+   "self_type" : "type-4420",
    "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"
   },
@@ -33538,8 +33617,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-4624",
-   "self_type" : "type-4623",
+   "referenced_type" : "type-4630",
+   "self_type" : "type-4629",
    "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"
   },
@@ -33548,8 +33627,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-4794",
-   "self_type" : "type-4793",
+   "referenced_type" : "type-4800",
+   "self_type" : "type-4799",
    "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"
   },
@@ -33558,8 +33637,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-5086",
-   "self_type" : "type-5085",
+   "referenced_type" : "type-5102",
+   "self_type" : "type-5101",
    "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"
   },
@@ -33568,8 +33647,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-5186",
-   "self_type" : "type-5185",
+   "referenced_type" : "type-5204",
+   "self_type" : "type-5203",
    "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"
   },
@@ -33578,8 +33657,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-5453",
-   "self_type" : "type-5452",
+   "referenced_type" : "type-5470",
+   "self_type" : "type-5469",
    "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"
   },
@@ -33588,8 +33667,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-5623",
-   "self_type" : "type-5622",
+   "referenced_type" : "type-5640",
+   "self_type" : "type-5639",
    "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"
   },
@@ -33598,8 +33677,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-5925",
-   "self_type" : "type-5924",
+   "referenced_type" : "type-5946",
+   "self_type" : "type-5945",
    "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"
   },
@@ -33618,8 +33697,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-6077",
-   "self_type" : "type-6076",
+   "referenced_type" : "type-6097",
+   "self_type" : "type-6096",
    "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"
   },
@@ -33628,8 +33707,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-6209",
-   "self_type" : "type-6208",
+   "referenced_type" : "type-6229",
+   "self_type" : "type-6228",
    "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"
   },
@@ -33638,8 +33717,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-6445",
-   "self_type" : "type-6444",
+   "referenced_type" : "type-6469",
+   "self_type" : "type-6468",
    "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"
   },
@@ -33648,8 +33727,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-7002",
-   "self_type" : "type-7001",
+   "referenced_type" : "type-7028",
+   "self_type" : "type-7027",
    "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"
   },
@@ -33658,8 +33737,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-7251",
-   "self_type" : "type-7250",
+   "referenced_type" : "type-7276",
+   "self_type" : "type-7275",
    "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"
   },
@@ -33668,8 +33747,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-7386",
-   "self_type" : "type-7385",
+   "referenced_type" : "type-7409",
+   "self_type" : "type-7408",
    "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"
   },
@@ -33678,8 +33757,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-7591",
-   "self_type" : "type-7590",
+   "referenced_type" : "type-7614",
+   "self_type" : "type-7613",
    "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"
   },
@@ -33698,8 +33777,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-1312",
-   "self_type" : "type-1311",
+   "referenced_type" : "type-1315",
+   "self_type" : "type-1314",
    "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"
   },
@@ -33708,8 +33787,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-3390",
-   "self_type" : "type-3389",
+   "referenced_type" : "type-3393",
+   "self_type" : "type-3392",
    "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"
   },
@@ -33718,8 +33797,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-3560",
-   "self_type" : "type-3559",
+   "referenced_type" : "type-3563",
+   "self_type" : "type-3562",
    "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"
   },
@@ -33728,8 +33807,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-3862",
-   "self_type" : "type-3861",
+   "referenced_type" : "type-3868",
+   "self_type" : "type-3867",
    "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"
   },
@@ -33738,8 +33817,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-4411",
-   "self_type" : "type-4410",
+   "referenced_type" : "type-4419",
+   "self_type" : "type-4418",
    "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"
   },
@@ -33748,8 +33827,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-4622",
-   "self_type" : "type-4621",
+   "referenced_type" : "type-4628",
+   "self_type" : "type-4627",
    "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"
   },
@@ -33758,8 +33837,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-4792",
-   "self_type" : "type-4791",
+   "referenced_type" : "type-4798",
+   "self_type" : "type-4797",
    "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"
   },
@@ -33768,8 +33847,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-5084",
-   "self_type" : "type-5083",
+   "referenced_type" : "type-5100",
+   "self_type" : "type-5099",
    "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"
   },
@@ -33778,8 +33857,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-5184",
-   "self_type" : "type-5183",
+   "referenced_type" : "type-5202",
+   "self_type" : "type-5201",
    "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"
   },
@@ -33788,8 +33867,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-5451",
-   "self_type" : "type-5450",
+   "referenced_type" : "type-5468",
+   "self_type" : "type-5467",
    "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"
   },
@@ -33798,8 +33877,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-5621",
-   "self_type" : "type-5620",
+   "referenced_type" : "type-5638",
+   "self_type" : "type-5637",
    "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"
   },
@@ -33808,8 +33887,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-5923",
-   "self_type" : "type-5922",
+   "referenced_type" : "type-5943",
+   "self_type" : "type-5942",
    "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"
   },
@@ -33828,8 +33907,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-6075",
-   "self_type" : "type-6074",
+   "referenced_type" : "type-6095",
+   "self_type" : "type-6094",
    "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"
   },
@@ -33838,8 +33917,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-6207",
-   "self_type" : "type-6206",
+   "referenced_type" : "type-6227",
+   "self_type" : "type-6226",
    "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"
   },
@@ -33848,8 +33927,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-6443",
-   "self_type" : "type-6442",
+   "referenced_type" : "type-6466",
+   "self_type" : "type-6465",
    "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"
   },
@@ -33858,8 +33937,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-7000",
-   "self_type" : "type-6999",
+   "referenced_type" : "type-7026",
+   "self_type" : "type-7025",
    "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"
   },
@@ -33868,8 +33947,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-7248",
-   "self_type" : "type-7247",
+   "referenced_type" : "type-7274",
+   "self_type" : "type-7273",
    "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"
   },
@@ -33878,8 +33957,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-7384",
-   "self_type" : "type-7383",
+   "referenced_type" : "type-7407",
+   "self_type" : "type-7406",
    "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"
   },
@@ -33888,8 +33967,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-7589",
-   "self_type" : "type-7588",
+   "referenced_type" : "type-7612",
+   "self_type" : "type-7611",
    "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"
   },
@@ -33908,8 +33987,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-1321",
-   "self_type" : "type-1320",
+   "referenced_type" : "type-1324",
+   "self_type" : "type-1323",
    "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"
   },
@@ -33918,8 +33997,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-3404",
-   "self_type" : "type-3403",
+   "referenced_type" : "type-3407",
+   "self_type" : "type-3406",
    "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"
   },
@@ -33928,8 +34007,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-3568",
-   "self_type" : "type-3567",
+   "referenced_type" : "type-3571",
+   "self_type" : "type-3570",
    "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"
   },
@@ -33938,8 +34017,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-3872",
-   "self_type" : "type-3871",
+   "referenced_type" : "type-3878",
+   "self_type" : "type-3877",
    "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"
   },
@@ -33948,8 +34027,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-4421",
-   "self_type" : "type-4420",
+   "referenced_type" : "type-4427",
+   "self_type" : "type-4426",
    "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"
   },
@@ -33958,8 +34037,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-4630",
-   "self_type" : "type-4629",
+   "referenced_type" : "type-4636",
+   "self_type" : "type-4635",
    "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"
   },
@@ -33968,8 +34047,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-4800",
-   "self_type" : "type-4799",
+   "referenced_type" : "type-4806",
+   "self_type" : "type-4805",
    "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"
   },
@@ -33978,8 +34057,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-5092",
-   "self_type" : "type-5091",
+   "referenced_type" : "type-5108",
+   "self_type" : "type-5107",
    "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"
   },
@@ -33988,8 +34067,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-5193",
-   "self_type" : "type-5192",
+   "referenced_type" : "type-5212",
+   "self_type" : "type-5211",
    "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"
   },
@@ -33998,8 +34077,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-5465",
-   "self_type" : "type-5464",
+   "referenced_type" : "type-5482",
+   "self_type" : "type-5481",
    "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"
   },
@@ -34008,8 +34087,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-5629",
-   "self_type" : "type-5628",
+   "referenced_type" : "type-5646",
+   "self_type" : "type-5645",
    "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"
   },
@@ -34018,8 +34097,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-5933",
-   "self_type" : "type-5932",
+   "referenced_type" : "type-5953",
+   "self_type" : "type-5952",
    "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"
   },
@@ -34028,8 +34107,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-6083",
-   "self_type" : "type-6082",
+   "referenced_type" : "type-6104",
+   "self_type" : "type-6103",
    "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"
   },
@@ -34048,8 +34127,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-6215",
-   "self_type" : "type-6214",
+   "referenced_type" : "type-6235",
+   "self_type" : "type-6234",
    "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"
   },
@@ -34058,8 +34137,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-6452",
-   "self_type" : "type-6451",
+   "referenced_type" : "type-6475",
+   "self_type" : "type-6474",
    "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"
   },
@@ -34068,8 +34147,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-7011",
-   "self_type" : "type-7010",
+   "referenced_type" : "type-7035",
+   "self_type" : "type-7034",
    "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"
   },
@@ -34078,8 +34157,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-7259",
-   "self_type" : "type-7258",
+   "referenced_type" : "type-7282",
+   "self_type" : "type-7281",
    "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"
   },
@@ -34088,8 +34167,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-7392",
-   "self_type" : "type-7391",
+   "referenced_type" : "type-7415",
+   "self_type" : "type-7414",
    "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"
   },
@@ -34098,8 +34177,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-7527",
-   "self_type" : "type-7526",
+   "referenced_type" : "type-7550",
+   "self_type" : "type-7549",
    "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"
   },
@@ -34118,8 +34197,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-1319",
-   "self_type" : "type-1318",
+   "referenced_type" : "type-1322",
+   "self_type" : "type-1321",
    "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"
   },
@@ -34128,8 +34207,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-3402",
-   "self_type" : "type-3401",
+   "referenced_type" : "type-3405",
+   "self_type" : "type-3404",
    "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"
   },
@@ -34138,8 +34217,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-3566",
-   "self_type" : "type-3565",
+   "referenced_type" : "type-3569",
+   "self_type" : "type-3568",
    "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"
   },
@@ -34148,8 +34227,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-3870",
-   "self_type" : "type-3869",
+   "referenced_type" : "type-3876",
+   "self_type" : "type-3875",
    "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"
   },
@@ -34158,8 +34237,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-4419",
-   "self_type" : "type-4418",
+   "referenced_type" : "type-4425",
+   "self_type" : "type-4424",
    "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"
   },
@@ -34168,8 +34247,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-4628",
-   "self_type" : "type-4627",
+   "referenced_type" : "type-4634",
+   "self_type" : "type-4633",
    "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"
   },
@@ -34178,8 +34257,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-4798",
-   "self_type" : "type-4797",
+   "referenced_type" : "type-4804",
+   "self_type" : "type-4803",
    "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"
   },
@@ -34188,8 +34267,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-5090",
-   "self_type" : "type-5089",
+   "referenced_type" : "type-5106",
+   "self_type" : "type-5105",
    "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"
   },
@@ -34198,8 +34277,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-5191",
-   "self_type" : "type-5190",
+   "referenced_type" : "type-5209",
+   "self_type" : "type-5208",
    "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"
   },
@@ -34208,8 +34287,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-5463",
-   "self_type" : "type-5462",
+   "referenced_type" : "type-5480",
+   "self_type" : "type-5479",
    "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"
   },
@@ -34218,8 +34297,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-5627",
-   "self_type" : "type-5626",
+   "referenced_type" : "type-5644",
+   "self_type" : "type-5643",
    "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"
   },
@@ -34228,8 +34307,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-5931",
-   "self_type" : "type-5930",
+   "referenced_type" : "type-5951",
+   "self_type" : "type-5950",
    "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"
   },
@@ -34238,8 +34317,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-6081",
-   "self_type" : "type-6080",
+   "referenced_type" : "type-6102",
+   "self_type" : "type-6101",
    "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"
   },
@@ -34258,8 +34337,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-6213",
-   "self_type" : "type-6212",
+   "referenced_type" : "type-6233",
+   "self_type" : "type-6232",
    "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"
   },
@@ -34268,8 +34347,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-6450",
-   "self_type" : "type-6449",
+   "referenced_type" : "type-6473",
+   "self_type" : "type-6472",
    "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"
   },
@@ -34278,8 +34357,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-7009",
-   "self_type" : "type-7008",
+   "referenced_type" : "type-7033",
+   "self_type" : "type-7032",
    "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"
   },
@@ -34288,8 +34367,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-7257",
-   "self_type" : "type-7256",
+   "referenced_type" : "type-7280",
+   "self_type" : "type-7279",
    "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"
   },
@@ -34298,8 +34377,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-7390",
-   "self_type" : "type-7389",
+   "referenced_type" : "type-7413",
+   "self_type" : "type-7412",
    "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"
   },
@@ -34308,8 +34387,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-7525",
-   "self_type" : "type-7524",
+   "referenced_type" : "type-7548",
+   "self_type" : "type-7547",
    "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"
   },
@@ -34328,8 +34407,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-1317",
-   "self_type" : "type-1316",
+   "referenced_type" : "type-1320",
+   "self_type" : "type-1319",
    "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"
   },
@@ -34338,8 +34417,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-3400",
-   "self_type" : "type-3399",
+   "referenced_type" : "type-3403",
+   "self_type" : "type-3402",
    "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"
   },
@@ -34348,8 +34427,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-3564",
-   "self_type" : "type-3563",
+   "referenced_type" : "type-3567",
+   "self_type" : "type-3566",
    "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"
   },
@@ -34358,8 +34437,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-3868",
-   "self_type" : "type-3867",
+   "referenced_type" : "type-3874",
+   "self_type" : "type-3873",
    "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"
   },
@@ -34368,8 +34447,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-4417",
-   "self_type" : "type-4416",
+   "referenced_type" : "type-4423",
+   "self_type" : "type-4422",
    "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"
   },
@@ -34378,8 +34457,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-4626",
-   "self_type" : "type-4625",
+   "referenced_type" : "type-4632",
+   "self_type" : "type-4631",
    "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"
   },
@@ -34388,8 +34467,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-4796",
-   "self_type" : "type-4795",
+   "referenced_type" : "type-4802",
+   "self_type" : "type-4801",
    "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"
   },
@@ -34398,8 +34477,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-5088",
-   "self_type" : "type-5087",
+   "referenced_type" : "type-5104",
+   "self_type" : "type-5103",
    "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"
   },
@@ -34408,8 +34487,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-5189",
-   "self_type" : "type-5188",
+   "referenced_type" : "type-5207",
+   "self_type" : "type-5206",
    "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"
   },
@@ -34418,8 +34497,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-5461",
-   "self_type" : "type-5460",
+   "referenced_type" : "type-5478",
+   "self_type" : "type-5477",
    "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"
   },
@@ -34428,8 +34507,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-5625",
-   "self_type" : "type-5624",
+   "referenced_type" : "type-5642",
+   "self_type" : "type-5641",
    "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"
   },
@@ -34438,8 +34517,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-5929",
-   "self_type" : "type-5928",
+   "referenced_type" : "type-5949",
+   "self_type" : "type-5948",
    "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"
   },
@@ -34448,8 +34527,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-6079",
-   "self_type" : "type-6078",
+   "referenced_type" : "type-6099",
+   "self_type" : "type-6098",
    "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"
   },
@@ -34468,8 +34547,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-6211",
-   "self_type" : "type-6210",
+   "referenced_type" : "type-6231",
+   "self_type" : "type-6230",
    "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"
   },
@@ -34478,8 +34557,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-6448",
-   "self_type" : "type-6447",
+   "referenced_type" : "type-6471",
+   "self_type" : "type-6470",
    "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"
   },
@@ -34488,8 +34567,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-7007",
-   "self_type" : "type-7006",
+   "referenced_type" : "type-7030",
+   "self_type" : "type-7029",
    "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"
   },
@@ -34498,8 +34577,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-7253",
-   "self_type" : "type-7252",
+   "referenced_type" : "type-7278",
+   "self_type" : "type-7277",
    "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"
   },
@@ -34508,8 +34587,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-7388",
-   "self_type" : "type-7387",
+   "referenced_type" : "type-7411",
+   "self_type" : "type-7410",
    "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"
   },
@@ -34518,8 +34597,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-7523",
-   "self_type" : "type-7522",
+   "referenced_type" : "type-7546",
+   "self_type" : "type-7545",
    "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"
   },
@@ -34538,8 +34617,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1119",
-   "self_type" : "type-1118",
+   "referenced_type" : "type-1122",
+   "self_type" : "type-1121",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34548,8 +34627,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1297",
-   "self_type" : "type-1296",
+   "referenced_type" : "type-1300",
+   "self_type" : "type-1299",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34558,8 +34637,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3374",
+   "self_type" : "type-3373",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34568,8 +34647,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3551",
+   "self_type" : "type-3550",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34578,8 +34657,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3728",
+   "self_type" : "type-3727",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34588,8 +34667,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3853",
+   "self_type" : "type-3852",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34598,8 +34677,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4405",
+   "self_type" : "type-4404",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34608,8 +34687,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4613",
+   "self_type" : "type-4612",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34618,8 +34697,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4786",
+   "self_type" : "type-4785",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34628,8 +34707,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5189",
+   "self_type" : "type-5188",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34638,8 +34717,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5449",
+   "self_type" : "type-5448",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34658,8 +34737,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5626",
+   "self_type" : "type-5625",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34668,8 +34747,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5803",
+   "self_type" : "type-5802",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34678,8 +34757,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5928",
+   "self_type" : "type-5927",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34688,8 +34767,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6082",
+   "self_type" : "type-6081",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34698,8 +34777,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6215",
+   "self_type" : "type-6214",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34708,8 +34787,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6362",
+   "self_type" : "type-6361",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34718,8 +34797,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6452",
+   "self_type" : "type-6451",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34728,8 +34807,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7011",
+   "self_type" : "type-7010",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34738,8 +34817,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7256",
+   "self_type" : "type-7255",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34748,8 +34827,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7395",
+   "self_type" : "type-7394",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34758,8 +34837,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7554",
+   "self_type" : "type-7553",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34768,8 +34847,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7696",
+   "self_type" : "type-7695",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34778,8 +34857,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-872",
+   "self_type" : "type-871",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34788,8 +34867,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-1126",
-   "self_type" : "type-1125",
+   "referenced_type" : "type-1129",
+   "self_type" : "type-1128",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34798,8 +34877,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-1303",
-   "self_type" : "type-1302",
+   "referenced_type" : "type-1307",
+   "self_type" : "type-1306",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34808,8 +34887,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-3377",
-   "self_type" : "type-3376",
+   "referenced_type" : "type-3380",
+   "self_type" : "type-3379",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34818,8 +34897,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-3554",
-   "self_type" : "type-3553",
+   "referenced_type" : "type-3557",
+   "self_type" : "type-3556",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34828,8 +34907,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-3729",
-   "self_type" : "type-3728",
+   "referenced_type" : "type-3735",
+   "self_type" : "type-3734",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34838,8 +34917,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-3853",
-   "self_type" : "type-3852",
+   "referenced_type" : "type-3860",
+   "self_type" : "type-3859",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34848,8 +34927,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-4405",
-   "self_type" : "type-4404",
+   "referenced_type" : "type-4411",
+   "self_type" : "type-4410",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34858,8 +34937,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-4613",
-   "self_type" : "type-4612",
+   "referenced_type" : "type-4619",
+   "self_type" : "type-4618",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34868,8 +34947,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-4785",
-   "self_type" : "type-4784",
+   "referenced_type" : "type-4792",
+   "self_type" : "type-4791",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34878,8 +34957,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-5178",
-   "self_type" : "type-5177",
+   "referenced_type" : "type-5195",
+   "self_type" : "type-5194",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34888,8 +34967,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-5438",
-   "self_type" : "type-5437",
+   "referenced_type" : "type-5455",
+   "self_type" : "type-5454",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34908,8 +34987,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-5615",
-   "self_type" : "type-5614",
+   "referenced_type" : "type-5632",
+   "self_type" : "type-5631",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34918,8 +34997,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-5790",
-   "self_type" : "type-5789",
+   "referenced_type" : "type-5810",
+   "self_type" : "type-5809",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34928,8 +35007,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-5914",
-   "self_type" : "type-5913",
+   "referenced_type" : "type-5935",
+   "self_type" : "type-5934",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34938,8 +35017,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-6068",
-   "self_type" : "type-6067",
+   "referenced_type" : "type-6088",
+   "self_type" : "type-6087",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34948,8 +35027,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-6201",
-   "self_type" : "type-6200",
+   "referenced_type" : "type-6221",
+   "self_type" : "type-6220",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34958,8 +35037,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-6345",
-   "self_type" : "type-6344",
+   "referenced_type" : "type-6368",
+   "self_type" : "type-6367",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34968,8 +35047,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-6435",
-   "self_type" : "type-6434",
+   "referenced_type" : "type-6458",
+   "self_type" : "type-6457",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34978,8 +35057,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-6993",
-   "self_type" : "type-6992",
+   "referenced_type" : "type-7017",
+   "self_type" : "type-7016",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34988,8 +35067,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-7239",
-   "self_type" : "type-7238",
+   "referenced_type" : "type-7263",
+   "self_type" : "type-7262",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34998,8 +35077,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-7378",
-   "self_type" : "type-7377",
+   "referenced_type" : "type-7401",
+   "self_type" : "type-7400",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35008,8 +35087,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-7537",
-   "self_type" : "type-7536",
+   "referenced_type" : "type-7560",
+   "self_type" : "type-7559",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35018,8 +35097,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-7679",
-   "self_type" : "type-7678",
+   "referenced_type" : "type-7702",
+   "self_type" : "type-7701",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35038,8 +35117,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-1128",
-   "self_type" : "type-1127",
+   "referenced_type" : "type-1131",
+   "self_type" : "type-1130",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35048,8 +35127,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-1306",
-   "self_type" : "type-1305",
+   "referenced_type" : "type-1309",
+   "self_type" : "type-1308",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35058,8 +35137,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-3380",
-   "self_type" : "type-3379",
+   "referenced_type" : "type-3383",
+   "self_type" : "type-3382",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35068,8 +35147,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-3556",
-   "self_type" : "type-3555",
+   "referenced_type" : "type-3559",
+   "self_type" : "type-3558",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35078,8 +35157,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-3731",
-   "self_type" : "type-3730",
+   "referenced_type" : "type-3737",
+   "self_type" : "type-3736",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35088,8 +35167,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-3856",
-   "self_type" : "type-3855",
+   "referenced_type" : "type-3862",
+   "self_type" : "type-3861",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35098,8 +35177,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-4407",
-   "self_type" : "type-4406",
+   "referenced_type" : "type-4413",
+   "self_type" : "type-4412",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35108,8 +35187,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-4615",
-   "self_type" : "type-4614",
+   "referenced_type" : "type-4621",
+   "self_type" : "type-4620",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35118,8 +35197,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-4787",
-   "self_type" : "type-4786",
+   "referenced_type" : "type-4794",
+   "self_type" : "type-4793",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35128,8 +35207,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-5180",
-   "self_type" : "type-5179",
+   "referenced_type" : "type-5197",
+   "self_type" : "type-5196",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35138,18 +35217,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-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",
+   "referenced_type" : "type-5458",
+   "self_type" : "type-5457",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35168,8 +35237,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-5792",
-   "self_type" : "type-5791",
+   "referenced_type" : "type-5634",
+   "self_type" : "type-5633",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35178,8 +35247,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-5917",
-   "self_type" : "type-5916",
+   "referenced_type" : "type-5812",
+   "self_type" : "type-5811",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35188,8 +35257,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-6070",
-   "self_type" : "type-6069",
+   "referenced_type" : "type-5937",
+   "self_type" : "type-5936",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35198,8 +35267,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-6203",
-   "self_type" : "type-6202",
+   "referenced_type" : "type-6090",
+   "self_type" : "type-6089",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35208,8 +35277,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-6347",
-   "self_type" : "type-6346",
+   "referenced_type" : "type-6223",
+   "self_type" : "type-6222",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35218,8 +35287,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-6437",
-   "self_type" : "type-6436",
+   "referenced_type" : "type-6370",
+   "self_type" : "type-6369",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35228,8 +35297,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-6996",
-   "self_type" : "type-6995",
+   "referenced_type" : "type-6460",
+   "self_type" : "type-6459",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35238,8 +35307,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-7241",
-   "self_type" : "type-7240",
+   "referenced_type" : "type-7019",
+   "self_type" : "type-7018",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35248,8 +35317,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-7380",
-   "self_type" : "type-7379",
+   "referenced_type" : "type-7265",
+   "self_type" : "type-7264",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35258,8 +35327,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-7539",
-   "self_type" : "type-7538",
+   "referenced_type" : "type-7403",
+   "self_type" : "type-7402",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35268,8 +35337,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7562",
+   "self_type" : "type-7561",
+   "size" : 28,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/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-7705",
+   "self_type" : "type-7704",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35288,8 +35367,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-1123",
-   "self_type" : "type-1122",
+   "referenced_type" : "type-1127",
+   "self_type" : "type-1126",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35298,8 +35377,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-1301",
-   "self_type" : "type-1300",
+   "referenced_type" : "type-1305",
+   "self_type" : "type-1304",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35308,8 +35387,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-3375",
-   "self_type" : "type-3374",
+   "referenced_type" : "type-3378",
+   "self_type" : "type-3377",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35318,8 +35397,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-3552",
-   "self_type" : "type-3551",
+   "referenced_type" : "type-3555",
+   "self_type" : "type-3554",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35328,8 +35407,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-3726",
-   "self_type" : "type-3725",
+   "referenced_type" : "type-3733",
+   "self_type" : "type-3732",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35338,8 +35417,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-3851",
-   "self_type" : "type-3850",
+   "referenced_type" : "type-3858",
+   "self_type" : "type-3857",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35348,8 +35427,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-4403",
-   "self_type" : "type-4402",
+   "referenced_type" : "type-4409",
+   "self_type" : "type-4408",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35358,8 +35437,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-4611",
-   "self_type" : "type-4610",
+   "referenced_type" : "type-4617",
+   "self_type" : "type-4616",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35368,8 +35447,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-4783",
-   "self_type" : "type-4782",
+   "referenced_type" : "type-4790",
+   "self_type" : "type-4789",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35378,8 +35457,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-5176",
-   "self_type" : "type-5175",
+   "referenced_type" : "type-5193",
+   "self_type" : "type-5192",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35388,8 +35467,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-5436",
-   "self_type" : "type-5435",
+   "referenced_type" : "type-5453",
+   "self_type" : "type-5452",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35408,8 +35487,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-5613",
-   "self_type" : "type-5612",
+   "referenced_type" : "type-5630",
+   "self_type" : "type-5629",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35418,8 +35497,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-5787",
-   "self_type" : "type-5786",
+   "referenced_type" : "type-5808",
+   "self_type" : "type-5807",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35428,8 +35507,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-5912",
-   "self_type" : "type-5911",
+   "referenced_type" : "type-5933",
+   "self_type" : "type-5932",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35438,8 +35517,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-6065",
-   "self_type" : "type-6064",
+   "referenced_type" : "type-6086",
+   "self_type" : "type-6085",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35448,8 +35527,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-6199",
-   "self_type" : "type-6198",
+   "referenced_type" : "type-6219",
+   "self_type" : "type-6218",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35458,8 +35537,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-6343",
-   "self_type" : "type-6342",
+   "referenced_type" : "type-6366",
+   "self_type" : "type-6365",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35468,8 +35547,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-6432",
-   "self_type" : "type-6431",
+   "referenced_type" : "type-6456",
+   "self_type" : "type-6455",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35478,8 +35557,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-6991",
-   "self_type" : "type-6990",
+   "referenced_type" : "type-7015",
+   "self_type" : "type-7014",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35488,8 +35567,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-7237",
-   "self_type" : "type-7236",
+   "referenced_type" : "type-7260",
+   "self_type" : "type-7259",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35498,8 +35577,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-7376",
-   "self_type" : "type-7375",
+   "referenced_type" : "type-7399",
+   "self_type" : "type-7398",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35508,8 +35587,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-7535",
-   "self_type" : "type-7534",
+   "referenced_type" : "type-7558",
+   "self_type" : "type-7557",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35518,8 +35597,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-7677",
-   "self_type" : "type-7676",
+   "referenced_type" : "type-7700",
+   "self_type" : "type-7699",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35538,8 +35617,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-1130",
-   "self_type" : "type-1129",
+   "referenced_type" : "type-1133",
+   "self_type" : "type-1132",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35548,8 +35627,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-1308",
-   "self_type" : "type-1307",
+   "referenced_type" : "type-1311",
+   "self_type" : "type-1310",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35558,8 +35637,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-3383",
-   "self_type" : "type-3382",
+   "referenced_type" : "type-3386",
+   "self_type" : "type-3385",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35568,8 +35647,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-3558",
-   "self_type" : "type-3557",
+   "referenced_type" : "type-3561",
+   "self_type" : "type-3560",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35578,8 +35657,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-3733",
-   "self_type" : "type-3732",
+   "referenced_type" : "type-3739",
+   "self_type" : "type-3738",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35588,8 +35667,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-3858",
-   "self_type" : "type-3857",
+   "referenced_type" : "type-3864",
+   "self_type" : "type-3863",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35598,8 +35677,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-4409",
-   "self_type" : "type-4408",
+   "referenced_type" : "type-4415",
+   "self_type" : "type-4414",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35608,8 +35687,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-4617",
-   "self_type" : "type-4616",
+   "referenced_type" : "type-4626",
+   "self_type" : "type-4625",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35618,8 +35697,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-4789",
-   "self_type" : "type-4788",
+   "referenced_type" : "type-4796",
+   "self_type" : "type-4795",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35628,8 +35707,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-5182",
-   "self_type" : "type-5181",
+   "referenced_type" : "type-5200",
+   "self_type" : "type-5199",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35638,8 +35717,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-5444",
-   "self_type" : "type-5443",
+   "referenced_type" : "type-5461",
+   "self_type" : "type-5460",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35648,8 +35727,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-5619",
-   "self_type" : "type-5618",
+   "referenced_type" : "type-5636",
+   "self_type" : "type-5635",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35658,8 +35737,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-5794",
-   "self_type" : "type-5793",
+   "referenced_type" : "type-5814",
+   "self_type" : "type-5813",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35678,8 +35757,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-5919",
-   "self_type" : "type-5918",
+   "referenced_type" : "type-5939",
+   "self_type" : "type-5938",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35688,8 +35767,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-6072",
-   "self_type" : "type-6071",
+   "referenced_type" : "type-6093",
+   "self_type" : "type-6092",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35698,8 +35777,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-6205",
-   "self_type" : "type-6204",
+   "referenced_type" : "type-6225",
+   "self_type" : "type-6224",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35708,8 +35787,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-6349",
-   "self_type" : "type-6348",
+   "referenced_type" : "type-6372",
+   "self_type" : "type-6371",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35718,8 +35797,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-6439",
-   "self_type" : "type-6438",
+   "referenced_type" : "type-6462",
+   "self_type" : "type-6461",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35728,8 +35807,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-6998",
-   "self_type" : "type-6997",
+   "referenced_type" : "type-7021",
+   "self_type" : "type-7020",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35738,8 +35817,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-7243",
-   "self_type" : "type-7242",
+   "referenced_type" : "type-7270",
+   "self_type" : "type-7269",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35748,8 +35827,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-7382",
-   "self_type" : "type-7381",
+   "referenced_type" : "type-7405",
+   "self_type" : "type-7404",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35758,8 +35837,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-7541",
-   "self_type" : "type-7540",
+   "referenced_type" : "type-7564",
+   "self_type" : "type-7563",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35768,8 +35847,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-7683",
-   "self_type" : "type-7682",
+   "referenced_type" : "type-7707",
+   "self_type" : "type-7706",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35788,8 +35867,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-1117",
-   "self_type" : "type-1116",
+   "referenced_type" : "type-1120",
+   "self_type" : "type-1119",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35798,8 +35877,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-1295",
-   "self_type" : "type-1294",
+   "referenced_type" : "type-1298",
+   "self_type" : "type-1297",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35808,8 +35887,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-3369",
-   "self_type" : "type-3368",
+   "referenced_type" : "type-3372",
+   "self_type" : "type-3371",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35818,8 +35897,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-3544",
-   "self_type" : "type-3543",
+   "referenced_type" : "type-3549",
+   "self_type" : "type-3548",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35828,8 +35907,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-3720",
-   "self_type" : "type-3719",
+   "referenced_type" : "type-3726",
+   "self_type" : "type-3725",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35838,8 +35917,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-3845",
-   "self_type" : "type-3844",
+   "referenced_type" : "type-3851",
+   "self_type" : "type-3850",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35848,8 +35927,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-4397",
-   "self_type" : "type-4396",
+   "referenced_type" : "type-4403",
+   "self_type" : "type-4402",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35858,8 +35937,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-4605",
-   "self_type" : "type-4604",
+   "referenced_type" : "type-4611",
+   "self_type" : "type-4610",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35868,8 +35947,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-4776",
-   "self_type" : "type-4775",
+   "referenced_type" : "type-4783",
+   "self_type" : "type-4782",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35878,8 +35957,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-5169",
-   "self_type" : "type-5168",
+   "referenced_type" : "type-5187",
+   "self_type" : "type-5186",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35888,8 +35967,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-5430",
-   "self_type" : "type-5429",
+   "referenced_type" : "type-5447",
+   "self_type" : "type-5446",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35908,8 +35987,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-5605",
-   "self_type" : "type-5604",
+   "referenced_type" : "type-5624",
+   "self_type" : "type-5623",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35918,8 +35997,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-5781",
-   "self_type" : "type-5780",
+   "referenced_type" : "type-5801",
+   "self_type" : "type-5800",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35928,8 +36007,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-5906",
-   "self_type" : "type-5905",
+   "referenced_type" : "type-5926",
+   "self_type" : "type-5925",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35938,8 +36017,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-6059",
-   "self_type" : "type-6058",
+   "referenced_type" : "type-6079",
+   "self_type" : "type-6078",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35948,8 +36027,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-6191",
-   "self_type" : "type-6190",
+   "referenced_type" : "type-6213",
+   "self_type" : "type-6212",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35958,8 +36037,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-6337",
-   "self_type" : "type-6336",
+   "referenced_type" : "type-6360",
+   "self_type" : "type-6359",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35968,8 +36047,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-6426",
-   "self_type" : "type-6425",
+   "referenced_type" : "type-6450",
+   "self_type" : "type-6449",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35978,8 +36057,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-6985",
-   "self_type" : "type-6984",
+   "referenced_type" : "type-7009",
+   "self_type" : "type-7008",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35988,8 +36067,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-7231",
-   "self_type" : "type-7230",
+   "referenced_type" : "type-7254",
+   "self_type" : "type-7253",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35998,8 +36077,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-7370",
-   "self_type" : "type-7369",
+   "referenced_type" : "type-7393",
+   "self_type" : "type-7392",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36008,8 +36087,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-7529",
-   "self_type" : "type-7528",
+   "referenced_type" : "type-7552",
+   "self_type" : "type-7551",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36018,8 +36097,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-7671",
-   "self_type" : "type-7670",
+   "referenced_type" : "type-7694",
+   "self_type" : "type-7693",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36028,8 +36107,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-868",
-   "self_type" : "type-867",
+   "referenced_type" : "type-870",
+   "self_type" : "type-869",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36038,8 +36117,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-1121",
-   "self_type" : "type-1120",
+   "referenced_type" : "type-1125",
+   "self_type" : "type-1124",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36048,8 +36127,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-1299",
-   "self_type" : "type-1298",
+   "referenced_type" : "type-1303",
+   "self_type" : "type-1302",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36058,8 +36137,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-3373",
-   "self_type" : "type-3372",
+   "referenced_type" : "type-3376",
+   "self_type" : "type-3375",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36068,8 +36147,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-3550",
-   "self_type" : "type-3549",
+   "referenced_type" : "type-3553",
+   "self_type" : "type-3552",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36078,8 +36157,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-3724",
-   "self_type" : "type-3723",
+   "referenced_type" : "type-3731",
+   "self_type" : "type-3730",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36088,8 +36167,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-3849",
-   "self_type" : "type-3848",
+   "referenced_type" : "type-3856",
+   "self_type" : "type-3855",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36098,8 +36177,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-4401",
-   "self_type" : "type-4400",
+   "referenced_type" : "type-4407",
+   "self_type" : "type-4406",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36108,8 +36187,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-4609",
-   "self_type" : "type-4608",
+   "referenced_type" : "type-4615",
+   "self_type" : "type-4614",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36118,8 +36197,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-4781",
-   "self_type" : "type-4780",
+   "referenced_type" : "type-4788",
+   "self_type" : "type-4787",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36128,8 +36207,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-5173",
-   "self_type" : "type-5172",
+   "referenced_type" : "type-5191",
+   "self_type" : "type-5190",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36138,8 +36217,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-5434",
-   "self_type" : "type-5433",
+   "referenced_type" : "type-5451",
+   "self_type" : "type-5450",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36158,8 +36237,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-5611",
-   "self_type" : "type-5610",
+   "referenced_type" : "type-5628",
+   "self_type" : "type-5627",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36168,8 +36247,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-5785",
-   "self_type" : "type-5784",
+   "referenced_type" : "type-5806",
+   "self_type" : "type-5805",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36178,8 +36257,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-5910",
-   "self_type" : "type-5909",
+   "referenced_type" : "type-5931",
+   "self_type" : "type-5930",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36188,8 +36267,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-6063",
-   "self_type" : "type-6062",
+   "referenced_type" : "type-6084",
+   "self_type" : "type-6083",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36198,8 +36277,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-6197",
-   "self_type" : "type-6196",
+   "referenced_type" : "type-6217",
+   "self_type" : "type-6216",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36208,8 +36287,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-6341",
-   "self_type" : "type-6340",
+   "referenced_type" : "type-6364",
+   "self_type" : "type-6363",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36218,8 +36297,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-6430",
-   "self_type" : "type-6429",
+   "referenced_type" : "type-6454",
+   "self_type" : "type-6453",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36228,8 +36307,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-6989",
-   "self_type" : "type-6988",
+   "referenced_type" : "type-7013",
+   "self_type" : "type-7012",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36238,8 +36317,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-7235",
-   "self_type" : "type-7234",
+   "referenced_type" : "type-7258",
+   "self_type" : "type-7257",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36248,8 +36327,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-7374",
-   "self_type" : "type-7373",
+   "referenced_type" : "type-7397",
+   "self_type" : "type-7396",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36258,8 +36337,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-7533",
-   "self_type" : "type-7532",
+   "referenced_type" : "type-7556",
+   "self_type" : "type-7555",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36268,8 +36347,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-7675",
-   "self_type" : "type-7674",
+   "referenced_type" : "type-7698",
+   "self_type" : "type-7697",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36288,8 +36367,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-1139",
+   "self_type" : "type-1138",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36298,8 +36377,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-1328",
+   "self_type" : "type-1327",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36308,8 +36387,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3417",
+   "self_type" : "type-3416",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36318,8 +36397,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3576",
+   "self_type" : "type-3575",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36328,8 +36407,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3745",
+   "self_type" : "type-3744",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36338,8 +36417,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3882",
+   "self_type" : "type-3881",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36348,8 +36427,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4435",
+   "self_type" : "type-4434",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36358,8 +36437,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4640",
+   "self_type" : "type-4639",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36368,8 +36447,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4811",
+   "self_type" : "type-4810",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36378,8 +36457,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5216",
+   "self_type" : "type-5215",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36388,8 +36467,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5492",
+   "self_type" : "type-5491",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36398,8 +36477,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5651",
+   "self_type" : "type-5650",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36408,8 +36487,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5820",
+   "self_type" : "type-5819",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36418,8 +36497,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5957",
+   "self_type" : "type-5956",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36428,8 +36507,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6108",
+   "self_type" : "type-6107",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36438,8 +36517,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6240",
+   "self_type" : "type-6239",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36448,8 +36527,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6378",
+   "self_type" : "type-6377",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36468,8 +36547,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6479",
+   "self_type" : "type-6478",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36478,8 +36557,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7044",
+   "self_type" : "type-7043",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36488,8 +36567,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7287",
+   "self_type" : "type-7286",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36498,8 +36577,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7419",
+   "self_type" : "type-7418",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36508,8 +36587,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7568",
+   "self_type" : "type-7567",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36518,8 +36597,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7712",
+   "self_type" : "type-7711",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36538,8 +36617,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-1138",
-   "self_type" : "type-1137",
+   "referenced_type" : "type-1143",
+   "self_type" : "type-1142",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36548,8 +36627,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-1329",
-   "self_type" : "type-1328",
+   "referenced_type" : "type-1334",
+   "self_type" : "type-1333",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36558,8 +36637,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-3418",
-   "self_type" : "type-3417",
+   "referenced_type" : "type-3421",
+   "self_type" : "type-3420",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36568,8 +36647,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-3577",
-   "self_type" : "type-3576",
+   "referenced_type" : "type-3582",
+   "self_type" : "type-3581",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36578,8 +36657,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-3741",
-   "self_type" : "type-3740",
+   "referenced_type" : "type-3749",
+   "self_type" : "type-3748",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36588,8 +36667,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-3880",
-   "self_type" : "type-3879",
+   "referenced_type" : "type-3888",
+   "self_type" : "type-3887",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36598,8 +36677,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-4432",
-   "self_type" : "type-4431",
+   "referenced_type" : "type-4439",
+   "self_type" : "type-4438",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36608,8 +36687,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-4638",
-   "self_type" : "type-4637",
+   "referenced_type" : "type-4644",
+   "self_type" : "type-4643",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36618,8 +36697,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-4808",
-   "self_type" : "type-4807",
+   "referenced_type" : "type-4815",
+   "self_type" : "type-4814",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36628,8 +36707,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-5203",
-   "self_type" : "type-5202",
+   "referenced_type" : "type-5220",
+   "self_type" : "type-5219",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36638,8 +36717,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-5479",
-   "self_type" : "type-5478",
+   "referenced_type" : "type-5496",
+   "self_type" : "type-5495",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36648,8 +36727,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-5638",
-   "self_type" : "type-5637",
+   "referenced_type" : "type-5657",
+   "self_type" : "type-5656",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36658,8 +36737,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-5802",
-   "self_type" : "type-5801",
+   "referenced_type" : "type-5824",
+   "self_type" : "type-5823",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36668,8 +36747,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-5941",
-   "self_type" : "type-5940",
+   "referenced_type" : "type-5963",
+   "self_type" : "type-5962",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36678,8 +36757,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-6092",
-   "self_type" : "type-6091",
+   "referenced_type" : "type-6112",
+   "self_type" : "type-6111",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36688,8 +36767,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-6224",
-   "self_type" : "type-6223",
+   "referenced_type" : "type-6246",
+   "self_type" : "type-6245",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36698,8 +36777,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-6357",
-   "self_type" : "type-6356",
+   "referenced_type" : "type-6382",
+   "self_type" : "type-6381",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36718,8 +36797,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-6460",
-   "self_type" : "type-6459",
+   "referenced_type" : "type-6485",
+   "self_type" : "type-6484",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36728,8 +36807,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-7023",
-   "self_type" : "type-7022",
+   "referenced_type" : "type-7048",
+   "self_type" : "type-7047",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36738,8 +36817,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-7267",
-   "self_type" : "type-7266",
+   "referenced_type" : "type-7291",
+   "self_type" : "type-7290",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36748,8 +36827,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-7400",
-   "self_type" : "type-7399",
+   "referenced_type" : "type-7423",
+   "self_type" : "type-7422",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36758,8 +36837,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-7549",
-   "self_type" : "type-7548",
+   "referenced_type" : "type-7572",
+   "self_type" : "type-7571",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36768,8 +36847,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-7693",
-   "self_type" : "type-7692",
+   "referenced_type" : "type-7716",
+   "self_type" : "type-7715",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36778,8 +36857,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-906",
-   "self_type" : "type-905",
+   "referenced_type" : "type-908",
+   "self_type" : "type-907",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36788,8 +36867,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-1136",
-   "self_type" : "type-1135",
+   "referenced_type" : "type-1141",
+   "self_type" : "type-1140",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36798,8 +36877,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-1327",
-   "self_type" : "type-1326",
+   "referenced_type" : "type-1332",
+   "self_type" : "type-1331",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36808,8 +36887,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-3416",
-   "self_type" : "type-3415",
+   "referenced_type" : "type-3419",
+   "self_type" : "type-3418",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36818,8 +36897,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-3575",
-   "self_type" : "type-3574",
+   "referenced_type" : "type-3580",
+   "self_type" : "type-3579",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36828,8 +36907,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-3739",
-   "self_type" : "type-3738",
+   "referenced_type" : "type-3747",
+   "self_type" : "type-3746",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36838,8 +36917,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-3878",
-   "self_type" : "type-3877",
+   "referenced_type" : "type-3886",
+   "self_type" : "type-3885",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36848,8 +36927,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-4429",
-   "self_type" : "type-4428",
+   "referenced_type" : "type-4437",
+   "self_type" : "type-4436",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36858,8 +36937,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-4636",
-   "self_type" : "type-4635",
+   "referenced_type" : "type-4642",
+   "self_type" : "type-4641",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36868,8 +36947,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-4806",
-   "self_type" : "type-4805",
+   "referenced_type" : "type-4813",
+   "self_type" : "type-4812",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36878,8 +36957,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-5200",
-   "self_type" : "type-5199",
+   "referenced_type" : "type-5218",
+   "self_type" : "type-5217",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36888,8 +36967,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-5477",
-   "self_type" : "type-5476",
+   "referenced_type" : "type-5494",
+   "self_type" : "type-5493",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36898,8 +36977,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-5636",
-   "self_type" : "type-5635",
+   "referenced_type" : "type-5655",
+   "self_type" : "type-5654",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36908,8 +36987,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-5800",
-   "self_type" : "type-5799",
+   "referenced_type" : "type-5822",
+   "self_type" : "type-5821",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36918,8 +36997,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-5939",
-   "self_type" : "type-5938",
+   "referenced_type" : "type-5961",
+   "self_type" : "type-5960",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36928,8 +37007,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-6090",
-   "self_type" : "type-6089",
+   "referenced_type" : "type-6110",
+   "self_type" : "type-6109",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36938,8 +37017,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-6221",
-   "self_type" : "type-6220",
+   "referenced_type" : "type-6244",
+   "self_type" : "type-6243",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36948,8 +37027,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-6355",
-   "self_type" : "type-6354",
+   "referenced_type" : "type-6380",
+   "self_type" : "type-6379",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36968,8 +37047,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-6458",
-   "self_type" : "type-6457",
+   "referenced_type" : "type-6483",
+   "self_type" : "type-6482",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36978,8 +37057,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-7019",
-   "self_type" : "type-7018",
+   "referenced_type" : "type-7046",
+   "self_type" : "type-7045",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36988,8 +37067,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-7265",
-   "self_type" : "type-7264",
+   "referenced_type" : "type-7289",
+   "self_type" : "type-7288",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36998,8 +37077,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-7398",
-   "self_type" : "type-7397",
+   "referenced_type" : "type-7421",
+   "self_type" : "type-7420",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37008,8 +37087,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-7547",
-   "self_type" : "type-7546",
+   "referenced_type" : "type-7570",
+   "self_type" : "type-7569",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37018,8 +37097,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-7691",
-   "self_type" : "type-7690",
+   "referenced_type" : "type-7714",
+   "self_type" : "type-7713",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37028,8 +37107,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-904",
-   "self_type" : "type-903",
+   "referenced_type" : "type-906",
+   "self_type" : "type-905",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37038,8 +37117,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-1132",
-   "self_type" : "type-1131",
+   "referenced_type" : "type-1135",
+   "self_type" : "type-1134",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37048,8 +37127,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-1323",
-   "self_type" : "type-1322",
+   "referenced_type" : "type-1326",
+   "self_type" : "type-1325",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37058,8 +37137,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-3412",
-   "self_type" : "type-3411",
+   "referenced_type" : "type-3415",
+   "self_type" : "type-3414",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37068,8 +37147,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-3571",
-   "self_type" : "type-3570",
+   "referenced_type" : "type-3574",
+   "self_type" : "type-3573",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37078,8 +37157,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-3735",
-   "self_type" : "type-3734",
+   "referenced_type" : "type-3741",
+   "self_type" : "type-3740",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37088,8 +37167,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-3874",
-   "self_type" : "type-3873",
+   "referenced_type" : "type-3880",
+   "self_type" : "type-3879",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37098,8 +37177,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-4425",
-   "self_type" : "type-4424",
+   "referenced_type" : "type-4431",
+   "self_type" : "type-4430",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37108,8 +37187,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-4632",
-   "self_type" : "type-4631",
+   "referenced_type" : "type-4638",
+   "self_type" : "type-4637",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37118,8 +37197,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-4802",
-   "self_type" : "type-4801",
+   "referenced_type" : "type-4809",
+   "self_type" : "type-4808",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37128,8 +37207,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-5196",
-   "self_type" : "type-5195",
+   "referenced_type" : "type-5214",
+   "self_type" : "type-5213",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37138,8 +37217,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-5473",
-   "self_type" : "type-5472",
+   "referenced_type" : "type-5490",
+   "self_type" : "type-5489",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37148,8 +37227,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-5632",
-   "self_type" : "type-5631",
+   "referenced_type" : "type-5649",
+   "self_type" : "type-5648",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37158,8 +37237,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-5796",
-   "self_type" : "type-5795",
+   "referenced_type" : "type-5816",
+   "self_type" : "type-5815",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37168,8 +37247,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-5935",
-   "self_type" : "type-5934",
+   "referenced_type" : "type-5955",
+   "self_type" : "type-5954",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37178,8 +37257,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-6086",
-   "self_type" : "type-6085",
+   "referenced_type" : "type-6106",
+   "self_type" : "type-6105",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37188,8 +37267,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-6217",
-   "self_type" : "type-6216",
+   "referenced_type" : "type-6238",
+   "self_type" : "type-6237",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37198,8 +37277,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-6351",
-   "self_type" : "type-6350",
+   "referenced_type" : "type-6374",
+   "self_type" : "type-6373",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37218,8 +37297,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-6454",
-   "self_type" : "type-6453",
+   "referenced_type" : "type-6477",
+   "self_type" : "type-6476",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37228,8 +37307,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-7015",
-   "self_type" : "type-7014",
+   "referenced_type" : "type-7041",
+   "self_type" : "type-7040",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37238,8 +37317,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-7261",
-   "self_type" : "type-7260",
+   "referenced_type" : "type-7285",
+   "self_type" : "type-7284",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37248,8 +37327,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-7394",
-   "self_type" : "type-7393",
+   "referenced_type" : "type-7417",
+   "self_type" : "type-7416",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37258,8 +37337,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-7543",
-   "self_type" : "type-7542",
+   "referenced_type" : "type-7566",
+   "self_type" : "type-7565",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37268,8 +37347,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-7686",
-   "self_type" : "type-7685",
+   "referenced_type" : "type-7710",
+   "self_type" : "type-7709",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37288,8 +37367,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-1140",
-   "self_type" : "type-1139",
+   "referenced_type" : "type-1145",
+   "self_type" : "type-1144",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37298,8 +37377,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-1333",
-   "self_type" : "type-1332",
+   "referenced_type" : "type-1336",
+   "self_type" : "type-1335",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37308,8 +37387,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-3421",
-   "self_type" : "type-3420",
+   "referenced_type" : "type-3424",
+   "self_type" : "type-3423",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37318,8 +37397,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-3581",
-   "self_type" : "type-3580",
+   "referenced_type" : "type-3584",
+   "self_type" : "type-3583",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37328,8 +37407,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-3743",
-   "self_type" : "type-3742",
+   "referenced_type" : "type-3751",
+   "self_type" : "type-3750",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37338,8 +37417,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-3884",
-   "self_type" : "type-3883",
+   "referenced_type" : "type-3890",
+   "self_type" : "type-3889",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37348,8 +37427,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-4434",
-   "self_type" : "type-4433",
+   "referenced_type" : "type-4441",
+   "self_type" : "type-4440",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37358,8 +37437,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-4640",
-   "self_type" : "type-4639",
+   "referenced_type" : "type-4646",
+   "self_type" : "type-4645",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37368,8 +37447,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-4810",
-   "self_type" : "type-4809",
+   "referenced_type" : "type-4817",
+   "self_type" : "type-4816",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37378,8 +37457,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-5205",
-   "self_type" : "type-5204",
+   "referenced_type" : "type-5222",
+   "self_type" : "type-5221",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37388,8 +37467,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-5482",
-   "self_type" : "type-5481",
+   "referenced_type" : "type-5499",
+   "self_type" : "type-5498",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37398,8 +37477,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-5642",
-   "self_type" : "type-5641",
+   "referenced_type" : "type-5659",
+   "self_type" : "type-5658",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37408,8 +37487,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-5804",
-   "self_type" : "type-5803",
+   "referenced_type" : "type-5826",
+   "self_type" : "type-5825",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37418,8 +37497,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-5945",
-   "self_type" : "type-5944",
+   "referenced_type" : "type-5965",
+   "self_type" : "type-5964",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37428,8 +37507,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-6094",
-   "self_type" : "type-6093",
+   "referenced_type" : "type-6114",
+   "self_type" : "type-6113",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37438,8 +37517,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-6228",
-   "self_type" : "type-6227",
+   "referenced_type" : "type-6248",
+   "self_type" : "type-6247",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37448,8 +37527,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-6359",
-   "self_type" : "type-6358",
+   "referenced_type" : "type-6384",
+   "self_type" : "type-6383",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37458,8 +37537,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-6464",
-   "self_type" : "type-6463",
+   "referenced_type" : "type-6487",
+   "self_type" : "type-6486",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37478,8 +37557,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-7025",
-   "self_type" : "type-7024",
+   "referenced_type" : "type-7050",
+   "self_type" : "type-7049",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37488,8 +37567,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-7269",
-   "self_type" : "type-7268",
+   "referenced_type" : "type-7293",
+   "self_type" : "type-7292",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37498,8 +37577,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-7402",
-   "self_type" : "type-7401",
+   "referenced_type" : "type-7425",
+   "self_type" : "type-7424",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37508,8 +37587,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-7551",
-   "self_type" : "type-7550",
+   "referenced_type" : "type-7574",
+   "self_type" : "type-7573",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37518,8 +37597,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-7695",
-   "self_type" : "type-7694",
+   "referenced_type" : "type-7718",
+   "self_type" : "type-7717",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37538,8 +37617,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-1153",
+   "self_type" : "type-1152",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37548,8 +37627,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-1346",
+   "self_type" : "type-1345",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37558,8 +37637,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3437",
+   "self_type" : "type-3436",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37568,8 +37647,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3592",
+   "self_type" : "type-3591",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37578,8 +37657,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3759",
+   "self_type" : "type-3758",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37588,8 +37667,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3901",
+   "self_type" : "type-3900",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37598,8 +37677,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4449",
+   "self_type" : "type-4448",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37608,8 +37687,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4655",
+   "self_type" : "type-4654",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37618,8 +37697,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4825",
+   "self_type" : "type-4824",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37628,8 +37707,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "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"
   },
@@ -37638,8 +37717,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5234",
+   "self_type" : "type-5233",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37648,8 +37727,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5512",
+   "self_type" : "type-5511",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37658,8 +37737,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5667",
+   "self_type" : "type-5666",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37668,8 +37747,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5834",
+   "self_type" : "type-5833",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37678,8 +37757,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5976",
+   "self_type" : "type-5975",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37688,8 +37767,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6123",
+   "self_type" : "type-6122",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37698,8 +37777,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6256",
+   "self_type" : "type-6255",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37708,8 +37787,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6392",
+   "self_type" : "type-6391",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/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-6497",
+   "self_type" : "type-6496",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37728,8 +37817,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7058",
+   "self_type" : "type-7057",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37738,8 +37827,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7302",
+   "self_type" : "type-7301",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37748,8 +37837,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7433",
+   "self_type" : "type-7432",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37758,18 +37847,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7582",
+   "self_type" : "type-7581",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37788,8 +37867,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-1148",
-   "self_type" : "type-1147",
+   "referenced_type" : "type-1151",
+   "self_type" : "type-1150",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37798,8 +37877,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-1341",
-   "self_type" : "type-1340",
+   "referenced_type" : "type-1344",
+   "self_type" : "type-1343",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37808,8 +37887,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-3432",
-   "self_type" : "type-3431",
+   "referenced_type" : "type-3435",
+   "self_type" : "type-3434",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37818,8 +37897,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-3587",
-   "self_type" : "type-3586",
+   "referenced_type" : "type-3590",
+   "self_type" : "type-3589",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37828,8 +37907,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-3751",
-   "self_type" : "type-3750",
+   "referenced_type" : "type-3757",
+   "self_type" : "type-3756",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37838,8 +37917,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-3893",
-   "self_type" : "type-3892",
+   "referenced_type" : "type-3899",
+   "self_type" : "type-3898",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37848,8 +37927,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-4441",
-   "self_type" : "type-4440",
+   "referenced_type" : "type-4447",
+   "self_type" : "type-4446",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37858,8 +37937,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-4646",
-   "self_type" : "type-4645",
+   "referenced_type" : "type-4653",
+   "self_type" : "type-4652",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37868,8 +37947,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-4817",
-   "self_type" : "type-4816",
+   "referenced_type" : "type-4823",
+   "self_type" : "type-4822",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37878,8 +37957,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-5213",
-   "self_type" : "type-5212",
+   "referenced_type" : "type-5067",
+   "self_type" : "type-5066",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37888,8 +37967,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-5493",
-   "self_type" : "type-5492",
+   "referenced_type" : "type-5232",
+   "self_type" : "type-5231",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37898,8 +37977,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-5648",
-   "self_type" : "type-5647",
+   "referenced_type" : "type-5510",
+   "self_type" : "type-5509",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37908,8 +37987,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-5812",
-   "self_type" : "type-5811",
+   "referenced_type" : "type-5665",
+   "self_type" : "type-5664",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37918,8 +37997,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-5954",
-   "self_type" : "type-5953",
+   "referenced_type" : "type-5832",
+   "self_type" : "type-5831",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37928,8 +38007,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-6101",
-   "self_type" : "type-6100",
+   "referenced_type" : "type-5974",
+   "self_type" : "type-5973",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37938,8 +38017,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-6234",
-   "self_type" : "type-6233",
+   "referenced_type" : "type-6121",
+   "self_type" : "type-6120",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37948,8 +38027,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-6367",
-   "self_type" : "type-6366",
+   "referenced_type" : "type-6254",
+   "self_type" : "type-6253",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37958,8 +38037,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6390",
+   "self_type" : "type-6389",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-6495",
+   "self_type" : "type-6494",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37978,8 +38067,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-7033",
-   "self_type" : "type-7032",
+   "referenced_type" : "type-7056",
+   "self_type" : "type-7055",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37988,8 +38077,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-7276",
-   "self_type" : "type-7275",
+   "referenced_type" : "type-7300",
+   "self_type" : "type-7299",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37998,8 +38087,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-7408",
-   "self_type" : "type-7407",
+   "referenced_type" : "type-7431",
+   "self_type" : "type-7430",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38008,18 +38097,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-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",
+   "referenced_type" : "type-7580",
+   "self_type" : "type-7579",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38038,8 +38117,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-1146",
-   "self_type" : "type-1145",
+   "referenced_type" : "type-1149",
+   "self_type" : "type-1148",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38048,8 +38127,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-1339",
-   "self_type" : "type-1338",
+   "referenced_type" : "type-1342",
+   "self_type" : "type-1341",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38058,8 +38137,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-3430",
-   "self_type" : "type-3429",
+   "referenced_type" : "type-3433",
+   "self_type" : "type-3432",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38068,8 +38147,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-3585",
-   "self_type" : "type-3584",
+   "referenced_type" : "type-3588",
+   "self_type" : "type-3587",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38078,8 +38157,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-3749",
-   "self_type" : "type-3748",
+   "referenced_type" : "type-3755",
+   "self_type" : "type-3754",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38088,8 +38167,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-3891",
-   "self_type" : "type-3890",
+   "referenced_type" : "type-3897",
+   "self_type" : "type-3896",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38098,8 +38177,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-4439",
-   "self_type" : "type-4438",
+   "referenced_type" : "type-4445",
+   "self_type" : "type-4444",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38108,8 +38187,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-4644",
-   "self_type" : "type-4643",
+   "referenced_type" : "type-4650",
+   "self_type" : "type-4649",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38118,8 +38197,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-4815",
-   "self_type" : "type-4814",
+   "referenced_type" : "type-4821",
+   "self_type" : "type-4820",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38128,8 +38207,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-5211",
-   "self_type" : "type-5210",
+   "referenced_type" : "type-5065",
+   "self_type" : "type-5064",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38138,8 +38217,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-5491",
-   "self_type" : "type-5490",
+   "referenced_type" : "type-5229",
+   "self_type" : "type-5228",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38148,8 +38227,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-5646",
-   "self_type" : "type-5645",
+   "referenced_type" : "type-5508",
+   "self_type" : "type-5507",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38158,8 +38237,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-5810",
-   "self_type" : "type-5809",
+   "referenced_type" : "type-5663",
+   "self_type" : "type-5662",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38168,8 +38247,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-5952",
-   "self_type" : "type-5951",
+   "referenced_type" : "type-5830",
+   "self_type" : "type-5829",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38178,8 +38257,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-6099",
-   "self_type" : "type-6098",
+   "referenced_type" : "type-5972",
+   "self_type" : "type-5971",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38188,8 +38267,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-6232",
-   "self_type" : "type-6231",
+   "referenced_type" : "type-6119",
+   "self_type" : "type-6118",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38198,8 +38277,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-6365",
-   "self_type" : "type-6364",
+   "referenced_type" : "type-6252",
+   "self_type" : "type-6251",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38208,8 +38287,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6388",
+   "self_type" : "type-6387",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-6493",
+   "self_type" : "type-6492",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38228,8 +38317,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-7031",
-   "self_type" : "type-7030",
+   "referenced_type" : "type-7054",
+   "self_type" : "type-7053",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38238,8 +38327,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-7274",
-   "self_type" : "type-7273",
+   "referenced_type" : "type-7298",
+   "self_type" : "type-7297",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38248,8 +38337,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-7406",
-   "self_type" : "type-7405",
+   "referenced_type" : "type-7429",
+   "self_type" : "type-7428",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38258,18 +38347,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-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",
+   "referenced_type" : "type-7578",
+   "self_type" : "type-7577",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38288,8 +38367,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-1144",
-   "self_type" : "type-1143",
+   "referenced_type" : "type-1147",
+   "self_type" : "type-1146",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38298,8 +38377,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-1337",
-   "self_type" : "type-1336",
+   "referenced_type" : "type-1340",
+   "self_type" : "type-1339",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38308,8 +38387,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-3428",
-   "self_type" : "type-3427",
+   "referenced_type" : "type-3431",
+   "self_type" : "type-3430",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38318,8 +38397,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-3583",
-   "self_type" : "type-3582",
+   "referenced_type" : "type-3586",
+   "self_type" : "type-3585",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38328,8 +38407,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-3747",
-   "self_type" : "type-3746",
+   "referenced_type" : "type-3753",
+   "self_type" : "type-3752",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38338,8 +38417,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-3889",
-   "self_type" : "type-3888",
+   "referenced_type" : "type-3895",
+   "self_type" : "type-3894",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38348,8 +38427,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-4437",
-   "self_type" : "type-4436",
+   "referenced_type" : "type-4443",
+   "self_type" : "type-4442",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38358,8 +38437,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-4642",
-   "self_type" : "type-4641",
+   "referenced_type" : "type-4648",
+   "self_type" : "type-4647",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38368,8 +38447,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-4813",
-   "self_type" : "type-4812",
+   "referenced_type" : "type-4819",
+   "self_type" : "type-4818",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38378,8 +38457,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-5209",
-   "self_type" : "type-5208",
+   "referenced_type" : "type-5227",
+   "self_type" : "type-5226",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38388,8 +38467,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-5489",
-   "self_type" : "type-5488",
+   "referenced_type" : "type-5506",
+   "self_type" : "type-5505",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38398,8 +38477,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-5644",
-   "self_type" : "type-5643",
+   "referenced_type" : "type-5661",
+   "self_type" : "type-5660",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38408,8 +38487,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-5808",
-   "self_type" : "type-5807",
+   "referenced_type" : "type-5828",
+   "self_type" : "type-5827",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38418,8 +38497,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-5950",
-   "self_type" : "type-5949",
+   "referenced_type" : "type-5970",
+   "self_type" : "type-5969",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38428,8 +38507,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-6097",
-   "self_type" : "type-6096",
+   "referenced_type" : "type-6117",
+   "self_type" : "type-6116",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38438,8 +38517,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-6230",
-   "self_type" : "type-6229",
+   "referenced_type" : "type-6250",
+   "self_type" : "type-6249",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38448,8 +38527,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-6363",
-   "self_type" : "type-6362",
+   "referenced_type" : "type-6386",
+   "self_type" : "type-6385",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38458,8 +38537,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-6468",
-   "self_type" : "type-6467",
+   "referenced_type" : "type-6491",
+   "self_type" : "type-6490",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38478,8 +38557,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-7029",
-   "self_type" : "type-7028",
+   "referenced_type" : "type-7052",
+   "self_type" : "type-7051",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38488,8 +38567,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-7272",
-   "self_type" : "type-7271",
+   "referenced_type" : "type-7296",
+   "self_type" : "type-7295",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38498,8 +38577,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-7404",
-   "self_type" : "type-7403",
+   "referenced_type" : "type-7427",
+   "self_type" : "type-7426",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38508,8 +38587,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-7553",
-   "self_type" : "type-7552",
+   "referenced_type" : "type-7576",
+   "self_type" : "type-7575",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38518,8 +38597,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-7698",
-   "self_type" : "type-7697",
+   "referenced_type" : "type-7720",
+   "self_type" : "type-7719",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38538,8 +38617,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-1152",
-   "self_type" : "type-1151",
+   "referenced_type" : "type-1155",
+   "self_type" : "type-1154",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38548,8 +38627,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-1345",
-   "self_type" : "type-1344",
+   "referenced_type" : "type-1348",
+   "self_type" : "type-1347",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38558,8 +38637,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-3436",
-   "self_type" : "type-3435",
+   "referenced_type" : "type-3439",
+   "self_type" : "type-3438",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38568,8 +38647,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-3591",
-   "self_type" : "type-3590",
+   "referenced_type" : "type-3594",
+   "self_type" : "type-3593",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38578,8 +38657,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-3755",
-   "self_type" : "type-3754",
+   "referenced_type" : "type-3761",
+   "self_type" : "type-3760",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38588,8 +38667,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-3897",
-   "self_type" : "type-3896",
+   "referenced_type" : "type-3903",
+   "self_type" : "type-3902",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38598,8 +38677,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-4445",
-   "self_type" : "type-4444",
+   "referenced_type" : "type-4451",
+   "self_type" : "type-4450",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38608,8 +38687,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-4650",
-   "self_type" : "type-4649",
+   "referenced_type" : "type-4657",
+   "self_type" : "type-4656",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38618,8 +38697,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-4821",
-   "self_type" : "type-4820",
+   "referenced_type" : "type-4827",
+   "self_type" : "type-4826",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38628,8 +38707,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-5218",
-   "self_type" : "type-5217",
+   "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"
   },
@@ -38638,8 +38717,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-5497",
-   "self_type" : "type-5496",
+   "referenced_type" : "type-5236",
+   "self_type" : "type-5235",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38648,8 +38727,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-5652",
-   "self_type" : "type-5651",
+   "referenced_type" : "type-5514",
+   "self_type" : "type-5513",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38658,8 +38737,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-5816",
-   "self_type" : "type-5815",
+   "referenced_type" : "type-5669",
+   "self_type" : "type-5668",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38668,8 +38747,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-5958",
-   "self_type" : "type-5957",
+   "referenced_type" : "type-5836",
+   "self_type" : "type-5835",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38678,8 +38757,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-6105",
-   "self_type" : "type-6104",
+   "referenced_type" : "type-5978",
+   "self_type" : "type-5977",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38688,8 +38767,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-6238",
-   "self_type" : "type-6237",
+   "referenced_type" : "type-6125",
+   "self_type" : "type-6124",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38698,8 +38777,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-6371",
-   "self_type" : "type-6370",
+   "referenced_type" : "type-6258",
+   "self_type" : "type-6257",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38708,8 +38787,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6394",
+   "self_type" : "type-6393",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/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-6499",
+   "self_type" : "type-6498",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38728,8 +38817,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-7037",
-   "self_type" : "type-7036",
+   "referenced_type" : "type-7060",
+   "self_type" : "type-7059",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38738,8 +38827,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-7280",
-   "self_type" : "type-7279",
+   "referenced_type" : "type-7304",
+   "self_type" : "type-7303",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38748,8 +38837,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-7412",
-   "self_type" : "type-7411",
+   "referenced_type" : "type-7435",
+   "self_type" : "type-7434",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38758,18 +38847,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-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",
+   "referenced_type" : "type-7584",
+   "self_type" : "type-7583",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38798,8 +38877,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-1113",
-   "self_type" : "type-1112",
+   "referenced_type" : "type-1116",
+   "self_type" : "type-1115",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38808,8 +38887,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-1290",
-   "self_type" : "type-1289",
+   "referenced_type" : "type-1293",
+   "self_type" : "type-1292",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38818,8 +38897,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-3355",
-   "self_type" : "type-3354",
+   "referenced_type" : "type-3358",
+   "self_type" : "type-3357",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38828,8 +38907,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-3542",
-   "self_type" : "type-3541",
+   "referenced_type" : "type-3545",
+   "self_type" : "type-3544",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38838,8 +38917,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-3651",
-   "self_type" : "type-3650",
+   "referenced_type" : "type-3654",
+   "self_type" : "type-3653",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38848,8 +38927,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-3715",
-   "self_type" : "type-3714",
+   "referenced_type" : "type-3722",
+   "self_type" : "type-3721",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38858,8 +38937,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-3839",
-   "self_type" : "type-3838",
+   "referenced_type" : "type-3845",
+   "self_type" : "type-3844",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38868,8 +38947,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-4393",
-   "self_type" : "type-4392",
+   "referenced_type" : "type-4401",
+   "self_type" : "type-4400",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38878,8 +38957,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-4508",
-   "self_type" : "type-4507",
+   "referenced_type" : "type-4515",
+   "self_type" : "type-4514",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38888,8 +38967,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-4544",
-   "self_type" : "type-4543",
+   "referenced_type" : "type-4553",
+   "self_type" : "type-4552",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38898,8 +38977,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-4603",
-   "self_type" : "type-4602",
+   "referenced_type" : "type-4609",
+   "self_type" : "type-4608",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38908,8 +38987,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-4773",
-   "self_type" : "type-4772",
+   "referenced_type" : "type-4780",
+   "self_type" : "type-4779",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38918,8 +38997,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-4851",
-   "self_type" : "type-4850",
+   "referenced_type" : "type-4857",
+   "self_type" : "type-4856",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38928,8 +39007,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-5112",
-   "self_type" : "type-5111",
+   "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"
   },
@@ -38938,8 +39017,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5128",
+   "self_type" : "type-5127",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-5184",
+   "self_type" : "type-5183",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38958,8 +39047,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-5416",
-   "self_type" : "type-5415",
+   "referenced_type" : "type-5433",
+   "self_type" : "type-5432",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38968,8 +39057,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-5603",
-   "self_type" : "type-5602",
+   "referenced_type" : "type-5620",
+   "self_type" : "type-5619",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38978,8 +39067,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-5712",
-   "self_type" : "type-5711",
+   "referenced_type" : "type-5729",
+   "self_type" : "type-5728",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38988,8 +39077,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-5776",
-   "self_type" : "type-5775",
+   "referenced_type" : "type-5797",
+   "self_type" : "type-5796",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38998,8 +39087,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-5900",
-   "self_type" : "type-5899",
+   "referenced_type" : "type-5920",
+   "self_type" : "type-5919",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39008,8 +39097,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-6056",
-   "self_type" : "type-6055",
+   "referenced_type" : "type-6077",
+   "self_type" : "type-6076",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39018,8 +39107,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-6189",
-   "self_type" : "type-6188",
+   "referenced_type" : "type-6209",
+   "self_type" : "type-6208",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39028,8 +39117,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-6285",
-   "self_type" : "type-6284",
+   "referenced_type" : "type-6305",
+   "self_type" : "type-6304",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39038,8 +39127,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-6331",
-   "self_type" : "type-6330",
+   "referenced_type" : "type-6355",
+   "self_type" : "type-6354",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39048,8 +39137,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-6423",
-   "self_type" : "type-6422",
+   "referenced_type" : "type-6447",
+   "self_type" : "type-6446",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39058,8 +39147,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-6979",
-   "self_type" : "type-6978",
+   "referenced_type" : "type-7005",
+   "self_type" : "type-7004",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39068,8 +39157,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-7098",
-   "self_type" : "type-7097",
+   "referenced_type" : "type-7123",
+   "self_type" : "type-7122",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39078,8 +39167,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-7149",
-   "self_type" : "type-7148",
+   "referenced_type" : "type-7174",
+   "self_type" : "type-7173",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39088,8 +39177,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-7227",
-   "self_type" : "type-7226",
+   "referenced_type" : "type-7252",
+   "self_type" : "type-7251",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39098,8 +39187,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-7368",
-   "self_type" : "type-7367",
+   "referenced_type" : "type-7391",
+   "self_type" : "type-7390",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39108,8 +39197,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-7432",
-   "self_type" : "type-7431",
+   "referenced_type" : "type-7457",
+   "self_type" : "type-7456",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39118,8 +39207,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-7472",
-   "self_type" : "type-7471",
+   "referenced_type" : "type-7496",
+   "self_type" : "type-7495",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39128,8 +39217,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-7563",
-   "self_type" : "type-7562",
+   "referenced_type" : "type-7586",
+   "self_type" : "type-7585",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39138,18 +39227,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-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",
+   "referenced_type" : "type-7626",
+   "self_type" : "type-7625",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39168,8 +39247,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-4760",
-   "self_type" : "type-4759",
+   "referenced_type" : "type-4767",
+   "self_type" : "type-4766",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39178,8 +39257,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-4864",
-   "self_type" : "type-4863",
+   "referenced_type" : "type-4870",
+   "self_type" : "type-4869",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39188,8 +39267,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-5071",
-   "self_type" : "type-5070",
+   "referenced_type" : "type-5087",
+   "self_type" : "type-5086",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39198,8 +39277,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-5124",
-   "self_type" : "type-5123",
+   "referenced_type" : "type-5140",
+   "self_type" : "type-5139",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39208,8 +39287,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-7358",
-   "self_type" : "type-7357",
+   "referenced_type" : "type-7381",
+   "self_type" : "type-7380",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39218,8 +39297,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-7451",
-   "self_type" : "type-7450",
+   "referenced_type" : "type-7476",
+   "self_type" : "type-7475",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39228,8 +39307,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-7579",
-   "self_type" : "type-7578",
+   "referenced_type" : "type-7603",
+   "self_type" : "type-7602",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39238,8 +39317,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-2644",
-   "self_type" : "type-2643",
+   "referenced_type" : "type-2647",
+   "self_type" : "type-2646",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39248,8 +39327,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-4988",
-   "self_type" : "type-4987",
+   "referenced_type" : "type-4994",
+   "self_type" : "type-4993",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39258,8 +39337,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-6020",
-   "self_type" : "type-6019",
+   "referenced_type" : "type-6042",
+   "self_type" : "type-6041",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39268,8 +39347,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-7514",
-   "self_type" : "type-7513",
+   "referenced_type" : "type-7530",
+   "self_type" : "type-7529",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39278,8 +39357,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-2640",
-   "self_type" : "type-2639",
+   "referenced_type" : "type-2643",
+   "self_type" : "type-2642",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39288,8 +39367,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-4984",
-   "self_type" : "type-4983",
+   "referenced_type" : "type-4990",
+   "self_type" : "type-4989",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39298,8 +39377,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-6017",
-   "self_type" : "type-6016",
+   "referenced_type" : "type-6037",
+   "self_type" : "type-6036",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39308,8 +39387,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-7498",
-   "self_type" : "type-7497",
+   "referenced_type" : "type-7517",
+   "self_type" : "type-7516",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39318,8 +39397,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-4753",
-   "self_type" : "type-4752",
+   "referenced_type" : "type-4759",
+   "self_type" : "type-4758",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39328,8 +39407,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-4860",
-   "self_type" : "type-4859",
+   "referenced_type" : "type-4866",
+   "self_type" : "type-4865",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39338,8 +39417,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-5060",
-   "self_type" : "type-5059",
+   "referenced_type" : "type-5077",
+   "self_type" : "type-5076",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39348,8 +39427,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-5120",
-   "self_type" : "type-5119",
+   "referenced_type" : "type-5136",
+   "self_type" : "type-5135",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39358,8 +39437,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-7352",
-   "self_type" : "type-7351",
+   "referenced_type" : "type-7375",
+   "self_type" : "type-7374",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39368,8 +39447,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-7447",
-   "self_type" : "type-7446",
+   "referenced_type" : "type-7470",
+   "self_type" : "type-7469",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39378,8 +39457,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-7569",
-   "self_type" : "type-7568",
+   "referenced_type" : "type-7594",
+   "self_type" : "type-7593",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39388,8 +39467,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-1644",
-   "self_type" : "type-1643",
+   "referenced_type" : "type-1647",
+   "self_type" : "type-1646",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -39398,8 +39477,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-4105",
-   "self_type" : "type-4104",
+   "referenced_type" : "type-4112",
+   "self_type" : "type-4111",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -39408,8 +39487,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-6678",
-   "self_type" : "type-6677",
+   "referenced_type" : "type-6701",
+   "self_type" : "type-6700",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -39428,8 +39507,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1108",
-   "self_type" : "type-1107",
+   "referenced_type" : "type-1111",
+   "self_type" : "type-1110",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39438,8 +39517,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1280",
-   "self_type" : "type-1279",
+   "referenced_type" : "type-1283",
+   "self_type" : "type-1282",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39448,8 +39527,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-3275",
+   "self_type" : "type-3274",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39458,8 +39537,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-3539",
+   "self_type" : "type-3538",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39468,8 +39547,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-3649",
+   "self_type" : "type-3648",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39478,8 +39557,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-3715",
+   "self_type" : "type-3714",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39488,8 +39567,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-3837",
+   "self_type" : "type-3836",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39508,8 +39587,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-4358",
+   "self_type" : "type-4357",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39518,8 +39597,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-4493",
+   "self_type" : "type-4492",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39528,8 +39607,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-4562",
+   "self_type" : "type-4561",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39538,8 +39617,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-4624",
+   "self_type" : "type-4623",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39548,8 +39627,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-4667",
+   "self_type" : "type-4666",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39558,8 +39637,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-4874",
+   "self_type" : "type-4873",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39568,8 +39647,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-5144",
+   "self_type" : "type-5143",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39578,8 +39657,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-5174",
+   "self_type" : "type-5173",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39588,8 +39667,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-5350",
+   "self_type" : "type-5349",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39598,8 +39677,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-5614",
+   "self_type" : "type-5613",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39608,8 +39687,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-5724",
+   "self_type" : "type-5723",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39618,8 +39697,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-5790",
+   "self_type" : "type-5789",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39628,8 +39707,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-5912",
+   "self_type" : "type-5911",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39638,8 +39717,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6067",
+   "self_type" : "type-6066",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39648,8 +39727,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6204",
+   "self_type" : "type-6203",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39658,8 +39737,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6300",
+   "self_type" : "type-6299",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39668,8 +39747,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6347",
+   "self_type" : "type-6346",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39678,8 +39757,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6439",
+   "self_type" : "type-6438",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39688,8 +39767,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6960",
+   "self_type" : "type-6959",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39698,8 +39777,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7098",
+   "self_type" : "type-7097",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39708,8 +39787,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7187",
+   "self_type" : "type-7186",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39718,8 +39797,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7268",
+   "self_type" : "type-7267",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39728,8 +39807,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7313",
+   "self_type" : "type-7312",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39738,8 +39817,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7481",
+   "self_type" : "type-7480",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39748,8 +39827,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7506",
+   "self_type" : "type-7505",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39758,8 +39837,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7511",
+   "self_type" : "type-7510",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39768,8 +39847,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7639",
+   "self_type" : "type-7638",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39778,8 +39857,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7650",
+   "self_type" : "type-7649",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39798,8 +39877,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-4376",
-   "self_type" : "type-4375",
+   "referenced_type" : "type-4383",
+   "self_type" : "type-4382",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -39808,8 +39887,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-4505",
-   "self_type" : "type-4504",
+   "referenced_type" : "type-4511",
+   "self_type" : "type-4510",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -39818,8 +39897,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-6960",
-   "self_type" : "type-6959",
+   "referenced_type" : "type-6984",
+   "self_type" : "type-6983",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -39828,8 +39907,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-7093",
-   "self_type" : "type-7092",
+   "referenced_type" : "type-7118",
+   "self_type" : "type-7117",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -39869,7 +39948,7 @@
    "linker_set_key" : "const unsigned short",
    "name" : "const unsigned short",
    "referenced_type" : "type-497",
-   "self_type" : "type-2520",
+   "self_type" : "type-2523",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39897,7 +39976,7 @@
    "linker_set_key" : "volatile int",
    "name" : "volatile int",
    "referenced_type" : "type-4",
-   "self_type" : "type-1250",
+   "self_type" : "type-1253",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h"
   }
@@ -39915,7 +39994,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -39930,8 +40009,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_BALANCETYPE",
    "name" : "OMX_AUDIO_CONFIG_BALANCETYPE",
-   "referenced_type" : "type-2184",
-   "self_type" : "type-2184",
+   "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_BALANCETYPE"
@@ -39947,7 +40026,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -39957,7 +40036,7 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nBass",
@@ -39967,8 +40046,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_BASSTYPE",
    "name" : "OMX_AUDIO_CONFIG_BASSTYPE",
-   "referenced_type" : "type-2188",
-   "self_type" : "type-2188",
+   "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_BASSTYPE"
@@ -39984,7 +40063,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -39999,18 +40078,18 @@
     {
      "field_name" : "bMute",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bIsMIDI",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
    "name" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
-   "referenced_type" : "type-2186",
-   "self_type" : "type-2186",
+   "referenced_type" : "type-2189",
+   "self_type" : "type-2189",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE"
@@ -40026,7 +40105,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40041,23 +40120,23 @@
     {
      "field_name" : "bLinear",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "sVolume",
      "field_offset" : 160,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     },
     {
      "field_name" : "bIsMIDI",
      "field_offset" : 256,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
    "name" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
-   "referenced_type" : "type-2183",
-   "self_type" : "type-2183",
+   "referenced_type" : "type-2186",
+   "self_type" : "type-2186",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE"
@@ -40073,7 +40152,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40083,17 +40162,17 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "sDelay",
      "field_offset" : 128,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "sModulationRate",
      "field_offset" : 224,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "nModulationDepth",
@@ -40103,13 +40182,13 @@
     {
      "field_name" : "nFeedback",
      "field_offset" : 352,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
    "name" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
-   "referenced_type" : "type-2194",
-   "self_type" : "type-2194",
+   "referenced_type" : "type-2197",
+   "self_type" : "type-2197",
    "size" : 56,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHORUSTYPE"
@@ -40125,7 +40204,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40135,13 +40214,13 @@
     {
      "field_name" : "eEchoCancelation",
      "field_offset" : 96,
-     "referenced_type" : "type-2196"
+     "referenced_type" : "type-2199"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
-   "referenced_type" : "type-2197",
-   "self_type" : "type-2197",
+   "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_ECHOCANCELATIONTYPE"
@@ -40157,7 +40236,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40167,28 +40246,28 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "sBandIndex",
      "field_offset" : 128,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "sCenterFreq",
      "field_offset" : 224,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "sBandLevel",
      "field_offset" : 320,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
    "name" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
-   "referenced_type" : "type-2191",
-   "self_type" : "type-2191",
+   "referenced_type" : "type-2194",
+   "self_type" : "type-2194",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE"
@@ -40204,7 +40283,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40214,13 +40293,13 @@
     {
      "field_name" : "bLoudness",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
    "name" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
-   "referenced_type" : "type-2187",
-   "self_type" : "type-2187",
+   "referenced_type" : "type-2190",
+   "self_type" : "type-2190",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE"
@@ -40236,7 +40315,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40246,17 +40325,17 @@
     {
      "field_name" : "sPitchTransposition",
      "field_offset" : 96,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     },
     {
      "field_name" : "sPlayBackRate",
      "field_offset" : 192,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "sTempo",
      "field_offset" : 288,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "nMaxPolyphony",
@@ -40306,8 +40385,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
-   "referenced_type" : "type-2165",
-   "self_type" : "type-2165",
+   "referenced_type" : "type-2157",
+   "self_type" : "type-2157",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE"
@@ -40323,7 +40402,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40338,13 +40417,13 @@
     {
      "field_name" : "nMidiEvents",
      "field_offset" : 128,
-     "referenced_type" : "type-1572"
+     "referenced_type" : "type-1567"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
-   "referenced_type" : "type-2143",
-   "self_type" : "type-2143",
+   "referenced_type" : "type-2135",
+   "self_type" : "type-2135",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE"
@@ -40360,7 +40439,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40380,13 +40459,13 @@
     {
      "field_name" : "nData",
      "field_offset" : 160,
-     "referenced_type" : "type-1572"
+     "referenced_type" : "type-1567"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
-   "referenced_type" : "type-2181",
-   "self_type" : "type-2181",
+   "referenced_type" : "type-2184",
+   "self_type" : "type-2184",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE"
@@ -40402,7 +40481,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40437,8 +40516,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
-   "referenced_type" : "type-2176",
-   "self_type" : "type-2176",
+   "referenced_type" : "type-2179",
+   "self_type" : "type-2179",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE"
@@ -40454,7 +40533,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40484,8 +40563,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
-   "referenced_type" : "type-2154",
-   "self_type" : "type-2154",
+   "referenced_type" : "type-2146",
+   "self_type" : "type-2146",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE"
@@ -40501,7 +40580,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40526,7 +40605,7 @@
     {
      "field_name" : "bVibra",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nNumMetaEvents",
@@ -40541,13 +40620,13 @@
     {
      "field_name" : "eMIDIPlayBackState",
      "field_offset" : 288,
-     "referenced_type" : "type-2169"
+     "referenced_type" : "type-2168"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
-   "referenced_type" : "type-2170",
-   "self_type" : "type-2170",
+   "referenced_type" : "type-2173",
+   "self_type" : "type-2173",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE"
@@ -40563,7 +40642,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40573,13 +40652,13 @@
     {
      "field_name" : "bMute",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MUTETYPE",
    "name" : "OMX_AUDIO_CONFIG_MUTETYPE",
-   "referenced_type" : "type-2185",
-   "self_type" : "type-2185",
+   "referenced_type" : "type-2188",
+   "self_type" : "type-2188",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MUTETYPE"
@@ -40595,7 +40674,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40605,13 +40684,13 @@
     {
      "field_name" : "bNoiseReduction",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
-   "referenced_type" : "type-2198",
-   "self_type" : "type-2198",
+   "referenced_type" : "type-2201",
+   "self_type" : "type-2201",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE"
@@ -40627,7 +40706,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40637,47 +40716,47 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "sRoomLevel",
      "field_offset" : 128,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     },
     {
      "field_name" : "sRoomHighFreqLevel",
      "field_offset" : 224,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     },
     {
      "field_name" : "sReflectionsLevel",
      "field_offset" : 320,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     },
     {
      "field_name" : "sReflectionsDelay",
      "field_offset" : 416,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "sReverbLevel",
      "field_offset" : 512,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     },
     {
      "field_name" : "sReverbDelay",
      "field_offset" : 608,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "sDecayTime",
      "field_offset" : 704,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "nDecayHighFreqRatio",
      "field_offset" : 800,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "nDensity",
@@ -40692,13 +40771,13 @@
     {
      "field_name" : "sReferenceHighFreq",
      "field_offset" : 960,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
-   "referenced_type" : "type-2195",
-   "self_type" : "type-2195",
+   "referenced_type" : "type-2198",
+   "self_type" : "type-2198",
    "size" : 132,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE"
@@ -40714,7 +40793,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40724,12 +40803,12 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eWideningType",
      "field_offset" : 128,
-     "referenced_type" : "type-2192"
+     "referenced_type" : "type-2195"
     },
     {
      "field_name" : "nStereoWidening",
@@ -40739,8 +40818,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
    "name" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-2193",
-   "self_type" : "type-2193",
+   "referenced_type" : "type-2196",
+   "self_type" : "type-2196",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE"
@@ -40756,7 +40835,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40766,7 +40845,7 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nTreble",
@@ -40776,8 +40855,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_TREBLETYPE",
    "name" : "OMX_AUDIO_CONFIG_TREBLETYPE",
-   "referenced_type" : "type-2189",
-   "self_type" : "type-2189",
+   "referenced_type" : "type-2192",
+   "self_type" : "type-2192",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_TREBLETYPE"
@@ -40793,7 +40872,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40803,18 +40882,18 @@
     {
      "field_name" : "bLinear",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "sVolume",
      "field_offset" : 128,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
    "name" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
-   "referenced_type" : "type-2182",
-   "self_type" : "type-2182",
+   "referenced_type" : "type-2185",
+   "self_type" : "type-2185",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_VOLUMETYPE"
@@ -40830,7 +40909,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40875,23 +40954,23 @@
     {
      "field_name" : "eAACProfile",
      "field_offset" : 320,
-     "referenced_type" : "type-1676"
+     "referenced_type" : "type-1671"
     },
     {
      "field_name" : "eAACStreamFormat",
      "field_offset" : 352,
-     "referenced_type" : "type-1668"
+     "referenced_type" : "type-1670"
     },
     {
      "field_name" : "eChannelMode",
      "field_offset" : 384,
-     "referenced_type" : "type-1652"
+     "referenced_type" : "type-1651"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
    "name" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
-   "referenced_type" : "type-1687",
-   "self_type" : "type-1687",
+   "referenced_type" : "type-1679",
+   "self_type" : "type-1679",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_AACPROFILETYPE"
@@ -40907,7 +40986,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40932,8 +41011,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_ADPCMTYPE",
    "name" : "OMX_AUDIO_PARAM_ADPCMTYPE",
-   "referenced_type" : "type-1798",
-   "self_type" : "type-1798",
+   "referenced_type" : "type-1789",
+   "self_type" : "type-1789",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_ADPCMTYPE"
@@ -40949,7 +41028,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40969,23 +41048,23 @@
     {
      "field_name" : "eAMRBandMode",
      "field_offset" : 160,
-     "referenced_type" : "type-1890"
+     "referenced_type" : "type-1881"
     },
     {
      "field_name" : "eAMRDTXMode",
      "field_offset" : 192,
-     "referenced_type" : "type-1901"
+     "referenced_type" : "type-1892"
     },
     {
      "field_name" : "eAMRFrameFormat",
      "field_offset" : 224,
-     "referenced_type" : "type-1877"
+     "referenced_type" : "type-1862"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_AMRTYPE",
    "name" : "OMX_AUDIO_PARAM_AMRTYPE",
-   "referenced_type" : "type-1912",
-   "self_type" : "type-1912",
+   "referenced_type" : "type-1903",
+   "self_type" : "type-1903",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_AMRTYPE"
@@ -41001,7 +41080,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41016,12 +41095,12 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-2021"
+     "referenced_type" : "type-2013"
     },
     {
      "field_name" : "bRATE_REDUCon",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nMinBitRate",
@@ -41036,23 +41115,23 @@
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 256,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bNoiseSuppressor",
      "field_offset" : 288,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_EVRCTYPE",
    "name" : "OMX_AUDIO_PARAM_EVRCTYPE",
-   "referenced_type" : "type-2055",
-   "self_type" : "type-2055",
+   "referenced_type" : "type-2046",
+   "self_type" : "type-2046",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_EVRCTYPE"
@@ -41068,7 +41147,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41093,8 +41172,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_FLACTYPE",
    "name" : "OMX_AUDIO_PARAM_FLACTYPE",
-   "referenced_type" : "type-1709",
-   "self_type" : "type-1709",
+   "referenced_type" : "type-1700",
+   "self_type" : "type-1700",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_FLACTYPE"
@@ -41110,7 +41189,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41125,28 +41204,28 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eBitRate",
      "field_offset" : 160,
-     "referenced_type" : "type-1808"
+     "referenced_type" : "type-1799"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G723TYPE",
    "name" : "OMX_AUDIO_PARAM_G723TYPE",
-   "referenced_type" : "type-1818",
-   "self_type" : "type-1818",
+   "referenced_type" : "type-1812",
+   "self_type" : "type-1812",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G723TYPE"
@@ -41162,7 +41241,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41177,13 +41256,13 @@
     {
      "field_name" : "eG726Mode",
      "field_offset" : 128,
-     "referenced_type" : "type-1831"
+     "referenced_type" : "type-1822"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G726TYPE",
    "name" : "OMX_AUDIO_PARAM_G726TYPE",
-   "referenced_type" : "type-1841",
-   "self_type" : "type-1841",
+   "referenced_type" : "type-1832",
+   "self_type" : "type-1832",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G726TYPE"
@@ -41199,7 +41278,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41214,18 +41293,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eBitType",
      "field_offset" : 160,
-     "referenced_type" : "type-1851"
+     "referenced_type" : "type-1845"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G729TYPE",
    "name" : "OMX_AUDIO_PARAM_G729TYPE",
-   "referenced_type" : "type-1860",
-   "self_type" : "type-1860",
+   "referenced_type" : "type-1855",
+   "self_type" : "type-1855",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G729TYPE"
@@ -41241,7 +41320,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41251,18 +41330,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
-   "referenced_type" : "type-1945",
-   "self_type" : "type-1945",
+   "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_GSMEFRTYPE"
@@ -41278,7 +41357,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41288,18 +41367,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMFRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMFRTYPE",
-   "referenced_type" : "type-1923",
-   "self_type" : "type-1923",
+   "referenced_type" : "type-1914",
+   "self_type" : "type-1914",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_GSMFRTYPE"
@@ -41315,7 +41394,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41325,18 +41404,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMHRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMHRTYPE",
-   "referenced_type" : "type-1934",
-   "self_type" : "type-1934",
+   "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_GSMHRTYPE"
@@ -41352,7 +41431,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41377,18 +41456,18 @@
     {
      "field_name" : "eMidiSoundBank",
      "field_offset" : 192,
-     "referenced_type" : "type-2111"
+     "referenced_type" : "type-2102"
     },
     {
      "field_name" : "eMidiSoundBankLayout",
      "field_offset" : 224,
-     "referenced_type" : "type-2121"
+     "referenced_type" : "type-2113"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
    "name" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
-   "referenced_type" : "type-2132",
-   "self_type" : "type-2132",
+   "referenced_type" : "type-2124",
+   "self_type" : "type-2124",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE"
@@ -41404,7 +41483,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41419,23 +41498,23 @@
     {
      "field_name" : "sMaxPolyphony",
      "field_offset" : 128,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "bLoadDefaultSound",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eMidiFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-2087"
+     "referenced_type" : "type-2079"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MIDITYPE",
    "name" : "OMX_AUDIO_PARAM_MIDITYPE",
-   "referenced_type" : "type-2098",
-   "self_type" : "type-2098",
+   "referenced_type" : "type-2090",
+   "self_type" : "type-2090",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MIDITYPE"
@@ -41451,7 +41530,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41481,18 +41560,18 @@
     {
      "field_name" : "eChannelMode",
      "field_offset" : 224,
-     "referenced_type" : "type-1652"
+     "referenced_type" : "type-1651"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-1660"
+     "referenced_type" : "type-1656"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MP3TYPE",
    "name" : "OMX_AUDIO_PARAM_MP3TYPE",
-   "referenced_type" : "type-1666",
-   "self_type" : "type-1666",
+   "referenced_type" : "type-1664",
+   "self_type" : "type-1664",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MP3TYPE"
@@ -41508,7 +41587,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41528,12 +41607,12 @@
     {
      "field_name" : "eEndian",
      "field_offset" : 160,
-     "referenced_type" : "type-1460"
+     "referenced_type" : "type-1459"
     },
     {
      "field_name" : "bInterleaved",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nBitPerSample",
@@ -41548,18 +41627,18 @@
     {
      "field_name" : "ePCMMode",
      "field_offset" : 288,
-     "referenced_type" : "type-1633"
+     "referenced_type" : "type-1628"
     },
     {
      "field_name" : "eChannelMapping",
      "field_offset" : 320,
-     "referenced_type" : "type-1642"
+     "referenced_type" : "type-1641"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PCMMODETYPE",
    "name" : "OMX_AUDIO_PARAM_PCMMODETYPE",
-   "referenced_type" : "type-1641",
-   "self_type" : "type-1641",
+   "referenced_type" : "type-1640",
+   "self_type" : "type-1640",
    "size" : 104,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PCMMODETYPE"
@@ -41575,7 +41654,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41590,18 +41669,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
-   "referenced_type" : "type-2000",
-   "self_type" : "type-2000",
+   "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_PDCEFRTYPE"
@@ -41617,7 +41696,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41632,18 +41711,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCFRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCFRTYPE",
-   "referenced_type" : "type-1989",
-   "self_type" : "type-1989",
+   "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_PDCFRTYPE"
@@ -41659,7 +41738,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41674,18 +41753,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCHRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCHRTYPE",
-   "referenced_type" : "type-2011",
-   "self_type" : "type-2011",
+   "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_PDCHRTYPE"
@@ -41701,7 +41780,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41716,7 +41795,7 @@
     {
      "field_name" : "eEncoding",
      "field_offset" : 128,
-     "referenced_type" : "type-1618"
+     "referenced_type" : "type-1616"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PORTFORMATTYPE",
@@ -41738,7 +41817,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41753,7 +41832,7 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-2021"
+     "referenced_type" : "type-2013"
     },
     {
      "field_name" : "nMinBitRate",
@@ -41768,8 +41847,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_QCELP13TYPE",
    "name" : "OMX_AUDIO_PARAM_QCELP13TYPE",
-   "referenced_type" : "type-2043",
-   "self_type" : "type-2043",
+   "referenced_type" : "type-2035",
+   "self_type" : "type-2035",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_QCELP13TYPE"
@@ -41785,7 +41864,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41805,7 +41884,7 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 160,
-     "referenced_type" : "type-2021"
+     "referenced_type" : "type-2013"
     },
     {
      "field_name" : "nMinBitRate",
@@ -41820,8 +41899,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_QCELP8TYPE",
    "name" : "OMX_AUDIO_PARAM_QCELP8TYPE",
-   "referenced_type" : "type-2032",
-   "self_type" : "type-2032",
+   "referenced_type" : "type-2024",
+   "self_type" : "type-2024",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_QCELP8TYPE"
@@ -41837,7 +41916,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41882,13 +41961,13 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 320,
-     "referenced_type" : "type-1752"
+     "referenced_type" : "type-1746"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_RATYPE",
    "name" : "OMX_AUDIO_PARAM_RATYPE",
-   "referenced_type" : "type-1765",
-   "self_type" : "type-1765",
+   "referenced_type" : "type-1756",
+   "self_type" : "type-1756",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_RATYPE"
@@ -41904,7 +41983,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41944,23 +42023,23 @@
     {
      "field_name" : "bEnableBitrate",
      "field_offset" : 288,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eChannelMode",
      "field_offset" : 320,
-     "referenced_type" : "type-1652"
+     "referenced_type" : "type-1651"
     },
     {
      "field_name" : "eSBCAllocType",
      "field_offset" : 352,
-     "referenced_type" : "type-1775"
+     "referenced_type" : "type-1766"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_SBCTYPE",
    "name" : "OMX_AUDIO_PARAM_SBCTYPE",
-   "referenced_type" : "type-1785",
-   "self_type" : "type-1785",
+   "referenced_type" : "type-1779",
+   "self_type" : "type-1779",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_SBCTYPE"
@@ -41976,7 +42055,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41991,12 +42070,12 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-2021"
+     "referenced_type" : "type-2013"
     },
     {
      "field_name" : "bRATE_REDUCon",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nMinBitRate",
@@ -42011,23 +42090,23 @@
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 256,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bNoiseSuppressor",
      "field_offset" : 288,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_SMVTYPE",
    "name" : "OMX_AUDIO_PARAM_SMVTYPE",
-   "referenced_type" : "type-2065",
-   "self_type" : "type-2065",
+   "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_SMVTYPE"
@@ -42043,7 +42122,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -42058,18 +42137,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
-   "referenced_type" : "type-1978",
-   "self_type" : "type-1978",
+   "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_TDMAEFRTYPE"
@@ -42085,7 +42164,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -42100,18 +42179,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
    "name" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
-   "referenced_type" : "type-1967",
-   "self_type" : "type-1967",
+   "referenced_type" : "type-1958",
+   "self_type" : "type-1958",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_TDMAFRTYPE"
@@ -42127,7 +42206,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -42172,18 +42251,18 @@
     {
      "field_name" : "bManaged",
      "field_offset" : 320,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bDownmix",
      "field_offset" : 352,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_VORBISTYPE",
    "name" : "OMX_AUDIO_PARAM_VORBISTYPE",
-   "referenced_type" : "type-1698",
-   "self_type" : "type-1698",
+   "referenced_type" : "type-1689",
+   "self_type" : "type-1689",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_VORBISTYPE"
@@ -42199,7 +42278,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -42219,12 +42298,12 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-1719"
+     "referenced_type" : "type-1711"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 192,
-     "referenced_type" : "type-1732"
+     "referenced_type" : "type-1722"
     },
     {
      "field_name" : "nSamplingRate",
@@ -42249,8 +42328,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_WMATYPE",
    "name" : "OMX_AUDIO_PARAM_WMATYPE",
-   "referenced_type" : "type-1742",
-   "self_type" : "type-1742",
+   "referenced_type" : "type-1733",
+   "self_type" : "type-1733",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_WMATYPE"
@@ -42271,18 +42350,18 @@
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 64,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eEncoding",
      "field_offset" : 96,
-     "referenced_type" : "type-1618"
+     "referenced_type" : "type-1616"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PORTDEFINITIONTYPE",
    "name" : "OMX_AUDIO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-1619",
-   "self_type" : "type-1619",
+   "referenced_type" : "type-1621",
+   "self_type" : "type-1621",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PORTDEFINITIONTYPE"
@@ -42308,8 +42387,8 @@
    ],
    "linker_set_key" : "OMX_BS32",
    "name" : "OMX_BS32",
-   "referenced_type" : "type-1470",
-   "self_type" : "type-1470",
+   "referenced_type" : "type-1473",
+   "self_type" : "type-1473",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_BS32"
@@ -42335,8 +42414,8 @@
    ],
    "linker_set_key" : "OMX_BU32",
    "name" : "OMX_BU32",
-   "referenced_type" : "type-1469",
-   "self_type" : "type-1469",
+   "referenced_type" : "type-1468",
+   "self_type" : "type-1468",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_BU32"
@@ -42352,7 +42431,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "pBuffer",
@@ -42432,8 +42511,8 @@
    ],
    "linker_set_key" : "OMX_BUFFERHEADERTYPE",
    "name" : "OMX_BUFFERHEADERTYPE",
-   "referenced_type" : "type-1540",
-   "self_type" : "type-1540",
+   "referenced_type" : "type-1536",
+   "self_type" : "type-1536",
    "size" : 72,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_BUFFERHEADERTYPE"
@@ -42444,23 +42523,23 @@
    [
     {
      "field_name" : "EventHandler",
-     "referenced_type" : "type-1591"
+     "referenced_type" : "type-1594"
     },
     {
      "field_name" : "EmptyBufferDone",
      "field_offset" : 32,
-     "referenced_type" : "type-1593"
+     "referenced_type" : "type-1596"
     },
     {
      "field_name" : "FillBufferDone",
      "field_offset" : 64,
-     "referenced_type" : "type-1593"
+     "referenced_type" : "type-1596"
     }
    ],
    "linker_set_key" : "OMX_CALLBACKTYPE",
    "name" : "OMX_CALLBACKTYPE",
-   "referenced_type" : "type-1590",
-   "self_type" : "type-1590",
+   "referenced_type" : "type-1593",
+   "self_type" : "type-1593",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_CALLBACKTYPE"
@@ -42476,13 +42555,13 @@
     {
      "field_name" : "pInitialize",
      "field_offset" : 32,
-     "referenced_type" : "type-1500"
+     "referenced_type" : "type-1499"
     }
    ],
    "linker_set_key" : "OMX_COMPONENTREGISTERTYPE",
    "name" : "OMX_COMPONENTREGISTERTYPE",
-   "referenced_type" : "type-1499",
-   "self_type" : "type-1499",
+   "referenced_type" : "type-1498",
+   "self_type" : "type-1498",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_COMPONENTREGISTERTYPE"
@@ -42498,7 +42577,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "pComponentPrivate",
@@ -42513,98 +42592,98 @@
     {
      "field_name" : "GetComponentVersion",
      "field_offset" : 128,
-     "referenced_type" : "type-2357"
+     "referenced_type" : "type-2360"
     },
     {
      "field_name" : "SendCommand",
      "field_offset" : 160,
-     "referenced_type" : "type-2361"
+     "referenced_type" : "type-2364"
     },
     {
      "field_name" : "GetParameter",
      "field_offset" : 192,
-     "referenced_type" : "type-2363"
+     "referenced_type" : "type-2366"
     },
     {
      "field_name" : "SetParameter",
      "field_offset" : 224,
-     "referenced_type" : "type-2363"
+     "referenced_type" : "type-2366"
     },
     {
      "field_name" : "GetConfig",
      "field_offset" : 256,
-     "referenced_type" : "type-2363"
+     "referenced_type" : "type-2366"
     },
     {
      "field_name" : "SetConfig",
      "field_offset" : 288,
-     "referenced_type" : "type-2363"
+     "referenced_type" : "type-2366"
     },
     {
      "field_name" : "GetExtensionIndex",
      "field_offset" : 320,
-     "referenced_type" : "type-2365"
+     "referenced_type" : "type-2368"
     },
     {
      "field_name" : "GetState",
      "field_offset" : 352,
-     "referenced_type" : "type-2368"
+     "referenced_type" : "type-2371"
     },
     {
      "field_name" : "ComponentTunnelRequest",
      "field_offset" : 384,
-     "referenced_type" : "type-2371"
+     "referenced_type" : "type-2374"
     },
     {
      "field_name" : "UseBuffer",
      "field_offset" : 416,
-     "referenced_type" : "type-2374"
+     "referenced_type" : "type-2377"
     },
     {
      "field_name" : "AllocateBuffer",
      "field_offset" : 448,
-     "referenced_type" : "type-2377"
+     "referenced_type" : "type-2380"
     },
     {
      "field_name" : "FreeBuffer",
      "field_offset" : 480,
-     "referenced_type" : "type-2379"
+     "referenced_type" : "type-2382"
     },
     {
      "field_name" : "EmptyThisBuffer",
      "field_offset" : 512,
-     "referenced_type" : "type-2381"
+     "referenced_type" : "type-2384"
     },
     {
      "field_name" : "FillThisBuffer",
      "field_offset" : 544,
-     "referenced_type" : "type-2381"
+     "referenced_type" : "type-2384"
     },
     {
      "field_name" : "SetCallbacks",
      "field_offset" : 576,
-     "referenced_type" : "type-2383"
+     "referenced_type" : "type-2386"
     },
     {
      "field_name" : "ComponentDeInit",
      "field_offset" : 608,
-     "referenced_type" : "type-1500"
+     "referenced_type" : "type-1499"
     },
     {
      "field_name" : "UseEGLImage",
      "field_offset" : 640,
-     "referenced_type" : "type-2386"
+     "referenced_type" : "type-2389"
     },
     {
      "field_name" : "ComponentRoleEnum",
      "field_offset" : 672,
-     "referenced_type" : "type-2388"
+     "referenced_type" : "type-2391"
     }
    ],
    "linker_set_key" : "OMX_COMPONENTTYPE",
    "name" : "OMX_COMPONENTTYPE",
-   "referenced_type" : "type-2356",
-   "self_type" : "type-2356",
+   "referenced_type" : "type-2359",
+   "self_type" : "type-2359",
    "size" : 88,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_COMPONENTTYPE"
@@ -42620,7 +42699,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -42640,8 +42719,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_BACKLIGHTTYPE",
    "name" : "OMX_CONFIG_BACKLIGHTTYPE",
-   "referenced_type" : "type-2226",
-   "self_type" : "type-2226",
+   "referenced_type" : "type-2229",
+   "self_type" : "type-2229",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_BACKLIGHTTYPE"
@@ -42657,18 +42736,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "bEnabled",
      "field_offset" : 64,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_BOOLEANTYPE",
    "name" : "OMX_CONFIG_BOOLEANTYPE",
-   "referenced_type" : "type-2340",
-   "self_type" : "type-2340",
+   "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_CONFIG_BOOLEANTYPE"
@@ -42684,7 +42763,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -42699,8 +42778,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_BRIGHTNESSTYPE",
    "name" : "OMX_CONFIG_BRIGHTNESSTYPE",
-   "referenced_type" : "type-2225",
-   "self_type" : "type-2225",
+   "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_BRIGHTNESSTYPE"
@@ -42716,7 +42795,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -42726,12 +42805,12 @@
     {
      "field_name" : "bContinuous",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bFrameLimited",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nFrameLimit",
@@ -42741,8 +42820,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_CAPTUREMODETYPE",
    "name" : "OMX_CONFIG_CAPTUREMODETYPE",
-   "referenced_type" : "type-2240",
-   "self_type" : "type-2240",
+   "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"
@@ -42758,7 +42837,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -42773,13 +42852,13 @@
     {
      "field_name" : "eColorBlend",
      "field_offset" : 128,
-     "referenced_type" : "type-2209"
+     "referenced_type" : "type-2212"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_COLORBLENDTYPE",
    "name" : "OMX_CONFIG_COLORBLENDTYPE",
-   "referenced_type" : "type-2210",
-   "self_type" : "type-2210",
+   "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_CONFIG_COLORBLENDTYPE"
@@ -42795,7 +42874,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -42805,7 +42884,7 @@
     {
      "field_name" : "xColorMatrix",
      "field_offset" : 96,
-     "referenced_type" : "type-2201"
+     "referenced_type" : "type-2204"
     },
     {
      "field_name" : "xColorOffset",
@@ -42815,8 +42894,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_COLORCONVERSIONTYPE",
    "name" : "OMX_CONFIG_COLORCONVERSIONTYPE",
-   "referenced_type" : "type-2200",
-   "self_type" : "type-2200",
+   "referenced_type" : "type-2203",
+   "self_type" : "type-2203",
    "size" : 64,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORCONVERSIONTYPE"
@@ -42832,7 +42911,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -42842,7 +42921,7 @@
     {
      "field_name" : "bColorEnhancement",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nCustomizedU",
@@ -42857,8 +42936,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
    "name" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
-   "referenced_type" : "type-2207",
-   "self_type" : "type-2207",
+   "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_COLORENHANCEMENTTYPE"
@@ -42874,7 +42953,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -42894,8 +42973,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_COLORKEYTYPE",
    "name" : "OMX_CONFIG_COLORKEYTYPE",
-   "referenced_type" : "type-2208",
-   "self_type" : "type-2208",
+   "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_CONFIG_COLORKEYTYPE"
@@ -42911,12 +42990,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nParentNodeID",
@@ -42931,8 +43010,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
    "name" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
-   "referenced_type" : "type-2350",
-   "self_type" : "type-2350",
+   "referenced_type" : "type-2353",
+   "self_type" : "type-2353",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE"
@@ -42948,12 +43027,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nParentNodeID",
@@ -42978,13 +43057,13 @@
     {
      "field_name" : "bIsLeafType",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
    "name" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
-   "referenced_type" : "type-2351",
-   "self_type" : "type-2351",
+   "referenced_type" : "type-2354",
+   "self_type" : "type-2354",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_CONTAINERNODEIDTYPE"
@@ -43000,7 +43079,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43015,8 +43094,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_CONTRASTTYPE",
    "name" : "OMX_CONFIG_CONTRASTTYPE",
-   "referenced_type" : "type-2224",
-   "self_type" : "type-2224",
+   "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_CONTRASTTYPE"
@@ -43032,7 +43111,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43042,13 +43121,13 @@
     {
      "field_name" : "eDither",
      "field_offset" : 96,
-     "referenced_type" : "type-2238"
+     "referenced_type" : "type-2241"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_DITHERTYPE",
    "name" : "OMX_CONFIG_DITHERTYPE",
-   "referenced_type" : "type-2239",
-   "self_type" : "type-2239",
+   "referenced_type" : "type-2242",
+   "self_type" : "type-2242",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_DITHERTYPE"
@@ -43064,7 +43143,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43074,13 +43153,13 @@
     {
      "field_name" : "eExposureControl",
      "field_offset" : 96,
-     "referenced_type" : "type-2221"
+     "referenced_type" : "type-2224"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
    "name" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-2222",
-   "self_type" : "type-2222",
+   "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_EXPOSURECONTROLTYPE"
@@ -43096,7 +43175,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43106,7 +43185,7 @@
     {
      "field_name" : "eMetering",
      "field_offset" : 96,
-     "referenced_type" : "type-2242"
+     "referenced_type" : "type-2245"
     },
     {
      "field_name" : "xEVCompensation",
@@ -43121,7 +43200,7 @@
     {
      "field_name" : "bAutoAperture",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nShutterSpeedMsec",
@@ -43131,7 +43210,7 @@
     {
      "field_name" : "bAutoShutterSpeed",
      "field_offset" : 256,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nSensitivity",
@@ -43141,13 +43220,13 @@
     {
      "field_name" : "bAutoSensitivity",
      "field_offset" : 320,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_EXPOSUREVALUETYPE",
    "name" : "OMX_CONFIG_EXPOSUREVALUETYPE",
-   "referenced_type" : "type-2243",
-   "self_type" : "type-2243",
+   "referenced_type" : "type-2246",
+   "self_type" : "type-2246",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_EXPOSUREVALUETYPE"
@@ -43163,7 +43242,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43173,53 +43252,53 @@
     {
      "field_name" : "bCenter",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bLeft",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bRight",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bTop",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bBottom",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bTopLeft",
      "field_offset" : 256,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bTopRight",
      "field_offset" : 288,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bBottomLeft",
      "field_offset" : 320,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bBottomRight",
      "field_offset" : 352,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_FOCUSREGIONTYPE",
    "name" : "OMX_CONFIG_FOCUSREGIONTYPE",
-   "referenced_type" : "type-2245",
-   "self_type" : "type-2245",
+   "referenced_type" : "type-2248",
+   "self_type" : "type-2248",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_FOCUSREGIONTYPE"
@@ -43235,7 +43314,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43250,8 +43329,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_FRAMERATETYPE",
    "name" : "OMX_CONFIG_FRAMERATETYPE",
-   "referenced_type" : "type-2286",
-   "self_type" : "type-2286",
+   "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_FRAMERATETYPE"
@@ -43267,7 +43346,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43277,13 +43356,13 @@
     {
      "field_name" : "bStab",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_FRAMESTABTYPE",
    "name" : "OMX_CONFIG_FRAMESTABTYPE",
-   "referenced_type" : "type-2218",
-   "self_type" : "type-2218",
+   "referenced_type" : "type-2221",
+   "self_type" : "type-2221",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_FRAMESTABTYPE"
@@ -43299,7 +43378,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43314,8 +43393,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_GAMMATYPE",
    "name" : "OMX_CONFIG_GAMMATYPE",
-   "referenced_type" : "type-2227",
-   "self_type" : "type-2227",
+   "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_GAMMATYPE"
@@ -43331,7 +43410,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43341,13 +43420,13 @@
     {
      "field_name" : "eImageFilter",
      "field_offset" : 96,
-     "referenced_type" : "type-2205"
+     "referenced_type" : "type-2208"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_IMAGEFILTERTYPE",
    "name" : "OMX_CONFIG_IMAGEFILTERTYPE",
-   "referenced_type" : "type-2206",
-   "self_type" : "type-2206",
+   "referenced_type" : "type-2209",
+   "self_type" : "type-2209",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_IMAGEFILTERTYPE"
@@ -43363,7 +43442,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43373,13 +43452,13 @@
     {
      "field_name" : "IntraRefreshVOP",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
    "name" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
-   "referenced_type" : "type-2287",
-   "self_type" : "type-2287",
+   "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_INTRAREFRESHVOPTYPE"
@@ -43395,7 +43474,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43410,8 +43489,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_LIGHTNESSTYPE",
    "name" : "OMX_CONFIG_LIGHTNESSTYPE",
-   "referenced_type" : "type-2229",
-   "self_type" : "type-2229",
+   "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"
@@ -43427,7 +43506,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43442,13 +43521,13 @@
     {
      "field_name" : "ErrMap",
      "field_offset" : 128,
-     "referenced_type" : "type-1572"
+     "referenced_type" : "type-1567"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
    "name" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
-   "referenced_type" : "type-2288",
-   "self_type" : "type-2288",
+   "referenced_type" : "type-2291",
+   "self_type" : "type-2291",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE"
@@ -43464,7 +43543,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43474,13 +43553,13 @@
     {
      "field_name" : "bEnabled",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
    "name" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
-   "referenced_type" : "type-2290",
-   "self_type" : "type-2290",
+   "referenced_type" : "type-2293",
+   "self_type" : "type-2293",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_MBERRORREPORTINGTYPE"
@@ -43496,12 +43575,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "eScopeMode",
      "field_offset" : 64,
-     "referenced_type" : "type-2346"
+     "referenced_type" : "type-2349"
     },
     {
      "field_name" : "nScopeSpecifier",
@@ -43516,8 +43595,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
    "name" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
-   "referenced_type" : "type-2348",
-   "self_type" : "type-2348",
+   "referenced_type" : "type-2351",
+   "self_type" : "type-2351",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_METADATAITEMCOUNTTYPE"
@@ -43533,12 +43612,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "eScopeMode",
      "field_offset" : 64,
-     "referenced_type" : "type-2346"
+     "referenced_type" : "type-2349"
     },
     {
      "field_name" : "nScopeSpecifier",
@@ -43553,12 +43632,12 @@
     {
      "field_name" : "eSearchMode",
      "field_offset" : 160,
-     "referenced_type" : "type-2347"
+     "referenced_type" : "type-2350"
     },
     {
      "field_name" : "eKeyCharset",
      "field_offset" : 192,
-     "referenced_type" : "type-2345"
+     "referenced_type" : "type-2348"
     },
     {
      "field_name" : "nKeySizeUsed",
@@ -43573,7 +43652,7 @@
     {
      "field_name" : "eValueCharset",
      "field_offset" : 1280,
-     "referenced_type" : "type-2345"
+     "referenced_type" : "type-2348"
     },
     {
      "field_name" : "sLanguageCountry",
@@ -43593,13 +43672,13 @@
     {
      "field_name" : "nValue",
      "field_offset" : 1408,
-     "referenced_type" : "type-1572"
+     "referenced_type" : "type-1567"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_METADATAITEMTYPE",
    "name" : "OMX_CONFIG_METADATAITEMTYPE",
-   "referenced_type" : "type-2349",
-   "self_type" : "type-2349",
+   "referenced_type" : "type-2352",
+   "self_type" : "type-2352",
    "size" : 180,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_METADATAITEMTYPE"
@@ -43615,7 +43694,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43625,13 +43704,13 @@
     {
      "field_name" : "eMirror",
      "field_offset" : 96,
-     "referenced_type" : "type-2213"
+     "referenced_type" : "type-2216"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MIRRORTYPE",
    "name" : "OMX_CONFIG_MIRRORTYPE",
-   "referenced_type" : "type-2214",
-   "self_type" : "type-2214",
+   "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_CONFIG_MIRRORTYPE"
@@ -43647,7 +43726,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43667,8 +43746,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_PLANEBLENDTYPE",
    "name" : "OMX_CONFIG_PLANEBLENDTYPE",
-   "referenced_type" : "type-2231",
-   "self_type" : "type-2231",
+   "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_CONFIG_PLANEBLENDTYPE"
@@ -43684,7 +43763,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43704,8 +43783,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_POINTTYPE",
    "name" : "OMX_CONFIG_POINTTYPE",
-   "referenced_type" : "type-2215",
-   "self_type" : "type-2215",
+   "referenced_type" : "type-2218",
+   "self_type" : "type-2218",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_POINTTYPE"
@@ -43721,7 +43800,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43751,8 +43830,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_RECTTYPE",
    "name" : "OMX_CONFIG_RECTTYPE",
-   "referenced_type" : "type-2216",
-   "self_type" : "type-2216",
+   "referenced_type" : "type-2219",
+   "self_type" : "type-2219",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_RECTTYPE"
@@ -43768,7 +43847,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43783,8 +43862,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_ROTATIONTYPE",
    "name" : "OMX_CONFIG_ROTATIONTYPE",
-   "referenced_type" : "type-2212",
-   "self_type" : "type-2212",
+   "referenced_type" : "type-2215",
+   "self_type" : "type-2215",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_ROTATIONTYPE"
@@ -43800,7 +43879,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43815,8 +43894,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_SATURATIONTYPE",
    "name" : "OMX_CONFIG_SATURATIONTYPE",
-   "referenced_type" : "type-2228",
-   "self_type" : "type-2228",
+   "referenced_type" : "type-2231",
+   "self_type" : "type-2231",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_SATURATIONTYPE"
@@ -43832,7 +43911,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43852,8 +43931,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_SCALEFACTORTYPE",
    "name" : "OMX_CONFIG_SCALEFACTORTYPE",
-   "referenced_type" : "type-2204",
-   "self_type" : "type-2204",
+   "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_SCALEFACTORTYPE"
@@ -43869,7 +43948,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43879,13 +43958,13 @@
     {
      "field_name" : "eEffect",
      "field_offset" : 96,
-     "referenced_type" : "type-2233"
+     "referenced_type" : "type-2236"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
    "name" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-2234",
-   "self_type" : "type-2234",
+   "referenced_type" : "type-2237",
+   "self_type" : "type-2237",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_TRANSITIONEFFECTTYPE"
@@ -43901,7 +43980,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43911,13 +43990,13 @@
     {
      "field_name" : "eWhiteBalControl",
      "field_offset" : 96,
-     "referenced_type" : "type-2219"
+     "referenced_type" : "type-2222"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
    "name" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-2220",
-   "self_type" : "type-2220",
+   "referenced_type" : "type-2223",
+   "self_type" : "type-2223",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_WHITEBALCONTROLTYPE"
@@ -43933,7 +44012,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43953,8 +44032,8 @@
    ],
    "linker_set_key" : "OMX_FRAMESIZETYPE",
    "name" : "OMX_FRAMESIZETYPE",
-   "referenced_type" : "type-2211",
-   "self_type" : "type-2211",
+   "referenced_type" : "type-2214",
+   "self_type" : "type-2214",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_FRAMESIZETYPE"
@@ -43970,7 +44049,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43980,7 +44059,7 @@
     {
      "field_name" : "eFocusControl",
      "field_offset" : 96,
-     "referenced_type" : "type-2303"
+     "referenced_type" : "type-2306"
     },
     {
      "field_name" : "nFocusSteps",
@@ -43995,8 +44074,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
    "name" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-2304",
-   "self_type" : "type-2304",
+   "referenced_type" : "type-2307",
+   "self_type" : "type-2307",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE"
@@ -44012,7 +44091,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -44022,13 +44101,13 @@
     {
      "field_name" : "eFlashControl",
      "field_offset" : 96,
-     "referenced_type" : "type-2300"
+     "referenced_type" : "type-2303"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
    "name" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
-   "referenced_type" : "type-2302",
-   "self_type" : "type-2302",
+   "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_FLASHCONTROLTYPE"
@@ -44044,7 +44123,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -44054,23 +44133,23 @@
     {
      "field_name" : "eHuffmanTable",
      "field_offset" : 96,
-     "referenced_type" : "type-2309"
+     "referenced_type" : "type-2312"
     },
     {
      "field_name" : "nNumberOfHuffmanCodeOfLength",
      "field_offset" : 128,
-     "referenced_type" : "type-2311"
+     "referenced_type" : "type-2314"
     },
     {
      "field_name" : "nHuffmanTable",
      "field_offset" : 256,
-     "referenced_type" : "type-2312"
+     "referenced_type" : "type-2315"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
    "name" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
-   "referenced_type" : "type-2310",
-   "self_type" : "type-2310",
+   "referenced_type" : "type-2313",
+   "self_type" : "type-2313",
    "size" : 288,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE"
@@ -44086,7 +44165,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -44101,18 +44180,18 @@
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-2297"
+     "referenced_type" : "type-2300"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-2199"
+     "referenced_type" : "type-2202"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
    "name" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-2299",
-   "self_type" : "type-2299",
+   "referenced_type" : "type-2302",
+   "self_type" : "type-2302",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_PORTFORMATTYPE"
@@ -44128,7 +44207,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -44143,8 +44222,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_QFACTORTYPE",
    "name" : "OMX_IMAGE_PARAM_QFACTORTYPE",
-   "referenced_type" : "type-2305",
-   "self_type" : "type-2305",
+   "referenced_type" : "type-2308",
+   "self_type" : "type-2308",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_QFACTORTYPE"
@@ -44160,7 +44239,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -44170,18 +44249,18 @@
     {
      "field_name" : "eQuantizationTable",
      "field_offset" : 96,
-     "referenced_type" : "type-2306"
+     "referenced_type" : "type-2309"
     },
     {
      "field_name" : "nQuantizationMatrix",
      "field_offset" : 128,
-     "referenced_type" : "type-2308"
+     "referenced_type" : "type-2311"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
    "name" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-2307",
-   "self_type" : "type-2307",
+   "referenced_type" : "type-2310",
+   "self_type" : "type-2310",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE"
@@ -44222,17 +44301,17 @@
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 224,
-     "referenced_type" : "type-2297"
+     "referenced_type" : "type-2300"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-2199"
+     "referenced_type" : "type-2202"
     },
     {
      "field_name" : "pNativeWindow",
@@ -44242,8 +44321,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_PORTDEFINITIONTYPE",
    "name" : "OMX_IMAGE_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-2298",
-   "self_type" : "type-2298",
+   "referenced_type" : "type-2301",
+   "self_type" : "type-2301",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PORTDEFINITIONTYPE"
@@ -44264,8 +44343,8 @@
    ],
    "linker_set_key" : "OMX_MARKTYPE",
    "name" : "OMX_MARKTYPE",
-   "referenced_type" : "type-1477",
-   "self_type" : "type-1477",
+   "referenced_type" : "type-1475",
+   "self_type" : "type-1475",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_MARKTYPE"
@@ -44281,18 +44360,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "bEnablePM",
      "field_offset" : 64,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_OTHER_CONFIG_POWERTYPE",
    "name" : "OMX_OTHER_CONFIG_POWERTYPE",
-   "referenced_type" : "type-2327",
-   "self_type" : "type-2327",
+   "referenced_type" : "type-2330",
+   "self_type" : "type-2330",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_CONFIG_POWERTYPE"
@@ -44308,13 +44387,13 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     }
    ],
    "linker_set_key" : "OMX_OTHER_CONFIG_STATSTYPE",
    "name" : "OMX_OTHER_CONFIG_STATSTYPE",
-   "referenced_type" : "type-2328",
-   "self_type" : "type-2328",
+   "referenced_type" : "type-2331",
+   "self_type" : "type-2331",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_CONFIG_STATSTYPE"
@@ -44330,7 +44409,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -44340,7 +44419,7 @@
     {
      "field_name" : "eType",
      "field_offset" : 96,
-     "referenced_type" : "type-1561"
+     "referenced_type" : "type-1556"
     },
     {
      "field_name" : "nDataSize",
@@ -44350,13 +44429,13 @@
     {
      "field_name" : "data",
      "field_offset" : 160,
-     "referenced_type" : "type-1572"
+     "referenced_type" : "type-1567"
     }
    ],
    "linker_set_key" : "OMX_OTHER_EXTRADATATYPE",
    "name" : "OMX_OTHER_EXTRADATATYPE",
-   "referenced_type" : "type-1571",
-   "self_type" : "type-1571",
+   "referenced_type" : "type-1566",
+   "self_type" : "type-1566",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_OTHER_EXTRADATATYPE"
@@ -44372,7 +44451,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -44387,13 +44466,13 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-2314"
+     "referenced_type" : "type-2317"
     }
    ],
    "linker_set_key" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
    "name" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-2330",
-   "self_type" : "type-2330",
+   "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"
@@ -44404,13 +44483,13 @@
    [
     {
      "field_name" : "eFormat",
-     "referenced_type" : "type-2314"
+     "referenced_type" : "type-2317"
     }
    ],
    "linker_set_key" : "OMX_OTHER_PORTDEFINITIONTYPE",
    "name" : "OMX_OTHER_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-2329",
-   "self_type" : "type-2329",
+   "referenced_type" : "type-2332",
+   "self_type" : "type-2332",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_PORTDEFINITIONTYPE"
@@ -44426,7 +44505,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -44436,13 +44515,13 @@
     {
      "field_name" : "eBufferSupplier",
      "field_offset" : 96,
-     "referenced_type" : "type-1601"
+     "referenced_type" : "type-1599"
     }
    ],
    "linker_set_key" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
    "name" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-1609",
-   "self_type" : "type-1609",
+   "referenced_type" : "type-1605",
+   "self_type" : "type-1605",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PARAM_BUFFERSUPPLIERTYPE"
@@ -44458,7 +44537,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "cRole",
@@ -44485,7 +44564,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "hPipe",
@@ -44495,8 +44574,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_CONTENTPIPETYPE",
    "name" : "OMX_PARAM_CONTENTPIPETYPE",
-   "referenced_type" : "type-2343",
-   "self_type" : "type-2343",
+   "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_PARAM_CONTENTPIPETYPE"
@@ -44512,18 +44591,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "contentURI",
      "field_offset" : 64,
-     "referenced_type" : "type-1572"
+     "referenced_type" : "type-1567"
     }
    ],
    "linker_set_key" : "OMX_PARAM_CONTENTURITYPE",
    "name" : "OMX_PARAM_CONTENTURITYPE",
-   "referenced_type" : "type-2341",
-   "self_type" : "type-2341",
+   "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"
@@ -44539,7 +44618,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -44549,18 +44628,18 @@
     {
      "field_name" : "eUnitType",
      "field_offset" : 96,
-     "referenced_type" : "type-2235"
+     "referenced_type" : "type-2238"
     },
     {
      "field_name" : "eEncapsulationType",
      "field_offset" : 128,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2239"
     }
    ],
    "linker_set_key" : "OMX_PARAM_DATAUNITTYPE",
    "name" : "OMX_PARAM_DATAUNITTYPE",
-   "referenced_type" : "type-2237",
-   "self_type" : "type-2237",
+   "referenced_type" : "type-2240",
+   "self_type" : "type-2240",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_DATAUNITTYPE"
@@ -44576,7 +44655,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -44586,13 +44665,13 @@
     {
      "field_name" : "bDeblocking",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_PARAM_DEBLOCKINGTYPE",
    "name" : "OMX_PARAM_DEBLOCKINGTYPE",
-   "referenced_type" : "type-2217",
-   "self_type" : "type-2217",
+   "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_PARAM_DEBLOCKINGTYPE"
@@ -44608,7 +44687,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -44618,58 +44697,58 @@
     {
      "field_name" : "eFocusStatus",
      "field_offset" : 96,
-     "referenced_type" : "type-2246"
+     "referenced_type" : "type-2249"
     },
     {
      "field_name" : "bCenterStatus",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bLeftStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bRightStatus",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bTopStatus",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bBottomStatus",
      "field_offset" : 256,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bTopLeftStatus",
      "field_offset" : 288,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bTopRightStatus",
      "field_offset" : 320,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bBottomLeftStatus",
      "field_offset" : 352,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bBottomRightStatus",
      "field_offset" : 384,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_PARAM_FOCUSSTATUSTYPE",
    "name" : "OMX_PARAM_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-2247",
-   "self_type" : "type-2247",
+   "referenced_type" : "type-2250",
+   "self_type" : "type-2250",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_FOCUSSTATUSTYPE"
@@ -44685,7 +44764,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -44695,7 +44774,7 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nInterleavePortIndex",
@@ -44705,8 +44784,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_INTERLEAVETYPE",
    "name" : "OMX_PARAM_INTERLEAVETYPE",
-   "referenced_type" : "type-2232",
-   "self_type" : "type-2232",
+   "referenced_type" : "type-2235",
+   "self_type" : "type-2235",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_INTERLEAVETYPE"
@@ -44722,7 +44801,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -44737,8 +44816,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_MACROBLOCKSTYPE",
    "name" : "OMX_PARAM_MACROBLOCKSTYPE",
-   "referenced_type" : "type-2291",
-   "self_type" : "type-2291",
+   "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"
@@ -44754,17 +44833,17 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eKeyCharset",
      "field_offset" : 96,
-     "referenced_type" : "type-2345"
+     "referenced_type" : "type-2348"
     },
     {
      "field_name" : "nKeySizeUsed",
@@ -44789,13 +44868,13 @@
     {
      "field_name" : "bEnabled",
      "field_offset" : 2240,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_PARAM_METADATAFILTERTYPE",
    "name" : "OMX_PARAM_METADATAFILTERTYPE",
-   "referenced_type" : "type-2355",
-   "self_type" : "type-2355",
+   "referenced_type" : "type-2358",
+   "self_type" : "type-2358",
    "size" : 284,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_METADATAFILTERTYPE"
@@ -44811,7 +44890,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -44821,7 +44900,7 @@
     {
      "field_name" : "eDir",
      "field_offset" : 96,
-     "referenced_type" : "type-1452"
+     "referenced_type" : "type-1455"
     },
     {
      "field_name" : "nBufferCountActual",
@@ -44841,27 +44920,27 @@
     {
      "field_name" : "bEnabled",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bPopulated",
      "field_offset" : 256,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eDomain",
      "field_offset" : 288,
-     "referenced_type" : "type-2332"
+     "referenced_type" : "type-2335"
     },
     {
      "field_name" : "format",
      "field_offset" : 320,
-     "referenced_type" : "type-2334"
+     "referenced_type" : "type-2337"
     },
     {
      "field_name" : "bBuffersContiguous",
      "field_offset" : 704,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nBufferAlignment",
@@ -44871,8 +44950,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_PORTDEFINITIONTYPE",
    "name" : "OMX_PARAM_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-2333",
-   "self_type" : "type-2333",
+   "referenced_type" : "type-2336",
+   "self_type" : "type-2336",
    "size" : 96,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_PORTDEFINITIONTYPE"
@@ -44883,27 +44962,27 @@
    [
     {
      "field_name" : "audio",
-     "referenced_type" : "type-1619"
+     "referenced_type" : "type-1621"
     },
     {
      "field_name" : "video",
-     "referenced_type" : "type-2249"
+     "referenced_type" : "type-2252"
     },
     {
      "field_name" : "image",
-     "referenced_type" : "type-2298"
+     "referenced_type" : "type-2301"
     },
     {
      "field_name" : "other",
-     "referenced_type" : "type-2329"
+     "referenced_type" : "type-2332"
     }
    ],
    "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-2334",
-   "self_type" : "type-2334",
+   "referenced_type" : "type-2337",
+   "self_type" : "type-2337",
    "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)"
@@ -44919,7 +44998,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -44934,18 +45013,18 @@
     {
      "field_name" : "bOneShot",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "sFrameSize",
      "field_offset" : 160,
-     "referenced_type" : "type-2211"
+     "referenced_type" : "type-2214"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SENSORMODETYPE",
    "name" : "OMX_PARAM_SENSORMODETYPE",
-   "referenced_type" : "type-2223",
-   "self_type" : "type-2223",
+   "referenced_type" : "type-2226",
+   "self_type" : "type-2226",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_SENSORMODETYPE"
@@ -44961,18 +45040,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "ePolicy",
      "field_offset" : 64,
-     "referenced_type" : "type-2336"
+     "referenced_type" : "type-2339"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
    "name" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-2337",
-   "self_type" : "type-2337",
+   "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_PARAM_SUSPENSIONPOLICYTYPE"
@@ -44988,18 +45067,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "eType",
      "field_offset" : 64,
-     "referenced_type" : "type-2338"
+     "referenced_type" : "type-2341"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SUSPENSIONTYPE",
    "name" : "OMX_PARAM_SUSPENSIONTYPE",
-   "referenced_type" : "type-2339",
-   "self_type" : "type-2339",
+   "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_PARAM_SUSPENSIONTYPE"
@@ -45015,7 +45094,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -45030,8 +45109,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_U32TYPE",
    "name" : "OMX_PARAM_U32TYPE",
-   "referenced_type" : "type-2335",
-   "self_type" : "type-2335",
+   "referenced_type" : "type-2338",
+   "self_type" : "type-2338",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_U32TYPE"
@@ -45047,7 +45126,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPorts",
@@ -45062,8 +45141,8 @@
    ],
    "linker_set_key" : "OMX_PORT_PARAM_TYPE",
    "name" : "OMX_PORT_PARAM_TYPE",
-   "referenced_type" : "type-1585",
-   "self_type" : "type-1585",
+   "referenced_type" : "type-1581",
+   "self_type" : "type-1581",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PORT_PARAM_TYPE"
@@ -45079,7 +45158,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nGroupPriority",
@@ -45094,8 +45173,8 @@
    ],
    "linker_set_key" : "OMX_PRIORITYMGMTTYPE",
    "name" : "OMX_PRIORITYMGMTTYPE",
-   "referenced_type" : "type-1522",
-   "self_type" : "type-1522",
+   "referenced_type" : "type-1519",
+   "self_type" : "type-1519",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PRIORITYMGMTTYPE"
@@ -45111,18 +45190,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "bResourceConcealmentForbidden",
      "field_offset" : 64,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_RESOURCECONCEALMENTTYPE",
    "name" : "OMX_RESOURCECONCEALMENTTYPE",
-   "referenced_type" : "type-2344",
-   "self_type" : "type-2344",
+   "referenced_type" : "type-2347",
+   "self_type" : "type-2347",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_RESOURCECONCEALMENTTYPE"
@@ -45138,18 +45217,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "eClock",
      "field_offset" : 64,
-     "referenced_type" : "type-2319"
+     "referenced_type" : "type-2322"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
    "name" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
-   "referenced_type" : "type-2326",
-   "self_type" : "type-2326",
+   "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_TIME_CONFIG_ACTIVEREFCLOCKTYPE"
@@ -45165,12 +45244,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "eState",
      "field_offset" : 64,
-     "referenced_type" : "type-2321"
+     "referenced_type" : "type-2324"
     },
     {
      "field_name" : "nStartTime",
@@ -45190,8 +45269,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
    "name" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
-   "referenced_type" : "type-2325",
-   "self_type" : "type-2325",
+   "referenced_type" : "type-2328",
+   "self_type" : "type-2328",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_CLOCKSTATETYPE"
@@ -45207,7 +45286,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -45232,8 +45311,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
    "name" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
-   "referenced_type" : "type-2322",
-   "self_type" : "type-2322",
+   "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_MEDIATIMEREQUESTTYPE"
@@ -45249,7 +45328,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "xScale",
@@ -45259,8 +45338,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_SCALETYPE",
    "name" : "OMX_TIME_CONFIG_SCALETYPE",
-   "referenced_type" : "type-2324",
-   "self_type" : "type-2324",
+   "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_TIME_CONFIG_SCALETYPE"
@@ -45276,18 +45355,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "eType",
      "field_offset" : 64,
-     "referenced_type" : "type-2315"
+     "referenced_type" : "type-2318"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_SEEKMODETYPE",
    "name" : "OMX_TIME_CONFIG_SEEKMODETYPE",
-   "referenced_type" : "type-2316",
-   "self_type" : "type-2316",
+   "referenced_type" : "type-2319",
+   "self_type" : "type-2319",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_SEEKMODETYPE"
@@ -45303,7 +45382,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -45318,8 +45397,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
    "name" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
-   "referenced_type" : "type-2317",
-   "self_type" : "type-2317",
+   "referenced_type" : "type-2320",
+   "self_type" : "type-2320",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_TIMESTAMPTYPE"
@@ -45335,7 +45414,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nClientPrivate",
@@ -45345,7 +45424,7 @@
     {
      "field_name" : "eUpdateType",
      "field_offset" : 96,
-     "referenced_type" : "type-2318"
+     "referenced_type" : "type-2321"
     },
     {
      "field_name" : "nMediaTimestamp",
@@ -45370,13 +45449,13 @@
     {
      "field_name" : "eState",
      "field_offset" : 352,
-     "referenced_type" : "type-2321"
+     "referenced_type" : "type-2324"
     }
    ],
    "linker_set_key" : "OMX_TIME_MEDIATIMETYPE",
    "name" : "OMX_TIME_MEDIATIMETYPE",
-   "referenced_type" : "type-2323",
-   "self_type" : "type-2323",
+   "referenced_type" : "type-2326",
+   "self_type" : "type-2326",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_MEDIATIMETYPE"
@@ -45392,13 +45471,13 @@
     {
      "field_name" : "eSupplier",
      "field_offset" : 32,
-     "referenced_type" : "type-1601"
+     "referenced_type" : "type-1599"
     }
    ],
    "linker_set_key" : "OMX_TUNNELSETUPTYPE",
    "name" : "OMX_TUNNELSETUPTYPE",
-   "referenced_type" : "type-1612",
-   "self_type" : "type-1612",
+   "referenced_type" : "type-1613",
+   "self_type" : "type-1613",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_TUNNELSETUPTYPE"
@@ -45409,7 +45488,7 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-1479"
+     "referenced_type" : "type-1482"
     },
     {
      "field_name" : "nVersion",
@@ -45419,8 +45498,8 @@
    "linker_set_key" : "OMX_VERSIONTYPE",
    "name" : "OMX_VERSIONTYPE",
    "record_kind" : "union",
-   "referenced_type" : "type-1478",
-   "self_type" : "type-1478",
+   "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"
@@ -45452,8 +45531,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "OMX_VERSIONTYPE::(anonymous struct at frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h:376:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h:376:5",
    "name" : "OMX_VERSIONTYPE::(anonymous struct at frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h:376:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h:376:5",
-   "referenced_type" : "type-1479",
-   "self_type" : "type-1479",
+   "referenced_type" : "type-1482",
+   "self_type" : "type-1482",
    "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)"
@@ -45469,7 +45548,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -45489,8 +45568,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
    "name" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
-   "referenced_type" : "type-2295",
-   "self_type" : "type-2295",
+   "referenced_type" : "type-2298",
+   "self_type" : "type-2298",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD"
@@ -45506,7 +45585,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -45521,8 +45600,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_BITRATETYPE",
    "name" : "OMX_VIDEO_CONFIG_BITRATETYPE",
-   "referenced_type" : "type-2285",
-   "self_type" : "type-2285",
+   "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_VIDEO_CONFIG_BITRATETYPE"
@@ -45538,7 +45617,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -45553,8 +45632,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_NALSIZE",
    "name" : "OMX_VIDEO_CONFIG_NALSIZE",
-   "referenced_type" : "type-2296",
-   "self_type" : "type-2296",
+   "referenced_type" : "type-2299",
+   "self_type" : "type-2299",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_NALSIZE"
@@ -45570,7 +45649,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -45590,13 +45669,13 @@
     {
      "field_name" : "eSliceMode",
      "field_offset" : 128,
-     "referenced_type" : "type-2293"
+     "referenced_type" : "type-2296"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
    "name" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
-   "referenced_type" : "type-2294",
-   "self_type" : "type-2294",
+   "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_PARAM_AVCSLICEFMO"
@@ -45612,7 +45691,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -45637,7 +45716,7 @@
     {
      "field_name" : "bUseHadamard",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nRefFrames",
@@ -45657,32 +45736,32 @@
     {
      "field_name" : "bEnableUEP",
      "field_offset" : 320,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bEnableFMO",
      "field_offset" : 352,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bEnableASO",
      "field_offset" : 384,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bEnableRS",
      "field_offset" : 416,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 448,
-     "referenced_type" : "type-2279"
+     "referenced_type" : "type-2282"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 480,
-     "referenced_type" : "type-2280"
+     "referenced_type" : "type-2283"
     },
     {
      "field_name" : "nAllowedPictureTypes",
@@ -45692,22 +45771,22 @@
     {
      "field_name" : "bFrameMBsOnly",
      "field_offset" : 544,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bMBAFF",
      "field_offset" : 576,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bEntropyCodingCABAC",
      "field_offset" : 608,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bWeightedPPrediction",
      "field_offset" : 640,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nWeightedBipredicitonMode",
@@ -45717,17 +45796,17 @@
     {
      "field_name" : "bconstIpred",
      "field_offset" : 704,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bDirect8x8Inference",
      "field_offset" : 736,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bDirectSpatialTemporal",
      "field_offset" : 768,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nCabacInitIdc",
@@ -45737,13 +45816,13 @@
     {
      "field_name" : "eLoopFilterMode",
      "field_offset" : 832,
-     "referenced_type" : "type-2282"
+     "referenced_type" : "type-2285"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_AVCTYPE",
    "name" : "OMX_VIDEO_PARAM_AVCTYPE",
-   "referenced_type" : "type-2283",
-   "self_type" : "type-2283",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2286",
    "size" : 108,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_AVCTYPE"
@@ -45759,7 +45838,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -45769,17 +45848,17 @@
     {
      "field_name" : "eControlRate",
      "field_offset" : 96,
-     "referenced_type" : "type-2253"
+     "referenced_type" : "type-2256"
     },
     {
      "field_offset" : 128,
-     "referenced_type" : "type-2255"
+     "referenced_type" : "type-2258"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_BITRATETYPE",
    "name" : "OMX_VIDEO_PARAM_BITRATETYPE",
-   "referenced_type" : "type-2254",
-   "self_type" : "type-2254",
+   "referenced_type" : "type-2257",
+   "self_type" : "type-2257",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_BITRATETYPE"
@@ -45801,8 +45880,8 @@
    "linker_set_key" : "OMX_VIDEO_PARAM_BITRATETYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5",
    "name" : "OMX_VIDEO_PARAM_BITRATETYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5",
    "record_kind" : "union",
-   "referenced_type" : "type-2255",
-   "self_type" : "type-2255",
+   "referenced_type" : "type-2258",
+   "self_type" : "type-2258",
    "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)"
@@ -45818,7 +45897,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -45828,12 +45907,12 @@
     {
      "field_name" : "bEnableHEC",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bEnableResync",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nResynchMarkerSpacing",
@@ -45843,18 +45922,18 @@
     {
      "field_name" : "bEnableDataPartitioning",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bEnableRVLC",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE",
    "name" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE",
-   "referenced_type" : "type-2261",
-   "self_type" : "type-2261",
+   "referenced_type" : "type-2264",
+   "self_type" : "type-2264",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE"
@@ -45870,7 +45949,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -45890,17 +45969,17 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 160,
-     "referenced_type" : "type-2263"
+     "referenced_type" : "type-2266"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 192,
-     "referenced_type" : "type-2264"
+     "referenced_type" : "type-2267"
     },
     {
      "field_name" : "bPLUSPTYPEAllowed",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nAllowedPictureTypes",
@@ -45910,7 +45989,7 @@
     {
      "field_name" : "bForceRoundingTypeToZero",
      "field_offset" : 288,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nPictureHeaderRepetition",
@@ -45925,8 +46004,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_H263TYPE",
    "name" : "OMX_VIDEO_PARAM_H263TYPE",
-   "referenced_type" : "type-2267",
-   "self_type" : "type-2267",
+   "referenced_type" : "type-2270",
+   "self_type" : "type-2270",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_H263TYPE"
@@ -45942,7 +46021,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -45952,7 +46031,7 @@
     {
      "field_name" : "eRefreshMode",
      "field_offset" : 96,
-     "referenced_type" : "type-2259"
+     "referenced_type" : "type-2262"
     },
     {
      "field_name" : "nAirMBs",
@@ -45972,8 +46051,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
    "name" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
-   "referenced_type" : "type-2260",
-   "self_type" : "type-2260",
+   "referenced_type" : "type-2263",
+   "self_type" : "type-2263",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE"
@@ -45989,7 +46068,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -45999,17 +46078,17 @@
     {
      "field_name" : "eAccuracy",
      "field_offset" : 96,
-     "referenced_type" : "type-2257"
+     "referenced_type" : "type-2260"
     },
     {
      "field_name" : "bUnrestrictedMVs",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bFourMV",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "sXSearchRange",
@@ -46024,8 +46103,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
    "name" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
-   "referenced_type" : "type-2258",
-   "self_type" : "type-2258",
+   "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_MOTIONVECTORTYPE"
@@ -46041,7 +46120,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -46061,18 +46140,18 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 160,
-     "referenced_type" : "type-2268"
+     "referenced_type" : "type-2271"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 192,
-     "referenced_type" : "type-2269"
+     "referenced_type" : "type-2272"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MPEG2TYPE",
    "name" : "OMX_VIDEO_PARAM_MPEG2TYPE",
-   "referenced_type" : "type-2270",
-   "self_type" : "type-2270",
+   "referenced_type" : "type-2273",
+   "self_type" : "type-2273",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MPEG2TYPE"
@@ -46088,7 +46167,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -46103,12 +46182,12 @@
     {
      "field_name" : "bSVH",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bGov",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nPFrames",
@@ -46128,7 +46207,7 @@
     {
      "field_name" : "bACPred",
      "field_offset" : 288,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nMaxPacketSize",
@@ -46143,12 +46222,12 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 384,
-     "referenced_type" : "type-2271"
+     "referenced_type" : "type-2274"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 416,
-     "referenced_type" : "type-2272"
+     "referenced_type" : "type-2275"
     },
     {
      "field_name" : "nAllowedPictureTypes",
@@ -46163,13 +46242,13 @@
     {
      "field_name" : "bReversibleVLC",
      "field_offset" : 512,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MPEG4TYPE",
    "name" : "OMX_VIDEO_PARAM_MPEG4TYPE",
-   "referenced_type" : "type-2273",
-   "self_type" : "type-2273",
+   "referenced_type" : "type-2276",
+   "self_type" : "type-2276",
    "size" : 68,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MPEG4TYPE"
@@ -46185,7 +46264,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -46200,12 +46279,12 @@
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-2248"
+     "referenced_type" : "type-2251"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-2199"
+     "referenced_type" : "type-2202"
     },
     {
      "field_name" : "xFramerate",
@@ -46215,8 +46294,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
    "name" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-2250",
-   "self_type" : "type-2250",
+   "referenced_type" : "type-2253",
+   "self_type" : "type-2253",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_PORTFORMATTYPE"
@@ -46232,7 +46311,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -46257,8 +46336,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
    "name" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
-   "referenced_type" : "type-2284",
-   "self_type" : "type-2284",
+   "referenced_type" : "type-2287",
+   "self_type" : "type-2287",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE"
@@ -46274,7 +46353,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -46299,8 +46378,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
    "name" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
-   "referenced_type" : "type-2251",
-   "self_type" : "type-2251",
+   "referenced_type" : "type-2254",
+   "self_type" : "type-2254",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE"
@@ -46316,7 +46395,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -46326,7 +46405,7 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 96,
-     "referenced_type" : "type-2276"
+     "referenced_type" : "type-2279"
     },
     {
      "field_name" : "nBitsPerPixel",
@@ -46366,23 +46445,23 @@
     {
      "field_name" : "bEnablePostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bEnableTemporalInterpolation",
      "field_offset" : 352,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bEnableLatencyMode",
      "field_offset" : 384,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_RVTYPE",
    "name" : "OMX_VIDEO_PARAM_RVTYPE",
-   "referenced_type" : "type-2278",
-   "self_type" : "type-2278",
+   "referenced_type" : "type-2281",
+   "self_type" : "type-2281",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_RVTYPE"
@@ -46398,7 +46477,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -46408,43 +46487,43 @@
     {
      "field_name" : "b16x16",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "b16x8",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "b8x16",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "b8x8",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "b8x4",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "b4x8",
      "field_offset" : 256,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "b4x4",
      "field_offset" : 288,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VBSMCTYPE",
    "name" : "OMX_VIDEO_PARAM_VBSMCTYPE",
-   "referenced_type" : "type-2262",
-   "self_type" : "type-2262",
+   "referenced_type" : "type-2265",
+   "self_type" : "type-2265",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_VBSMCTYPE"
@@ -46460,7 +46539,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -46470,7 +46549,7 @@
     {
      "field_name" : "bEnableVFU",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nFirstGOB",
@@ -46490,8 +46569,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
    "name" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
-   "referenced_type" : "type-2252",
-   "self_type" : "type-2252",
+   "referenced_type" : "type-2255",
+   "self_type" : "type-2255",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE"
@@ -46507,7 +46586,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -46517,13 +46596,13 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 96,
-     "referenced_type" : "type-2274"
+     "referenced_type" : "type-2277"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_WMVTYPE",
    "name" : "OMX_VIDEO_PARAM_WMVTYPE",
-   "referenced_type" : "type-2275",
-   "self_type" : "type-2275",
+   "referenced_type" : "type-2278",
+   "self_type" : "type-2278",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_WMVTYPE"
@@ -46574,17 +46653,17 @@
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 256,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 288,
-     "referenced_type" : "type-2248"
+     "referenced_type" : "type-2251"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 320,
-     "referenced_type" : "type-2199"
+     "referenced_type" : "type-2202"
     },
     {
      "field_name" : "pNativeWindow",
@@ -46594,8 +46673,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PORTDEFINITIONTYPE",
    "name" : "OMX_VIDEO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-2249",
-   "self_type" : "type-2249",
+   "referenced_type" : "type-2252",
+   "self_type" : "type-2252",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PORTDEFINITIONTYPE"
@@ -46605,7 +46684,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1166"
+     "referenced_type" : "type-1167"
     }
    ],
    "fields" :
@@ -46614,20 +46693,20 @@
      "access" : "private",
      "field_name" : "d_",
      "field_offset" : 32,
-     "referenced_type" : "type-1194"
+     "referenced_type" : "type-1198"
     },
     {
      "access" : "private",
      "field_name" : "s_",
      "field_offset" : 64,
-     "referenced_type" : "type-1195"
+     "referenced_type" : "type-1199"
     }
    ],
    "linker_set_key" : "Renamer",
    "name" : "Renamer",
    "record_kind" : "class",
-   "referenced_type" : "type-1193",
-   "self_type" : "type-1193",
+   "referenced_type" : "type-1197",
+   "self_type" : "type-1197",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSZN7android14ReferenceMover15move_referencesINS_13GraphicBufferEEEvPNS_2spIT_EEPKS5_jE7Renamer",
@@ -46657,8 +46736,8 @@
    "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-1039",
-   "self_type" : "type-1039",
+   "referenced_type" : "type-1042",
+   "self_type" : "type-1042",
    "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"
@@ -46667,8 +46746,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::ADebug",
    "name" : "android::ADebug",
-   "referenced_type" : "type-2281",
-   "self_type" : "type-2281",
+   "referenced_type" : "type-2284",
+   "self_type" : "type-2284",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
    "unique_id" : "_ZTSN7android6ADebugE"
@@ -47167,8 +47246,8 @@
    ],
    "linker_set_key" : "android::AReplyToken",
    "name" : "android::AReplyToken",
-   "referenced_type" : "type-1044",
-   "self_type" : "type-1044",
+   "referenced_type" : "type-1043",
+   "self_type" : "type-1043",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android11AReplyTokenE",
@@ -48137,6 +48216,10 @@
      "mangled_component_name" : "_ZN7android16ProducerListener18needsReleaseNotifyEv"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ProducerListener18onBuffersDiscardedERKNSt3__16vectorIiNS1_9allocatorIiEEEE"
+    },
+    {
      "mangled_component_name" : "_ZNK7android17IProducerListener13getHalVariantEv"
     },
     {
@@ -48287,7 +48370,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1096"
+     "referenced_type" : "type-1099"
     },
     {
      "referenced_type" : "type-67"
@@ -48296,11 +48379,11 @@
    "linker_set_key" : "android::BnInterface<android::ISurfaceComposer>",
    "name" : "android::BnInterface<android::ISurfaceComposer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1095",
-   "self_type" : "type-1095",
+   "referenced_type" : "type-1098",
+   "self_type" : "type-1098",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-1097" ],
+   "template_args" : [ "type-1100" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_16ISurfaceComposerEEE",
    "vtable_components" :
    [
@@ -48335,7 +48418,7 @@
     },
     {
      "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ISurfaceComposer28createDisplayEventConnectionENS0_11VsyncSourceE"
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer28createDisplayEventConnectionENS0_11VsyncSourceENS0_13ConfigChangedE"
     },
     {
      "is_pure" : true,
@@ -48414,6 +48497,10 @@
     },
     {
      "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer13captureScreenEyPNS_8hardware8graphics6common4V1_29DataspaceEPNS_2spINS_13GraphicBufferEEE"
+    },
+    {
+     "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"
     },
     {
@@ -48493,6 +48580,10 @@
      "mangled_component_name" : "_ZNK7android16ISurfaceComposer20setDisplayBrightnessERKNS_2spINS_7IBinderEEEf"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer15notifyPowerHintEi"
+    },
+    {
      "mangled_component_name" : "_ZN7android11BnInterfaceINS_16ISurfaceComposerEE19queryLocalInterfaceERKNS_8String16E"
     },
     {
@@ -48611,7 +48702,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1032"
+     "referenced_type" : "type-1035"
     },
     {
      "referenced_type" : "type-67"
@@ -48620,11 +48711,11 @@
    "linker_set_key" : "android::BnInterface<android::ITransactionCompletedListener>",
    "name" : "android::BnInterface<android::ITransactionCompletedListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1031",
-   "self_type" : "type-1031",
+   "referenced_type" : "type-1034",
+   "self_type" : "type-1034",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-1033" ],
+   "template_args" : [ "type-1036" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_29ITransactionCompletedListenerEEE",
    "vtable_components" :
    [
@@ -48776,7 +48867,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1496"
+     "referenced_type" : "type-1502"
     },
     {
      "referenced_type" : "type-48"
@@ -48785,11 +48876,11 @@
    "linker_set_key" : "android::BpInterface<android::IConsumerListener>",
    "name" : "android::BpInterface<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1495",
-   "self_type" : "type-1495",
+   "referenced_type" : "type-1501",
+   "self_type" : "type-1501",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-1497" ],
+   "template_args" : [ "type-1503" ],
    "unique_id" : "_ZTSN7android11BpInterfaceINS_17IConsumerListenerEEE",
    "vtable_components" :
    [
@@ -48945,7 +49036,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1625"
+     "referenced_type" : "type-1630"
     },
     {
      "referenced_type" : "type-48"
@@ -48954,11 +49045,11 @@
    "linker_set_key" : "android::BpInterface<android::IGraphicBufferConsumer>",
    "name" : "android::BpInterface<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1624",
-   "self_type" : "type-1624",
+   "referenced_type" : "type-1629",
+   "self_type" : "type-1629",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-1626" ],
+   "template_args" : [ "type-1631" ],
    "unique_id" : "_ZTSN7android11BpInterfaceINS_22IGraphicBufferConsumerEEE",
    "vtable_components" :
    [
@@ -49150,7 +49241,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-4318"
+     "referenced_type" : "type-4324"
     },
     {
      "referenced_type" : "type-48"
@@ -49159,11 +49250,11 @@
    "linker_set_key" : "android::BpInterface<android::IGraphicBufferProducer>",
    "name" : "android::BpInterface<android::IGraphicBufferProducer>",
    "record_kind" : "class",
-   "referenced_type" : "type-4317",
-   "self_type" : "type-4317",
+   "referenced_type" : "type-4323",
+   "self_type" : "type-4323",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-4319" ],
+   "template_args" : [ "type-4325" ],
    "unique_id" : "_ZTSN7android11BpInterfaceINS_22IGraphicBufferProducerEEE",
    "vtable_components" :
    [
@@ -49379,7 +49470,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-4480"
+     "referenced_type" : "type-4486"
     },
     {
      "referenced_type" : "type-48"
@@ -49388,11 +49479,11 @@
    "linker_set_key" : "android::BpInterface<android::IProducerListener>",
    "name" : "android::BpInterface<android::IProducerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-4479",
-   "self_type" : "type-4479",
+   "referenced_type" : "type-4485",
+   "self_type" : "type-4485",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-4481" ],
+   "template_args" : [ "type-4487" ],
    "unique_id" : "_ZTSN7android11BpInterfaceINS_17IProducerListenerEEE",
    "vtable_components" :
    [
@@ -49424,6 +49515,10 @@
      "mangled_component_name" : "_ZN7android16ProducerListener18needsReleaseNotifyEv"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ProducerListener18onBuffersDiscardedERKNSt3__16vectorIiNS1_9allocatorIiEEEE"
+    },
+    {
      "mangled_component_name" : "_ZNK7android17IProducerListener13getHalVariantEv"
     },
     {
@@ -49656,28 +49751,28 @@
    [
     {
      "field_name" : "mRange",
-     "referenced_type" : "type-2429"
+     "referenced_type" : "type-2432"
     },
     {
      "field_name" : "mPrimaries",
      "field_offset" : 32,
-     "referenced_type" : "type-2430"
+     "referenced_type" : "type-2433"
     },
     {
      "field_name" : "mTransfer",
      "field_offset" : 64,
-     "referenced_type" : "type-2431"
+     "referenced_type" : "type-2434"
     },
     {
      "field_name" : "mMatrixCoeffs",
      "field_offset" : 96,
-     "referenced_type" : "type-2432"
+     "referenced_type" : "type-2435"
     }
    ],
    "linker_set_key" : "android::ColorAspects",
    "name" : "android::ColorAspects",
-   "referenced_type" : "type-2428",
-   "self_type" : "type-2428",
+   "referenced_type" : "type-2431",
+   "self_type" : "type-2431",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android12ColorAspectsE"
@@ -49686,8 +49781,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::ColorUtils",
    "name" : "android::ColorUtils",
-   "referenced_type" : "type-1181",
-   "self_type" : "type-1181",
+   "referenced_type" : "type-1180",
+   "self_type" : "type-1180",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
    "unique_id" : "_ZTSN7android10ColorUtilsE"
@@ -49696,8 +49791,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::CompileTimeAssert<true>",
    "name" : "android::CompileTimeAssert<true>",
-   "referenced_type" : "type-2690",
-   "self_type" : "type-2690",
+   "referenced_type" : "type-2693",
+   "self_type" : "type-2693",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Debug.h",
    "unique_id" : "_ZTSN7android17CompileTimeAssertILb1EEE"
@@ -49790,7 +49885,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -49800,7 +49895,7 @@
     {
      "field_name" : "bTunneled",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nAudioHwSync",
@@ -49815,8 +49910,8 @@
    ],
    "linker_set_key" : "android::ConfigureVideoTunnelModeParams",
    "name" : "android::ConfigureVideoTunnelModeParams",
-   "referenced_type" : "type-2426",
-   "self_type" : "type-2426",
+   "referenced_type" : "type-2429",
+   "self_type" : "type-2429",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android30ConfigureVideoTunnelModeParamsE"
@@ -49832,7 +49927,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -49842,12 +49937,12 @@
     {
      "field_name" : "bRequestingDataSpace",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bDataSpaceChanged",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nPixelFormat",
@@ -49862,13 +49957,13 @@
     {
      "field_name" : "sAspects",
      "field_offset" : 224,
-     "referenced_type" : "type-2428"
+     "referenced_type" : "type-2431"
     }
    ],
    "linker_set_key" : "android::DescribeColorAspectsParams",
    "name" : "android::DescribeColorAspectsParams",
-   "referenced_type" : "type-2427",
-   "self_type" : "type-2427",
+   "referenced_type" : "type-2430",
+   "self_type" : "type-2430",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26DescribeColorAspectsParamsE"
@@ -49884,12 +49979,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 64,
-     "referenced_type" : "type-2199"
+     "referenced_type" : "type-2202"
     },
     {
      "field_name" : "nFrameWidth",
@@ -49914,18 +50009,18 @@
     {
      "field_name" : "bUsingNativeBuffers",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "sMediaImage",
      "field_offset" : 256,
-     "referenced_type" : "type-2420"
+     "referenced_type" : "type-2423"
     }
    ],
    "linker_set_key" : "android::DescribeColorFormat2Params",
    "name" : "android::DescribeColorFormat2Params",
-   "referenced_type" : "type-2419",
-   "self_type" : "type-2419",
+   "referenced_type" : "type-2422",
+   "self_type" : "type-2422",
    "size" : 136,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26DescribeColorFormat2ParamsE"
@@ -49941,12 +50036,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 64,
-     "referenced_type" : "type-2199"
+     "referenced_type" : "type-2202"
     },
     {
      "field_name" : "nFrameWidth",
@@ -49971,18 +50066,18 @@
     {
      "field_name" : "bUsingNativeBuffers",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "sMediaImage",
      "field_offset" : 256,
-     "referenced_type" : "type-2415"
+     "referenced_type" : "type-2418"
     }
    ],
    "linker_set_key" : "android::DescribeColorFormatParams",
    "name" : "android::DescribeColorFormatParams",
-   "referenced_type" : "type-2414",
-   "self_type" : "type-2414",
+   "referenced_type" : "type-2417",
+   "self_type" : "type-2417",
    "size" : 112,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android25DescribeColorFormatParamsE"
@@ -49998,7 +50093,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50018,13 +50113,13 @@
     {
      "field_name" : "nValue",
      "field_offset" : 160,
-     "referenced_type" : "type-1572"
+     "referenced_type" : "type-1567"
     }
    ],
    "linker_set_key" : "android::DescribeHDR10PlusInfoParams",
    "name" : "android::DescribeHDR10PlusInfoParams",
-   "referenced_type" : "type-2440",
-   "self_type" : "type-2440",
+   "referenced_type" : "type-2443",
+   "self_type" : "type-2443",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android27DescribeHDR10PlusInfoParamsE"
@@ -50040,7 +50135,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50050,13 +50145,13 @@
     {
      "field_name" : "sInfo",
      "field_offset" : 96,
-     "referenced_type" : "type-2435"
+     "referenced_type" : "type-2438"
     }
    ],
    "linker_set_key" : "android::DescribeHDRStaticInfoParams",
    "name" : "android::DescribeHDRStaticInfoParams",
-   "referenced_type" : "type-2434",
-   "self_type" : "type-2434",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2437",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android27DescribeHDRStaticInfoParamsE"
@@ -50072,7 +50167,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50082,13 +50177,13 @@
     {
      "field_name" : "enable",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "android::EnableAndroidNativeBuffersParams",
    "name" : "android::EnableAndroidNativeBuffersParams",
-   "referenced_type" : "type-2395",
-   "self_type" : "type-2395",
+   "referenced_type" : "type-2398",
+   "self_type" : "type-2398",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android32EnableAndroidNativeBuffersParamsE"
@@ -50100,13 +50195,13 @@
     {
      "access" : "private",
      "field_name" : "mSharedFd",
-     "referenced_type" : "type-1199"
+     "referenced_type" : "type-1202"
     }
    ],
    "linker_set_key" : "android::FileDescriptor",
    "name" : "android::FileDescriptor",
-   "referenced_type" : "type-1198",
-   "self_type" : "type-1198",
+   "referenced_type" : "type-1201",
+   "self_type" : "type-1201",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h",
    "unique_id" : "_ZTSN7android14FileDescriptorE"
@@ -50123,8 +50218,8 @@
    ],
    "linker_set_key" : "android::FileDescriptor::Autoclose",
    "name" : "android::FileDescriptor::Autoclose",
-   "referenced_type" : "type-1204",
-   "self_type" : "type-1204",
+   "referenced_type" : "type-1203",
+   "self_type" : "type-1203",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h",
    "unique_id" : "_ZTSN7android14FileDescriptor9AutocloseE"
@@ -50308,7 +50403,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50323,8 +50418,8 @@
    ],
    "linker_set_key" : "android::GetAndroidNativeBufferUsageParams",
    "name" : "android::GetAndroidNativeBufferUsageParams",
-   "referenced_type" : "type-2412",
-   "self_type" : "type-2412",
+   "referenced_type" : "type-2415",
+   "self_type" : "type-2415",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android33GetAndroidNativeBufferUsageParamsE"
@@ -50670,17 +50765,17 @@
    [
     {
      "field_name" : "mID",
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2439"
     },
     {
      "field_offset" : 8,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2440"
     }
    ],
    "linker_set_key" : "android::HDRStaticInfo",
    "name" : "android::HDRStaticInfo",
-   "referenced_type" : "type-2435",
-   "self_type" : "type-2435",
+   "referenced_type" : "type-2438",
+   "self_type" : "type-2438",
    "size" : 25,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfoE"
@@ -50691,15 +50786,15 @@
    [
     {
      "field_name" : "sType1",
-     "referenced_type" : "type-2438"
+     "referenced_type" : "type-2441"
     }
    ],
    "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-2437",
-   "self_type" : "type-2437",
+   "referenced_type" : "type-2440",
+   "self_type" : "type-2440",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfoUt_E"
@@ -50720,8 +50815,8 @@
    ],
    "linker_set_key" : "android::HDRStaticInfo::Primaries1",
    "name" : "android::HDRStaticInfo::Primaries1",
-   "referenced_type" : "type-2439",
-   "self_type" : "type-2439",
+   "referenced_type" : "type-2442",
+   "self_type" : "type-2442",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfo10Primaries1E"
@@ -50732,22 +50827,22 @@
    [
     {
      "field_name" : "mR",
-     "referenced_type" : "type-2439"
+     "referenced_type" : "type-2442"
     },
     {
      "field_name" : "mG",
      "field_offset" : 32,
-     "referenced_type" : "type-2439"
+     "referenced_type" : "type-2442"
     },
     {
      "field_name" : "mB",
      "field_offset" : 64,
-     "referenced_type" : "type-2439"
+     "referenced_type" : "type-2442"
     },
     {
      "field_name" : "mW",
      "field_offset" : 96,
-     "referenced_type" : "type-2439"
+     "referenced_type" : "type-2442"
     },
     {
      "field_name" : "mMaxDisplayLuminance",
@@ -50772,8 +50867,8 @@
    ],
    "linker_set_key" : "android::HDRStaticInfo::Type1",
    "name" : "android::HDRStaticInfo::Type1",
-   "referenced_type" : "type-2438",
-   "self_type" : "type-2438",
+   "referenced_type" : "type-2441",
+   "self_type" : "type-2441",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfo5Type1E"
@@ -51097,31 +51192,31 @@
     {
      "access" : "private",
      "field_name" : "mProcess",
-     "referenced_type" : "type-1258"
+     "referenced_type" : "type-1261"
     },
     {
      "access" : "private",
      "field_name" : "mPendingStrongDerefs",
      "field_offset" : 32,
-     "referenced_type" : "type-1205"
+     "referenced_type" : "type-1208"
     },
     {
      "access" : "private",
      "field_name" : "mPendingWeakDerefs",
      "field_offset" : 192,
-     "referenced_type" : "type-1207"
+     "referenced_type" : "type-1210"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteStrongDerefs",
      "field_offset" : 352,
-     "referenced_type" : "type-1208"
+     "referenced_type" : "type-1213"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteWeakDerefs",
      "field_offset" : 512,
-     "referenced_type" : "type-1207"
+     "referenced_type" : "type-1210"
     },
     {
      "access" : "private",
@@ -51187,20 +51282,20 @@
      "access" : "private",
      "field_name" : "mIPCThreadStateBase",
      "field_offset" : 1888,
-     "referenced_type" : "type-1264"
+     "referenced_type" : "type-1267"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 1920,
-     "referenced_type" : "type-1255"
+     "referenced_type" : "type-1259"
     }
    ],
    "linker_set_key" : "android::IPCThreadState",
    "name" : "android::IPCThreadState",
    "record_kind" : "class",
-   "referenced_type" : "type-1257",
-   "self_type" : "type-1257",
+   "referenced_type" : "type-1260",
+   "self_type" : "type-1260",
    "size" : 244,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h",
    "unique_id" : "_ZTSN7android14IPCThreadStateE"
@@ -51212,17 +51307,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-1200"
+     "referenced_type" : "type-1204"
     }
    ],
    "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",
+   "referenced_type" : "type-1241",
+   "self_type" : "type-1241",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-1239", "type-795" ],
+   "template_args" : [ "type-1242", "type-795" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_7IBinderEEEEE"
   },
   {
@@ -51232,17 +51327,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-1354"
+     "referenced_type" : "type-1357"
     }
    ],
    "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",
+   "referenced_type" : "type-1369",
+   "self_type" : "type-1369",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-1239", "type-1367" ],
+   "template_args" : [ "type-1242", "type-1370" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
   },
   {
@@ -51310,11 +51405,11 @@
    "linker_set_key" : "android::LightFlattenable<android::FrameStats>",
    "name" : "android::LightFlattenable<android::FrameStats>",
    "record_kind" : "class",
-   "referenced_type" : "type-1098",
-   "self_type" : "type-1098",
+   "referenced_type" : "type-1101",
+   "self_type" : "type-1101",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1099" ],
+   "template_args" : [ "type-1102" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_10FrameStatsEEE"
   },
   {
@@ -51428,17 +51523,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-1210"
+     "referenced_type" : "type-1215"
     }
    ],
    "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",
+   "referenced_type" : "type-1214",
+   "self_type" : "type-1214",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-1211" ],
+   "template_args" : [ "type-1216" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_10GLConsumer8EglImageEEE"
   },
   {
@@ -51468,17 +51563,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-2353"
+     "referenced_type" : "type-2356"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
    "name" : "android::LightRefBase<android::VirtualLightRefBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-2352",
-   "self_type" : "type-2352",
+   "referenced_type" : "type-2355",
+   "self_type" : "type-2355",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-2354" ],
+   "template_args" : [ "type-2357" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
   },
   {
@@ -51889,7 +51984,7 @@
    [
     {
      "field_name" : "mType",
-     "referenced_type" : "type-2416"
+     "referenced_type" : "type-2419"
     },
     {
      "field_name" : "mNumPlanes",
@@ -51914,13 +52009,13 @@
     {
      "field_name" : "mPlane",
      "field_offset" : 160,
-     "referenced_type" : "type-2417"
+     "referenced_type" : "type-2420"
     }
    ],
    "linker_set_key" : "android::MediaImage",
    "name" : "android::MediaImage",
-   "referenced_type" : "type-2415",
-   "self_type" : "type-2415",
+   "referenced_type" : "type-2418",
+   "self_type" : "type-2418",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android10MediaImageE"
@@ -51931,7 +52026,7 @@
    [
     {
      "field_name" : "mType",
-     "referenced_type" : "type-2421"
+     "referenced_type" : "type-2424"
     },
     {
      "field_name" : "mNumPlanes",
@@ -51961,13 +52056,13 @@
     {
      "field_name" : "mPlane",
      "field_offset" : 192,
-     "referenced_type" : "type-2422"
+     "referenced_type" : "type-2425"
     }
    ],
    "linker_set_key" : "android::MediaImage2",
    "name" : "android::MediaImage2",
-   "referenced_type" : "type-2420",
-   "self_type" : "type-2420",
+   "referenced_type" : "type-2423",
+   "self_type" : "type-2423",
    "size" : 104,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android11MediaImage2E"
@@ -52003,8 +52098,8 @@
    ],
    "linker_set_key" : "android::MediaImage2::PlaneInfo",
    "name" : "android::MediaImage2::PlaneInfo",
-   "referenced_type" : "type-2423",
-   "self_type" : "type-2423",
+   "referenced_type" : "type-2426",
+   "self_type" : "type-2426",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android11MediaImage29PlaneInfoE"
@@ -52040,8 +52135,8 @@
    ],
    "linker_set_key" : "android::MediaImage::PlaneInfo",
    "name" : "android::MediaImage::PlaneInfo",
-   "referenced_type" : "type-2418",
-   "self_type" : "type-2418",
+   "referenced_type" : "type-2421",
+   "self_type" : "type-2421",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android10MediaImage9PlaneInfoE"
@@ -52120,8 +52215,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::OMXPluginBase",
    "name" : "android::OMXPluginBase",
-   "referenced_type" : "type-2393",
-   "self_type" : "type-2393",
+   "referenced_type" : "type-2396",
+   "self_type" : "type-2396",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h",
    "unique_id" : "_ZTSN7android13OMXPluginBaseE",
@@ -52333,17 +52428,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 32,
-     "referenced_type" : "type-1512"
+     "referenced_type" : "type-1516"
     }
    ],
    "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",
+   "referenced_type" : "type-1520",
+   "self_type" : "type-1520",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-1517" ],
+   "template_args" : [ "type-1521" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_10BufferItemEEE",
    "vtable_components" :
    [
@@ -52382,17 +52477,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 32,
-     "referenced_type" : "type-1647"
+     "referenced_type" : "type-1650"
     }
    ],
    "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",
+   "referenced_type" : "type-1662",
+   "self_type" : "type-1662",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-1659" ],
+   "template_args" : [ "type-1663" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_5FenceEEE",
    "vtable_components" :
    [
@@ -52431,17 +52526,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 32,
-     "referenced_type" : "type-4322"
+     "referenced_type" : "type-4328"
     }
    ],
    "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",
+   "referenced_type" : "type-4334",
+   "self_type" : "type-4334",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-4329" ],
+   "template_args" : [ "type-4335" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEEE",
    "vtable_components" :
    [
@@ -52480,17 +52575,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 32,
-     "referenced_type" : "type-1646"
+     "referenced_type" : "type-1649"
     }
    ],
    "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",
+   "referenced_type" : "type-1657",
+   "self_type" : "type-1657",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-1654" ],
+   "template_args" : [ "type-1658" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_13GraphicBufferEEE",
    "vtable_components" :
    [
@@ -52529,17 +52624,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 32,
-     "referenced_type" : "type-4321"
+     "referenced_type" : "type-4327"
     }
    ],
    "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",
+   "referenced_type" : "type-4339",
+   "self_type" : "type-4339",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-4334" ],
+   "template_args" : [ "type-4340" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEEE",
    "vtable_components" :
    [
@@ -52578,17 +52673,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 32,
-     "referenced_type" : "type-4323"
+     "referenced_type" : "type-4329"
     }
    ],
    "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",
+   "referenced_type" : "type-4345",
+   "self_type" : "type-4345",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-4339" ],
+   "template_args" : [ "type-4346" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEEE",
    "vtable_components" :
    [
@@ -52733,7 +52828,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -52743,7 +52838,7 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nMaxFrameWidth",
@@ -52758,8 +52853,8 @@
    ],
    "linker_set_key" : "android::PrepareForAdaptivePlaybackParams",
    "name" : "android::PrepareForAdaptivePlaybackParams",
-   "referenced_type" : "type-2406",
-   "self_type" : "type-2406",
+   "referenced_type" : "type-2409",
+   "self_type" : "type-2409",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android32PrepareForAdaptivePlaybackParamsE"
@@ -52775,18 +52870,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 64,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "android::PrependSPSPPSToIDRFramesParams",
    "name" : "android::PrependSPSPPSToIDRFramesParams",
-   "referenced_type" : "type-2413",
-   "self_type" : "type-2413",
+   "referenced_type" : "type-2416",
+   "self_type" : "type-2416",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android30PrependSPSPPSToIDRFramesParamsE"
@@ -52824,13 +52919,13 @@
      "access" : "private",
      "field_name" : "mThreadCountLock",
      "field_offset" : 128,
-     "referenced_type" : "type-1262"
+     "referenced_type" : "type-1265"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountDecrement",
      "field_offset" : 160,
-     "referenced_type" : "type-1263"
+     "referenced_type" : "type-1266"
     },
     {
      "access" : "private",
@@ -52860,7 +52955,7 @@
      "access" : "private",
      "field_name" : "mHandleToObject",
      "field_offset" : 352,
-     "referenced_type" : "type-1202"
+     "referenced_type" : "type-1206"
     },
     {
      "access" : "private",
@@ -52872,7 +52967,7 @@
      "access" : "private",
      "field_name" : "mBinderContextCheckFunc",
      "field_offset" : 544,
-     "referenced_type" : "type-1249"
+     "referenced_type" : "type-1252"
     },
     {
      "access" : "private",
@@ -52884,7 +52979,7 @@
      "access" : "private",
      "field_name" : "mContexts",
      "field_offset" : 608,
-     "referenced_type" : "type-1238"
+     "referenced_type" : "type-1241"
     },
     {
      "access" : "private",
@@ -52902,20 +52997,20 @@
      "access" : "private",
      "field_name" : "mThreadPoolSeq",
      "field_offset" : 832,
-     "referenced_type" : "type-1250"
+     "referenced_type" : "type-1253"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 864,
-     "referenced_type" : "type-1255"
+     "referenced_type" : "type-1259"
     }
    ],
    "linker_set_key" : "android::ProcessState",
    "name" : "android::ProcessState",
    "record_kind" : "class",
-   "referenced_type" : "type-1261",
-   "self_type" : "type-1261",
+   "referenced_type" : "type-1264",
+   "self_type" : "type-1264",
    "size" : 120,
    "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h",
    "unique_id" : "_ZTSN7android12ProcessStateE",
@@ -53003,8 +53098,8 @@
    ],
    "linker_set_key" : "android::ProcessState::handle_entry",
    "name" : "android::ProcessState::handle_entry",
-   "referenced_type" : "type-1203",
-   "self_type" : "type-1203",
+   "referenced_type" : "type-1207",
+   "self_type" : "type-1207",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h",
    "unique_id" : "_ZTSN7android12ProcessState12handle_entryE"
@@ -53132,8 +53227,8 @@
    "linker_set_key" : "android::ReferenceMover",
    "name" : "android::ReferenceMover",
    "record_kind" : "class",
-   "referenced_type" : "type-1589",
-   "self_type" : "type-1589",
+   "referenced_type" : "type-1592",
+   "self_type" : "type-1592",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android14ReferenceMoverE"
@@ -53143,8 +53238,8 @@
    "linker_set_key" : "android::ReferenceRenamer",
    "name" : "android::ReferenceRenamer",
    "record_kind" : "class",
-   "referenced_type" : "type-1166",
-   "self_type" : "type-1166",
+   "referenced_type" : "type-1167",
+   "self_type" : "type-1167",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android16ReferenceRenamerE",
@@ -53167,8 +53262,8 @@
    "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",
+   "referenced_type" : "type-1565",
+   "self_type" : "type-1565",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE16ElementIsPointerILj0EJRKNS_10BufferItemEEEE"
@@ -53180,14 +53275,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> >",
    "name" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> >",
    "record_kind" : "class",
-   "referenced_type" : "type-1563",
-   "self_type" : "type-1563",
+   "referenced_type" : "type-1568",
+   "self_type" : "type-1568",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE11InputReaderIJNSt3__15tupleIJEEEEEE"
@@ -53199,14 +53294,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-1572",
+   "self_type" : "type-1572",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE11InputReaderIJNSt3__15tupleIJRKNS_10BufferItemEEEEEEE"
@@ -53215,8 +53310,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::MethodCaller<tuple<> >",
    "name" : "android::SafeBnInterface<IConsumerListener>::MethodCaller<tuple<> >",
-   "referenced_type" : "type-1573",
-   "self_type" : "type-1573",
+   "referenced_type" : "type-1576",
+   "self_type" : "type-1576",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE12MethodCallerIJNSt3__15tupleIJEEEEEE"
@@ -53225,8 +53320,8 @@
    "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",
+   "referenced_type" : "type-1577",
+   "self_type" : "type-1577",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE12MethodCallerIJNSt3__15tupleIJRKNS_10BufferItemEEEEEEE"
@@ -53235,52 +53330,52 @@
    "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",
+   "referenced_type" : "type-1559",
+   "self_type" : "type-1559",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1556" ],
+   "template_args" : [ "type-1560" ],
    "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",
+   "referenced_type" : "type-1561",
+   "self_type" : "type-1561",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1558" ],
+   "template_args" : [ "type-1562" ],
    "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",
+   "referenced_type" : "type-1563",
+   "self_type" : "type-1563",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1560" ],
+   "template_args" : [ "type-1564" ],
    "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",
+   "referenced_type" : "type-1557",
+   "self_type" : "type-1557",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1554" ],
+   "template_args" : [ "type-1558" ],
    "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",
+   "referenced_type" : "type-2025",
+   "self_type" : "type-2025",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJPNS_10BufferItemExyEEE"
@@ -53289,8 +53384,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, android_dataspace_t>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, android_dataspace_t>",
-   "referenced_type" : "type-2037",
-   "self_type" : "type-2037",
+   "referenced_type" : "type-2041",
+   "self_type" : "type-2041",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJ19android_dataspace_tEEE"
@@ -53299,8 +53394,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, bool, vector<Segment, allocator<Segment> > *>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, bool, vector<Segment, allocator<Segment> > *>",
-   "referenced_type" : "type-2042",
-   "self_type" : "type-2042",
+   "referenced_type" : "type-2047",
+   "self_type" : "type-2047",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS7_EEEEEEE"
@@ -53309,8 +53404,8 @@
    "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",
+   "referenced_type" : "type-2043",
+   "self_type" : "type-2043",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJbEEE"
@@ -53319,8 +53414,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, const String8 &, String8 *>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, const String8 &, String8 *>",
-   "referenced_type" : "type-2045",
-   "self_type" : "type-2045",
+   "referenced_type" : "type-2049",
+   "self_type" : "type-2049",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJRKNS_7String8EPS4_EEE"
@@ -53329,8 +53424,8 @@
    "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",
+   "referenced_type" : "type-2040",
+   "self_type" : "type-2040",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJRKNS_7String8EEEE"
@@ -53339,8 +53434,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, const sp<IConsumerListener> &, bool>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, const sp<IConsumerListener> &, bool>",
-   "referenced_type" : "type-2030",
-   "self_type" : "type-2030",
+   "referenced_type" : "type-2034",
+   "self_type" : "type-2034",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJRKNS_2spINS_17IConsumerListenerEEEbEEE"
@@ -53349,8 +53444,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, int *, const sp<GraphicBuffer> &>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, int *, const sp<GraphicBuffer> &>",
-   "referenced_type" : "type-2025",
-   "self_type" : "type-2025",
+   "referenced_type" : "type-2029",
+   "self_type" : "type-2029",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJPiRKNS_2spINS_13GraphicBufferEEEEEE"
@@ -53359,8 +53454,8 @@
    "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",
+   "referenced_type" : "type-2031",
+   "self_type" : "type-2031",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJiyRKNS_2spINS_5FenceEEEEEE"
@@ -53369,8 +53464,8 @@
    "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",
+   "referenced_type" : "type-2028",
+   "self_type" : "type-2028",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJiEEE"
@@ -53379,8 +53474,8 @@
    "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",
+   "referenced_type" : "type-2045",
+   "self_type" : "type-2045",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJPNS_2spINS_12NativeHandleEEEEEE"
@@ -53389,8 +53484,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned int, unsigned int>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned int, unsigned int>",
-   "referenced_type" : "type-2034",
-   "self_type" : "type-2034",
+   "referenced_type" : "type-2038",
+   "self_type" : "type-2038",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJjjEEE"
@@ -53399,8 +53494,8 @@
    "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",
+   "referenced_type" : "type-2044",
+   "self_type" : "type-2044",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJjEEE"
@@ -53409,8 +53504,8 @@
    "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",
+   "referenced_type" : "type-2037",
+   "self_type" : "type-2037",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJPyEEE"
@@ -53419,8 +53514,8 @@
    "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",
+   "referenced_type" : "type-2042",
+   "self_type" : "type-2042",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJyEEE"
@@ -53429,8 +53524,8 @@
    "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",
+   "referenced_type" : "type-2026",
+   "self_type" : "type-2026",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJPNS_10BufferItemExyEEE"
@@ -53439,8 +53534,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, bool, vector<Segment, allocator<Segment> > *>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, bool, vector<Segment, allocator<Segment> > *>",
-   "referenced_type" : "type-2044",
-   "self_type" : "type-2044",
+   "referenced_type" : "type-2048",
+   "self_type" : "type-2048",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS7_EEEEEEE"
@@ -53449,8 +53544,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, const String8 &, String8 *>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, const String8 &, String8 *>",
-   "referenced_type" : "type-2046",
-   "self_type" : "type-2046",
+   "referenced_type" : "type-2050",
+   "self_type" : "type-2050",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJRKNS_7String8EPS4_EEE"
@@ -53459,8 +53554,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, const sp<IConsumerListener> &, bool>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, const sp<IConsumerListener> &, bool>",
-   "referenced_type" : "type-2031",
-   "self_type" : "type-2031",
+   "referenced_type" : "type-2036",
+   "self_type" : "type-2036",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJRKNS_2spINS_17IConsumerListenerEEEbEEE"
@@ -53469,8 +53564,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, int *, const sp<GraphicBuffer> &>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, int *, const sp<GraphicBuffer> &>",
-   "referenced_type" : "type-2026",
-   "self_type" : "type-2026",
+   "referenced_type" : "type-2030",
+   "self_type" : "type-2030",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJPiRKNS_2spINS_13GraphicBufferEEEEEE"
@@ -53479,8 +53574,8 @@
    "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",
+   "referenced_type" : "type-2032",
+   "self_type" : "type-2032",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJiyRKNS_2spINS_5FenceEEEEEE"
@@ -53489,8 +53584,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, unsigned int, unsigned int>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, unsigned int, unsigned int>",
-   "referenced_type" : "type-2035",
-   "self_type" : "type-2035",
+   "referenced_type" : "type-2039",
+   "self_type" : "type-2039",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJjjEEE"
@@ -53499,8 +53594,8 @@
    "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",
+   "referenced_type" : "type-2027",
+   "self_type" : "type-2027",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj2EJPNS_10BufferItemExyEEE"
@@ -53509,8 +53604,8 @@
    "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",
+   "referenced_type" : "type-2033",
+   "self_type" : "type-2033",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj2EJiyRKNS_2spINS_5FenceEEEEEE"
@@ -53522,14 +53617,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2073",
+   "self_type" : "type-2073",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJEEEEEE"
@@ -53541,14 +53636,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2051",
+   "self_type" : "type-2051",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPNS_10BufferItemExyEEEEEE"
@@ -53560,14 +53655,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2091",
+   "self_type" : "type-2091",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJ19android_dataspace_tEEEEEE"
@@ -53579,14 +53674,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2111",
+   "self_type" : "type-2111",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJbPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEEEE"
@@ -53598,14 +53693,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2097",
+   "self_type" : "type-2097",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJbEEEEEE"
@@ -53617,14 +53712,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2116",
+   "self_type" : "type-2116",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJRKNS_7String8EPS6_EEEEEE"
@@ -53636,14 +53731,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2086",
+   "self_type" : "type-2086",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJRKNS_7String8EEEEEEE"
@@ -53655,14 +53750,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2069",
+   "self_type" : "type-2069",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEEbEEEEEE"
@@ -53674,14 +53769,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2060",
+   "self_type" : "type-2060",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
@@ -53693,14 +53788,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2064",
+   "self_type" : "type-2064",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJiyRKNS_2spINS_5FenceEEEEEEEEE"
@@ -53712,14 +53807,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2055",
+   "self_type" : "type-2055",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJiEEEEEE"
@@ -53731,14 +53826,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2107",
+   "self_type" : "type-2107",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPNS_2spINS_12NativeHandleEEEEEEEEE"
@@ -53750,14 +53845,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2082",
+   "self_type" : "type-2082",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJjjEEEEEE"
@@ -53769,14 +53864,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2103",
+   "self_type" : "type-2103",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJjEEEEEE"
@@ -53788,14 +53883,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2077",
+   "self_type" : "type-2077",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPyEEEEEE"
@@ -53807,14 +53902,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2095",
+   "self_type" : "type-2095",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJyEEEEEE"
@@ -53823,8 +53918,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<> >",
-   "referenced_type" : "type-2122",
-   "self_type" : "type-2122",
+   "referenced_type" : "type-2126",
+   "self_type" : "type-2126",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJEEEEEE"
@@ -53833,8 +53928,8 @@
    "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",
+   "referenced_type" : "type-2120",
+   "self_type" : "type-2120",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPNS_10BufferItemExyEEEEEE"
@@ -53843,8 +53938,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<android_dataspace_t> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<android_dataspace_t> >",
-   "referenced_type" : "type-2126",
-   "self_type" : "type-2126",
+   "referenced_type" : "type-2130",
+   "self_type" : "type-2130",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJ19android_dataspace_tEEEEEE"
@@ -53853,8 +53948,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<bool, vector<Segment, allocator<Segment> > *> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<bool, vector<Segment, allocator<Segment> > *> >",
-   "referenced_type" : "type-2131",
-   "self_type" : "type-2131",
+   "referenced_type" : "type-2136",
+   "self_type" : "type-2136",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJbPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEEEE"
@@ -53863,8 +53958,8 @@
    "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",
+   "referenced_type" : "type-2132",
+   "self_type" : "type-2132",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJbEEEEEE"
@@ -53873,8 +53968,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<const String8 &, String8 *> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<const String8 &, String8 *> >",
-   "referenced_type" : "type-2133",
-   "self_type" : "type-2133",
+   "referenced_type" : "type-2137",
+   "self_type" : "type-2137",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJRKNS_7String8EPS6_EEEEEE"
@@ -53883,8 +53978,8 @@
    "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",
+   "referenced_type" : "type-2129",
+   "self_type" : "type-2129",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJRKNS_7String8EEEEEEE"
@@ -53893,8 +53988,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<const sp<IConsumerListener> &, bool> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<const sp<IConsumerListener> &, bool> >",
-   "referenced_type" : "type-2120",
-   "self_type" : "type-2120",
+   "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_2spINS_17IConsumerListenerEEEbEEEEEE"
@@ -53903,8 +53998,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<int *, const sp<GraphicBuffer> &> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<int *, const sp<GraphicBuffer> &> >",
-   "referenced_type" : "type-2118",
-   "self_type" : "type-2118",
+   "referenced_type" : "type-2122",
+   "self_type" : "type-2122",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
@@ -53913,8 +54008,8 @@
    "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",
+   "referenced_type" : "type-2123",
+   "self_type" : "type-2123",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJiyRKNS_2spINS_5FenceEEEEEEEEE"
@@ -53923,8 +54018,8 @@
    "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",
+   "referenced_type" : "type-2121",
+   "self_type" : "type-2121",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJiEEEEEE"
@@ -53933,8 +54028,8 @@
    "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",
+   "referenced_type" : "type-2134",
+   "self_type" : "type-2134",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPNS_2spINS_12NativeHandleEEEEEEEEE"
@@ -53943,8 +54038,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned int, unsigned int> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned int, unsigned int> >",
-   "referenced_type" : "type-2124",
-   "self_type" : "type-2124",
+   "referenced_type" : "type-2128",
+   "self_type" : "type-2128",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJjjEEEEEE"
@@ -53953,8 +54048,8 @@
    "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",
+   "referenced_type" : "type-2133",
+   "self_type" : "type-2133",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJjEEEEEE"
@@ -53963,8 +54058,8 @@
    "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",
+   "referenced_type" : "type-2127",
+   "self_type" : "type-2127",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPyEEEEEE"
@@ -53973,8 +54068,8 @@
    "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",
+   "referenced_type" : "type-2131",
+   "self_type" : "type-2131",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJyEEEEEE"
@@ -53986,13 +54081,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<> >",
-   "referenced_type" : "type-2145",
-   "self_type" : "type-2145",
+   "referenced_type" : "type-2149",
+   "self_type" : "type-2149",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJEEEEEE"
@@ -54004,13 +54099,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2138",
+   "self_type" : "type-2138",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPNS_10BufferItemExyEEEEEE"
@@ -54022,13 +54117,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2158",
+   "self_type" : "type-2158",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJ19android_dataspace_tEEEEEE"
@@ -54040,13 +54135,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2169",
+   "self_type" : "type-2169",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJbPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEEEE"
@@ -54058,13 +54153,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool> >",
-   "referenced_type" : "type-2158",
-   "self_type" : "type-2158",
+   "referenced_type" : "type-2162",
+   "self_type" : "type-2162",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJbEEEEEE"
@@ -54076,13 +54171,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2171",
+   "self_type" : "type-2171",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJRKNS_7String8EPS6_EEEEEE"
@@ -54094,13 +54189,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2155",
+   "self_type" : "type-2155",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJRKNS_7String8EEEEEEE"
@@ -54112,13 +54207,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2147",
+   "self_type" : "type-2147",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEEbEEEEEE"
@@ -54130,13 +54225,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2142",
+   "self_type" : "type-2142",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
@@ -54148,13 +54243,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2144",
+   "self_type" : "type-2144",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJiyRKNS_2spINS_5FenceEEEEEEEEE"
@@ -54166,13 +54261,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int> >",
-   "referenced_type" : "type-2136",
-   "self_type" : "type-2136",
+   "referenced_type" : "type-2140",
+   "self_type" : "type-2140",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJiEEEEEE"
@@ -54184,13 +54279,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2166",
+   "self_type" : "type-2166",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPNS_2spINS_12NativeHandleEEEEEEEEE"
@@ -54202,13 +54297,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2153",
+   "self_type" : "type-2153",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJjjEEEEEE"
@@ -54220,13 +54315,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2164",
+   "self_type" : "type-2164",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJjEEEEEE"
@@ -54238,13 +54333,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2151",
+   "self_type" : "type-2151",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPyEEEEEE"
@@ -54256,13 +54351,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2160",
+   "self_type" : "type-2160",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJyEEEEEE"
@@ -54271,660 +54366,660 @@
    "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",
+   "referenced_type" : "type-1974",
+   "self_type" : "type-1974",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1971" ],
+   "template_args" : [ "type-1975" ],
    "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",
+   "referenced_type" : "type-1939",
+   "self_type" : "type-1939",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1936" ],
+   "template_args" : [ "type-1940" ],
    "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",
+   "referenced_type" : "type-1992",
+   "self_type" : "type-1992",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1988" ],
+   "template_args" : [ "type-1993" ],
    "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",
+   "referenced_type" : "type-2011",
+   "self_type" : "type-2011",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2008" ],
+   "template_args" : [ "type-2012" ],
    "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",
+   "referenced_type" : "type-1998",
+   "self_type" : "type-1998",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1995" ],
+   "template_args" : [ "type-1999" ],
    "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",
+   "referenced_type" : "type-2018",
+   "self_type" : "type-2018",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2015" ],
+   "template_args" : [ "type-2019" ],
    "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",
+   "referenced_type" : "type-1987",
+   "self_type" : "type-1987",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1984" ],
+   "template_args" : [ "type-1988" ],
    "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",
+   "referenced_type" : "type-1967",
+   "self_type" : "type-1967",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1964" ],
+   "template_args" : [ "type-1968" ],
    "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",
+   "referenced_type" : "type-1952",
+   "self_type" : "type-1952",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1949" ],
+   "template_args" : [ "type-1953" ],
    "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",
+   "referenced_type" : "type-1959",
+   "self_type" : "type-1959",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1955" ],
+   "template_args" : [ "type-1960" ],
    "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",
+   "referenced_type" : "type-1948",
+   "self_type" : "type-1948",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1944" ],
+   "template_args" : [ "type-1949" ],
    "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",
+   "referenced_type" : "type-2007",
+   "self_type" : "type-2007",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2004" ],
+   "template_args" : [ "type-2008" ],
    "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",
+   "referenced_type" : "type-1981",
+   "self_type" : "type-1981",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1977" ],
+   "template_args" : [ "type-1982" ],
    "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",
+   "referenced_type" : "type-2003",
+   "self_type" : "type-2003",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1999" ],
+   "template_args" : [ "type-2004" ],
    "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",
+   "referenced_type" : "type-1976",
+   "self_type" : "type-1976",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1973" ],
+   "template_args" : [ "type-1977" ],
    "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",
+   "referenced_type" : "type-1996",
+   "self_type" : "type-1996",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1993" ],
+   "template_args" : [ "type-1997" ],
    "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",
+   "referenced_type" : "type-1945",
+   "self_type" : "type-1945",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1942" ],
+   "template_args" : [ "type-1946" ],
    "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",
+   "referenced_type" : "type-1943",
+   "self_type" : "type-1943",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1940" ],
+   "template_args" : [ "type-1944" ],
    "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",
+   "referenced_type" : "type-1941",
+   "self_type" : "type-1941",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1938" ],
+   "template_args" : [ "type-1942" ],
    "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",
+   "referenced_type" : "type-2022",
+   "self_type" : "type-2022",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2019" ],
+   "template_args" : [ "type-2023" ],
    "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",
+   "referenced_type" : "type-1989",
+   "self_type" : "type-1989",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1986" ],
+   "template_args" : [ "type-1990" ],
    "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",
+   "referenced_type" : "type-2020",
+   "self_type" : "type-2020",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2017" ],
+   "template_args" : [ "type-2021" ],
    "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",
+   "referenced_type" : "type-1994",
+   "self_type" : "type-1994",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1991" ],
+   "template_args" : [ "type-1995" ],
    "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",
+   "referenced_type" : "type-2016",
+   "self_type" : "type-2016",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2013" ],
+   "template_args" : [ "type-2017" ],
    "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",
+   "referenced_type" : "type-2000",
+   "self_type" : "type-2000",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1997" ],
+   "template_args" : [ "type-2001" ],
    "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",
+   "referenced_type" : "type-2014",
+   "self_type" : "type-2014",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2010" ],
+   "template_args" : [ "type-2015" ],
    "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",
+   "referenced_type" : "type-1956",
+   "self_type" : "type-1956",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1953" ],
+   "template_args" : [ "type-1957" ],
    "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",
+   "referenced_type" : "type-1965",
+   "self_type" : "type-1965",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1962" ],
+   "template_args" : [ "type-1966" ],
    "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",
+   "referenced_type" : "type-1963",
+   "self_type" : "type-1963",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1960" ],
+   "template_args" : [ "type-1964" ],
    "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",
+   "referenced_type" : "type-1950",
+   "self_type" : "type-1950",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1947" ],
+   "template_args" : [ "type-1951" ],
    "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",
+   "referenced_type" : "type-1954",
+   "self_type" : "type-1954",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1951" ],
+   "template_args" : [ "type-1955" ],
    "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",
+   "referenced_type" : "type-1961",
+   "self_type" : "type-1961",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1958" ],
+   "template_args" : [ "type-1962" ],
    "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",
+   "referenced_type" : "type-1970",
+   "self_type" : "type-1970",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1966" ],
+   "template_args" : [ "type-1971" ],
    "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",
+   "referenced_type" : "type-1972",
+   "self_type" : "type-1972",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1969" ],
+   "template_args" : [ "type-1973" ],
    "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",
+   "referenced_type" : "type-2009",
+   "self_type" : "type-2009",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2006" ],
+   "template_args" : [ "type-2010" ],
    "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",
+   "referenced_type" : "type-1985",
+   "self_type" : "type-1985",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1982" ],
+   "template_args" : [ "type-1986" ],
    "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",
+   "referenced_type" : "type-2005",
+   "self_type" : "type-2005",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2002" ],
+   "template_args" : [ "type-2006" ],
    "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",
+   "referenced_type" : "type-1983",
+   "self_type" : "type-1983",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1980" ],
+   "template_args" : [ "type-1984" ],
    "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",
+   "referenced_type" : "type-1978",
+   "self_type" : "type-1978",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1975" ],
+   "template_args" : [ "type-1979" ],
    "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",
+   "referenced_type" : "type-1893",
+   "self_type" : "type-1893",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1889" ],
+   "template_args" : [ "type-1894" ],
    "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",
+   "referenced_type" : "type-1937",
+   "self_type" : "type-1937",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1933" ],
+   "template_args" : [ "type-1938" ],
    "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",
+   "referenced_type" : "type-1926",
+   "self_type" : "type-1926",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1922" ],
+   "template_args" : [ "type-1927" ],
    "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",
+   "referenced_type" : "type-1930",
+   "self_type" : "type-1930",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1927" ],
+   "template_args" : [ "type-1931" ],
    "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",
+   "referenced_type" : "type-1915",
+   "self_type" : "type-1915",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1911" ],
+   "template_args" : [ "type-1916" ],
    "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",
+   "referenced_type" : "type-1934",
+   "self_type" : "type-1934",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1931" ],
+   "template_args" : [ "type-1935" ],
    "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",
+   "referenced_type" : "type-1923",
+   "self_type" : "type-1923",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1920" ],
+   "template_args" : [ "type-1924" ],
    "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",
+   "referenced_type" : "type-1910",
+   "self_type" : "type-1910",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1907" ],
+   "template_args" : [ "type-1911" ],
    "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",
+   "referenced_type" : "type-1904",
+   "self_type" : "type-1904",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1900" ],
+   "template_args" : [ "type-1905" ],
    "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",
+   "referenced_type" : "type-1912",
+   "self_type" : "type-1912",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1909" ],
+   "template_args" : [ "type-1913" ],
    "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",
+   "referenced_type" : "type-1901",
+   "self_type" : "type-1901",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1898" ],
+   "template_args" : [ "type-1902" ],
    "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",
+   "referenced_type" : "type-1906",
+   "self_type" : "type-1906",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1903" ],
+   "template_args" : [ "type-1907" ],
    "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",
+   "referenced_type" : "type-1899",
+   "self_type" : "type-1899",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1896" ],
+   "template_args" : [ "type-1900" ],
    "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",
+   "referenced_type" : "type-1895",
+   "self_type" : "type-1895",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1892" ],
+   "template_args" : [ "type-1896" ],
    "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",
+   "referenced_type" : "type-1928",
+   "self_type" : "type-1928",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1925" ],
+   "template_args" : [ "type-1929" ],
    "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",
+   "referenced_type" : "type-1919",
+   "self_type" : "type-1919",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1916" ],
+   "template_args" : [ "type-1920" ],
    "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",
+   "referenced_type" : "type-1921",
+   "self_type" : "type-1921",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1918" ],
+   "template_args" : [ "type-1922" ],
    "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",
+   "referenced_type" : "type-1917",
+   "self_type" : "type-1917",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1914" ],
+   "template_args" : [ "type-1918" ],
    "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",
+   "referenced_type" : "type-1908",
+   "self_type" : "type-1908",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1905" ],
+   "template_args" : [ "type-1909" ],
    "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",
+   "referenced_type" : "type-1897",
+   "self_type" : "type-1897",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1894" ],
+   "template_args" : [ "type-1898" ],
    "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",
+   "referenced_type" : "type-1932",
+   "self_type" : "type-1932",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1929" ],
+   "template_args" : [ "type-1933" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEJEEE"
   },
   {
@@ -54941,17 +55036,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 160,
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<android::IConsumerListener>",
    "name" : "android::SafeBnInterface<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1287",
-   "self_type" : "type-1287",
+   "referenced_type" : "type-1290",
+   "self_type" : "type-1290",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1288" ],
+   "template_args" : [ "type-1291" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEEE",
    "vtable_components" :
    [
@@ -55152,17 +55247,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 128,
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<android::IGraphicBufferConsumer>",
    "name" : "android::SafeBnInterface<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1276",
-   "self_type" : "type-1276",
+   "referenced_type" : "type-1279",
+   "self_type" : "type-1279",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1277" ],
+   "template_args" : [ "type-1280" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEEE",
    "vtable_components" :
    [
@@ -55390,7 +55485,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1031"
+     "referenced_type" : "type-1034"
     }
    ],
    "fields" :
@@ -55399,17 +55494,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 128,
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<android::ITransactionCompletedListener>",
    "name" : "android::SafeBnInterface<android::ITransactionCompletedListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1102",
-   "self_type" : "type-1102",
+   "referenced_type" : "type-1105",
+   "self_type" : "type-1105",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1104" ],
+   "template_args" : [ "type-1107" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEEE",
    "vtable_components" :
    [
@@ -55560,525 +55655,525 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IConsumerListener>::ArgsMatchParams<std::tuple<>, std::tuple<> >",
    "name" : "android::SafeBpInterface<IConsumerListener>::ArgsMatchParams<std::tuple<>, std::tuple<> >",
-   "referenced_type" : "type-1544",
-   "self_type" : "type-1544",
+   "referenced_type" : "type-1547",
+   "self_type" : "type-1547",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1545", "type-1546" ],
+   "template_args" : [ "type-1548", "type-1549" ],
    "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",
+   "referenced_type" : "type-1550",
+   "self_type" : "type-1550",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1548", "type-1549" ],
+   "template_args" : [ "type-1551", "type-1552" ],
    "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",
+   "referenced_type" : "type-1544",
+   "self_type" : "type-1544",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1542", "type-1543" ],
+   "template_args" : [ "type-1545", "type-1546" ],
    "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",
+   "referenced_type" : "type-1553",
+   "self_type" : "type-1553",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1532" ],
+   "template_args" : [ "type-1535" ],
    "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",
+   "referenced_type" : "type-1819",
+   "self_type" : "type-1819",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1816", "type-1817" ],
+   "template_args" : [ "type-1820", "type-1821" ],
    "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",
+   "referenced_type" : "type-1803",
+   "self_type" : "type-1803",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1800", "type-1801" ],
+   "template_args" : [ "type-1804", "type-1805" ],
    "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",
+   "referenced_type" : "type-1833",
+   "self_type" : "type-1833",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1829", "type-1830" ],
+   "template_args" : [ "type-1834", "type-1835" ],
    "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",
+   "referenced_type" : "type-1849",
+   "self_type" : "type-1849",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1846", "type-1847" ],
+   "template_args" : [ "type-1850", "type-1851" ],
    "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",
+   "referenced_type" : "type-1839",
+   "self_type" : "type-1839",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1836", "type-1837" ],
+   "template_args" : [ "type-1840", "type-1841" ],
    "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",
+   "referenced_type" : "type-1852",
+   "self_type" : "type-1852",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1849", "type-1850" ],
+   "template_args" : [ "type-1853", "type-1854" ],
    "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",
+   "referenced_type" : "type-1829",
+   "self_type" : "type-1829",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1826", "type-1827" ],
+   "template_args" : [ "type-1830", "type-1831" ],
    "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",
+   "referenced_type" : "type-1816",
+   "self_type" : "type-1816",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1813", "type-1814" ],
+   "template_args" : [ "type-1817", "type-1818" ],
    "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",
+   "referenced_type" : "type-1813",
+   "self_type" : "type-1813",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1810", "type-1811" ],
+   "template_args" : [ "type-1814", "type-1815" ],
    "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",
+   "referenced_type" : "type-1806",
+   "self_type" : "type-1806",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1803", "type-1804" ],
+   "template_args" : [ "type-1807", "type-1808" ],
    "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",
+   "referenced_type" : "type-1809",
+   "self_type" : "type-1809",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1806", "type-1807" ],
+   "template_args" : [ "type-1810", "type-1811" ],
    "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",
+   "referenced_type" : "type-1846",
+   "self_type" : "type-1846",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1843", "type-1844" ],
+   "template_args" : [ "type-1847", "type-1848" ],
    "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",
+   "referenced_type" : "type-1826",
+   "self_type" : "type-1826",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1823", "type-1824" ],
+   "template_args" : [ "type-1827", "type-1828" ],
    "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",
+   "referenced_type" : "type-1842",
+   "self_type" : "type-1842",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1839", "type-1840" ],
+   "template_args" : [ "type-1843", "type-1844" ],
    "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",
+   "referenced_type" : "type-1836",
+   "self_type" : "type-1836",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1833", "type-1834" ],
+   "template_args" : [ "type-1837", "type-1838" ],
    "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",
+   "referenced_type" : "type-1823",
+   "self_type" : "type-1823",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1820", "type-1821" ],
+   "template_args" : [ "type-1824", "type-1825" ],
    "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",
+   "referenced_type" : "type-1724",
+   "self_type" : "type-1724",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1721", "type-1722" ],
+   "template_args" : [ "type-1725", "type-1726" ],
    "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",
+   "referenced_type" : "type-1773",
+   "self_type" : "type-1773",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1770", "type-1771" ],
+   "template_args" : [ "type-1774", "type-1775" ],
    "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",
+   "referenced_type" : "type-1790",
+   "self_type" : "type-1790",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1787", "type-1788" ],
+   "template_args" : [ "type-1791", "type-1792" ],
    "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",
+   "referenced_type" : "type-1780",
+   "self_type" : "type-1780",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1777", "type-1778" ],
+   "template_args" : [ "type-1781", "type-1782" ],
    "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",
+   "referenced_type" : "type-1796",
+   "self_type" : "type-1796",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1793", "type-1794" ],
+   "template_args" : [ "type-1797", "type-1798" ],
    "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",
+   "referenced_type" : "type-1770",
+   "self_type" : "type-1770",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1767", "type-1768" ],
+   "template_args" : [ "type-1771", "type-1772" ],
    "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",
+   "referenced_type" : "type-1753",
+   "self_type" : "type-1753",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1750", "type-1751" ],
+   "template_args" : [ "type-1754", "type-1755" ],
    "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",
+   "referenced_type" : "type-1743",
+   "self_type" : "type-1743",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1740", "type-1741" ],
+   "template_args" : [ "type-1744", "type-1745" ],
    "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",
+   "referenced_type" : "type-1734",
+   "self_type" : "type-1734",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1730", "type-1731" ],
+   "template_args" : [ "type-1735", "type-1736" ],
    "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",
+   "referenced_type" : "type-1737",
+   "self_type" : "type-1737",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1734", "type-1735" ],
+   "template_args" : [ "type-1738", "type-1739" ],
    "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",
+   "referenced_type" : "type-1786",
+   "self_type" : "type-1786",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1783", "type-1784" ],
+   "template_args" : [ "type-1787", "type-1788" ],
    "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",
+   "referenced_type" : "type-1763",
+   "self_type" : "type-1763",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1760", "type-1761" ],
+   "template_args" : [ "type-1764", "type-1765" ],
    "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",
+   "referenced_type" : "type-1783",
+   "self_type" : "type-1783",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1780", "type-1781" ],
+   "template_args" : [ "type-1784", "type-1785" ],
    "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",
+   "referenced_type" : "type-1776",
+   "self_type" : "type-1776",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1773", "type-1774" ],
+   "template_args" : [ "type-1777", "type-1778" ],
    "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",
+   "referenced_type" : "type-1760",
+   "self_type" : "type-1760",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1757", "type-1758" ],
+   "template_args" : [ "type-1761", "type-1762" ],
    "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",
+   "referenced_type" : "type-1727",
+   "self_type" : "type-1727",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1724", "type-1725" ],
+   "template_args" : [ "type-1728", "type-1729" ],
    "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",
+   "referenced_type" : "type-1793",
+   "self_type" : "type-1793",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1790", "type-1791" ],
+   "template_args" : [ "type-1794", "type-1795" ],
    "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",
+   "referenced_type" : "type-1800",
+   "self_type" : "type-1800",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1796", "type-1797" ],
+   "template_args" : [ "type-1801", "type-1802" ],
    "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",
+   "referenced_type" : "type-1757",
+   "self_type" : "type-1757",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1754", "type-1755" ],
+   "template_args" : [ "type-1758", "type-1759" ],
    "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",
+   "referenced_type" : "type-1747",
+   "self_type" : "type-1747",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1744", "type-1745" ],
+   "template_args" : [ "type-1748", "type-1749" ],
    "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",
+   "referenced_type" : "type-1740",
+   "self_type" : "type-1740",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1737", "type-1738" ],
+   "template_args" : [ "type-1741", "type-1742" ],
    "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",
+   "referenced_type" : "type-1767",
+   "self_type" : "type-1767",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1763", "type-1764" ],
+   "template_args" : [ "type-1768", "type-1769" ],
    "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",
+   "referenced_type" : "type-1730",
+   "self_type" : "type-1730",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1727", "type-1728" ],
+   "template_args" : [ "type-1731", "type-1732" ],
    "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",
+   "referenced_type" : "type-1750",
+   "self_type" : "type-1750",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1747", "type-1748" ],
+   "template_args" : [ "type-1751", "type-1752" ],
    "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",
+   "referenced_type" : "type-1856",
+   "self_type" : "type-1856",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1853" ],
+   "template_args" : [ "type-1857" ],
    "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",
+   "referenced_type" : "type-1887",
+   "self_type" : "type-1887",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1884" ],
+   "template_args" : [ "type-1888" ],
    "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",
+   "referenced_type" : "type-1882",
+   "self_type" : "type-1882",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1879" ],
+   "template_args" : [ "type-1883" ],
    "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",
+   "referenced_type" : "type-1880",
+   "self_type" : "type-1880",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-767" ],
@@ -56088,8 +56183,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<bool &>",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<bool &>",
-   "referenced_type" : "type-1869",
-   "self_type" : "type-1869",
+   "referenced_type" : "type-1873",
+   "self_type" : "type-1873",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-766" ],
@@ -56099,41 +56194,41 @@
    "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",
+   "referenced_type" : "type-1877",
+   "self_type" : "type-1877",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1874" ],
+   "template_args" : [ "type-1878" ],
    "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",
+   "referenced_type" : "type-1865",
+   "self_type" : "type-1865",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1862" ],
+   "template_args" : [ "type-1866" ],
    "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",
+   "referenced_type" : "type-1863",
+   "self_type" : "type-1863",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1859" ],
+   "template_args" : [ "type-1864" ],
    "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",
+   "referenced_type" : "type-1872",
+   "self_type" : "type-1872",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-944" ],
@@ -56143,8 +56238,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int &>",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int &>",
-   "referenced_type" : "type-1856",
-   "self_type" : "type-1856",
+   "referenced_type" : "type-1860",
+   "self_type" : "type-1860",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-198" ],
@@ -56154,41 +56249,41 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int *&>",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int *&>",
-   "referenced_type" : "type-1857",
-   "self_type" : "type-1857",
+   "referenced_type" : "type-1861",
+   "self_type" : "type-1861",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1508" ],
+   "template_args" : [ "type-1511" ],
    "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",
+   "referenced_type" : "type-1858",
+   "self_type" : "type-1858",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1429" ],
+   "template_args" : [ "type-1432" ],
    "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",
+   "referenced_type" : "type-1885",
+   "self_type" : "type-1885",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1882" ],
+   "template_args" : [ "type-1886" ],
    "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",
+   "referenced_type" : "type-1876",
+   "self_type" : "type-1876",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-10" ],
@@ -56198,8 +56293,8 @@
    "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",
+   "referenced_type" : "type-1859",
+   "self_type" : "type-1859",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-544" ],
@@ -56209,11 +56304,11 @@
    "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",
+   "referenced_type" : "type-1874",
+   "self_type" : "type-1874",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1871" ],
+   "template_args" : [ "type-1875" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRPyEE"
   },
   {
@@ -56221,7 +56316,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1495"
+     "referenced_type" : "type-1501"
     }
    ],
    "fields" :
@@ -56230,17 +56325,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 192,
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeBpInterface<android::IConsumerListener>",
    "name" : "android::SafeBpInterface<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1537",
-   "self_type" : "type-1537",
+   "referenced_type" : "type-1541",
+   "self_type" : "type-1541",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1538" ],
+   "template_args" : [ "type-1542" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_17IConsumerListenerEEE",
    "vtable_components" :
    [
@@ -56396,7 +56491,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1624"
+     "referenced_type" : "type-1629"
     }
    ],
    "fields" :
@@ -56405,17 +56500,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 160,
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeBpInterface<android::IGraphicBufferConsumer>",
    "name" : "android::SafeBpInterface<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1716",
-   "self_type" : "type-1716",
+   "referenced_type" : "type-1720",
+   "self_type" : "type-1720",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1717" ],
+   "template_args" : [ "type-1721" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEEE",
    "vtable_components" :
    [
@@ -56606,198 +56701,198 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)()>",
    "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)()>",
-   "referenced_type" : "type-1692",
-   "self_type" : "type-1692",
+   "referenced_type" : "type-1696",
+   "self_type" : "type-1696",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1693" ],
+   "template_args" : [ "type-1697" ],
    "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",
+   "referenced_type" : "type-1685",
+   "self_type" : "type-1685",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1682" ],
+   "template_args" : [ "type-1686" ],
    "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",
+   "referenced_type" : "type-1705",
+   "self_type" : "type-1705",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1702" ],
+   "template_args" : [ "type-1706" ],
    "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",
+   "referenced_type" : "type-1709",
+   "self_type" : "type-1709",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1706" ],
+   "template_args" : [ "type-1710" ],
    "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",
+   "referenced_type" : "type-1716",
+   "self_type" : "type-1716",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1713" ],
+   "template_args" : [ "type-1717" ],
    "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",
+   "referenced_type" : "type-1703",
+   "self_type" : "type-1703",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1700" ],
+   "template_args" : [ "type-1704" ],
    "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",
+   "referenced_type" : "type-1718",
+   "self_type" : "type-1718",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1715" ],
+   "template_args" : [ "type-1719" ],
    "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",
+   "referenced_type" : "type-1694",
+   "self_type" : "type-1694",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1691" ],
+   "template_args" : [ "type-1695" ],
    "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",
+   "referenced_type" : "type-1690",
+   "self_type" : "type-1690",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1686" ],
+   "template_args" : [ "type-1691" ],
    "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",
+   "referenced_type" : "type-1687",
+   "self_type" : "type-1687",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1684" ],
+   "template_args" : [ "type-1688" ],
    "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",
+   "referenced_type" : "type-1692",
+   "self_type" : "type-1692",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1689" ],
+   "template_args" : [ "type-1693" ],
    "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",
+   "referenced_type" : "type-1714",
+   "self_type" : "type-1714",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1711" ],
+   "template_args" : [ "type-1715" ],
    "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",
+   "referenced_type" : "type-1712",
+   "self_type" : "type-1712",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1708" ],
+   "template_args" : [ "type-1713" ],
    "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",
+   "referenced_type" : "type-1701",
+   "self_type" : "type-1701",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1697" ],
+   "template_args" : [ "type-1702" ],
    "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",
+   "referenced_type" : "type-1698",
+   "self_type" : "type-1698",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1695" ],
+   "template_args" : [ "type-1699" ],
    "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",
+   "referenced_type" : "type-1707",
+   "self_type" : "type-1707",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1704" ],
+   "template_args" : [ "type-1708" ],
    "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",
+   "referenced_type" : "type-1537",
+   "self_type" : "type-1537",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1534" ],
+   "template_args" : [ "type-1538" ],
    "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",
+   "referenced_type" : "type-1539",
+   "self_type" : "type-1539",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1536" ],
+   "template_args" : [ "type-1540" ],
    "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_16ConsumerListenerEFvRKNS_10BufferItemEEEE"
   },
   {
@@ -56807,14 +56902,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeInterface::ParcelHandler",
    "name" : "android::SafeInterface::ParcelHandler",
    "record_kind" : "class",
-   "referenced_type" : "type-1235",
-   "self_type" : "type-1235",
+   "referenced_type" : "type-1238",
+   "self_type" : "type-1238",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android13SafeInterface13ParcelHandlerE"
@@ -56823,8 +56918,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParcelHandler::HandleInt<false, 4, unsigned int>",
    "name" : "android::SafeInterface::ParcelHandler::HandleInt<false, 4, unsigned int>",
-   "referenced_type" : "type-1679",
-   "self_type" : "type-1679",
+   "referenced_type" : "type-1683",
+   "self_type" : "type-1683",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-2" ],
@@ -56834,8 +56929,8 @@
    "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",
+   "referenced_type" : "type-1681",
+   "self_type" : "type-1681",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-92" ],
@@ -56845,8 +56940,8 @@
    "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",
+   "referenced_type" : "type-1682",
+   "self_type" : "type-1682",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-4" ],
@@ -56856,8 +56951,8 @@
    "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",
+   "referenced_type" : "type-1678",
+   "self_type" : "type-1678",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-169" ],
@@ -56887,11 +56982,11 @@
    "linker_set_key" : "android::Singleton<android::ComposerService>",
    "name" : "android::Singleton<android::ComposerService>",
    "record_kind" : "class",
-   "referenced_type" : "type-1089",
-   "self_type" : "type-1089",
+   "referenced_type" : "type-1092",
+   "self_type" : "type-1092",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-1090" ],
+   "template_args" : [ "type-1093" ],
    "unique_id" : "_ZTSN7android9SingletonINS_15ComposerServiceEEE"
   },
   {
@@ -56918,11 +57013,11 @@
    "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",
+   "referenced_type" : "type-1204",
+   "self_type" : "type-1204",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-1201" ],
+   "template_args" : [ "type-1205" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEEE",
    "vtable_components" :
    [
@@ -56976,11 +57071,11 @@
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
    "name" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-1354",
-   "self_type" : "type-1354",
+   "referenced_type" : "type-1357",
+   "self_type" : "type-1357",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-1355" ],
+   "template_args" : [ "type-1358" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
    "vtable_components" :
    [
@@ -57270,7 +57365,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -57280,13 +57375,13 @@
     {
      "field_name" : "bStoreMetaData",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "android::StoreMetaDataInBuffersParams",
    "name" : "android::StoreMetaDataInBuffersParams",
-   "referenced_type" : "type-2396",
-   "self_type" : "type-2396",
+   "referenced_type" : "type-2399",
+   "self_type" : "type-2399",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android28StoreMetaDataInBuffersParamsE"
@@ -57298,14 +57393,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-1240"
+     "referenced_type" : "type-1243"
     }
    ],
    "linker_set_key" : "android::String16",
    "name" : "android::String16",
    "record_kind" : "class",
-   "referenced_type" : "type-1239",
-   "self_type" : "type-1239",
+   "referenced_type" : "type-1242",
+   "self_type" : "type-1242",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "unique_id" : "_ZTSN7android8String16E"
@@ -57494,7 +57589,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -57509,18 +57604,18 @@
     {
      "field_name" : "bufferHeader",
      "field_offset" : 128,
-     "referenced_type" : "type-2376"
+     "referenced_type" : "type-2379"
     },
     {
      "field_name" : "nativeBuffer",
      "field_offset" : 160,
-     "referenced_type" : "type-2408"
+     "referenced_type" : "type-2411"
     }
    ],
    "linker_set_key" : "android::UseAndroidNativeBufferParams",
    "name" : "android::UseAndroidNativeBufferParams",
-   "referenced_type" : "type-2407",
-   "self_type" : "type-2407",
+   "referenced_type" : "type-2410",
+   "self_type" : "type-2410",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android28UseAndroidNativeBufferParamsE"
@@ -57537,11 +57632,11 @@
    "linker_set_key" : "android::Vector<android::BBinder *>",
    "name" : "android::Vector<android::BBinder *>",
    "record_kind" : "class",
-   "referenced_type" : "type-1205",
-   "self_type" : "type-1205",
+   "referenced_type" : "type-1208",
+   "self_type" : "type-1208",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-1206" ],
+   "template_args" : [ "type-1209" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7BBinderEEE",
    "vtable_components" :
    [
@@ -57647,11 +57742,11 @@
    "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",
+   "referenced_type" : "type-1206",
+   "self_type" : "type-1206",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-1203" ],
+   "template_args" : [ "type-1207" ],
    "unique_id" : "_ZTSN7android6VectorINS_12ProcessState12handle_entryEEE",
    "vtable_components" :
    [
@@ -57702,11 +57797,11 @@
    "linker_set_key" : "android::Vector<android::Rect>",
    "name" : "android::Vector<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-2677",
-   "self_type" : "type-2677",
+   "referenced_type" : "type-2680",
+   "self_type" : "type-2680",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-2678" ],
+   "template_args" : [ "type-2681" ],
    "unique_id" : "_ZTSN7android6VectorINS_4RectEEE",
    "vtable_components" :
    [
@@ -57757,8 +57852,8 @@
    "linker_set_key" : "android::Vector<android::RefBase *>",
    "name" : "android::Vector<android::RefBase *>",
    "record_kind" : "class",
-   "referenced_type" : "type-1208",
-   "self_type" : "type-1208",
+   "referenced_type" : "type-1213",
+   "self_type" : "type-1213",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-270" ],
@@ -57812,8 +57907,8 @@
    "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",
+   "referenced_type" : "type-1210",
+   "self_type" : "type-1210",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-56" ],
@@ -57867,11 +57962,11 @@
    "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",
+   "referenced_type" : "type-1363",
+   "self_type" : "type-1363",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-1361" ],
+   "template_args" : [ "type-1364" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_8hardware9BHwBinderEEE",
    "vtable_components" :
    [
@@ -57922,11 +58017,11 @@
    "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "record_kind" : "class",
-   "referenced_type" : "type-1356",
-   "self_type" : "type-1356",
+   "referenced_type" : "type-1359",
+   "self_type" : "type-1359",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-1357" ],
+   "template_args" : [ "type-1360" ],
    "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
    "vtable_components" :
    [
@@ -57977,8 +58072,8 @@
    "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",
+   "referenced_type" : "type-1228",
+   "self_type" : "type-1228",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-733" ],
@@ -58032,8 +58127,8 @@
    "linker_set_key" : "android::Vector<int>",
    "name" : "android::Vector<int>",
    "record_kind" : "class",
-   "referenced_type" : "type-2686",
-   "self_type" : "type-2686",
+   "referenced_type" : "type-2689",
+   "self_type" : "type-2689",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-4" ],
@@ -58087,8 +58182,8 @@
    "linker_set_key" : "android::Vector<long long>",
    "name" : "android::Vector<long long>",
    "record_kind" : "class",
-   "referenced_type" : "type-1081",
-   "self_type" : "type-1081",
+   "referenced_type" : "type-1084",
+   "self_type" : "type-1084",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-169" ],
@@ -58215,13 +58310,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2397"
+     "referenced_type" : "type-2400"
     }
    ],
    "linker_set_key" : "android::VideoDecoderOutputMetaData",
    "name" : "android::VideoDecoderOutputMetaData",
-   "referenced_type" : "type-2398",
-   "self_type" : "type-2398",
+   "referenced_type" : "type-2401",
+   "self_type" : "type-2401",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26VideoDecoderOutputMetaDataE"
@@ -58232,7 +58327,7 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-1234"
+     "referenced_type" : "type-1235"
     },
     {
      "field_name" : "pHandle",
@@ -58242,8 +58337,8 @@
    ],
    "linker_set_key" : "android::VideoGrallocMetadata",
    "name" : "android::VideoGrallocMetadata",
-   "referenced_type" : "type-2397",
-   "self_type" : "type-2397",
+   "referenced_type" : "type-2400",
+   "self_type" : "type-2400",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android20VideoGrallocMetadataE"
@@ -58254,7 +58349,7 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-1234"
+     "referenced_type" : "type-1235"
     },
     {
      "field_name" : "pHandle",
@@ -58264,8 +58359,8 @@
    ],
    "linker_set_key" : "android::VideoNativeHandleMetadata",
    "name" : "android::VideoNativeHandleMetadata",
-   "referenced_type" : "type-2405",
-   "self_type" : "type-2405",
+   "referenced_type" : "type-2408",
+   "self_type" : "type-2408",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android25VideoNativeHandleMetadataE"
@@ -58276,12 +58371,12 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-1234"
+     "referenced_type" : "type-1235"
     },
     {
      "field_name" : "pBuffer",
      "field_offset" : 32,
-     "referenced_type" : "type-2401"
+     "referenced_type" : "type-2404"
     },
     {
      "field_name" : "nFenceFd",
@@ -58291,8 +58386,8 @@
    ],
    "linker_set_key" : "android::VideoNativeMetadata",
    "name" : "android::VideoNativeMetadata",
-   "referenced_type" : "type-2400",
-   "self_type" : "type-2400",
+   "referenced_type" : "type-2403",
+   "self_type" : "type-2403",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android19VideoNativeMetadataE"
@@ -58302,14 +58397,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2352"
+     "referenced_type" : "type-2355"
     }
    ],
    "linker_set_key" : "android::VirtualLightRefBase",
    "name" : "android::VirtualLightRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-2354",
-   "self_type" : "type-2354",
+   "referenced_type" : "type-2357",
+   "self_type" : "type-2357",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
    "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
@@ -58356,30 +58451,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::aggregate_traits<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-2606",
-   "self_type" : "type-2606",
+   "referenced_type" : "type-2609",
+   "self_type" : "type-2609",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-4", "type-2607" ],
+   "template_args" : [ "type-4", "type-2610" ],
    "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-2603",
-   "self_type" : "type-2603",
+   "referenced_type" : "type-2606",
+   "self_type" : "type-2606",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-4", "type-2604" ],
+   "template_args" : [ "type-4", "type-2607" ],
    "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-2602",
-   "self_type" : "type-2602",
+   "referenced_type" : "type-2605",
+   "self_type" : "type-2605",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2", "type-2" ],
@@ -58438,13 +58533,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-980"
+     "referenced_type" : "type-977"
     }
    ],
    "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-979",
-   "self_type" : "type-979",
+   "referenced_type" : "type-976",
+   "self_type" : "type-976",
    "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"
@@ -58581,8 +58676,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::base::DefaultCloser",
    "name" : "android::base::DefaultCloser",
-   "referenced_type" : "type-2523",
-   "self_type" : "type-2523",
+   "referenced_type" : "type-2526",
+   "self_type" : "type-2526",
    "size" : 1,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "unique_id" : "_ZTSN7android4base13DefaultCloserE"
@@ -58603,8 +58698,8 @@
    ],
    "linker_set_key" : "android::base::EagerEvaluator<char *, char *>",
    "name" : "android::base::EagerEvaluator<char *, char *>",
-   "referenced_type" : "type-4699",
-   "self_type" : "type-4699",
+   "referenced_type" : "type-4705",
+   "self_type" : "type-4705",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-254", "type-254" ],
@@ -58626,8 +58721,8 @@
    ],
    "linker_set_key" : "android::base::EagerEvaluator<char *, const char *>",
    "name" : "android::base::EagerEvaluator<char *, const char *>",
-   "referenced_type" : "type-4695",
-   "self_type" : "type-4695",
+   "referenced_type" : "type-4702",
+   "self_type" : "type-4702",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-254", "type-122" ],
@@ -58649,8 +58744,8 @@
    ],
    "linker_set_key" : "android::base::EagerEvaluator<const char *, char *>",
    "name" : "android::base::EagerEvaluator<const char *, char *>",
-   "referenced_type" : "type-4681",
-   "self_type" : "type-4681",
+   "referenced_type" : "type-4689",
+   "self_type" : "type-4689",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-122", "type-254" ],
@@ -58672,8 +58767,8 @@
    ],
    "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",
+   "referenced_type" : "type-4672",
+   "self_type" : "type-4672",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-122", "type-122" ],
@@ -58695,11 +58790,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",
+   "referenced_type" : "type-4729",
+   "self_type" : "type-4729",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-4723", "type-4723" ],
+   "template_args" : [ "type-4730", "type-4730" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaS3_EE"
   },
   {
@@ -58718,11 +58813,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",
+   "referenced_type" : "type-4736",
+   "self_type" : "type-4736",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-4723", "type-4731" ],
+   "template_args" : [ "type-4730", "type-4737" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaPaEE"
   },
   {
@@ -58741,8 +58836,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-4703",
-   "self_type" : "type-4703",
+   "referenced_type" : "type-4710",
+   "self_type" : "type-4710",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-97", "type-97" ],
@@ -58764,8 +58859,8 @@
    ],
    "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",
+   "referenced_type" : "type-4713",
+   "self_type" : "type-4713",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-97", "type-89" ],
@@ -58787,11 +58882,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",
+   "referenced_type" : "type-4740",
+   "self_type" : "type-4740",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-4731", "type-4723" ],
+   "template_args" : [ "type-4737", "type-4730" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaPKaEE"
   },
   {
@@ -58810,11 +58905,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",
+   "referenced_type" : "type-4747",
+   "self_type" : "type-4747",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-4731", "type-4731" ],
+   "template_args" : [ "type-4737", "type-4737" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaS2_EE"
   },
   {
@@ -58833,8 +58928,8 @@
    ],
    "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",
+   "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-97" ],
@@ -58856,8 +58951,8 @@
    ],
    "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",
+   "referenced_type" : "type-4722",
+   "self_type" : "type-4722",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-89", "type-89" ],
@@ -58876,8 +58971,8 @@
    "linker_set_key" : "android::base::ErrnoRestorer",
    "name" : "android::base::ErrnoRestorer",
    "record_kind" : "class",
-   "referenced_type" : "type-4656",
-   "self_type" : "type-4656",
+   "referenced_type" : "type-4663",
+   "self_type" : "type-4663",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base13ErrnoRestorerE"
@@ -58889,14 +58984,14 @@
     {
      "access" : "private",
      "field_name" : "data_",
-     "referenced_type" : "type-4752"
+     "referenced_type" : "type-4758"
     }
    ],
    "linker_set_key" : "android::base::LogMessage",
    "name" : "android::base::LogMessage",
    "record_kind" : "class",
-   "referenced_type" : "type-4751",
-   "self_type" : "type-4751",
+   "referenced_type" : "type-4757",
+   "self_type" : "type-4757",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base10LogMessageE"
@@ -58908,14 +59003,14 @@
     {
      "access" : "private",
      "field_name" : "default_log_id_",
-     "referenced_type" : "type-4704"
+     "referenced_type" : "type-4711"
     }
    ],
    "linker_set_key" : "android::base::LogdLogger",
    "name" : "android::base::LogdLogger",
    "record_kind" : "class",
-   "referenced_type" : "type-4721",
-   "self_type" : "type-4721",
+   "referenced_type" : "type-4728",
+   "self_type" : "type-4728",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base10LogdLoggerE"
@@ -58927,14 +59022,14 @@
     {
      "access" : "private",
      "field_name" : "old_",
-     "referenced_type" : "type-4654"
+     "referenced_type" : "type-4661"
     }
    ],
    "linker_set_key" : "android::base::ScopedLogSeverity",
    "name" : "android::base::ScopedLogSeverity",
    "record_kind" : "class",
-   "referenced_type" : "type-4756",
-   "self_type" : "type-4756",
+   "referenced_type" : "type-4763",
+   "self_type" : "type-4763",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base17ScopedLogSeverityE"
@@ -58952,11 +59047,11 @@
    "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser>",
    "name" : "android::base::unique_fd_impl<android::base::DefaultCloser>",
    "record_kind" : "class",
-   "referenced_type" : "type-2553",
-   "self_type" : "type-2553",
+   "referenced_type" : "type-2556",
+   "self_type" : "type-2556",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h",
-   "template_args" : [ "type-2523" ],
+   "template_args" : [ "type-2526" ],
    "unique_id" : "_ZTSN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
   },
   {
@@ -58995,7 +59090,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1362"
     }
    ],
    "fields" :
@@ -59016,7 +59111,7 @@
      "access" : "private",
      "field_name" : "mExtras",
      "field_offset" : 96,
-     "referenced_type" : "type-1363"
+     "referenced_type" : "type-1366"
     },
     {
      "access" : "private",
@@ -59028,8 +59123,8 @@
    "linker_set_key" : "android::hardware::BHwBinder",
    "name" : "android::hardware::BHwBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-1362",
-   "self_type" : "type-1362",
+   "referenced_type" : "type-1365",
+   "self_type" : "type-1365",
    "size" : 28,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware9BHwBinderE",
@@ -59145,7 +59240,7 @@
      "access" : "private",
      "field_name" : "mRemote",
      "field_offset" : 32,
-     "referenced_type" : "type-1372"
+     "referenced_type" : "type-1375"
     },
     {
      "access" : "private",
@@ -59157,14 +59252,14 @@
      "access" : "private",
      "field_name" : "mState",
      "field_offset" : 96,
-     "referenced_type" : "type-1373"
+     "referenced_type" : "type-1376"
     }
    ],
    "linker_set_key" : "android::hardware::BpHwRefBase",
    "name" : "android::hardware::BpHwRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-1371",
-   "self_type" : "type-1371",
+   "referenced_type" : "type-1374",
+   "self_type" : "type-1374",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE",
@@ -59383,8 +59478,8 @@
    "linker_set_key" : "android::hardware::IBinder",
    "name" : "android::hardware::IBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-1359",
-   "self_type" : "type-1359",
+   "referenced_type" : "type-1362",
+   "self_type" : "type-1362",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinderE",
@@ -59500,8 +59595,8 @@
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient",
    "name" : "android::hardware::IBinder::DeathRecipient",
    "record_kind" : "class",
-   "referenced_type" : "type-1370",
-   "self_type" : "type-1370",
+   "referenced_type" : "type-1373",
+   "self_type" : "type-1373",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinder14DeathRecipientE",
@@ -59588,8 +59683,8 @@
    "linker_set_key" : "android::hardware::IInterface",
    "name" : "android::hardware::IInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1376",
+   "referenced_type" : "type-1379",
+   "self_type" : "type-1379",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
    "unique_id" : "_ZTSN7android8hardware10IInterfaceE",
@@ -59671,43 +59766,43 @@
     {
      "access" : "private",
      "field_name" : "mProcess",
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1396"
     },
     {
      "access" : "private",
      "field_name" : "mPendingStrongDerefs",
      "field_offset" : 32,
-     "referenced_type" : "type-1360"
+     "referenced_type" : "type-1363"
     },
     {
      "access" : "private",
      "field_name" : "mPendingWeakDerefs",
      "field_offset" : 192,
-     "referenced_type" : "type-1207"
+     "referenced_type" : "type-1210"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteStrongDerefs",
      "field_offset" : 352,
-     "referenced_type" : "type-1208"
+     "referenced_type" : "type-1213"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteWeakDerefs",
      "field_offset" : 512,
-     "referenced_type" : "type-1207"
+     "referenced_type" : "type-1210"
     },
     {
      "access" : "private",
      "field_name" : "mIn",
      "field_offset" : 672,
-     "referenced_type" : "type-1377"
+     "referenced_type" : "type-1380"
     },
     {
      "access" : "private",
      "field_name" : "mOut",
      "field_offset" : 1216,
-     "referenced_type" : "type-1377"
+     "referenced_type" : "type-1380"
     },
     {
      "access" : "private",
@@ -59749,7 +59844,7 @@
      "access" : "private",
      "field_name" : "mContextObject",
      "field_offset" : 1952,
-     "referenced_type" : "type-1399"
+     "referenced_type" : "type-1402"
     },
     {
      "access" : "private",
@@ -59767,26 +59862,26 @@
      "access" : "private",
      "field_name" : "mPostCommandTasks",
      "field_offset" : 2016,
-     "referenced_type" : "type-1400"
+     "referenced_type" : "type-1403"
     },
     {
      "access" : "private",
      "field_name" : "mIPCThreadStateBase",
      "field_offset" : 2112,
-     "referenced_type" : "type-1368"
+     "referenced_type" : "type-1371"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 2144,
-     "referenced_type" : "type-1391"
+     "referenced_type" : "type-1394"
     }
    ],
    "linker_set_key" : "android::hardware::IPCThreadState",
    "name" : "android::hardware::IPCThreadState",
    "record_kind" : "class",
-   "referenced_type" : "type-1392",
-   "self_type" : "type-1392",
+   "referenced_type" : "type-1395",
+   "self_type" : "type-1395",
    "size" : 272,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h",
    "unique_id" : "_ZTSN7android8hardware14IPCThreadStateE"
@@ -59804,7 +59899,7 @@
      "access" : "private",
      "field_name" : "mBufCache",
      "field_offset" : 32,
-     "referenced_type" : "type-1378"
+     "referenced_type" : "type-1381"
     },
     {
      "access" : "private",
@@ -59888,7 +59983,7 @@
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 480,
-     "referenced_type" : "type-1379"
+     "referenced_type" : "type-1382"
     },
     {
      "access" : "private",
@@ -59900,8 +59995,8 @@
    "linker_set_key" : "android::hardware::Parcel",
    "name" : "android::hardware::Parcel",
    "record_kind" : "class",
-   "referenced_type" : "type-1377",
-   "self_type" : "type-1377",
+   "referenced_type" : "type-1380",
+   "self_type" : "type-1380",
    "size" : 68,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6ParcelE"
@@ -59928,8 +60023,8 @@
    ],
    "linker_set_key" : "android::hardware::Parcel::BufferInfo",
    "name" : "android::hardware::Parcel::BufferInfo",
-   "referenced_type" : "type-1382",
-   "self_type" : "type-1382",
+   "referenced_type" : "type-1385",
+   "self_type" : "type-1385",
    "size" : 20,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE"
@@ -59961,13 +60056,13 @@
      "access" : "private",
      "field_name" : "mThreadCountLock",
      "field_offset" : 96,
-     "referenced_type" : "type-1397"
+     "referenced_type" : "type-1400"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountDecrement",
      "field_offset" : 128,
-     "referenced_type" : "type-1398"
+     "referenced_type" : "type-1401"
     },
     {
      "access" : "private",
@@ -59997,7 +60092,7 @@
      "access" : "private",
      "field_name" : "mHandleToObject",
      "field_offset" : 320,
-     "referenced_type" : "type-1356"
+     "referenced_type" : "type-1359"
     },
     {
      "access" : "private",
@@ -60009,7 +60104,7 @@
      "access" : "private",
      "field_name" : "mBinderContextCheckFunc",
      "field_offset" : 512,
-     "referenced_type" : "type-1390"
+     "referenced_type" : "type-1393"
     },
     {
      "access" : "private",
@@ -60021,7 +60116,7 @@
      "access" : "private",
      "field_name" : "mContexts",
      "field_offset" : 576,
-     "referenced_type" : "type-1366"
+     "referenced_type" : "type-1369"
     },
     {
      "access" : "private",
@@ -60045,7 +60140,7 @@
      "access" : "private",
      "field_name" : "mThreadPoolSeq",
      "field_offset" : 800,
-     "referenced_type" : "type-1250"
+     "referenced_type" : "type-1253"
     },
     {
      "access" : "private",
@@ -60057,14 +60152,14 @@
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 864,
-     "referenced_type" : "type-1391"
+     "referenced_type" : "type-1394"
     }
    ],
    "linker_set_key" : "android::hardware::ProcessState",
    "name" : "android::hardware::ProcessState",
    "record_kind" : "class",
-   "referenced_type" : "type-1396",
-   "self_type" : "type-1396",
+   "referenced_type" : "type-1399",
+   "self_type" : "type-1399",
    "size" : 120,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessStateE",
@@ -60142,7 +60237,7 @@
    [
     {
      "field_name" : "binder",
-     "referenced_type" : "type-1358"
+     "referenced_type" : "type-1361"
     },
     {
      "field_name" : "refs",
@@ -60152,8 +60247,8 @@
    ],
    "linker_set_key" : "android::hardware::ProcessState::handle_entry",
    "name" : "android::hardware::ProcessState::handle_entry",
-   "referenced_type" : "type-1357",
-   "self_type" : "type-1357",
+   "referenced_type" : "type-1360",
+   "self_type" : "type-1360",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE"
@@ -60178,8 +60273,8 @@
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::bufferqueue::V2_0::Status>",
    "name" : "android::hardware::Return<android::hardware::graphics::bufferqueue::V2_0::Status>",
    "record_kind" : "class",
-   "referenced_type" : "type-7504",
-   "self_type" : "type-7504",
+   "referenced_type" : "type-7528",
+   "self_type" : "type-7528",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "template_args" : [ "type-607" ],
@@ -60199,17 +60294,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-2463"
+     "referenced_type" : "type-2466"
     }
    ],
    "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",
+   "referenced_type" : "type-4365",
+   "self_type" : "type-4365",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-2463" ],
+   "template_args" : [ "type-2466" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducerEEEEE"
   },
   {
@@ -60226,17 +60321,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-2454"
+     "referenced_type" : "type-2457"
     }
    ],
    "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",
+   "referenced_type" : "type-4494",
+   "self_type" : "type-4494",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-2454" ],
+   "template_args" : [ "type-2457" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V1_017IProducerListenerEEEEE"
   },
   {
@@ -60253,17 +60348,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-2476"
+     "referenced_type" : "type-2479"
     }
    ],
    "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",
+   "referenced_type" : "type-4371",
+   "self_type" : "type-4371",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-2476" ],
+   "template_args" : [ "type-2479" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V2_022IGraphicBufferProducerEEEEE"
   },
   {
@@ -60280,17 +60375,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-2470"
+     "referenced_type" : "type-2473"
     }
    ],
    "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",
+   "referenced_type" : "type-4500",
+   "self_type" : "type-4500",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-2470" ],
+   "template_args" : [ "type-2473" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V2_017IProducerListenerEEEEE"
   },
   {
@@ -60313,8 +60408,8 @@
    "linker_set_key" : "android::hardware::Return<bool>",
    "name" : "android::hardware::Return<bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-4353",
-   "self_type" : "type-4353",
+   "referenced_type" : "type-4359",
+   "self_type" : "type-4359",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "template_args" : [ "type-93" ],
@@ -60367,8 +60462,8 @@
    "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",
+   "referenced_type" : "type-7534",
+   "self_type" : "type-7534",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "template_args" : [ "type-92" ],
@@ -61439,8 +61534,8 @@
    ],
    "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-2456",
+   "referenced_type" : "type-2459",
+   "self_type" : "type-2459",
    "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",
@@ -64017,8 +64112,8 @@
    "linker_set_key" : "android::sp<android::AHandler>",
    "name" : "android::sp<android::AHandler>",
    "record_kind" : "class",
-   "referenced_type" : "type-1188",
-   "self_type" : "type-1188",
+   "referenced_type" : "type-1191",
+   "self_type" : "type-1191",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-264" ],
@@ -64111,17 +64206,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4229"
+     "referenced_type" : "type-4235"
     }
    ],
    "linker_set_key" : "android::sp<android::BpGraphicBufferProducer>",
    "name" : "android::sp<android::BpGraphicBufferProducer>",
    "record_kind" : "class",
-   "referenced_type" : "type-4228",
-   "self_type" : "type-4228",
+   "referenced_type" : "type-4234",
+   "self_type" : "type-4234",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4231" ],
+   "template_args" : [ "type-4237" ],
    "unique_id" : "_ZTSN7android2spINS_23BpGraphicBufferProducerEEE"
   },
   {
@@ -64131,17 +64226,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4451"
+     "referenced_type" : "type-4457"
     }
    ],
    "linker_set_key" : "android::sp<android::BpProducerListener>",
    "name" : "android::sp<android::BpProducerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-4454",
-   "self_type" : "type-4454",
+   "referenced_type" : "type-4460",
+   "self_type" : "type-4460",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4455" ],
+   "template_args" : [ "type-4461" ],
    "unique_id" : "_ZTSN7android2spINS_18BpProducerListenerEEE"
   },
   {
@@ -64211,17 +64306,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1865"
+     "referenced_type" : "type-1869"
     }
    ],
    "linker_set_key" : "android::sp<android::Fence>",
    "name" : "android::sp<android::Fence>",
    "record_kind" : "class",
-   "referenced_type" : "type-1864",
-   "self_type" : "type-1864",
+   "referenced_type" : "type-1868",
+   "self_type" : "type-1868",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1867" ],
+   "template_args" : [ "type-1871" ],
    "unique_id" : "_ZTSN7android2spINS_5FenceEEE"
   },
   {
@@ -64251,17 +64346,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1174"
+     "referenced_type" : "type-1177"
     }
    ],
    "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",
+   "referenced_type" : "type-1176",
+   "self_type" : "type-1176",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1176" ],
+   "template_args" : [ "type-1179" ],
    "unique_id" : "_ZTSN7android2spINS_10GLConsumer8EglImageEEE"
   },
   {
@@ -64317,8 +64412,8 @@
    "linker_set_key" : "android::sp<android::GraphicBufferSource>",
    "name" : "android::sp<android::GraphicBufferSource>",
    "record_kind" : "class",
-   "referenced_type" : "type-2542",
-   "self_type" : "type-2542",
+   "referenced_type" : "type-2545",
+   "self_type" : "type-2545",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-566" ],
@@ -64331,17 +64426,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4256"
+     "referenced_type" : "type-4262"
     }
    ],
    "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",
+   "referenced_type" : "type-4265",
+   "self_type" : "type-4265",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4260" ],
+   "template_args" : [ "type-4266" ],
    "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE8ObituaryEEE"
   },
   {
@@ -64351,17 +64446,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4265"
+     "referenced_type" : "type-4271"
     }
    ],
    "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",
+   "referenced_type" : "type-4274",
+   "self_type" : "type-4274",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4269" ],
+   "template_args" : [ "type-4275" ],
    "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE8ObituaryEEE"
   },
   {
@@ -64371,17 +64466,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4828"
+     "referenced_type" : "type-4834"
     }
    ],
    "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",
+   "referenced_type" : "type-4833",
+   "self_type" : "type-4833",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4830" ],
+   "template_args" : [ "type-4836" ],
    "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE8ObituaryEEE"
   },
   {
@@ -64391,17 +64486,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-5097"
+     "referenced_type" : "type-5113"
     }
    ],
    "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",
+   "referenced_type" : "type-5112",
+   "self_type" : "type-5112",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-5099" ],
+   "template_args" : [ "type-5115" ],
    "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE8ObituaryEEE"
   },
   {
@@ -64551,17 +64646,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1049"
+     "referenced_type" : "type-1052"
     }
    ],
    "linker_set_key" : "android::sp<android::ISurfaceComposer>",
    "name" : "android::sp<android::ISurfaceComposer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1048",
-   "self_type" : "type-1048",
+   "referenced_type" : "type-1051",
+   "self_type" : "type-1051",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1051" ],
+   "template_args" : [ "type-1054" ],
    "unique_id" : "_ZTSN7android2spINS_16ISurfaceComposerEEE"
   },
   {
@@ -64571,17 +64666,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1041"
+     "referenced_type" : "type-1045"
     }
    ],
    "linker_set_key" : "android::sp<android::ITransactionCompletedListener>",
    "name" : "android::sp<android::ITransactionCompletedListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1040",
-   "self_type" : "type-1040",
+   "referenced_type" : "type-1044",
+   "self_type" : "type-1044",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1043" ],
+   "template_args" : [ "type-1047" ],
    "unique_id" : "_ZTSN7android2spINS_29ITransactionCompletedListenerEEE"
   },
   {
@@ -64611,17 +64706,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1260"
+     "referenced_type" : "type-1263"
     }
    ],
    "linker_set_key" : "android::sp<android::ProcessState>",
    "name" : "android::sp<android::ProcessState>",
    "record_kind" : "class",
-   "referenced_type" : "type-1259",
-   "self_type" : "type-1259",
+   "referenced_type" : "type-1262",
+   "self_type" : "type-1262",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1261" ],
+   "template_args" : [ "type-1264" ],
    "unique_id" : "_ZTSN7android2spINS_12ProcessStateEEE"
   },
   {
@@ -64651,17 +64746,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1361"
+     "referenced_type" : "type-1364"
     }
    ],
    "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",
+   "referenced_type" : "type-1402",
+   "self_type" : "type-1402",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1362" ],
+   "template_args" : [ "type-1365" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
   },
   {
@@ -64671,17 +64766,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1358"
+     "referenced_type" : "type-1361"
     }
    ],
    "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",
+   "referenced_type" : "type-1370",
+   "self_type" : "type-1370",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1359" ],
+   "template_args" : [ "type-1362" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
   },
   {
@@ -64691,17 +64786,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1395"
+     "referenced_type" : "type-1398"
     }
    ],
    "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",
+   "referenced_type" : "type-1397",
+   "self_type" : "type-1397",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1396" ],
+   "template_args" : [ "type-1399" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
   },
   {
@@ -64711,14 +64806,14 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2464"
+     "referenced_type" : "type-2467"
     }
    ],
    "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-2463",
-   "self_type" : "type-2463",
+   "referenced_type" : "type-2466",
+   "self_type" : "type-2466",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-595" ],
@@ -64731,17 +64826,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2455"
+     "referenced_type" : "type-2458"
     }
    ],
    "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-2454",
-   "self_type" : "type-2454",
+   "referenced_type" : "type-2457",
+   "self_type" : "type-2457",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-2456" ],
+   "template_args" : [ "type-2459" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerEEE"
   },
   {
@@ -64751,17 +64846,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4241"
+     "referenced_type" : "type-4247"
     }
    ],
    "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",
+   "referenced_type" : "type-4246",
+   "self_type" : "type-4246",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4243" ],
+   "template_args" : [ "type-4249" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerEEE"
   },
   {
@@ -64771,17 +64866,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4463"
+     "referenced_type" : "type-4470"
     }
    ],
    "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",
+   "referenced_type" : "type-4473",
+   "self_type" : "type-4473",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4467" ],
+   "template_args" : [ "type-4474" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerEEE"
   },
   {
@@ -64791,14 +64886,14 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2477"
+     "referenced_type" : "type-2480"
     }
    ],
    "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-2476",
-   "self_type" : "type-2476",
+   "referenced_type" : "type-2479",
+   "self_type" : "type-2479",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-677" ],
@@ -64811,14 +64906,14 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2471"
+     "referenced_type" : "type-2474"
     }
    ],
    "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-2470",
-   "self_type" : "type-2470",
+   "referenced_type" : "type-2473",
+   "self_type" : "type-2473",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-604" ],
@@ -64831,17 +64926,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4235"
+     "referenced_type" : "type-4241"
     }
    ],
    "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",
+   "referenced_type" : "type-4240",
+   "self_type" : "type-4240",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4237" ],
+   "template_args" : [ "type-4243" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerEEE"
   },
   {
@@ -64851,17 +64946,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4456"
+     "referenced_type" : "type-4462"
     }
    ],
    "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",
+   "referenced_type" : "type-4466",
+   "self_type" : "type-4466",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4460" ],
+   "template_args" : [ "type-4467" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerEEE"
   },
   {
@@ -64891,14 +64986,14 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2445"
+     "referenced_type" : "type-2448"
     }
    ],
    "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-2444",
-   "self_type" : "type-2444",
+   "referenced_type" : "type-2447",
+   "self_type" : "type-2447",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-530" ],
@@ -64911,14 +65006,14 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2449"
+     "referenced_type" : "type-2452"
     }
    ],
    "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-2448",
-   "self_type" : "type-2448",
+   "referenced_type" : "type-2451",
+   "self_type" : "type-2451",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-533" ],
@@ -64931,36 +65026,36 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2517"
+     "referenced_type" : "type-2520"
     }
    ],
    "linker_set_key" : "android::sp<const android::AHandler>",
    "name" : "android::sp<const android::AHandler>",
    "record_kind" : "class",
-   "referenced_type" : "type-2516",
-   "self_type" : "type-2516",
+   "referenced_type" : "type-2519",
+   "self_type" : "type-2519",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-2518" ],
+   "template_args" : [ "type-2521" ],
    "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",
+   "referenced_type" : "type-1064",
+   "self_type" : "type-1064",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1062" ],
+   "template_args" : [ "type-1065" ],
    "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-2588",
-   "self_type" : "type-2588",
+   "referenced_type" : "type-2591",
+   "self_type" : "type-2591",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-160" ],
@@ -64970,8 +65065,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::trait_pointer<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-2585",
-   "self_type" : "type-2585",
+   "referenced_type" : "type-2588",
+   "self_type" : "type-2588",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-147" ],
@@ -64981,8 +65076,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::trait_pointer<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-2581",
-   "self_type" : "type-2581",
+   "referenced_type" : "type-2584",
+   "self_type" : "type-2584",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-143" ],
@@ -64992,8 +65087,8 @@
    "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",
+   "referenced_type" : "type-1186",
+   "self_type" : "type-1186",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-733" ],
@@ -65003,8 +65098,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<int>",
    "name" : "android::trait_pointer<int>",
-   "referenced_type" : "type-2584",
-   "self_type" : "type-2584",
+   "referenced_type" : "type-2587",
+   "self_type" : "type-2587",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -65014,8 +65109,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<long long>",
    "name" : "android::trait_pointer<long long>",
-   "referenced_type" : "type-1060",
-   "self_type" : "type-1060",
+   "referenced_type" : "type-1063",
+   "self_type" : "type-1063",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-169" ],
@@ -65025,30 +65120,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::trait_pointer<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-2589",
-   "self_type" : "type-2589",
+   "referenced_type" : "type-2592",
+   "self_type" : "type-2592",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2590" ],
+   "template_args" : [ "type-2593" ],
    "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-2586",
-   "self_type" : "type-2586",
+   "referenced_type" : "type-2589",
+   "self_type" : "type-2589",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2587" ],
+   "template_args" : [ "type-2590" ],
    "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-2582",
-   "self_type" : "type-2582",
+   "referenced_type" : "type-2585",
+   "self_type" : "type-2585",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -65058,19 +65153,19 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::BufferItem>",
    "name" : "android::trait_trivial_copy<android::BufferItem>",
-   "referenced_type" : "type-1056",
-   "self_type" : "type-1056",
+   "referenced_type" : "type-1059",
+   "self_type" : "type-1059",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1057" ],
+   "template_args" : [ "type-1060" ],
    "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-2572",
-   "self_type" : "type-2572",
+   "referenced_type" : "type-2575",
+   "self_type" : "type-2575",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-160" ],
@@ -65080,8 +65175,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-2569",
-   "self_type" : "type-2569",
+   "referenced_type" : "type-2572",
+   "self_type" : "type-2572",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-147" ],
@@ -65091,8 +65186,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-2566",
-   "self_type" : "type-2566",
+   "referenced_type" : "type-2569",
+   "self_type" : "type-2569",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-143" ],
@@ -65102,8 +65197,8 @@
    "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",
+   "referenced_type" : "type-1184",
+   "self_type" : "type-1184",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-733" ],
@@ -65113,8 +65208,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-2462",
-   "self_type" : "type-2462",
+   "referenced_type" : "type-2465",
+   "self_type" : "type-2465",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-93" ],
@@ -65124,8 +65219,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-2499",
-   "self_type" : "type-2499",
+   "referenced_type" : "type-2502",
+   "self_type" : "type-2502",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-124" ],
@@ -65157,8 +65252,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-2655",
-   "self_type" : "type-2655",
+   "referenced_type" : "type-2658",
+   "self_type" : "type-2658",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -65190,8 +65285,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<short>",
    "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-2594",
-   "self_type" : "type-2594",
+   "referenced_type" : "type-2597",
+   "self_type" : "type-2597",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-499" ],
@@ -65201,30 +65296,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::trait_trivial_copy<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-2570",
-   "self_type" : "type-2570",
+   "referenced_type" : "type-2573",
+   "self_type" : "type-2573",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2571" ],
+   "template_args" : [ "type-2574" ],
    "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-2567",
-   "self_type" : "type-2567",
+   "referenced_type" : "type-2570",
+   "self_type" : "type-2570",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2568" ],
+   "template_args" : [ "type-2571" ],
    "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-2540",
-   "self_type" : "type-2540",
+   "referenced_type" : "type-2543",
+   "self_type" : "type-2543",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-90" ],
@@ -65267,8 +65362,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
    "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-2634",
-   "self_type" : "type-2634",
+   "referenced_type" : "type-2637",
+   "self_type" : "type-2637",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-497" ],
@@ -65278,8 +65373,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-2433",
-   "self_type" : "type-2433",
+   "referenced_type" : "type-2436",
+   "self_type" : "type-2436",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-9" ],
@@ -65289,19 +65384,19 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::BufferItem>",
    "name" : "android::trait_trivial_ctor<android::BufferItem>",
-   "referenced_type" : "type-1052",
-   "self_type" : "type-1052",
+   "referenced_type" : "type-1055",
+   "self_type" : "type-1055",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1053" ],
+   "template_args" : [ "type-1056" ],
    "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-2554",
-   "self_type" : "type-2554",
+   "referenced_type" : "type-2557",
+   "self_type" : "type-2557",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-160" ],
@@ -65311,8 +65406,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-2549",
-   "self_type" : "type-2549",
+   "referenced_type" : "type-2552",
+   "self_type" : "type-2552",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-147" ],
@@ -65322,8 +65417,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-2548",
-   "self_type" : "type-2548",
+   "referenced_type" : "type-2551",
+   "self_type" : "type-2551",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-143" ],
@@ -65333,8 +65428,8 @@
    "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",
+   "referenced_type" : "type-1182",
+   "self_type" : "type-1182",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-733" ],
@@ -65344,8 +65439,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-2443",
-   "self_type" : "type-2443",
+   "referenced_type" : "type-2446",
+   "self_type" : "type-2446",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-93" ],
@@ -65355,8 +65450,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-2481",
-   "self_type" : "type-2481",
+   "referenced_type" : "type-2484",
+   "self_type" : "type-2484",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-124" ],
@@ -65388,8 +65483,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-2647",
-   "self_type" : "type-2647",
+   "referenced_type" : "type-2650",
+   "self_type" : "type-2650",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -65421,8 +65516,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<short>",
    "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-2563",
-   "self_type" : "type-2563",
+   "referenced_type" : "type-2566",
+   "self_type" : "type-2566",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-499" ],
@@ -65432,30 +65527,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::trait_trivial_ctor<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-2555",
-   "self_type" : "type-2555",
+   "referenced_type" : "type-2558",
+   "self_type" : "type-2558",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2556" ],
+   "template_args" : [ "type-2559" ],
    "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-2550",
-   "self_type" : "type-2550",
+   "referenced_type" : "type-2553",
+   "self_type" : "type-2553",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2551" ],
+   "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-2526",
-   "self_type" : "type-2526",
+   "referenced_type" : "type-2529",
+   "self_type" : "type-2529",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-90" ],
@@ -65465,8 +65560,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
    "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-2670",
-   "self_type" : "type-2670",
+   "referenced_type" : "type-2673",
+   "self_type" : "type-2673",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -65498,8 +65593,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned short>",
    "name" : "android::trait_trivial_ctor<unsigned short>",
-   "referenced_type" : "type-2616",
-   "self_type" : "type-2616",
+   "referenced_type" : "type-2619",
+   "self_type" : "type-2619",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-497" ],
@@ -65509,8 +65604,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-2399",
-   "self_type" : "type-2399",
+   "referenced_type" : "type-2402",
+   "self_type" : "type-2402",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-9" ],
@@ -65520,19 +65615,19 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::BufferItem>",
    "name" : "android::trait_trivial_dtor<android::BufferItem>",
-   "referenced_type" : "type-1054",
-   "self_type" : "type-1054",
+   "referenced_type" : "type-1057",
+   "self_type" : "type-1057",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1055" ],
+   "template_args" : [ "type-1058" ],
    "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-2564",
-   "self_type" : "type-2564",
+   "referenced_type" : "type-2567",
+   "self_type" : "type-2567",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-160" ],
@@ -65542,8 +65637,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-2560",
-   "self_type" : "type-2560",
+   "referenced_type" : "type-2563",
+   "self_type" : "type-2563",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-147" ],
@@ -65553,8 +65648,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-2557",
-   "self_type" : "type-2557",
+   "referenced_type" : "type-2560",
+   "self_type" : "type-2560",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-143" ],
@@ -65564,8 +65659,8 @@
    "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",
+   "referenced_type" : "type-1183",
+   "self_type" : "type-1183",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-733" ],
@@ -65575,8 +65670,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<bool>",
    "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-2452",
-   "self_type" : "type-2452",
+   "referenced_type" : "type-2455",
+   "self_type" : "type-2455",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-93" ],
@@ -65586,8 +65681,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-2489",
-   "self_type" : "type-2489",
+   "referenced_type" : "type-2492",
+   "self_type" : "type-2492",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-124" ],
@@ -65619,8 +65714,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<int>",
    "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-2650",
-   "self_type" : "type-2650",
+   "referenced_type" : "type-2653",
+   "self_type" : "type-2653",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -65652,8 +65747,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<short>",
    "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-2583",
-   "self_type" : "type-2583",
+   "referenced_type" : "type-2586",
+   "self_type" : "type-2586",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-499" ],
@@ -65663,30 +65758,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::trait_trivial_dtor<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-2561",
-   "self_type" : "type-2561",
+   "referenced_type" : "type-2564",
+   "self_type" : "type-2564",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2562" ],
+   "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-2558",
-   "self_type" : "type-2558",
+   "referenced_type" : "type-2561",
+   "self_type" : "type-2561",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2559" ],
+   "template_args" : [ "type-2562" ],
    "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-2533",
-   "self_type" : "type-2533",
+   "referenced_type" : "type-2536",
+   "self_type" : "type-2536",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-90" ],
@@ -65696,8 +65791,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
    "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-2681",
-   "self_type" : "type-2681",
+   "referenced_type" : "type-2684",
+   "self_type" : "type-2684",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -65729,8 +65824,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned short>",
    "name" : "android::trait_trivial_dtor<unsigned short>",
-   "referenced_type" : "type-2624",
-   "self_type" : "type-2624",
+   "referenced_type" : "type-2627",
+   "self_type" : "type-2627",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-497" ],
@@ -65740,8 +65835,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-2424",
-   "self_type" : "type-2424",
+   "referenced_type" : "type-2427",
+   "self_type" : "type-2427",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-9" ],
@@ -65751,30 +65846,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::BufferItem>",
    "name" : "android::trait_trivial_move<android::BufferItem>",
-   "referenced_type" : "type-1058",
-   "self_type" : "type-1058",
+   "referenced_type" : "type-1061",
+   "self_type" : "type-1061",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1059" ],
+   "template_args" : [ "type-1062" ],
    "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-2662",
-   "self_type" : "type-2662",
+   "referenced_type" : "type-2665",
+   "self_type" : "type-2665",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-1239" ],
+   "template_args" : [ "type-1242" ],
    "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-2656",
-   "self_type" : "type-2656",
+   "referenced_type" : "type-2659",
+   "self_type" : "type-2659",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "template_args" : [ "type-121" ],
@@ -65784,8 +65879,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
-   "referenced_type" : "type-2579",
-   "self_type" : "type-2579",
+   "referenced_type" : "type-2582",
+   "self_type" : "type-2582",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-160" ],
@@ -65795,8 +65890,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-2576",
-   "self_type" : "type-2576",
+   "referenced_type" : "type-2579",
+   "self_type" : "type-2579",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-147" ],
@@ -65806,8 +65901,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-2573",
-   "self_type" : "type-2573",
+   "referenced_type" : "type-2576",
+   "self_type" : "type-2576",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-143" ],
@@ -65817,8 +65912,8 @@
    "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",
+   "referenced_type" : "type-1185",
+   "self_type" : "type-1185",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-733" ],
@@ -65828,8 +65923,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<bool>",
    "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-2472",
-   "self_type" : "type-2472",
+   "referenced_type" : "type-2475",
+   "self_type" : "type-2475",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-93" ],
@@ -65839,8 +65934,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-2521",
-   "self_type" : "type-2521",
+   "referenced_type" : "type-2524",
+   "self_type" : "type-2524",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-124" ],
@@ -65872,8 +65967,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-2659",
-   "self_type" : "type-2659",
+   "referenced_type" : "type-2662",
+   "self_type" : "type-2662",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -65905,8 +66000,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<short>",
    "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-2605",
-   "self_type" : "type-2605",
+   "referenced_type" : "type-2608",
+   "self_type" : "type-2608",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-499" ],
@@ -65916,30 +66011,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::trait_trivial_move<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-2577",
-   "self_type" : "type-2577",
+   "referenced_type" : "type-2580",
+   "self_type" : "type-2580",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2578" ],
+   "template_args" : [ "type-2581" ],
    "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-2574",
-   "self_type" : "type-2574",
+   "referenced_type" : "type-2577",
+   "self_type" : "type-2577",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2575" ],
+   "template_args" : [ "type-2578" ],
    "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-2552",
-   "self_type" : "type-2552",
+   "referenced_type" : "type-2555",
+   "self_type" : "type-2555",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-90" ],
@@ -65982,8 +66077,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned short>",
    "name" : "android::trait_trivial_move<unsigned short>",
-   "referenced_type" : "type-2645",
-   "self_type" : "type-2645",
+   "referenced_type" : "type-2648",
+   "self_type" : "type-2648",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-497" ],
@@ -65993,8 +66088,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-2441",
-   "self_type" : "type-2441",
+   "referenced_type" : "type-2444",
+   "self_type" : "type-2444",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-9" ],
@@ -66004,19 +66099,19 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::BufferItem>",
    "name" : "android::traits<android::BufferItem>",
-   "referenced_type" : "type-1064",
-   "self_type" : "type-1064",
+   "referenced_type" : "type-1067",
+   "self_type" : "type-1067",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1065" ],
+   "template_args" : [ "type-1068" ],
    "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-2599",
-   "self_type" : "type-2599",
+   "referenced_type" : "type-2602",
+   "self_type" : "type-2602",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-160" ],
@@ -66026,8 +66121,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::traits<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-2596",
-   "self_type" : "type-2596",
+   "referenced_type" : "type-2599",
+   "self_type" : "type-2599",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-147" ],
@@ -66037,8 +66132,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::traits<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-2591",
-   "self_type" : "type-2591",
+   "referenced_type" : "type-2594",
+   "self_type" : "type-2594",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-143" ],
@@ -66048,8 +66143,8 @@
    "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",
+   "referenced_type" : "type-1187",
+   "self_type" : "type-1187",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-733" ],
@@ -66059,8 +66154,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<int>",
    "name" : "android::traits<int>",
-   "referenced_type" : "type-2593",
-   "self_type" : "type-2593",
+   "referenced_type" : "type-2596",
+   "self_type" : "type-2596",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -66070,8 +66165,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<long long>",
    "name" : "android::traits<long long>",
-   "referenced_type" : "type-1063",
-   "self_type" : "type-1063",
+   "referenced_type" : "type-1066",
+   "self_type" : "type-1066",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-169" ],
@@ -66081,30 +66176,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::traits<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-2600",
-   "self_type" : "type-2600",
+   "referenced_type" : "type-2603",
+   "self_type" : "type-2603",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2601" ],
+   "template_args" : [ "type-2604" ],
    "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-2597",
-   "self_type" : "type-2597",
+   "referenced_type" : "type-2600",
+   "self_type" : "type-2600",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2598" ],
+   "template_args" : [ "type-2601" ],
    "unique_id" : "_ZTSN7android6traitsINSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<unsigned int>",
    "name" : "android::traits<unsigned int>",
-   "referenced_type" : "type-2592",
-   "self_type" : "type-2592",
+   "referenced_type" : "type-2595",
+   "self_type" : "type-2595",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -66115,16 +66210,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1075"
+     "referenced_type" : "type-1078"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::BufferItem>",
    "name" : "android::use_trivial_move<android::BufferItem>",
-   "referenced_type" : "type-1074",
-   "self_type" : "type-1074",
+   "referenced_type" : "type-1077",
+   "self_type" : "type-1077",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1076" ],
+   "template_args" : [ "type-1079" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_10BufferItemEEE"
   },
   {
@@ -66132,13 +66227,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2636"
+     "referenced_type" : "type-2639"
     }
    ],
    "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-2635",
-   "self_type" : "type-2635",
+   "referenced_type" : "type-2638",
+   "self_type" : "type-2638",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-160" ],
@@ -66149,13 +66244,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2633"
+     "referenced_type" : "type-2636"
     }
    ],
    "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-2632",
-   "self_type" : "type-2632",
+   "referenced_type" : "type-2635",
+   "self_type" : "type-2635",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-147" ],
@@ -66166,13 +66261,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2629"
+     "referenced_type" : "type-2632"
     }
    ],
    "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-2628",
-   "self_type" : "type-2628",
+   "referenced_type" : "type-2631",
+   "self_type" : "type-2631",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-143" ],
@@ -66183,13 +66278,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1186"
+     "referenced_type" : "type-1190"
     }
    ],
    "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",
+   "referenced_type" : "type-1189",
+   "self_type" : "type-1189",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-733" ],
@@ -66200,13 +66295,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2631"
+     "referenced_type" : "type-2634"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<int>",
    "name" : "android::use_trivial_move<int>",
-   "referenced_type" : "type-2630",
-   "self_type" : "type-2630",
+   "referenced_type" : "type-2633",
+   "self_type" : "type-2633",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -66217,13 +66312,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1073"
+     "referenced_type" : "type-1076"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<long long>",
    "name" : "android::use_trivial_move<long long>",
-   "referenced_type" : "type-1072",
-   "self_type" : "type-1072",
+   "referenced_type" : "type-1075",
+   "self_type" : "type-1075",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-169" ],
@@ -66288,7 +66383,7 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1252"
+     "referenced_type" : "type-1256"
     },
     {
      "access" : "private",
@@ -66300,11 +66395,11 @@
    "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",
+   "referenced_type" : "type-1255",
+   "self_type" : "type-1255",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-1254" ],
+   "template_args" : [ "type-1258" ],
    "unique_id" : "_ZTSN7android2wpINS_12ConsumerBase22FrameAvailableListenerEEE"
   },
   {
@@ -66655,13 +66750,13 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-2178"
+     "referenced_type" : "type-2181"
     }
    ],
    "linker_set_key" : "log_msg",
    "name" : "log_msg",
-   "referenced_type" : "type-2177",
-   "self_type" : "type-2177",
+   "referenced_type" : "type-2180",
+   "self_type" : "type-2180",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
@@ -66672,15 +66767,15 @@
    [
     {
      "field_name" : "buf",
-     "referenced_type" : "type-2179"
+     "referenced_type" : "type-2182"
     },
     {
      "field_name" : "entry",
-     "referenced_type" : "type-1408"
+     "referenced_type" : "type-1411"
     },
     {
      "field_name" : "entry_v4",
-     "referenced_type" : "type-1408"
+     "referenced_type" : "type-1411"
     },
     {
      "field_name" : "entry_v3",
@@ -66688,19 +66783,19 @@
     },
     {
      "field_name" : "entry_v2",
-     "referenced_type" : "type-1291"
+     "referenced_type" : "type-1294"
     },
     {
      "field_name" : "entry_v1",
-     "referenced_type" : "type-2180"
+     "referenced_type" : "type-2183"
     }
    ],
    "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-2178",
-   "self_type" : "type-2178",
+   "referenced_type" : "type-2181",
+   "self_type" : "type-2181",
    "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)"
@@ -66721,8 +66816,8 @@
    ],
    "linker_set_key" : "log_time",
    "name" : "log_time",
-   "referenced_type" : "type-2509",
-   "self_type" : "type-2509",
+   "referenced_type" : "type-2512",
+   "self_type" : "type-2512",
    "size" : 8,
    "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
    "unique_id" : "_ZTS8log_time"
@@ -66768,8 +66863,8 @@
    ],
    "linker_set_key" : "logger_entry",
    "name" : "logger_entry",
-   "referenced_type" : "type-2180",
-   "self_type" : "type-2180",
+   "referenced_type" : "type-2183",
+   "self_type" : "type-2183",
    "size" : 20,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
@@ -66820,8 +66915,8 @@
    ],
    "linker_set_key" : "logger_entry_v2",
    "name" : "logger_entry_v2",
-   "referenced_type" : "type-1291",
-   "self_type" : "type-1291",
+   "referenced_type" : "type-1294",
+   "self_type" : "type-1294",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
@@ -66929,8 +67024,8 @@
    ],
    "linker_set_key" : "logger_entry_v4",
    "name" : "logger_entry_v4",
-   "referenced_type" : "type-1408",
-   "self_type" : "type-1408",
+   "referenced_type" : "type-1411",
+   "self_type" : "type-1411",
    "size" : 28,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
@@ -66974,8 +67069,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser> &&",
    "name" : "android::base::unique_fd_impl<android::base::DefaultCloser> &&",
-   "referenced_type" : "type-2553",
-   "self_type" : "type-2610",
+   "referenced_type" : "type-2556",
+   "self_type" : "type-2613",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -66992,8 +67087,8 @@
    "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",
+   "referenced_type" : "type-7528",
+   "self_type" : "type-7532",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -67001,24 +67096,6 @@
    "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,
@@ -67026,8 +67103,8 @@
   },
   {
    "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> > &&",
+   "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-4494",
    "self_type" : "type-4496",
    "size" : 4,
@@ -67035,10 +67112,28 @@
   },
   {
    "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-4371",
+   "self_type" : "type-4373",
+   "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-4500",
+   "self_type" : "type-4502",
+   "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-4355",
+   "referenced_type" : "type-4359",
+   "self_type" : "type-4361",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -67055,8 +67150,8 @@
    "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",
+   "referenced_type" : "type-7534",
+   "self_type" : "type-7536",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -67110,7 +67205,7 @@
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> &&",
    "name" : "android::hardware::hidl_vec<unsigned char> &&",
    "referenced_type" : "type-452",
-   "self_type" : "type-4566",
+   "self_type" : "type-4572",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -67119,7 +67214,7 @@
    "linker_set_key" : "android::sp<android::ALooper> &&",
    "name" : "android::sp<android::ALooper> &&",
    "referenced_type" : "type-321",
-   "self_type" : "type-2256",
+   "self_type" : "type-2259",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67136,8 +67231,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::Fence> &&",
    "name" : "android::sp<android::Fence> &&",
-   "referenced_type" : "type-1864",
-   "self_type" : "type-2524",
+   "referenced_type" : "type-1868",
+   "self_type" : "type-2527",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67145,8 +67240,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::GraphicBufferSource> &&",
    "name" : "android::sp<android::GraphicBufferSource> &&",
-   "referenced_type" : "type-2542",
-   "self_type" : "type-2543",
+   "referenced_type" : "type-2545",
+   "self_type" : "type-2546",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67154,8 +67249,8 @@
    "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-4261",
+   "referenced_type" : "type-4265",
+   "self_type" : "type-4267",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67163,8 +67258,8 @@
    "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",
+   "referenced_type" : "type-4274",
+   "self_type" : "type-4276",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67172,8 +67267,8 @@
    "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",
+   "referenced_type" : "type-4833",
+   "self_type" : "type-4843",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67181,8 +67276,8 @@
    "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",
+   "referenced_type" : "type-5112",
+   "self_type" : "type-5118",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67191,7 +67286,7 @@
    "linker_set_key" : "android::sp<android::IBinder::DeathRecipient> &&",
    "name" : "android::sp<android::IBinder::DeathRecipient> &&",
    "referenced_type" : "type-843",
-   "self_type" : "type-4383",
+   "self_type" : "type-4389",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67200,7 +67295,7 @@
    "linker_set_key" : "android::sp<android::IConsumerListener> &&",
    "name" : "android::sp<android::IConsumerListener> &&",
    "referenced_type" : "type-939",
-   "self_type" : "type-1577",
+   "self_type" : "type-1580",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67209,7 +67304,7 @@
    "linker_set_key" : "android::sp<android::IGraphicBufferConsumer> &&",
    "name" : "android::sp<android::IGraphicBufferConsumer> &&",
    "referenced_type" : "type-574",
-   "self_type" : "type-1600",
+   "self_type" : "type-1604",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67218,7 +67313,7 @@
    "linker_set_key" : "android::sp<android::IGraphicBufferProducer> &&",
    "name" : "android::sp<android::IGraphicBufferProducer> &&",
    "referenced_type" : "type-570",
-   "self_type" : "type-4226",
+   "self_type" : "type-4232",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67227,7 +67322,7 @@
    "linker_set_key" : "android::sp<android::IProducerListener> &&",
    "name" : "android::sp<android::IProducerListener> &&",
    "referenced_type" : "type-957",
-   "self_type" : "type-4252",
+   "self_type" : "type-4258",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67236,7 +67331,7 @@
    "linker_set_key" : "android::sp<android::NativeHandle> &&",
    "name" : "android::sp<android::NativeHandle> &&",
    "referenced_type" : "type-932",
-   "self_type" : "type-1596",
+   "self_type" : "type-1600",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   }
diff --git a/29/64/x86/source-based/libui.so.lsdump b/29/64/x86/source-based/libui.so.lsdump
index ba6360c..8848d82 100644
--- a/29/64/x86/source-based/libui.so.lsdump
+++ b/29/64/x86/source-based/libui.so.lsdump
@@ -5,8 +5,8 @@
    "alignment" : 4,
    "linker_set_key" : "AHardwareBuffer_Plane [4]",
    "name" : "AHardwareBuffer_Plane [4]",
-   "referenced_type" : "type-509",
-   "self_type" : "type-508",
+   "referenced_type" : "type-506",
+   "self_type" : "type-505",
    "size" : 48,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h"
   },
@@ -14,7 +14,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<float> [3]",
    "name" : "android::details::TVec3<float> [3]",
-   "referenced_type" : "type-17",
+   "referenced_type" : "type-18",
    "self_type" : "type-904",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
@@ -23,8 +23,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<float> [4]",
    "name" : "android::details::TVec4<float> [4]",
-   "referenced_type" : "type-200",
-   "self_type" : "type-2428",
+   "referenced_type" : "type-192",
+   "self_type" : "type-2430",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -32,7 +32,7 @@
    "alignment" : 1,
    "linker_set_key" : "char [0]",
    "name" : "char [0]",
-   "referenced_type" : "type-288",
+   "referenced_type" : "type-285",
    "self_type" : "type-1261",
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -47,16 +47,16 @@
    "alignment" : 4,
    "linker_set_key" : "int [0]",
    "name" : "int [0]",
-   "referenced_type" : "type-103",
-   "self_type" : "type-145",
+   "referenced_type" : "type-105",
+   "self_type" : "type-148",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int [7]",
    "name" : "int [7]",
-   "referenced_type" : "type-103",
-   "self_type" : "type-564",
+   "referenced_type" : "type-105",
+   "self_type" : "type-561",
    "size" : 28,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -64,7 +64,7 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
-   "referenced_type" : "type-218",
+   "referenced_type" : "type-220",
    "self_type" : "type-1270",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
@@ -73,7 +73,7 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [10]",
    "name" : "unsigned int [10]",
-   "referenced_type" : "type-123",
+   "referenced_type" : "type-125",
    "self_type" : "type-1109",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -82,8 +82,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [12]",
    "name" : "unsigned int [12]",
-   "referenced_type" : "type-123",
-   "self_type" : "type-559",
+   "referenced_type" : "type-125",
+   "self_type" : "type-556",
    "size" : 48,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -91,8 +91,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [25]",
    "name" : "unsigned int [25]",
-   "referenced_type" : "type-123",
-   "self_type" : "type-558",
+   "referenced_type" : "type-125",
+   "self_type" : "type-555",
    "size" : 100,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -100,8 +100,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [3]",
    "name" : "unsigned int [3]",
-   "referenced_type" : "type-123",
-   "self_type" : "type-941",
+   "referenced_type" : "type-125",
+   "self_type" : "type-935",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -109,8 +109,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [8]",
    "name" : "unsigned int [8]",
-   "referenced_type" : "type-123",
-   "self_type" : "type-349",
+   "referenced_type" : "type-125",
+   "self_type" : "type-346",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -118,26 +118,17 @@
    "alignment" : 4,
    "linker_set_key" : "void *[1]",
    "name" : "void *[1]",
-   "referenced_type" : "type-227",
-   "self_type" : "type-523",
+   "referenced_type" : "type-229",
+   "self_type" : "type-521",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void *[3]",
-   "name" : "void *[3]",
-   "referenced_type" : "type-227",
-   "self_type" : "type-596",
-   "size" : 12,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "void *[4]",
    "name" : "void *[4]",
-   "referenced_type" : "type-227",
-   "self_type" : "type-519",
+   "referenced_type" : "type-229",
+   "self_type" : "type-517",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -145,8 +136,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *[6]",
    "name" : "void *[6]",
-   "referenced_type" : "type-227",
-   "self_type" : "type-524",
+   "referenced_type" : "type-229",
+   "self_type" : "type-522",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -154,7 +145,7 @@
    "alignment" : 4,
    "linker_set_key" : "void *[7]",
    "name" : "void *[7]",
-   "referenced_type" : "type-227",
+   "referenced_type" : "type-229",
    "self_type" : "type-609",
    "size" : 28,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
@@ -177,8 +168,8 @@
    "is_integral" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-288",
-   "self_type" : "type-288",
+   "referenced_type" : "type-285",
+   "self_type" : "type-285",
    "size" : 1
   },
   {
@@ -187,16 +178,16 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-182",
-   "self_type" : "type-182",
+   "referenced_type" : "type-185",
+   "self_type" : "type-185",
    "size" : 2
   },
   {
    "alignment" : 4,
    "linker_set_key" : "double",
    "name" : "double",
-   "referenced_type" : "type-41",
-   "self_type" : "type-41",
+   "referenced_type" : "type-43",
+   "self_type" : "type-43",
    "size" : 8
   },
   {
@@ -212,8 +203,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-103",
-   "self_type" : "type-103",
+   "referenced_type" : "type-105",
+   "self_type" : "type-105",
    "size" : 4
   },
   {
@@ -221,16 +212,16 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-687",
-   "self_type" : "type-687",
+   "referenced_type" : "type-684",
+   "self_type" : "type-684",
    "size" : 4
   },
   {
    "alignment" : 4,
    "linker_set_key" : "long double",
    "name" : "long double",
-   "referenced_type" : "type-298",
-   "self_type" : "type-298",
+   "referenced_type" : "type-295",
+   "self_type" : "type-295",
    "size" : 8
   },
   {
@@ -238,8 +229,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-284",
-   "self_type" : "type-284",
+   "referenced_type" : "type-12",
+   "self_type" : "type-12",
    "size" : 8
   },
   {
@@ -266,8 +257,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned char",
    "name" : "unsigned char",
-   "referenced_type" : "type-218",
-   "self_type" : "type-218",
+   "referenced_type" : "type-220",
+   "self_type" : "type-220",
    "size" : 1
   },
   {
@@ -276,8 +267,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned int",
    "name" : "unsigned int",
-   "referenced_type" : "type-123",
-   "self_type" : "type-123",
+   "referenced_type" : "type-125",
+   "self_type" : "type-125",
    "size" : 4
   },
   {
@@ -296,8 +287,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-124",
-   "self_type" : "type-124",
+   "referenced_type" : "type-126",
+   "self_type" : "type-126",
    "size" : 8
   },
   {
@@ -313,8 +304,8 @@
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-151",
-   "self_type" : "type-151"
+   "referenced_type" : "type-154",
+   "self_type" : "type-154"
   }
  ],
  "elf_functions" :
@@ -1805,11 +1796,11 @@
    ],
    "linker_set_key" : "AHardwareBuffer_Format",
    "name" : "AHardwareBuffer_Format",
-   "referenced_type" : "type-616",
-   "self_type" : "type-616",
+   "referenced_type" : "type-617",
+   "self_type" : "type-617",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "AHardwareBuffer_Format"
   },
   {
@@ -1971,11 +1962,11 @@
    ],
    "linker_set_key" : "AHardwareBuffer_UsageFlags",
    "name" : "AHardwareBuffer_UsageFlags",
-   "referenced_type" : "type-678",
-   "self_type" : "type-678",
+   "referenced_type" : "type-676",
+   "self_type" : "type-676",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "AHardwareBuffer_UsageFlags"
   },
   {
@@ -1993,11 +1984,11 @@
    ],
    "linker_set_key" : "android::Condition::WakeUpType",
    "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-260",
-   "self_type" : "type-260",
+   "referenced_type" : "type-256",
+   "self_type" : "type-256",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android9Condition10WakeUpTypeE"
   },
   {
@@ -2023,7 +2014,7 @@
    "self_type" : "type-1346",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android5Fence6StatusE"
   },
   {
@@ -2045,11 +2036,11 @@
    ],
    "linker_set_key" : "android::FenceTime::Snapshot::State",
    "name" : "android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1384",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1388",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android9FenceTime8Snapshot5StateE"
   },
   {
@@ -2072,11 +2063,11 @@
    ],
    "linker_set_key" : "android::FenceTime::State",
    "name" : "android::FenceTime::State",
-   "referenced_type" : "type-1378",
-   "self_type" : "type-1378",
+   "referenced_type" : "type-1383",
+   "self_type" : "type-1383",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android9FenceTime5StateE"
   },
   {
@@ -2102,11 +2093,11 @@
    ],
    "linker_set_key" : "android::GraphicBuffer::HandleWrapMethod",
    "name" : "android::GraphicBuffer::HandleWrapMethod",
-   "referenced_type" : "type-629",
-   "self_type" : "type-629",
+   "referenced_type" : "type-630",
+   "self_type" : "type-630",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h",
-   "underlying_type" : "type-218",
+   "underlying_type" : "type-220",
    "unique_id" : "_ZTSN7android13GraphicBuffer16HandleWrapMethodE"
   },
   {
@@ -2124,11 +2115,11 @@
    ],
    "linker_set_key" : "android::GraphicBufferMapper::Version",
    "name" : "android::GraphicBufferMapper::Version",
-   "referenced_type" : "type-529",
-   "self_type" : "type-529",
+   "referenced_type" : "type-527",
+   "self_type" : "type-527",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android19GraphicBufferMapper7VersionE"
   },
   {
@@ -2142,11 +2133,11 @@
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-183",
-   "self_type" : "type-183",
+   "referenced_type" : "type-186",
+   "self_type" : "type-186",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android8String1613StaticLinkageE"
   },
   {
@@ -2160,11 +2151,11 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-864",
-   "self_type" : "type-864",
+   "referenced_type" : "type-862",
+   "self_type" : "type-862",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7String813StaticLinkageE"
   },
   {
@@ -2182,7 +2173,7 @@
    "self_type" : "type-975",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details6TMat33IfE7no_initE"
   },
   {
@@ -2196,11 +2187,11 @@
    ],
    "linker_set_key" : "android::details::TMat44<float>::no_init",
    "name" : "android::details::TMat44<float>::no_init",
-   "referenced_type" : "type-2429",
-   "self_type" : "type-2429",
+   "referenced_type" : "type-2431",
+   "self_type" : "type-2431",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details6TMat44IfE7no_initE"
   },
   {
@@ -2214,11 +2205,11 @@
    ],
    "linker_set_key" : "android::details::TQuaternion<double>::no_init",
    "name" : "android::details::TQuaternion<double>::no_init",
-   "referenced_type" : "type-389",
-   "self_type" : "type-389",
+   "referenced_type" : "type-386",
+   "self_type" : "type-386",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details11TQuaternionIdE7no_initE"
   },
   {
@@ -2232,11 +2223,11 @@
    ],
    "linker_set_key" : "android::details::TQuaternion<float>::no_init",
    "name" : "android::details::TQuaternion<float>::no_init",
-   "referenced_type" : "type-428",
-   "self_type" : "type-428",
+   "referenced_type" : "type-425",
+   "self_type" : "type-425",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details11TQuaternionIfE7no_initE"
   },
   {
@@ -2254,7 +2245,7 @@
    "self_type" : "type-1255",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec2IbE7no_initE"
   },
   {
@@ -2272,7 +2263,7 @@
    "self_type" : "type-1068",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec2IdE7no_initE"
   },
   {
@@ -2290,7 +2281,7 @@
    "self_type" : "type-1135",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec2IfE7no_initE"
   },
   {
@@ -2308,7 +2299,7 @@
    "self_type" : "type-1365",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec3IdE7no_initE"
   },
   {
@@ -2322,11 +2313,11 @@
    ],
    "linker_set_key" : "android::details::TVec3<float>::no_init",
    "name" : "android::details::TVec3<float>::no_init",
-   "referenced_type" : "type-1412",
-   "self_type" : "type-1412",
+   "referenced_type" : "type-1414",
+   "self_type" : "type-1414",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec3IfE7no_initE"
   },
   {
@@ -2340,11 +2331,11 @@
    ],
    "linker_set_key" : "android::details::TVec4<double>::no_init",
    "name" : "android::details::TVec4<double>::no_init",
-   "referenced_type" : "type-148",
-   "self_type" : "type-148",
+   "referenced_type" : "type-137",
+   "self_type" : "type-137",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec4IdE7no_initE"
   },
   {
@@ -2358,11 +2349,11 @@
    ],
    "linker_set_key" : "android::details::TVec4<float>::no_init",
    "name" : "android::details::TVec4<float>::no_init",
-   "referenced_type" : "type-309",
-   "self_type" : "type-309",
+   "referenced_type" : "type-304",
+   "self_type" : "type-304",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec4IfE7no_initE"
   },
   {
@@ -2377,11 +2368,11 @@
    ],
    "linker_set_key" : "android::half::Binary",
    "name" : "android::half::Binary",
-   "referenced_type" : "type-403",
-   "self_type" : "type-403",
+   "referenced_type" : "type-399",
+   "self_type" : "type-399",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android4half6BinaryE"
   },
   {
@@ -2407,7 +2398,7 @@
    "self_type" : "type-1321",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware21HidlReturnRestrictionE"
   },
   {
@@ -2429,7 +2420,7 @@
    "self_type" : "type-1129",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android8hardware8MQFlavorE"
   },
   {
@@ -2451,11 +2442,11 @@
    ],
    "linker_set_key" : "android::hardware::ProcessState::CallRestriction",
    "name" : "android::hardware::ProcessState::CallRestriction",
-   "referenced_type" : "type-276",
-   "self_type" : "type-276",
+   "referenced_type" : "type-272",
+   "self_type" : "type-272",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware12ProcessState15CallRestrictionE"
   },
   {
@@ -2509,7 +2500,7 @@
    "self_type" : "type-1308",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware6Status9ExceptionE"
   },
   {
@@ -2563,7 +2554,7 @@
    "self_type" : "type-1223",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentor20InstrumentationEventE"
   },
   {
@@ -2665,11 +2656,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_0::BufferUsage",
-   "referenced_type" : "type-150",
-   "self_type" : "type-150",
+   "referenced_type" : "type-153",
+   "self_type" : "type-153",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_011BufferUsageE"
   },
   {
@@ -2723,7 +2714,7 @@
    "self_type" : "type-1140",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09ColorModeE"
   },
   {
@@ -2765,7 +2756,7 @@
    "self_type" : "type-1141",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_014ColorTransformE"
   },
   {
@@ -3007,7 +2998,7 @@
    "self_type" : "type-1139",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09DataspaceE"
   },
   {
@@ -3033,7 +3024,7 @@
    "self_type" : "type-1143",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_03HdrE"
   },
   {
@@ -3127,7 +3118,7 @@
    "self_type" : "type-1137",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_011PixelFormatE"
   },
   {
@@ -3161,7 +3152,7 @@
    "self_type" : "type-1138",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09TransformE"
   },
   {
@@ -3271,11 +3262,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_1::BufferUsage",
-   "referenced_type" : "type-158",
-   "self_type" : "type-158",
+   "referenced_type" : "type-160",
+   "self_type" : "type-160",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_111BufferUsageE"
   },
   {
@@ -3341,7 +3332,7 @@
    "self_type" : "type-1170",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_19ColorModeE"
   },
   {
@@ -3599,7 +3590,7 @@
    "self_type" : "type-1169",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_19DataspaceE"
   },
   {
@@ -3721,7 +3712,7 @@
    "self_type" : "type-1168",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_111PixelFormatE"
   },
   {
@@ -3751,7 +3742,7 @@
    "self_type" : "type-1171",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_112RenderIntentE"
   },
   {
@@ -3865,11 +3856,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_2::BufferUsage",
-   "referenced_type" : "type-420",
-   "self_type" : "type-420",
+   "referenced_type" : "type-417",
+   "self_type" : "type-417",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_211BufferUsageE"
   },
   {
@@ -3939,7 +3930,7 @@
    "self_type" : "type-1192",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_29ColorModeE"
   },
   {
@@ -4213,7 +4204,7 @@
    "self_type" : "type-1191",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_29DataspaceE"
   },
   {
@@ -4243,7 +4234,7 @@
    "self_type" : "type-1190",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_23HdrE"
   },
   {
@@ -4369,7 +4360,7 @@
    "self_type" : "type-1194",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_211PixelFormatE"
   },
   {
@@ -4391,11 +4382,11 @@
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-164",
-   "self_type" : "type-164",
+   "referenced_type" : "type-167",
+   "self_type" : "type-167",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfo12ArchitectureE"
   },
   {
@@ -4433,11 +4424,11 @@
    ],
    "linker_set_key" : "android::ui::Transform::orientation_flags",
    "name" : "android::ui::Transform::orientation_flags",
-   "referenced_type" : "type-2439",
-   "self_type" : "type-2439",
+   "referenced_type" : "type-2441",
+   "self_type" : "type-2441",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android2ui9Transform17orientation_flagsE"
   },
   {
@@ -4467,11 +4458,11 @@
    ],
    "linker_set_key" : "android::ui::Transform::type_mask",
    "name" : "android::ui::Transform::type_mask",
-   "referenced_type" : "type-2440",
-   "self_type" : "type-2440",
+   "referenced_type" : "type-2442",
+   "self_type" : "type-2442",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android2ui9Transform9type_maskE"
   },
   {
@@ -4521,7 +4512,7 @@
    "self_type" : "type-1257",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_LogPriority"
   },
   {
@@ -4575,7 +4566,7 @@
    "self_type" : "type-1212",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_color_mode_t"
   },
   {
@@ -4601,7 +4592,7 @@
    "self_type" : "type-1217",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_color_mode_v1_1_t"
   },
   {
@@ -4643,7 +4634,7 @@
    "self_type" : "type-1213",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_color_transform_t"
   },
   {
@@ -4885,7 +4876,7 @@
    "self_type" : "type-1211",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_dataspace_t"
   },
   {
@@ -4915,7 +4906,7 @@
    "self_type" : "type-1216",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_dataspace_v1_1_t"
   },
   {
@@ -4945,7 +4936,7 @@
    "self_type" : "type-1221",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_dataspace_v1_2_t"
   },
   {
@@ -4987,7 +4978,7 @@
    "self_type" : "type-1225",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_flex_component"
   },
   {
@@ -5025,7 +5016,7 @@
    "self_type" : "type-1227",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_flex_format"
   },
   {
@@ -5051,7 +5042,7 @@
    "self_type" : "type-1214",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_hdr_t"
   },
   {
@@ -5069,7 +5060,7 @@
    "self_type" : "type-1220",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_hdr_v1_2_t"
   },
   {
@@ -5099,7 +5090,7 @@
    "self_type" : "type-1224",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTS25android_pixel_format_sw_t"
   },
   {
@@ -5193,7 +5184,7 @@
    "self_type" : "type-1209",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_pixel_format_t"
   },
   {
@@ -5235,7 +5226,7 @@
    "self_type" : "type-1215",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_pixel_format_v1_1_t"
   },
   {
@@ -5253,7 +5244,7 @@
    "self_type" : "type-1222",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_pixel_format_v1_2_t"
   },
   {
@@ -5283,7 +5274,7 @@
    "self_type" : "type-1219",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_render_intent_v1_1_t"
   },
   {
@@ -5317,7 +5308,7 @@
    "self_type" : "type-1210",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_transform_t"
   },
   {
@@ -5371,7 +5362,7 @@
    "self_type" : "type-1258",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "log_id"
   }
  ],
@@ -5384,18 +5375,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-272"
+     "referenced_type" : "type-268"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
-   "referenced_type" : "type-271",
+   "referenced_type" : "type-267",
    "return_type" : "type-6",
-   "self_type" : "type-271",
+   "self_type" : "type-267",
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
   {
@@ -5408,11 +5399,11 @@
      "referenced_type" : "type-604"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
    "referenced_type" : "type-606",
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "self_type" : "type-606",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -5426,26 +5417,26 @@
      "referenced_type" : "type-604"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-343"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
    "referenced_type" : "type-603",
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "self_type" : "type-603",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -5456,15 +5447,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "referenced_type" : "type-580",
-   "return_type" : "type-103",
-   "self_type" : "type-580",
+   "referenced_type" : "type-578",
+   "return_type" : "type-105",
+   "self_type" : "type-578",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5474,18 +5465,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "referenced_type" : "type-592",
-   "return_type" : "type-103",
-   "self_type" : "type-592",
+   "referenced_type" : "type-590",
+   "return_type" : "type-105",
+   "self_type" : "type-590",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5495,33 +5486,33 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "referenced_type" : "type-588",
-   "return_type" : "type-103",
-   "self_type" : "type-588",
+   "referenced_type" : "type-586",
+   "return_type" : "type-105",
+   "self_type" : "type-586",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5531,36 +5522,36 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-595",
-   "return_type" : "type-103",
-   "self_type" : "type-595",
+   "referenced_type" : "type-593",
+   "return_type" : "type-105",
+   "self_type" : "type-593",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5570,33 +5561,33 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     }
    ],
-   "referenced_type" : "type-584",
-   "return_type" : "type-103",
-   "self_type" : "type-584",
+   "referenced_type" : "type-582",
+   "return_type" : "type-105",
+   "self_type" : "type-582",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5606,36 +5597,93 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-590",
-   "return_type" : "type-103",
-   "self_type" : "type-590",
+   "referenced_type" : "type-588",
+   "return_type" : "type-105",
+   "self_type" : "type-588",
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "name" : "int (const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-579"
+    },
+    {
+     "referenced_type" : "type-145"
+    },
+    {
+     "referenced_type" : "type-124"
+    },
+    {
+     "referenced_type" : "type-124"
+    }
+   ],
+   "referenced_type" : "type-595",
+   "return_type" : "type-105",
+   "self_type" : "type-595",
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "name" : "int (const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-579"
+    },
+    {
+     "referenced_type" : "type-145"
+    },
+    {
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-105"
+    },
+    {
+     "referenced_type" : "type-105"
+    },
+    {
+     "referenced_type" : "type-125"
+    }
+   ],
+   "referenced_type" : "type-597",
+   "return_type" : "type-105",
+   "self_type" : "type-597",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5645,15 +5693,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-586",
-   "return_type" : "type-103",
-   "self_type" : "type-586",
+   "referenced_type" : "type-584",
+   "return_type" : "type-105",
+   "self_type" : "type-584",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5663,18 +5711,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-554"
+     "referenced_type" : "type-551"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
-     "referenced_type" : "type-556"
+     "referenced_type" : "type-553"
     }
    ],
-   "referenced_type" : "type-553",
-   "return_type" : "type-103",
-   "self_type" : "type-553",
+   "referenced_type" : "type-550",
+   "return_type" : "type-105",
+   "self_type" : "type-550",
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
   {
@@ -5684,12 +5732,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     }
    ],
-   "referenced_type" : "type-573",
-   "return_type" : "type-103",
-   "self_type" : "type-573",
+   "referenced_type" : "type-570",
+   "return_type" : "type-105",
+   "self_type" : "type-570",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5699,15 +5747,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "referenced_type" : "type-571",
-   "return_type" : "type-103",
-   "self_type" : "type-571",
+   "referenced_type" : "type-568",
+   "return_type" : "type-105",
+   "self_type" : "type-568",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5717,15 +5765,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-566",
-   "return_type" : "type-103",
-   "self_type" : "type-566",
+   "referenced_type" : "type-563",
+   "return_type" : "type-105",
+   "self_type" : "type-563",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5735,24 +5783,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-569",
-   "return_type" : "type-103",
-   "self_type" : "type-569",
+   "referenced_type" : "type-566",
+   "return_type" : "type-105",
+   "self_type" : "type-566",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5762,12 +5810,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-557"
+     "referenced_type" : "type-554"
     }
    ],
-   "referenced_type" : "type-561",
-   "return_type" : "type-103",
-   "self_type" : "type-561",
+   "referenced_type" : "type-558",
+   "return_type" : "type-105",
+   "self_type" : "type-558",
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
   {
@@ -5777,12 +5825,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
-   "referenced_type" : "type-249",
-   "return_type" : "type-103",
-   "self_type" : "type-249",
+   "referenced_type" : "type-251",
+   "return_type" : "type-105",
+   "self_type" : "type-251",
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
   {
@@ -5795,14 +5843,14 @@
      "referenced_type" : "type-604"
     },
     {
-     "referenced_type" : "type-576"
+     "referenced_type" : "type-573"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "referenced_type" : "type-608",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "self_type" : "type-608",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -5813,27 +5861,27 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-222"
-    },
-    {
-     "referenced_type" : "type-223"
-    },
-    {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-224"
     },
     {
      "referenced_type" : "type-225"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-227"
+    },
+    {
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-229"
     }
    ],
-   "referenced_type" : "type-221",
-   "return_type" : "type-151",
-   "self_type" : "type-221",
+   "referenced_type" : "type-223",
+   "return_type" : "type-154",
+   "self_type" : "type-223",
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
   {
@@ -5843,12 +5891,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-522"
+     "referenced_type" : "type-520"
     }
    ],
-   "referenced_type" : "type-521",
-   "return_type" : "type-151",
-   "self_type" : "type-521",
+   "referenced_type" : "type-519",
+   "return_type" : "type-154",
+   "self_type" : "type-519",
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
   {
@@ -5858,18 +5906,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     },
     {
-     "referenced_type" : "type-576"
+     "referenced_type" : "type-573"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-575",
-   "return_type" : "type-151",
-   "self_type" : "type-575",
+   "referenced_type" : "type-572",
+   "return_type" : "type-154",
+   "self_type" : "type-572",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   }
  ],
@@ -5884,7 +5932,7 @@
      "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-1433",
+   "return_type" : "type-1436",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5896,7 +5944,7 @@
      "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-1434",
+   "return_type" : "type-1437",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5908,7 +5956,7 @@
      "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-1435",
+   "return_type" : "type-1438",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5920,7 +5968,7 @@
      "referenced_type" : "type-1192"
     }
    ],
-   "return_type" : "type-1436",
+   "return_type" : "type-1439",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5932,7 +5980,7 @@
      "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-1437",
+   "return_type" : "type-1440",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5941,10 +5989,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-1438",
+   "return_type" : "type-1441",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5956,7 +6004,7 @@
      "referenced_type" : "type-1171"
     }
    ],
-   "return_type" : "type-1439",
+   "return_type" : "type-1442",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5968,7 +6016,7 @@
      "referenced_type" : "type-1213"
     }
    ],
-   "return_type" : "type-1440",
+   "return_type" : "type-1443",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5980,7 +6028,7 @@
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-1441",
+   "return_type" : "type-1444",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -6067,7 +6115,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1042"
@@ -6076,7 +6124,7 @@
      "referenced_type" : "type-1042"
     }
    ],
-   "return_type" : "type-1442",
+   "return_type" : "type-1445",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6086,10 +6134,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6098,14 +6146,14 @@
      "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-1030"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1443"
+     "referenced_type" : "type-1446"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6115,10 +6163,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6128,18 +6176,18 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1444"
+     "referenced_type" : "type-1447"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1445"
+     "referenced_type" : "type-1448"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1446"
+     "referenced_type" : "type-1449"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6149,10 +6197,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6165,10 +6213,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1447"
+     "referenced_type" : "type-1450"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6178,23 +6226,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-1030"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1448"
+     "referenced_type" : "type-1451"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6204,28 +6252,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1449"
+     "referenced_type" : "type-1452"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1450"
+     "referenced_type" : "type-1453"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1451"
+     "referenced_type" : "type-1454"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6235,23 +6283,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
      "referenced_type" : "type-10"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1452"
+     "referenced_type" : "type-1455"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6261,10 +6309,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6273,14 +6321,14 @@
      "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-1030"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1453"
+     "referenced_type" : "type-1456"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6290,10 +6338,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6303,18 +6351,18 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1454"
+     "referenced_type" : "type-1457"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1455"
+     "referenced_type" : "type-1458"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1456"
+     "referenced_type" : "type-1459"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6324,10 +6372,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6340,10 +6388,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1457"
+     "referenced_type" : "type-1460"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6353,23 +6401,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-1030"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1458"
+     "referenced_type" : "type-1461"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6379,28 +6427,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1459"
+     "referenced_type" : "type-1462"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1460"
+     "referenced_type" : "type-1463"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1464"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6410,23 +6458,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
      "referenced_type" : "type-10"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1462"
+     "referenced_type" : "type-1465"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6436,16 +6484,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1427"
+     "referenced_type" : "type-1431"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
   {
@@ -6454,10 +6502,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/PixelFormat.h"
   },
   {
@@ -6467,10 +6515,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1400"
+     "referenced_type" : "type-1404"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -6480,13 +6528,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1400"
+     "referenced_type" : "type-1404"
     },
     {
-     "referenced_type" : "type-1401"
+     "referenced_type" : "type-1405"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -6496,25 +6544,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6525,10 +6573,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6538,13 +6586,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6555,28 +6603,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-1463"
+     "referenced_type" : "type-1466"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6587,34 +6635,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-629"
+     "referenced_type" : "type-630"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6624,19 +6672,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6646,22 +6694,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6671,16 +6719,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-1464"
+     "referenced_type" : "type-1467"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6690,22 +6738,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "return_type" : "type-6",
@@ -6718,10 +6766,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-621",
+   "return_type" : "type-622",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6730,10 +6778,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-621"
+     "referenced_type" : "type-622"
     }
    ],
-   "return_type" : "type-680",
+   "return_type" : "type-679",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6745,13 +6793,13 @@
      "referenced_type" : "type-628"
     }
    ],
-   "return_type" : "type-623",
+   "return_type" : "type-624",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
    "function_name" : "android::GraphicBuffer::dumpAllocationsToSystemLog",
    "linker_set_key" : "_ZN7android13GraphicBuffer26dumpAllocationsToSystemLogEv",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6763,7 +6811,7 @@
      "referenced_type" : "type-636"
     }
    ],
-   "return_type" : "type-679",
+   "return_type" : "type-678",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6773,24 +6821,24 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6800,27 +6848,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6830,10 +6878,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6843,27 +6891,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6873,30 +6921,30 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6906,33 +6954,33 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6942,16 +6990,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6961,19 +7009,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6983,7 +7031,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
      "referenced_type" : "type-1251"
@@ -6998,7 +7046,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7008,34 +7056,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-629"
+     "referenced_type" : "type-630"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7045,26 +7093,26 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1465"
+     "referenced_type" : "type-1468"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7074,25 +7122,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1132"
@@ -7101,7 +7149,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7111,29 +7159,29 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1466"
+     "referenced_type" : "type-1469"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7143,10 +7191,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7156,34 +7204,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-629"
+     "referenced_type" : "type-630"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7193,26 +7241,26 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1467"
+     "referenced_type" : "type-1470"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7222,25 +7270,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1132"
@@ -7249,7 +7297,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7259,29 +7307,29 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1468"
+     "referenced_type" : "type-1471"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7291,10 +7339,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7305,10 +7353,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7319,10 +7367,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7333,10 +7381,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7345,16 +7393,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/PixelFormat.h"
   },
   {
    "function_name" : "android::Gralloc2Mapper::preload",
    "linker_set_key" : "_ZN7android14Gralloc2Mapper7preloadEv",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7364,10 +7412,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-343"
+     "referenced_type" : "type-340"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7377,10 +7425,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-343"
+     "referenced_type" : "type-340"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7396,10 +7444,10 @@
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7415,7 +7463,7 @@
      "referenced_type" : "type-970"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7431,7 +7479,7 @@
      "referenced_type" : "type-970"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7444,7 +7492,7 @@
      "referenced_type" : "type-966"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7457,7 +7505,7 @@
      "referenced_type" : "type-966"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7483,13 +7531,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-360"
+     "referenced_type" : "type-357"
     },
     {
-     "referenced_type" : "type-354"
+     "referenced_type" : "type-351"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7499,13 +7547,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-360"
+     "referenced_type" : "type-357"
     },
     {
-     "referenced_type" : "type-354"
+     "referenced_type" : "type-351"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7524,7 +7572,7 @@
      "referenced_type" : "type-1042"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -7543,7 +7591,7 @@
      "referenced_type" : "type-1042"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -7553,16 +7601,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1405"
+     "referenced_type" : "type-1409"
     },
     {
      "referenced_type" : "type-1361"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -7573,10 +7621,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1405"
+     "referenced_type" : "type-1409"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -7586,13 +7634,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1405"
+     "referenced_type" : "type-1409"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-1469",
+   "return_type" : "type-1472",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -7602,19 +7650,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
    "function_name" : "android::GraphicBufferMapper::preloadHal",
    "linker_set_key" : "_ZN7android19GraphicBufferMapper10preloadHalEv",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7624,28 +7672,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-350"
+     "referenced_type" : "type-347"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7655,16 +7703,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7674,34 +7722,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-343"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7711,25 +7759,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7739,19 +7787,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7761,30 +7809,30 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7794,13 +7842,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7810,33 +7858,33 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7846,36 +7894,36 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7885,22 +7933,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7911,10 +7959,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7925,10 +7973,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7937,16 +7985,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2448"
+     "referenced_type" : "type-2450"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/UiConfig.h"
   },
   {
    "function_name" : "android::GraphicBufferAllocator::dumpToSystemLog",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocator15dumpToSystemLogEv",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -7956,13 +8004,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -7972,93 +8020,93 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-126"
+    },
+    {
+     "referenced_type" : "type-343"
     },
     {
      "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-122"
-    },
-    {
-     "referenced_type" : "type-124"
-    },
-    {
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorC1Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorC2Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::~GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorD1Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::~GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorD2Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -8071,7 +8119,7 @@
      "referenced_type" : "type-1359"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -8084,7 +8132,7 @@
      "referenced_type" : "type-1359"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -8094,7 +8142,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     },
     {
      "referenced_type" : "type-10"
@@ -8103,7 +8151,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8113,7 +8161,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     },
     {
      "referenced_type" : "type-10"
@@ -8128,7 +8176,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8138,10 +8186,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-10"
@@ -8150,7 +8198,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8160,10 +8208,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8199,13 +8247,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     },
     {
-     "referenced_type" : "type-2438"
+     "referenced_type" : "type-2440"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8215,13 +8263,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8231,10 +8279,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8244,13 +8292,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     },
     {
-     "referenced_type" : "type-2438"
+     "referenced_type" : "type-2440"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8260,13 +8308,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8276,10 +8324,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8289,10 +8337,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8302,10 +8350,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8315,13 +8363,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     },
     {
-     "referenced_type" : "type-2438"
+     "referenced_type" : "type-2440"
     }
    ],
-   "return_type" : "type-2442",
+   "return_type" : "type-2444",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8334,7 +8382,7 @@
      "referenced_type" : "type-1296"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
   },
   {
@@ -8347,16 +8395,16 @@
      "referenced_type" : "type-1296"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1300",
@@ -8372,10 +8420,10 @@
      "referenced_type" : "type-1296"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1300",
@@ -8391,10 +8439,10 @@
      "referenced_type" : "type-1296"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1300",
@@ -8410,10 +8458,10 @@
      "referenced_type" : "type-1358"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8426,10 +8474,10 @@
      "referenced_type" : "type-1358"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8438,7 +8486,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "referenced_type" : "type-1361"
@@ -8456,7 +8504,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-889"
+     "referenced_type" : "type-879"
     },
     {
      "referenced_type" : "type-1361"
@@ -8490,7 +8538,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8506,7 +8554,7 @@
      "referenced_type" : "type-1341"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8519,10 +8567,10 @@
      "referenced_type" : "type-1358"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8538,7 +8586,7 @@
      "referenced_type" : "type-1341"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8551,10 +8599,10 @@
      "referenced_type" : "type-1358"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8564,13 +8612,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8580,13 +8628,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8596,19 +8644,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8619,16 +8667,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8639,22 +8687,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8665,16 +8713,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8684,16 +8732,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8703,10 +8751,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8716,22 +8764,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8741,19 +8789,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8763,25 +8811,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8791,19 +8839,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8813,25 +8861,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8840,10 +8888,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8853,13 +8901,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8869,16 +8917,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8888,16 +8936,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8907,10 +8955,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8920,13 +8968,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8936,13 +8984,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8952,19 +9000,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8974,13 +9022,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8990,13 +9038,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9006,19 +9054,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9028,13 +9076,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9044,13 +9092,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9060,19 +9108,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9082,10 +9130,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "default_arg" : true,
@@ -9102,7 +9150,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-10"
@@ -9111,7 +9159,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9121,19 +9169,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9143,16 +9191,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9162,16 +9210,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9181,13 +9229,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9197,13 +9245,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9213,10 +9261,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9226,13 +9274,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9242,13 +9290,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9258,10 +9306,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9271,10 +9319,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9284,10 +9332,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9297,13 +9345,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9313,10 +9361,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     }
    ],
-   "return_type" : "type-284",
+   "return_type" : "type-12",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9326,13 +9374,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9342,13 +9390,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-1394"
+     "referenced_type" : "type-1398"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9358,7 +9406,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
      "referenced_type" : "type-1251"
@@ -9373,7 +9421,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9383,13 +9431,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9399,13 +9447,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9415,13 +9463,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9431,13 +9479,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9447,13 +9495,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-1410"
+     "referenced_type" : "type-1415"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9463,13 +9511,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9480,7 +9528,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
      "referenced_type" : "type-1361"
@@ -9489,7 +9537,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9499,13 +9547,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9515,13 +9563,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-1410"
+     "referenced_type" : "type-1415"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9531,13 +9579,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9548,7 +9596,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
      "referenced_type" : "type-1361"
@@ -9557,7 +9605,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9567,25 +9615,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
    "function_name" : "android::Singleton<android::GraphicBufferMapper>::getInstance",
    "linker_set_key" : "_ZN7android9SingletonINS_19GraphicBufferMapperEE11getInstanceEv",
-   "return_type" : "type-526",
+   "return_type" : "type-524",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "function_name" : "android::Singleton<android::GraphicBufferAllocator>::getInstance",
    "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11getInstanceEv",
-   "return_type" : "type-544",
+   "return_type" : "type-541",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
@@ -9595,7 +9643,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1429"
+     "referenced_type" : "type-1433"
     }
    ],
    "return_type" : "type-6",
@@ -9608,10 +9656,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1429"
+     "referenced_type" : "type-1433"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
   {
@@ -9621,16 +9669,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1429"
+     "referenced_type" : "type-1433"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
   {
@@ -9650,7 +9698,7 @@
      "referenced_type" : "type-1119"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9664,13 +9712,13 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9684,13 +9732,13 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9704,16 +9752,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9727,16 +9775,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9750,16 +9798,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9773,16 +9821,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9792,10 +9840,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9805,28 +9853,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-350"
+     "referenced_type" : "type-347"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9836,7 +9884,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
    "return_type" : "type-636",
@@ -9849,10 +9897,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9862,7 +9910,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
    "return_type" : "type-628",
@@ -9875,7 +9923,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     },
     {
      "referenced_type" : "type-1249"
@@ -9890,7 +9938,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9900,10 +9948,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9913,13 +9961,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -9929,28 +9977,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-350"
+     "referenced_type" : "type-347"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -9960,16 +10008,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
      "referenced_type" : "type-1122"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-343"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -9979,16 +10027,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -9998,19 +10046,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10020,31 +10068,31 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10055,13 +10103,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-351"
+     "referenced_type" : "type-348"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10071,25 +10119,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10099,31 +10147,31 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10133,13 +10181,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10149,7 +10197,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     }
    ],
    "return_type" : "type-6",
@@ -10162,10 +10210,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-973"
+     "referenced_type" : "type-974"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -10175,16 +10223,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-973"
+     "referenced_type" : "type-974"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -10194,10 +10242,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-362"
+     "referenced_type" : "type-359"
     }
    ],
-   "return_type" : "type-1566",
+   "return_type" : "type-1569",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10207,34 +10255,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-362"
+     "referenced_type" : "type-359"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-126"
+    },
+    {
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-123"
-    },
-    {
-     "referenced_type" : "type-122"
-    },
-    {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-343"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10244,7 +10292,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-362"
+     "referenced_type" : "type-359"
     }
    ],
    "return_type" : "type-6",
@@ -10257,10 +10305,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-721"
+     "referenced_type" : "type-722"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -10270,13 +10318,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-721"
+     "referenced_type" : "type-722"
     },
     {
      "referenced_type" : "type-723"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -10286,13 +10334,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1241",
@@ -10305,7 +10353,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
    "return_type" : "type-6",
@@ -10318,10 +10366,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10331,7 +10379,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
    "return_type" : "type-10",
@@ -10344,7 +10392,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
    "return_type" : "type-10",
@@ -10357,7 +10405,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
    "return_type" : "type-10",
@@ -10370,7 +10418,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
    "return_type" : "type-10",
@@ -10383,13 +10431,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10399,16 +10447,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
-    },
-    {
      "referenced_type" : "type-2443"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-2445"
+    },
+    {
+     "referenced_type" : "type-283"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10419,10 +10467,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10432,10 +10480,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10445,10 +10493,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
-   "return_type" : "type-2434",
+   "return_type" : "type-2436",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10458,10 +10506,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
-   "return_type" : "type-2427",
+   "return_type" : "type-2429",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10471,7 +10519,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
      "referenced_type" : "type-1246"
@@ -10491,13 +10539,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10507,13 +10555,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
      "referenced_type" : "type-1050"
     }
    ],
-   "return_type" : "type-22",
+   "return_type" : "type-23",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10523,13 +10571,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
      "referenced_type" : "type-1054"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-18",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10539,7 +10587,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
      "referenced_type" : "type-1280"
@@ -10555,16 +10603,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-22",
+   "return_type" : "type-23",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10574,10 +10622,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "return_type" : "type-1054",
@@ -10590,13 +10638,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
-     "referenced_type" : "type-2438"
+     "referenced_type" : "type-2440"
     }
    ],
-   "return_type" : "type-2434",
+   "return_type" : "type-2436",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10644,13 +10692,13 @@
      "referenced_type" : "type-1299"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1241",
@@ -10714,7 +10762,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10727,7 +10775,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-284",
+   "return_type" : "type-12",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10740,7 +10788,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10753,7 +10801,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10778,7 +10826,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10788,13 +10836,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10804,13 +10852,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10820,19 +10868,19 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2396"
+    },
+    {
      "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10842,10 +10890,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10855,10 +10903,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
    "return_type" : "type-6",
@@ -10871,7 +10919,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     }
    ],
    "return_type" : "type-1299",
@@ -10884,17 +10932,17 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10904,20 +10952,20 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10927,7 +10975,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     }
    ],
    "return_type" : "type-1299",
@@ -10940,13 +10988,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10956,13 +11004,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10972,19 +11020,19 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2396"
+    },
+    {
      "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10994,16 +11042,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11013,7 +11061,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
      "referenced_type" : "type-1284"
@@ -11029,13 +11077,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-6",
@@ -11048,10 +11096,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     }
    ],
    "return_type" : "type-1299",
@@ -11064,13 +11112,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11080,13 +11128,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11096,19 +11144,19 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2396"
+    },
+    {
      "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11118,13 +11166,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11134,13 +11182,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11150,19 +11198,19 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2396"
+    },
+    {
      "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11173,16 +11221,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11193,22 +11241,22 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2396"
+    },
+    {
      "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11219,16 +11267,16 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2396"
+    },
+    {
      "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2392"
-    },
-    {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11238,16 +11286,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11258,16 +11306,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2387"
+     "referenced_type" : "type-2389"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11278,16 +11326,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2387"
+     "referenced_type" : "type-2389"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11298,19 +11346,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2387"
+     "referenced_type" : "type-2389"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11321,19 +11369,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2387"
+     "referenced_type" : "type-2389"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11344,19 +11392,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2387"
+     "referenced_type" : "type-2389"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11367,19 +11415,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2387"
+     "referenced_type" : "type-2389"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11389,10 +11437,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1396"
+     "referenced_type" : "type-1400"
     }
    ],
-   "return_type" : "type-1383",
+   "return_type" : "type-1387",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11402,10 +11450,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1396"
+     "referenced_type" : "type-1400"
     }
    ],
-   "return_type" : "type-284",
+   "return_type" : "type-12",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11415,7 +11463,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1396"
+     "referenced_type" : "type-1400"
     }
    ],
    "return_type" : "type-6",
@@ -11428,10 +11476,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1394"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11441,10 +11489,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1394"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11454,7 +11502,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1394"
     },
     {
      "referenced_type" : "type-1249"
@@ -11469,24 +11517,24 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   }
  ],
  "global_vars" :
  [
   {
-   "access" : "private",
+   "access" : "protected",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocator10sAllocListE",
    "name" : "android::GraphicBufferAllocator::sAllocList",
-   "referenced_type" : "type-1570",
+   "referenced_type" : "type-1573",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocator5sLockE",
    "name" : "android::GraphicBufferAllocator::sLock",
-   "referenced_type" : "type-252",
+   "referenced_type" : "type-280",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -11522,41 +11570,41 @@
   {
    "linker_set_key" : "_ZN7android6Region14INVALID_REGIONE",
    "name" : "android::Region::INVALID_REGION",
-   "referenced_type" : "type-2388",
+   "referenced_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
    "linker_set_key" : "_ZN7android9FenceTime8NO_FENCEE",
    "name" : "android::FenceTime::NO_FENCE",
-   "referenced_type" : "type-1391",
+   "referenced_type" : "type-1395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_19GraphicBufferMapperEE5sLockE",
    "name" : "android::Singleton<android::GraphicBufferMapper>::sLock",
-   "referenced_type" : "type-252",
+   "referenced_type" : "type-280",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_19GraphicBufferMapperEE9sInstanceE",
    "name" : "android::Singleton<android::GraphicBufferMapper>::sInstance",
-   "referenced_type" : "type-539",
+   "referenced_type" : "type-537",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE5sLockE",
    "name" : "android::Singleton<android::GraphicBufferAllocator>::sLock",
-   "referenced_type" : "type-252",
+   "referenced_type" : "type-280",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE9sInstanceE",
    "name" : "android::Singleton<android::GraphicBufferAllocator>::sInstance",
-   "referenced_type" : "type-545",
+   "referenced_type" : "type-542",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   }
  ],
@@ -11566,8 +11614,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot &",
    "name" : "android::FenceTime::Snapshot &",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1387",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1392",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -11575,8 +11623,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot::State &",
    "name" : "android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1408",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1412",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -11584,8 +11632,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferAllocator &",
    "name" : "android::GraphicBufferAllocator &",
-   "referenced_type" : "type-542",
-   "self_type" : "type-544",
+   "referenced_type" : "type-539",
+   "self_type" : "type-541",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -11593,8 +11641,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-527",
-   "self_type" : "type-526",
+   "referenced_type" : "type-525",
+   "self_type" : "type-524",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -11611,8 +11659,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex &",
    "name" : "android::Mutex &",
-   "referenced_type" : "type-252",
-   "self_type" : "type-256",
+   "referenced_type" : "type-280",
+   "self_type" : "type-1379",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -11629,8 +11677,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock &",
    "name" : "android::RWLock &",
-   "referenced_type" : "type-262",
-   "self_type" : "type-266",
+   "referenced_type" : "type-258",
+   "self_type" : "type-262",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -11647,8 +11695,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Region &",
    "name" : "android::Region &",
-   "referenced_type" : "type-2389",
-   "self_type" : "type-2393",
+   "referenced_type" : "type-2391",
+   "self_type" : "type-2395",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -11656,8 +11704,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
-   "referenced_type" : "type-179",
-   "self_type" : "type-188",
+   "referenced_type" : "type-182",
+   "self_type" : "type-190",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -11665,8 +11713,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
-   "referenced_type" : "type-285",
-   "self_type" : "type-890",
+   "referenced_type" : "type-282",
+   "self_type" : "type-888",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -11674,8 +11722,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<android::Rect> &",
    "name" : "android::Vector<android::Rect> &",
-   "referenced_type" : "type-2382",
-   "self_type" : "type-2386",
+   "referenced_type" : "type-2384",
+   "self_type" : "type-2388",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -11692,8 +11740,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TMat44<float> &",
    "name" : "android::details::TMat44<float> &",
-   "referenced_type" : "type-2427",
-   "self_type" : "type-2433",
+   "referenced_type" : "type-2429",
+   "self_type" : "type-2435",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -11701,8 +11749,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TQuaternion<double> &",
    "name" : "android::details::TQuaternion<double> &",
-   "referenced_type" : "type-331",
-   "self_type" : "type-406",
+   "referenced_type" : "type-328",
+   "self_type" : "type-403",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -11710,8 +11758,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TQuaternion<float> &",
    "name" : "android::details::TQuaternion<float> &",
-   "referenced_type" : "type-410",
-   "self_type" : "type-438",
+   "referenced_type" : "type-407",
+   "self_type" : "type-435",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -11728,7 +11776,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec2<double> &",
    "name" : "android::details::TVec2<double> &",
-   "referenced_type" : "type-55",
+   "referenced_type" : "type-57",
    "self_type" : "type-1081",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -11737,7 +11785,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec2<float> &",
    "name" : "android::details::TVec2<float> &",
-   "referenced_type" : "type-22",
+   "referenced_type" : "type-23",
    "self_type" : "type-1048",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -11746,7 +11794,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<double> &",
    "name" : "android::details::TVec3<double> &",
-   "referenced_type" : "type-66",
+   "referenced_type" : "type-68",
    "self_type" : "type-1390",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
@@ -11755,7 +11803,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<float> &",
    "name" : "android::details::TVec3<float> &",
-   "referenced_type" : "type-17",
+   "referenced_type" : "type-18",
    "self_type" : "type-1052",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -11764,8 +11812,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<double> &",
    "name" : "android::details::TVec4<double> &",
-   "referenced_type" : "type-50",
-   "self_type" : "type-185",
+   "referenced_type" : "type-52",
+   "self_type" : "type-181",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -11773,8 +11821,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<float> &",
    "name" : "android::details::TVec4<float> &",
-   "referenced_type" : "type-200",
-   "self_type" : "type-330",
+   "referenced_type" : "type-192",
+   "self_type" : "type-327",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -11782,8 +11830,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &",
-   "referenced_type" : "type-99",
-   "self_type" : "type-108",
+   "referenced_type" : "type-101",
+   "self_type" : "type-110",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11791,8 +11839,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &",
-   "referenced_type" : "type-393",
-   "self_type" : "type-400",
+   "referenced_type" : "type-392",
+   "self_type" : "type-397",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11800,8 +11848,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &",
-   "referenced_type" : "type-111",
-   "self_type" : "type-114",
+   "referenced_type" : "type-113",
+   "self_type" : "type-116",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11818,7 +11866,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status &",
    "name" : "android::hardware::Status &",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1313",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -11827,8 +11875,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1658",
-   "self_type" : "type-1657",
+   "referenced_type" : "type-1662",
+   "self_type" : "type-1661",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11836,8 +11884,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1872",
-   "self_type" : "type-1871",
+   "referenced_type" : "type-1873",
+   "self_type" : "type-1872",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11845,8 +11893,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1948",
-   "self_type" : "type-1947",
+   "referenced_type" : "type-1950",
+   "self_type" : "type-1949",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11854,8 +11902,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-230",
-   "self_type" : "type-229",
+   "referenced_type" : "type-232",
+   "self_type" : "type-231",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11863,8 +11911,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-431",
-   "self_type" : "type-430",
+   "referenced_type" : "type-428",
+   "self_type" : "type-427",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11872,8 +11920,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int> &",
    "name" : "android::hardware::details::hidl_pointer<unsigned int> &",
-   "referenced_type" : "type-120",
-   "self_type" : "type-178",
+   "referenced_type" : "type-122",
+   "self_type" : "type-180",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11890,8 +11938,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned int> &",
    "name" : "android::hardware::hidl_vec<unsigned int> &",
-   "referenced_type" : "type-128",
-   "self_type" : "type-131",
+   "referenced_type" : "type-131",
+   "self_type" : "type-133",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11909,7 +11957,7 @@
    "linker_set_key" : "android::sp<android::Fence> &",
    "name" : "android::sp<android::Fence> &",
    "referenced_type" : "type-1357",
-   "self_type" : "type-1411",
+   "self_type" : "type-1416",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11917,8 +11965,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &",
-   "referenced_type" : "type-355",
-   "self_type" : "type-377",
+   "referenced_type" : "type-352",
+   "self_type" : "type-374",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11926,8 +11974,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &",
-   "referenced_type" : "type-484",
-   "self_type" : "type-489",
+   "referenced_type" : "type-481",
+   "self_type" : "type-487",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11935,8 +11983,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &",
-   "referenced_type" : "type-338",
-   "self_type" : "type-385",
+   "referenced_type" : "type-335",
+   "self_type" : "type-382",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11944,8 +11992,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
-   "referenced_type" : "type-86",
-   "self_type" : "type-93",
+   "referenced_type" : "type-88",
+   "self_type" : "type-95",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11953,8 +12001,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &",
-   "referenced_type" : "type-497",
-   "self_type" : "type-503",
+   "referenced_type" : "type-494",
+   "self_type" : "type-500",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11962,8 +12010,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ui::Transform &",
    "name" : "android::ui::Transform &",
-   "referenced_type" : "type-2434",
-   "self_type" : "type-2442",
+   "referenced_type" : "type-2436",
+   "self_type" : "type-2444",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -11986,50 +12034,50 @@
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-1771",
-   "self_type" : "type-1773",
+   "referenced_type" : "type-1772",
+   "self_type" : "type-1774",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-2133",
-   "self_type" : "type-2165",
+   "referenced_type" : "type-2132",
+   "self_type" : "type-2167",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-2406",
-   "self_type" : "type-2408",
+   "referenced_type" : "type-2408",
+   "self_type" : "type-2410",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-1762",
-   "self_type" : "type-1764",
+   "referenced_type" : "type-1763",
+   "self_type" : "type-1765",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-2046",
-   "self_type" : "type-2056",
+   "referenced_type" : "type-2044",
+   "self_type" : "type-2054",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-2424",
-   "self_type" : "type-2426",
+   "referenced_type" : "type-2426",
+   "self_type" : "type-2428",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-961",
-   "self_type" : "type-974",
+   "referenced_type" : "type-958",
+   "self_type" : "type-972",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
@@ -12045,7 +12093,7 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ColorSpace::TransferParameters &",
    "name" : "const android::ColorSpace::TransferParameters &",
-   "referenced_type" : "type-1033",
+   "referenced_type" : "type-1030",
    "self_type" : "type-1041",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
@@ -12054,8 +12102,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot &",
    "name" : "const android::FenceTime::Snapshot &",
-   "referenced_type" : "type-1388",
-   "self_type" : "type-1394",
+   "referenced_type" : "type-1393",
+   "self_type" : "type-1398",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -12063,8 +12111,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-1406",
-   "self_type" : "type-1407",
+   "referenced_type" : "type-1410",
+   "self_type" : "type-1411",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -12081,8 +12129,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Gralloc2Mapper &",
    "name" : "const android::Gralloc2Mapper &",
-   "referenced_type" : "type-344",
-   "self_type" : "type-354",
+   "referenced_type" : "type-341",
+   "self_type" : "type-351",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -12090,8 +12138,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-2059",
-   "self_type" : "type-2058",
+   "referenced_type" : "type-2061",
+   "self_type" : "type-2060",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12099,8 +12147,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-2225",
-   "self_type" : "type-2224",
+   "referenced_type" : "type-2228",
+   "self_type" : "type-2227",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12108,8 +12156,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-2229",
-   "self_type" : "type-2228",
+   "referenced_type" : "type-2231",
+   "self_type" : "type-2230",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12126,8 +12174,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-802",
-   "self_type" : "type-801",
+   "referenced_type" : "type-803",
+   "self_type" : "type-802",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12135,8 +12183,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-827",
-   "self_type" : "type-826",
+   "referenced_type" : "type-828",
+   "self_type" : "type-827",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12145,7 +12193,7 @@
    "linker_set_key" : "const android::GraphicBufferAllocator::alloc_rec_t &",
    "name" : "const android::GraphicBufferAllocator::alloc_rec_t &",
    "referenced_type" : "type-706",
-   "self_type" : "type-707",
+   "self_type" : "type-708",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12153,8 +12201,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBufferMapper &",
    "name" : "const android::GraphicBufferMapper &",
-   "referenced_type" : "type-614",
-   "self_type" : "type-630",
+   "referenced_type" : "type-615",
+   "self_type" : "type-631",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -12180,8 +12228,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Region &",
    "name" : "const android::Region &",
-   "referenced_type" : "type-2388",
-   "self_type" : "type-2392",
+   "referenced_type" : "type-2390",
+   "self_type" : "type-2394",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -12189,8 +12237,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-184",
-   "self_type" : "type-187",
+   "referenced_type" : "type-187",
+   "self_type" : "type-189",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -12198,8 +12246,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 &",
    "name" : "const android::String8 &",
-   "referenced_type" : "type-873",
-   "self_type" : "type-889",
+   "referenced_type" : "type-863",
+   "self_type" : "type-879",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -12207,8 +12255,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::Rect> &",
    "name" : "const android::Vector<android::Rect> &",
-   "referenced_type" : "type-2384",
-   "self_type" : "type-2385",
+   "referenced_type" : "type-2386",
+   "self_type" : "type-2387",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -12216,8 +12264,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TMat33<float> &",
    "name" : "const android::details::TMat33<float> &",
-   "referenced_type" : "type-925",
-   "self_type" : "type-934",
+   "referenced_type" : "type-919",
+   "self_type" : "type-926",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -12225,8 +12273,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TMat44<float> &",
    "name" : "const android::details::TMat44<float> &",
-   "referenced_type" : "type-2431",
-   "self_type" : "type-2432",
+   "referenced_type" : "type-2433",
+   "self_type" : "type-2434",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -12234,8 +12282,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TQuaternion<double> &",
    "name" : "const android::details::TQuaternion<double> &",
-   "referenced_type" : "type-404",
-   "self_type" : "type-405",
+   "referenced_type" : "type-401",
+   "self_type" : "type-402",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -12243,8 +12291,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TQuaternion<float> &",
    "name" : "const android::details::TQuaternion<float> &",
-   "referenced_type" : "type-432",
-   "self_type" : "type-433",
+   "referenced_type" : "type-429",
+   "self_type" : "type-430",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -12297,8 +12345,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TVec4<double> &",
    "name" : "const android::details::TVec4<double> &",
-   "referenced_type" : "type-166",
-   "self_type" : "type-177",
+   "referenced_type" : "type-164",
+   "self_type" : "type-171",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -12306,8 +12354,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TVec4<float> &",
    "name" : "const android::details::TVec4<float> &",
-   "referenced_type" : "type-325",
-   "self_type" : "type-326",
+   "referenced_type" : "type-322",
+   "self_type" : "type-323",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -12315,8 +12363,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-231",
-   "self_type" : "type-232",
+   "referenced_type" : "type-233",
+   "self_type" : "type-234",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -12378,8 +12426,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned int> &",
    "name" : "const android::hardware::hidl_vec<unsigned int> &",
-   "referenced_type" : "type-132",
-   "self_type" : "type-133",
+   "referenced_type" : "type-134",
+   "self_type" : "type-135",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12397,7 +12445,7 @@
    "linker_set_key" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> &",
    "name" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> &",
    "referenced_type" : "type-693",
-   "self_type" : "type-695",
+   "self_type" : "type-698",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12414,8 +12462,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
    "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-273",
-   "self_type" : "type-272",
+   "referenced_type" : "type-269",
+   "self_type" : "type-268",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -12423,8 +12471,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
-   "referenced_type" : "type-91",
-   "self_type" : "type-92",
+   "referenced_type" : "type-93",
+   "self_type" : "type-94",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12450,8 +12498,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ui::Transform &",
    "name" : "const android::ui::Transform &",
-   "referenced_type" : "type-2437",
-   "self_type" : "type-2438",
+   "referenced_type" : "type-2439",
+   "self_type" : "type-2440",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -12459,7 +12507,7 @@
    "alignment" : 4,
    "linker_set_key" : "const bool &",
    "name" : "const bool &",
-   "referenced_type" : "type-370",
+   "referenced_type" : "type-367",
    "self_type" : "type-1276",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -12468,7 +12516,7 @@
    "alignment" : 4,
    "linker_set_key" : "const double &",
    "name" : "const double &",
-   "referenced_type" : "type-853",
+   "referenced_type" : "type-850",
    "self_type" : "type-859",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -12477,7 +12525,7 @@
    "alignment" : 4,
    "linker_set_key" : "const float &",
    "name" : "const float &",
-   "referenced_type" : "type-563",
+   "referenced_type" : "type-560",
    "self_type" : "type-1218",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -12492,30 +12540,30 @@
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-1774",
-   "self_type" : "type-1776",
+   "referenced_type" : "type-1775",
+   "self_type" : "type-1777",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-2209",
+   "referenced_type" : "type-2207",
    "self_type" : "type-2221",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-2412",
-   "self_type" : "type-2414",
+   "referenced_type" : "type-2414",
+   "self_type" : "type-2416",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const int &",
    "name" : "const int &",
-   "referenced_type" : "type-562",
-   "self_type" : "type-837",
+   "referenced_type" : "type-559",
+   "self_type" : "type-835",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12538,106 +12586,106 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-125",
-   "self_type" : "type-127",
+   "referenced_type" : "type-128",
+   "self_type" : "type-130",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1576",
-   "self_type" : "type-1578",
+   "referenced_type" : "type-1580",
+   "self_type" : "type-1582",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1611",
-   "self_type" : "type-1613",
+   "referenced_type" : "type-1616",
+   "self_type" : "type-1618",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1786",
-   "self_type" : "type-1788",
+   "referenced_type" : "type-1787",
+   "self_type" : "type-1789",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1847",
-   "self_type" : "type-1849",
+   "referenced_type" : "type-1848",
+   "self_type" : "type-1850",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1866",
-   "self_type" : "type-1868",
+   "referenced_type" : "type-1867",
+   "self_type" : "type-1869",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1933",
-   "self_type" : "type-1935",
+   "referenced_type" : "type-1935",
+   "self_type" : "type-1937",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2079",
-   "self_type" : "type-2081",
+   "referenced_type" : "type-2081",
+   "self_type" : "type-2083",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2170",
-   "self_type" : "type-2173",
+   "referenced_type" : "type-2173",
+   "self_type" : "type-2176",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2247",
-   "self_type" : "type-2249",
+   "referenced_type" : "type-2249",
+   "self_type" : "type-2251",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2289",
-   "self_type" : "type-2291",
+   "referenced_type" : "type-2291",
+   "self_type" : "type-2293",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2340",
-   "self_type" : "type-2342",
+   "referenced_type" : "type-2342",
+   "self_type" : "type-2344",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2471",
-   "self_type" : "type-2473",
+   "referenced_type" : "type-2473",
+   "self_type" : "type-2475",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-36",
-   "self_type" : "type-39",
+   "referenced_type" : "type-39",
+   "self_type" : "type-41",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-416",
-   "self_type" : "type-418",
+   "referenced_type" : "type-413",
+   "self_type" : "type-415",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12650,15 +12698,15 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-747",
+   "referenced_type" : "type-748",
    "self_type" : "type-750",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-854",
-   "self_type" : "type-856",
+   "referenced_type" : "type-856",
+   "self_type" : "type-858",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12697,8 +12745,8 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle *const &",
    "name" : "const native_handle *const &",
-   "referenced_type" : "type-696",
-   "self_type" : "type-697",
+   "referenced_type" : "type-699",
+   "self_type" : "type-700",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12706,8 +12754,8 @@
    "alignment" : 4,
    "linker_set_key" : "const short &",
    "name" : "const short &",
-   "referenced_type" : "type-825",
-   "self_type" : "type-829",
+   "referenced_type" : "type-823",
+   "self_type" : "type-826",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12716,7 +12764,7 @@
    "linker_set_key" : "const signed char &",
    "name" : "const signed char &",
    "referenced_type" : "type-799",
-   "self_type" : "type-804",
+   "self_type" : "type-801",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12733,8 +12781,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3> &",
    "name" : "const std::array<android::details::TVec2<float>, 3> &",
-   "referenced_type" : "type-1768",
-   "self_type" : "type-1770",
+   "referenced_type" : "type-1769",
+   "self_type" : "type-1771",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12742,8 +12790,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3> &",
    "name" : "const std::array<android::details::TVec2<float>, 3> &",
-   "referenced_type" : "type-2121",
-   "self_type" : "type-2129",
+   "referenced_type" : "type-2119",
+   "self_type" : "type-2125",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12751,8 +12799,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1015",
-   "self_type" : "type-1029",
+   "referenced_type" : "type-1007",
+   "self_type" : "type-1021",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12760,8 +12808,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1765",
-   "self_type" : "type-1767",
+   "referenced_type" : "type-1766",
+   "self_type" : "type-1768",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12769,7 +12817,7 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2103",
+   "referenced_type" : "type-2099",
    "self_type" : "type-2113",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
@@ -12787,8 +12835,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<float (float)> &",
    "name" : "const std::function<float (float)> &",
-   "referenced_type" : "type-1777",
-   "self_type" : "type-1779",
+   "referenced_type" : "type-1778",
+   "self_type" : "type-1780",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -12796,8 +12844,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<float (float)> &",
    "name" : "const std::function<float (float)> &",
-   "referenced_type" : "type-2222",
-   "self_type" : "type-2227",
+   "referenced_type" : "type-2224",
+   "self_type" : "type-2226",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -12805,8 +12853,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-1391",
-   "self_type" : "type-1401",
+   "referenced_type" : "type-1395",
+   "self_type" : "type-1405",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -12814,8 +12862,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-1839",
-   "self_type" : "type-1841",
+   "referenced_type" : "type-1840",
+   "self_type" : "type-1842",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -12823,8 +12871,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-2662",
-   "self_type" : "type-2669",
+   "referenced_type" : "type-2667",
+   "self_type" : "type-2674",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -12832,8 +12880,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> > &",
    "name" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> > &",
-   "referenced_type" : "type-2330",
-   "self_type" : "type-2332",
+   "referenced_type" : "type-2332",
+   "self_type" : "type-2334",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -12850,8 +12898,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1031",
-   "self_type" : "type-1030",
+   "referenced_type" : "type-1032",
+   "self_type" : "type-1031",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12868,8 +12916,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1581",
-   "self_type" : "type-1580",
+   "referenced_type" : "type-1585",
+   "self_type" : "type-1584",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12877,8 +12925,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1712",
-   "self_type" : "type-1711",
+   "referenced_type" : "type-1713",
+   "self_type" : "type-1712",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12886,8 +12934,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1825",
-   "self_type" : "type-1824",
+   "referenced_type" : "type-1826",
+   "self_type" : "type-1825",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12895,8 +12943,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1851",
-   "self_type" : "type-1850",
+   "referenced_type" : "type-1852",
+   "self_type" : "type-1851",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12904,8 +12952,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1902",
-   "self_type" : "type-1901",
+   "referenced_type" : "type-1903",
+   "self_type" : "type-1902",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12913,8 +12961,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1993",
-   "self_type" : "type-1992",
+   "referenced_type" : "type-1994",
+   "self_type" : "type-1993",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12922,8 +12970,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2074",
-   "self_type" : "type-2073",
+   "referenced_type" : "type-2076",
+   "self_type" : "type-2075",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12931,8 +12979,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2149",
-   "self_type" : "type-2148",
+   "referenced_type" : "type-2152",
+   "self_type" : "type-2151",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12940,8 +12988,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2232",
-   "self_type" : "type-2231",
+   "referenced_type" : "type-2234",
+   "self_type" : "type-2233",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12949,8 +12997,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2327",
-   "self_type" : "type-2326",
+   "referenced_type" : "type-2329",
+   "self_type" : "type-2328",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12958,8 +13006,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2378",
-   "self_type" : "type-2377",
+   "referenced_type" : "type-2380",
+   "self_type" : "type-2379",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12967,8 +13015,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2565",
-   "self_type" : "type-2564",
+   "referenced_type" : "type-2567",
+   "self_type" : "type-2566",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12976,8 +13024,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-328",
-   "self_type" : "type-327",
+   "referenced_type" : "type-325",
+   "self_type" : "type-324",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12985,8 +13033,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-45",
-   "self_type" : "type-44",
+   "referenced_type" : "type-47",
+   "self_type" : "type-46",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12994,8 +13042,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-478",
-   "self_type" : "type-477",
+   "referenced_type" : "type-475",
+   "self_type" : "type-474",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13012,8 +13060,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-726",
-   "self_type" : "type-725",
+   "referenced_type" : "type-727",
+   "self_type" : "type-726",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13021,8 +13069,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-832",
-   "self_type" : "type-831",
+   "referenced_type" : "type-833",
+   "self_type" : "type-832",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13030,8 +13078,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-959",
-   "self_type" : "type-958",
+   "referenced_type" : "type-961",
+   "self_type" : "type-960",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13039,8 +13087,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned char &",
    "name" : "const unsigned char &",
-   "referenced_type" : "type-224",
-   "self_type" : "type-821",
+   "referenced_type" : "type-226",
+   "self_type" : "type-812",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13048,8 +13096,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned int &",
    "name" : "const unsigned int &",
-   "referenced_type" : "type-236",
-   "self_type" : "type-846",
+   "referenced_type" : "type-238",
+   "self_type" : "type-842",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13057,7 +13105,7 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long &",
    "name" : "const unsigned long long &",
-   "referenced_type" : "type-226",
+   "referenced_type" : "type-228",
    "self_type" : "type-849",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -13067,7 +13115,7 @@
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
    "referenced_type" : "type-830",
-   "self_type" : "type-834",
+   "self_type" : "type-831",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13093,7 +13141,7 @@
    "alignment" : 4,
    "linker_set_key" : "int &",
    "name" : "int &",
-   "referenced_type" : "type-103",
+   "referenced_type" : "type-105",
    "self_type" : "type-1145",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
@@ -13102,7 +13150,7 @@
    "alignment" : 4,
    "linker_set_key" : "int *&",
    "name" : "int *&",
-   "referenced_type" : "type-593",
+   "referenced_type" : "type-591",
    "self_type" : "type-1347",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
@@ -13111,8 +13159,8 @@
    "alignment" : 4,
    "linker_set_key" : "long long &",
    "name" : "long long &",
-   "referenced_type" : "type-284",
-   "self_type" : "type-1409",
+   "referenced_type" : "type-12",
+   "self_type" : "type-1413",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -13120,8 +13168,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-1753",
-   "self_type" : "type-1752",
+   "referenced_type" : "type-1754",
+   "self_type" : "type-1753",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13129,8 +13177,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-1854",
-   "self_type" : "type-1853",
+   "referenced_type" : "type-1855",
+   "self_type" : "type-1854",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13138,8 +13186,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-2416",
-   "self_type" : "type-2415",
+   "referenced_type" : "type-2418",
+   "self_type" : "type-2417",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13147,8 +13195,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-703",
-   "self_type" : "type-702",
+   "referenced_type" : "type-696",
+   "self_type" : "type-695",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13156,8 +13204,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2147",
-   "self_type" : "type-2146",
+   "referenced_type" : "type-2150",
+   "self_type" : "type-2149",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -13165,8 +13213,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2396",
-   "self_type" : "type-2395",
+   "referenced_type" : "type-2398",
+   "self_type" : "type-2397",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -13174,8 +13222,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2444",
-   "self_type" : "type-2443",
+   "referenced_type" : "type-2446",
+   "self_type" : "type-2445",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -13183,8 +13231,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2449",
-   "self_type" : "type-2448",
+   "referenced_type" : "type-2451",
+   "self_type" : "type-2450",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/UiConfig.h"
   },
@@ -13201,7 +13249,7 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int &",
    "name" : "unsigned int &",
-   "referenced_type" : "type-123",
+   "referenced_type" : "type-125",
    "self_type" : "type-1250",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
@@ -13210,7 +13258,7 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned long long &",
    "name" : "unsigned long long &",
-   "referenced_type" : "type-124",
+   "referenced_type" : "type-126",
    "self_type" : "type-1146",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
@@ -13219,7 +13267,7 @@
    "alignment" : 4,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-227",
+   "referenced_type" : "type-229",
    "self_type" : "type-1249",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
@@ -13231,8 +13279,8 @@
    "alignment" : 4,
    "linker_set_key" : "AHardwareBuffer *",
    "name" : "AHardwareBuffer *",
-   "referenced_type" : "type-2066",
-   "self_type" : "type-2065",
+   "referenced_type" : "type-2069",
+   "self_type" : "type-2068",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -13240,8 +13288,8 @@
    "alignment" : 4,
    "linker_set_key" : "AHardwareBuffer *",
    "name" : "AHardwareBuffer *",
-   "referenced_type" : "type-622",
-   "self_type" : "type-621",
+   "referenced_type" : "type-623",
+   "self_type" : "type-622",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -13249,7 +13297,7 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-517",
+   "referenced_type" : "type-515",
    "self_type" : "type-636",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
@@ -13276,8 +13324,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1833",
-   "self_type" : "type-1832",
+   "referenced_type" : "type-1834",
+   "self_type" : "type-1833",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13285,8 +13333,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1838",
-   "self_type" : "type-1837",
+   "referenced_type" : "type-1839",
+   "self_type" : "type-1838",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13294,8 +13342,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2631",
-   "self_type" : "type-2630",
+   "referenced_type" : "type-2633",
+   "self_type" : "type-2632",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13303,8 +13351,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2653",
-   "self_type" : "type-2652",
+   "referenced_type" : "type-2655",
+   "self_type" : "type-2654",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13321,8 +13369,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1414",
-   "self_type" : "type-1413",
+   "referenced_type" : "type-1418",
+   "self_type" : "type-1417",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13330,8 +13378,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1828",
-   "self_type" : "type-1827",
+   "referenced_type" : "type-1829",
+   "self_type" : "type-1828",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13339,8 +13387,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1843",
-   "self_type" : "type-1842",
+   "referenced_type" : "type-1844",
+   "self_type" : "type-1843",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13348,8 +13396,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2621",
-   "self_type" : "type-2620",
+   "referenced_type" : "type-2623",
+   "self_type" : "type-2622",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13357,8 +13405,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2678",
-   "self_type" : "type-2677",
+   "referenced_type" : "type-2683",
+   "self_type" : "type-2682",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13375,8 +13423,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
    "name" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
-   "referenced_type" : "type-516",
-   "self_type" : "type-537",
+   "referenced_type" : "type-514",
+   "self_type" : "type-534",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
   },
@@ -13385,7 +13433,7 @@
    "linker_set_key" : "android::ColorSpace *",
    "name" : "android::ColorSpace *",
    "referenced_type" : "type-979",
-   "self_type" : "type-1006",
+   "self_type" : "type-1000",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -13402,8 +13450,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Condition *",
    "name" : "android::Condition *",
-   "referenced_type" : "type-258",
-   "self_type" : "type-261",
+   "referenced_type" : "type-254",
+   "self_type" : "type-257",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h"
   },
@@ -13420,8 +13468,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime *",
    "name" : "android::FenceTime *",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1393",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1397",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13429,8 +13477,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot *",
    "name" : "android::FenceTime::Snapshot *",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1382",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1386",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13438,8 +13486,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTimeline *",
    "name" : "android::FenceTimeline *",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1400",
+   "referenced_type" : "type-1401",
+   "self_type" : "type-1404",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13447,8 +13495,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceToFenceTimeMap *",
    "name" : "android::FenceToFenceTimeMap *",
-   "referenced_type" : "type-1402",
-   "self_type" : "type-1405",
+   "referenced_type" : "type-1406",
+   "self_type" : "type-1409",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13465,8 +13513,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FrameStats *",
    "name" : "android::FrameStats *",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1427",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1431",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
@@ -13474,8 +13522,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Gralloc2Allocator *",
    "name" : "android::Gralloc2Allocator *",
-   "referenced_type" : "type-353",
-   "self_type" : "type-360",
+   "referenced_type" : "type-350",
+   "self_type" : "type-357",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -13483,8 +13531,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Gralloc2Mapper *",
    "name" : "android::Gralloc2Mapper *",
-   "referenced_type" : "type-337",
-   "self_type" : "type-343",
+   "referenced_type" : "type-334",
+   "self_type" : "type-340",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -13492,8 +13540,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-525",
-   "self_type" : "type-680",
+   "referenced_type" : "type-523",
+   "self_type" : "type-679",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13501,8 +13549,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferAllocator *",
    "name" : "android::GraphicBufferAllocator *",
-   "referenced_type" : "type-542",
-   "self_type" : "type-545",
+   "referenced_type" : "type-539",
+   "self_type" : "type-542",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -13510,8 +13558,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-527",
-   "self_type" : "type-539",
+   "referenced_type" : "type-525",
+   "self_type" : "type-537",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -13528,8 +13576,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1679",
-   "self_type" : "type-1678",
+   "referenced_type" : "type-1680",
+   "self_type" : "type-1679",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13537,8 +13585,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1874",
-   "self_type" : "type-1873",
+   "referenced_type" : "type-1875",
+   "self_type" : "type-1874",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13546,8 +13594,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1952",
-   "self_type" : "type-1951",
+   "referenced_type" : "type-1953",
+   "self_type" : "type-1952",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13555,8 +13603,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-292",
-   "self_type" : "type-291",
+   "referenced_type" : "type-289",
+   "self_type" : "type-288",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13564,8 +13612,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-437",
-   "self_type" : "type-436",
+   "referenced_type" : "type-434",
+   "self_type" : "type-433",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13573,8 +13621,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
-   "referenced_type" : "type-715",
-   "self_type" : "type-716",
+   "referenced_type" : "type-716",
+   "self_type" : "type-717",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -13583,7 +13631,7 @@
    "linker_set_key" : "android::LightFlattenablePod<android::Rect> *",
    "name" : "android::LightFlattenablePod<android::Rect> *",
    "referenced_type" : "type-1243",
-   "self_type" : "type-2399",
+   "self_type" : "type-2401",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -13600,8 +13648,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex *",
    "name" : "android::Mutex *",
-   "referenced_type" : "type-252",
-   "self_type" : "type-254",
+   "referenced_type" : "type-280",
+   "self_type" : "type-1376",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -13609,8 +13657,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex::Autolock *",
    "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-255",
-   "self_type" : "type-257",
+   "referenced_type" : "type-1378",
+   "self_type" : "type-1380",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -13627,8 +13675,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock *",
    "name" : "android::RWLock *",
-   "referenced_type" : "type-262",
-   "self_type" : "type-264",
+   "referenced_type" : "type-258",
+   "self_type" : "type-260",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -13636,8 +13684,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock::AutoRLock *",
    "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-265",
-   "self_type" : "type-267",
+   "referenced_type" : "type-261",
+   "self_type" : "type-263",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -13645,8 +13693,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock::AutoWLock *",
    "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-268",
-   "self_type" : "type-269",
+   "referenced_type" : "type-264",
+   "self_type" : "type-265",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -13663,8 +13711,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase *",
    "name" : "android::RefBase *",
-   "referenced_type" : "type-172",
-   "self_type" : "type-246",
+   "referenced_type" : "type-175",
+   "self_type" : "type-248",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13672,8 +13720,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-118",
-   "self_type" : "type-117",
+   "referenced_type" : "type-120",
+   "self_type" : "type-119",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13699,8 +13747,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-14",
-   "self_type" : "type-13",
+   "referenced_type" : "type-1577",
+   "self_type" : "type-1576",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13708,8 +13756,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1573",
-   "self_type" : "type-1572",
+   "referenced_type" : "type-16",
+   "self_type" : "type-15",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13717,8 +13765,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1608",
-   "self_type" : "type-1607",
+   "referenced_type" : "type-1612",
+   "self_type" : "type-1611",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13726,8 +13774,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-175",
-   "self_type" : "type-174",
+   "referenced_type" : "type-178",
+   "self_type" : "type-177",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13735,8 +13783,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1783",
-   "self_type" : "type-1782",
+   "referenced_type" : "type-1784",
+   "self_type" : "type-1783",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13744,8 +13792,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1830",
-   "self_type" : "type-1829",
+   "referenced_type" : "type-1831",
+   "self_type" : "type-1830",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13753,8 +13801,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1835",
-   "self_type" : "type-1834",
+   "referenced_type" : "type-1836",
+   "self_type" : "type-1835",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13762,8 +13810,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1845",
-   "self_type" : "type-1844",
+   "referenced_type" : "type-1846",
+   "self_type" : "type-1845",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13771,8 +13819,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1864",
-   "self_type" : "type-1863",
+   "referenced_type" : "type-1865",
+   "self_type" : "type-1864",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13780,8 +13828,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1930",
-   "self_type" : "type-1929",
+   "referenced_type" : "type-1931",
+   "self_type" : "type-1930",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13789,8 +13837,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2015",
-   "self_type" : "type-2014",
+   "referenced_type" : "type-2016",
+   "self_type" : "type-2015",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13798,8 +13846,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2167",
-   "self_type" : "type-2166",
+   "referenced_type" : "type-2170",
+   "self_type" : "type-2169",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13807,8 +13855,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2245",
-   "self_type" : "type-2244",
+   "referenced_type" : "type-2247",
+   "self_type" : "type-2246",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13816,8 +13864,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2287",
-   "self_type" : "type-2286",
+   "referenced_type" : "type-2289",
+   "self_type" : "type-2288",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13825,8 +13873,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2338",
-   "self_type" : "type-2337",
+   "referenced_type" : "type-2340",
+   "self_type" : "type-2339",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13834,8 +13882,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2457",
-   "self_type" : "type-2456",
+   "referenced_type" : "type-2459",
+   "self_type" : "type-2458",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13843,8 +13891,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2623",
-   "self_type" : "type-2622",
+   "referenced_type" : "type-2625",
+   "self_type" : "type-2624",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13852,8 +13900,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2649",
-   "self_type" : "type-2648",
+   "referenced_type" : "type-2651",
+   "self_type" : "type-2650",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13861,8 +13909,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-408",
-   "self_type" : "type-407",
+   "referenced_type" : "type-405",
+   "self_type" : "type-404",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13870,8 +13918,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-514",
-   "self_type" : "type-513",
+   "referenced_type" : "type-511",
+   "self_type" : "type-510",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13879,8 +13927,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-744",
-   "self_type" : "type-743",
+   "referenced_type" : "type-745",
+   "self_type" : "type-744",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13888,8 +13936,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-851",
-   "self_type" : "type-850",
+   "referenced_type" : "type-852",
+   "self_type" : "type-851",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13915,8 +13963,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_type *",
    "name" : "android::RefBase::weakref_type *",
-   "referenced_type" : "type-198",
-   "self_type" : "type-197",
+   "referenced_type" : "type-211",
+   "self_type" : "type-210",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -13933,8 +13981,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Region *",
    "name" : "android::Region *",
-   "referenced_type" : "type-2389",
-   "self_type" : "type-2391",
+   "referenced_type" : "type-2391",
+   "self_type" : "type-2393",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -13960,8 +14008,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 *",
    "name" : "android::String16 *",
-   "referenced_type" : "type-179",
-   "self_type" : "type-189",
+   "referenced_type" : "type-182",
+   "self_type" : "type-191",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -13969,8 +14017,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 *",
    "name" : "android::String8 *",
-   "referenced_type" : "type-285",
-   "self_type" : "type-901",
+   "referenced_type" : "type-282",
+   "self_type" : "type-891",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -13978,8 +14026,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Thread *",
    "name" : "android::Thread *",
-   "referenced_type" : "type-369",
-   "self_type" : "type-368",
+   "referenced_type" : "type-366",
+   "self_type" : "type-365",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13987,8 +14035,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<android::Rect> *",
    "name" : "android::Vector<android::Rect> *",
-   "referenced_type" : "type-2382",
-   "self_type" : "type-2383",
+   "referenced_type" : "type-2384",
+   "self_type" : "type-2385",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -13996,8 +14044,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<long long> *",
    "name" : "android::Vector<long long> *",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1424",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1428",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14032,8 +14080,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TMat44<float> *",
    "name" : "android::details::TMat44<float> *",
-   "referenced_type" : "type-2427",
-   "self_type" : "type-2430",
+   "referenced_type" : "type-2429",
+   "self_type" : "type-2432",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -14042,7 +14090,7 @@
    "linker_set_key" : "android::details::TMatTransform<android::details::TMat33, float> *",
    "name" : "android::details::TMatTransform<android::details::TMat33, float> *",
    "referenced_type" : "type-910",
-   "self_type" : "type-957",
+   "self_type" : "type-949",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -14050,8 +14098,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TMatTransform<android::details::TMat44, float> *",
    "name" : "android::details::TMatTransform<android::details::TMat44, float> *",
-   "referenced_type" : "type-2421",
-   "self_type" : "type-2422",
+   "referenced_type" : "type-2423",
+   "self_type" : "type-2424",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -14059,8 +14107,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TQuaternion<double> *",
    "name" : "android::details::TQuaternion<double> *",
-   "referenced_type" : "type-331",
-   "self_type" : "type-397",
+   "referenced_type" : "type-328",
+   "self_type" : "type-391",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -14068,8 +14116,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TQuaternion<float> *",
    "name" : "android::details::TQuaternion<float> *",
-   "referenced_type" : "type-410",
-   "self_type" : "type-429",
+   "referenced_type" : "type-407",
+   "self_type" : "type-426",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -14086,7 +14134,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec2<double> *",
    "name" : "android::details::TVec2<double> *",
-   "referenced_type" : "type-55",
+   "referenced_type" : "type-57",
    "self_type" : "type-1069",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -14095,7 +14143,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec2<float> *",
    "name" : "android::details::TVec2<float> *",
-   "referenced_type" : "type-22",
+   "referenced_type" : "type-23",
    "self_type" : "type-1245",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -14104,7 +14152,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<double> *",
    "name" : "android::details::TVec3<double> *",
-   "referenced_type" : "type-66",
+   "referenced_type" : "type-68",
    "self_type" : "type-1368",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
@@ -14113,8 +14161,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<float> *",
    "name" : "android::details::TVec3<float> *",
-   "referenced_type" : "type-17",
-   "self_type" : "type-16",
+   "referenced_type" : "type-18",
+   "self_type" : "type-17",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
   },
@@ -14122,8 +14170,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<double> *",
    "name" : "android::details::TVec4<double> *",
-   "referenced_type" : "type-50",
-   "self_type" : "type-155",
+   "referenced_type" : "type-52",
+   "self_type" : "type-151",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -14131,8 +14179,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<float> *",
    "name" : "android::details::TVec4<float> *",
-   "referenced_type" : "type-200",
-   "self_type" : "type-316",
+   "referenced_type" : "type-192",
+   "self_type" : "type-311",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -14140,7 +14188,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec2, float> *",
    "name" : "android::details::TVecAddOperators<android::details::TVec2, float> *",
-   "referenced_type" : "type-28",
+   "referenced_type" : "type-29",
    "self_type" : "type-1049",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -14149,7 +14197,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec3, float> *",
    "name" : "android::details::TVecAddOperators<android::details::TVec3, float> *",
-   "referenced_type" : "type-34",
+   "referenced_type" : "type-35",
    "self_type" : "type-1053",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -14158,7 +14206,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec2, float> *",
    "name" : "android::details::TVecProductOperators<android::details::TVec2, float> *",
-   "referenced_type" : "type-27",
+   "referenced_type" : "type-28",
    "self_type" : "type-1057",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -14167,7 +14215,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec3, float> *",
    "name" : "android::details::TVecProductOperators<android::details::TVec3, float> *",
-   "referenced_type" : "type-33",
+   "referenced_type" : "type-34",
    "self_type" : "type-1058",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -14177,7 +14225,7 @@
    "linker_set_key" : "android::half *",
    "name" : "android::half *",
    "referenced_type" : "type-1",
-   "self_type" : "type-1381",
+   "self_type" : "type-1377",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -14203,8 +14251,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-242",
-   "self_type" : "type-241",
+   "referenced_type" : "type-244",
+   "self_type" : "type-243",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14221,8 +14269,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-196",
-   "self_type" : "type-195",
+   "referenced_type" : "type-209",
+   "self_type" : "type-208",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14230,8 +14278,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-215",
-   "self_type" : "type-222",
+   "referenced_type" : "type-217",
+   "self_type" : "type-224",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -14239,8 +14287,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-281",
-   "self_type" : "type-280",
+   "referenced_type" : "type-277",
+   "self_type" : "type-276",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14248,8 +14296,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
-   "referenced_type" : "type-99",
-   "self_type" : "type-106",
+   "referenced_type" : "type-101",
+   "self_type" : "type-108",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14257,8 +14305,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
-   "referenced_type" : "type-393",
-   "self_type" : "type-398",
+   "referenced_type" : "type-392",
+   "self_type" : "type-395",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14266,8 +14314,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
-   "referenced_type" : "type-111",
-   "self_type" : "type-112",
+   "referenced_type" : "type-113",
+   "self_type" : "type-114",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14284,7 +14332,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status *",
    "name" : "android::hardware::Status *",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1309",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -14311,8 +14359,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int> *",
    "name" : "android::hardware::details::hidl_pointer<unsigned int> *",
-   "referenced_type" : "type-120",
-   "self_type" : "type-169",
+   "referenced_type" : "type-122",
+   "self_type" : "type-172",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14320,7 +14368,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status *",
    "name" : "android::hardware::details::return_status *",
-   "referenced_type" : "type-101",
+   "referenced_type" : "type-103",
    "self_type" : "type-1315",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -14329,8 +14377,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1727",
-   "self_type" : "type-1726",
+   "referenced_type" : "type-1728",
+   "self_type" : "type-1727",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14338,8 +14386,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1909",
-   "self_type" : "type-1908",
+   "referenced_type" : "type-1910",
+   "self_type" : "type-1909",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14347,8 +14395,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2115",
-   "self_type" : "type-2114",
+   "referenced_type" : "type-2118",
+   "self_type" : "type-2117",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14356,8 +14404,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2153",
-   "self_type" : "type-2152",
+   "referenced_type" : "type-2156",
+   "self_type" : "type-2155",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14365,8 +14413,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2235",
-   "self_type" : "type-2234",
+   "referenced_type" : "type-2237",
+   "self_type" : "type-2236",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14374,8 +14422,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-357",
-   "self_type" : "type-356",
+   "referenced_type" : "type-354",
+   "self_type" : "type-353",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14383,8 +14431,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-685",
-   "self_type" : "type-684",
+   "referenced_type" : "type-687",
+   "self_type" : "type-686",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14401,8 +14449,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-836",
-   "self_type" : "type-835",
+   "referenced_type" : "type-837",
+   "self_type" : "type-836",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14410,8 +14458,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-1997",
-   "self_type" : "type-1996",
+   "referenced_type" : "type-1998",
+   "self_type" : "type-1997",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14419,8 +14467,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-2160",
-   "self_type" : "type-2159",
+   "referenced_type" : "type-2163",
+   "self_type" : "type-2162",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14428,8 +14476,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-2241",
-   "self_type" : "type-2240",
+   "referenced_type" : "type-2243",
+   "self_type" : "type-2242",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14437,8 +14485,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-486",
-   "self_type" : "type-485",
+   "referenced_type" : "type-483",
+   "self_type" : "type-482",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14446,8 +14494,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-737",
-   "self_type" : "type-736",
+   "referenced_type" : "type-738",
+   "self_type" : "type-737",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14455,8 +14503,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-843",
-   "self_type" : "type-842",
+   "referenced_type" : "type-844",
+   "self_type" : "type-843",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14464,8 +14512,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1716",
-   "self_type" : "type-1715",
+   "referenced_type" : "type-1717",
+   "self_type" : "type-1716",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14473,8 +14521,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1915",
-   "self_type" : "type-1914",
+   "referenced_type" : "type-1916",
+   "self_type" : "type-1915",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14482,8 +14530,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2118",
-   "self_type" : "type-2117",
+   "referenced_type" : "type-2122",
+   "self_type" : "type-2121",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14491,8 +14539,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2155",
-   "self_type" : "type-2154",
+   "referenced_type" : "type-2158",
+   "self_type" : "type-2157",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14500,8 +14548,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2237",
-   "self_type" : "type-2236",
+   "referenced_type" : "type-2239",
+   "self_type" : "type-2238",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14509,8 +14557,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-340",
-   "self_type" : "type-339",
+   "referenced_type" : "type-337",
+   "self_type" : "type-336",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14545,8 +14593,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1587",
-   "self_type" : "type-1586",
+   "referenced_type" : "type-1591",
+   "self_type" : "type-1590",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14554,8 +14602,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1859",
-   "self_type" : "type-1858",
+   "referenced_type" : "type-1860",
+   "self_type" : "type-1859",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14563,8 +14611,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2120",
-   "self_type" : "type-2119",
+   "referenced_type" : "type-2124",
+   "self_type" : "type-2123",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14572,8 +14620,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2158",
-   "self_type" : "type-2157",
+   "referenced_type" : "type-2161",
+   "self_type" : "type-2160",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14581,8 +14629,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2239",
-   "self_type" : "type-2238",
+   "referenced_type" : "type-2241",
+   "self_type" : "type-2240",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14617,8 +14665,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-88",
-   "self_type" : "type-87",
+   "referenced_type" : "type-90",
+   "self_type" : "type-89",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14626,8 +14674,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
-   "referenced_type" : "type-1724",
-   "self_type" : "type-1723",
+   "referenced_type" : "type-1725",
+   "self_type" : "type-1724",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -14635,8 +14683,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
-   "referenced_type" : "type-1906",
-   "self_type" : "type-1905",
+   "referenced_type" : "type-1908",
+   "self_type" : "type-1907",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -14644,8 +14692,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
-   "referenced_type" : "type-352",
-   "self_type" : "type-351",
+   "referenced_type" : "type-349",
+   "self_type" : "type-348",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -14653,8 +14701,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-2007",
-   "self_type" : "type-2006",
+   "referenced_type" : "type-2008",
+   "self_type" : "type-2007",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14662,8 +14710,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-2163",
-   "self_type" : "type-2162",
+   "referenced_type" : "type-2166",
+   "self_type" : "type-2165",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14671,8 +14719,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-2243",
-   "self_type" : "type-2242",
+   "referenced_type" : "type-2245",
+   "self_type" : "type-2244",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14680,8 +14728,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-499",
-   "self_type" : "type-498",
+   "referenced_type" : "type-496",
+   "self_type" : "type-495",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14698,8 +14746,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-845",
-   "self_type" : "type-844",
+   "referenced_type" : "type-846",
+   "self_type" : "type-845",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14725,8 +14773,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_handle *",
    "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-139",
-   "self_type" : "type-138",
+   "referenced_type" : "type-142",
+   "self_type" : "type-141",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14743,8 +14791,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned int> *",
    "name" : "android::hardware::hidl_vec<unsigned int> *",
-   "referenced_type" : "type-128",
-   "self_type" : "type-129",
+   "referenced_type" : "type-131",
+   "self_type" : "type-132",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14761,8 +14809,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::base::V1_0::IBase *",
    "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-171",
-   "self_type" : "type-364",
+   "referenced_type" : "type-174",
+   "self_type" : "type-361",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14770,8 +14818,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-295",
-   "self_type" : "type-372",
+   "referenced_type" : "type-292",
+   "self_type" : "type-369",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14780,7 +14828,7 @@
    "linker_set_key" : "android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "referenced_type" : "type-694",
-   "self_type" : "type-698",
+   "self_type" : "type-701",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14797,8 +14845,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::GraphicBuffer> *",
    "name" : "android::sp<android::GraphicBuffer> *",
-   "referenced_type" : "type-679",
-   "self_type" : "type-681",
+   "referenced_type" : "type-678",
+   "self_type" : "type-682",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14806,8 +14854,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
-   "referenced_type" : "type-355",
-   "self_type" : "type-376",
+   "referenced_type" : "type-352",
+   "self_type" : "type-373",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14815,8 +14863,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
-   "referenced_type" : "type-484",
-   "self_type" : "type-488",
+   "referenced_type" : "type-481",
+   "self_type" : "type-486",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14824,8 +14872,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
-   "referenced_type" : "type-338",
-   "self_type" : "type-384",
+   "referenced_type" : "type-335",
+   "self_type" : "type-381",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14833,8 +14881,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
-   "referenced_type" : "type-86",
-   "self_type" : "type-90",
+   "referenced_type" : "type-88",
+   "self_type" : "type-92",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14842,8 +14890,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
-   "referenced_type" : "type-497",
-   "self_type" : "type-502",
+   "referenced_type" : "type-494",
+   "self_type" : "type-499",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14851,8 +14899,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "referenced_type" : "type-371",
-   "self_type" : "type-373",
+   "referenced_type" : "type-368",
+   "self_type" : "type-370",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14869,8 +14917,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ui::Transform *",
    "name" : "android::ui::Transform *",
-   "referenced_type" : "type-2434",
-   "self_type" : "type-2436",
+   "referenced_type" : "type-2436",
+   "self_type" : "type-2438",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -14878,8 +14926,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ui::Transform::mat33 *",
    "name" : "android::ui::Transform::mat33 *",
-   "referenced_type" : "type-2435",
-   "self_type" : "type-2447",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2449",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -14896,8 +14944,8 @@
    "alignment" : 4,
    "linker_set_key" : "android_native_base_t *",
    "name" : "android_native_base_t *",
-   "referenced_type" : "type-518",
-   "self_type" : "type-522",
+   "referenced_type" : "type-516",
+   "self_type" : "type-520",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -14905,8 +14953,8 @@
    "alignment" : 4,
    "linker_set_key" : "android_ycbcr *",
    "name" : "android_ycbcr *",
-   "referenced_type" : "type-348",
-   "self_type" : "type-347",
+   "referenced_type" : "type-345",
+   "self_type" : "type-344",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -14914,8 +14962,8 @@
    "alignment" : 4,
    "linker_set_key" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
    "name" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
-   "referenced_type" : "type-271",
-   "self_type" : "type-274",
+   "referenced_type" : "type-267",
+   "self_type" : "type-270",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -14924,7 +14972,7 @@
    "linker_set_key" : "bool *",
    "name" : "bool *",
    "referenced_type" : "type-6",
-   "self_type" : "type-350",
+   "self_type" : "type-347",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -14932,8 +14980,8 @@
    "alignment" : 4,
    "linker_set_key" : "char *",
    "name" : "char *",
-   "referenced_type" : "type-288",
-   "self_type" : "type-576",
+   "referenced_type" : "type-285",
+   "self_type" : "type-573",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -14941,8 +14989,8 @@
    "alignment" : 4,
    "linker_set_key" : "const AHardwareBuffer *",
    "name" : "const AHardwareBuffer *",
-   "referenced_type" : "type-2069",
-   "self_type" : "type-2071",
+   "referenced_type" : "type-2071",
+   "self_type" : "type-2073",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -14959,7 +15007,7 @@
    "alignment" : 4,
    "linker_set_key" : "const ANativeWindowBuffer *",
    "name" : "const ANativeWindowBuffer *",
-   "referenced_type" : "type-637",
+   "referenced_type" : "type-638",
    "self_type" : "type-639",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
@@ -14968,8 +15016,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
    "name" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
-   "referenced_type" : "type-535",
-   "self_type" : "type-536",
+   "referenced_type" : "type-532",
+   "self_type" : "type-533",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
   },
@@ -15004,8 +15052,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime *",
    "name" : "const android::FenceTime *",
-   "referenced_type" : "type-1395",
-   "self_type" : "type-1396",
+   "referenced_type" : "type-1399",
+   "self_type" : "type-1400",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -15013,8 +15061,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot *",
    "name" : "const android::FenceTime::Snapshot *",
-   "referenced_type" : "type-1388",
-   "self_type" : "type-1389",
+   "referenced_type" : "type-1393",
+   "self_type" : "type-1394",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -15031,8 +15079,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FrameStats *",
    "name" : "const android::FrameStats *",
-   "referenced_type" : "type-1428",
-   "self_type" : "type-1429",
+   "referenced_type" : "type-1432",
+   "self_type" : "type-1433",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
@@ -15040,8 +15088,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Gralloc2Allocator *",
    "name" : "const android::Gralloc2Allocator *",
-   "referenced_type" : "type-361",
-   "self_type" : "type-362",
+   "referenced_type" : "type-358",
+   "self_type" : "type-359",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15049,8 +15097,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Gralloc2Mapper *",
    "name" : "const android::Gralloc2Mapper *",
-   "referenced_type" : "type-344",
-   "self_type" : "type-345",
+   "referenced_type" : "type-341",
+   "self_type" : "type-342",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15058,8 +15106,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-624",
-   "self_type" : "type-623",
+   "referenced_type" : "type-625",
+   "self_type" : "type-624",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -15067,8 +15115,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBufferAllocator *",
    "name" : "const android::GraphicBufferAllocator *",
-   "referenced_type" : "type-720",
-   "self_type" : "type-721",
+   "referenced_type" : "type-721",
+   "self_type" : "type-722",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -15076,8 +15124,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBufferMapper *",
    "name" : "const android::GraphicBufferMapper *",
-   "referenced_type" : "type-614",
-   "self_type" : "type-615",
+   "referenced_type" : "type-615",
+   "self_type" : "type-616",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -15085,8 +15133,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::HdrCapabilities *",
    "name" : "const android::HdrCapabilities *",
-   "referenced_type" : "type-972",
-   "self_type" : "type-973",
+   "referenced_type" : "type-973",
+   "self_type" : "type-974",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -15094,8 +15142,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
-   "referenced_type" : "type-717",
-   "self_type" : "type-718",
+   "referenced_type" : "type-718",
+   "self_type" : "type-719",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -15103,8 +15151,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect> *",
    "name" : "const android::LightFlattenablePod<android::Rect> *",
-   "referenced_type" : "type-2397",
-   "self_type" : "type-2398",
+   "referenced_type" : "type-2399",
+   "self_type" : "type-2400",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15157,8 +15205,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Region *",
    "name" : "const android::Region *",
-   "referenced_type" : "type-2388",
-   "self_type" : "type-2394",
+   "referenced_type" : "type-2390",
+   "self_type" : "type-2396",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -15175,8 +15223,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 *",
    "name" : "const android::String16 *",
-   "referenced_type" : "type-184",
-   "self_type" : "type-186",
+   "referenced_type" : "type-187",
+   "self_type" : "type-188",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -15184,8 +15232,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 *",
    "name" : "const android::String8 *",
-   "referenced_type" : "type-873",
-   "self_type" : "type-878",
+   "referenced_type" : "type-863",
+   "self_type" : "type-874",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -15193,8 +15241,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::Rect> *",
    "name" : "const android::Vector<android::Rect> *",
-   "referenced_type" : "type-2384",
-   "self_type" : "type-2387",
+   "referenced_type" : "type-2386",
+   "self_type" : "type-2389",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -15202,8 +15250,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<long long> *",
    "name" : "const android::Vector<long long> *",
-   "referenced_type" : "type-1425",
-   "self_type" : "type-1426",
+   "referenced_type" : "type-1429",
+   "self_type" : "type-1430",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -15211,8 +15259,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::VectorImpl *",
    "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-1422",
-   "self_type" : "type-1423",
+   "referenced_type" : "type-1426",
+   "self_type" : "type-1427",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -15229,7 +15277,7 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TMat33<float> *",
    "name" : "const android::details::TMat33<float> *",
-   "referenced_type" : "type-925",
+   "referenced_type" : "type-919",
    "self_type" : "type-976",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
@@ -15257,7 +15305,7 @@
    "linker_set_key" : "const android::details::TVec3<float> *",
    "name" : "const android::details::TVec3<float> *",
    "referenced_type" : "type-1055",
-   "self_type" : "type-1418",
+   "self_type" : "type-1419",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
   },
@@ -15265,8 +15313,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::half *",
    "name" : "const android::half *",
-   "referenced_type" : "type-42",
-   "self_type" : "type-130",
+   "referenced_type" : "type-44",
+   "self_type" : "type-127",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -15292,8 +15340,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::BpHwRefBase *",
    "name" : "const android::hardware::BpHwRefBase *",
-   "referenced_type" : "type-211",
-   "self_type" : "type-212",
+   "referenced_type" : "type-213",
+   "self_type" : "type-214",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -15301,8 +15349,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
-   "referenced_type" : "type-109",
-   "self_type" : "type-110",
+   "referenced_type" : "type-111",
+   "self_type" : "type-112",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15310,8 +15358,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
-   "referenced_type" : "type-401",
-   "self_type" : "type-402",
+   "referenced_type" : "type-398",
+   "self_type" : "type-400",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15319,8 +15367,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
-   "referenced_type" : "type-115",
-   "self_type" : "type-116",
+   "referenced_type" : "type-117",
+   "self_type" : "type-118",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15346,8 +15394,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle> *",
-   "referenced_type" : "type-293",
-   "self_type" : "type-297",
+   "referenced_type" : "type-290",
+   "self_type" : "type-294",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15355,8 +15403,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned int> *",
    "name" : "const android::hardware::details::hidl_pointer<unsigned int> *",
-   "referenced_type" : "type-190",
-   "self_type" : "type-214",
+   "referenced_type" : "type-203",
+   "self_type" : "type-216",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15373,8 +15421,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1744",
-   "self_type" : "type-1746",
+   "referenced_type" : "type-1745",
+   "self_type" : "type-1747",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15382,8 +15430,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1910",
-   "self_type" : "type-1913",
+   "referenced_type" : "type-1912",
+   "self_type" : "type-1914",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15391,8 +15439,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-381",
-   "self_type" : "type-383",
+   "referenced_type" : "type-378",
+   "self_type" : "type-380",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15400,8 +15448,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-2003",
-   "self_type" : "type-2005",
+   "referenced_type" : "type-2004",
+   "self_type" : "type-2006",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15409,8 +15457,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-494",
-   "self_type" : "type-496",
+   "referenced_type" : "type-491",
+   "self_type" : "type-493",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15418,8 +15466,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::BufferUsage *",
    "name" : "const android::hardware::graphics::common::V1_0::BufferUsage *",
-   "referenced_type" : "type-153",
-   "self_type" : "type-152",
+   "referenced_type" : "type-156",
+   "self_type" : "type-155",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15427,8 +15475,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::BufferUsage *",
    "name" : "const android::hardware::graphics::common::V1_1::BufferUsage *",
-   "referenced_type" : "type-160",
-   "self_type" : "type-159",
+   "referenced_type" : "type-162",
+   "self_type" : "type-161",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15436,8 +15484,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::BufferUsage *",
    "name" : "const android::hardware::graphics::common::V1_2::BufferUsage *",
-   "referenced_type" : "type-422",
-   "self_type" : "type-421",
+   "referenced_type" : "type-419",
+   "self_type" : "type-418",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15445,8 +15493,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1584",
-   "self_type" : "type-1583",
+   "referenced_type" : "type-1588",
+   "self_type" : "type-1587",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15454,8 +15502,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1856",
-   "self_type" : "type-1855",
+   "referenced_type" : "type-1857",
+   "self_type" : "type-1856",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15463,8 +15511,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-84",
-   "self_type" : "type-83",
+   "referenced_type" : "type-86",
+   "self_type" : "type-85",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15472,8 +15520,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1594",
-   "self_type" : "type-1596",
+   "referenced_type" : "type-1598",
+   "self_type" : "type-1600",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15481,8 +15529,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1860",
-   "self_type" : "type-1862",
+   "referenced_type" : "type-1861",
+   "self_type" : "type-1863",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15490,8 +15538,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-96",
-   "self_type" : "type-98",
+   "referenced_type" : "type-98",
+   "self_type" : "type-100",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15499,8 +15547,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-1918",
-   "self_type" : "type-1917",
+   "referenced_type" : "type-1919",
+   "self_type" : "type-1918",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15508,8 +15556,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-391",
-   "self_type" : "type-390",
+   "referenced_type" : "type-388",
+   "self_type" : "type-387",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15526,8 +15574,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void> *",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void> *",
-   "referenced_type" : "type-154",
-   "self_type" : "type-156",
+   "referenced_type" : "type-157",
+   "self_type" : "type-158",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15535,8 +15583,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void> *",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void> *",
-   "referenced_type" : "type-161",
-   "self_type" : "type-162",
+   "referenced_type" : "type-163",
+   "self_type" : "type-165",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15544,8 +15592,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void> *",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void> *",
-   "referenced_type" : "type-423",
-   "self_type" : "type-424",
+   "referenced_type" : "type-420",
+   "self_type" : "type-421",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15562,8 +15610,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_handle> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_handle> *",
-   "referenced_type" : "type-146",
-   "self_type" : "type-147",
+   "referenced_type" : "type-149",
+   "self_type" : "type-150",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15571,8 +15619,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned int> *",
    "name" : "const android::hardware::hidl_vec<unsigned int> *",
-   "referenced_type" : "type-132",
-   "self_type" : "type-134",
+   "referenced_type" : "type-134",
+   "self_type" : "type-136",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15589,8 +15637,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
    "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-170",
-   "self_type" : "type-176",
+   "referenced_type" : "type-173",
+   "self_type" : "type-179",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
@@ -15598,8 +15646,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-294",
-   "self_type" : "type-296",
+   "referenced_type" : "type-291",
+   "self_type" : "type-293",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
@@ -15608,7 +15656,7 @@
    "linker_set_key" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "referenced_type" : "type-693",
-   "self_type" : "type-699",
+   "self_type" : "type-702",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15625,8 +15673,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
    "name" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
-   "referenced_type" : "type-379",
-   "self_type" : "type-380",
+   "referenced_type" : "type-376",
+   "self_type" : "type-377",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15634,8 +15682,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
    "name" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
-   "referenced_type" : "type-492",
-   "self_type" : "type-493",
+   "referenced_type" : "type-489",
+   "self_type" : "type-490",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15643,8 +15691,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
-   "referenced_type" : "type-387",
-   "self_type" : "type-388",
+   "referenced_type" : "type-384",
+   "self_type" : "type-385",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15652,8 +15700,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
-   "referenced_type" : "type-91",
-   "self_type" : "type-95",
+   "referenced_type" : "type-93",
+   "self_type" : "type-97",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15661,8 +15709,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
    "name" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
-   "referenced_type" : "type-505",
-   "self_type" : "type-506",
+   "referenced_type" : "type-502",
+   "self_type" : "type-503",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15679,8 +15727,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::base::V1_0::IBase> *",
    "name" : "const android::sp<android::hidl::base::V1_0::IBase> *",
-   "referenced_type" : "type-365",
-   "self_type" : "type-366",
+   "referenced_type" : "type-362",
+   "self_type" : "type-363",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15688,8 +15736,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "referenced_type" : "type-374",
-   "self_type" : "type-375",
+   "referenced_type" : "type-371",
+   "self_type" : "type-372",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15706,8 +15754,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ui::Transform *",
    "name" : "const android::ui::Transform *",
-   "referenced_type" : "type-2437",
-   "self_type" : "type-2441",
+   "referenced_type" : "type-2439",
+   "self_type" : "type-2443",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -15715,8 +15763,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ui::Transform::mat33 *",
    "name" : "const android::ui::Transform::mat33 *",
-   "referenced_type" : "type-2445",
-   "self_type" : "type-2446",
+   "referenced_type" : "type-2447",
+   "self_type" : "type-2448",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -15724,8 +15772,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-287",
-   "self_type" : "type-286",
+   "referenced_type" : "type-284",
+   "self_type" : "type-283",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -15733,8 +15781,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-181",
-   "self_type" : "type-180",
+   "referenced_type" : "type-184",
+   "self_type" : "type-183",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -15742,8 +15790,8 @@
    "alignment" : 4,
    "linker_set_key" : "const gralloc_module_t *",
    "name" : "const gralloc_module_t *",
-   "referenced_type" : "type-582",
-   "self_type" : "type-581",
+   "referenced_type" : "type-580",
+   "self_type" : "type-579",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -15751,8 +15799,8 @@
    "alignment" : 4,
    "linker_set_key" : "const hw_module_t *",
    "name" : "const hw_module_t *",
-   "referenced_type" : "type-555",
-   "self_type" : "type-554",
+   "referenced_type" : "type-552",
+   "self_type" : "type-551",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15760,7 +15808,7 @@
    "alignment" : 4,
    "linker_set_key" : "const int *",
    "name" : "const int *",
-   "referenced_type" : "type-562",
+   "referenced_type" : "type-559",
    "self_type" : "type-1348",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
@@ -15779,7 +15827,7 @@
    "linker_set_key" : "const long long *",
    "name" : "const long long *",
    "referenced_type" : "type-847",
-   "self_type" : "type-1415",
+   "self_type" : "type-1420",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15787,8 +15835,8 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle *",
    "name" : "const native_handle *",
-   "referenced_type" : "type-143",
-   "self_type" : "type-142",
+   "referenced_type" : "type-146",
+   "self_type" : "type-145",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15796,8 +15844,8 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle **",
    "name" : "const native_handle **",
-   "referenced_type" : "type-142",
-   "self_type" : "type-346",
+   "referenced_type" : "type-145",
+   "self_type" : "type-343",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15805,8 +15853,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned char *",
    "name" : "const unsigned char *",
-   "referenced_type" : "type-224",
-   "self_type" : "type-223",
+   "referenced_type" : "type-226",
+   "self_type" : "type-225",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -15814,7 +15862,7 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned int *",
    "name" : "const unsigned int *",
-   "referenced_type" : "type-236",
+   "referenced_type" : "type-238",
    "self_type" : "type-1104",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -15823,8 +15871,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long *",
    "name" : "const unsigned long long *",
-   "referenced_type" : "type-226",
-   "self_type" : "type-225",
+   "referenced_type" : "type-228",
+   "self_type" : "type-227",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -15841,8 +15889,8 @@
    "alignment" : 4,
    "linker_set_key" : "framebuffer_device_t *",
    "name" : "framebuffer_device_t *",
-   "referenced_type" : "type-546",
-   "self_type" : "type-567",
+   "referenced_type" : "type-543",
+   "self_type" : "type-564",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -15850,8 +15898,8 @@
    "alignment" : 4,
    "linker_set_key" : "hw_device_t *",
    "name" : "hw_device_t *",
-   "referenced_type" : "type-547",
-   "self_type" : "type-557",
+   "referenced_type" : "type-544",
+   "self_type" : "type-554",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15859,8 +15907,8 @@
    "alignment" : 4,
    "linker_set_key" : "hw_device_t **",
    "name" : "hw_device_t **",
-   "referenced_type" : "type-557",
-   "self_type" : "type-556",
+   "referenced_type" : "type-554",
+   "self_type" : "type-553",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15868,8 +15916,8 @@
    "alignment" : 4,
    "linker_set_key" : "hw_module_methods_t *",
    "name" : "hw_module_methods_t *",
-   "referenced_type" : "type-551",
-   "self_type" : "type-550",
+   "referenced_type" : "type-548",
+   "self_type" : "type-547",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15877,8 +15925,8 @@
    "alignment" : 4,
    "linker_set_key" : "hw_module_t *",
    "name" : "hw_module_t *",
-   "referenced_type" : "type-549",
-   "self_type" : "type-548",
+   "referenced_type" : "type-546",
+   "self_type" : "type-545",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15904,8 +15952,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *)",
    "name" : "int (*)(const gralloc_module_t *, const native_handle *)",
-   "referenced_type" : "type-580",
-   "self_type" : "type-579",
+   "referenced_type" : "type-578",
+   "self_type" : "type-577",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -15913,42 +15961,6 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int *)",
    "name" : "int (*)(const gralloc_module_t *, const native_handle *, int *)",
-   "referenced_type" : "type-592",
-   "self_type" : "type-591",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "referenced_type" : "type-588",
-   "self_type" : "type-587",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "referenced_type" : "type-595",
-   "self_type" : "type-594",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "referenced_type" : "type-584",
-   "self_type" : "type-583",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
    "referenced_type" : "type-590",
    "self_type" : "type-589",
    "size" : 4,
@@ -15956,8 +15968,8 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, int, ...)",
-   "name" : "int (*)(const gralloc_module_t *, int, ...)",
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
    "referenced_type" : "type-586",
    "self_type" : "type-585",
    "size" : 4,
@@ -15965,10 +15977,64 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
+   "referenced_type" : "type-593",
+   "self_type" : "type-592",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
+   "referenced_type" : "type-582",
+   "self_type" : "type-581",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
+   "referenced_type" : "type-588",
+   "self_type" : "type-587",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "referenced_type" : "type-595",
+   "self_type" : "type-594",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "referenced_type" : "type-597",
+   "self_type" : "type-596",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, int, ...)",
+   "name" : "int (*)(const gralloc_module_t *, int, ...)",
+   "referenced_type" : "type-584",
+   "self_type" : "type-583",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "int (*)(const hw_module_t *, const char *, hw_device_t **)",
    "name" : "int (*)(const hw_module_t *, const char *, hw_device_t **)",
-   "referenced_type" : "type-553",
-   "self_type" : "type-552",
+   "referenced_type" : "type-550",
+   "self_type" : "type-549",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15976,8 +16042,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(framebuffer_device_t *)",
    "name" : "int (*)(framebuffer_device_t *)",
-   "referenced_type" : "type-573",
-   "self_type" : "type-572",
+   "referenced_type" : "type-570",
+   "self_type" : "type-569",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -15985,8 +16051,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(framebuffer_device_t *, const native_handle *)",
    "name" : "int (*)(framebuffer_device_t *, const native_handle *)",
-   "referenced_type" : "type-571",
-   "self_type" : "type-570",
+   "referenced_type" : "type-568",
+   "self_type" : "type-567",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -15994,8 +16060,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(framebuffer_device_t *, int)",
    "name" : "int (*)(framebuffer_device_t *, int)",
-   "referenced_type" : "type-566",
-   "self_type" : "type-565",
+   "referenced_type" : "type-563",
+   "self_type" : "type-562",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16003,8 +16069,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(framebuffer_device_t *, int, int, int, int)",
    "name" : "int (*)(framebuffer_device_t *, int, int, int, int)",
-   "referenced_type" : "type-569",
-   "self_type" : "type-568",
+   "referenced_type" : "type-566",
+   "self_type" : "type-565",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16012,8 +16078,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(hw_device_t *)",
    "name" : "int (*)(hw_device_t *)",
-   "referenced_type" : "type-561",
-   "self_type" : "type-560",
+   "referenced_type" : "type-558",
+   "self_type" : "type-557",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -16021,8 +16087,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
-   "referenced_type" : "type-249",
-   "self_type" : "type-250",
+   "referenced_type" : "type-251",
+   "self_type" : "type-252",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
@@ -16030,8 +16096,8 @@
    "alignment" : 4,
    "linker_set_key" : "int *",
    "name" : "int *",
-   "referenced_type" : "type-103",
-   "self_type" : "type-593",
+   "referenced_type" : "type-105",
+   "self_type" : "type-591",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
@@ -16048,8 +16114,8 @@
    "alignment" : 4,
    "linker_set_key" : "long long *",
    "name" : "long long *",
-   "referenced_type" : "type-284",
-   "self_type" : "type-1432",
+   "referenced_type" : "type-12",
+   "self_type" : "type-11",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16057,7 +16123,7 @@
    "alignment" : 4,
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
-   "referenced_type" : "type-144",
+   "referenced_type" : "type-147",
    "self_type" : "type-1132",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
@@ -16066,8 +16132,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned char *",
    "name" : "unsigned char *",
-   "referenced_type" : "type-218",
-   "self_type" : "type-217",
+   "referenced_type" : "type-220",
+   "self_type" : "type-219",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -16075,8 +16141,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
-   "referenced_type" : "type-123",
-   "self_type" : "type-122",
+   "referenced_type" : "type-125",
+   "self_type" : "type-124",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16084,8 +16150,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned long long *",
    "name" : "unsigned long long *",
-   "referenced_type" : "type-124",
-   "self_type" : "type-219",
+   "referenced_type" : "type-126",
+   "self_type" : "type-221",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16102,8 +16168,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
    "name" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
-   "referenced_type" : "type-221",
-   "self_type" : "type-220",
+   "referenced_type" : "type-223",
+   "self_type" : "type-222",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16111,8 +16177,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(android_native_base_t *)",
    "name" : "void (*)(android_native_base_t *)",
-   "referenced_type" : "type-521",
-   "self_type" : "type-520",
+   "referenced_type" : "type-519",
+   "self_type" : "type-518",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -16120,8 +16186,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(framebuffer_device_t *, char *, int)",
    "name" : "void (*)(framebuffer_device_t *, char *, int)",
-   "referenced_type" : "type-575",
-   "self_type" : "type-574",
+   "referenced_type" : "type-572",
+   "self_type" : "type-571",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16129,8 +16195,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *",
    "name" : "void *",
-   "referenced_type" : "type-151",
-   "self_type" : "type-227",
+   "referenced_type" : "type-154",
+   "self_type" : "type-229",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -16138,8 +16204,8 @@
    "alignment" : 4,
    "linker_set_key" : "void **",
    "name" : "void **",
-   "referenced_type" : "type-227",
-   "self_type" : "type-251",
+   "referenced_type" : "type-229",
+   "self_type" : "type-253",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   }
@@ -16151,8 +16217,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-117",
-   "self_type" : "type-119",
+   "referenced_type" : "type-119",
+   "self_type" : "type-121",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16181,8 +16247,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-13",
-   "self_type" : "type-15",
+   "referenced_type" : "type-1576",
+   "self_type" : "type-1579",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16191,8 +16257,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1572",
-   "self_type" : "type-1574",
+   "referenced_type" : "type-15",
+   "self_type" : "type-37",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16201,8 +16267,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1607",
-   "self_type" : "type-1609",
+   "referenced_type" : "type-1611",
+   "self_type" : "type-1613",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16211,8 +16277,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-174",
-   "self_type" : "type-173",
+   "referenced_type" : "type-177",
+   "self_type" : "type-176",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16221,8 +16287,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1782",
-   "self_type" : "type-1784",
+   "referenced_type" : "type-1783",
+   "self_type" : "type-1785",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16231,8 +16297,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1829",
-   "self_type" : "type-1831",
+   "referenced_type" : "type-1830",
+   "self_type" : "type-1832",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16241,8 +16307,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1834",
-   "self_type" : "type-1836",
+   "referenced_type" : "type-1835",
+   "self_type" : "type-1837",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16251,8 +16317,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1844",
-   "self_type" : "type-1846",
+   "referenced_type" : "type-1845",
+   "self_type" : "type-1847",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16261,8 +16327,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1863",
-   "self_type" : "type-1865",
+   "referenced_type" : "type-1864",
+   "self_type" : "type-1866",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16271,8 +16337,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1929",
-   "self_type" : "type-1931",
+   "referenced_type" : "type-1930",
+   "self_type" : "type-1932",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16281,8 +16347,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2014",
-   "self_type" : "type-2016",
+   "referenced_type" : "type-2015",
+   "self_type" : "type-2017",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16291,8 +16357,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2166",
-   "self_type" : "type-2168",
+   "referenced_type" : "type-2169",
+   "self_type" : "type-2171",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16301,8 +16367,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2244",
-   "self_type" : "type-2246",
+   "referenced_type" : "type-2246",
+   "self_type" : "type-2248",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16311,8 +16377,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2286",
-   "self_type" : "type-2288",
+   "referenced_type" : "type-2288",
+   "self_type" : "type-2290",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16321,8 +16387,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2337",
-   "self_type" : "type-2339",
+   "referenced_type" : "type-2339",
+   "self_type" : "type-2341",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16331,8 +16397,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2456",
-   "self_type" : "type-2455",
+   "referenced_type" : "type-2458",
+   "self_type" : "type-2457",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16341,8 +16407,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2622",
-   "self_type" : "type-2624",
+   "referenced_type" : "type-2624",
+   "self_type" : "type-2626",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16351,8 +16417,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2648",
-   "self_type" : "type-2650",
+   "referenced_type" : "type-2650",
+   "self_type" : "type-2652",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16361,8 +16427,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-407",
-   "self_type" : "type-409",
+   "referenced_type" : "type-404",
+   "self_type" : "type-406",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16371,8 +16437,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-513",
-   "self_type" : "type-515",
+   "referenced_type" : "type-510",
+   "self_type" : "type-512",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16381,8 +16447,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-743",
-   "self_type" : "type-745",
+   "referenced_type" : "type-744",
+   "self_type" : "type-746",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16391,8 +16457,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-850",
-   "self_type" : "type-852",
+   "referenced_type" : "type-851",
+   "self_type" : "type-853",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16421,8 +16487,8 @@
    "is_const" : true,
    "linker_set_key" : "android::hardware::IBinder *const",
    "name" : "android::hardware::IBinder *const",
-   "referenced_type" : "type-195",
-   "self_type" : "type-194",
+   "referenced_type" : "type-208",
+   "self_type" : "type-207",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -16438,32 +16504,32 @@
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-1772",
-   "self_type" : "type-1771",
+   "referenced_type" : "type-1773",
+   "self_type" : "type-1772",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-2134",
-   "self_type" : "type-2133",
+   "referenced_type" : "type-2133",
+   "self_type" : "type-2132",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-2407",
-   "self_type" : "type-2406",
+   "referenced_type" : "type-2409",
+   "self_type" : "type-2408",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const AHardwareBuffer",
    "name" : "const AHardwareBuffer",
-   "referenced_type" : "type-2070",
-   "self_type" : "type-2069",
+   "referenced_type" : "type-2072",
+   "self_type" : "type-2071",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -16479,8 +16545,8 @@
    "is_const" : true,
    "linker_set_key" : "const ANativeWindowBuffer",
    "name" : "const ANativeWindowBuffer",
-   "referenced_type" : "type-517",
-   "self_type" : "type-637",
+   "referenced_type" : "type-515",
+   "self_type" : "type-638",
    "size" : 96,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -16488,32 +16554,32 @@
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-1763",
-   "self_type" : "type-1762",
+   "referenced_type" : "type-1764",
+   "self_type" : "type-1763",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-2047",
-   "self_type" : "type-2046",
+   "referenced_type" : "type-2045",
+   "self_type" : "type-2044",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-2425",
-   "self_type" : "type-2424",
+   "referenced_type" : "type-2427",
+   "self_type" : "type-2426",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-962",
-   "self_type" : "type-961",
+   "referenced_type" : "type-959",
+   "self_type" : "type-958",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
@@ -16521,8 +16587,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
    "name" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
-   "referenced_type" : "type-516",
-   "self_type" : "type-535",
+   "referenced_type" : "type-514",
+   "self_type" : "type-532",
    "size" : 104,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
   },
@@ -16542,7 +16608,7 @@
    "linker_set_key" : "const android::ColorSpace::TransferParameters",
    "name" : "const android::ColorSpace::TransferParameters",
    "referenced_type" : "type-981",
-   "self_type" : "type-1033",
+   "self_type" : "type-1030",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -16571,8 +16637,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime",
    "name" : "const android::FenceTime",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1395",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1399",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -16581,8 +16647,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot",
    "name" : "const android::FenceTime::Snapshot",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1388",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1393",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -16591,8 +16657,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot::State",
    "name" : "const android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1406",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1410",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16601,8 +16667,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::State",
    "name" : "const android::FenceTime::State",
-   "referenced_type" : "type-1378",
-   "self_type" : "type-1377",
+   "referenced_type" : "type-1383",
+   "self_type" : "type-1382",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -16621,8 +16687,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FrameStats",
    "name" : "const android::FrameStats",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1428",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1432",
    "size" : 68,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
@@ -16631,8 +16697,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Gralloc2Allocator",
    "name" : "const android::Gralloc2Allocator",
-   "referenced_type" : "type-353",
-   "self_type" : "type-361",
+   "referenced_type" : "type-350",
+   "self_type" : "type-358",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -16641,8 +16707,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Gralloc2Mapper",
    "name" : "const android::Gralloc2Mapper",
-   "referenced_type" : "type-337",
-   "self_type" : "type-344",
+   "referenced_type" : "type-334",
+   "self_type" : "type-341",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -16651,8 +16717,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-2060",
-   "self_type" : "type-2059",
+   "referenced_type" : "type-2062",
+   "self_type" : "type-2061",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -16661,8 +16727,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-2226",
-   "self_type" : "type-2225",
+   "referenced_type" : "type-2229",
+   "self_type" : "type-2228",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -16671,8 +16737,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-2230",
-   "self_type" : "type-2229",
+   "referenced_type" : "type-2232",
+   "self_type" : "type-2231",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -16691,8 +16757,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-803",
-   "self_type" : "type-802",
+   "referenced_type" : "type-804",
+   "self_type" : "type-803",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -16701,8 +16767,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-828",
-   "self_type" : "type-827",
+   "referenced_type" : "type-829",
+   "self_type" : "type-828",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -16711,8 +16777,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-525",
-   "self_type" : "type-624",
+   "referenced_type" : "type-523",
+   "self_type" : "type-625",
    "size" : 152,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -16721,8 +16787,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferAllocator",
    "name" : "const android::GraphicBufferAllocator",
-   "referenced_type" : "type-542",
-   "self_type" : "type-720",
+   "referenced_type" : "type-539",
+   "self_type" : "type-721",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -16731,7 +16797,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferAllocator::alloc_rec_t",
    "name" : "const android::GraphicBufferAllocator::alloc_rec_t",
-   "referenced_type" : "type-676",
+   "referenced_type" : "type-680",
    "self_type" : "type-706",
    "size" : 44,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -16741,8 +16807,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferMapper",
    "name" : "const android::GraphicBufferMapper",
-   "referenced_type" : "type-527",
-   "self_type" : "type-614",
+   "referenced_type" : "type-525",
+   "self_type" : "type-615",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -16752,7 +16818,7 @@
    "linker_set_key" : "const android::HdrCapabilities",
    "name" : "const android::HdrCapabilities",
    "referenced_type" : "type-964",
-   "self_type" : "type-972",
+   "self_type" : "type-973",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -16761,8 +16827,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-715",
-   "self_type" : "type-717",
+   "referenced_type" : "type-716",
+   "self_type" : "type-718",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -16772,7 +16838,7 @@
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect>",
    "name" : "const android::LightFlattenablePod<android::Rect>",
    "referenced_type" : "type-1243",
-   "self_type" : "type-2397",
+   "self_type" : "type-2399",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16821,7 +16887,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
-   "referenced_type" : "type-172",
+   "referenced_type" : "type-175",
    "self_type" : "type-1078",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
@@ -16831,8 +16897,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Region",
    "name" : "const android::Region",
-   "referenced_type" : "type-2389",
-   "self_type" : "type-2388",
+   "referenced_type" : "type-2391",
+   "self_type" : "type-2390",
    "size" : 20,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -16851,8 +16917,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-179",
-   "self_type" : "type-184",
+   "referenced_type" : "type-182",
+   "self_type" : "type-187",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -16861,8 +16927,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
-   "referenced_type" : "type-285",
-   "self_type" : "type-873",
+   "referenced_type" : "type-282",
+   "self_type" : "type-863",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -16871,8 +16937,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<android::Rect>",
    "name" : "const android::Vector<android::Rect>",
-   "referenced_type" : "type-2382",
-   "self_type" : "type-2384",
+   "referenced_type" : "type-2384",
+   "self_type" : "type-2386",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16881,8 +16947,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<long long>",
    "name" : "const android::Vector<long long>",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1425",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1429",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16891,8 +16957,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
-   "referenced_type" : "type-235",
-   "self_type" : "type-1422",
+   "referenced_type" : "type-237",
+   "self_type" : "type-1426",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -16912,7 +16978,7 @@
    "linker_set_key" : "const android::details::TMat33<float>",
    "name" : "const android::details::TMat33<float>",
    "referenced_type" : "type-903",
-   "self_type" : "type-925",
+   "self_type" : "type-919",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -16921,8 +16987,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TMat44<float>",
    "name" : "const android::details::TMat44<float>",
-   "referenced_type" : "type-2427",
-   "self_type" : "type-2431",
+   "referenced_type" : "type-2429",
+   "self_type" : "type-2433",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -16931,8 +16997,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TQuaternion<double>",
    "name" : "const android::details::TQuaternion<double>",
-   "referenced_type" : "type-331",
-   "self_type" : "type-404",
+   "referenced_type" : "type-328",
+   "self_type" : "type-401",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -16941,8 +17007,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TQuaternion<float>",
    "name" : "const android::details::TQuaternion<float>",
-   "referenced_type" : "type-410",
-   "self_type" : "type-432",
+   "referenced_type" : "type-407",
+   "self_type" : "type-429",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -16961,7 +17027,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec2<double>",
    "name" : "const android::details::TVec2<double>",
-   "referenced_type" : "type-55",
+   "referenced_type" : "type-57",
    "self_type" : "type-1070",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -16971,7 +17037,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec2<float>",
    "name" : "const android::details::TVec2<float>",
-   "referenced_type" : "type-22",
+   "referenced_type" : "type-23",
    "self_type" : "type-1051",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -16981,7 +17047,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec3<double>",
    "name" : "const android::details::TVec3<double>",
-   "referenced_type" : "type-66",
+   "referenced_type" : "type-68",
    "self_type" : "type-1369",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
@@ -16991,7 +17057,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec3<float>",
    "name" : "const android::details::TVec3<float>",
-   "referenced_type" : "type-17",
+   "referenced_type" : "type-18",
    "self_type" : "type-1055",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -17001,8 +17067,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec4<double>",
    "name" : "const android::details::TVec4<double>",
-   "referenced_type" : "type-50",
-   "self_type" : "type-166",
+   "referenced_type" : "type-52",
+   "self_type" : "type-164",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -17011,8 +17077,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec4<float>",
    "name" : "const android::details::TVec4<float>",
-   "referenced_type" : "type-200",
-   "self_type" : "type-325",
+   "referenced_type" : "type-192",
+   "self_type" : "type-322",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -17022,7 +17088,7 @@
    "linker_set_key" : "const android::half",
    "name" : "const android::half",
    "referenced_type" : "type-1",
-   "self_type" : "type-42",
+   "self_type" : "type-44",
    "size" : 2,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -17051,8 +17117,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::BpHwRefBase",
    "name" : "const android::hardware::BpHwRefBase",
-   "referenced_type" : "type-193",
-   "self_type" : "type-211",
+   "referenced_type" : "type-206",
+   "self_type" : "type-213",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -17061,8 +17127,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-215",
-   "self_type" : "type-231",
+   "referenced_type" : "type-217",
+   "self_type" : "type-233",
    "size" : 68,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -17071,8 +17137,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
-   "referenced_type" : "type-99",
-   "self_type" : "type-109",
+   "referenced_type" : "type-101",
+   "self_type" : "type-111",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17081,8 +17147,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
-   "referenced_type" : "type-393",
-   "self_type" : "type-401",
+   "referenced_type" : "type-392",
+   "self_type" : "type-398",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17091,8 +17157,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
-   "referenced_type" : "type-111",
-   "self_type" : "type-115",
+   "referenced_type" : "type-113",
+   "self_type" : "type-117",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17101,7 +17167,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Status",
    "name" : "const android::hardware::Status",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1310",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -17121,8 +17187,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
-   "referenced_type" : "type-136",
-   "self_type" : "type-293",
+   "referenced_type" : "type-139",
+   "self_type" : "type-290",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17131,8 +17197,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned int>",
    "name" : "const android::hardware::details::hidl_pointer<unsigned int>",
-   "referenced_type" : "type-120",
-   "self_type" : "type-190",
+   "referenced_type" : "type-122",
+   "self_type" : "type-203",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17141,7 +17207,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::return_status",
    "name" : "const android::hardware::details::return_status",
-   "referenced_type" : "type-101",
+   "referenced_type" : "type-103",
    "self_type" : "type-1319",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -17151,8 +17217,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
-   "referenced_type" : "type-1745",
-   "self_type" : "type-1744",
+   "referenced_type" : "type-1746",
+   "self_type" : "type-1745",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17161,8 +17227,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
-   "referenced_type" : "type-1911",
-   "self_type" : "type-1910",
+   "referenced_type" : "type-1913",
+   "self_type" : "type-1912",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17171,8 +17237,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
-   "referenced_type" : "type-382",
-   "self_type" : "type-381",
+   "referenced_type" : "type-379",
+   "self_type" : "type-378",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17181,8 +17247,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
-   "referenced_type" : "type-2004",
-   "self_type" : "type-2003",
+   "referenced_type" : "type-2005",
+   "self_type" : "type-2004",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17191,8 +17257,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
-   "referenced_type" : "type-495",
-   "self_type" : "type-494",
+   "referenced_type" : "type-492",
+   "self_type" : "type-491",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17201,8 +17267,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_0::BufferUsage",
-   "referenced_type" : "type-150",
-   "self_type" : "type-153",
+   "referenced_type" : "type-153",
+   "self_type" : "type-156",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -17271,8 +17337,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_1::BufferUsage",
-   "referenced_type" : "type-158",
-   "self_type" : "type-160",
+   "referenced_type" : "type-160",
+   "self_type" : "type-162",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -17321,8 +17387,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_2::BufferUsage",
-   "referenced_type" : "type-420",
-   "self_type" : "type-422",
+   "referenced_type" : "type-417",
+   "self_type" : "type-419",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -17371,8 +17437,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper",
-   "referenced_type" : "type-1585",
-   "self_type" : "type-1584",
+   "referenced_type" : "type-1589",
+   "self_type" : "type-1588",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17381,8 +17447,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper",
-   "referenced_type" : "type-1857",
-   "self_type" : "type-1856",
+   "referenced_type" : "type-1858",
+   "self_type" : "type-1857",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17391,8 +17457,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper",
-   "referenced_type" : "type-85",
-   "self_type" : "type-84",
+   "referenced_type" : "type-87",
+   "self_type" : "type-86",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17401,8 +17467,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper",
-   "referenced_type" : "type-1595",
-   "self_type" : "type-1594",
+   "referenced_type" : "type-1599",
+   "self_type" : "type-1598",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17411,8 +17477,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper",
-   "referenced_type" : "type-1861",
-   "self_type" : "type-1860",
+   "referenced_type" : "type-1862",
+   "self_type" : "type-1861",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17421,8 +17487,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper",
-   "referenced_type" : "type-97",
-   "self_type" : "type-96",
+   "referenced_type" : "type-99",
+   "self_type" : "type-98",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17431,8 +17497,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper",
-   "referenced_type" : "type-1919",
-   "self_type" : "type-1918",
+   "referenced_type" : "type-1920",
+   "self_type" : "type-1919",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17441,8 +17507,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper",
-   "referenced_type" : "type-392",
-   "self_type" : "type-391",
+   "referenced_type" : "type-389",
+   "self_type" : "type-388",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17461,8 +17527,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
-   "referenced_type" : "type-149",
-   "self_type" : "type-154",
+   "referenced_type" : "type-152",
+   "self_type" : "type-157",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17471,8 +17537,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
-   "referenced_type" : "type-157",
-   "self_type" : "type-161",
+   "referenced_type" : "type-159",
+   "self_type" : "type-163",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17481,8 +17547,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
-   "referenced_type" : "type-419",
-   "self_type" : "type-423",
+   "referenced_type" : "type-416",
+   "self_type" : "type-420",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17491,7 +17557,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-139",
+   "referenced_type" : "type-142",
    "self_type" : "type-1121",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -17521,8 +17587,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_handle>",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_handle>",
-   "referenced_type" : "type-135",
-   "self_type" : "type-146",
+   "referenced_type" : "type-138",
+   "self_type" : "type-149",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17531,8 +17597,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned int>",
    "name" : "const android::hardware::hidl_vec<unsigned int>",
-   "referenced_type" : "type-128",
-   "self_type" : "type-132",
+   "referenced_type" : "type-131",
+   "self_type" : "type-134",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17551,8 +17617,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "const android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-164",
-   "self_type" : "type-165",
+   "referenced_type" : "type-167",
+   "self_type" : "type-168",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -17561,8 +17627,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase",
    "name" : "const android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-171",
-   "self_type" : "type-170",
+   "referenced_type" : "type-174",
+   "self_type" : "type-173",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
@@ -17571,8 +17637,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-295",
-   "self_type" : "type-294",
+   "referenced_type" : "type-292",
+   "self_type" : "type-291",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
@@ -17601,8 +17667,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::IBinder>",
    "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-248",
-   "self_type" : "type-273",
+   "referenced_type" : "type-250",
+   "self_type" : "type-269",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -17611,8 +17677,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::ProcessState>",
    "name" : "const android::sp<android::hardware::ProcessState>",
-   "referenced_type" : "type-279",
-   "self_type" : "type-278",
+   "referenced_type" : "type-275",
+   "self_type" : "type-274",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -17621,8 +17687,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
    "name" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
-   "referenced_type" : "type-355",
-   "self_type" : "type-379",
+   "referenced_type" : "type-352",
+   "self_type" : "type-376",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17631,8 +17697,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
    "name" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
-   "referenced_type" : "type-484",
-   "self_type" : "type-492",
+   "referenced_type" : "type-481",
+   "self_type" : "type-489",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17641,8 +17707,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
-   "referenced_type" : "type-338",
-   "self_type" : "type-387",
+   "referenced_type" : "type-335",
+   "self_type" : "type-384",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17651,8 +17717,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
-   "referenced_type" : "type-86",
-   "self_type" : "type-91",
+   "referenced_type" : "type-88",
+   "self_type" : "type-93",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17661,8 +17727,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
    "name" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
-   "referenced_type" : "type-497",
-   "self_type" : "type-505",
+   "referenced_type" : "type-494",
+   "self_type" : "type-502",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17681,8 +17747,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::base::V1_0::IBase>",
    "name" : "const android::sp<android::hidl::base::V1_0::IBase>",
-   "referenced_type" : "type-363",
-   "self_type" : "type-365",
+   "referenced_type" : "type-360",
+   "self_type" : "type-362",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17691,8 +17757,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification>",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification>",
-   "referenced_type" : "type-371",
-   "self_type" : "type-374",
+   "referenced_type" : "type-368",
+   "self_type" : "type-371",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17711,8 +17777,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ui::Transform",
    "name" : "const android::ui::Transform",
-   "referenced_type" : "type-2434",
-   "self_type" : "type-2437",
+   "referenced_type" : "type-2436",
+   "self_type" : "type-2439",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -17721,8 +17787,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ui::Transform::mat33",
    "name" : "const android::ui::Transform::mat33",
-   "referenced_type" : "type-2435",
-   "self_type" : "type-2445",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2447",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -17732,7 +17798,7 @@
    "linker_set_key" : "const bool",
    "name" : "const bool",
    "referenced_type" : "type-6",
-   "self_type" : "type-370",
+   "self_type" : "type-367",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -17741,8 +17807,8 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-288",
-   "self_type" : "type-287",
+   "referenced_type" : "type-285",
+   "self_type" : "type-284",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -17751,8 +17817,8 @@
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-182",
-   "self_type" : "type-181",
+   "referenced_type" : "type-185",
+   "self_type" : "type-184",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -17761,8 +17827,8 @@
    "is_const" : true,
    "linker_set_key" : "const double",
    "name" : "const double",
-   "referenced_type" : "type-41",
-   "self_type" : "type-853",
+   "referenced_type" : "type-43",
+   "self_type" : "type-850",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17772,7 +17838,7 @@
    "linker_set_key" : "const float",
    "name" : "const float",
    "referenced_type" : "type-10",
-   "self_type" : "type-563",
+   "self_type" : "type-560",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
   },
@@ -17788,24 +17854,24 @@
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-1775",
-   "self_type" : "type-1774",
+   "referenced_type" : "type-1776",
+   "self_type" : "type-1775",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-2210",
-   "self_type" : "type-2209",
+   "referenced_type" : "type-2208",
+   "self_type" : "type-2207",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-2413",
-   "self_type" : "type-2412",
+   "referenced_type" : "type-2415",
+   "self_type" : "type-2414",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
@@ -17813,8 +17879,8 @@
    "is_const" : true,
    "linker_set_key" : "const gralloc_module_t",
    "name" : "const gralloc_module_t",
-   "referenced_type" : "type-578",
-   "self_type" : "type-582",
+   "referenced_type" : "type-576",
+   "self_type" : "type-580",
    "size" : 176,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -17823,8 +17889,8 @@
    "is_const" : true,
    "linker_set_key" : "const hw_module_t",
    "name" : "const hw_module_t",
-   "referenced_type" : "type-549",
-   "self_type" : "type-555",
+   "referenced_type" : "type-546",
+   "self_type" : "type-552",
    "size" : 128,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -17833,8 +17899,8 @@
    "is_const" : true,
    "linker_set_key" : "const int",
    "name" : "const int",
-   "referenced_type" : "type-103",
-   "self_type" : "type-562",
+   "referenced_type" : "type-105",
+   "self_type" : "type-559",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -17850,120 +17916,120 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-126",
-   "self_type" : "type-125",
+   "referenced_type" : "type-129",
+   "self_type" : "type-128",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1577",
-   "self_type" : "type-1576",
+   "referenced_type" : "type-1581",
+   "self_type" : "type-1580",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1612",
-   "self_type" : "type-1611",
+   "referenced_type" : "type-1617",
+   "self_type" : "type-1616",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1787",
-   "self_type" : "type-1786",
+   "referenced_type" : "type-1788",
+   "self_type" : "type-1787",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1848",
-   "self_type" : "type-1847",
+   "referenced_type" : "type-1849",
+   "self_type" : "type-1848",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1867",
-   "self_type" : "type-1866",
+   "referenced_type" : "type-1868",
+   "self_type" : "type-1867",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1934",
-   "self_type" : "type-1933",
+   "referenced_type" : "type-1936",
+   "self_type" : "type-1935",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2080",
-   "self_type" : "type-2079",
+   "referenced_type" : "type-2082",
+   "self_type" : "type-2081",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2171",
-   "self_type" : "type-2170",
+   "referenced_type" : "type-2174",
+   "self_type" : "type-2173",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2248",
-   "self_type" : "type-2247",
+   "referenced_type" : "type-2250",
+   "self_type" : "type-2249",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2290",
-   "self_type" : "type-2289",
+   "referenced_type" : "type-2292",
+   "self_type" : "type-2291",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2341",
-   "self_type" : "type-2340",
+   "referenced_type" : "type-2343",
+   "self_type" : "type-2342",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2472",
-   "self_type" : "type-2471",
+   "referenced_type" : "type-2474",
+   "self_type" : "type-2473",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-37",
-   "self_type" : "type-36",
+   "referenced_type" : "type-40",
+   "self_type" : "type-39",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-417",
-   "self_type" : "type-416",
+   "referenced_type" : "type-414",
+   "self_type" : "type-413",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -17978,16 +18044,16 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-748",
-   "self_type" : "type-747",
+   "referenced_type" : "type-749",
+   "self_type" : "type-748",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-855",
-   "self_type" : "type-854",
+   "referenced_type" : "type-857",
+   "self_type" : "type-856",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -18021,7 +18087,7 @@
    "is_const" : true,
    "linker_set_key" : "const long long",
    "name" : "const long long",
-   "referenced_type" : "type-284",
+   "referenced_type" : "type-12",
    "self_type" : "type-847",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -18031,8 +18097,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle",
    "name" : "const native_handle",
-   "referenced_type" : "type-144",
-   "self_type" : "type-143",
+   "referenced_type" : "type-147",
+   "self_type" : "type-146",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18041,8 +18107,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle *const",
    "name" : "const native_handle *const",
-   "referenced_type" : "type-142",
-   "self_type" : "type-696",
+   "referenced_type" : "type-145",
+   "self_type" : "type-699",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18052,7 +18118,7 @@
    "linker_set_key" : "const short",
    "name" : "const short",
    "referenced_type" : "type-599",
-   "self_type" : "type-825",
+   "self_type" : "type-823",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18081,8 +18147,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3>",
    "name" : "const std::array<android::details::TVec2<float>, 3>",
-   "referenced_type" : "type-1769",
-   "self_type" : "type-1768",
+   "referenced_type" : "type-1770",
+   "self_type" : "type-1769",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -18091,8 +18157,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3>",
    "name" : "const std::array<android::details::TVec2<float>, 3>",
-   "referenced_type" : "type-2122",
-   "self_type" : "type-2121",
+   "referenced_type" : "type-2120",
+   "self_type" : "type-2119",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -18111,8 +18177,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1687",
-   "self_type" : "type-1686",
+   "referenced_type" : "type-1688",
+   "self_type" : "type-1687",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18121,8 +18187,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1793",
-   "self_type" : "type-1792",
+   "referenced_type" : "type-1794",
+   "self_type" : "type-1793",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18131,8 +18197,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1880",
-   "self_type" : "type-1879",
+   "referenced_type" : "type-1881",
+   "self_type" : "type-1880",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18141,8 +18207,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1956",
-   "self_type" : "type-1955",
+   "referenced_type" : "type-1958",
+   "self_type" : "type-1957",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18151,8 +18217,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2087",
-   "self_type" : "type-2086",
+   "referenced_type" : "type-2090",
+   "self_type" : "type-2089",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18161,8 +18227,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2185",
-   "self_type" : "type-2184",
+   "referenced_type" : "type-2188",
+   "self_type" : "type-2187",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18171,8 +18237,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2255",
-   "self_type" : "type-2254",
+   "referenced_type" : "type-2257",
+   "self_type" : "type-2256",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18181,8 +18247,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2295",
-   "self_type" : "type-2294",
+   "referenced_type" : "type-2297",
+   "self_type" : "type-2296",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18191,8 +18257,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2346",
-   "self_type" : "type-2345",
+   "referenced_type" : "type-2348",
+   "self_type" : "type-2347",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18201,8 +18267,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2510",
-   "self_type" : "type-2509",
+   "referenced_type" : "type-2512",
+   "self_type" : "type-2511",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18211,8 +18277,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-302",
-   "self_type" : "type-301",
+   "referenced_type" : "type-299",
+   "self_type" : "type-298",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18221,8 +18287,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-442",
-   "self_type" : "type-441",
+   "referenced_type" : "type-439",
+   "self_type" : "type-438",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18241,8 +18307,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-762",
-   "self_type" : "type-761",
+   "referenced_type" : "type-764",
+   "self_type" : "type-763",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18251,8 +18317,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-866",
-   "self_type" : "type-865",
+   "referenced_type" : "type-867",
+   "self_type" : "type-866",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18261,8 +18327,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-922",
-   "self_type" : "type-921",
+   "referenced_type" : "type-923",
+   "self_type" : "type-922",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18281,8 +18347,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1001",
-   "self_type" : "type-1000",
+   "referenced_type" : "type-1002",
+   "self_type" : "type-1001",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18301,8 +18367,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1693",
-   "self_type" : "type-1692",
+   "referenced_type" : "type-1694",
+   "self_type" : "type-1693",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18311,8 +18377,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1799",
-   "self_type" : "type-1798",
+   "referenced_type" : "type-1800",
+   "self_type" : "type-1799",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18321,8 +18387,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1886",
-   "self_type" : "type-1885",
+   "referenced_type" : "type-1887",
+   "self_type" : "type-1886",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18331,8 +18397,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1963",
-   "self_type" : "type-1962",
+   "referenced_type" : "type-1964",
+   "self_type" : "type-1963",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18341,8 +18407,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2093",
-   "self_type" : "type-2092",
+   "referenced_type" : "type-2096",
+   "self_type" : "type-2095",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18351,8 +18417,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2192",
-   "self_type" : "type-2191",
+   "referenced_type" : "type-2195",
+   "self_type" : "type-2194",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18361,8 +18427,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2261",
-   "self_type" : "type-2260",
+   "referenced_type" : "type-2263",
+   "self_type" : "type-2262",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18371,8 +18437,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2301",
-   "self_type" : "type-2300",
+   "referenced_type" : "type-2303",
+   "self_type" : "type-2302",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18381,8 +18447,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2352",
-   "self_type" : "type-2351",
+   "referenced_type" : "type-2354",
+   "self_type" : "type-2353",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18391,8 +18457,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2516",
-   "self_type" : "type-2515",
+   "referenced_type" : "type-2518",
+   "self_type" : "type-2517",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18401,8 +18467,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-308",
-   "self_type" : "type-307",
+   "referenced_type" : "type-306",
+   "self_type" : "type-305",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18411,8 +18477,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-448",
-   "self_type" : "type-447",
+   "referenced_type" : "type-445",
+   "self_type" : "type-444",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18421,8 +18487,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-658",
-   "self_type" : "type-657",
+   "referenced_type" : "type-659",
+   "self_type" : "type-658",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18441,8 +18507,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-872",
-   "self_type" : "type-871",
+   "referenced_type" : "type-873",
+   "self_type" : "type-872",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18451,8 +18517,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-929",
-   "self_type" : "type-928",
+   "referenced_type" : "type-930",
+   "self_type" : "type-929",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18461,8 +18527,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1003",
-   "self_type" : "type-1002",
+   "referenced_type" : "type-1004",
+   "self_type" : "type-1003",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18481,8 +18547,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1695",
-   "self_type" : "type-1694",
+   "referenced_type" : "type-1696",
+   "self_type" : "type-1695",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18491,8 +18557,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1801",
-   "self_type" : "type-1800",
+   "referenced_type" : "type-1802",
+   "self_type" : "type-1801",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18501,8 +18567,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1888",
-   "self_type" : "type-1887",
+   "referenced_type" : "type-1889",
+   "self_type" : "type-1888",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18511,8 +18577,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1965",
-   "self_type" : "type-1964",
+   "referenced_type" : "type-1967",
+   "self_type" : "type-1966",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18521,8 +18587,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2095",
-   "self_type" : "type-2094",
+   "referenced_type" : "type-2098",
+   "self_type" : "type-2097",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18531,8 +18597,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2194",
-   "self_type" : "type-2193",
+   "referenced_type" : "type-2197",
+   "self_type" : "type-2196",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18541,8 +18607,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2263",
-   "self_type" : "type-2262",
+   "referenced_type" : "type-2265",
+   "self_type" : "type-2264",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18551,8 +18617,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2303",
-   "self_type" : "type-2302",
+   "referenced_type" : "type-2305",
+   "self_type" : "type-2304",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18561,8 +18627,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2354",
-   "self_type" : "type-2353",
+   "referenced_type" : "type-2356",
+   "self_type" : "type-2355",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18571,8 +18637,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2518",
-   "self_type" : "type-2517",
+   "referenced_type" : "type-2520",
+   "self_type" : "type-2519",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18581,8 +18647,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-311",
-   "self_type" : "type-310",
+   "referenced_type" : "type-308",
+   "self_type" : "type-307",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18591,8 +18657,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-450",
-   "self_type" : "type-449",
+   "referenced_type" : "type-447",
+   "self_type" : "type-446",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18601,8 +18667,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-660",
-   "self_type" : "type-659",
+   "referenced_type" : "type-661",
+   "self_type" : "type-660",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18621,8 +18687,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-875",
-   "self_type" : "type-874",
+   "referenced_type" : "type-876",
+   "self_type" : "type-875",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18631,8 +18697,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-931",
-   "self_type" : "type-930",
+   "referenced_type" : "type-932",
+   "self_type" : "type-931",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18651,8 +18717,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1691",
-   "self_type" : "type-1690",
+   "referenced_type" : "type-1692",
+   "self_type" : "type-1691",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18661,8 +18727,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1797",
-   "self_type" : "type-1796",
+   "referenced_type" : "type-1798",
+   "self_type" : "type-1797",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18671,8 +18737,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1884",
-   "self_type" : "type-1883",
+   "referenced_type" : "type-1885",
+   "self_type" : "type-1884",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18681,8 +18747,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1961",
-   "self_type" : "type-1960",
+   "referenced_type" : "type-1962",
+   "self_type" : "type-1961",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18691,8 +18757,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2091",
-   "self_type" : "type-2090",
+   "referenced_type" : "type-2094",
+   "self_type" : "type-2093",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18701,8 +18767,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2189",
-   "self_type" : "type-2188",
+   "referenced_type" : "type-2192",
+   "self_type" : "type-2191",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18711,8 +18777,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2259",
-   "self_type" : "type-2258",
+   "referenced_type" : "type-2261",
+   "self_type" : "type-2260",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18721,8 +18787,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2299",
-   "self_type" : "type-2298",
+   "referenced_type" : "type-2301",
+   "self_type" : "type-2300",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18731,8 +18797,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2350",
-   "self_type" : "type-2349",
+   "referenced_type" : "type-2352",
+   "self_type" : "type-2351",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18741,8 +18807,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2514",
-   "self_type" : "type-2513",
+   "referenced_type" : "type-2516",
+   "self_type" : "type-2515",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18751,8 +18817,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-306",
-   "self_type" : "type-305",
+   "referenced_type" : "type-303",
+   "self_type" : "type-302",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18761,8 +18827,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-446",
-   "self_type" : "type-445",
+   "referenced_type" : "type-443",
+   "self_type" : "type-442",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18771,8 +18837,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-656",
-   "self_type" : "type-655",
+   "referenced_type" : "type-657",
+   "self_type" : "type-656",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18781,8 +18847,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-766",
-   "self_type" : "type-765",
+   "referenced_type" : "type-768",
+   "self_type" : "type-767",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18791,8 +18857,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-870",
-   "self_type" : "type-869",
+   "referenced_type" : "type-871",
+   "self_type" : "type-870",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18801,8 +18867,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-927",
-   "self_type" : "type-926",
+   "referenced_type" : "type-928",
+   "self_type" : "type-927",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18821,8 +18887,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1005",
-   "self_type" : "type-1004",
+   "referenced_type" : "type-1006",
+   "self_type" : "type-1005",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18841,8 +18907,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1697",
-   "self_type" : "type-1696",
+   "referenced_type" : "type-1698",
+   "self_type" : "type-1697",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18851,8 +18917,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1803",
-   "self_type" : "type-1802",
+   "referenced_type" : "type-1804",
+   "self_type" : "type-1803",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18861,8 +18927,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1890",
-   "self_type" : "type-1889",
+   "referenced_type" : "type-1891",
+   "self_type" : "type-1890",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18871,8 +18937,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1967",
-   "self_type" : "type-1966",
+   "referenced_type" : "type-1969",
+   "self_type" : "type-1968",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18881,8 +18947,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2098",
-   "self_type" : "type-2097",
+   "referenced_type" : "type-2102",
+   "self_type" : "type-2101",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18891,8 +18957,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2196",
-   "self_type" : "type-2195",
+   "referenced_type" : "type-2199",
+   "self_type" : "type-2198",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18901,8 +18967,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2265",
-   "self_type" : "type-2264",
+   "referenced_type" : "type-2267",
+   "self_type" : "type-2266",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18911,8 +18977,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2305",
-   "self_type" : "type-2304",
+   "referenced_type" : "type-2307",
+   "self_type" : "type-2306",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18921,8 +18987,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2356",
-   "self_type" : "type-2355",
+   "referenced_type" : "type-2358",
+   "self_type" : "type-2357",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18931,8 +18997,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2520",
-   "self_type" : "type-2519",
+   "referenced_type" : "type-2522",
+   "self_type" : "type-2521",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18941,8 +19007,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-313",
-   "self_type" : "type-312",
+   "referenced_type" : "type-310",
+   "self_type" : "type-309",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18951,8 +19017,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-452",
-   "self_type" : "type-451",
+   "referenced_type" : "type-449",
+   "self_type" : "type-448",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18981,8 +19047,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-877",
-   "self_type" : "type-876",
+   "referenced_type" : "type-878",
+   "self_type" : "type-877",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18991,8 +19057,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-933",
-   "self_type" : "type-932",
+   "referenced_type" : "type-934",
+   "self_type" : "type-933",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19011,8 +19077,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1685",
-   "self_type" : "type-1684",
+   "referenced_type" : "type-1686",
+   "self_type" : "type-1685",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19021,8 +19087,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1791",
-   "self_type" : "type-1790",
+   "referenced_type" : "type-1792",
+   "self_type" : "type-1791",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19031,8 +19097,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1878",
-   "self_type" : "type-1877",
+   "referenced_type" : "type-1879",
+   "self_type" : "type-1878",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19041,8 +19107,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1954",
-   "self_type" : "type-1953",
+   "referenced_type" : "type-1955",
+   "self_type" : "type-1954",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19051,8 +19117,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2085",
-   "self_type" : "type-2084",
+   "referenced_type" : "type-2087",
+   "self_type" : "type-2086",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19061,8 +19127,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2183",
-   "self_type" : "type-2182",
+   "referenced_type" : "type-2186",
+   "self_type" : "type-2185",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19071,8 +19137,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2253",
-   "self_type" : "type-2252",
+   "referenced_type" : "type-2255",
+   "self_type" : "type-2254",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19081,8 +19147,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2293",
-   "self_type" : "type-2292",
+   "referenced_type" : "type-2295",
+   "self_type" : "type-2294",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19091,8 +19157,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2344",
-   "self_type" : "type-2343",
+   "referenced_type" : "type-2346",
+   "self_type" : "type-2345",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19101,8 +19167,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2508",
-   "self_type" : "type-2507",
+   "referenced_type" : "type-2510",
+   "self_type" : "type-2509",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19111,8 +19177,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-300",
-   "self_type" : "type-299",
+   "referenced_type" : "type-297",
+   "self_type" : "type-296",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19121,8 +19187,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-440",
-   "self_type" : "type-439",
+   "referenced_type" : "type-437",
+   "self_type" : "type-436",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19131,8 +19197,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-649",
-   "self_type" : "type-648",
+   "referenced_type" : "type-650",
+   "self_type" : "type-649",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19151,8 +19217,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-863",
-   "self_type" : "type-862",
+   "referenced_type" : "type-865",
+   "self_type" : "type-864",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19161,8 +19227,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-920",
-   "self_type" : "type-919",
+   "referenced_type" : "type-921",
+   "self_type" : "type-920",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19191,8 +19257,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1689",
-   "self_type" : "type-1688",
+   "referenced_type" : "type-1690",
+   "self_type" : "type-1689",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19201,8 +19267,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1795",
-   "self_type" : "type-1794",
+   "referenced_type" : "type-1796",
+   "self_type" : "type-1795",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19211,8 +19277,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1882",
-   "self_type" : "type-1881",
+   "referenced_type" : "type-1883",
+   "self_type" : "type-1882",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19221,8 +19287,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1958",
-   "self_type" : "type-1957",
+   "referenced_type" : "type-1960",
+   "self_type" : "type-1959",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19231,8 +19297,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2089",
-   "self_type" : "type-2088",
+   "referenced_type" : "type-2092",
+   "self_type" : "type-2091",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19241,8 +19307,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2187",
-   "self_type" : "type-2186",
+   "referenced_type" : "type-2190",
+   "self_type" : "type-2189",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19251,8 +19317,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2257",
-   "self_type" : "type-2256",
+   "referenced_type" : "type-2259",
+   "self_type" : "type-2258",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19261,8 +19327,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2297",
-   "self_type" : "type-2296",
+   "referenced_type" : "type-2299",
+   "self_type" : "type-2298",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19271,8 +19337,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2348",
-   "self_type" : "type-2347",
+   "referenced_type" : "type-2350",
+   "self_type" : "type-2349",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19281,8 +19347,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2512",
-   "self_type" : "type-2511",
+   "referenced_type" : "type-2514",
+   "self_type" : "type-2513",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19291,8 +19357,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-304",
-   "self_type" : "type-303",
+   "referenced_type" : "type-301",
+   "self_type" : "type-300",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19301,8 +19367,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-444",
-   "self_type" : "type-443",
+   "referenced_type" : "type-441",
+   "self_type" : "type-440",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19321,8 +19387,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-764",
-   "self_type" : "type-763",
+   "referenced_type" : "type-766",
+   "self_type" : "type-765",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19331,8 +19397,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-868",
-   "self_type" : "type-867",
+   "referenced_type" : "type-869",
+   "self_type" : "type-868",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19341,8 +19407,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-924",
-   "self_type" : "type-923",
+   "referenced_type" : "type-925",
+   "self_type" : "type-924",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19361,8 +19427,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1010",
-   "self_type" : "type-1009",
+   "referenced_type" : "type-1012",
+   "self_type" : "type-1011",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19381,8 +19447,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1702",
-   "self_type" : "type-1701",
+   "referenced_type" : "type-1703",
+   "self_type" : "type-1702",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19391,8 +19457,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1807",
-   "self_type" : "type-1806",
+   "referenced_type" : "type-1808",
+   "self_type" : "type-1807",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19401,8 +19467,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1894",
-   "self_type" : "type-1893",
+   "referenced_type" : "type-1895",
+   "self_type" : "type-1894",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19411,8 +19477,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1972",
-   "self_type" : "type-1971",
+   "referenced_type" : "type-1974",
+   "self_type" : "type-1973",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19421,8 +19487,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2102",
-   "self_type" : "type-2101",
+   "referenced_type" : "type-2106",
+   "self_type" : "type-2105",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19431,8 +19497,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2201",
-   "self_type" : "type-2200",
+   "referenced_type" : "type-2204",
+   "self_type" : "type-2203",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19441,8 +19507,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2269",
-   "self_type" : "type-2268",
+   "referenced_type" : "type-2271",
+   "self_type" : "type-2270",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19451,8 +19517,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2309",
-   "self_type" : "type-2308",
+   "referenced_type" : "type-2311",
+   "self_type" : "type-2310",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19461,8 +19527,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2360",
-   "self_type" : "type-2359",
+   "referenced_type" : "type-2362",
+   "self_type" : "type-2361",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19471,8 +19537,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2528",
-   "self_type" : "type-2527",
+   "referenced_type" : "type-2530",
+   "self_type" : "type-2529",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19481,8 +19547,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-318",
-   "self_type" : "type-317",
+   "referenced_type" : "type-315",
+   "self_type" : "type-314",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19491,8 +19557,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-457",
-   "self_type" : "type-456",
+   "referenced_type" : "type-454",
+   "self_type" : "type-453",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19501,8 +19567,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-667",
-   "self_type" : "type-666",
+   "referenced_type" : "type-668",
+   "self_type" : "type-667",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19511,8 +19577,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-778",
-   "self_type" : "type-777",
+   "referenced_type" : "type-779",
+   "self_type" : "type-778",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19521,8 +19587,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-882",
-   "self_type" : "type-881",
+   "referenced_type" : "type-883",
+   "self_type" : "type-882",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19531,8 +19597,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-938",
-   "self_type" : "type-937",
+   "referenced_type" : "type-939",
+   "self_type" : "type-938",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19541,8 +19607,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1013",
+   "referenced_type" : "type-1016",
+   "self_type" : "type-1015",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19561,8 +19627,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1706",
-   "self_type" : "type-1705",
+   "referenced_type" : "type-1707",
+   "self_type" : "type-1706",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19571,8 +19637,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1811",
-   "self_type" : "type-1810",
+   "referenced_type" : "type-1812",
+   "self_type" : "type-1811",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19581,8 +19647,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1898",
-   "self_type" : "type-1897",
+   "referenced_type" : "type-1899",
+   "self_type" : "type-1898",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19591,8 +19657,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1976",
-   "self_type" : "type-1975",
+   "referenced_type" : "type-1978",
+   "self_type" : "type-1977",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19601,8 +19667,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2108",
-   "self_type" : "type-2107",
+   "referenced_type" : "type-2110",
+   "self_type" : "type-2109",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19611,8 +19677,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2206",
-   "self_type" : "type-2205",
+   "referenced_type" : "type-2210",
+   "self_type" : "type-2209",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19621,8 +19687,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2273",
-   "self_type" : "type-2272",
+   "referenced_type" : "type-2275",
+   "self_type" : "type-2274",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19631,8 +19697,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2313",
-   "self_type" : "type-2312",
+   "referenced_type" : "type-2315",
+   "self_type" : "type-2314",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19641,8 +19707,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2364",
-   "self_type" : "type-2363",
+   "referenced_type" : "type-2366",
+   "self_type" : "type-2365",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19651,8 +19717,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2532",
-   "self_type" : "type-2531",
+   "referenced_type" : "type-2534",
+   "self_type" : "type-2533",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19661,8 +19727,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-322",
-   "self_type" : "type-321",
+   "referenced_type" : "type-319",
+   "self_type" : "type-318",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19671,8 +19737,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-461",
-   "self_type" : "type-460",
+   "referenced_type" : "type-459",
+   "self_type" : "type-458",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19681,8 +19747,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-672",
-   "self_type" : "type-671",
+   "referenced_type" : "type-673",
+   "self_type" : "type-672",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19701,8 +19767,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-886",
-   "self_type" : "type-885",
+   "referenced_type" : "type-887",
+   "self_type" : "type-886",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19711,8 +19777,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-943",
-   "self_type" : "type-942",
+   "referenced_type" : "type-944",
+   "self_type" : "type-943",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19721,8 +19787,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1012",
-   "self_type" : "type-1011",
+   "referenced_type" : "type-1014",
+   "self_type" : "type-1013",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19741,8 +19807,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1704",
-   "self_type" : "type-1703",
+   "referenced_type" : "type-1705",
+   "self_type" : "type-1704",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19751,8 +19817,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1809",
-   "self_type" : "type-1808",
+   "referenced_type" : "type-1810",
+   "self_type" : "type-1809",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19761,8 +19827,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1896",
-   "self_type" : "type-1895",
+   "referenced_type" : "type-1897",
+   "self_type" : "type-1896",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19771,8 +19837,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1974",
-   "self_type" : "type-1973",
+   "referenced_type" : "type-1976",
+   "self_type" : "type-1975",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19781,8 +19847,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2106",
-   "self_type" : "type-2105",
+   "referenced_type" : "type-2108",
+   "self_type" : "type-2107",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19791,8 +19857,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2203",
-   "self_type" : "type-2202",
+   "referenced_type" : "type-2206",
+   "self_type" : "type-2205",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19801,8 +19867,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2271",
-   "self_type" : "type-2270",
+   "referenced_type" : "type-2273",
+   "self_type" : "type-2272",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19811,8 +19877,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2311",
-   "self_type" : "type-2310",
+   "referenced_type" : "type-2313",
+   "self_type" : "type-2312",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19821,8 +19887,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2362",
-   "self_type" : "type-2361",
+   "referenced_type" : "type-2364",
+   "self_type" : "type-2363",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19831,8 +19897,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2530",
-   "self_type" : "type-2529",
+   "referenced_type" : "type-2532",
+   "self_type" : "type-2531",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19841,8 +19907,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-320",
-   "self_type" : "type-319",
+   "referenced_type" : "type-317",
+   "self_type" : "type-316",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19851,8 +19917,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-459",
-   "self_type" : "type-458",
+   "referenced_type" : "type-457",
+   "self_type" : "type-456",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19871,8 +19937,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-780",
-   "self_type" : "type-779",
+   "referenced_type" : "type-781",
+   "self_type" : "type-780",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19881,8 +19947,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-884",
-   "self_type" : "type-883",
+   "referenced_type" : "type-885",
+   "self_type" : "type-884",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19891,8 +19957,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-940",
-   "self_type" : "type-939",
+   "referenced_type" : "type-941",
+   "self_type" : "type-940",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19901,8 +19967,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1008",
-   "self_type" : "type-1007",
+   "referenced_type" : "type-1010",
+   "self_type" : "type-1009",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19921,8 +19987,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1699",
-   "self_type" : "type-1698",
+   "referenced_type" : "type-1701",
+   "self_type" : "type-1700",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19931,8 +19997,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1805",
-   "self_type" : "type-1804",
+   "referenced_type" : "type-1806",
+   "self_type" : "type-1805",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19941,8 +20007,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1892",
-   "self_type" : "type-1891",
+   "referenced_type" : "type-1893",
+   "self_type" : "type-1892",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19951,8 +20017,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1970",
-   "self_type" : "type-1969",
+   "referenced_type" : "type-1971",
+   "self_type" : "type-1970",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19961,8 +20027,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2100",
-   "self_type" : "type-2099",
+   "referenced_type" : "type-2104",
+   "self_type" : "type-2103",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19971,8 +20037,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2199",
-   "self_type" : "type-2198",
+   "referenced_type" : "type-2202",
+   "self_type" : "type-2201",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19981,8 +20047,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2267",
-   "self_type" : "type-2266",
+   "referenced_type" : "type-2269",
+   "self_type" : "type-2268",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19991,8 +20057,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2307",
-   "self_type" : "type-2306",
+   "referenced_type" : "type-2309",
+   "self_type" : "type-2308",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20001,8 +20067,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2358",
-   "self_type" : "type-2357",
+   "referenced_type" : "type-2360",
+   "self_type" : "type-2359",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20011,8 +20077,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2526",
-   "self_type" : "type-2525",
+   "referenced_type" : "type-2528",
+   "self_type" : "type-2527",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20021,8 +20087,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-315",
-   "self_type" : "type-314",
+   "referenced_type" : "type-313",
+   "self_type" : "type-312",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20031,8 +20097,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-455",
-   "self_type" : "type-454",
+   "referenced_type" : "type-452",
+   "self_type" : "type-451",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20041,8 +20107,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-665",
-   "self_type" : "type-664",
+   "referenced_type" : "type-666",
+   "self_type" : "type-665",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20051,8 +20117,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-776",
-   "self_type" : "type-775",
+   "referenced_type" : "type-777",
+   "self_type" : "type-776",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20061,8 +20127,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-880",
-   "self_type" : "type-879",
+   "referenced_type" : "type-881",
+   "self_type" : "type-880",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20071,8 +20137,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-936",
-   "self_type" : "type-935",
+   "referenced_type" : "type-937",
+   "self_type" : "type-936",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20101,8 +20167,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1708",
-   "self_type" : "type-1707",
+   "referenced_type" : "type-1709",
+   "self_type" : "type-1708",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20111,8 +20177,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1813",
-   "self_type" : "type-1812",
+   "referenced_type" : "type-1814",
+   "self_type" : "type-1813",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20121,8 +20187,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1900",
-   "self_type" : "type-1899",
+   "referenced_type" : "type-1901",
+   "self_type" : "type-1900",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20131,8 +20197,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1979",
-   "self_type" : "type-1978",
+   "referenced_type" : "type-1980",
+   "self_type" : "type-1979",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20141,8 +20207,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2110",
-   "self_type" : "type-2109",
+   "referenced_type" : "type-2112",
+   "self_type" : "type-2111",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20151,8 +20217,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2208",
-   "self_type" : "type-2207",
+   "referenced_type" : "type-2212",
+   "self_type" : "type-2211",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20161,8 +20227,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2275",
-   "self_type" : "type-2274",
+   "referenced_type" : "type-2277",
+   "self_type" : "type-2276",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20171,8 +20237,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2315",
-   "self_type" : "type-2314",
+   "referenced_type" : "type-2317",
+   "self_type" : "type-2316",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20181,8 +20247,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2366",
-   "self_type" : "type-2365",
+   "referenced_type" : "type-2368",
+   "self_type" : "type-2367",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20191,8 +20257,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2534",
-   "self_type" : "type-2533",
+   "referenced_type" : "type-2536",
+   "self_type" : "type-2535",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20201,8 +20267,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-324",
-   "self_type" : "type-323",
+   "referenced_type" : "type-321",
+   "self_type" : "type-320",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20211,8 +20277,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-464",
-   "self_type" : "type-463",
+   "referenced_type" : "type-461",
+   "self_type" : "type-460",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20221,8 +20287,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-674",
-   "self_type" : "type-673",
+   "referenced_type" : "type-675",
+   "self_type" : "type-674",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20241,8 +20307,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-888",
-   "self_type" : "type-887",
+   "referenced_type" : "type-890",
+   "self_type" : "type-889",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20251,8 +20317,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-945",
-   "self_type" : "type-944",
+   "referenced_type" : "type-946",
+   "self_type" : "type-945",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20261,8 +20327,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1026",
-   "self_type" : "type-1025",
+   "referenced_type" : "type-1027",
+   "self_type" : "type-1026",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20281,8 +20347,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1821",
-   "self_type" : "type-1820",
+   "referenced_type" : "type-1822",
+   "self_type" : "type-1821",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20291,8 +20357,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1988",
-   "self_type" : "type-1987",
+   "referenced_type" : "type-1989",
+   "self_type" : "type-1988",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20301,8 +20367,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2218",
-   "self_type" : "type-2217",
+   "referenced_type" : "type-2220",
+   "self_type" : "type-2219",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20311,8 +20377,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2283",
-   "self_type" : "type-2282",
+   "referenced_type" : "type-2285",
+   "self_type" : "type-2284",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20321,8 +20387,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2323",
-   "self_type" : "type-2322",
+   "referenced_type" : "type-2325",
+   "self_type" : "type-2324",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20331,8 +20397,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2374",
-   "self_type" : "type-2373",
+   "referenced_type" : "type-2376",
+   "self_type" : "type-2375",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20341,8 +20407,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2546",
-   "self_type" : "type-2545",
+   "referenced_type" : "type-2548",
+   "self_type" : "type-2547",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20351,8 +20417,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-473",
-   "self_type" : "type-472",
+   "referenced_type" : "type-470",
+   "self_type" : "type-469",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20361,8 +20427,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-794",
-   "self_type" : "type-793",
+   "referenced_type" : "type-795",
+   "self_type" : "type-794",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20371,8 +20437,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-898",
-   "self_type" : "type-897",
+   "referenced_type" : "type-899",
+   "self_type" : "type-898",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20381,8 +20447,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-954",
-   "self_type" : "type-953",
+   "referenced_type" : "type-955",
+   "self_type" : "type-954",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20391,8 +20457,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-1024",
-   "self_type" : "type-1023",
+   "referenced_type" : "type-1025",
+   "self_type" : "type-1024",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20411,8 +20477,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-1819",
-   "self_type" : "type-1818",
+   "referenced_type" : "type-1820",
+   "self_type" : "type-1819",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20421,8 +20487,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-1986",
-   "self_type" : "type-1985",
+   "referenced_type" : "type-1987",
+   "self_type" : "type-1986",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20431,8 +20497,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2216",
-   "self_type" : "type-2215",
+   "referenced_type" : "type-2218",
+   "self_type" : "type-2217",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20441,8 +20507,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2281",
-   "self_type" : "type-2280",
+   "referenced_type" : "type-2283",
+   "self_type" : "type-2282",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20451,8 +20517,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2321",
-   "self_type" : "type-2320",
+   "referenced_type" : "type-2323",
+   "self_type" : "type-2322",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20461,8 +20527,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2372",
-   "self_type" : "type-2371",
+   "referenced_type" : "type-2374",
+   "self_type" : "type-2373",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20471,8 +20537,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2544",
-   "self_type" : "type-2543",
+   "referenced_type" : "type-2546",
+   "self_type" : "type-2545",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20481,8 +20547,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-471",
-   "self_type" : "type-470",
+   "referenced_type" : "type-468",
+   "self_type" : "type-467",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20491,8 +20557,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-792",
-   "self_type" : "type-791",
+   "referenced_type" : "type-793",
+   "self_type" : "type-792",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20501,8 +20567,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-896",
-   "self_type" : "type-895",
+   "referenced_type" : "type-897",
+   "self_type" : "type-896",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20511,8 +20577,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-952",
-   "self_type" : "type-951",
+   "referenced_type" : "type-953",
+   "self_type" : "type-952",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20521,8 +20587,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-1022",
-   "self_type" : "type-1021",
+   "referenced_type" : "type-1023",
+   "self_type" : "type-1022",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20541,8 +20607,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-1817",
-   "self_type" : "type-1816",
+   "referenced_type" : "type-1818",
+   "self_type" : "type-1817",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20551,8 +20617,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-1983",
-   "self_type" : "type-1982",
+   "referenced_type" : "type-1985",
+   "self_type" : "type-1984",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20561,8 +20627,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2214",
-   "self_type" : "type-2213",
+   "referenced_type" : "type-2216",
+   "self_type" : "type-2215",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20571,8 +20637,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2279",
-   "self_type" : "type-2278",
+   "referenced_type" : "type-2281",
+   "self_type" : "type-2280",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20581,8 +20647,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2319",
-   "self_type" : "type-2318",
+   "referenced_type" : "type-2321",
+   "self_type" : "type-2320",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20591,8 +20657,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2370",
-   "self_type" : "type-2369",
+   "referenced_type" : "type-2372",
+   "self_type" : "type-2371",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20601,8 +20667,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2542",
-   "self_type" : "type-2541",
+   "referenced_type" : "type-2544",
+   "self_type" : "type-2543",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20611,8 +20677,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-468",
-   "self_type" : "type-467",
+   "referenced_type" : "type-466",
+   "self_type" : "type-465",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20621,8 +20687,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-790",
-   "self_type" : "type-789",
+   "referenced_type" : "type-791",
+   "self_type" : "type-790",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20631,8 +20697,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-894",
-   "self_type" : "type-893",
+   "referenced_type" : "type-895",
+   "self_type" : "type-894",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20641,8 +20707,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-950",
-   "self_type" : "type-949",
+   "referenced_type" : "type-951",
+   "self_type" : "type-950",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20671,8 +20737,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-1815",
-   "self_type" : "type-1814",
+   "referenced_type" : "type-1816",
+   "self_type" : "type-1815",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20681,8 +20747,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-1981",
-   "self_type" : "type-1980",
+   "referenced_type" : "type-1983",
+   "self_type" : "type-1982",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20691,8 +20757,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2212",
-   "self_type" : "type-2211",
+   "referenced_type" : "type-2214",
+   "self_type" : "type-2213",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20701,8 +20767,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2277",
-   "self_type" : "type-2276",
+   "referenced_type" : "type-2279",
+   "self_type" : "type-2278",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20711,8 +20777,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2317",
-   "self_type" : "type-2316",
+   "referenced_type" : "type-2319",
+   "self_type" : "type-2318",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20721,8 +20787,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2368",
-   "self_type" : "type-2367",
+   "referenced_type" : "type-2370",
+   "self_type" : "type-2369",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20731,8 +20797,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2540",
-   "self_type" : "type-2539",
+   "referenced_type" : "type-2542",
+   "self_type" : "type-2541",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20741,8 +20807,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-466",
-   "self_type" : "type-465",
+   "referenced_type" : "type-464",
+   "self_type" : "type-463",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20751,8 +20817,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-788",
-   "self_type" : "type-787",
+   "referenced_type" : "type-789",
+   "self_type" : "type-788",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20761,8 +20827,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-892",
-   "self_type" : "type-891",
+   "referenced_type" : "type-893",
+   "self_type" : "type-892",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20771,8 +20837,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-947",
-   "self_type" : "type-946",
+   "referenced_type" : "type-948",
+   "self_type" : "type-947",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20781,8 +20847,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1028",
-   "self_type" : "type-1027",
+   "referenced_type" : "type-1029",
+   "self_type" : "type-1028",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20801,8 +20867,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1823",
-   "self_type" : "type-1822",
+   "referenced_type" : "type-1824",
+   "self_type" : "type-1823",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20811,8 +20877,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1990",
-   "self_type" : "type-1989",
+   "referenced_type" : "type-1992",
+   "self_type" : "type-1991",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20821,8 +20887,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2220",
-   "self_type" : "type-2219",
+   "referenced_type" : "type-2223",
+   "self_type" : "type-2222",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20831,8 +20897,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2285",
-   "self_type" : "type-2284",
+   "referenced_type" : "type-2287",
+   "self_type" : "type-2286",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20841,8 +20907,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2325",
-   "self_type" : "type-2324",
+   "referenced_type" : "type-2327",
+   "self_type" : "type-2326",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20851,8 +20917,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2376",
-   "self_type" : "type-2375",
+   "referenced_type" : "type-2378",
+   "self_type" : "type-2377",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20861,8 +20927,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2548",
-   "self_type" : "type-2547",
+   "referenced_type" : "type-2550",
+   "self_type" : "type-2549",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20871,8 +20937,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-475",
-   "self_type" : "type-474",
+   "referenced_type" : "type-472",
+   "self_type" : "type-471",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20891,8 +20957,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-900",
-   "self_type" : "type-899",
+   "referenced_type" : "type-901",
+   "self_type" : "type-900",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20901,8 +20967,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-956",
-   "self_type" : "type-955",
+   "referenced_type" : "type-957",
+   "self_type" : "type-956",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20911,8 +20977,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1633",
-   "self_type" : "type-1632",
+   "referenced_type" : "type-1637",
+   "self_type" : "type-1636",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20921,8 +20987,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-168",
-   "self_type" : "type-167",
+   "referenced_type" : "type-170",
+   "self_type" : "type-169",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20931,8 +20997,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1870",
-   "self_type" : "type-1869",
+   "referenced_type" : "type-1871",
+   "self_type" : "type-1870",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20941,8 +21007,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1943",
-   "self_type" : "type-1942",
+   "referenced_type" : "type-1944",
+   "self_type" : "type-1943",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20951,8 +21017,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2083",
-   "self_type" : "type-2082",
+   "referenced_type" : "type-2085",
+   "self_type" : "type-2084",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20961,8 +21027,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2179",
-   "self_type" : "type-2178",
+   "referenced_type" : "type-2182",
+   "self_type" : "type-2181",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20971,8 +21037,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2251",
-   "self_type" : "type-2250",
+   "referenced_type" : "type-2253",
+   "self_type" : "type-2252",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20981,8 +21047,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-426",
-   "self_type" : "type-425",
+   "referenced_type" : "type-423",
+   "self_type" : "type-422",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20991,8 +21057,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-646",
-   "self_type" : "type-645",
+   "referenced_type" : "type-647",
+   "self_type" : "type-646",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -21001,8 +21067,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-756",
-   "self_type" : "type-755",
+   "referenced_type" : "type-757",
+   "self_type" : "type-756",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -21021,8 +21087,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1016",
-   "self_type" : "type-1015",
+   "referenced_type" : "type-1008",
+   "self_type" : "type-1007",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -21031,8 +21097,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1766",
-   "self_type" : "type-1765",
+   "referenced_type" : "type-1767",
+   "self_type" : "type-1766",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -21041,8 +21107,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2104",
-   "self_type" : "type-2103",
+   "referenced_type" : "type-2100",
+   "self_type" : "type-2099",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -21051,8 +21117,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-1758",
-   "self_type" : "type-1757",
+   "referenced_type" : "type-1759",
+   "self_type" : "type-1758",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -21061,8 +21127,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-1876",
-   "self_type" : "type-1875",
+   "referenced_type" : "type-1877",
+   "self_type" : "type-1876",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -21071,46 +21137,6 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-2403",
-   "self_type" : "type-2402",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::float_denorm_style",
-   "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-768",
-   "self_type" : "type-767",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::float_round_style",
-   "name" : "const std::float_round_style",
-   "referenced_type" : "type-1761",
-   "self_type" : "type-1760",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::float_round_style",
-   "name" : "const std::float_round_style",
-   "referenced_type" : "type-1946",
-   "self_type" : "type-1945",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::float_round_style",
-   "name" : "const std::float_round_style",
    "referenced_type" : "type-2405",
    "self_type" : "type-2404",
    "size" : 4,
@@ -21119,10 +21145,50 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const std::float_denorm_style",
+   "name" : "const std::float_denorm_style",
+   "referenced_type" : "type-762",
+   "self_type" : "type-761",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const std::float_round_style",
    "name" : "const std::float_round_style",
-   "referenced_type" : "type-858",
-   "self_type" : "type-857",
+   "referenced_type" : "type-1762",
+   "self_type" : "type-1761",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::float_round_style",
+   "name" : "const std::float_round_style",
+   "referenced_type" : "type-1947",
+   "self_type" : "type-1946",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::float_round_style",
+   "name" : "const std::float_round_style",
+   "referenced_type" : "type-2407",
+   "self_type" : "type-2406",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::float_round_style",
+   "name" : "const std::float_round_style",
+   "referenced_type" : "type-855",
+   "self_type" : "type-854",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -21141,8 +21207,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<float (float)>",
    "name" : "const std::function<float (float)>",
-   "referenced_type" : "type-1778",
-   "self_type" : "type-1777",
+   "referenced_type" : "type-1779",
+   "self_type" : "type-1778",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -21151,8 +21217,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<float (float)>",
    "name" : "const std::function<float (float)>",
-   "referenced_type" : "type-2223",
-   "self_type" : "type-2222",
+   "referenced_type" : "type-2225",
+   "self_type" : "type-2224",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -21161,8 +21227,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-1392",
-   "self_type" : "type-1391",
+   "referenced_type" : "type-1396",
+   "self_type" : "type-1395",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -21171,8 +21237,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-1840",
-   "self_type" : "type-1839",
+   "referenced_type" : "type-1841",
+   "self_type" : "type-1840",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -21181,8 +21247,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-2663",
-   "self_type" : "type-2662",
+   "referenced_type" : "type-2668",
+   "self_type" : "type-2667",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -21191,8 +21257,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> >",
    "name" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> >",
-   "referenced_type" : "type-2331",
-   "self_type" : "type-2330",
+   "referenced_type" : "type-2333",
+   "self_type" : "type-2332",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -21211,8 +21277,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1032",
-   "self_type" : "type-1031",
+   "referenced_type" : "type-1033",
+   "self_type" : "type-1032",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21231,8 +21297,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1582",
-   "self_type" : "type-1581",
+   "referenced_type" : "type-1586",
+   "self_type" : "type-1585",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21241,8 +21307,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1713",
-   "self_type" : "type-1712",
+   "referenced_type" : "type-1714",
+   "self_type" : "type-1713",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21251,8 +21317,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1826",
-   "self_type" : "type-1825",
+   "referenced_type" : "type-1827",
+   "self_type" : "type-1826",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21261,8 +21327,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1852",
-   "self_type" : "type-1851",
+   "referenced_type" : "type-1853",
+   "self_type" : "type-1852",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21271,8 +21337,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1903",
-   "self_type" : "type-1902",
+   "referenced_type" : "type-1904",
+   "self_type" : "type-1903",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21281,8 +21347,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1994",
-   "self_type" : "type-1993",
+   "referenced_type" : "type-1995",
+   "self_type" : "type-1994",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21291,8 +21357,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2075",
-   "self_type" : "type-2074",
+   "referenced_type" : "type-2077",
+   "self_type" : "type-2076",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21301,8 +21367,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2150",
-   "self_type" : "type-2149",
+   "referenced_type" : "type-2153",
+   "self_type" : "type-2152",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21311,8 +21377,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2233",
-   "self_type" : "type-2232",
+   "referenced_type" : "type-2235",
+   "self_type" : "type-2234",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21321,8 +21387,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2328",
-   "self_type" : "type-2327",
+   "referenced_type" : "type-2330",
+   "self_type" : "type-2329",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21331,8 +21397,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2379",
-   "self_type" : "type-2378",
+   "referenced_type" : "type-2381",
+   "self_type" : "type-2380",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21341,8 +21407,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2566",
-   "self_type" : "type-2565",
+   "referenced_type" : "type-2568",
+   "self_type" : "type-2567",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21351,8 +21417,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-329",
-   "self_type" : "type-328",
+   "referenced_type" : "type-326",
+   "self_type" : "type-325",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21361,8 +21427,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-46",
-   "self_type" : "type-45",
+   "referenced_type" : "type-476",
+   "self_type" : "type-475",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21371,8 +21437,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-479",
-   "self_type" : "type-478",
+   "referenced_type" : "type-48",
+   "self_type" : "type-47",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21391,8 +21457,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-727",
-   "self_type" : "type-726",
+   "referenced_type" : "type-728",
+   "self_type" : "type-727",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21401,8 +21467,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-833",
-   "self_type" : "type-832",
+   "referenced_type" : "type-834",
+   "self_type" : "type-833",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21411,8 +21477,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-960",
-   "self_type" : "type-959",
+   "referenced_type" : "type-962",
+   "self_type" : "type-961",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21421,8 +21487,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned char",
    "name" : "const unsigned char",
-   "referenced_type" : "type-218",
-   "self_type" : "type-224",
+   "referenced_type" : "type-220",
+   "self_type" : "type-226",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -21431,8 +21497,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned int",
    "name" : "const unsigned int",
-   "referenced_type" : "type-123",
-   "self_type" : "type-236",
+   "referenced_type" : "type-125",
+   "self_type" : "type-238",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
   },
@@ -21441,8 +21507,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned long long",
    "name" : "const unsigned long long",
-   "referenced_type" : "type-124",
-   "self_type" : "type-226",
+   "referenced_type" : "type-126",
+   "self_type" : "type-228",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -21460,7 +21526,7 @@
    "is_const" : true,
    "linker_set_key" : "const void",
    "name" : "const void",
-   "referenced_type" : "type-151",
+   "referenced_type" : "type-154",
    "self_type" : "type-1118",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -21469,8 +21535,8 @@
    "is_const" : true,
    "linker_set_key" : "unsigned int const[3]",
    "name" : "unsigned int const[3]",
-   "referenced_type" : "type-941",
-   "self_type" : "type-948",
+   "referenced_type" : "type-935",
+   "self_type" : "type-942",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -21480,7 +21546,7 @@
    "linker_set_key" : "volatile bool",
    "name" : "volatile bool",
    "referenced_type" : "type-6",
-   "self_type" : "type-270",
+   "self_type" : "type-266",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Thread.h"
   },
@@ -21489,8 +21555,8 @@
    "is_volatile" : true,
    "linker_set_key" : "volatile int",
    "name" : "volatile int",
-   "referenced_type" : "type-103",
-   "self_type" : "type-275",
+   "referenced_type" : "type-105",
+   "self_type" : "type-271",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   }
@@ -21503,48 +21569,48 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "layers",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "format",
      "field_offset" : 96,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "usage",
      "field_offset" : 128,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "stride",
      "field_offset" : 192,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "rfu0",
      "field_offset" : 224,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "rfu1",
      "field_offset" : 256,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "AHardwareBuffer_Desc",
    "name" : "AHardwareBuffer_Desc",
-   "referenced_type" : "type-683",
-   "self_type" : "type-683",
+   "referenced_type" : "type-685",
+   "self_type" : "type-685",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
    "unique_id" : "AHardwareBuffer_Desc"
@@ -21555,23 +21621,23 @@
    [
     {
      "field_name" : "data",
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "pixelStride",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "rowStride",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "linker_set_key" : "AHardwareBuffer_Plane",
    "name" : "AHardwareBuffer_Plane",
-   "referenced_type" : "type-509",
-   "self_type" : "type-509",
+   "referenced_type" : "type-506",
+   "self_type" : "type-506",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
    "unique_id" : "AHardwareBuffer_Plane"
@@ -21582,18 +21648,18 @@
    [
     {
      "field_name" : "planeCount",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "planes",
      "field_offset" : 32,
-     "referenced_type" : "type-508"
+     "referenced_type" : "type-505"
     }
    ],
    "linker_set_key" : "AHardwareBuffer_Planes",
    "name" : "AHardwareBuffer_Planes",
-   "referenced_type" : "type-507",
-   "self_type" : "type-507",
+   "referenced_type" : "type-504",
+   "self_type" : "type-504",
    "size" : 52,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
    "unique_id" : "AHardwareBuffer_Planes"
@@ -21604,63 +21670,63 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-518"
+     "referenced_type" : "type-516"
     },
     {
      "field_name" : "width",
      "field_offset" : 256,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "height",
      "field_offset" : 288,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "stride",
      "field_offset" : 320,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "format",
      "field_offset" : 352,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "usage_deprecated",
      "field_offset" : 384,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "layerCount",
      "field_offset" : 416,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 448,
-     "referenced_type" : "type-523"
+     "referenced_type" : "type-521"
     },
     {
      "field_name" : "handle",
      "field_offset" : 480,
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
      "field_name" : "usage",
      "field_offset" : 512,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "reserved_proc",
      "field_offset" : 576,
-     "referenced_type" : "type-524"
+     "referenced_type" : "type-522"
     }
    ],
    "linker_set_key" : "ANativeWindowBuffer",
    "name" : "ANativeWindowBuffer",
-   "referenced_type" : "type-517",
-   "self_type" : "type-517",
+   "referenced_type" : "type-515",
+   "self_type" : "type-515",
    "size" : 96,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
    "unique_id" : "ANativeWindowBuffer"
@@ -21671,22 +21737,22 @@
    [
     {
      "field_name" : "left",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "top",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "right",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "bottom",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "ARect",
@@ -21703,7 +21769,7 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-547"
+     "referenced_type" : "type-544"
     },
     {
      "field_name" : "alloc",
@@ -21739,20 +21805,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-517"
+     "referenced_type" : "type-515"
     },
     {
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
    "name" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
    "record_kind" : "class",
-   "referenced_type" : "type-516",
-   "self_type" : "type-516",
+   "referenced_type" : "type-514",
+   "self_type" : "type-514",
    "size" : 104,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h",
-   "template_args" : [ "type-517", "type-525", "type-172", "type-518" ],
+   "template_args" : [ "type-515", "type-523", "type-175", "type-516" ],
    "unique_id" : "_ZTSN7android17ANativeObjectBaseI19ANativeWindowBufferNS_13GraphicBufferENS_7RefBaseE21android_native_base_tEE",
    "vtable_components" :
    [
@@ -21840,7 +21906,7 @@
      "access" : "private",
      "field_name" : "mWhitePoint",
      "field_offset" : 1664,
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     }
    ],
    "linker_set_key" : "android::ColorSpace",
@@ -21947,14 +22013,14 @@
     {
      "access" : "private",
      "field_name" : "mCond",
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-255"
     }
    ],
    "linker_set_key" : "android::Condition",
    "name" : "android::Condition",
    "record_kind" : "class",
-   "referenced_type" : "type-258",
-   "self_type" : "type-258",
+   "referenced_type" : "type-254",
+   "self_type" : "type-254",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "unique_id" : "_ZTSN7android9ConditionE"
@@ -21995,13 +22061,13 @@
     {
      "access" : "private",
      "field_name" : "mState",
-     "referenced_type" : "type-1377"
+     "referenced_type" : "type-1382"
     },
     {
      "access" : "private",
      "field_name" : "mMutex",
      "field_offset" : 32,
-     "referenced_type" : "type-1379"
+     "referenced_type" : "type-1384"
     },
     {
      "access" : "private",
@@ -22013,14 +22079,14 @@
      "access" : "private",
      "field_name" : "mSignalTime",
      "field_offset" : 128,
-     "referenced_type" : "type-1380"
+     "referenced_type" : "type-1385"
     }
    ],
    "linker_set_key" : "android::FenceTime",
    "name" : "android::FenceTime",
    "record_kind" : "class",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1376",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1381",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android9FenceTimeE"
@@ -22030,14 +22096,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1385"
+     "referenced_type" : "type-1389"
     }
    ],
    "fields" :
    [
     {
      "field_name" : "state",
-     "referenced_type" : "type-1384"
+     "referenced_type" : "type-1388"
     },
     {
      "field_name" : "fence",
@@ -22047,13 +22113,13 @@
     {
      "field_name" : "signalTime",
      "field_offset" : 64,
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
    "linker_set_key" : "android::FenceTime::Snapshot",
    "name" : "android::FenceTime::Snapshot",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1383",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1387",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android9FenceTime8SnapshotE"
@@ -22065,20 +22131,20 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-1398"
+     "referenced_type" : "type-1402"
     },
     {
      "access" : "private",
      "field_name" : "mQueue",
      "field_offset" : 32,
-     "referenced_type" : "type-1399"
+     "referenced_type" : "type-1403"
     }
    ],
    "linker_set_key" : "android::FenceTimeline",
    "name" : "android::FenceTimeline",
    "record_kind" : "class",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1397",
+   "referenced_type" : "type-1401",
+   "self_type" : "type-1401",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android13FenceTimelineE"
@@ -22090,20 +22156,20 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-1403"
+     "referenced_type" : "type-1407"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-1404"
+     "referenced_type" : "type-1408"
     }
    ],
    "linker_set_key" : "android::FenceToFenceTimeMap",
    "name" : "android::FenceToFenceTimeMap",
    "record_kind" : "class",
-   "referenced_type" : "type-1402",
-   "self_type" : "type-1402",
+   "referenced_type" : "type-1406",
+   "self_type" : "type-1406",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android19FenceToFenceTimeMapE"
@@ -22125,11 +22191,11 @@
    "linker_set_key" : "android::Flattenable<android::FenceTime::Snapshot>",
    "name" : "android::Flattenable<android::FenceTime::Snapshot>",
    "record_kind" : "class",
-   "referenced_type" : "type-1385",
-   "self_type" : "type-1385",
+   "referenced_type" : "type-1389",
+   "self_type" : "type-1389",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1383" ],
+   "template_args" : [ "type-1387" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_9FenceTime8SnapshotEEE"
   },
   {
@@ -22137,11 +22203,11 @@
    "linker_set_key" : "android::Flattenable<android::GraphicBuffer>",
    "name" : "android::Flattenable<android::GraphicBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-532",
-   "self_type" : "type-532",
+   "referenced_type" : "type-530",
+   "self_type" : "type-530",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-525" ],
+   "template_args" : [ "type-523" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_13GraphicBufferEEE"
   },
   {
@@ -22193,36 +22259,36 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1419"
+     "referenced_type" : "type-1423"
     }
    ],
    "fields" :
    [
     {
      "field_name" : "refreshPeriodNano",
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     },
     {
      "field_name" : "desiredPresentTimesNano",
      "field_offset" : 64,
-     "referenced_type" : "type-1421"
+     "referenced_type" : "type-1425"
     },
     {
      "field_name" : "actualPresentTimesNano",
      "field_offset" : 224,
-     "referenced_type" : "type-1421"
+     "referenced_type" : "type-1425"
     },
     {
      "field_name" : "frameReadyTimesNano",
      "field_offset" : 384,
-     "referenced_type" : "type-1421"
+     "referenced_type" : "type-1425"
     }
    ],
    "linker_set_key" : "android::FrameStats",
    "name" : "android::FrameStats",
    "record_kind" : "class",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1420",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1424",
    "size" : 68,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h",
    "unique_id" : "_ZTSN7android10FrameStatsE"
@@ -22232,7 +22298,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-359"
+     "referenced_type" : "type-356"
     }
    ],
    "fields" :
@@ -22241,20 +22307,20 @@
      "access" : "private",
      "field_name" : "mMapper",
      "field_offset" : 32,
-     "referenced_type" : "type-354"
+     "referenced_type" : "type-351"
     },
     {
      "access" : "private",
      "field_name" : "mAllocator",
      "field_offset" : 64,
-     "referenced_type" : "type-355"
+     "referenced_type" : "type-352"
     }
    ],
    "linker_set_key" : "android::Gralloc2Allocator",
    "name" : "android::Gralloc2Allocator",
    "record_kind" : "class",
-   "referenced_type" : "type-353",
-   "self_type" : "type-353",
+   "referenced_type" : "type-350",
+   "self_type" : "type-350",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h",
    "unique_id" : "_ZTSN7android17Gralloc2AllocatorE",
@@ -22291,7 +22357,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-342"
+     "referenced_type" : "type-339"
     }
    ],
    "fields" :
@@ -22300,20 +22366,20 @@
      "access" : "private",
      "field_name" : "mMapper",
      "field_offset" : 32,
-     "referenced_type" : "type-338"
+     "referenced_type" : "type-335"
     },
     {
      "access" : "private",
      "field_name" : "mMapperV2_1",
      "field_offset" : 64,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-88"
     }
    ],
    "linker_set_key" : "android::Gralloc2Mapper",
    "name" : "android::Gralloc2Mapper",
    "record_kind" : "class",
-   "referenced_type" : "type-337",
-   "self_type" : "type-337",
+   "referenced_type" : "type-334",
+   "self_type" : "type-334",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h",
    "unique_id" : "_ZTSN7android14Gralloc2MapperE",
@@ -22371,10 +22437,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-516"
+     "referenced_type" : "type-514"
     },
     {
-     "referenced_type" : "type-532"
+     "referenced_type" : "type-530"
     }
    ],
    "fields" :
@@ -22383,62 +22449,62 @@
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 832,
-     "referenced_type" : "type-218"
+     "referenced_type" : "type-220"
     },
     {
      "access" : "private",
      "field_name" : "mBufferMapper",
      "field_offset" : 864,
-     "referenced_type" : "type-526"
+     "referenced_type" : "type-524"
     },
     {
      "access" : "private",
      "field_name" : "mInitCheck",
      "field_offset" : 896,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mTransportNumFds",
      "field_offset" : 928,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mTransportNumInts",
      "field_offset" : 960,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mId",
      "field_offset" : 992,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
      "field_name" : "mBufferId",
      "field_offset" : 1056,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mGenerationNumber",
      "field_offset" : 1088,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mDeathCallbacks",
      "field_offset" : 1120,
-     "referenced_type" : "type-531"
+     "referenced_type" : "type-529"
     }
    ],
    "linker_set_key" : "android::GraphicBuffer",
    "name" : "android::GraphicBuffer",
    "record_kind" : "class",
-   "referenced_type" : "type-525",
-   "self_type" : "type-525",
+   "referenced_type" : "type-523",
+   "self_type" : "type-523",
    "size" : 152,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h",
    "unique_id" : "_ZTSN7android13GraphicBufferE",
@@ -22478,7 +22544,91 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "protected",
+     "field_name" : "mMapper",
+     "referenced_type" : "type-524"
+    },
+    {
+     "access" : "protected",
+     "field_name" : "mAllocator",
+     "field_offset" : 32,
+     "referenced_type" : "type-540"
+    }
+   ],
+   "linker_set_key" : "android::GraphicBufferAllocator",
+   "name" : "android::GraphicBufferAllocator",
+   "record_kind" : "class",
+   "referenced_type" : "type-539",
+   "self_type" : "type-539",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h",
+   "unique_id" : "_ZTSN7android22GraphicBufferAllocatorE"
+  },
+  {
+   "access" : "protected",
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "width",
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "height",
+     "field_offset" : 32,
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "stride",
+     "field_offset" : 64,
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "format",
+     "field_offset" : 96,
+     "referenced_type" : "type-105"
+    },
+    {
+     "field_name" : "layerCount",
+     "field_offset" : 128,
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "usage",
+     "field_offset" : 160,
+     "referenced_type" : "type-126"
+    },
+    {
+     "field_name" : "size",
+     "field_offset" : 224,
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "requestorName",
+     "field_offset" : 256,
+     "referenced_type" : "type-681"
+    }
+   ],
+   "linker_set_key" : "android::GraphicBufferAllocator::alloc_rec_t",
+   "name" : "android::GraphicBufferAllocator::alloc_rec_t",
+   "referenced_type" : "type-680",
+   "self_type" : "type-680",
+   "size" : 44,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h",
+   "unique_id" : "_ZTSN7android22GraphicBufferAllocator11alloc_rec_tE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-528"
     }
    ],
    "fields" :
@@ -22490,100 +22640,16 @@
     },
     {
      "access" : "private",
-     "field_name" : "mAllocator",
-     "field_offset" : 32,
-     "referenced_type" : "type-543"
-    }
-   ],
-   "linker_set_key" : "android::GraphicBufferAllocator",
-   "name" : "android::GraphicBufferAllocator",
-   "record_kind" : "class",
-   "referenced_type" : "type-542",
-   "self_type" : "type-542",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h",
-   "unique_id" : "_ZTSN7android22GraphicBufferAllocatorE"
-  },
-  {
-   "access" : "private",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "width",
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "height",
-     "field_offset" : 32,
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "stride",
-     "field_offset" : 64,
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "format",
-     "field_offset" : 96,
-     "referenced_type" : "type-103"
-    },
-    {
-     "field_name" : "layerCount",
-     "field_offset" : 128,
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "usage",
-     "field_offset" : 160,
-     "referenced_type" : "type-124"
-    },
-    {
-     "field_name" : "size",
-     "field_offset" : 224,
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "requestorName",
-     "field_offset" : 256,
-     "referenced_type" : "type-677"
-    }
-   ],
-   "linker_set_key" : "android::GraphicBufferAllocator::alloc_rec_t",
-   "name" : "android::GraphicBufferAllocator::alloc_rec_t",
-   "referenced_type" : "type-676",
-   "self_type" : "type-676",
-   "size" : 44,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h",
-   "unique_id" : "_ZTSN7android22GraphicBufferAllocator11alloc_rec_tE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-530"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMapper",
-     "referenced_type" : "type-528"
-    },
-    {
-     "access" : "private",
      "field_name" : "mMapperVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-529"
+     "referenced_type" : "type-527"
     }
    ],
    "linker_set_key" : "android::GraphicBufferMapper",
    "name" : "android::GraphicBufferMapper",
    "record_kind" : "class",
-   "referenced_type" : "type-527",
-   "self_type" : "type-527",
+   "referenced_type" : "type-525",
+   "self_type" : "type-525",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h",
    "unique_id" : "_ZTSN7android19GraphicBufferMapperE"
@@ -22638,17 +22704,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-235"
     }
    ],
    "linker_set_key" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
    "name" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
    "record_kind" : "class",
-   "referenced_type" : "type-247",
-   "self_type" : "type-247",
+   "referenced_type" : "type-249",
+   "self_type" : "type-249",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-179", "type-248" ],
+   "template_args" : [ "type-182", "type-250" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
   },
   {
@@ -22664,11 +22730,11 @@
    "linker_set_key" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "record_kind" : "class",
-   "referenced_type" : "type-715",
-   "self_type" : "type-715",
+   "referenced_type" : "type-716",
+   "self_type" : "type-716",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-142", "type-676" ],
+   "template_args" : [ "type-145", "type-680" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -22676,11 +22742,11 @@
    "linker_set_key" : "android::LightFlattenable<android::FrameStats>",
    "name" : "android::LightFlattenable<android::FrameStats>",
    "record_kind" : "class",
-   "referenced_type" : "type-1419",
-   "self_type" : "type-1419",
+   "referenced_type" : "type-1423",
+   "self_type" : "type-1423",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1420" ],
+   "template_args" : [ "type-1424" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_10FrameStatsEEE"
   },
   {
@@ -22724,11 +22790,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Region>",
    "name" : "android::LightFlattenable<android::Region>",
    "record_kind" : "class",
-   "referenced_type" : "type-2390",
-   "self_type" : "type-2390",
+   "referenced_type" : "type-2392",
+   "self_type" : "type-2392",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-2389" ],
+   "template_args" : [ "type-2391" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_6RegionEEE"
   },
   {
@@ -22834,14 +22900,14 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-281"
     }
    ],
    "linker_set_key" : "android::Mutex",
    "name" : "android::Mutex",
    "record_kind" : "class",
-   "referenced_type" : "type-252",
-   "self_type" : "type-252",
+   "referenced_type" : "type-280",
+   "self_type" : "type-280",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5MutexE"
@@ -22853,14 +22919,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-256"
+     "referenced_type" : "type-1379"
     }
    ],
    "linker_set_key" : "android::Mutex::Autolock",
    "name" : "android::Mutex::Autolock",
    "record_kind" : "class",
-   "referenced_type" : "type-255",
-   "self_type" : "type-255",
+   "referenced_type" : "type-1378",
+   "self_type" : "type-1378",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5Mutex8AutolockE"
@@ -22909,12 +22975,12 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "y",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::Point",
@@ -22933,14 +22999,14 @@
     {
      "access" : "private",
      "field_name" : "mRWLock",
-     "referenced_type" : "type-263"
+     "referenced_type" : "type-259"
     }
    ],
    "linker_set_key" : "android::RWLock",
    "name" : "android::RWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-262",
-   "self_type" : "type-262",
+   "referenced_type" : "type-258",
+   "self_type" : "type-258",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLockE"
@@ -22952,14 +23018,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-262"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoRLock",
    "name" : "android::RWLock::AutoRLock",
    "record_kind" : "class",
-   "referenced_type" : "type-265",
-   "self_type" : "type-265",
+   "referenced_type" : "type-261",
+   "self_type" : "type-261",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
@@ -22971,14 +23037,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-262"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoWLock",
    "name" : "android::RWLock::AutoWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-268",
-   "self_type" : "type-268",
+   "referenced_type" : "type-264",
+   "self_type" : "type-264",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
@@ -23011,14 +23077,14 @@
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 32,
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-176"
     }
    ],
    "linker_set_key" : "android::RefBase",
    "name" : "android::RefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-172",
-   "self_type" : "type-172",
+   "referenced_type" : "type-175",
+   "self_type" : "type-175",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBaseE",
@@ -23058,8 +23124,8 @@
    "linker_set_key" : "android::RefBase::weakref_type",
    "name" : "android::RefBase::weakref_type",
    "record_kind" : "class",
-   "referenced_type" : "type-198",
-   "self_type" : "type-198",
+   "referenced_type" : "type-211",
+   "self_type" : "type-211",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBase12weakref_typeE"
@@ -23105,7 +23171,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2390"
+     "referenced_type" : "type-2392"
     }
    ],
    "fields" :
@@ -23113,14 +23179,14 @@
     {
      "access" : "private",
      "field_name" : "mStorage",
-     "referenced_type" : "type-2382"
+     "referenced_type" : "type-2384"
     }
    ],
    "linker_set_key" : "android::Region",
    "name" : "android::Region",
    "record_kind" : "class",
-   "referenced_type" : "type-2389",
-   "self_type" : "type-2389",
+   "referenced_type" : "type-2391",
+   "self_type" : "type-2391",
    "size" : 20,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h",
    "unique_id" : "_ZTSN7android6RegionE"
@@ -23132,7 +23198,7 @@
     {
      "access" : "private",
      "field_name" : "mTag",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "android::ScopedTrace",
@@ -23149,11 +23215,11 @@
    "linker_set_key" : "android::Singleton<android::GraphicBufferAllocator>",
    "name" : "android::Singleton<android::GraphicBufferAllocator>",
    "record_kind" : "class",
-   "referenced_type" : "type-541",
-   "self_type" : "type-541",
+   "referenced_type" : "type-538",
+   "self_type" : "type-538",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-542" ],
+   "template_args" : [ "type-539" ],
    "unique_id" : "_ZTSN7android9SingletonINS_22GraphicBufferAllocatorEEE"
   },
   {
@@ -23161,11 +23227,11 @@
    "linker_set_key" : "android::Singleton<android::GraphicBufferMapper>",
    "name" : "android::Singleton<android::GraphicBufferMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-530",
-   "self_type" : "type-530",
+   "referenced_type" : "type-528",
+   "self_type" : "type-528",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-527" ],
+   "template_args" : [ "type-525" ],
    "unique_id" : "_ZTSN7android9SingletonINS_19GraphicBufferMapperEEE"
   },
   {
@@ -23174,17 +23240,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-234"
+     "referenced_type" : "type-236"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
    "name" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-233",
-   "self_type" : "type-233",
+   "referenced_type" : "type-235",
+   "self_type" : "type-235",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-237" ],
+   "template_args" : [ "type-239" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
    "vtable_components" :
    [
@@ -23232,7 +23298,7 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-234"
+     "referenced_type" : "type-236"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
@@ -23289,14 +23355,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::SortedVectorImpl",
    "name" : "android::SortedVectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-234",
-   "self_type" : "type-234",
+   "referenced_type" : "type-236",
+   "self_type" : "type-236",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android16SortedVectorImplE",
@@ -23354,14 +23420,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-180"
+     "referenced_type" : "type-183"
     }
    ],
    "linker_set_key" : "android::String16",
    "name" : "android::String16",
    "record_kind" : "class",
-   "referenced_type" : "type-179",
-   "self_type" : "type-179",
+   "referenced_type" : "type-182",
+   "self_type" : "type-182",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "unique_id" : "_ZTSN7android8String16E"
@@ -23373,14 +23439,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     }
    ],
    "linker_set_key" : "android::String8",
    "name" : "android::String8",
    "record_kind" : "class",
-   "referenced_type" : "type-285",
-   "self_type" : "type-285",
+   "referenced_type" : "type-282",
+   "self_type" : "type-282",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "unique_id" : "_ZTSN7android7String8E"
@@ -23391,7 +23457,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "fields" :
@@ -23400,62 +23466,62 @@
      "access" : "private",
      "field_name" : "mCanCallJava",
      "field_offset" : 32,
-     "referenced_type" : "type-370"
+     "referenced_type" : "type-367"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 64,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 96,
-     "referenced_type" : "type-252"
+     "referenced_type" : "type-280"
     },
     {
      "access" : "private",
      "field_name" : "mThreadExitedCondition",
      "field_offset" : 128,
-     "referenced_type" : "type-258"
+     "referenced_type" : "type-254"
     },
     {
      "access" : "private",
      "field_name" : "mStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mExitPending",
      "field_offset" : 192,
-     "referenced_type" : "type-270"
+     "referenced_type" : "type-266"
     },
     {
      "access" : "private",
      "field_name" : "mRunning",
      "field_offset" : 200,
-     "referenced_type" : "type-270"
+     "referenced_type" : "type-266"
     },
     {
      "access" : "private",
      "field_name" : "mHoldSelf",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-364"
     },
     {
      "access" : "private",
      "field_name" : "mTid",
      "field_offset" : 256,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::Thread",
    "name" : "android::Thread",
    "record_kind" : "class",
-   "referenced_type" : "type-369",
-   "self_type" : "type-369",
+   "referenced_type" : "type-366",
+   "self_type" : "type-366",
    "size" : 44,
    "source_file" : "/system/core/libutils/include/utils/Thread.h",
    "unique_id" : "_ZTSN7android6ThreadE",
@@ -23545,14 +23611,14 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::Rect>",
    "name" : "android::Vector<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-2382",
-   "self_type" : "type-2382",
+   "referenced_type" : "type-2384",
+   "self_type" : "type-2384",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-1241" ],
@@ -23600,17 +23666,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::RefBase *>",
    "name" : "android::Vector<android::RefBase *>",
    "record_kind" : "class",
-   "referenced_type" : "type-245",
-   "self_type" : "type-245",
+   "referenced_type" : "type-247",
+   "self_type" : "type-247",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-246" ],
+   "template_args" : [ "type-248" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7RefBaseEEE",
    "vtable_components" :
    [
@@ -23655,17 +23721,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::RefBase::weakref_type *>",
    "name" : "android::Vector<android::RefBase::weakref_type *>",
    "record_kind" : "class",
-   "referenced_type" : "type-244",
-   "self_type" : "type-244",
+   "referenced_type" : "type-246",
+   "self_type" : "type-246",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-197" ],
+   "template_args" : [ "type-210" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7RefBase12weakref_typeEEE",
    "vtable_components" :
    [
@@ -23710,17 +23776,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::BHwBinder *>",
    "name" : "android::Vector<android::hardware::BHwBinder *>",
    "record_kind" : "class",
-   "referenced_type" : "type-240",
-   "self_type" : "type-240",
+   "referenced_type" : "type-242",
+   "self_type" : "type-242",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-241" ],
+   "template_args" : [ "type-243" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_8hardware9BHwBinderEEE",
    "vtable_components" :
    [
@@ -23765,17 +23831,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "record_kind" : "class",
-   "referenced_type" : "type-238",
-   "self_type" : "type-238",
+   "referenced_type" : "type-240",
+   "self_type" : "type-240",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-239" ],
+   "template_args" : [ "type-241" ],
    "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
    "vtable_components" :
    [
@@ -23820,17 +23886,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<long long>",
    "name" : "android::Vector<long long>",
    "record_kind" : "class",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1421",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1425",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android6VectorIxEE",
    "vtable_components" :
    [
@@ -23877,32 +23943,32 @@
      "access" : "private",
      "field_name" : "mStorage",
      "field_offset" : 32,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "access" : "private",
      "field_name" : "mCount",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mFlags",
      "field_offset" : 96,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "access" : "private",
      "field_name" : "mItemSize",
      "field_offset" : 128,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     }
    ],
    "linker_set_key" : "android::VectorImpl",
    "name" : "android::VectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-235",
-   "self_type" : "type-235",
+   "referenced_type" : "type-237",
+   "self_type" : "type-237",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android10VectorImplE",
@@ -23988,11 +24054,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::aggregate_traits<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-824",
-   "self_type" : "type-824",
+   "referenced_type" : "type-825",
+   "self_type" : "type-825",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142", "type-676" ],
+   "template_args" : [ "type-145", "type-680" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -24012,7 +24078,7 @@
     {
      "access" : "private",
      "field_name" : "fd_",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser>",
@@ -24077,28 +24143,28 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2410"
+     "referenced_type" : "type-2412"
+    },
+    {
+     "referenced_type" : "type-2413"
     },
     {
      "referenced_type" : "type-2411"
     },
     {
-     "referenced_type" : "type-2409"
-    },
-    {
-     "referenced_type" : "type-2417"
-    },
-    {
-     "referenced_type" : "type-2419"
+     "referenced_type" : "type-2420"
     },
     {
      "referenced_type" : "type-2421"
     },
     {
-     "referenced_type" : "type-2420"
+     "referenced_type" : "type-2423"
     },
     {
-     "referenced_type" : "type-2423"
+     "referenced_type" : "type-2422"
+    },
+    {
+     "referenced_type" : "type-2425"
     }
    ],
    "fields" :
@@ -24106,14 +24172,14 @@
     {
      "access" : "private",
      "field_name" : "m_value",
-     "referenced_type" : "type-2428"
+     "referenced_type" : "type-2430"
     }
    ],
    "linker_set_key" : "android::details::TMat44<float>",
    "name" : "android::details::TMat44<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2427",
-   "self_type" : "type-2427",
+   "referenced_type" : "type-2429",
+   "self_type" : "type-2429",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h",
    "template_args" : [ "type-10" ],
@@ -24136,8 +24202,8 @@
    "linker_set_key" : "android::details::TMatDebug<android::details::TMat44, float>",
    "name" : "android::details::TMatDebug<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2423",
-   "self_type" : "type-2423",
+   "referenced_type" : "type-2425",
+   "self_type" : "type-2425",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24160,8 +24226,8 @@
    "linker_set_key" : "android::details::TMatHelpers<android::details::TMat44, float>",
    "name" : "android::details::TMatHelpers<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2420",
-   "self_type" : "type-2420",
+   "referenced_type" : "type-2422",
+   "self_type" : "type-2422",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24184,8 +24250,8 @@
    "linker_set_key" : "android::details::TMatProductOperators<android::details::TMat44, float>",
    "name" : "android::details::TMatProductOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2417",
-   "self_type" : "type-2417",
+   "referenced_type" : "type-2420",
+   "self_type" : "type-2420",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24208,8 +24274,8 @@
    "linker_set_key" : "android::details::TMatSquareFunctions<android::details::TMat44, float>",
    "name" : "android::details::TMatSquareFunctions<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2419",
-   "self_type" : "type-2419",
+   "referenced_type" : "type-2421",
+   "self_type" : "type-2421",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24232,8 +24298,8 @@
    "linker_set_key" : "android::details::TMatTransform<android::details::TMat44, float>",
    "name" : "android::details::TMatTransform<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2421",
-   "self_type" : "type-2421",
+   "referenced_type" : "type-2423",
+   "self_type" : "type-2423",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24244,11 +24310,11 @@
    "linker_set_key" : "android::details::TQuatDebug<android::details::TQuaternion, double>",
    "name" : "android::details::TQuatDebug<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-49",
-   "self_type" : "type-49",
+   "referenced_type" : "type-51",
+   "self_type" : "type-51",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details10TQuatDebugINS0_11TQuaternionEdEE"
   },
   {
@@ -24256,8 +24322,8 @@
    "linker_set_key" : "android::details::TQuatDebug<android::details::TQuaternion, float>",
    "name" : "android::details::TQuatDebug<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-48",
-   "self_type" : "type-48",
+   "referenced_type" : "type-50",
+   "self_type" : "type-50",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24268,11 +24334,11 @@
    "linker_set_key" : "android::details::TQuatFunctions<android::details::TQuaternion, double>",
    "name" : "android::details::TQuatFunctions<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-47",
-   "self_type" : "type-47",
+   "referenced_type" : "type-49",
+   "self_type" : "type-49",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details14TQuatFunctionsINS0_11TQuaternionEdEE"
   },
   {
@@ -24280,8 +24346,8 @@
    "linker_set_key" : "android::details::TQuatFunctions<android::details::TQuaternion, float>",
    "name" : "android::details::TQuatFunctions<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-43",
-   "self_type" : "type-43",
+   "referenced_type" : "type-45",
+   "self_type" : "type-45",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24292,11 +24358,11 @@
    "linker_set_key" : "android::details::TQuatProductOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TQuatProductOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-40",
-   "self_type" : "type-40",
+   "referenced_type" : "type-42",
+   "self_type" : "type-42",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details21TQuatProductOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -24316,38 +24382,38 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-334"
+     "referenced_type" : "type-331"
     },
     {
-     "referenced_type" : "type-335"
+     "referenced_type" : "type-332"
     },
     {
-     "referenced_type" : "type-336"
+     "referenced_type" : "type-333"
     },
     {
-     "referenced_type" : "type-40"
-    },
-    {
-     "referenced_type" : "type-47"
+     "referenced_type" : "type-42"
     },
     {
      "referenced_type" : "type-49"
+    },
+    {
+     "referenced_type" : "type-51"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-332"
+     "referenced_type" : "type-329"
     }
    ],
    "linker_set_key" : "android::details::TQuaternion<double>",
    "name" : "android::details::TQuaternion<double>",
    "record_kind" : "class",
-   "referenced_type" : "type-331",
-   "self_type" : "type-331",
+   "referenced_type" : "type-328",
+   "self_type" : "type-328",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details11TQuaternionIdEE"
   },
   {
@@ -24355,27 +24421,27 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-330"
     },
     {
      "field_name" : "xyzw",
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-52"
     },
     {
      "field_name" : "xyz",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-68"
     },
     {
      "field_name" : "xy",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "name" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "record_kind" : "union",
-   "referenced_type" : "type-332",
-   "self_type" : "type-332",
+   "referenced_type" : "type-329",
+   "self_type" : "type-329",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIdEUt_E"
@@ -24386,29 +24452,29 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "z",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "w",
      "field_offset" : 192,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
    "name" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
-   "referenced_type" : "type-333",
-   "self_type" : "type-333",
+   "referenced_type" : "type-330",
+   "self_type" : "type-330",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIdEUt_Ut_E"
@@ -24418,35 +24484,35 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-413"
+     "referenced_type" : "type-410"
     },
     {
-     "referenced_type" : "type-414"
+     "referenced_type" : "type-411"
     },
     {
-     "referenced_type" : "type-415"
+     "referenced_type" : "type-412"
     },
     {
      "referenced_type" : "type-38"
     },
     {
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-50"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-411"
+     "referenced_type" : "type-408"
     }
    ],
    "linker_set_key" : "android::details::TQuaternion<float>",
    "name" : "android::details::TQuaternion<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-410",
-   "self_type" : "type-410",
+   "referenced_type" : "type-407",
+   "self_type" : "type-407",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "template_args" : [ "type-10" ],
@@ -24457,27 +24523,27 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-412"
+     "referenced_type" : "type-409"
     },
     {
      "field_name" : "xyzw",
-     "referenced_type" : "type-200"
+     "referenced_type" : "type-192"
     },
     {
      "field_name" : "xyz",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-18"
     },
     {
      "field_name" : "xy",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "name" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "record_kind" : "union",
-   "referenced_type" : "type-411",
-   "self_type" : "type-411",
+   "referenced_type" : "type-408",
+   "self_type" : "type-408",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIfEUt_E"
@@ -24509,8 +24575,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
    "name" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
-   "referenced_type" : "type-412",
-   "self_type" : "type-412",
+   "referenced_type" : "type-409",
+   "self_type" : "type-409",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIfEUt_Ut_E"
@@ -24520,16 +24586,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-396"
+     "referenced_type" : "type-390"
     },
     {
-     "referenced_type" : "type-427"
+     "referenced_type" : "type-424"
     },
     {
-     "referenced_type" : "type-462"
+     "referenced_type" : "type-455"
     },
     {
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-507"
     },
     {
      "referenced_type" : "type-600"
@@ -24652,12 +24718,6 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-61"
-    },
-    {
      "referenced_type" : "type-62"
     },
     {
@@ -24668,22 +24728,28 @@
     },
     {
      "referenced_type" : "type-65"
+    },
+    {
+     "referenced_type" : "type-66"
+    },
+    {
+     "referenced_type" : "type-67"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-58"
     }
    ],
    "linker_set_key" : "android::details::TVec2<double>",
    "name" : "android::details::TVec2<double>",
    "record_kind" : "class",
-   "referenced_type" : "type-55",
-   "self_type" : "type-55",
+   "referenced_type" : "type-57",
+   "self_type" : "type-57",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details5TVec2IdEE"
   },
   {
@@ -24691,21 +24757,21 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-57"
-    },
-    {
-     "referenced_type" : "type-58"
-    },
-    {
      "referenced_type" : "type-59"
+    },
+    {
+     "referenced_type" : "type-60"
+    },
+    {
+     "referenced_type" : "type-61"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5) at frameworks/native/libs/math/include/math/vec2.h:49:5",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5) at frameworks/native/libs/math/include/math/vec2.h:49:5",
    "record_kind" : "union",
-   "referenced_type" : "type-56",
-   "self_type" : "type-56",
+   "referenced_type" : "type-58",
+   "self_type" : "type-58",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_E"
@@ -24716,19 +24782,19 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:50:9) at frameworks/native/libs/math/include/math/vec2.h:50:9",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:50:9) at frameworks/native/libs/math/include/math/vec2.h:50:9",
-   "referenced_type" : "type-57",
-   "self_type" : "type-57",
+   "referenced_type" : "type-59",
+   "self_type" : "type-59",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_Ut_E"
@@ -24739,19 +24805,19 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "t",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:51:9) at frameworks/native/libs/math/include/math/vec2.h:51:9",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:51:9) at frameworks/native/libs/math/include/math/vec2.h:51:9",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
+   "referenced_type" : "type-60",
+   "self_type" : "type-60",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_Ut0_E"
@@ -24762,19 +24828,19 @@
    [
     {
      "field_name" : "r",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "g",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:52:9) at frameworks/native/libs/math/include/math/vec2.h:52:9",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:52:9) at frameworks/native/libs/math/include/math/vec2.h:52:9",
-   "referenced_type" : "type-59",
-   "self_type" : "type-59",
+   "referenced_type" : "type-61",
+   "self_type" : "type-61",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_Ut1_E"
@@ -24784,9 +24850,6 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-27"
-    },
-    {
      "referenced_type" : "type-28"
     },
     {
@@ -24800,19 +24863,22 @@
     },
     {
      "referenced_type" : "type-32"
+    },
+    {
+     "referenced_type" : "type-33"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-24"
     }
    ],
    "linker_set_key" : "android::details::TVec2<float>",
    "name" : "android::details::TVec2<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-22",
-   "self_type" : "type-22",
+   "referenced_type" : "type-23",
+   "self_type" : "type-23",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "template_args" : [ "type-10" ],
@@ -24823,21 +24889,21 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-24"
-    },
-    {
      "referenced_type" : "type-25"
     },
     {
      "referenced_type" : "type-26"
+    },
+    {
+     "referenced_type" : "type-27"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5) at frameworks/native/libs/math/include/math/vec2.h:49:5",
    "name" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5) at frameworks/native/libs/math/include/math/vec2.h:49:5",
    "record_kind" : "union",
-   "referenced_type" : "type-23",
-   "self_type" : "type-23",
+   "referenced_type" : "type-24",
+   "self_type" : "type-24",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IfEUt_E"
@@ -24859,8 +24925,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:50:9) at frameworks/native/libs/math/include/math/vec2.h:50:9",
    "name" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:50:9) at frameworks/native/libs/math/include/math/vec2.h:50:9",
-   "referenced_type" : "type-24",
-   "self_type" : "type-24",
+   "referenced_type" : "type-25",
+   "self_type" : "type-25",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IfEUt_Ut_E"
@@ -24882,8 +24948,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:51:9) at frameworks/native/libs/math/include/math/vec2.h:51:9",
    "name" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:51:9) at frameworks/native/libs/math/include/math/vec2.h:51:9",
-   "referenced_type" : "type-25",
-   "self_type" : "type-25",
+   "referenced_type" : "type-26",
+   "self_type" : "type-26",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IfEUt_Ut0_E"
@@ -24905,8 +24971,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:52:9) at frameworks/native/libs/math/include/math/vec2.h:52:9",
    "name" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:52:9) at frameworks/native/libs/math/include/math/vec2.h:52:9",
-   "referenced_type" : "type-26",
-   "self_type" : "type-26",
+   "referenced_type" : "type-27",
+   "self_type" : "type-27",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IfEUt_Ut1_E"
@@ -24916,12 +24982,6 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-72"
-    },
-    {
      "referenced_type" : "type-73"
     },
     {
@@ -24932,22 +24992,28 @@
     },
     {
      "referenced_type" : "type-76"
+    },
+    {
+     "referenced_type" : "type-77"
+    },
+    {
+     "referenced_type" : "type-78"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-69"
     }
    ],
    "linker_set_key" : "android::details::TVec3<double>",
    "name" : "android::details::TVec3<double>",
    "record_kind" : "class",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
+   "referenced_type" : "type-68",
+   "self_type" : "type-68",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details5TVec3IdEE"
   },
   {
@@ -24955,33 +25021,33 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-68"
-    },
-    {
-     "referenced_type" : "type-69"
-    },
-    {
      "referenced_type" : "type-70"
     },
     {
+     "referenced_type" : "type-71"
+    },
+    {
+     "referenced_type" : "type-72"
+    },
+    {
      "field_name" : "xy",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "st",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "rg",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5) at frameworks/native/libs/math/include/math/vec3.h:47:5",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5) at frameworks/native/libs/math/include/math/vec3.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-67",
-   "self_type" : "type-67",
+   "referenced_type" : "type-69",
+   "self_type" : "type-69",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_E"
@@ -24992,24 +25058,24 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "z",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:48:9) at frameworks/native/libs/math/include/math/vec3.h:48:9",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:48:9) at frameworks/native/libs/math/include/math/vec3.h:48:9",
-   "referenced_type" : "type-68",
-   "self_type" : "type-68",
+   "referenced_type" : "type-70",
+   "self_type" : "type-70",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_Ut_E"
@@ -25020,24 +25086,24 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "t",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "p",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:49:9) at frameworks/native/libs/math/include/math/vec3.h:49:9",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:49:9) at frameworks/native/libs/math/include/math/vec3.h:49:9",
-   "referenced_type" : "type-69",
-   "self_type" : "type-69",
+   "referenced_type" : "type-71",
+   "self_type" : "type-71",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_Ut0_E"
@@ -25048,24 +25114,24 @@
    [
     {
      "field_name" : "r",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "g",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "b",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:50:9) at frameworks/native/libs/math/include/math/vec3.h:50:9",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:50:9) at frameworks/native/libs/math/include/math/vec3.h:50:9",
-   "referenced_type" : "type-70",
-   "self_type" : "type-70",
+   "referenced_type" : "type-72",
+   "self_type" : "type-72",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_Ut1_E"
@@ -25075,35 +25141,35 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-33"
+     "referenced_type" : "type-34"
     },
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-35"
     },
     {
      "referenced_type" : "type-9"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-13"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "type-36"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-19"
     }
    ],
    "linker_set_key" : "android::details::TVec3<float>",
    "name" : "android::details::TVec3<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-17",
-   "self_type" : "type-17",
+   "referenced_type" : "type-18",
+   "self_type" : "type-18",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "template_args" : [ "type-10" ],
@@ -25114,33 +25180,33 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-19"
-    },
-    {
      "referenced_type" : "type-20"
     },
     {
      "referenced_type" : "type-21"
     },
     {
-     "field_name" : "xy",
      "referenced_type" : "type-22"
     },
     {
+     "field_name" : "xy",
+     "referenced_type" : "type-23"
+    },
+    {
      "field_name" : "st",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "rg",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5) at frameworks/native/libs/math/include/math/vec3.h:47:5",
    "name" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5) at frameworks/native/libs/math/include/math/vec3.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-18",
-   "self_type" : "type-18",
+   "referenced_type" : "type-19",
+   "self_type" : "type-19",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IfEUt_E"
@@ -25167,8 +25233,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:48:9) at frameworks/native/libs/math/include/math/vec3.h:48:9",
    "name" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:48:9) at frameworks/native/libs/math/include/math/vec3.h:48:9",
-   "referenced_type" : "type-19",
-   "self_type" : "type-19",
+   "referenced_type" : "type-20",
+   "self_type" : "type-20",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IfEUt_Ut_E"
@@ -25195,8 +25261,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:49:9) at frameworks/native/libs/math/include/math/vec3.h:49:9",
    "name" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:49:9) at frameworks/native/libs/math/include/math/vec3.h:49:9",
-   "referenced_type" : "type-20",
-   "self_type" : "type-20",
+   "referenced_type" : "type-21",
+   "self_type" : "type-21",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IfEUt_Ut0_E"
@@ -25223,8 +25289,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:50:9) at frameworks/native/libs/math/include/math/vec3.h:50:9",
    "name" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:50:9) at frameworks/native/libs/math/include/math/vec3.h:50:9",
-   "referenced_type" : "type-21",
-   "self_type" : "type-21",
+   "referenced_type" : "type-22",
+   "self_type" : "type-22",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IfEUt_Ut1_E"
@@ -25234,12 +25300,6 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-78"
-    },
-    {
      "referenced_type" : "type-79"
     },
     {
@@ -25250,22 +25310,28 @@
     },
     {
      "referenced_type" : "type-82"
+    },
+    {
+     "referenced_type" : "type-83"
+    },
+    {
+     "referenced_type" : "type-84"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-53"
     }
    ],
    "linker_set_key" : "android::details::TVec4<double>",
    "name" : "android::details::TVec4<double>",
    "record_kind" : "class",
-   "referenced_type" : "type-50",
-   "self_type" : "type-50",
+   "referenced_type" : "type-52",
+   "self_type" : "type-52",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details5TVec4IdEE"
   },
   {
@@ -25273,45 +25339,45 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-52"
-    },
-    {
-     "referenced_type" : "type-53"
-    },
-    {
      "referenced_type" : "type-54"
     },
     {
-     "field_name" : "xy",
      "referenced_type" : "type-55"
     },
     {
+     "referenced_type" : "type-56"
+    },
+    {
+     "field_name" : "xy",
+     "referenced_type" : "type-57"
+    },
+    {
      "field_name" : "st",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "rg",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "xyz",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-68"
     },
     {
      "field_name" : "stp",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-68"
     },
     {
      "field_name" : "rgb",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-68"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-51",
-   "self_type" : "type-51",
+   "referenced_type" : "type-53",
+   "self_type" : "type-53",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_E"
@@ -25322,29 +25388,29 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "z",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "w",
      "field_offset" : 192,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
-   "referenced_type" : "type-52",
-   "self_type" : "type-52",
+   "referenced_type" : "type-54",
+   "self_type" : "type-54",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_Ut_E"
@@ -25355,29 +25421,29 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "t",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "p",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "q",
      "field_offset" : 192,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
-   "referenced_type" : "type-53",
-   "self_type" : "type-53",
+   "referenced_type" : "type-55",
+   "self_type" : "type-55",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_Ut0_E"
@@ -25388,29 +25454,29 @@
    [
     {
      "field_name" : "r",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "g",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "b",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "a",
      "field_offset" : 192,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
-   "referenced_type" : "type-54",
-   "self_type" : "type-54",
+   "referenced_type" : "type-56",
+   "self_type" : "type-56",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_Ut1_E"
@@ -25420,35 +25486,35 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-205"
+     "referenced_type" : "type-197"
     },
     {
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-198"
     },
     {
-     "referenced_type" : "type-207"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-200"
     },
     {
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-201"
     },
     {
-     "referenced_type" : "type-210"
+     "referenced_type" : "type-202"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-193"
     }
    ],
    "linker_set_key" : "android::details::TVec4<float>",
    "name" : "android::details::TVec4<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-200",
-   "self_type" : "type-200",
+   "referenced_type" : "type-192",
+   "self_type" : "type-192",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "template_args" : [ "type-10" ],
@@ -25459,45 +25525,45 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-202"
+     "referenced_type" : "type-194"
     },
     {
-     "referenced_type" : "type-203"
+     "referenced_type" : "type-195"
     },
     {
-     "referenced_type" : "type-204"
+     "referenced_type" : "type-196"
     },
     {
      "field_name" : "xy",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "st",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "rg",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "xyz",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-18"
     },
     {
      "field_name" : "stp",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-18"
     },
     {
      "field_name" : "rgb",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-18"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-201",
-   "self_type" : "type-201",
+   "referenced_type" : "type-193",
+   "self_type" : "type-193",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_E"
@@ -25529,8 +25595,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
-   "referenced_type" : "type-202",
-   "self_type" : "type-202",
+   "referenced_type" : "type-194",
+   "self_type" : "type-194",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_Ut_E"
@@ -25562,8 +25628,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
-   "referenced_type" : "type-203",
-   "self_type" : "type-203",
+   "referenced_type" : "type-195",
+   "self_type" : "type-195",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_Ut0_E"
@@ -25595,8 +25661,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
-   "referenced_type" : "type-204",
-   "self_type" : "type-204",
+   "referenced_type" : "type-196",
+   "self_type" : "type-196",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_Ut1_E"
@@ -25618,8 +25684,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TMat44, float>",
    "name" : "android::details::TVecAddOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2409",
-   "self_type" : "type-2409",
+   "referenced_type" : "type-2411",
+   "self_type" : "type-2411",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25630,11 +25696,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TVecAddOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-334",
-   "self_type" : "type-334",
+   "referenced_type" : "type-331",
+   "self_type" : "type-331",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -25642,8 +25708,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TQuaternion, float>",
    "name" : "android::details::TVecAddOperators<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-413",
-   "self_type" : "type-413",
+   "referenced_type" : "type-410",
+   "self_type" : "type-410",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25654,8 +25720,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecAddOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-427",
-   "self_type" : "type-427",
+   "referenced_type" : "type-424",
+   "self_type" : "type-424",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -25666,11 +25732,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecAddOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-61",
-   "self_type" : "type-61",
+   "referenced_type" : "type-63",
+   "self_type" : "type-63",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -25678,8 +25744,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec2, float>",
    "name" : "android::details::TVecAddOperators<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-28",
-   "self_type" : "type-28",
+   "referenced_type" : "type-29",
+   "self_type" : "type-29",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25690,11 +25756,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecAddOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-72",
-   "self_type" : "type-72",
+   "referenced_type" : "type-74",
+   "self_type" : "type-74",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -25702,8 +25768,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec3, float>",
    "name" : "android::details::TVecAddOperators<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-34",
-   "self_type" : "type-34",
+   "referenced_type" : "type-35",
+   "self_type" : "type-35",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25714,11 +25780,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecAddOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-78",
-   "self_type" : "type-78",
+   "referenced_type" : "type-80",
+   "self_type" : "type-80",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -25726,8 +25792,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecAddOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-206",
-   "self_type" : "type-206",
+   "referenced_type" : "type-198",
+   "self_type" : "type-198",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25750,8 +25816,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TMat44, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2411",
-   "self_type" : "type-2411",
+   "referenced_type" : "type-2413",
+   "self_type" : "type-2413",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25762,11 +25828,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-336",
-   "self_type" : "type-336",
+   "referenced_type" : "type-333",
+   "self_type" : "type-333",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -25774,8 +25840,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TQuaternion, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-415",
-   "self_type" : "type-415",
+   "referenced_type" : "type-412",
+   "self_type" : "type-412",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25786,8 +25852,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-510",
-   "self_type" : "type-510",
+   "referenced_type" : "type-507",
+   "self_type" : "type-507",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -25798,11 +25864,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-63",
-   "self_type" : "type-63",
+   "referenced_type" : "type-65",
+   "self_type" : "type-65",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -25810,8 +25876,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec2, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-30",
-   "self_type" : "type-30",
+   "referenced_type" : "type-31",
+   "self_type" : "type-31",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25822,11 +25888,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-74",
-   "self_type" : "type-74",
+   "referenced_type" : "type-76",
+   "self_type" : "type-76",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -25834,8 +25900,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec3, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-11",
-   "self_type" : "type-11",
+   "referenced_type" : "type-13",
+   "self_type" : "type-13",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25846,11 +25912,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-80",
-   "self_type" : "type-80",
+   "referenced_type" : "type-82",
+   "self_type" : "type-82",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -25858,8 +25924,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-208",
-   "self_type" : "type-208",
+   "referenced_type" : "type-200",
+   "self_type" : "type-200",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25882,11 +25948,11 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec2, double>",
    "name" : "android::details::TVecDebug<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-65",
-   "self_type" : "type-65",
+   "referenced_type" : "type-67",
+   "self_type" : "type-67",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details9TVecDebugINS0_5TVec2EdEE"
   },
   {
@@ -25894,8 +25960,8 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec2, float>",
    "name" : "android::details::TVecDebug<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-32",
-   "self_type" : "type-32",
+   "referenced_type" : "type-33",
+   "self_type" : "type-33",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25906,11 +25972,11 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec3, double>",
    "name" : "android::details::TVecDebug<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-76",
-   "self_type" : "type-76",
+   "referenced_type" : "type-78",
+   "self_type" : "type-78",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details9TVecDebugINS0_5TVec3EdEE"
   },
   {
@@ -25918,8 +25984,8 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec3, float>",
    "name" : "android::details::TVecDebug<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-35",
-   "self_type" : "type-35",
+   "referenced_type" : "type-36",
+   "self_type" : "type-36",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25930,11 +25996,11 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec4, double>",
    "name" : "android::details::TVecDebug<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-82",
-   "self_type" : "type-82",
+   "referenced_type" : "type-84",
+   "self_type" : "type-84",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details9TVecDebugINS0_5TVec4EdEE"
   },
   {
@@ -25942,8 +26008,8 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec4, float>",
    "name" : "android::details::TVecDebug<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-210",
-   "self_type" : "type-210",
+   "referenced_type" : "type-202",
+   "self_type" : "type-202",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25966,11 +26032,11 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec2, double>",
    "name" : "android::details::TVecFunctions<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-64",
-   "self_type" : "type-64",
+   "referenced_type" : "type-66",
+   "self_type" : "type-66",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details13TVecFunctionsINS0_5TVec2EdEE"
   },
   {
@@ -25978,8 +26044,8 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec2, float>",
    "name" : "android::details::TVecFunctions<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-31",
-   "self_type" : "type-31",
+   "referenced_type" : "type-32",
+   "self_type" : "type-32",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25990,11 +26056,11 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec3, double>",
    "name" : "android::details::TVecFunctions<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-75",
-   "self_type" : "type-75",
+   "referenced_type" : "type-77",
+   "self_type" : "type-77",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details13TVecFunctionsINS0_5TVec3EdEE"
   },
   {
@@ -26002,8 +26068,8 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec3, float>",
    "name" : "android::details::TVecFunctions<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-12",
-   "self_type" : "type-12",
+   "referenced_type" : "type-14",
+   "self_type" : "type-14",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26014,11 +26080,11 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec4, double>",
    "name" : "android::details::TVecFunctions<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-81",
-   "self_type" : "type-81",
+   "referenced_type" : "type-83",
+   "self_type" : "type-83",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details13TVecFunctionsINS0_5TVec4EdEE"
   },
   {
@@ -26026,8 +26092,8 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec4, float>",
    "name" : "android::details::TVecFunctions<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-209",
-   "self_type" : "type-209",
+   "referenced_type" : "type-201",
+   "self_type" : "type-201",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26038,8 +26104,8 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecProductOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-396",
-   "self_type" : "type-396",
+   "referenced_type" : "type-390",
+   "self_type" : "type-390",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -26050,11 +26116,11 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecProductOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-60",
-   "self_type" : "type-60",
+   "referenced_type" : "type-62",
+   "self_type" : "type-62",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details20TVecProductOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -26062,8 +26128,8 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec2, float>",
    "name" : "android::details::TVecProductOperators<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-27",
-   "self_type" : "type-27",
+   "referenced_type" : "type-28",
+   "self_type" : "type-28",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26074,11 +26140,11 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecProductOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-71",
-   "self_type" : "type-71",
+   "referenced_type" : "type-73",
+   "self_type" : "type-73",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details20TVecProductOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -26086,8 +26152,8 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec3, float>",
    "name" : "android::details::TVecProductOperators<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-33",
-   "self_type" : "type-33",
+   "referenced_type" : "type-34",
+   "self_type" : "type-34",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26098,11 +26164,11 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecProductOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-77",
-   "self_type" : "type-77",
+   "referenced_type" : "type-79",
+   "self_type" : "type-79",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details20TVecProductOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -26110,8 +26176,8 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecProductOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-205",
-   "self_type" : "type-205",
+   "referenced_type" : "type-197",
+   "self_type" : "type-197",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26134,8 +26200,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TMat44, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2410",
-   "self_type" : "type-2410",
+   "referenced_type" : "type-2412",
+   "self_type" : "type-2412",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26146,11 +26212,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-335",
-   "self_type" : "type-335",
+   "referenced_type" : "type-332",
+   "self_type" : "type-332",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -26158,8 +26224,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TQuaternion, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-414",
-   "self_type" : "type-414",
+   "referenced_type" : "type-411",
+   "self_type" : "type-411",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26170,8 +26236,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-462",
-   "self_type" : "type-462",
+   "referenced_type" : "type-455",
+   "self_type" : "type-455",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -26182,11 +26248,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-62",
-   "self_type" : "type-62",
+   "referenced_type" : "type-64",
+   "self_type" : "type-64",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -26194,8 +26260,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec2, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-29",
-   "self_type" : "type-29",
+   "referenced_type" : "type-30",
+   "self_type" : "type-30",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26206,11 +26272,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-73",
-   "self_type" : "type-73",
+   "referenced_type" : "type-75",
+   "self_type" : "type-75",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -26230,11 +26296,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-79",
-   "self_type" : "type-79",
+   "referenced_type" : "type-81",
+   "self_type" : "type-81",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -26242,8 +26308,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-207",
-   "self_type" : "type-207",
+   "referenced_type" : "type-199",
+   "self_type" : "type-199",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26309,7 +26375,7 @@
    [
     {
      "field_name" : "bits",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "fp",
@@ -26331,7 +26397,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-196"
+     "referenced_type" : "type-209"
     }
    ],
    "fields" :
@@ -26340,32 +26406,32 @@
      "access" : "protected",
      "field_name" : "mSchedPolicy",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "protected",
      "field_name" : "mSchedPriority",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mExtras",
      "field_offset" : 96,
-     "referenced_type" : "type-243"
+     "referenced_type" : "type-245"
     },
     {
      "access" : "private",
      "field_name" : "mReserved0",
      "field_offset" : 128,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
    "linker_set_key" : "android::hardware::BHwBinder",
    "name" : "android::hardware::BHwBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-242",
-   "self_type" : "type-242",
+   "referenced_type" : "type-244",
+   "self_type" : "type-244",
    "size" : 28,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware9BHwBinderE",
@@ -26472,7 +26538,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "fields" :
@@ -26481,26 +26547,26 @@
      "access" : "private",
      "field_name" : "mRemote",
      "field_offset" : 32,
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-207"
     },
     {
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 64,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-210"
     },
     {
      "access" : "private",
      "field_name" : "mState",
      "field_offset" : 96,
-     "referenced_type" : "type-199"
+     "referenced_type" : "type-212"
     }
    ],
    "linker_set_key" : "android::hardware::BpHwRefBase",
    "name" : "android::hardware::BpHwRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-193",
-   "self_type" : "type-193",
+   "referenced_type" : "type-206",
+   "self_type" : "type-206",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE",
@@ -26589,22 +26655,22 @@
    [
     {
      "field_name" : "flags",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "fdIndex",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "offset",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "extent",
      "field_offset" : 128,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "android::hardware::GrantorDescriptor",
@@ -26625,7 +26691,7 @@
     },
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::HidlMemory",
@@ -26713,14 +26779,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::IBinder",
    "name" : "android::hardware::IBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-196",
-   "self_type" : "type-196",
+   "referenced_type" : "type-209",
+   "self_type" : "type-209",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinderE",
@@ -26830,14 +26896,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient",
    "name" : "android::hardware::IBinder::DeathRecipient",
    "record_kind" : "class",
-   "referenced_type" : "type-192",
-   "self_type" : "type-192",
+   "referenced_type" : "type-205",
+   "self_type" : "type-205",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinder14DeathRecipientE",
@@ -26918,14 +26984,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::IInterface",
    "name" : "android::hardware::IInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-213",
-   "self_type" : "type-213",
+   "referenced_type" : "type-215",
+   "self_type" : "type-215",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
    "unique_id" : "_ZTSN7android8hardware10IInterfaceE",
@@ -27007,85 +27073,85 @@
     {
      "access" : "private",
      "field_name" : "mProcess",
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-274"
     },
     {
      "access" : "private",
      "field_name" : "mPendingStrongDerefs",
      "field_offset" : 32,
-     "referenced_type" : "type-240"
+     "referenced_type" : "type-242"
     },
     {
      "access" : "private",
      "field_name" : "mPendingWeakDerefs",
      "field_offset" : 192,
-     "referenced_type" : "type-244"
+     "referenced_type" : "type-246"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteStrongDerefs",
      "field_offset" : 352,
-     "referenced_type" : "type-245"
+     "referenced_type" : "type-247"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteWeakDerefs",
      "field_offset" : 512,
-     "referenced_type" : "type-244"
+     "referenced_type" : "type-246"
     },
     {
      "access" : "private",
      "field_name" : "mIn",
      "field_offset" : 672,
-     "referenced_type" : "type-215"
+     "referenced_type" : "type-217"
     },
     {
      "access" : "private",
      "field_name" : "mOut",
      "field_offset" : 1216,
-     "referenced_type" : "type-215"
+     "referenced_type" : "type-217"
     },
     {
      "access" : "private",
      "field_name" : "mLastError",
      "field_offset" : 1760,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mCallingPid",
      "field_offset" : 1792,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mCallingSid",
      "field_offset" : 1824,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "access" : "private",
      "field_name" : "mCallingUid",
      "field_offset" : 1856,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mStrictModePolicy",
      "field_offset" : 1888,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mLastTransactionBinderFlags",
      "field_offset" : 1920,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mContextObject",
      "field_offset" : 1952,
-     "referenced_type" : "type-289"
+     "referenced_type" : "type-286"
     },
     {
      "access" : "private",
@@ -27103,26 +27169,26 @@
      "access" : "private",
      "field_name" : "mPostCommandTasks",
      "field_offset" : 2016,
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-287"
     },
     {
      "access" : "private",
      "field_name" : "mIPCThreadStateBase",
      "field_offset" : 2112,
-     "referenced_type" : "type-291"
+     "referenced_type" : "type-288"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 2144,
-     "referenced_type" : "type-276"
+     "referenced_type" : "type-272"
     }
    ],
    "linker_set_key" : "android::hardware::IPCThreadState",
    "name" : "android::hardware::IPCThreadState",
    "record_kind" : "class",
-   "referenced_type" : "type-277",
-   "self_type" : "type-277",
+   "referenced_type" : "type-273",
+   "self_type" : "type-273",
    "size" : 272,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h",
    "unique_id" : "_ZTSN7android8hardware14IPCThreadStateE"
@@ -27134,73 +27200,73 @@
     {
      "access" : "private",
      "field_name" : "mBufCachePos",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mBufCache",
      "field_offset" : 32,
-     "referenced_type" : "type-216"
+     "referenced_type" : "type-218"
     },
     {
      "access" : "private",
      "field_name" : "mError",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mData",
      "field_offset" : 160,
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-219"
     },
     {
      "access" : "private",
      "field_name" : "mDataSize",
      "field_offset" : 192,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mDataCapacity",
      "field_offset" : 224,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mDataPos",
      "field_offset" : 256,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mObjects",
      "field_offset" : 288,
-     "referenced_type" : "type-219"
+     "referenced_type" : "type-221"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsSize",
      "field_offset" : 320,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsCapacity",
      "field_offset" : 352,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mNextObjectHint",
      "field_offset" : 384,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mNumRef",
      "field_offset" : 416,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -27224,20 +27290,20 @@
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 480,
-     "referenced_type" : "type-220"
+     "referenced_type" : "type-222"
     },
     {
      "access" : "private",
      "field_name" : "mOwnerCookie",
      "field_offset" : 512,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
    "linker_set_key" : "android::hardware::Parcel",
    "name" : "android::hardware::Parcel",
    "record_kind" : "class",
-   "referenced_type" : "type-215",
-   "self_type" : "type-215",
+   "referenced_type" : "type-217",
+   "self_type" : "type-217",
    "size" : 68,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6ParcelE"
@@ -27249,23 +27315,23 @@
    [
     {
      "field_name" : "index",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "buffer",
      "field_offset" : 32,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "bufend",
      "field_offset" : 96,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "android::hardware::Parcel::BufferInfo",
    "name" : "android::hardware::Parcel::BufferInfo",
-   "referenced_type" : "type-228",
-   "self_type" : "type-228",
+   "referenced_type" : "type-230",
+   "self_type" : "type-230",
    "size" : 20,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE"
@@ -27276,7 +27342,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "fields" :
@@ -27285,55 +27351,55 @@
      "access" : "private",
      "field_name" : "mDriverFD",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mVMStart",
      "field_offset" : 64,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountLock",
      "field_offset" : 96,
-     "referenced_type" : "type-282"
+     "referenced_type" : "type-278"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountDecrement",
      "field_offset" : 128,
-     "referenced_type" : "type-283"
+     "referenced_type" : "type-279"
     },
     {
      "access" : "private",
      "field_name" : "mExecutingThreadsCount",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mMaxThreads",
      "field_offset" : 192,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mStarvationStartTimeMs",
      "field_offset" : 224,
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 288,
-     "referenced_type" : "type-252"
+     "referenced_type" : "type-280"
     },
     {
      "access" : "private",
      "field_name" : "mHandleToObject",
      "field_offset" : 320,
-     "referenced_type" : "type-238"
+     "referenced_type" : "type-240"
     },
     {
      "access" : "private",
@@ -27345,25 +27411,25 @@
      "access" : "private",
      "field_name" : "mBinderContextCheckFunc",
      "field_offset" : 512,
-     "referenced_type" : "type-274"
+     "referenced_type" : "type-270"
     },
     {
      "access" : "private",
      "field_name" : "mBinderContextUserData",
      "field_offset" : 544,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "access" : "private",
      "field_name" : "mContexts",
      "field_offset" : 576,
-     "referenced_type" : "type-247"
+     "referenced_type" : "type-249"
     },
     {
      "access" : "private",
      "field_name" : "mRootDir",
      "field_offset" : 736,
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-282"
     },
     {
      "access" : "private",
@@ -27381,26 +27447,26 @@
      "access" : "private",
      "field_name" : "mThreadPoolSeq",
      "field_offset" : 800,
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-271"
     },
     {
      "access" : "private",
      "field_name" : "mMmapSize",
      "field_offset" : 832,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 864,
-     "referenced_type" : "type-276"
+     "referenced_type" : "type-272"
     }
    ],
    "linker_set_key" : "android::hardware::ProcessState",
    "name" : "android::hardware::ProcessState",
    "record_kind" : "class",
-   "referenced_type" : "type-281",
-   "self_type" : "type-281",
+   "referenced_type" : "type-277",
+   "self_type" : "type-277",
    "size" : 120,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessStateE",
@@ -27478,18 +27544,18 @@
    [
     {
      "field_name" : "binder",
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-208"
     },
     {
      "field_name" : "refs",
      "field_offset" : 32,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-210"
     }
    ],
    "linker_set_key" : "android::hardware::ProcessState::handle_entry",
    "name" : "android::hardware::ProcessState::handle_entry",
-   "referenced_type" : "type-239",
-   "self_type" : "type-239",
+   "referenced_type" : "type-241",
+   "self_type" : "type-241",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE"
@@ -27499,7 +27565,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "fields" :
@@ -27508,17 +27574,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-102"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
    "record_kind" : "class",
-   "referenced_type" : "type-99",
-   "self_type" : "type-99",
+   "referenced_type" : "type-101",
+   "self_type" : "type-101",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-105" ],
+   "template_args" : [ "type-107" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS0_8graphics6mapper4V2_05ErrorEEE"
   },
   {
@@ -27526,7 +27592,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "fields" :
@@ -27535,17 +27601,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-393"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
    "record_kind" : "class",
-   "referenced_type" : "type-393",
-   "self_type" : "type-393",
+   "referenced_type" : "type-392",
+   "self_type" : "type-392",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-395" ],
+   "template_args" : [ "type-394" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS0_8graphics6mapper4V3_05ErrorEEE"
   },
   {
@@ -27553,7 +27619,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "fields" :
@@ -27562,17 +27628,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-88"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
    "record_kind" : "class",
-   "referenced_type" : "type-111",
-   "self_type" : "type-111",
+   "referenced_type" : "type-113",
+   "self_type" : "type-113",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-88" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics6mapper4V2_17IMapperEEEEE"
   },
   {
@@ -27580,7 +27646,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "linker_set_key" : "android::hardware::Return<void>",
@@ -27590,7 +27656,7 @@
    "self_type" : "type-1322",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIvEE"
   },
   {
@@ -27600,26 +27666,26 @@
     {
      "access" : "private",
      "field_name" : "mException",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mErrorCode",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-106"
     }
    ],
    "linker_set_key" : "android::hardware::Status",
    "name" : "android::hardware::Status",
    "record_kind" : "class",
-   "referenced_type" : "type-102",
-   "self_type" : "type-102",
+   "referenced_type" : "type-104",
+   "self_type" : "type-104",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware6StatusE"
@@ -27725,7 +27791,7 @@
    "self_type" : "type-1103",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware7details14const_accessorIjLj10EJEEE"
   },
   {
@@ -27739,12 +27805,12 @@
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-1099",
    "self_type" : "type-1099",
@@ -27776,16 +27842,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-137"
+     "referenced_type" : "type-140"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
-   "referenced_type" : "type-136",
-   "self_type" : "type-136",
+   "referenced_type" : "type-139",
+   "self_type" : "type-139",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-139" ],
+   "template_args" : [ "type-142" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_handleEEE"
   },
   {
@@ -27803,7 +27869,7 @@
    "self_type" : "type-1071",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-287" ],
+   "template_args" : [ "type-284" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEE"
   },
   {
@@ -27813,16 +27879,16 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-1072",
    "self_type" : "type-1072",
@@ -27836,16 +27902,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-144"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>",
-   "referenced_type" : "type-140",
-   "self_type" : "type-140",
+   "referenced_type" : "type-143",
+   "self_type" : "type-143",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-143" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEE"
   },
   {
@@ -27855,19 +27921,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-141",
-   "self_type" : "type-141",
+   "referenced_type" : "type-144",
+   "self_type" : "type-144",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEUt_E"
@@ -27879,19 +27945,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-141"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<hidl_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<hidl_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-137",
-   "self_type" : "type-137",
+   "referenced_type" : "type-140",
+   "self_type" : "type-140",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_handleEEUt_E"
@@ -27911,7 +27977,7 @@
    "self_type" : "type-1150",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-144" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEE"
   },
   {
@@ -27925,12 +27991,12 @@
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-1151",
    "self_type" : "type-1151",
@@ -27944,16 +28010,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-121"
+     "referenced_type" : "type-123"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int>",
    "name" : "android::hardware::details::hidl_pointer<unsigned int>",
-   "referenced_type" : "type-120",
-   "self_type" : "type-120",
+   "referenced_type" : "type-122",
+   "self_type" : "type-122",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIjEE"
   },
   {
@@ -27963,19 +28029,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<unsigned int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<unsigned int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-121",
-   "self_type" : "type-121",
+   "referenced_type" : "type-123",
+   "self_type" : "type-123",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIjEUt_E"
@@ -27997,7 +28063,7 @@
     {
      "access" : "private",
      "field_name" : "mStatus",
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-104"
     },
     {
      "access" : "private",
@@ -28009,8 +28075,8 @@
    "linker_set_key" : "android::hardware::details::return_status",
    "name" : "android::hardware::details::return_status",
    "record_kind" : "class",
-   "referenced_type" : "type-101",
-   "self_type" : "type-101",
+   "referenced_type" : "type-103",
+   "self_type" : "type-103",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware7details13return_statusE"
@@ -28023,7 +28089,7 @@
    "self_type" : "type-1102",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware7details9std_arrayIjLj10EJEEE"
   },
   {
@@ -28037,7 +28103,7 @@
     {
      "field_name" : "nativeHandle",
      "field_offset" : 320,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-142"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::HardwareBuffer",
@@ -28064,7 +28130,7 @@
    "self_type" : "type-1108",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware10hidl_arrayIjLj10EJEEE"
   },
   {
@@ -28073,7 +28139,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_death_recipient",
@@ -28158,33 +28224,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
    "name" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
-   "referenced_type" : "type-149",
-   "self_type" : "type-149",
+   "referenced_type" : "type-152",
+   "self_type" : "type-152",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-150", "type-151" ],
+   "template_args" : [ "type-153", "type-154" ],
    "unique_id" : "_ZTSN7android8hardware15hidl_enum_rangeINS0_8graphics6common4V1_011BufferUsageEvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
    "name" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
-   "referenced_type" : "type-157",
-   "self_type" : "type-157",
+   "referenced_type" : "type-159",
+   "self_type" : "type-159",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-158", "type-151" ],
+   "template_args" : [ "type-160", "type-154" ],
    "unique_id" : "_ZTSN7android8hardware15hidl_enum_rangeINS0_8graphics6common4V1_111BufferUsageEvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
    "name" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
-   "referenced_type" : "type-419",
-   "self_type" : "type-419",
+   "referenced_type" : "type-416",
+   "self_type" : "type-416",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-420", "type-151" ],
+   "template_args" : [ "type-417", "type-154" ],
    "unique_id" : "_ZTSN7android8hardware15hidl_enum_rangeINS0_8graphics6common4V1_211BufferUsageEvEE"
   },
   {
@@ -28194,7 +28260,7 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-140"
+     "referenced_type" : "type-143"
     },
     {
      "access" : "private",
@@ -28205,8 +28271,8 @@
    ],
    "linker_set_key" : "android::hardware::hidl_handle",
    "name" : "android::hardware::hidl_handle",
-   "referenced_type" : "type-139",
-   "self_type" : "type-139",
+   "referenced_type" : "type-142",
+   "self_type" : "type-142",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_handleE"
@@ -28218,13 +28284,13 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-142"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 128,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
@@ -28254,7 +28320,7 @@
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -28284,7 +28350,7 @@
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -28309,13 +28375,13 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-136"
+     "referenced_type" : "type-139"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -28326,11 +28392,11 @@
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_handle>",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_handle>",
-   "referenced_type" : "type-135",
-   "self_type" : "type-135",
+   "referenced_type" : "type-138",
+   "self_type" : "type-138",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-139" ],
+   "template_args" : [ "type-142" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_11hidl_handleEEE"
   },
   {
@@ -28340,13 +28406,13 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-120"
+     "referenced_type" : "type-122"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -28357,11 +28423,11 @@
    ],
    "linker_set_key" : "android::hardware::hidl_vec<unsigned int>",
    "name" : "android::hardware::hidl_vec<unsigned int>",
-   "referenced_type" : "type-128",
-   "self_type" : "type-128",
+   "referenced_type" : "type-131",
+   "self_type" : "type-131",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecIjEE"
   },
   {
@@ -28394,23 +28460,23 @@
    [
     {
      "field_name" : "pid",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "ptr",
      "field_offset" : 64,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "arch",
      "field_offset" : 128,
-     "referenced_type" : "type-164"
+     "referenced_type" : "type-167"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo",
    "name" : "android::hidl::base::V1_0::DebugInfo",
-   "referenced_type" : "type-163",
-   "self_type" : "type-163",
+   "referenced_type" : "type-166",
+   "self_type" : "type-166",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfoE"
@@ -28421,13 +28487,13 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::IBase",
    "name" : "android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-171",
-   "self_type" : "type-171",
+   "referenced_type" : "type-174",
+   "self_type" : "type-174",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_05IBaseE",
@@ -28536,13 +28602,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-174"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification",
    "name" : "android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-295",
-   "self_type" : "type-295",
+   "referenced_type" : "type-292",
+   "self_type" : "type-292",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_020IServiceNotificationE",
@@ -28656,12 +28722,12 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
      "field_name" : "value",
      "field_offset" : 32,
-     "referenced_type" : "type-676"
+     "referenced_type" : "type-680"
     }
    ],
    "linker_set_key" : "android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
@@ -28670,7 +28736,7 @@
    "self_type" : "type-694",
    "size" : 48,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142", "type-676" ],
+   "template_args" : [ "type-145", "type-680" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -28700,17 +28766,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
    "linker_set_key" : "android::sp<android::GraphicBuffer>",
    "name" : "android::sp<android::GraphicBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-679",
-   "self_type" : "type-679",
+   "referenced_type" : "type-678",
+   "self_type" : "type-678",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-525" ],
+   "template_args" : [ "type-523" ],
    "unique_id" : "_ZTSN7android2spINS_13GraphicBufferEEE"
   },
   {
@@ -28720,17 +28786,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-365"
     }
    ],
    "linker_set_key" : "android::sp<android::Thread>",
    "name" : "android::sp<android::Thread>",
    "record_kind" : "class",
-   "referenced_type" : "type-367",
-   "self_type" : "type-367",
+   "referenced_type" : "type-364",
+   "self_type" : "type-364",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-369" ],
+   "template_args" : [ "type-366" ],
    "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
   },
   {
@@ -28740,17 +28806,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-241"
+     "referenced_type" : "type-243"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::BHwBinder>",
    "name" : "android::sp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-289",
-   "self_type" : "type-289",
+   "referenced_type" : "type-286",
+   "self_type" : "type-286",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-242" ],
+   "template_args" : [ "type-244" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
   },
   {
@@ -28760,17 +28826,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-208"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IBinder>",
    "name" : "android::sp<android::hardware::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-248",
-   "self_type" : "type-248",
+   "referenced_type" : "type-250",
+   "self_type" : "type-250",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-196" ],
+   "template_args" : [ "type-209" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
   },
   {
@@ -28780,17 +28846,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-280"
+     "referenced_type" : "type-276"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::ProcessState>",
    "name" : "android::sp<android::hardware::ProcessState>",
    "record_kind" : "class",
-   "referenced_type" : "type-279",
-   "self_type" : "type-279",
+   "referenced_type" : "type-275",
+   "self_type" : "type-275",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-281" ],
+   "template_args" : [ "type-277" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
   },
   {
@@ -28800,17 +28866,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-356"
+     "referenced_type" : "type-353"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
    "record_kind" : "class",
-   "referenced_type" : "type-355",
-   "self_type" : "type-355",
+   "referenced_type" : "type-352",
+   "self_type" : "type-352",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-358" ],
+   "template_args" : [ "type-355" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics9allocator4V2_010IAllocatorEEE"
   },
   {
@@ -28820,17 +28886,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-485"
+     "referenced_type" : "type-482"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
    "record_kind" : "class",
-   "referenced_type" : "type-484",
-   "self_type" : "type-484",
+   "referenced_type" : "type-481",
+   "self_type" : "type-481",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-487" ],
+   "template_args" : [ "type-484" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics9allocator4V3_010IAllocatorEEE"
   },
   {
@@ -28840,17 +28906,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-339"
+     "referenced_type" : "type-336"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-338",
-   "self_type" : "type-338",
+   "referenced_type" : "type-335",
+   "self_type" : "type-335",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-341" ],
+   "template_args" : [ "type-338" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics6mapper4V2_07IMapperEEE"
   },
   {
@@ -28860,17 +28926,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-87"
+     "referenced_type" : "type-89"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-86",
-   "self_type" : "type-86",
+   "referenced_type" : "type-88",
+   "self_type" : "type-88",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-89" ],
+   "template_args" : [ "type-91" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics6mapper4V2_17IMapperEEE"
   },
   {
@@ -28880,17 +28946,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-498"
+     "referenced_type" : "type-495"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-497",
-   "self_type" : "type-497",
+   "referenced_type" : "type-494",
+   "self_type" : "type-494",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-500" ],
+   "template_args" : [ "type-497" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics6mapper4V3_07IMapperEEE"
   },
   {
@@ -28920,17 +28986,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-364"
+     "referenced_type" : "type-361"
     }
    ],
    "linker_set_key" : "android::sp<android::hidl::base::V1_0::IBase>",
    "name" : "android::sp<android::hidl::base::V1_0::IBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-363",
-   "self_type" : "type-363",
+   "referenced_type" : "type-360",
+   "self_type" : "type-360",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-171" ],
+   "template_args" : [ "type-174" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl4base4V1_05IBaseEEE"
   },
   {
@@ -28940,36 +29006,36 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-369"
     }
    ],
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceNotification>",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification>",
    "record_kind" : "class",
-   "referenced_type" : "type-371",
-   "self_type" : "type-371",
+   "referenced_type" : "type-368",
+   "self_type" : "type-368",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-295" ],
+   "template_args" : [ "type-292" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::trait_pointer<android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-819",
-   "self_type" : "type-819",
+   "referenced_type" : "type-820",
+   "self_type" : "type-820",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::Rect>",
    "name" : "android::trait_pointer<android::Rect>",
-   "referenced_type" : "type-2400",
-   "self_type" : "type-2400",
+   "referenced_type" : "type-2402",
+   "self_type" : "type-2402",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -28979,8 +29045,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::trait_pointer<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-817",
-   "self_type" : "type-817",
+   "referenced_type" : "type-818",
+   "self_type" : "type-818",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -28990,33 +29056,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<const native_handle *>",
    "name" : "android::trait_pointer<const native_handle *>",
-   "referenced_type" : "type-818",
-   "self_type" : "type-818",
+   "referenced_type" : "type-819",
+   "self_type" : "type-819",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android13trait_pointerIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<long long>",
    "name" : "android::trait_pointer<long long>",
-   "referenced_type" : "type-1430",
-   "self_type" : "type-1430",
+   "referenced_type" : "type-1434",
+   "self_type" : "type-1434",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android13trait_pointerIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::trait_trivial_copy<android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-812",
-   "self_type" : "type-812",
+   "referenced_type" : "type-813",
+   "self_type" : "type-813",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -29045,8 +29111,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-813",
-   "self_type" : "type-813",
+   "referenced_type" : "type-814",
+   "self_type" : "type-814",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -29056,8 +29122,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-483",
-   "self_type" : "type-483",
+   "referenced_type" : "type-480",
+   "self_type" : "type-480",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -29067,11 +29133,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-512",
-   "self_type" : "type-512",
+   "referenced_type" : "type-509",
+   "self_type" : "type-509",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-288" ],
+   "template_args" : [ "type-285" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
   },
   {
@@ -29082,26 +29148,26 @@
    "self_type" : "type-811",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<double>",
    "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-795",
-   "self_type" : "type-795",
+   "referenced_type" : "type-787",
+   "self_type" : "type-787",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<float>",
    "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-757",
-   "self_type" : "type-757",
+   "referenced_type" : "type-755",
+   "self_type" : "type-755",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-10" ],
@@ -29111,11 +29177,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-647",
-   "self_type" : "type-647",
+   "referenced_type" : "type-645",
+   "self_type" : "type-645",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIiEE"
   },
   {
@@ -29126,26 +29192,26 @@
    "self_type" : "type-741",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long>",
    "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-704",
-   "self_type" : "type-704",
+   "referenced_type" : "type-697",
+   "self_type" : "type-697",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-687" ],
+   "template_args" : [ "type-684" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<short>",
    "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-617",
-   "self_type" : "type-617",
+   "referenced_type" : "type-614",
+   "self_type" : "type-614",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-599" ],
@@ -29155,22 +29221,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned char>",
    "name" : "android::trait_trivial_copy<unsigned char>",
-   "referenced_type" : "type-540",
-   "self_type" : "type-540",
+   "referenced_type" : "type-536",
+   "self_type" : "type-536",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-218" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned int>",
    "name" : "android::trait_trivial_copy<unsigned int>",
-   "referenced_type" : "type-675",
-   "self_type" : "type-675",
+   "referenced_type" : "type-671",
+   "self_type" : "type-671",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIjEE"
   },
   {
@@ -29181,15 +29247,15 @@
    "self_type" : "type-751",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long>",
    "name" : "android::trait_trivial_copy<unsigned long>",
-   "referenced_type" : "type-722",
-   "self_type" : "type-722",
+   "referenced_type" : "type-720",
+   "self_type" : "type-720",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-710" ],
@@ -29199,8 +29265,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
    "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-631",
-   "self_type" : "type-631",
+   "referenced_type" : "type-629",
+   "self_type" : "type-629",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-3" ],
@@ -29210,11 +29276,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-476",
-   "self_type" : "type-476",
+   "referenced_type" : "type-473",
+   "self_type" : "type-473",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
   },
   {
@@ -29225,7 +29291,7 @@
    "self_type" : "type-807",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -29265,8 +29331,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-481",
-   "self_type" : "type-481",
+   "referenced_type" : "type-478",
+   "self_type" : "type-478",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -29276,11 +29342,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-501",
-   "self_type" : "type-501",
+   "referenced_type" : "type-498",
+   "self_type" : "type-498",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-288" ],
+   "template_args" : [ "type-285" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
   },
   {
@@ -29291,18 +29357,18 @@
    "self_type" : "type-806",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<double>",
    "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-781",
-   "self_type" : "type-781",
+   "referenced_type" : "type-775",
+   "self_type" : "type-775",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIdEE"
   },
   {
@@ -29320,11 +29386,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-638",
-   "self_type" : "type-638",
+   "referenced_type" : "type-637",
+   "self_type" : "type-637",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIiEE"
   },
   {
@@ -29335,18 +29401,18 @@
    "self_type" : "type-729",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long>",
    "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-686",
-   "self_type" : "type-686",
+   "referenced_type" : "type-683",
+   "self_type" : "type-683",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-687" ],
+   "template_args" : [ "type-684" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
   },
   {
@@ -29364,33 +29430,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned char>",
    "name" : "android::trait_trivial_ctor<unsigned char>",
-   "referenced_type" : "type-534",
-   "self_type" : "type-534",
+   "referenced_type" : "type-531",
+   "self_type" : "type-531",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-218" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
    "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-661",
-   "self_type" : "type-661",
+   "referenced_type" : "type-655",
+   "self_type" : "type-655",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
    "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-746",
-   "self_type" : "type-746",
+   "referenced_type" : "type-743",
+   "self_type" : "type-743",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIyEE"
   },
   {
@@ -29408,8 +29474,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned short>",
    "name" : "android::trait_trivial_ctor<unsigned short>",
-   "referenced_type" : "type-620",
-   "self_type" : "type-620",
+   "referenced_type" : "type-619",
+   "self_type" : "type-619",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-3" ],
@@ -29419,11 +29485,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-453",
-   "self_type" : "type-453",
+   "referenced_type" : "type-450",
+   "self_type" : "type-450",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
   },
   {
@@ -29434,7 +29500,7 @@
    "self_type" : "type-809",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -29474,8 +29540,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<bool>",
    "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-482",
-   "self_type" : "type-482",
+   "referenced_type" : "type-479",
+   "self_type" : "type-479",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -29485,11 +29551,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-511",
-   "self_type" : "type-511",
+   "referenced_type" : "type-508",
+   "self_type" : "type-508",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-288" ],
+   "template_args" : [ "type-285" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
   },
   {
@@ -29500,7 +29566,7 @@
    "self_type" : "type-808",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIPK13native_handleEE"
   },
   {
@@ -29511,7 +29577,7 @@
    "self_type" : "type-786",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIdEE"
   },
   {
@@ -29533,18 +29599,18 @@
    "self_type" : "type-644",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long long>",
    "name" : "android::trait_trivial_dtor<long long>",
-   "referenced_type" : "type-738",
-   "self_type" : "type-738",
+   "referenced_type" : "type-736",
+   "self_type" : "type-736",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
   },
   {
@@ -29555,7 +29621,7 @@
    "self_type" : "type-692",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-687" ],
+   "template_args" : [ "type-684" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
   },
   {
@@ -29573,41 +29639,41 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned char>",
    "name" : "android::trait_trivial_dtor<unsigned char>",
-   "referenced_type" : "type-538",
-   "self_type" : "type-538",
+   "referenced_type" : "type-535",
+   "self_type" : "type-535",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-218" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
    "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-668",
-   "self_type" : "type-668",
+   "referenced_type" : "type-664",
+   "self_type" : "type-664",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
    "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-749",
-   "self_type" : "type-749",
+   "referenced_type" : "type-747",
+   "self_type" : "type-747",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long>",
    "name" : "android::trait_trivial_dtor<unsigned long>",
-   "referenced_type" : "type-719",
-   "self_type" : "type-719",
+   "referenced_type" : "type-715",
+   "self_type" : "type-715",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-710" ],
@@ -29617,8 +29683,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned short>",
    "name" : "android::trait_trivial_dtor<unsigned short>",
-   "referenced_type" : "type-625",
-   "self_type" : "type-625",
+   "referenced_type" : "type-621",
+   "self_type" : "type-621",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-3" ],
@@ -29628,22 +29694,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-469",
-   "self_type" : "type-469",
+   "referenced_type" : "type-462",
+   "self_type" : "type-462",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::trait_trivial_move<android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-815",
-   "self_type" : "type-815",
+   "referenced_type" : "type-816",
+   "self_type" : "type-816",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -29672,11 +29738,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String16>",
    "name" : "android::trait_trivial_move<android::String16>",
-   "referenced_type" : "type-191",
-   "self_type" : "type-191",
+   "referenced_type" : "type-204",
+   "self_type" : "type-204",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-179" ],
+   "template_args" : [ "type-182" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8String16EEE"
   },
   {
@@ -29687,15 +29753,15 @@
    "self_type" : "type-902",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-285" ],
+   "template_args" : [ "type-282" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-816",
-   "self_type" : "type-816",
+   "referenced_type" : "type-817",
+   "self_type" : "type-817",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -29705,8 +29771,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<bool>",
    "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-490",
-   "self_type" : "type-490",
+   "referenced_type" : "type-485",
+   "self_type" : "type-485",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -29716,22 +29782,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-533",
-   "self_type" : "type-533",
+   "referenced_type" : "type-513",
+   "self_type" : "type-513",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-288" ],
+   "template_args" : [ "type-285" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<const native_handle *>",
    "name" : "android::trait_trivial_move<const native_handle *>",
-   "referenced_type" : "type-814",
-   "self_type" : "type-814",
+   "referenced_type" : "type-815",
+   "self_type" : "type-815",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIPK13native_handleEE"
   },
   {
@@ -29742,7 +29808,7 @@
    "self_type" : "type-798",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIdEE"
   },
   {
@@ -29760,11 +29826,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-650",
-   "self_type" : "type-650",
+   "referenced_type" : "type-648",
+   "self_type" : "type-648",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIiEE"
   },
   {
@@ -29775,18 +29841,18 @@
    "self_type" : "type-742",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long>",
    "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-708",
-   "self_type" : "type-708",
+   "referenced_type" : "type-707",
+   "self_type" : "type-707",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-687" ],
+   "template_args" : [ "type-684" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
   },
   {
@@ -29804,22 +29870,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned char>",
    "name" : "android::trait_trivial_move<unsigned char>",
-   "referenced_type" : "type-577",
-   "self_type" : "type-577",
+   "referenced_type" : "type-574",
+   "self_type" : "type-574",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-218" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned int>",
    "name" : "android::trait_trivial_move<unsigned int>",
-   "referenced_type" : "type-682",
-   "self_type" : "type-682",
+   "referenced_type" : "type-677",
+   "self_type" : "type-677",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIjEE"
   },
   {
@@ -29830,15 +29896,15 @@
    "self_type" : "type-752",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long>",
    "name" : "android::trait_trivial_move<unsigned long>",
-   "referenced_type" : "type-728",
-   "self_type" : "type-728",
+   "referenced_type" : "type-725",
+   "self_type" : "type-725",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-710" ],
@@ -29859,30 +29925,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-480",
-   "self_type" : "type-480",
+   "referenced_type" : "type-477",
+   "self_type" : "type-477",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::traits<android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-823",
-   "self_type" : "type-823",
+   "referenced_type" : "type-824",
+   "self_type" : "type-824",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android6traitsINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::Rect>",
    "name" : "android::traits<android::Rect>",
-   "referenced_type" : "type-2401",
-   "self_type" : "type-2401",
+   "referenced_type" : "type-2403",
+   "self_type" : "type-2403",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -29892,8 +29958,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::traits<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-820",
-   "self_type" : "type-820",
+   "referenced_type" : "type-821",
+   "self_type" : "type-821",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -29907,18 +29973,18 @@
    "self_type" : "type-822",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android6traitsIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<long long>",
    "name" : "android::traits<long long>",
-   "referenced_type" : "type-1431",
-   "self_type" : "type-1431",
+   "referenced_type" : "type-1435",
+   "self_type" : "type-1435",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android6traitsIxEE"
   },
   {
@@ -29927,12 +29993,12 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::ui::Size",
@@ -29950,20 +30016,20 @@
     {
      "access" : "private",
      "field_name" : "mMatrix",
-     "referenced_type" : "type-2435"
+     "referenced_type" : "type-2437"
     },
     {
      "access" : "private",
      "field_name" : "mType",
      "field_offset" : 288,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "linker_set_key" : "android::ui::Transform",
    "name" : "android::ui::Transform",
    "record_kind" : "class",
-   "referenced_type" : "type-2434",
-   "self_type" : "type-2434",
+   "referenced_type" : "type-2436",
+   "self_type" : "type-2436",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "unique_id" : "_ZTSN7android2ui9TransformE"
@@ -29980,8 +30046,8 @@
    ],
    "linker_set_key" : "android::ui::Transform::mat33",
    "name" : "android::ui::Transform::mat33",
-   "referenced_type" : "type-2435",
-   "self_type" : "type-2435",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2437",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "unique_id" : "_ZTSN7android2ui9Transform5mat33E"
@@ -29991,13 +30057,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2381"
+     "referenced_type" : "type-2383"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::Rect>",
    "name" : "android::use_trivial_move<android::Rect>",
-   "referenced_type" : "type-2380",
-   "self_type" : "type-2380",
+   "referenced_type" : "type-2382",
+   "self_type" : "type-2382",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -30008,13 +30074,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-701"
+     "referenced_type" : "type-704"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-700",
-   "self_type" : "type-700",
+   "referenced_type" : "type-703",
+   "self_type" : "type-703",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -30025,16 +30091,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1417"
+     "referenced_type" : "type-1422"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<long long>",
    "name" : "android::use_trivial_move<long long>",
-   "referenced_type" : "type-1416",
-   "self_type" : "type-1416",
+   "referenced_type" : "type-1421",
+   "self_type" : "type-1421",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveIxEE"
   },
   {
@@ -30065,12 +30131,12 @@
    [
     {
      "field_name" : "num_points",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 32,
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     },
     {
      "field_name" : "xyzc_points",
@@ -30097,7 +30163,7 @@
     {
      "field_name" : "num_planes",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "planes",
@@ -30119,7 +30185,7 @@
    [
     {
      "field_name" : "top_left",
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-219"
     },
     {
      "field_name" : "component",
@@ -30129,32 +30195,32 @@
     {
      "field_name" : "bits_per_component",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "bits_used",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "h_increment",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "v_increment",
      "field_offset" : 160,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "h_subsampling",
      "field_offset" : 192,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "v_subsampling",
      "field_offset" : 224,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android_flex_plane",
@@ -30171,33 +30237,33 @@
    [
     {
      "field_name" : "magic",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "version",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 64,
-     "referenced_type" : "type-519"
+     "referenced_type" : "type-517"
     },
     {
      "field_name" : "incRef",
      "field_offset" : 192,
-     "referenced_type" : "type-520"
+     "referenced_type" : "type-518"
     },
     {
      "field_name" : "decRef",
      "field_offset" : 224,
-     "referenced_type" : "type-520"
+     "referenced_type" : "type-518"
     }
    ],
    "linker_set_key" : "android_native_base_t",
    "name" : "android_native_base_t",
-   "referenced_type" : "type-518",
-   "self_type" : "type-518",
+   "referenced_type" : "type-516",
+   "self_type" : "type-516",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
    "unique_id" : "android_native_base_t"
@@ -30208,28 +30274,28 @@
    [
     {
      "field_name" : "left",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "top",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "right",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "bottom",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android_native_rect_t",
    "name" : "android_native_rect_t",
-   "referenced_type" : "type-619",
-   "self_type" : "type-619",
+   "referenced_type" : "type-620",
+   "self_type" : "type-620",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
    "unique_id" : "android_native_rect_t"
@@ -30304,43 +30370,43 @@
    [
     {
      "field_name" : "y",
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "cb",
      "field_offset" : 32,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "cr",
      "field_offset" : 64,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "ystride",
      "field_offset" : 96,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "cstride",
      "field_offset" : 128,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "chroma_step",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 192,
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     }
    ],
    "linker_set_key" : "android_ycbcr",
    "name" : "android_ycbcr",
-   "referenced_type" : "type-348",
-   "self_type" : "type-348",
+   "referenced_type" : "type-345",
+   "self_type" : "type-345",
    "size" : 56,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_ycbcr"
@@ -30351,108 +30417,108 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-547"
+     "referenced_type" : "type-544"
     },
     {
      "field_name" : "flags",
      "field_offset" : 512,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "field_name" : "width",
      "field_offset" : 544,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "field_name" : "height",
      "field_offset" : 576,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "field_name" : "stride",
      "field_offset" : 608,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "format",
      "field_offset" : 640,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "xdpi",
      "field_offset" : 672,
-     "referenced_type" : "type-563"
+     "referenced_type" : "type-560"
     },
     {
      "field_name" : "ydpi",
      "field_offset" : 704,
-     "referenced_type" : "type-563"
+     "referenced_type" : "type-560"
     },
     {
      "field_name" : "fps",
      "field_offset" : 736,
-     "referenced_type" : "type-563"
+     "referenced_type" : "type-560"
     },
     {
      "field_name" : "minSwapInterval",
      "field_offset" : 768,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "maxSwapInterval",
      "field_offset" : 800,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "numFramebuffers",
      "field_offset" : 832,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 864,
-     "referenced_type" : "type-564"
+     "referenced_type" : "type-561"
     },
     {
      "field_name" : "setSwapInterval",
      "field_offset" : 1088,
-     "referenced_type" : "type-565"
+     "referenced_type" : "type-562"
     },
     {
      "field_name" : "setUpdateRect",
      "field_offset" : 1120,
-     "referenced_type" : "type-568"
+     "referenced_type" : "type-565"
     },
     {
      "field_name" : "post",
      "field_offset" : 1152,
-     "referenced_type" : "type-570"
+     "referenced_type" : "type-567"
     },
     {
      "field_name" : "compositionComplete",
      "field_offset" : 1184,
-     "referenced_type" : "type-572"
+     "referenced_type" : "type-569"
     },
     {
      "field_name" : "dump",
      "field_offset" : 1216,
-     "referenced_type" : "type-574"
+     "referenced_type" : "type-571"
     },
     {
      "field_name" : "enableScreen",
      "field_offset" : 1248,
-     "referenced_type" : "type-565"
+     "referenced_type" : "type-562"
     },
     {
      "field_name" : "reserved_proc",
      "field_offset" : 1280,
-     "referenced_type" : "type-524"
+     "referenced_type" : "type-522"
     }
    ],
    "linker_set_key" : "framebuffer_device_t",
    "name" : "framebuffer_device_t",
-   "referenced_type" : "type-546",
-   "self_type" : "type-546",
+   "referenced_type" : "type-543",
+   "self_type" : "type-543",
    "size" : 184,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h",
    "unique_id" : "framebuffer_device_t"
@@ -30463,63 +30529,73 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-549"
+     "referenced_type" : "type-546"
     },
     {
      "field_name" : "registerBuffer",
      "field_offset" : 1024,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-577"
     },
     {
      "field_name" : "unregisterBuffer",
      "field_offset" : 1056,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-577"
     },
     {
      "field_name" : "lock",
      "field_offset" : 1088,
-     "referenced_type" : "type-583"
+     "referenced_type" : "type-581"
     },
     {
      "field_name" : "unlock",
      "field_offset" : 1120,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-577"
     },
     {
      "field_name" : "perform",
      "field_offset" : 1152,
-     "referenced_type" : "type-585"
+     "referenced_type" : "type-583"
     },
     {
      "field_name" : "lock_ycbcr",
      "field_offset" : 1184,
-     "referenced_type" : "type-587"
+     "referenced_type" : "type-585"
     },
     {
      "field_name" : "lockAsync",
      "field_offset" : 1216,
-     "referenced_type" : "type-589"
+     "referenced_type" : "type-587"
     },
     {
      "field_name" : "unlockAsync",
      "field_offset" : 1248,
-     "referenced_type" : "type-591"
+     "referenced_type" : "type-589"
     },
     {
      "field_name" : "lockAsync_ycbcr",
      "field_offset" : 1280,
+     "referenced_type" : "type-592"
+    },
+    {
+     "field_name" : "getTransportSize",
+     "field_offset" : 1312,
      "referenced_type" : "type-594"
     },
     {
-     "field_name" : "reserved_proc",
-     "field_offset" : 1312,
+     "field_name" : "validateBufferSize",
+     "field_offset" : 1344,
      "referenced_type" : "type-596"
+    },
+    {
+     "field_name" : "reserved_proc",
+     "field_offset" : 1376,
+     "referenced_type" : "type-521"
     }
    ],
    "linker_set_key" : "gralloc_module_t",
    "name" : "gralloc_module_t",
-   "referenced_type" : "type-578",
-   "self_type" : "type-578",
+   "referenced_type" : "type-576",
+   "self_type" : "type-576",
    "size" : 176,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h",
    "unique_id" : "gralloc_module_t"
@@ -30530,33 +30606,33 @@
    [
     {
      "field_name" : "tag",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "version",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "module",
      "field_offset" : 64,
-     "referenced_type" : "type-548"
+     "referenced_type" : "type-545"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 96,
-     "referenced_type" : "type-559"
+     "referenced_type" : "type-556"
     },
     {
      "field_name" : "close",
      "field_offset" : 480,
-     "referenced_type" : "type-560"
+     "referenced_type" : "type-557"
     }
    ],
    "linker_set_key" : "hw_device_t",
    "name" : "hw_device_t",
-   "referenced_type" : "type-547",
-   "self_type" : "type-547",
+   "referenced_type" : "type-544",
+   "self_type" : "type-544",
    "size" : 64,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
    "unique_id" : "hw_device_t"
@@ -30567,13 +30643,13 @@
    [
     {
      "field_name" : "open",
-     "referenced_type" : "type-552"
+     "referenced_type" : "type-549"
     }
    ],
    "linker_set_key" : "hw_module_methods_t",
    "name" : "hw_module_methods_t",
-   "referenced_type" : "type-551",
-   "self_type" : "type-551",
+   "referenced_type" : "type-548",
+   "self_type" : "type-548",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
    "unique_id" : "hw_module_methods_t"
@@ -30584,7 +30660,7 @@
    [
     {
      "field_name" : "tag",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "module_api_version",
@@ -30599,38 +30675,38 @@
     {
      "field_name" : "id",
      "field_offset" : 64,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "field_name" : "name",
      "field_offset" : 96,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "field_name" : "author",
      "field_offset" : 128,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "field_name" : "methods",
      "field_offset" : 160,
-     "referenced_type" : "type-550"
+     "referenced_type" : "type-547"
     },
     {
      "field_name" : "dso",
      "field_offset" : 192,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 224,
-     "referenced_type" : "type-558"
+     "referenced_type" : "type-555"
     }
    ],
    "linker_set_key" : "hw_module_t",
    "name" : "hw_module_t",
-   "referenced_type" : "type-549",
-   "self_type" : "type-549",
+   "referenced_type" : "type-546",
+   "self_type" : "type-546",
    "size" : 128,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
    "unique_id" : "hw_module_t"
@@ -30696,12 +30772,12 @@
    [
     {
      "field_name" : "tv_sec",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "tv_nsec",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "linker_set_key" : "log_time",
@@ -30728,22 +30804,22 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "msg",
@@ -30775,27 +30851,27 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "euid",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "msg",
@@ -30827,27 +30903,27 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "lid",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "msg",
@@ -30879,32 +30955,32 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "lid",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "uid",
      "field_offset" : 192,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "msg",
@@ -30926,28 +31002,28 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "numFds",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "numInts",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "data",
      "field_offset" : 96,
-     "referenced_type" : "type-145"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "native_handle",
    "name" : "native_handle",
-   "referenced_type" : "type-144",
-   "self_type" : "type-144",
+   "referenced_type" : "type-147",
+   "self_type" : "type-147",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
    "unique_id" : "native_handle"
@@ -30957,13 +31033,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-435"
+     "referenced_type" : "type-432"
     }
    ],
    "linker_set_key" : "std::is_floating_point<android::half>",
    "name" : "std::is_floating_point<android::half>",
-   "referenced_type" : "type-434",
-   "self_type" : "type-434",
+   "referenced_type" : "type-431",
+   "self_type" : "type-431",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h",
    "template_args" : [ "type-1" ],
@@ -30974,8 +31050,8 @@
    "linker_set_key" : "std::numeric_limits<android::half>",
    "name" : "std::numeric_limits<android::half>",
    "record_kind" : "class",
-   "referenced_type" : "type-597",
-   "self_type" : "type-597",
+   "referenced_type" : "type-575",
+   "self_type" : "type-575",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h",
    "template_args" : [ "type-1" ],
@@ -30988,8 +31064,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot &&",
    "name" : "android::FenceTime::Snapshot &&",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1386",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1391",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -31015,8 +31091,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &&",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &&",
-   "referenced_type" : "type-99",
-   "self_type" : "type-107",
+   "referenced_type" : "type-101",
+   "self_type" : "type-109",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -31024,8 +31100,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &&",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &&",
-   "referenced_type" : "type-393",
-   "self_type" : "type-399",
+   "referenced_type" : "type-392",
+   "self_type" : "type-396",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -31033,8 +31109,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &&",
-   "referenced_type" : "type-111",
-   "self_type" : "type-113",
+   "referenced_type" : "type-113",
+   "self_type" : "type-115",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -31051,7 +31127,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status &&",
    "name" : "android::hardware::Status &&",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1312",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -31060,7 +31136,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status &&",
    "name" : "android::hardware::details::return_status &&",
-   "referenced_type" : "type-101",
+   "referenced_type" : "type-103",
    "self_type" : "type-1318",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -31069,7 +31145,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_handle &&",
    "name" : "android::hardware::hidl_handle &&",
-   "referenced_type" : "type-139",
+   "referenced_type" : "type-142",
    "self_type" : "type-1087",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -31088,7 +31164,7 @@
    "linker_set_key" : "android::sp<android::Fence> &&",
    "name" : "android::sp<android::Fence> &&",
    "referenced_type" : "type-1357",
-   "self_type" : "type-1410",
+   "self_type" : "type-1415",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31096,8 +31172,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &&",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &&",
-   "referenced_type" : "type-355",
-   "self_type" : "type-378",
+   "referenced_type" : "type-352",
+   "self_type" : "type-375",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31105,8 +31181,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &&",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &&",
-   "referenced_type" : "type-484",
-   "self_type" : "type-491",
+   "referenced_type" : "type-481",
+   "self_type" : "type-488",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31114,8 +31190,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &&",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &&",
-   "referenced_type" : "type-338",
-   "self_type" : "type-386",
+   "referenced_type" : "type-335",
+   "self_type" : "type-383",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31123,8 +31199,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &&",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &&",
-   "referenced_type" : "type-86",
-   "self_type" : "type-94",
+   "referenced_type" : "type-88",
+   "self_type" : "type-96",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31132,8 +31208,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &&",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &&",
-   "referenced_type" : "type-497",
-   "self_type" : "type-504",
+   "referenced_type" : "type-494",
+   "self_type" : "type-501",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31141,7 +31217,7 @@
    "alignment" : 4,
    "linker_set_key" : "int &&",
    "name" : "int &&",
-   "referenced_type" : "type-103",
+   "referenced_type" : "type-105",
    "self_type" : "type-1294",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
diff --git a/29/64/x86_64/source-based/libstagefright_bufferqueue_helper.so.lsdump b/29/64/x86_64/source-based/libstagefright_bufferqueue_helper.so.lsdump
index a698be2..c36a0f8 100644
--- a/29/64/x86_64/source-based/libstagefright_bufferqueue_helper.so.lsdump
+++ b/29/64/x86_64/source-based/libstagefright_bufferqueue_helper.so.lsdump
@@ -13,7 +13,7 @@
   {
    "linker_set_key" : "OMX_COMPONENTREGISTERTYPE []",
    "name" : "OMX_COMPONENTREGISTERTYPE []",
-   "referenced_type" : "type-1504",
+   "referenced_type" : "type-1503",
    "self_type" : "type-1516",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -30,8 +30,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::MediaImage2::PlaneInfo [4]",
    "name" : "android::MediaImage2::PlaneInfo [4]",
-   "referenced_type" : "type-2426",
-   "self_type" : "type-2425",
+   "referenced_type" : "type-2429",
+   "self_type" : "type-2428",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
@@ -39,8 +39,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::MediaImage::PlaneInfo [3]",
    "name" : "android::MediaImage::PlaneInfo [3]",
-   "referenced_type" : "type-2420",
-   "self_type" : "type-2419",
+   "referenced_type" : "type-2423",
+   "self_type" : "type-2422",
    "size" : 60,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
@@ -81,7 +81,7 @@
    "linker_set_key" : "int [3]",
    "name" : "int [3]",
    "referenced_type" : "type-4",
-   "self_type" : "type-2204",
+   "self_type" : "type-2207",
    "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-2204",
-   "self_type" : "type-2203",
+   "referenced_type" : "type-2207",
+   "self_type" : "type-2206",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
   },
@@ -108,7 +108,7 @@
    "linker_set_key" : "unsigned char [128]",
    "name" : "unsigned char [128]",
    "referenced_type" : "type-92",
-   "self_type" : "type-1528",
+   "self_type" : "type-1530",
    "size" : 128,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -117,7 +117,7 @@
    "linker_set_key" : "unsigned char [16]",
    "name" : "unsigned char [16]",
    "referenced_type" : "type-92",
-   "self_type" : "type-2313",
+   "self_type" : "type-2316",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -126,7 +126,7 @@
    "linker_set_key" : "unsigned char [1]",
    "name" : "unsigned char [1]",
    "referenced_type" : "type-92",
-   "self_type" : "type-1577",
+   "self_type" : "type-1572",
    "size" : 1,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -135,7 +135,7 @@
    "linker_set_key" : "unsigned char [256]",
    "name" : "unsigned char [256]",
    "referenced_type" : "type-92",
-   "self_type" : "type-2314",
+   "self_type" : "type-2317",
    "size" : 256,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -144,7 +144,7 @@
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
    "referenced_type" : "type-92",
-   "self_type" : "type-2180",
+   "self_type" : "type-2183",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -153,7 +153,7 @@
    "linker_set_key" : "unsigned char [64]",
    "name" : "unsigned char [64]",
    "referenced_type" : "type-92",
-   "self_type" : "type-2310",
+   "self_type" : "type-2313",
    "size" : 64,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -203,8 +203,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-1243",
-   "self_type" : "type-1243",
+   "referenced_type" : "type-1246",
+   "self_type" : "type-1246",
    "size" : 2
   },
   {
@@ -245,8 +245,8 @@
    "alignment" : 16,
    "linker_set_key" : "long double",
    "name" : "long double",
-   "referenced_type" : "type-1453",
-   "self_type" : "type-1453",
+   "referenced_type" : "type-1457",
+   "self_type" : "type-1457",
    "size" : 16
   },
   {
@@ -759,6 +759,9 @@
    "name" : "_ZN7android18BnProducerListener18needsReleaseNotifyEv"
   },
   {
+   "name" : "_ZN7android18BnProducerListener18onBuffersDiscardedERKNSt3__16vectorIiNS1_9allocatorIiEEEE"
+  },
+  {
    "name" : "_ZN7android18BpConsumerListenerD0Ev"
   },
   {
@@ -3151,8 +3154,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AACPROFILETYPE",
    "name" : "OMX_AUDIO_AACPROFILETYPE",
-   "referenced_type" : "type-1678",
-   "self_type" : "type-1678",
+   "referenced_type" : "type-1675",
+   "self_type" : "type-1675",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3303,8 +3306,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRBANDMODETYPE",
    "name" : "OMX_AUDIO_AMRBANDMODETYPE",
-   "referenced_type" : "type-1892",
-   "self_type" : "type-1892",
+   "referenced_type" : "type-1883",
+   "self_type" : "type-1883",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3349,8 +3352,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRDTXMODETYPE",
    "name" : "OMX_AUDIO_AMRDTXMODETYPE",
-   "referenced_type" : "type-1903",
-   "self_type" : "type-1903",
+   "referenced_type" : "type-1896",
+   "self_type" : "type-1896",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3399,8 +3402,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
    "name" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
-   "referenced_type" : "type-1882",
-   "self_type" : "type-1882",
+   "referenced_type" : "type-1873",
+   "self_type" : "type-1873",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3449,8 +3452,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CDMARATETYPE",
    "name" : "OMX_AUDIO_CDMARATETYPE",
-   "referenced_type" : "type-2024",
-   "self_type" : "type-2024",
+   "referenced_type" : "type-2017",
+   "self_type" : "type-2017",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3491,8 +3494,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CHANNELMODETYPE",
    "name" : "OMX_AUDIO_CHANNELMODETYPE",
-   "referenced_type" : "type-1653",
-   "self_type" : "type-1653",
+   "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-2",
@@ -3741,8 +3744,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_ECHOCANTYPE",
    "name" : "OMX_AUDIO_ECHOCANTYPE",
-   "referenced_type" : "type-2198",
-   "self_type" : "type-2198",
+   "referenced_type" : "type-2201",
+   "self_type" : "type-2201",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3779,8 +3782,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G723RATE",
    "name" : "OMX_AUDIO_G723RATE",
-   "referenced_type" : "type-1810",
-   "self_type" : "type-1810",
+   "referenced_type" : "type-1804",
+   "self_type" : "type-1804",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3825,8 +3828,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G726MODE",
    "name" : "OMX_AUDIO_G726MODE",
-   "referenced_type" : "type-1833",
-   "self_type" : "type-1833",
+   "referenced_type" : "type-1824",
+   "self_type" : "type-1824",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3867,8 +3870,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G729TYPE",
    "name" : "OMX_AUDIO_G729TYPE",
-   "referenced_type" : "type-1855",
-   "self_type" : "type-1855",
+   "referenced_type" : "type-1847",
+   "self_type" : "type-1847",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3925,8 +3928,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDIFORMATTYPE",
    "name" : "OMX_AUDIO_MIDIFORMATTYPE",
-   "referenced_type" : "type-2090",
-   "self_type" : "type-2090",
+   "referenced_type" : "type-2083",
+   "self_type" : "type-2083",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3979,8 +3982,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
    "name" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
-   "referenced_type" : "type-2171",
-   "self_type" : "type-2171",
+   "referenced_type" : "type-2170",
+   "self_type" : "type-2170",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4021,8 +4024,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
    "name" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
-   "referenced_type" : "type-2124",
-   "self_type" : "type-2124",
+   "referenced_type" : "type-2117",
+   "self_type" : "type-2117",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4067,8 +4070,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
    "name" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
-   "referenced_type" : "type-2113",
-   "self_type" : "type-2113",
+   "referenced_type" : "type-2105",
+   "self_type" : "type-2105",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4105,8 +4108,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
    "name" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
-   "referenced_type" : "type-1663",
-   "self_type" : "type-1663",
+   "referenced_type" : "type-1657",
+   "self_type" : "type-1657",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4143,8 +4146,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PCMMODETYPE",
    "name" : "OMX_AUDIO_PCMMODETYPE",
-   "referenced_type" : "type-1634",
-   "self_type" : "type-1634",
+   "referenced_type" : "type-1632",
+   "self_type" : "type-1632",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4201,8 +4204,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_RAFORMATTYPE",
    "name" : "OMX_AUDIO_RAFORMATTYPE",
-   "referenced_type" : "type-1757",
-   "self_type" : "type-1757",
+   "referenced_type" : "type-1748",
+   "self_type" : "type-1748",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4235,8 +4238,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
    "name" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
-   "referenced_type" : "type-1777",
-   "self_type" : "type-1777",
+   "referenced_type" : "type-1771",
+   "self_type" : "type-1771",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4269,8 +4272,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_STEREOWIDENINGTYPE",
    "name" : "OMX_AUDIO_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-2194",
-   "self_type" : "type-2194",
+   "referenced_type" : "type-2197",
+   "self_type" : "type-2197",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4311,8 +4314,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_WMAFORMATTYPE",
    "name" : "OMX_AUDIO_WMAFORMATTYPE",
-   "referenced_type" : "type-1724",
-   "self_type" : "type-1724",
+   "referenced_type" : "type-1715",
+   "self_type" : "type-1715",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4353,8 +4356,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_WMAPROFILETYPE",
    "name" : "OMX_AUDIO_WMAPROFILETYPE",
-   "referenced_type" : "type-1734",
-   "self_type" : "type-1734",
+   "referenced_type" : "type-1725",
+   "self_type" : "type-1725",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4379,8 +4382,8 @@
    ],
    "linker_set_key" : "OMX_BOOL",
    "name" : "OMX_BOOL",
-   "referenced_type" : "type-1302",
-   "self_type" : "type-1302",
+   "referenced_type" : "type-1301",
+   "self_type" : "type-1301",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "underlying_type" : "type-2",
@@ -4417,8 +4420,8 @@
    ],
    "linker_set_key" : "OMX_BUFFERSUPPLIERTYPE",
    "name" : "OMX_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-1604",
-   "self_type" : "type-1604",
+   "referenced_type" : "type-1600",
+   "self_type" : "type-1600",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -4471,8 +4474,8 @@
    ],
    "linker_set_key" : "OMX_COLORBLENDTYPE",
    "name" : "OMX_COLORBLENDTYPE",
-   "referenced_type" : "type-2211",
-   "self_type" : "type-2211",
+   "referenced_type" : "type-2214",
+   "self_type" : "type-2214",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4713,8 +4716,8 @@
    ],
    "linker_set_key" : "OMX_COLOR_FORMATTYPE",
    "name" : "OMX_COLOR_FORMATTYPE",
-   "referenced_type" : "type-2201",
-   "self_type" : "type-2201",
+   "referenced_type" : "type-2204",
+   "self_type" : "type-2204",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4759,8 +4762,8 @@
    ],
    "linker_set_key" : "OMX_COMMANDTYPE",
    "name" : "OMX_COMMANDTYPE",
-   "referenced_type" : "type-1486",
-   "self_type" : "type-1486",
+   "referenced_type" : "type-1489",
+   "self_type" : "type-1489",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -4797,8 +4800,8 @@
    ],
    "linker_set_key" : "OMX_DATAUNITENCAPSULATIONTYPE",
    "name" : "OMX_DATAUNITENCAPSULATIONTYPE",
-   "referenced_type" : "type-2238",
-   "self_type" : "type-2238",
+   "referenced_type" : "type-2241",
+   "self_type" : "type-2241",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4839,8 +4842,8 @@
    ],
    "linker_set_key" : "OMX_DATAUNITTYPE",
    "name" : "OMX_DATAUNITTYPE",
-   "referenced_type" : "type-2237",
-   "self_type" : "type-2237",
+   "referenced_type" : "type-2240",
+   "self_type" : "type-2240",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4865,8 +4868,8 @@
    ],
    "linker_set_key" : "OMX_DIRTYPE",
    "name" : "OMX_DIRTYPE",
-   "referenced_type" : "type-1458",
-   "self_type" : "type-1458",
+   "referenced_type" : "type-1456",
+   "self_type" : "type-1456",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "underlying_type" : "type-2",
@@ -4907,8 +4910,8 @@
    ],
    "linker_set_key" : "OMX_DITHERTYPE",
    "name" : "OMX_DITHERTYPE",
-   "referenced_type" : "type-2240",
-   "self_type" : "type-2240",
+   "referenced_type" : "type-2243",
+   "self_type" : "type-2243",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4933,8 +4936,8 @@
    ],
    "linker_set_key" : "OMX_ENDIANTYPE",
    "name" : "OMX_ENDIANTYPE",
-   "referenced_type" : "type-1463",
-   "self_type" : "type-1463",
+   "referenced_type" : "type-1462",
+   "self_type" : "type-1462",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "underlying_type" : "type-2",
@@ -5111,8 +5114,8 @@
    ],
    "linker_set_key" : "OMX_ERRORTYPE",
    "name" : "OMX_ERRORTYPE",
-   "referenced_type" : "type-1498",
-   "self_type" : "type-1498",
+   "referenced_type" : "type-1497",
+   "self_type" : "type-1497",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-4",
@@ -5185,8 +5188,8 @@
    ],
    "linker_set_key" : "OMX_EVENTTYPE",
    "name" : "OMX_EVENTTYPE",
-   "referenced_type" : "type-1590",
-   "self_type" : "type-1590",
+   "referenced_type" : "type-1591",
+   "self_type" : "type-1591",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -5251,8 +5254,8 @@
    ],
    "linker_set_key" : "OMX_EXPOSURECONTROLTYPE",
    "name" : "OMX_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-2223",
-   "self_type" : "type-2223",
+   "referenced_type" : "type-2226",
+   "self_type" : "type-2226",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -5285,8 +5288,8 @@
    ],
    "linker_set_key" : "OMX_EXTRADATATYPE",
    "name" : "OMX_EXTRADATATYPE",
-   "referenced_type" : "type-1564",
-   "self_type" : "type-1564",
+   "referenced_type" : "type-1559",
+   "self_type" : "type-1559",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -5331,8 +5334,8 @@
    ],
    "linker_set_key" : "OMX_FOCUSSTATUSTYPE",
    "name" : "OMX_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-2248",
-   "self_type" : "type-2248",
+   "referenced_type" : "type-2251",
+   "self_type" : "type-2251",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -5401,8 +5404,8 @@
    ],
    "linker_set_key" : "OMX_IMAGEFILTERTYPE",
    "name" : "OMX_IMAGEFILTERTYPE",
-   "referenced_type" : "type-2207",
-   "self_type" : "type-2207",
+   "referenced_type" : "type-2210",
+   "self_type" : "type-2210",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -5467,8 +5470,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_CODINGTYPE",
    "name" : "OMX_IMAGE_CODINGTYPE",
-   "referenced_type" : "type-2299",
-   "self_type" : "type-2299",
+   "referenced_type" : "type-2302",
+   "self_type" : "type-2302",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "underlying_type" : "type-2",
@@ -5517,8 +5520,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_FLASHCONTROLTYPE",
    "name" : "OMX_IMAGE_FLASHCONTROLTYPE",
-   "referenced_type" : "type-2302",
-   "self_type" : "type-2302",
+   "referenced_type" : "type-2305",
+   "self_type" : "type-2305",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "underlying_type" : "type-2",
@@ -5559,8 +5562,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_FOCUSCONTROLTYPE",
    "name" : "OMX_IMAGE_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-2305",
-   "self_type" : "type-2305",
+   "referenced_type" : "type-2308",
+   "self_type" : "type-2308",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "underlying_type" : "type-2",
@@ -5609,8 +5612,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_HUFFMANTABLETYPE",
    "name" : "OMX_IMAGE_HUFFMANTABLETYPE",
-   "referenced_type" : "type-2311",
-   "self_type" : "type-2311",
+   "referenced_type" : "type-2314",
+   "self_type" : "type-2314",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "underlying_type" : "type-2",
@@ -5651,8 +5654,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
    "name" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-2308",
-   "self_type" : "type-2308",
+   "referenced_type" : "type-2311",
+   "self_type" : "type-2311",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "underlying_type" : "type-2",
@@ -6349,8 +6352,8 @@
    ],
    "linker_set_key" : "OMX_INDEXTYPE",
    "name" : "OMX_INDEXTYPE",
-   "referenced_type" : "type-1485",
-   "self_type" : "type-1485",
+   "referenced_type" : "type-1487",
+   "self_type" : "type-1487",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Index.h",
    "underlying_type" : "type-2",
@@ -6511,8 +6514,8 @@
    ],
    "linker_set_key" : "OMX_METADATACHARSETTYPE",
    "name" : "OMX_METADATACHARSETTYPE",
-   "referenced_type" : "type-2347",
-   "self_type" : "type-2347",
+   "referenced_type" : "type-2350",
+   "self_type" : "type-2350",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6553,8 +6556,8 @@
    ],
    "linker_set_key" : "OMX_METADATASCOPETYPE",
    "name" : "OMX_METADATASCOPETYPE",
-   "referenced_type" : "type-2348",
-   "self_type" : "type-2348",
+   "referenced_type" : "type-2351",
+   "self_type" : "type-2351",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6591,8 +6594,8 @@
    ],
    "linker_set_key" : "OMX_METADATASEARCHMODETYPE",
    "name" : "OMX_METADATASEARCHMODETYPE",
-   "referenced_type" : "type-2349",
-   "self_type" : "type-2349",
+   "referenced_type" : "type-2352",
+   "self_type" : "type-2352",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6629,8 +6632,8 @@
    ],
    "linker_set_key" : "OMX_METERINGTYPE",
    "name" : "OMX_METERINGTYPE",
-   "referenced_type" : "type-2244",
-   "self_type" : "type-2244",
+   "referenced_type" : "type-2247",
+   "self_type" : "type-2247",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -6671,8 +6674,8 @@
    ],
    "linker_set_key" : "OMX_MIRRORTYPE",
    "name" : "OMX_MIRRORTYPE",
-   "referenced_type" : "type-2215",
-   "self_type" : "type-2215",
+   "referenced_type" : "type-2218",
+   "self_type" : "type-2218",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -6701,8 +6704,8 @@
    ],
    "linker_set_key" : "OMX_NUMERICALDATATYPE",
    "name" : "OMX_NUMERICALDATATYPE",
-   "referenced_type" : "type-1467",
-   "self_type" : "type-1467",
+   "referenced_type" : "type-1468",
+   "self_type" : "type-1468",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "underlying_type" : "type-2",
@@ -6747,8 +6750,8 @@
    ],
    "linker_set_key" : "OMX_OTHER_FORMATTYPE",
    "name" : "OMX_OTHER_FORMATTYPE",
-   "referenced_type" : "type-2316",
-   "self_type" : "type-2316",
+   "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-2",
@@ -6789,8 +6792,8 @@
    ],
    "linker_set_key" : "OMX_PORTDOMAINTYPE",
    "name" : "OMX_PORTDOMAINTYPE",
-   "referenced_type" : "type-2334",
-   "self_type" : "type-2334",
+   "referenced_type" : "type-2337",
+   "self_type" : "type-2337",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6839,8 +6842,8 @@
    ],
    "linker_set_key" : "OMX_STATETYPE",
    "name" : "OMX_STATETYPE",
-   "referenced_type" : "type-1493",
-   "self_type" : "type-1493",
+   "referenced_type" : "type-1491",
+   "self_type" : "type-1491",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -6873,8 +6876,8 @@
    ],
    "linker_set_key" : "OMX_SUSPENSIONPOLICYTYPE",
    "name" : "OMX_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-2338",
-   "self_type" : "type-2338",
+   "referenced_type" : "type-2341",
+   "self_type" : "type-2341",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6907,8 +6910,8 @@
    ],
    "linker_set_key" : "OMX_SUSPENSIONTYPE",
    "name" : "OMX_SUSPENSIONTYPE",
-   "referenced_type" : "type-2340",
-   "self_type" : "type-2340",
+   "referenced_type" : "type-2343",
+   "self_type" : "type-2343",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6945,8 +6948,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CLOCKSTATE",
    "name" : "OMX_TIME_CLOCKSTATE",
-   "referenced_type" : "type-2323",
-   "self_type" : "type-2323",
+   "referenced_type" : "type-2326",
+   "self_type" : "type-2326",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -6983,8 +6986,8 @@
    ],
    "linker_set_key" : "OMX_TIME_REFCLOCKTYPE",
    "name" : "OMX_TIME_REFCLOCKTYPE",
-   "referenced_type" : "type-2322",
-   "self_type" : "type-2322",
+   "referenced_type" : "type-2325",
+   "self_type" : "type-2325",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -7017,8 +7020,8 @@
    ],
    "linker_set_key" : "OMX_TIME_SEEKMODETYPE",
    "name" : "OMX_TIME_SEEKMODETYPE",
-   "referenced_type" : "type-2317",
-   "self_type" : "type-2317",
+   "referenced_type" : "type-2320",
+   "self_type" : "type-2320",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -7055,8 +7058,8 @@
    ],
    "linker_set_key" : "OMX_TIME_UPDATETYPE",
    "name" : "OMX_TIME_UPDATETYPE",
-   "referenced_type" : "type-2320",
-   "self_type" : "type-2320",
+   "referenced_type" : "type-2323",
+   "self_type" : "type-2323",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -7109,8 +7112,8 @@
    ],
    "linker_set_key" : "OMX_TRANSITIONEFFECTTYPE",
    "name" : "OMX_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-2235",
-   "self_type" : "type-2235",
+   "referenced_type" : "type-2238",
+   "self_type" : "type-2238",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -7215,8 +7218,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCLEVELTYPE",
    "name" : "OMX_VIDEO_AVCLEVELTYPE",
-   "referenced_type" : "type-2283",
-   "self_type" : "type-2283",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2286",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7253,8 +7256,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
    "name" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
-   "referenced_type" : "type-2284",
-   "self_type" : "type-2284",
+   "referenced_type" : "type-2287",
+   "self_type" : "type-2287",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7307,8 +7310,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCPROFILETYPE",
    "name" : "OMX_VIDEO_AVCPROFILETYPE",
-   "referenced_type" : "type-2281",
-   "self_type" : "type-2281",
+   "referenced_type" : "type-2284",
+   "self_type" : "type-2284",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7345,8 +7348,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCSLICEMODETYPE",
    "name" : "OMX_VIDEO_AVCSLICEMODETYPE",
-   "referenced_type" : "type-2295",
-   "self_type" : "type-2295",
+   "referenced_type" : "type-2298",
+   "self_type" : "type-2298",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7427,8 +7430,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CODINGTYPE",
    "name" : "OMX_VIDEO_CODINGTYPE",
-   "referenced_type" : "type-2250",
-   "self_type" : "type-2250",
+   "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-2",
@@ -7477,8 +7480,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONTROLRATETYPE",
    "name" : "OMX_VIDEO_CONTROLRATETYPE",
-   "referenced_type" : "type-2255",
-   "self_type" : "type-2255",
+   "referenced_type" : "type-2258",
+   "self_type" : "type-2258",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7535,8 +7538,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_H263LEVELTYPE",
    "name" : "OMX_VIDEO_H263LEVELTYPE",
-   "referenced_type" : "type-2266",
-   "self_type" : "type-2266",
+   "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-2",
@@ -7597,8 +7600,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_H263PROFILETYPE",
    "name" : "OMX_VIDEO_H263PROFILETYPE",
-   "referenced_type" : "type-2265",
-   "self_type" : "type-2265",
+   "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-2",
@@ -7635,8 +7638,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_INTRAREFRESHTYPE",
    "name" : "OMX_VIDEO_INTRAREFRESHTYPE",
-   "referenced_type" : "type-2261",
-   "self_type" : "type-2261",
+   "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-2",
@@ -7677,8 +7680,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MOTIONVECTORTYPE",
    "name" : "OMX_VIDEO_MOTIONVECTORTYPE",
-   "referenced_type" : "type-2259",
-   "self_type" : "type-2259",
+   "referenced_type" : "type-2262",
+   "self_type" : "type-2262",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7723,8 +7726,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG2LEVELTYPE",
    "name" : "OMX_VIDEO_MPEG2LEVELTYPE",
-   "referenced_type" : "type-2271",
-   "self_type" : "type-2271",
+   "referenced_type" : "type-2274",
+   "self_type" : "type-2274",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7773,8 +7776,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG2PROFILETYPE",
    "name" : "OMX_VIDEO_MPEG2PROFILETYPE",
-   "referenced_type" : "type-2270",
-   "self_type" : "type-2270",
+   "referenced_type" : "type-2273",
+   "self_type" : "type-2273",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7839,8 +7842,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG4LEVELTYPE",
    "name" : "OMX_VIDEO_MPEG4LEVELTYPE",
-   "referenced_type" : "type-2274",
-   "self_type" : "type-2274",
+   "referenced_type" : "type-2277",
+   "self_type" : "type-2277",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7929,8 +7932,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG4PROFILETYPE",
    "name" : "OMX_VIDEO_MPEG4PROFILETYPE",
-   "referenced_type" : "type-2273",
-   "self_type" : "type-2273",
+   "referenced_type" : "type-2276",
+   "self_type" : "type-2276",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7987,8 +7990,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PICTURETYPE",
    "name" : "OMX_VIDEO_PICTURETYPE",
-   "referenced_type" : "type-2267",
-   "self_type" : "type-2267",
+   "referenced_type" : "type-2270",
+   "self_type" : "type-2270",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -8029,8 +8032,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_RVFORMATTYPE",
    "name" : "OMX_VIDEO_RVFORMATTYPE",
-   "referenced_type" : "type-2278",
-   "self_type" : "type-2278",
+   "referenced_type" : "type-2281",
+   "self_type" : "type-2281",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -8071,8 +8074,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_WMVFORMATTYPE",
    "name" : "OMX_VIDEO_WMVFORMATTYPE",
-   "referenced_type" : "type-2276",
-   "self_type" : "type-2276",
+   "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-2",
@@ -8137,8 +8140,8 @@
    ],
    "linker_set_key" : "OMX_WHITEBALCONTROLTYPE",
    "name" : "OMX_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-2221",
-   "self_type" : "type-2221",
+   "referenced_type" : "type-2224",
+   "self_type" : "type-2224",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -8179,8 +8182,8 @@
    ],
    "linker_set_key" : "android::ADebug::Level",
    "name" : "android::ADebug::Level",
-   "referenced_type" : "type-2293",
-   "self_type" : "type-2293",
+   "referenced_type" : "type-2296",
+   "self_type" : "type-2296",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
    "underlying_type" : "type-2",
@@ -8283,8 +8286,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::MatrixCoeffs",
    "name" : "android::ColorAspects::MatrixCoeffs",
-   "referenced_type" : "type-2434",
-   "self_type" : "type-2434",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2437",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8329,8 +8332,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::Primaries",
    "name" : "android::ColorAspects::Primaries",
-   "referenced_type" : "type-2432",
-   "self_type" : "type-2432",
+   "referenced_type" : "type-2435",
+   "self_type" : "type-2435",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8359,8 +8362,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::Range",
    "name" : "android::ColorAspects::Range",
-   "referenced_type" : "type-2431",
-   "self_type" : "type-2431",
+   "referenced_type" : "type-2434",
+   "self_type" : "type-2434",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8483,8 +8486,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::Transfer",
    "name" : "android::ColorAspects::Transfer",
-   "referenced_type" : "type-2433",
-   "self_type" : "type-2433",
+   "referenced_type" : "type-2436",
+   "self_type" : "type-2436",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8517,8 +8520,8 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorRange",
    "name" : "android::ColorUtils::ColorRange",
-   "referenced_type" : "type-1198",
-   "self_type" : "type-1198",
+   "referenced_type" : "type-1201",
+   "self_type" : "type-1201",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
    "underlying_type" : "type-2",
@@ -8583,8 +8586,8 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorStandard",
    "name" : "android::ColorUtils::ColorStandard",
-   "referenced_type" : "type-1188",
-   "self_type" : "type-1188",
+   "referenced_type" : "type-1191",
+   "self_type" : "type-1191",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
    "underlying_type" : "type-2",
@@ -8641,8 +8644,8 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorTransfer",
    "name" : "android::ColorUtils::ColorTransfer",
-   "referenced_type" : "type-1193",
-   "self_type" : "type-1193",
+   "referenced_type" : "type-1195",
+   "self_type" : "type-1195",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
    "underlying_type" : "type-2",
@@ -8707,8 +8710,8 @@
    ],
    "linker_set_key" : "android::HDRStaticInfo::ID",
    "name" : "android::HDRStaticInfo::ID",
-   "referenced_type" : "type-2438",
-   "self_type" : "type-2438",
+   "referenced_type" : "type-2441",
+   "self_type" : "type-2441",
    "size" : 1,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-92",
@@ -8791,8 +8794,8 @@
    ],
    "linker_set_key" : "android::MediaImage2::Type",
    "name" : "android::MediaImage2::Type",
-   "referenced_type" : "type-2424",
-   "self_type" : "type-2424",
+   "referenced_type" : "type-2427",
+   "self_type" : "type-2427",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8843,8 +8846,8 @@
    ],
    "linker_set_key" : "android::MediaImage::Type",
    "name" : "android::MediaImage::Type",
-   "referenced_type" : "type-2418",
-   "self_type" : "type-2418",
+   "referenced_type" : "type-2421",
+   "self_type" : "type-2421",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8877,8 +8880,8 @@
    ],
    "linker_set_key" : "android::MetadataBufferType",
    "name" : "android::MetadataBufferType",
-   "referenced_type" : "type-1235",
-   "self_type" : "type-1235",
+   "referenced_type" : "type-1238",
+   "self_type" : "type-1238",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/MetadataBufferType.h",
    "underlying_type" : "type-4",
@@ -8903,8 +8906,8 @@
    ],
    "linker_set_key" : "android::ProcessState::CallRestriction",
    "name" : "android::ProcessState::CallRestriction",
-   "referenced_type" : "type-1256",
-   "self_type" : "type-1256",
+   "referenced_type" : "type-1259",
+   "self_type" : "type-1259",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h",
    "underlying_type" : "type-4",
@@ -8921,8 +8924,8 @@
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-2659",
-   "self_type" : "type-2659",
+   "referenced_type" : "type-2662",
+   "self_type" : "type-2662",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "underlying_type" : "type-2",
@@ -8939,8 +8942,8 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-2654",
-   "self_type" : "type-2654",
+   "referenced_type" : "type-2657",
+   "self_type" : "type-2657",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "underlying_type" : "type-2",
@@ -8965,8 +8968,8 @@
    ],
    "linker_set_key" : "android::base::LogId",
    "name" : "android::base::LogId",
-   "referenced_type" : "type-4707",
-   "self_type" : "type-4707",
+   "referenced_type" : "type-4714",
+   "self_type" : "type-4714",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "type-2",
@@ -9007,8 +9010,8 @@
    ],
    "linker_set_key" : "android::base::LogSeverity",
    "name" : "android::base::LogSeverity",
-   "referenced_type" : "type-4657",
-   "self_type" : "type-4657",
+   "referenced_type" : "type-4664",
+   "self_type" : "type-4664",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "type-2",
@@ -9143,8 +9146,8 @@
    ],
    "linker_set_key" : "android::hardware::ProcessState::CallRestriction",
    "name" : "android::hardware::ProcessState::CallRestriction",
-   "referenced_type" : "type-1392",
-   "self_type" : "type-1392",
+   "referenced_type" : "type-1395",
+   "self_type" : "type-1395",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "underlying_type" : "type-4",
@@ -12137,8 +12140,8 @@
    ],
    "linker_set_key" : "log_id",
    "name" : "log_id",
-   "referenced_type" : "type-2413",
-   "self_type" : "type-2413",
+   "referenced_type" : "type-2416",
+   "self_type" : "type-2416",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
@@ -12157,9 +12160,9 @@
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1506",
-   "return_type" : "type-1498",
-   "self_type" : "type-1506",
+   "referenced_type" : "type-1505",
+   "return_type" : "type-1497",
+   "self_type" : "type-1505",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -12172,12 +12175,12 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1596"
+     "referenced_type" : "type-1599"
     }
    ],
-   "referenced_type" : "type-2384",
-   "return_type" : "type-1498",
-   "self_type" : "type-2384",
+   "referenced_type" : "type-2387",
+   "return_type" : "type-1497",
+   "self_type" : "type-2387",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12190,7 +12193,7 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-2378"
+     "referenced_type" : "type-2381"
     },
     {
      "referenced_type" : "type-2"
@@ -12202,9 +12205,9 @@
      "referenced_type" : "type-2"
     }
    ],
-   "referenced_type" : "type-2380",
-   "return_type" : "type-1498",
-   "self_type" : "type-2380",
+   "referenced_type" : "type-2383",
+   "return_type" : "type-1497",
+   "self_type" : "type-2383",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12217,7 +12220,7 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-2378"
+     "referenced_type" : "type-2381"
     },
     {
      "referenced_type" : "type-2"
@@ -12232,9 +12235,9 @@
      "referenced_type" : "type-91"
     }
    ],
-   "referenced_type" : "type-2377",
-   "return_type" : "type-1498",
-   "self_type" : "type-2377",
+   "referenced_type" : "type-2380",
+   "return_type" : "type-1497",
+   "self_type" : "type-2380",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12247,7 +12250,7 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-2378"
+     "referenced_type" : "type-2381"
     },
     {
      "referenced_type" : "type-2"
@@ -12259,9 +12262,9 @@
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-2389",
-   "return_type" : "type-1498",
-   "self_type" : "type-2389",
+   "referenced_type" : "type-2392",
+   "return_type" : "type-1497",
+   "self_type" : "type-2392",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12274,15 +12277,15 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-2387"
+     "referenced_type" : "type-2390"
     },
     {
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-2386",
-   "return_type" : "type-1498",
-   "self_type" : "type-2386",
+   "referenced_type" : "type-2389",
+   "return_type" : "type-1497",
+   "self_type" : "type-2389",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12295,7 +12298,7 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1486"
+     "referenced_type" : "type-1489"
     },
     {
      "referenced_type" : "type-2"
@@ -12304,9 +12307,9 @@
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-2364",
-   "return_type" : "type-1498",
-   "self_type" : "type-2364",
+   "referenced_type" : "type-2367",
+   "return_type" : "type-1497",
+   "self_type" : "type-2367",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12319,15 +12322,15 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-1487"
     },
     {
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-2366",
-   "return_type" : "type-1498",
-   "self_type" : "type-2366",
+   "referenced_type" : "type-2369",
+   "return_type" : "type-1497",
+   "self_type" : "type-2369",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12340,12 +12343,12 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-2372"
+     "referenced_type" : "type-2375"
     }
    ],
-   "referenced_type" : "type-2371",
-   "return_type" : "type-1498",
-   "self_type" : "type-2371",
+   "referenced_type" : "type-2374",
+   "return_type" : "type-1497",
+   "self_type" : "type-2374",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12361,12 +12364,12 @@
      "referenced_type" : "type-254"
     },
     {
-     "referenced_type" : "type-2369"
+     "referenced_type" : "type-2372"
     }
    ],
-   "referenced_type" : "type-2368",
-   "return_type" : "type-1498",
-   "self_type" : "type-2368",
+   "referenced_type" : "type-2371",
+   "return_type" : "type-1497",
+   "self_type" : "type-2371",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12382,18 +12385,18 @@
      "referenced_type" : "type-254"
     },
     {
-     "referenced_type" : "type-2361"
+     "referenced_type" : "type-2364"
     },
     {
-     "referenced_type" : "type-2361"
+     "referenced_type" : "type-2364"
     },
     {
-     "referenced_type" : "type-2362"
+     "referenced_type" : "type-2365"
     }
    ],
-   "referenced_type" : "type-2360",
-   "return_type" : "type-1498",
-   "self_type" : "type-2360",
+   "referenced_type" : "type-2363",
+   "return_type" : "type-1497",
+   "self_type" : "type-2363",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12412,9 +12415,9 @@
      "referenced_type" : "type-2"
     }
    ],
-   "referenced_type" : "type-2391",
-   "return_type" : "type-1498",
-   "self_type" : "type-2391",
+   "referenced_type" : "type-2394",
+   "return_type" : "type-1497",
+   "self_type" : "type-2394",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12430,12 +12433,12 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1596"
+     "referenced_type" : "type-1599"
     }
    ],
-   "referenced_type" : "type-2382",
-   "return_type" : "type-1498",
-   "self_type" : "type-2382",
+   "referenced_type" : "type-2385",
+   "return_type" : "type-1497",
+   "self_type" : "type-2385",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12457,12 +12460,12 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-2375"
+     "referenced_type" : "type-2378"
     }
    ],
-   "referenced_type" : "type-2374",
-   "return_type" : "type-1498",
-   "self_type" : "type-2374",
+   "referenced_type" : "type-2377",
+   "return_type" : "type-1497",
+   "self_type" : "type-2377",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12478,12 +12481,12 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1596"
+     "referenced_type" : "type-1599"
     }
    ],
-   "referenced_type" : "type-1595",
-   "return_type" : "type-1498",
-   "self_type" : "type-1595",
+   "referenced_type" : "type-1598",
+   "return_type" : "type-1497",
+   "self_type" : "type-1598",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -12499,7 +12502,7 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1590"
+     "referenced_type" : "type-1591"
     },
     {
      "referenced_type" : "type-2"
@@ -12511,9 +12514,9 @@
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1593",
-   "return_type" : "type-1498",
-   "self_type" : "type-1593",
+   "referenced_type" : "type-1596",
+   "return_type" : "type-1497",
+   "self_type" : "type-1596",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -12523,18 +12526,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1247"
+     "referenced_type" : "type-1250"
     },
     {
-     "referenced_type" : "type-1038"
+     "referenced_type" : "type-1042"
     },
     {
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1246",
+   "referenced_type" : "type-1249",
    "return_type" : "type-95",
-   "self_type" : "type-1246",
+   "self_type" : "type-1249",
    "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h"
   },
   {
@@ -12544,18 +12547,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1247"
+     "referenced_type" : "type-1250"
     },
     {
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1392"
     },
     {
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1388",
+   "referenced_type" : "type-1391",
    "return_type" : "type-95",
-   "self_type" : "type-1388",
+   "self_type" : "type-1391",
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
   {
@@ -12610,7 +12613,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1385"
     },
     {
      "referenced_type" : "type-99"
@@ -12628,9 +12631,9 @@
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1381",
+   "referenced_type" : "type-1384",
    "return_type" : "type-9",
-   "self_type" : "type-1381",
+   "self_type" : "type-1384",
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   }
  ],
@@ -12658,7 +12661,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-4503"
+     "referenced_type" : "type-4509"
     }
    ],
    "return_type" : "type-52",
@@ -12686,7 +12689,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1271"
+     "referenced_type" : "type-1275"
     }
    ],
    "return_type" : "type-52",
@@ -12965,7 +12968,7 @@
      "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-2192"
+     "referenced_type" : "type-2195"
     }
    ],
    "return_type" : "type-9",
@@ -13311,7 +13314,7 @@
      "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-2494"
+     "referenced_type" : "type-2497"
     },
     {
      "referenced_type" : "type-4"
@@ -13420,13 +13423,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2524"
+     "referenced_type" : "type-2527"
     },
     {
      "referenced_type" : "type-725"
     }
    ],
-   "return_type" : "type-2528",
+   "return_type" : "type-2531",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -13436,13 +13439,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2524"
+     "referenced_type" : "type-2527"
     },
     {
-     "referenced_type" : "type-1863"
+     "referenced_type" : "type-1867"
     }
    ],
-   "return_type" : "type-2528",
+   "return_type" : "type-2531",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -13453,7 +13456,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2675"
+     "referenced_type" : "type-2678"
     },
     {
      "referenced_type" : "type-12"
@@ -13473,7 +13476,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2675"
+     "referenced_type" : "type-2678"
     },
     {
      "referenced_type" : "type-8"
@@ -13493,7 +13496,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2675"
+     "referenced_type" : "type-2678"
     },
     {
      "referenced_type" : "type-8"
@@ -13513,7 +13516,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2675"
+     "referenced_type" : "type-2678"
     },
     {
      "referenced_type" : "type-8"
@@ -13536,7 +13539,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2675"
+     "referenced_type" : "type-2678"
     },
     {
      "referenced_type" : "type-8"
@@ -13559,7 +13562,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2675"
+     "referenced_type" : "type-2678"
     },
     {
      "referenced_type" : "type-8"
@@ -13582,7 +13585,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2675"
+     "referenced_type" : "type-2678"
     },
     {
      "referenced_type" : "type-8"
@@ -13605,7 +13608,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2678"
+     "referenced_type" : "type-2681"
     },
     {
      "referenced_type" : "type-12"
@@ -13625,7 +13628,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2678"
+     "referenced_type" : "type-2681"
     },
     {
      "referenced_type" : "type-8"
@@ -13645,7 +13648,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2678"
+     "referenced_type" : "type-2681"
     },
     {
      "referenced_type" : "type-8"
@@ -13665,7 +13668,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2678"
+     "referenced_type" : "type-2681"
     },
     {
      "referenced_type" : "type-8"
@@ -13688,7 +13691,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2678"
+     "referenced_type" : "type-2681"
     },
     {
      "referenced_type" : "type-8"
@@ -13711,7 +13714,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2678"
+     "referenced_type" : "type-2681"
     },
     {
      "referenced_type" : "type-8"
@@ -13734,7 +13737,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2678"
+     "referenced_type" : "type-2681"
     },
     {
      "referenced_type" : "type-8"
@@ -13757,7 +13760,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2670"
+     "referenced_type" : "type-2673"
     },
     {
      "referenced_type" : "type-12"
@@ -13777,7 +13780,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2670"
+     "referenced_type" : "type-2673"
     },
     {
      "referenced_type" : "type-8"
@@ -13797,7 +13800,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2670"
+     "referenced_type" : "type-2673"
     },
     {
      "referenced_type" : "type-8"
@@ -13817,7 +13820,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2670"
+     "referenced_type" : "type-2673"
     },
     {
      "referenced_type" : "type-8"
@@ -13840,7 +13843,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2670"
+     "referenced_type" : "type-2673"
     },
     {
      "referenced_type" : "type-8"
@@ -13863,7 +13866,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2670"
+     "referenced_type" : "type-2673"
     },
     {
      "referenced_type" : "type-8"
@@ -13886,7 +13889,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2670"
+     "referenced_type" : "type-2673"
     },
     {
      "referenced_type" : "type-8"
@@ -13908,10 +13911,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2549"
+     "referenced_type" : "type-2552"
     }
    ],
-   "return_type" : "type-2478",
+   "return_type" : "type-2481",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -13921,7 +13924,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2549"
+     "referenced_type" : "type-2552"
     }
    ],
    "return_type" : "type-570",
@@ -13934,10 +13937,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2549"
+     "referenced_type" : "type-2552"
     }
    ],
-   "return_type" : "type-2465",
+   "return_type" : "type-2468",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -13947,15 +13950,15 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1514"
+     "referenced_type" : "type-1518"
     },
     {
-     "referenced_type" : "type-1649"
+     "referenced_type" : "type-1653"
     }
    ],
    "return_type" : "type-4",
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-3128" ]
+   "template_args" : [ "type-3131" ]
   },
   {
    "function_name" : "android::Parcel::readNullableStrongBinder",
@@ -13964,15 +13967,15 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1514"
+     "referenced_type" : "type-1518"
     },
     {
-     "referenced_type" : "type-2536"
+     "referenced_type" : "type-2539"
     }
    ],
    "return_type" : "type-4",
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-3131" ]
+   "template_args" : [ "type-3134" ]
   },
   {
    "access" : "protected",
@@ -14114,7 +14117,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1228"
+     "referenced_type" : "type-1232"
     },
     {
      "referenced_type" : "type-8"
@@ -14134,7 +14137,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1228"
+     "referenced_type" : "type-1232"
     },
     {
      "referenced_type" : "type-8"
@@ -14154,7 +14157,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1228"
+     "referenced_type" : "type-1232"
     },
     {
      "referenced_type" : "type-8"
@@ -14177,7 +14180,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1228"
+     "referenced_type" : "type-1232"
     },
     {
      "referenced_type" : "type-8"
@@ -14200,7 +14203,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1228"
+     "referenced_type" : "type-1232"
     },
     {
      "referenced_type" : "type-8"
@@ -14223,7 +14226,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1228"
+     "referenced_type" : "type-1232"
     },
     {
      "referenced_type" : "type-8"
@@ -14246,7 +14249,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2691"
+     "referenced_type" : "type-2694"
     },
     {
      "referenced_type" : "type-8"
@@ -14266,7 +14269,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2691"
+     "referenced_type" : "type-2694"
     },
     {
      "referenced_type" : "type-8"
@@ -14286,7 +14289,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2691"
+     "referenced_type" : "type-2694"
     },
     {
      "referenced_type" : "type-8"
@@ -14309,7 +14312,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2691"
+     "referenced_type" : "type-2694"
     },
     {
      "referenced_type" : "type-8"
@@ -14332,7 +14335,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2691"
+     "referenced_type" : "type-2694"
     },
     {
      "referenced_type" : "type-8"
@@ -14355,7 +14358,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2691"
+     "referenced_type" : "type-2694"
     },
     {
      "referenced_type" : "type-8"
@@ -14392,7 +14395,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-4503"
+     "referenced_type" : "type-4509"
     }
    ],
    "return_type" : "type-52",
@@ -14406,8 +14409,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem &",
    "name" : "android::BufferItem &",
-   "referenced_type" : "type-1224",
-   "self_type" : "type-1223",
+   "referenced_type" : "type-1227",
+   "self_type" : "type-1226",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14415,8 +14418,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem &",
    "name" : "android::BufferItem &",
-   "referenced_type" : "type-3797",
-   "self_type" : "type-3796",
+   "referenced_type" : "type-3803",
+   "self_type" : "type-3802",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14424,8 +14427,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem &",
    "name" : "android::BufferItem &",
-   "referenced_type" : "type-5872",
-   "self_type" : "type-5871",
+   "referenced_type" : "type-5892",
+   "self_type" : "type-5891",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14433,8 +14436,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem &",
    "name" : "android::BufferItem &",
-   "referenced_type" : "type-6418",
-   "self_type" : "type-6417",
+   "referenced_type" : "type-6441",
+   "self_type" : "type-6440",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14442,8 +14445,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *&",
    "name" : "android::BufferItem *&",
-   "referenced_type" : "type-1669",
-   "self_type" : "type-1854",
+   "referenced_type" : "type-1673",
+   "self_type" : "type-1859",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -14451,8 +14454,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *&",
    "name" : "android::BufferItem *&",
-   "referenced_type" : "type-4126",
-   "self_type" : "type-4135",
+   "referenced_type" : "type-4132",
+   "self_type" : "type-4141",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -14460,8 +14463,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *&",
    "name" : "android::BufferItem *&",
-   "referenced_type" : "type-6712",
-   "self_type" : "type-6726",
+   "referenced_type" : "type-6735",
+   "self_type" : "type-6750",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -14469,8 +14472,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::CompositorTiming &",
    "name" : "android::CompositorTiming &",
-   "referenced_type" : "type-1432",
-   "self_type" : "type-1431",
+   "referenced_type" : "type-1435",
+   "self_type" : "type-1434",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14478,8 +14481,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::CompositorTiming &",
    "name" : "android::CompositorTiming &",
-   "referenced_type" : "type-3961",
-   "self_type" : "type-3960",
+   "referenced_type" : "type-3969",
+   "self_type" : "type-3968",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14487,8 +14490,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::CompositorTiming &",
    "name" : "android::CompositorTiming &",
-   "referenced_type" : "type-6554",
-   "self_type" : "type-6553",
+   "referenced_type" : "type-6577",
+   "self_type" : "type-6576",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14496,8 +14499,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-2530",
-   "self_type" : "type-2529",
+   "referenced_type" : "type-2533",
+   "self_type" : "type-2532",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14505,8 +14508,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-4416",
-   "self_type" : "type-4415",
+   "referenced_type" : "type-4420",
+   "self_type" : "type-4419",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14514,8 +14517,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-4674",
-   "self_type" : "type-4673",
+   "referenced_type" : "type-4681",
+   "self_type" : "type-4680",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14523,8 +14526,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-4942",
-   "self_type" : "type-4941",
+   "referenced_type" : "type-4948",
+   "self_type" : "type-4947",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14532,8 +14535,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-6015",
-   "self_type" : "type-6014",
+   "referenced_type" : "type-6035",
+   "self_type" : "type-6034",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14541,8 +14544,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-7019",
-   "self_type" : "type-7018",
+   "referenced_type" : "type-7041",
+   "self_type" : "type-7040",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14550,8 +14553,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-7203",
-   "self_type" : "type-7202",
+   "referenced_type" : "type-7226",
+   "self_type" : "type-7225",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14559,8 +14562,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-7315",
-   "self_type" : "type-7314",
+   "referenced_type" : "type-7338",
+   "self_type" : "type-7337",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14568,8 +14571,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::FenceTime::Snapshot::State &",
    "name" : "android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-4588",
-   "self_type" : "type-4587",
+   "referenced_type" : "type-4594",
+   "self_type" : "type-4593",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14577,8 +14580,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::FenceTime::Snapshot::State &",
    "name" : "android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-7225",
-   "self_type" : "type-7224",
+   "referenced_type" : "type-7248",
+   "self_type" : "type-7247",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14587,7 +14590,7 @@
    "linker_set_key" : "android::Flattenable<android::BufferItem> &",
    "name" : "android::Flattenable<android::BufferItem> &",
    "referenced_type" : "type-22",
-   "self_type" : "type-1515",
+   "self_type" : "type-1519",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14596,7 +14599,7 @@
    "linker_set_key" : "android::Flattenable<android::Fence> &",
    "name" : "android::Flattenable<android::Fence> &",
    "referenced_type" : "type-17",
-   "self_type" : "type-1652",
+   "self_type" : "type-1656",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14605,7 +14608,7 @@
    "linker_set_key" : "android::Flattenable<android::FrameEventHistoryDelta> &",
    "name" : "android::Flattenable<android::FrameEventHistoryDelta> &",
    "referenced_type" : "type-26",
-   "self_type" : "type-4328",
+   "self_type" : "type-4334",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14614,7 +14617,7 @@
    "linker_set_key" : "android::Flattenable<android::GraphicBuffer> &",
    "name" : "android::Flattenable<android::GraphicBuffer> &",
    "referenced_type" : "type-15",
-   "self_type" : "type-1651",
+   "self_type" : "type-1655",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14623,7 +14626,7 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> &",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> &",
    "referenced_type" : "type-33",
-   "self_type" : "type-4330",
+   "self_type" : "type-4336",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14632,7 +14635,7 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> &",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> &",
    "referenced_type" : "type-35",
-   "self_type" : "type-4329",
+   "self_type" : "type-4335",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14640,8 +14643,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-2393",
-   "self_type" : "type-2392",
+   "referenced_type" : "type-2396",
+   "self_type" : "type-2395",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14649,8 +14652,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-4220",
-   "self_type" : "type-4219",
+   "referenced_type" : "type-4226",
+   "self_type" : "type-4225",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14658,8 +14661,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-4682",
-   "self_type" : "type-4681",
+   "referenced_type" : "type-4688",
+   "self_type" : "type-4687",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14667,8 +14670,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-4772",
-   "self_type" : "type-4771",
+   "referenced_type" : "type-4774",
+   "self_type" : "type-4773",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14676,8 +14679,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-5989",
-   "self_type" : "type-5988",
+   "referenced_type" : "type-6009",
+   "self_type" : "type-6008",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14685,8 +14688,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-6814",
-   "self_type" : "type-6813",
+   "referenced_type" : "type-6837",
+   "self_type" : "type-6836",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14694,8 +14697,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-6835",
-   "self_type" : "type-6834",
+   "referenced_type" : "type-6859",
+   "self_type" : "type-6858",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14703,8 +14706,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-7322",
-   "self_type" : "type-7321",
+   "referenced_type" : "type-7345",
+   "self_type" : "type-7344",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14712,8 +14715,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1087",
-   "self_type" : "type-1086",
+   "referenced_type" : "type-1090",
+   "self_type" : "type-1089",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14721,8 +14724,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1268",
-   "self_type" : "type-1267",
+   "referenced_type" : "type-1271",
+   "self_type" : "type-1270",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14730,8 +14733,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1411",
-   "self_type" : "type-1410",
+   "referenced_type" : "type-1414",
+   "self_type" : "type-1413",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14739,8 +14742,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1447",
-   "self_type" : "type-1446",
+   "referenced_type" : "type-1450",
+   "self_type" : "type-1449",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14748,8 +14751,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-2174",
-   "self_type" : "type-2173",
+   "referenced_type" : "type-2178",
+   "self_type" : "type-2177",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14757,8 +14760,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3251",
-   "self_type" : "type-3250",
+   "referenced_type" : "type-3254",
+   "self_type" : "type-3253",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14775,8 +14778,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3463",
-   "self_type" : "type-3462",
+   "referenced_type" : "type-3466",
+   "self_type" : "type-3465",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14784,8 +14787,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3530",
-   "self_type" : "type-3529",
+   "referenced_type" : "type-3533",
+   "self_type" : "type-3532",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14793,8 +14796,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3641",
-   "self_type" : "type-3640",
+   "referenced_type" : "type-3644",
+   "self_type" : "type-3643",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14802,8 +14805,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3698",
-   "self_type" : "type-3697",
+   "referenced_type" : "type-3704",
+   "self_type" : "type-3703",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14811,8 +14814,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3822",
-   "self_type" : "type-3821",
+   "referenced_type" : "type-3828",
+   "self_type" : "type-3827",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14820,8 +14823,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3939",
-   "self_type" : "type-3938",
+   "referenced_type" : "type-3945",
+   "self_type" : "type-3944",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14829,8 +14832,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3980",
-   "self_type" : "type-3979",
+   "referenced_type" : "type-3986",
+   "self_type" : "type-3985",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14838,8 +14841,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-4210",
-   "self_type" : "type-4209",
+   "referenced_type" : "type-4217",
+   "self_type" : "type-4216",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14847,8 +14850,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-4389",
-   "self_type" : "type-4388",
+   "referenced_type" : "type-4395",
+   "self_type" : "type-4394",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14856,8 +14859,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-4601",
-   "self_type" : "type-4600",
+   "referenced_type" : "type-4608",
+   "self_type" : "type-4607",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14865,8 +14868,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-4768",
-   "self_type" : "type-4767",
+   "referenced_type" : "type-4776",
+   "self_type" : "type-4775",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14874,8 +14877,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5095",
-   "self_type" : "type-5094",
+   "referenced_type" : "type-5111",
+   "self_type" : "type-5110",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14883,8 +14886,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5163",
-   "self_type" : "type-5162",
+   "referenced_type" : "type-5181",
+   "self_type" : "type-5180",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14892,8 +14895,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5326",
-   "self_type" : "type-5325",
+   "referenced_type" : "type-5343",
+   "self_type" : "type-5342",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14901,8 +14904,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5538",
-   "self_type" : "type-5537",
+   "referenced_type" : "type-5555",
+   "self_type" : "type-5554",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14910,8 +14913,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5605",
-   "self_type" : "type-5604",
+   "referenced_type" : "type-5622",
+   "self_type" : "type-5621",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14919,8 +14922,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5716",
-   "self_type" : "type-5715",
+   "referenced_type" : "type-5733",
+   "self_type" : "type-5732",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14928,8 +14931,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5773",
-   "self_type" : "type-5772",
+   "referenced_type" : "type-5793",
+   "self_type" : "type-5792",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14937,8 +14940,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5897",
-   "self_type" : "type-5896",
+   "referenced_type" : "type-5917",
+   "self_type" : "type-5916",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14946,8 +14949,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6058",
-   "self_type" : "type-6057",
+   "referenced_type" : "type-6078",
+   "self_type" : "type-6077",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14955,8 +14958,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6141",
-   "self_type" : "type-6140",
+   "referenced_type" : "type-6161",
+   "self_type" : "type-6160",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14964,8 +14967,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6193",
-   "self_type" : "type-6192",
+   "referenced_type" : "type-6213",
+   "self_type" : "type-6212",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14973,8 +14976,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6287",
-   "self_type" : "type-6286",
+   "referenced_type" : "type-6307",
+   "self_type" : "type-6306",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14982,8 +14985,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6331",
-   "self_type" : "type-6330",
+   "referenced_type" : "type-6354",
+   "self_type" : "type-6353",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14991,8 +14994,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6426",
-   "self_type" : "type-6425",
+   "referenced_type" : "type-6450",
+   "self_type" : "type-6449",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15000,8 +15003,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6532",
-   "self_type" : "type-6531",
+   "referenced_type" : "type-6555",
+   "self_type" : "type-6554",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15009,8 +15012,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6569",
-   "self_type" : "type-6568",
+   "referenced_type" : "type-6592",
+   "self_type" : "type-6591",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15018,8 +15021,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6816",
-   "self_type" : "type-6815",
+   "referenced_type" : "type-6839",
+   "self_type" : "type-6838",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15027,8 +15030,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6988",
-   "self_type" : "type-6987",
+   "referenced_type" : "type-7012",
+   "self_type" : "type-7011",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15036,8 +15039,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-7240",
-   "self_type" : "type-7239",
+   "referenced_type" : "type-7265",
+   "self_type" : "type-7264",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15045,8 +15048,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-7378",
-   "self_type" : "type-7377",
+   "referenced_type" : "type-7402",
+   "self_type" : "type-7401",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15063,8 +15066,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-7602",
-   "self_type" : "type-7601",
+   "referenced_type" : "type-7625",
+   "self_type" : "type-7624",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15153,8 +15156,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-3473",
-   "self_type" : "type-3472",
+   "referenced_type" : "type-3476",
+   "self_type" : "type-3475",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15162,8 +15165,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-4306",
-   "self_type" : "type-4305",
+   "referenced_type" : "type-4312",
+   "self_type" : "type-4311",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15171,8 +15174,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-4758",
-   "self_type" : "type-4757",
+   "referenced_type" : "type-4765",
+   "self_type" : "type-4764",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15180,8 +15183,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-5548",
-   "self_type" : "type-5547",
+   "referenced_type" : "type-5565",
+   "self_type" : "type-5564",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15189,8 +15192,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-6149",
-   "self_type" : "type-6148",
+   "referenced_type" : "type-6169",
+   "self_type" : "type-6168",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15198,8 +15201,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-6911",
-   "self_type" : "type-6910",
+   "referenced_type" : "type-6934",
+   "self_type" : "type-6933",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15207,8 +15210,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-7371",
-   "self_type" : "type-7370",
+   "referenced_type" : "type-7394",
+   "self_type" : "type-7393",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15225,8 +15228,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
-   "referenced_type" : "type-1240",
-   "self_type" : "type-2662",
+   "referenced_type" : "type-1243",
+   "self_type" : "type-2665",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -15235,7 +15238,7 @@
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
    "referenced_type" : "type-123",
-   "self_type" : "type-2656",
+   "self_type" : "type-2659",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -15243,8 +15246,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::String8 *&",
    "name" : "android::String8 *&",
-   "referenced_type" : "type-1887",
-   "self_type" : "type-1886",
+   "referenced_type" : "type-1891",
+   "self_type" : "type-1890",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -15252,8 +15255,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1100",
-   "self_type" : "type-1099",
+   "referenced_type" : "type-1105",
+   "self_type" : "type-1104",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15270,8 +15273,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1238",
-   "self_type" : "type-1237",
+   "referenced_type" : "type-1241",
+   "self_type" : "type-1240",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15279,8 +15282,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1366",
-   "self_type" : "type-1365",
+   "referenced_type" : "type-1369",
+   "self_type" : "type-1368",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15288,8 +15291,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1452",
-   "self_type" : "type-1451",
+   "referenced_type" : "type-1455",
+   "self_type" : "type-1454",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15297,8 +15300,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1525",
-   "self_type" : "type-1524",
+   "referenced_type" : "type-1528",
+   "self_type" : "type-1527",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15306,8 +15309,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1666",
-   "self_type" : "type-1665",
+   "referenced_type" : "type-1670",
+   "self_type" : "type-1669",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15315,8 +15318,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3169",
-   "self_type" : "type-3168",
+   "referenced_type" : "type-3172",
+   "self_type" : "type-3171",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15324,8 +15327,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3535",
-   "self_type" : "type-3534",
+   "referenced_type" : "type-3538",
+   "self_type" : "type-3537",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15333,8 +15336,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3645",
-   "self_type" : "type-3644",
+   "referenced_type" : "type-3648",
+   "self_type" : "type-3647",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15342,8 +15345,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3707",
-   "self_type" : "type-3706",
+   "referenced_type" : "type-3713",
+   "self_type" : "type-3712",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15351,8 +15354,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3808",
-   "self_type" : "type-3807",
+   "referenced_type" : "type-3814",
+   "self_type" : "type-3813",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15360,8 +15363,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3913",
-   "self_type" : "type-3912",
+   "referenced_type" : "type-3919",
+   "self_type" : "type-3918",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15369,8 +15372,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3986",
-   "self_type" : "type-3985",
+   "referenced_type" : "type-3992",
+   "self_type" : "type-3991",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15378,8 +15381,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4038",
-   "self_type" : "type-4037",
+   "referenced_type" : "type-4044",
+   "self_type" : "type-4043",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15387,8 +15390,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4123",
-   "self_type" : "type-4122",
+   "referenced_type" : "type-4130",
+   "self_type" : "type-4129",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15396,8 +15399,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4348",
-   "self_type" : "type-4347",
+   "referenced_type" : "type-4354",
+   "self_type" : "type-4353",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15405,8 +15408,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4487",
-   "self_type" : "type-4486",
+   "referenced_type" : "type-4493",
+   "self_type" : "type-4492",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15414,8 +15417,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4534",
-   "self_type" : "type-4533",
+   "referenced_type" : "type-4540",
+   "self_type" : "type-4539",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15423,8 +15426,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4556",
-   "self_type" : "type-4555",
+   "referenced_type" : "type-4562",
+   "self_type" : "type-4561",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15432,8 +15435,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4596",
-   "self_type" : "type-4595",
+   "referenced_type" : "type-4602",
+   "self_type" : "type-4601",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15441,8 +15444,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4774",
-   "self_type" : "type-4773",
+   "referenced_type" : "type-4782",
+   "self_type" : "type-4781",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15450,8 +15453,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4861",
-   "self_type" : "type-4860",
+   "referenced_type" : "type-4867",
+   "self_type" : "type-4866",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15459,8 +15462,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5093",
-   "self_type" : "type-5092",
+   "referenced_type" : "type-5109",
+   "self_type" : "type-5108",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15468,8 +15471,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5133",
-   "self_type" : "type-5132",
+   "referenced_type" : "type-5149",
+   "self_type" : "type-5148",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15477,8 +15480,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5169",
-   "self_type" : "type-5168",
+   "referenced_type" : "type-5185",
+   "self_type" : "type-5184",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15486,8 +15489,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5244",
-   "self_type" : "type-5243",
+   "referenced_type" : "type-5261",
+   "self_type" : "type-5260",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15495,8 +15498,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5610",
-   "self_type" : "type-5609",
+   "referenced_type" : "type-5627",
+   "self_type" : "type-5626",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15504,8 +15507,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5720",
-   "self_type" : "type-5719",
+   "referenced_type" : "type-5737",
+   "self_type" : "type-5736",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15513,8 +15516,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5782",
-   "self_type" : "type-5781",
+   "referenced_type" : "type-5802",
+   "self_type" : "type-5801",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15522,8 +15525,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5883",
-   "self_type" : "type-5882",
+   "referenced_type" : "type-5903",
+   "self_type" : "type-5902",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15531,8 +15534,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6051",
-   "self_type" : "type-6050",
+   "referenced_type" : "type-6071",
+   "self_type" : "type-6070",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15540,8 +15543,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6197",
-   "self_type" : "type-6196",
+   "referenced_type" : "type-6217",
+   "self_type" : "type-6216",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15549,8 +15552,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6293",
-   "self_type" : "type-6292",
+   "referenced_type" : "type-6313",
+   "self_type" : "type-6312",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15558,8 +15561,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6337",
-   "self_type" : "type-6336",
+   "referenced_type" : "type-6360",
+   "self_type" : "type-6359",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15567,8 +15570,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6420",
-   "self_type" : "type-6419",
+   "referenced_type" : "type-6443",
+   "self_type" : "type-6442",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15576,8 +15579,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6506",
-   "self_type" : "type-6505",
+   "referenced_type" : "type-6529",
+   "self_type" : "type-6528",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15585,8 +15588,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6574",
-   "self_type" : "type-6573",
+   "referenced_type" : "type-6597",
+   "self_type" : "type-6596",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15594,8 +15597,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6626",
-   "self_type" : "type-6625",
+   "referenced_type" : "type-6651",
+   "self_type" : "type-6650",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15603,8 +15606,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6709",
-   "self_type" : "type-6708",
+   "referenced_type" : "type-6733",
+   "self_type" : "type-6732",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15612,8 +15615,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6944",
-   "self_type" : "type-6943",
+   "referenced_type" : "type-6969",
+   "self_type" : "type-6968",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15621,8 +15624,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7089",
-   "self_type" : "type-7088",
+   "referenced_type" : "type-7112",
+   "self_type" : "type-7111",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15630,8 +15633,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7147",
-   "self_type" : "type-7146",
+   "referenced_type" : "type-7171",
+   "self_type" : "type-7170",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15639,8 +15642,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7177",
-   "self_type" : "type-7176",
+   "referenced_type" : "type-7201",
+   "self_type" : "type-7200",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15648,8 +15651,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7233",
-   "self_type" : "type-7232",
+   "referenced_type" : "type-7258",
+   "self_type" : "type-7257",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15657,8 +15660,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7383",
-   "self_type" : "type-7382",
+   "referenced_type" : "type-7406",
+   "self_type" : "type-7405",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15666,8 +15669,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7462",
-   "self_type" : "type-7461",
+   "referenced_type" : "type-7486",
+   "self_type" : "type-7485",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15675,8 +15678,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7497",
-   "self_type" : "type-7496",
+   "referenced_type" : "type-7520",
+   "self_type" : "type-7519",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15684,8 +15687,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7600",
-   "self_type" : "type-7599",
+   "referenced_type" : "type-7623",
+   "self_type" : "type-7622",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15693,8 +15696,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7630",
-   "self_type" : "type-7629",
+   "referenced_type" : "type-7655",
+   "self_type" : "type-7654",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15729,8 +15732,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::bufferqueue::V2_0::Status> &",
    "name" : "android::hardware::Return<android::hardware::graphics::bufferqueue::V2_0::Status> &",
-   "referenced_type" : "type-7522",
-   "self_type" : "type-7525",
+   "referenced_type" : "type-7547",
+   "self_type" : "type-7550",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15738,24 +15741,6 @@
    "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,
@@ -15763,8 +15748,8 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> > &",
-   "name" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> > &",
+   "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-4497",
    "self_type" : "type-4500",
    "size" : 8,
@@ -15772,10 +15757,28 @@
   },
   {
    "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-4374",
+   "self_type" : "type-4377",
+   "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-4503",
+   "self_type" : "type-4506",
+   "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-4356",
-   "self_type" : "type-4359",
+   "referenced_type" : "type-4362",
+   "self_type" : "type-4365",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15792,8 +15795,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<unsigned long> &",
    "name" : "android::hardware::Return<unsigned long> &",
-   "referenced_type" : "type-7526",
-   "self_type" : "type-7531",
+   "referenced_type" : "type-7551",
+   "self_type" : "type-7554",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15819,8 +15822,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1385",
-   "self_type" : "type-1384",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1387",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -15828,8 +15831,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-3923",
-   "self_type" : "type-3922",
+   "referenced_type" : "type-3929",
+   "self_type" : "type-3928",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -15837,8 +15840,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-6515",
-   "self_type" : "type-6514",
+   "referenced_type" : "type-6538",
+   "self_type" : "type-6537",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -15856,7 +15859,7 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> > &",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> > &",
    "referenced_type" : "type-382",
-   "self_type" : "type-7641",
+   "self_type" : "type-7665",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15865,7 +15868,7 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect> &",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect> &",
    "referenced_type" : "type-373",
-   "self_type" : "type-4597",
+   "self_type" : "type-4604",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15874,7 +15877,7 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char> &",
    "name" : "android::hardware::details::hidl_pointer<unsigned char> &",
    "referenced_type" : "type-391",
-   "self_type" : "type-4350",
+   "self_type" : "type-4356",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15883,7 +15886,7 @@
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming &",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming &",
    "referenced_type" : "type-588",
-   "self_type" : "type-4589",
+   "self_type" : "type-4595",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15892,7 +15895,7 @@
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta &",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta &",
    "referenced_type" : "type-360",
-   "self_type" : "type-4593",
+   "self_type" : "type-4600",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15901,7 +15904,7 @@
    "linker_set_key" : "android::hardware::hidl_array<int, 4> &",
    "name" : "android::hardware::hidl_array<int, 4> &",
    "referenced_type" : "type-385",
-   "self_type" : "type-7642",
+   "self_type" : "type-5188",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15919,7 +15922,7 @@
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> &",
    "name" : "android::hardware::hidl_vec<unsigned char> &",
    "referenced_type" : "type-453",
-   "self_type" : "type-4382",
+   "self_type" : "type-4388",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15928,7 +15931,7 @@
    "linker_set_key" : "android::hardware::media::V1_0::Rect &",
    "name" : "android::hardware::media::V1_0::Rect &",
    "referenced_type" : "type-376",
-   "self_type" : "type-4599",
+   "self_type" : "type-4606",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15937,7 +15940,7 @@
    "linker_set_key" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > &",
    "name" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > &",
    "referenced_type" : "type-164",
-   "self_type" : "type-2644",
+   "self_type" : "type-2647",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15946,7 +15949,7 @@
    "linker_set_key" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > &",
    "name" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > &",
    "referenced_type" : "type-150",
-   "self_type" : "type-2640",
+   "self_type" : "type-2643",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15955,7 +15958,7 @@
    "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int> &",
    "name" : "android::key_value_pair_t<unsigned int, unsigned int> &",
    "referenced_type" : "type-146",
-   "self_type" : "type-2639",
+   "self_type" : "type-2642",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15964,7 +15967,7 @@
    "linker_set_key" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > &",
    "name" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > &",
    "referenced_type" : "type-581",
-   "self_type" : "type-2514",
+   "self_type" : "type-2517",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15973,7 +15976,7 @@
    "linker_set_key" : "android::sp<android::ALooper> &",
    "name" : "android::sp<android::ALooper> &",
    "referenced_type" : "type-322",
-   "self_type" : "type-2268",
+   "self_type" : "type-2271",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15982,7 +15985,7 @@
    "linker_set_key" : "android::sp<android::AMessage> &",
    "name" : "android::sp<android::AMessage> &",
    "referenced_type" : "type-259",
-   "self_type" : "type-2079",
+   "self_type" : "type-2071",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15991,7 +15994,7 @@
    "linker_set_key" : "android::sp<android::ComponentWrapper> &",
    "name" : "android::sp<android::ComponentWrapper> &",
    "referenced_type" : "type-567",
-   "self_type" : "type-2492",
+   "self_type" : "type-2495",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15999,8 +16002,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::Fence> &",
    "name" : "android::sp<android::Fence> &",
-   "referenced_type" : "type-1865",
-   "self_type" : "type-2528",
+   "referenced_type" : "type-1869",
+   "self_type" : "type-2531",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16009,7 +16012,7 @@
    "linker_set_key" : "android::sp<android::FrameDropper> &",
    "name" : "android::sp<android::FrameDropper> &",
    "referenced_type" : "type-578",
-   "self_type" : "type-2507",
+   "self_type" : "type-2510",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16027,7 +16030,7 @@
    "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy> &",
    "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy> &",
    "referenced_type" : "type-473",
-   "self_type" : "type-2499",
+   "self_type" : "type-2502",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16035,8 +16038,8 @@
    "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",
+   "referenced_type" : "type-4268",
+   "self_type" : "type-4271",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16044,8 +16047,8 @@
    "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",
+   "referenced_type" : "type-4277",
+   "self_type" : "type-4280",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16053,8 +16056,8 @@
    "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",
+   "referenced_type" : "type-4838",
+   "self_type" : "type-4847",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16062,8 +16065,8 @@
    "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",
+   "referenced_type" : "type-5127",
+   "self_type" : "type-5134",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16116,8 +16119,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::NativeHandle> *&",
    "name" : "android::sp<android::NativeHandle> *&",
-   "referenced_type" : "type-1881",
-   "self_type" : "type-1880",
+   "referenced_type" : "type-1886",
+   "self_type" : "type-1885",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16125,8 +16128,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> &",
    "name" : "android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> &",
-   "referenced_type" : "type-2472",
-   "self_type" : "type-7654",
+   "referenced_type" : "type-2475",
+   "self_type" : "type-7678",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16144,7 +16147,7 @@
    "linker_set_key" : "android::wp<android::IBinder::DeathRecipient> &",
    "name" : "android::wp<android::IBinder::DeathRecipient> &",
    "referenced_type" : "type-174",
-   "self_type" : "type-4307",
+   "self_type" : "type-4313",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16153,7 +16156,7 @@
    "linker_set_key" : "android_cta861_3_metadata &",
    "name" : "android_cta861_3_metadata &",
    "referenced_type" : "type-306",
-   "self_type" : "type-1477",
+   "self_type" : "type-1481",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16171,7 +16174,7 @@
    "linker_set_key" : "android_smpte2086_metadata &",
    "name" : "android_smpte2086_metadata &",
    "referenced_type" : "type-305",
-   "self_type" : "type-1476",
+   "self_type" : "type-1479",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16188,8 +16191,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::AString &",
    "name" : "const android::AString &",
-   "referenced_type" : "type-2101",
-   "self_type" : "type-2242",
+   "referenced_type" : "type-2093",
+   "self_type" : "type-2245",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -16197,8 +16200,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-1219",
-   "self_type" : "type-1222",
+   "referenced_type" : "type-1223",
+   "self_type" : "type-1225",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16206,8 +16209,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-1531",
-   "self_type" : "type-1533",
+   "referenced_type" : "type-1534",
+   "self_type" : "type-1536",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16215,8 +16218,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-1672",
-   "self_type" : "type-1674",
+   "referenced_type" : "type-1676",
+   "self_type" : "type-1678",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16224,8 +16227,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-3441",
-   "self_type" : "type-3443",
+   "referenced_type" : "type-3444",
+   "self_type" : "type-3446",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -16233,8 +16236,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-3635",
-   "self_type" : "type-3639",
+   "referenced_type" : "type-3638",
+   "self_type" : "type-3642",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16242,8 +16245,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-3792",
-   "self_type" : "type-3795",
+   "referenced_type" : "type-3799",
+   "self_type" : "type-3801",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16251,8 +16254,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-4042",
-   "self_type" : "type-4044",
+   "referenced_type" : "type-4049",
+   "self_type" : "type-4051",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16260,8 +16263,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-4128",
-   "self_type" : "type-4130",
+   "referenced_type" : "type-4134",
+   "self_type" : "type-4136",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16269,8 +16272,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-5516",
-   "self_type" : "type-5518",
+   "referenced_type" : "type-5533",
+   "self_type" : "type-5535",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -16278,8 +16281,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-5710",
-   "self_type" : "type-5714",
+   "referenced_type" : "type-5727",
+   "self_type" : "type-5731",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16287,8 +16290,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-5867",
-   "self_type" : "type-5870",
+   "referenced_type" : "type-5888",
+   "self_type" : "type-5890",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16296,8 +16299,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-6122",
-   "self_type" : "type-6124",
+   "referenced_type" : "type-6142",
+   "self_type" : "type-6144",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -16305,8 +16308,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-6281",
-   "self_type" : "type-6285",
+   "referenced_type" : "type-6301",
+   "self_type" : "type-6305",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16314,8 +16317,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-6414",
-   "self_type" : "type-6416",
+   "referenced_type" : "type-6437",
+   "self_type" : "type-6439",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16323,8 +16326,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-6632",
-   "self_type" : "type-6634",
+   "referenced_type" : "type-6655",
+   "self_type" : "type-6657",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16332,8 +16335,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-6714",
-   "self_type" : "type-6716",
+   "referenced_type" : "type-6737",
+   "self_type" : "type-6739",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16359,8 +16362,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::CompositorTiming &",
    "name" : "const android::CompositorTiming &",
-   "referenced_type" : "type-1425",
-   "self_type" : "type-1427",
+   "referenced_type" : "type-1428",
+   "self_type" : "type-1430",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16368,8 +16371,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::CompositorTiming &",
    "name" : "const android::CompositorTiming &",
-   "referenced_type" : "type-3954",
-   "self_type" : "type-3956",
+   "referenced_type" : "type-3960",
+   "self_type" : "type-3962",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16377,8 +16380,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::CompositorTiming &",
    "name" : "const android::CompositorTiming &",
-   "referenced_type" : "type-6547",
-   "self_type" : "type-6549",
+   "referenced_type" : "type-6570",
+   "self_type" : "type-6572",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16386,8 +16389,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-4582",
-   "self_type" : "type-4584",
+   "referenced_type" : "type-4588",
+   "self_type" : "type-4590",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16395,8 +16398,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-4751",
-   "self_type" : "type-4753",
+   "referenced_type" : "type-4757",
+   "self_type" : "type-4759",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16404,8 +16407,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-7217",
-   "self_type" : "type-7219",
+   "referenced_type" : "type-7242",
+   "self_type" : "type-7244",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16413,8 +16416,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-7365",
-   "self_type" : "type-7367",
+   "referenced_type" : "type-7388",
+   "self_type" : "type-7390",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16422,8 +16425,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Flattenable<android::BufferItem> &",
    "name" : "const android::Flattenable<android::BufferItem> &",
-   "referenced_type" : "type-1507",
-   "self_type" : "type-1513",
+   "referenced_type" : "type-1510",
+   "self_type" : "type-1517",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16431,8 +16434,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Flattenable<android::Fence> &",
    "name" : "const android::Flattenable<android::Fence> &",
-   "referenced_type" : "type-1635",
-   "self_type" : "type-1648",
+   "referenced_type" : "type-1639",
+   "self_type" : "type-1651",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16440,8 +16443,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Flattenable<android::FrameEventHistoryDelta> &",
    "name" : "const android::Flattenable<android::FrameEventHistoryDelta> &",
-   "referenced_type" : "type-4309",
-   "self_type" : "type-4325",
+   "referenced_type" : "type-4315",
+   "self_type" : "type-4332",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16449,8 +16452,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Flattenable<android::GraphicBuffer> &",
    "name" : "const android::Flattenable<android::GraphicBuffer> &",
-   "referenced_type" : "type-1639",
-   "self_type" : "type-1647",
+   "referenced_type" : "type-1644",
+   "self_type" : "type-1650",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16458,8 +16461,8 @@
    "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",
+   "referenced_type" : "type-4318",
+   "self_type" : "type-4331",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16467,8 +16470,8 @@
    "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",
+   "referenced_type" : "type-4321",
+   "self_type" : "type-4333",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16530,8 +16533,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Parcel &",
    "name" : "const android::Parcel &",
-   "referenced_type" : "type-4536",
-   "self_type" : "type-4535",
+   "referenced_type" : "type-4542",
+   "self_type" : "type-4541",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16539,8 +16542,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Parcel &",
    "name" : "const android::Parcel &",
-   "referenced_type" : "type-7149",
-   "self_type" : "type-7148",
+   "referenced_type" : "type-7173",
+   "self_type" : "type-7172",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16557,8 +16560,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-1215",
-   "self_type" : "type-1217",
+   "referenced_type" : "type-1218",
+   "self_type" : "type-1221",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16566,8 +16569,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-1490",
-   "self_type" : "type-1492",
+   "referenced_type" : "type-1494",
+   "self_type" : "type-1496",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16575,8 +16578,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-1622",
-   "self_type" : "type-1624",
+   "referenced_type" : "type-1625",
+   "self_type" : "type-1627",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16584,8 +16587,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-2685",
-   "self_type" : "type-2687",
+   "referenced_type" : "type-2688",
+   "self_type" : "type-2690",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16593,8 +16596,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-3466",
-   "self_type" : "type-3468",
+   "referenced_type" : "type-3469",
+   "self_type" : "type-3471",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16602,8 +16605,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-3788",
-   "self_type" : "type-3790",
+   "referenced_type" : "type-3794",
+   "self_type" : "type-3797",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16611,8 +16614,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-4013",
-   "self_type" : "type-4015",
+   "referenced_type" : "type-4019",
+   "self_type" : "type-4021",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16620,8 +16623,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-4092",
-   "self_type" : "type-4094",
+   "referenced_type" : "type-4098",
+   "self_type" : "type-4100",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16629,8 +16632,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-4295",
-   "self_type" : "type-4297",
+   "referenced_type" : "type-4301",
+   "self_type" : "type-4303",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16638,8 +16641,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-4575",
-   "self_type" : "type-4577",
+   "referenced_type" : "type-4581",
+   "self_type" : "type-4583",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16647,8 +16650,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-4739",
-   "self_type" : "type-4742",
+   "referenced_type" : "type-4746",
+   "self_type" : "type-4748",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16656,8 +16659,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-5022",
-   "self_type" : "type-5024",
+   "referenced_type" : "type-5028",
+   "self_type" : "type-5030",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16665,8 +16668,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-5080",
-   "self_type" : "type-5082",
+   "referenced_type" : "type-5096",
+   "self_type" : "type-5098",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16674,8 +16677,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-5541",
-   "self_type" : "type-5543",
+   "referenced_type" : "type-5558",
+   "self_type" : "type-5560",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16683,8 +16686,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-5863",
-   "self_type" : "type-5865",
+   "referenced_type" : "type-5883",
+   "self_type" : "type-5886",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16692,8 +16695,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-6046",
-   "self_type" : "type-6048",
+   "referenced_type" : "type-6066",
+   "self_type" : "type-6068",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16701,8 +16704,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-6144",
-   "self_type" : "type-6146",
+   "referenced_type" : "type-6164",
+   "self_type" : "type-6167",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16710,8 +16713,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-6410",
-   "self_type" : "type-6412",
+   "referenced_type" : "type-6433",
+   "self_type" : "type-6435",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16719,8 +16722,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-6600",
-   "self_type" : "type-6602",
+   "referenced_type" : "type-6624",
+   "self_type" : "type-6626",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16728,8 +16731,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-6679",
-   "self_type" : "type-6681",
+   "referenced_type" : "type-6702",
+   "self_type" : "type-6704",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16737,8 +16740,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-6899",
-   "self_type" : "type-6901",
+   "referenced_type" : "type-6922",
+   "self_type" : "type-6924",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16746,8 +16749,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-7209",
-   "self_type" : "type-7211",
+   "referenced_type" : "type-7233",
+   "self_type" : "type-7235",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16755,17 +16758,8 @@
    "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",
+   "referenced_type" : "type-7379",
+   "self_type" : "type-7381",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16782,8 +16776,17 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-7679",
-   "self_type" : "type-7686",
+   "referenced_type" : "type-7607",
+   "self_type" : "type-7609",
+   "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-7699",
+   "self_type" : "type-7707",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16791,8 +16794,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::SafeInterface::ParcelHandler &",
    "name" : "const android::SafeInterface::ParcelHandler &",
-   "referenced_type" : "type-1266",
-   "self_type" : "type-1676",
+   "referenced_type" : "type-1269",
+   "self_type" : "type-1680",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16800,8 +16803,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-1248",
-   "self_type" : "type-1247",
+   "referenced_type" : "type-1251",
+   "self_type" : "type-1250",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -16809,8 +16812,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::String8 &",
    "name" : "const android::String8 &",
-   "referenced_type" : "type-1877",
-   "self_type" : "type-1876",
+   "referenced_type" : "type-1881",
+   "self_type" : "type-1880",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -16827,8 +16830,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1386",
-   "self_type" : "type-1387",
+   "referenced_type" : "type-1389",
+   "self_type" : "type-1390",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16863,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-4351",
-   "self_type" : "type-4573",
+   "referenced_type" : "type-4357",
+   "self_type" : "type-4579",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16872,8 +16875,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming &",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming &",
-   "referenced_type" : "type-4585",
-   "self_type" : "type-4586",
+   "referenced_type" : "type-4591",
+   "self_type" : "type-4592",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16980,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-2621",
-   "self_type" : "type-2622",
+   "referenced_type" : "type-2624",
+   "self_type" : "type-2625",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16989,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-2619",
-   "self_type" : "type-2620",
+   "referenced_type" : "type-2622",
+   "self_type" : "type-2623",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16998,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-2615",
-   "self_type" : "type-2616",
+   "referenced_type" : "type-2618",
+   "self_type" : "type-2619",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17007,8 +17010,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-2411",
-   "self_type" : "type-2410",
+   "referenced_type" : "type-2414",
+   "self_type" : "type-2413",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -17016,8 +17019,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-4848",
-   "self_type" : "type-4847",
+   "referenced_type" : "type-4851",
+   "self_type" : "type-4850",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -17025,8 +17028,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-5994",
-   "self_type" : "type-5996",
+   "referenced_type" : "type-6014",
+   "self_type" : "type-6016",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -17034,8 +17037,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-6830",
-   "self_type" : "type-6829",
+   "referenced_type" : "type-6853",
+   "self_type" : "type-6852",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -17043,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-1311",
-   "self_type" : "type-1487",
+   "referenced_type" : "type-1312",
+   "self_type" : "type-1490",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17061,8 +17064,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::AMessage> &",
    "name" : "const android::sp<android::AMessage> &",
-   "referenced_type" : "type-2177",
-   "self_type" : "type-2192",
+   "referenced_type" : "type-2176",
+   "self_type" : "type-2195",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17070,8 +17073,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::BpGraphicBufferProducer> &",
    "name" : "const android::sp<android::BpGraphicBufferProducer> &",
-   "referenced_type" : "type-4230",
-   "self_type" : "type-4235",
+   "referenced_type" : "type-4236",
+   "self_type" : "type-4241",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17079,8 +17082,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::BpProducerListener> &",
    "name" : "const android::sp<android::BpProducerListener> &",
-   "referenced_type" : "type-4519",
-   "self_type" : "type-4520",
+   "referenced_type" : "type-4525",
+   "self_type" : "type-4526",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17097,8 +17100,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::ComponentWrapper> &",
    "name" : "const android::sp<android::ComponentWrapper> &",
-   "referenced_type" : "type-2493",
-   "self_type" : "type-2494",
+   "referenced_type" : "type-2496",
+   "self_type" : "type-2497",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17106,8 +17109,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::Fence> &",
    "name" : "const android::sp<android::Fence> &",
-   "referenced_type" : "type-1864",
-   "self_type" : "type-1863",
+   "referenced_type" : "type-1868",
+   "self_type" : "type-1867",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17115,8 +17118,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::GraphicBuffer> &",
    "name" : "const android::sp<android::GraphicBuffer> &",
-   "referenced_type" : "type-1197",
-   "self_type" : "type-1861",
+   "referenced_type" : "type-1200",
+   "self_type" : "type-1865",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17133,8 +17136,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
    "name" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
-   "referenced_type" : "type-4267",
-   "self_type" : "type-4393",
+   "referenced_type" : "type-4273",
+   "self_type" : "type-4399",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17142,8 +17145,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
    "name" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
-   "referenced_type" : "type-4276",
-   "self_type" : "type-4394",
+   "referenced_type" : "type-4282",
+   "self_type" : "type-4400",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17151,8 +17154,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
    "name" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
-   "referenced_type" : "type-4829",
-   "self_type" : "type-4834",
+   "referenced_type" : "type-4837",
+   "self_type" : "type-4842",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17160,8 +17163,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
    "name" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
-   "referenced_type" : "type-5110",
-   "self_type" : "type-5115",
+   "referenced_type" : "type-5126",
+   "self_type" : "type-5131",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17169,8 +17172,8 @@
    "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",
+   "referenced_type" : "type-4309",
+   "self_type" : "type-4310",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17178,8 +17181,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::IBinder> &",
    "name" : "const android::sp<android::IBinder> &",
-   "referenced_type" : "type-1037",
-   "self_type" : "type-1038",
+   "referenced_type" : "type-1041",
+   "self_type" : "type-1042",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17205,8 +17208,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer> &",
    "name" : "const android::sp<android::IGraphicBufferProducer> &",
-   "referenced_type" : "type-2487",
-   "self_type" : "type-2488",
+   "referenced_type" : "type-2490",
+   "self_type" : "type-2491",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17223,8 +17226,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::ITransactionCompletedListener> &",
    "name" : "const android::sp<android::ITransactionCompletedListener> &",
-   "referenced_type" : "type-1047",
-   "self_type" : "type-1048",
+   "referenced_type" : "type-1050",
+   "self_type" : "type-1051",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17241,8 +17244,8 @@
    "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",
+   "referenced_type" : "type-1393",
+   "self_type" : "type-1392",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -17250,8 +17253,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-2470",
-   "self_type" : "type-4225",
+   "referenced_type" : "type-2473",
+   "self_type" : "type-4231",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17259,8 +17262,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> &",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> &",
-   "referenced_type" : "type-2460",
-   "self_type" : "type-4513",
+   "referenced_type" : "type-2463",
+   "self_type" : "type-4519",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17268,8 +17271,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer> &",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer> &",
-   "referenced_type" : "type-4242",
-   "self_type" : "type-4247",
+   "referenced_type" : "type-4248",
+   "self_type" : "type-4253",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17277,8 +17280,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener> &",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener> &",
-   "referenced_type" : "type-4473",
-   "self_type" : "type-4522",
+   "referenced_type" : "type-4479",
+   "self_type" : "type-4528",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17286,8 +17289,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-2484",
-   "self_type" : "type-4226",
+   "referenced_type" : "type-2487",
+   "self_type" : "type-4232",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17295,8 +17298,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> &",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> &",
-   "referenced_type" : "type-2476",
-   "self_type" : "type-4516",
+   "referenced_type" : "type-2479",
+   "self_type" : "type-4522",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17304,8 +17307,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer> &",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer> &",
-   "referenced_type" : "type-4236",
-   "self_type" : "type-4241",
+   "referenced_type" : "type-4242",
+   "self_type" : "type-4247",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17313,8 +17316,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener> &",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener> &",
-   "referenced_type" : "type-4466",
-   "self_type" : "type-4521",
+   "referenced_type" : "type-4472",
+   "self_type" : "type-4527",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17358,8 +17361,8 @@
    "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",
+   "referenced_type" : "type-4299",
+   "self_type" : "type-4304",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17367,8 +17370,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::wp<android::IBinder> &",
    "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "type-4283",
-   "self_type" : "type-4284",
+   "referenced_type" : "type-4289",
+   "self_type" : "type-4290",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17376,8 +17379,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android_cta861_3_metadata &",
    "name" : "const android_cta861_3_metadata &",
-   "referenced_type" : "type-1473",
-   "self_type" : "type-1474",
+   "referenced_type" : "type-1477",
+   "self_type" : "type-1478",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17394,8 +17397,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android_smpte2086_metadata &",
    "name" : "const android_smpte2086_metadata &",
-   "referenced_type" : "type-1471",
-   "self_type" : "type-1472",
+   "referenced_type" : "type-1475",
+   "self_type" : "type-1476",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17413,7 +17416,7 @@
    "linker_set_key" : "const double &",
    "name" : "const double &",
    "referenced_type" : "type-1078",
-   "self_type" : "type-1125",
+   "self_type" : "type-1122",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17440,7 +17443,7 @@
    "linker_set_key" : "const int *&",
    "name" : "const int *&",
    "referenced_type" : "type-480",
-   "self_type" : "type-1512",
+   "self_type" : "type-1515",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17454,57 +17457,57 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1110",
-   "self_type" : "type-1112",
+   "referenced_type" : "type-1113",
+   "self_type" : "type-1115",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1282",
-   "self_type" : "type-1284",
+   "referenced_type" : "type-1285",
+   "self_type" : "type-1287",
    "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",
+   "referenced_type" : "type-3310",
+   "self_type" : "type-3312",
    "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",
+   "referenced_type" : "type-3543",
+   "self_type" : "type-3545",
    "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",
+   "referenced_type" : "type-3652",
+   "self_type" : "type-3654",
    "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",
+   "referenced_type" : "type-3718",
+   "self_type" : "type-3720",
    "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",
+   "referenced_type" : "type-3840",
+   "self_type" : "type-3842",
    "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",
+   "referenced_type" : "type-4381",
+   "self_type" : "type-4383",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -17517,190 +17520,190 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-4504",
-   "self_type" : "type-4506",
+   "referenced_type" : "type-4510",
+   "self_type" : "type-4512",
    "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",
+   "referenced_type" : "type-4547",
+   "self_type" : "type-4549",
    "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",
+   "referenced_type" : "type-4572",
+   "self_type" : "type-4574",
    "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",
+   "referenced_type" : "type-4727",
+   "self_type" : "type-4729",
    "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",
+   "referenced_type" : "type-4856",
+   "self_type" : "type-4858",
    "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",
+   "referenced_type" : "type-5139",
+   "self_type" : "type-5141",
    "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",
+   "referenced_type" : "type-5194",
+   "self_type" : "type-5196",
    "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",
+   "referenced_type" : "type-5399",
+   "self_type" : "type-5401",
    "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",
+   "referenced_type" : "type-5632",
+   "self_type" : "type-5634",
    "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",
+   "referenced_type" : "type-5741",
+   "self_type" : "type-5743",
    "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",
+   "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-5909",
-   "self_type" : "type-5911",
+   "referenced_type" : "type-5929",
+   "self_type" : "type-5931",
    "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",
+   "referenced_type" : "type-6087",
+   "self_type" : "type-6089",
    "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",
+   "referenced_type" : "type-6221",
+   "self_type" : "type-6223",
    "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",
+   "referenced_type" : "type-6317",
+   "self_type" : "type-6319",
    "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",
+   "referenced_type" : "type-6365",
+   "self_type" : "type-6367",
    "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",
+   "referenced_type" : "type-6456",
+   "self_type" : "type-6458",
    "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",
+   "referenced_type" : "type-6996",
+   "self_type" : "type-6998",
    "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",
+   "referenced_type" : "type-7131",
+   "self_type" : "type-7133",
    "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",
+   "referenced_type" : "type-7184",
+   "self_type" : "type-7186",
    "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",
+   "referenced_type" : "type-7219",
+   "self_type" : "type-7222",
    "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",
+   "referenced_type" : "type-7368",
+   "self_type" : "type-7370",
    "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",
+   "referenced_type" : "type-7468",
+   "self_type" : "type-7470",
    "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",
+   "referenced_type" : "type-7507",
+   "self_type" : "type-7509",
    "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",
+   "referenced_type" : "type-7559",
+   "self_type" : "type-7561",
    "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",
+   "referenced_type" : "type-7640",
+   "self_type" : "type-7642",
    "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",
+   "referenced_type" : "type-7704",
+   "self_type" : "type-7706",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -17714,8 +17717,8 @@
    "alignment" : 8,
    "linker_set_key" : "const log_msg &",
    "name" : "const log_msg &",
-   "referenced_type" : "type-2315",
-   "self_type" : "type-2332",
+   "referenced_type" : "type-2318",
+   "self_type" : "type-2335",
    "size" : 8,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -17750,8 +17753,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
-   "referenced_type" : "type-2645",
-   "self_type" : "type-2648",
+   "referenced_type" : "type-2648",
+   "self_type" : "type-2651",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17759,8 +17762,8 @@
    "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",
+   "referenced_type" : "type-4996",
+   "self_type" : "type-4998",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17768,8 +17771,8 @@
    "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",
+   "referenced_type" : "type-6055",
+   "self_type" : "type-6057",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17777,8 +17780,8 @@
    "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",
+   "referenced_type" : "type-7545",
+   "self_type" : "type-7555",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17786,8 +17789,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
-   "referenced_type" : "type-2641",
-   "self_type" : "type-2643",
+   "referenced_type" : "type-2644",
+   "self_type" : "type-2646",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17795,8 +17798,8 @@
    "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",
+   "referenced_type" : "type-4992",
+   "self_type" : "type-4994",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17804,8 +17807,8 @@
    "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",
+   "referenced_type" : "type-6052",
+   "self_type" : "type-6054",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17813,8 +17816,8 @@
    "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",
+   "referenced_type" : "type-7531",
+   "self_type" : "type-7537",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17822,8 +17825,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > &",
    "name" : "const std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > &",
-   "referenced_type" : "type-1644",
-   "self_type" : "type-1646",
+   "referenced_type" : "type-1647",
+   "self_type" : "type-1649",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17831,8 +17834,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > &",
    "name" : "const std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > &",
-   "referenced_type" : "type-4106",
-   "self_type" : "type-4108",
+   "referenced_type" : "type-4113",
+   "self_type" : "type-4115",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17840,8 +17843,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > &",
    "name" : "const std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > &",
-   "referenced_type" : "type-6693",
-   "self_type" : "type-6695",
+   "referenced_type" : "type-6716",
+   "self_type" : "type-6718",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17858,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-1108",
-   "self_type" : "type-1107",
+   "referenced_type" : "type-1111",
+   "self_type" : "type-1110",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17867,8 +17870,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-1278",
-   "self_type" : "type-1277",
+   "referenced_type" : "type-1281",
+   "self_type" : "type-1280",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17876,8 +17879,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-3272",
-   "self_type" : "type-3271",
+   "referenced_type" : "type-3275",
+   "self_type" : "type-3274",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17885,8 +17888,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-3537",
-   "self_type" : "type-3536",
+   "referenced_type" : "type-3540",
+   "self_type" : "type-3539",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17894,8 +17897,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-3647",
-   "self_type" : "type-3646",
+   "referenced_type" : "type-3650",
+   "self_type" : "type-3649",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17903,8 +17906,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-3710",
-   "self_type" : "type-3709",
+   "referenced_type" : "type-3716",
+   "self_type" : "type-3715",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17912,8 +17915,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-3832",
-   "self_type" : "type-3831",
+   "referenced_type" : "type-3838",
+   "self_type" : "type-3837",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17930,8 +17933,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-4354",
-   "self_type" : "type-4353",
+   "referenced_type" : "type-4360",
+   "self_type" : "type-4359",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17939,8 +17942,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-4489",
-   "self_type" : "type-4488",
+   "referenced_type" : "type-4495",
+   "self_type" : "type-4494",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17948,8 +17951,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-4558",
-   "self_type" : "type-4557",
+   "referenced_type" : "type-4564",
+   "self_type" : "type-4563",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17957,8 +17960,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-4622",
-   "self_type" : "type-4621",
+   "referenced_type" : "type-4626",
+   "self_type" : "type-4625",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17966,8 +17969,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-4662",
-   "self_type" : "type-4661",
+   "referenced_type" : "type-4670",
+   "self_type" : "type-4669",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17975,8 +17978,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-4870",
-   "self_type" : "type-4869",
+   "referenced_type" : "type-4876",
+   "self_type" : "type-4875",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17984,8 +17987,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-5142",
-   "self_type" : "type-5141",
+   "referenced_type" : "type-5159",
+   "self_type" : "type-5158",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17993,8 +17996,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-5171",
-   "self_type" : "type-5170",
+   "referenced_type" : "type-5190",
+   "self_type" : "type-5189",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18002,8 +18005,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-5347",
-   "self_type" : "type-5346",
+   "referenced_type" : "type-5364",
+   "self_type" : "type-5363",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18011,8 +18014,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-5612",
-   "self_type" : "type-5611",
+   "referenced_type" : "type-5629",
+   "self_type" : "type-5628",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18020,8 +18023,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-5722",
-   "self_type" : "type-5721",
+   "referenced_type" : "type-5739",
+   "self_type" : "type-5738",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18029,8 +18032,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-5785",
-   "self_type" : "type-5784",
+   "referenced_type" : "type-5805",
+   "self_type" : "type-5804",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18038,8 +18041,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-5907",
-   "self_type" : "type-5906",
+   "referenced_type" : "type-5927",
+   "self_type" : "type-5926",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18047,8 +18050,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-6062",
-   "self_type" : "type-6061",
+   "referenced_type" : "type-6082",
+   "self_type" : "type-6081",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18056,8 +18059,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-6199",
-   "self_type" : "type-6198",
+   "referenced_type" : "type-6219",
+   "self_type" : "type-6218",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18065,8 +18068,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-6295",
-   "self_type" : "type-6294",
+   "referenced_type" : "type-6315",
+   "self_type" : "type-6314",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18074,8 +18077,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-6339",
-   "self_type" : "type-6338",
+   "referenced_type" : "type-6362",
+   "self_type" : "type-6361",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18083,8 +18086,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-6431",
-   "self_type" : "type-6430",
+   "referenced_type" : "type-6454",
+   "self_type" : "type-6453",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18092,8 +18095,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-6952",
-   "self_type" : "type-6951",
+   "referenced_type" : "type-6976",
+   "self_type" : "type-6975",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18101,8 +18104,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-7091",
-   "self_type" : "type-7090",
+   "referenced_type" : "type-7115",
+   "self_type" : "type-7114",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18110,8 +18113,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-7179",
-   "self_type" : "type-7178",
+   "referenced_type" : "type-7203",
+   "self_type" : "type-7202",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18119,8 +18122,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-7262",
-   "self_type" : "type-7261",
+   "referenced_type" : "type-7286",
+   "self_type" : "type-7285",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18128,8 +18131,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-7306",
-   "self_type" : "type-7305",
+   "referenced_type" : "type-7330",
+   "self_type" : "type-7329",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18137,8 +18140,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-7473",
-   "self_type" : "type-7472",
+   "referenced_type" : "type-7497",
+   "self_type" : "type-7496",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18146,8 +18149,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-7499",
-   "self_type" : "type-7498",
+   "referenced_type" : "type-7522",
+   "self_type" : "type-7521",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18155,8 +18158,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-7504",
-   "self_type" : "type-7503",
+   "referenced_type" : "type-7528",
+   "self_type" : "type-7527",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18164,8 +18167,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-7632",
-   "self_type" : "type-7631",
+   "referenced_type" : "type-7657",
+   "self_type" : "type-7656",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18173,8 +18176,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-7644",
-   "self_type" : "type-7643",
+   "referenced_type" : "type-7668",
+   "self_type" : "type-7667",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18191,8 +18194,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
    "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
-   "referenced_type" : "type-4379",
-   "self_type" : "type-4381",
+   "referenced_type" : "type-4385",
+   "self_type" : "type-4387",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18200,8 +18203,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
    "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
-   "referenced_type" : "type-4507",
-   "self_type" : "type-4509",
+   "referenced_type" : "type-4513",
+   "self_type" : "type-4515",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18209,8 +18212,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
    "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
-   "referenced_type" : "type-6976",
-   "self_type" : "type-6979",
+   "referenced_type" : "type-7000",
+   "self_type" : "type-7002",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18218,8 +18221,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
    "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
-   "referenced_type" : "type-7110",
-   "self_type" : "type-7112",
+   "referenced_type" : "type-7134",
+   "self_type" : "type-7137",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18254,8 +18257,8 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
-   "referenced_type" : "type-2521",
-   "self_type" : "type-2617",
+   "referenced_type" : "type-2524",
+   "self_type" : "type-2620",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18281,8 +18284,8 @@
    "alignment" : 8,
    "linker_set_key" : "int *&",
    "name" : "int *&",
-   "referenced_type" : "type-1510",
-   "self_type" : "type-1509",
+   "referenced_type" : "type-1513",
+   "self_type" : "type-1512",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18291,7 +18294,7 @@
    "linker_set_key" : "long &",
    "name" : "long &",
    "referenced_type" : "type-32",
-   "self_type" : "type-1430",
+   "self_type" : "type-1433",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18299,8 +18302,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-4761",
-   "self_type" : "type-4760",
+   "referenced_type" : "type-4769",
+   "self_type" : "type-4768",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18308,8 +18311,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-4865",
-   "self_type" : "type-4864",
+   "referenced_type" : "type-4871",
+   "self_type" : "type-4870",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18317,8 +18320,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-5084",
-   "self_type" : "type-5083",
+   "referenced_type" : "type-5100",
+   "self_type" : "type-5099",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18326,8 +18329,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-5137",
-   "self_type" : "type-5136",
+   "referenced_type" : "type-5153",
+   "self_type" : "type-5152",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18335,8 +18338,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-7373",
-   "self_type" : "type-7372",
+   "referenced_type" : "type-7396",
+   "self_type" : "type-7395",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18344,8 +18347,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-7467",
-   "self_type" : "type-7466",
+   "referenced_type" : "type-7491",
+   "self_type" : "type-7490",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18353,8 +18356,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-7594",
-   "self_type" : "type-7593",
+   "referenced_type" : "type-7618",
+   "self_type" : "type-7617",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18371,8 +18374,8 @@
    "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",
+   "referenced_type" : "type-3187",
+   "self_type" : "type-3186",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -18380,8 +18383,8 @@
    "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",
+   "referenced_type" : "type-5276",
+   "self_type" : "type-5275",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -18389,8 +18392,8 @@
    "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",
+   "referenced_type" : "type-6073",
+   "self_type" : "type-6072",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -18398,8 +18401,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > *&",
    "name" : "std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > *&",
-   "referenced_type" : "type-1649",
-   "self_type" : "type-1884",
+   "referenced_type" : "type-1653",
+   "self_type" : "type-1888",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -18407,8 +18410,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > *&",
    "name" : "std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > *&",
-   "referenced_type" : "type-4112",
-   "self_type" : "type-4139",
+   "referenced_type" : "type-4118",
+   "self_type" : "type-4145",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -18416,8 +18419,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > *&",
    "name" : "std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > *&",
-   "referenced_type" : "type-6698",
-   "self_type" : "type-6730",
+   "referenced_type" : "type-6721",
+   "self_type" : "type-6754",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -18426,7 +18429,7 @@
    "linker_set_key" : "unsigned char &",
    "name" : "unsigned char &",
    "referenced_type" : "type-92",
-   "self_type" : "type-1429",
+   "self_type" : "type-1432",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18452,8 +18455,8 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned long *&",
    "name" : "unsigned long *&",
-   "referenced_type" : "type-1679",
-   "self_type" : "type-1873",
+   "referenced_type" : "type-1683",
+   "self_type" : "type-1877",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -18462,7 +18465,7 @@
    "linker_set_key" : "unsigned short &",
    "name" : "unsigned short &",
    "referenced_type" : "type-500",
-   "self_type" : "type-1428",
+   "self_type" : "type-1431",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18470,8 +18473,8 @@
    "alignment" : 8,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-1445",
-   "self_type" : "type-1444",
+   "referenced_type" : "type-1448",
+   "self_type" : "type-1447",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18479,8 +18482,8 @@
    "alignment" : 8,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-3978",
-   "self_type" : "type-3977",
+   "referenced_type" : "type-3984",
+   "self_type" : "type-3983",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18488,8 +18491,8 @@
    "alignment" : 8,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-6567",
-   "self_type" : "type-6566",
+   "referenced_type" : "type-6590",
+   "self_type" : "type-6589",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18509,8 +18512,8 @@
    "alignment" : 8,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-2404",
-   "self_type" : "type-2403",
+   "referenced_type" : "type-2407",
+   "self_type" : "type-2406",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -18527,8 +18530,8 @@
    "alignment" : 8,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-5991",
-   "self_type" : "type-5990",
+   "referenced_type" : "type-6011",
+   "self_type" : "type-6010",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -18536,8 +18539,8 @@
    "alignment" : 8,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-6825",
-   "self_type" : "type-6824",
+   "referenced_type" : "type-6848",
+   "self_type" : "type-6847",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -18554,8 +18557,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1143",
-   "self_type" : "type-1142",
+   "referenced_type" : "type-1146",
+   "self_type" : "type-1145",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18563,8 +18566,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1165",
-   "self_type" : "type-1164",
+   "referenced_type" : "type-1170",
+   "self_type" : "type-1169",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18572,8 +18575,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1351",
-   "self_type" : "type-1350",
+   "referenced_type" : "type-1354",
+   "self_type" : "type-1353",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18581,8 +18584,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1408",
-   "self_type" : "type-1407",
+   "referenced_type" : "type-1411",
+   "self_type" : "type-1410",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18590,8 +18593,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1424",
-   "self_type" : "type-1423",
+   "referenced_type" : "type-1427",
+   "self_type" : "type-1426",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18599,8 +18602,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1440",
-   "self_type" : "type-1439",
+   "referenced_type" : "type-1443",
+   "self_type" : "type-1442",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18608,8 +18611,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1503",
-   "self_type" : "type-1502",
+   "referenced_type" : "type-1509",
+   "self_type" : "type-1508",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18617,8 +18620,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1633",
-   "self_type" : "type-1632",
+   "referenced_type" : "type-1637",
+   "self_type" : "type-1636",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18626,8 +18629,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2614",
-   "self_type" : "type-2613",
+   "referenced_type" : "type-2617",
+   "self_type" : "type-2616",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18635,8 +18638,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3479",
-   "self_type" : "type-3478",
+   "referenced_type" : "type-3482",
+   "self_type" : "type-3481",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18644,8 +18647,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3583",
-   "self_type" : "type-3582",
+   "referenced_type" : "type-3586",
+   "self_type" : "type-3585",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18653,8 +18656,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3657",
-   "self_type" : "type-3656",
+   "referenced_type" : "type-3660",
+   "self_type" : "type-3659",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18662,8 +18665,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3747",
-   "self_type" : "type-3746",
+   "referenced_type" : "type-3753",
+   "self_type" : "type-3752",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18671,8 +18674,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3771",
-   "self_type" : "type-3770",
+   "referenced_type" : "type-3778",
+   "self_type" : "type-3777",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18680,8 +18683,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3906",
-   "self_type" : "type-3905",
+   "referenced_type" : "type-3912",
+   "self_type" : "type-3911",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18689,8 +18692,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3937",
-   "self_type" : "type-3936",
+   "referenced_type" : "type-3943",
+   "self_type" : "type-3942",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18698,8 +18701,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3952",
-   "self_type" : "type-3951",
+   "referenced_type" : "type-3958",
+   "self_type" : "type-3957",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18707,8 +18710,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3973",
-   "self_type" : "type-3972",
+   "referenced_type" : "type-3979",
+   "self_type" : "type-3978",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18716,8 +18719,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4021",
-   "self_type" : "type-4020",
+   "referenced_type" : "type-4027",
+   "self_type" : "type-4026",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18725,8 +18728,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4099",
-   "self_type" : "type-4098",
+   "referenced_type" : "type-4105",
+   "self_type" : "type-4104",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18734,8 +18737,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4302",
-   "self_type" : "type-4301",
+   "referenced_type" : "type-4308",
+   "self_type" : "type-4307",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18743,8 +18746,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4475",
-   "self_type" : "type-4474",
+   "referenced_type" : "type-4481",
+   "self_type" : "type-4480",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18752,8 +18755,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4528",
-   "self_type" : "type-4527",
+   "referenced_type" : "type-4534",
+   "self_type" : "type-4533",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18761,8 +18764,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4554",
-   "self_type" : "type-4553",
+   "referenced_type" : "type-4560",
+   "self_type" : "type-4559",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18770,8 +18773,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4581",
-   "self_type" : "type-4580",
+   "referenced_type" : "type-4587",
+   "self_type" : "type-4586",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18779,8 +18782,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4748",
-   "self_type" : "type-4747",
+   "referenced_type" : "type-4755",
+   "self_type" : "type-4754",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18788,8 +18791,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4858",
-   "self_type" : "type-4857",
+   "referenced_type" : "type-4865",
+   "self_type" : "type-4864",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18797,8 +18800,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4970",
-   "self_type" : "type-4969",
+   "referenced_type" : "type-4976",
+   "self_type" : "type-4975",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18806,8 +18809,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5090",
-   "self_type" : "type-5089",
+   "referenced_type" : "type-5106",
+   "self_type" : "type-5105",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18815,8 +18818,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5131",
-   "self_type" : "type-5130",
+   "referenced_type" : "type-5147",
+   "self_type" : "type-5146",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18824,8 +18827,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5237",
-   "self_type" : "type-5236",
+   "referenced_type" : "type-5254",
+   "self_type" : "type-5253",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18833,8 +18836,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5554",
-   "self_type" : "type-5553",
+   "referenced_type" : "type-5571",
+   "self_type" : "type-5570",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18842,8 +18845,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5658",
-   "self_type" : "type-5657",
+   "referenced_type" : "type-5675",
+   "self_type" : "type-5674",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18851,8 +18854,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5732",
-   "self_type" : "type-5731",
+   "referenced_type" : "type-5749",
+   "self_type" : "type-5748",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18860,8 +18863,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5822",
-   "self_type" : "type-5821",
+   "referenced_type" : "type-5842",
+   "self_type" : "type-5841",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18869,8 +18872,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5846",
-   "self_type" : "type-5845",
+   "referenced_type" : "type-5867",
+   "self_type" : "type-5866",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18878,8 +18881,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6030",
-   "self_type" : "type-6029",
+   "referenced_type" : "type-6050",
+   "self_type" : "type-6049",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18887,8 +18890,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6153",
-   "self_type" : "type-6152",
+   "referenced_type" : "type-6174",
+   "self_type" : "type-6173",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18896,8 +18899,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6244",
-   "self_type" : "type-6243",
+   "referenced_type" : "type-6264",
+   "self_type" : "type-6263",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18905,8 +18908,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6305",
-   "self_type" : "type-6304",
+   "referenced_type" : "type-6325",
+   "self_type" : "type-6324",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18914,8 +18917,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6377",
-   "self_type" : "type-6376",
+   "referenced_type" : "type-6400",
+   "self_type" : "type-6399",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18923,8 +18926,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6399",
-   "self_type" : "type-6398",
+   "referenced_type" : "type-6422",
+   "self_type" : "type-6421",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18932,8 +18935,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6498",
-   "self_type" : "type-6497",
+   "referenced_type" : "type-6521",
+   "self_type" : "type-6520",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18941,8 +18944,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6529",
-   "self_type" : "type-6528",
+   "referenced_type" : "type-6553",
+   "self_type" : "type-6552",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18950,8 +18953,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6545",
-   "self_type" : "type-6544",
+   "referenced_type" : "type-6569",
+   "self_type" : "type-6568",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18959,8 +18962,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6562",
-   "self_type" : "type-6561",
+   "referenced_type" : "type-6585",
+   "self_type" : "type-6584",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18968,8 +18971,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6609",
-   "self_type" : "type-6608",
+   "referenced_type" : "type-6632",
+   "self_type" : "type-6631",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18977,8 +18980,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6686",
-   "self_type" : "type-6685",
+   "referenced_type" : "type-6709",
+   "self_type" : "type-6708",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18986,8 +18989,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6906",
-   "self_type" : "type-6905",
+   "referenced_type" : "type-6929",
+   "self_type" : "type-6928",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18995,8 +18998,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7074",
-   "self_type" : "type-7073",
+   "referenced_type" : "type-7099",
+   "self_type" : "type-7098",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19004,8 +19007,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7138",
-   "self_type" : "type-7137",
+   "referenced_type" : "type-7162",
+   "self_type" : "type-7161",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19013,8 +19016,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7173",
-   "self_type" : "type-7172",
+   "referenced_type" : "type-7197",
+   "self_type" : "type-7196",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19022,8 +19025,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7216",
-   "self_type" : "type-7215",
+   "referenced_type" : "type-7241",
+   "self_type" : "type-7240",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19031,8 +19034,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7363",
-   "self_type" : "type-7362",
+   "referenced_type" : "type-7386",
+   "self_type" : "type-7385",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19040,8 +19043,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7454",
-   "self_type" : "type-7453",
+   "referenced_type" : "type-7477",
+   "self_type" : "type-7476",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19049,8 +19052,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7458",
-   "self_type" : "type-7457",
+   "referenced_type" : "type-7482",
+   "self_type" : "type-7481",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19058,8 +19061,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7495",
-   "self_type" : "type-7494",
+   "referenced_type" : "type-7518",
+   "self_type" : "type-7517",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19067,8 +19070,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7592",
-   "self_type" : "type-7591",
+   "referenced_type" : "type-7616",
+   "self_type" : "type-7615",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19076,8 +19079,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7626",
-   "self_type" : "type-7625",
+   "referenced_type" : "type-7650",
+   "self_type" : "type-7649",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19103,8 +19106,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE *",
    "name" : "OMX_BUFFERHEADERTYPE *",
-   "referenced_type" : "type-1544",
-   "self_type" : "type-1596",
+   "referenced_type" : "type-1541",
+   "self_type" : "type-1599",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -19112,8 +19115,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE **",
    "name" : "OMX_BUFFERHEADERTYPE **",
-   "referenced_type" : "type-1596",
-   "self_type" : "type-2378",
+   "referenced_type" : "type-1599",
+   "self_type" : "type-2381",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19121,8 +19124,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_CALLBACKTYPE *",
    "name" : "OMX_CALLBACKTYPE *",
-   "referenced_type" : "type-1591",
-   "self_type" : "type-2387",
+   "referenced_type" : "type-1594",
+   "self_type" : "type-2390",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19130,8 +19133,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *)",
    "name" : "OMX_ERRORTYPE (*)(void *)",
-   "referenced_type" : "type-1506",
-   "self_type" : "type-1505",
+   "referenced_type" : "type-1505",
+   "self_type" : "type-1504",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -19139,8 +19142,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-2384",
-   "self_type" : "type-2383",
+   "referenced_type" : "type-2387",
+   "self_type" : "type-2386",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19148,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-2380",
-   "self_type" : "type-2379",
+   "referenced_type" : "type-2383",
+   "self_type" : "type-2382",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19157,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-2377",
-   "self_type" : "type-2376",
+   "referenced_type" : "type-2380",
+   "self_type" : "type-2379",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19166,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-2389",
-   "self_type" : "type-2388",
+   "referenced_type" : "type-2392",
+   "self_type" : "type-2391",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19175,8 +19178,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
-   "referenced_type" : "type-2386",
-   "self_type" : "type-2385",
+   "referenced_type" : "type-2389",
+   "self_type" : "type-2388",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19184,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-2364",
-   "self_type" : "type-2363",
+   "referenced_type" : "type-2367",
+   "self_type" : "type-2366",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19193,8 +19196,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
-   "referenced_type" : "type-2366",
-   "self_type" : "type-2365",
+   "referenced_type" : "type-2369",
+   "self_type" : "type-2368",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19202,51 +19205,6 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
-   "referenced_type" : "type-2371",
-   "self_type" : "type-2370",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, char *, OMX_INDEXTYPE *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, char *, OMX_INDEXTYPE *)",
-   "referenced_type" : "type-2368",
-   "self_type" : "type-2367",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-2360",
-   "self_type" : "type-2359",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, unsigned char *, unsigned int)",
-   "name" : "OMX_ERRORTYPE (*)(void *, unsigned char *, unsigned int)",
-   "referenced_type" : "type-2391",
-   "self_type" : "type-2390",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, unsigned int, OMX_BUFFERHEADERTYPE *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, unsigned int, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-2382",
-   "self_type" : "type-2381",
-   "size" : 8,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-2374",
    "self_type" : "type-2373",
    "size" : 8,
@@ -19254,10 +19212,55 @@
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, char *, OMX_INDEXTYPE *)",
+   "name" : "OMX_ERRORTYPE (*)(void *, char *, OMX_INDEXTYPE *)",
+   "referenced_type" : "type-2371",
+   "self_type" : "type-2370",
+   "size" : 8,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "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-2363",
+   "self_type" : "type-2362",
+   "size" : 8,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, unsigned char *, unsigned int)",
+   "name" : "OMX_ERRORTYPE (*)(void *, unsigned char *, unsigned int)",
+   "referenced_type" : "type-2394",
+   "self_type" : "type-2393",
+   "size" : 8,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, unsigned int, OMX_BUFFERHEADERTYPE *)",
+   "name" : "OMX_ERRORTYPE (*)(void *, unsigned int, OMX_BUFFERHEADERTYPE *)",
+   "referenced_type" : "type-2385",
+   "self_type" : "type-2384",
+   "size" : 8,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "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-2377",
+   "self_type" : "type-2376",
+   "size" : 8,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, void *, OMX_BUFFERHEADERTYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, void *, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-1595",
-   "self_type" : "type-1594",
+   "referenced_type" : "type-1598",
+   "self_type" : "type-1597",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -19265,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-1593",
-   "self_type" : "type-1592",
+   "referenced_type" : "type-1596",
+   "self_type" : "type-1595",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -19274,8 +19277,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_INDEXTYPE *",
    "name" : "OMX_INDEXTYPE *",
-   "referenced_type" : "type-1485",
-   "self_type" : "type-2369",
+   "referenced_type" : "type-1487",
+   "self_type" : "type-2372",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19283,8 +19286,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_STATETYPE *",
    "name" : "OMX_STATETYPE *",
-   "referenced_type" : "type-1493",
-   "self_type" : "type-2372",
+   "referenced_type" : "type-1491",
+   "self_type" : "type-2375",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19292,8 +19295,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_TUNNELSETUPTYPE *",
    "name" : "OMX_TUNNELSETUPTYPE *",
-   "referenced_type" : "type-1615",
-   "self_type" : "type-2375",
+   "referenced_type" : "type-1614",
+   "self_type" : "type-2378",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19301,8 +19304,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_VERSIONTYPE *",
    "name" : "OMX_VERSIONTYPE *",
-   "referenced_type" : "type-1480",
-   "self_type" : "type-2361",
+   "referenced_type" : "type-1483",
+   "self_type" : "type-2364",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19319,8 +19322,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1116",
-   "self_type" : "type-1115",
+   "referenced_type" : "type-1119",
+   "self_type" : "type-1118",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19328,8 +19331,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1336",
-   "self_type" : "type-1335",
+   "referenced_type" : "type-1339",
+   "self_type" : "type-1338",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19337,8 +19340,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1403",
-   "self_type" : "type-1402",
+   "referenced_type" : "type-1406",
+   "self_type" : "type-1405",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19346,8 +19349,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1419",
-   "self_type" : "type-1418",
+   "referenced_type" : "type-1422",
+   "self_type" : "type-1421",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19355,8 +19358,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1436",
-   "self_type" : "type-1435",
+   "referenced_type" : "type-1439",
+   "self_type" : "type-1438",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19364,8 +19367,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1438",
-   "self_type" : "type-1437",
+   "referenced_type" : "type-1441",
+   "self_type" : "type-1440",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19373,8 +19376,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1501",
-   "self_type" : "type-1500",
+   "referenced_type" : "type-1507",
+   "self_type" : "type-1506",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19382,8 +19385,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1631",
-   "self_type" : "type-1630",
+   "referenced_type" : "type-1635",
+   "self_type" : "type-1634",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19391,8 +19394,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2611",
-   "self_type" : "type-2610",
+   "referenced_type" : "type-2614",
+   "self_type" : "type-2613",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19400,8 +19403,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3477",
-   "self_type" : "type-3476",
+   "referenced_type" : "type-3480",
+   "self_type" : "type-3479",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19409,8 +19412,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3560",
-   "self_type" : "type-3559",
+   "referenced_type" : "type-3559",
+   "self_type" : "type-3558",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19418,8 +19421,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3655",
-   "self_type" : "type-3654",
+   "referenced_type" : "type-3658",
+   "self_type" : "type-3657",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19427,8 +19430,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3720",
-   "self_type" : "type-3719",
+   "referenced_type" : "type-3726",
+   "self_type" : "type-3725",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19436,8 +19439,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3888",
-   "self_type" : "type-3887",
+   "referenced_type" : "type-3894",
+   "self_type" : "type-3893",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19445,8 +19448,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3931",
-   "self_type" : "type-3930",
+   "referenced_type" : "type-3937",
+   "self_type" : "type-3936",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19454,8 +19457,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3947",
-   "self_type" : "type-3946",
+   "referenced_type" : "type-3953",
+   "self_type" : "type-3952",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19463,8 +19466,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3967",
-   "self_type" : "type-3966",
+   "referenced_type" : "type-3973",
+   "self_type" : "type-3972",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19472,8 +19475,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3969",
-   "self_type" : "type-3968",
+   "referenced_type" : "type-3975",
+   "self_type" : "type-3974",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19481,8 +19484,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4019",
-   "self_type" : "type-4018",
+   "referenced_type" : "type-4025",
+   "self_type" : "type-4024",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19490,8 +19493,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4097",
-   "self_type" : "type-4096",
+   "referenced_type" : "type-4103",
+   "self_type" : "type-4102",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19499,8 +19502,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4300",
-   "self_type" : "type-4299",
+   "referenced_type" : "type-4306",
+   "self_type" : "type-4305",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19508,8 +19511,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4515",
-   "self_type" : "type-4514",
+   "referenced_type" : "type-4521",
+   "self_type" : "type-4520",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19517,8 +19520,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4526",
-   "self_type" : "type-4525",
+   "referenced_type" : "type-4532",
+   "self_type" : "type-4531",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19526,8 +19529,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4552",
-   "self_type" : "type-4551",
+   "referenced_type" : "type-4558",
+   "self_type" : "type-4557",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19535,8 +19538,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4579",
-   "self_type" : "type-4578",
+   "referenced_type" : "type-4585",
+   "self_type" : "type-4584",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19544,8 +19547,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4746",
-   "self_type" : "type-4745",
+   "referenced_type" : "type-4753",
+   "self_type" : "type-4752",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19553,8 +19556,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4856",
-   "self_type" : "type-4855",
+   "referenced_type" : "type-4862",
+   "self_type" : "type-4861",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19562,8 +19565,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4967",
-   "self_type" : "type-4966",
+   "referenced_type" : "type-4973",
+   "self_type" : "type-4972",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19571,8 +19574,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5088",
-   "self_type" : "type-5087",
+   "referenced_type" : "type-5104",
+   "self_type" : "type-5103",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19580,8 +19583,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5129",
-   "self_type" : "type-5128",
+   "referenced_type" : "type-5145",
+   "self_type" : "type-5144",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19589,8 +19592,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5230",
-   "self_type" : "type-5229",
+   "referenced_type" : "type-5246",
+   "self_type" : "type-5245",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19598,8 +19601,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5552",
-   "self_type" : "type-5551",
+   "referenced_type" : "type-5569",
+   "self_type" : "type-5568",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19607,8 +19610,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5635",
-   "self_type" : "type-5634",
+   "referenced_type" : "type-5648",
+   "self_type" : "type-5647",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19616,8 +19619,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5730",
-   "self_type" : "type-5729",
+   "referenced_type" : "type-5747",
+   "self_type" : "type-5746",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19625,8 +19628,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5795",
-   "self_type" : "type-5794",
+   "referenced_type" : "type-5815",
+   "self_type" : "type-5814",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19634,8 +19637,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5963",
-   "self_type" : "type-5962",
+   "referenced_type" : "type-5983",
+   "self_type" : "type-5982",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19643,8 +19646,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6028",
-   "self_type" : "type-6027",
+   "referenced_type" : "type-6048",
+   "self_type" : "type-6047",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19652,8 +19655,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6151",
-   "self_type" : "type-6150",
+   "referenced_type" : "type-6171",
+   "self_type" : "type-6170",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19661,8 +19664,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6221",
-   "self_type" : "type-6220",
+   "referenced_type" : "type-6237",
+   "self_type" : "type-6236",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19670,8 +19673,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6303",
-   "self_type" : "type-6302",
+   "referenced_type" : "type-6323",
+   "self_type" : "type-6322",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19679,8 +19682,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6349",
-   "self_type" : "type-6348",
+   "referenced_type" : "type-6373",
+   "self_type" : "type-6372",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19688,8 +19691,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6482",
-   "self_type" : "type-6481",
+   "referenced_type" : "type-6505",
+   "self_type" : "type-6504",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19697,8 +19700,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6524",
-   "self_type" : "type-6523",
+   "referenced_type" : "type-6547",
+   "self_type" : "type-6546",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19706,8 +19709,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6540",
-   "self_type" : "type-6539",
+   "referenced_type" : "type-6563",
+   "self_type" : "type-6562",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19715,8 +19718,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6558",
-   "self_type" : "type-6557",
+   "referenced_type" : "type-6581",
+   "self_type" : "type-6580",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19724,8 +19727,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6560",
-   "self_type" : "type-6559",
+   "referenced_type" : "type-6583",
+   "self_type" : "type-6582",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19733,8 +19736,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6607",
-   "self_type" : "type-6606",
+   "referenced_type" : "type-6630",
+   "self_type" : "type-6629",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19742,8 +19745,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6684",
-   "self_type" : "type-6683",
+   "referenced_type" : "type-6707",
+   "self_type" : "type-6706",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19751,8 +19754,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6904",
-   "self_type" : "type-6903",
+   "referenced_type" : "type-6927",
+   "self_type" : "type-6926",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19760,8 +19763,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7120",
-   "self_type" : "type-7119",
+   "referenced_type" : "type-7145",
+   "self_type" : "type-7144",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19769,8 +19772,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7135",
-   "self_type" : "type-7134",
+   "referenced_type" : "type-7160",
+   "self_type" : "type-7159",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19778,8 +19781,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7171",
-   "self_type" : "type-7170",
+   "referenced_type" : "type-7195",
+   "self_type" : "type-7194",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19787,8 +19790,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7214",
-   "self_type" : "type-7213",
+   "referenced_type" : "type-7239",
+   "self_type" : "type-7238",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19796,8 +19799,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7361",
-   "self_type" : "type-7360",
+   "referenced_type" : "type-7384",
+   "self_type" : "type-7383",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19805,8 +19808,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7451",
-   "self_type" : "type-7450",
+   "referenced_type" : "type-7472",
+   "self_type" : "type-7471",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19814,8 +19817,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7456",
-   "self_type" : "type-7455",
+   "referenced_type" : "type-7480",
+   "self_type" : "type-7479",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19823,8 +19826,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7493",
-   "self_type" : "type-7492",
+   "referenced_type" : "type-7516",
+   "self_type" : "type-7515",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19832,8 +19835,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7590",
-   "self_type" : "type-7589",
+   "referenced_type" : "type-7614",
+   "self_type" : "type-7613",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19841,8 +19844,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7624",
-   "self_type" : "type-7623",
+   "referenced_type" : "type-7648",
+   "self_type" : "type-7647",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19859,8 +19862,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-883",
-   "self_type" : "type-882",
+   "referenced_type" : "type-879",
+   "self_type" : "type-878",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19904,8 +19907,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ALooper::LooperThread *",
    "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-3766",
-   "self_type" : "type-3765",
+   "referenced_type" : "type-3769",
+   "self_type" : "type-3768",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19913,8 +19916,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ALooper::LooperThread *",
    "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-5841",
-   "self_type" : "type-5840",
+   "referenced_type" : "type-5858",
+   "self_type" : "type-5857",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19922,8 +19925,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ALooper::LooperThread *",
    "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-5984",
-   "self_type" : "type-5983",
+   "referenced_type" : "type-6004",
+   "self_type" : "type-6003",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19940,8 +19943,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::AReplyToken *",
    "name" : "android::AReplyToken *",
-   "referenced_type" : "type-1045",
-   "self_type" : "type-1167",
+   "referenced_type" : "type-1044",
+   "self_type" : "type-1168",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -19959,7 +19962,7 @@
    "linker_set_key" : "android::BBinder *",
    "name" : "android::BBinder *",
    "referenced_type" : "type-69",
-   "self_type" : "type-1206",
+   "self_type" : "type-1209",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -19986,7 +19989,7 @@
    "linker_set_key" : "android::BnInterface<android::IGraphicBufferProducer> *",
    "name" : "android::BnInterface<android::IGraphicBufferProducer> *",
    "referenced_type" : "type-73",
-   "self_type" : "type-1271",
+   "self_type" : "type-1275",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19995,7 +19998,7 @@
    "linker_set_key" : "android::BnInterface<android::IProducerListener> *",
    "name" : "android::BnInterface<android::IProducerListener> *",
    "referenced_type" : "type-82",
-   "self_type" : "type-4503",
+   "self_type" : "type-4509",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20003,8 +20006,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BnInterface<android::ITransactionCompletedListener> *",
    "name" : "android::BnInterface<android::ITransactionCompletedListener> *",
-   "referenced_type" : "type-1032",
-   "self_type" : "type-1035",
+   "referenced_type" : "type-1035",
+   "self_type" : "type-1039",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20012,8 +20015,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BpConsumerListener *",
    "name" : "android::BpConsumerListener *",
-   "referenced_type" : "type-1580",
-   "self_type" : "type-1579",
+   "referenced_type" : "type-1583",
+   "self_type" : "type-1582",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20021,8 +20024,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BpConsumerListener *",
    "name" : "android::BpConsumerListener *",
-   "referenced_type" : "type-4060",
-   "self_type" : "type-4059",
+   "referenced_type" : "type-4067",
+   "self_type" : "type-4066",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20030,8 +20033,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BpConsumerListener *",
    "name" : "android::BpConsumerListener *",
-   "referenced_type" : "type-6648",
-   "self_type" : "type-6647",
+   "referenced_type" : "type-6671",
+   "self_type" : "type-6670",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20039,8 +20042,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BpGraphicBufferConsumer *",
    "name" : "android::BpGraphicBufferConsumer *",
-   "referenced_type" : "type-1603",
-   "self_type" : "type-1602",
+   "referenced_type" : "type-1607",
+   "self_type" : "type-1606",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20048,8 +20051,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BpGraphicBufferConsumer *",
    "name" : "android::BpGraphicBufferConsumer *",
-   "referenced_type" : "type-4078",
-   "self_type" : "type-4077",
+   "referenced_type" : "type-4084",
+   "self_type" : "type-4083",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20057,8 +20060,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BpGraphicBufferConsumer *",
    "name" : "android::BpGraphicBufferConsumer *",
-   "referenced_type" : "type-6663",
-   "self_type" : "type-6662",
+   "referenced_type" : "type-6686",
+   "self_type" : "type-6685",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20066,8 +20069,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BpGraphicBufferProducer *",
    "name" : "android::BpGraphicBufferProducer *",
-   "referenced_type" : "type-4233",
-   "self_type" : "type-4232",
+   "referenced_type" : "type-4239",
+   "self_type" : "type-4238",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20075,8 +20078,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BpGraphicBufferProducer *",
    "name" : "android::BpGraphicBufferProducer *",
-   "referenced_type" : "type-6848",
-   "self_type" : "type-6847",
+   "referenced_type" : "type-6871",
+   "self_type" : "type-6870",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20084,8 +20087,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BpInterface<android::IConsumerListener> *",
    "name" : "android::BpInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-1495",
-   "self_type" : "type-1499",
+   "referenced_type" : "type-1499",
+   "self_type" : "type-1502",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -20093,8 +20096,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BpInterface<android::IGraphicBufferConsumer> *",
    "name" : "android::BpInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-1625",
-   "self_type" : "type-1628",
+   "referenced_type" : "type-1629",
+   "self_type" : "type-1633",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -20102,8 +20105,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BpInterface<android::IGraphicBufferProducer> *",
    "name" : "android::BpInterface<android::IGraphicBufferProducer> *",
-   "referenced_type" : "type-4320",
-   "self_type" : "type-4323",
+   "referenced_type" : "type-4326",
+   "self_type" : "type-4329",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -20111,8 +20114,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BpInterface<android::IProducerListener> *",
    "name" : "android::BpInterface<android::IProducerListener> *",
-   "referenced_type" : "type-4482",
-   "self_type" : "type-4485",
+   "referenced_type" : "type-4488",
+   "self_type" : "type-4491",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -20120,8 +20123,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BpProducerListener *",
    "name" : "android::BpProducerListener *",
-   "referenced_type" : "type-4455",
-   "self_type" : "type-4454",
+   "referenced_type" : "type-4462",
+   "self_type" : "type-4461",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20129,8 +20132,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BpProducerListener *",
    "name" : "android::BpProducerListener *",
-   "referenced_type" : "type-7062",
-   "self_type" : "type-7061",
+   "referenced_type" : "type-7086",
+   "self_type" : "type-7085",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20147,8 +20150,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-1068",
-   "self_type" : "type-1067",
+   "referenced_type" : "type-1071",
+   "self_type" : "type-1070",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20156,8 +20159,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-1530",
-   "self_type" : "type-1529",
+   "referenced_type" : "type-1533",
+   "self_type" : "type-1532",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -20165,8 +20168,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-1670",
-   "self_type" : "type-1669",
+   "referenced_type" : "type-1674",
+   "self_type" : "type-1673",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -20174,8 +20177,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-3638",
-   "self_type" : "type-3637",
+   "referenced_type" : "type-3641",
+   "self_type" : "type-3640",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -20183,8 +20186,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-3682",
-   "self_type" : "type-3681",
+   "referenced_type" : "type-3688",
+   "self_type" : "type-3687",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20192,8 +20195,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-4041",
-   "self_type" : "type-4040",
+   "referenced_type" : "type-4048",
+   "self_type" : "type-4047",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -20201,8 +20204,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-4127",
-   "self_type" : "type-4126",
+   "referenced_type" : "type-4133",
+   "self_type" : "type-4132",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -20210,8 +20213,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-5713",
-   "self_type" : "type-5712",
+   "referenced_type" : "type-5730",
+   "self_type" : "type-5729",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -20219,8 +20222,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-5757",
-   "self_type" : "type-5756",
+   "referenced_type" : "type-5777",
+   "self_type" : "type-5776",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20228,8 +20231,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-6284",
-   "self_type" : "type-6283",
+   "referenced_type" : "type-6304",
+   "self_type" : "type-6303",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -20237,8 +20240,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-6322",
-   "self_type" : "type-6321",
+   "referenced_type" : "type-6345",
+   "self_type" : "type-6344",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20246,8 +20249,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-6631",
-   "self_type" : "type-6630",
+   "referenced_type" : "type-6654",
+   "self_type" : "type-6653",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -20255,8 +20258,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-6713",
-   "self_type" : "type-6712",
+   "referenced_type" : "type-6736",
+   "self_type" : "type-6735",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -20273,8 +20276,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
    "name" : "android::BufferQueue::ProxyConsumerListener *",
-   "referenced_type" : "type-2538",
-   "self_type" : "type-2537",
+   "referenced_type" : "type-2541",
+   "self_type" : "type-2540",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20282,8 +20285,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
    "name" : "android::BufferQueue::ProxyConsumerListener *",
-   "referenced_type" : "type-4951",
-   "self_type" : "type-4950",
+   "referenced_type" : "type-4957",
+   "self_type" : "type-4956",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20291,8 +20294,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
    "name" : "android::BufferQueue::ProxyConsumerListener *",
-   "referenced_type" : "type-6022",
-   "self_type" : "type-6021",
+   "referenced_type" : "type-6042",
+   "self_type" : "type-6041",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20300,8 +20303,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
    "name" : "android::BufferQueue::ProxyConsumerListener *",
-   "referenced_type" : "type-7235",
-   "self_type" : "type-7234",
+   "referenced_type" : "type-7256",
+   "self_type" : "type-7255",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20309,8 +20312,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueConsumer *",
    "name" : "android::BufferQueueConsumer *",
-   "referenced_type" : "type-3492",
-   "self_type" : "type-3491",
+   "referenced_type" : "type-3495",
+   "self_type" : "type-3494",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20318,8 +20321,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueConsumer *",
    "name" : "android::BufferQueueConsumer *",
-   "referenced_type" : "type-5567",
-   "self_type" : "type-5566",
+   "referenced_type" : "type-5584",
+   "self_type" : "type-5583",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20327,8 +20330,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueConsumer *",
    "name" : "android::BufferQueueConsumer *",
-   "referenced_type" : "type-6164",
-   "self_type" : "type-6163",
+   "referenced_type" : "type-6184",
+   "self_type" : "type-6183",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20345,8 +20348,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-1169",
-   "self_type" : "type-1168",
+   "referenced_type" : "type-1173",
+   "self_type" : "type-1172",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20354,8 +20357,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-3519",
-   "self_type" : "type-3518",
+   "referenced_type" : "type-3522",
+   "self_type" : "type-3521",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20363,8 +20366,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-3617",
-   "self_type" : "type-3616",
+   "referenced_type" : "type-3620",
+   "self_type" : "type-3619",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20372,8 +20375,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-3774",
-   "self_type" : "type-3773",
+   "referenced_type" : "type-3781",
+   "self_type" : "type-3780",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20381,8 +20384,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-5594",
-   "self_type" : "type-5593",
+   "referenced_type" : "type-5611",
+   "self_type" : "type-5610",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20390,8 +20393,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-5692",
-   "self_type" : "type-5691",
+   "referenced_type" : "type-5709",
+   "self_type" : "type-5708",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20399,8 +20402,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-5849",
-   "self_type" : "type-5848",
+   "referenced_type" : "type-5870",
+   "self_type" : "type-5869",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20408,8 +20411,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-6183",
-   "self_type" : "type-6182",
+   "referenced_type" : "type-6203",
+   "self_type" : "type-6202",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20417,8 +20420,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-6269",
-   "self_type" : "type-6268",
+   "referenced_type" : "type-6290",
+   "self_type" : "type-6289",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20426,8 +20429,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-6401",
-   "self_type" : "type-6400",
+   "referenced_type" : "type-6424",
+   "self_type" : "type-6423",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20453,8 +20456,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueProducer *",
    "name" : "android::BufferQueueProducer *",
-   "referenced_type" : "type-3504",
-   "self_type" : "type-3503",
+   "referenced_type" : "type-3507",
+   "self_type" : "type-3506",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20462,8 +20465,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueProducer *",
    "name" : "android::BufferQueueProducer *",
-   "referenced_type" : "type-5579",
-   "self_type" : "type-5578",
+   "referenced_type" : "type-5596",
+   "self_type" : "type-5595",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20471,8 +20474,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueProducer *",
    "name" : "android::BufferQueueProducer *",
-   "referenced_type" : "type-6173",
-   "self_type" : "type-6172",
+   "referenced_type" : "type-6193",
+   "self_type" : "type-6192",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20498,8 +20501,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ComposerService *",
    "name" : "android::ComposerService *",
-   "referenced_type" : "type-1093",
-   "self_type" : "type-1092",
+   "referenced_type" : "type-1096",
+   "self_type" : "type-1095",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -20507,8 +20510,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ComposerService *",
    "name" : "android::ComposerService *",
-   "referenced_type" : "type-3702",
-   "self_type" : "type-3701",
+   "referenced_type" : "type-3708",
+   "self_type" : "type-3707",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -20516,8 +20519,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ComposerService *",
    "name" : "android::ComposerService *",
-   "referenced_type" : "type-5777",
-   "self_type" : "type-5776",
+   "referenced_type" : "type-5797",
+   "self_type" : "type-5796",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -20525,8 +20528,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ComposerService *",
    "name" : "android::ComposerService *",
-   "referenced_type" : "type-6335",
-   "self_type" : "type-6334",
+   "referenced_type" : "type-6358",
+   "self_type" : "type-6357",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -20543,8 +20546,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-1252",
-   "self_type" : "type-1251",
+   "referenced_type" : "type-1256",
+   "self_type" : "type-1255",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20552,8 +20555,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-1455",
-   "self_type" : "type-1454",
+   "referenced_type" : "type-1459",
+   "self_type" : "type-1458",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20561,8 +20564,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-3813",
-   "self_type" : "type-3812",
+   "referenced_type" : "type-3820",
+   "self_type" : "type-3819",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20570,8 +20573,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-3988",
-   "self_type" : "type-3987",
+   "referenced_type" : "type-3994",
+   "self_type" : "type-3993",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20579,8 +20582,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-5888",
-   "self_type" : "type-5887",
+   "referenced_type" : "type-5909",
+   "self_type" : "type-5908",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20588,8 +20591,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-6424",
-   "self_type" : "type-6423",
+   "referenced_type" : "type-6448",
+   "self_type" : "type-6447",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20597,8 +20600,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-6576",
-   "self_type" : "type-6575",
+   "referenced_type" : "type-6599",
+   "self_type" : "type-6598",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20606,8 +20609,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-3292",
-   "self_type" : "type-3291",
+   "referenced_type" : "type-3295",
+   "self_type" : "type-3294",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20615,8 +20618,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-3481",
-   "self_type" : "type-3480",
+   "referenced_type" : "type-3484",
+   "self_type" : "type-3483",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20633,8 +20636,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-5367",
-   "self_type" : "type-5366",
+   "referenced_type" : "type-5384",
+   "self_type" : "type-5383",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20642,8 +20645,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-5556",
-   "self_type" : "type-5555",
+   "referenced_type" : "type-5573",
+   "self_type" : "type-5572",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20651,8 +20654,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-6066",
-   "self_type" : "type-6065",
+   "referenced_type" : "type-6086",
+   "self_type" : "type-6085",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20660,8 +20663,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-6156",
-   "self_type" : "type-6155",
+   "referenced_type" : "type-6176",
+   "self_type" : "type-6175",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20696,8 +20699,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-1286",
-   "self_type" : "type-1285",
+   "referenced_type" : "type-1289",
+   "self_type" : "type-1288",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20705,8 +20708,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-1415",
-   "self_type" : "type-1414",
+   "referenced_type" : "type-1418",
+   "self_type" : "type-1417",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20714,8 +20717,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-1434",
-   "self_type" : "type-1433",
+   "referenced_type" : "type-1437",
+   "self_type" : "type-1436",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20723,8 +20726,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-1457",
-   "self_type" : "type-1456",
+   "referenced_type" : "type-1461",
+   "self_type" : "type-1460",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20732,8 +20735,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-1585",
-   "self_type" : "type-1584",
+   "referenced_type" : "type-1589",
+   "self_type" : "type-1588",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20741,8 +20744,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-1612",
-   "self_type" : "type-1611",
+   "referenced_type" : "type-1616",
+   "self_type" : "type-1615",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20750,8 +20753,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-1867",
-   "self_type" : "type-1866",
+   "referenced_type" : "type-1871",
+   "self_type" : "type-1870",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20759,8 +20762,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3447",
-   "self_type" : "type-3446",
+   "referenced_type" : "type-3450",
+   "self_type" : "type-3449",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20768,8 +20771,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3486",
-   "self_type" : "type-3485",
+   "referenced_type" : "type-3489",
+   "self_type" : "type-3488",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20777,8 +20780,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3660",
-   "self_type" : "type-3659",
+   "referenced_type" : "type-3663",
+   "self_type" : "type-3662",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20786,8 +20789,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3662",
-   "self_type" : "type-3661",
+   "referenced_type" : "type-3665",
+   "self_type" : "type-3664",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20795,8 +20798,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3838",
-   "self_type" : "type-3837",
+   "referenced_type" : "type-3844",
+   "self_type" : "type-3843",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20804,8 +20807,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3943",
-   "self_type" : "type-3942",
+   "referenced_type" : "type-3949",
+   "self_type" : "type-3948",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20813,8 +20816,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3965",
-   "self_type" : "type-3964",
+   "referenced_type" : "type-3971",
+   "self_type" : "type-3970",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20822,8 +20825,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3990",
-   "self_type" : "type-3989",
+   "referenced_type" : "type-3996",
+   "self_type" : "type-3995",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20831,8 +20834,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-4066",
-   "self_type" : "type-4065",
+   "referenced_type" : "type-4072",
+   "self_type" : "type-4071",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20840,8 +20843,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-4085",
-   "self_type" : "type-4084",
+   "referenced_type" : "type-4091",
+   "self_type" : "type-4090",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20849,8 +20852,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-4398",
-   "self_type" : "type-4397",
+   "referenced_type" : "type-4402",
+   "self_type" : "type-4401",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20858,8 +20861,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-4656",
-   "self_type" : "type-4655",
+   "referenced_type" : "type-4662",
+   "self_type" : "type-4661",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20867,8 +20870,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-4672",
-   "self_type" : "type-4671",
+   "referenced_type" : "type-4678",
+   "self_type" : "type-4677",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20876,8 +20879,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-4935",
-   "self_type" : "type-4934",
+   "referenced_type" : "type-4941",
+   "self_type" : "type-4940",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20885,8 +20888,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5146",
-   "self_type" : "type-5145",
+   "referenced_type" : "type-5163",
+   "self_type" : "type-5162",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20894,8 +20897,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5522",
-   "self_type" : "type-5521",
+   "referenced_type" : "type-5539",
+   "self_type" : "type-5538",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20903,8 +20906,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5561",
-   "self_type" : "type-5560",
+   "referenced_type" : "type-5578",
+   "self_type" : "type-5577",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20912,8 +20915,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5735",
-   "self_type" : "type-5734",
+   "referenced_type" : "type-5752",
+   "self_type" : "type-5751",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20921,8 +20924,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5737",
-   "self_type" : "type-5736",
+   "referenced_type" : "type-5754",
+   "self_type" : "type-5753",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20930,8 +20933,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5913",
-   "self_type" : "type-5912",
+   "referenced_type" : "type-5933",
+   "self_type" : "type-5932",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20939,8 +20942,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6013",
-   "self_type" : "type-6012",
+   "referenced_type" : "type-6033",
+   "self_type" : "type-6032",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20948,8 +20951,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6126",
-   "self_type" : "type-6125",
+   "referenced_type" : "type-6146",
+   "self_type" : "type-6145",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20957,8 +20960,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6158",
-   "self_type" : "type-6157",
+   "referenced_type" : "type-6178",
+   "self_type" : "type-6177",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20966,8 +20969,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6307",
-   "self_type" : "type-6306",
+   "referenced_type" : "type-6328",
+   "self_type" : "type-6327",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20975,8 +20978,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6309",
-   "self_type" : "type-6308",
+   "referenced_type" : "type-6330",
+   "self_type" : "type-6329",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20984,8 +20987,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6437",
-   "self_type" : "type-6436",
+   "referenced_type" : "type-6460",
+   "self_type" : "type-6459",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20993,8 +20996,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6536",
-   "self_type" : "type-6535",
+   "referenced_type" : "type-6559",
+   "self_type" : "type-6558",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21002,8 +21005,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6556",
-   "self_type" : "type-6555",
+   "referenced_type" : "type-6579",
+   "self_type" : "type-6578",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21011,8 +21014,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6578",
-   "self_type" : "type-6577",
+   "referenced_type" : "type-6601",
+   "self_type" : "type-6600",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21020,8 +21023,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6653",
-   "self_type" : "type-6652",
+   "referenced_type" : "type-6677",
+   "self_type" : "type-6676",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21029,8 +21032,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6670",
-   "self_type" : "type-6669",
+   "referenced_type" : "type-6693",
+   "self_type" : "type-6692",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21038,8 +21041,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6998",
-   "self_type" : "type-6997",
+   "referenced_type" : "type-7020",
+   "self_type" : "type-7019",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21047,8 +21050,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-7188",
-   "self_type" : "type-7187",
+   "referenced_type" : "type-7211",
+   "self_type" : "type-7210",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21065,8 +21068,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-7300",
-   "self_type" : "type-7299",
+   "referenced_type" : "type-7325",
+   "self_type" : "type-7324",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21074,8 +21077,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-7313",
-   "self_type" : "type-7312",
+   "referenced_type" : "type-7336",
+   "self_type" : "type-7335",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21083,8 +21086,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-7515",
-   "self_type" : "type-7514",
+   "referenced_type" : "type-7539",
+   "self_type" : "type-7538",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21092,8 +21095,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-7661",
-   "self_type" : "type-7660",
+   "referenced_type" : "type-7685",
+   "self_type" : "type-7684",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21110,8 +21113,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::FileDescriptor::Autoclose *",
    "name" : "android::FileDescriptor::Autoclose *",
-   "referenced_type" : "type-1213",
-   "self_type" : "type-1221",
+   "referenced_type" : "type-1211",
+   "self_type" : "type-1220",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h"
   },
@@ -21120,7 +21123,7 @@
    "linker_set_key" : "android::Flattenable<android::BufferItem> *",
    "name" : "android::Flattenable<android::BufferItem> *",
    "referenced_type" : "type-22",
-   "self_type" : "type-1511",
+   "self_type" : "type-1514",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -21129,7 +21132,7 @@
    "linker_set_key" : "android::Flattenable<android::Fence> *",
    "name" : "android::Flattenable<android::Fence> *",
    "referenced_type" : "type-17",
-   "self_type" : "type-1637",
+   "self_type" : "type-1641",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -21138,7 +21141,7 @@
    "linker_set_key" : "android::Flattenable<android::FrameEventHistoryDelta> *",
    "name" : "android::Flattenable<android::FrameEventHistoryDelta> *",
    "referenced_type" : "type-26",
-   "self_type" : "type-4311",
+   "self_type" : "type-4317",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -21147,7 +21150,7 @@
    "linker_set_key" : "android::Flattenable<android::GraphicBuffer> *",
    "name" : "android::Flattenable<android::GraphicBuffer> *",
    "referenced_type" : "type-15",
-   "self_type" : "type-1641",
+   "self_type" : "type-1646",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -21156,7 +21159,7 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> *",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> *",
    "referenced_type" : "type-33",
-   "self_type" : "type-4314",
+   "self_type" : "type-4320",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -21165,7 +21168,7 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> *",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> *",
    "referenced_type" : "type-35",
-   "self_type" : "type-4317",
+   "self_type" : "type-4323",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -21182,8 +21185,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-1175",
-   "self_type" : "type-1174",
+   "referenced_type" : "type-1178",
+   "self_type" : "type-1177",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21191,8 +21194,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-1469",
-   "self_type" : "type-1468",
+   "referenced_type" : "type-1472",
+   "self_type" : "type-1471",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21200,8 +21203,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-3779",
-   "self_type" : "type-3778",
+   "referenced_type" : "type-3785",
+   "self_type" : "type-3784",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21209,8 +21212,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-3999",
-   "self_type" : "type-3998",
+   "referenced_type" : "type-4005",
+   "self_type" : "type-4004",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21218,8 +21221,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-5854",
-   "self_type" : "type-5853",
+   "referenced_type" : "type-5874",
+   "self_type" : "type-5873",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21227,8 +21230,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-6405",
-   "self_type" : "type-6404",
+   "referenced_type" : "type-6428",
+   "self_type" : "type-6427",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21236,8 +21239,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-6587",
-   "self_type" : "type-6586",
+   "referenced_type" : "type-6610",
+   "self_type" : "type-6609",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21254,8 +21257,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1332",
-   "self_type" : "type-1331",
+   "referenced_type" : "type-1331",
+   "self_type" : "type-1330",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21263,8 +21266,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1417",
-   "self_type" : "type-1416",
+   "referenced_type" : "type-1420",
+   "self_type" : "type-1419",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21272,8 +21275,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1460",
-   "self_type" : "type-1459",
+   "referenced_type" : "type-1464",
+   "self_type" : "type-1463",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21281,8 +21284,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1587",
-   "self_type" : "type-1586",
+   "referenced_type" : "type-1593",
+   "self_type" : "type-1592",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21290,8 +21293,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1609",
-   "self_type" : "type-1608",
+   "referenced_type" : "type-1613",
+   "self_type" : "type-1612",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21299,8 +21302,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3452",
-   "self_type" : "type-3451",
+   "referenced_type" : "type-3455",
+   "self_type" : "type-3454",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21308,8 +21311,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3488",
-   "self_type" : "type-3487",
+   "referenced_type" : "type-3491",
+   "self_type" : "type-3490",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21317,8 +21320,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3599",
-   "self_type" : "type-3598",
+   "referenced_type" : "type-3602",
+   "self_type" : "type-3601",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21326,8 +21329,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3664",
-   "self_type" : "type-3663",
+   "referenced_type" : "type-3667",
+   "self_type" : "type-3666",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21335,8 +21338,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3884",
-   "self_type" : "type-3883",
+   "referenced_type" : "type-3886",
+   "self_type" : "type-3885",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21344,8 +21347,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3945",
-   "self_type" : "type-3944",
+   "referenced_type" : "type-3951",
+   "self_type" : "type-3950",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21353,8 +21356,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3992",
-   "self_type" : "type-3991",
+   "referenced_type" : "type-3998",
+   "self_type" : "type-3997",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21362,8 +21365,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-4068",
-   "self_type" : "type-4067",
+   "referenced_type" : "type-4074",
+   "self_type" : "type-4073",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21371,8 +21374,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-4083",
-   "self_type" : "type-4082",
+   "referenced_type" : "type-4089",
+   "self_type" : "type-4088",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21380,8 +21383,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-4450",
-   "self_type" : "type-4449",
+   "referenced_type" : "type-4456",
+   "self_type" : "type-4455",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21389,8 +21392,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-4550",
-   "self_type" : "type-4549",
+   "referenced_type" : "type-4554",
+   "self_type" : "type-4553",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21398,8 +21401,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-4679",
-   "self_type" : "type-4678",
+   "referenced_type" : "type-4686",
+   "self_type" : "type-4685",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21407,8 +21410,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5148",
-   "self_type" : "type-5147",
+   "referenced_type" : "type-5166",
+   "self_type" : "type-5165",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21416,8 +21419,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5527",
-   "self_type" : "type-5526",
+   "referenced_type" : "type-5544",
+   "self_type" : "type-5543",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21425,8 +21428,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5563",
-   "self_type" : "type-5562",
+   "referenced_type" : "type-5580",
+   "self_type" : "type-5579",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21434,8 +21437,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5674",
-   "self_type" : "type-5673",
+   "referenced_type" : "type-5691",
+   "self_type" : "type-5690",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21443,8 +21446,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5739",
-   "self_type" : "type-5738",
+   "referenced_type" : "type-5756",
+   "self_type" : "type-5755",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21452,8 +21455,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5959",
-   "self_type" : "type-5958",
+   "referenced_type" : "type-5975",
+   "self_type" : "type-5974",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21461,8 +21464,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5986",
-   "self_type" : "type-5985",
+   "referenced_type" : "type-6006",
+   "self_type" : "type-6005",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21470,8 +21473,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6131",
-   "self_type" : "type-6130",
+   "referenced_type" : "type-6151",
+   "self_type" : "type-6150",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21479,8 +21482,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6160",
-   "self_type" : "type-6159",
+   "referenced_type" : "type-6180",
+   "self_type" : "type-6179",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21488,8 +21491,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6259",
-   "self_type" : "type-6258",
+   "referenced_type" : "type-6279",
+   "self_type" : "type-6278",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21497,8 +21500,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6312",
-   "self_type" : "type-6311",
+   "referenced_type" : "type-6332",
+   "self_type" : "type-6331",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21506,8 +21509,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6478",
-   "self_type" : "type-6477",
+   "referenced_type" : "type-6497",
+   "self_type" : "type-6496",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21515,8 +21518,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6538",
-   "self_type" : "type-6537",
+   "referenced_type" : "type-6561",
+   "self_type" : "type-6560",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21524,8 +21527,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6580",
-   "self_type" : "type-6579",
+   "referenced_type" : "type-6603",
+   "self_type" : "type-6602",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21533,8 +21536,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6629",
-   "self_type" : "type-6628",
+   "referenced_type" : "type-6649",
+   "self_type" : "type-6648",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21542,8 +21545,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6655",
-   "self_type" : "type-6654",
+   "referenced_type" : "type-6679",
+   "self_type" : "type-6678",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21551,8 +21554,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6668",
-   "self_type" : "type-6667",
+   "referenced_type" : "type-6691",
+   "self_type" : "type-6690",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21560,8 +21563,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-7056",
-   "self_type" : "type-7055",
+   "referenced_type" : "type-7080",
+   "self_type" : "type-7079",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21578,8 +21581,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-7320",
-   "self_type" : "type-7319",
+   "referenced_type" : "type-7343",
+   "self_type" : "type-7342",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21596,8 +21599,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-7517",
-   "self_type" : "type-7516",
+   "referenced_type" : "type-7541",
+   "self_type" : "type-7540",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21605,8 +21608,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-7664",
-   "self_type" : "type-7663",
+   "referenced_type" : "type-7687",
+   "self_type" : "type-7686",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21632,8 +21635,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1089",
-   "self_type" : "type-1088",
+   "referenced_type" : "type-1092",
+   "self_type" : "type-1091",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21641,8 +21644,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1270",
-   "self_type" : "type-1269",
+   "referenced_type" : "type-1274",
+   "self_type" : "type-1273",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21650,8 +21653,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1413",
-   "self_type" : "type-1412",
+   "referenced_type" : "type-1416",
+   "self_type" : "type-1415",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21659,8 +21662,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1449",
-   "self_type" : "type-1448",
+   "referenced_type" : "type-1452",
+   "self_type" : "type-1451",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21668,8 +21671,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-2176",
-   "self_type" : "type-2175",
+   "referenced_type" : "type-2180",
+   "self_type" : "type-2179",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21677,8 +21680,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3253",
-   "self_type" : "type-3252",
+   "referenced_type" : "type-3256",
+   "self_type" : "type-3255",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21695,8 +21698,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3465",
-   "self_type" : "type-3464",
+   "referenced_type" : "type-3468",
+   "self_type" : "type-3467",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21704,8 +21707,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3532",
-   "self_type" : "type-3531",
+   "referenced_type" : "type-3535",
+   "self_type" : "type-3534",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21713,8 +21716,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3643",
-   "self_type" : "type-3642",
+   "referenced_type" : "type-3646",
+   "self_type" : "type-3645",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21722,8 +21725,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3700",
-   "self_type" : "type-3699",
+   "referenced_type" : "type-3706",
+   "self_type" : "type-3705",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21731,8 +21734,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3824",
-   "self_type" : "type-3823",
+   "referenced_type" : "type-3831",
+   "self_type" : "type-3830",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21740,8 +21743,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3941",
-   "self_type" : "type-3940",
+   "referenced_type" : "type-3947",
+   "self_type" : "type-3946",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21749,8 +21752,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3982",
-   "self_type" : "type-3981",
+   "referenced_type" : "type-3988",
+   "self_type" : "type-3987",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21758,8 +21761,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-4212",
-   "self_type" : "type-4211",
+   "referenced_type" : "type-4219",
+   "self_type" : "type-4218",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21767,8 +21770,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-4391",
-   "self_type" : "type-4390",
+   "referenced_type" : "type-4397",
+   "self_type" : "type-4396",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21776,8 +21779,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-4604",
-   "self_type" : "type-4603",
+   "referenced_type" : "type-4610",
+   "self_type" : "type-4609",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21785,8 +21788,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-4770",
-   "self_type" : "type-4769",
+   "referenced_type" : "type-4778",
+   "self_type" : "type-4777",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21794,8 +21797,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5097",
-   "self_type" : "type-5096",
+   "referenced_type" : "type-5113",
+   "self_type" : "type-5112",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21803,8 +21806,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5165",
-   "self_type" : "type-5164",
+   "referenced_type" : "type-5183",
+   "self_type" : "type-5182",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21812,8 +21815,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5328",
-   "self_type" : "type-5327",
+   "referenced_type" : "type-5345",
+   "self_type" : "type-5344",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21821,8 +21824,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5540",
-   "self_type" : "type-5539",
+   "referenced_type" : "type-5557",
+   "self_type" : "type-5556",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21830,8 +21833,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5607",
-   "self_type" : "type-5606",
+   "referenced_type" : "type-5624",
+   "self_type" : "type-5623",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21839,8 +21842,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5718",
-   "self_type" : "type-5717",
+   "referenced_type" : "type-5735",
+   "self_type" : "type-5734",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21848,8 +21851,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5775",
-   "self_type" : "type-5774",
+   "referenced_type" : "type-5795",
+   "self_type" : "type-5794",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21857,8 +21860,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5899",
-   "self_type" : "type-5898",
+   "referenced_type" : "type-5920",
+   "self_type" : "type-5919",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21866,8 +21869,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6060",
-   "self_type" : "type-6059",
+   "referenced_type" : "type-6080",
+   "self_type" : "type-6079",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21875,8 +21878,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6143",
-   "self_type" : "type-6142",
+   "referenced_type" : "type-6163",
+   "self_type" : "type-6162",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21884,8 +21887,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6195",
-   "self_type" : "type-6194",
+   "referenced_type" : "type-6215",
+   "self_type" : "type-6214",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21893,8 +21896,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6289",
-   "self_type" : "type-6288",
+   "referenced_type" : "type-6309",
+   "self_type" : "type-6308",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21902,8 +21905,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6333",
-   "self_type" : "type-6332",
+   "referenced_type" : "type-6356",
+   "self_type" : "type-6355",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21911,8 +21914,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6428",
-   "self_type" : "type-6427",
+   "referenced_type" : "type-6452",
+   "self_type" : "type-6451",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21920,8 +21923,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6534",
-   "self_type" : "type-6533",
+   "referenced_type" : "type-6557",
+   "self_type" : "type-6556",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21929,8 +21932,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6571",
-   "self_type" : "type-6570",
+   "referenced_type" : "type-6594",
+   "self_type" : "type-6593",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21938,8 +21941,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6818",
-   "self_type" : "type-6817",
+   "referenced_type" : "type-6843",
+   "self_type" : "type-6842",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21947,8 +21950,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6990",
-   "self_type" : "type-6989",
+   "referenced_type" : "type-7015",
+   "self_type" : "type-7014",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21956,8 +21959,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-7242",
-   "self_type" : "type-7241",
+   "referenced_type" : "type-7267",
+   "self_type" : "type-7266",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21965,8 +21968,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-7380",
-   "self_type" : "type-7379",
+   "referenced_type" : "type-7404",
+   "self_type" : "type-7403",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21983,8 +21986,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-7604",
-   "self_type" : "type-7603",
+   "referenced_type" : "type-7627",
+   "self_type" : "type-7626",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -22028,8 +22031,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
    "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-3904",
-   "self_type" : "type-3903",
+   "referenced_type" : "type-3910",
+   "self_type" : "type-3909",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22046,8 +22049,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
    "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-5979",
-   "self_type" : "type-5978",
+   "referenced_type" : "type-5999",
+   "self_type" : "type-5998",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22055,8 +22058,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
    "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-6006",
-   "self_type" : "type-6005",
+   "referenced_type" : "type-6026",
+   "self_type" : "type-6025",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22073,8 +22076,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-4260",
-   "self_type" : "type-4259",
+   "referenced_type" : "type-4266",
+   "self_type" : "type-4265",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22082,8 +22085,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-4269",
-   "self_type" : "type-4268",
+   "referenced_type" : "type-4275",
+   "self_type" : "type-4274",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22091,8 +22094,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-4697",
-   "self_type" : "type-4696",
+   "referenced_type" : "type-4704",
+   "self_type" : "type-4703",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22100,8 +22103,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-6870",
-   "self_type" : "type-6869",
+   "referenced_type" : "type-6893",
+   "self_type" : "type-6892",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22109,8 +22112,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-6876",
-   "self_type" : "type-6875",
+   "referenced_type" : "type-6899",
+   "self_type" : "type-6898",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22118,8 +22121,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-7333",
-   "self_type" : "type-7332",
+   "referenced_type" : "type-7356",
+   "self_type" : "type-7355",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22127,8 +22130,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-7667",
-   "self_type" : "type-7666",
+   "referenced_type" : "type-7690",
+   "self_type" : "type-7689",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22136,8 +22139,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
    "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
-   "referenced_type" : "type-4832",
-   "self_type" : "type-4831",
+   "referenced_type" : "type-4840",
+   "self_type" : "type-4839",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22145,8 +22148,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
    "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
-   "referenced_type" : "type-5113",
-   "self_type" : "type-5112",
+   "referenced_type" : "type-5129",
+   "self_type" : "type-5128",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22154,8 +22157,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
    "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
-   "referenced_type" : "type-7436",
-   "self_type" : "type-7435",
+   "referenced_type" : "type-7459",
+   "self_type" : "type-7458",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22163,8 +22166,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, android::BnGraphicBufferProducer> *",
    "name" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, android::BnGraphicBufferProducer> *",
-   "referenced_type" : "type-4286",
-   "self_type" : "type-4285",
+   "referenced_type" : "type-4292",
+   "self_type" : "type-4291",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22172,8 +22175,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, android::BnGraphicBufferProducer> *",
    "name" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, android::BnGraphicBufferProducer> *",
-   "referenced_type" : "type-4667",
-   "self_type" : "type-4666",
+   "referenced_type" : "type-4674",
+   "self_type" : "type-4673",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22181,8 +22184,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, android::BnGraphicBufferProducer> *",
    "name" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, android::BnGraphicBufferProducer> *",
-   "referenced_type" : "type-6890",
-   "self_type" : "type-6889",
+   "referenced_type" : "type-6913",
+   "self_type" : "type-6912",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22190,8 +22193,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, android::BnGraphicBufferProducer> *",
    "name" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, android::BnGraphicBufferProducer> *",
-   "referenced_type" : "type-7311",
-   "self_type" : "type-7310",
+   "referenced_type" : "type-7334",
+   "self_type" : "type-7333",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22199,8 +22202,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V1_0::IProducerListener, android::BnProducerListener> *",
    "name" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V1_0::IProducerListener, android::BnProducerListener> *",
-   "referenced_type" : "type-4828",
-   "self_type" : "type-4827",
+   "referenced_type" : "type-4834",
+   "self_type" : "type-4833",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22208,8 +22211,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V1_0::IProducerListener, android::BnProducerListener> *",
    "name" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V1_0::IProducerListener, android::BnProducerListener> *",
-   "referenced_type" : "type-7432",
-   "self_type" : "type-7431",
+   "referenced_type" : "type-7456",
+   "self_type" : "type-7455",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22217,8 +22220,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer, android::BnGraphicBufferProducer> *",
    "name" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer, android::BnGraphicBufferProducer> *",
-   "referenced_type" : "type-4288",
-   "self_type" : "type-4287",
+   "referenced_type" : "type-4294",
+   "self_type" : "type-4293",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22226,8 +22229,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer, android::BnGraphicBufferProducer> *",
    "name" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer, android::BnGraphicBufferProducer> *",
-   "referenced_type" : "type-6892",
-   "self_type" : "type-6891",
+   "referenced_type" : "type-6915",
+   "self_type" : "type-6914",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22235,8 +22238,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer, android::BnGraphicBufferProducer> *",
    "name" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer, android::BnGraphicBufferProducer> *",
-   "referenced_type" : "type-7648",
-   "self_type" : "type-7647",
+   "referenced_type" : "type-7672",
+   "self_type" : "type-7671",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22244,8 +22247,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V2_0::IProducerListener, android::BnProducerListener> *",
    "name" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V2_0::IProducerListener, android::BnProducerListener> *",
-   "referenced_type" : "type-5109",
-   "self_type" : "type-5108",
+   "referenced_type" : "type-5125",
+   "self_type" : "type-5124",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22253,8 +22256,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::HpGraphicBufferProducer *",
    "name" : "android::HpGraphicBufferProducer *",
-   "referenced_type" : "type-4249",
-   "self_type" : "type-4248",
+   "referenced_type" : "type-4255",
+   "self_type" : "type-4254",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22262,8 +22265,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::HpGraphicBufferProducer *",
    "name" : "android::HpGraphicBufferProducer *",
-   "referenced_type" : "type-6859",
-   "self_type" : "type-6858",
+   "referenced_type" : "type-6882",
+   "self_type" : "type-6881",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22271,8 +22274,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::HpProducerListener *",
    "name" : "android::HpProducerListener *",
-   "referenced_type" : "type-4524",
-   "self_type" : "type-4523",
+   "referenced_type" : "type-4530",
+   "self_type" : "type-4529",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22280,8 +22283,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::HpProducerListener *",
    "name" : "android::HpProducerListener *",
-   "referenced_type" : "type-7131",
-   "self_type" : "type-7130",
+   "referenced_type" : "type-7156",
+   "self_type" : "type-7155",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22316,8 +22319,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-1155",
-   "self_type" : "type-1154",
+   "referenced_type" : "type-1158",
+   "self_type" : "type-1157",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22325,8 +22328,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-1575",
-   "self_type" : "type-1574",
+   "referenced_type" : "type-1580",
+   "self_type" : "type-1579",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22334,8 +22337,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-1614",
-   "self_type" : "type-1613",
+   "referenced_type" : "type-1618",
+   "self_type" : "type-1617",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22343,8 +22346,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-3500",
-   "self_type" : "type-3499",
+   "referenced_type" : "type-3503",
+   "self_type" : "type-3502",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22352,8 +22355,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-3607",
-   "self_type" : "type-3606",
+   "referenced_type" : "type-3610",
+   "self_type" : "type-3609",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22361,8 +22364,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-3666",
-   "self_type" : "type-3665",
+   "referenced_type" : "type-3669",
+   "self_type" : "type-3668",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22370,8 +22373,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-3759",
-   "self_type" : "type-3758",
+   "referenced_type" : "type-3765",
+   "self_type" : "type-3764",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22379,8 +22382,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-4057",
-   "self_type" : "type-4056",
+   "referenced_type" : "type-4063",
+   "self_type" : "type-4062",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22388,8 +22391,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-4087",
-   "self_type" : "type-4086",
+   "referenced_type" : "type-4093",
+   "self_type" : "type-4092",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22397,8 +22400,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-4948",
-   "self_type" : "type-4947",
+   "referenced_type" : "type-4954",
+   "self_type" : "type-4953",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22406,8 +22409,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-5151",
-   "self_type" : "type-5150",
+   "referenced_type" : "type-5168",
+   "self_type" : "type-5167",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22415,8 +22418,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-5575",
-   "self_type" : "type-5574",
+   "referenced_type" : "type-5592",
+   "self_type" : "type-5591",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22424,8 +22427,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-5682",
-   "self_type" : "type-5681",
+   "referenced_type" : "type-5699",
+   "self_type" : "type-5698",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22433,8 +22436,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-5741",
-   "self_type" : "type-5740",
+   "referenced_type" : "type-5758",
+   "self_type" : "type-5757",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22442,8 +22445,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-5834",
-   "self_type" : "type-5833",
+   "referenced_type" : "type-5854",
+   "self_type" : "type-5853",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22451,8 +22454,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-6020",
-   "self_type" : "type-6019",
+   "referenced_type" : "type-6040",
+   "self_type" : "type-6039",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22460,8 +22463,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-6169",
-   "self_type" : "type-6168",
+   "referenced_type" : "type-6189",
+   "self_type" : "type-6188",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22469,8 +22472,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-6264",
-   "self_type" : "type-6263",
+   "referenced_type" : "type-6284",
+   "self_type" : "type-6283",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22478,8 +22481,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-6314",
-   "self_type" : "type-6313",
+   "referenced_type" : "type-6334",
+   "self_type" : "type-6333",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22487,8 +22490,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-6389",
-   "self_type" : "type-6388",
+   "referenced_type" : "type-6412",
+   "self_type" : "type-6411",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22496,8 +22499,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-6645",
-   "self_type" : "type-6644",
+   "referenced_type" : "type-6668",
+   "self_type" : "type-6667",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22505,8 +22508,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-6672",
-   "self_type" : "type-6671",
+   "referenced_type" : "type-6697",
+   "self_type" : "type-6696",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22514,8 +22517,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-7221",
-   "self_type" : "type-7220",
+   "referenced_type" : "type-7237",
+   "self_type" : "type-7236",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22550,8 +22553,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-1172",
-   "self_type" : "type-1171",
+   "referenced_type" : "type-1175",
+   "self_type" : "type-1174",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22559,8 +22562,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-1466",
-   "self_type" : "type-1465",
+   "referenced_type" : "type-1470",
+   "self_type" : "type-1469",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22568,8 +22571,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-1600",
-   "self_type" : "type-1599",
+   "referenced_type" : "type-1604",
+   "self_type" : "type-1603",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22577,8 +22580,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-3490",
-   "self_type" : "type-3489",
+   "referenced_type" : "type-3493",
+   "self_type" : "type-3492",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22586,8 +22589,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-3777",
-   "self_type" : "type-3776",
+   "referenced_type" : "type-3783",
+   "self_type" : "type-3782",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22595,8 +22598,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-3971",
-   "self_type" : "type-3970",
+   "referenced_type" : "type-3977",
+   "self_type" : "type-3976",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22604,8 +22607,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-3997",
-   "self_type" : "type-3996",
+   "referenced_type" : "type-4003",
+   "self_type" : "type-4002",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22613,8 +22616,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-4075",
-   "self_type" : "type-4074",
+   "referenced_type" : "type-4081",
+   "self_type" : "type-4080",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22622,8 +22625,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-5565",
-   "self_type" : "type-5564",
+   "referenced_type" : "type-5582",
+   "self_type" : "type-5581",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22640,8 +22643,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-5852",
-   "self_type" : "type-5851",
+   "referenced_type" : "type-5872",
+   "self_type" : "type-5871",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22649,8 +22652,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6008",
-   "self_type" : "type-6007",
+   "referenced_type" : "type-6028",
+   "self_type" : "type-6027",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22658,8 +22661,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6044",
-   "self_type" : "type-6043",
+   "referenced_type" : "type-6064",
+   "self_type" : "type-6063",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22667,8 +22670,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6162",
-   "self_type" : "type-6161",
+   "referenced_type" : "type-6182",
+   "self_type" : "type-6181",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22676,8 +22679,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6403",
-   "self_type" : "type-6402",
+   "referenced_type" : "type-6426",
+   "self_type" : "type-6425",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22685,8 +22688,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6585",
-   "self_type" : "type-6584",
+   "referenced_type" : "type-6608",
+   "self_type" : "type-6607",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22694,8 +22697,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6660",
-   "self_type" : "type-6659",
+   "referenced_type" : "type-6683",
+   "self_type" : "type-6682",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22712,8 +22715,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-3502",
-   "self_type" : "type-3501",
+   "referenced_type" : "type-3505",
+   "self_type" : "type-3504",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22721,8 +22724,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-3963",
-   "self_type" : "type-3962",
+   "referenced_type" : "type-3964",
+   "self_type" : "type-3963",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22730,8 +22733,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-4228",
-   "self_type" : "type-4227",
+   "referenced_type" : "type-4234",
+   "self_type" : "type-4233",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22739,8 +22742,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-5577",
-   "self_type" : "type-5576",
+   "referenced_type" : "type-5594",
+   "self_type" : "type-5593",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22757,8 +22760,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-6003",
-   "self_type" : "type-6002",
+   "referenced_type" : "type-6024",
+   "self_type" : "type-6023",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22766,8 +22769,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-6039",
-   "self_type" : "type-6038",
+   "referenced_type" : "type-6059",
+   "self_type" : "type-6058",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22775,8 +22778,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-6171",
-   "self_type" : "type-6170",
+   "referenced_type" : "type-6191",
+   "self_type" : "type-6190",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22784,8 +22787,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-6844",
-   "self_type" : "type-6843",
+   "referenced_type" : "type-6867",
+   "self_type" : "type-6866",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22793,8 +22796,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-7520",
-   "self_type" : "type-7519",
+   "referenced_type" : "type-7544",
+   "self_type" : "type-7543",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22820,8 +22823,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1265",
-   "self_type" : "type-1264",
+   "referenced_type" : "type-1268",
+   "self_type" : "type-1267",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -22829,8 +22832,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1370",
-   "self_type" : "type-1369",
+   "referenced_type" : "type-1373",
+   "self_type" : "type-1372",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -22838,8 +22841,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-3819",
-   "self_type" : "type-3818",
+   "referenced_type" : "type-3826",
+   "self_type" : "type-3825",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -22847,8 +22850,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-3916",
-   "self_type" : "type-3915",
+   "referenced_type" : "type-3922",
+   "self_type" : "type-3921",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -22856,8 +22859,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-5894",
-   "self_type" : "type-5893",
+   "referenced_type" : "type-5915",
+   "self_type" : "type-5914",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -22865,8 +22868,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-6422",
-   "self_type" : "type-6421",
+   "referenced_type" : "type-6445",
+   "self_type" : "type-6444",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -22874,8 +22877,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-6508",
-   "self_type" : "type-6507",
+   "referenced_type" : "type-6531",
+   "self_type" : "type-6530",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -22892,8 +22895,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-1160",
-   "self_type" : "type-1159",
+   "referenced_type" : "type-1163",
+   "self_type" : "type-1162",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22901,8 +22904,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-3510",
-   "self_type" : "type-3509",
+   "referenced_type" : "type-3513",
+   "self_type" : "type-3512",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22910,8 +22913,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-3620",
-   "self_type" : "type-3619",
+   "referenced_type" : "type-3623",
+   "self_type" : "type-3622",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22919,8 +22922,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-3668",
-   "self_type" : "type-3667",
+   "referenced_type" : "type-3671",
+   "self_type" : "type-3670",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22928,8 +22931,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-3764",
-   "self_type" : "type-3763",
+   "referenced_type" : "type-3772",
+   "self_type" : "type-3771",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22937,8 +22940,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-4254",
-   "self_type" : "type-4253",
+   "referenced_type" : "type-4260",
+   "self_type" : "type-4259",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22946,8 +22949,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-4518",
-   "self_type" : "type-4517",
+   "referenced_type" : "type-4524",
+   "self_type" : "type-4523",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22955,8 +22958,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-4561",
-   "self_type" : "type-4560",
+   "referenced_type" : "type-4567",
+   "self_type" : "type-4566",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22964,8 +22967,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-4691",
-   "self_type" : "type-4690",
+   "referenced_type" : "type-4698",
+   "self_type" : "type-4697",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22973,8 +22976,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-4953",
-   "self_type" : "type-4952",
+   "referenced_type" : "type-4959",
+   "self_type" : "type-4958",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22982,8 +22985,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-5153",
-   "self_type" : "type-5152",
+   "referenced_type" : "type-5171",
+   "self_type" : "type-5170",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22991,8 +22994,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-5585",
-   "self_type" : "type-5584",
+   "referenced_type" : "type-5602",
+   "self_type" : "type-5601",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23000,8 +23003,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-5695",
-   "self_type" : "type-5694",
+   "referenced_type" : "type-5712",
+   "self_type" : "type-5711",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23009,8 +23012,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-5743",
-   "self_type" : "type-5742",
+   "referenced_type" : "type-5760",
+   "self_type" : "type-5759",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23018,8 +23021,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-5839",
-   "self_type" : "type-5838",
+   "referenced_type" : "type-5861",
+   "self_type" : "type-5860",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23027,8 +23030,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6024",
-   "self_type" : "type-6023",
+   "referenced_type" : "type-6044",
+   "self_type" : "type-6043",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23036,8 +23039,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6178",
-   "self_type" : "type-6177",
+   "referenced_type" : "type-6198",
+   "self_type" : "type-6197",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23045,8 +23048,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6272",
-   "self_type" : "type-6271",
+   "referenced_type" : "type-6292",
+   "self_type" : "type-6291",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23054,8 +23057,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6316",
-   "self_type" : "type-6315",
+   "referenced_type" : "type-6336",
+   "self_type" : "type-6335",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23063,8 +23066,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6394",
-   "self_type" : "type-6393",
+   "referenced_type" : "type-6417",
+   "self_type" : "type-6416",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23072,8 +23075,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6864",
-   "self_type" : "type-6863",
+   "referenced_type" : "type-6887",
+   "self_type" : "type-6886",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23081,8 +23084,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7124",
-   "self_type" : "type-7123",
+   "referenced_type" : "type-7149",
+   "self_type" : "type-7148",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23090,8 +23093,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7184",
-   "self_type" : "type-7183",
+   "referenced_type" : "type-7207",
+   "self_type" : "type-7206",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23099,8 +23102,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7244",
-   "self_type" : "type-7243",
+   "referenced_type" : "type-7262",
+   "self_type" : "type-7261",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23108,8 +23111,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7328",
-   "self_type" : "type-7327",
+   "referenced_type" : "type-7351",
+   "self_type" : "type-7350",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23117,8 +23120,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7502",
-   "self_type" : "type-7501",
+   "referenced_type" : "type-7525",
+   "self_type" : "type-7524",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23126,8 +23129,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7509",
-   "self_type" : "type-7508",
+   "referenced_type" : "type-7534",
+   "self_type" : "type-7533",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23135,8 +23138,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7637",
-   "self_type" : "type-7636",
+   "referenced_type" : "type-7661",
+   "self_type" : "type-7660",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23144,8 +23147,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7659",
-   "self_type" : "type-7658",
+   "referenced_type" : "type-7682",
+   "self_type" : "type-7681",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23180,8 +23183,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ISurfaceComposer *",
    "name" : "android::ISurfaceComposer *",
-   "referenced_type" : "type-1051",
-   "self_type" : "type-1050",
+   "referenced_type" : "type-1054",
+   "self_type" : "type-1053",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23189,8 +23192,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ISurfaceComposer *",
    "name" : "android::ISurfaceComposer *",
-   "referenced_type" : "type-3679",
-   "self_type" : "type-3678",
+   "referenced_type" : "type-3685",
+   "self_type" : "type-3684",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23198,8 +23201,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ISurfaceComposer *",
    "name" : "android::ISurfaceComposer *",
-   "referenced_type" : "type-5754",
-   "self_type" : "type-5753",
+   "referenced_type" : "type-5774",
+   "self_type" : "type-5773",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23207,8 +23210,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ISurfaceComposer *",
    "name" : "android::ISurfaceComposer *",
-   "referenced_type" : "type-6320",
-   "self_type" : "type-6319",
+   "referenced_type" : "type-6343",
+   "self_type" : "type-6342",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23216,8 +23219,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ITransactionCompletedListener *",
    "name" : "android::ITransactionCompletedListener *",
-   "referenced_type" : "type-1043",
-   "self_type" : "type-1042",
+   "referenced_type" : "type-1047",
+   "self_type" : "type-1046",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23225,8 +23228,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ITransactionCompletedListener *",
    "name" : "android::ITransactionCompletedListener *",
-   "referenced_type" : "type-3674",
-   "self_type" : "type-3673",
+   "referenced_type" : "type-3680",
+   "self_type" : "type-3679",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23234,8 +23237,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ITransactionCompletedListener *",
    "name" : "android::ITransactionCompletedListener *",
-   "referenced_type" : "type-5749",
-   "self_type" : "type-5748",
+   "referenced_type" : "type-5769",
+   "self_type" : "type-5768",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23243,8 +23246,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ITransactionCompletedListener *",
    "name" : "android::ITransactionCompletedListener *",
-   "referenced_type" : "type-6318",
-   "self_type" : "type-6317",
+   "referenced_type" : "type-6341",
+   "self_type" : "type-6340",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23279,8 +23282,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::LWProducerListener *",
    "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-2541",
-   "self_type" : "type-2540",
+   "referenced_type" : "type-2544",
+   "self_type" : "type-2543",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23288,8 +23291,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::LWProducerListener *",
    "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-4956",
-   "self_type" : "type-4955",
+   "referenced_type" : "type-4962",
+   "self_type" : "type-4961",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23297,8 +23300,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::LWProducerListener *",
    "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-6026",
-   "self_type" : "type-6025",
+   "referenced_type" : "type-6046",
+   "self_type" : "type-6045",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23306,8 +23309,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::LWProducerListener *",
    "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-7270",
-   "self_type" : "type-7269",
+   "referenced_type" : "type-7282",
+   "self_type" : "type-7281",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23316,7 +23319,7 @@
    "linker_set_key" : "android::LightFlattenablePod<android::Rect> *",
    "name" : "android::LightFlattenablePod<android::Rect> *",
    "referenced_type" : "type-48",
-   "self_type" : "type-4592",
+   "self_type" : "type-4599",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -23360,8 +23363,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::List<Event>::_Node *",
    "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-3689",
-   "self_type" : "type-3688",
+   "referenced_type" : "type-3695",
+   "self_type" : "type-3694",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -23369,8 +23372,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::List<Event>::_Node *",
    "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-5764",
-   "self_type" : "type-5763",
+   "referenced_type" : "type-5784",
+   "self_type" : "type-5783",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -23378,8 +23381,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::List<Event>::_Node *",
    "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-6055",
-   "self_type" : "type-6054",
+   "referenced_type" : "type-6076",
+   "self_type" : "type-6075",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -23495,8 +23498,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::OMXPluginBase *",
    "name" : "android::OMXPluginBase *",
-   "referenced_type" : "type-2395",
-   "self_type" : "type-2396",
+   "referenced_type" : "type-2398",
+   "self_type" : "type-2399",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h"
   },
@@ -23513,8 +23516,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Parcel::FlattenableHelper<android::BufferItem> *",
    "name" : "android::Parcel::FlattenableHelper<android::BufferItem> *",
-   "referenced_type" : "type-1517",
-   "self_type" : "type-1519",
+   "referenced_type" : "type-1520",
+   "self_type" : "type-1523",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -23522,8 +23525,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Parcel::FlattenableHelper<android::Fence> *",
    "name" : "android::Parcel::FlattenableHelper<android::Fence> *",
-   "referenced_type" : "type-1659",
-   "self_type" : "type-1661",
+   "referenced_type" : "type-1663",
+   "self_type" : "type-1665",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -23531,8 +23534,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta> *",
    "name" : "android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta> *",
-   "referenced_type" : "type-4331",
-   "self_type" : "type-4333",
+   "referenced_type" : "type-4337",
+   "self_type" : "type-4339",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -23540,8 +23543,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Parcel::FlattenableHelper<android::GraphicBuffer> *",
    "name" : "android::Parcel::FlattenableHelper<android::GraphicBuffer> *",
-   "referenced_type" : "type-1654",
-   "self_type" : "type-1656",
+   "referenced_type" : "type-1658",
+   "self_type" : "type-1660",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -23549,8 +23552,8 @@
    "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",
+   "referenced_type" : "type-4343",
+   "self_type" : "type-4345",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -23558,8 +23561,8 @@
    "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",
+   "referenced_type" : "type-4348",
+   "self_type" : "type-4350",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -23603,8 +23606,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ProcessState *",
    "name" : "android::ProcessState *",
-   "referenced_type" : "type-1261",
-   "self_type" : "type-1260",
+   "referenced_type" : "type-1264",
+   "self_type" : "type-1263",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23648,8 +23651,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1080",
-   "self_type" : "type-1079",
+   "referenced_type" : "type-1083",
+   "self_type" : "type-1082",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23657,8 +23660,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1191",
-   "self_type" : "type-1190",
+   "referenced_type" : "type-1194",
+   "self_type" : "type-1193",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23666,8 +23669,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1353",
-   "self_type" : "type-1352",
+   "referenced_type" : "type-1356",
+   "self_type" : "type-1355",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23675,8 +23678,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1405",
-   "self_type" : "type-1404",
+   "referenced_type" : "type-1408",
+   "self_type" : "type-1407",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23684,8 +23687,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1420",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1423",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23693,8 +23696,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1442",
-   "self_type" : "type-1441",
+   "referenced_type" : "type-1445",
+   "self_type" : "type-1444",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23702,8 +23705,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1483",
-   "self_type" : "type-1482",
+   "referenced_type" : "type-1486",
+   "self_type" : "type-1485",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23711,8 +23714,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1617",
-   "self_type" : "type-1616",
+   "referenced_type" : "type-1621",
+   "self_type" : "type-1620",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23720,8 +23723,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2651",
-   "self_type" : "type-2650",
+   "referenced_type" : "type-2654",
+   "self_type" : "type-2653",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23729,8 +23732,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3459",
-   "self_type" : "type-3458",
+   "referenced_type" : "type-3462",
+   "self_type" : "type-3461",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23738,8 +23741,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3527",
-   "self_type" : "type-3526",
+   "referenced_type" : "type-3530",
+   "self_type" : "type-3529",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23747,8 +23750,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3629",
-   "self_type" : "type-3628",
+   "referenced_type" : "type-3632",
+   "self_type" : "type-3631",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23756,8 +23759,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3691",
-   "self_type" : "type-3690",
+   "referenced_type" : "type-3697",
+   "self_type" : "type-3696",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23765,8 +23768,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3783",
-   "self_type" : "type-3782",
+   "referenced_type" : "type-3789",
+   "self_type" : "type-3788",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23774,8 +23777,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3844",
-   "self_type" : "type-3843",
+   "referenced_type" : "type-3848",
+   "self_type" : "type-3847",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23783,8 +23786,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3908",
-   "self_type" : "type-3907",
+   "referenced_type" : "type-3914",
+   "self_type" : "type-3913",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23792,8 +23795,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3934",
-   "self_type" : "type-3933",
+   "referenced_type" : "type-3940",
+   "self_type" : "type-3939",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23801,8 +23804,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3949",
-   "self_type" : "type-3948",
+   "referenced_type" : "type-3955",
+   "self_type" : "type-3954",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23810,8 +23813,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3975",
-   "self_type" : "type-3974",
+   "referenced_type" : "type-3981",
+   "self_type" : "type-3980",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23819,8 +23822,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4008",
-   "self_type" : "type-4007",
+   "referenced_type" : "type-4014",
+   "self_type" : "type-4013",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23828,8 +23831,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4089",
-   "self_type" : "type-4088",
+   "referenced_type" : "type-4095",
+   "self_type" : "type-4094",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23837,8 +23840,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4290",
-   "self_type" : "type-4289",
+   "referenced_type" : "type-4296",
+   "self_type" : "type-4295",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23846,8 +23849,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4477",
-   "self_type" : "type-4476",
+   "referenced_type" : "type-4483",
+   "self_type" : "type-4482",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23855,8 +23858,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4530",
-   "self_type" : "type-4529",
+   "referenced_type" : "type-4536",
+   "self_type" : "type-4535",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23864,8 +23867,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4538",
-   "self_type" : "type-4537",
+   "referenced_type" : "type-4545",
+   "self_type" : "type-4544",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23873,8 +23876,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4564",
-   "self_type" : "type-4563",
+   "referenced_type" : "type-4570",
+   "self_type" : "type-4569",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23882,8 +23885,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4715",
-   "self_type" : "type-4714",
+   "referenced_type" : "type-4722",
+   "self_type" : "type-4721",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23891,8 +23894,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4845",
-   "self_type" : "type-4844",
+   "referenced_type" : "type-4854",
+   "self_type" : "type-4853",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23900,8 +23903,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4994",
-   "self_type" : "type-4993",
+   "referenced_type" : "type-5000",
+   "self_type" : "type-4999",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23909,8 +23912,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5121",
-   "self_type" : "type-5120",
+   "referenced_type" : "type-5137",
+   "self_type" : "type-5136",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23918,8 +23921,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5160",
-   "self_type" : "type-5159",
+   "referenced_type" : "type-5176",
+   "self_type" : "type-5175",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23927,8 +23930,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5534",
-   "self_type" : "type-5533",
+   "referenced_type" : "type-5551",
+   "self_type" : "type-5550",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23936,8 +23939,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5602",
-   "self_type" : "type-5601",
+   "referenced_type" : "type-5619",
+   "self_type" : "type-5618",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23954,8 +23957,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5704",
-   "self_type" : "type-5703",
+   "referenced_type" : "type-5721",
+   "self_type" : "type-5720",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23963,8 +23966,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5766",
-   "self_type" : "type-5765",
+   "referenced_type" : "type-5786",
+   "self_type" : "type-5785",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23972,8 +23975,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5858",
-   "self_type" : "type-5857",
+   "referenced_type" : "type-5878",
+   "self_type" : "type-5877",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23981,8 +23984,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5919",
-   "self_type" : "type-5918",
+   "referenced_type" : "type-5937",
+   "self_type" : "type-5936",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23990,8 +23993,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5981",
-   "self_type" : "type-5980",
+   "referenced_type" : "type-6001",
+   "self_type" : "type-6000",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23999,8 +24002,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6041",
-   "self_type" : "type-6040",
+   "referenced_type" : "type-6061",
+   "self_type" : "type-6060",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24008,8 +24011,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6137",
-   "self_type" : "type-6136",
+   "referenced_type" : "type-6157",
+   "self_type" : "type-6156",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24017,8 +24020,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6189",
-   "self_type" : "type-6188",
+   "referenced_type" : "type-6209",
+   "self_type" : "type-6208",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24026,8 +24029,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6278",
-   "self_type" : "type-6277",
+   "referenced_type" : "type-6298",
+   "self_type" : "type-6297",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24035,8 +24038,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6327",
-   "self_type" : "type-6326",
+   "referenced_type" : "type-6350",
+   "self_type" : "type-6349",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24044,8 +24047,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6407",
-   "self_type" : "type-6406",
+   "referenced_type" : "type-6430",
+   "self_type" : "type-6429",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24053,8 +24056,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6500",
-   "self_type" : "type-6499",
+   "referenced_type" : "type-6523",
+   "self_type" : "type-6522",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24062,8 +24065,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6526",
-   "self_type" : "type-6525",
+   "referenced_type" : "type-6549",
+   "self_type" : "type-6548",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24071,8 +24074,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6542",
-   "self_type" : "type-6541",
+   "referenced_type" : "type-6566",
+   "self_type" : "type-6565",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24080,8 +24083,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6564",
-   "self_type" : "type-6563",
+   "referenced_type" : "type-6587",
+   "self_type" : "type-6586",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24089,8 +24092,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6596",
-   "self_type" : "type-6595",
+   "referenced_type" : "type-6619",
+   "self_type" : "type-6618",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24098,8 +24101,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6674",
-   "self_type" : "type-6673",
+   "referenced_type" : "type-6699",
+   "self_type" : "type-6698",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24107,8 +24110,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6894",
-   "self_type" : "type-6893",
+   "referenced_type" : "type-6917",
+   "self_type" : "type-6916",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24116,8 +24119,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7078",
-   "self_type" : "type-7077",
+   "referenced_type" : "type-7102",
+   "self_type" : "type-7101",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24125,8 +24128,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7140",
-   "self_type" : "type-7139",
+   "referenced_type" : "type-7165",
+   "self_type" : "type-7164",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24134,8 +24137,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7155",
-   "self_type" : "type-7154",
+   "referenced_type" : "type-7180",
+   "self_type" : "type-7179",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24143,8 +24146,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7192",
-   "self_type" : "type-7191",
+   "referenced_type" : "type-7216",
+   "self_type" : "type-7215",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24152,8 +24155,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7341",
-   "self_type" : "type-7340",
+   "referenced_type" : "type-7365",
+   "self_type" : "type-7364",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24170,8 +24173,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7443",
-   "self_type" : "type-7442",
+   "referenced_type" : "type-7466",
+   "self_type" : "type-7465",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24179,8 +24182,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7479",
-   "self_type" : "type-7478",
+   "referenced_type" : "type-7503",
+   "self_type" : "type-7502",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24188,8 +24191,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7534",
-   "self_type" : "type-7533",
+   "referenced_type" : "type-7557",
+   "self_type" : "type-7556",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24197,8 +24200,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7585",
-   "self_type" : "type-7584",
+   "referenced_type" : "type-7605",
+   "self_type" : "type-7604",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24206,8 +24209,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7614",
-   "self_type" : "type-7613",
+   "referenced_type" : "type-7637",
+   "self_type" : "type-7636",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24215,8 +24218,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7677",
-   "self_type" : "type-7676",
+   "referenced_type" : "type-7702",
+   "self_type" : "type-7701",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24251,8 +24254,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ReferenceRenamer *",
    "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-1166",
-   "self_type" : "type-1212",
+   "referenced_type" : "type-1167",
+   "self_type" : "type-1210",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24260,8 +24263,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> > *",
    "name" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> > *",
-   "referenced_type" : "type-1563",
-   "self_type" : "type-1565",
+   "referenced_type" : "type-1567",
+   "self_type" : "type-1568",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24269,8 +24272,8 @@
    "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",
+   "referenced_type" : "type-1573",
+   "self_type" : "type-1574",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24278,132 +24281,6 @@
    "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,
@@ -24411,10 +24288,136 @@
   },
   {
    "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-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<android_dataspace_t> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<android_dataspace_t> > *",
+   "referenced_type" : "type-2092",
+   "self_type" : "type-2095",
+   "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-2113",
+   "self_type" : "type-2114",
+   "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-2100",
+   "self_type" : "type-2101",
+   "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-2118",
+   "self_type" : "type-2119",
+   "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-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<const sp<IConsumerListener> &, bool> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const sp<IConsumerListener> &, bool> > *",
+   "referenced_type" : "type-2070",
+   "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<int *, const sp<GraphicBuffer> &> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int *, const sp<GraphicBuffer> &> > *",
+   "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, unsigned long, const sp<Fence> &> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int, unsigned long, const sp<Fence> &> > *",
+   "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> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int> > *",
+   "referenced_type" : "type-2057",
+   "self_type" : "type-2058",
+   "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-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<unsigned int, unsigned int> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned int, unsigned int> > *",
+   "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<unsigned int> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned int> > *",
+   "referenced_type" : "type-2104",
+   "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 long *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long *> > *",
+   "referenced_type" : "type-2079",
+   "self_type" : "type-2080",
+   "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",
+   "referenced_type" : "type-2098",
+   "self_type" : "type-2099",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24422,114 +24425,6 @@
    "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,
@@ -24537,10 +24432,118 @@
   },
   {
    "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-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<android_dataspace_t> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<android_dataspace_t> > *",
+   "referenced_type" : "type-2159",
+   "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<bool, vector<Segment, allocator<Segment> > *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool, vector<Segment, allocator<Segment> > *> > *",
+   "referenced_type" : "type-2171",
+   "self_type" : "type-2172",
+   "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-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<const String8 &, String8 *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &, String8 *> > *",
+   "referenced_type" : "type-2173",
+   "self_type" : "type-2174",
+   "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-2157",
+   "self_type" : "type-2158",
+   "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-2148",
+   "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<int *, const sp<GraphicBuffer> &> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int *, const sp<GraphicBuffer> &> > *",
+   "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, unsigned long, const sp<Fence> &> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int, unsigned long, const sp<Fence> &> > *",
+   "referenced_type" : "type-2146",
+   "self_type" : "type-2147",
+   "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-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<sp<NativeHandle> *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<sp<NativeHandle> *> > *",
+   "referenced_type" : "type-2168",
+   "self_type" : "type-2169",
+   "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-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<unsigned int> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned int> > *",
-   "referenced_type" : "type-2162",
-   "self_type" : "type-2163",
+   "referenced_type" : "type-2166",
+   "self_type" : "type-2167",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24548,8 +24551,8 @@
    "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",
+   "referenced_type" : "type-2153",
+   "self_type" : "type-2154",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24557,8 +24560,8 @@
    "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",
+   "referenced_type" : "type-2162",
+   "self_type" : "type-2163",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24566,8 +24569,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<android::IConsumerListener> *",
    "name" : "android::SafeBnInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-1288",
-   "self_type" : "type-1293",
+   "referenced_type" : "type-1291",
+   "self_type" : "type-1296",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24575,8 +24578,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
    "name" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-1280",
-   "self_type" : "type-1287",
+   "referenced_type" : "type-1283",
+   "self_type" : "type-1290",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24584,8 +24587,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<android::ITransactionCompletedListener> *",
    "name" : "android::SafeBnInterface<android::ITransactionCompletedListener> *",
-   "referenced_type" : "type-1103",
-   "self_type" : "type-1106",
+   "referenced_type" : "type-1106",
+   "self_type" : "type-1109",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24593,8 +24596,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBpInterface<android::IConsumerListener> *",
    "name" : "android::SafeBpInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-1538",
-   "self_type" : "type-1540",
+   "referenced_type" : "type-1542",
+   "self_type" : "type-1544",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24602,8 +24605,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBpInterface<android::IGraphicBufferConsumer> *",
    "name" : "android::SafeBpInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-1718",
-   "self_type" : "type-1720",
+   "referenced_type" : "type-1722",
+   "self_type" : "type-1724",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24611,8 +24614,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeInterface::ParcelHandler *",
    "name" : "android::SafeInterface::ParcelHandler *",
-   "referenced_type" : "type-1236",
-   "self_type" : "type-1254",
+   "referenced_type" : "type-1239",
+   "self_type" : "type-1252",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24630,7 +24633,7 @@
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > > *",
    "name" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > > *",
    "referenced_type" : "type-163",
-   "self_type" : "type-2676",
+   "self_type" : "type-2679",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -24639,7 +24642,7 @@
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > > *",
    "name" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > > *",
    "referenced_type" : "type-149",
-   "self_type" : "type-2671",
+   "self_type" : "type-2674",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -24648,7 +24651,7 @@
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
    "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
    "referenced_type" : "type-141",
-   "self_type" : "type-2668",
+   "self_type" : "type-2671",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -24656,8 +24659,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::String16 *",
    "name" : "android::String16 *",
-   "referenced_type" : "type-1240",
-   "self_type" : "type-2663",
+   "referenced_type" : "type-1243",
+   "self_type" : "type-2666",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -24666,7 +24669,7 @@
    "linker_set_key" : "android::String8 *",
    "name" : "android::String8 *",
    "referenced_type" : "type-123",
-   "self_type" : "type-1887",
+   "self_type" : "type-1891",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -24674,8 +24677,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
    "name" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
-   "referenced_type" : "type-2469",
-   "self_type" : "type-2468",
+   "referenced_type" : "type-2472",
+   "self_type" : "type-2471",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24683,8 +24686,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
    "name" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
-   "referenced_type" : "type-4892",
-   "self_type" : "type-4891",
+   "referenced_type" : "type-4898",
+   "self_type" : "type-4897",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24692,8 +24695,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
    "name" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
-   "referenced_type" : "type-5999",
-   "self_type" : "type-5998",
+   "referenced_type" : "type-6019",
+   "self_type" : "type-6018",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24701,8 +24704,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
    "name" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
-   "referenced_type" : "type-7044",
-   "self_type" : "type-7043",
+   "referenced_type" : "type-7056",
+   "self_type" : "type-7055",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24720,7 +24723,7 @@
    "linker_set_key" : "android::Vector<android::BufferItem> *",
    "name" : "android::Vector<android::BufferItem> *",
    "referenced_type" : "type-838",
-   "self_type" : "type-977",
+   "self_type" : "type-979",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -24728,8 +24731,8 @@
    "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",
+   "referenced_type" : "type-1229",
+   "self_type" : "type-1230",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -24737,8 +24740,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Vector<int> *",
    "name" : "android::Vector<int> *",
-   "referenced_type" : "type-2688",
-   "self_type" : "type-2689",
+   "referenced_type" : "type-2691",
+   "self_type" : "type-2692",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -24746,8 +24749,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Vector<long> *",
    "name" : "android::Vector<long> *",
-   "referenced_type" : "type-1082",
-   "self_type" : "type-1083",
+   "referenced_type" : "type-1085",
+   "self_type" : "type-1086",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -24755,8 +24758,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::VirtualLightRefBase *",
    "name" : "android::VirtualLightRefBase *",
-   "referenced_type" : "type-2355",
-   "self_type" : "type-2394",
+   "referenced_type" : "type-2358",
+   "self_type" : "type-2397",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -24764,8 +24767,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::base::EagerEvaluator<char *, char *> *",
    "name" : "android::base::EagerEvaluator<char *, char *> *",
-   "referenced_type" : "type-4702",
-   "self_type" : "type-4705",
+   "referenced_type" : "type-4709",
+   "self_type" : "type-4712",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24773,8 +24776,8 @@
    "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",
+   "referenced_type" : "type-4705",
+   "self_type" : "type-4706",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24782,8 +24785,8 @@
    "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",
+   "referenced_type" : "type-4692",
+   "self_type" : "type-4696",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24791,8 +24794,8 @@
    "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",
+   "referenced_type" : "type-4676",
+   "self_type" : "type-4690",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24800,8 +24803,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::base::EagerEvaluator<const signed char *, const signed char *> *",
    "name" : "android::base::EagerEvaluator<const signed char *, const signed char *> *",
-   "referenced_type" : "type-4726",
-   "self_type" : "type-4731",
+   "referenced_type" : "type-4732",
+   "self_type" : "type-4738",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24809,8 +24812,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::base::EagerEvaluator<const signed char *, signed char *> *",
    "name" : "android::base::EagerEvaluator<const signed char *, signed char *> *",
-   "referenced_type" : "type-4733",
-   "self_type" : "type-4735",
+   "referenced_type" : "type-4739",
+   "self_type" : "type-4742",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24818,8 +24821,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::base::EagerEvaluator<const unsigned char *, const unsigned char *> *",
    "name" : "android::base::EagerEvaluator<const unsigned char *, const unsigned char *> *",
-   "referenced_type" : "type-4706",
-   "self_type" : "type-4709",
+   "referenced_type" : "type-4713",
+   "self_type" : "type-4715",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24827,8 +24830,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *> *",
    "name" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *> *",
-   "referenced_type" : "type-4710",
-   "self_type" : "type-4711",
+   "referenced_type" : "type-4716",
+   "self_type" : "type-4718",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24836,15 +24839,6 @@
    "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,
@@ -24852,10 +24846,19 @@
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::base::EagerEvaluator<signed char *, signed char *> *",
+   "name" : "android::base::EagerEvaluator<signed char *, signed char *> *",
+   "referenced_type" : "type-4751",
+   "self_type" : "type-4756",
+   "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",
+   "referenced_type" : "type-4720",
+   "self_type" : "type-4724",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24863,8 +24866,8 @@
    "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",
+   "referenced_type" : "type-4725",
+   "self_type" : "type-4730",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24872,8 +24875,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::base::ErrnoRestorer *",
    "name" : "android::base::ErrnoRestorer *",
-   "referenced_type" : "type-4660",
-   "self_type" : "type-4825",
+   "referenced_type" : "type-4667",
+   "self_type" : "type-4832",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24881,8 +24884,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
    "name" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
-   "referenced_type" : "type-2555",
-   "self_type" : "type-2567",
+   "referenced_type" : "type-2558",
+   "self_type" : "type-2570",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -24899,8 +24902,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1363",
-   "self_type" : "type-1362",
+   "referenced_type" : "type-1366",
+   "self_type" : "type-1365",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24917,8 +24920,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1360",
-   "self_type" : "type-1359",
+   "referenced_type" : "type-1363",
+   "self_type" : "type-1362",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24926,8 +24929,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1378",
-   "self_type" : "type-1382",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1385",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -24935,8 +24938,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1396",
+   "referenced_type" : "type-1400",
+   "self_type" : "type-1399",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24944,8 +24947,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::bufferqueue::V2_0::Status> *",
    "name" : "android::hardware::Return<android::hardware::graphics::bufferqueue::V2_0::Status> *",
-   "referenced_type" : "type-7522",
-   "self_type" : "type-7523",
+   "referenced_type" : "type-7547",
+   "self_type" : "type-7548",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24953,24 +24956,6 @@
    "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,
@@ -24978,8 +24963,8 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> > *",
-   "name" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> > *",
+   "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-4497",
    "self_type" : "type-4498",
    "size" : 8,
@@ -24987,10 +24972,28 @@
   },
   {
    "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-4374",
+   "self_type" : "type-4375",
+   "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-4503",
+   "self_type" : "type-4504",
+   "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-4356",
-   "self_type" : "type-4357",
+   "referenced_type" : "type-4362",
+   "self_type" : "type-4363",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -25007,8 +25010,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<unsigned long> *",
    "name" : "android::hardware::Return<unsigned long> *",
-   "referenced_type" : "type-7526",
-   "self_type" : "type-7527",
+   "referenced_type" : "type-7551",
+   "self_type" : "type-7552",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -25071,7 +25074,7 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> > *",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> > *",
    "referenced_type" : "type-382",
-   "self_type" : "type-7640",
+   "self_type" : "type-7664",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -25080,7 +25083,7 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect> *",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect> *",
    "referenced_type" : "type-373",
-   "self_type" : "type-4598",
+   "self_type" : "type-4605",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -25089,7 +25092,7 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char> *",
    "name" : "android::hardware::details::hidl_pointer<unsigned char> *",
    "referenced_type" : "type-391",
-   "self_type" : "type-4349",
+   "self_type" : "type-4355",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -25107,7 +25110,7 @@
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
    "referenced_type" : "type-595",
-   "self_type" : "type-2466",
+   "self_type" : "type-2469",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25124,8 +25127,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-2458",
-   "self_type" : "type-2457",
+   "referenced_type" : "type-2461",
+   "self_type" : "type-2460",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25133,8 +25136,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::B2HProducerListener *",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::B2HProducerListener *",
-   "referenced_type" : "type-4687",
-   "self_type" : "type-4686",
+   "referenced_type" : "type-4694",
+   "self_type" : "type-4693",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25142,8 +25145,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::B2HProducerListener *",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::B2HProducerListener *",
-   "referenced_type" : "type-7325",
-   "self_type" : "type-7324",
+   "referenced_type" : "type-7348",
+   "self_type" : "type-7347",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25151,8 +25154,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer *",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer *",
-   "referenced_type" : "type-4245",
-   "self_type" : "type-4244",
+   "referenced_type" : "type-4251",
+   "self_type" : "type-4250",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25160,8 +25163,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer *",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer *",
-   "referenced_type" : "type-6856",
-   "self_type" : "type-6855",
+   "referenced_type" : "type-6879",
+   "self_type" : "type-6878",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25169,8 +25172,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener *",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener *",
-   "referenced_type" : "type-4468",
-   "self_type" : "type-4467",
+   "referenced_type" : "type-4474",
+   "self_type" : "type-4473",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25178,8 +25181,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener *",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener *",
-   "referenced_type" : "type-7070",
-   "self_type" : "type-7069",
+   "referenced_type" : "type-7094",
+   "self_type" : "type-7093",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25188,7 +25191,7 @@
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
    "referenced_type" : "type-677",
-   "self_type" : "type-2479",
+   "self_type" : "type-2482",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25197,7 +25200,7 @@
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
    "referenced_type" : "type-604",
-   "self_type" : "type-2473",
+   "self_type" : "type-2476",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25205,8 +25208,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
-   "referenced_type" : "type-2483",
-   "self_type" : "type-2482",
+   "referenced_type" : "type-2486",
+   "self_type" : "type-2485",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25214,8 +25217,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
-   "referenced_type" : "type-4900",
-   "self_type" : "type-4899",
+   "referenced_type" : "type-4906",
+   "self_type" : "type-4905",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25223,8 +25226,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
-   "referenced_type" : "type-6001",
-   "self_type" : "type-6000",
+   "referenced_type" : "type-6021",
+   "self_type" : "type-6020",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25232,8 +25235,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
-   "referenced_type" : "type-7087",
-   "self_type" : "type-7086",
+   "referenced_type" : "type-7110",
+   "self_type" : "type-7109",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25241,8 +25244,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HProducerListener *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HProducerListener *",
-   "referenced_type" : "type-7656",
-   "self_type" : "type-7655",
+   "referenced_type" : "type-7680",
+   "self_type" : "type-7679",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25250,8 +25253,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer *",
-   "referenced_type" : "type-4239",
-   "self_type" : "type-4238",
+   "referenced_type" : "type-4245",
+   "self_type" : "type-4244",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25259,8 +25262,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer *",
-   "referenced_type" : "type-6852",
-   "self_type" : "type-6851",
+   "referenced_type" : "type-6875",
+   "self_type" : "type-6874",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25268,8 +25271,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
-   "referenced_type" : "type-4460",
-   "self_type" : "type-4459",
+   "referenced_type" : "type-4467",
+   "self_type" : "type-4466",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25277,8 +25280,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
-   "referenced_type" : "type-7065",
-   "self_type" : "type-7064",
+   "referenced_type" : "type-7089",
+   "self_type" : "type-7088",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25286,8 +25289,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
-   "referenced_type" : "type-7511",
-   "self_type" : "type-7510",
+   "referenced_type" : "type-7536",
+   "self_type" : "type-7535",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25350,7 +25353,7 @@
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > *",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > *",
    "referenced_type" : "type-463",
-   "self_type" : "type-7685",
+   "self_type" : "type-7708",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -25359,7 +25362,7 @@
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::media::V1_0::Rect> *",
    "name" : "android::hardware::hidl_vec<android::hardware::media::V1_0::Rect> *",
    "referenced_type" : "type-454",
-   "self_type" : "type-4570",
+   "self_type" : "type-4578",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -25368,7 +25371,7 @@
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> *",
    "name" : "android::hardware::hidl_vec<unsigned char> *",
    "referenced_type" : "type-453",
-   "self_type" : "type-4378",
+   "self_type" : "type-4384",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -25395,7 +25398,7 @@
    "linker_set_key" : "android::hidl::base::V1_0::IBase *",
    "name" : "android::hidl::base::V1_0::IBase *",
    "referenced_type" : "type-531",
-   "self_type" : "type-2447",
+   "self_type" : "type-2450",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25404,7 +25407,7 @@
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "android::hidl::manager::V1_0::IServiceNotification *",
    "referenced_type" : "type-534",
-   "self_type" : "type-2451",
+   "self_type" : "type-2454",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25413,7 +25416,7 @@
    "linker_set_key" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
    "name" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
    "referenced_type" : "type-164",
-   "self_type" : "type-2626",
+   "self_type" : "type-2629",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -25422,7 +25425,7 @@
    "linker_set_key" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
    "name" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
    "referenced_type" : "type-150",
-   "self_type" : "type-2624",
+   "self_type" : "type-2627",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -25431,7 +25434,7 @@
    "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int> *",
    "name" : "android::key_value_pair_t<unsigned int, unsigned int> *",
    "referenced_type" : "type-146",
-   "self_type" : "type-2623",
+   "self_type" : "type-2626",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -25439,8 +25442,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::AHandler> *",
    "name" : "android::sp<android::AHandler> *",
-   "referenced_type" : "type-1189",
-   "self_type" : "type-1245",
+   "referenced_type" : "type-1192",
+   "self_type" : "type-1247",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25449,7 +25452,7 @@
    "linker_set_key" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
    "name" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
    "referenced_type" : "type-581",
-   "self_type" : "type-2513",
+   "self_type" : "type-2516",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25458,7 +25461,7 @@
    "linker_set_key" : "android::sp<android::ALooper> *",
    "name" : "android::sp<android::ALooper> *",
    "referenced_type" : "type-322",
-   "self_type" : "type-2246",
+   "self_type" : "type-2249",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25467,7 +25470,7 @@
    "linker_set_key" : "android::sp<android::AMessage> *",
    "name" : "android::sp<android::AMessage> *",
    "referenced_type" : "type-259",
-   "self_type" : "type-1958",
+   "self_type" : "type-1951",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25475,8 +25478,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::BpGraphicBufferProducer> *",
    "name" : "android::sp<android::BpGraphicBufferProducer> *",
-   "referenced_type" : "type-4231",
-   "self_type" : "type-4277",
+   "referenced_type" : "type-4237",
+   "self_type" : "type-4283",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25484,8 +25487,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::BpProducerListener> *",
    "name" : "android::sp<android::BpProducerListener> *",
-   "referenced_type" : "type-4457",
-   "self_type" : "type-4456",
+   "referenced_type" : "type-4464",
+   "self_type" : "type-4463",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25503,7 +25506,7 @@
    "linker_set_key" : "android::sp<android::ComponentWrapper> *",
    "name" : "android::sp<android::ComponentWrapper> *",
    "referenced_type" : "type-567",
-   "self_type" : "type-2490",
+   "self_type" : "type-2493",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25520,8 +25523,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::Fence> *",
    "name" : "android::sp<android::Fence> *",
-   "referenced_type" : "type-1865",
-   "self_type" : "type-2524",
+   "referenced_type" : "type-1869",
+   "self_type" : "type-2527",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25530,7 +25533,7 @@
    "linker_set_key" : "android::sp<android::FrameDropper> *",
    "name" : "android::sp<android::FrameDropper> *",
    "referenced_type" : "type-578",
-   "self_type" : "type-2506",
+   "self_type" : "type-2509",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25538,8 +25541,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::GLConsumer::EglImage> *",
    "name" : "android::sp<android::GLConsumer::EglImage> *",
-   "referenced_type" : "type-1173",
-   "self_type" : "type-1177",
+   "referenced_type" : "type-1176",
+   "self_type" : "type-1181",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25548,7 +25551,7 @@
    "linker_set_key" : "android::sp<android::GraphicBuffer> *",
    "name" : "android::sp<android::GraphicBuffer> *",
    "referenced_type" : "type-733",
-   "self_type" : "type-1195",
+   "self_type" : "type-1198",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25557,7 +25560,7 @@
    "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy> *",
    "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy> *",
    "referenced_type" : "type-473",
-   "self_type" : "type-2498",
+   "self_type" : "type-2501",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25565,8 +25568,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::GraphicBufferSource> *",
    "name" : "android::sp<android::GraphicBufferSource> *",
-   "referenced_type" : "type-2544",
-   "self_type" : "type-2543",
+   "referenced_type" : "type-2547",
+   "self_type" : "type-2546",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25574,8 +25577,8 @@
    "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",
+   "referenced_type" : "type-4268",
+   "self_type" : "type-4267",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25583,8 +25586,8 @@
    "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",
+   "referenced_type" : "type-4277",
+   "self_type" : "type-4276",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25592,8 +25595,8 @@
    "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",
+   "referenced_type" : "type-4838",
+   "self_type" : "type-4845",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25601,8 +25604,8 @@
    "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",
+   "referenced_type" : "type-5127",
+   "self_type" : "type-5132",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25611,7 +25614,7 @@
    "linker_set_key" : "android::sp<android::IBinder::DeathRecipient> *",
    "name" : "android::sp<android::IBinder::DeathRecipient> *",
    "referenced_type" : "type-844",
-   "self_type" : "type-1274",
+   "self_type" : "type-1278",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25620,7 +25623,7 @@
    "linker_set_key" : "android::sp<android::IBinder> *",
    "name" : "android::sp<android::IBinder> *",
    "referenced_type" : "type-796",
-   "self_type" : "type-1036",
+   "self_type" : "type-1040",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25629,7 +25632,7 @@
    "linker_set_key" : "android::sp<android::IConsumerListener> *",
    "name" : "android::sp<android::IConsumerListener> *",
    "referenced_type" : "type-940",
-   "self_type" : "type-2536",
+   "self_type" : "type-2539",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25638,7 +25641,7 @@
    "linker_set_key" : "android::sp<android::IGraphicBufferConsumer> *",
    "name" : "android::sp<android::IGraphicBufferConsumer> *",
    "referenced_type" : "type-574",
-   "self_type" : "type-2500",
+   "self_type" : "type-2503",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25647,7 +25650,7 @@
    "linker_set_key" : "android::sp<android::IGraphicBufferProducer> *",
    "name" : "android::sp<android::IGraphicBufferProducer> *",
    "referenced_type" : "type-570",
-   "self_type" : "type-2486",
+   "self_type" : "type-2489",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25665,7 +25668,7 @@
    "linker_set_key" : "android::sp<android::IProducerListener> *",
    "name" : "android::sp<android::IProducerListener> *",
    "referenced_type" : "type-958",
-   "self_type" : "type-2539",
+   "self_type" : "type-2542",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25673,8 +25676,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::ITransactionCompletedListener> *",
    "name" : "android::sp<android::ITransactionCompletedListener> *",
-   "referenced_type" : "type-1041",
-   "self_type" : "type-1046",
+   "referenced_type" : "type-1045",
+   "self_type" : "type-1049",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25683,7 +25686,7 @@
    "linker_set_key" : "android::sp<android::NativeHandle> *",
    "name" : "android::sp<android::NativeHandle> *",
    "referenced_type" : "type-933",
-   "self_type" : "type-1881",
+   "self_type" : "type-1886",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25691,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-2465",
-   "self_type" : "type-2467",
+   "referenced_type" : "type-2468",
+   "self_type" : "type-2470",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25700,8 +25703,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> *",
    "name" : "android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> *",
-   "referenced_type" : "type-2456",
-   "self_type" : "type-2459",
+   "referenced_type" : "type-2459",
+   "self_type" : "type-2462",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25709,8 +25712,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer> *",
    "name" : "android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer> *",
-   "referenced_type" : "type-4243",
-   "self_type" : "type-4280",
+   "referenced_type" : "type-4249",
+   "self_type" : "type-4286",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25718,8 +25721,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener> *",
    "name" : "android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener> *",
-   "referenced_type" : "type-4470",
-   "self_type" : "type-4469",
+   "referenced_type" : "type-4476",
+   "self_type" : "type-4475",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25727,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-2478",
-   "self_type" : "type-2480",
+   "referenced_type" : "type-2481",
+   "self_type" : "type-2483",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25736,8 +25739,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> *",
    "name" : "android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> *",
-   "referenced_type" : "type-2472",
-   "self_type" : "type-2475",
+   "referenced_type" : "type-2475",
+   "self_type" : "type-2478",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25745,8 +25748,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer> *",
    "name" : "android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer> *",
-   "referenced_type" : "type-4237",
-   "self_type" : "type-4278",
+   "referenced_type" : "type-4243",
+   "self_type" : "type-4284",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25754,8 +25757,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener> *",
    "name" : "android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener> *",
-   "referenced_type" : "type-4463",
-   "self_type" : "type-4462",
+   "referenced_type" : "type-4469",
+   "self_type" : "type-4468",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25764,7 +25767,7 @@
    "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient> *",
    "name" : "android::sp<android::hardware::hidl_death_recipient> *",
    "referenced_type" : "type-515",
-   "self_type" : "type-4392",
+   "self_type" : "type-4398",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25772,8 +25775,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hidl::base::V1_0::IBase> *",
    "name" : "android::sp<android::hidl::base::V1_0::IBase> *",
-   "referenced_type" : "type-2446",
-   "self_type" : "type-4224",
+   "referenced_type" : "type-2449",
+   "self_type" : "type-4230",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25781,8 +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-2450",
-   "self_type" : "type-2452",
+   "referenced_type" : "type-2453",
+   "self_type" : "type-2455",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25790,8 +25793,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<const android::AHandler> *",
    "name" : "android::sp<const android::AHandler> *",
-   "referenced_type" : "type-2518",
-   "self_type" : "type-2523",
+   "referenced_type" : "type-2521",
+   "self_type" : "type-2526",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25836,7 +25839,7 @@
    "linker_set_key" : "android::wp<android::IBinder::DeathRecipient> *",
    "name" : "android::wp<android::IBinder::DeathRecipient> *",
    "referenced_type" : "type-174",
-   "self_type" : "type-1244",
+   "self_type" : "type-1248",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -25845,7 +25848,7 @@
    "linker_set_key" : "android::wp<android::IBinder> *",
    "name" : "android::wp<android::IBinder> *",
    "referenced_type" : "type-131",
-   "self_type" : "type-4282",
+   "self_type" : "type-4288",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -25854,7 +25857,7 @@
    "linker_set_key" : "android_dataspace_t *",
    "name" : "android_dataspace_t *",
    "referenced_type" : "type-173",
-   "self_type" : "type-1668",
+   "self_type" : "type-1672",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -25871,8 +25874,8 @@
    "alignment" : 8,
    "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",
+   "referenced_type" : "type-1249",
+   "self_type" : "type-1253",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h"
   },
@@ -25880,8 +25883,8 @@
    "alignment" : 8,
    "linker_set_key" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
    "name" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
-   "referenced_type" : "type-1388",
-   "self_type" : "type-1391",
+   "referenced_type" : "type-1391",
+   "self_type" : "type-1394",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -25890,7 +25893,7 @@
    "linker_set_key" : "bool *",
    "name" : "bool *",
    "referenced_type" : "type-95",
-   "self_type" : "type-1275",
+   "self_type" : "type-1276",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -25907,8 +25910,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::AHandler *",
    "name" : "const android::AHandler *",
-   "referenced_type" : "type-2520",
-   "self_type" : "type-2519",
+   "referenced_type" : "type-2523",
+   "self_type" : "type-2522",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25916,8 +25919,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::AHandlerReflector<android::GraphicBufferSource> *",
    "name" : "const android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-2516",
-   "self_type" : "type-2517",
+   "referenced_type" : "type-2519",
+   "self_type" : "type-2520",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25925,8 +25928,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::ALooper *",
    "name" : "const android::ALooper *",
-   "referenced_type" : "type-2291",
-   "self_type" : "type-2303",
+   "referenced_type" : "type-2294",
+   "self_type" : "type-2306",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25934,7 +25937,7 @@
    "alignment" : 8,
    "linker_set_key" : "const android::AReplyToken *",
    "name" : "const android::AReplyToken *",
-   "referenced_type" : "type-1170",
+   "referenced_type" : "type-1171",
    "self_type" : "type-1180",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
@@ -25943,8 +25946,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::AString *",
    "name" : "const android::AString *",
-   "referenced_type" : "type-2101",
-   "self_type" : "type-2231",
+   "referenced_type" : "type-2093",
+   "self_type" : "type-2234",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -25970,8 +25973,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BnInterface<android::IGraphicBufferProducer> *",
    "name" : "const android::BnInterface<android::IGraphicBufferProducer> *",
-   "referenced_type" : "type-1232",
-   "self_type" : "type-1234",
+   "referenced_type" : "type-1236",
+   "self_type" : "type-1237",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -25979,8 +25982,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BnInterface<android::IProducerListener> *",
    "name" : "const android::BnInterface<android::IProducerListener> *",
-   "referenced_type" : "type-4480",
-   "self_type" : "type-4481",
+   "referenced_type" : "type-4486",
+   "self_type" : "type-4487",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -25988,8 +25991,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BnInterface<android::ITransactionCompletedListener> *",
    "name" : "const android::BnInterface<android::ITransactionCompletedListener> *",
-   "referenced_type" : "type-1094",
-   "self_type" : "type-1095",
+   "referenced_type" : "type-1097",
+   "self_type" : "type-1098",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -26006,8 +26009,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-1070",
-   "self_type" : "type-1072",
+   "referenced_type" : "type-1073",
+   "self_type" : "type-1075",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -26015,8 +26018,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-1219",
-   "self_type" : "type-1218",
+   "referenced_type" : "type-1223",
+   "self_type" : "type-1222",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26024,8 +26027,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-3635",
-   "self_type" : "type-3634",
+   "referenced_type" : "type-3638",
+   "self_type" : "type-3637",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26033,8 +26036,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-3684",
-   "self_type" : "type-3686",
+   "referenced_type" : "type-3690",
+   "self_type" : "type-3692",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -26042,8 +26045,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-3792",
-   "self_type" : "type-3791",
+   "referenced_type" : "type-3799",
+   "self_type" : "type-3798",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26051,8 +26054,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-5710",
-   "self_type" : "type-5709",
+   "referenced_type" : "type-5727",
+   "self_type" : "type-5726",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26060,8 +26063,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-5759",
-   "self_type" : "type-5761",
+   "referenced_type" : "type-5779",
+   "self_type" : "type-5781",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -26069,8 +26072,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-5867",
-   "self_type" : "type-5866",
+   "referenced_type" : "type-5888",
+   "self_type" : "type-5887",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26078,8 +26081,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-6281",
-   "self_type" : "type-6280",
+   "referenced_type" : "type-6301",
+   "self_type" : "type-6300",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26087,8 +26090,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-6323",
-   "self_type" : "type-6325",
+   "referenced_type" : "type-6346",
+   "self_type" : "type-6348",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -26096,8 +26099,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-6414",
-   "self_type" : "type-6413",
+   "referenced_type" : "type-6437",
+   "self_type" : "type-6436",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26114,8 +26117,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferQueueCore *",
    "name" : "const android::BufferQueueCore *",
-   "referenced_type" : "type-3523",
-   "self_type" : "type-3525",
+   "referenced_type" : "type-3526",
+   "self_type" : "type-3528",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26123,8 +26126,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferQueueCore *",
    "name" : "const android::BufferQueueCore *",
-   "referenced_type" : "type-5598",
-   "self_type" : "type-5600",
+   "referenced_type" : "type-5615",
+   "self_type" : "type-5617",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26132,8 +26135,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferQueueCore *",
    "name" : "const android::BufferQueueCore *",
-   "referenced_type" : "type-6184",
-   "self_type" : "type-6186",
+   "referenced_type" : "type-6204",
+   "self_type" : "type-6206",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26150,8 +26153,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::ComponentWrapper *",
    "name" : "const android::ComponentWrapper *",
-   "referenced_type" : "type-2496",
-   "self_type" : "type-2497",
+   "referenced_type" : "type-2499",
+   "self_type" : "type-2500",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26159,8 +26162,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::ConsumerListener *",
    "name" : "const android::ConsumerListener *",
-   "referenced_type" : "type-3515",
-   "self_type" : "type-3517",
+   "referenced_type" : "type-3518",
+   "self_type" : "type-3520",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26168,8 +26171,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::ConsumerListener *",
    "name" : "const android::ConsumerListener *",
-   "referenced_type" : "type-5590",
-   "self_type" : "type-5592",
+   "referenced_type" : "type-5607",
+   "self_type" : "type-5609",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26177,8 +26180,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::ConsumerListener *",
    "name" : "const android::ConsumerListener *",
-   "referenced_type" : "type-6179",
-   "self_type" : "type-6181",
+   "referenced_type" : "type-6199",
+   "self_type" : "type-6201",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26195,8 +26198,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-1309",
-   "self_type" : "type-1316",
+   "referenced_type" : "type-1313",
+   "self_type" : "type-1317",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26204,8 +26207,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-2532",
-   "self_type" : "type-2534",
+   "referenced_type" : "type-2535",
+   "self_type" : "type-2537",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26213,8 +26216,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-3448",
-   "self_type" : "type-3450",
+   "referenced_type" : "type-3451",
+   "self_type" : "type-3453",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26222,8 +26225,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-3595",
-   "self_type" : "type-3597",
+   "referenced_type" : "type-3598",
+   "self_type" : "type-3600",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26231,8 +26234,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-3860",
-   "self_type" : "type-3867",
+   "referenced_type" : "type-3867",
+   "self_type" : "type-3871",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26240,8 +26243,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-4425",
-   "self_type" : "type-4431",
+   "referenced_type" : "type-4431",
+   "self_type" : "type-4433",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26249,8 +26252,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-4675",
-   "self_type" : "type-4677",
+   "referenced_type" : "type-4682",
+   "self_type" : "type-4684",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26258,8 +26261,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-4944",
-   "self_type" : "type-4946",
+   "referenced_type" : "type-4950",
+   "self_type" : "type-4952",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26267,8 +26270,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-5523",
-   "self_type" : "type-5525",
+   "referenced_type" : "type-5540",
+   "self_type" : "type-5542",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26276,8 +26279,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-5670",
-   "self_type" : "type-5672",
+   "referenced_type" : "type-5687",
+   "self_type" : "type-5689",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26285,8 +26288,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-5935",
-   "self_type" : "type-5942",
+   "referenced_type" : "type-5956",
+   "self_type" : "type-5960",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26294,8 +26297,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-6016",
-   "self_type" : "type-6018",
+   "referenced_type" : "type-6036",
+   "self_type" : "type-6038",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26303,8 +26306,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-6127",
-   "self_type" : "type-6129",
+   "referenced_type" : "type-6147",
+   "self_type" : "type-6149",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26312,8 +26315,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-6255",
-   "self_type" : "type-6257",
+   "referenced_type" : "type-6275",
+   "self_type" : "type-6277",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26321,8 +26324,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-6455",
-   "self_type" : "type-6462",
+   "referenced_type" : "type-6479",
+   "self_type" : "type-6483",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26330,8 +26333,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-7029",
-   "self_type" : "type-7036",
+   "referenced_type" : "type-7053",
+   "self_type" : "type-7057",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26339,8 +26342,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-7206",
-   "self_type" : "type-7212",
+   "referenced_type" : "type-7228",
+   "self_type" : "type-7231",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26357,8 +26360,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-7316",
-   "self_type" : "type-7318",
+   "referenced_type" : "type-7339",
+   "self_type" : "type-7341",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26375,8 +26378,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::FileDescriptor::Autoclose *",
    "name" : "const android::FileDescriptor::Autoclose *",
-   "referenced_type" : "type-1230",
-   "self_type" : "type-1233",
+   "referenced_type" : "type-1228",
+   "self_type" : "type-1235",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h"
   },
@@ -26384,8 +26387,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Flattenable<android::BufferItem> *",
    "name" : "const android::Flattenable<android::BufferItem> *",
-   "referenced_type" : "type-1507",
-   "self_type" : "type-1508",
+   "referenced_type" : "type-1510",
+   "self_type" : "type-1511",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -26393,24 +26396,6 @@
    "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,
@@ -26418,17 +26403,8 @@
   },
   {
    "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> *",
+   "linker_set_key" : "const android::Flattenable<android::FrameEventHistoryDelta> *",
+   "name" : "const android::Flattenable<android::FrameEventHistoryDelta> *",
    "referenced_type" : "type-4315",
    "self_type" : "type-4316",
    "size" : 8,
@@ -26436,10 +26412,37 @@
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const android::Flattenable<android::GraphicBuffer> *",
+   "name" : "const android::Flattenable<android::GraphicBuffer> *",
+   "referenced_type" : "type-1644",
+   "self_type" : "type-1645",
+   "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-4318",
+   "self_type" : "type-4319",
+   "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-4321",
+   "self_type" : "type-4322",
+   "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-2511",
-   "self_type" : "type-2512",
+   "referenced_type" : "type-2514",
+   "self_type" : "type-2515",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26447,8 +26450,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-1347",
-   "self_type" : "type-1349",
+   "referenced_type" : "type-1350",
+   "self_type" : "type-1352",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26456,8 +26459,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-1461",
-   "self_type" : "type-1464",
+   "referenced_type" : "type-1465",
+   "self_type" : "type-1467",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26465,8 +26468,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-2405",
-   "self_type" : "type-2427",
+   "referenced_type" : "type-2408",
+   "self_type" : "type-2430",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26474,8 +26477,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-3454",
-   "self_type" : "type-3456",
+   "referenced_type" : "type-3457",
+   "self_type" : "type-3459",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26483,8 +26486,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-3600",
-   "self_type" : "type-3602",
+   "referenced_type" : "type-3603",
+   "self_type" : "type-3605",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26492,8 +26495,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-3900",
-   "self_type" : "type-3902",
+   "referenced_type" : "type-3906",
+   "self_type" : "type-3908",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26501,8 +26504,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-3993",
-   "self_type" : "type-3995",
+   "referenced_type" : "type-3999",
+   "self_type" : "type-4001",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26510,8 +26513,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-4221",
-   "self_type" : "type-4223",
+   "referenced_type" : "type-4227",
+   "self_type" : "type-4229",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26519,8 +26522,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-4837",
-   "self_type" : "type-4873",
+   "referenced_type" : "type-4843",
+   "self_type" : "type-4879",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26528,8 +26531,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-5529",
-   "self_type" : "type-5531",
+   "referenced_type" : "type-5546",
+   "self_type" : "type-5548",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26537,8 +26540,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-5675",
-   "self_type" : "type-5677",
+   "referenced_type" : "type-5692",
+   "self_type" : "type-5694",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26546,16 +26549,7 @@
    "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",
+   "referenced_type" : "type-5995",
    "self_type" : "type-5997",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
@@ -26564,8 +26558,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-6132",
-   "self_type" : "type-6135",
+   "referenced_type" : "type-6012",
+   "self_type" : "type-6017",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26573,8 +26567,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-6260",
-   "self_type" : "type-6262",
+   "referenced_type" : "type-6153",
+   "self_type" : "type-6155",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26582,8 +26576,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-6493",
-   "self_type" : "type-6496",
+   "referenced_type" : "type-6280",
+   "self_type" : "type-6282",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26591,8 +26585,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-6581",
-   "self_type" : "type-6583",
+   "referenced_type" : "type-6517",
+   "self_type" : "type-6519",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26600,8 +26594,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-6826",
-   "self_type" : "type-6836",
+   "referenced_type" : "type-6604",
+   "self_type" : "type-6606",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26609,8 +26603,17 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-6837",
-   "self_type" : "type-6839",
+   "referenced_type" : "type-6849",
+   "self_type" : "type-6857",
+   "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-6860",
+   "self_type" : "type-6862",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26636,8 +26639,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBufferSource *",
    "name" : "const android::GraphicBufferSource *",
-   "referenced_type" : "type-2548",
-   "self_type" : "type-2549",
+   "referenced_type" : "type-2551",
+   "self_type" : "type-2552",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26645,8 +26648,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IBinder *",
    "name" : "const android::IBinder *",
-   "referenced_type" : "type-1520",
-   "self_type" : "type-1526",
+   "referenced_type" : "type-1524",
+   "self_type" : "type-1531",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26654,8 +26657,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IBinder::DeathRecipient *",
    "name" : "const android::IBinder::DeathRecipient *",
-   "referenced_type" : "type-4318",
-   "self_type" : "type-4319",
+   "referenced_type" : "type-4324",
+   "self_type" : "type-4325",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26663,8 +26666,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-1156",
-   "self_type" : "type-1158",
+   "referenced_type" : "type-1159",
+   "self_type" : "type-1161",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26672,8 +26675,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-1581",
-   "self_type" : "type-1583",
+   "referenced_type" : "type-1585",
+   "self_type" : "type-1587",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26681,8 +26684,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-3613",
-   "self_type" : "type-3615",
+   "referenced_type" : "type-3616",
+   "self_type" : "type-3618",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26690,8 +26693,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-3760",
-   "self_type" : "type-3762",
+   "referenced_type" : "type-3766",
+   "self_type" : "type-3770",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26699,8 +26702,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-4062",
-   "self_type" : "type-4064",
+   "referenced_type" : "type-4068",
+   "self_type" : "type-4070",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26708,8 +26711,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-5688",
-   "self_type" : "type-5690",
+   "referenced_type" : "type-5705",
+   "self_type" : "type-5707",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26717,8 +26720,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-5835",
-   "self_type" : "type-5837",
+   "referenced_type" : "type-5855",
+   "self_type" : "type-5859",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26726,8 +26729,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-6265",
-   "self_type" : "type-6267",
+   "referenced_type" : "type-6286",
+   "self_type" : "type-6288",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26735,8 +26738,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-6390",
-   "self_type" : "type-6392",
+   "referenced_type" : "type-6413",
+   "self_type" : "type-6415",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26744,8 +26747,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-6649",
-   "self_type" : "type-6651",
+   "referenced_type" : "type-6672",
+   "self_type" : "type-6675",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26762,8 +26765,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-1605",
-   "self_type" : "type-1607",
+   "referenced_type" : "type-1609",
+   "self_type" : "type-1611",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26771,8 +26774,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-2503",
-   "self_type" : "type-2505",
+   "referenced_type" : "type-2506",
+   "self_type" : "type-2508",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26780,8 +26783,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-3496",
-   "self_type" : "type-3498",
+   "referenced_type" : "type-3499",
+   "self_type" : "type-3501",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26789,8 +26792,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-4079",
-   "self_type" : "type-4081",
+   "referenced_type" : "type-4085",
+   "self_type" : "type-4087",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26798,8 +26801,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-4917",
-   "self_type" : "type-4919",
+   "referenced_type" : "type-4923",
+   "self_type" : "type-4925",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26807,8 +26810,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-5571",
-   "self_type" : "type-5573",
+   "referenced_type" : "type-5588",
+   "self_type" : "type-5590",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26816,8 +26819,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6009",
-   "self_type" : "type-6011",
+   "referenced_type" : "type-6029",
+   "self_type" : "type-6031",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26825,8 +26828,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6165",
-   "self_type" : "type-6167",
+   "referenced_type" : "type-6185",
+   "self_type" : "type-6187",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26834,8 +26837,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6664",
-   "self_type" : "type-6666",
+   "referenced_type" : "type-6687",
+   "self_type" : "type-6689",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26843,8 +26846,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-7151",
-   "self_type" : "type-7153",
+   "referenced_type" : "type-7174",
+   "self_type" : "type-7176",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26861,8 +26864,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferProducer *",
    "name" : "const android::IGraphicBufferProducer *",
-   "referenced_type" : "type-3506",
-   "self_type" : "type-3508",
+   "referenced_type" : "type-3509",
+   "self_type" : "type-3511",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26870,8 +26873,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferProducer *",
    "name" : "const android::IGraphicBufferProducer *",
-   "referenced_type" : "type-4250",
-   "self_type" : "type-4252",
+   "referenced_type" : "type-4256",
+   "self_type" : "type-4258",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26879,8 +26882,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferProducer *",
    "name" : "const android::IGraphicBufferProducer *",
-   "referenced_type" : "type-5581",
-   "self_type" : "type-5583",
+   "referenced_type" : "type-5598",
+   "self_type" : "type-5600",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26888,8 +26891,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferProducer *",
    "name" : "const android::IGraphicBufferProducer *",
-   "referenced_type" : "type-6174",
-   "self_type" : "type-6176",
+   "referenced_type" : "type-6194",
+   "self_type" : "type-6196",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26897,8 +26900,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferProducer *",
    "name" : "const android::IGraphicBufferProducer *",
-   "referenced_type" : "type-6860",
-   "self_type" : "type-6862",
+   "referenced_type" : "type-6883",
+   "self_type" : "type-6885",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26915,8 +26918,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-1161",
-   "self_type" : "type-1163",
+   "referenced_type" : "type-1032",
+   "self_type" : "type-1034",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26924,8 +26927,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-3625",
-   "self_type" : "type-3627",
+   "referenced_type" : "type-1164",
+   "self_type" : "type-1166",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26933,8 +26936,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-3767",
-   "self_type" : "type-3769",
+   "referenced_type" : "type-3628",
+   "self_type" : "type-3630",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26942,8 +26945,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-4256",
-   "self_type" : "type-4258",
+   "referenced_type" : "type-3672",
+   "self_type" : "type-3674",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26951,8 +26954,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-4452",
-   "self_type" : "type-4451",
+   "referenced_type" : "type-3773",
+   "self_type" : "type-3775",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26960,8 +26963,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-4692",
-   "self_type" : "type-4694",
+   "referenced_type" : "type-4262",
+   "self_type" : "type-4264",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26969,8 +26972,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-5700",
-   "self_type" : "type-5702",
+   "referenced_type" : "type-4459",
+   "self_type" : "type-4458",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26978,8 +26981,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-5842",
-   "self_type" : "type-5844",
+   "referenced_type" : "type-4699",
+   "self_type" : "type-4702",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26987,8 +26990,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-6273",
-   "self_type" : "type-6275",
+   "referenced_type" : "type-5717",
+   "self_type" : "type-5719",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26996,8 +26999,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-6395",
-   "self_type" : "type-6397",
+   "referenced_type" : "type-5761",
+   "self_type" : "type-5763",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27005,8 +27008,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-6866",
-   "self_type" : "type-6868",
+   "referenced_type" : "type-5862",
+   "self_type" : "type-5864",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27014,8 +27017,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-7059",
-   "self_type" : "type-7058",
+   "referenced_type" : "type-6293",
+   "self_type" : "type-6295",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27023,8 +27026,44 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-7329",
-   "self_type" : "type-7331",
+   "referenced_type" : "type-6337",
+   "self_type" : "type-6339",
+   "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-6418",
+   "self_type" : "type-6420",
+   "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-6889",
+   "self_type" : "type-6891",
+   "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-7083",
+   "self_type" : "type-7082",
+   "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-7352",
+   "self_type" : "type-7354",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27059,8 +27098,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect> *",
    "name" : "const android::LightFlattenablePod<android::Rect> *",
-   "referenced_type" : "type-4590",
-   "self_type" : "type-4591",
+   "referenced_type" : "type-4597",
+   "self_type" : "type-4598",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -27077,8 +27116,8 @@
    "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",
+   "referenced_type" : "type-1233",
+   "self_type" : "type-1234",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -27086,8 +27125,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::LightRefBase<android::NativeHandle> *",
    "name" : "const android::LightRefBase<android::NativeHandle> *",
-   "referenced_type" : "type-2665",
-   "self_type" : "type-2674",
+   "referenced_type" : "type-2668",
+   "self_type" : "type-2677",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -27204,7 +27243,7 @@
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
    "referenced_type" : "type-120",
-   "self_type" : "type-1514",
+   "self_type" : "type-1518",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -27221,8 +27260,8 @@
    "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",
+   "referenced_type" : "type-1525",
+   "self_type" : "type-1526",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -27230,8 +27269,8 @@
    "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",
+   "referenced_type" : "type-1667",
+   "self_type" : "type-1668",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -27239,8 +27278,8 @@
    "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",
+   "referenced_type" : "type-4340",
+   "self_type" : "type-4341",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -27248,8 +27287,8 @@
    "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",
+   "referenced_type" : "type-1661",
+   "self_type" : "type-1662",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -27257,8 +27296,8 @@
    "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",
+   "referenced_type" : "type-4346",
+   "self_type" : "type-4347",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -27266,8 +27305,8 @@
    "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",
+   "referenced_type" : "type-4351",
+   "self_type" : "type-4352",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -27284,8 +27323,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1215",
-   "self_type" : "type-1214",
+   "referenced_type" : "type-1218",
+   "self_type" : "type-1217",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27293,8 +27332,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1490",
-   "self_type" : "type-1489",
+   "referenced_type" : "type-1494",
+   "self_type" : "type-1493",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27302,8 +27341,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1622",
-   "self_type" : "type-1621",
+   "referenced_type" : "type-1625",
+   "self_type" : "type-1624",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27311,8 +27350,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-2685",
-   "self_type" : "type-2684",
+   "referenced_type" : "type-2688",
+   "self_type" : "type-2687",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27320,8 +27359,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-3788",
-   "self_type" : "type-3787",
+   "referenced_type" : "type-3794",
+   "self_type" : "type-3793",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27329,8 +27368,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4013",
-   "self_type" : "type-4012",
+   "referenced_type" : "type-4019",
+   "self_type" : "type-4018",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27338,8 +27377,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4092",
-   "self_type" : "type-4091",
+   "referenced_type" : "type-4098",
+   "self_type" : "type-4097",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27347,8 +27386,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4295",
-   "self_type" : "type-4294",
+   "referenced_type" : "type-4301",
+   "self_type" : "type-4300",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27356,8 +27395,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4575",
-   "self_type" : "type-4574",
+   "referenced_type" : "type-4581",
+   "self_type" : "type-4580",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27365,8 +27404,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4739",
-   "self_type" : "type-4738",
+   "referenced_type" : "type-4746",
+   "self_type" : "type-4745",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27374,8 +27413,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-5022",
-   "self_type" : "type-5021",
+   "referenced_type" : "type-5028",
+   "self_type" : "type-5027",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27383,8 +27422,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-5080",
-   "self_type" : "type-5079",
+   "referenced_type" : "type-5096",
+   "self_type" : "type-5095",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27392,8 +27431,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-5863",
-   "self_type" : "type-5862",
+   "referenced_type" : "type-5883",
+   "self_type" : "type-5882",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27401,8 +27440,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-6046",
-   "self_type" : "type-6045",
+   "referenced_type" : "type-6066",
+   "self_type" : "type-6065",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27410,8 +27449,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-6410",
-   "self_type" : "type-6409",
+   "referenced_type" : "type-6433",
+   "self_type" : "type-6432",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27419,8 +27458,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-6600",
-   "self_type" : "type-6599",
+   "referenced_type" : "type-6624",
+   "self_type" : "type-6623",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27428,8 +27467,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-6679",
-   "self_type" : "type-6678",
+   "referenced_type" : "type-6702",
+   "self_type" : "type-6701",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27437,8 +27476,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-6899",
-   "self_type" : "type-6898",
+   "referenced_type" : "type-6922",
+   "self_type" : "type-6921",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27446,8 +27485,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-7209",
-   "self_type" : "type-7208",
+   "referenced_type" : "type-7233",
+   "self_type" : "type-7232",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27455,8 +27494,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-7356",
-   "self_type" : "type-7355",
+   "referenced_type" : "type-7379",
+   "self_type" : "type-7378",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27464,8 +27503,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-7582",
-   "self_type" : "type-7581",
+   "referenced_type" : "type-7607",
+   "self_type" : "type-7606",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27473,8 +27512,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-7679",
-   "self_type" : "type-7678",
+   "referenced_type" : "type-7699",
+   "self_type" : "type-7698",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27482,8 +27521,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::RefBase *",
    "name" : "const android::RefBase *",
-   "referenced_type" : "type-1450",
-   "self_type" : "type-1479",
+   "referenced_type" : "type-1453",
+   "self_type" : "type-1482",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27491,8 +27530,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::SafeBpInterface<android::IConsumerListener> *",
    "name" : "const android::SafeBpInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-1552",
-   "self_type" : "type-1553",
+   "referenced_type" : "type-1555",
+   "self_type" : "type-1556",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -27500,8 +27539,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::SafeBpInterface<android::IGraphicBufferConsumer> *",
    "name" : "const android::SafeBpInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-1888",
-   "self_type" : "type-1889",
+   "referenced_type" : "type-1892",
+   "self_type" : "type-1893",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -27509,7 +27548,7 @@
    "alignment" : 8,
    "linker_set_key" : "const android::SafeInterface::ParcelHandler *",
    "name" : "const android::SafeInterface::ParcelHandler *",
-   "referenced_type" : "type-1266",
+   "referenced_type" : "type-1269",
    "self_type" : "type-1272",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
@@ -27518,8 +27557,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-2677",
-   "self_type" : "type-2678",
+   "referenced_type" : "type-2680",
+   "self_type" : "type-2681",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27527,8 +27566,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-2673",
-   "self_type" : "type-2675",
+   "referenced_type" : "type-2676",
+   "self_type" : "type-2678",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27536,8 +27575,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-2669",
-   "self_type" : "type-2670",
+   "referenced_type" : "type-2672",
+   "self_type" : "type-2673",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27545,8 +27584,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::String16 *",
    "name" : "const android::String16 *",
-   "referenced_type" : "type-1248",
-   "self_type" : "type-2660",
+   "referenced_type" : "type-1251",
+   "self_type" : "type-2663",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -27554,8 +27593,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::String8 *",
    "name" : "const android::String8 *",
-   "referenced_type" : "type-1877",
-   "self_type" : "type-2655",
+   "referenced_type" : "type-1881",
+   "self_type" : "type-2658",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -27563,7 +27602,7 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Vector<android::BufferItem> *",
    "name" : "const android::Vector<android::BufferItem> *",
-   "referenced_type" : "type-978",
+   "referenced_type" : "type-980",
    "self_type" : "type-981",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
@@ -27572,8 +27611,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Vector<android::Rect> *",
    "name" : "const android::Vector<android::Rect> *",
-   "referenced_type" : "type-2681",
-   "self_type" : "type-2682",
+   "referenced_type" : "type-2684",
+   "self_type" : "type-2685",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27581,8 +27620,8 @@
    "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",
+   "referenced_type" : "type-1231",
+   "self_type" : "type-1232",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27590,8 +27629,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Vector<int> *",
    "name" : "const android::Vector<int> *",
-   "referenced_type" : "type-2690",
-   "self_type" : "type-2691",
+   "referenced_type" : "type-2693",
+   "self_type" : "type-2694",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27599,8 +27638,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Vector<long> *",
    "name" : "const android::Vector<long> *",
-   "referenced_type" : "type-1084",
-   "self_type" : "type-1085",
+   "referenced_type" : "type-1087",
+   "self_type" : "type-1088",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27608,8 +27647,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::VectorImpl *",
    "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-2666",
-   "self_type" : "type-2667",
+   "referenced_type" : "type-2669",
+   "self_type" : "type-2670",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -27617,8 +27656,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::base::ErrnoRestorer *",
    "name" : "const android::base::ErrnoRestorer *",
-   "referenced_type" : "type-4659",
-   "self_type" : "type-4665",
+   "referenced_type" : "type-4666",
+   "self_type" : "type-4672",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27626,8 +27665,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser> *",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser> *",
-   "referenced_type" : "type-2582",
-   "self_type" : "type-2597",
+   "referenced_type" : "type-2585",
+   "self_type" : "type-2600",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -27644,8 +27683,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::BpHwRefBase *",
    "name" : "const android::hardware::BpHwRefBase *",
-   "referenced_type" : "type-1375",
-   "self_type" : "type-1376",
+   "referenced_type" : "type-1378",
+   "self_type" : "type-1379",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -27653,8 +27692,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::bufferqueue::V2_0::Status> *",
    "name" : "const android::hardware::Return<android::hardware::graphics::bufferqueue::V2_0::Status> *",
-   "referenced_type" : "type-7670",
-   "self_type" : "type-7671",
+   "referenced_type" : "type-7692",
+   "self_type" : "type-7693",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27662,24 +27701,6 @@
    "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,
@@ -27687,8 +27708,8 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> > *",
-   "name" : "const android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> > *",
+   "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-4501",
    "self_type" : "type-4502",
    "size" : 8,
@@ -27696,10 +27717,28 @@
   },
   {
    "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-4378",
+   "self_type" : "type-4379",
+   "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-4507",
+   "self_type" : "type-4508",
+   "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-4360",
-   "self_type" : "type-4361",
+   "referenced_type" : "type-4366",
+   "self_type" : "type-4367",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27707,8 +27746,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<int> *",
    "name" : "const android::hardware::Return<int> *",
-   "referenced_type" : "type-4701",
-   "self_type" : "type-4703",
+   "referenced_type" : "type-4708",
+   "self_type" : "type-4710",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27716,8 +27755,8 @@
    "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",
+   "referenced_type" : "type-7694",
+   "self_type" : "type-7695",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27779,8 +27818,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-4351",
-   "self_type" : "type-4352",
+   "referenced_type" : "type-4357",
+   "self_type" : "type-4358",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -27806,8 +27845,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-2462",
-   "self_type" : "type-2464",
+   "referenced_type" : "type-2465",
+   "self_type" : "type-2467",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27833,8 +27872,8 @@
    "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",
+   "referenced_type" : "type-4735",
+   "self_type" : "type-4736",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -27896,8 +27935,8 @@
    "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",
+   "referenced_type" : "type-4389",
+   "self_type" : "type-4390",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -27932,8 +27971,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-2621",
-   "self_type" : "type-2629",
+   "referenced_type" : "type-2624",
+   "self_type" : "type-2632",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27941,8 +27980,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-2619",
-   "self_type" : "type-2628",
+   "referenced_type" : "type-2622",
+   "self_type" : "type-2631",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27950,8 +27989,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-2615",
-   "self_type" : "type-2627",
+   "referenced_type" : "type-2618",
+   "self_type" : "type-2630",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27959,8 +27998,8 @@
    "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-2515",
+   "referenced_type" : "type-1312",
+   "self_type" : "type-2518",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27969,7 +28008,7 @@
    "linker_set_key" : "const android::sp<android::ALooper> *",
    "name" : "const android::sp<android::ALooper> *",
    "referenced_type" : "type-321",
-   "self_type" : "type-2279",
+   "self_type" : "type-2282",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27977,8 +28016,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::AMessage> *",
    "name" : "const android::sp<android::AMessage> *",
-   "referenced_type" : "type-2177",
-   "self_type" : "type-2205",
+   "referenced_type" : "type-2176",
+   "self_type" : "type-2208",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27995,8 +28034,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::ComponentWrapper> *",
    "name" : "const android::sp<android::ComponentWrapper> *",
-   "referenced_type" : "type-2493",
-   "self_type" : "type-2495",
+   "referenced_type" : "type-2496",
+   "self_type" : "type-2498",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28013,8 +28052,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::Fence> *",
    "name" : "const android::sp<android::Fence> *",
-   "referenced_type" : "type-1864",
-   "self_type" : "type-2531",
+   "referenced_type" : "type-1868",
+   "self_type" : "type-2534",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28022,8 +28061,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::FrameDropper> *",
    "name" : "const android::sp<android::FrameDropper> *",
-   "referenced_type" : "type-2508",
-   "self_type" : "type-2509",
+   "referenced_type" : "type-2511",
+   "self_type" : "type-2512",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28031,8 +28070,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::GraphicBuffer> *",
    "name" : "const android::sp<android::GraphicBuffer> *",
-   "referenced_type" : "type-1197",
-   "self_type" : "type-1196",
+   "referenced_type" : "type-1200",
+   "self_type" : "type-1199",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28040,8 +28079,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::GraphicBufferSource> *",
    "name" : "const android::sp<android::GraphicBufferSource> *",
-   "referenced_type" : "type-2546",
-   "self_type" : "type-2547",
+   "referenced_type" : "type-2549",
+   "self_type" : "type-2550",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28049,8 +28088,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
    "name" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
-   "referenced_type" : "type-4267",
-   "self_type" : "type-4266",
+   "referenced_type" : "type-4273",
+   "self_type" : "type-4272",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28058,8 +28097,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
    "name" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
-   "referenced_type" : "type-4276",
-   "self_type" : "type-4275",
+   "referenced_type" : "type-4282",
+   "self_type" : "type-4281",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28067,8 +28106,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
    "name" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
-   "referenced_type" : "type-4829",
-   "self_type" : "type-4842",
+   "referenced_type" : "type-4837",
+   "self_type" : "type-4848",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28076,8 +28115,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
    "name" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
-   "referenced_type" : "type-5110",
-   "self_type" : "type-5119",
+   "referenced_type" : "type-5126",
+   "self_type" : "type-5135",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28085,8 +28124,8 @@
    "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",
+   "referenced_type" : "type-4309",
+   "self_type" : "type-4393",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28094,8 +28133,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::IBinder> *",
    "name" : "const android::sp<android::IBinder> *",
-   "referenced_type" : "type-1037",
-   "self_type" : "type-1273",
+   "referenced_type" : "type-1041",
+   "self_type" : "type-1277",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28113,7 +28152,7 @@
    "linker_set_key" : "const android::sp<android::IGraphicBufferConsumer> *",
    "name" : "const android::sp<android::IGraphicBufferConsumer> *",
    "referenced_type" : "type-790",
-   "self_type" : "type-2502",
+   "self_type" : "type-2505",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28121,8 +28160,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer> *",
    "name" : "const android::sp<android::IGraphicBufferProducer> *",
-   "referenced_type" : "type-2487",
-   "self_type" : "type-2489",
+   "referenced_type" : "type-2490",
+   "self_type" : "type-2492",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28130,8 +28169,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::IInterface> *",
    "name" : "const android::sp<android::IInterface> *",
-   "referenced_type" : "type-1488",
-   "self_type" : "type-1494",
+   "referenced_type" : "type-1492",
+   "self_type" : "type-1498",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28149,7 +28188,7 @@
    "linker_set_key" : "const android::sp<android::NativeHandle> *",
    "name" : "const android::sp<android::NativeHandle> *",
    "referenced_type" : "type-935",
-   "self_type" : "type-1598",
+   "self_type" : "type-1602",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28157,8 +28196,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-2470",
-   "self_type" : "type-2471",
+   "referenced_type" : "type-2473",
+   "self_type" : "type-2474",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28166,8 +28205,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> *",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> *",
-   "referenced_type" : "type-2460",
-   "self_type" : "type-2461",
+   "referenced_type" : "type-2463",
+   "self_type" : "type-2464",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28175,8 +28214,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer> *",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer> *",
-   "referenced_type" : "type-4242",
-   "self_type" : "type-4281",
+   "referenced_type" : "type-4248",
+   "self_type" : "type-4287",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28184,8 +28223,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener> *",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener> *",
-   "referenced_type" : "type-4473",
-   "self_type" : "type-4472",
+   "referenced_type" : "type-4479",
+   "self_type" : "type-4478",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28193,8 +28232,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-2484",
-   "self_type" : "type-2485",
+   "referenced_type" : "type-2487",
+   "self_type" : "type-2488",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28202,8 +28241,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> *",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> *",
-   "referenced_type" : "type-2476",
-   "self_type" : "type-2477",
+   "referenced_type" : "type-2479",
+   "self_type" : "type-2480",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28211,8 +28250,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer> *",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer> *",
-   "referenced_type" : "type-4236",
-   "self_type" : "type-4279",
+   "referenced_type" : "type-4242",
+   "self_type" : "type-4285",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28220,8 +28259,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener> *",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener> *",
-   "referenced_type" : "type-4466",
-   "self_type" : "type-4465",
+   "referenced_type" : "type-4472",
+   "self_type" : "type-4471",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28230,7 +28269,7 @@
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient> *",
    "name" : "const android::sp<android::hardware::hidl_death_recipient> *",
    "referenced_type" : "type-514",
-   "self_type" : "type-2444",
+   "self_type" : "type-2447",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28238,8 +28277,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-2448",
-   "self_type" : "type-2449",
+   "referenced_type" : "type-2451",
+   "self_type" : "type-2452",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28247,8 +28286,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "referenced_type" : "type-2454",
-   "self_type" : "type-2455",
+   "referenced_type" : "type-2457",
+   "self_type" : "type-2458",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28283,8 +28322,8 @@
    "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",
+   "referenced_type" : "type-4299",
+   "self_type" : "type-4314",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28301,8 +28340,8 @@
    "alignment" : 8,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-1242",
-   "self_type" : "type-1241",
+   "referenced_type" : "type-1245",
+   "self_type" : "type-1244",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -28328,8 +28367,8 @@
    "alignment" : 8,
    "linker_set_key" : "const log_msg *",
    "name" : "const log_msg *",
-   "referenced_type" : "type-2315",
-   "self_type" : "type-2321",
+   "referenced_type" : "type-2318",
+   "self_type" : "type-2324",
    "size" : 8,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -28338,7 +28377,7 @@
    "linker_set_key" : "const long *",
    "name" : "const long *",
    "referenced_type" : "type-560",
-   "self_type" : "type-1069",
+   "self_type" : "type-1072",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28356,7 +28395,7 @@
    "linker_set_key" : "const signed char *",
    "name" : "const signed char *",
    "referenced_type" : "type-437",
-   "self_type" : "type-4727",
+   "self_type" : "type-4733",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28364,8 +28403,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-4763",
-   "self_type" : "type-4765",
+   "referenced_type" : "type-4770",
+   "self_type" : "type-4772",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28373,8 +28412,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-4866",
-   "self_type" : "type-4868",
+   "referenced_type" : "type-4872",
+   "self_type" : "type-4874",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28382,8 +28421,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-5085",
-   "self_type" : "type-5091",
+   "referenced_type" : "type-5101",
+   "self_type" : "type-5107",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28391,8 +28430,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-5138",
-   "self_type" : "type-5140",
+   "referenced_type" : "type-5154",
+   "self_type" : "type-5157",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28400,8 +28439,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-7374",
-   "self_type" : "type-7376",
+   "referenced_type" : "type-7397",
+   "self_type" : "type-7400",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28409,8 +28448,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-7468",
-   "self_type" : "type-7470",
+   "referenced_type" : "type-7493",
+   "self_type" : "type-7495",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28418,8 +28457,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-7596",
-   "self_type" : "type-7598",
+   "referenced_type" : "type-7619",
+   "self_type" : "type-7621",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28464,7 +28503,7 @@
    "linker_set_key" : "float *",
    "name" : "float *",
    "referenced_type" : "type-268",
-   "self_type" : "type-1276",
+   "self_type" : "type-1279",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28482,7 +28521,7 @@
    "linker_set_key" : "int *",
    "name" : "int *",
    "referenced_type" : "type-4",
-   "self_type" : "type-1510",
+   "self_type" : "type-1513",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28490,8 +28529,8 @@
    "alignment" : 8,
    "linker_set_key" : "log_msg *",
    "name" : "log_msg *",
-   "referenced_type" : "type-2178",
-   "self_type" : "type-2343",
+   "referenced_type" : "type-2181",
+   "self_type" : "type-2346",
    "size" : 8,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -28518,7 +28557,7 @@
    "linker_set_key" : "signed char *",
    "name" : "signed char *",
    "referenced_type" : "type-438",
-   "self_type" : "type-4734",
+   "self_type" : "type-4740",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28526,8 +28565,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<> *",
    "name" : "std::tuple<> *",
-   "referenced_type" : "type-1567",
-   "self_type" : "type-1566",
+   "referenced_type" : "type-1570",
+   "self_type" : "type-1569",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28535,429 +28574,6 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<> *",
    "name" : "std::tuple<> *",
-   "referenced_type" : "type-2074",
-   "self_type" : "type-2073",
-   "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-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,
@@ -28965,10 +28581,415 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "std::tuple<unsigned long> *",
-   "name" : "std::tuple<unsigned long> *",
-   "referenced_type" : "type-4165",
-   "self_type" : "type-4164",
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-4058",
+   "self_type" : "type-4057",
+   "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-4169",
+   "self_type" : "type-4168",
+   "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-6663",
+   "self_type" : "type-6662",
+   "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-6786",
+   "self_type" : "type-6785",
+   "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-2056",
+   "self_type" : "type-2055",
+   "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-4153",
+   "self_type" : "type-4152",
+   "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-6770",
+   "self_type" : "type-6769",
+   "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-1576",
+   "self_type" : "type-1575",
+   "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-4061",
+   "self_type" : "type-4060",
+   "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-6666",
+   "self_type" : "type-6665",
+   "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-2121",
+   "self_type" : "type-2120",
+   "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-4198",
+   "self_type" : "type-4197",
+   "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-6816",
+   "self_type" : "type-6815",
+   "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-2091",
+   "self_type" : "type-2090",
+   "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-4178",
+   "self_type" : "type-4177",
+   "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-6795",
+   "self_type" : "type-6794",
+   "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-2097",
+   "self_type" : "type-2096",
+   "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-4182",
+   "self_type" : "type-4181",
+   "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-6798",
+   "self_type" : "type-6797",
+   "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-2116",
+   "self_type" : "type-2115",
+   "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-4195",
+   "self_type" : "type-4194",
+   "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-6813",
+   "self_type" : "type-6812",
+   "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-2103",
+   "self_type" : "type-2102",
+   "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-4186",
+   "self_type" : "type-4185",
+   "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-6803",
+   "self_type" : "type-6802",
+   "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-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, sp<GraphicBuffer> > *",
+   "name" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "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<int, sp<GraphicBuffer> > *",
+   "name" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "referenced_type" : "type-6776",
+   "self_type" : "type-6775",
+   "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-2069",
+   "self_type" : "type-2068",
+   "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-4162",
+   "self_type" : "type-4161",
+   "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-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> *",
+   "name" : "std::tuple<int> *",
+   "referenced_type" : "type-2060",
+   "self_type" : "type-2059",
+   "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-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> *",
+   "name" : "std::tuple<int> *",
+   "referenced_type" : "type-6773",
+   "self_type" : "type-6772",
+   "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-2074",
+   "self_type" : "type-2073",
+   "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-4166",
+   "self_type" : "type-4165",
+   "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-6782",
+   "self_type" : "type-6781",
+   "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-2112",
+   "self_type" : "type-2111",
+   "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-4192",
+   "self_type" : "type-4191",
+   "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-6810",
+   "self_type" : "type-6809",
+   "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-2087",
+   "self_type" : "type-2086",
+   "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-4175",
+   "self_type" : "type-4174",
+   "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-6792",
+   "self_type" : "type-6791",
+   "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-2108",
+   "self_type" : "type-2107",
+   "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-4189",
+   "self_type" : "type-4188",
+   "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-6806",
+   "self_type" : "type-6805",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28976,8 +28997,26 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<unsigned long> *",
    "name" : "std::tuple<unsigned long> *",
-   "referenced_type" : "type-6765",
-   "self_type" : "type-6764",
+   "referenced_type" : "type-2082",
+   "self_type" : "type-2081",
+   "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-4172",
+   "self_type" : "type-4171",
+   "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-6789",
+   "self_type" : "type-6788",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28985,8 +29024,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > *",
    "name" : "std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > *",
-   "referenced_type" : "type-1650",
-   "self_type" : "type-1649",
+   "referenced_type" : "type-1654",
+   "self_type" : "type-1653",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -28994,8 +29033,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > *",
    "name" : "std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > *",
-   "referenced_type" : "type-4113",
-   "self_type" : "type-4112",
+   "referenced_type" : "type-4119",
+   "self_type" : "type-4118",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -29003,8 +29042,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > *",
    "name" : "std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > *",
-   "referenced_type" : "type-6699",
-   "self_type" : "type-6698",
+   "referenced_type" : "type-6722",
+   "self_type" : "type-6721",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -29012,8 +29051,8 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned char (*)[128]",
    "name" : "unsigned char (*)[128]",
-   "referenced_type" : "type-1528",
-   "self_type" : "type-2362",
+   "referenced_type" : "type-1530",
+   "self_type" : "type-2365",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -29031,7 +29070,7 @@
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
    "referenced_type" : "type-2",
-   "self_type" : "type-1682",
+   "self_type" : "type-1686",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -29040,7 +29079,7 @@
    "linker_set_key" : "unsigned long *",
    "name" : "unsigned long *",
    "referenced_type" : "type-11",
-   "self_type" : "type-1679",
+   "self_type" : "type-1683",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -29066,8 +29105,8 @@
    "alignment" : 8,
    "linker_set_key" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned long, const unsigned long long *, unsigned long, void *)",
    "name" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned long, const unsigned long long *, unsigned long, void *)",
-   "referenced_type" : "type-1381",
-   "self_type" : "type-1380",
+   "referenced_type" : "type-1384",
+   "self_type" : "type-1383",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -29107,8 +29146,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1079",
-   "self_type" : "type-1081",
+   "referenced_type" : "type-1082",
+   "self_type" : "type-1084",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29117,8 +29156,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1190",
-   "self_type" : "type-1192",
+   "referenced_type" : "type-1193",
+   "self_type" : "type-1196",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29127,8 +29166,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1352",
-   "self_type" : "type-1354",
+   "referenced_type" : "type-1355",
+   "self_type" : "type-1357",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29137,8 +29176,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1404",
-   "self_type" : "type-1406",
+   "referenced_type" : "type-1407",
+   "self_type" : "type-1409",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29147,8 +29186,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1422",
+   "referenced_type" : "type-1423",
+   "self_type" : "type-1425",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29157,8 +29196,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",
+   "referenced_type" : "type-1444",
+   "self_type" : "type-1446",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29167,8 +29206,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",
+   "referenced_type" : "type-1485",
+   "self_type" : "type-1488",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29177,8 +29216,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",
+   "referenced_type" : "type-1620",
+   "self_type" : "type-1622",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29187,8 +29226,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",
+   "referenced_type" : "type-2653",
+   "self_type" : "type-2656",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29197,8 +29236,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",
+   "referenced_type" : "type-3461",
+   "self_type" : "type-3463",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29207,8 +29246,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",
+   "referenced_type" : "type-3529",
+   "self_type" : "type-3531",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29217,8 +29256,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",
+   "referenced_type" : "type-3631",
+   "self_type" : "type-3633",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29227,8 +29266,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",
+   "referenced_type" : "type-3696",
+   "self_type" : "type-3698",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29237,8 +29276,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",
+   "referenced_type" : "type-3788",
+   "self_type" : "type-3790",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29247,8 +29286,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",
+   "referenced_type" : "type-3847",
+   "self_type" : "type-3846",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29257,8 +29296,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",
+   "referenced_type" : "type-3913",
+   "self_type" : "type-3915",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29267,8 +29306,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",
+   "referenced_type" : "type-3939",
+   "self_type" : "type-3941",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29277,8 +29316,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",
+   "referenced_type" : "type-3954",
+   "self_type" : "type-3956",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29287,8 +29326,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",
+   "referenced_type" : "type-3980",
+   "self_type" : "type-3982",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29297,8 +29336,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",
+   "referenced_type" : "type-4013",
+   "self_type" : "type-4015",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29307,8 +29346,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",
+   "referenced_type" : "type-4094",
+   "self_type" : "type-4096",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29317,8 +29356,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",
+   "referenced_type" : "type-4295",
+   "self_type" : "type-4297",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29327,8 +29366,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",
+   "referenced_type" : "type-4482",
+   "self_type" : "type-4484",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29337,8 +29376,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",
+   "referenced_type" : "type-4535",
+   "self_type" : "type-4537",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29347,8 +29386,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",
+   "referenced_type" : "type-4544",
+   "self_type" : "type-4546",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29357,8 +29396,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",
+   "referenced_type" : "type-4569",
+   "self_type" : "type-4571",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29367,8 +29406,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",
+   "referenced_type" : "type-4721",
+   "self_type" : "type-4723",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29377,8 +29416,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",
+   "referenced_type" : "type-4853",
+   "self_type" : "type-4855",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29387,8 +29426,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",
+   "referenced_type" : "type-4999",
+   "self_type" : "type-5001",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29397,8 +29436,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",
+   "referenced_type" : "type-5136",
+   "self_type" : "type-5138",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29407,8 +29446,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",
+   "referenced_type" : "type-5175",
+   "self_type" : "type-5177",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29417,8 +29456,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",
+   "referenced_type" : "type-5550",
+   "self_type" : "type-5552",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29427,8 +29466,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",
+   "referenced_type" : "type-5618",
+   "self_type" : "type-5620",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29447,8 +29486,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",
+   "referenced_type" : "type-5720",
+   "self_type" : "type-5722",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29457,8 +29496,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",
+   "referenced_type" : "type-5785",
+   "self_type" : "type-5787",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29467,8 +29506,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",
+   "referenced_type" : "type-5877",
+   "self_type" : "type-5879",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29477,8 +29516,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",
+   "referenced_type" : "type-5936",
+   "self_type" : "type-5935",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29487,8 +29526,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",
+   "referenced_type" : "type-6000",
+   "self_type" : "type-6002",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29497,8 +29536,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",
+   "referenced_type" : "type-6060",
+   "self_type" : "type-6062",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29507,8 +29546,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",
+   "referenced_type" : "type-6156",
+   "self_type" : "type-6158",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29517,8 +29556,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",
+   "referenced_type" : "type-6208",
+   "self_type" : "type-6210",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29527,8 +29566,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",
+   "referenced_type" : "type-6297",
+   "self_type" : "type-6299",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29537,8 +29576,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",
+   "referenced_type" : "type-6349",
+   "self_type" : "type-6351",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29547,8 +29586,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",
+   "referenced_type" : "type-6429",
+   "self_type" : "type-6431",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29557,8 +29596,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",
+   "referenced_type" : "type-6522",
+   "self_type" : "type-6524",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29567,8 +29606,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",
+   "referenced_type" : "type-6548",
+   "self_type" : "type-6551",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29577,8 +29616,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",
+   "referenced_type" : "type-6565",
+   "self_type" : "type-6567",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29587,8 +29626,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",
+   "referenced_type" : "type-6586",
+   "self_type" : "type-6588",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29597,8 +29636,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",
+   "referenced_type" : "type-6618",
+   "self_type" : "type-6620",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29607,8 +29646,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",
+   "referenced_type" : "type-6698",
+   "self_type" : "type-6700",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29617,8 +29656,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",
+   "referenced_type" : "type-6916",
+   "self_type" : "type-6918",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29627,8 +29666,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",
+   "referenced_type" : "type-7101",
+   "self_type" : "type-7103",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29637,8 +29676,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",
+   "referenced_type" : "type-7164",
+   "self_type" : "type-7166",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29647,8 +29686,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",
+   "referenced_type" : "type-7179",
+   "self_type" : "type-7181",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29657,8 +29696,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",
+   "referenced_type" : "type-7215",
+   "self_type" : "type-7217",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29667,8 +29706,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",
+   "referenced_type" : "type-7364",
+   "self_type" : "type-7366",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29687,8 +29726,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",
+   "referenced_type" : "type-7465",
+   "self_type" : "type-7467",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29697,8 +29736,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",
+   "referenced_type" : "type-7502",
+   "self_type" : "type-7504",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29707,8 +29746,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",
+   "referenced_type" : "type-7556",
+   "self_type" : "type-7558",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29717,8 +29756,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",
+   "referenced_type" : "type-7604",
+   "self_type" : "type-7610",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29727,8 +29766,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",
+   "referenced_type" : "type-7636",
+   "self_type" : "type-7638",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29737,8 +29776,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",
+   "referenced_type" : "type-7701",
+   "self_type" : "type-7703",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29767,8 +29806,8 @@
    "is_const" : true,
    "linker_set_key" : "android::hardware::IBinder *const",
    "name" : "android::hardware::IBinder *const",
-   "referenced_type" : "type-1359",
-   "self_type" : "type-1373",
+   "referenced_type" : "type-1362",
+   "self_type" : "type-1376",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -29778,7 +29817,7 @@
    "linker_set_key" : "const android::AHandler",
    "name" : "const android::AHandler",
    "referenced_type" : "type-264",
-   "self_type" : "type-2520",
+   "self_type" : "type-2523",
    "size" : 88,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29788,7 +29827,7 @@
    "linker_set_key" : "const android::AHandlerReflector<android::GraphicBufferSource>",
    "name" : "const android::AHandlerReflector<android::GraphicBufferSource>",
    "referenced_type" : "type-583",
-   "self_type" : "type-2516",
+   "self_type" : "type-2519",
    "size" : 104,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29798,7 +29837,7 @@
    "linker_set_key" : "const android::ALooper",
    "name" : "const android::ALooper",
    "referenced_type" : "type-248",
-   "self_type" : "type-2291",
+   "self_type" : "type-2294",
    "size" : 248,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29807,8 +29846,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AReplyToken",
    "name" : "const android::AReplyToken",
-   "referenced_type" : "type-1045",
-   "self_type" : "type-1170",
+   "referenced_type" : "type-1044",
+   "self_type" : "type-1171",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -29818,7 +29857,7 @@
    "linker_set_key" : "const android::AString",
    "name" : "const android::AString",
    "referenced_type" : "type-253",
-   "self_type" : "type-2101",
+   "self_type" : "type-2093",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -29848,7 +29887,7 @@
    "linker_set_key" : "const android::BnInterface<android::IGraphicBufferProducer>",
    "name" : "const android::BnInterface<android::IGraphicBufferProducer>",
    "referenced_type" : "type-73",
-   "self_type" : "type-1232",
+   "self_type" : "type-1236",
    "size" : 48,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -29858,7 +29897,7 @@
    "linker_set_key" : "const android::BnInterface<android::IProducerListener>",
    "name" : "const android::BnInterface<android::IProducerListener>",
    "referenced_type" : "type-82",
-   "self_type" : "type-4480",
+   "self_type" : "type-4486",
    "size" : 56,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -29867,8 +29906,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",
+   "referenced_type" : "type-1035",
+   "self_type" : "type-1097",
    "size" : 48,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -29887,8 +29926,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-1071",
-   "self_type" : "type-1070",
+   "referenced_type" : "type-1074",
+   "self_type" : "type-1073",
    "size" : 216,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -29897,8 +29936,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-1220",
-   "self_type" : "type-1219",
+   "referenced_type" : "type-1224",
+   "self_type" : "type-1223",
    "size" : 216,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -29907,8 +29946,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-1532",
-   "self_type" : "type-1531",
+   "referenced_type" : "type-1535",
+   "self_type" : "type-1534",
    "size" : 216,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -29917,8 +29956,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-1673",
-   "self_type" : "type-1672",
+   "referenced_type" : "type-1677",
+   "self_type" : "type-1676",
    "size" : 216,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -29927,8 +29966,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-3442",
-   "self_type" : "type-3441",
+   "referenced_type" : "type-3445",
+   "self_type" : "type-3444",
    "size" : 216,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -29937,8 +29976,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-3636",
-   "self_type" : "type-3635",
+   "referenced_type" : "type-3639",
+   "self_type" : "type-3638",
    "size" : 216,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -29947,8 +29986,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-3685",
-   "self_type" : "type-3684",
+   "referenced_type" : "type-3691",
+   "self_type" : "type-3690",
    "size" : 216,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -29957,8 +29996,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-3793",
-   "self_type" : "type-3792",
+   "referenced_type" : "type-3800",
+   "self_type" : "type-3799",
    "size" : 216,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -29967,8 +30006,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-4043",
-   "self_type" : "type-4042",
+   "referenced_type" : "type-4050",
+   "self_type" : "type-4049",
    "size" : 216,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -29977,8 +30016,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-4129",
-   "self_type" : "type-4128",
+   "referenced_type" : "type-4135",
+   "self_type" : "type-4134",
    "size" : 216,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -29987,8 +30026,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-5517",
-   "self_type" : "type-5516",
+   "referenced_type" : "type-5534",
+   "self_type" : "type-5533",
    "size" : 216,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -29997,8 +30036,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-5711",
-   "self_type" : "type-5710",
+   "referenced_type" : "type-5728",
+   "self_type" : "type-5727",
    "size" : 216,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30007,8 +30046,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-5760",
-   "self_type" : "type-5759",
+   "referenced_type" : "type-5780",
+   "self_type" : "type-5779",
    "size" : 216,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -30017,8 +30056,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-5868",
-   "self_type" : "type-5867",
+   "referenced_type" : "type-5889",
+   "self_type" : "type-5888",
    "size" : 216,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30027,8 +30066,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-6123",
-   "self_type" : "type-6122",
+   "referenced_type" : "type-6143",
+   "self_type" : "type-6142",
    "size" : 216,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -30037,8 +30076,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-6282",
-   "self_type" : "type-6281",
+   "referenced_type" : "type-6302",
+   "self_type" : "type-6301",
    "size" : 216,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30047,8 +30086,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-6324",
-   "self_type" : "type-6323",
+   "referenced_type" : "type-6347",
+   "self_type" : "type-6346",
    "size" : 216,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -30057,8 +30096,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-6415",
-   "self_type" : "type-6414",
+   "referenced_type" : "type-6438",
+   "self_type" : "type-6437",
    "size" : 216,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30067,8 +30106,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-6633",
-   "self_type" : "type-6632",
+   "referenced_type" : "type-6656",
+   "self_type" : "type-6655",
    "size" : 216,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -30077,8 +30116,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-6715",
-   "self_type" : "type-6714",
+   "referenced_type" : "type-6738",
+   "self_type" : "type-6737",
    "size" : 216,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -30107,9 +30146,9 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferQueueCore",
    "name" : "const android::BufferQueueCore",
-   "referenced_type" : "type-3524",
-   "self_type" : "type-3523",
-   "size" : 5224,
+   "referenced_type" : "type-3527",
+   "self_type" : "type-3526",
+   "size" : 5232,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -30117,9 +30156,9 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferQueueCore",
    "name" : "const android::BufferQueueCore",
-   "referenced_type" : "type-5599",
-   "self_type" : "type-5598",
-   "size" : 5224,
+   "referenced_type" : "type-5616",
+   "self_type" : "type-5615",
+   "size" : 5232,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -30127,9 +30166,9 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferQueueCore",
    "name" : "const android::BufferQueueCore",
-   "referenced_type" : "type-6185",
-   "self_type" : "type-6184",
-   "size" : 5224,
+   "referenced_type" : "type-6205",
+   "self_type" : "type-6204",
+   "size" : 5232,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -30139,7 +30178,7 @@
    "name" : "const android::BufferQueueCore",
    "referenced_type" : "type-833",
    "self_type" : "type-832",
-   "size" : 5224,
+   "size" : 5232,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -30148,7 +30187,7 @@
    "linker_set_key" : "const android::ComponentWrapper",
    "name" : "const android::ComponentWrapper",
    "referenced_type" : "type-569",
-   "self_type" : "type-2496",
+   "self_type" : "type-2499",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30157,8 +30196,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::CompositorTiming",
    "name" : "const android::CompositorTiming",
-   "referenced_type" : "type-1426",
-   "self_type" : "type-1425",
+   "referenced_type" : "type-1429",
+   "self_type" : "type-1428",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30167,8 +30206,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::CompositorTiming",
    "name" : "const android::CompositorTiming",
-   "referenced_type" : "type-3955",
-   "self_type" : "type-3954",
+   "referenced_type" : "type-3961",
+   "self_type" : "type-3960",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30177,8 +30216,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::CompositorTiming",
    "name" : "const android::CompositorTiming",
-   "referenced_type" : "type-6548",
-   "self_type" : "type-6547",
+   "referenced_type" : "type-6571",
+   "self_type" : "type-6570",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30187,8 +30226,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ConsumerListener",
    "name" : "const android::ConsumerListener",
-   "referenced_type" : "type-3516",
-   "self_type" : "type-3515",
+   "referenced_type" : "type-3519",
+   "self_type" : "type-3518",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30197,8 +30236,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ConsumerListener",
    "name" : "const android::ConsumerListener",
-   "referenced_type" : "type-5591",
-   "self_type" : "type-5590",
+   "referenced_type" : "type-5608",
+   "self_type" : "type-5607",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30207,8 +30246,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ConsumerListener",
    "name" : "const android::ConsumerListener",
-   "referenced_type" : "type-6180",
-   "self_type" : "type-6179",
+   "referenced_type" : "type-6200",
+   "self_type" : "type-6199",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30227,8 +30266,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-1310",
-   "self_type" : "type-1309",
+   "referenced_type" : "type-1314",
+   "self_type" : "type-1313",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30237,8 +30276,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-2533",
-   "self_type" : "type-2532",
+   "referenced_type" : "type-2536",
+   "self_type" : "type-2535",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30247,8 +30286,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-3449",
-   "self_type" : "type-3448",
+   "referenced_type" : "type-3452",
+   "self_type" : "type-3451",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30257,8 +30296,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-3596",
-   "self_type" : "type-3595",
+   "referenced_type" : "type-3599",
+   "self_type" : "type-3598",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30267,8 +30306,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-3861",
-   "self_type" : "type-3860",
+   "referenced_type" : "type-3868",
+   "self_type" : "type-3867",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30277,8 +30316,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-4426",
-   "self_type" : "type-4425",
+   "referenced_type" : "type-4432",
+   "self_type" : "type-4431",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30287,8 +30326,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-4676",
-   "self_type" : "type-4675",
+   "referenced_type" : "type-4683",
+   "self_type" : "type-4682",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30297,8 +30336,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-4945",
-   "self_type" : "type-4944",
+   "referenced_type" : "type-4951",
+   "self_type" : "type-4950",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30307,8 +30346,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-5524",
-   "self_type" : "type-5523",
+   "referenced_type" : "type-5541",
+   "self_type" : "type-5540",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30317,8 +30356,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-5671",
-   "self_type" : "type-5670",
+   "referenced_type" : "type-5688",
+   "self_type" : "type-5687",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30327,8 +30366,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-5936",
-   "self_type" : "type-5935",
+   "referenced_type" : "type-5957",
+   "self_type" : "type-5956",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30337,8 +30376,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-6017",
-   "self_type" : "type-6016",
+   "referenced_type" : "type-6037",
+   "self_type" : "type-6036",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30347,8 +30386,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-6128",
-   "self_type" : "type-6127",
+   "referenced_type" : "type-6148",
+   "self_type" : "type-6147",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30357,8 +30396,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-6256",
-   "self_type" : "type-6255",
+   "referenced_type" : "type-6276",
+   "self_type" : "type-6275",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30367,8 +30406,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-6456",
-   "self_type" : "type-6455",
+   "referenced_type" : "type-6480",
+   "self_type" : "type-6479",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30377,8 +30416,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-7030",
-   "self_type" : "type-7029",
+   "referenced_type" : "type-7054",
+   "self_type" : "type-7053",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30387,8 +30426,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-7207",
-   "self_type" : "type-7206",
+   "referenced_type" : "type-7229",
+   "self_type" : "type-7228",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30407,8 +30446,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-7317",
-   "self_type" : "type-7316",
+   "referenced_type" : "type-7340",
+   "self_type" : "type-7339",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30427,8 +30466,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot::State",
    "name" : "const android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-4583",
-   "self_type" : "type-4582",
+   "referenced_type" : "type-4589",
+   "self_type" : "type-4588",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30437,8 +30476,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot::State",
    "name" : "const android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-4752",
-   "self_type" : "type-4751",
+   "referenced_type" : "type-4758",
+   "self_type" : "type-4757",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30447,8 +30486,8 @@
    "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",
+   "referenced_type" : "type-7243",
+   "self_type" : "type-7242",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30457,8 +30496,8 @@
    "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",
+   "referenced_type" : "type-7389",
+   "self_type" : "type-7388",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30467,8 +30506,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FileDescriptor::Autoclose",
    "name" : "const android::FileDescriptor::Autoclose",
-   "referenced_type" : "type-1213",
-   "self_type" : "type-1230",
+   "referenced_type" : "type-1211",
+   "self_type" : "type-1228",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h"
   },
@@ -30478,7 +30517,7 @@
    "linker_set_key" : "const android::Flattenable<android::BufferItem>",
    "name" : "const android::Flattenable<android::BufferItem>",
    "referenced_type" : "type-22",
-   "self_type" : "type-1507",
+   "self_type" : "type-1510",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30488,7 +30527,7 @@
    "linker_set_key" : "const android::Flattenable<android::Fence>",
    "name" : "const android::Flattenable<android::Fence>",
    "referenced_type" : "type-17",
-   "self_type" : "type-1635",
+   "self_type" : "type-1639",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30498,7 +30537,7 @@
    "linker_set_key" : "const android::Flattenable<android::FrameEventHistoryDelta>",
    "name" : "const android::Flattenable<android::FrameEventHistoryDelta>",
    "referenced_type" : "type-26",
-   "self_type" : "type-4309",
+   "self_type" : "type-4315",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30508,7 +30547,7 @@
    "linker_set_key" : "const android::Flattenable<android::GraphicBuffer>",
    "name" : "const android::Flattenable<android::GraphicBuffer>",
    "referenced_type" : "type-15",
-   "self_type" : "type-1639",
+   "self_type" : "type-1644",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30518,7 +30557,7 @@
    "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
    "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
    "referenced_type" : "type-33",
-   "self_type" : "type-4312",
+   "self_type" : "type-4318",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30528,7 +30567,7 @@
    "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
    "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
    "referenced_type" : "type-35",
-   "self_type" : "type-4315",
+   "self_type" : "type-4321",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30538,7 +30577,7 @@
    "linker_set_key" : "const android::FrameDropper",
    "name" : "const android::FrameDropper",
    "referenced_type" : "type-580",
-   "self_type" : "type-2511",
+   "self_type" : "type-2514",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30547,8 +30586,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-1348",
-   "self_type" : "type-1347",
+   "referenced_type" : "type-1351",
+   "self_type" : "type-1350",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30557,8 +30596,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-1462",
-   "self_type" : "type-1461",
+   "referenced_type" : "type-1466",
+   "self_type" : "type-1465",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30567,8 +30606,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-2406",
-   "self_type" : "type-2405",
+   "referenced_type" : "type-2409",
+   "self_type" : "type-2408",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30577,8 +30616,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-3455",
-   "self_type" : "type-3454",
+   "referenced_type" : "type-3458",
+   "self_type" : "type-3457",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30587,8 +30626,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-3601",
-   "self_type" : "type-3600",
+   "referenced_type" : "type-3604",
+   "self_type" : "type-3603",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30597,8 +30636,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-3901",
-   "self_type" : "type-3900",
+   "referenced_type" : "type-3907",
+   "self_type" : "type-3906",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30607,8 +30646,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-3994",
-   "self_type" : "type-3993",
+   "referenced_type" : "type-4000",
+   "self_type" : "type-3999",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30617,8 +30656,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-4222",
-   "self_type" : "type-4221",
+   "referenced_type" : "type-4228",
+   "self_type" : "type-4227",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30627,8 +30666,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-4838",
-   "self_type" : "type-4837",
+   "referenced_type" : "type-4844",
+   "self_type" : "type-4843",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30637,8 +30676,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-5530",
-   "self_type" : "type-5529",
+   "referenced_type" : "type-5547",
+   "self_type" : "type-5546",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30647,8 +30686,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-5676",
-   "self_type" : "type-5675",
+   "referenced_type" : "type-5693",
+   "self_type" : "type-5692",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30657,8 +30696,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-5976",
-   "self_type" : "type-5975",
+   "referenced_type" : "type-5996",
+   "self_type" : "type-5995",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30667,8 +30706,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-5993",
-   "self_type" : "type-5992",
+   "referenced_type" : "type-6013",
+   "self_type" : "type-6012",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30677,8 +30716,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-6133",
-   "self_type" : "type-6132",
+   "referenced_type" : "type-6154",
+   "self_type" : "type-6153",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30687,8 +30726,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-6261",
-   "self_type" : "type-6260",
+   "referenced_type" : "type-6281",
+   "self_type" : "type-6280",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30697,8 +30736,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-6494",
-   "self_type" : "type-6493",
+   "referenced_type" : "type-6518",
+   "self_type" : "type-6517",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30707,8 +30746,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-6582",
-   "self_type" : "type-6581",
+   "referenced_type" : "type-6605",
+   "self_type" : "type-6604",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30717,8 +30756,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-6827",
-   "self_type" : "type-6826",
+   "referenced_type" : "type-6850",
+   "self_type" : "type-6849",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30727,8 +30766,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-6838",
-   "self_type" : "type-6837",
+   "referenced_type" : "type-6861",
+   "self_type" : "type-6860",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30758,7 +30797,7 @@
    "linker_set_key" : "const android::GraphicBufferSource",
    "name" : "const android::GraphicBufferSource",
    "referenced_type" : "type-566",
-   "self_type" : "type-2548",
+   "self_type" : "type-2551",
    "size" : 432,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30788,7 +30827,7 @@
    "linker_set_key" : "const android::IBinder",
    "name" : "const android::IBinder",
    "referenced_type" : "type-53",
-   "self_type" : "type-1520",
+   "self_type" : "type-1524",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30798,7 +30837,7 @@
    "linker_set_key" : "const android::IBinder::DeathRecipient",
    "name" : "const android::IBinder::DeathRecipient",
    "referenced_type" : "type-176",
-   "self_type" : "type-4318",
+   "self_type" : "type-4324",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -30807,8 +30846,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-1157",
-   "self_type" : "type-1156",
+   "referenced_type" : "type-1160",
+   "self_type" : "type-1159",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30817,8 +30856,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-1582",
-   "self_type" : "type-1581",
+   "referenced_type" : "type-1586",
+   "self_type" : "type-1585",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30827,8 +30866,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-3614",
-   "self_type" : "type-3613",
+   "referenced_type" : "type-3617",
+   "self_type" : "type-3616",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30837,8 +30876,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-3761",
-   "self_type" : "type-3760",
+   "referenced_type" : "type-3767",
+   "self_type" : "type-3766",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30847,8 +30886,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-4063",
-   "self_type" : "type-4062",
+   "referenced_type" : "type-4069",
+   "self_type" : "type-4068",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30857,8 +30896,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-5689",
-   "self_type" : "type-5688",
+   "referenced_type" : "type-5706",
+   "self_type" : "type-5705",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30867,8 +30906,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-5836",
-   "self_type" : "type-5835",
+   "referenced_type" : "type-5856",
+   "self_type" : "type-5855",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30877,8 +30916,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-6266",
-   "self_type" : "type-6265",
+   "referenced_type" : "type-6287",
+   "self_type" : "type-6286",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30887,8 +30926,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-6391",
-   "self_type" : "type-6390",
+   "referenced_type" : "type-6414",
+   "self_type" : "type-6413",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30897,8 +30936,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-6650",
-   "self_type" : "type-6649",
+   "referenced_type" : "type-6673",
+   "self_type" : "type-6672",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30917,8 +30956,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-1606",
-   "self_type" : "type-1605",
+   "referenced_type" : "type-1610",
+   "self_type" : "type-1609",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30927,8 +30966,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-2504",
-   "self_type" : "type-2503",
+   "referenced_type" : "type-2507",
+   "self_type" : "type-2506",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30937,8 +30976,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-3497",
-   "self_type" : "type-3496",
+   "referenced_type" : "type-3500",
+   "self_type" : "type-3499",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30947,8 +30986,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-4080",
-   "self_type" : "type-4079",
+   "referenced_type" : "type-4086",
+   "self_type" : "type-4085",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30957,8 +30996,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-4918",
-   "self_type" : "type-4917",
+   "referenced_type" : "type-4924",
+   "self_type" : "type-4923",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30967,8 +31006,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-5572",
-   "self_type" : "type-5571",
+   "referenced_type" : "type-5589",
+   "self_type" : "type-5588",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30977,8 +31016,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-6010",
-   "self_type" : "type-6009",
+   "referenced_type" : "type-6030",
+   "self_type" : "type-6029",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30987,8 +31026,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-6166",
-   "self_type" : "type-6165",
+   "referenced_type" : "type-6186",
+   "self_type" : "type-6185",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30997,8 +31036,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-6665",
-   "self_type" : "type-6664",
+   "referenced_type" : "type-6688",
+   "self_type" : "type-6687",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31007,8 +31046,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-7152",
-   "self_type" : "type-7151",
+   "referenced_type" : "type-7175",
+   "self_type" : "type-7174",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31027,8 +31066,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferProducer",
    "name" : "const android::IGraphicBufferProducer",
-   "referenced_type" : "type-3507",
-   "self_type" : "type-3506",
+   "referenced_type" : "type-3510",
+   "self_type" : "type-3509",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31037,8 +31076,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferProducer",
    "name" : "const android::IGraphicBufferProducer",
-   "referenced_type" : "type-4251",
-   "self_type" : "type-4250",
+   "referenced_type" : "type-4257",
+   "self_type" : "type-4256",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31047,8 +31086,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferProducer",
    "name" : "const android::IGraphicBufferProducer",
-   "referenced_type" : "type-5582",
-   "self_type" : "type-5581",
+   "referenced_type" : "type-5599",
+   "self_type" : "type-5598",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31057,8 +31096,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferProducer",
    "name" : "const android::IGraphicBufferProducer",
-   "referenced_type" : "type-6175",
-   "self_type" : "type-6174",
+   "referenced_type" : "type-6195",
+   "self_type" : "type-6194",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31067,8 +31106,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferProducer",
    "name" : "const android::IGraphicBufferProducer",
-   "referenced_type" : "type-6861",
-   "self_type" : "type-6860",
+   "referenced_type" : "type-6884",
+   "self_type" : "type-6883",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31087,8 +31126,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-1162",
-   "self_type" : "type-1161",
+   "referenced_type" : "type-1033",
+   "self_type" : "type-1032",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31097,8 +31136,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-3626",
-   "self_type" : "type-3625",
+   "referenced_type" : "type-1165",
+   "self_type" : "type-1164",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31107,8 +31146,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-3768",
-   "self_type" : "type-3767",
+   "referenced_type" : "type-3629",
+   "self_type" : "type-3628",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31117,8 +31156,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-4257",
-   "self_type" : "type-4256",
+   "referenced_type" : "type-3673",
+   "self_type" : "type-3672",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31127,8 +31166,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-4453",
-   "self_type" : "type-4452",
+   "referenced_type" : "type-3774",
+   "self_type" : "type-3773",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31137,8 +31176,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-4693",
-   "self_type" : "type-4692",
+   "referenced_type" : "type-4263",
+   "self_type" : "type-4262",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31147,8 +31186,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-5701",
-   "self_type" : "type-5700",
+   "referenced_type" : "type-4460",
+   "self_type" : "type-4459",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31157,8 +31196,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-5843",
-   "self_type" : "type-5842",
+   "referenced_type" : "type-4700",
+   "self_type" : "type-4699",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31167,8 +31206,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-6274",
-   "self_type" : "type-6273",
+   "referenced_type" : "type-5718",
+   "self_type" : "type-5717",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31177,8 +31216,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-6396",
-   "self_type" : "type-6395",
+   "referenced_type" : "type-5762",
+   "self_type" : "type-5761",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31187,8 +31226,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-6867",
-   "self_type" : "type-6866",
+   "referenced_type" : "type-5863",
+   "self_type" : "type-5862",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31197,8 +31236,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-7060",
-   "self_type" : "type-7059",
+   "referenced_type" : "type-6294",
+   "self_type" : "type-6293",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31207,8 +31246,48 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-7330",
-   "self_type" : "type-7329",
+   "referenced_type" : "type-6338",
+   "self_type" : "type-6337",
+   "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-6419",
+   "self_type" : "type-6418",
+   "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-6890",
+   "self_type" : "type-6889",
+   "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-7084",
+   "self_type" : "type-7083",
+   "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-7353",
+   "self_type" : "type-7352",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31248,7 +31327,7 @@
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect>",
    "name" : "const android::LightFlattenablePod<android::Rect>",
    "referenced_type" : "type-48",
-   "self_type" : "type-4590",
+   "self_type" : "type-4597",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -31267,8 +31346,8 @@
    "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",
+   "referenced_type" : "type-1214",
+   "self_type" : "type-1233",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -31278,7 +31357,7 @@
    "linker_set_key" : "const android::LightRefBase<android::NativeHandle>",
    "name" : "const android::LightRefBase<android::NativeHandle>",
    "referenced_type" : "type-522",
-   "self_type" : "type-2665",
+   "self_type" : "type-2668",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -31427,8 +31506,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",
+   "referenced_type" : "type-1520",
+   "self_type" : "type-1525",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -31437,8 +31516,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",
+   "referenced_type" : "type-1663",
+   "self_type" : "type-1667",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -31447,8 +31526,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",
+   "referenced_type" : "type-4337",
+   "self_type" : "type-4340",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -31457,8 +31536,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",
+   "referenced_type" : "type-1658",
+   "self_type" : "type-1661",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -31467,8 +31546,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",
+   "referenced_type" : "type-4343",
+   "self_type" : "type-4346",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -31477,8 +31556,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",
+   "referenced_type" : "type-4348",
+   "self_type" : "type-4351",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -31507,8 +31586,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-1216",
-   "self_type" : "type-1215",
+   "referenced_type" : "type-1219",
+   "self_type" : "type-1218",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31517,8 +31596,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-1491",
-   "self_type" : "type-1490",
+   "referenced_type" : "type-1495",
+   "self_type" : "type-1494",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31527,8 +31606,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-1623",
-   "self_type" : "type-1622",
+   "referenced_type" : "type-1626",
+   "self_type" : "type-1625",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31537,8 +31616,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-2686",
-   "self_type" : "type-2685",
+   "referenced_type" : "type-2689",
+   "self_type" : "type-2688",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31547,8 +31626,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-3467",
-   "self_type" : "type-3466",
+   "referenced_type" : "type-3470",
+   "self_type" : "type-3469",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -31557,8 +31636,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-3789",
-   "self_type" : "type-3788",
+   "referenced_type" : "type-3795",
+   "self_type" : "type-3794",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31567,8 +31646,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4014",
-   "self_type" : "type-4013",
+   "referenced_type" : "type-4020",
+   "self_type" : "type-4019",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31577,8 +31656,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4093",
-   "self_type" : "type-4092",
+   "referenced_type" : "type-4099",
+   "self_type" : "type-4098",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31587,8 +31666,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4296",
-   "self_type" : "type-4295",
+   "referenced_type" : "type-4302",
+   "self_type" : "type-4301",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31597,8 +31676,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4576",
-   "self_type" : "type-4575",
+   "referenced_type" : "type-4582",
+   "self_type" : "type-4581",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31607,8 +31686,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4740",
-   "self_type" : "type-4739",
+   "referenced_type" : "type-4747",
+   "self_type" : "type-4746",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31617,8 +31696,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-5023",
-   "self_type" : "type-5022",
+   "referenced_type" : "type-5029",
+   "self_type" : "type-5028",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31627,8 +31706,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-5081",
-   "self_type" : "type-5080",
+   "referenced_type" : "type-5097",
+   "self_type" : "type-5096",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31637,8 +31716,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-5542",
-   "self_type" : "type-5541",
+   "referenced_type" : "type-5559",
+   "self_type" : "type-5558",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -31647,8 +31726,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-5864",
-   "self_type" : "type-5863",
+   "referenced_type" : "type-5884",
+   "self_type" : "type-5883",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31657,8 +31736,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-6047",
-   "self_type" : "type-6046",
+   "referenced_type" : "type-6067",
+   "self_type" : "type-6066",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31667,8 +31746,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-6145",
-   "self_type" : "type-6144",
+   "referenced_type" : "type-6165",
+   "self_type" : "type-6164",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -31677,8 +31756,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-6411",
-   "self_type" : "type-6410",
+   "referenced_type" : "type-6434",
+   "self_type" : "type-6433",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31687,8 +31766,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-6601",
-   "self_type" : "type-6600",
+   "referenced_type" : "type-6625",
+   "self_type" : "type-6624",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31697,8 +31776,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-6680",
-   "self_type" : "type-6679",
+   "referenced_type" : "type-6703",
+   "self_type" : "type-6702",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31707,8 +31786,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-6900",
-   "self_type" : "type-6899",
+   "referenced_type" : "type-6923",
+   "self_type" : "type-6922",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31717,8 +31796,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-7210",
-   "self_type" : "type-7209",
+   "referenced_type" : "type-7234",
+   "self_type" : "type-7233",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31727,8 +31806,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-7357",
-   "self_type" : "type-7356",
+   "referenced_type" : "type-7380",
+   "self_type" : "type-7379",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31737,8 +31816,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-7583",
-   "self_type" : "type-7582",
+   "referenced_type" : "type-7608",
+   "self_type" : "type-7607",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31757,8 +31836,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-7680",
-   "self_type" : "type-7679",
+   "referenced_type" : "type-7700",
+   "self_type" : "type-7699",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31768,7 +31847,7 @@
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
    "referenced_type" : "type-54",
-   "self_type" : "type-1450",
+   "self_type" : "type-1453",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -31777,8 +31856,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SafeBpInterface<android::IConsumerListener>",
    "name" : "const android::SafeBpInterface<android::IConsumerListener>",
-   "referenced_type" : "type-1538",
-   "self_type" : "type-1552",
+   "referenced_type" : "type-1542",
+   "self_type" : "type-1555",
    "size" : 72,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -31787,8 +31866,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",
+   "referenced_type" : "type-1722",
+   "self_type" : "type-1892",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -31797,8 +31876,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SafeInterface::ParcelHandler",
    "name" : "const android::SafeInterface::ParcelHandler",
-   "referenced_type" : "type-1236",
-   "self_type" : "type-1266",
+   "referenced_type" : "type-1239",
+   "self_type" : "type-1269",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -31808,7 +31887,7 @@
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
    "name" : "const android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
    "referenced_type" : "type-163",
-   "self_type" : "type-2677",
+   "self_type" : "type-2680",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -31818,7 +31897,7 @@
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "const android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "referenced_type" : "type-149",
-   "self_type" : "type-2673",
+   "self_type" : "type-2676",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -31828,7 +31907,7 @@
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "const android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
    "referenced_type" : "type-141",
-   "self_type" : "type-2669",
+   "self_type" : "type-2672",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -31837,8 +31916,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-1240",
-   "self_type" : "type-1248",
+   "referenced_type" : "type-1243",
+   "self_type" : "type-1251",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -31848,7 +31927,7 @@
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
    "referenced_type" : "type-123",
-   "self_type" : "type-1877",
+   "self_type" : "type-1881",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -31858,7 +31937,7 @@
    "linker_set_key" : "const android::Vector<android::BufferItem>",
    "name" : "const android::Vector<android::BufferItem>",
    "referenced_type" : "type-838",
-   "self_type" : "type-978",
+   "self_type" : "type-980",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31867,8 +31946,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<android::Rect>",
    "name" : "const android::Vector<android::Rect>",
-   "referenced_type" : "type-2679",
-   "self_type" : "type-2681",
+   "referenced_type" : "type-2682",
+   "self_type" : "type-2684",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31877,8 +31956,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",
+   "referenced_type" : "type-1229",
+   "self_type" : "type-1231",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31887,8 +31966,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<int>",
    "name" : "const android::Vector<int>",
-   "referenced_type" : "type-2688",
-   "self_type" : "type-2690",
+   "referenced_type" : "type-2691",
+   "self_type" : "type-2693",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31897,8 +31976,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<long>",
    "name" : "const android::Vector<long>",
-   "referenced_type" : "type-1082",
-   "self_type" : "type-1084",
+   "referenced_type" : "type-1085",
+   "self_type" : "type-1087",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31908,7 +31987,7 @@
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
    "referenced_type" : "type-143",
-   "self_type" : "type-2666",
+   "self_type" : "type-2669",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -31917,8 +31996,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::base::ErrnoRestorer",
    "name" : "const android::base::ErrnoRestorer",
-   "referenced_type" : "type-4660",
-   "self_type" : "type-4659",
+   "referenced_type" : "type-4667",
+   "self_type" : "type-4666",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -31927,8 +32006,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
-   "referenced_type" : "type-2555",
-   "self_type" : "type-2582",
+   "referenced_type" : "type-2558",
+   "self_type" : "type-2585",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -31947,8 +32026,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::BpHwRefBase",
    "name" : "const android::hardware::BpHwRefBase",
-   "referenced_type" : "type-1372",
-   "self_type" : "type-1375",
+   "referenced_type" : "type-1375",
+   "self_type" : "type-1378",
    "size" : 48,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -31957,8 +32036,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1378",
-   "self_type" : "type-1386",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1389",
    "size" : 136,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -31967,8 +32046,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",
+   "referenced_type" : "type-7547",
+   "self_type" : "type-7692",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -31977,26 +32056,6 @@
    "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-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,
@@ -32005,8 +32064,8 @@
   {
    "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> >",
+   "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-4497",
    "self_type" : "type-4501",
    "size" : 48,
@@ -32015,10 +32074,30 @@
   {
    "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-4374",
+   "self_type" : "type-4378",
+   "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-4503",
+   "self_type" : "type-4507",
+   "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",
+   "referenced_type" : "type-4362",
+   "self_type" : "type-4366",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32028,7 +32107,7 @@
    "linker_set_key" : "const android::hardware::Return<int>",
    "name" : "const android::hardware::Return<int>",
    "referenced_type" : "type-415",
-   "self_type" : "type-4701",
+   "self_type" : "type-4708",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32037,8 +32116,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",
+   "referenced_type" : "type-7551",
+   "self_type" : "type-7694",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32108,7 +32187,7 @@
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned char>",
    "name" : "const android::hardware::details::hidl_pointer<unsigned char>",
    "referenced_type" : "type-391",
-   "self_type" : "type-4351",
+   "self_type" : "type-4357",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -32138,7 +32217,7 @@
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming",
    "referenced_type" : "type-588",
-   "self_type" : "type-4585",
+   "self_type" : "type-4591",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -32177,8 +32256,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-2458",
-   "self_type" : "type-2462",
+   "referenced_type" : "type-2461",
+   "self_type" : "type-2465",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32408,7 +32487,7 @@
    "linker_set_key" : "const android::hardware::hidl_array<float, 16>",
    "name" : "const android::hardware::hidl_array<float, 16>",
    "referenced_type" : "type-484",
-   "self_type" : "type-4728",
+   "self_type" : "type-4735",
    "size" : 64,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -32498,7 +32577,7 @@
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned char>",
    "name" : "const android::hardware::hidl_vec<unsigned char>",
    "referenced_type" : "type-453",
-   "self_type" : "type-4383",
+   "self_type" : "type-4389",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -32558,7 +32637,7 @@
    "linker_set_key" : "const android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "const android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "referenced_type" : "type-164",
-   "self_type" : "type-2621",
+   "self_type" : "type-2624",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32568,7 +32647,7 @@
    "linker_set_key" : "const android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "name" : "const android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "referenced_type" : "type-150",
-   "self_type" : "type-2619",
+   "self_type" : "type-2622",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32578,7 +32657,7 @@
    "linker_set_key" : "const android::key_value_pair_t<unsigned int, unsigned int>",
    "name" : "const android::key_value_pair_t<unsigned int, unsigned int>",
    "referenced_type" : "type-146",
-   "self_type" : "type-2615",
+   "self_type" : "type-2618",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32586,32 +32665,32 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer>",
    "name" : "const android::sp<ANativeWindowBuffer>",
-   "referenced_type" : "type-2412",
-   "self_type" : "type-2411",
+   "referenced_type" : "type-2415",
+   "self_type" : "type-2414",
    "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",
+   "referenced_type" : "type-4852",
+   "self_type" : "type-4851",
    "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",
+   "referenced_type" : "type-6015",
+   "self_type" : "type-6014",
    "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",
+   "referenced_type" : "type-6854",
+   "self_type" : "type-6853",
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
   {
@@ -32620,7 +32699,7 @@
    "linker_set_key" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
    "name" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
    "referenced_type" : "type-581",
-   "self_type" : "type-1311",
+   "self_type" : "type-1312",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32640,7 +32719,7 @@
    "linker_set_key" : "const android::sp<android::AMessage>",
    "name" : "const android::sp<android::AMessage>",
    "referenced_type" : "type-259",
-   "self_type" : "type-2177",
+   "self_type" : "type-2176",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32649,8 +32728,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",
+   "referenced_type" : "type-4237",
+   "self_type" : "type-4236",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32659,8 +32738,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",
+   "referenced_type" : "type-4464",
+   "self_type" : "type-4525",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32680,7 +32759,7 @@
    "linker_set_key" : "const android::sp<android::ComponentWrapper>",
    "name" : "const android::sp<android::ComponentWrapper>",
    "referenced_type" : "type-567",
-   "self_type" : "type-2493",
+   "self_type" : "type-2496",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32699,8 +32778,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::Fence>",
    "name" : "const android::sp<android::Fence>",
-   "referenced_type" : "type-1865",
-   "self_type" : "type-1864",
+   "referenced_type" : "type-1869",
+   "self_type" : "type-1868",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32710,7 +32789,7 @@
    "linker_set_key" : "const android::sp<android::FrameDropper>",
    "name" : "const android::sp<android::FrameDropper>",
    "referenced_type" : "type-578",
-   "self_type" : "type-2508",
+   "self_type" : "type-2511",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32720,7 +32799,7 @@
    "linker_set_key" : "const android::sp<android::GraphicBuffer>",
    "name" : "const android::sp<android::GraphicBuffer>",
    "referenced_type" : "type-733",
-   "self_type" : "type-1197",
+   "self_type" : "type-1200",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32739,8 +32818,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::GraphicBufferSource>",
    "name" : "const android::sp<android::GraphicBufferSource>",
-   "referenced_type" : "type-2544",
-   "self_type" : "type-2546",
+   "referenced_type" : "type-2547",
+   "self_type" : "type-2549",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32749,8 +32828,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",
+   "referenced_type" : "type-4268",
+   "self_type" : "type-4273",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32759,8 +32838,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",
+   "referenced_type" : "type-4277",
+   "self_type" : "type-4282",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32769,8 +32848,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",
+   "referenced_type" : "type-4838",
+   "self_type" : "type-4837",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32779,8 +32858,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",
+   "referenced_type" : "type-5127",
+   "self_type" : "type-5126",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32790,7 +32869,7 @@
    "linker_set_key" : "const android::sp<android::IBinder::DeathRecipient>",
    "name" : "const android::sp<android::IBinder::DeathRecipient>",
    "referenced_type" : "type-844",
-   "self_type" : "type-4303",
+   "self_type" : "type-4309",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32800,7 +32879,7 @@
    "linker_set_key" : "const android::sp<android::IBinder>",
    "name" : "const android::sp<android::IBinder>",
    "referenced_type" : "type-796",
-   "self_type" : "type-1037",
+   "self_type" : "type-1041",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32830,7 +32909,7 @@
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer>",
    "name" : "const android::sp<android::IGraphicBufferProducer>",
    "referenced_type" : "type-570",
-   "self_type" : "type-2487",
+   "self_type" : "type-2490",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32840,7 +32919,7 @@
    "linker_set_key" : "const android::sp<android::IInterface>",
    "name" : "const android::sp<android::IInterface>",
    "referenced_type" : "type-646",
-   "self_type" : "type-1488",
+   "self_type" : "type-1492",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32859,8 +32938,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",
+   "referenced_type" : "type-1045",
+   "self_type" : "type-1050",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32879,8 +32958,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",
+   "referenced_type" : "type-1262",
+   "self_type" : "type-1261",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -32889,8 +32968,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",
+   "referenced_type" : "type-1371",
+   "self_type" : "type-1393",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -32899,8 +32978,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",
+   "referenced_type" : "type-1398",
+   "self_type" : "type-1397",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -32909,8 +32988,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-2465",
-   "self_type" : "type-2470",
+   "referenced_type" : "type-2468",
+   "self_type" : "type-2473",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32919,8 +32998,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener>",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener>",
-   "referenced_type" : "type-2456",
-   "self_type" : "type-2460",
+   "referenced_type" : "type-2459",
+   "self_type" : "type-2463",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32929,8 +33008,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",
+   "referenced_type" : "type-4249",
+   "self_type" : "type-4248",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32939,8 +33018,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",
+   "referenced_type" : "type-4476",
+   "self_type" : "type-4479",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32949,8 +33028,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-2478",
-   "self_type" : "type-2484",
+   "referenced_type" : "type-2481",
+   "self_type" : "type-2487",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32959,8 +33038,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener>",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener>",
-   "referenced_type" : "type-2472",
-   "self_type" : "type-2476",
+   "referenced_type" : "type-2475",
+   "self_type" : "type-2479",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32969,8 +33048,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",
+   "referenced_type" : "type-4243",
+   "self_type" : "type-4242",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32979,8 +33058,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",
+   "referenced_type" : "type-4469",
+   "self_type" : "type-4472",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32999,8 +33078,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-2446",
-   "self_type" : "type-2448",
+   "referenced_type" : "type-2449",
+   "self_type" : "type-2451",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33009,8 +33088,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification>",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification>",
-   "referenced_type" : "type-2450",
-   "self_type" : "type-2454",
+   "referenced_type" : "type-2453",
+   "self_type" : "type-2457",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33050,7 +33129,7 @@
    "linker_set_key" : "const android::wp<android::IBinder::DeathRecipient>",
    "name" : "const android::wp<android::IBinder::DeathRecipient>",
    "referenced_type" : "type-174",
-   "self_type" : "type-4293",
+   "self_type" : "type-4299",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33060,7 +33139,7 @@
    "linker_set_key" : "const android::wp<android::IBinder>",
    "name" : "const android::wp<android::IBinder>",
    "referenced_type" : "type-131",
-   "self_type" : "type-4283",
+   "self_type" : "type-4289",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33070,7 +33149,7 @@
    "linker_set_key" : "const android_cta861_3_metadata",
    "name" : "const android_cta861_3_metadata",
    "referenced_type" : "type-306",
-   "self_type" : "type-1473",
+   "self_type" : "type-1477",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -33090,7 +33169,7 @@
    "linker_set_key" : "const android_smpte2086_metadata",
    "name" : "const android_smpte2086_metadata",
    "referenced_type" : "type-305",
-   "self_type" : "type-1471",
+   "self_type" : "type-1475",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -33120,7 +33199,7 @@
    "linker_set_key" : "const char *const",
    "name" : "const char *const",
    "referenced_type" : "type-124",
-   "self_type" : "type-1104",
+   "self_type" : "type-1107",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -33129,8 +33208,8 @@
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-1243",
-   "self_type" : "type-1242",
+   "referenced_type" : "type-1246",
+   "self_type" : "type-1245",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -33176,72 +33255,64 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1111",
-   "self_type" : "type-1110",
+   "referenced_type" : "type-1114",
+   "self_type" : "type-1113",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1283",
-   "self_type" : "type-1282",
+   "referenced_type" : "type-1286",
+   "self_type" : "type-1285",
    "source_file" : "/system/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",
+   "referenced_type" : "type-3311",
+   "self_type" : "type-3310",
    "source_file" : "/system/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",
+   "referenced_type" : "type-3544",
+   "self_type" : "type-3543",
    "source_file" : "/system/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",
+   "referenced_type" : "type-3653",
+   "self_type" : "type-3652",
    "source_file" : "/system/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",
+   "referenced_type" : "type-3719",
+   "self_type" : "type-3718",
    "source_file" : "/system/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",
+   "referenced_type" : "type-3841",
+   "self_type" : "type-3840",
    "source_file" : "/system/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",
+   "referenced_type" : "type-4382",
+   "self_type" : "type-4381",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -33256,208 +33327,216 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-4542",
-   "self_type" : "type-4541",
+   "referenced_type" : "type-4511",
+   "self_type" : "type-4510",
    "source_file" : "/system/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",
+   "referenced_type" : "type-4548",
+   "self_type" : "type-4547",
    "source_file" : "/system/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",
+   "referenced_type" : "type-4573",
+   "self_type" : "type-4572",
    "source_file" : "/system/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",
+   "referenced_type" : "type-4728",
+   "self_type" : "type-4727",
    "source_file" : "/system/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",
+   "referenced_type" : "type-4857",
+   "self_type" : "type-4856",
    "source_file" : "/system/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",
+   "referenced_type" : "type-5140",
+   "self_type" : "type-5139",
    "source_file" : "/system/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",
+   "referenced_type" : "type-5195",
+   "self_type" : "type-5194",
    "source_file" : "/system/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",
+   "referenced_type" : "type-5400",
+   "self_type" : "type-5399",
    "source_file" : "/system/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",
+   "referenced_type" : "type-5633",
+   "self_type" : "type-5632",
    "source_file" : "/system/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",
+   "referenced_type" : "type-5742",
+   "self_type" : "type-5741",
    "source_file" : "/system/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",
+   "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-6068",
-   "self_type" : "type-6067",
+   "referenced_type" : "type-5930",
+   "self_type" : "type-5929",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6088",
+   "self_type" : "type-6087",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6222",
+   "self_type" : "type-6221",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6318",
+   "self_type" : "type-6317",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6366",
+   "self_type" : "type-6365",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6457",
+   "self_type" : "type-6456",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6997",
+   "self_type" : "type-6996",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7132",
+   "self_type" : "type-7131",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7185",
+   "self_type" : "type-7184",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7220",
+   "self_type" : "type-7219",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7369",
+   "self_type" : "type-7368",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7469",
+   "self_type" : "type-7468",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7508",
+   "self_type" : "type-7507",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7560",
+   "self_type" : "type-7559",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7641",
+   "self_type" : "type-7640",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7705",
+   "self_type" : "type-7704",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -33473,8 +33552,8 @@
    "is_const" : true,
    "linker_set_key" : "const log_msg",
    "name" : "const log_msg",
-   "referenced_type" : "type-2178",
-   "self_type" : "type-2315",
+   "referenced_type" : "type-2181",
+   "self_type" : "type-2318",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -33523,8 +33602,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-1315",
-   "self_type" : "type-1314",
+   "referenced_type" : "type-1319",
+   "self_type" : "type-1318",
    "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"
   },
@@ -33533,8 +33612,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-3392",
-   "self_type" : "type-3391",
+   "referenced_type" : "type-3395",
+   "self_type" : "type-3394",
    "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"
   },
@@ -33543,8 +33622,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-3564",
-   "self_type" : "type-3563",
+   "referenced_type" : "type-3567",
+   "self_type" : "type-3566",
    "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"
   },
@@ -33553,8 +33632,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-3866",
-   "self_type" : "type-3865",
+   "referenced_type" : "type-3873",
+   "self_type" : "type-3872",
    "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"
   },
@@ -33563,8 +33642,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-4418",
-   "self_type" : "type-4417",
+   "referenced_type" : "type-4424",
+   "self_type" : "type-4423",
    "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"
   },
@@ -33573,8 +33652,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-4627",
-   "self_type" : "type-4626",
+   "referenced_type" : "type-4633",
+   "self_type" : "type-4632",
    "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"
   },
@@ -33583,8 +33662,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-4797",
-   "self_type" : "type-4796",
+   "referenced_type" : "type-4803",
+   "self_type" : "type-4802",
    "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"
   },
@@ -33593,8 +33672,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-5101",
-   "self_type" : "type-5100",
+   "referenced_type" : "type-5117",
+   "self_type" : "type-5116",
    "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"
   },
@@ -33603,8 +33682,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-5203",
-   "self_type" : "type-5202",
+   "referenced_type" : "type-5221",
+   "self_type" : "type-5220",
    "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"
   },
@@ -33613,8 +33692,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-5467",
-   "self_type" : "type-5466",
+   "referenced_type" : "type-5484",
+   "self_type" : "type-5483",
    "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"
   },
@@ -33623,8 +33702,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-5639",
-   "self_type" : "type-5638",
+   "referenced_type" : "type-5656",
+   "self_type" : "type-5655",
    "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"
   },
@@ -33633,8 +33712,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-5941",
-   "self_type" : "type-5940",
+   "referenced_type" : "type-5962",
+   "self_type" : "type-5961",
    "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"
   },
@@ -33653,8 +33732,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-6093",
-   "self_type" : "type-6092",
+   "referenced_type" : "type-6113",
+   "self_type" : "type-6112",
    "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"
   },
@@ -33663,8 +33742,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-6225",
-   "self_type" : "type-6224",
+   "referenced_type" : "type-6245",
+   "self_type" : "type-6244",
    "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"
   },
@@ -33673,8 +33752,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-6461",
-   "self_type" : "type-6460",
+   "referenced_type" : "type-6485",
+   "self_type" : "type-6484",
    "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"
   },
@@ -33683,8 +33762,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-7021",
-   "self_type" : "type-7020",
+   "referenced_type" : "type-7045",
+   "self_type" : "type-7044",
    "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"
   },
@@ -33693,8 +33772,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-7268",
-   "self_type" : "type-7267",
+   "referenced_type" : "type-7293",
+   "self_type" : "type-7292",
    "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"
   },
@@ -33703,8 +33782,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-7403",
-   "self_type" : "type-7402",
+   "referenced_type" : "type-7426",
+   "self_type" : "type-7425",
    "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"
   },
@@ -33713,8 +33792,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-7608",
-   "self_type" : "type-7607",
+   "referenced_type" : "type-7633",
+   "self_type" : "type-7632",
    "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"
   },
@@ -33733,8 +33812,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-1313",
-   "self_type" : "type-1312",
+   "referenced_type" : "type-1316",
+   "self_type" : "type-1315",
    "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"
   },
@@ -33743,8 +33822,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-3390",
-   "self_type" : "type-3389",
+   "referenced_type" : "type-3393",
+   "self_type" : "type-3392",
    "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"
   },
@@ -33753,8 +33832,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-3562",
-   "self_type" : "type-3561",
+   "referenced_type" : "type-3565",
+   "self_type" : "type-3564",
    "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"
   },
@@ -33763,8 +33842,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-3864",
-   "self_type" : "type-3863",
+   "referenced_type" : "type-3870",
+   "self_type" : "type-3869",
    "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"
   },
@@ -33773,8 +33852,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-4414",
-   "self_type" : "type-4413",
+   "referenced_type" : "type-4422",
+   "self_type" : "type-4421",
    "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"
   },
@@ -33783,8 +33862,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-4625",
-   "self_type" : "type-4624",
+   "referenced_type" : "type-4631",
+   "self_type" : "type-4630",
    "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"
   },
@@ -33793,8 +33872,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-4795",
-   "self_type" : "type-4794",
+   "referenced_type" : "type-4801",
+   "self_type" : "type-4800",
    "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"
   },
@@ -33803,8 +33882,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-5099",
-   "self_type" : "type-5098",
+   "referenced_type" : "type-5115",
+   "self_type" : "type-5114",
    "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"
   },
@@ -33813,8 +33892,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-5201",
-   "self_type" : "type-5200",
+   "referenced_type" : "type-5219",
+   "self_type" : "type-5218",
    "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"
   },
@@ -33823,8 +33902,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-5465",
-   "self_type" : "type-5464",
+   "referenced_type" : "type-5482",
+   "self_type" : "type-5481",
    "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"
   },
@@ -33833,8 +33912,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-5637",
-   "self_type" : "type-5636",
+   "referenced_type" : "type-5654",
+   "self_type" : "type-5653",
    "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"
   },
@@ -33843,8 +33922,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-5939",
-   "self_type" : "type-5938",
+   "referenced_type" : "type-5959",
+   "self_type" : "type-5958",
    "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"
   },
@@ -33863,8 +33942,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-6091",
-   "self_type" : "type-6090",
+   "referenced_type" : "type-6111",
+   "self_type" : "type-6110",
    "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"
   },
@@ -33873,8 +33952,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-6223",
-   "self_type" : "type-6222",
+   "referenced_type" : "type-6243",
+   "self_type" : "type-6242",
    "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"
   },
@@ -33883,8 +33962,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-6459",
-   "self_type" : "type-6458",
+   "referenced_type" : "type-6482",
+   "self_type" : "type-6481",
    "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"
   },
@@ -33893,8 +33972,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-7017",
-   "self_type" : "type-7016",
+   "referenced_type" : "type-7043",
+   "self_type" : "type-7042",
    "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"
   },
@@ -33903,8 +33982,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-7266",
-   "self_type" : "type-7265",
+   "referenced_type" : "type-7291",
+   "self_type" : "type-7290",
    "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"
   },
@@ -33913,8 +33992,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-7401",
-   "self_type" : "type-7400",
+   "referenced_type" : "type-7424",
+   "self_type" : "type-7423",
    "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"
   },
@@ -33923,8 +34002,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-7606",
-   "self_type" : "type-7605",
+   "referenced_type" : "type-7630",
+   "self_type" : "type-7629",
    "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"
   },
@@ -33943,8 +34022,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-1322",
-   "self_type" : "type-1321",
+   "referenced_type" : "type-1325",
+   "self_type" : "type-1324",
    "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"
   },
@@ -33953,8 +34032,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-3404",
-   "self_type" : "type-3403",
+   "referenced_type" : "type-3407",
+   "self_type" : "type-3406",
    "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"
   },
@@ -33963,8 +34042,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-3570",
-   "self_type" : "type-3569",
+   "referenced_type" : "type-3573",
+   "self_type" : "type-3572",
    "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"
   },
@@ -33973,8 +34052,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-3873",
-   "self_type" : "type-3872",
+   "referenced_type" : "type-3880",
+   "self_type" : "type-3879",
    "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"
   },
@@ -33983,8 +34062,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-4424",
-   "self_type" : "type-4423",
+   "referenced_type" : "type-4430",
+   "self_type" : "type-4429",
    "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"
   },
@@ -33993,8 +34072,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-4633",
-   "self_type" : "type-4632",
+   "referenced_type" : "type-4639",
+   "self_type" : "type-4638",
    "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"
   },
@@ -34003,8 +34082,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-4803",
-   "self_type" : "type-4802",
+   "referenced_type" : "type-4809",
+   "self_type" : "type-4808",
    "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"
   },
@@ -34013,8 +34092,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-5107",
-   "self_type" : "type-5106",
+   "referenced_type" : "type-5123",
+   "self_type" : "type-5122",
    "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"
   },
@@ -34023,8 +34102,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-5210",
-   "self_type" : "type-5209",
+   "referenced_type" : "type-5228",
+   "self_type" : "type-5227",
    "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"
   },
@@ -34033,8 +34112,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-5479",
-   "self_type" : "type-5478",
+   "referenced_type" : "type-5496",
+   "self_type" : "type-5495",
    "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"
   },
@@ -34043,8 +34122,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-5645",
-   "self_type" : "type-5644",
+   "referenced_type" : "type-5662",
+   "self_type" : "type-5661",
    "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"
   },
@@ -34053,8 +34132,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-5948",
-   "self_type" : "type-5947",
+   "referenced_type" : "type-5969",
+   "self_type" : "type-5968",
    "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"
   },
@@ -34063,8 +34142,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-6099",
-   "self_type" : "type-6098",
+   "referenced_type" : "type-6119",
+   "self_type" : "type-6118",
    "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"
   },
@@ -34083,8 +34162,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-6231",
-   "self_type" : "type-6230",
+   "referenced_type" : "type-6251",
+   "self_type" : "type-6250",
    "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"
   },
@@ -34093,8 +34172,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-6468",
-   "self_type" : "type-6467",
+   "referenced_type" : "type-6491",
+   "self_type" : "type-6490",
    "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"
   },
@@ -34103,8 +34182,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-7028",
-   "self_type" : "type-7027",
+   "referenced_type" : "type-7052",
+   "self_type" : "type-7051",
    "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"
   },
@@ -34113,8 +34192,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-7276",
-   "self_type" : "type-7275",
+   "referenced_type" : "type-7300",
+   "self_type" : "type-7299",
    "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"
   },
@@ -34123,8 +34202,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-7409",
-   "self_type" : "type-7408",
+   "referenced_type" : "type-7432",
+   "self_type" : "type-7431",
    "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"
   },
@@ -34133,8 +34212,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-7544",
-   "self_type" : "type-7543",
+   "referenced_type" : "type-7567",
+   "self_type" : "type-7566",
    "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"
   },
@@ -34153,8 +34232,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-1320",
-   "self_type" : "type-1319",
+   "referenced_type" : "type-1323",
+   "self_type" : "type-1322",
    "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"
   },
@@ -34163,8 +34242,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-3402",
-   "self_type" : "type-3401",
+   "referenced_type" : "type-3405",
+   "self_type" : "type-3404",
    "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"
   },
@@ -34173,8 +34252,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-3568",
-   "self_type" : "type-3567",
+   "referenced_type" : "type-3571",
+   "self_type" : "type-3570",
    "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"
   },
@@ -34183,8 +34262,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-3871",
-   "self_type" : "type-3870",
+   "referenced_type" : "type-3877",
+   "self_type" : "type-3876",
    "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"
   },
@@ -34193,8 +34272,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-4422",
-   "self_type" : "type-4421",
+   "referenced_type" : "type-4428",
+   "self_type" : "type-4427",
    "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"
   },
@@ -34203,8 +34282,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-4631",
-   "self_type" : "type-4630",
+   "referenced_type" : "type-4637",
+   "self_type" : "type-4636",
    "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"
   },
@@ -34213,8 +34292,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-4801",
-   "self_type" : "type-4800",
+   "referenced_type" : "type-4807",
+   "self_type" : "type-4806",
    "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"
   },
@@ -34223,8 +34302,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-5105",
-   "self_type" : "type-5104",
+   "referenced_type" : "type-5121",
+   "self_type" : "type-5120",
    "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"
   },
@@ -34233,8 +34312,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-5208",
-   "self_type" : "type-5207",
+   "referenced_type" : "type-5226",
+   "self_type" : "type-5225",
    "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"
   },
@@ -34243,8 +34322,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-5477",
-   "self_type" : "type-5476",
+   "referenced_type" : "type-5494",
+   "self_type" : "type-5493",
    "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"
   },
@@ -34253,8 +34332,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-5643",
-   "self_type" : "type-5642",
+   "referenced_type" : "type-5660",
+   "self_type" : "type-5659",
    "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"
   },
@@ -34263,8 +34342,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-5946",
-   "self_type" : "type-5945",
+   "referenced_type" : "type-5966",
+   "self_type" : "type-5965",
    "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"
   },
@@ -34273,8 +34352,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-6097",
-   "self_type" : "type-6096",
+   "referenced_type" : "type-6117",
+   "self_type" : "type-6116",
    "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"
   },
@@ -34293,8 +34372,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-6229",
-   "self_type" : "type-6228",
+   "referenced_type" : "type-6249",
+   "self_type" : "type-6248",
    "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"
   },
@@ -34303,8 +34382,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-6466",
-   "self_type" : "type-6465",
+   "referenced_type" : "type-6489",
+   "self_type" : "type-6488",
    "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"
   },
@@ -34313,8 +34392,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-7026",
-   "self_type" : "type-7025",
+   "referenced_type" : "type-7050",
+   "self_type" : "type-7049",
    "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"
   },
@@ -34323,8 +34402,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-7274",
-   "self_type" : "type-7273",
+   "referenced_type" : "type-7298",
+   "self_type" : "type-7297",
    "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"
   },
@@ -34333,8 +34412,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-7407",
-   "self_type" : "type-7406",
+   "referenced_type" : "type-7430",
+   "self_type" : "type-7429",
    "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"
   },
@@ -34343,8 +34422,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-7542",
-   "self_type" : "type-7541",
+   "referenced_type" : "type-7565",
+   "self_type" : "type-7564",
    "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"
   },
@@ -34363,8 +34442,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-1318",
-   "self_type" : "type-1317",
+   "referenced_type" : "type-1321",
+   "self_type" : "type-1320",
    "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"
   },
@@ -34373,8 +34452,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-3400",
-   "self_type" : "type-3399",
+   "referenced_type" : "type-3403",
+   "self_type" : "type-3402",
    "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"
   },
@@ -34383,8 +34462,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-3566",
-   "self_type" : "type-3565",
+   "referenced_type" : "type-3569",
+   "self_type" : "type-3568",
    "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"
   },
@@ -34393,8 +34472,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-3869",
-   "self_type" : "type-3868",
+   "referenced_type" : "type-3875",
+   "self_type" : "type-3874",
    "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"
   },
@@ -34403,8 +34482,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-4420",
-   "self_type" : "type-4419",
+   "referenced_type" : "type-4426",
+   "self_type" : "type-4425",
    "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"
   },
@@ -34413,8 +34492,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-4629",
-   "self_type" : "type-4628",
+   "referenced_type" : "type-4635",
+   "self_type" : "type-4634",
    "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"
   },
@@ -34423,8 +34502,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-4799",
-   "self_type" : "type-4798",
+   "referenced_type" : "type-4805",
+   "self_type" : "type-4804",
    "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"
   },
@@ -34433,8 +34512,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-5103",
-   "self_type" : "type-5102",
+   "referenced_type" : "type-5119",
+   "self_type" : "type-5118",
    "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"
   },
@@ -34443,8 +34522,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-5206",
-   "self_type" : "type-5205",
+   "referenced_type" : "type-5224",
+   "self_type" : "type-5223",
    "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"
   },
@@ -34453,8 +34532,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-5475",
-   "self_type" : "type-5474",
+   "referenced_type" : "type-5492",
+   "self_type" : "type-5491",
    "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"
   },
@@ -34463,8 +34542,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-5641",
-   "self_type" : "type-5640",
+   "referenced_type" : "type-5658",
+   "self_type" : "type-5657",
    "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"
   },
@@ -34473,8 +34552,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-5944",
-   "self_type" : "type-5943",
+   "referenced_type" : "type-5964",
+   "self_type" : "type-5963",
    "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"
   },
@@ -34483,8 +34562,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-6095",
-   "self_type" : "type-6094",
+   "referenced_type" : "type-6115",
+   "self_type" : "type-6114",
    "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"
   },
@@ -34503,8 +34582,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-6227",
-   "self_type" : "type-6226",
+   "referenced_type" : "type-6247",
+   "self_type" : "type-6246",
    "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"
   },
@@ -34513,8 +34592,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-6464",
-   "self_type" : "type-6463",
+   "referenced_type" : "type-6487",
+   "self_type" : "type-6486",
    "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"
   },
@@ -34523,8 +34602,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-7024",
-   "self_type" : "type-7023",
+   "referenced_type" : "type-7048",
+   "self_type" : "type-7047",
    "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"
   },
@@ -34533,8 +34612,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-7272",
-   "self_type" : "type-7271",
+   "referenced_type" : "type-7296",
+   "self_type" : "type-7295",
    "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"
   },
@@ -34543,8 +34622,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-7405",
-   "self_type" : "type-7404",
+   "referenced_type" : "type-7428",
+   "self_type" : "type-7427",
    "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"
   },
@@ -34553,8 +34632,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-7540",
-   "self_type" : "type-7539",
+   "referenced_type" : "type-7563",
+   "self_type" : "type-7562",
    "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"
   },
@@ -34573,8 +34652,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1120",
-   "self_type" : "type-1119",
+   "referenced_type" : "type-1124",
+   "self_type" : "type-1123",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34583,8 +34662,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1297",
-   "self_type" : "type-1296",
+   "referenced_type" : "type-1300",
+   "self_type" : "type-1299",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34593,8 +34672,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3374",
+   "self_type" : "type-3373",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34603,8 +34682,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3551",
+   "self_type" : "type-3550",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34613,8 +34692,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3731",
+   "self_type" : "type-3730",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34623,8 +34702,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3855",
+   "self_type" : "type-3854",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34633,8 +34712,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4408",
+   "self_type" : "type-4407",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34643,8 +34722,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4616",
+   "self_type" : "type-4615",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34653,8 +34732,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4789",
+   "self_type" : "type-4788",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34663,8 +34742,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5206",
+   "self_type" : "type-5205",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34673,8 +34752,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5463",
+   "self_type" : "type-5462",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34693,8 +34772,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5640",
+   "self_type" : "type-5639",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34703,8 +34782,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5820",
+   "self_type" : "type-5819",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34713,8 +34792,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5944",
+   "self_type" : "type-5943",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34723,8 +34802,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6097",
+   "self_type" : "type-6096",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34733,8 +34812,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6229",
+   "self_type" : "type-6228",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34743,8 +34822,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6378",
+   "self_type" : "type-6377",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34753,8 +34832,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6467",
+   "self_type" : "type-6466",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34763,8 +34842,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7028",
+   "self_type" : "type-7027",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34773,8 +34852,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7274",
+   "self_type" : "type-7273",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34783,8 +34862,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7412",
+   "self_type" : "type-7411",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34793,8 +34872,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7571",
+   "self_type" : "type-7570",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34803,8 +34882,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7715",
+   "self_type" : "type-7714",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34823,8 +34902,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-1127",
-   "self_type" : "type-1126",
+   "referenced_type" : "type-1130",
+   "self_type" : "type-1129",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34833,8 +34912,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-1304",
-   "self_type" : "type-1303",
+   "referenced_type" : "type-1307",
+   "self_type" : "type-1306",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34843,8 +34922,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-3377",
-   "self_type" : "type-3376",
+   "referenced_type" : "type-3380",
+   "self_type" : "type-3379",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34853,8 +34932,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-3554",
-   "self_type" : "type-3553",
+   "referenced_type" : "type-3557",
+   "self_type" : "type-3556",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34863,8 +34942,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-3731",
-   "self_type" : "type-3730",
+   "referenced_type" : "type-3737",
+   "self_type" : "type-3736",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34873,8 +34952,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-3855",
-   "self_type" : "type-3854",
+   "referenced_type" : "type-3861",
+   "self_type" : "type-3860",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34883,8 +34962,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-4408",
-   "self_type" : "type-4407",
+   "referenced_type" : "type-4414",
+   "self_type" : "type-4413",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34893,8 +34972,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-4616",
-   "self_type" : "type-4615",
+   "referenced_type" : "type-4622",
+   "self_type" : "type-4621",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34903,8 +34982,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-4789",
-   "self_type" : "type-4788",
+   "referenced_type" : "type-4795",
+   "self_type" : "type-4794",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34913,8 +34992,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-5194",
-   "self_type" : "type-5193",
+   "referenced_type" : "type-5213",
+   "self_type" : "type-5212",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34923,8 +35002,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-5452",
-   "self_type" : "type-5451",
+   "referenced_type" : "type-5469",
+   "self_type" : "type-5468",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34943,8 +35022,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-5629",
-   "self_type" : "type-5628",
+   "referenced_type" : "type-5646",
+   "self_type" : "type-5645",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34953,8 +35032,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-5806",
-   "self_type" : "type-5805",
+   "referenced_type" : "type-5826",
+   "self_type" : "type-5825",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34963,8 +35042,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-5930",
-   "self_type" : "type-5929",
+   "referenced_type" : "type-5950",
+   "self_type" : "type-5949",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34973,8 +35052,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-6083",
-   "self_type" : "type-6082",
+   "referenced_type" : "type-6103",
+   "self_type" : "type-6102",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34983,8 +35062,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-6215",
-   "self_type" : "type-6214",
+   "referenced_type" : "type-6235",
+   "self_type" : "type-6234",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34993,8 +35072,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-6361",
-   "self_type" : "type-6360",
+   "referenced_type" : "type-6384",
+   "self_type" : "type-6383",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35003,8 +35082,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-6450",
-   "self_type" : "type-6449",
+   "referenced_type" : "type-6474",
+   "self_type" : "type-6473",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35013,8 +35092,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-7011",
-   "self_type" : "type-7010",
+   "referenced_type" : "type-7034",
+   "self_type" : "type-7033",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35023,8 +35102,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-7256",
-   "self_type" : "type-7255",
+   "referenced_type" : "type-7280",
+   "self_type" : "type-7279",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35033,8 +35112,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-7395",
-   "self_type" : "type-7394",
+   "referenced_type" : "type-7418",
+   "self_type" : "type-7417",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35043,8 +35122,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-7554",
-   "self_type" : "type-7553",
+   "referenced_type" : "type-7577",
+   "self_type" : "type-7576",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35053,8 +35132,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-7698",
-   "self_type" : "type-7697",
+   "referenced_type" : "type-7721",
+   "self_type" : "type-7720",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35073,8 +35152,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-1129",
-   "self_type" : "type-1128",
+   "referenced_type" : "type-1132",
+   "self_type" : "type-1131",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35083,8 +35162,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-1306",
-   "self_type" : "type-1305",
+   "referenced_type" : "type-1309",
+   "self_type" : "type-1308",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35093,8 +35172,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-3380",
-   "self_type" : "type-3379",
+   "referenced_type" : "type-3383",
+   "self_type" : "type-3382",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35103,8 +35182,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-3556",
-   "self_type" : "type-3555",
+   "referenced_type" : "type-3561",
+   "self_type" : "type-3560",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35113,8 +35192,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-3733",
-   "self_type" : "type-3732",
+   "referenced_type" : "type-3739",
+   "self_type" : "type-3738",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35123,8 +35202,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-3857",
-   "self_type" : "type-3856",
+   "referenced_type" : "type-3863",
+   "self_type" : "type-3862",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35133,8 +35212,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-4410",
-   "self_type" : "type-4409",
+   "referenced_type" : "type-4416",
+   "self_type" : "type-4415",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35143,8 +35222,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-4618",
-   "self_type" : "type-4617",
+   "referenced_type" : "type-4624",
+   "self_type" : "type-4623",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35153,8 +35232,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-4791",
-   "self_type" : "type-4790",
+   "referenced_type" : "type-4797",
+   "self_type" : "type-4796",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35163,8 +35242,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-5196",
-   "self_type" : "type-5195",
+   "referenced_type" : "type-5215",
+   "self_type" : "type-5214",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35173,8 +35252,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-5455",
-   "self_type" : "type-5454",
+   "referenced_type" : "type-5472",
+   "self_type" : "type-5471",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35193,8 +35272,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-5631",
-   "self_type" : "type-5630",
+   "referenced_type" : "type-5650",
+   "self_type" : "type-5649",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35203,8 +35282,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-5808",
-   "self_type" : "type-5807",
+   "referenced_type" : "type-5828",
+   "self_type" : "type-5827",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35213,8 +35292,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-5932",
-   "self_type" : "type-5931",
+   "referenced_type" : "type-5952",
+   "self_type" : "type-5951",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35223,8 +35302,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-6085",
-   "self_type" : "type-6084",
+   "referenced_type" : "type-6105",
+   "self_type" : "type-6104",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35233,8 +35312,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-6217",
-   "self_type" : "type-6216",
+   "referenced_type" : "type-6239",
+   "self_type" : "type-6238",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35243,8 +35322,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-6363",
-   "self_type" : "type-6362",
+   "referenced_type" : "type-6386",
+   "self_type" : "type-6385",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35253,8 +35332,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-6452",
-   "self_type" : "type-6451",
+   "referenced_type" : "type-6476",
+   "self_type" : "type-6475",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35263,8 +35342,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-7013",
-   "self_type" : "type-7012",
+   "referenced_type" : "type-7037",
+   "self_type" : "type-7036",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35273,8 +35352,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-7258",
-   "self_type" : "type-7257",
+   "referenced_type" : "type-7284",
+   "self_type" : "type-7283",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35283,8 +35362,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-7397",
-   "self_type" : "type-7396",
+   "referenced_type" : "type-7420",
+   "self_type" : "type-7419",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35293,8 +35372,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-7556",
-   "self_type" : "type-7555",
+   "referenced_type" : "type-7579",
+   "self_type" : "type-7578",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35303,8 +35382,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-7700",
-   "self_type" : "type-7699",
+   "referenced_type" : "type-7723",
+   "self_type" : "type-7722",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35313,8 +35392,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-879",
-   "self_type" : "type-878",
+   "referenced_type" : "type-881",
+   "self_type" : "type-880",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35323,8 +35402,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-1124",
-   "self_type" : "type-1123",
+   "referenced_type" : "type-1128",
+   "self_type" : "type-1127",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35333,8 +35412,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-1301",
-   "self_type" : "type-1300",
+   "referenced_type" : "type-1305",
+   "self_type" : "type-1304",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35343,8 +35422,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-3375",
-   "self_type" : "type-3374",
+   "referenced_type" : "type-3378",
+   "self_type" : "type-3377",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35353,8 +35432,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-3552",
-   "self_type" : "type-3551",
+   "referenced_type" : "type-3555",
+   "self_type" : "type-3554",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35363,8 +35442,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-3728",
-   "self_type" : "type-3727",
+   "referenced_type" : "type-3735",
+   "self_type" : "type-3734",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35373,8 +35452,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-3853",
-   "self_type" : "type-3852",
+   "referenced_type" : "type-3859",
+   "self_type" : "type-3858",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35383,8 +35462,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-4406",
-   "self_type" : "type-4405",
+   "referenced_type" : "type-4412",
+   "self_type" : "type-4411",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35393,8 +35472,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-4614",
-   "self_type" : "type-4613",
+   "referenced_type" : "type-4620",
+   "self_type" : "type-4619",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35403,8 +35482,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-4787",
-   "self_type" : "type-4786",
+   "referenced_type" : "type-4793",
+   "self_type" : "type-4792",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35413,8 +35492,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-5192",
-   "self_type" : "type-5191",
+   "referenced_type" : "type-5210",
+   "self_type" : "type-5209",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35423,8 +35502,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-5450",
-   "self_type" : "type-5449",
+   "referenced_type" : "type-5467",
+   "self_type" : "type-5466",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35443,8 +35522,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-5627",
-   "self_type" : "type-5626",
+   "referenced_type" : "type-5644",
+   "self_type" : "type-5643",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35453,8 +35532,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-5803",
-   "self_type" : "type-5802",
+   "referenced_type" : "type-5824",
+   "self_type" : "type-5823",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35463,8 +35542,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-5928",
-   "self_type" : "type-5927",
+   "referenced_type" : "type-5948",
+   "self_type" : "type-5947",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35473,8 +35552,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-6081",
-   "self_type" : "type-6080",
+   "referenced_type" : "type-6101",
+   "self_type" : "type-6100",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35483,8 +35562,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-6213",
-   "self_type" : "type-6212",
+   "referenced_type" : "type-6233",
+   "self_type" : "type-6232",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35493,8 +35572,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-6359",
-   "self_type" : "type-6358",
+   "referenced_type" : "type-6382",
+   "self_type" : "type-6381",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35503,8 +35582,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-6448",
-   "self_type" : "type-6447",
+   "referenced_type" : "type-6472",
+   "self_type" : "type-6471",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35513,8 +35592,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-7008",
-   "self_type" : "type-7007",
+   "referenced_type" : "type-7032",
+   "self_type" : "type-7031",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35523,8 +35602,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-7254",
-   "self_type" : "type-7253",
+   "referenced_type" : "type-7278",
+   "self_type" : "type-7277",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35533,8 +35612,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-7393",
-   "self_type" : "type-7392",
+   "referenced_type" : "type-7416",
+   "self_type" : "type-7415",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35543,8 +35622,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-7552",
-   "self_type" : "type-7551",
+   "referenced_type" : "type-7575",
+   "self_type" : "type-7574",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35553,8 +35632,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-7696",
-   "self_type" : "type-7695",
+   "referenced_type" : "type-7719",
+   "self_type" : "type-7718",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35573,8 +35652,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-1131",
-   "self_type" : "type-1130",
+   "referenced_type" : "type-1134",
+   "self_type" : "type-1133",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35583,8 +35662,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-1308",
-   "self_type" : "type-1307",
+   "referenced_type" : "type-1311",
+   "self_type" : "type-1310",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35593,8 +35672,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-3383",
-   "self_type" : "type-3382",
+   "referenced_type" : "type-3386",
+   "self_type" : "type-3385",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35603,8 +35682,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-3558",
-   "self_type" : "type-3557",
+   "referenced_type" : "type-3563",
+   "self_type" : "type-3562",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35613,8 +35692,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-3735",
-   "self_type" : "type-3734",
+   "referenced_type" : "type-3741",
+   "self_type" : "type-3740",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35623,8 +35702,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-3859",
-   "self_type" : "type-3858",
+   "referenced_type" : "type-3865",
+   "self_type" : "type-3864",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35633,8 +35712,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-4412",
-   "self_type" : "type-4411",
+   "referenced_type" : "type-4418",
+   "self_type" : "type-4417",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35643,8 +35722,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-4620",
-   "self_type" : "type-4619",
+   "referenced_type" : "type-4629",
+   "self_type" : "type-4628",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35653,8 +35732,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-4793",
-   "self_type" : "type-4792",
+   "referenced_type" : "type-4799",
+   "self_type" : "type-4798",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35663,8 +35742,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-5199",
-   "self_type" : "type-5198",
+   "referenced_type" : "type-5217",
+   "self_type" : "type-5216",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35673,8 +35752,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-5458",
-   "self_type" : "type-5457",
+   "referenced_type" : "type-5475",
+   "self_type" : "type-5474",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35683,8 +35762,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-5633",
-   "self_type" : "type-5632",
+   "referenced_type" : "type-5652",
+   "self_type" : "type-5651",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35693,8 +35772,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-5810",
-   "self_type" : "type-5809",
+   "referenced_type" : "type-5830",
+   "self_type" : "type-5829",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35713,8 +35792,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-5934",
-   "self_type" : "type-5933",
+   "referenced_type" : "type-5954",
+   "self_type" : "type-5953",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35723,8 +35802,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-6087",
-   "self_type" : "type-6086",
+   "referenced_type" : "type-6109",
+   "self_type" : "type-6108",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35733,8 +35812,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-6219",
-   "self_type" : "type-6218",
+   "referenced_type" : "type-6241",
+   "self_type" : "type-6240",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35743,8 +35822,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-6365",
-   "self_type" : "type-6364",
+   "referenced_type" : "type-6388",
+   "self_type" : "type-6387",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35753,8 +35832,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-6454",
-   "self_type" : "type-6453",
+   "referenced_type" : "type-6478",
+   "self_type" : "type-6477",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35763,8 +35842,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-7015",
-   "self_type" : "type-7014",
+   "referenced_type" : "type-7039",
+   "self_type" : "type-7038",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35773,8 +35852,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-7260",
-   "self_type" : "type-7259",
+   "referenced_type" : "type-7289",
+   "self_type" : "type-7288",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35783,8 +35862,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-7399",
-   "self_type" : "type-7398",
+   "referenced_type" : "type-7422",
+   "self_type" : "type-7421",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35793,8 +35872,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-7558",
-   "self_type" : "type-7557",
+   "referenced_type" : "type-7581",
+   "self_type" : "type-7580",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35803,8 +35882,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-7703",
-   "self_type" : "type-7702",
+   "referenced_type" : "type-7725",
+   "self_type" : "type-7724",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35813,8 +35892,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-881",
-   "self_type" : "type-880",
+   "referenced_type" : "type-883",
+   "self_type" : "type-882",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35823,8 +35902,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-1118",
-   "self_type" : "type-1117",
+   "referenced_type" : "type-1121",
+   "self_type" : "type-1120",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35833,8 +35912,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-1295",
-   "self_type" : "type-1294",
+   "referenced_type" : "type-1298",
+   "self_type" : "type-1297",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35843,8 +35922,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-3369",
-   "self_type" : "type-3368",
+   "referenced_type" : "type-3372",
+   "self_type" : "type-3371",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35853,8 +35932,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-3546",
-   "self_type" : "type-3545",
+   "referenced_type" : "type-3549",
+   "self_type" : "type-3548",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35863,8 +35942,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-3722",
-   "self_type" : "type-3721",
+   "referenced_type" : "type-3728",
+   "self_type" : "type-3727",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35873,8 +35952,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-3847",
-   "self_type" : "type-3846",
+   "referenced_type" : "type-3853",
+   "self_type" : "type-3852",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35883,8 +35962,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-4400",
-   "self_type" : "type-4399",
+   "referenced_type" : "type-4406",
+   "self_type" : "type-4405",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35893,8 +35972,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-4608",
-   "self_type" : "type-4607",
+   "referenced_type" : "type-4614",
+   "self_type" : "type-4613",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35903,8 +35982,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-4780",
-   "self_type" : "type-4779",
+   "referenced_type" : "type-4787",
+   "self_type" : "type-4786",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35913,8 +35992,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-5185",
-   "self_type" : "type-5184",
+   "referenced_type" : "type-5204",
+   "self_type" : "type-5203",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35923,8 +36002,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-5444",
-   "self_type" : "type-5443",
+   "referenced_type" : "type-5461",
+   "self_type" : "type-5460",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35943,8 +36022,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-5621",
-   "self_type" : "type-5620",
+   "referenced_type" : "type-5638",
+   "self_type" : "type-5637",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35953,8 +36032,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-5797",
-   "self_type" : "type-5796",
+   "referenced_type" : "type-5817",
+   "self_type" : "type-5816",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35963,8 +36042,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-5922",
-   "self_type" : "type-5921",
+   "referenced_type" : "type-5942",
+   "self_type" : "type-5941",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35973,8 +36052,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-6075",
-   "self_type" : "type-6074",
+   "referenced_type" : "type-6095",
+   "self_type" : "type-6094",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35983,8 +36062,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-6207",
-   "self_type" : "type-6206",
+   "referenced_type" : "type-6227",
+   "self_type" : "type-6226",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35993,8 +36072,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-6352",
-   "self_type" : "type-6351",
+   "referenced_type" : "type-6376",
+   "self_type" : "type-6375",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36003,8 +36082,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-6442",
-   "self_type" : "type-6441",
+   "referenced_type" : "type-6465",
+   "self_type" : "type-6464",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36013,8 +36092,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-7002",
-   "self_type" : "type-7001",
+   "referenced_type" : "type-7026",
+   "self_type" : "type-7025",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36023,8 +36102,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-7248",
-   "self_type" : "type-7247",
+   "referenced_type" : "type-7272",
+   "self_type" : "type-7271",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36033,8 +36112,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-7387",
-   "self_type" : "type-7386",
+   "referenced_type" : "type-7410",
+   "self_type" : "type-7409",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36043,8 +36122,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-7546",
-   "self_type" : "type-7545",
+   "referenced_type" : "type-7569",
+   "self_type" : "type-7568",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36053,8 +36132,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-7689",
-   "self_type" : "type-7688",
+   "referenced_type" : "type-7713",
+   "self_type" : "type-7712",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36073,8 +36152,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-1122",
-   "self_type" : "type-1121",
+   "referenced_type" : "type-1126",
+   "self_type" : "type-1125",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36083,8 +36162,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-1299",
-   "self_type" : "type-1298",
+   "referenced_type" : "type-1303",
+   "self_type" : "type-1302",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36093,8 +36172,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-3373",
-   "self_type" : "type-3372",
+   "referenced_type" : "type-3376",
+   "self_type" : "type-3375",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36103,8 +36182,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-3550",
-   "self_type" : "type-3549",
+   "referenced_type" : "type-3553",
+   "self_type" : "type-3552",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36113,8 +36192,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-3726",
-   "self_type" : "type-3725",
+   "referenced_type" : "type-3733",
+   "self_type" : "type-3732",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36123,8 +36202,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-3851",
-   "self_type" : "type-3850",
+   "referenced_type" : "type-3857",
+   "self_type" : "type-3856",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36133,8 +36212,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-4404",
-   "self_type" : "type-4403",
+   "referenced_type" : "type-4410",
+   "self_type" : "type-4409",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36143,8 +36222,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-4612",
-   "self_type" : "type-4611",
+   "referenced_type" : "type-4618",
+   "self_type" : "type-4617",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36153,8 +36232,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-4784",
-   "self_type" : "type-4783",
+   "referenced_type" : "type-4791",
+   "self_type" : "type-4790",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36163,8 +36242,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-5190",
-   "self_type" : "type-5189",
+   "referenced_type" : "type-5208",
+   "self_type" : "type-5207",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36173,8 +36252,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-5448",
-   "self_type" : "type-5447",
+   "referenced_type" : "type-5465",
+   "self_type" : "type-5464",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36193,8 +36272,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-5625",
-   "self_type" : "type-5624",
+   "referenced_type" : "type-5642",
+   "self_type" : "type-5641",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36203,8 +36282,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-5801",
-   "self_type" : "type-5800",
+   "referenced_type" : "type-5822",
+   "self_type" : "type-5821",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36213,8 +36292,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-5926",
-   "self_type" : "type-5925",
+   "referenced_type" : "type-5946",
+   "self_type" : "type-5945",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36223,8 +36302,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-6079",
-   "self_type" : "type-6078",
+   "referenced_type" : "type-6099",
+   "self_type" : "type-6098",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36233,8 +36312,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-6211",
-   "self_type" : "type-6210",
+   "referenced_type" : "type-6231",
+   "self_type" : "type-6230",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36243,8 +36322,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-6357",
-   "self_type" : "type-6356",
+   "referenced_type" : "type-6380",
+   "self_type" : "type-6379",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36253,8 +36332,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-6446",
-   "self_type" : "type-6445",
+   "referenced_type" : "type-6469",
+   "self_type" : "type-6468",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36263,8 +36342,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-7006",
-   "self_type" : "type-7005",
+   "referenced_type" : "type-7030",
+   "self_type" : "type-7029",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36273,8 +36352,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-7252",
-   "self_type" : "type-7251",
+   "referenced_type" : "type-7276",
+   "self_type" : "type-7275",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36283,8 +36362,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-7391",
-   "self_type" : "type-7390",
+   "referenced_type" : "type-7414",
+   "self_type" : "type-7413",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36293,8 +36372,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-7550",
-   "self_type" : "type-7549",
+   "referenced_type" : "type-7573",
+   "self_type" : "type-7572",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36303,8 +36382,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-7694",
-   "self_type" : "type-7693",
+   "referenced_type" : "type-7717",
+   "self_type" : "type-7716",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36323,8 +36402,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1135",
-   "self_type" : "type-1134",
+   "referenced_type" : "type-1138",
+   "self_type" : "type-1137",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36333,8 +36412,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1326",
-   "self_type" : "type-1325",
+   "referenced_type" : "type-1329",
+   "self_type" : "type-1328",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36343,8 +36422,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3417",
+   "self_type" : "type-3416",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36353,8 +36432,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3578",
+   "self_type" : "type-3577",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36363,8 +36442,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3745",
+   "self_type" : "type-3744",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36373,8 +36452,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3884",
+   "self_type" : "type-3883",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36383,8 +36462,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4438",
+   "self_type" : "type-4437",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36393,8 +36472,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4643",
+   "self_type" : "type-4642",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36403,8 +36482,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4814",
+   "self_type" : "type-4813",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36413,8 +36492,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5070",
+   "self_type" : "type-5069",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36423,8 +36502,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5232",
+   "self_type" : "type-5231",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36433,8 +36512,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5506",
+   "self_type" : "type-5505",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36443,8 +36522,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5667",
+   "self_type" : "type-5666",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36453,8 +36532,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5834",
+   "self_type" : "type-5833",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36463,8 +36542,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5973",
+   "self_type" : "type-5972",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36473,8 +36552,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6124",
+   "self_type" : "type-6123",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36483,8 +36562,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-6369",
-   "self_type" : "type-6368",
+   "referenced_type" : "type-6256",
+   "self_type" : "type-6255",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/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-6392",
+   "self_type" : "type-6391",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36503,8 +36592,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6495",
+   "self_type" : "type-6494",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36513,8 +36602,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7061",
+   "self_type" : "type-7060",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36523,8 +36612,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7304",
+   "self_type" : "type-7303",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36533,8 +36622,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7436",
+   "self_type" : "type-7435",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36543,18 +36632,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7585",
+   "self_type" : "type-7584",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36573,8 +36652,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-1139",
-   "self_type" : "type-1138",
+   "referenced_type" : "type-1142",
+   "self_type" : "type-1141",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36583,8 +36662,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-1330",
-   "self_type" : "type-1329",
+   "referenced_type" : "type-1335",
+   "self_type" : "type-1334",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36593,8 +36672,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-3418",
-   "self_type" : "type-3417",
+   "referenced_type" : "type-3421",
+   "self_type" : "type-3420",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36603,8 +36682,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-3579",
-   "self_type" : "type-3578",
+   "referenced_type" : "type-3582",
+   "self_type" : "type-3581",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36613,8 +36692,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-3743",
-   "self_type" : "type-3742",
+   "referenced_type" : "type-3749",
+   "self_type" : "type-3748",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36623,8 +36702,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-3882",
-   "self_type" : "type-3881",
+   "referenced_type" : "type-3890",
+   "self_type" : "type-3889",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36633,8 +36712,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-4435",
-   "self_type" : "type-4434",
+   "referenced_type" : "type-4442",
+   "self_type" : "type-4441",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36643,8 +36722,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-4641",
-   "self_type" : "type-4640",
+   "referenced_type" : "type-4647",
+   "self_type" : "type-4646",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36653,8 +36732,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-4812",
-   "self_type" : "type-4811",
+   "referenced_type" : "type-4818",
+   "self_type" : "type-4817",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36663,8 +36742,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-5219",
-   "self_type" : "type-5218",
+   "referenced_type" : "type-5075",
+   "self_type" : "type-5074",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36673,8 +36752,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-5493",
-   "self_type" : "type-5492",
+   "referenced_type" : "type-5236",
+   "self_type" : "type-5235",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36683,8 +36762,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-5654",
-   "self_type" : "type-5653",
+   "referenced_type" : "type-5510",
+   "self_type" : "type-5509",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36693,8 +36772,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-5818",
-   "self_type" : "type-5817",
+   "referenced_type" : "type-5671",
+   "self_type" : "type-5670",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36703,8 +36782,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-5957",
-   "self_type" : "type-5956",
+   "referenced_type" : "type-5838",
+   "self_type" : "type-5837",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36713,8 +36792,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-6108",
-   "self_type" : "type-6107",
+   "referenced_type" : "type-5979",
+   "self_type" : "type-5978",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36723,8 +36802,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-6240",
-   "self_type" : "type-6239",
+   "referenced_type" : "type-6128",
+   "self_type" : "type-6127",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36733,8 +36812,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-6373",
-   "self_type" : "type-6372",
+   "referenced_type" : "type-6260",
+   "self_type" : "type-6259",
+   "size" : 52,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/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-6396",
+   "self_type" : "type-6395",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36753,8 +36842,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-6476",
-   "self_type" : "type-6475",
+   "referenced_type" : "type-6501",
+   "self_type" : "type-6500",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36763,8 +36852,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-7040",
-   "self_type" : "type-7039",
+   "referenced_type" : "type-7065",
+   "self_type" : "type-7064",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36773,8 +36862,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-7285",
-   "self_type" : "type-7284",
+   "referenced_type" : "type-7308",
+   "self_type" : "type-7307",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36783,8 +36872,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-7417",
-   "self_type" : "type-7416",
+   "referenced_type" : "type-7440",
+   "self_type" : "type-7439",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36793,18 +36882,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-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",
+   "referenced_type" : "type-7589",
+   "self_type" : "type-7588",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36823,8 +36902,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-1137",
-   "self_type" : "type-1136",
+   "referenced_type" : "type-1140",
+   "self_type" : "type-1139",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36833,8 +36912,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-1328",
-   "self_type" : "type-1327",
+   "referenced_type" : "type-1333",
+   "self_type" : "type-1332",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36843,8 +36922,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-3416",
-   "self_type" : "type-3415",
+   "referenced_type" : "type-3419",
+   "self_type" : "type-3418",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36853,8 +36932,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-3577",
-   "self_type" : "type-3576",
+   "referenced_type" : "type-3580",
+   "self_type" : "type-3579",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36863,8 +36942,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-3741",
-   "self_type" : "type-3740",
+   "referenced_type" : "type-3747",
+   "self_type" : "type-3746",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36873,8 +36952,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-3880",
-   "self_type" : "type-3879",
+   "referenced_type" : "type-3888",
+   "self_type" : "type-3887",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36883,8 +36962,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-4433",
-   "self_type" : "type-4432",
+   "referenced_type" : "type-4440",
+   "self_type" : "type-4439",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36893,8 +36972,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-4639",
-   "self_type" : "type-4638",
+   "referenced_type" : "type-4645",
+   "self_type" : "type-4644",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36903,8 +36982,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-4810",
-   "self_type" : "type-4809",
+   "referenced_type" : "type-4816",
+   "self_type" : "type-4815",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36913,8 +36992,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-5217",
-   "self_type" : "type-5216",
+   "referenced_type" : "type-5072",
+   "self_type" : "type-5071",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36923,8 +37002,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-5491",
-   "self_type" : "type-5490",
+   "referenced_type" : "type-5234",
+   "self_type" : "type-5233",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36933,8 +37012,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-5652",
-   "self_type" : "type-5651",
+   "referenced_type" : "type-5508",
+   "self_type" : "type-5507",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36943,8 +37022,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-5816",
-   "self_type" : "type-5815",
+   "referenced_type" : "type-5669",
+   "self_type" : "type-5668",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36953,8 +37032,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-5955",
-   "self_type" : "type-5954",
+   "referenced_type" : "type-5836",
+   "self_type" : "type-5835",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36963,8 +37042,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-6106",
-   "self_type" : "type-6105",
+   "referenced_type" : "type-5977",
+   "self_type" : "type-5976",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36973,8 +37052,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-6238",
-   "self_type" : "type-6237",
+   "referenced_type" : "type-6126",
+   "self_type" : "type-6125",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36983,8 +37062,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6258",
+   "self_type" : "type-6257",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/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-6394",
+   "self_type" : "type-6393",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37003,8 +37092,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-6474",
-   "self_type" : "type-6473",
+   "referenced_type" : "type-6499",
+   "self_type" : "type-6498",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37013,8 +37102,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-7038",
-   "self_type" : "type-7037",
+   "referenced_type" : "type-7063",
+   "self_type" : "type-7062",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37023,8 +37112,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-7283",
-   "self_type" : "type-7282",
+   "referenced_type" : "type-7306",
+   "self_type" : "type-7305",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37033,8 +37122,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-7415",
-   "self_type" : "type-7414",
+   "referenced_type" : "type-7438",
+   "self_type" : "type-7437",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37043,18 +37132,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-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",
+   "referenced_type" : "type-7587",
+   "self_type" : "type-7586",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37073,8 +37152,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-1133",
-   "self_type" : "type-1132",
+   "referenced_type" : "type-1136",
+   "self_type" : "type-1135",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37083,8 +37162,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-1324",
-   "self_type" : "type-1323",
+   "referenced_type" : "type-1327",
+   "self_type" : "type-1326",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37093,8 +37172,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-3412",
-   "self_type" : "type-3411",
+   "referenced_type" : "type-3415",
+   "self_type" : "type-3414",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37103,8 +37182,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-3573",
-   "self_type" : "type-3572",
+   "referenced_type" : "type-3576",
+   "self_type" : "type-3575",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37113,8 +37192,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-3737",
-   "self_type" : "type-3736",
+   "referenced_type" : "type-3743",
+   "self_type" : "type-3742",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37123,8 +37202,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-3876",
-   "self_type" : "type-3875",
+   "referenced_type" : "type-3882",
+   "self_type" : "type-3881",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37133,8 +37212,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-4428",
-   "self_type" : "type-4427",
+   "referenced_type" : "type-4435",
+   "self_type" : "type-4434",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37143,8 +37222,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-4635",
-   "self_type" : "type-4634",
+   "referenced_type" : "type-4641",
+   "self_type" : "type-4640",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37153,8 +37232,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-4805",
-   "self_type" : "type-4804",
+   "referenced_type" : "type-4812",
+   "self_type" : "type-4811",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37163,8 +37242,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-5212",
-   "self_type" : "type-5211",
+   "referenced_type" : "type-5068",
+   "self_type" : "type-5067",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37173,8 +37252,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-5487",
-   "self_type" : "type-5486",
+   "referenced_type" : "type-5230",
+   "self_type" : "type-5229",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37183,8 +37262,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-5648",
-   "self_type" : "type-5647",
+   "referenced_type" : "type-5504",
+   "self_type" : "type-5503",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37193,8 +37272,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-5812",
-   "self_type" : "type-5811",
+   "referenced_type" : "type-5665",
+   "self_type" : "type-5664",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37203,8 +37282,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-5951",
-   "self_type" : "type-5950",
+   "referenced_type" : "type-5832",
+   "self_type" : "type-5831",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37213,8 +37292,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-6101",
-   "self_type" : "type-6100",
+   "referenced_type" : "type-5971",
+   "self_type" : "type-5970",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37223,8 +37302,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-6233",
-   "self_type" : "type-6232",
+   "referenced_type" : "type-6122",
+   "self_type" : "type-6121",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37233,8 +37312,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6254",
+   "self_type" : "type-6253",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/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-6390",
+   "self_type" : "type-6389",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37253,8 +37342,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-6470",
-   "self_type" : "type-6469",
+   "referenced_type" : "type-6493",
+   "self_type" : "type-6492",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37263,8 +37352,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-7032",
-   "self_type" : "type-7031",
+   "referenced_type" : "type-7059",
+   "self_type" : "type-7058",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37273,8 +37362,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-7278",
-   "self_type" : "type-7277",
+   "referenced_type" : "type-7302",
+   "self_type" : "type-7301",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37283,8 +37372,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-7411",
-   "self_type" : "type-7410",
+   "referenced_type" : "type-7434",
+   "self_type" : "type-7433",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37293,18 +37382,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-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",
+   "referenced_type" : "type-7583",
+   "self_type" : "type-7582",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37323,8 +37402,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-1141",
-   "self_type" : "type-1140",
+   "referenced_type" : "type-1144",
+   "self_type" : "type-1143",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37333,8 +37412,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-1334",
-   "self_type" : "type-1333",
+   "referenced_type" : "type-1337",
+   "self_type" : "type-1336",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37343,8 +37422,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-3421",
-   "self_type" : "type-3420",
+   "referenced_type" : "type-3424",
+   "self_type" : "type-3423",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37353,8 +37432,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-3581",
-   "self_type" : "type-3580",
+   "referenced_type" : "type-3584",
+   "self_type" : "type-3583",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37363,8 +37442,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-3745",
-   "self_type" : "type-3744",
+   "referenced_type" : "type-3751",
+   "self_type" : "type-3750",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37373,8 +37452,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-3886",
-   "self_type" : "type-3885",
+   "referenced_type" : "type-3892",
+   "self_type" : "type-3891",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37383,8 +37462,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-4437",
-   "self_type" : "type-4436",
+   "referenced_type" : "type-4444",
+   "self_type" : "type-4443",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37393,8 +37472,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-4643",
-   "self_type" : "type-4642",
+   "referenced_type" : "type-4649",
+   "self_type" : "type-4648",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37403,8 +37482,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-4814",
-   "self_type" : "type-4813",
+   "referenced_type" : "type-4820",
+   "self_type" : "type-4819",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37413,8 +37492,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-5221",
-   "self_type" : "type-5220",
+   "referenced_type" : "type-5077",
+   "self_type" : "type-5076",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37423,8 +37502,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-5496",
-   "self_type" : "type-5495",
+   "referenced_type" : "type-5239",
+   "self_type" : "type-5238",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37433,8 +37512,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-5656",
-   "self_type" : "type-5655",
+   "referenced_type" : "type-5513",
+   "self_type" : "type-5512",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37443,8 +37522,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-5820",
-   "self_type" : "type-5819",
+   "referenced_type" : "type-5673",
+   "self_type" : "type-5672",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37453,8 +37532,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-5961",
-   "self_type" : "type-5960",
+   "referenced_type" : "type-5840",
+   "self_type" : "type-5839",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37463,8 +37542,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-6110",
-   "self_type" : "type-6109",
+   "referenced_type" : "type-5981",
+   "self_type" : "type-5980",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37473,8 +37552,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-6242",
-   "self_type" : "type-6241",
+   "referenced_type" : "type-6130",
+   "self_type" : "type-6129",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37483,8 +37562,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-6375",
-   "self_type" : "type-6374",
+   "referenced_type" : "type-6262",
+   "self_type" : "type-6261",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37493,8 +37572,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-6480",
-   "self_type" : "type-6479",
+   "referenced_type" : "type-6398",
+   "self_type" : "type-6397",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/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-6503",
+   "self_type" : "type-6502",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37513,8 +37602,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-7042",
-   "self_type" : "type-7041",
+   "referenced_type" : "type-7067",
+   "self_type" : "type-7066",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37523,8 +37612,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-7287",
-   "self_type" : "type-7286",
+   "referenced_type" : "type-7311",
+   "self_type" : "type-7310",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37533,8 +37622,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-7419",
-   "self_type" : "type-7418",
+   "referenced_type" : "type-7442",
+   "self_type" : "type-7441",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37543,18 +37632,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-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",
+   "referenced_type" : "type-7591",
+   "self_type" : "type-7590",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37573,8 +37652,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1151",
-   "self_type" : "type-1150",
+   "referenced_type" : "type-1154",
+   "self_type" : "type-1153",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37583,8 +37662,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1344",
-   "self_type" : "type-1343",
+   "referenced_type" : "type-1347",
+   "self_type" : "type-1346",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37593,8 +37672,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3437",
+   "self_type" : "type-3436",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37603,8 +37682,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3594",
+   "self_type" : "type-3593",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37613,8 +37692,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3761",
+   "self_type" : "type-3760",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37623,8 +37702,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3903",
+   "self_type" : "type-3902",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37633,8 +37712,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4452",
+   "self_type" : "type-4451",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37643,8 +37722,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4658",
+   "self_type" : "type-4657",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37653,8 +37732,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4828",
+   "self_type" : "type-4827",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37663,8 +37742,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5086",
+   "self_type" : "type-5085",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37673,8 +37752,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5250",
+   "self_type" : "type-5249",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37683,8 +37762,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5526",
+   "self_type" : "type-5525",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37693,8 +37772,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5683",
+   "self_type" : "type-5682",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37703,8 +37782,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5850",
+   "self_type" : "type-5849",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37713,8 +37792,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5992",
+   "self_type" : "type-5991",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37723,8 +37802,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6139",
+   "self_type" : "type-6138",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37733,8 +37812,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6272",
+   "self_type" : "type-6271",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37743,8 +37822,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6408",
+   "self_type" : "type-6407",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37753,8 +37832,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6513",
+   "self_type" : "type-6512",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37773,8 +37852,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7075",
+   "self_type" : "type-7074",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37783,8 +37862,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7320",
+   "self_type" : "type-7319",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37793,8 +37872,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7450",
+   "self_type" : "type-7449",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37803,8 +37882,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7599",
+   "self_type" : "type-7598",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37823,8 +37902,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-1149",
-   "self_type" : "type-1148",
+   "referenced_type" : "type-1152",
+   "self_type" : "type-1151",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37833,8 +37912,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-1342",
-   "self_type" : "type-1341",
+   "referenced_type" : "type-1345",
+   "self_type" : "type-1344",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37843,8 +37922,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-3432",
-   "self_type" : "type-3431",
+   "referenced_type" : "type-3435",
+   "self_type" : "type-3434",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37853,8 +37932,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-3589",
-   "self_type" : "type-3588",
+   "referenced_type" : "type-3592",
+   "self_type" : "type-3591",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37863,8 +37942,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-3753",
-   "self_type" : "type-3752",
+   "referenced_type" : "type-3759",
+   "self_type" : "type-3758",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37873,8 +37952,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-3894",
-   "self_type" : "type-3893",
+   "referenced_type" : "type-3901",
+   "self_type" : "type-3900",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37883,8 +37962,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-4444",
-   "self_type" : "type-4443",
+   "referenced_type" : "type-4450",
+   "self_type" : "type-4449",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37893,8 +37972,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-4649",
-   "self_type" : "type-4648",
+   "referenced_type" : "type-4656",
+   "self_type" : "type-4655",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37903,8 +37982,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-4820",
-   "self_type" : "type-4819",
+   "referenced_type" : "type-4826",
+   "self_type" : "type-4825",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37913,8 +37992,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-5066",
-   "self_type" : "type-5065",
+   "referenced_type" : "type-5084",
+   "self_type" : "type-5083",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37923,8 +38002,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-5227",
-   "self_type" : "type-5226",
+   "referenced_type" : "type-5248",
+   "self_type" : "type-5247",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37933,8 +38012,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-5507",
-   "self_type" : "type-5506",
+   "referenced_type" : "type-5524",
+   "self_type" : "type-5523",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37943,8 +38022,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-5664",
-   "self_type" : "type-5663",
+   "referenced_type" : "type-5681",
+   "self_type" : "type-5680",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37953,8 +38032,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-5828",
-   "self_type" : "type-5827",
+   "referenced_type" : "type-5848",
+   "self_type" : "type-5847",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37963,8 +38042,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-5969",
-   "self_type" : "type-5968",
+   "referenced_type" : "type-5990",
+   "self_type" : "type-5989",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37973,8 +38052,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-6116",
-   "self_type" : "type-6115",
+   "referenced_type" : "type-6137",
+   "self_type" : "type-6136",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37983,8 +38062,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-6250",
-   "self_type" : "type-6249",
+   "referenced_type" : "type-6270",
+   "self_type" : "type-6269",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37993,8 +38072,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-6383",
-   "self_type" : "type-6382",
+   "referenced_type" : "type-6406",
+   "self_type" : "type-6405",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38003,8 +38082,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-6488",
-   "self_type" : "type-6487",
+   "referenced_type" : "type-6511",
+   "self_type" : "type-6510",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38023,8 +38102,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-7050",
-   "self_type" : "type-7049",
+   "referenced_type" : "type-7073",
+   "self_type" : "type-7072",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38033,8 +38112,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-7293",
-   "self_type" : "type-7292",
+   "referenced_type" : "type-7318",
+   "self_type" : "type-7317",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38043,8 +38122,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-7425",
-   "self_type" : "type-7424",
+   "referenced_type" : "type-7448",
+   "self_type" : "type-7447",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38053,8 +38132,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-7574",
-   "self_type" : "type-7573",
+   "referenced_type" : "type-7597",
+   "self_type" : "type-7596",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38073,8 +38152,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-1147",
-   "self_type" : "type-1146",
+   "referenced_type" : "type-1150",
+   "self_type" : "type-1149",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38083,8 +38162,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-1340",
-   "self_type" : "type-1339",
+   "referenced_type" : "type-1343",
+   "self_type" : "type-1342",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38093,8 +38172,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-3430",
-   "self_type" : "type-3429",
+   "referenced_type" : "type-3433",
+   "self_type" : "type-3432",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38103,8 +38182,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-3587",
-   "self_type" : "type-3586",
+   "referenced_type" : "type-3590",
+   "self_type" : "type-3589",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38113,8 +38192,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-3751",
-   "self_type" : "type-3750",
+   "referenced_type" : "type-3757",
+   "self_type" : "type-3756",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38123,8 +38202,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-3892",
-   "self_type" : "type-3891",
+   "referenced_type" : "type-3898",
+   "self_type" : "type-3897",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38133,8 +38212,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-4442",
-   "self_type" : "type-4441",
+   "referenced_type" : "type-4448",
+   "self_type" : "type-4447",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38143,8 +38222,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-4647",
-   "self_type" : "type-4646",
+   "referenced_type" : "type-4654",
+   "self_type" : "type-4653",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38153,8 +38232,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-4818",
-   "self_type" : "type-4817",
+   "referenced_type" : "type-4824",
+   "self_type" : "type-4823",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38163,8 +38242,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-5064",
-   "self_type" : "type-5063",
+   "referenced_type" : "type-5082",
+   "self_type" : "type-5081",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38173,8 +38252,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-5225",
-   "self_type" : "type-5224",
+   "referenced_type" : "type-5244",
+   "self_type" : "type-5243",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38183,8 +38262,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-5505",
-   "self_type" : "type-5504",
+   "referenced_type" : "type-5522",
+   "self_type" : "type-5521",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38193,8 +38272,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-5662",
-   "self_type" : "type-5661",
+   "referenced_type" : "type-5679",
+   "self_type" : "type-5678",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38203,8 +38282,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-5826",
-   "self_type" : "type-5825",
+   "referenced_type" : "type-5846",
+   "self_type" : "type-5845",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38213,8 +38292,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-5967",
-   "self_type" : "type-5966",
+   "referenced_type" : "type-5987",
+   "self_type" : "type-5986",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38223,8 +38302,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-6114",
-   "self_type" : "type-6113",
+   "referenced_type" : "type-6134",
+   "self_type" : "type-6133",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38233,8 +38312,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-6248",
-   "self_type" : "type-6247",
+   "referenced_type" : "type-6268",
+   "self_type" : "type-6267",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38243,8 +38322,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-6381",
-   "self_type" : "type-6380",
+   "referenced_type" : "type-6404",
+   "self_type" : "type-6403",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38253,8 +38332,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-6486",
-   "self_type" : "type-6485",
+   "referenced_type" : "type-6509",
+   "self_type" : "type-6508",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38273,8 +38352,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-7048",
-   "self_type" : "type-7047",
+   "referenced_type" : "type-7071",
+   "self_type" : "type-7070",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38283,8 +38362,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-7291",
-   "self_type" : "type-7290",
+   "referenced_type" : "type-7316",
+   "self_type" : "type-7315",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38293,8 +38372,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-7423",
-   "self_type" : "type-7422",
+   "referenced_type" : "type-7446",
+   "self_type" : "type-7445",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38303,8 +38382,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-7572",
-   "self_type" : "type-7571",
+   "referenced_type" : "type-7595",
+   "self_type" : "type-7594",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38323,8 +38402,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-1145",
-   "self_type" : "type-1144",
+   "referenced_type" : "type-1148",
+   "self_type" : "type-1147",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38333,8 +38412,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-1338",
-   "self_type" : "type-1337",
+   "referenced_type" : "type-1341",
+   "self_type" : "type-1340",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38343,8 +38422,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-3428",
-   "self_type" : "type-3427",
+   "referenced_type" : "type-3431",
+   "self_type" : "type-3430",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38353,8 +38432,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-3585",
-   "self_type" : "type-3584",
+   "referenced_type" : "type-3588",
+   "self_type" : "type-3587",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38363,8 +38442,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-3749",
-   "self_type" : "type-3748",
+   "referenced_type" : "type-3755",
+   "self_type" : "type-3754",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38373,8 +38452,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-3890",
-   "self_type" : "type-3889",
+   "referenced_type" : "type-3896",
+   "self_type" : "type-3895",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38383,8 +38462,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-4440",
-   "self_type" : "type-4439",
+   "referenced_type" : "type-4446",
+   "self_type" : "type-4445",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38393,8 +38472,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-4645",
-   "self_type" : "type-4644",
+   "referenced_type" : "type-4652",
+   "self_type" : "type-4651",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38403,8 +38482,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-4816",
-   "self_type" : "type-4815",
+   "referenced_type" : "type-4822",
+   "self_type" : "type-4821",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38413,8 +38492,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-5062",
-   "self_type" : "type-5061",
+   "referenced_type" : "type-5080",
+   "self_type" : "type-5079",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38423,8 +38502,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-5223",
-   "self_type" : "type-5222",
+   "referenced_type" : "type-5241",
+   "self_type" : "type-5240",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38433,8 +38512,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-5503",
-   "self_type" : "type-5502",
+   "referenced_type" : "type-5520",
+   "self_type" : "type-5519",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38443,8 +38522,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-5660",
-   "self_type" : "type-5659",
+   "referenced_type" : "type-5677",
+   "self_type" : "type-5676",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38453,8 +38532,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-5824",
-   "self_type" : "type-5823",
+   "referenced_type" : "type-5844",
+   "self_type" : "type-5843",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38463,8 +38542,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-5965",
-   "self_type" : "type-5964",
+   "referenced_type" : "type-5985",
+   "self_type" : "type-5984",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38473,8 +38552,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-6112",
-   "self_type" : "type-6111",
+   "referenced_type" : "type-6132",
+   "self_type" : "type-6131",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38483,8 +38562,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-6246",
-   "self_type" : "type-6245",
+   "referenced_type" : "type-6266",
+   "self_type" : "type-6265",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38493,8 +38572,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-6379",
-   "self_type" : "type-6378",
+   "referenced_type" : "type-6402",
+   "self_type" : "type-6401",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38503,8 +38582,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-6484",
-   "self_type" : "type-6483",
+   "referenced_type" : "type-6507",
+   "self_type" : "type-6506",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38523,8 +38602,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-7046",
-   "self_type" : "type-7045",
+   "referenced_type" : "type-7069",
+   "self_type" : "type-7068",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38533,8 +38612,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-7289",
-   "self_type" : "type-7288",
+   "referenced_type" : "type-7313",
+   "self_type" : "type-7312",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38543,8 +38622,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-7421",
-   "self_type" : "type-7420",
+   "referenced_type" : "type-7444",
+   "self_type" : "type-7443",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38553,8 +38632,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-7570",
-   "self_type" : "type-7569",
+   "referenced_type" : "type-7593",
+   "self_type" : "type-7592",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38573,8 +38652,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-1153",
-   "self_type" : "type-1152",
+   "referenced_type" : "type-1156",
+   "self_type" : "type-1155",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38583,8 +38662,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-1346",
-   "self_type" : "type-1345",
+   "referenced_type" : "type-1349",
+   "self_type" : "type-1348",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38593,8 +38672,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-3436",
-   "self_type" : "type-3435",
+   "referenced_type" : "type-3439",
+   "self_type" : "type-3438",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38603,8 +38682,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-3593",
-   "self_type" : "type-3592",
+   "referenced_type" : "type-3596",
+   "self_type" : "type-3595",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38613,8 +38692,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-3757",
-   "self_type" : "type-3756",
+   "referenced_type" : "type-3763",
+   "self_type" : "type-3762",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38623,8 +38702,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-3899",
-   "self_type" : "type-3898",
+   "referenced_type" : "type-3905",
+   "self_type" : "type-3904",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38633,8 +38712,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-4448",
-   "self_type" : "type-4447",
+   "referenced_type" : "type-4454",
+   "self_type" : "type-4453",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38643,8 +38722,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-4653",
-   "self_type" : "type-4652",
+   "referenced_type" : "type-4660",
+   "self_type" : "type-4659",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38653,8 +38732,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-4824",
-   "self_type" : "type-4823",
+   "referenced_type" : "type-4831",
+   "self_type" : "type-4830",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38663,8 +38742,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-5071",
-   "self_type" : "type-5070",
+   "referenced_type" : "type-5088",
+   "self_type" : "type-5087",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38673,8 +38752,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-5234",
-   "self_type" : "type-5233",
+   "referenced_type" : "type-5252",
+   "self_type" : "type-5251",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38683,8 +38762,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-5511",
-   "self_type" : "type-5510",
+   "referenced_type" : "type-5528",
+   "self_type" : "type-5527",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38693,8 +38772,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-5668",
-   "self_type" : "type-5667",
+   "referenced_type" : "type-5685",
+   "self_type" : "type-5684",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38703,8 +38782,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-5832",
-   "self_type" : "type-5831",
+   "referenced_type" : "type-5852",
+   "self_type" : "type-5851",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38713,8 +38792,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-5974",
-   "self_type" : "type-5973",
+   "referenced_type" : "type-5994",
+   "self_type" : "type-5993",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38723,8 +38802,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-6121",
-   "self_type" : "type-6120",
+   "referenced_type" : "type-6141",
+   "self_type" : "type-6140",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38733,8 +38812,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-6254",
-   "self_type" : "type-6253",
+   "referenced_type" : "type-6274",
+   "self_type" : "type-6273",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38743,8 +38822,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-6387",
-   "self_type" : "type-6386",
+   "referenced_type" : "type-6410",
+   "self_type" : "type-6409",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38753,8 +38832,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-6492",
-   "self_type" : "type-6491",
+   "referenced_type" : "type-6515",
+   "self_type" : "type-6514",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38773,8 +38852,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-7054",
-   "self_type" : "type-7053",
+   "referenced_type" : "type-7077",
+   "self_type" : "type-7076",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38783,8 +38862,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-7298",
-   "self_type" : "type-7297",
+   "referenced_type" : "type-7322",
+   "self_type" : "type-7321",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38793,8 +38872,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-7429",
-   "self_type" : "type-7428",
+   "referenced_type" : "type-7452",
+   "self_type" : "type-7451",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38803,8 +38882,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-7578",
-   "self_type" : "type-7577",
+   "referenced_type" : "type-7601",
+   "self_type" : "type-7600",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38833,8 +38912,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-1114",
-   "self_type" : "type-1113",
+   "referenced_type" : "type-1117",
+   "self_type" : "type-1116",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38843,8 +38922,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-1291",
-   "self_type" : "type-1290",
+   "referenced_type" : "type-1295",
+   "self_type" : "type-1294",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38853,8 +38932,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-3356",
-   "self_type" : "type-3355",
+   "referenced_type" : "type-3359",
+   "self_type" : "type-3358",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38863,8 +38942,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-3544",
-   "self_type" : "type-3543",
+   "referenced_type" : "type-3547",
+   "self_type" : "type-3546",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38873,8 +38952,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-3653",
-   "self_type" : "type-3652",
+   "referenced_type" : "type-3656",
+   "self_type" : "type-3655",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38883,8 +38962,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-3717",
-   "self_type" : "type-3716",
+   "referenced_type" : "type-3723",
+   "self_type" : "type-3722",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38893,8 +38972,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-3841",
-   "self_type" : "type-3840",
+   "referenced_type" : "type-3850",
+   "self_type" : "type-3849",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38903,8 +38982,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-4396",
-   "self_type" : "type-4395",
+   "referenced_type" : "type-4404",
+   "self_type" : "type-4403",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38913,8 +38992,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-4511",
-   "self_type" : "type-4510",
+   "referenced_type" : "type-4518",
+   "self_type" : "type-4517",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38923,8 +39002,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-4548",
-   "self_type" : "type-4547",
+   "referenced_type" : "type-4556",
+   "self_type" : "type-4555",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38933,8 +39012,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-4606",
-   "self_type" : "type-4605",
+   "referenced_type" : "type-4612",
+   "self_type" : "type-4611",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38943,8 +39022,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-4776",
-   "self_type" : "type-4775",
+   "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"
   },
@@ -38953,8 +39032,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-4854",
-   "self_type" : "type-4853",
+   "referenced_type" : "type-4860",
+   "self_type" : "type-4859",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38963,8 +39042,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-5073",
-   "self_type" : "type-5072",
+   "referenced_type" : "type-5091",
+   "self_type" : "type-5090",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38973,8 +39052,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-5127",
-   "self_type" : "type-5126",
+   "referenced_type" : "type-5143",
+   "self_type" : "type-5142",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38983,8 +39062,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-5183",
-   "self_type" : "type-5182",
+   "referenced_type" : "type-5200",
+   "self_type" : "type-5199",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39003,8 +39082,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-5431",
-   "self_type" : "type-5430",
+   "referenced_type" : "type-5448",
+   "self_type" : "type-5447",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39013,8 +39092,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-5619",
-   "self_type" : "type-5618",
+   "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"
   },
@@ -39023,8 +39102,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-5728",
-   "self_type" : "type-5727",
+   "referenced_type" : "type-5745",
+   "self_type" : "type-5744",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39033,8 +39112,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-5792",
-   "self_type" : "type-5791",
+   "referenced_type" : "type-5812",
+   "self_type" : "type-5811",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39043,8 +39122,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-5916",
-   "self_type" : "type-5915",
+   "referenced_type" : "type-5939",
+   "self_type" : "type-5938",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39053,8 +39132,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-6072",
-   "self_type" : "type-6071",
+   "referenced_type" : "type-6092",
+   "self_type" : "type-6091",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39063,8 +39142,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-6205",
-   "self_type" : "type-6204",
+   "referenced_type" : "type-6225",
+   "self_type" : "type-6224",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39073,8 +39152,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-6301",
-   "self_type" : "type-6300",
+   "referenced_type" : "type-6321",
+   "self_type" : "type-6320",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39083,8 +39162,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-6347",
-   "self_type" : "type-6346",
+   "referenced_type" : "type-6370",
+   "self_type" : "type-6369",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39093,8 +39172,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-6439",
-   "self_type" : "type-6438",
+   "referenced_type" : "type-6463",
+   "self_type" : "type-6462",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39103,8 +39182,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-6996",
-   "self_type" : "type-6995",
+   "referenced_type" : "type-7023",
+   "self_type" : "type-7022",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39113,8 +39192,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-7115",
-   "self_type" : "type-7114",
+   "referenced_type" : "type-7140",
+   "self_type" : "type-7139",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39123,8 +39202,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-7167",
-   "self_type" : "type-7166",
+   "referenced_type" : "type-7192",
+   "self_type" : "type-7191",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39133,8 +39212,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-7246",
-   "self_type" : "type-7245",
+   "referenced_type" : "type-7269",
+   "self_type" : "type-7268",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39143,8 +39222,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-7385",
-   "self_type" : "type-7384",
+   "referenced_type" : "type-7408",
+   "self_type" : "type-7407",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39153,8 +39232,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-7449",
-   "self_type" : "type-7448",
+   "referenced_type" : "type-7474",
+   "self_type" : "type-7473",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39163,8 +39242,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-7489",
-   "self_type" : "type-7488",
+   "referenced_type" : "type-7514",
+   "self_type" : "type-7513",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39173,8 +39252,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-7580",
-   "self_type" : "type-7579",
+   "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"
   },
@@ -39183,8 +39262,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-7621",
-   "self_type" : "type-7620",
+   "referenced_type" : "type-7644",
+   "self_type" : "type-7643",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39203,8 +39282,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-4764",
-   "self_type" : "type-4763",
+   "referenced_type" : "type-4771",
+   "self_type" : "type-4770",
    "size" : 24,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39213,8 +39292,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-4867",
-   "self_type" : "type-4866",
+   "referenced_type" : "type-4873",
+   "self_type" : "type-4872",
    "size" : 24,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39223,8 +39302,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",
+   "referenced_type" : "type-5102",
+   "self_type" : "type-5101",
    "size" : 24,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39233,8 +39312,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",
+   "referenced_type" : "type-5155",
+   "self_type" : "type-5154",
    "size" : 24,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39243,8 +39322,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",
+   "referenced_type" : "type-7398",
+   "self_type" : "type-7397",
    "size" : 24,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39253,8 +39332,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",
+   "referenced_type" : "type-7494",
+   "self_type" : "type-7493",
    "size" : 24,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39263,8 +39342,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",
+   "referenced_type" : "type-7620",
+   "self_type" : "type-7619",
    "size" : 24,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39273,8 +39352,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-2646",
-   "self_type" : "type-2645",
+   "referenced_type" : "type-2649",
+   "self_type" : "type-2648",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39283,8 +39362,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",
+   "referenced_type" : "type-4997",
+   "self_type" : "type-4996",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39293,8 +39372,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",
+   "referenced_type" : "type-6056",
+   "self_type" : "type-6055",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39303,8 +39382,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",
+   "referenced_type" : "type-7546",
+   "self_type" : "type-7545",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39313,8 +39392,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-2642",
-   "self_type" : "type-2641",
+   "referenced_type" : "type-2645",
+   "self_type" : "type-2644",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39323,8 +39402,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",
+   "referenced_type" : "type-4993",
+   "self_type" : "type-4992",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39333,8 +39412,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",
+   "referenced_type" : "type-6053",
+   "self_type" : "type-6052",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39343,8 +39422,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",
+   "referenced_type" : "type-7532",
+   "self_type" : "type-7531",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39353,8 +39432,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",
+   "referenced_type" : "type-4762",
+   "self_type" : "type-4761",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39363,8 +39442,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",
+   "referenced_type" : "type-4869",
+   "self_type" : "type-4868",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39373,8 +39452,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",
+   "referenced_type" : "type-5094",
+   "self_type" : "type-5093",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39383,8 +39462,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",
+   "referenced_type" : "type-5151",
+   "self_type" : "type-5150",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39393,8 +39472,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",
+   "referenced_type" : "type-7392",
+   "self_type" : "type-7391",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39403,8 +39482,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",
+   "referenced_type" : "type-7489",
+   "self_type" : "type-7488",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39413,8 +39492,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",
+   "referenced_type" : "type-7612",
+   "self_type" : "type-7611",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39423,8 +39502,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",
+   "referenced_type" : "type-1648",
+   "self_type" : "type-1647",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -39433,8 +39512,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",
+   "referenced_type" : "type-4114",
+   "self_type" : "type-4113",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -39443,8 +39522,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",
+   "referenced_type" : "type-6717",
+   "self_type" : "type-6716",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -39463,8 +39542,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1109",
-   "self_type" : "type-1108",
+   "referenced_type" : "type-1112",
+   "self_type" : "type-1111",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39473,8 +39552,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1279",
-   "self_type" : "type-1278",
+   "referenced_type" : "type-1282",
+   "self_type" : "type-1281",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39483,8 +39562,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-3276",
+   "self_type" : "type-3275",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39493,8 +39572,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-3541",
+   "self_type" : "type-3540",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39503,8 +39582,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-3651",
+   "self_type" : "type-3650",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39513,8 +39592,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-3717",
+   "self_type" : "type-3716",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39523,8 +39602,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-3839",
+   "self_type" : "type-3838",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39543,8 +39622,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-4361",
+   "self_type" : "type-4360",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39553,8 +39632,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-4496",
+   "self_type" : "type-4495",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39563,8 +39642,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-4565",
+   "self_type" : "type-4564",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39573,8 +39652,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-4627",
+   "self_type" : "type-4626",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39583,8 +39662,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-4671",
+   "self_type" : "type-4670",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39593,8 +39672,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-4877",
+   "self_type" : "type-4876",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39603,8 +39682,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-5160",
+   "self_type" : "type-5159",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39613,8 +39692,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-5191",
+   "self_type" : "type-5190",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39623,8 +39702,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-5365",
+   "self_type" : "type-5364",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39633,8 +39712,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-5630",
+   "self_type" : "type-5629",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39643,8 +39722,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-5740",
+   "self_type" : "type-5739",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39653,8 +39732,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-5806",
+   "self_type" : "type-5805",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39663,8 +39742,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-5928",
+   "self_type" : "type-5927",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39673,8 +39752,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6083",
+   "self_type" : "type-6082",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39683,8 +39762,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6220",
+   "self_type" : "type-6219",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39693,8 +39772,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6316",
+   "self_type" : "type-6315",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39703,8 +39782,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6363",
+   "self_type" : "type-6362",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39713,8 +39792,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6455",
+   "self_type" : "type-6454",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39723,8 +39802,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6977",
+   "self_type" : "type-6976",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39733,8 +39812,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7116",
+   "self_type" : "type-7115",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39743,8 +39822,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7204",
+   "self_type" : "type-7203",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39753,8 +39832,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7287",
+   "self_type" : "type-7286",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39763,8 +39842,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7331",
+   "self_type" : "type-7330",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39773,8 +39852,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7498",
+   "self_type" : "type-7497",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39783,8 +39862,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7523",
+   "self_type" : "type-7522",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39793,8 +39872,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7529",
+   "self_type" : "type-7528",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39803,8 +39882,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7658",
+   "self_type" : "type-7657",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39813,8 +39892,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7669",
+   "self_type" : "type-7668",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39833,8 +39912,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",
+   "referenced_type" : "type-4386",
+   "self_type" : "type-4385",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -39843,8 +39922,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",
+   "referenced_type" : "type-4514",
+   "self_type" : "type-4513",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -39853,8 +39932,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",
+   "referenced_type" : "type-7001",
+   "self_type" : "type-7000",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -39863,8 +39942,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",
+   "referenced_type" : "type-7135",
+   "self_type" : "type-7134",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -39914,7 +39993,7 @@
    "linker_set_key" : "const unsigned short",
    "name" : "const unsigned short",
    "referenced_type" : "type-500",
-   "self_type" : "type-2521",
+   "self_type" : "type-2524",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39942,7 +40021,7 @@
    "linker_set_key" : "volatile int",
    "name" : "volatile int",
    "referenced_type" : "type-4",
-   "self_type" : "type-1255",
+   "self_type" : "type-1258",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h"
   }
@@ -39960,7 +40039,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -39975,8 +40054,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_BALANCETYPE",
    "name" : "OMX_AUDIO_CONFIG_BALANCETYPE",
-   "referenced_type" : "type-2186",
-   "self_type" : "type-2186",
+   "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_BALANCETYPE"
@@ -39992,7 +40071,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -40002,7 +40081,7 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "nBass",
@@ -40012,8 +40091,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_BASSTYPE",
    "name" : "OMX_AUDIO_CONFIG_BASSTYPE",
-   "referenced_type" : "type-2190",
-   "self_type" : "type-2190",
+   "referenced_type" : "type-2193",
+   "self_type" : "type-2193",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_BASSTYPE"
@@ -40029,7 +40108,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -40044,18 +40123,18 @@
     {
      "field_name" : "bMute",
      "field_offset" : 128,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bIsMIDI",
      "field_offset" : 160,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
    "name" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
-   "referenced_type" : "type-2188",
-   "self_type" : "type-2188",
+   "referenced_type" : "type-2191",
+   "self_type" : "type-2191",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE"
@@ -40071,7 +40150,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -40086,23 +40165,23 @@
     {
      "field_name" : "bLinear",
      "field_offset" : 128,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "sVolume",
      "field_offset" : 160,
-     "referenced_type" : "type-1475"
+     "referenced_type" : "type-1474"
     },
     {
      "field_name" : "bIsMIDI",
      "field_offset" : 256,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
    "name" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
-   "referenced_type" : "type-2185",
-   "self_type" : "type-2185",
+   "referenced_type" : "type-2188",
+   "self_type" : "type-2188",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE"
@@ -40118,7 +40197,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -40128,17 +40207,17 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "sDelay",
      "field_offset" : 128,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     },
     {
      "field_name" : "sModulationRate",
      "field_offset" : 224,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     },
     {
      "field_name" : "nModulationDepth",
@@ -40148,13 +40227,13 @@
     {
      "field_name" : "nFeedback",
      "field_offset" : 352,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
    "name" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
-   "referenced_type" : "type-2196",
-   "self_type" : "type-2196",
+   "referenced_type" : "type-2199",
+   "self_type" : "type-2199",
    "size" : 56,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHORUSTYPE"
@@ -40170,7 +40249,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -40180,13 +40259,13 @@
     {
      "field_name" : "eEchoCancelation",
      "field_offset" : 96,
-     "referenced_type" : "type-2198"
+     "referenced_type" : "type-2201"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
-   "referenced_type" : "type-2199",
-   "self_type" : "type-2199",
+   "referenced_type" : "type-2202",
+   "self_type" : "type-2202",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE"
@@ -40202,7 +40281,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -40212,28 +40291,28 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "sBandIndex",
      "field_offset" : 128,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     },
     {
      "field_name" : "sCenterFreq",
      "field_offset" : 224,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     },
     {
      "field_name" : "sBandLevel",
      "field_offset" : 320,
-     "referenced_type" : "type-1475"
+     "referenced_type" : "type-1474"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
    "name" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
-   "referenced_type" : "type-2193",
-   "self_type" : "type-2193",
+   "referenced_type" : "type-2196",
+   "self_type" : "type-2196",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE"
@@ -40249,7 +40328,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -40259,13 +40338,13 @@
     {
      "field_name" : "bLoudness",
      "field_offset" : 96,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
    "name" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
-   "referenced_type" : "type-2189",
-   "self_type" : "type-2189",
+   "referenced_type" : "type-2192",
+   "self_type" : "type-2192",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE"
@@ -40281,7 +40360,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -40291,17 +40370,17 @@
     {
      "field_name" : "sPitchTransposition",
      "field_offset" : 96,
-     "referenced_type" : "type-1475"
+     "referenced_type" : "type-1474"
     },
     {
      "field_name" : "sPlayBackRate",
      "field_offset" : 192,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     },
     {
      "field_name" : "sTempo",
      "field_offset" : 288,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     },
     {
      "field_name" : "nMaxPolyphony",
@@ -40351,8 +40430,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
-   "referenced_type" : "type-2167",
-   "self_type" : "type-2167",
+   "referenced_type" : "type-2160",
+   "self_type" : "type-2160",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE"
@@ -40368,7 +40447,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -40383,13 +40462,13 @@
     {
      "field_name" : "nMidiEvents",
      "field_offset" : 128,
-     "referenced_type" : "type-1577"
+     "referenced_type" : "type-1572"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
-   "referenced_type" : "type-2146",
-   "self_type" : "type-2146",
+   "referenced_type" : "type-2138",
+   "self_type" : "type-2138",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE"
@@ -40405,7 +40484,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -40425,13 +40504,13 @@
     {
      "field_name" : "nData",
      "field_offset" : 160,
-     "referenced_type" : "type-1577"
+     "referenced_type" : "type-1572"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
-   "referenced_type" : "type-2183",
-   "self_type" : "type-2183",
+   "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_MIDIMETAEVENTDATATYPE"
@@ -40447,7 +40526,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -40482,8 +40561,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
-   "referenced_type" : "type-2182",
-   "self_type" : "type-2182",
+   "referenced_type" : "type-2185",
+   "self_type" : "type-2185",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE"
@@ -40499,7 +40578,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -40529,8 +40608,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
-   "referenced_type" : "type-2157",
-   "self_type" : "type-2157",
+   "referenced_type" : "type-2149",
+   "self_type" : "type-2149",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE"
@@ -40546,7 +40625,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -40571,7 +40650,7 @@
     {
      "field_name" : "bVibra",
      "field_offset" : 192,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "nNumMetaEvents",
@@ -40586,13 +40665,13 @@
     {
      "field_name" : "eMIDIPlayBackState",
      "field_offset" : 288,
-     "referenced_type" : "type-2171"
+     "referenced_type" : "type-2170"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
-   "referenced_type" : "type-2172",
-   "self_type" : "type-2172",
+   "referenced_type" : "type-2175",
+   "self_type" : "type-2175",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE"
@@ -40608,7 +40687,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -40618,13 +40697,13 @@
     {
      "field_name" : "bMute",
      "field_offset" : 96,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MUTETYPE",
    "name" : "OMX_AUDIO_CONFIG_MUTETYPE",
-   "referenced_type" : "type-2187",
-   "self_type" : "type-2187",
+   "referenced_type" : "type-2190",
+   "self_type" : "type-2190",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MUTETYPE"
@@ -40640,7 +40719,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -40650,13 +40729,13 @@
     {
      "field_name" : "bNoiseReduction",
      "field_offset" : 96,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
-   "referenced_type" : "type-2200",
-   "self_type" : "type-2200",
+   "referenced_type" : "type-2203",
+   "self_type" : "type-2203",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE"
@@ -40672,7 +40751,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -40682,47 +40761,47 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "sRoomLevel",
      "field_offset" : 128,
-     "referenced_type" : "type-1475"
+     "referenced_type" : "type-1474"
     },
     {
      "field_name" : "sRoomHighFreqLevel",
      "field_offset" : 224,
-     "referenced_type" : "type-1475"
+     "referenced_type" : "type-1474"
     },
     {
      "field_name" : "sReflectionsLevel",
      "field_offset" : 320,
-     "referenced_type" : "type-1475"
+     "referenced_type" : "type-1474"
     },
     {
      "field_name" : "sReflectionsDelay",
      "field_offset" : 416,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     },
     {
      "field_name" : "sReverbLevel",
      "field_offset" : 512,
-     "referenced_type" : "type-1475"
+     "referenced_type" : "type-1474"
     },
     {
      "field_name" : "sReverbDelay",
      "field_offset" : 608,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     },
     {
      "field_name" : "sDecayTime",
      "field_offset" : 704,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     },
     {
      "field_name" : "nDecayHighFreqRatio",
      "field_offset" : 800,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     },
     {
      "field_name" : "nDensity",
@@ -40737,13 +40816,13 @@
     {
      "field_name" : "sReferenceHighFreq",
      "field_offset" : 960,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
-   "referenced_type" : "type-2197",
-   "self_type" : "type-2197",
+   "referenced_type" : "type-2200",
+   "self_type" : "type-2200",
    "size" : 132,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE"
@@ -40759,7 +40838,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -40769,12 +40848,12 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "eWideningType",
      "field_offset" : 128,
-     "referenced_type" : "type-2194"
+     "referenced_type" : "type-2197"
     },
     {
      "field_name" : "nStereoWidening",
@@ -40784,8 +40863,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
    "name" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-2195",
-   "self_type" : "type-2195",
+   "referenced_type" : "type-2198",
+   "self_type" : "type-2198",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE"
@@ -40801,7 +40880,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -40811,7 +40890,7 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "nTreble",
@@ -40821,8 +40900,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_TREBLETYPE",
    "name" : "OMX_AUDIO_CONFIG_TREBLETYPE",
-   "referenced_type" : "type-2191",
-   "self_type" : "type-2191",
+   "referenced_type" : "type-2194",
+   "self_type" : "type-2194",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_TREBLETYPE"
@@ -40838,7 +40917,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -40848,18 +40927,18 @@
     {
      "field_name" : "bLinear",
      "field_offset" : 96,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "sVolume",
      "field_offset" : 128,
-     "referenced_type" : "type-1475"
+     "referenced_type" : "type-1474"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
    "name" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
-   "referenced_type" : "type-2184",
-   "self_type" : "type-2184",
+   "referenced_type" : "type-2187",
+   "self_type" : "type-2187",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_VOLUMETYPE"
@@ -40875,7 +40954,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -40920,7 +40999,7 @@
     {
      "field_name" : "eAACProfile",
      "field_offset" : 320,
-     "referenced_type" : "type-1678"
+     "referenced_type" : "type-1675"
     },
     {
      "field_name" : "eAACStreamFormat",
@@ -40930,13 +41009,13 @@
     {
      "field_name" : "eChannelMode",
      "field_offset" : 384,
-     "referenced_type" : "type-1653"
+     "referenced_type" : "type-1652"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
    "name" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
-   "referenced_type" : "type-1689",
-   "self_type" : "type-1689",
+   "referenced_type" : "type-1681",
+   "self_type" : "type-1681",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_AACPROFILETYPE"
@@ -40952,7 +41031,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -40977,8 +41056,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_ADPCMTYPE",
    "name" : "OMX_AUDIO_PARAM_ADPCMTYPE",
-   "referenced_type" : "type-1800",
-   "self_type" : "type-1800",
+   "referenced_type" : "type-1791",
+   "self_type" : "type-1791",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_ADPCMTYPE"
@@ -40994,7 +41073,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -41014,23 +41093,23 @@
     {
      "field_name" : "eAMRBandMode",
      "field_offset" : 160,
-     "referenced_type" : "type-1892"
+     "referenced_type" : "type-1883"
     },
     {
      "field_name" : "eAMRDTXMode",
      "field_offset" : 192,
-     "referenced_type" : "type-1903"
+     "referenced_type" : "type-1896"
     },
     {
      "field_name" : "eAMRFrameFormat",
      "field_offset" : 224,
-     "referenced_type" : "type-1882"
+     "referenced_type" : "type-1873"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_AMRTYPE",
    "name" : "OMX_AUDIO_PARAM_AMRTYPE",
-   "referenced_type" : "type-1914",
-   "self_type" : "type-1914",
+   "referenced_type" : "type-1907",
+   "self_type" : "type-1907",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_AMRTYPE"
@@ -41046,7 +41125,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -41061,12 +41140,12 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-2024"
+     "referenced_type" : "type-2017"
     },
     {
      "field_name" : "bRATE_REDUCon",
      "field_offset" : 160,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "nMinBitRate",
@@ -41081,23 +41160,23 @@
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 256,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bNoiseSuppressor",
      "field_offset" : 288,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_EVRCTYPE",
    "name" : "OMX_AUDIO_PARAM_EVRCTYPE",
-   "referenced_type" : "type-2057",
-   "self_type" : "type-2057",
+   "referenced_type" : "type-2049",
+   "self_type" : "type-2049",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_EVRCTYPE"
@@ -41113,7 +41192,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -41138,8 +41217,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_FLACTYPE",
    "name" : "OMX_AUDIO_PARAM_FLACTYPE",
-   "referenced_type" : "type-1711",
-   "self_type" : "type-1711",
+   "referenced_type" : "type-1704",
+   "self_type" : "type-1704",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_FLACTYPE"
@@ -41155,7 +41234,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -41170,28 +41249,28 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "eBitRate",
      "field_offset" : 160,
-     "referenced_type" : "type-1810"
+     "referenced_type" : "type-1804"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 192,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 224,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G723TYPE",
    "name" : "OMX_AUDIO_PARAM_G723TYPE",
-   "referenced_type" : "type-1823",
-   "self_type" : "type-1823",
+   "referenced_type" : "type-1814",
+   "self_type" : "type-1814",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G723TYPE"
@@ -41207,7 +41286,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -41222,13 +41301,13 @@
     {
      "field_name" : "eG726Mode",
      "field_offset" : 128,
-     "referenced_type" : "type-1833"
+     "referenced_type" : "type-1824"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G726TYPE",
    "name" : "OMX_AUDIO_PARAM_G726TYPE",
-   "referenced_type" : "type-1843",
-   "self_type" : "type-1843",
+   "referenced_type" : "type-1837",
+   "self_type" : "type-1837",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G726TYPE"
@@ -41244,7 +41323,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -41259,18 +41338,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "eBitType",
      "field_offset" : 160,
-     "referenced_type" : "type-1855"
+     "referenced_type" : "type-1847"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G729TYPE",
    "name" : "OMX_AUDIO_PARAM_G729TYPE",
-   "referenced_type" : "type-1870",
-   "self_type" : "type-1870",
+   "referenced_type" : "type-1857",
+   "self_type" : "type-1857",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G729TYPE"
@@ -41286,7 +41365,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -41296,18 +41375,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
-   "referenced_type" : "type-1947",
-   "self_type" : "type-1947",
+   "referenced_type" : "type-1940",
+   "self_type" : "type-1940",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_GSMEFRTYPE"
@@ -41323,7 +41402,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -41333,18 +41412,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMFRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMFRTYPE",
-   "referenced_type" : "type-1925",
-   "self_type" : "type-1925",
+   "referenced_type" : "type-1918",
+   "self_type" : "type-1918",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_GSMFRTYPE"
@@ -41360,7 +41439,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -41370,18 +41449,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMHRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMHRTYPE",
-   "referenced_type" : "type-1936",
-   "self_type" : "type-1936",
+   "referenced_type" : "type-1929",
+   "self_type" : "type-1929",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_GSMHRTYPE"
@@ -41397,7 +41476,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -41422,18 +41501,18 @@
     {
      "field_name" : "eMidiSoundBank",
      "field_offset" : 256,
-     "referenced_type" : "type-2113"
+     "referenced_type" : "type-2105"
     },
     {
      "field_name" : "eMidiSoundBankLayout",
      "field_offset" : 288,
-     "referenced_type" : "type-2124"
+     "referenced_type" : "type-2117"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
    "name" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
-   "referenced_type" : "type-2135",
-   "self_type" : "type-2135",
+   "referenced_type" : "type-2127",
+   "self_type" : "type-2127",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE"
@@ -41449,7 +41528,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -41464,23 +41543,23 @@
     {
      "field_name" : "sMaxPolyphony",
      "field_offset" : 128,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     },
     {
      "field_name" : "bLoadDefaultSound",
      "field_offset" : 224,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "eMidiFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-2090"
+     "referenced_type" : "type-2083"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MIDITYPE",
    "name" : "OMX_AUDIO_PARAM_MIDITYPE",
-   "referenced_type" : "type-2102",
-   "self_type" : "type-2102",
+   "referenced_type" : "type-2094",
+   "self_type" : "type-2094",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MIDITYPE"
@@ -41496,7 +41575,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -41526,18 +41605,18 @@
     {
      "field_name" : "eChannelMode",
      "field_offset" : 224,
-     "referenced_type" : "type-1653"
+     "referenced_type" : "type-1652"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-1663"
+     "referenced_type" : "type-1657"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MP3TYPE",
    "name" : "OMX_AUDIO_PARAM_MP3TYPE",
-   "referenced_type" : "type-1667",
-   "self_type" : "type-1667",
+   "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"
@@ -41553,7 +41632,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -41568,17 +41647,17 @@
     {
      "field_name" : "eNumData",
      "field_offset" : 128,
-     "referenced_type" : "type-1467"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "eEndian",
      "field_offset" : 160,
-     "referenced_type" : "type-1463"
+     "referenced_type" : "type-1462"
     },
     {
      "field_name" : "bInterleaved",
      "field_offset" : 192,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "nBitPerSample",
@@ -41593,7 +41672,7 @@
     {
      "field_name" : "ePCMMode",
      "field_offset" : 288,
-     "referenced_type" : "type-1634"
+     "referenced_type" : "type-1632"
     },
     {
      "field_name" : "eChannelMapping",
@@ -41620,7 +41699,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -41635,18 +41714,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
-   "referenced_type" : "type-2002",
-   "self_type" : "type-2002",
+   "referenced_type" : "type-1995",
+   "self_type" : "type-1995",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PDCEFRTYPE"
@@ -41662,7 +41741,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -41677,18 +41756,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCFRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCFRTYPE",
-   "referenced_type" : "type-1991",
-   "self_type" : "type-1991",
+   "referenced_type" : "type-1984",
+   "self_type" : "type-1984",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PDCFRTYPE"
@@ -41704,7 +41783,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -41719,18 +41798,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCHRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCHRTYPE",
-   "referenced_type" : "type-2013",
-   "self_type" : "type-2013",
+   "referenced_type" : "type-2006",
+   "self_type" : "type-2006",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PDCHRTYPE"
@@ -41746,7 +41825,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -41766,8 +41845,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PORTFORMATTYPE",
    "name" : "OMX_AUDIO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-1629",
-   "self_type" : "type-1629",
+   "referenced_type" : "type-1628",
+   "self_type" : "type-1628",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PORTFORMATTYPE"
@@ -41783,7 +41862,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -41798,7 +41877,7 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-2024"
+     "referenced_type" : "type-2017"
     },
     {
      "field_name" : "nMinBitRate",
@@ -41813,8 +41892,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_QCELP13TYPE",
    "name" : "OMX_AUDIO_PARAM_QCELP13TYPE",
-   "referenced_type" : "type-2046",
-   "self_type" : "type-2046",
+   "referenced_type" : "type-2038",
+   "self_type" : "type-2038",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_QCELP13TYPE"
@@ -41830,7 +41909,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -41850,7 +41929,7 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 160,
-     "referenced_type" : "type-2024"
+     "referenced_type" : "type-2017"
     },
     {
      "field_name" : "nMinBitRate",
@@ -41865,8 +41944,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_QCELP8TYPE",
    "name" : "OMX_AUDIO_PARAM_QCELP8TYPE",
-   "referenced_type" : "type-2035",
-   "self_type" : "type-2035",
+   "referenced_type" : "type-2027",
+   "self_type" : "type-2027",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_QCELP8TYPE"
@@ -41882,7 +41961,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -41927,13 +42006,13 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 320,
-     "referenced_type" : "type-1757"
+     "referenced_type" : "type-1748"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_RATYPE",
    "name" : "OMX_AUDIO_PARAM_RATYPE",
-   "referenced_type" : "type-1767",
-   "self_type" : "type-1767",
+   "referenced_type" : "type-1758",
+   "self_type" : "type-1758",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_RATYPE"
@@ -41949,7 +42028,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -41989,23 +42068,23 @@
     {
      "field_name" : "bEnableBitrate",
      "field_offset" : 288,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "eChannelMode",
      "field_offset" : 320,
-     "referenced_type" : "type-1653"
+     "referenced_type" : "type-1652"
     },
     {
      "field_name" : "eSBCAllocType",
      "field_offset" : 352,
-     "referenced_type" : "type-1777"
+     "referenced_type" : "type-1771"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_SBCTYPE",
    "name" : "OMX_AUDIO_PARAM_SBCTYPE",
-   "referenced_type" : "type-1790",
-   "self_type" : "type-1790",
+   "referenced_type" : "type-1781",
+   "self_type" : "type-1781",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_SBCTYPE"
@@ -42021,7 +42100,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -42036,12 +42115,12 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-2024"
+     "referenced_type" : "type-2017"
     },
     {
      "field_name" : "bRATE_REDUCon",
      "field_offset" : 160,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "nMinBitRate",
@@ -42056,23 +42135,23 @@
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 256,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bNoiseSuppressor",
      "field_offset" : 288,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_SMVTYPE",
    "name" : "OMX_AUDIO_PARAM_SMVTYPE",
-   "referenced_type" : "type-2068",
-   "self_type" : "type-2068",
+   "referenced_type" : "type-2061",
+   "self_type" : "type-2061",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_SMVTYPE"
@@ -42088,7 +42167,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -42103,18 +42182,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
-   "referenced_type" : "type-1980",
-   "self_type" : "type-1980",
+   "referenced_type" : "type-1973",
+   "self_type" : "type-1973",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_TDMAEFRTYPE"
@@ -42130,7 +42209,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -42145,18 +42224,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
    "name" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
-   "referenced_type" : "type-1969",
-   "self_type" : "type-1969",
+   "referenced_type" : "type-1962",
+   "self_type" : "type-1962",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_TDMAFRTYPE"
@@ -42172,7 +42251,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -42217,18 +42296,18 @@
     {
      "field_name" : "bManaged",
      "field_offset" : 320,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bDownmix",
      "field_offset" : 352,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_VORBISTYPE",
    "name" : "OMX_AUDIO_PARAM_VORBISTYPE",
-   "referenced_type" : "type-1700",
-   "self_type" : "type-1700",
+   "referenced_type" : "type-1693",
+   "self_type" : "type-1693",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_VORBISTYPE"
@@ -42244,7 +42323,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -42264,12 +42343,12 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-1724"
+     "referenced_type" : "type-1715"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 192,
-     "referenced_type" : "type-1734"
+     "referenced_type" : "type-1725"
     },
     {
      "field_name" : "nSamplingRate",
@@ -42294,8 +42373,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_WMATYPE",
    "name" : "OMX_AUDIO_PARAM_WMATYPE",
-   "referenced_type" : "type-1744",
-   "self_type" : "type-1744",
+   "referenced_type" : "type-1738",
+   "self_type" : "type-1738",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_WMATYPE"
@@ -42316,7 +42395,7 @@
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 128,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "eEncoding",
@@ -42326,8 +42405,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PORTDEFINITIONTYPE",
    "name" : "OMX_AUDIO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-1620",
-   "self_type" : "type-1620",
+   "referenced_type" : "type-1623",
+   "self_type" : "type-1623",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PORTDEFINITIONTYPE"
@@ -42353,8 +42432,8 @@
    ],
    "linker_set_key" : "OMX_BS32",
    "name" : "OMX_BS32",
-   "referenced_type" : "type-1475",
-   "self_type" : "type-1475",
+   "referenced_type" : "type-1474",
+   "self_type" : "type-1474",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_BS32"
@@ -42380,8 +42459,8 @@
    ],
    "linker_set_key" : "OMX_BU32",
    "name" : "OMX_BU32",
-   "referenced_type" : "type-1470",
-   "self_type" : "type-1470",
+   "referenced_type" : "type-1473",
+   "self_type" : "type-1473",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_BU32"
@@ -42397,7 +42476,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "pBuffer",
@@ -42477,8 +42556,8 @@
    ],
    "linker_set_key" : "OMX_BUFFERHEADERTYPE",
    "name" : "OMX_BUFFERHEADERTYPE",
-   "referenced_type" : "type-1544",
-   "self_type" : "type-1544",
+   "referenced_type" : "type-1541",
+   "self_type" : "type-1541",
    "size" : 112,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_BUFFERHEADERTYPE"
@@ -42489,23 +42568,23 @@
    [
     {
      "field_name" : "EventHandler",
-     "referenced_type" : "type-1592"
+     "referenced_type" : "type-1595"
     },
     {
      "field_name" : "EmptyBufferDone",
      "field_offset" : 64,
-     "referenced_type" : "type-1594"
+     "referenced_type" : "type-1597"
     },
     {
      "field_name" : "FillBufferDone",
      "field_offset" : 128,
-     "referenced_type" : "type-1594"
+     "referenced_type" : "type-1597"
     }
    ],
    "linker_set_key" : "OMX_CALLBACKTYPE",
    "name" : "OMX_CALLBACKTYPE",
-   "referenced_type" : "type-1591",
-   "self_type" : "type-1591",
+   "referenced_type" : "type-1594",
+   "self_type" : "type-1594",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_CALLBACKTYPE"
@@ -42521,13 +42600,13 @@
     {
      "field_name" : "pInitialize",
      "field_offset" : 64,
-     "referenced_type" : "type-1505"
+     "referenced_type" : "type-1504"
     }
    ],
    "linker_set_key" : "OMX_COMPONENTREGISTERTYPE",
    "name" : "OMX_COMPONENTREGISTERTYPE",
-   "referenced_type" : "type-1504",
-   "self_type" : "type-1504",
+   "referenced_type" : "type-1503",
+   "self_type" : "type-1503",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_COMPONENTREGISTERTYPE"
@@ -42543,7 +42622,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "pComponentPrivate",
@@ -42558,98 +42637,98 @@
     {
      "field_name" : "GetComponentVersion",
      "field_offset" : 192,
-     "referenced_type" : "type-2359"
+     "referenced_type" : "type-2362"
     },
     {
      "field_name" : "SendCommand",
      "field_offset" : 256,
-     "referenced_type" : "type-2363"
+     "referenced_type" : "type-2366"
     },
     {
      "field_name" : "GetParameter",
      "field_offset" : 320,
-     "referenced_type" : "type-2365"
+     "referenced_type" : "type-2368"
     },
     {
      "field_name" : "SetParameter",
      "field_offset" : 384,
-     "referenced_type" : "type-2365"
+     "referenced_type" : "type-2368"
     },
     {
      "field_name" : "GetConfig",
      "field_offset" : 448,
-     "referenced_type" : "type-2365"
+     "referenced_type" : "type-2368"
     },
     {
      "field_name" : "SetConfig",
      "field_offset" : 512,
-     "referenced_type" : "type-2365"
+     "referenced_type" : "type-2368"
     },
     {
      "field_name" : "GetExtensionIndex",
      "field_offset" : 576,
-     "referenced_type" : "type-2367"
+     "referenced_type" : "type-2370"
     },
     {
      "field_name" : "GetState",
      "field_offset" : 640,
-     "referenced_type" : "type-2370"
+     "referenced_type" : "type-2373"
     },
     {
      "field_name" : "ComponentTunnelRequest",
      "field_offset" : 704,
-     "referenced_type" : "type-2373"
+     "referenced_type" : "type-2376"
     },
     {
      "field_name" : "UseBuffer",
      "field_offset" : 768,
-     "referenced_type" : "type-2376"
+     "referenced_type" : "type-2379"
     },
     {
      "field_name" : "AllocateBuffer",
      "field_offset" : 832,
-     "referenced_type" : "type-2379"
+     "referenced_type" : "type-2382"
     },
     {
      "field_name" : "FreeBuffer",
      "field_offset" : 896,
-     "referenced_type" : "type-2381"
+     "referenced_type" : "type-2384"
     },
     {
      "field_name" : "EmptyThisBuffer",
      "field_offset" : 960,
-     "referenced_type" : "type-2383"
+     "referenced_type" : "type-2386"
     },
     {
      "field_name" : "FillThisBuffer",
      "field_offset" : 1024,
-     "referenced_type" : "type-2383"
+     "referenced_type" : "type-2386"
     },
     {
      "field_name" : "SetCallbacks",
      "field_offset" : 1088,
-     "referenced_type" : "type-2385"
+     "referenced_type" : "type-2388"
     },
     {
      "field_name" : "ComponentDeInit",
      "field_offset" : 1152,
-     "referenced_type" : "type-1505"
+     "referenced_type" : "type-1504"
     },
     {
      "field_name" : "UseEGLImage",
      "field_offset" : 1216,
-     "referenced_type" : "type-2388"
+     "referenced_type" : "type-2391"
     },
     {
      "field_name" : "ComponentRoleEnum",
      "field_offset" : 1280,
-     "referenced_type" : "type-2390"
+     "referenced_type" : "type-2393"
     }
    ],
    "linker_set_key" : "OMX_COMPONENTTYPE",
    "name" : "OMX_COMPONENTTYPE",
-   "referenced_type" : "type-2358",
-   "self_type" : "type-2358",
+   "referenced_type" : "type-2361",
+   "self_type" : "type-2361",
    "size" : 168,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_COMPONENTTYPE"
@@ -42665,7 +42744,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -42685,8 +42764,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_BACKLIGHTTYPE",
    "name" : "OMX_CONFIG_BACKLIGHTTYPE",
-   "referenced_type" : "type-2228",
-   "self_type" : "type-2228",
+   "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_BACKLIGHTTYPE"
@@ -42702,18 +42781,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "bEnabled",
      "field_offset" : 64,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_BOOLEANTYPE",
    "name" : "OMX_CONFIG_BOOLEANTYPE",
-   "referenced_type" : "type-2342",
-   "self_type" : "type-2342",
+   "referenced_type" : "type-2345",
+   "self_type" : "type-2345",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_BOOLEANTYPE"
@@ -42729,7 +42808,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -42744,8 +42823,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_BRIGHTNESSTYPE",
    "name" : "OMX_CONFIG_BRIGHTNESSTYPE",
-   "referenced_type" : "type-2227",
-   "self_type" : "type-2227",
+   "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_BRIGHTNESSTYPE"
@@ -42761,7 +42840,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -42771,12 +42850,12 @@
     {
      "field_name" : "bContinuous",
      "field_offset" : 96,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bFrameLimited",
      "field_offset" : 128,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "nFrameLimit",
@@ -42786,8 +42865,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_CAPTUREMODETYPE",
    "name" : "OMX_CONFIG_CAPTUREMODETYPE",
-   "referenced_type" : "type-2243",
-   "self_type" : "type-2243",
+   "referenced_type" : "type-2246",
+   "self_type" : "type-2246",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_CAPTUREMODETYPE"
@@ -42803,7 +42882,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -42818,13 +42897,13 @@
     {
      "field_name" : "eColorBlend",
      "field_offset" : 128,
-     "referenced_type" : "type-2211"
+     "referenced_type" : "type-2214"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_COLORBLENDTYPE",
    "name" : "OMX_CONFIG_COLORBLENDTYPE",
-   "referenced_type" : "type-2212",
-   "self_type" : "type-2212",
+   "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_COLORBLENDTYPE"
@@ -42840,7 +42919,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -42850,7 +42929,7 @@
     {
      "field_name" : "xColorMatrix",
      "field_offset" : 96,
-     "referenced_type" : "type-2203"
+     "referenced_type" : "type-2206"
     },
     {
      "field_name" : "xColorOffset",
@@ -42860,8 +42939,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_COLORCONVERSIONTYPE",
    "name" : "OMX_CONFIG_COLORCONVERSIONTYPE",
-   "referenced_type" : "type-2202",
-   "self_type" : "type-2202",
+   "referenced_type" : "type-2205",
+   "self_type" : "type-2205",
    "size" : 64,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORCONVERSIONTYPE"
@@ -42877,7 +42956,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -42887,7 +42966,7 @@
     {
      "field_name" : "bColorEnhancement",
      "field_offset" : 96,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "nCustomizedU",
@@ -42902,8 +42981,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
    "name" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
-   "referenced_type" : "type-2209",
-   "self_type" : "type-2209",
+   "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_COLORENHANCEMENTTYPE"
@@ -42919,7 +42998,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -42939,8 +43018,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_COLORKEYTYPE",
    "name" : "OMX_CONFIG_COLORKEYTYPE",
-   "referenced_type" : "type-2210",
-   "self_type" : "type-2210",
+   "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_CONFIG_COLORKEYTYPE"
@@ -42956,12 +43035,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "nParentNodeID",
@@ -42976,8 +43055,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
    "name" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
-   "referenced_type" : "type-2352",
-   "self_type" : "type-2352",
+   "referenced_type" : "type-2355",
+   "self_type" : "type-2355",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE"
@@ -42993,12 +43072,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "nParentNodeID",
@@ -43023,13 +43102,13 @@
     {
      "field_name" : "bIsLeafType",
      "field_offset" : 256,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
    "name" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
-   "referenced_type" : "type-2356",
-   "self_type" : "type-2356",
+   "referenced_type" : "type-2359",
+   "self_type" : "type-2359",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_CONTAINERNODEIDTYPE"
@@ -43045,7 +43124,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -43060,8 +43139,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_CONTRASTTYPE",
    "name" : "OMX_CONFIG_CONTRASTTYPE",
-   "referenced_type" : "type-2226",
-   "self_type" : "type-2226",
+   "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_CONTRASTTYPE"
@@ -43077,7 +43156,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -43087,13 +43166,13 @@
     {
      "field_name" : "eDither",
      "field_offset" : 96,
-     "referenced_type" : "type-2240"
+     "referenced_type" : "type-2243"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_DITHERTYPE",
    "name" : "OMX_CONFIG_DITHERTYPE",
-   "referenced_type" : "type-2241",
-   "self_type" : "type-2241",
+   "referenced_type" : "type-2244",
+   "self_type" : "type-2244",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_DITHERTYPE"
@@ -43109,7 +43188,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -43119,13 +43198,13 @@
     {
      "field_name" : "eExposureControl",
      "field_offset" : 96,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
    "name" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-2224",
-   "self_type" : "type-2224",
+   "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_EXPOSURECONTROLTYPE"
@@ -43141,7 +43220,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -43151,7 +43230,7 @@
     {
      "field_name" : "eMetering",
      "field_offset" : 96,
-     "referenced_type" : "type-2244"
+     "referenced_type" : "type-2247"
     },
     {
      "field_name" : "xEVCompensation",
@@ -43166,7 +43245,7 @@
     {
      "field_name" : "bAutoAperture",
      "field_offset" : 192,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "nShutterSpeedMsec",
@@ -43176,7 +43255,7 @@
     {
      "field_name" : "bAutoShutterSpeed",
      "field_offset" : 256,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "nSensitivity",
@@ -43186,13 +43265,13 @@
     {
      "field_name" : "bAutoSensitivity",
      "field_offset" : 320,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_EXPOSUREVALUETYPE",
    "name" : "OMX_CONFIG_EXPOSUREVALUETYPE",
-   "referenced_type" : "type-2245",
-   "self_type" : "type-2245",
+   "referenced_type" : "type-2248",
+   "self_type" : "type-2248",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_EXPOSUREVALUETYPE"
@@ -43208,7 +43287,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -43218,53 +43297,53 @@
     {
      "field_name" : "bCenter",
      "field_offset" : 96,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bLeft",
      "field_offset" : 128,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bRight",
      "field_offset" : 160,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bTop",
      "field_offset" : 192,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bBottom",
      "field_offset" : 224,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bTopLeft",
      "field_offset" : 256,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bTopRight",
      "field_offset" : 288,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bBottomLeft",
      "field_offset" : 320,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bBottomRight",
      "field_offset" : 352,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_FOCUSREGIONTYPE",
    "name" : "OMX_CONFIG_FOCUSREGIONTYPE",
-   "referenced_type" : "type-2247",
-   "self_type" : "type-2247",
+   "referenced_type" : "type-2250",
+   "self_type" : "type-2250",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_FOCUSREGIONTYPE"
@@ -43280,7 +43359,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -43295,8 +43374,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_FRAMERATETYPE",
    "name" : "OMX_CONFIG_FRAMERATETYPE",
-   "referenced_type" : "type-2288",
-   "self_type" : "type-2288",
+   "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_CONFIG_FRAMERATETYPE"
@@ -43312,7 +43391,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -43322,13 +43401,13 @@
     {
      "field_name" : "bStab",
      "field_offset" : 96,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_FRAMESTABTYPE",
    "name" : "OMX_CONFIG_FRAMESTABTYPE",
-   "referenced_type" : "type-2220",
-   "self_type" : "type-2220",
+   "referenced_type" : "type-2223",
+   "self_type" : "type-2223",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_FRAMESTABTYPE"
@@ -43344,7 +43423,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -43359,8 +43438,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_GAMMATYPE",
    "name" : "OMX_CONFIG_GAMMATYPE",
-   "referenced_type" : "type-2229",
-   "self_type" : "type-2229",
+   "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_GAMMATYPE"
@@ -43376,7 +43455,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -43386,13 +43465,13 @@
     {
      "field_name" : "eImageFilter",
      "field_offset" : 96,
-     "referenced_type" : "type-2207"
+     "referenced_type" : "type-2210"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_IMAGEFILTERTYPE",
    "name" : "OMX_CONFIG_IMAGEFILTERTYPE",
-   "referenced_type" : "type-2208",
-   "self_type" : "type-2208",
+   "referenced_type" : "type-2211",
+   "self_type" : "type-2211",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_IMAGEFILTERTYPE"
@@ -43408,7 +43487,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -43418,13 +43497,13 @@
     {
      "field_name" : "IntraRefreshVOP",
      "field_offset" : 96,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
    "name" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
-   "referenced_type" : "type-2289",
-   "self_type" : "type-2289",
+   "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_INTRAREFRESHVOPTYPE"
@@ -43440,7 +43519,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -43455,8 +43534,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_LIGHTNESSTYPE",
    "name" : "OMX_CONFIG_LIGHTNESSTYPE",
-   "referenced_type" : "type-2232",
-   "self_type" : "type-2232",
+   "referenced_type" : "type-2235",
+   "self_type" : "type-2235",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_LIGHTNESSTYPE"
@@ -43472,7 +43551,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -43487,13 +43566,13 @@
     {
      "field_name" : "ErrMap",
      "field_offset" : 128,
-     "referenced_type" : "type-1577"
+     "referenced_type" : "type-1572"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
    "name" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
-   "referenced_type" : "type-2290",
-   "self_type" : "type-2290",
+   "referenced_type" : "type-2293",
+   "self_type" : "type-2293",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE"
@@ -43509,7 +43588,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -43519,13 +43598,13 @@
     {
      "field_name" : "bEnabled",
      "field_offset" : 96,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
    "name" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
-   "referenced_type" : "type-2292",
-   "self_type" : "type-2292",
+   "referenced_type" : "type-2295",
+   "self_type" : "type-2295",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_MBERRORREPORTINGTYPE"
@@ -43541,12 +43620,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "eScopeMode",
      "field_offset" : 64,
-     "referenced_type" : "type-2348"
+     "referenced_type" : "type-2351"
     },
     {
      "field_name" : "nScopeSpecifier",
@@ -43561,8 +43640,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
    "name" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
-   "referenced_type" : "type-2350",
-   "self_type" : "type-2350",
+   "referenced_type" : "type-2353",
+   "self_type" : "type-2353",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_METADATAITEMCOUNTTYPE"
@@ -43578,12 +43657,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "eScopeMode",
      "field_offset" : 64,
-     "referenced_type" : "type-2348"
+     "referenced_type" : "type-2351"
     },
     {
      "field_name" : "nScopeSpecifier",
@@ -43598,12 +43677,12 @@
     {
      "field_name" : "eSearchMode",
      "field_offset" : 160,
-     "referenced_type" : "type-2349"
+     "referenced_type" : "type-2352"
     },
     {
      "field_name" : "eKeyCharset",
      "field_offset" : 192,
-     "referenced_type" : "type-2347"
+     "referenced_type" : "type-2350"
     },
     {
      "field_name" : "nKeySizeUsed",
@@ -43613,12 +43692,12 @@
     {
      "field_name" : "nKey",
      "field_offset" : 232,
-     "referenced_type" : "type-1528"
+     "referenced_type" : "type-1530"
     },
     {
      "field_name" : "eValueCharset",
      "field_offset" : 1280,
-     "referenced_type" : "type-2347"
+     "referenced_type" : "type-2350"
     },
     {
      "field_name" : "sLanguageCountry",
@@ -43638,13 +43717,13 @@
     {
      "field_name" : "nValue",
      "field_offset" : 1472,
-     "referenced_type" : "type-1577"
+     "referenced_type" : "type-1572"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_METADATAITEMTYPE",
    "name" : "OMX_CONFIG_METADATAITEMTYPE",
-   "referenced_type" : "type-2351",
-   "self_type" : "type-2351",
+   "referenced_type" : "type-2354",
+   "self_type" : "type-2354",
    "size" : 192,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_METADATAITEMTYPE"
@@ -43660,7 +43739,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -43670,13 +43749,13 @@
     {
      "field_name" : "eMirror",
      "field_offset" : 96,
-     "referenced_type" : "type-2215"
+     "referenced_type" : "type-2218"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MIRRORTYPE",
    "name" : "OMX_CONFIG_MIRRORTYPE",
-   "referenced_type" : "type-2216",
-   "self_type" : "type-2216",
+   "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_CONFIG_MIRRORTYPE"
@@ -43692,7 +43771,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -43712,8 +43791,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_PLANEBLENDTYPE",
    "name" : "OMX_CONFIG_PLANEBLENDTYPE",
-   "referenced_type" : "type-2233",
-   "self_type" : "type-2233",
+   "referenced_type" : "type-2236",
+   "self_type" : "type-2236",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_PLANEBLENDTYPE"
@@ -43729,7 +43808,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -43749,8 +43828,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_POINTTYPE",
    "name" : "OMX_CONFIG_POINTTYPE",
-   "referenced_type" : "type-2217",
-   "self_type" : "type-2217",
+   "referenced_type" : "type-2220",
+   "self_type" : "type-2220",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_POINTTYPE"
@@ -43766,7 +43845,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -43796,8 +43875,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_RECTTYPE",
    "name" : "OMX_CONFIG_RECTTYPE",
-   "referenced_type" : "type-2218",
-   "self_type" : "type-2218",
+   "referenced_type" : "type-2221",
+   "self_type" : "type-2221",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_RECTTYPE"
@@ -43813,7 +43892,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -43828,8 +43907,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_ROTATIONTYPE",
    "name" : "OMX_CONFIG_ROTATIONTYPE",
-   "referenced_type" : "type-2214",
-   "self_type" : "type-2214",
+   "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_CONFIG_ROTATIONTYPE"
@@ -43845,7 +43924,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -43860,8 +43939,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_SATURATIONTYPE",
    "name" : "OMX_CONFIG_SATURATIONTYPE",
-   "referenced_type" : "type-2230",
-   "self_type" : "type-2230",
+   "referenced_type" : "type-2233",
+   "self_type" : "type-2233",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_SATURATIONTYPE"
@@ -43877,7 +43956,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -43897,8 +43976,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_SCALEFACTORTYPE",
    "name" : "OMX_CONFIG_SCALEFACTORTYPE",
-   "referenced_type" : "type-2206",
-   "self_type" : "type-2206",
+   "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_SCALEFACTORTYPE"
@@ -43914,7 +43993,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -43924,13 +44003,13 @@
     {
      "field_name" : "eEffect",
      "field_offset" : 96,
-     "referenced_type" : "type-2235"
+     "referenced_type" : "type-2238"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
    "name" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-2236",
-   "self_type" : "type-2236",
+   "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_TRANSITIONEFFECTTYPE"
@@ -43946,7 +44025,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -43956,13 +44035,13 @@
     {
      "field_name" : "eWhiteBalControl",
      "field_offset" : 96,
-     "referenced_type" : "type-2221"
+     "referenced_type" : "type-2224"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
    "name" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-2222",
-   "self_type" : "type-2222",
+   "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_WHITEBALCONTROLTYPE"
@@ -43978,7 +44057,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -43998,8 +44077,8 @@
    ],
    "linker_set_key" : "OMX_FRAMESIZETYPE",
    "name" : "OMX_FRAMESIZETYPE",
-   "referenced_type" : "type-2213",
-   "self_type" : "type-2213",
+   "referenced_type" : "type-2216",
+   "self_type" : "type-2216",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_FRAMESIZETYPE"
@@ -44015,7 +44094,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -44025,7 +44104,7 @@
     {
      "field_name" : "eFocusControl",
      "field_offset" : 96,
-     "referenced_type" : "type-2305"
+     "referenced_type" : "type-2308"
     },
     {
      "field_name" : "nFocusSteps",
@@ -44040,8 +44119,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
    "name" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-2306",
-   "self_type" : "type-2306",
+   "referenced_type" : "type-2309",
+   "self_type" : "type-2309",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE"
@@ -44057,7 +44136,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -44067,13 +44146,13 @@
     {
      "field_name" : "eFlashControl",
      "field_offset" : 96,
-     "referenced_type" : "type-2302"
+     "referenced_type" : "type-2305"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
    "name" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
-   "referenced_type" : "type-2304",
-   "self_type" : "type-2304",
+   "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_FLASHCONTROLTYPE"
@@ -44089,7 +44168,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -44099,23 +44178,23 @@
     {
      "field_name" : "eHuffmanTable",
      "field_offset" : 96,
-     "referenced_type" : "type-2311"
+     "referenced_type" : "type-2314"
     },
     {
      "field_name" : "nNumberOfHuffmanCodeOfLength",
      "field_offset" : 128,
-     "referenced_type" : "type-2313"
+     "referenced_type" : "type-2316"
     },
     {
      "field_name" : "nHuffmanTable",
      "field_offset" : 256,
-     "referenced_type" : "type-2314"
+     "referenced_type" : "type-2317"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
    "name" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
-   "referenced_type" : "type-2312",
-   "self_type" : "type-2312",
+   "referenced_type" : "type-2315",
+   "self_type" : "type-2315",
    "size" : 288,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE"
@@ -44131,7 +44210,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -44146,18 +44225,18 @@
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-2299"
+     "referenced_type" : "type-2302"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-2201"
+     "referenced_type" : "type-2204"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
    "name" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-2301",
-   "self_type" : "type-2301",
+   "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_PARAM_PORTFORMATTYPE"
@@ -44173,7 +44252,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -44188,8 +44267,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_QFACTORTYPE",
    "name" : "OMX_IMAGE_PARAM_QFACTORTYPE",
-   "referenced_type" : "type-2307",
-   "self_type" : "type-2307",
+   "referenced_type" : "type-2310",
+   "self_type" : "type-2310",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_QFACTORTYPE"
@@ -44205,7 +44284,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -44215,18 +44294,18 @@
     {
      "field_name" : "eQuantizationTable",
      "field_offset" : 96,
-     "referenced_type" : "type-2308"
+     "referenced_type" : "type-2311"
     },
     {
      "field_name" : "nQuantizationMatrix",
      "field_offset" : 128,
-     "referenced_type" : "type-2310"
+     "referenced_type" : "type-2313"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
    "name" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-2309",
-   "self_type" : "type-2309",
+   "referenced_type" : "type-2312",
+   "self_type" : "type-2312",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE"
@@ -44267,17 +44346,17 @@
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 256,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 288,
-     "referenced_type" : "type-2299"
+     "referenced_type" : "type-2302"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 320,
-     "referenced_type" : "type-2201"
+     "referenced_type" : "type-2204"
     },
     {
      "field_name" : "pNativeWindow",
@@ -44287,8 +44366,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_PORTDEFINITIONTYPE",
    "name" : "OMX_IMAGE_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-2300",
-   "self_type" : "type-2300",
+   "referenced_type" : "type-2303",
+   "self_type" : "type-2303",
    "size" : 56,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PORTDEFINITIONTYPE"
@@ -44309,8 +44388,8 @@
    ],
    "linker_set_key" : "OMX_MARKTYPE",
    "name" : "OMX_MARKTYPE",
-   "referenced_type" : "type-1478",
-   "self_type" : "type-1478",
+   "referenced_type" : "type-1480",
+   "self_type" : "type-1480",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_MARKTYPE"
@@ -44326,18 +44405,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "bEnablePM",
      "field_offset" : 64,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_OTHER_CONFIG_POWERTYPE",
    "name" : "OMX_OTHER_CONFIG_POWERTYPE",
-   "referenced_type" : "type-2329",
-   "self_type" : "type-2329",
+   "referenced_type" : "type-2332",
+   "self_type" : "type-2332",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_CONFIG_POWERTYPE"
@@ -44353,13 +44432,13 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     }
    ],
    "linker_set_key" : "OMX_OTHER_CONFIG_STATSTYPE",
    "name" : "OMX_OTHER_CONFIG_STATSTYPE",
-   "referenced_type" : "type-2330",
-   "self_type" : "type-2330",
+   "referenced_type" : "type-2333",
+   "self_type" : "type-2333",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_CONFIG_STATSTYPE"
@@ -44375,7 +44454,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -44385,7 +44464,7 @@
     {
      "field_name" : "eType",
      "field_offset" : 96,
-     "referenced_type" : "type-1564"
+     "referenced_type" : "type-1559"
     },
     {
      "field_name" : "nDataSize",
@@ -44395,13 +44474,13 @@
     {
      "field_name" : "data",
      "field_offset" : 160,
-     "referenced_type" : "type-1577"
+     "referenced_type" : "type-1572"
     }
    ],
    "linker_set_key" : "OMX_OTHER_EXTRADATATYPE",
    "name" : "OMX_OTHER_EXTRADATATYPE",
-   "referenced_type" : "type-1576",
-   "self_type" : "type-1576",
+   "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"
@@ -44417,7 +44496,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -44432,13 +44511,13 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-2316"
+     "referenced_type" : "type-2319"
     }
    ],
    "linker_set_key" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
    "name" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-2333",
-   "self_type" : "type-2333",
+   "referenced_type" : "type-2336",
+   "self_type" : "type-2336",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_PARAM_PORTFORMATTYPE"
@@ -44449,13 +44528,13 @@
    [
     {
      "field_name" : "eFormat",
-     "referenced_type" : "type-2316"
+     "referenced_type" : "type-2319"
     }
    ],
    "linker_set_key" : "OMX_OTHER_PORTDEFINITIONTYPE",
    "name" : "OMX_OTHER_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-2331",
-   "self_type" : "type-2331",
+   "referenced_type" : "type-2334",
+   "self_type" : "type-2334",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_PORTDEFINITIONTYPE"
@@ -44471,7 +44550,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -44481,13 +44560,13 @@
     {
      "field_name" : "eBufferSupplier",
      "field_offset" : 96,
-     "referenced_type" : "type-1604"
+     "referenced_type" : "type-1600"
     }
    ],
    "linker_set_key" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
    "name" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-1610",
-   "self_type" : "type-1610",
+   "referenced_type" : "type-1608",
+   "self_type" : "type-1608",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PARAM_BUFFERSUPPLIERTYPE"
@@ -44503,18 +44582,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "cRole",
      "field_offset" : 64,
-     "referenced_type" : "type-1528"
+     "referenced_type" : "type-1530"
     }
    ],
    "linker_set_key" : "OMX_PARAM_COMPONENTROLETYPE",
    "name" : "OMX_PARAM_COMPONENTROLETYPE",
-   "referenced_type" : "type-1527",
-   "self_type" : "type-1527",
+   "referenced_type" : "type-1529",
+   "self_type" : "type-1529",
    "size" : 136,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PARAM_COMPONENTROLETYPE"
@@ -44530,7 +44609,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "hPipe",
@@ -44540,8 +44619,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_CONTENTPIPETYPE",
    "name" : "OMX_PARAM_CONTENTPIPETYPE",
-   "referenced_type" : "type-2345",
-   "self_type" : "type-2345",
+   "referenced_type" : "type-2348",
+   "self_type" : "type-2348",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_CONTENTPIPETYPE"
@@ -44557,18 +44636,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "contentURI",
      "field_offset" : 64,
-     "referenced_type" : "type-1577"
+     "referenced_type" : "type-1572"
     }
    ],
    "linker_set_key" : "OMX_PARAM_CONTENTURITYPE",
    "name" : "OMX_PARAM_CONTENTURITYPE",
-   "referenced_type" : "type-2344",
-   "self_type" : "type-2344",
+   "referenced_type" : "type-2347",
+   "self_type" : "type-2347",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_CONTENTURITYPE"
@@ -44584,7 +44663,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -44594,18 +44673,18 @@
     {
      "field_name" : "eUnitType",
      "field_offset" : 96,
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2240"
     },
     {
      "field_name" : "eEncapsulationType",
      "field_offset" : 128,
-     "referenced_type" : "type-2238"
+     "referenced_type" : "type-2241"
     }
    ],
    "linker_set_key" : "OMX_PARAM_DATAUNITTYPE",
    "name" : "OMX_PARAM_DATAUNITTYPE",
-   "referenced_type" : "type-2239",
-   "self_type" : "type-2239",
+   "referenced_type" : "type-2242",
+   "self_type" : "type-2242",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_DATAUNITTYPE"
@@ -44621,7 +44700,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -44631,13 +44710,13 @@
     {
      "field_name" : "bDeblocking",
      "field_offset" : 96,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_PARAM_DEBLOCKINGTYPE",
    "name" : "OMX_PARAM_DEBLOCKINGTYPE",
-   "referenced_type" : "type-2219",
-   "self_type" : "type-2219",
+   "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_PARAM_DEBLOCKINGTYPE"
@@ -44653,7 +44732,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -44663,58 +44742,58 @@
     {
      "field_name" : "eFocusStatus",
      "field_offset" : 96,
-     "referenced_type" : "type-2248"
+     "referenced_type" : "type-2251"
     },
     {
      "field_name" : "bCenterStatus",
      "field_offset" : 128,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bLeftStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bRightStatus",
      "field_offset" : 192,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bTopStatus",
      "field_offset" : 224,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bBottomStatus",
      "field_offset" : 256,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bTopLeftStatus",
      "field_offset" : 288,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bTopRightStatus",
      "field_offset" : 320,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bBottomLeftStatus",
      "field_offset" : 352,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bBottomRightStatus",
      "field_offset" : 384,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_PARAM_FOCUSSTATUSTYPE",
    "name" : "OMX_PARAM_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-2249",
-   "self_type" : "type-2249",
+   "referenced_type" : "type-2252",
+   "self_type" : "type-2252",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_FOCUSSTATUSTYPE"
@@ -44730,7 +44809,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -44740,7 +44819,7 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "nInterleavePortIndex",
@@ -44750,8 +44829,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_INTERLEAVETYPE",
    "name" : "OMX_PARAM_INTERLEAVETYPE",
-   "referenced_type" : "type-2234",
-   "self_type" : "type-2234",
+   "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_INTERLEAVETYPE"
@@ -44767,7 +44846,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -44782,8 +44861,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_MACROBLOCKSTYPE",
    "name" : "OMX_PARAM_MACROBLOCKSTYPE",
-   "referenced_type" : "type-2294",
-   "self_type" : "type-2294",
+   "referenced_type" : "type-2297",
+   "self_type" : "type-2297",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_PARAM_MACROBLOCKSTYPE"
@@ -44799,17 +44878,17 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "eKeyCharset",
      "field_offset" : 96,
-     "referenced_type" : "type-2347"
+     "referenced_type" : "type-2350"
     },
     {
      "field_name" : "nKeySizeUsed",
@@ -44819,7 +44898,7 @@
     {
      "field_name" : "nKey",
      "field_offset" : 160,
-     "referenced_type" : "type-1528"
+     "referenced_type" : "type-1530"
     },
     {
      "field_name" : "nLanguageCountrySizeUsed",
@@ -44829,18 +44908,18 @@
     {
      "field_name" : "nLanguageCountry",
      "field_offset" : 1216,
-     "referenced_type" : "type-1528"
+     "referenced_type" : "type-1530"
     },
     {
      "field_name" : "bEnabled",
      "field_offset" : 2240,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_PARAM_METADATAFILTERTYPE",
    "name" : "OMX_PARAM_METADATAFILTERTYPE",
-   "referenced_type" : "type-2357",
-   "self_type" : "type-2357",
+   "referenced_type" : "type-2360",
+   "self_type" : "type-2360",
    "size" : 284,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_METADATAFILTERTYPE"
@@ -44856,7 +44935,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -44866,7 +44945,7 @@
     {
      "field_name" : "eDir",
      "field_offset" : 96,
-     "referenced_type" : "type-1458"
+     "referenced_type" : "type-1456"
     },
     {
      "field_name" : "nBufferCountActual",
@@ -44886,27 +44965,27 @@
     {
      "field_name" : "bEnabled",
      "field_offset" : 224,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bPopulated",
      "field_offset" : 256,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "eDomain",
      "field_offset" : 288,
-     "referenced_type" : "type-2334"
+     "referenced_type" : "type-2337"
     },
     {
      "field_name" : "format",
      "field_offset" : 320,
-     "referenced_type" : "type-2336"
+     "referenced_type" : "type-2339"
     },
     {
      "field_name" : "bBuffersContiguous",
      "field_offset" : 832,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "nBufferAlignment",
@@ -44916,8 +44995,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_PORTDEFINITIONTYPE",
    "name" : "OMX_PARAM_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-2335",
-   "self_type" : "type-2335",
+   "referenced_type" : "type-2338",
+   "self_type" : "type-2338",
    "size" : 112,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_PORTDEFINITIONTYPE"
@@ -44928,27 +45007,27 @@
    [
     {
      "field_name" : "audio",
-     "referenced_type" : "type-1620"
+     "referenced_type" : "type-1623"
     },
     {
      "field_name" : "video",
-     "referenced_type" : "type-2251"
+     "referenced_type" : "type-2254"
     },
     {
      "field_name" : "image",
-     "referenced_type" : "type-2300"
+     "referenced_type" : "type-2303"
     },
     {
      "field_name" : "other",
-     "referenced_type" : "type-2331"
+     "referenced_type" : "type-2334"
     }
    ],
    "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-2336",
-   "self_type" : "type-2336",
+   "referenced_type" : "type-2339",
+   "self_type" : "type-2339",
    "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)"
@@ -44964,7 +45043,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -44979,18 +45058,18 @@
     {
      "field_name" : "bOneShot",
      "field_offset" : 128,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "sFrameSize",
      "field_offset" : 160,
-     "referenced_type" : "type-2213"
+     "referenced_type" : "type-2216"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SENSORMODETYPE",
    "name" : "OMX_PARAM_SENSORMODETYPE",
-   "referenced_type" : "type-2225",
-   "self_type" : "type-2225",
+   "referenced_type" : "type-2228",
+   "self_type" : "type-2228",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_SENSORMODETYPE"
@@ -45006,18 +45085,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "ePolicy",
      "field_offset" : 64,
-     "referenced_type" : "type-2338"
+     "referenced_type" : "type-2341"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
    "name" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-2339",
-   "self_type" : "type-2339",
+   "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_PARAM_SUSPENSIONPOLICYTYPE"
@@ -45033,18 +45112,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "eType",
      "field_offset" : 64,
-     "referenced_type" : "type-2340"
+     "referenced_type" : "type-2343"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SUSPENSIONTYPE",
    "name" : "OMX_PARAM_SUSPENSIONTYPE",
-   "referenced_type" : "type-2341",
-   "self_type" : "type-2341",
+   "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_SUSPENSIONTYPE"
@@ -45060,7 +45139,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -45075,8 +45154,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_U32TYPE",
    "name" : "OMX_PARAM_U32TYPE",
-   "referenced_type" : "type-2337",
-   "self_type" : "type-2337",
+   "referenced_type" : "type-2340",
+   "self_type" : "type-2340",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_U32TYPE"
@@ -45092,7 +45171,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPorts",
@@ -45107,8 +45186,8 @@
    ],
    "linker_set_key" : "OMX_PORT_PARAM_TYPE",
    "name" : "OMX_PORT_PARAM_TYPE",
-   "referenced_type" : "type-1588",
-   "self_type" : "type-1588",
+   "referenced_type" : "type-1584",
+   "self_type" : "type-1584",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PORT_PARAM_TYPE"
@@ -45124,7 +45203,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nGroupPriority",
@@ -45139,8 +45218,8 @@
    ],
    "linker_set_key" : "OMX_PRIORITYMGMTTYPE",
    "name" : "OMX_PRIORITYMGMTTYPE",
-   "referenced_type" : "type-1523",
-   "self_type" : "type-1523",
+   "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"
@@ -45156,18 +45235,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "bResourceConcealmentForbidden",
      "field_offset" : 64,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_RESOURCECONCEALMENTTYPE",
    "name" : "OMX_RESOURCECONCEALMENTTYPE",
-   "referenced_type" : "type-2346",
-   "self_type" : "type-2346",
+   "referenced_type" : "type-2349",
+   "self_type" : "type-2349",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_RESOURCECONCEALMENTTYPE"
@@ -45183,18 +45262,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "eClock",
      "field_offset" : 64,
-     "referenced_type" : "type-2322"
+     "referenced_type" : "type-2325"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
    "name" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
-   "referenced_type" : "type-2328",
-   "self_type" : "type-2328",
+   "referenced_type" : "type-2331",
+   "self_type" : "type-2331",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE"
@@ -45210,12 +45289,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "eState",
      "field_offset" : 64,
-     "referenced_type" : "type-2323"
+     "referenced_type" : "type-2326"
     },
     {
      "field_name" : "nStartTime",
@@ -45235,8 +45314,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
    "name" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
-   "referenced_type" : "type-2327",
-   "self_type" : "type-2327",
+   "referenced_type" : "type-2330",
+   "self_type" : "type-2330",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_CLOCKSTATETYPE"
@@ -45252,7 +45331,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -45277,8 +45356,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
    "name" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
-   "referenced_type" : "type-2324",
-   "self_type" : "type-2324",
+   "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_MEDIATIMEREQUESTTYPE"
@@ -45294,7 +45373,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "xScale",
@@ -45304,8 +45383,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_SCALETYPE",
    "name" : "OMX_TIME_CONFIG_SCALETYPE",
-   "referenced_type" : "type-2326",
-   "self_type" : "type-2326",
+   "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_TIME_CONFIG_SCALETYPE"
@@ -45321,18 +45400,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "eType",
      "field_offset" : 64,
-     "referenced_type" : "type-2317"
+     "referenced_type" : "type-2320"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_SEEKMODETYPE",
    "name" : "OMX_TIME_CONFIG_SEEKMODETYPE",
-   "referenced_type" : "type-2318",
-   "self_type" : "type-2318",
+   "referenced_type" : "type-2321",
+   "self_type" : "type-2321",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_SEEKMODETYPE"
@@ -45348,7 +45427,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -45363,8 +45442,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
    "name" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
-   "referenced_type" : "type-2319",
-   "self_type" : "type-2319",
+   "referenced_type" : "type-2322",
+   "self_type" : "type-2322",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_TIMESTAMPTYPE"
@@ -45380,7 +45459,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nClientPrivate",
@@ -45390,7 +45469,7 @@
     {
      "field_name" : "eUpdateType",
      "field_offset" : 96,
-     "referenced_type" : "type-2320"
+     "referenced_type" : "type-2323"
     },
     {
      "field_name" : "nMediaTimestamp",
@@ -45415,13 +45494,13 @@
     {
      "field_name" : "eState",
      "field_offset" : 352,
-     "referenced_type" : "type-2323"
+     "referenced_type" : "type-2326"
     }
    ],
    "linker_set_key" : "OMX_TIME_MEDIATIMETYPE",
    "name" : "OMX_TIME_MEDIATIMETYPE",
-   "referenced_type" : "type-2325",
-   "self_type" : "type-2325",
+   "referenced_type" : "type-2328",
+   "self_type" : "type-2328",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_MEDIATIMETYPE"
@@ -45437,13 +45516,13 @@
     {
      "field_name" : "eSupplier",
      "field_offset" : 32,
-     "referenced_type" : "type-1604"
+     "referenced_type" : "type-1600"
     }
    ],
    "linker_set_key" : "OMX_TUNNELSETUPTYPE",
    "name" : "OMX_TUNNELSETUPTYPE",
-   "referenced_type" : "type-1615",
-   "self_type" : "type-1615",
+   "referenced_type" : "type-1614",
+   "self_type" : "type-1614",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_TUNNELSETUPTYPE"
@@ -45454,7 +45533,7 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-1481"
+     "referenced_type" : "type-1484"
     },
     {
      "field_name" : "nVersion",
@@ -45464,8 +45543,8 @@
    "linker_set_key" : "OMX_VERSIONTYPE",
    "name" : "OMX_VERSIONTYPE",
    "record_kind" : "union",
-   "referenced_type" : "type-1480",
-   "self_type" : "type-1480",
+   "referenced_type" : "type-1483",
+   "self_type" : "type-1483",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_VERSIONTYPE"
@@ -45497,8 +45576,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "OMX_VERSIONTYPE::(anonymous struct at frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h:376:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h:376:5",
    "name" : "OMX_VERSIONTYPE::(anonymous struct at frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h:376:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h:376:5",
-   "referenced_type" : "type-1481",
-   "self_type" : "type-1481",
+   "referenced_type" : "type-1484",
+   "self_type" : "type-1484",
    "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)"
@@ -45514,7 +45593,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -45534,8 +45613,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
    "name" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
-   "referenced_type" : "type-2297",
-   "self_type" : "type-2297",
+   "referenced_type" : "type-2300",
+   "self_type" : "type-2300",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD"
@@ -45551,7 +45630,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -45566,8 +45645,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_BITRATETYPE",
    "name" : "OMX_VIDEO_CONFIG_BITRATETYPE",
-   "referenced_type" : "type-2287",
-   "self_type" : "type-2287",
+   "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_VIDEO_CONFIG_BITRATETYPE"
@@ -45583,7 +45662,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -45598,8 +45677,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_NALSIZE",
    "name" : "OMX_VIDEO_CONFIG_NALSIZE",
-   "referenced_type" : "type-2298",
-   "self_type" : "type-2298",
+   "referenced_type" : "type-2301",
+   "self_type" : "type-2301",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_NALSIZE"
@@ -45615,7 +45694,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -45635,13 +45714,13 @@
     {
      "field_name" : "eSliceMode",
      "field_offset" : 128,
-     "referenced_type" : "type-2295"
+     "referenced_type" : "type-2298"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
    "name" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
-   "referenced_type" : "type-2296",
-   "self_type" : "type-2296",
+   "referenced_type" : "type-2299",
+   "self_type" : "type-2299",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_AVCSLICEFMO"
@@ -45657,7 +45736,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -45682,7 +45761,7 @@
     {
      "field_name" : "bUseHadamard",
      "field_offset" : 192,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "nRefFrames",
@@ -45702,32 +45781,32 @@
     {
      "field_name" : "bEnableUEP",
      "field_offset" : 320,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bEnableFMO",
      "field_offset" : 352,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bEnableASO",
      "field_offset" : 384,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bEnableRS",
      "field_offset" : 416,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 448,
-     "referenced_type" : "type-2281"
+     "referenced_type" : "type-2284"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 480,
-     "referenced_type" : "type-2283"
+     "referenced_type" : "type-2286"
     },
     {
      "field_name" : "nAllowedPictureTypes",
@@ -45737,22 +45816,22 @@
     {
      "field_name" : "bFrameMBsOnly",
      "field_offset" : 544,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bMBAFF",
      "field_offset" : 576,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bEntropyCodingCABAC",
      "field_offset" : 608,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bWeightedPPrediction",
      "field_offset" : 640,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "nWeightedBipredicitonMode",
@@ -45762,17 +45841,17 @@
     {
      "field_name" : "bconstIpred",
      "field_offset" : 704,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bDirect8x8Inference",
      "field_offset" : 736,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bDirectSpatialTemporal",
      "field_offset" : 768,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "nCabacInitIdc",
@@ -45782,13 +45861,13 @@
     {
      "field_name" : "eLoopFilterMode",
      "field_offset" : 832,
-     "referenced_type" : "type-2284"
+     "referenced_type" : "type-2287"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_AVCTYPE",
    "name" : "OMX_VIDEO_PARAM_AVCTYPE",
-   "referenced_type" : "type-2285",
-   "self_type" : "type-2285",
+   "referenced_type" : "type-2288",
+   "self_type" : "type-2288",
    "size" : 108,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_AVCTYPE"
@@ -45804,7 +45883,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -45814,17 +45893,17 @@
     {
      "field_name" : "eControlRate",
      "field_offset" : 96,
-     "referenced_type" : "type-2255"
+     "referenced_type" : "type-2258"
     },
     {
      "field_offset" : 128,
-     "referenced_type" : "type-2257"
+     "referenced_type" : "type-2260"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_BITRATETYPE",
    "name" : "OMX_VIDEO_PARAM_BITRATETYPE",
-   "referenced_type" : "type-2256",
-   "self_type" : "type-2256",
+   "referenced_type" : "type-2259",
+   "self_type" : "type-2259",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_BITRATETYPE"
@@ -45846,8 +45925,8 @@
    "linker_set_key" : "OMX_VIDEO_PARAM_BITRATETYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5",
    "name" : "OMX_VIDEO_PARAM_BITRATETYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5",
    "record_kind" : "union",
-   "referenced_type" : "type-2257",
-   "self_type" : "type-2257",
+   "referenced_type" : "type-2260",
+   "self_type" : "type-2260",
    "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)"
@@ -45863,7 +45942,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -45873,12 +45952,12 @@
     {
      "field_name" : "bEnableHEC",
      "field_offset" : 96,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bEnableResync",
      "field_offset" : 128,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "nResynchMarkerSpacing",
@@ -45888,18 +45967,18 @@
     {
      "field_name" : "bEnableDataPartitioning",
      "field_offset" : 192,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bEnableRVLC",
      "field_offset" : 224,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE",
    "name" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE",
-   "referenced_type" : "type-2263",
-   "self_type" : "type-2263",
+   "referenced_type" : "type-2266",
+   "self_type" : "type-2266",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE"
@@ -45915,7 +45994,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -45935,17 +46014,17 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 160,
-     "referenced_type" : "type-2265"
+     "referenced_type" : "type-2268"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 192,
-     "referenced_type" : "type-2266"
+     "referenced_type" : "type-2269"
     },
     {
      "field_name" : "bPLUSPTYPEAllowed",
      "field_offset" : 224,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "nAllowedPictureTypes",
@@ -45955,7 +46034,7 @@
     {
      "field_name" : "bForceRoundingTypeToZero",
      "field_offset" : 288,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "nPictureHeaderRepetition",
@@ -45970,8 +46049,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_H263TYPE",
    "name" : "OMX_VIDEO_PARAM_H263TYPE",
-   "referenced_type" : "type-2269",
-   "self_type" : "type-2269",
+   "referenced_type" : "type-2272",
+   "self_type" : "type-2272",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_H263TYPE"
@@ -45987,7 +46066,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -45997,7 +46076,7 @@
     {
      "field_name" : "eRefreshMode",
      "field_offset" : 96,
-     "referenced_type" : "type-2261"
+     "referenced_type" : "type-2264"
     },
     {
      "field_name" : "nAirMBs",
@@ -46017,8 +46096,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
    "name" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
-   "referenced_type" : "type-2262",
-   "self_type" : "type-2262",
+   "referenced_type" : "type-2265",
+   "self_type" : "type-2265",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE"
@@ -46034,7 +46113,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -46044,17 +46123,17 @@
     {
      "field_name" : "eAccuracy",
      "field_offset" : 96,
-     "referenced_type" : "type-2259"
+     "referenced_type" : "type-2262"
     },
     {
      "field_name" : "bUnrestrictedMVs",
      "field_offset" : 128,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bFourMV",
      "field_offset" : 160,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "sXSearchRange",
@@ -46069,8 +46148,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
    "name" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
-   "referenced_type" : "type-2260",
-   "self_type" : "type-2260",
+   "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_MOTIONVECTORTYPE"
@@ -46086,7 +46165,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -46106,18 +46185,18 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 160,
-     "referenced_type" : "type-2270"
+     "referenced_type" : "type-2273"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 192,
-     "referenced_type" : "type-2271"
+     "referenced_type" : "type-2274"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MPEG2TYPE",
    "name" : "OMX_VIDEO_PARAM_MPEG2TYPE",
-   "referenced_type" : "type-2272",
-   "self_type" : "type-2272",
+   "referenced_type" : "type-2275",
+   "self_type" : "type-2275",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MPEG2TYPE"
@@ -46133,7 +46212,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -46148,12 +46227,12 @@
     {
      "field_name" : "bSVH",
      "field_offset" : 128,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bGov",
      "field_offset" : 160,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "nPFrames",
@@ -46173,7 +46252,7 @@
     {
      "field_name" : "bACPred",
      "field_offset" : 288,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "nMaxPacketSize",
@@ -46188,12 +46267,12 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 384,
-     "referenced_type" : "type-2273"
+     "referenced_type" : "type-2276"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 416,
-     "referenced_type" : "type-2274"
+     "referenced_type" : "type-2277"
     },
     {
      "field_name" : "nAllowedPictureTypes",
@@ -46208,13 +46287,13 @@
     {
      "field_name" : "bReversibleVLC",
      "field_offset" : 512,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MPEG4TYPE",
    "name" : "OMX_VIDEO_PARAM_MPEG4TYPE",
-   "referenced_type" : "type-2275",
-   "self_type" : "type-2275",
+   "referenced_type" : "type-2278",
+   "self_type" : "type-2278",
    "size" : 68,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MPEG4TYPE"
@@ -46230,7 +46309,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -46245,12 +46324,12 @@
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-2250"
+     "referenced_type" : "type-2253"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-2201"
+     "referenced_type" : "type-2204"
     },
     {
      "field_name" : "xFramerate",
@@ -46260,8 +46339,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
    "name" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-2252",
-   "self_type" : "type-2252",
+   "referenced_type" : "type-2255",
+   "self_type" : "type-2255",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_PORTFORMATTYPE"
@@ -46277,7 +46356,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -46302,8 +46381,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
    "name" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
-   "referenced_type" : "type-2286",
-   "self_type" : "type-2286",
+   "referenced_type" : "type-2289",
+   "self_type" : "type-2289",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE"
@@ -46319,7 +46398,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -46344,8 +46423,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
    "name" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
-   "referenced_type" : "type-2253",
-   "self_type" : "type-2253",
+   "referenced_type" : "type-2256",
+   "self_type" : "type-2256",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE"
@@ -46361,7 +46440,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -46371,7 +46450,7 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 96,
-     "referenced_type" : "type-2278"
+     "referenced_type" : "type-2281"
     },
     {
      "field_name" : "nBitsPerPixel",
@@ -46411,23 +46490,23 @@
     {
      "field_name" : "bEnablePostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bEnableTemporalInterpolation",
      "field_offset" : 352,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bEnableLatencyMode",
      "field_offset" : 384,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_RVTYPE",
    "name" : "OMX_VIDEO_PARAM_RVTYPE",
-   "referenced_type" : "type-2280",
-   "self_type" : "type-2280",
+   "referenced_type" : "type-2283",
+   "self_type" : "type-2283",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_RVTYPE"
@@ -46443,7 +46522,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -46453,43 +46532,43 @@
     {
      "field_name" : "b16x16",
      "field_offset" : 96,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "b16x8",
      "field_offset" : 128,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "b8x16",
      "field_offset" : 160,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "b8x8",
      "field_offset" : 192,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "b8x4",
      "field_offset" : 224,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "b4x8",
      "field_offset" : 256,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "b4x4",
      "field_offset" : 288,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VBSMCTYPE",
    "name" : "OMX_VIDEO_PARAM_VBSMCTYPE",
-   "referenced_type" : "type-2264",
-   "self_type" : "type-2264",
+   "referenced_type" : "type-2267",
+   "self_type" : "type-2267",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_VBSMCTYPE"
@@ -46505,7 +46584,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -46515,7 +46594,7 @@
     {
      "field_name" : "bEnableVFU",
      "field_offset" : 96,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "nFirstGOB",
@@ -46535,8 +46614,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
    "name" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
-   "referenced_type" : "type-2254",
-   "self_type" : "type-2254",
+   "referenced_type" : "type-2257",
+   "self_type" : "type-2257",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE"
@@ -46552,7 +46631,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -46562,13 +46641,13 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 96,
-     "referenced_type" : "type-2276"
+     "referenced_type" : "type-2279"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_WMVTYPE",
    "name" : "OMX_VIDEO_PARAM_WMVTYPE",
-   "referenced_type" : "type-2277",
-   "self_type" : "type-2277",
+   "referenced_type" : "type-2280",
+   "self_type" : "type-2280",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_WMVTYPE"
@@ -46619,17 +46698,17 @@
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 320,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 352,
-     "referenced_type" : "type-2250"
+     "referenced_type" : "type-2253"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 384,
-     "referenced_type" : "type-2201"
+     "referenced_type" : "type-2204"
     },
     {
      "field_name" : "pNativeWindow",
@@ -46639,8 +46718,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PORTDEFINITIONTYPE",
    "name" : "OMX_VIDEO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-2251",
-   "self_type" : "type-2251",
+   "referenced_type" : "type-2254",
+   "self_type" : "type-2254",
    "size" : 64,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PORTDEFINITIONTYPE"
@@ -46650,7 +46729,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1166"
+     "referenced_type" : "type-1167"
     }
    ],
    "fields" :
@@ -46659,20 +46738,20 @@
      "access" : "private",
      "field_name" : "d_",
      "field_offset" : 64,
-     "referenced_type" : "type-1195"
+     "referenced_type" : "type-1198"
     },
     {
      "access" : "private",
      "field_name" : "s_",
      "field_offset" : 128,
-     "referenced_type" : "type-1196"
+     "referenced_type" : "type-1199"
     }
    ],
    "linker_set_key" : "Renamer",
    "name" : "Renamer",
    "record_kind" : "class",
-   "referenced_type" : "type-1194",
-   "self_type" : "type-1194",
+   "referenced_type" : "type-1197",
+   "self_type" : "type-1197",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSZN7android14ReferenceMover15move_referencesINS_13GraphicBufferEEEvPNS_2spIT_EEPKS5_mE7Renamer",
@@ -46702,8 +46781,8 @@
    "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-1040",
-   "self_type" : "type-1040",
+   "referenced_type" : "type-1043",
+   "self_type" : "type-1043",
    "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"
@@ -46712,8 +46791,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::ADebug",
    "name" : "android::ADebug",
-   "referenced_type" : "type-2282",
-   "self_type" : "type-2282",
+   "referenced_type" : "type-2285",
+   "self_type" : "type-2285",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
    "unique_id" : "_ZTSN7android6ADebugE"
@@ -47212,8 +47291,8 @@
    ],
    "linker_set_key" : "android::AReplyToken",
    "name" : "android::AReplyToken",
-   "referenced_type" : "type-1045",
-   "self_type" : "type-1045",
+   "referenced_type" : "type-1044",
+   "self_type" : "type-1044",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android11AReplyTokenE",
@@ -48182,6 +48261,10 @@
      "mangled_component_name" : "_ZN7android16ProducerListener18needsReleaseNotifyEv"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ProducerListener18onBuffersDiscardedERKNSt3__16vectorIiNS1_9allocatorIiEEEE"
+    },
+    {
      "mangled_component_name" : "_ZNK7android17IProducerListener13getHalVariantEv"
     },
     {
@@ -48332,7 +48415,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1097"
+     "referenced_type" : "type-1100"
     },
     {
      "referenced_type" : "type-69"
@@ -48341,11 +48424,11 @@
    "linker_set_key" : "android::BnInterface<android::ISurfaceComposer>",
    "name" : "android::BnInterface<android::ISurfaceComposer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1096",
-   "self_type" : "type-1096",
+   "referenced_type" : "type-1099",
+   "self_type" : "type-1099",
    "size" : 48,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-1098" ],
+   "template_args" : [ "type-1101" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_16ISurfaceComposerEEE",
    "vtable_components" :
    [
@@ -48380,7 +48463,7 @@
     },
     {
      "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ISurfaceComposer28createDisplayEventConnectionENS0_11VsyncSourceE"
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer28createDisplayEventConnectionENS0_11VsyncSourceENS0_13ConfigChangedE"
     },
     {
      "is_pure" : true,
@@ -48459,6 +48542,10 @@
     },
     {
      "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer13captureScreenEmPNS_8hardware8graphics6common4V1_29DataspaceEPNS_2spINS_13GraphicBufferEEE"
+    },
+    {
+     "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"
     },
     {
@@ -48538,6 +48625,10 @@
      "mangled_component_name" : "_ZNK7android16ISurfaceComposer20setDisplayBrightnessERKNS_2spINS_7IBinderEEEf"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer15notifyPowerHintEi"
+    },
+    {
      "mangled_component_name" : "_ZN7android11BnInterfaceINS_16ISurfaceComposerEE19queryLocalInterfaceERKNS_8String16E"
     },
     {
@@ -48656,7 +48747,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-1036"
     },
     {
      "referenced_type" : "type-69"
@@ -48665,11 +48756,11 @@
    "linker_set_key" : "android::BnInterface<android::ITransactionCompletedListener>",
    "name" : "android::BnInterface<android::ITransactionCompletedListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1032",
-   "self_type" : "type-1032",
+   "referenced_type" : "type-1035",
+   "self_type" : "type-1035",
    "size" : 48,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-1034" ],
+   "template_args" : [ "type-1037" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_29ITransactionCompletedListenerEEE",
    "vtable_components" :
    [
@@ -48821,7 +48912,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1496"
+     "referenced_type" : "type-1500"
     },
     {
      "referenced_type" : "type-50"
@@ -48830,11 +48921,11 @@
    "linker_set_key" : "android::BpInterface<android::IConsumerListener>",
    "name" : "android::BpInterface<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1495",
-   "self_type" : "type-1495",
+   "referenced_type" : "type-1499",
+   "self_type" : "type-1499",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-1497" ],
+   "template_args" : [ "type-1501" ],
    "unique_id" : "_ZTSN7android11BpInterfaceINS_17IConsumerListenerEEE",
    "vtable_components" :
    [
@@ -48990,7 +49081,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1626"
+     "referenced_type" : "type-1630"
     },
     {
      "referenced_type" : "type-50"
@@ -48999,11 +49090,11 @@
    "linker_set_key" : "android::BpInterface<android::IGraphicBufferConsumer>",
    "name" : "android::BpInterface<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1625",
-   "self_type" : "type-1625",
+   "referenced_type" : "type-1629",
+   "self_type" : "type-1629",
    "size" : 56,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-1627" ],
+   "template_args" : [ "type-1631" ],
    "unique_id" : "_ZTSN7android11BpInterfaceINS_22IGraphicBufferConsumerEEE",
    "vtable_components" :
    [
@@ -49195,7 +49286,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-4321"
+     "referenced_type" : "type-4327"
     },
     {
      "referenced_type" : "type-50"
@@ -49204,11 +49295,11 @@
    "linker_set_key" : "android::BpInterface<android::IGraphicBufferProducer>",
    "name" : "android::BpInterface<android::IGraphicBufferProducer>",
    "record_kind" : "class",
-   "referenced_type" : "type-4320",
-   "self_type" : "type-4320",
+   "referenced_type" : "type-4326",
+   "self_type" : "type-4326",
    "size" : 56,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-4322" ],
+   "template_args" : [ "type-4328" ],
    "unique_id" : "_ZTSN7android11BpInterfaceINS_22IGraphicBufferProducerEEE",
    "vtable_components" :
    [
@@ -49424,7 +49515,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-4483"
+     "referenced_type" : "type-4489"
     },
     {
      "referenced_type" : "type-50"
@@ -49433,11 +49524,11 @@
    "linker_set_key" : "android::BpInterface<android::IProducerListener>",
    "name" : "android::BpInterface<android::IProducerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-4482",
-   "self_type" : "type-4482",
+   "referenced_type" : "type-4488",
+   "self_type" : "type-4488",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-4484" ],
+   "template_args" : [ "type-4490" ],
    "unique_id" : "_ZTSN7android11BpInterfaceINS_17IProducerListenerEEE",
    "vtable_components" :
    [
@@ -49469,6 +49560,10 @@
      "mangled_component_name" : "_ZN7android16ProducerListener18needsReleaseNotifyEv"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ProducerListener18onBuffersDiscardedERKNSt3__16vectorIiNS1_9allocatorIiEEEE"
+    },
+    {
      "mangled_component_name" : "_ZNK7android17IProducerListener13getHalVariantEv"
     },
     {
@@ -49701,28 +49796,28 @@
    [
     {
      "field_name" : "mRange",
-     "referenced_type" : "type-2431"
+     "referenced_type" : "type-2434"
     },
     {
      "field_name" : "mPrimaries",
      "field_offset" : 32,
-     "referenced_type" : "type-2432"
+     "referenced_type" : "type-2435"
     },
     {
      "field_name" : "mTransfer",
      "field_offset" : 64,
-     "referenced_type" : "type-2433"
+     "referenced_type" : "type-2436"
     },
     {
      "field_name" : "mMatrixCoeffs",
      "field_offset" : 96,
-     "referenced_type" : "type-2434"
+     "referenced_type" : "type-2437"
     }
    ],
    "linker_set_key" : "android::ColorAspects",
    "name" : "android::ColorAspects",
-   "referenced_type" : "type-2430",
-   "self_type" : "type-2430",
+   "referenced_type" : "type-2433",
+   "self_type" : "type-2433",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android12ColorAspectsE"
@@ -49731,8 +49826,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::ColorUtils",
    "name" : "android::ColorUtils",
-   "referenced_type" : "type-1187",
-   "self_type" : "type-1187",
+   "referenced_type" : "type-1188",
+   "self_type" : "type-1188",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
    "unique_id" : "_ZTSN7android10ColorUtilsE"
@@ -49741,8 +49836,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::CompileTimeAssert<true>",
    "name" : "android::CompileTimeAssert<true>",
-   "referenced_type" : "type-2692",
-   "self_type" : "type-2692",
+   "referenced_type" : "type-2695",
+   "self_type" : "type-2695",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Debug.h",
    "unique_id" : "_ZTSN7android17CompileTimeAssertILb1EEE"
@@ -49835,7 +49930,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -49845,7 +49940,7 @@
     {
      "field_name" : "bTunneled",
      "field_offset" : 96,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "nAudioHwSync",
@@ -49860,8 +49955,8 @@
    ],
    "linker_set_key" : "android::ConfigureVideoTunnelModeParams",
    "name" : "android::ConfigureVideoTunnelModeParams",
-   "referenced_type" : "type-2428",
-   "self_type" : "type-2428",
+   "referenced_type" : "type-2431",
+   "self_type" : "type-2431",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android30ConfigureVideoTunnelModeParamsE"
@@ -49877,7 +49972,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -49887,12 +49982,12 @@
     {
      "field_name" : "bRequestingDataSpace",
      "field_offset" : 96,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "bDataSpaceChanged",
      "field_offset" : 128,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "nPixelFormat",
@@ -49907,13 +50002,13 @@
     {
      "field_name" : "sAspects",
      "field_offset" : 224,
-     "referenced_type" : "type-2430"
+     "referenced_type" : "type-2433"
     }
    ],
    "linker_set_key" : "android::DescribeColorAspectsParams",
    "name" : "android::DescribeColorAspectsParams",
-   "referenced_type" : "type-2429",
-   "self_type" : "type-2429",
+   "referenced_type" : "type-2432",
+   "self_type" : "type-2432",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26DescribeColorAspectsParamsE"
@@ -49929,12 +50024,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 64,
-     "referenced_type" : "type-2201"
+     "referenced_type" : "type-2204"
     },
     {
      "field_name" : "nFrameWidth",
@@ -49959,18 +50054,18 @@
     {
      "field_name" : "bUsingNativeBuffers",
      "field_offset" : 224,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "sMediaImage",
      "field_offset" : 256,
-     "referenced_type" : "type-2423"
+     "referenced_type" : "type-2426"
     }
    ],
    "linker_set_key" : "android::DescribeColorFormat2Params",
    "name" : "android::DescribeColorFormat2Params",
-   "referenced_type" : "type-2422",
-   "self_type" : "type-2422",
+   "referenced_type" : "type-2425",
+   "self_type" : "type-2425",
    "size" : 136,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26DescribeColorFormat2ParamsE"
@@ -49986,12 +50081,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 64,
-     "referenced_type" : "type-2201"
+     "referenced_type" : "type-2204"
     },
     {
      "field_name" : "nFrameWidth",
@@ -50016,18 +50111,18 @@
     {
      "field_name" : "bUsingNativeBuffers",
      "field_offset" : 224,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "sMediaImage",
      "field_offset" : 256,
-     "referenced_type" : "type-2417"
+     "referenced_type" : "type-2420"
     }
    ],
    "linker_set_key" : "android::DescribeColorFormatParams",
    "name" : "android::DescribeColorFormatParams",
-   "referenced_type" : "type-2416",
-   "self_type" : "type-2416",
+   "referenced_type" : "type-2419",
+   "self_type" : "type-2419",
    "size" : 112,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android25DescribeColorFormatParamsE"
@@ -50043,7 +50138,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -50063,13 +50158,13 @@
     {
      "field_name" : "nValue",
      "field_offset" : 160,
-     "referenced_type" : "type-1577"
+     "referenced_type" : "type-1572"
     }
    ],
    "linker_set_key" : "android::DescribeHDR10PlusInfoParams",
    "name" : "android::DescribeHDR10PlusInfoParams",
-   "referenced_type" : "type-2442",
-   "self_type" : "type-2442",
+   "referenced_type" : "type-2445",
+   "self_type" : "type-2445",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android27DescribeHDR10PlusInfoParamsE"
@@ -50085,7 +50180,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -50095,13 +50190,13 @@
     {
      "field_name" : "sInfo",
      "field_offset" : 96,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2440"
     }
    ],
    "linker_set_key" : "android::DescribeHDRStaticInfoParams",
    "name" : "android::DescribeHDRStaticInfoParams",
-   "referenced_type" : "type-2436",
-   "self_type" : "type-2436",
+   "referenced_type" : "type-2439",
+   "self_type" : "type-2439",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android27DescribeHDRStaticInfoParamsE"
@@ -50117,7 +50212,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -50127,13 +50222,13 @@
     {
      "field_name" : "enable",
      "field_offset" : 96,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "android::EnableAndroidNativeBuffersParams",
    "name" : "android::EnableAndroidNativeBuffersParams",
-   "referenced_type" : "type-2397",
-   "self_type" : "type-2397",
+   "referenced_type" : "type-2400",
+   "self_type" : "type-2400",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android32EnableAndroidNativeBuffersParamsE"
@@ -50145,13 +50240,13 @@
     {
      "access" : "private",
      "field_name" : "mSharedFd",
-     "referenced_type" : "type-1200"
+     "referenced_type" : "type-1203"
     }
    ],
    "linker_set_key" : "android::FileDescriptor",
    "name" : "android::FileDescriptor",
-   "referenced_type" : "type-1199",
-   "self_type" : "type-1199",
+   "referenced_type" : "type-1202",
+   "self_type" : "type-1202",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h",
    "unique_id" : "_ZTSN7android14FileDescriptorE"
@@ -50168,8 +50263,8 @@
    ],
    "linker_set_key" : "android::FileDescriptor::Autoclose",
    "name" : "android::FileDescriptor::Autoclose",
-   "referenced_type" : "type-1213",
-   "self_type" : "type-1213",
+   "referenced_type" : "type-1211",
+   "self_type" : "type-1211",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h",
    "unique_id" : "_ZTSN7android14FileDescriptor9AutocloseE"
@@ -50353,7 +50448,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -50368,8 +50463,8 @@
    ],
    "linker_set_key" : "android::GetAndroidNativeBufferUsageParams",
    "name" : "android::GetAndroidNativeBufferUsageParams",
-   "referenced_type" : "type-2414",
-   "self_type" : "type-2414",
+   "referenced_type" : "type-2417",
+   "self_type" : "type-2417",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android33GetAndroidNativeBufferUsageParamsE"
@@ -50715,17 +50810,17 @@
    [
     {
      "field_name" : "mID",
-     "referenced_type" : "type-2438"
+     "referenced_type" : "type-2441"
     },
     {
      "field_offset" : 8,
-     "referenced_type" : "type-2439"
+     "referenced_type" : "type-2442"
     }
    ],
    "linker_set_key" : "android::HDRStaticInfo",
    "name" : "android::HDRStaticInfo",
-   "referenced_type" : "type-2437",
-   "self_type" : "type-2437",
+   "referenced_type" : "type-2440",
+   "self_type" : "type-2440",
    "size" : 25,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfoE"
@@ -50736,15 +50831,15 @@
    [
     {
      "field_name" : "sType1",
-     "referenced_type" : "type-2440"
+     "referenced_type" : "type-2443"
     }
    ],
    "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-2439",
-   "self_type" : "type-2439",
+   "referenced_type" : "type-2442",
+   "self_type" : "type-2442",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfoUt_E"
@@ -50765,8 +50860,8 @@
    ],
    "linker_set_key" : "android::HDRStaticInfo::Primaries1",
    "name" : "android::HDRStaticInfo::Primaries1",
-   "referenced_type" : "type-2441",
-   "self_type" : "type-2441",
+   "referenced_type" : "type-2444",
+   "self_type" : "type-2444",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfo10Primaries1E"
@@ -50777,22 +50872,22 @@
    [
     {
      "field_name" : "mR",
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2444"
     },
     {
      "field_name" : "mG",
      "field_offset" : 32,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2444"
     },
     {
      "field_name" : "mB",
      "field_offset" : 64,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2444"
     },
     {
      "field_name" : "mW",
      "field_offset" : 96,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2444"
     },
     {
      "field_name" : "mMaxDisplayLuminance",
@@ -50817,8 +50912,8 @@
    ],
    "linker_set_key" : "android::HDRStaticInfo::Type1",
    "name" : "android::HDRStaticInfo::Type1",
-   "referenced_type" : "type-2440",
-   "self_type" : "type-2440",
+   "referenced_type" : "type-2443",
+   "self_type" : "type-2443",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfo5Type1E"
@@ -51142,31 +51237,31 @@
     {
      "access" : "private",
      "field_name" : "mProcess",
-     "referenced_type" : "type-1258"
+     "referenced_type" : "type-1261"
     },
     {
      "access" : "private",
      "field_name" : "mPendingStrongDerefs",
      "field_offset" : 64,
-     "referenced_type" : "type-1205"
+     "referenced_type" : "type-1208"
     },
     {
      "access" : "private",
      "field_name" : "mPendingWeakDerefs",
      "field_offset" : 384,
-     "referenced_type" : "type-1207"
+     "referenced_type" : "type-1212"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteStrongDerefs",
      "field_offset" : 704,
-     "referenced_type" : "type-1208"
+     "referenced_type" : "type-1213"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteWeakDerefs",
      "field_offset" : 1024,
-     "referenced_type" : "type-1207"
+     "referenced_type" : "type-1212"
     },
     {
      "access" : "private",
@@ -51232,20 +51327,20 @@
      "access" : "private",
      "field_name" : "mIPCThreadStateBase",
      "field_offset" : 3584,
-     "referenced_type" : "type-1264"
+     "referenced_type" : "type-1267"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 3648,
-     "referenced_type" : "type-1256"
+     "referenced_type" : "type-1259"
     }
    ],
    "linker_set_key" : "android::IPCThreadState",
    "name" : "android::IPCThreadState",
    "record_kind" : "class",
-   "referenced_type" : "type-1257",
-   "self_type" : "type-1257",
+   "referenced_type" : "type-1260",
+   "self_type" : "type-1260",
    "size" : 464,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h",
    "unique_id" : "_ZTSN7android14IPCThreadStateE"
@@ -51257,17 +51352,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-1201"
+     "referenced_type" : "type-1204"
     }
    ],
    "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",
+   "referenced_type" : "type-1242",
+   "self_type" : "type-1242",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-1240", "type-796" ],
+   "template_args" : [ "type-1243", "type-796" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_7IBinderEEEEE"
   },
   {
@@ -51277,17 +51372,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-1355"
+     "referenced_type" : "type-1358"
     }
    ],
    "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",
+   "referenced_type" : "type-1370",
+   "self_type" : "type-1370",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-1240", "type-1368" ],
+   "template_args" : [ "type-1243", "type-1371" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
   },
   {
@@ -51355,11 +51450,11 @@
    "linker_set_key" : "android::LightFlattenable<android::FrameStats>",
    "name" : "android::LightFlattenable<android::FrameStats>",
    "record_kind" : "class",
-   "referenced_type" : "type-1101",
-   "self_type" : "type-1101",
+   "referenced_type" : "type-1102",
+   "self_type" : "type-1102",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1102" ],
+   "template_args" : [ "type-1103" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_10FrameStatsEEE"
   },
   {
@@ -51473,17 +51568,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-1210"
+     "referenced_type" : "type-1215"
     }
    ],
    "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",
+   "referenced_type" : "type-1214",
+   "self_type" : "type-1214",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-1211" ],
+   "template_args" : [ "type-1216" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_10GLConsumer8EglImageEEE"
   },
   {
@@ -51513,17 +51608,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-2354"
+     "referenced_type" : "type-2357"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
    "name" : "android::LightRefBase<android::VirtualLightRefBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-2353",
-   "self_type" : "type-2353",
+   "referenced_type" : "type-2356",
+   "self_type" : "type-2356",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-2355" ],
+   "template_args" : [ "type-2358" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
   },
   {
@@ -51934,7 +52029,7 @@
    [
     {
      "field_name" : "mType",
-     "referenced_type" : "type-2418"
+     "referenced_type" : "type-2421"
     },
     {
      "field_name" : "mNumPlanes",
@@ -51959,13 +52054,13 @@
     {
      "field_name" : "mPlane",
      "field_offset" : 160,
-     "referenced_type" : "type-2419"
+     "referenced_type" : "type-2422"
     }
    ],
    "linker_set_key" : "android::MediaImage",
    "name" : "android::MediaImage",
-   "referenced_type" : "type-2417",
-   "self_type" : "type-2417",
+   "referenced_type" : "type-2420",
+   "self_type" : "type-2420",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android10MediaImageE"
@@ -51976,7 +52071,7 @@
    [
     {
      "field_name" : "mType",
-     "referenced_type" : "type-2424"
+     "referenced_type" : "type-2427"
     },
     {
      "field_name" : "mNumPlanes",
@@ -52006,13 +52101,13 @@
     {
      "field_name" : "mPlane",
      "field_offset" : 192,
-     "referenced_type" : "type-2425"
+     "referenced_type" : "type-2428"
     }
    ],
    "linker_set_key" : "android::MediaImage2",
    "name" : "android::MediaImage2",
-   "referenced_type" : "type-2423",
-   "self_type" : "type-2423",
+   "referenced_type" : "type-2426",
+   "self_type" : "type-2426",
    "size" : 104,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android11MediaImage2E"
@@ -52048,8 +52143,8 @@
    ],
    "linker_set_key" : "android::MediaImage2::PlaneInfo",
    "name" : "android::MediaImage2::PlaneInfo",
-   "referenced_type" : "type-2426",
-   "self_type" : "type-2426",
+   "referenced_type" : "type-2429",
+   "self_type" : "type-2429",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android11MediaImage29PlaneInfoE"
@@ -52085,8 +52180,8 @@
    ],
    "linker_set_key" : "android::MediaImage::PlaneInfo",
    "name" : "android::MediaImage::PlaneInfo",
-   "referenced_type" : "type-2420",
-   "self_type" : "type-2420",
+   "referenced_type" : "type-2423",
+   "self_type" : "type-2423",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android10MediaImage9PlaneInfoE"
@@ -52165,8 +52260,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::OMXPluginBase",
    "name" : "android::OMXPluginBase",
-   "referenced_type" : "type-2395",
-   "self_type" : "type-2395",
+   "referenced_type" : "type-2398",
+   "self_type" : "type-2398",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h",
    "unique_id" : "_ZTSN7android13OMXPluginBaseE",
@@ -52378,17 +52473,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 64,
-     "referenced_type" : "type-1513"
+     "referenced_type" : "type-1517"
     }
    ],
    "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",
+   "referenced_type" : "type-1520",
+   "self_type" : "type-1520",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-1518" ],
+   "template_args" : [ "type-1521" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_10BufferItemEEE",
    "vtable_components" :
    [
@@ -52427,17 +52522,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 64,
-     "referenced_type" : "type-1648"
+     "referenced_type" : "type-1651"
     }
    ],
    "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",
+   "referenced_type" : "type-1663",
+   "self_type" : "type-1663",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-1660" ],
+   "template_args" : [ "type-1664" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_5FenceEEE",
    "vtable_components" :
    [
@@ -52476,17 +52571,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 64,
-     "referenced_type" : "type-4325"
+     "referenced_type" : "type-4332"
     }
    ],
    "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",
+   "referenced_type" : "type-4337",
+   "self_type" : "type-4337",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-4332" ],
+   "template_args" : [ "type-4338" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEEE",
    "vtable_components" :
    [
@@ -52525,17 +52620,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 64,
-     "referenced_type" : "type-1647"
+     "referenced_type" : "type-1650"
     }
    ],
    "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",
+   "referenced_type" : "type-1658",
+   "self_type" : "type-1658",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-1655" ],
+   "template_args" : [ "type-1659" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_13GraphicBufferEEE",
    "vtable_components" :
    [
@@ -52574,17 +52669,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 64,
-     "referenced_type" : "type-4324"
+     "referenced_type" : "type-4331"
     }
    ],
    "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",
+   "referenced_type" : "type-4343",
+   "self_type" : "type-4343",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-4337" ],
+   "template_args" : [ "type-4344" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEEE",
    "vtable_components" :
    [
@@ -52623,17 +52718,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 64,
-     "referenced_type" : "type-4326"
+     "referenced_type" : "type-4333"
     }
    ],
    "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",
+   "referenced_type" : "type-4348",
+   "self_type" : "type-4348",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-4342" ],
+   "template_args" : [ "type-4349" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEEE",
    "vtable_components" :
    [
@@ -52778,7 +52873,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -52788,7 +52883,7 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     },
     {
      "field_name" : "nMaxFrameWidth",
@@ -52803,8 +52898,8 @@
    ],
    "linker_set_key" : "android::PrepareForAdaptivePlaybackParams",
    "name" : "android::PrepareForAdaptivePlaybackParams",
-   "referenced_type" : "type-2408",
-   "self_type" : "type-2408",
+   "referenced_type" : "type-2411",
+   "self_type" : "type-2411",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android32PrepareForAdaptivePlaybackParamsE"
@@ -52820,18 +52915,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 64,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "android::PrependSPSPPSToIDRFramesParams",
    "name" : "android::PrependSPSPPSToIDRFramesParams",
-   "referenced_type" : "type-2415",
-   "self_type" : "type-2415",
+   "referenced_type" : "type-2418",
+   "self_type" : "type-2418",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android30PrependSPSPPSToIDRFramesParamsE"
@@ -52869,13 +52964,13 @@
      "access" : "private",
      "field_name" : "mThreadCountLock",
      "field_offset" : 256,
-     "referenced_type" : "type-1262"
+     "referenced_type" : "type-1265"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountDecrement",
      "field_offset" : 576,
-     "referenced_type" : "type-1263"
+     "referenced_type" : "type-1266"
     },
     {
      "access" : "private",
@@ -52905,7 +53000,7 @@
      "access" : "private",
      "field_name" : "mHandleToObject",
      "field_offset" : 1472,
-     "referenced_type" : "type-1203"
+     "referenced_type" : "type-1206"
     },
     {
      "access" : "private",
@@ -52917,7 +53012,7 @@
      "access" : "private",
      "field_name" : "mBinderContextCheckFunc",
      "field_offset" : 1856,
-     "referenced_type" : "type-1249"
+     "referenced_type" : "type-1253"
     },
     {
      "access" : "private",
@@ -52929,7 +53024,7 @@
      "access" : "private",
      "field_name" : "mContexts",
      "field_offset" : 1984,
-     "referenced_type" : "type-1239"
+     "referenced_type" : "type-1242"
     },
     {
      "access" : "private",
@@ -52947,20 +53042,20 @@
      "access" : "private",
      "field_name" : "mThreadPoolSeq",
      "field_offset" : 2400,
-     "referenced_type" : "type-1255"
+     "referenced_type" : "type-1258"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 2432,
-     "referenced_type" : "type-1256"
+     "referenced_type" : "type-1259"
     }
    ],
    "linker_set_key" : "android::ProcessState",
    "name" : "android::ProcessState",
    "record_kind" : "class",
-   "referenced_type" : "type-1261",
-   "self_type" : "type-1261",
+   "referenced_type" : "type-1264",
+   "self_type" : "type-1264",
    "size" : 328,
    "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h",
    "unique_id" : "_ZTSN7android12ProcessStateE",
@@ -53048,8 +53143,8 @@
    ],
    "linker_set_key" : "android::ProcessState::handle_entry",
    "name" : "android::ProcessState::handle_entry",
-   "referenced_type" : "type-1204",
-   "self_type" : "type-1204",
+   "referenced_type" : "type-1207",
+   "self_type" : "type-1207",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h",
    "unique_id" : "_ZTSN7android12ProcessState12handle_entryE"
@@ -53177,8 +53272,8 @@
    "linker_set_key" : "android::ReferenceMover",
    "name" : "android::ReferenceMover",
    "record_kind" : "class",
-   "referenced_type" : "type-1589",
-   "self_type" : "type-1589",
+   "referenced_type" : "type-1590",
+   "self_type" : "type-1590",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android14ReferenceMoverE"
@@ -53188,8 +53283,8 @@
    "linker_set_key" : "android::ReferenceRenamer",
    "name" : "android::ReferenceRenamer",
    "record_kind" : "class",
-   "referenced_type" : "type-1166",
-   "self_type" : "type-1166",
+   "referenced_type" : "type-1167",
+   "self_type" : "type-1167",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android16ReferenceRenamerE",
@@ -53212,8 +53307,8 @@
    "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",
+   "referenced_type" : "type-1566",
+   "self_type" : "type-1566",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE16ElementIsPointerILm0EJRKNS_10BufferItemEEEE"
@@ -53225,14 +53320,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> >",
    "name" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> >",
    "record_kind" : "class",
-   "referenced_type" : "type-1563",
-   "self_type" : "type-1563",
+   "referenced_type" : "type-1567",
+   "self_type" : "type-1567",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE11InputReaderIJNSt3__15tupleIJEEEEEE"
@@ -53244,14 +53339,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-1573",
+   "self_type" : "type-1573",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE11InputReaderIJNSt3__15tupleIJRKNS_10BufferItemEEEEEEE"
@@ -53260,8 +53355,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::MethodCaller<tuple<> >",
    "name" : "android::SafeBnInterface<IConsumerListener>::MethodCaller<tuple<> >",
-   "referenced_type" : "type-1572",
-   "self_type" : "type-1572",
+   "referenced_type" : "type-1577",
+   "self_type" : "type-1577",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE12MethodCallerIJNSt3__15tupleIJEEEEEE"
@@ -53270,8 +53365,8 @@
    "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",
+   "referenced_type" : "type-1578",
+   "self_type" : "type-1578",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE12MethodCallerIJNSt3__15tupleIJRKNS_10BufferItemEEEEEEE"
@@ -53280,52 +53375,52 @@
    "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",
+   "referenced_type" : "type-1560",
+   "self_type" : "type-1560",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1557" ],
+   "template_args" : [ "type-1561" ],
    "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",
+   "referenced_type" : "type-1562",
+   "self_type" : "type-1562",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1559" ],
+   "template_args" : [ "type-1563" ],
    "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",
+   "referenced_type" : "type-1564",
+   "self_type" : "type-1564",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1561" ],
+   "template_args" : [ "type-1565" ],
    "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",
+   "referenced_type" : "type-1557",
+   "self_type" : "type-1557",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1555" ],
+   "template_args" : [ "type-1558" ],
    "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",
+   "referenced_type" : "type-2026",
+   "self_type" : "type-2026",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJPNS_10BufferItemElmEEE"
@@ -53334,8 +53429,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, android_dataspace_t>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, android_dataspace_t>",
-   "referenced_type" : "type-2039",
-   "self_type" : "type-2039",
+   "referenced_type" : "type-2043",
+   "self_type" : "type-2043",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJ19android_dataspace_tEEE"
@@ -53344,8 +53439,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, bool, vector<Segment, allocator<Segment> > *>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, bool, vector<Segment, allocator<Segment> > *>",
-   "referenced_type" : "type-2044",
-   "self_type" : "type-2044",
+   "referenced_type" : "type-2048",
+   "self_type" : "type-2048",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS7_EEEEEEE"
@@ -53354,8 +53449,8 @@
    "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",
+   "referenced_type" : "type-2045",
+   "self_type" : "type-2045",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJbEEE"
@@ -53364,8 +53459,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, const String8 &, String8 *>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, const String8 &, String8 *>",
-   "referenced_type" : "type-2047",
-   "self_type" : "type-2047",
+   "referenced_type" : "type-2051",
+   "self_type" : "type-2051",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJRKNS_7String8EPS4_EEE"
@@ -53374,8 +53469,8 @@
    "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",
+   "referenced_type" : "type-2042",
+   "self_type" : "type-2042",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJRKNS_7String8EEEE"
@@ -53384,8 +53479,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, const sp<IConsumerListener> &, bool>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, const sp<IConsumerListener> &, bool>",
-   "referenced_type" : "type-2032",
-   "self_type" : "type-2032",
+   "referenced_type" : "type-2036",
+   "self_type" : "type-2036",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJRKNS_2spINS_17IConsumerListenerEEEbEEE"
@@ -53394,8 +53489,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, int *, const sp<GraphicBuffer> &>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, int *, const sp<GraphicBuffer> &>",
-   "referenced_type" : "type-2027",
-   "self_type" : "type-2027",
+   "referenced_type" : "type-2031",
+   "self_type" : "type-2031",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJPiRKNS_2spINS_13GraphicBufferEEEEEE"
@@ -53404,8 +53499,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, int, unsigned long, const sp<Fence> &>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, int, unsigned long, const sp<Fence> &>",
-   "referenced_type" : "type-2029",
-   "self_type" : "type-2029",
+   "referenced_type" : "type-2033",
+   "self_type" : "type-2033",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJimRKNS_2spINS_5FenceEEEEEE"
@@ -53414,8 +53509,8 @@
    "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",
+   "referenced_type" : "type-2030",
+   "self_type" : "type-2030",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJiEEE"
@@ -53424,8 +53519,8 @@
    "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",
+   "referenced_type" : "type-2047",
+   "self_type" : "type-2047",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJPNS_2spINS_12NativeHandleEEEEEE"
@@ -53434,8 +53529,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned int, unsigned int>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned int, unsigned int>",
-   "referenced_type" : "type-2036",
-   "self_type" : "type-2036",
+   "referenced_type" : "type-2040",
+   "self_type" : "type-2040",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJjjEEE"
@@ -53444,8 +53539,8 @@
    "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",
+   "referenced_type" : "type-2046",
+   "self_type" : "type-2046",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJjEEE"
@@ -53454,8 +53549,8 @@
    "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",
+   "referenced_type" : "type-2039",
+   "self_type" : "type-2039",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJPmEEE"
@@ -53464,8 +53559,8 @@
    "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",
+   "referenced_type" : "type-2044",
+   "self_type" : "type-2044",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJmEEE"
@@ -53474,8 +53569,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, BufferItem *, long, unsigned long>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, BufferItem *, long, unsigned long>",
-   "referenced_type" : "type-2023",
-   "self_type" : "type-2023",
+   "referenced_type" : "type-2028",
+   "self_type" : "type-2028",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm1EJPNS_10BufferItemElmEEE"
@@ -53484,8 +53579,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, bool, vector<Segment, allocator<Segment> > *>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, bool, vector<Segment, allocator<Segment> > *>",
-   "referenced_type" : "type-2045",
-   "self_type" : "type-2045",
+   "referenced_type" : "type-2050",
+   "self_type" : "type-2050",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm1EJbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS7_EEEEEEE"
@@ -53494,8 +53589,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, const String8 &, String8 *>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, const String8 &, String8 *>",
-   "referenced_type" : "type-2048",
-   "self_type" : "type-2048",
+   "referenced_type" : "type-2052",
+   "self_type" : "type-2052",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm1EJRKNS_7String8EPS4_EEE"
@@ -53504,8 +53599,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, const sp<IConsumerListener> &, bool>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, const sp<IConsumerListener> &, bool>",
-   "referenced_type" : "type-2033",
-   "self_type" : "type-2033",
+   "referenced_type" : "type-2037",
+   "self_type" : "type-2037",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm1EJRKNS_2spINS_17IConsumerListenerEEEbEEE"
@@ -53514,8 +53609,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, int *, const sp<GraphicBuffer> &>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, int *, const sp<GraphicBuffer> &>",
-   "referenced_type" : "type-2028",
-   "self_type" : "type-2028",
+   "referenced_type" : "type-2032",
+   "self_type" : "type-2032",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm1EJPiRKNS_2spINS_13GraphicBufferEEEEEE"
@@ -53524,8 +53619,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, int, unsigned long, const sp<Fence> &>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, int, unsigned long, const sp<Fence> &>",
-   "referenced_type" : "type-2030",
-   "self_type" : "type-2030",
+   "referenced_type" : "type-2034",
+   "self_type" : "type-2034",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm1EJimRKNS_2spINS_5FenceEEEEEE"
@@ -53534,8 +53629,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, unsigned int, unsigned int>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, unsigned int, unsigned int>",
-   "referenced_type" : "type-2037",
-   "self_type" : "type-2037",
+   "referenced_type" : "type-2041",
+   "self_type" : "type-2041",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm1EJjjEEE"
@@ -53544,8 +53639,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<2, BufferItem *, long, unsigned long>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<2, BufferItem *, long, unsigned long>",
-   "referenced_type" : "type-2025",
-   "self_type" : "type-2025",
+   "referenced_type" : "type-2029",
+   "self_type" : "type-2029",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm2EJPNS_10BufferItemElmEEE"
@@ -53554,8 +53649,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<2, int, unsigned long, const sp<Fence> &>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<2, int, unsigned long, const sp<Fence> &>",
-   "referenced_type" : "type-2031",
-   "self_type" : "type-2031",
+   "referenced_type" : "type-2035",
+   "self_type" : "type-2035",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm2EJimRKNS_2spINS_5FenceEEEEEE"
@@ -53567,14 +53662,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-2075",
+   "self_type" : "type-2075",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJEEEEEE"
@@ -53586,14 +53681,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-2053",
+   "self_type" : "type-2053",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPNS_10BufferItemElmEEEEEE"
@@ -53605,14 +53700,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-2092",
+   "self_type" : "type-2092",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJ19android_dataspace_tEEEEEE"
@@ -53624,14 +53719,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-2113",
+   "self_type" : "type-2113",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJbPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEEEE"
@@ -53643,14 +53738,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-2100",
+   "self_type" : "type-2100",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJbEEEEEE"
@@ -53662,14 +53757,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-2118",
+   "self_type" : "type-2118",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJRKNS_7String8EPS6_EEEEEE"
@@ -53681,14 +53776,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-2088",
+   "self_type" : "type-2088",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJRKNS_7String8EEEEEEE"
@@ -53700,14 +53795,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-2070",
+   "self_type" : "type-2070",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEEbEEEEEE"
@@ -53719,14 +53814,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-2062",
+   "self_type" : "type-2062",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
@@ -53738,14 +53833,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-2066",
+   "self_type" : "type-2066",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJimRKNS_2spINS_5FenceEEEEEEEEE"
@@ -53757,14 +53852,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-2057",
+   "self_type" : "type-2057",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJiEEEEEE"
@@ -53776,14 +53871,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-2109",
+   "self_type" : "type-2109",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPNS_2spINS_12NativeHandleEEEEEEEEE"
@@ -53795,14 +53890,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-2084",
+   "self_type" : "type-2084",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJjjEEEEEE"
@@ -53814,14 +53909,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-2104",
+   "self_type" : "type-2104",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJjEEEEEE"
@@ -53833,14 +53928,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-2079",
+   "self_type" : "type-2079",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPmEEEEEE"
@@ -53852,14 +53947,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-2098",
+   "self_type" : "type-2098",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJmEEEEEE"
@@ -53868,8 +53963,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<> >",
-   "referenced_type" : "type-2123",
-   "self_type" : "type-2123",
+   "referenced_type" : "type-2128",
+   "self_type" : "type-2128",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJEEEEEE"
@@ -53878,8 +53973,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<BufferItem *, long, unsigned long> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<BufferItem *, long, unsigned long> >",
-   "referenced_type" : "type-2118",
-   "self_type" : "type-2118",
+   "referenced_type" : "type-2122",
+   "self_type" : "type-2122",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPNS_10BufferItemElmEEEEEE"
@@ -53888,8 +53983,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<android_dataspace_t> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<android_dataspace_t> >",
-   "referenced_type" : "type-2128",
-   "self_type" : "type-2128",
+   "referenced_type" : "type-2132",
+   "self_type" : "type-2132",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJ19android_dataspace_tEEEEEE"
@@ -53898,8 +53993,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<bool, vector<Segment, allocator<Segment> > *> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<bool, vector<Segment, allocator<Segment> > *> >",
-   "referenced_type" : "type-2133",
-   "self_type" : "type-2133",
+   "referenced_type" : "type-2137",
+   "self_type" : "type-2137",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJbPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEEEE"
@@ -53908,8 +54003,8 @@
    "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",
+   "referenced_type" : "type-2134",
+   "self_type" : "type-2134",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJbEEEEEE"
@@ -53918,8 +54013,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<const String8 &, String8 *> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<const String8 &, String8 *> >",
-   "referenced_type" : "type-2134",
-   "self_type" : "type-2134",
+   "referenced_type" : "type-2139",
+   "self_type" : "type-2139",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJRKNS_7String8EPS6_EEEEEE"
@@ -53928,8 +54023,8 @@
    "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",
+   "referenced_type" : "type-2131",
+   "self_type" : "type-2131",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJRKNS_7String8EEEEEEE"
@@ -53938,8 +54033,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<const sp<IConsumerListener> &, bool> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<const sp<IConsumerListener> &, bool> >",
-   "referenced_type" : "type-2122",
-   "self_type" : "type-2122",
+   "referenced_type" : "type-2126",
+   "self_type" : "type-2126",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEEbEEEEEE"
@@ -53948,8 +54043,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<int *, const sp<GraphicBuffer> &> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<int *, const sp<GraphicBuffer> &> >",
-   "referenced_type" : "type-2120",
-   "self_type" : "type-2120",
+   "referenced_type" : "type-2124",
+   "self_type" : "type-2124",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
@@ -53958,8 +54053,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<int, unsigned long, const sp<Fence> &> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<int, unsigned long, const sp<Fence> &> >",
-   "referenced_type" : "type-2121",
-   "self_type" : "type-2121",
+   "referenced_type" : "type-2125",
+   "self_type" : "type-2125",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJimRKNS_2spINS_5FenceEEEEEEEEE"
@@ -53968,8 +54063,8 @@
    "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",
+   "referenced_type" : "type-2123",
+   "self_type" : "type-2123",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJiEEEEEE"
@@ -53978,8 +54073,8 @@
    "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",
+   "referenced_type" : "type-2136",
+   "self_type" : "type-2136",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPNS_2spINS_12NativeHandleEEEEEEEEE"
@@ -53988,8 +54083,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned int, unsigned int> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned int, unsigned int> >",
-   "referenced_type" : "type-2126",
-   "self_type" : "type-2126",
+   "referenced_type" : "type-2130",
+   "self_type" : "type-2130",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJjjEEEEEE"
@@ -53998,8 +54093,8 @@
    "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",
+   "referenced_type" : "type-2135",
+   "self_type" : "type-2135",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJjEEEEEE"
@@ -54008,8 +54103,8 @@
    "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",
+   "referenced_type" : "type-2129",
+   "self_type" : "type-2129",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPmEEEEEE"
@@ -54018,8 +54113,8 @@
    "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",
+   "referenced_type" : "type-2133",
+   "self_type" : "type-2133",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJmEEEEEE"
@@ -54031,13 +54126,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<> >",
-   "referenced_type" : "type-2147",
-   "self_type" : "type-2147",
+   "referenced_type" : "type-2151",
+   "self_type" : "type-2151",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJEEEEEE"
@@ -54049,13 +54144,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-2140",
+   "self_type" : "type-2140",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPNS_10BufferItemElmEEEEEE"
@@ -54067,13 +54162,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-2159",
+   "self_type" : "type-2159",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJ19android_dataspace_tEEEEEE"
@@ -54085,13 +54180,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-2171",
+   "self_type" : "type-2171",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJbPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEEEE"
@@ -54103,13 +54198,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool> >",
-   "referenced_type" : "type-2160",
-   "self_type" : "type-2160",
+   "referenced_type" : "type-2164",
+   "self_type" : "type-2164",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJbEEEEEE"
@@ -54121,13 +54216,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-2173",
+   "self_type" : "type-2173",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJRKNS_7String8EPS6_EEEEEE"
@@ -54139,13 +54234,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-2157",
+   "self_type" : "type-2157",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJRKNS_7String8EEEEEEE"
@@ -54157,13 +54252,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-2148",
+   "self_type" : "type-2148",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEEbEEEEEE"
@@ -54175,13 +54270,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-2144",
+   "self_type" : "type-2144",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
@@ -54193,13 +54288,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-2146",
+   "self_type" : "type-2146",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJimRKNS_2spINS_5FenceEEEEEEEEE"
@@ -54211,13 +54306,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int> >",
-   "referenced_type" : "type-2138",
-   "self_type" : "type-2138",
+   "referenced_type" : "type-2142",
+   "self_type" : "type-2142",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJiEEEEEE"
@@ -54229,13 +54324,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-2168",
+   "self_type" : "type-2168",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPNS_2spINS_12NativeHandleEEEEEEEEE"
@@ -54247,13 +54342,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-2155",
+   "self_type" : "type-2155",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJjjEEEEEE"
@@ -54265,13 +54360,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-2166",
+   "self_type" : "type-2166",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJjEEEEEE"
@@ -54283,13 +54378,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-2153",
+   "self_type" : "type-2153",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPmEEEEEE"
@@ -54301,13 +54396,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "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",
+   "referenced_type" : "type-2162",
+   "self_type" : "type-2162",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJmEEEEEE"
@@ -54316,660 +54411,660 @@
    "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",
+   "referenced_type" : "type-1976",
+   "self_type" : "type-1976",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1973" ],
+   "template_args" : [ "type-1977" ],
    "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",
+   "referenced_type" : "type-1941",
+   "self_type" : "type-1941",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1938" ],
+   "template_args" : [ "type-1942" ],
    "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",
+   "referenced_type" : "type-1993",
+   "self_type" : "type-1993",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1990" ],
+   "template_args" : [ "type-1994" ],
    "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",
+   "referenced_type" : "type-2013",
+   "self_type" : "type-2013",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2010" ],
+   "template_args" : [ "type-2014" ],
    "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",
+   "referenced_type" : "type-2000",
+   "self_type" : "type-2000",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1997" ],
+   "template_args" : [ "type-2001" ],
    "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",
+   "referenced_type" : "type-2020",
+   "self_type" : "type-2020",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2017" ],
+   "template_args" : [ "type-2021" ],
    "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",
+   "referenced_type" : "type-1989",
+   "self_type" : "type-1989",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1986" ],
+   "template_args" : [ "type-1990" ],
    "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",
+   "referenced_type" : "type-1969",
+   "self_type" : "type-1969",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1966" ],
+   "template_args" : [ "type-1970" ],
    "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",
+   "referenced_type" : "type-1954",
+   "self_type" : "type-1954",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1951" ],
+   "template_args" : [ "type-1955" ],
    "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",
+   "referenced_type" : "type-1960",
+   "self_type" : "type-1960",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1957" ],
+   "template_args" : [ "type-1961" ],
    "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",
+   "referenced_type" : "type-1949",
+   "self_type" : "type-1949",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1946" ],
+   "template_args" : [ "type-1950" ],
    "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",
+   "referenced_type" : "type-2009",
+   "self_type" : "type-2009",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2006" ],
+   "template_args" : [ "type-2010" ],
    "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",
+   "referenced_type" : "type-1982",
+   "self_type" : "type-1982",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1979" ],
+   "template_args" : [ "type-1983" ],
    "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",
+   "referenced_type" : "type-2004",
+   "self_type" : "type-2004",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2001" ],
+   "template_args" : [ "type-2005" ],
    "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",
+   "referenced_type" : "type-1978",
+   "self_type" : "type-1978",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1975" ],
+   "template_args" : [ "type-1979" ],
    "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",
+   "referenced_type" : "type-1998",
+   "self_type" : "type-1998",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1995" ],
+   "template_args" : [ "type-1999" ],
    "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",
+   "referenced_type" : "type-1947",
+   "self_type" : "type-1947",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1944" ],
+   "template_args" : [ "type-1948" ],
    "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",
+   "referenced_type" : "type-1945",
+   "self_type" : "type-1945",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1942" ],
+   "template_args" : [ "type-1946" ],
    "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",
+   "referenced_type" : "type-1943",
+   "self_type" : "type-1943",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1940" ],
+   "template_args" : [ "type-1944" ],
    "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",
+   "referenced_type" : "type-2024",
+   "self_type" : "type-2024",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2021" ],
+   "template_args" : [ "type-2025" ],
    "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",
+   "referenced_type" : "type-1991",
+   "self_type" : "type-1991",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1988" ],
+   "template_args" : [ "type-1992" ],
    "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",
+   "referenced_type" : "type-2022",
+   "self_type" : "type-2022",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2019" ],
+   "template_args" : [ "type-2023" ],
    "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",
+   "referenced_type" : "type-1996",
+   "self_type" : "type-1996",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1993" ],
+   "template_args" : [ "type-1997" ],
    "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",
+   "referenced_type" : "type-2018",
+   "self_type" : "type-2018",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2015" ],
+   "template_args" : [ "type-2019" ],
    "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",
+   "referenced_type" : "type-2002",
+   "self_type" : "type-2002",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1999" ],
+   "template_args" : [ "type-2003" ],
    "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",
+   "referenced_type" : "type-2015",
+   "self_type" : "type-2015",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2012" ],
+   "template_args" : [ "type-2016" ],
    "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",
+   "referenced_type" : "type-1958",
+   "self_type" : "type-1958",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1955" ],
+   "template_args" : [ "type-1959" ],
    "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",
+   "referenced_type" : "type-1967",
+   "self_type" : "type-1967",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1964" ],
+   "template_args" : [ "type-1968" ],
    "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",
+   "referenced_type" : "type-1965",
+   "self_type" : "type-1965",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1962" ],
+   "template_args" : [ "type-1966" ],
    "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",
+   "referenced_type" : "type-1952",
+   "self_type" : "type-1952",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1949" ],
+   "template_args" : [ "type-1953" ],
    "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",
+   "referenced_type" : "type-1956",
+   "self_type" : "type-1956",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1953" ],
+   "template_args" : [ "type-1957" ],
    "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",
+   "referenced_type" : "type-1963",
+   "self_type" : "type-1963",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1960" ],
+   "template_args" : [ "type-1964" ],
    "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",
+   "referenced_type" : "type-1971",
+   "self_type" : "type-1971",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1968" ],
+   "template_args" : [ "type-1972" ],
    "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",
+   "referenced_type" : "type-1974",
+   "self_type" : "type-1974",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1971" ],
+   "template_args" : [ "type-1975" ],
    "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",
+   "referenced_type" : "type-2011",
+   "self_type" : "type-2011",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2008" ],
+   "template_args" : [ "type-2012" ],
    "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",
+   "referenced_type" : "type-1987",
+   "self_type" : "type-1987",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1984" ],
+   "template_args" : [ "type-1988" ],
    "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",
+   "referenced_type" : "type-2007",
+   "self_type" : "type-2007",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2004" ],
+   "template_args" : [ "type-2008" ],
    "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",
+   "referenced_type" : "type-1985",
+   "self_type" : "type-1985",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1982" ],
+   "template_args" : [ "type-1986" ],
    "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",
+   "referenced_type" : "type-1980",
+   "self_type" : "type-1980",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1977" ],
+   "template_args" : [ "type-1981" ],
    "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",
+   "referenced_type" : "type-1894",
+   "self_type" : "type-1894",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1891" ],
+   "template_args" : [ "type-1895" ],
    "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",
+   "referenced_type" : "type-1938",
+   "self_type" : "type-1938",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1935" ],
+   "template_args" : [ "type-1939" ],
    "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",
+   "referenced_type" : "type-1927",
+   "self_type" : "type-1927",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1924" ],
+   "template_args" : [ "type-1928" ],
    "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",
+   "referenced_type" : "type-1932",
+   "self_type" : "type-1932",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1929" ],
+   "template_args" : [ "type-1933" ],
    "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",
+   "referenced_type" : "type-1916",
+   "self_type" : "type-1916",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1913" ],
+   "template_args" : [ "type-1917" ],
    "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",
+   "referenced_type" : "type-1936",
+   "self_type" : "type-1936",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1933" ],
+   "template_args" : [ "type-1937" ],
    "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",
+   "referenced_type" : "type-1925",
+   "self_type" : "type-1925",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1922" ],
+   "template_args" : [ "type-1926" ],
    "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",
+   "referenced_type" : "type-1912",
+   "self_type" : "type-1912",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1909" ],
+   "template_args" : [ "type-1913" ],
    "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",
+   "referenced_type" : "type-1905",
+   "self_type" : "type-1905",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1902" ],
+   "template_args" : [ "type-1906" ],
    "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",
+   "referenced_type" : "type-1914",
+   "self_type" : "type-1914",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1911" ],
+   "template_args" : [ "type-1915" ],
    "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",
+   "referenced_type" : "type-1903",
+   "self_type" : "type-1903",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1900" ],
+   "template_args" : [ "type-1904" ],
    "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",
+   "referenced_type" : "type-1908",
+   "self_type" : "type-1908",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1905" ],
+   "template_args" : [ "type-1909" ],
    "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",
+   "referenced_type" : "type-1901",
+   "self_type" : "type-1901",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1898" ],
+   "template_args" : [ "type-1902" ],
    "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",
+   "referenced_type" : "type-1897",
+   "self_type" : "type-1897",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1894" ],
+   "template_args" : [ "type-1898" ],
    "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",
+   "referenced_type" : "type-1930",
+   "self_type" : "type-1930",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1927" ],
+   "template_args" : [ "type-1931" ],
    "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",
+   "referenced_type" : "type-1921",
+   "self_type" : "type-1921",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1918" ],
+   "template_args" : [ "type-1922" ],
    "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",
+   "referenced_type" : "type-1923",
+   "self_type" : "type-1923",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1920" ],
+   "template_args" : [ "type-1924" ],
    "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",
+   "referenced_type" : "type-1919",
+   "self_type" : "type-1919",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1916" ],
+   "template_args" : [ "type-1920" ],
    "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",
+   "referenced_type" : "type-1910",
+   "self_type" : "type-1910",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1907" ],
+   "template_args" : [ "type-1911" ],
    "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",
+   "referenced_type" : "type-1899",
+   "self_type" : "type-1899",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1896" ],
+   "template_args" : [ "type-1900" ],
    "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",
+   "referenced_type" : "type-1934",
+   "self_type" : "type-1934",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1931" ],
+   "template_args" : [ "type-1935" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEJEEE"
   },
   {
@@ -54986,17 +55081,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 320,
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<android::IConsumerListener>",
    "name" : "android::SafeBnInterface<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1288",
-   "self_type" : "type-1288",
+   "referenced_type" : "type-1291",
+   "self_type" : "type-1291",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1289" ],
+   "template_args" : [ "type-1292" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEEE",
    "vtable_components" :
    [
@@ -55197,17 +55292,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 256,
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<android::IGraphicBufferConsumer>",
    "name" : "android::SafeBnInterface<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1280",
-   "self_type" : "type-1280",
+   "referenced_type" : "type-1283",
+   "self_type" : "type-1283",
    "size" : 56,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1281" ],
+   "template_args" : [ "type-1284" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEEE",
    "vtable_components" :
    [
@@ -55435,7 +55530,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1032"
+     "referenced_type" : "type-1035"
     }
    ],
    "fields" :
@@ -55444,17 +55539,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 256,
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<android::ITransactionCompletedListener>",
    "name" : "android::SafeBnInterface<android::ITransactionCompletedListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1103",
-   "self_type" : "type-1103",
+   "referenced_type" : "type-1106",
+   "self_type" : "type-1106",
    "size" : 56,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1105" ],
+   "template_args" : [ "type-1108" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEEE",
    "vtable_components" :
    [
@@ -55605,525 +55700,525 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IConsumerListener>::ArgsMatchParams<std::tuple<>, std::tuple<> >",
    "name" : "android::SafeBpInterface<IConsumerListener>::ArgsMatchParams<std::tuple<>, std::tuple<> >",
-   "referenced_type" : "type-1545",
-   "self_type" : "type-1545",
+   "referenced_type" : "type-1548",
+   "self_type" : "type-1548",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1546", "type-1547" ],
+   "template_args" : [ "type-1549", "type-1550" ],
    "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",
+   "referenced_type" : "type-1551",
+   "self_type" : "type-1551",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1549", "type-1550" ],
+   "template_args" : [ "type-1552", "type-1553" ],
    "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",
+   "referenced_type" : "type-1545",
+   "self_type" : "type-1545",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1542", "type-1543" ],
+   "template_args" : [ "type-1546", "type-1547" ],
    "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",
+   "referenced_type" : "type-1554",
+   "self_type" : "type-1554",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1533" ],
+   "template_args" : [ "type-1536" ],
    "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",
+   "referenced_type" : "type-1821",
+   "self_type" : "type-1821",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1818", "type-1819" ],
+   "template_args" : [ "type-1822", "type-1823" ],
    "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",
+   "referenced_type" : "type-1805",
+   "self_type" : "type-1805",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1802", "type-1803" ],
+   "template_args" : [ "type-1806", "type-1807" ],
    "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",
+   "referenced_type" : "type-1834",
+   "self_type" : "type-1834",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1831", "type-1832" ],
+   "template_args" : [ "type-1835", "type-1836" ],
    "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",
+   "referenced_type" : "type-1851",
+   "self_type" : "type-1851",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1848", "type-1849" ],
+   "template_args" : [ "type-1852", "type-1853" ],
    "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",
+   "referenced_type" : "type-1841",
+   "self_type" : "type-1841",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1838", "type-1839" ],
+   "template_args" : [ "type-1842", "type-1843" ],
    "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",
+   "referenced_type" : "type-1854",
+   "self_type" : "type-1854",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1851", "type-1852" ],
+   "template_args" : [ "type-1855", "type-1856" ],
    "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",
+   "referenced_type" : "type-1831",
+   "self_type" : "type-1831",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1828", "type-1829" ],
+   "template_args" : [ "type-1832", "type-1833" ],
    "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",
+   "referenced_type" : "type-1818",
+   "self_type" : "type-1818",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1815", "type-1816" ],
+   "template_args" : [ "type-1819", "type-1820" ],
    "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",
+   "referenced_type" : "type-1815",
+   "self_type" : "type-1815",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1812", "type-1813" ],
+   "template_args" : [ "type-1816", "type-1817" ],
    "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",
+   "referenced_type" : "type-1808",
+   "self_type" : "type-1808",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1805", "type-1806" ],
+   "template_args" : [ "type-1809", "type-1810" ],
    "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",
+   "referenced_type" : "type-1811",
+   "self_type" : "type-1811",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1808", "type-1809" ],
+   "template_args" : [ "type-1812", "type-1813" ],
    "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",
+   "referenced_type" : "type-1848",
+   "self_type" : "type-1848",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1845", "type-1846" ],
+   "template_args" : [ "type-1849", "type-1850" ],
    "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",
+   "referenced_type" : "type-1828",
+   "self_type" : "type-1828",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1825", "type-1826" ],
+   "template_args" : [ "type-1829", "type-1830" ],
    "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",
+   "referenced_type" : "type-1844",
+   "self_type" : "type-1844",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1841", "type-1842" ],
+   "template_args" : [ "type-1845", "type-1846" ],
    "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",
+   "referenced_type" : "type-1838",
+   "self_type" : "type-1838",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1835", "type-1836" ],
+   "template_args" : [ "type-1839", "type-1840" ],
    "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",
+   "referenced_type" : "type-1825",
+   "self_type" : "type-1825",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1821", "type-1822" ],
+   "template_args" : [ "type-1826", "type-1827" ],
    "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",
+   "referenced_type" : "type-1726",
+   "self_type" : "type-1726",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1722", "type-1723" ],
+   "template_args" : [ "type-1727", "type-1728" ],
    "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",
+   "referenced_type" : "type-1775",
+   "self_type" : "type-1775",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1772", "type-1773" ],
+   "template_args" : [ "type-1776", "type-1777" ],
    "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",
+   "referenced_type" : "type-1792",
+   "self_type" : "type-1792",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1788", "type-1789" ],
+   "template_args" : [ "type-1793", "type-1794" ],
    "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",
+   "referenced_type" : "type-1782",
+   "self_type" : "type-1782",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1779", "type-1780" ],
+   "template_args" : [ "type-1783", "type-1784" ],
    "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",
+   "referenced_type" : "type-1798",
+   "self_type" : "type-1798",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1795", "type-1796" ],
+   "template_args" : [ "type-1799", "type-1800" ],
    "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",
+   "referenced_type" : "type-1772",
+   "self_type" : "type-1772",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1769", "type-1770" ],
+   "template_args" : [ "type-1773", "type-1774" ],
    "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",
+   "referenced_type" : "type-1755",
+   "self_type" : "type-1755",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1752", "type-1753" ],
+   "template_args" : [ "type-1756", "type-1757" ],
    "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",
+   "referenced_type" : "type-1745",
+   "self_type" : "type-1745",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1742", "type-1743" ],
+   "template_args" : [ "type-1746", "type-1747" ],
    "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",
+   "referenced_type" : "type-1735",
+   "self_type" : "type-1735",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1732", "type-1733" ],
+   "template_args" : [ "type-1736", "type-1737" ],
    "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",
+   "referenced_type" : "type-1739",
+   "self_type" : "type-1739",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1736", "type-1737" ],
+   "template_args" : [ "type-1740", "type-1741" ],
    "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",
+   "referenced_type" : "type-1788",
+   "self_type" : "type-1788",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1785", "type-1786" ],
+   "template_args" : [ "type-1789", "type-1790" ],
    "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",
+   "referenced_type" : "type-1765",
+   "self_type" : "type-1765",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1762", "type-1763" ],
+   "template_args" : [ "type-1766", "type-1767" ],
    "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",
+   "referenced_type" : "type-1785",
+   "self_type" : "type-1785",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1782", "type-1783" ],
+   "template_args" : [ "type-1786", "type-1787" ],
    "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",
+   "referenced_type" : "type-1778",
+   "self_type" : "type-1778",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1775", "type-1776" ],
+   "template_args" : [ "type-1779", "type-1780" ],
    "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",
+   "referenced_type" : "type-1762",
+   "self_type" : "type-1762",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1759", "type-1760" ],
+   "template_args" : [ "type-1763", "type-1764" ],
    "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",
+   "referenced_type" : "type-1729",
+   "self_type" : "type-1729",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1726", "type-1727" ],
+   "template_args" : [ "type-1730", "type-1731" ],
    "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",
+   "referenced_type" : "type-1795",
+   "self_type" : "type-1795",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1792", "type-1793" ],
+   "template_args" : [ "type-1796", "type-1797" ],
    "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",
+   "referenced_type" : "type-1801",
+   "self_type" : "type-1801",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1798", "type-1799" ],
+   "template_args" : [ "type-1802", "type-1803" ],
    "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",
+   "referenced_type" : "type-1759",
+   "self_type" : "type-1759",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1755", "type-1756" ],
+   "template_args" : [ "type-1760", "type-1761" ],
    "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",
+   "referenced_type" : "type-1749",
+   "self_type" : "type-1749",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1746", "type-1747" ],
+   "template_args" : [ "type-1750", "type-1751" ],
    "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",
+   "referenced_type" : "type-1742",
+   "self_type" : "type-1742",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1739", "type-1740" ],
+   "template_args" : [ "type-1743", "type-1744" ],
    "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",
+   "referenced_type" : "type-1768",
+   "self_type" : "type-1768",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1765", "type-1766" ],
+   "template_args" : [ "type-1769", "type-1770" ],
    "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",
+   "referenced_type" : "type-1732",
+   "self_type" : "type-1732",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1729", "type-1730" ],
+   "template_args" : [ "type-1733", "type-1734" ],
    "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",
+   "referenced_type" : "type-1752",
+   "self_type" : "type-1752",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1749", "type-1750" ],
+   "template_args" : [ "type-1753", "type-1754" ],
    "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",
+   "referenced_type" : "type-1858",
+   "self_type" : "type-1858",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1854" ],
+   "template_args" : [ "type-1859" ],
    "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",
+   "referenced_type" : "type-1889",
+   "self_type" : "type-1889",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1886" ],
+   "template_args" : [ "type-1890" ],
    "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",
+   "referenced_type" : "type-1884",
+   "self_type" : "type-1884",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1880" ],
+   "template_args" : [ "type-1885" ],
    "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",
+   "referenced_type" : "type-1882",
+   "self_type" : "type-1882",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-768" ],
@@ -56133,8 +56228,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<bool &>",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<bool &>",
-   "referenced_type" : "type-1871",
-   "self_type" : "type-1871",
+   "referenced_type" : "type-1875",
+   "self_type" : "type-1875",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-767" ],
@@ -56144,41 +56239,41 @@
    "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",
+   "referenced_type" : "type-1879",
+   "self_type" : "type-1879",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1876" ],
+   "template_args" : [ "type-1880" ],
    "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",
+   "referenced_type" : "type-1866",
+   "self_type" : "type-1866",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1863" ],
+   "template_args" : [ "type-1867" ],
    "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",
+   "referenced_type" : "type-1864",
+   "self_type" : "type-1864",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1861" ],
+   "template_args" : [ "type-1865" ],
    "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",
+   "referenced_type" : "type-1874",
+   "self_type" : "type-1874",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-945" ],
@@ -56188,8 +56283,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int &>",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int &>",
-   "referenced_type" : "type-1858",
-   "self_type" : "type-1858",
+   "referenced_type" : "type-1862",
+   "self_type" : "type-1862",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-200" ],
@@ -56199,41 +56294,41 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int *&>",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int *&>",
-   "referenced_type" : "type-1859",
-   "self_type" : "type-1859",
+   "referenced_type" : "type-1863",
+   "self_type" : "type-1863",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1509" ],
+   "template_args" : [ "type-1512" ],
    "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",
+   "referenced_type" : "type-1860",
+   "self_type" : "type-1860",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1430" ],
+   "template_args" : [ "type-1433" ],
    "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",
+   "referenced_type" : "type-1887",
+   "self_type" : "type-1887",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1884" ],
+   "template_args" : [ "type-1888" ],
    "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",
+   "referenced_type" : "type-1878",
+   "self_type" : "type-1878",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-764" ],
@@ -56243,8 +56338,8 @@
    "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",
+   "referenced_type" : "type-1861",
+   "self_type" : "type-1861",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-10" ],
@@ -56254,11 +56349,11 @@
    "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",
+   "referenced_type" : "type-1876",
+   "self_type" : "type-1876",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1873" ],
+   "template_args" : [ "type-1877" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRPmEE"
   },
   {
@@ -56266,7 +56361,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1495"
+     "referenced_type" : "type-1499"
     }
    ],
    "fields" :
@@ -56275,17 +56370,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 384,
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "linker_set_key" : "android::SafeBpInterface<android::IConsumerListener>",
    "name" : "android::SafeBpInterface<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1538",
-   "self_type" : "type-1538",
+   "referenced_type" : "type-1542",
+   "self_type" : "type-1542",
    "size" : 72,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1539" ],
+   "template_args" : [ "type-1543" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_17IConsumerListenerEEE",
    "vtable_components" :
    [
@@ -56441,7 +56536,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1625"
+     "referenced_type" : "type-1629"
     }
    ],
    "fields" :
@@ -56450,17 +56545,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 320,
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "linker_set_key" : "android::SafeBpInterface<android::IGraphicBufferConsumer>",
    "name" : "android::SafeBpInterface<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1718",
-   "self_type" : "type-1718",
+   "referenced_type" : "type-1722",
+   "self_type" : "type-1722",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1719" ],
+   "template_args" : [ "type-1723" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEEE",
    "vtable_components" :
    [
@@ -56651,198 +56746,198 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)()>",
    "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)()>",
-   "referenced_type" : "type-1694",
-   "self_type" : "type-1694",
+   "referenced_type" : "type-1698",
+   "self_type" : "type-1698",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1695" ],
+   "template_args" : [ "type-1699" ],
    "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",
+   "referenced_type" : "type-1687",
+   "self_type" : "type-1687",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1684" ],
+   "template_args" : [ "type-1688" ],
    "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",
+   "referenced_type" : "type-1707",
+   "self_type" : "type-1707",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1704" ],
+   "template_args" : [ "type-1708" ],
    "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",
+   "referenced_type" : "type-1711",
+   "self_type" : "type-1711",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1708" ],
+   "template_args" : [ "type-1712" ],
    "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",
+   "referenced_type" : "type-1718",
+   "self_type" : "type-1718",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1715" ],
+   "template_args" : [ "type-1719" ],
    "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",
+   "referenced_type" : "type-1705",
+   "self_type" : "type-1705",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1702" ],
+   "template_args" : [ "type-1706" ],
    "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",
+   "referenced_type" : "type-1720",
+   "self_type" : "type-1720",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1717" ],
+   "template_args" : [ "type-1721" ],
    "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",
+   "referenced_type" : "type-1696",
+   "self_type" : "type-1696",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1693" ],
+   "template_args" : [ "type-1697" ],
    "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",
+   "referenced_type" : "type-1691",
+   "self_type" : "type-1691",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1688" ],
+   "template_args" : [ "type-1692" ],
    "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",
+   "referenced_type" : "type-1689",
+   "self_type" : "type-1689",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1686" ],
+   "template_args" : [ "type-1690" ],
    "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",
+   "referenced_type" : "type-1694",
+   "self_type" : "type-1694",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1691" ],
+   "template_args" : [ "type-1695" ],
    "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",
+   "referenced_type" : "type-1716",
+   "self_type" : "type-1716",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1713" ],
+   "template_args" : [ "type-1717" ],
    "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",
+   "referenced_type" : "type-1713",
+   "self_type" : "type-1713",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1710" ],
+   "template_args" : [ "type-1714" ],
    "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",
+   "referenced_type" : "type-1702",
+   "self_type" : "type-1702",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1699" ],
+   "template_args" : [ "type-1703" ],
    "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",
+   "referenced_type" : "type-1700",
+   "self_type" : "type-1700",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1697" ],
+   "template_args" : [ "type-1701" ],
    "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",
+   "referenced_type" : "type-1709",
+   "self_type" : "type-1709",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1706" ],
+   "template_args" : [ "type-1710" ],
    "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",
+   "referenced_type" : "type-1537",
+   "self_type" : "type-1537",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1535" ],
+   "template_args" : [ "type-1538" ],
    "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",
+   "referenced_type" : "type-1539",
+   "self_type" : "type-1539",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1537" ],
+   "template_args" : [ "type-1540" ],
    "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_16ConsumerListenerEFvRKNS_10BufferItemEEEE"
   },
   {
@@ -56852,14 +56947,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-1107"
     }
    ],
    "linker_set_key" : "android::SafeInterface::ParcelHandler",
    "name" : "android::SafeInterface::ParcelHandler",
    "record_kind" : "class",
-   "referenced_type" : "type-1236",
-   "self_type" : "type-1236",
+   "referenced_type" : "type-1239",
+   "self_type" : "type-1239",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android13SafeInterface13ParcelHandlerE"
@@ -56868,8 +56963,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParcelHandler::HandleInt<false, 4, unsigned int>",
    "name" : "android::SafeInterface::ParcelHandler::HandleInt<false, 4, unsigned int>",
-   "referenced_type" : "type-1681",
-   "self_type" : "type-1681",
+   "referenced_type" : "type-1685",
+   "self_type" : "type-1685",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-2" ],
@@ -56879,8 +56974,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParcelHandler::HandleInt<false, 8, unsigned long>",
    "name" : "android::SafeInterface::ParcelHandler::HandleInt<false, 8, unsigned long>",
-   "referenced_type" : "type-1677",
-   "self_type" : "type-1677",
+   "referenced_type" : "type-1682",
+   "self_type" : "type-1682",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-11" ],
@@ -56890,8 +56985,8 @@
    "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",
+   "referenced_type" : "type-1684",
+   "self_type" : "type-1684",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-4" ],
@@ -56901,8 +56996,8 @@
    "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",
+   "referenced_type" : "type-1679",
+   "self_type" : "type-1679",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-32" ],
@@ -56932,11 +57027,11 @@
    "linker_set_key" : "android::Singleton<android::ComposerService>",
    "name" : "android::Singleton<android::ComposerService>",
    "record_kind" : "class",
-   "referenced_type" : "type-1090",
-   "self_type" : "type-1090",
+   "referenced_type" : "type-1093",
+   "self_type" : "type-1093",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-1091" ],
+   "template_args" : [ "type-1094" ],
    "unique_id" : "_ZTSN7android9SingletonINS_15ComposerServiceEEE"
   },
   {
@@ -56963,11 +57058,11 @@
    "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",
+   "referenced_type" : "type-1204",
+   "self_type" : "type-1204",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-1202" ],
+   "template_args" : [ "type-1205" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEEE",
    "vtable_components" :
    [
@@ -57021,11 +57116,11 @@
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
    "name" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-1355",
-   "self_type" : "type-1355",
+   "referenced_type" : "type-1358",
+   "self_type" : "type-1358",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-1356" ],
+   "template_args" : [ "type-1359" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
    "vtable_components" :
    [
@@ -57315,7 +57410,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -57325,13 +57420,13 @@
     {
      "field_name" : "bStoreMetaData",
      "field_offset" : 96,
-     "referenced_type" : "type-1302"
+     "referenced_type" : "type-1301"
     }
    ],
    "linker_set_key" : "android::StoreMetaDataInBuffersParams",
    "name" : "android::StoreMetaDataInBuffersParams",
-   "referenced_type" : "type-2398",
-   "self_type" : "type-2398",
+   "referenced_type" : "type-2401",
+   "self_type" : "type-2401",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android28StoreMetaDataInBuffersParamsE"
@@ -57343,14 +57438,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-1241"
+     "referenced_type" : "type-1244"
     }
    ],
    "linker_set_key" : "android::String16",
    "name" : "android::String16",
    "record_kind" : "class",
-   "referenced_type" : "type-1240",
-   "self_type" : "type-1240",
+   "referenced_type" : "type-1243",
+   "self_type" : "type-1243",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "unique_id" : "_ZTSN7android8String16E"
@@ -57539,7 +57634,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1483"
     },
     {
      "field_name" : "nPortIndex",
@@ -57554,18 +57649,18 @@
     {
      "field_name" : "bufferHeader",
      "field_offset" : 192,
-     "referenced_type" : "type-2378"
+     "referenced_type" : "type-2381"
     },
     {
      "field_name" : "nativeBuffer",
      "field_offset" : 256,
-     "referenced_type" : "type-2410"
+     "referenced_type" : "type-2413"
     }
    ],
    "linker_set_key" : "android::UseAndroidNativeBufferParams",
    "name" : "android::UseAndroidNativeBufferParams",
-   "referenced_type" : "type-2409",
-   "self_type" : "type-2409",
+   "referenced_type" : "type-2412",
+   "self_type" : "type-2412",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android28UseAndroidNativeBufferParamsE"
@@ -57582,11 +57677,11 @@
    "linker_set_key" : "android::Vector<android::BBinder *>",
    "name" : "android::Vector<android::BBinder *>",
    "record_kind" : "class",
-   "referenced_type" : "type-1205",
-   "self_type" : "type-1205",
+   "referenced_type" : "type-1208",
+   "self_type" : "type-1208",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-1206" ],
+   "template_args" : [ "type-1209" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7BBinderEEE",
    "vtable_components" :
    [
@@ -57692,11 +57787,11 @@
    "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",
+   "referenced_type" : "type-1206",
+   "self_type" : "type-1206",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-1204" ],
+   "template_args" : [ "type-1207" ],
    "unique_id" : "_ZTSN7android6VectorINS_12ProcessState12handle_entryEEE",
    "vtable_components" :
    [
@@ -57747,11 +57842,11 @@
    "linker_set_key" : "android::Vector<android::Rect>",
    "name" : "android::Vector<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-2679",
-   "self_type" : "type-2679",
+   "referenced_type" : "type-2682",
+   "self_type" : "type-2682",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-2680" ],
+   "template_args" : [ "type-2683" ],
    "unique_id" : "_ZTSN7android6VectorINS_4RectEEE",
    "vtable_components" :
    [
@@ -57802,8 +57897,8 @@
    "linker_set_key" : "android::Vector<android::RefBase *>",
    "name" : "android::Vector<android::RefBase *>",
    "record_kind" : "class",
-   "referenced_type" : "type-1208",
-   "self_type" : "type-1208",
+   "referenced_type" : "type-1213",
+   "self_type" : "type-1213",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-270" ],
@@ -57857,8 +57952,8 @@
    "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",
+   "referenced_type" : "type-1212",
+   "self_type" : "type-1212",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-58" ],
@@ -57912,11 +58007,11 @@
    "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",
+   "referenced_type" : "type-1364",
+   "self_type" : "type-1364",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-1362" ],
+   "template_args" : [ "type-1365" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_8hardware9BHwBinderEEE",
    "vtable_components" :
    [
@@ -57967,11 +58062,11 @@
    "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "record_kind" : "class",
-   "referenced_type" : "type-1357",
-   "self_type" : "type-1357",
+   "referenced_type" : "type-1360",
+   "self_type" : "type-1360",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-1358" ],
+   "template_args" : [ "type-1361" ],
    "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
    "vtable_components" :
    [
@@ -58022,8 +58117,8 @@
    "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",
+   "referenced_type" : "type-1229",
+   "self_type" : "type-1229",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-733" ],
@@ -58077,8 +58172,8 @@
    "linker_set_key" : "android::Vector<int>",
    "name" : "android::Vector<int>",
    "record_kind" : "class",
-   "referenced_type" : "type-2688",
-   "self_type" : "type-2688",
+   "referenced_type" : "type-2691",
+   "self_type" : "type-2691",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-4" ],
@@ -58132,8 +58227,8 @@
    "linker_set_key" : "android::Vector<long>",
    "name" : "android::Vector<long>",
    "record_kind" : "class",
-   "referenced_type" : "type-1082",
-   "self_type" : "type-1082",
+   "referenced_type" : "type-1085",
+   "self_type" : "type-1085",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-32" ],
@@ -58260,13 +58355,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2399"
+     "referenced_type" : "type-2402"
     }
    ],
    "linker_set_key" : "android::VideoDecoderOutputMetaData",
    "name" : "android::VideoDecoderOutputMetaData",
-   "referenced_type" : "type-2401",
-   "self_type" : "type-2401",
+   "referenced_type" : "type-2404",
+   "self_type" : "type-2404",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26VideoDecoderOutputMetaDataE"
@@ -58277,7 +58372,7 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-1235"
+     "referenced_type" : "type-1238"
     },
     {
      "field_name" : "pHandle",
@@ -58287,8 +58382,8 @@
    ],
    "linker_set_key" : "android::VideoGrallocMetadata",
    "name" : "android::VideoGrallocMetadata",
-   "referenced_type" : "type-2399",
-   "self_type" : "type-2399",
+   "referenced_type" : "type-2402",
+   "self_type" : "type-2402",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android20VideoGrallocMetadataE"
@@ -58299,7 +58394,7 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-1235"
+     "referenced_type" : "type-1238"
     },
     {
      "field_name" : "pHandle",
@@ -58309,8 +58404,8 @@
    ],
    "linker_set_key" : "android::VideoNativeHandleMetadata",
    "name" : "android::VideoNativeHandleMetadata",
-   "referenced_type" : "type-2407",
-   "self_type" : "type-2407",
+   "referenced_type" : "type-2410",
+   "self_type" : "type-2410",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android25VideoNativeHandleMetadataE"
@@ -58321,12 +58416,12 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-1235"
+     "referenced_type" : "type-1238"
     },
     {
      "field_name" : "pBuffer",
      "field_offset" : 64,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2406"
     },
     {
      "field_name" : "nFenceFd",
@@ -58336,8 +58431,8 @@
    ],
    "linker_set_key" : "android::VideoNativeMetadata",
    "name" : "android::VideoNativeMetadata",
-   "referenced_type" : "type-2402",
-   "self_type" : "type-2402",
+   "referenced_type" : "type-2405",
+   "self_type" : "type-2405",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android19VideoNativeMetadataE"
@@ -58347,14 +58442,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2353"
+     "referenced_type" : "type-2356"
     }
    ],
    "linker_set_key" : "android::VirtualLightRefBase",
    "name" : "android::VirtualLightRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-2355",
-   "self_type" : "type-2355",
+   "referenced_type" : "type-2358",
+   "self_type" : "type-2358",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
    "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
@@ -58381,8 +58476,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::_AUnion_impl",
    "name" : "android::_AUnion_impl",
-   "referenced_type" : "type-1039",
-   "self_type" : "type-1039",
+   "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"
@@ -58401,30 +58496,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::aggregate_traits<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-2608",
-   "self_type" : "type-2608",
+   "referenced_type" : "type-2611",
+   "self_type" : "type-2611",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-4", "type-2609" ],
+   "template_args" : [ "type-4", "type-2612" ],
    "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-2605",
-   "self_type" : "type-2605",
+   "referenced_type" : "type-2608",
+   "self_type" : "type-2608",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-4", "type-2606" ],
+   "template_args" : [ "type-4", "type-2609" ],
    "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-2604",
-   "self_type" : "type-2604",
+   "referenced_type" : "type-2607",
+   "self_type" : "type-2607",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2", "type-2" ],
@@ -58483,13 +58578,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-980"
+     "referenced_type" : "type-978"
     }
    ],
    "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-979",
-   "self_type" : "type-979",
+   "referenced_type" : "type-977",
+   "self_type" : "type-977",
    "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"
@@ -58626,8 +58721,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::base::DefaultCloser",
    "name" : "android::base::DefaultCloser",
-   "referenced_type" : "type-2525",
-   "self_type" : "type-2525",
+   "referenced_type" : "type-2528",
+   "self_type" : "type-2528",
    "size" : 1,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "unique_id" : "_ZTSN7android4base13DefaultCloserE"
@@ -58648,8 +58743,8 @@
    ],
    "linker_set_key" : "android::base::EagerEvaluator<char *, char *>",
    "name" : "android::base::EagerEvaluator<char *, char *>",
-   "referenced_type" : "type-4702",
-   "self_type" : "type-4702",
+   "referenced_type" : "type-4709",
+   "self_type" : "type-4709",
    "size" : 16,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-254", "type-254" ],
@@ -58671,8 +58766,8 @@
    ],
    "linker_set_key" : "android::base::EagerEvaluator<char *, const char *>",
    "name" : "android::base::EagerEvaluator<char *, const char *>",
-   "referenced_type" : "type-4698",
-   "self_type" : "type-4698",
+   "referenced_type" : "type-4705",
+   "self_type" : "type-4705",
    "size" : 16,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-254", "type-124" ],
@@ -58694,8 +58789,8 @@
    ],
    "linker_set_key" : "android::base::EagerEvaluator<const char *, char *>",
    "name" : "android::base::EagerEvaluator<const char *, char *>",
-   "referenced_type" : "type-4685",
-   "self_type" : "type-4685",
+   "referenced_type" : "type-4692",
+   "self_type" : "type-4692",
    "size" : 16,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-124", "type-254" ],
@@ -58717,8 +58812,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-4669",
+   "referenced_type" : "type-4676",
+   "self_type" : "type-4676",
    "size" : 16,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-124", "type-124" ],
@@ -58740,11 +58835,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-4726",
-   "self_type" : "type-4726",
+   "referenced_type" : "type-4732",
+   "self_type" : "type-4732",
    "size" : 16,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-4727", "type-4727" ],
+   "template_args" : [ "type-4733", "type-4733" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaS3_EE"
   },
   {
@@ -58763,11 +58858,11 @@
    ],
    "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",
+   "referenced_type" : "type-4739",
+   "self_type" : "type-4739",
    "size" : 16,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-4727", "type-4734" ],
+   "template_args" : [ "type-4733", "type-4740" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaPaEE"
   },
   {
@@ -58786,8 +58881,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-4706",
+   "referenced_type" : "type-4713",
+   "self_type" : "type-4713",
    "size" : 16,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-99", "type-99" ],
@@ -58809,8 +58904,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-4710",
+   "referenced_type" : "type-4716",
+   "self_type" : "type-4716",
    "size" : 16,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-99", "type-91" ],
@@ -58832,11 +58927,11 @@
    ],
    "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",
+   "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-4727" ],
+   "template_args" : [ "type-4740", "type-4733" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaPKaEE"
   },
   {
@@ -58855,11 +58950,11 @@
    ],
    "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",
+   "referenced_type" : "type-4751",
+   "self_type" : "type-4751",
    "size" : 16,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-4734", "type-4734" ],
+   "template_args" : [ "type-4740", "type-4740" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaS2_EE"
   },
   {
@@ -58878,8 +58973,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-4713",
+   "referenced_type" : "type-4720",
+   "self_type" : "type-4720",
    "size" : 16,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-91", "type-99" ],
@@ -58901,8 +58996,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-4719",
+   "referenced_type" : "type-4725",
+   "self_type" : "type-4725",
    "size" : 16,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-91", "type-91" ],
@@ -58921,8 +59016,8 @@
    "linker_set_key" : "android::base::ErrnoRestorer",
    "name" : "android::base::ErrnoRestorer",
    "record_kind" : "class",
-   "referenced_type" : "type-4660",
-   "self_type" : "type-4660",
+   "referenced_type" : "type-4667",
+   "self_type" : "type-4667",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base13ErrnoRestorerE"
@@ -58934,14 +59029,14 @@
     {
      "access" : "private",
      "field_name" : "data_",
-     "referenced_type" : "type-4755"
+     "referenced_type" : "type-4761"
     }
    ],
    "linker_set_key" : "android::base::LogMessage",
    "name" : "android::base::LogMessage",
    "record_kind" : "class",
-   "referenced_type" : "type-4754",
-   "self_type" : "type-4754",
+   "referenced_type" : "type-4760",
+   "self_type" : "type-4760",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base10LogMessageE"
@@ -58953,14 +59048,14 @@
     {
      "access" : "private",
      "field_name" : "default_log_id_",
-     "referenced_type" : "type-4707"
+     "referenced_type" : "type-4714"
     }
    ],
    "linker_set_key" : "android::base::LogdLogger",
    "name" : "android::base::LogdLogger",
    "record_kind" : "class",
-   "referenced_type" : "type-4725",
-   "self_type" : "type-4725",
+   "referenced_type" : "type-4731",
+   "self_type" : "type-4731",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base10LogdLoggerE"
@@ -58972,14 +59067,14 @@
     {
      "access" : "private",
      "field_name" : "old_",
-     "referenced_type" : "type-4657"
+     "referenced_type" : "type-4664"
     }
    ],
    "linker_set_key" : "android::base::ScopedLogSeverity",
    "name" : "android::base::ScopedLogSeverity",
    "record_kind" : "class",
-   "referenced_type" : "type-4759",
-   "self_type" : "type-4759",
+   "referenced_type" : "type-4766",
+   "self_type" : "type-4766",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base17ScopedLogSeverityE"
@@ -58997,11 +59092,11 @@
    "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser>",
    "name" : "android::base::unique_fd_impl<android::base::DefaultCloser>",
    "record_kind" : "class",
-   "referenced_type" : "type-2555",
-   "self_type" : "type-2555",
+   "referenced_type" : "type-2558",
+   "self_type" : "type-2558",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h",
-   "template_args" : [ "type-2525" ],
+   "template_args" : [ "type-2528" ],
    "unique_id" : "_ZTSN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
   },
   {
@@ -59040,7 +59135,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1360"
+     "referenced_type" : "type-1363"
     }
    ],
    "fields" :
@@ -59061,7 +59156,7 @@
      "access" : "private",
      "field_name" : "mExtras",
      "field_offset" : 128,
-     "referenced_type" : "type-1364"
+     "referenced_type" : "type-1367"
     },
     {
      "access" : "private",
@@ -59073,8 +59168,8 @@
    "linker_set_key" : "android::hardware::BHwBinder",
    "name" : "android::hardware::BHwBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-1363",
-   "self_type" : "type-1363",
+   "referenced_type" : "type-1366",
+   "self_type" : "type-1366",
    "size" : 48,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware9BHwBinderE",
@@ -59190,7 +59285,7 @@
      "access" : "private",
      "field_name" : "mRemote",
      "field_offset" : 64,
-     "referenced_type" : "type-1373"
+     "referenced_type" : "type-1376"
     },
     {
      "access" : "private",
@@ -59202,14 +59297,14 @@
      "access" : "private",
      "field_name" : "mState",
      "field_offset" : 192,
-     "referenced_type" : "type-1374"
+     "referenced_type" : "type-1377"
     }
    ],
    "linker_set_key" : "android::hardware::BpHwRefBase",
    "name" : "android::hardware::BpHwRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-1372",
-   "self_type" : "type-1372",
+   "referenced_type" : "type-1375",
+   "self_type" : "type-1375",
    "size" : 48,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE",
@@ -59428,8 +59523,8 @@
    "linker_set_key" : "android::hardware::IBinder",
    "name" : "android::hardware::IBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-1360",
-   "self_type" : "type-1360",
+   "referenced_type" : "type-1363",
+   "self_type" : "type-1363",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinderE",
@@ -59545,8 +59640,8 @@
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient",
    "name" : "android::hardware::IBinder::DeathRecipient",
    "record_kind" : "class",
-   "referenced_type" : "type-1371",
-   "self_type" : "type-1371",
+   "referenced_type" : "type-1374",
+   "self_type" : "type-1374",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinder14DeathRecipientE",
@@ -59633,8 +59728,8 @@
    "linker_set_key" : "android::hardware::IInterface",
    "name" : "android::hardware::IInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-1377",
-   "self_type" : "type-1377",
+   "referenced_type" : "type-1380",
+   "self_type" : "type-1380",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
    "unique_id" : "_ZTSN7android8hardware10IInterfaceE",
@@ -59716,43 +59811,43 @@
     {
      "access" : "private",
      "field_name" : "mProcess",
-     "referenced_type" : "type-1394"
+     "referenced_type" : "type-1397"
     },
     {
      "access" : "private",
      "field_name" : "mPendingStrongDerefs",
      "field_offset" : 64,
-     "referenced_type" : "type-1361"
+     "referenced_type" : "type-1364"
     },
     {
      "access" : "private",
      "field_name" : "mPendingWeakDerefs",
      "field_offset" : 384,
-     "referenced_type" : "type-1207"
+     "referenced_type" : "type-1212"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteStrongDerefs",
      "field_offset" : 704,
-     "referenced_type" : "type-1208"
+     "referenced_type" : "type-1213"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteWeakDerefs",
      "field_offset" : 1024,
-     "referenced_type" : "type-1207"
+     "referenced_type" : "type-1212"
     },
     {
      "access" : "private",
      "field_name" : "mIn",
      "field_offset" : 1344,
-     "referenced_type" : "type-1378"
+     "referenced_type" : "type-1381"
     },
     {
      "access" : "private",
      "field_name" : "mOut",
      "field_offset" : 2432,
-     "referenced_type" : "type-1378"
+     "referenced_type" : "type-1381"
     },
     {
      "access" : "private",
@@ -59794,7 +59889,7 @@
      "access" : "private",
      "field_name" : "mContextObject",
      "field_offset" : 3776,
-     "referenced_type" : "type-1400"
+     "referenced_type" : "type-1403"
     },
     {
      "access" : "private",
@@ -59812,26 +59907,26 @@
      "access" : "private",
      "field_name" : "mPostCommandTasks",
      "field_offset" : 3904,
-     "referenced_type" : "type-1401"
+     "referenced_type" : "type-1404"
     },
     {
      "access" : "private",
      "field_name" : "mIPCThreadStateBase",
      "field_offset" : 4096,
-     "referenced_type" : "type-1369"
+     "referenced_type" : "type-1372"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 4160,
-     "referenced_type" : "type-1392"
+     "referenced_type" : "type-1395"
     }
    ],
    "linker_set_key" : "android::hardware::IPCThreadState",
    "name" : "android::hardware::IPCThreadState",
    "record_kind" : "class",
-   "referenced_type" : "type-1393",
-   "self_type" : "type-1393",
+   "referenced_type" : "type-1396",
+   "self_type" : "type-1396",
    "size" : 528,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h",
    "unique_id" : "_ZTSN7android8hardware14IPCThreadStateE"
@@ -59849,7 +59944,7 @@
      "access" : "private",
      "field_name" : "mBufCache",
      "field_offset" : 64,
-     "referenced_type" : "type-1379"
+     "referenced_type" : "type-1382"
     },
     {
      "access" : "private",
@@ -59933,7 +60028,7 @@
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 960,
-     "referenced_type" : "type-1380"
+     "referenced_type" : "type-1383"
     },
     {
      "access" : "private",
@@ -59945,8 +60040,8 @@
    "linker_set_key" : "android::hardware::Parcel",
    "name" : "android::hardware::Parcel",
    "record_kind" : "class",
-   "referenced_type" : "type-1378",
-   "self_type" : "type-1378",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1381",
    "size" : 136,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6ParcelE"
@@ -59973,8 +60068,8 @@
    ],
    "linker_set_key" : "android::hardware::Parcel::BufferInfo",
    "name" : "android::hardware::Parcel::BufferInfo",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1383",
+   "referenced_type" : "type-1386",
+   "self_type" : "type-1386",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE"
@@ -60006,13 +60101,13 @@
      "access" : "private",
      "field_name" : "mThreadCountLock",
      "field_offset" : 192,
-     "referenced_type" : "type-1398"
+     "referenced_type" : "type-1401"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountDecrement",
      "field_offset" : 512,
-     "referenced_type" : "type-1399"
+     "referenced_type" : "type-1402"
     },
     {
      "access" : "private",
@@ -60042,7 +60137,7 @@
      "access" : "private",
      "field_name" : "mHandleToObject",
      "field_offset" : 1408,
-     "referenced_type" : "type-1357"
+     "referenced_type" : "type-1360"
     },
     {
      "access" : "private",
@@ -60054,7 +60149,7 @@
      "access" : "private",
      "field_name" : "mBinderContextCheckFunc",
      "field_offset" : 1792,
-     "referenced_type" : "type-1391"
+     "referenced_type" : "type-1394"
     },
     {
      "access" : "private",
@@ -60066,7 +60161,7 @@
      "access" : "private",
      "field_name" : "mContexts",
      "field_offset" : 1920,
-     "referenced_type" : "type-1367"
+     "referenced_type" : "type-1370"
     },
     {
      "access" : "private",
@@ -60090,7 +60185,7 @@
      "access" : "private",
      "field_name" : "mThreadPoolSeq",
      "field_offset" : 2336,
-     "referenced_type" : "type-1255"
+     "referenced_type" : "type-1258"
     },
     {
      "access" : "private",
@@ -60102,14 +60197,14 @@
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 2432,
-     "referenced_type" : "type-1392"
+     "referenced_type" : "type-1395"
     }
    ],
    "linker_set_key" : "android::hardware::ProcessState",
    "name" : "android::hardware::ProcessState",
    "record_kind" : "class",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1397",
+   "referenced_type" : "type-1400",
+   "self_type" : "type-1400",
    "size" : 328,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessStateE",
@@ -60187,7 +60282,7 @@
    [
     {
      "field_name" : "binder",
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1362"
     },
     {
      "field_name" : "refs",
@@ -60197,8 +60292,8 @@
    ],
    "linker_set_key" : "android::hardware::ProcessState::handle_entry",
    "name" : "android::hardware::ProcessState::handle_entry",
-   "referenced_type" : "type-1358",
-   "self_type" : "type-1358",
+   "referenced_type" : "type-1361",
+   "self_type" : "type-1361",
    "size" : 16,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE"
@@ -60223,8 +60318,8 @@
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::bufferqueue::V2_0::Status>",
    "name" : "android::hardware::Return<android::hardware::graphics::bufferqueue::V2_0::Status>",
    "record_kind" : "class",
-   "referenced_type" : "type-7522",
-   "self_type" : "type-7522",
+   "referenced_type" : "type-7547",
+   "self_type" : "type-7547",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "template_args" : [ "type-607" ],
@@ -60244,17 +60339,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 320,
-     "referenced_type" : "type-2465"
+     "referenced_type" : "type-2468"
     }
    ],
    "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",
+   "referenced_type" : "type-4368",
+   "self_type" : "type-4368",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-2465" ],
+   "template_args" : [ "type-2468" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducerEEEEE"
   },
   {
@@ -60271,17 +60366,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 320,
-     "referenced_type" : "type-2456"
+     "referenced_type" : "type-2459"
     }
    ],
    "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",
+   "referenced_type" : "type-4497",
+   "self_type" : "type-4497",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-2456" ],
+   "template_args" : [ "type-2459" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V1_017IProducerListenerEEEEE"
   },
   {
@@ -60298,17 +60393,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 320,
-     "referenced_type" : "type-2478"
+     "referenced_type" : "type-2481"
     }
    ],
    "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",
+   "referenced_type" : "type-4374",
+   "self_type" : "type-4374",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-2478" ],
+   "template_args" : [ "type-2481" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V2_022IGraphicBufferProducerEEEEE"
   },
   {
@@ -60325,17 +60420,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 320,
-     "referenced_type" : "type-2472"
+     "referenced_type" : "type-2475"
     }
    ],
    "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",
+   "referenced_type" : "type-4503",
+   "self_type" : "type-4503",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-2472" ],
+   "template_args" : [ "type-2475" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V2_017IProducerListenerEEEEE"
   },
   {
@@ -60358,8 +60453,8 @@
    "linker_set_key" : "android::hardware::Return<bool>",
    "name" : "android::hardware::Return<bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-4356",
-   "self_type" : "type-4356",
+   "referenced_type" : "type-4362",
+   "self_type" : "type-4362",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "template_args" : [ "type-95" ],
@@ -60412,8 +60507,8 @@
    "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",
+   "referenced_type" : "type-7551",
+   "self_type" : "type-7551",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "template_args" : [ "type-11" ],
@@ -61484,8 +61579,8 @@
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener",
-   "referenced_type" : "type-2458",
-   "self_type" : "type-2458",
+   "referenced_type" : "type-2461",
+   "self_type" : "type-2461",
    "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",
@@ -64062,8 +64157,8 @@
    "linker_set_key" : "android::sp<android::AHandler>",
    "name" : "android::sp<android::AHandler>",
    "record_kind" : "class",
-   "referenced_type" : "type-1189",
-   "self_type" : "type-1189",
+   "referenced_type" : "type-1192",
+   "self_type" : "type-1192",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-264" ],
@@ -64156,17 +64251,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4232"
+     "referenced_type" : "type-4238"
     }
    ],
    "linker_set_key" : "android::sp<android::BpGraphicBufferProducer>",
    "name" : "android::sp<android::BpGraphicBufferProducer>",
    "record_kind" : "class",
-   "referenced_type" : "type-4231",
-   "self_type" : "type-4231",
+   "referenced_type" : "type-4237",
+   "self_type" : "type-4237",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4234" ],
+   "template_args" : [ "type-4240" ],
    "unique_id" : "_ZTSN7android2spINS_23BpGraphicBufferProducerEEE"
   },
   {
@@ -64176,17 +64271,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4454"
+     "referenced_type" : "type-4461"
     }
    ],
    "linker_set_key" : "android::sp<android::BpProducerListener>",
    "name" : "android::sp<android::BpProducerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-4457",
-   "self_type" : "type-4457",
+   "referenced_type" : "type-4464",
+   "self_type" : "type-4464",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4458" ],
+   "template_args" : [ "type-4465" ],
    "unique_id" : "_ZTSN7android2spINS_18BpProducerListenerEEE"
   },
   {
@@ -64256,17 +64351,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1866"
+     "referenced_type" : "type-1870"
     }
    ],
    "linker_set_key" : "android::sp<android::Fence>",
    "name" : "android::sp<android::Fence>",
    "record_kind" : "class",
-   "referenced_type" : "type-1865",
-   "self_type" : "type-1865",
+   "referenced_type" : "type-1869",
+   "self_type" : "type-1869",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1868" ],
+   "template_args" : [ "type-1872" ],
    "unique_id" : "_ZTSN7android2spINS_5FenceEEE"
   },
   {
@@ -64296,17 +64391,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1174"
+     "referenced_type" : "type-1177"
     }
    ],
    "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",
+   "referenced_type" : "type-1176",
+   "self_type" : "type-1176",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1176" ],
+   "template_args" : [ "type-1179" ],
    "unique_id" : "_ZTSN7android2spINS_10GLConsumer8EglImageEEE"
   },
   {
@@ -64362,8 +64457,8 @@
    "linker_set_key" : "android::sp<android::GraphicBufferSource>",
    "name" : "android::sp<android::GraphicBufferSource>",
    "record_kind" : "class",
-   "referenced_type" : "type-2544",
-   "self_type" : "type-2544",
+   "referenced_type" : "type-2547",
+   "self_type" : "type-2547",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-566" ],
@@ -64376,17 +64471,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4259"
+     "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-4262",
-   "self_type" : "type-4262",
+   "referenced_type" : "type-4268",
+   "self_type" : "type-4268",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4263" ],
+   "template_args" : [ "type-4269" ],
    "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE8ObituaryEEE"
   },
   {
@@ -64396,17 +64491,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4268"
+     "referenced_type" : "type-4274"
     }
    ],
    "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",
+   "referenced_type" : "type-4277",
+   "self_type" : "type-4277",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4272" ],
+   "template_args" : [ "type-4278" ],
    "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE8ObituaryEEE"
   },
   {
@@ -64416,17 +64511,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4831"
+     "referenced_type" : "type-4839"
     }
    ],
    "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",
+   "referenced_type" : "type-4838",
+   "self_type" : "type-4838",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4833" ],
+   "template_args" : [ "type-4841" ],
    "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE8ObituaryEEE"
   },
   {
@@ -64436,17 +64531,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-5112"
+     "referenced_type" : "type-5128"
     }
    ],
    "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",
+   "referenced_type" : "type-5127",
+   "self_type" : "type-5127",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-5114" ],
+   "template_args" : [ "type-5130" ],
    "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE8ObituaryEEE"
   },
   {
@@ -64596,17 +64691,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1050"
+     "referenced_type" : "type-1053"
     }
    ],
    "linker_set_key" : "android::sp<android::ISurfaceComposer>",
    "name" : "android::sp<android::ISurfaceComposer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1049",
-   "self_type" : "type-1049",
+   "referenced_type" : "type-1052",
+   "self_type" : "type-1052",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1052" ],
+   "template_args" : [ "type-1055" ],
    "unique_id" : "_ZTSN7android2spINS_16ISurfaceComposerEEE"
   },
   {
@@ -64616,17 +64711,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1042"
+     "referenced_type" : "type-1046"
     }
    ],
    "linker_set_key" : "android::sp<android::ITransactionCompletedListener>",
    "name" : "android::sp<android::ITransactionCompletedListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1041",
-   "self_type" : "type-1041",
+   "referenced_type" : "type-1045",
+   "self_type" : "type-1045",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1044" ],
+   "template_args" : [ "type-1048" ],
    "unique_id" : "_ZTSN7android2spINS_29ITransactionCompletedListenerEEE"
   },
   {
@@ -64656,17 +64751,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1260"
+     "referenced_type" : "type-1263"
     }
    ],
    "linker_set_key" : "android::sp<android::ProcessState>",
    "name" : "android::sp<android::ProcessState>",
    "record_kind" : "class",
-   "referenced_type" : "type-1259",
-   "self_type" : "type-1259",
+   "referenced_type" : "type-1262",
+   "self_type" : "type-1262",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1261" ],
+   "template_args" : [ "type-1264" ],
    "unique_id" : "_ZTSN7android2spINS_12ProcessStateEEE"
   },
   {
@@ -64696,17 +64791,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1362"
+     "referenced_type" : "type-1365"
     }
    ],
    "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",
+   "referenced_type" : "type-1403",
+   "self_type" : "type-1403",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1363" ],
+   "template_args" : [ "type-1366" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
   },
   {
@@ -64716,17 +64811,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1362"
     }
    ],
    "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",
+   "referenced_type" : "type-1371",
+   "self_type" : "type-1371",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1360" ],
+   "template_args" : [ "type-1363" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
   },
   {
@@ -64736,17 +64831,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1396"
+     "referenced_type" : "type-1399"
     }
    ],
    "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",
+   "referenced_type" : "type-1398",
+   "self_type" : "type-1398",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1397" ],
+   "template_args" : [ "type-1400" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
   },
   {
@@ -64756,14 +64851,14 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2466"
+     "referenced_type" : "type-2469"
     }
    ],
    "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-2465",
-   "self_type" : "type-2465",
+   "referenced_type" : "type-2468",
+   "self_type" : "type-2468",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-595" ],
@@ -64776,17 +64871,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2457"
+     "referenced_type" : "type-2460"
     }
    ],
    "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-2456",
-   "self_type" : "type-2456",
+   "referenced_type" : "type-2459",
+   "self_type" : "type-2459",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-2458" ],
+   "template_args" : [ "type-2461" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerEEE"
   },
   {
@@ -64796,17 +64891,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4244"
+     "referenced_type" : "type-4250"
     }
    ],
    "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",
+   "referenced_type" : "type-4249",
+   "self_type" : "type-4249",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4246" ],
+   "template_args" : [ "type-4252" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerEEE"
   },
   {
@@ -64816,17 +64911,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4467"
+     "referenced_type" : "type-4473"
     }
    ],
    "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",
+   "referenced_type" : "type-4476",
+   "self_type" : "type-4476",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4471" ],
+   "template_args" : [ "type-4477" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerEEE"
   },
   {
@@ -64836,14 +64931,14 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2479"
+     "referenced_type" : "type-2482"
     }
    ],
    "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-2478",
-   "self_type" : "type-2478",
+   "referenced_type" : "type-2481",
+   "self_type" : "type-2481",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-677" ],
@@ -64856,14 +64951,14 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2473"
+     "referenced_type" : "type-2476"
     }
    ],
    "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-2472",
-   "self_type" : "type-2472",
+   "referenced_type" : "type-2475",
+   "self_type" : "type-2475",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-604" ],
@@ -64876,17 +64971,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4238"
+     "referenced_type" : "type-4244"
     }
    ],
    "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",
+   "referenced_type" : "type-4243",
+   "self_type" : "type-4243",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4240" ],
+   "template_args" : [ "type-4246" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerEEE"
   },
   {
@@ -64896,17 +64991,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4459"
+     "referenced_type" : "type-4466"
     }
    ],
    "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",
+   "referenced_type" : "type-4469",
+   "self_type" : "type-4469",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4464" ],
+   "template_args" : [ "type-4470" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerEEE"
   },
   {
@@ -64936,14 +65031,14 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2447"
+     "referenced_type" : "type-2450"
     }
    ],
    "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-2446",
-   "self_type" : "type-2446",
+   "referenced_type" : "type-2449",
+   "self_type" : "type-2449",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-531" ],
@@ -64956,14 +65051,14 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2454"
     }
    ],
    "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-2450",
-   "self_type" : "type-2450",
+   "referenced_type" : "type-2453",
+   "self_type" : "type-2453",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-534" ],
@@ -64976,36 +65071,36 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2519"
+     "referenced_type" : "type-2522"
     }
    ],
    "linker_set_key" : "android::sp<const android::AHandler>",
    "name" : "android::sp<const android::AHandler>",
    "record_kind" : "class",
-   "referenced_type" : "type-2518",
-   "self_type" : "type-2518",
+   "referenced_type" : "type-2521",
+   "self_type" : "type-2521",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-2520" ],
+   "template_args" : [ "type-2523" ],
    "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",
+   "referenced_type" : "type-1065",
+   "self_type" : "type-1065",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1063" ],
+   "template_args" : [ "type-1066" ],
    "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-2590",
-   "self_type" : "type-2590",
+   "referenced_type" : "type-2593",
+   "self_type" : "type-2593",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-164" ],
@@ -65015,8 +65110,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::trait_pointer<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-2587",
-   "self_type" : "type-2587",
+   "referenced_type" : "type-2590",
+   "self_type" : "type-2590",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-150" ],
@@ -65026,8 +65121,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::trait_pointer<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-2583",
-   "self_type" : "type-2583",
+   "referenced_type" : "type-2586",
+   "self_type" : "type-2586",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-146" ],
@@ -65037,8 +65132,8 @@
    "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",
+   "referenced_type" : "type-1186",
+   "self_type" : "type-1186",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-733" ],
@@ -65048,8 +65143,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<int>",
    "name" : "android::trait_pointer<int>",
-   "referenced_type" : "type-2586",
-   "self_type" : "type-2586",
+   "referenced_type" : "type-2589",
+   "self_type" : "type-2589",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -65059,8 +65154,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<long>",
    "name" : "android::trait_pointer<long>",
-   "referenced_type" : "type-1061",
-   "self_type" : "type-1061",
+   "referenced_type" : "type-1064",
+   "self_type" : "type-1064",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-32" ],
@@ -65070,30 +65165,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::trait_pointer<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-2591",
-   "self_type" : "type-2591",
+   "referenced_type" : "type-2594",
+   "self_type" : "type-2594",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2592" ],
+   "template_args" : [ "type-2595" ],
    "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-2588",
-   "self_type" : "type-2588",
+   "referenced_type" : "type-2591",
+   "self_type" : "type-2591",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2589" ],
+   "template_args" : [ "type-2592" ],
    "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-2585",
-   "self_type" : "type-2585",
+   "referenced_type" : "type-2588",
+   "self_type" : "type-2588",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -65103,19 +65198,19 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::BufferItem>",
    "name" : "android::trait_trivial_copy<android::BufferItem>",
-   "referenced_type" : "type-1057",
-   "self_type" : "type-1057",
+   "referenced_type" : "type-1060",
+   "self_type" : "type-1060",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1058" ],
+   "template_args" : [ "type-1061" ],
    "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-2574",
-   "self_type" : "type-2574",
+   "referenced_type" : "type-2577",
+   "self_type" : "type-2577",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-164" ],
@@ -65125,8 +65220,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-2571",
-   "self_type" : "type-2571",
+   "referenced_type" : "type-2574",
+   "self_type" : "type-2574",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-150" ],
@@ -65136,8 +65231,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-2568",
-   "self_type" : "type-2568",
+   "referenced_type" : "type-2571",
+   "self_type" : "type-2571",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-146" ],
@@ -65147,8 +65242,8 @@
    "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",
+   "referenced_type" : "type-1184",
+   "self_type" : "type-1184",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-733" ],
@@ -65158,8 +65253,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-2463",
-   "self_type" : "type-2463",
+   "referenced_type" : "type-2466",
+   "self_type" : "type-2466",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-95" ],
@@ -65169,8 +65264,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-2501",
-   "self_type" : "type-2501",
+   "referenced_type" : "type-2504",
+   "self_type" : "type-2504",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-126" ],
@@ -65202,8 +65297,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-2657",
-   "self_type" : "type-2657",
+   "referenced_type" : "type-2660",
+   "self_type" : "type-2660",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -65235,8 +65330,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<short>",
    "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-2595",
-   "self_type" : "type-2595",
+   "referenced_type" : "type-2598",
+   "self_type" : "type-2598",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-498" ],
@@ -65246,30 +65341,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::trait_trivial_copy<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-2572",
-   "self_type" : "type-2572",
+   "referenced_type" : "type-2575",
+   "self_type" : "type-2575",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2573" ],
+   "template_args" : [ "type-2576" ],
    "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-2569",
-   "self_type" : "type-2569",
+   "referenced_type" : "type-2572",
+   "self_type" : "type-2572",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2570" ],
+   "template_args" : [ "type-2573" ],
    "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-2542",
-   "self_type" : "type-2542",
+   "referenced_type" : "type-2545",
+   "self_type" : "type-2545",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-92" ],
@@ -65312,8 +65407,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
    "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-2636",
-   "self_type" : "type-2636",
+   "referenced_type" : "type-2639",
+   "self_type" : "type-2639",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-500" ],
@@ -65323,8 +65418,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-2435",
-   "self_type" : "type-2435",
+   "referenced_type" : "type-2438",
+   "self_type" : "type-2438",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-9" ],
@@ -65334,19 +65429,19 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::BufferItem>",
    "name" : "android::trait_trivial_ctor<android::BufferItem>",
-   "referenced_type" : "type-1053",
-   "self_type" : "type-1053",
+   "referenced_type" : "type-1056",
+   "self_type" : "type-1056",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1054" ],
+   "template_args" : [ "type-1057" ],
    "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-2556",
-   "self_type" : "type-2556",
+   "referenced_type" : "type-2559",
+   "self_type" : "type-2559",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-164" ],
@@ -65356,8 +65451,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-2551",
-   "self_type" : "type-2551",
+   "referenced_type" : "type-2554",
+   "self_type" : "type-2554",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-150" ],
@@ -65367,8 +65462,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-2550",
-   "self_type" : "type-2550",
+   "referenced_type" : "type-2553",
+   "self_type" : "type-2553",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-146" ],
@@ -65378,8 +65473,8 @@
    "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",
+   "referenced_type" : "type-1182",
+   "self_type" : "type-1182",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-733" ],
@@ -65389,8 +65484,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-2445",
-   "self_type" : "type-2445",
+   "referenced_type" : "type-2448",
+   "self_type" : "type-2448",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-95" ],
@@ -65400,8 +65495,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-2481",
-   "self_type" : "type-2481",
+   "referenced_type" : "type-2484",
+   "self_type" : "type-2484",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-126" ],
@@ -65433,8 +65528,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-2649",
-   "self_type" : "type-2649",
+   "referenced_type" : "type-2652",
+   "self_type" : "type-2652",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -65466,8 +65561,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<short>",
    "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-2563",
-   "self_type" : "type-2563",
+   "referenced_type" : "type-2566",
+   "self_type" : "type-2566",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-498" ],
@@ -65477,30 +65572,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::trait_trivial_ctor<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-2557",
-   "self_type" : "type-2557",
+   "referenced_type" : "type-2560",
+   "self_type" : "type-2560",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2558" ],
+   "template_args" : [ "type-2561" ],
    "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-2553",
-   "self_type" : "type-2553",
+   "referenced_type" : "type-2556",
+   "self_type" : "type-2556",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2554" ],
+   "template_args" : [ "type-2557" ],
    "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-2527",
-   "self_type" : "type-2527",
+   "referenced_type" : "type-2530",
+   "self_type" : "type-2530",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-92" ],
@@ -65510,8 +65605,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
    "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-2672",
-   "self_type" : "type-2672",
+   "referenced_type" : "type-2675",
+   "self_type" : "type-2675",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -65543,8 +65638,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned short>",
    "name" : "android::trait_trivial_ctor<unsigned short>",
-   "referenced_type" : "type-2618",
-   "self_type" : "type-2618",
+   "referenced_type" : "type-2621",
+   "self_type" : "type-2621",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-500" ],
@@ -65554,8 +65649,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-2400",
-   "self_type" : "type-2400",
+   "referenced_type" : "type-2403",
+   "self_type" : "type-2403",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-9" ],
@@ -65565,19 +65660,19 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::BufferItem>",
    "name" : "android::trait_trivial_dtor<android::BufferItem>",
-   "referenced_type" : "type-1055",
-   "self_type" : "type-1055",
+   "referenced_type" : "type-1058",
+   "self_type" : "type-1058",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1056" ],
+   "template_args" : [ "type-1059" ],
    "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-2566",
-   "self_type" : "type-2566",
+   "referenced_type" : "type-2569",
+   "self_type" : "type-2569",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-164" ],
@@ -65587,8 +65682,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-2562",
-   "self_type" : "type-2562",
+   "referenced_type" : "type-2565",
+   "self_type" : "type-2565",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-150" ],
@@ -65598,8 +65693,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-2559",
-   "self_type" : "type-2559",
+   "referenced_type" : "type-2562",
+   "self_type" : "type-2562",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-146" ],
@@ -65609,8 +65704,8 @@
    "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",
+   "referenced_type" : "type-1183",
+   "self_type" : "type-1183",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-733" ],
@@ -65620,8 +65715,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<bool>",
    "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-2453",
-   "self_type" : "type-2453",
+   "referenced_type" : "type-2456",
+   "self_type" : "type-2456",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-95" ],
@@ -65631,8 +65726,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-2491",
-   "self_type" : "type-2491",
+   "referenced_type" : "type-2494",
+   "self_type" : "type-2494",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-126" ],
@@ -65664,8 +65759,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<int>",
    "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-2652",
-   "self_type" : "type-2652",
+   "referenced_type" : "type-2655",
+   "self_type" : "type-2655",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -65697,8 +65792,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<short>",
    "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-2584",
-   "self_type" : "type-2584",
+   "referenced_type" : "type-2587",
+   "self_type" : "type-2587",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-498" ],
@@ -65708,30 +65803,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::trait_trivial_dtor<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-2564",
-   "self_type" : "type-2564",
+   "referenced_type" : "type-2567",
+   "self_type" : "type-2567",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2565" ],
+   "template_args" : [ "type-2568" ],
    "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-2560",
-   "self_type" : "type-2560",
+   "referenced_type" : "type-2563",
+   "self_type" : "type-2563",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2561" ],
+   "template_args" : [ "type-2564" ],
    "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-2535",
-   "self_type" : "type-2535",
+   "referenced_type" : "type-2538",
+   "self_type" : "type-2538",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-92" ],
@@ -65741,8 +65836,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
    "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-2683",
-   "self_type" : "type-2683",
+   "referenced_type" : "type-2686",
+   "self_type" : "type-2686",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -65774,8 +65869,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned short>",
    "name" : "android::trait_trivial_dtor<unsigned short>",
-   "referenced_type" : "type-2625",
-   "self_type" : "type-2625",
+   "referenced_type" : "type-2628",
+   "self_type" : "type-2628",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-500" ],
@@ -65785,8 +65880,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-2421",
-   "self_type" : "type-2421",
+   "referenced_type" : "type-2424",
+   "self_type" : "type-2424",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-9" ],
@@ -65796,30 +65891,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::BufferItem>",
    "name" : "android::trait_trivial_move<android::BufferItem>",
-   "referenced_type" : "type-1059",
-   "self_type" : "type-1059",
+   "referenced_type" : "type-1062",
+   "self_type" : "type-1062",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1060" ],
+   "template_args" : [ "type-1063" ],
    "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-2664",
-   "self_type" : "type-2664",
+   "referenced_type" : "type-2667",
+   "self_type" : "type-2667",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-1240" ],
+   "template_args" : [ "type-1243" ],
    "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-2658",
-   "self_type" : "type-2658",
+   "referenced_type" : "type-2661",
+   "self_type" : "type-2661",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "template_args" : [ "type-123" ],
@@ -65829,8 +65924,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
-   "referenced_type" : "type-2581",
-   "self_type" : "type-2581",
+   "referenced_type" : "type-2584",
+   "self_type" : "type-2584",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-164" ],
@@ -65840,8 +65935,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-2578",
-   "self_type" : "type-2578",
+   "referenced_type" : "type-2581",
+   "self_type" : "type-2581",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-150" ],
@@ -65851,8 +65946,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-2575",
-   "self_type" : "type-2575",
+   "referenced_type" : "type-2578",
+   "self_type" : "type-2578",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-146" ],
@@ -65862,8 +65957,8 @@
    "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",
+   "referenced_type" : "type-1185",
+   "self_type" : "type-1185",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-733" ],
@@ -65873,8 +65968,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<bool>",
    "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-2474",
-   "self_type" : "type-2474",
+   "referenced_type" : "type-2477",
+   "self_type" : "type-2477",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-95" ],
@@ -65884,8 +65979,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-2522",
-   "self_type" : "type-2522",
+   "referenced_type" : "type-2525",
+   "self_type" : "type-2525",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-126" ],
@@ -65917,8 +66012,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-2661",
-   "self_type" : "type-2661",
+   "referenced_type" : "type-2664",
+   "self_type" : "type-2664",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -65950,8 +66045,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<short>",
    "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-2607",
-   "self_type" : "type-2607",
+   "referenced_type" : "type-2610",
+   "self_type" : "type-2610",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-498" ],
@@ -65961,30 +66056,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::trait_trivial_move<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-2579",
-   "self_type" : "type-2579",
+   "referenced_type" : "type-2582",
+   "self_type" : "type-2582",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2580" ],
+   "template_args" : [ "type-2583" ],
    "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-2576",
-   "self_type" : "type-2576",
+   "referenced_type" : "type-2579",
+   "self_type" : "type-2579",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2577" ],
+   "template_args" : [ "type-2580" ],
    "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-2552",
-   "self_type" : "type-2552",
+   "referenced_type" : "type-2555",
+   "self_type" : "type-2555",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-92" ],
@@ -66027,8 +66122,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned short>",
    "name" : "android::trait_trivial_move<unsigned short>",
-   "referenced_type" : "type-2647",
-   "self_type" : "type-2647",
+   "referenced_type" : "type-2650",
+   "self_type" : "type-2650",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-500" ],
@@ -66038,8 +66133,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-2443",
-   "self_type" : "type-2443",
+   "referenced_type" : "type-2446",
+   "self_type" : "type-2446",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-9" ],
@@ -66049,19 +66144,19 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::BufferItem>",
    "name" : "android::traits<android::BufferItem>",
-   "referenced_type" : "type-1065",
-   "self_type" : "type-1065",
+   "referenced_type" : "type-1068",
+   "self_type" : "type-1068",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1066" ],
+   "template_args" : [ "type-1069" ],
    "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-2601",
-   "self_type" : "type-2601",
+   "referenced_type" : "type-2604",
+   "self_type" : "type-2604",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-164" ],
@@ -66071,8 +66166,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::traits<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-2598",
-   "self_type" : "type-2598",
+   "referenced_type" : "type-2601",
+   "self_type" : "type-2601",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-150" ],
@@ -66082,8 +66177,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::traits<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-2593",
-   "self_type" : "type-2593",
+   "referenced_type" : "type-2596",
+   "self_type" : "type-2596",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-146" ],
@@ -66093,8 +66188,8 @@
    "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",
+   "referenced_type" : "type-1187",
+   "self_type" : "type-1187",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-733" ],
@@ -66104,8 +66199,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<int>",
    "name" : "android::traits<int>",
-   "referenced_type" : "type-2596",
-   "self_type" : "type-2596",
+   "referenced_type" : "type-2599",
+   "self_type" : "type-2599",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -66115,8 +66210,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<long>",
    "name" : "android::traits<long>",
-   "referenced_type" : "type-1064",
-   "self_type" : "type-1064",
+   "referenced_type" : "type-1067",
+   "self_type" : "type-1067",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-32" ],
@@ -66126,30 +66221,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::traits<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-2602",
-   "self_type" : "type-2602",
+   "referenced_type" : "type-2605",
+   "self_type" : "type-2605",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2603" ],
+   "template_args" : [ "type-2606" ],
    "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-2599",
-   "self_type" : "type-2599",
+   "referenced_type" : "type-2602",
+   "self_type" : "type-2602",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2600" ],
+   "template_args" : [ "type-2603" ],
    "unique_id" : "_ZTSN7android6traitsINSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<unsigned int>",
    "name" : "android::traits<unsigned int>",
-   "referenced_type" : "type-2594",
-   "self_type" : "type-2594",
+   "referenced_type" : "type-2597",
+   "self_type" : "type-2597",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -66160,16 +66255,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1076"
+     "referenced_type" : "type-1080"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::BufferItem>",
    "name" : "android::use_trivial_move<android::BufferItem>",
-   "referenced_type" : "type-1075",
-   "self_type" : "type-1075",
+   "referenced_type" : "type-1079",
+   "self_type" : "type-1079",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1077" ],
+   "template_args" : [ "type-1081" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_10BufferItemEEE"
   },
   {
@@ -66177,13 +66272,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2638"
+     "referenced_type" : "type-2641"
     }
    ],
    "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-2637",
-   "self_type" : "type-2637",
+   "referenced_type" : "type-2640",
+   "self_type" : "type-2640",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-164" ],
@@ -66194,13 +66289,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2635"
+     "referenced_type" : "type-2638"
     }
    ],
    "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-2634",
-   "self_type" : "type-2634",
+   "referenced_type" : "type-2637",
+   "self_type" : "type-2637",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-150" ],
@@ -66211,13 +66306,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2631"
+     "referenced_type" : "type-2634"
     }
    ],
    "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-2630",
-   "self_type" : "type-2630",
+   "referenced_type" : "type-2633",
+   "self_type" : "type-2633",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-146" ],
@@ -66228,13 +66323,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1186"
+     "referenced_type" : "type-1190"
     }
    ],
    "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",
+   "referenced_type" : "type-1189",
+   "self_type" : "type-1189",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-733" ],
@@ -66245,13 +66340,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2633"
+     "referenced_type" : "type-2636"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<int>",
    "name" : "android::use_trivial_move<int>",
-   "referenced_type" : "type-2632",
-   "self_type" : "type-2632",
+   "referenced_type" : "type-2635",
+   "self_type" : "type-2635",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -66262,13 +66357,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1074"
+     "referenced_type" : "type-1077"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<long>",
    "name" : "android::use_trivial_move<long>",
-   "referenced_type" : "type-1073",
-   "self_type" : "type-1073",
+   "referenced_type" : "type-1076",
+   "self_type" : "type-1076",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-32" ],
@@ -66333,7 +66428,7 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1251"
+     "referenced_type" : "type-1255"
     },
     {
      "access" : "private",
@@ -66345,11 +66440,11 @@
    "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",
+   "referenced_type" : "type-1254",
+   "self_type" : "type-1254",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-1253" ],
+   "template_args" : [ "type-1257" ],
    "unique_id" : "_ZTSN7android2wpINS_12ConsumerBase22FrameAvailableListenerEEE"
   },
   {
@@ -66700,13 +66795,13 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-2179"
+     "referenced_type" : "type-2182"
     }
    ],
    "linker_set_key" : "log_msg",
    "name" : "log_msg",
-   "referenced_type" : "type-2178",
-   "self_type" : "type-2178",
+   "referenced_type" : "type-2181",
+   "self_type" : "type-2181",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
@@ -66717,15 +66812,15 @@
    [
     {
      "field_name" : "buf",
-     "referenced_type" : "type-2180"
+     "referenced_type" : "type-2183"
     },
     {
      "field_name" : "entry",
-     "referenced_type" : "type-1409"
+     "referenced_type" : "type-1412"
     },
     {
      "field_name" : "entry_v4",
-     "referenced_type" : "type-1409"
+     "referenced_type" : "type-1412"
     },
     {
      "field_name" : "entry_v3",
@@ -66733,19 +66828,19 @@
     },
     {
      "field_name" : "entry_v2",
-     "referenced_type" : "type-1292"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "entry_v1",
-     "referenced_type" : "type-2181"
+     "referenced_type" : "type-2184"
     }
    ],
    "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-2179",
-   "self_type" : "type-2179",
+   "referenced_type" : "type-2182",
+   "self_type" : "type-2182",
    "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)"
@@ -66766,8 +66861,8 @@
    ],
    "linker_set_key" : "log_time",
    "name" : "log_time",
-   "referenced_type" : "type-2510",
-   "self_type" : "type-2510",
+   "referenced_type" : "type-2513",
+   "self_type" : "type-2513",
    "size" : 8,
    "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
    "unique_id" : "_ZTS8log_time"
@@ -66813,8 +66908,8 @@
    ],
    "linker_set_key" : "logger_entry",
    "name" : "logger_entry",
-   "referenced_type" : "type-2181",
-   "self_type" : "type-2181",
+   "referenced_type" : "type-2184",
+   "self_type" : "type-2184",
    "size" : 20,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
@@ -66865,8 +66960,8 @@
    ],
    "linker_set_key" : "logger_entry_v2",
    "name" : "logger_entry_v2",
-   "referenced_type" : "type-1292",
-   "self_type" : "type-1292",
+   "referenced_type" : "type-1293",
+   "self_type" : "type-1293",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
@@ -66974,8 +67069,8 @@
    ],
    "linker_set_key" : "logger_entry_v4",
    "name" : "logger_entry_v4",
-   "referenced_type" : "type-1409",
-   "self_type" : "type-1409",
+   "referenced_type" : "type-1412",
+   "self_type" : "type-1412",
    "size" : 28,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
@@ -67019,8 +67114,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser> &&",
    "name" : "android::base::unique_fd_impl<android::base::DefaultCloser> &&",
-   "referenced_type" : "type-2555",
-   "self_type" : "type-2612",
+   "referenced_type" : "type-2558",
+   "self_type" : "type-2615",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -67037,8 +67132,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::bufferqueue::V2_0::Status> &&",
    "name" : "android::hardware::Return<android::hardware::graphics::bufferqueue::V2_0::Status> &&",
-   "referenced_type" : "type-7522",
-   "self_type" : "type-7524",
+   "referenced_type" : "type-7547",
+   "self_type" : "type-7549",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -67046,24 +67141,6 @@
    "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,
@@ -67071,8 +67148,8 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> > &&",
-   "name" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> > &&",
+   "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-4497",
    "self_type" : "type-4499",
    "size" : 8,
@@ -67080,10 +67157,28 @@
   },
   {
    "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-4374",
+   "self_type" : "type-4376",
+   "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-4503",
+   "self_type" : "type-4505",
+   "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-4356",
-   "self_type" : "type-4358",
+   "referenced_type" : "type-4362",
+   "self_type" : "type-4364",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -67100,8 +67195,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<unsigned long> &&",
    "name" : "android::hardware::Return<unsigned long> &&",
-   "referenced_type" : "type-7526",
-   "self_type" : "type-7530",
+   "referenced_type" : "type-7551",
+   "self_type" : "type-7553",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -67155,7 +67250,7 @@
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> &&",
    "name" : "android::hardware::hidl_vec<unsigned char> &&",
    "referenced_type" : "type-453",
-   "self_type" : "type-4569",
+   "self_type" : "type-4575",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -67164,7 +67259,7 @@
    "linker_set_key" : "android::sp<android::ALooper> &&",
    "name" : "android::sp<android::ALooper> &&",
    "referenced_type" : "type-322",
-   "self_type" : "type-2258",
+   "self_type" : "type-2261",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67181,8 +67276,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::Fence> &&",
    "name" : "android::sp<android::Fence> &&",
-   "referenced_type" : "type-1865",
-   "self_type" : "type-2526",
+   "referenced_type" : "type-1869",
+   "self_type" : "type-2529",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67190,8 +67285,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::GraphicBufferSource> &&",
    "name" : "android::sp<android::GraphicBufferSource> &&",
-   "referenced_type" : "type-2544",
-   "self_type" : "type-2545",
+   "referenced_type" : "type-2547",
+   "self_type" : "type-2548",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67199,8 +67294,8 @@
    "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-4264",
+   "referenced_type" : "type-4268",
+   "self_type" : "type-4270",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67208,8 +67303,8 @@
    "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",
+   "referenced_type" : "type-4277",
+   "self_type" : "type-4279",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67217,8 +67312,8 @@
    "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",
+   "referenced_type" : "type-4838",
+   "self_type" : "type-4846",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67226,8 +67321,8 @@
    "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",
+   "referenced_type" : "type-5127",
+   "self_type" : "type-5133",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67236,7 +67331,7 @@
    "linker_set_key" : "android::sp<android::IBinder::DeathRecipient> &&",
    "name" : "android::sp<android::IBinder::DeathRecipient> &&",
    "referenced_type" : "type-844",
-   "self_type" : "type-4386",
+   "self_type" : "type-4392",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67245,7 +67340,7 @@
    "linker_set_key" : "android::sp<android::IConsumerListener> &&",
    "name" : "android::sp<android::IConsumerListener> &&",
    "referenced_type" : "type-940",
-   "self_type" : "type-1578",
+   "self_type" : "type-1581",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67254,7 +67349,7 @@
    "linker_set_key" : "android::sp<android::IGraphicBufferConsumer> &&",
    "name" : "android::sp<android::IGraphicBufferConsumer> &&",
    "referenced_type" : "type-574",
-   "self_type" : "type-1601",
+   "self_type" : "type-1605",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67263,7 +67358,7 @@
    "linker_set_key" : "android::sp<android::IGraphicBufferProducer> &&",
    "name" : "android::sp<android::IGraphicBufferProducer> &&",
    "referenced_type" : "type-570",
-   "self_type" : "type-4229",
+   "self_type" : "type-4235",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67272,7 +67367,7 @@
    "linker_set_key" : "android::sp<android::IProducerListener> &&",
    "name" : "android::sp<android::IProducerListener> &&",
    "referenced_type" : "type-958",
-   "self_type" : "type-4255",
+   "self_type" : "type-4261",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67281,7 +67376,7 @@
    "linker_set_key" : "android::sp<android::NativeHandle> &&",
    "name" : "android::sp<android::NativeHandle> &&",
    "referenced_type" : "type-933",
-   "self_type" : "type-1597",
+   "self_type" : "type-1601",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   }
diff --git a/29/64/x86_64/source-based/libui.so.lsdump b/29/64/x86_64/source-based/libui.so.lsdump
index 2c14427..e4ef990 100644
--- a/29/64/x86_64/source-based/libui.so.lsdump
+++ b/29/64/x86_64/source-based/libui.so.lsdump
@@ -5,8 +5,8 @@
    "alignment" : 8,
    "linker_set_key" : "AHardwareBuffer_Plane [4]",
    "name" : "AHardwareBuffer_Plane [4]",
-   "referenced_type" : "type-510",
-   "self_type" : "type-509",
+   "referenced_type" : "type-508",
+   "self_type" : "type-507",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h"
   },
@@ -23,8 +23,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<float> [4]",
    "name" : "android::details::TVec4<float> [4]",
-   "referenced_type" : "type-218",
-   "self_type" : "type-2429",
+   "referenced_type" : "type-203",
+   "self_type" : "type-2431",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -32,7 +32,7 @@
    "alignment" : 1,
    "linker_set_key" : "char [0]",
    "name" : "char [0]",
-   "referenced_type" : "type-290",
+   "referenced_type" : "type-287",
    "self_type" : "type-1260",
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -47,16 +47,16 @@
    "alignment" : 4,
    "linker_set_key" : "int [0]",
    "name" : "int [0]",
-   "referenced_type" : "type-103",
-   "self_type" : "type-144",
+   "referenced_type" : "type-105",
+   "self_type" : "type-146",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int [7]",
    "name" : "int [7]",
-   "referenced_type" : "type-103",
-   "self_type" : "type-565",
+   "referenced_type" : "type-105",
+   "self_type" : "type-562",
    "size" : 28,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -64,7 +64,7 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
-   "referenced_type" : "type-207",
+   "referenced_type" : "type-220",
    "self_type" : "type-1267",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
@@ -73,7 +73,7 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [10]",
    "name" : "unsigned int [10]",
-   "referenced_type" : "type-123",
+   "referenced_type" : "type-125",
    "self_type" : "type-1110",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -82,8 +82,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [8]",
    "name" : "unsigned int [8]",
-   "referenced_type" : "type-123",
-   "self_type" : "type-351",
+   "referenced_type" : "type-125",
+   "self_type" : "type-348",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -91,8 +91,8 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned long [12]",
    "name" : "unsigned long [12]",
-   "referenced_type" : "type-124",
-   "self_type" : "type-560",
+   "referenced_type" : "type-126",
+   "self_type" : "type-557",
    "size" : 96,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -100,8 +100,8 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned long [25]",
    "name" : "unsigned long [25]",
-   "referenced_type" : "type-124",
-   "self_type" : "type-559",
+   "referenced_type" : "type-126",
+   "self_type" : "type-556",
    "size" : 200,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -109,8 +109,8 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned long [3]",
    "name" : "unsigned long [3]",
-   "referenced_type" : "type-124",
-   "self_type" : "type-944",
+   "referenced_type" : "type-126",
+   "self_type" : "type-936",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -118,26 +118,17 @@
    "alignment" : 8,
    "linker_set_key" : "void *[1]",
    "name" : "void *[1]",
-   "referenced_type" : "type-217",
-   "self_type" : "type-525",
+   "referenced_type" : "type-230",
+   "self_type" : "type-522",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "void *[3]",
-   "name" : "void *[3]",
-   "referenced_type" : "type-217",
-   "self_type" : "type-599",
-   "size" : 24,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "void *[4]",
    "name" : "void *[4]",
-   "referenced_type" : "type-217",
-   "self_type" : "type-521",
+   "referenced_type" : "type-230",
+   "self_type" : "type-518",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -145,8 +136,8 @@
    "alignment" : 8,
    "linker_set_key" : "void *[6]",
    "name" : "void *[6]",
-   "referenced_type" : "type-217",
-   "self_type" : "type-578",
+   "referenced_type" : "type-230",
+   "self_type" : "type-575",
    "size" : 48,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -154,8 +145,8 @@
    "alignment" : 8,
    "linker_set_key" : "void *[7]",
    "name" : "void *[7]",
-   "referenced_type" : "type-217",
-   "self_type" : "type-526",
+   "referenced_type" : "type-230",
+   "self_type" : "type-523",
    "size" : 56,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   }
@@ -177,8 +168,8 @@
    "is_integral" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-290",
-   "self_type" : "type-290",
+   "referenced_type" : "type-287",
+   "self_type" : "type-287",
    "size" : 1
   },
   {
@@ -187,16 +178,16 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-181",
-   "self_type" : "type-181",
+   "referenced_type" : "type-183",
+   "self_type" : "type-183",
    "size" : 2
   },
   {
    "alignment" : 8,
    "linker_set_key" : "double",
    "name" : "double",
-   "referenced_type" : "type-45",
-   "self_type" : "type-45",
+   "referenced_type" : "type-44",
+   "self_type" : "type-44",
    "size" : 8
   },
   {
@@ -212,8 +203,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-103",
-   "self_type" : "type-103",
+   "referenced_type" : "type-105",
+   "self_type" : "type-105",
    "size" : 4
   },
   {
@@ -221,16 +212,16 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-286",
-   "self_type" : "type-286",
+   "referenced_type" : "type-12",
+   "self_type" : "type-12",
    "size" : 8
   },
   {
    "alignment" : 16,
    "linker_set_key" : "long double",
    "name" : "long double",
-   "referenced_type" : "type-310",
-   "self_type" : "type-310",
+   "referenced_type" : "type-305",
+   "self_type" : "type-305",
    "size" : 16
   },
   {
@@ -238,8 +229,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-732",
-   "self_type" : "type-732",
+   "referenced_type" : "type-730",
+   "self_type" : "type-730",
    "size" : 8
   },
   {
@@ -266,8 +257,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned char",
    "name" : "unsigned char",
-   "referenced_type" : "type-207",
-   "self_type" : "type-207",
+   "referenced_type" : "type-220",
+   "self_type" : "type-220",
    "size" : 1
   },
   {
@@ -276,8 +267,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned int",
    "name" : "unsigned int",
-   "referenced_type" : "type-123",
-   "self_type" : "type-123",
+   "referenced_type" : "type-125",
+   "self_type" : "type-125",
    "size" : 4
   },
   {
@@ -286,8 +277,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long",
    "name" : "unsigned long",
-   "referenced_type" : "type-124",
-   "self_type" : "type-124",
+   "referenced_type" : "type-126",
+   "self_type" : "type-126",
    "size" : 8
   },
   {
@@ -296,8 +287,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-209",
-   "self_type" : "type-209",
+   "referenced_type" : "type-222",
+   "self_type" : "type-222",
    "size" : 8
   },
   {
@@ -313,8 +304,8 @@
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-150",
-   "self_type" : "type-150"
+   "referenced_type" : "type-153",
+   "self_type" : "type-153"
   }
  ],
  "elf_functions" :
@@ -1805,7 +1796,7 @@
    "self_type" : "type-618",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "AHardwareBuffer_Format"
   },
   {
@@ -1967,11 +1958,11 @@
    ],
    "linker_set_key" : "AHardwareBuffer_UsageFlags",
    "name" : "AHardwareBuffer_UsageFlags",
-   "referenced_type" : "type-679",
-   "self_type" : "type-679",
+   "referenced_type" : "type-677",
+   "self_type" : "type-677",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "AHardwareBuffer_UsageFlags"
   },
   {
@@ -1989,11 +1980,11 @@
    ],
    "linker_set_key" : "android::Condition::WakeUpType",
    "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-262",
-   "self_type" : "type-262",
+   "referenced_type" : "type-258",
+   "self_type" : "type-258",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android9Condition10WakeUpTypeE"
   },
   {
@@ -2019,7 +2010,7 @@
    "self_type" : "type-1346",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android5Fence6StatusE"
   },
   {
@@ -2041,11 +2032,11 @@
    ],
    "linker_set_key" : "android::FenceTime::Snapshot::State",
    "name" : "android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1384",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1388",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android9FenceTime8Snapshot5StateE"
   },
   {
@@ -2068,11 +2059,11 @@
    ],
    "linker_set_key" : "android::FenceTime::State",
    "name" : "android::FenceTime::State",
-   "referenced_type" : "type-1378",
-   "self_type" : "type-1378",
+   "referenced_type" : "type-1383",
+   "self_type" : "type-1383",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android9FenceTime5StateE"
   },
   {
@@ -2098,11 +2089,11 @@
    ],
    "linker_set_key" : "android::GraphicBuffer::HandleWrapMethod",
    "name" : "android::GraphicBuffer::HandleWrapMethod",
-   "referenced_type" : "type-630",
-   "self_type" : "type-630",
+   "referenced_type" : "type-631",
+   "self_type" : "type-631",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h",
-   "underlying_type" : "type-207",
+   "underlying_type" : "type-220",
    "unique_id" : "_ZTSN7android13GraphicBuffer16HandleWrapMethodE"
   },
   {
@@ -2120,11 +2111,11 @@
    ],
    "linker_set_key" : "android::GraphicBufferMapper::Version",
    "name" : "android::GraphicBufferMapper::Version",
-   "referenced_type" : "type-531",
-   "self_type" : "type-531",
+   "referenced_type" : "type-528",
+   "self_type" : "type-528",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android19GraphicBufferMapper7VersionE"
   },
   {
@@ -2138,11 +2129,11 @@
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-182",
-   "self_type" : "type-182",
+   "referenced_type" : "type-185",
+   "self_type" : "type-185",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android8String1613StaticLinkageE"
   },
   {
@@ -2156,11 +2147,11 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-865",
-   "self_type" : "type-865",
+   "referenced_type" : "type-863",
+   "self_type" : "type-863",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7String813StaticLinkageE"
   },
   {
@@ -2178,7 +2169,7 @@
    "self_type" : "type-976",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details6TMat33IfE7no_initE"
   },
   {
@@ -2192,11 +2183,11 @@
    ],
    "linker_set_key" : "android::details::TMat44<float>::no_init",
    "name" : "android::details::TMat44<float>::no_init",
-   "referenced_type" : "type-2430",
-   "self_type" : "type-2430",
+   "referenced_type" : "type-2432",
+   "self_type" : "type-2432",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details6TMat44IfE7no_initE"
   },
   {
@@ -2210,11 +2201,11 @@
    ],
    "linker_set_key" : "android::details::TQuaternion<double>::no_init",
    "name" : "android::details::TQuaternion<double>::no_init",
-   "referenced_type" : "type-398",
-   "self_type" : "type-398",
+   "referenced_type" : "type-392",
+   "self_type" : "type-392",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details11TQuaternionIdE7no_initE"
   },
   {
@@ -2228,11 +2219,11 @@
    ],
    "linker_set_key" : "android::details::TQuaternion<float>::no_init",
    "name" : "android::details::TQuaternion<float>::no_init",
-   "referenced_type" : "type-430",
-   "self_type" : "type-430",
+   "referenced_type" : "type-427",
+   "self_type" : "type-427",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details11TQuaternionIfE7no_initE"
   },
   {
@@ -2250,7 +2241,7 @@
    "self_type" : "type-1264",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec2IbE7no_initE"
   },
   {
@@ -2268,7 +2259,7 @@
    "self_type" : "type-1069",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec2IdE7no_initE"
   },
   {
@@ -2286,7 +2277,7 @@
    "self_type" : "type-1142",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec2IfE7no_initE"
   },
   {
@@ -2304,7 +2295,7 @@
    "self_type" : "type-1368",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec3IdE7no_initE"
   },
   {
@@ -2318,11 +2309,11 @@
    ],
    "linker_set_key" : "android::details::TVec3<float>::no_init",
    "name" : "android::details::TVec3<float>::no_init",
-   "referenced_type" : "type-1418",
-   "self_type" : "type-1418",
+   "referenced_type" : "type-1419",
+   "self_type" : "type-1419",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec3IfE7no_initE"
   },
   {
@@ -2336,11 +2327,11 @@
    ],
    "linker_set_key" : "android::details::TVec4<double>::no_init",
    "name" : "android::details::TVec4<double>::no_init",
-   "referenced_type" : "type-155",
-   "self_type" : "type-155",
+   "referenced_type" : "type-150",
+   "self_type" : "type-150",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec4IdE7no_initE"
   },
   {
@@ -2354,11 +2345,11 @@
    ],
    "linker_set_key" : "android::details::TVec4<float>::no_init",
    "name" : "android::details::TVec4<float>::no_init",
-   "referenced_type" : "type-317",
-   "self_type" : "type-317",
+   "referenced_type" : "type-312",
+   "self_type" : "type-312",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec4IfE7no_initE"
   },
   {
@@ -2373,11 +2364,11 @@
    ],
    "linker_set_key" : "android::half::Binary",
    "name" : "android::half::Binary",
-   "referenced_type" : "type-404",
-   "self_type" : "type-404",
+   "referenced_type" : "type-400",
+   "self_type" : "type-400",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android4half6BinaryE"
   },
   {
@@ -2403,7 +2394,7 @@
    "self_type" : "type-1320",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware21HidlReturnRestrictionE"
   },
   {
@@ -2425,7 +2416,7 @@
    "self_type" : "type-1130",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android8hardware8MQFlavorE"
   },
   {
@@ -2447,11 +2438,11 @@
    ],
    "linker_set_key" : "android::hardware::ProcessState::CallRestriction",
    "name" : "android::hardware::ProcessState::CallRestriction",
-   "referenced_type" : "type-278",
-   "self_type" : "type-278",
+   "referenced_type" : "type-274",
+   "self_type" : "type-274",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware12ProcessState15CallRestrictionE"
   },
   {
@@ -2505,7 +2496,7 @@
    "self_type" : "type-1306",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware6Status9ExceptionE"
   },
   {
@@ -2559,7 +2550,7 @@
    "self_type" : "type-1223",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentor20InstrumentationEventE"
   },
   {
@@ -2661,11 +2652,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_0::BufferUsage",
-   "referenced_type" : "type-149",
-   "self_type" : "type-149",
+   "referenced_type" : "type-152",
+   "self_type" : "type-152",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_011BufferUsageE"
   },
   {
@@ -2719,7 +2710,7 @@
    "self_type" : "type-1140",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09ColorModeE"
   },
   {
@@ -2761,7 +2752,7 @@
    "self_type" : "type-1141",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_014ColorTransformE"
   },
   {
@@ -3003,7 +2994,7 @@
    "self_type" : "type-1139",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09DataspaceE"
   },
   {
@@ -3029,7 +3020,7 @@
    "self_type" : "type-1143",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_03HdrE"
   },
   {
@@ -3123,7 +3114,7 @@
    "self_type" : "type-1137",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_011PixelFormatE"
   },
   {
@@ -3157,7 +3148,7 @@
    "self_type" : "type-1138",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09TransformE"
   },
   {
@@ -3267,11 +3258,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_1::BufferUsage",
-   "referenced_type" : "type-157",
-   "self_type" : "type-157",
+   "referenced_type" : "type-159",
+   "self_type" : "type-159",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_111BufferUsageE"
   },
   {
@@ -3337,7 +3328,7 @@
    "self_type" : "type-1171",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_19ColorModeE"
   },
   {
@@ -3595,7 +3586,7 @@
    "self_type" : "type-1170",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_19DataspaceE"
   },
   {
@@ -3717,7 +3708,7 @@
    "self_type" : "type-1169",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_111PixelFormatE"
   },
   {
@@ -3747,7 +3738,7 @@
    "self_type" : "type-1172",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_112RenderIntentE"
   },
   {
@@ -3861,11 +3852,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_2::BufferUsage",
-   "referenced_type" : "type-422",
-   "self_type" : "type-422",
+   "referenced_type" : "type-419",
+   "self_type" : "type-419",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_211BufferUsageE"
   },
   {
@@ -3935,7 +3926,7 @@
    "self_type" : "type-1193",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_29ColorModeE"
   },
   {
@@ -4209,7 +4200,7 @@
    "self_type" : "type-1192",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_29DataspaceE"
   },
   {
@@ -4239,7 +4230,7 @@
    "self_type" : "type-1191",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_23HdrE"
   },
   {
@@ -4365,7 +4356,7 @@
    "self_type" : "type-1195",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_211PixelFormatE"
   },
   {
@@ -4387,11 +4378,11 @@
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-163",
-   "self_type" : "type-163",
+   "referenced_type" : "type-166",
+   "self_type" : "type-166",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfo12ArchitectureE"
   },
   {
@@ -4429,11 +4420,11 @@
    ],
    "linker_set_key" : "android::ui::Transform::orientation_flags",
    "name" : "android::ui::Transform::orientation_flags",
-   "referenced_type" : "type-2440",
-   "self_type" : "type-2440",
+   "referenced_type" : "type-2442",
+   "self_type" : "type-2442",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android2ui9Transform17orientation_flagsE"
   },
   {
@@ -4463,11 +4454,11 @@
    ],
    "linker_set_key" : "android::ui::Transform::type_mask",
    "name" : "android::ui::Transform::type_mask",
-   "referenced_type" : "type-2441",
-   "self_type" : "type-2441",
+   "referenced_type" : "type-2443",
+   "self_type" : "type-2443",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android2ui9Transform9type_maskE"
   },
   {
@@ -4517,7 +4508,7 @@
    "self_type" : "type-1256",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_LogPriority"
   },
   {
@@ -4571,7 +4562,7 @@
    "self_type" : "type-1213",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_color_mode_t"
   },
   {
@@ -4597,7 +4588,7 @@
    "self_type" : "type-1218",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_color_mode_v1_1_t"
   },
   {
@@ -4639,7 +4630,7 @@
    "self_type" : "type-1214",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_color_transform_t"
   },
   {
@@ -4881,7 +4872,7 @@
    "self_type" : "type-1212",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_dataspace_t"
   },
   {
@@ -4911,7 +4902,7 @@
    "self_type" : "type-1217",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_dataspace_v1_1_t"
   },
   {
@@ -4941,7 +4932,7 @@
    "self_type" : "type-1221",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_dataspace_v1_2_t"
   },
   {
@@ -4983,7 +4974,7 @@
    "self_type" : "type-1225",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_flex_component"
   },
   {
@@ -5021,7 +5012,7 @@
    "self_type" : "type-1228",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_flex_format"
   },
   {
@@ -5047,7 +5038,7 @@
    "self_type" : "type-1215",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_hdr_t"
   },
   {
@@ -5065,7 +5056,7 @@
    "self_type" : "type-1220",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_hdr_v1_2_t"
   },
   {
@@ -5095,7 +5086,7 @@
    "self_type" : "type-1224",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTS25android_pixel_format_sw_t"
   },
   {
@@ -5189,7 +5180,7 @@
    "self_type" : "type-1210",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_pixel_format_t"
   },
   {
@@ -5231,7 +5222,7 @@
    "self_type" : "type-1216",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_pixel_format_v1_1_t"
   },
   {
@@ -5249,7 +5240,7 @@
    "self_type" : "type-1222",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_pixel_format_v1_2_t"
   },
   {
@@ -5279,7 +5270,7 @@
    "self_type" : "type-1219",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_render_intent_v1_1_t"
   },
   {
@@ -5313,7 +5304,7 @@
    "self_type" : "type-1211",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_transform_t"
   },
   {
@@ -5367,7 +5358,7 @@
    "self_type" : "type-1257",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "log_id"
   }
  ],
@@ -5380,18 +5371,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-186"
+     "referenced_type" : "type-188"
     },
     {
-     "referenced_type" : "type-274"
+     "referenced_type" : "type-270"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     }
    ],
-   "referenced_type" : "type-273",
+   "referenced_type" : "type-269",
    "return_type" : "type-6",
-   "self_type" : "type-273",
+   "self_type" : "type-269",
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
   {
@@ -5404,11 +5395,11 @@
      "referenced_type" : "type-607"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     }
    ],
    "referenced_type" : "type-609",
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "self_type" : "type-609",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -5422,26 +5413,26 @@
      "referenced_type" : "type-607"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-345"
     },
     {
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     }
    ],
    "referenced_type" : "type-606",
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "self_type" : "type-606",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -5452,15 +5443,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-584"
+     "referenced_type" : "type-581"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     }
    ],
-   "referenced_type" : "type-583",
-   "return_type" : "type-103",
-   "self_type" : "type-583",
+   "referenced_type" : "type-580",
+   "return_type" : "type-105",
+   "self_type" : "type-580",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5470,18 +5461,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-584"
+     "referenced_type" : "type-581"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     }
    ],
-   "referenced_type" : "type-595",
-   "return_type" : "type-103",
-   "self_type" : "type-595",
+   "referenced_type" : "type-592",
+   "return_type" : "type-105",
+   "self_type" : "type-592",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5491,33 +5482,33 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-584"
+     "referenced_type" : "type-581"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     }
    ],
-   "referenced_type" : "type-591",
-   "return_type" : "type-103",
-   "self_type" : "type-591",
+   "referenced_type" : "type-588",
+   "return_type" : "type-105",
+   "self_type" : "type-588",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5527,36 +5518,36 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-584"
+     "referenced_type" : "type-581"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-598",
-   "return_type" : "type-103",
-   "self_type" : "type-598",
+   "referenced_type" : "type-595",
+   "return_type" : "type-105",
+   "self_type" : "type-595",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5566,33 +5557,33 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-584"
+     "referenced_type" : "type-581"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-255"
     }
    ],
-   "referenced_type" : "type-587",
-   "return_type" : "type-103",
-   "self_type" : "type-587",
+   "referenced_type" : "type-584",
+   "return_type" : "type-105",
+   "self_type" : "type-584",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5602,36 +5593,93 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-584"
+     "referenced_type" : "type-581"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-255"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-593",
-   "return_type" : "type-103",
-   "self_type" : "type-593",
+   "referenced_type" : "type-590",
+   "return_type" : "type-105",
+   "self_type" : "type-590",
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "name" : "int (const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-581"
+    },
+    {
+     "referenced_type" : "type-143"
+    },
+    {
+     "referenced_type" : "type-124"
+    },
+    {
+     "referenced_type" : "type-124"
+    }
+   ],
+   "referenced_type" : "type-597",
+   "return_type" : "type-105",
+   "self_type" : "type-597",
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "name" : "int (const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-581"
+    },
+    {
+     "referenced_type" : "type-143"
+    },
+    {
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-105"
+    },
+    {
+     "referenced_type" : "type-105"
+    },
+    {
+     "referenced_type" : "type-125"
+    }
+   ],
+   "referenced_type" : "type-599",
+   "return_type" : "type-105",
+   "self_type" : "type-599",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5641,15 +5689,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-584"
+     "referenced_type" : "type-581"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-589",
-   "return_type" : "type-103",
-   "self_type" : "type-589",
+   "referenced_type" : "type-586",
+   "return_type" : "type-105",
+   "self_type" : "type-586",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5659,18 +5707,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-555"
+     "referenced_type" : "type-552"
     },
     {
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-285"
     },
     {
-     "referenced_type" : "type-557"
+     "referenced_type" : "type-554"
     }
    ],
-   "referenced_type" : "type-554",
-   "return_type" : "type-103",
-   "self_type" : "type-554",
+   "referenced_type" : "type-551",
+   "return_type" : "type-105",
+   "self_type" : "type-551",
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
   {
@@ -5680,12 +5728,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-568"
+     "referenced_type" : "type-565"
     }
    ],
-   "referenced_type" : "type-574",
-   "return_type" : "type-103",
-   "self_type" : "type-574",
+   "referenced_type" : "type-571",
+   "return_type" : "type-105",
+   "self_type" : "type-571",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5695,15 +5743,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-568"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     }
    ],
-   "referenced_type" : "type-572",
-   "return_type" : "type-103",
-   "self_type" : "type-572",
+   "referenced_type" : "type-569",
+   "return_type" : "type-105",
+   "self_type" : "type-569",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5713,15 +5761,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-568"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-567",
-   "return_type" : "type-103",
-   "self_type" : "type-567",
+   "referenced_type" : "type-564",
+   "return_type" : "type-105",
+   "self_type" : "type-564",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5731,24 +5779,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-568"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-570",
-   "return_type" : "type-103",
-   "self_type" : "type-570",
+   "referenced_type" : "type-567",
+   "return_type" : "type-105",
+   "self_type" : "type-567",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5758,12 +5806,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-558"
+     "referenced_type" : "type-555"
     }
    ],
-   "referenced_type" : "type-562",
-   "return_type" : "type-103",
-   "self_type" : "type-562",
+   "referenced_type" : "type-559",
+   "return_type" : "type-105",
+   "self_type" : "type-559",
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
   {
@@ -5773,12 +5821,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     }
    ],
-   "referenced_type" : "type-251",
-   "return_type" : "type-103",
-   "self_type" : "type-251",
+   "referenced_type" : "type-253",
+   "return_type" : "type-105",
+   "self_type" : "type-253",
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
   {
@@ -5791,14 +5839,14 @@
      "referenced_type" : "type-607"
     },
     {
-     "referenced_type" : "type-577"
+     "referenced_type" : "type-574"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "referenced_type" : "type-611",
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "self_type" : "type-611",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -5809,27 +5857,27 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-212"
+     "referenced_type" : "type-225"
     },
     {
-     "referenced_type" : "type-213"
+     "referenced_type" : "type-226"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-215"
+     "referenced_type" : "type-228"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     }
    ],
-   "referenced_type" : "type-211",
-   "return_type" : "type-150",
-   "self_type" : "type-211",
+   "referenced_type" : "type-224",
+   "return_type" : "type-153",
+   "self_type" : "type-224",
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
   {
@@ -5839,12 +5887,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-524"
+     "referenced_type" : "type-521"
     }
    ],
-   "referenced_type" : "type-523",
-   "return_type" : "type-150",
-   "self_type" : "type-523",
+   "referenced_type" : "type-520",
+   "return_type" : "type-153",
+   "self_type" : "type-520",
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
   {
@@ -5854,18 +5902,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-568"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-577"
+     "referenced_type" : "type-574"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-576",
-   "return_type" : "type-150",
-   "self_type" : "type-576",
+   "referenced_type" : "type-573",
+   "return_type" : "type-153",
+   "self_type" : "type-573",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   }
  ],
@@ -5880,7 +5928,7 @@
      "referenced_type" : "type-1212"
     }
    ],
-   "return_type" : "type-1434",
+   "return_type" : "type-1437",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5892,7 +5940,7 @@
      "referenced_type" : "type-1212"
     }
    ],
-   "return_type" : "type-1435",
+   "return_type" : "type-1438",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5904,7 +5952,7 @@
      "referenced_type" : "type-1212"
     }
    ],
-   "return_type" : "type-1436",
+   "return_type" : "type-1439",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5916,7 +5964,7 @@
      "referenced_type" : "type-1193"
     }
    ],
-   "return_type" : "type-1437",
+   "return_type" : "type-1440",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5928,7 +5976,7 @@
      "referenced_type" : "type-1212"
     }
    ],
-   "return_type" : "type-1438",
+   "return_type" : "type-1441",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5937,10 +5985,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-1439",
+   "return_type" : "type-1442",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5952,7 +6000,7 @@
      "referenced_type" : "type-1172"
     }
    ],
-   "return_type" : "type-1440",
+   "return_type" : "type-1443",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5964,7 +6012,7 @@
      "referenced_type" : "type-1214"
     }
    ],
-   "return_type" : "type-1441",
+   "return_type" : "type-1444",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5976,7 +6024,7 @@
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-1442",
+   "return_type" : "type-1445",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -6063,7 +6111,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1043"
@@ -6072,7 +6120,7 @@
      "referenced_type" : "type-1043"
     }
    ],
-   "return_type" : "type-1443",
+   "return_type" : "type-1446",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6082,10 +6130,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1003"
     },
     {
-     "referenced_type" : "type-1030"
+     "referenced_type" : "type-1026"
     },
     {
      "referenced_type" : "type-1037"
@@ -6094,14 +6142,14 @@
      "referenced_type" : "type-1051"
     },
     {
-     "referenced_type" : "type-1034"
+     "referenced_type" : "type-1031"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1444"
+     "referenced_type" : "type-1447"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6111,10 +6159,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1003"
     },
     {
-     "referenced_type" : "type-1030"
+     "referenced_type" : "type-1026"
     },
     {
      "referenced_type" : "type-1037"
@@ -6124,18 +6172,18 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1445"
+     "referenced_type" : "type-1448"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1446"
+     "referenced_type" : "type-1449"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1447"
+     "referenced_type" : "type-1450"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6145,10 +6193,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1003"
     },
     {
-     "referenced_type" : "type-1030"
+     "referenced_type" : "type-1026"
     },
     {
      "referenced_type" : "type-1037"
@@ -6161,10 +6209,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1448"
+     "referenced_type" : "type-1451"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6174,23 +6222,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1003"
     },
     {
-     "referenced_type" : "type-1030"
+     "referenced_type" : "type-1026"
     },
     {
-     "referenced_type" : "type-935"
+     "referenced_type" : "type-929"
     },
     {
-     "referenced_type" : "type-1034"
+     "referenced_type" : "type-1031"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1449"
+     "referenced_type" : "type-1452"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6200,28 +6248,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1003"
     },
     {
-     "referenced_type" : "type-1030"
+     "referenced_type" : "type-1026"
     },
     {
-     "referenced_type" : "type-935"
+     "referenced_type" : "type-929"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1450"
+     "referenced_type" : "type-1453"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1451"
+     "referenced_type" : "type-1454"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1452"
+     "referenced_type" : "type-1455"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6231,23 +6279,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1003"
     },
     {
-     "referenced_type" : "type-1030"
+     "referenced_type" : "type-1026"
     },
     {
-     "referenced_type" : "type-935"
+     "referenced_type" : "type-929"
     },
     {
      "referenced_type" : "type-10"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1453"
+     "referenced_type" : "type-1456"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6257,10 +6305,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1003"
     },
     {
-     "referenced_type" : "type-1030"
+     "referenced_type" : "type-1026"
     },
     {
      "referenced_type" : "type-1037"
@@ -6269,14 +6317,14 @@
      "referenced_type" : "type-1051"
     },
     {
-     "referenced_type" : "type-1034"
+     "referenced_type" : "type-1031"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1454"
+     "referenced_type" : "type-1457"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6286,10 +6334,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1003"
     },
     {
-     "referenced_type" : "type-1030"
+     "referenced_type" : "type-1026"
     },
     {
      "referenced_type" : "type-1037"
@@ -6299,18 +6347,18 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1455"
+     "referenced_type" : "type-1458"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1456"
+     "referenced_type" : "type-1459"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1457"
+     "referenced_type" : "type-1460"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6320,10 +6368,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1003"
     },
     {
-     "referenced_type" : "type-1030"
+     "referenced_type" : "type-1026"
     },
     {
      "referenced_type" : "type-1037"
@@ -6336,10 +6384,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1458"
+     "referenced_type" : "type-1461"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6349,23 +6397,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1003"
     },
     {
-     "referenced_type" : "type-1030"
+     "referenced_type" : "type-1026"
     },
     {
-     "referenced_type" : "type-935"
+     "referenced_type" : "type-929"
     },
     {
-     "referenced_type" : "type-1034"
+     "referenced_type" : "type-1031"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1459"
+     "referenced_type" : "type-1462"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6375,28 +6423,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1003"
     },
     {
-     "referenced_type" : "type-1030"
+     "referenced_type" : "type-1026"
     },
     {
-     "referenced_type" : "type-935"
+     "referenced_type" : "type-929"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1460"
+     "referenced_type" : "type-1463"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1464"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1462"
+     "referenced_type" : "type-1465"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6406,23 +6454,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1003"
     },
     {
-     "referenced_type" : "type-1030"
+     "referenced_type" : "type-1026"
     },
     {
-     "referenced_type" : "type-935"
+     "referenced_type" : "type-929"
     },
     {
      "referenced_type" : "type-10"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1463"
+     "referenced_type" : "type-1466"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6432,16 +6480,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1428"
+     "referenced_type" : "type-1432"
     },
     {
      "referenced_type" : "type-1120"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
   {
@@ -6450,10 +6498,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/PixelFormat.h"
   },
   {
@@ -6463,10 +6511,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1401"
+     "referenced_type" : "type-1405"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -6476,13 +6524,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1401"
+     "referenced_type" : "type-1405"
     },
     {
-     "referenced_type" : "type-1402"
+     "referenced_type" : "type-1406"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -6492,25 +6540,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6521,10 +6569,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6534,13 +6582,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6551,28 +6599,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-1464"
+     "referenced_type" : "type-1467"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6583,34 +6631,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-630"
+     "referenced_type" : "type-631"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6620,19 +6668,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6642,22 +6690,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6667,16 +6715,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-1465"
+     "referenced_type" : "type-1468"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6686,22 +6734,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "return_type" : "type-6",
@@ -6714,10 +6762,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     }
    ],
-   "return_type" : "type-622",
+   "return_type" : "type-623",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6726,10 +6774,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-622"
+     "referenced_type" : "type-623"
     }
    ],
-   "return_type" : "type-681",
+   "return_type" : "type-680",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6738,16 +6786,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-629"
+     "referenced_type" : "type-630"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-625",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
    "function_name" : "android::GraphicBuffer::dumpAllocationsToSystemLog",
    "linker_set_key" : "_ZN7android13GraphicBuffer26dumpAllocationsToSystemLogEv",
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6759,7 +6807,7 @@
      "referenced_type" : "type-637"
     }
    ],
-   "return_type" : "type-680",
+   "return_type" : "type-679",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6769,24 +6817,24 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-255"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6796,27 +6844,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-255"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6826,10 +6874,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6839,27 +6887,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-255"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6869,30 +6917,30 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-255"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6902,33 +6950,33 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-255"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6938,16 +6986,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6957,19 +7005,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6979,7 +7027,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
      "referenced_type" : "type-1250"
@@ -6994,7 +7042,7 @@
      "referenced_type" : "type-1146"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7004,34 +7052,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-630"
+     "referenced_type" : "type-631"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7041,26 +7089,26 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1466"
+     "referenced_type" : "type-1469"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7070,25 +7118,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1133"
@@ -7097,7 +7145,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7107,29 +7155,29 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1467"
+     "referenced_type" : "type-1470"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7139,10 +7187,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7152,34 +7200,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-630"
+     "referenced_type" : "type-631"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7189,26 +7237,26 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1468"
+     "referenced_type" : "type-1471"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7218,25 +7266,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1133"
@@ -7245,7 +7293,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7255,29 +7303,29 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1472"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7287,10 +7335,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7301,10 +7349,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7315,10 +7363,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7329,10 +7377,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7341,16 +7389,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/PixelFormat.h"
   },
   {
    "function_name" : "android::Gralloc2Mapper::preload",
    "linker_set_key" : "_ZN7android14Gralloc2Mapper7preloadEv",
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7360,10 +7408,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-339"
+     "referenced_type" : "type-342"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7373,10 +7421,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-339"
+     "referenced_type" : "type-342"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7392,10 +7440,10 @@
      "referenced_type" : "type-1120"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7411,7 +7459,7 @@
      "referenced_type" : "type-971"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7427,7 +7475,7 @@
      "referenced_type" : "type-971"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7440,7 +7488,7 @@
      "referenced_type" : "type-967"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7453,7 +7501,7 @@
      "referenced_type" : "type-967"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7479,13 +7527,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-362"
+     "referenced_type" : "type-359"
     },
     {
-     "referenced_type" : "type-356"
+     "referenced_type" : "type-353"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7495,13 +7543,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-362"
+     "referenced_type" : "type-359"
     },
     {
-     "referenced_type" : "type-356"
+     "referenced_type" : "type-353"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7520,7 +7568,7 @@
      "referenced_type" : "type-1043"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -7539,7 +7587,7 @@
      "referenced_type" : "type-1043"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -7549,16 +7597,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1406"
+     "referenced_type" : "type-1410"
     },
     {
      "referenced_type" : "type-1362"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -7569,10 +7617,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1406"
+     "referenced_type" : "type-1410"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -7582,13 +7630,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1406"
+     "referenced_type" : "type-1410"
     },
     {
      "referenced_type" : "type-1362"
     }
    ],
-   "return_type" : "type-1470",
+   "return_type" : "type-1473",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -7598,19 +7646,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
    "function_name" : "android::GraphicBufferMapper::preloadHal",
    "linker_set_key" : "_ZN7android19GraphicBufferMapper10preloadHalEv",
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7620,28 +7668,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-352"
+     "referenced_type" : "type-349"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7651,16 +7699,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7670,34 +7718,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-345"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7707,25 +7755,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7735,19 +7783,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7757,30 +7805,30 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-255"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7790,13 +7838,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7806,33 +7854,33 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-255"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7842,36 +7890,36 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-255"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7881,22 +7929,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7907,10 +7955,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7921,10 +7969,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7933,16 +7981,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2449"
+     "referenced_type" : "type-2451"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/UiConfig.h"
   },
   {
    "function_name" : "android::GraphicBufferAllocator::dumpToSystemLog",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocator15dumpToSystemLogEv",
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -7952,13 +8000,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-546"
+     "referenced_type" : "type-543"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -7968,93 +8016,93 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-546"
+     "referenced_type" : "type-543"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-126"
+    },
+    {
+     "referenced_type" : "type-345"
     },
     {
      "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-122"
-    },
-    {
-     "referenced_type" : "type-124"
-    },
-    {
-     "referenced_type" : "type-1471"
+     "referenced_type" : "type-1474"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorC1Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-546"
+     "referenced_type" : "type-543"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorC2Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-546"
+     "referenced_type" : "type-543"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::~GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorD1Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-546"
+     "referenced_type" : "type-543"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::~GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorD2Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-546"
+     "referenced_type" : "type-543"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -8067,7 +8115,7 @@
      "referenced_type" : "type-1360"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -8080,7 +8128,7 @@
      "referenced_type" : "type-1360"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -8090,7 +8138,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2439"
     },
     {
      "referenced_type" : "type-10"
@@ -8099,7 +8147,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8109,7 +8157,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2439"
     },
     {
      "referenced_type" : "type-10"
@@ -8124,7 +8172,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8134,10 +8182,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2439"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-10"
@@ -8146,7 +8194,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8156,10 +8204,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2439"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8195,13 +8243,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2439"
     },
     {
-     "referenced_type" : "type-2439"
+     "referenced_type" : "type-2441"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8211,13 +8259,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2439"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8227,10 +8275,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2439"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8240,13 +8288,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2439"
     },
     {
-     "referenced_type" : "type-2439"
+     "referenced_type" : "type-2441"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8256,13 +8304,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2439"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8272,10 +8320,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2439"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8285,10 +8333,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2439"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8298,10 +8346,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2439"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8311,13 +8359,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2439"
     },
     {
-     "referenced_type" : "type-2439"
+     "referenced_type" : "type-2441"
     }
    ],
-   "return_type" : "type-2443",
+   "return_type" : "type-2445",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8330,7 +8378,7 @@
      "referenced_type" : "type-1296"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
   },
   {
@@ -8343,16 +8391,16 @@
      "referenced_type" : "type-1296"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1299",
@@ -8368,10 +8416,10 @@
      "referenced_type" : "type-1296"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1299",
@@ -8387,10 +8435,10 @@
      "referenced_type" : "type-1296"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1299",
@@ -8406,10 +8454,10 @@
      "referenced_type" : "type-1359"
     },
     {
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-285"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8422,10 +8470,10 @@
      "referenced_type" : "type-1359"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8434,7 +8482,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-285"
     },
     {
      "referenced_type" : "type-1362"
@@ -8452,7 +8500,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-890"
+     "referenced_type" : "type-882"
     },
     {
      "referenced_type" : "type-1362"
@@ -8486,7 +8534,7 @@
      "referenced_type" : "type-1146"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8502,7 +8550,7 @@
      "referenced_type" : "type-1341"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8515,10 +8563,10 @@
      "referenced_type" : "type-1359"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8534,7 +8582,7 @@
      "referenced_type" : "type-1341"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8547,10 +8595,10 @@
      "referenced_type" : "type-1359"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8560,13 +8608,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8576,13 +8624,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8592,19 +8640,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8615,16 +8663,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8635,22 +8683,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8661,16 +8709,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8680,16 +8728,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8699,10 +8747,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8712,22 +8760,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8737,19 +8785,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8759,25 +8807,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8787,19 +8835,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8809,25 +8857,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8836,10 +8884,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
-   "return_type" : "type-2390",
+   "return_type" : "type-2392",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8849,13 +8897,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8865,16 +8913,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8884,16 +8932,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8903,10 +8951,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8916,13 +8964,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8932,13 +8980,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8948,19 +8996,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8970,13 +9018,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8986,13 +9034,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9002,19 +9050,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9024,13 +9072,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9040,13 +9088,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9056,19 +9104,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9078,10 +9126,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-285"
     },
     {
      "default_arg" : true,
@@ -9098,7 +9146,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-10"
@@ -9107,7 +9155,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9117,19 +9165,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9139,16 +9187,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9158,16 +9206,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1120"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9177,13 +9225,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9193,13 +9241,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9209,10 +9257,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9222,13 +9270,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9238,13 +9286,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9254,10 +9302,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9267,10 +9315,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9280,10 +9328,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9293,13 +9341,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9309,10 +9357,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1398"
     }
    ],
-   "return_type" : "type-286",
+   "return_type" : "type-12",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9322,13 +9370,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1398"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9338,13 +9386,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1398"
     },
     {
-     "referenced_type" : "type-1394"
+     "referenced_type" : "type-1399"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9354,7 +9402,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
      "referenced_type" : "type-1250"
@@ -9369,7 +9417,7 @@
      "referenced_type" : "type-1146"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9379,13 +9427,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
      "referenced_type" : "type-1362"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9395,13 +9443,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9411,13 +9459,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
      "referenced_type" : "type-1362"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9427,13 +9475,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9443,13 +9491,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1398"
     },
     {
-     "referenced_type" : "type-1411"
+     "referenced_type" : "type-1415"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9459,13 +9507,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1398"
     },
     {
      "referenced_type" : "type-1362"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9476,7 +9524,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1398"
     },
     {
      "referenced_type" : "type-1362"
@@ -9485,7 +9533,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9495,13 +9543,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1398"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9511,13 +9559,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1398"
     },
     {
-     "referenced_type" : "type-1411"
+     "referenced_type" : "type-1415"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9527,13 +9575,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1398"
     },
     {
      "referenced_type" : "type-1362"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9544,7 +9592,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1398"
     },
     {
      "referenced_type" : "type-1362"
@@ -9553,7 +9601,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9563,25 +9611,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1398"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
    "function_name" : "android::Singleton<android::GraphicBufferMapper>::getInstance",
    "linker_set_key" : "_ZN7android9SingletonINS_19GraphicBufferMapperEE11getInstanceEv",
-   "return_type" : "type-528",
+   "return_type" : "type-525",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "function_name" : "android::Singleton<android::GraphicBufferAllocator>::getInstance",
    "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11getInstanceEv",
-   "return_type" : "type-545",
+   "return_type" : "type-542",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
@@ -9591,7 +9639,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1430"
+     "referenced_type" : "type-1434"
     }
    ],
    "return_type" : "type-6",
@@ -9604,10 +9652,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1430"
+     "referenced_type" : "type-1434"
     }
    ],
-   "return_type" : "type-124",
+   "return_type" : "type-126",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
   {
@@ -9617,16 +9665,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1430"
+     "referenced_type" : "type-1434"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
   {
@@ -9646,7 +9694,7 @@
      "referenced_type" : "type-1120"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9660,13 +9708,13 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9680,13 +9728,13 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9700,16 +9748,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "referenced_type" : "type-1120"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9723,16 +9771,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "referenced_type" : "type-1120"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9746,16 +9794,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "referenced_type" : "type-1120"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9769,16 +9817,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "referenced_type" : "type-1120"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9788,10 +9836,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-624"
+     "referenced_type" : "type-625"
     }
    ],
-   "return_type" : "type-124",
+   "return_type" : "type-126",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9801,28 +9849,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-624"
+     "referenced_type" : "type-625"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-352"
+     "referenced_type" : "type-349"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9832,7 +9880,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-624"
+     "referenced_type" : "type-625"
     }
    ],
    "return_type" : "type-637",
@@ -9845,10 +9893,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-624"
+     "referenced_type" : "type-625"
     }
    ],
-   "return_type" : "type-124",
+   "return_type" : "type-126",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9858,10 +9906,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-624"
+     "referenced_type" : "type-625"
     }
    ],
-   "return_type" : "type-629",
+   "return_type" : "type-630",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9871,7 +9919,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-624"
+     "referenced_type" : "type-625"
     },
     {
      "referenced_type" : "type-1249"
@@ -9886,7 +9934,7 @@
      "referenced_type" : "type-1146"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9896,10 +9944,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-624"
+     "referenced_type" : "type-625"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9909,13 +9957,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -9925,28 +9973,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-352"
+     "referenced_type" : "type-349"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -9956,16 +10004,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
      "referenced_type" : "type-1123"
     },
     {
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-345"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -9975,16 +10023,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -9994,19 +10042,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10016,31 +10064,31 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10051,13 +10099,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-353"
+     "referenced_type" : "type-350"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10067,25 +10115,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10095,31 +10143,31 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-255"
     },
     {
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     },
     {
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10129,13 +10177,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10145,7 +10193,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
    "return_type" : "type-6",
@@ -10161,7 +10209,7 @@
      "referenced_type" : "type-974"
     }
    ],
-   "return_type" : "type-124",
+   "return_type" : "type-126",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -10174,13 +10222,13 @@
      "referenced_type" : "type-974"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -10190,10 +10238,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-364"
+     "referenced_type" : "type-361"
     }
    ],
-   "return_type" : "type-1566",
+   "return_type" : "type-1569",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10203,34 +10251,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-364"
+     "referenced_type" : "type-361"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-126"
+    },
+    {
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-123"
-    },
-    {
-     "referenced_type" : "type-122"
-    },
-    {
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-345"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10240,7 +10288,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-364"
+     "referenced_type" : "type-361"
     }
    ],
    "return_type" : "type-6",
@@ -10253,10 +10301,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-721"
+     "referenced_type" : "type-722"
     }
    ],
-   "return_type" : "type-124",
+   "return_type" : "type-126",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -10266,13 +10314,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-721"
+     "referenced_type" : "type-722"
     },
     {
-     "referenced_type" : "type-722"
+     "referenced_type" : "type-723"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -10282,13 +10330,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1241",
@@ -10301,7 +10349,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     }
    ],
    "return_type" : "type-6",
@@ -10314,10 +10362,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10327,7 +10375,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     }
    ],
    "return_type" : "type-10",
@@ -10340,7 +10388,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     }
    ],
    "return_type" : "type-10",
@@ -10353,7 +10401,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     }
    ],
    "return_type" : "type-10",
@@ -10366,7 +10414,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     }
    ],
    "return_type" : "type-10",
@@ -10379,13 +10427,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     },
     {
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-285"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10395,16 +10443,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
-    },
-    {
      "referenced_type" : "type-2444"
     },
     {
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-2446"
+    },
+    {
+     "referenced_type" : "type-285"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10415,10 +10463,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10428,10 +10476,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10441,10 +10489,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     }
    ],
-   "return_type" : "type-2435",
+   "return_type" : "type-2437",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10454,10 +10502,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     }
    ],
-   "return_type" : "type-2428",
+   "return_type" : "type-2430",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10467,7 +10515,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     },
     {
      "referenced_type" : "type-1246"
@@ -10487,13 +10535,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
-   "return_type" : "type-2390",
+   "return_type" : "type-2392",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10503,7 +10551,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     },
     {
      "referenced_type" : "type-1051"
@@ -10519,7 +10567,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     },
     {
      "referenced_type" : "type-1055"
@@ -10535,7 +10583,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     },
     {
      "referenced_type" : "type-1279"
@@ -10551,13 +10599,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-25",
@@ -10570,10 +10618,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "return_type" : "type-1055",
@@ -10586,13 +10634,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     },
     {
-     "referenced_type" : "type-2439"
+     "referenced_type" : "type-2441"
     }
    ],
-   "return_type" : "type-2435",
+   "return_type" : "type-2437",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10640,13 +10688,13 @@
      "referenced_type" : "type-1297"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1241",
@@ -10710,7 +10758,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-124",
+   "return_type" : "type-126",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10723,7 +10771,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-286",
+   "return_type" : "type-12",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10736,7 +10784,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-124",
+   "return_type" : "type-126",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10749,7 +10797,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10774,7 +10822,7 @@
      "referenced_type" : "type-1146"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10784,13 +10832,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10800,13 +10848,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10816,19 +10864,19 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2397"
+    },
+    {
      "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10838,10 +10886,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     }
    ],
-   "return_type" : "type-124",
+   "return_type" : "type-126",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10851,10 +10899,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
    "return_type" : "type-6",
@@ -10867,7 +10915,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     }
    ],
    "return_type" : "type-1297",
@@ -10880,17 +10928,17 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-285"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10900,20 +10948,20 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
-    },
-    {
      "referenced_type" : "type-2397"
     },
     {
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-2399"
+    },
+    {
+     "referenced_type" : "type-285"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10923,7 +10971,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     }
    ],
    "return_type" : "type-1297",
@@ -10936,13 +10984,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10952,13 +11000,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10968,19 +11016,19 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2397"
+    },
+    {
      "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10990,16 +11038,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11009,7 +11057,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
      "referenced_type" : "type-1283"
@@ -11025,13 +11073,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-6",
@@ -11044,10 +11092,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
-     "referenced_type" : "type-2396"
+     "referenced_type" : "type-2398"
     }
    ],
    "return_type" : "type-1297",
@@ -11060,13 +11108,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11076,13 +11124,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11092,19 +11140,19 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2397"
+    },
+    {
      "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11114,13 +11162,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11130,13 +11178,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11146,19 +11194,19 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2397"
+    },
+    {
      "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11169,16 +11217,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11189,22 +11237,22 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2397"
+    },
+    {
      "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11215,16 +11263,16 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2397"
+    },
+    {
      "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2393"
-    },
-    {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11234,16 +11282,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11254,16 +11302,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2388"
+     "referenced_type" : "type-2390"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11274,16 +11322,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2388"
+     "referenced_type" : "type-2390"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11294,19 +11342,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2388"
+     "referenced_type" : "type-2390"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "referenced_type" : "type-1120"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11317,19 +11365,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2388"
+     "referenced_type" : "type-2390"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "referenced_type" : "type-1120"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11340,19 +11388,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2388"
+     "referenced_type" : "type-2390"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "referenced_type" : "type-1120"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11363,19 +11411,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2388"
+     "referenced_type" : "type-2390"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "referenced_type" : "type-1120"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11385,10 +11433,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1396"
+     "referenced_type" : "type-1401"
     }
    ],
-   "return_type" : "type-1383",
+   "return_type" : "type-1387",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11398,10 +11446,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1396"
+     "referenced_type" : "type-1401"
     }
    ],
-   "return_type" : "type-286",
+   "return_type" : "type-12",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11411,7 +11459,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1396"
+     "referenced_type" : "type-1401"
     }
    ],
    "return_type" : "type-6",
@@ -11424,10 +11472,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1394"
     }
    ],
-   "return_type" : "type-124",
+   "return_type" : "type-126",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11437,10 +11485,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1394"
     }
    ],
-   "return_type" : "type-124",
+   "return_type" : "type-126",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11450,7 +11498,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1394"
     },
     {
      "referenced_type" : "type-1249"
@@ -11465,24 +11513,24 @@
      "referenced_type" : "type-1146"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   }
  ],
  "global_vars" :
  [
   {
-   "access" : "private",
+   "access" : "protected",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocator10sAllocListE",
    "name" : "android::GraphicBufferAllocator::sAllocList",
-   "referenced_type" : "type-1570",
+   "referenced_type" : "type-1573",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocator5sLockE",
    "name" : "android::GraphicBufferAllocator::sLock",
-   "referenced_type" : "type-254",
+   "referenced_type" : "type-282",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -11518,41 +11566,41 @@
   {
    "linker_set_key" : "_ZN7android6Region14INVALID_REGIONE",
    "name" : "android::Region::INVALID_REGION",
-   "referenced_type" : "type-2389",
+   "referenced_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
    "linker_set_key" : "_ZN7android9FenceTime8NO_FENCEE",
    "name" : "android::FenceTime::NO_FENCE",
-   "referenced_type" : "type-1391",
+   "referenced_type" : "type-1395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_19GraphicBufferMapperEE5sLockE",
    "name" : "android::Singleton<android::GraphicBufferMapper>::sLock",
-   "referenced_type" : "type-254",
+   "referenced_type" : "type-282",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_19GraphicBufferMapperEE9sInstanceE",
    "name" : "android::Singleton<android::GraphicBufferMapper>::sInstance",
-   "referenced_type" : "type-541",
+   "referenced_type" : "type-538",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE5sLockE",
    "name" : "android::Singleton<android::GraphicBufferAllocator>::sLock",
-   "referenced_type" : "type-254",
+   "referenced_type" : "type-282",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE9sInstanceE",
    "name" : "android::Singleton<android::GraphicBufferAllocator>::sInstance",
-   "referenced_type" : "type-546",
+   "referenced_type" : "type-543",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   }
  ],
@@ -11562,8 +11610,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::FenceTime::Snapshot &",
    "name" : "android::FenceTime::Snapshot &",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1387",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1392",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -11571,8 +11619,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::FenceTime::Snapshot::State &",
    "name" : "android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1409",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1413",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -11580,8 +11628,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferAllocator &",
    "name" : "android::GraphicBufferAllocator &",
-   "referenced_type" : "type-543",
-   "self_type" : "type-545",
+   "referenced_type" : "type-540",
+   "self_type" : "type-542",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -11589,8 +11637,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-529",
-   "self_type" : "type-528",
+   "referenced_type" : "type-526",
+   "self_type" : "type-525",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -11598,7 +11646,7 @@
    "alignment" : 8,
    "linker_set_key" : "android::HdrCapabilities &",
    "name" : "android::HdrCapabilities &",
-   "referenced_type" : "type-960",
+   "referenced_type" : "type-962",
    "self_type" : "type-972",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
@@ -11607,8 +11655,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Mutex &",
    "name" : "android::Mutex &",
-   "referenced_type" : "type-254",
-   "self_type" : "type-258",
+   "referenced_type" : "type-282",
+   "self_type" : "type-1378",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -11625,8 +11673,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RWLock &",
    "name" : "android::RWLock &",
-   "referenced_type" : "type-264",
-   "self_type" : "type-268",
+   "referenced_type" : "type-260",
+   "self_type" : "type-264",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -11643,8 +11691,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Region &",
    "name" : "android::Region &",
-   "referenced_type" : "type-2390",
-   "self_type" : "type-2394",
+   "referenced_type" : "type-2392",
+   "self_type" : "type-2396",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -11652,8 +11700,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
-   "referenced_type" : "type-178",
-   "self_type" : "type-187",
+   "referenced_type" : "type-180",
+   "self_type" : "type-189",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -11661,8 +11709,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
-   "referenced_type" : "type-287",
-   "self_type" : "type-893",
+   "referenced_type" : "type-284",
+   "self_type" : "type-891",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -11670,8 +11718,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Vector<android::Rect> &",
    "name" : "android::Vector<android::Rect> &",
-   "referenced_type" : "type-2383",
-   "self_type" : "type-2387",
+   "referenced_type" : "type-2385",
+   "self_type" : "type-2389",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -11688,8 +11736,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TMat44<float> &",
    "name" : "android::details::TMat44<float> &",
-   "referenced_type" : "type-2428",
-   "self_type" : "type-2434",
+   "referenced_type" : "type-2430",
+   "self_type" : "type-2436",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -11697,8 +11745,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TQuaternion<double> &",
    "name" : "android::details::TQuaternion<double> &",
-   "referenced_type" : "type-340",
-   "self_type" : "type-411",
+   "referenced_type" : "type-336",
+   "self_type" : "type-408",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -11706,8 +11754,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TQuaternion<float> &",
    "name" : "android::details::TQuaternion<float> &",
-   "referenced_type" : "type-415",
-   "self_type" : "type-446",
+   "referenced_type" : "type-411",
+   "self_type" : "type-439",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -11724,7 +11772,7 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TVec2<double> &",
    "name" : "android::details::TVec2<double> &",
-   "referenced_type" : "type-62",
+   "referenced_type" : "type-57",
    "self_type" : "type-1092",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -11742,8 +11790,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TVec3<double> &",
    "name" : "android::details::TVec3<double> &",
-   "referenced_type" : "type-73",
-   "self_type" : "type-1400",
+   "referenced_type" : "type-68",
+   "self_type" : "type-1397",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
   },
@@ -11760,8 +11808,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TVec4<double> &",
    "name" : "android::details::TVec4<double> &",
-   "referenced_type" : "type-57",
-   "self_type" : "type-199",
+   "referenced_type" : "type-52",
+   "self_type" : "type-192",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -11769,8 +11817,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TVec4<float> &",
    "name" : "android::details::TVec4<float> &",
-   "referenced_type" : "type-218",
-   "self_type" : "type-332",
+   "referenced_type" : "type-203",
+   "self_type" : "type-329",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -11778,8 +11826,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &",
-   "referenced_type" : "type-99",
-   "self_type" : "type-108",
+   "referenced_type" : "type-101",
+   "self_type" : "type-110",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11787,8 +11835,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &",
-   "referenced_type" : "type-394",
-   "self_type" : "type-401",
+   "referenced_type" : "type-393",
+   "self_type" : "type-398",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11796,8 +11844,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &",
-   "referenced_type" : "type-111",
-   "self_type" : "type-114",
+   "referenced_type" : "type-113",
+   "self_type" : "type-116",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11814,7 +11862,7 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Status &",
    "name" : "android::hardware::Status &",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1312",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -11823,8 +11871,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1658",
-   "self_type" : "type-1657",
+   "referenced_type" : "type-1662",
+   "self_type" : "type-1661",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11832,8 +11880,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1872",
-   "self_type" : "type-1871",
+   "referenced_type" : "type-1873",
+   "self_type" : "type-1872",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11841,8 +11889,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1949",
-   "self_type" : "type-1948",
+   "referenced_type" : "type-1951",
+   "self_type" : "type-1950",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11850,8 +11898,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-231",
-   "self_type" : "type-230",
+   "referenced_type" : "type-233",
+   "self_type" : "type-232",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11859,8 +11907,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-432",
-   "self_type" : "type-431",
+   "referenced_type" : "type-429",
+   "self_type" : "type-428",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11868,8 +11916,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int> &",
    "name" : "android::hardware::details::hidl_pointer<unsigned int> &",
-   "referenced_type" : "type-120",
-   "self_type" : "type-177",
+   "referenced_type" : "type-122",
+   "self_type" : "type-179",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11886,8 +11934,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned int> &",
    "name" : "android::hardware::hidl_vec<unsigned int> &",
-   "referenced_type" : "type-128",
-   "self_type" : "type-130",
+   "referenced_type" : "type-130",
+   "self_type" : "type-132",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11905,7 +11953,7 @@
    "linker_set_key" : "android::sp<android::Fence> &",
    "name" : "android::sp<android::Fence> &",
    "referenced_type" : "type-1358",
-   "self_type" : "type-1412",
+   "self_type" : "type-1416",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11913,8 +11961,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &",
-   "referenced_type" : "type-357",
-   "self_type" : "type-379",
+   "referenced_type" : "type-354",
+   "self_type" : "type-376",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11922,8 +11970,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &",
-   "referenced_type" : "type-485",
-   "self_type" : "type-491",
+   "referenced_type" : "type-482",
+   "self_type" : "type-488",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11931,8 +11979,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &",
-   "referenced_type" : "type-334",
-   "self_type" : "type-387",
+   "referenced_type" : "type-331",
+   "self_type" : "type-384",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11940,8 +11988,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
-   "referenced_type" : "type-53",
-   "self_type" : "type-93",
+   "referenced_type" : "type-88",
+   "self_type" : "type-95",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11949,8 +11997,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &",
-   "referenced_type" : "type-498",
-   "self_type" : "type-504",
+   "referenced_type" : "type-496",
+   "self_type" : "type-501",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11958,8 +12006,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ui::Transform &",
    "name" : "android::ui::Transform &",
-   "referenced_type" : "type-2435",
-   "self_type" : "type-2443",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2445",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -11982,49 +12030,49 @@
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-1771",
-   "self_type" : "type-1773",
+   "referenced_type" : "type-1772",
+   "self_type" : "type-1774",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-2134",
-   "self_type" : "type-2166",
+   "referenced_type" : "type-2133",
+   "self_type" : "type-2168",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-2408",
-   "self_type" : "type-2410",
+   "referenced_type" : "type-2410",
+   "self_type" : "type-2412",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-1762",
-   "self_type" : "type-1764",
+   "referenced_type" : "type-1763",
+   "self_type" : "type-1765",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-2046",
-   "self_type" : "type-2057",
+   "referenced_type" : "type-2045",
+   "self_type" : "type-2055",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-2425",
-   "self_type" : "type-2427",
+   "referenced_type" : "type-2427",
+   "self_type" : "type-2429",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-965",
+   "referenced_type" : "type-959",
    "self_type" : "type-975",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
@@ -12041,7 +12089,7 @@
    "alignment" : 8,
    "linker_set_key" : "const android::ColorSpace::TransferParameters &",
    "name" : "const android::ColorSpace::TransferParameters &",
-   "referenced_type" : "type-1034",
+   "referenced_type" : "type-1031",
    "self_type" : "type-1042",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
@@ -12050,8 +12098,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::FenceTime::Snapshot &",
    "name" : "const android::FenceTime::Snapshot &",
-   "referenced_type" : "type-1388",
-   "self_type" : "type-1394",
+   "referenced_type" : "type-1393",
+   "self_type" : "type-1399",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -12059,8 +12107,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-1407",
-   "self_type" : "type-1408",
+   "referenced_type" : "type-1411",
+   "self_type" : "type-1412",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -12077,8 +12125,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Gralloc2Mapper &",
    "name" : "const android::Gralloc2Mapper &",
-   "referenced_type" : "type-346",
-   "self_type" : "type-356",
+   "referenced_type" : "type-343",
+   "self_type" : "type-353",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -12086,8 +12134,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-2060",
-   "self_type" : "type-2059",
+   "referenced_type" : "type-2062",
+   "self_type" : "type-2061",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12095,8 +12143,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-2226",
-   "self_type" : "type-2225",
+   "referenced_type" : "type-2229",
+   "self_type" : "type-2228",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12104,8 +12152,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-2230",
-   "self_type" : "type-2229",
+   "referenced_type" : "type-2232",
+   "self_type" : "type-2231",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12131,8 +12179,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-828",
-   "self_type" : "type-827",
+   "referenced_type" : "type-829",
+   "self_type" : "type-828",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12141,7 +12189,7 @@
    "linker_set_key" : "const android::GraphicBufferAllocator::alloc_rec_t &",
    "name" : "const android::GraphicBufferAllocator::alloc_rec_t &",
    "referenced_type" : "type-706",
-   "self_type" : "type-707",
+   "self_type" : "type-708",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12149,7 +12197,7 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBufferMapper &",
    "name" : "const android::GraphicBufferMapper &",
-   "referenced_type" : "type-615",
+   "referenced_type" : "type-616",
    "self_type" : "type-632",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
@@ -12176,8 +12224,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Region &",
    "name" : "const android::Region &",
-   "referenced_type" : "type-2389",
-   "self_type" : "type-2393",
+   "referenced_type" : "type-2391",
+   "self_type" : "type-2395",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -12185,8 +12233,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-183",
-   "self_type" : "type-186",
+   "referenced_type" : "type-186",
+   "self_type" : "type-188",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -12194,8 +12242,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::String8 &",
    "name" : "const android::String8 &",
-   "referenced_type" : "type-876",
-   "self_type" : "type-890",
+   "referenced_type" : "type-866",
+   "self_type" : "type-882",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -12203,8 +12251,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Vector<android::Rect> &",
    "name" : "const android::Vector<android::Rect> &",
-   "referenced_type" : "type-2385",
-   "self_type" : "type-2386",
+   "referenced_type" : "type-2387",
+   "self_type" : "type-2388",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -12212,8 +12260,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::details::TMat33<float> &",
    "name" : "const android::details::TMat33<float> &",
-   "referenced_type" : "type-928",
-   "self_type" : "type-935",
+   "referenced_type" : "type-920",
+   "self_type" : "type-929",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -12221,8 +12269,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::details::TMat44<float> &",
    "name" : "const android::details::TMat44<float> &",
-   "referenced_type" : "type-2432",
-   "self_type" : "type-2433",
+   "referenced_type" : "type-2434",
+   "self_type" : "type-2435",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -12230,8 +12278,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::details::TQuaternion<double> &",
    "name" : "const android::details::TQuaternion<double> &",
-   "referenced_type" : "type-406",
-   "self_type" : "type-407",
+   "referenced_type" : "type-403",
+   "self_type" : "type-404",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -12239,8 +12287,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::details::TQuaternion<float> &",
    "name" : "const android::details::TQuaternion<float> &",
-   "referenced_type" : "type-434",
-   "self_type" : "type-439",
+   "referenced_type" : "type-431",
+   "self_type" : "type-436",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -12293,8 +12341,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::details::TVec4<double> &",
    "name" : "const android::details::TVec4<double> &",
-   "referenced_type" : "type-176",
-   "self_type" : "type-185",
+   "referenced_type" : "type-171",
+   "self_type" : "type-184",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -12302,8 +12350,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::details::TVec4<float> &",
    "name" : "const android::details::TVec4<float> &",
-   "referenced_type" : "type-327",
-   "self_type" : "type-331",
+   "referenced_type" : "type-324",
+   "self_type" : "type-328",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -12311,8 +12359,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-232",
-   "self_type" : "type-233",
+   "referenced_type" : "type-234",
+   "self_type" : "type-235",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -12374,8 +12422,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned int> &",
    "name" : "const android::hardware::hidl_vec<unsigned int> &",
-   "referenced_type" : "type-131",
-   "self_type" : "type-132",
+   "referenced_type" : "type-133",
+   "self_type" : "type-134",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12393,7 +12441,7 @@
    "linker_set_key" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> &",
    "name" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> &",
    "referenced_type" : "type-693",
-   "self_type" : "type-695",
+   "self_type" : "type-698",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12410,8 +12458,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
    "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-275",
-   "self_type" : "type-274",
+   "referenced_type" : "type-271",
+   "self_type" : "type-270",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -12419,8 +12467,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
-   "referenced_type" : "type-91",
-   "self_type" : "type-92",
+   "referenced_type" : "type-93",
+   "self_type" : "type-94",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12446,8 +12494,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::ui::Transform &",
    "name" : "const android::ui::Transform &",
-   "referenced_type" : "type-2438",
-   "self_type" : "type-2439",
+   "referenced_type" : "type-2440",
+   "self_type" : "type-2441",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -12455,7 +12503,7 @@
    "alignment" : 8,
    "linker_set_key" : "const bool &",
    "name" : "const bool &",
-   "referenced_type" : "type-372",
+   "referenced_type" : "type-369",
    "self_type" : "type-1287",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -12464,7 +12512,7 @@
    "alignment" : 8,
    "linker_set_key" : "const double &",
    "name" : "const double &",
-   "referenced_type" : "type-854",
+   "referenced_type" : "type-851",
    "self_type" : "type-860",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -12473,7 +12521,7 @@
    "alignment" : 8,
    "linker_set_key" : "const float &",
    "name" : "const float &",
-   "referenced_type" : "type-564",
+   "referenced_type" : "type-561",
    "self_type" : "type-1226",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -12488,8 +12536,8 @@
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-1774",
-   "self_type" : "type-1776",
+   "referenced_type" : "type-1775",
+   "self_type" : "type-1777",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
@@ -12502,16 +12550,16 @@
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-2414",
-   "self_type" : "type-2416",
+   "referenced_type" : "type-2416",
+   "self_type" : "type-2418",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "const int &",
    "name" : "const int &",
-   "referenced_type" : "type-563",
-   "self_type" : "type-838",
+   "referenced_type" : "type-560",
+   "self_type" : "type-836",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12534,127 +12582,127 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-125",
-   "self_type" : "type-127",
+   "referenced_type" : "type-127",
+   "self_type" : "type-129",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1575",
-   "self_type" : "type-1578",
+   "referenced_type" : "type-1580",
+   "self_type" : "type-1582",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1611",
-   "self_type" : "type-1613",
+   "referenced_type" : "type-1615",
+   "self_type" : "type-1617",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-17",
-   "self_type" : "type-38",
+   "referenced_type" : "type-1786",
+   "self_type" : "type-1788",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1785",
-   "self_type" : "type-1787",
+   "referenced_type" : "type-1848",
+   "self_type" : "type-1850",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1847",
-   "self_type" : "type-1849",
+   "referenced_type" : "type-1867",
+   "self_type" : "type-1869",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1866",
-   "self_type" : "type-1868",
+   "referenced_type" : "type-1935",
+   "self_type" : "type-1937",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1933",
-   "self_type" : "type-1935",
+   "referenced_type" : "type-2082",
+   "self_type" : "type-2084",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2080",
-   "self_type" : "type-2082",
+   "referenced_type" : "type-2174",
+   "self_type" : "type-2177",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2171",
-   "self_type" : "type-2174",
+   "referenced_type" : "type-2250",
+   "self_type" : "type-2252",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2248",
-   "self_type" : "type-2250",
+   "referenced_type" : "type-2292",
+   "self_type" : "type-2294",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2290",
-   "self_type" : "type-2292",
+   "referenced_type" : "type-2343",
+   "self_type" : "type-2345",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2341",
-   "self_type" : "type-2343",
+   "referenced_type" : "type-2475",
+   "self_type" : "type-2477",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2473",
-   "self_type" : "type-2475",
+   "referenced_type" : "type-38",
+   "self_type" : "type-40",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-412",
-   "self_type" : "type-414",
+   "referenced_type" : "type-409",
+   "self_type" : "type-417",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
    "referenced_type" : "type-642",
-   "self_type" : "type-644",
+   "self_type" : "type-645",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-748",
+   "referenced_type" : "type-749",
    "self_type" : "type-751",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-855",
-   "self_type" : "type-857",
+   "referenced_type" : "type-857",
+   "self_type" : "type-859",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12693,8 +12741,8 @@
    "alignment" : 8,
    "linker_set_key" : "const native_handle *const &",
    "name" : "const native_handle *const &",
-   "referenced_type" : "type-696",
-   "self_type" : "type-697",
+   "referenced_type" : "type-699",
+   "self_type" : "type-700",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12702,8 +12750,8 @@
    "alignment" : 8,
    "linker_set_key" : "const short &",
    "name" : "const short &",
-   "referenced_type" : "type-826",
-   "self_type" : "type-830",
+   "referenced_type" : "type-825",
+   "self_type" : "type-827",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12729,8 +12777,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3> &",
    "name" : "const std::array<android::details::TVec2<float>, 3> &",
-   "referenced_type" : "type-1768",
-   "self_type" : "type-1770",
+   "referenced_type" : "type-1769",
+   "self_type" : "type-1771",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12738,8 +12786,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3> &",
    "name" : "const std::array<android::details::TVec2<float>, 3> &",
-   "referenced_type" : "type-2120",
-   "self_type" : "type-2130",
+   "referenced_type" : "type-2118",
+   "self_type" : "type-2126",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12747,8 +12795,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1018",
-   "self_type" : "type-1030",
+   "referenced_type" : "type-1008",
+   "self_type" : "type-1026",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12756,8 +12804,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1765",
-   "self_type" : "type-1767",
+   "referenced_type" : "type-1766",
+   "self_type" : "type-1768",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12765,7 +12813,7 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2102",
+   "referenced_type" : "type-2100",
    "self_type" : "type-2114",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
@@ -12783,8 +12831,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::function<float (float)> &",
    "name" : "const std::function<float (float)> &",
-   "referenced_type" : "type-1777",
-   "self_type" : "type-1779",
+   "referenced_type" : "type-1778",
+   "self_type" : "type-1780",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -12792,8 +12840,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::function<float (float)> &",
    "name" : "const std::function<float (float)> &",
-   "referenced_type" : "type-2223",
-   "self_type" : "type-2228",
+   "referenced_type" : "type-2225",
+   "self_type" : "type-2227",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -12801,8 +12849,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-1391",
-   "self_type" : "type-1402",
+   "referenced_type" : "type-1395",
+   "self_type" : "type-1406",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -12810,8 +12858,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-1839",
-   "self_type" : "type-1841",
+   "referenced_type" : "type-1840",
+   "self_type" : "type-1842",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -12819,8 +12867,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-2663",
-   "self_type" : "type-2671",
+   "referenced_type" : "type-2668",
+   "self_type" : "type-2676",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -12828,8 +12876,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> > &",
    "name" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> > &",
-   "referenced_type" : "type-2331",
-   "self_type" : "type-2333",
+   "referenced_type" : "type-2333",
+   "self_type" : "type-2335",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -12846,8 +12894,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1032",
-   "self_type" : "type-1031",
+   "referenced_type" : "type-1033",
+   "self_type" : "type-1032",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12864,8 +12912,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1581",
-   "self_type" : "type-1580",
+   "referenced_type" : "type-1585",
+   "self_type" : "type-1584",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12873,8 +12921,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1711",
-   "self_type" : "type-1710",
+   "referenced_type" : "type-1712",
+   "self_type" : "type-1711",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12882,8 +12930,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1825",
-   "self_type" : "type-1824",
+   "referenced_type" : "type-1826",
+   "self_type" : "type-1825",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12891,8 +12939,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1851",
-   "self_type" : "type-1850",
+   "referenced_type" : "type-1852",
+   "self_type" : "type-1851",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12900,8 +12948,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1902",
-   "self_type" : "type-1901",
+   "referenced_type" : "type-1903",
+   "self_type" : "type-1902",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12909,8 +12957,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1994",
-   "self_type" : "type-1993",
+   "referenced_type" : "type-1995",
+   "self_type" : "type-1994",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12918,8 +12966,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2075",
-   "self_type" : "type-2074",
+   "referenced_type" : "type-2077",
+   "self_type" : "type-2076",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12927,8 +12975,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2150",
-   "self_type" : "type-2149",
+   "referenced_type" : "type-2153",
+   "self_type" : "type-2152",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12936,8 +12984,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2233",
-   "self_type" : "type-2232",
+   "referenced_type" : "type-2235",
+   "self_type" : "type-2234",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12945,8 +12993,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2328",
-   "self_type" : "type-2327",
+   "referenced_type" : "type-2330",
+   "self_type" : "type-2329",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12954,8 +13002,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2379",
-   "self_type" : "type-2378",
+   "referenced_type" : "type-2381",
+   "self_type" : "type-2380",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12963,8 +13011,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2566",
-   "self_type" : "type-2565",
+   "referenced_type" : "type-2568",
+   "self_type" : "type-2567",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12972,8 +13020,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-329",
-   "self_type" : "type-328",
+   "referenced_type" : "type-326",
+   "self_type" : "type-325",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12981,8 +13029,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-42",
-   "self_type" : "type-41",
+   "referenced_type" : "type-46",
+   "self_type" : "type-45",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12990,8 +13038,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-479",
-   "self_type" : "type-478",
+   "referenced_type" : "type-476",
+   "self_type" : "type-475",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13008,8 +13056,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-726",
-   "self_type" : "type-725",
+   "referenced_type" : "type-727",
+   "self_type" : "type-726",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13017,8 +13065,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-833",
-   "self_type" : "type-832",
+   "referenced_type" : "type-834",
+   "self_type" : "type-833",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13026,8 +13074,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-963",
-   "self_type" : "type-962",
+   "referenced_type" : "type-965",
+   "self_type" : "type-964",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13035,8 +13083,8 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned char &",
    "name" : "const unsigned char &",
-   "referenced_type" : "type-214",
-   "self_type" : "type-823",
+   "referenced_type" : "type-227",
+   "self_type" : "type-814",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13044,7 +13092,7 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned int &",
    "name" : "const unsigned int &",
-   "referenced_type" : "type-237",
+   "referenced_type" : "type-239",
    "self_type" : "type-847",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -13053,8 +13101,8 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned long &",
    "name" : "const unsigned long &",
-   "referenced_type" : "type-238",
-   "self_type" : "type-852",
+   "referenced_type" : "type-240",
+   "self_type" : "type-850",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13063,7 +13111,7 @@
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
    "referenced_type" : "type-831",
-   "self_type" : "type-835",
+   "self_type" : "type-832",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13089,7 +13137,7 @@
    "alignment" : 8,
    "linker_set_key" : "int &",
    "name" : "int &",
-   "referenced_type" : "type-103",
+   "referenced_type" : "type-105",
    "self_type" : "type-1145",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
@@ -13098,7 +13146,7 @@
    "alignment" : 8,
    "linker_set_key" : "int *&",
    "name" : "int *&",
-   "referenced_type" : "type-596",
+   "referenced_type" : "type-593",
    "self_type" : "type-1347",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
@@ -13107,8 +13155,8 @@
    "alignment" : 8,
    "linker_set_key" : "long &",
    "name" : "long &",
-   "referenced_type" : "type-286",
-   "self_type" : "type-1410",
+   "referenced_type" : "type-12",
+   "self_type" : "type-1414",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -13116,8 +13164,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-1753",
-   "self_type" : "type-1752",
+   "referenced_type" : "type-1754",
+   "self_type" : "type-1753",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13125,8 +13173,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-1854",
-   "self_type" : "type-1853",
+   "referenced_type" : "type-1855",
+   "self_type" : "type-1854",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13134,8 +13182,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-2418",
-   "self_type" : "type-2417",
+   "referenced_type" : "type-2420",
+   "self_type" : "type-2419",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13143,8 +13191,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-703",
-   "self_type" : "type-702",
+   "referenced_type" : "type-696",
+   "self_type" : "type-695",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13152,8 +13200,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2148",
-   "self_type" : "type-2147",
+   "referenced_type" : "type-2151",
+   "self_type" : "type-2150",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -13161,8 +13209,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2398",
-   "self_type" : "type-2397",
+   "referenced_type" : "type-2400",
+   "self_type" : "type-2399",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -13170,8 +13218,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2445",
-   "self_type" : "type-2444",
+   "referenced_type" : "type-2447",
+   "self_type" : "type-2446",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -13179,8 +13227,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2450",
-   "self_type" : "type-2449",
+   "referenced_type" : "type-2452",
+   "self_type" : "type-2451",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/UiConfig.h"
   },
@@ -13188,8 +13236,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-723",
-   "self_type" : "type-722",
+   "referenced_type" : "type-724",
+   "self_type" : "type-723",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -13197,7 +13245,7 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned int &",
    "name" : "unsigned int &",
-   "referenced_type" : "type-123",
+   "referenced_type" : "type-125",
    "self_type" : "type-1354",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
@@ -13206,7 +13254,7 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned long &",
    "name" : "unsigned long &",
-   "referenced_type" : "type-124",
+   "referenced_type" : "type-126",
    "self_type" : "type-1146",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
@@ -13215,7 +13263,7 @@
    "alignment" : 8,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-217",
+   "referenced_type" : "type-230",
    "self_type" : "type-1249",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
@@ -13227,8 +13275,8 @@
    "alignment" : 8,
    "linker_set_key" : "AHardwareBuffer *",
    "name" : "AHardwareBuffer *",
-   "referenced_type" : "type-2067",
-   "self_type" : "type-2066",
+   "referenced_type" : "type-2070",
+   "self_type" : "type-2069",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -13236,8 +13284,8 @@
    "alignment" : 8,
    "linker_set_key" : "AHardwareBuffer *",
    "name" : "AHardwareBuffer *",
-   "referenced_type" : "type-623",
-   "self_type" : "type-622",
+   "referenced_type" : "type-624",
+   "self_type" : "type-623",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -13245,7 +13293,7 @@
    "alignment" : 8,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-519",
+   "referenced_type" : "type-516",
    "self_type" : "type-637",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
@@ -13272,8 +13320,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1833",
-   "self_type" : "type-1832",
+   "referenced_type" : "type-1834",
+   "self_type" : "type-1833",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13281,8 +13329,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1838",
-   "self_type" : "type-1837",
+   "referenced_type" : "type-1839",
+   "self_type" : "type-1838",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13290,8 +13338,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2631",
-   "self_type" : "type-2630",
+   "referenced_type" : "type-2633",
+   "self_type" : "type-2632",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13299,8 +13347,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2654",
-   "self_type" : "type-2653",
+   "referenced_type" : "type-2656",
+   "self_type" : "type-2655",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13317,8 +13365,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1414",
-   "self_type" : "type-1413",
+   "referenced_type" : "type-1418",
+   "self_type" : "type-1417",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13326,8 +13374,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1828",
-   "self_type" : "type-1827",
+   "referenced_type" : "type-1829",
+   "self_type" : "type-1828",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13335,8 +13383,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1843",
-   "self_type" : "type-1842",
+   "referenced_type" : "type-1844",
+   "self_type" : "type-1843",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13344,8 +13392,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2622",
-   "self_type" : "type-2621",
+   "referenced_type" : "type-2624",
+   "self_type" : "type-2623",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13353,8 +13401,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2680",
-   "self_type" : "type-2679",
+   "referenced_type" : "type-2685",
+   "self_type" : "type-2684",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13371,8 +13419,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
    "name" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
-   "referenced_type" : "type-518",
-   "self_type" : "type-539",
+   "referenced_type" : "type-515",
+   "self_type" : "type-536",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
   },
@@ -13381,7 +13429,7 @@
    "linker_set_key" : "android::ColorSpace *",
    "name" : "android::ColorSpace *",
    "referenced_type" : "type-980",
-   "self_type" : "type-1007",
+   "self_type" : "type-1003",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -13398,8 +13446,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Condition *",
    "name" : "android::Condition *",
-   "referenced_type" : "type-260",
-   "self_type" : "type-263",
+   "referenced_type" : "type-256",
+   "self_type" : "type-259",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Condition.h"
   },
@@ -13416,8 +13464,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::FenceTime *",
    "name" : "android::FenceTime *",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1393",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1398",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13425,8 +13473,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::FenceTime::Snapshot *",
    "name" : "android::FenceTime::Snapshot *",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1382",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1386",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13434,8 +13482,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::FenceTimeline *",
    "name" : "android::FenceTimeline *",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1401",
+   "referenced_type" : "type-1402",
+   "self_type" : "type-1405",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13443,8 +13491,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::FenceToFenceTimeMap *",
    "name" : "android::FenceToFenceTimeMap *",
-   "referenced_type" : "type-1403",
-   "self_type" : "type-1406",
+   "referenced_type" : "type-1407",
+   "self_type" : "type-1410",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13461,8 +13509,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::FrameStats *",
    "name" : "android::FrameStats *",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1428",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1432",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
@@ -13470,8 +13518,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Gralloc2Allocator *",
    "name" : "android::Gralloc2Allocator *",
-   "referenced_type" : "type-355",
-   "self_type" : "type-362",
+   "referenced_type" : "type-352",
+   "self_type" : "type-359",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -13479,8 +13527,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Gralloc2Mapper *",
    "name" : "android::Gralloc2Mapper *",
-   "referenced_type" : "type-333",
-   "self_type" : "type-339",
+   "referenced_type" : "type-330",
+   "self_type" : "type-342",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -13488,8 +13536,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-527",
-   "self_type" : "type-681",
+   "referenced_type" : "type-524",
+   "self_type" : "type-680",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13497,8 +13545,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferAllocator *",
    "name" : "android::GraphicBufferAllocator *",
-   "referenced_type" : "type-543",
-   "self_type" : "type-546",
+   "referenced_type" : "type-540",
+   "self_type" : "type-543",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -13506,8 +13554,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-529",
-   "self_type" : "type-541",
+   "referenced_type" : "type-526",
+   "self_type" : "type-538",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -13515,7 +13563,7 @@
    "alignment" : 8,
    "linker_set_key" : "android::HdrCapabilities *",
    "name" : "android::HdrCapabilities *",
-   "referenced_type" : "type-960",
+   "referenced_type" : "type-962",
    "self_type" : "type-967",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
@@ -13524,8 +13572,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1679",
-   "self_type" : "type-1678",
+   "referenced_type" : "type-1680",
+   "self_type" : "type-1679",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13533,8 +13581,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1874",
-   "self_type" : "type-1873",
+   "referenced_type" : "type-1875",
+   "self_type" : "type-1874",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13542,8 +13590,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1953",
-   "self_type" : "type-1952",
+   "referenced_type" : "type-1954",
+   "self_type" : "type-1953",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13551,8 +13599,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-294",
-   "self_type" : "type-293",
+   "referenced_type" : "type-291",
+   "self_type" : "type-290",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13560,8 +13608,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-438",
-   "self_type" : "type-437",
+   "referenced_type" : "type-435",
+   "self_type" : "type-434",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13569,8 +13617,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
-   "referenced_type" : "type-715",
-   "self_type" : "type-716",
+   "referenced_type" : "type-716",
+   "self_type" : "type-717",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -13579,7 +13627,7 @@
    "linker_set_key" : "android::LightFlattenablePod<android::Rect> *",
    "name" : "android::LightFlattenablePod<android::Rect> *",
    "referenced_type" : "type-1243",
-   "self_type" : "type-2401",
+   "self_type" : "type-2403",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -13596,8 +13644,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Mutex *",
    "name" : "android::Mutex *",
-   "referenced_type" : "type-254",
-   "self_type" : "type-256",
+   "referenced_type" : "type-282",
+   "self_type" : "type-1376",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -13605,8 +13653,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Mutex::Autolock *",
    "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-257",
-   "self_type" : "type-259",
+   "referenced_type" : "type-1377",
+   "self_type" : "type-1380",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -13623,8 +13671,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RWLock *",
    "name" : "android::RWLock *",
-   "referenced_type" : "type-264",
-   "self_type" : "type-266",
+   "referenced_type" : "type-260",
+   "self_type" : "type-262",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -13632,8 +13680,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RWLock::AutoRLock *",
    "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-267",
-   "self_type" : "type-269",
+   "referenced_type" : "type-263",
+   "self_type" : "type-265",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -13641,8 +13689,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RWLock::AutoWLock *",
    "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-270",
-   "self_type" : "type-271",
+   "referenced_type" : "type-266",
+   "self_type" : "type-267",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -13659,8 +13707,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase *",
    "name" : "android::RefBase *",
-   "referenced_type" : "type-171",
-   "self_type" : "type-248",
+   "referenced_type" : "type-174",
+   "self_type" : "type-250",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13668,8 +13716,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-118",
-   "self_type" : "type-117",
+   "referenced_type" : "type-120",
+   "self_type" : "type-119",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13695,8 +13743,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-14",
-   "self_type" : "type-13",
+   "referenced_type" : "type-1577",
+   "self_type" : "type-1576",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13704,8 +13752,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1573",
-   "self_type" : "type-1572",
+   "referenced_type" : "type-16",
+   "self_type" : "type-15",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13713,8 +13761,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1608",
-   "self_type" : "type-1607",
+   "referenced_type" : "type-1612",
+   "self_type" : "type-1611",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13722,8 +13770,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-174",
-   "self_type" : "type-173",
+   "referenced_type" : "type-177",
+   "self_type" : "type-176",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13731,8 +13779,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1782",
-   "self_type" : "type-1781",
+   "referenced_type" : "type-1783",
+   "self_type" : "type-1782",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13740,8 +13788,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1830",
-   "self_type" : "type-1829",
+   "referenced_type" : "type-1831",
+   "self_type" : "type-1830",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13749,8 +13797,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1835",
-   "self_type" : "type-1834",
+   "referenced_type" : "type-1836",
+   "self_type" : "type-1835",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13758,8 +13806,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1845",
-   "self_type" : "type-1844",
+   "referenced_type" : "type-1846",
+   "self_type" : "type-1845",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13767,8 +13815,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1864",
-   "self_type" : "type-1863",
+   "referenced_type" : "type-1865",
+   "self_type" : "type-1864",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13776,8 +13824,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1930",
-   "self_type" : "type-1929",
+   "referenced_type" : "type-1931",
+   "self_type" : "type-1930",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13785,8 +13833,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2016",
-   "self_type" : "type-2015",
+   "referenced_type" : "type-2017",
+   "self_type" : "type-2016",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13794,8 +13842,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2168",
-   "self_type" : "type-2167",
+   "referenced_type" : "type-2171",
+   "self_type" : "type-2170",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13803,8 +13851,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2246",
-   "self_type" : "type-2245",
+   "referenced_type" : "type-2248",
+   "self_type" : "type-2247",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13812,8 +13860,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2288",
-   "self_type" : "type-2287",
+   "referenced_type" : "type-2290",
+   "self_type" : "type-2289",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13821,8 +13869,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2339",
-   "self_type" : "type-2338",
+   "referenced_type" : "type-2341",
+   "self_type" : "type-2340",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13830,8 +13878,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2458",
-   "self_type" : "type-2457",
+   "referenced_type" : "type-2460",
+   "self_type" : "type-2459",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13839,8 +13887,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2624",
-   "self_type" : "type-2623",
+   "referenced_type" : "type-2626",
+   "self_type" : "type-2625",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13848,8 +13896,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2650",
-   "self_type" : "type-2649",
+   "referenced_type" : "type-2652",
+   "self_type" : "type-2651",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13857,8 +13905,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-409",
-   "self_type" : "type-408",
+   "referenced_type" : "type-406",
+   "self_type" : "type-405",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13866,8 +13914,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-515",
-   "self_type" : "type-514",
+   "referenced_type" : "type-512",
+   "self_type" : "type-511",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13884,8 +13932,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-851",
-   "self_type" : "type-850",
+   "referenced_type" : "type-853",
+   "self_type" : "type-852",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13911,8 +13959,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_type *",
    "name" : "android::RefBase::weakref_type *",
-   "referenced_type" : "type-197",
-   "self_type" : "type-196",
+   "referenced_type" : "type-200",
+   "self_type" : "type-199",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -13929,8 +13977,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Region *",
    "name" : "android::Region *",
-   "referenced_type" : "type-2390",
-   "self_type" : "type-2392",
+   "referenced_type" : "type-2392",
+   "self_type" : "type-2394",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -13947,7 +13995,7 @@
    "alignment" : 8,
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> > *",
    "name" : "android::SortedVector<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> > *",
-   "referenced_type" : "type-710",
+   "referenced_type" : "type-711",
    "self_type" : "type-712",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
@@ -13956,8 +14004,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::String16 *",
    "name" : "android::String16 *",
-   "referenced_type" : "type-178",
-   "self_type" : "type-188",
+   "referenced_type" : "type-180",
+   "self_type" : "type-190",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -13965,8 +14013,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::String8 *",
    "name" : "android::String8 *",
-   "referenced_type" : "type-287",
-   "self_type" : "type-902",
+   "referenced_type" : "type-284",
+   "self_type" : "type-894",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -13974,8 +14022,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Thread *",
    "name" : "android::Thread *",
-   "referenced_type" : "type-371",
-   "self_type" : "type-370",
+   "referenced_type" : "type-368",
+   "self_type" : "type-367",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13983,8 +14031,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Vector<android::Rect> *",
    "name" : "android::Vector<android::Rect> *",
-   "referenced_type" : "type-2383",
-   "self_type" : "type-2384",
+   "referenced_type" : "type-2385",
+   "self_type" : "type-2386",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -13992,8 +14040,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Vector<long> *",
    "name" : "android::Vector<long> *",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1425",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1429",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14028,8 +14076,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TMat44<float> *",
    "name" : "android::details::TMat44<float> *",
-   "referenced_type" : "type-2428",
-   "self_type" : "type-2431",
+   "referenced_type" : "type-2430",
+   "self_type" : "type-2433",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -14038,7 +14086,7 @@
    "linker_set_key" : "android::details::TMatTransform<android::details::TMat33, float> *",
    "name" : "android::details::TMatTransform<android::details::TMat33, float> *",
    "referenced_type" : "type-911",
-   "self_type" : "type-958",
+   "self_type" : "type-952",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -14046,8 +14094,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TMatTransform<android::details::TMat44, float> *",
    "name" : "android::details::TMatTransform<android::details::TMat44, float> *",
-   "referenced_type" : "type-2422",
-   "self_type" : "type-2423",
+   "referenced_type" : "type-2424",
+   "self_type" : "type-2425",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -14055,8 +14103,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TQuaternion<double> *",
    "name" : "android::details::TQuaternion<double> *",
-   "referenced_type" : "type-340",
-   "self_type" : "type-405",
+   "referenced_type" : "type-336",
+   "self_type" : "type-402",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -14064,8 +14112,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TQuaternion<float> *",
    "name" : "android::details::TQuaternion<float> *",
-   "referenced_type" : "type-415",
-   "self_type" : "type-433",
+   "referenced_type" : "type-411",
+   "self_type" : "type-430",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -14082,7 +14130,7 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TVec2<double> *",
    "name" : "android::details::TVec2<double> *",
-   "referenced_type" : "type-62",
+   "referenced_type" : "type-57",
    "self_type" : "type-1070",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -14100,7 +14148,7 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TVec3<double> *",
    "name" : "android::details::TVec3<double> *",
-   "referenced_type" : "type-73",
+   "referenced_type" : "type-68",
    "self_type" : "type-1369",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
@@ -14118,8 +14166,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TVec4<double> *",
    "name" : "android::details::TVec4<double> *",
-   "referenced_type" : "type-57",
-   "self_type" : "type-165",
+   "referenced_type" : "type-52",
+   "self_type" : "type-164",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -14127,8 +14175,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TVec4<float> *",
    "name" : "android::details::TVec4<float> *",
-   "referenced_type" : "type-218",
-   "self_type" : "type-326",
+   "referenced_type" : "type-203",
+   "self_type" : "type-323",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -14173,7 +14221,7 @@
    "linker_set_key" : "android::half *",
    "name" : "android::half *",
    "referenced_type" : "type-1",
-   "self_type" : "type-1381",
+   "self_type" : "type-1379",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -14199,8 +14247,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-244",
-   "self_type" : "type-243",
+   "referenced_type" : "type-246",
+   "self_type" : "type-245",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14217,8 +14265,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-195",
-   "self_type" : "type-194",
+   "referenced_type" : "type-198",
+   "self_type" : "type-197",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14226,8 +14274,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-204",
-   "self_type" : "type-212",
+   "referenced_type" : "type-217",
+   "self_type" : "type-225",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -14235,8 +14283,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-283",
-   "self_type" : "type-282",
+   "referenced_type" : "type-279",
+   "self_type" : "type-278",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14244,8 +14292,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
-   "referenced_type" : "type-99",
-   "self_type" : "type-106",
+   "referenced_type" : "type-101",
+   "self_type" : "type-108",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14253,8 +14301,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
-   "referenced_type" : "type-394",
-   "self_type" : "type-399",
+   "referenced_type" : "type-393",
+   "self_type" : "type-396",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14262,8 +14310,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
-   "referenced_type" : "type-111",
-   "self_type" : "type-112",
+   "referenced_type" : "type-113",
+   "self_type" : "type-114",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14280,7 +14328,7 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Status *",
    "name" : "android::hardware::Status *",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1308",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -14307,8 +14355,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int> *",
    "name" : "android::hardware::details::hidl_pointer<unsigned int> *",
-   "referenced_type" : "type-120",
-   "self_type" : "type-168",
+   "referenced_type" : "type-122",
+   "self_type" : "type-170",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14316,7 +14364,7 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::return_status *",
    "name" : "android::hardware::details::return_status *",
-   "referenced_type" : "type-101",
+   "referenced_type" : "type-103",
    "self_type" : "type-1314",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -14325,8 +14373,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1727",
-   "self_type" : "type-1726",
+   "referenced_type" : "type-1728",
+   "self_type" : "type-1727",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14334,8 +14382,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1909",
-   "self_type" : "type-1908",
+   "referenced_type" : "type-1910",
+   "self_type" : "type-1909",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14343,8 +14391,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2117",
-   "self_type" : "type-2116",
+   "referenced_type" : "type-2121",
+   "self_type" : "type-2120",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14352,8 +14400,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2154",
-   "self_type" : "type-2153",
+   "referenced_type" : "type-2157",
+   "self_type" : "type-2156",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14361,8 +14409,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2236",
-   "self_type" : "type-2235",
+   "referenced_type" : "type-2238",
+   "self_type" : "type-2237",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14370,8 +14418,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-359",
-   "self_type" : "type-358",
+   "referenced_type" : "type-356",
+   "self_type" : "type-355",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14379,8 +14427,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-686",
-   "self_type" : "type-685",
+   "referenced_type" : "type-687",
+   "self_type" : "type-686",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14388,8 +14436,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-730",
-   "self_type" : "type-729",
+   "referenced_type" : "type-732",
+   "self_type" : "type-731",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14397,8 +14445,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-837",
-   "self_type" : "type-836",
+   "referenced_type" : "type-838",
+   "self_type" : "type-837",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14406,8 +14454,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-1998",
-   "self_type" : "type-1997",
+   "referenced_type" : "type-1999",
+   "self_type" : "type-1998",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14415,8 +14463,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-2161",
-   "self_type" : "type-2160",
+   "referenced_type" : "type-2164",
+   "self_type" : "type-2163",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14424,8 +14472,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-2242",
-   "self_type" : "type-2241",
+   "referenced_type" : "type-2244",
+   "self_type" : "type-2243",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14433,8 +14481,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-487",
-   "self_type" : "type-486",
+   "referenced_type" : "type-484",
+   "self_type" : "type-483",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14442,8 +14490,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-738",
-   "self_type" : "type-737",
+   "referenced_type" : "type-739",
+   "self_type" : "type-738",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14460,8 +14508,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1716",
-   "self_type" : "type-1715",
+   "referenced_type" : "type-1717",
+   "self_type" : "type-1716",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14469,8 +14517,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1915",
-   "self_type" : "type-1914",
+   "referenced_type" : "type-1916",
+   "self_type" : "type-1915",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14478,8 +14526,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2119",
-   "self_type" : "type-2118",
+   "referenced_type" : "type-2123",
+   "self_type" : "type-2122",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14487,8 +14535,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2156",
-   "self_type" : "type-2155",
+   "referenced_type" : "type-2159",
+   "self_type" : "type-2158",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14496,8 +14544,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2238",
-   "self_type" : "type-2237",
+   "referenced_type" : "type-2240",
+   "self_type" : "type-2239",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14505,8 +14553,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-336",
-   "self_type" : "type-335",
+   "referenced_type" : "type-333",
+   "self_type" : "type-332",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14514,8 +14562,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-689",
-   "self_type" : "type-688",
+   "referenced_type" : "type-690",
+   "self_type" : "type-689",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14541,8 +14589,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1587",
-   "self_type" : "type-1586",
+   "referenced_type" : "type-1591",
+   "self_type" : "type-1590",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14550,8 +14598,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1859",
-   "self_type" : "type-1858",
+   "referenced_type" : "type-1860",
+   "self_type" : "type-1859",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14559,8 +14607,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2123",
-   "self_type" : "type-2122",
+   "referenced_type" : "type-2125",
+   "self_type" : "type-2124",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14568,8 +14616,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2159",
-   "self_type" : "type-2158",
+   "referenced_type" : "type-2162",
+   "self_type" : "type-2161",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14577,8 +14625,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2240",
-   "self_type" : "type-2239",
+   "referenced_type" : "type-2242",
+   "self_type" : "type-2241",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14586,17 +14634,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-55",
-   "self_type" : "type-54",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-691",
-   "self_type" : "type-690",
+   "referenced_type" : "type-692",
+   "self_type" : "type-691",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14620,10 +14659,19 @@
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
+   "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
+   "referenced_type" : "type-90",
+   "self_type" : "type-89",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
-   "referenced_type" : "type-1724",
-   "self_type" : "type-1723",
+   "referenced_type" : "type-1725",
+   "self_type" : "type-1724",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -14631,8 +14679,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
-   "referenced_type" : "type-1906",
-   "self_type" : "type-1905",
+   "referenced_type" : "type-1908",
+   "self_type" : "type-1907",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -14640,8 +14688,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
-   "referenced_type" : "type-354",
-   "self_type" : "type-353",
+   "referenced_type" : "type-351",
+   "self_type" : "type-350",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -14649,8 +14697,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-2008",
-   "self_type" : "type-2007",
+   "referenced_type" : "type-2009",
+   "self_type" : "type-2008",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14658,8 +14706,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-2164",
-   "self_type" : "type-2163",
+   "referenced_type" : "type-2167",
+   "self_type" : "type-2166",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14667,8 +14715,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-2244",
-   "self_type" : "type-2243",
+   "referenced_type" : "type-2246",
+   "self_type" : "type-2245",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14676,8 +14724,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-500",
-   "self_type" : "type-499",
+   "referenced_type" : "type-498",
+   "self_type" : "type-497",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14721,8 +14769,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_handle *",
    "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-138",
-   "self_type" : "type-137",
+   "referenced_type" : "type-140",
+   "self_type" : "type-139",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14739,8 +14787,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned int> *",
    "name" : "android::hardware::hidl_vec<unsigned int> *",
-   "referenced_type" : "type-128",
-   "self_type" : "type-129",
+   "referenced_type" : "type-130",
+   "self_type" : "type-131",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14757,8 +14805,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::base::V1_0::IBase *",
    "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-170",
-   "self_type" : "type-366",
+   "referenced_type" : "type-173",
+   "self_type" : "type-363",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14766,8 +14814,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-297",
-   "self_type" : "type-374",
+   "referenced_type" : "type-294",
+   "self_type" : "type-371",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14776,7 +14824,7 @@
    "linker_set_key" : "android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "referenced_type" : "type-694",
-   "self_type" : "type-698",
+   "self_type" : "type-701",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14793,8 +14841,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::GraphicBuffer> *",
    "name" : "android::sp<android::GraphicBuffer> *",
-   "referenced_type" : "type-680",
-   "self_type" : "type-682",
+   "referenced_type" : "type-679",
+   "self_type" : "type-683",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14802,8 +14850,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
-   "referenced_type" : "type-357",
-   "self_type" : "type-378",
+   "referenced_type" : "type-354",
+   "self_type" : "type-375",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14811,8 +14859,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
-   "referenced_type" : "type-485",
-   "self_type" : "type-489",
+   "referenced_type" : "type-482",
+   "self_type" : "type-487",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14820,8 +14868,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
-   "referenced_type" : "type-334",
-   "self_type" : "type-386",
+   "referenced_type" : "type-331",
+   "self_type" : "type-383",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14829,8 +14877,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
-   "referenced_type" : "type-53",
-   "self_type" : "type-90",
+   "referenced_type" : "type-88",
+   "self_type" : "type-92",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14838,8 +14886,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
-   "referenced_type" : "type-498",
-   "self_type" : "type-503",
+   "referenced_type" : "type-496",
+   "self_type" : "type-500",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14847,8 +14895,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "referenced_type" : "type-373",
-   "self_type" : "type-375",
+   "referenced_type" : "type-370",
+   "self_type" : "type-372",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14865,8 +14913,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ui::Transform *",
    "name" : "android::ui::Transform *",
-   "referenced_type" : "type-2435",
-   "self_type" : "type-2437",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2439",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -14874,8 +14922,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ui::Transform::mat33 *",
    "name" : "android::ui::Transform::mat33 *",
-   "referenced_type" : "type-2436",
-   "self_type" : "type-2448",
+   "referenced_type" : "type-2438",
+   "self_type" : "type-2450",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -14892,8 +14940,8 @@
    "alignment" : 8,
    "linker_set_key" : "android_native_base_t *",
    "name" : "android_native_base_t *",
-   "referenced_type" : "type-520",
-   "self_type" : "type-524",
+   "referenced_type" : "type-517",
+   "self_type" : "type-521",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -14901,8 +14949,8 @@
    "alignment" : 8,
    "linker_set_key" : "android_ycbcr *",
    "name" : "android_ycbcr *",
-   "referenced_type" : "type-350",
-   "self_type" : "type-349",
+   "referenced_type" : "type-347",
+   "self_type" : "type-346",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -14910,8 +14958,8 @@
    "alignment" : 8,
    "linker_set_key" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
    "name" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
-   "referenced_type" : "type-273",
-   "self_type" : "type-276",
+   "referenced_type" : "type-269",
+   "self_type" : "type-272",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -14920,7 +14968,7 @@
    "linker_set_key" : "bool *",
    "name" : "bool *",
    "referenced_type" : "type-6",
-   "self_type" : "type-352",
+   "self_type" : "type-349",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -14928,8 +14976,8 @@
    "alignment" : 8,
    "linker_set_key" : "char *",
    "name" : "char *",
-   "referenced_type" : "type-290",
-   "self_type" : "type-577",
+   "referenced_type" : "type-287",
+   "self_type" : "type-574",
    "size" : 8,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -14937,8 +14985,8 @@
    "alignment" : 8,
    "linker_set_key" : "const AHardwareBuffer *",
    "name" : "const AHardwareBuffer *",
-   "referenced_type" : "type-2070",
-   "self_type" : "type-2072",
+   "referenced_type" : "type-2072",
+   "self_type" : "type-2074",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -14947,7 +14995,7 @@
    "linker_set_key" : "const AHardwareBuffer *",
    "name" : "const AHardwareBuffer *",
    "referenced_type" : "type-627",
-   "self_type" : "type-629",
+   "self_type" : "type-630",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -14956,7 +15004,7 @@
    "linker_set_key" : "const ANativeWindowBuffer *",
    "name" : "const ANativeWindowBuffer *",
    "referenced_type" : "type-639",
-   "self_type" : "type-640",
+   "self_type" : "type-641",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -14964,8 +15012,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
    "name" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
-   "referenced_type" : "type-536",
-   "self_type" : "type-537",
+   "referenced_type" : "type-534",
+   "self_type" : "type-535",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
   },
@@ -15000,8 +15048,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::FenceTime *",
    "name" : "const android::FenceTime *",
-   "referenced_type" : "type-1395",
-   "self_type" : "type-1396",
+   "referenced_type" : "type-1400",
+   "self_type" : "type-1401",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -15009,8 +15057,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::FenceTime::Snapshot *",
    "name" : "const android::FenceTime::Snapshot *",
-   "referenced_type" : "type-1388",
-   "self_type" : "type-1389",
+   "referenced_type" : "type-1393",
+   "self_type" : "type-1394",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -15027,8 +15075,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::FrameStats *",
    "name" : "const android::FrameStats *",
-   "referenced_type" : "type-1429",
-   "self_type" : "type-1430",
+   "referenced_type" : "type-1433",
+   "self_type" : "type-1434",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
@@ -15036,8 +15084,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Gralloc2Allocator *",
    "name" : "const android::Gralloc2Allocator *",
-   "referenced_type" : "type-363",
-   "self_type" : "type-364",
+   "referenced_type" : "type-360",
+   "self_type" : "type-361",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15045,8 +15093,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Gralloc2Mapper *",
    "name" : "const android::Gralloc2Mapper *",
-   "referenced_type" : "type-346",
-   "self_type" : "type-347",
+   "referenced_type" : "type-343",
+   "self_type" : "type-344",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15054,8 +15102,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-625",
-   "self_type" : "type-624",
+   "referenced_type" : "type-626",
+   "self_type" : "type-625",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -15063,8 +15111,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBufferAllocator *",
    "name" : "const android::GraphicBufferAllocator *",
-   "referenced_type" : "type-720",
-   "self_type" : "type-721",
+   "referenced_type" : "type-721",
+   "self_type" : "type-722",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -15072,8 +15120,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBufferMapper *",
    "name" : "const android::GraphicBufferMapper *",
-   "referenced_type" : "type-615",
-   "self_type" : "type-616",
+   "referenced_type" : "type-616",
+   "self_type" : "type-617",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -15090,8 +15138,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
-   "referenced_type" : "type-717",
-   "self_type" : "type-718",
+   "referenced_type" : "type-718",
+   "self_type" : "type-719",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -15099,8 +15147,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect> *",
    "name" : "const android::LightFlattenablePod<android::Rect> *",
-   "referenced_type" : "type-2399",
-   "self_type" : "type-2400",
+   "referenced_type" : "type-2401",
+   "self_type" : "type-2402",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15153,8 +15201,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Region *",
    "name" : "const android::Region *",
-   "referenced_type" : "type-2389",
-   "self_type" : "type-2395",
+   "referenced_type" : "type-2391",
+   "self_type" : "type-2397",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -15171,8 +15219,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::String16 *",
    "name" : "const android::String16 *",
-   "referenced_type" : "type-183",
-   "self_type" : "type-184",
+   "referenced_type" : "type-186",
+   "self_type" : "type-187",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -15180,8 +15228,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::String8 *",
    "name" : "const android::String8 *",
-   "referenced_type" : "type-876",
-   "self_type" : "type-881",
+   "referenced_type" : "type-866",
+   "self_type" : "type-877",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -15189,8 +15237,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Vector<android::Rect> *",
    "name" : "const android::Vector<android::Rect> *",
-   "referenced_type" : "type-2385",
-   "self_type" : "type-2388",
+   "referenced_type" : "type-2387",
+   "self_type" : "type-2390",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -15198,8 +15246,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Vector<long> *",
    "name" : "const android::Vector<long> *",
-   "referenced_type" : "type-1426",
-   "self_type" : "type-1427",
+   "referenced_type" : "type-1430",
+   "self_type" : "type-1431",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -15207,8 +15255,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::VectorImpl *",
    "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-1423",
-   "self_type" : "type-1424",
+   "referenced_type" : "type-1427",
+   "self_type" : "type-1428",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -15225,7 +15273,7 @@
    "alignment" : 8,
    "linker_set_key" : "const android::details::TMat33<float> *",
    "name" : "const android::details::TMat33<float> *",
-   "referenced_type" : "type-928",
+   "referenced_type" : "type-920",
    "self_type" : "type-977",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
@@ -15253,7 +15301,7 @@
    "linker_set_key" : "const android::details::TVec3<float> *",
    "name" : "const android::details::TVec3<float> *",
    "referenced_type" : "type-1056",
-   "self_type" : "type-1422",
+   "self_type" : "type-1426",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
   },
@@ -15261,7 +15309,7 @@
    "alignment" : 8,
    "linker_set_key" : "const android::half *",
    "name" : "const android::half *",
-   "referenced_type" : "type-40",
+   "referenced_type" : "type-42",
    "self_type" : "type-147",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
@@ -15288,8 +15336,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::BpHwRefBase *",
    "name" : "const android::hardware::BpHwRefBase *",
-   "referenced_type" : "type-200",
-   "self_type" : "type-201",
+   "referenced_type" : "type-202",
+   "self_type" : "type-214",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -15297,8 +15345,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
-   "referenced_type" : "type-109",
-   "self_type" : "type-110",
+   "referenced_type" : "type-111",
+   "self_type" : "type-112",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15306,8 +15354,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
-   "referenced_type" : "type-402",
-   "self_type" : "type-403",
+   "referenced_type" : "type-399",
+   "self_type" : "type-401",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15315,8 +15363,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
-   "referenced_type" : "type-115",
-   "self_type" : "type-116",
+   "referenced_type" : "type-117",
+   "self_type" : "type-118",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15342,8 +15390,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle> *",
-   "referenced_type" : "type-295",
-   "self_type" : "type-299",
+   "referenced_type" : "type-292",
+   "self_type" : "type-296",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15351,8 +15399,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned int> *",
    "name" : "const android::hardware::details::hidl_pointer<unsigned int> *",
-   "referenced_type" : "type-189",
-   "self_type" : "type-203",
+   "referenced_type" : "type-191",
+   "self_type" : "type-216",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15369,8 +15417,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1744",
-   "self_type" : "type-1746",
+   "referenced_type" : "type-1745",
+   "self_type" : "type-1747",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15378,8 +15426,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1911",
-   "self_type" : "type-1913",
+   "referenced_type" : "type-1912",
+   "self_type" : "type-1914",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15387,8 +15435,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-383",
-   "self_type" : "type-385",
+   "referenced_type" : "type-380",
+   "self_type" : "type-382",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15396,8 +15444,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-2004",
-   "self_type" : "type-2006",
+   "referenced_type" : "type-2005",
+   "self_type" : "type-2007",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15405,8 +15453,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-495",
-   "self_type" : "type-497",
+   "referenced_type" : "type-492",
+   "self_type" : "type-494",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15414,8 +15462,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::BufferUsage *",
    "name" : "const android::hardware::graphics::common::V1_0::BufferUsage *",
-   "referenced_type" : "type-152",
-   "self_type" : "type-151",
+   "referenced_type" : "type-155",
+   "self_type" : "type-154",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15423,8 +15471,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::BufferUsage *",
    "name" : "const android::hardware::graphics::common::V1_1::BufferUsage *",
-   "referenced_type" : "type-159",
-   "self_type" : "type-158",
+   "referenced_type" : "type-161",
+   "self_type" : "type-160",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15432,8 +15480,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::BufferUsage *",
    "name" : "const android::hardware::graphics::common::V1_2::BufferUsage *",
-   "referenced_type" : "type-424",
-   "self_type" : "type-423",
+   "referenced_type" : "type-421",
+   "self_type" : "type-420",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15441,8 +15489,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1584",
-   "self_type" : "type-1583",
+   "referenced_type" : "type-1588",
+   "self_type" : "type-1587",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15450,8 +15498,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1856",
-   "self_type" : "type-1855",
+   "referenced_type" : "type-1857",
+   "self_type" : "type-1856",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15459,8 +15507,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-51",
-   "self_type" : "type-50",
+   "referenced_type" : "type-86",
+   "self_type" : "type-85",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15468,8 +15516,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1594",
-   "self_type" : "type-1596",
+   "referenced_type" : "type-1598",
+   "self_type" : "type-1600",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15477,8 +15525,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1860",
-   "self_type" : "type-1862",
+   "referenced_type" : "type-1861",
+   "self_type" : "type-1863",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15486,8 +15534,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-96",
-   "self_type" : "type-98",
+   "referenced_type" : "type-98",
+   "self_type" : "type-100",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15495,8 +15543,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-1918",
-   "self_type" : "type-1917",
+   "referenced_type" : "type-1919",
+   "self_type" : "type-1918",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15504,8 +15552,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-392",
-   "self_type" : "type-391",
+   "referenced_type" : "type-389",
+   "self_type" : "type-388",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15522,8 +15570,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void> *",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void> *",
-   "referenced_type" : "type-153",
-   "self_type" : "type-154",
+   "referenced_type" : "type-156",
+   "self_type" : "type-157",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15531,8 +15579,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void> *",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void> *",
-   "referenced_type" : "type-160",
-   "self_type" : "type-161",
+   "referenced_type" : "type-162",
+   "self_type" : "type-163",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15540,8 +15588,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void> *",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void> *",
-   "referenced_type" : "type-425",
-   "self_type" : "type-426",
+   "referenced_type" : "type-422",
+   "self_type" : "type-423",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15558,8 +15606,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_handle> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_handle> *",
-   "referenced_type" : "type-145",
-   "self_type" : "type-146",
+   "referenced_type" : "type-148",
+   "self_type" : "type-149",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15567,8 +15615,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned int> *",
    "name" : "const android::hardware::hidl_vec<unsigned int> *",
-   "referenced_type" : "type-131",
-   "self_type" : "type-133",
+   "referenced_type" : "type-133",
+   "self_type" : "type-135",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15585,8 +15633,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
    "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-169",
-   "self_type" : "type-175",
+   "referenced_type" : "type-172",
+   "self_type" : "type-178",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
@@ -15594,8 +15642,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-296",
-   "self_type" : "type-298",
+   "referenced_type" : "type-293",
+   "self_type" : "type-295",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
@@ -15604,7 +15652,7 @@
    "linker_set_key" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "referenced_type" : "type-693",
-   "self_type" : "type-699",
+   "self_type" : "type-702",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15621,8 +15669,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
    "name" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
-   "referenced_type" : "type-381",
-   "self_type" : "type-382",
+   "referenced_type" : "type-378",
+   "self_type" : "type-379",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15630,8 +15678,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
    "name" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
-   "referenced_type" : "type-493",
-   "self_type" : "type-494",
+   "referenced_type" : "type-490",
+   "self_type" : "type-491",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15639,8 +15687,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
-   "referenced_type" : "type-389",
-   "self_type" : "type-390",
+   "referenced_type" : "type-386",
+   "self_type" : "type-387",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15648,8 +15696,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
-   "referenced_type" : "type-91",
-   "self_type" : "type-95",
+   "referenced_type" : "type-93",
+   "self_type" : "type-97",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15657,8 +15705,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
    "name" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
-   "referenced_type" : "type-506",
-   "self_type" : "type-507",
+   "referenced_type" : "type-503",
+   "self_type" : "type-504",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15675,8 +15723,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hidl::base::V1_0::IBase> *",
    "name" : "const android::sp<android::hidl::base::V1_0::IBase> *",
-   "referenced_type" : "type-367",
-   "self_type" : "type-368",
+   "referenced_type" : "type-364",
+   "self_type" : "type-365",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15684,8 +15732,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "referenced_type" : "type-376",
-   "self_type" : "type-377",
+   "referenced_type" : "type-373",
+   "self_type" : "type-374",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15702,8 +15750,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::ui::Transform *",
    "name" : "const android::ui::Transform *",
-   "referenced_type" : "type-2438",
-   "self_type" : "type-2442",
+   "referenced_type" : "type-2440",
+   "self_type" : "type-2444",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -15711,8 +15759,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::ui::Transform::mat33 *",
    "name" : "const android::ui::Transform::mat33 *",
-   "referenced_type" : "type-2446",
-   "self_type" : "type-2447",
+   "referenced_type" : "type-2448",
+   "self_type" : "type-2449",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -15720,8 +15768,8 @@
    "alignment" : 8,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-289",
-   "self_type" : "type-288",
+   "referenced_type" : "type-286",
+   "self_type" : "type-285",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -15729,8 +15777,8 @@
    "alignment" : 8,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-180",
-   "self_type" : "type-179",
+   "referenced_type" : "type-182",
+   "self_type" : "type-181",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -15738,8 +15786,8 @@
    "alignment" : 8,
    "linker_set_key" : "const gralloc_module_t *",
    "name" : "const gralloc_module_t *",
-   "referenced_type" : "type-585",
-   "self_type" : "type-584",
+   "referenced_type" : "type-582",
+   "self_type" : "type-581",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -15747,8 +15795,8 @@
    "alignment" : 8,
    "linker_set_key" : "const hw_module_t *",
    "name" : "const hw_module_t *",
-   "referenced_type" : "type-556",
-   "self_type" : "type-555",
+   "referenced_type" : "type-553",
+   "self_type" : "type-552",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15756,7 +15804,7 @@
    "alignment" : 8,
    "linker_set_key" : "const int *",
    "name" : "const int *",
-   "referenced_type" : "type-563",
+   "referenced_type" : "type-560",
    "self_type" : "type-1350",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
@@ -15775,7 +15823,7 @@
    "linker_set_key" : "const long *",
    "name" : "const long *",
    "referenced_type" : "type-848",
-   "self_type" : "type-1415",
+   "self_type" : "type-1420",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15783,8 +15831,8 @@
    "alignment" : 8,
    "linker_set_key" : "const native_handle *",
    "name" : "const native_handle *",
-   "referenced_type" : "type-142",
-   "self_type" : "type-141",
+   "referenced_type" : "type-144",
+   "self_type" : "type-143",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15792,8 +15840,8 @@
    "alignment" : 8,
    "linker_set_key" : "const native_handle **",
    "name" : "const native_handle **",
-   "referenced_type" : "type-141",
-   "self_type" : "type-348",
+   "referenced_type" : "type-143",
+   "self_type" : "type-345",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15801,8 +15849,8 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned char *",
    "name" : "const unsigned char *",
-   "referenced_type" : "type-214",
-   "self_type" : "type-213",
+   "referenced_type" : "type-227",
+   "self_type" : "type-226",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -15810,7 +15858,7 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned int *",
    "name" : "const unsigned int *",
-   "referenced_type" : "type-237",
+   "referenced_type" : "type-239",
    "self_type" : "type-1105",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -15819,8 +15867,8 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned long long *",
    "name" : "const unsigned long long *",
-   "referenced_type" : "type-216",
-   "self_type" : "type-215",
+   "referenced_type" : "type-229",
+   "self_type" : "type-228",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -15837,8 +15885,8 @@
    "alignment" : 8,
    "linker_set_key" : "framebuffer_device_t *",
    "name" : "framebuffer_device_t *",
-   "referenced_type" : "type-547",
-   "self_type" : "type-568",
+   "referenced_type" : "type-544",
+   "self_type" : "type-565",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -15846,8 +15894,8 @@
    "alignment" : 8,
    "linker_set_key" : "hw_device_t *",
    "name" : "hw_device_t *",
-   "referenced_type" : "type-548",
-   "self_type" : "type-558",
+   "referenced_type" : "type-545",
+   "self_type" : "type-555",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15855,8 +15903,8 @@
    "alignment" : 8,
    "linker_set_key" : "hw_device_t **",
    "name" : "hw_device_t **",
-   "referenced_type" : "type-558",
-   "self_type" : "type-557",
+   "referenced_type" : "type-555",
+   "self_type" : "type-554",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15864,8 +15912,8 @@
    "alignment" : 8,
    "linker_set_key" : "hw_module_methods_t *",
    "name" : "hw_module_methods_t *",
-   "referenced_type" : "type-552",
-   "self_type" : "type-551",
+   "referenced_type" : "type-549",
+   "self_type" : "type-548",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15873,8 +15921,8 @@
    "alignment" : 8,
    "linker_set_key" : "hw_module_t *",
    "name" : "hw_module_t *",
-   "referenced_type" : "type-550",
-   "self_type" : "type-549",
+   "referenced_type" : "type-547",
+   "self_type" : "type-546",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15900,8 +15948,8 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *)",
    "name" : "int (*)(const gralloc_module_t *, const native_handle *)",
-   "referenced_type" : "type-583",
-   "self_type" : "type-582",
+   "referenced_type" : "type-580",
+   "self_type" : "type-579",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -15909,8 +15957,8 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int *)",
    "name" : "int (*)(const gralloc_module_t *, const native_handle *, int *)",
-   "referenced_type" : "type-595",
-   "self_type" : "type-594",
+   "referenced_type" : "type-592",
+   "self_type" : "type-591",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -15918,8 +15966,8 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
    "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "referenced_type" : "type-591",
-   "self_type" : "type-590",
+   "referenced_type" : "type-588",
+   "self_type" : "type-587",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -15927,8 +15975,8 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
    "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "referenced_type" : "type-598",
-   "self_type" : "type-597",
+   "referenced_type" : "type-595",
+   "self_type" : "type-594",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -15936,8 +15984,8 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
    "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "referenced_type" : "type-587",
-   "self_type" : "type-586",
+   "referenced_type" : "type-584",
+   "self_type" : "type-583",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -15945,8 +15993,26 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
    "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
-   "referenced_type" : "type-593",
-   "self_type" : "type-592",
+   "referenced_type" : "type-590",
+   "self_type" : "type-589",
+   "size" : 8,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "referenced_type" : "type-597",
+   "self_type" : "type-596",
+   "size" : 8,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "referenced_type" : "type-599",
+   "self_type" : "type-598",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -15954,8 +16020,8 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(const gralloc_module_t *, int, ...)",
    "name" : "int (*)(const gralloc_module_t *, int, ...)",
-   "referenced_type" : "type-589",
-   "self_type" : "type-588",
+   "referenced_type" : "type-586",
+   "self_type" : "type-585",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -15963,8 +16029,8 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(const hw_module_t *, const char *, hw_device_t **)",
    "name" : "int (*)(const hw_module_t *, const char *, hw_device_t **)",
-   "referenced_type" : "type-554",
-   "self_type" : "type-553",
+   "referenced_type" : "type-551",
+   "self_type" : "type-550",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15972,8 +16038,8 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(framebuffer_device_t *)",
    "name" : "int (*)(framebuffer_device_t *)",
-   "referenced_type" : "type-574",
-   "self_type" : "type-573",
+   "referenced_type" : "type-571",
+   "self_type" : "type-570",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -15981,8 +16047,8 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(framebuffer_device_t *, const native_handle *)",
    "name" : "int (*)(framebuffer_device_t *, const native_handle *)",
-   "referenced_type" : "type-572",
-   "self_type" : "type-571",
+   "referenced_type" : "type-569",
+   "self_type" : "type-568",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -15990,8 +16056,8 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(framebuffer_device_t *, int)",
    "name" : "int (*)(framebuffer_device_t *, int)",
-   "referenced_type" : "type-567",
-   "self_type" : "type-566",
+   "referenced_type" : "type-564",
+   "self_type" : "type-563",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -15999,8 +16065,8 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(framebuffer_device_t *, int, int, int, int)",
    "name" : "int (*)(framebuffer_device_t *, int, int, int, int)",
-   "referenced_type" : "type-570",
-   "self_type" : "type-569",
+   "referenced_type" : "type-567",
+   "self_type" : "type-566",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16008,8 +16074,8 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(hw_device_t *)",
    "name" : "int (*)(hw_device_t *)",
-   "referenced_type" : "type-562",
-   "self_type" : "type-561",
+   "referenced_type" : "type-559",
+   "self_type" : "type-558",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -16017,8 +16083,8 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
-   "referenced_type" : "type-251",
-   "self_type" : "type-252",
+   "referenced_type" : "type-253",
+   "self_type" : "type-254",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
@@ -16026,8 +16092,8 @@
    "alignment" : 8,
    "linker_set_key" : "int *",
    "name" : "int *",
-   "referenced_type" : "type-103",
-   "self_type" : "type-596",
+   "referenced_type" : "type-105",
+   "self_type" : "type-593",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
@@ -16044,8 +16110,8 @@
    "alignment" : 8,
    "linker_set_key" : "long *",
    "name" : "long *",
-   "referenced_type" : "type-286",
-   "self_type" : "type-1433",
+   "referenced_type" : "type-12",
+   "self_type" : "type-11",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16053,7 +16119,7 @@
    "alignment" : 8,
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
-   "referenced_type" : "type-143",
+   "referenced_type" : "type-145",
    "self_type" : "type-1133",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
@@ -16062,8 +16128,8 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned char *",
    "name" : "unsigned char *",
-   "referenced_type" : "type-207",
-   "self_type" : "type-206",
+   "referenced_type" : "type-220",
+   "self_type" : "type-219",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -16071,8 +16137,8 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
-   "referenced_type" : "type-123",
-   "self_type" : "type-122",
+   "referenced_type" : "type-125",
+   "self_type" : "type-124",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16080,8 +16146,8 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned long *",
    "name" : "unsigned long *",
-   "referenced_type" : "type-124",
-   "self_type" : "type-2396",
+   "referenced_type" : "type-126",
+   "self_type" : "type-2398",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -16089,8 +16155,8 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned long long *",
    "name" : "unsigned long long *",
-   "referenced_type" : "type-209",
-   "self_type" : "type-208",
+   "referenced_type" : "type-222",
+   "self_type" : "type-221",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16107,8 +16173,8 @@
    "alignment" : 8,
    "linker_set_key" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned long, const unsigned long long *, unsigned long, void *)",
    "name" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned long, const unsigned long long *, unsigned long, void *)",
-   "referenced_type" : "type-211",
-   "self_type" : "type-210",
+   "referenced_type" : "type-224",
+   "self_type" : "type-223",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16116,8 +16182,8 @@
    "alignment" : 8,
    "linker_set_key" : "void (*)(android_native_base_t *)",
    "name" : "void (*)(android_native_base_t *)",
-   "referenced_type" : "type-523",
-   "self_type" : "type-522",
+   "referenced_type" : "type-520",
+   "self_type" : "type-519",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -16125,8 +16191,8 @@
    "alignment" : 8,
    "linker_set_key" : "void (*)(framebuffer_device_t *, char *, int)",
    "name" : "void (*)(framebuffer_device_t *, char *, int)",
-   "referenced_type" : "type-576",
-   "self_type" : "type-575",
+   "referenced_type" : "type-573",
+   "self_type" : "type-572",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16134,8 +16200,8 @@
    "alignment" : 8,
    "linker_set_key" : "void *",
    "name" : "void *",
-   "referenced_type" : "type-150",
-   "self_type" : "type-217",
+   "referenced_type" : "type-153",
+   "self_type" : "type-230",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -16143,8 +16209,8 @@
    "alignment" : 8,
    "linker_set_key" : "void **",
    "name" : "void **",
-   "referenced_type" : "type-217",
-   "self_type" : "type-253",
+   "referenced_type" : "type-230",
+   "self_type" : "type-255",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   }
@@ -16156,8 +16222,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-117",
-   "self_type" : "type-119",
+   "referenced_type" : "type-119",
+   "self_type" : "type-121",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16186,8 +16252,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-13",
-   "self_type" : "type-15",
+   "referenced_type" : "type-1576",
+   "self_type" : "type-1578",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16196,8 +16262,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1572",
-   "self_type" : "type-1574",
+   "referenced_type" : "type-15",
+   "self_type" : "type-17",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16206,8 +16272,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1607",
-   "self_type" : "type-1609",
+   "referenced_type" : "type-1611",
+   "self_type" : "type-1613",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16216,8 +16282,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-173",
-   "self_type" : "type-172",
+   "referenced_type" : "type-176",
+   "self_type" : "type-175",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16226,8 +16292,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1781",
-   "self_type" : "type-1783",
+   "referenced_type" : "type-1782",
+   "self_type" : "type-1784",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16236,8 +16302,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1829",
-   "self_type" : "type-1831",
+   "referenced_type" : "type-1830",
+   "self_type" : "type-1832",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16246,8 +16312,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1834",
-   "self_type" : "type-1836",
+   "referenced_type" : "type-1835",
+   "self_type" : "type-1837",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16256,8 +16322,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1844",
-   "self_type" : "type-1846",
+   "referenced_type" : "type-1845",
+   "self_type" : "type-1847",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16266,8 +16332,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1863",
-   "self_type" : "type-1865",
+   "referenced_type" : "type-1864",
+   "self_type" : "type-1866",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16276,8 +16342,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1929",
-   "self_type" : "type-1931",
+   "referenced_type" : "type-1930",
+   "self_type" : "type-1932",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16286,8 +16352,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2015",
-   "self_type" : "type-2017",
+   "referenced_type" : "type-2016",
+   "self_type" : "type-2018",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16296,8 +16362,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2167",
-   "self_type" : "type-2169",
+   "referenced_type" : "type-2170",
+   "self_type" : "type-2172",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16306,8 +16372,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2245",
-   "self_type" : "type-2247",
+   "referenced_type" : "type-2247",
+   "self_type" : "type-2249",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16316,8 +16382,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2287",
-   "self_type" : "type-2289",
+   "referenced_type" : "type-2289",
+   "self_type" : "type-2291",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16326,8 +16392,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2338",
-   "self_type" : "type-2340",
+   "referenced_type" : "type-2340",
+   "self_type" : "type-2342",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16336,8 +16402,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2457",
-   "self_type" : "type-2456",
+   "referenced_type" : "type-2459",
+   "self_type" : "type-2458",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16346,8 +16412,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2623",
-   "self_type" : "type-2625",
+   "referenced_type" : "type-2625",
+   "self_type" : "type-2627",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16356,8 +16422,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2649",
-   "self_type" : "type-2651",
+   "referenced_type" : "type-2651",
+   "self_type" : "type-2653",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16366,8 +16432,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-408",
-   "self_type" : "type-410",
+   "referenced_type" : "type-405",
+   "self_type" : "type-407",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16376,8 +16442,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-514",
-   "self_type" : "type-516",
+   "referenced_type" : "type-511",
+   "self_type" : "type-513",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16387,7 +16453,7 @@
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
    "referenced_type" : "type-744",
-   "self_type" : "type-746",
+   "self_type" : "type-747",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16396,8 +16462,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-850",
-   "self_type" : "type-853",
+   "referenced_type" : "type-852",
+   "self_type" : "type-854",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16426,8 +16492,8 @@
    "is_const" : true,
    "linker_set_key" : "android::hardware::IBinder *const",
    "name" : "android::hardware::IBinder *const",
-   "referenced_type" : "type-194",
-   "self_type" : "type-193",
+   "referenced_type" : "type-197",
+   "self_type" : "type-196",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -16443,32 +16509,32 @@
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-1772",
-   "self_type" : "type-1771",
+   "referenced_type" : "type-1773",
+   "self_type" : "type-1772",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-2135",
-   "self_type" : "type-2134",
+   "referenced_type" : "type-2134",
+   "self_type" : "type-2133",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-2409",
-   "self_type" : "type-2408",
+   "referenced_type" : "type-2411",
+   "self_type" : "type-2410",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const AHardwareBuffer",
    "name" : "const AHardwareBuffer",
-   "referenced_type" : "type-2071",
-   "self_type" : "type-2070",
+   "referenced_type" : "type-2073",
+   "self_type" : "type-2072",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -16484,7 +16550,7 @@
    "is_const" : true,
    "linker_set_key" : "const ANativeWindowBuffer",
    "name" : "const ANativeWindowBuffer",
-   "referenced_type" : "type-519",
+   "referenced_type" : "type-516",
    "self_type" : "type-639",
    "size" : 168,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
@@ -16493,32 +16559,32 @@
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-1763",
-   "self_type" : "type-1762",
+   "referenced_type" : "type-1764",
+   "self_type" : "type-1763",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-2047",
-   "self_type" : "type-2046",
+   "referenced_type" : "type-2046",
+   "self_type" : "type-2045",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-2426",
-   "self_type" : "type-2425",
+   "referenced_type" : "type-2428",
+   "self_type" : "type-2427",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-966",
-   "self_type" : "type-965",
+   "referenced_type" : "type-960",
+   "self_type" : "type-959",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
@@ -16526,8 +16592,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
    "name" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
-   "referenced_type" : "type-518",
-   "self_type" : "type-536",
+   "referenced_type" : "type-515",
+   "self_type" : "type-534",
    "size" : 184,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
   },
@@ -16547,7 +16613,7 @@
    "linker_set_key" : "const android::ColorSpace::TransferParameters",
    "name" : "const android::ColorSpace::TransferParameters",
    "referenced_type" : "type-982",
-   "self_type" : "type-1034",
+   "self_type" : "type-1031",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -16576,8 +16642,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime",
    "name" : "const android::FenceTime",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1395",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1400",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -16586,8 +16652,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot",
    "name" : "const android::FenceTime::Snapshot",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1388",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1393",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -16596,8 +16662,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot::State",
    "name" : "const android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1407",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1411",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16606,8 +16672,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::State",
    "name" : "const android::FenceTime::State",
-   "referenced_type" : "type-1378",
-   "self_type" : "type-1377",
+   "referenced_type" : "type-1383",
+   "self_type" : "type-1382",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -16626,8 +16692,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FrameStats",
    "name" : "const android::FrameStats",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1429",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1433",
    "size" : 128,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
@@ -16636,8 +16702,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Gralloc2Allocator",
    "name" : "const android::Gralloc2Allocator",
-   "referenced_type" : "type-355",
-   "self_type" : "type-363",
+   "referenced_type" : "type-352",
+   "self_type" : "type-360",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -16646,8 +16712,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Gralloc2Mapper",
    "name" : "const android::Gralloc2Mapper",
-   "referenced_type" : "type-333",
-   "self_type" : "type-346",
+   "referenced_type" : "type-330",
+   "self_type" : "type-343",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -16656,8 +16722,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-2061",
-   "self_type" : "type-2060",
+   "referenced_type" : "type-2063",
+   "self_type" : "type-2062",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -16666,8 +16732,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-2227",
-   "self_type" : "type-2226",
+   "referenced_type" : "type-2230",
+   "self_type" : "type-2229",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -16676,8 +16742,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-2231",
-   "self_type" : "type-2230",
+   "referenced_type" : "type-2233",
+   "self_type" : "type-2232",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -16706,8 +16772,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-829",
-   "self_type" : "type-828",
+   "referenced_type" : "type-830",
+   "self_type" : "type-829",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -16716,8 +16782,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-527",
-   "self_type" : "type-625",
+   "referenced_type" : "type-524",
+   "self_type" : "type-626",
    "size" : 256,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -16726,8 +16792,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferAllocator",
    "name" : "const android::GraphicBufferAllocator",
-   "referenced_type" : "type-543",
-   "self_type" : "type-720",
+   "referenced_type" : "type-540",
+   "self_type" : "type-721",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -16736,7 +16802,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferAllocator::alloc_rec_t",
    "name" : "const android::GraphicBufferAllocator::alloc_rec_t",
-   "referenced_type" : "type-677",
+   "referenced_type" : "type-681",
    "self_type" : "type-706",
    "size" : 64,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -16746,8 +16812,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferMapper",
    "name" : "const android::GraphicBufferMapper",
-   "referenced_type" : "type-529",
-   "self_type" : "type-615",
+   "referenced_type" : "type-526",
+   "self_type" : "type-616",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -16756,7 +16822,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::HdrCapabilities",
    "name" : "const android::HdrCapabilities",
-   "referenced_type" : "type-960",
+   "referenced_type" : "type-962",
    "self_type" : "type-973",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
@@ -16766,8 +16832,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-715",
-   "self_type" : "type-717",
+   "referenced_type" : "type-716",
+   "self_type" : "type-718",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -16777,7 +16843,7 @@
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect>",
    "name" : "const android::LightFlattenablePod<android::Rect>",
    "referenced_type" : "type-1243",
-   "self_type" : "type-2399",
+   "self_type" : "type-2401",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16826,7 +16892,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
-   "referenced_type" : "type-171",
+   "referenced_type" : "type-174",
    "self_type" : "type-1078",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
@@ -16836,8 +16902,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Region",
    "name" : "const android::Region",
-   "referenced_type" : "type-2390",
-   "self_type" : "type-2389",
+   "referenced_type" : "type-2392",
+   "self_type" : "type-2391",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -16846,7 +16912,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "const android::SortedVector<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-710",
+   "referenced_type" : "type-711",
    "self_type" : "type-713",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
@@ -16856,8 +16922,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-178",
-   "self_type" : "type-183",
+   "referenced_type" : "type-180",
+   "self_type" : "type-186",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -16866,8 +16932,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
-   "referenced_type" : "type-287",
-   "self_type" : "type-876",
+   "referenced_type" : "type-284",
+   "self_type" : "type-866",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -16876,8 +16942,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<android::Rect>",
    "name" : "const android::Vector<android::Rect>",
-   "referenced_type" : "type-2383",
-   "self_type" : "type-2385",
+   "referenced_type" : "type-2385",
+   "self_type" : "type-2387",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16886,8 +16952,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<long>",
    "name" : "const android::Vector<long>",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1426",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1430",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16896,8 +16962,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
-   "referenced_type" : "type-236",
-   "self_type" : "type-1423",
+   "referenced_type" : "type-238",
+   "self_type" : "type-1427",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -16917,7 +16983,7 @@
    "linker_set_key" : "const android::details::TMat33<float>",
    "name" : "const android::details::TMat33<float>",
    "referenced_type" : "type-904",
-   "self_type" : "type-928",
+   "self_type" : "type-920",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -16926,8 +16992,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TMat44<float>",
    "name" : "const android::details::TMat44<float>",
-   "referenced_type" : "type-2428",
-   "self_type" : "type-2432",
+   "referenced_type" : "type-2430",
+   "self_type" : "type-2434",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -16936,8 +17002,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TQuaternion<double>",
    "name" : "const android::details::TQuaternion<double>",
-   "referenced_type" : "type-340",
-   "self_type" : "type-406",
+   "referenced_type" : "type-336",
+   "self_type" : "type-403",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -16946,8 +17012,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TQuaternion<float>",
    "name" : "const android::details::TQuaternion<float>",
-   "referenced_type" : "type-415",
-   "self_type" : "type-434",
+   "referenced_type" : "type-411",
+   "self_type" : "type-431",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -16966,7 +17032,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec2<double>",
    "name" : "const android::details::TVec2<double>",
-   "referenced_type" : "type-62",
+   "referenced_type" : "type-57",
    "self_type" : "type-1073",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -16986,7 +17052,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec3<double>",
    "name" : "const android::details::TVec3<double>",
-   "referenced_type" : "type-73",
+   "referenced_type" : "type-68",
    "self_type" : "type-1373",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
@@ -17006,8 +17072,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec4<double>",
    "name" : "const android::details::TVec4<double>",
-   "referenced_type" : "type-57",
-   "self_type" : "type-176",
+   "referenced_type" : "type-52",
+   "self_type" : "type-171",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -17016,8 +17082,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec4<float>",
    "name" : "const android::details::TVec4<float>",
-   "referenced_type" : "type-218",
-   "self_type" : "type-327",
+   "referenced_type" : "type-203",
+   "self_type" : "type-324",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -17027,7 +17093,7 @@
    "linker_set_key" : "const android::half",
    "name" : "const android::half",
    "referenced_type" : "type-1",
-   "self_type" : "type-40",
+   "self_type" : "type-42",
    "size" : 2,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -17056,8 +17122,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::BpHwRefBase",
    "name" : "const android::hardware::BpHwRefBase",
-   "referenced_type" : "type-192",
-   "self_type" : "type-200",
+   "referenced_type" : "type-195",
+   "self_type" : "type-202",
    "size" : 48,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -17066,8 +17132,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-204",
-   "self_type" : "type-232",
+   "referenced_type" : "type-217",
+   "self_type" : "type-234",
    "size" : 136,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -17076,8 +17142,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
-   "referenced_type" : "type-99",
-   "self_type" : "type-109",
+   "referenced_type" : "type-101",
+   "self_type" : "type-111",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17086,8 +17152,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
-   "referenced_type" : "type-394",
-   "self_type" : "type-402",
+   "referenced_type" : "type-393",
+   "self_type" : "type-399",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17096,8 +17162,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
-   "referenced_type" : "type-111",
-   "self_type" : "type-115",
+   "referenced_type" : "type-113",
+   "self_type" : "type-117",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17106,7 +17172,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Status",
    "name" : "const android::hardware::Status",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1309",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -17126,8 +17192,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
-   "referenced_type" : "type-135",
-   "self_type" : "type-295",
+   "referenced_type" : "type-137",
+   "self_type" : "type-292",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17136,8 +17202,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned int>",
    "name" : "const android::hardware::details::hidl_pointer<unsigned int>",
-   "referenced_type" : "type-120",
-   "self_type" : "type-189",
+   "referenced_type" : "type-122",
+   "self_type" : "type-191",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17146,7 +17212,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::return_status",
    "name" : "const android::hardware::details::return_status",
-   "referenced_type" : "type-101",
+   "referenced_type" : "type-103",
    "self_type" : "type-1318",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -17156,8 +17222,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
-   "referenced_type" : "type-1745",
-   "self_type" : "type-1744",
+   "referenced_type" : "type-1746",
+   "self_type" : "type-1745",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17166,8 +17232,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
-   "referenced_type" : "type-1912",
-   "self_type" : "type-1911",
+   "referenced_type" : "type-1913",
+   "self_type" : "type-1912",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17176,8 +17242,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
-   "referenced_type" : "type-384",
-   "self_type" : "type-383",
+   "referenced_type" : "type-381",
+   "self_type" : "type-380",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17186,8 +17252,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
-   "referenced_type" : "type-2005",
-   "self_type" : "type-2004",
+   "referenced_type" : "type-2006",
+   "self_type" : "type-2005",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17196,8 +17262,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
-   "referenced_type" : "type-496",
-   "self_type" : "type-495",
+   "referenced_type" : "type-493",
+   "self_type" : "type-492",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17206,8 +17272,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_0::BufferUsage",
-   "referenced_type" : "type-149",
-   "self_type" : "type-152",
+   "referenced_type" : "type-152",
+   "self_type" : "type-155",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -17276,8 +17342,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_1::BufferUsage",
-   "referenced_type" : "type-157",
-   "self_type" : "type-159",
+   "referenced_type" : "type-159",
+   "self_type" : "type-161",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -17326,8 +17392,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_2::BufferUsage",
-   "referenced_type" : "type-422",
-   "self_type" : "type-424",
+   "referenced_type" : "type-419",
+   "self_type" : "type-421",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -17376,8 +17442,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper",
-   "referenced_type" : "type-1585",
-   "self_type" : "type-1584",
+   "referenced_type" : "type-1589",
+   "self_type" : "type-1588",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17386,8 +17452,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper",
-   "referenced_type" : "type-1857",
-   "self_type" : "type-1856",
+   "referenced_type" : "type-1858",
+   "self_type" : "type-1857",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17396,8 +17462,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper",
-   "referenced_type" : "type-52",
-   "self_type" : "type-51",
+   "referenced_type" : "type-87",
+   "self_type" : "type-86",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17406,8 +17472,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper",
-   "referenced_type" : "type-1595",
-   "self_type" : "type-1594",
+   "referenced_type" : "type-1599",
+   "self_type" : "type-1598",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17416,8 +17482,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper",
-   "referenced_type" : "type-1861",
-   "self_type" : "type-1860",
+   "referenced_type" : "type-1862",
+   "self_type" : "type-1861",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17426,8 +17492,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper",
-   "referenced_type" : "type-97",
-   "self_type" : "type-96",
+   "referenced_type" : "type-99",
+   "self_type" : "type-98",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17436,8 +17502,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper",
-   "referenced_type" : "type-1919",
-   "self_type" : "type-1918",
+   "referenced_type" : "type-1920",
+   "self_type" : "type-1919",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17446,8 +17512,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper",
-   "referenced_type" : "type-393",
-   "self_type" : "type-392",
+   "referenced_type" : "type-390",
+   "self_type" : "type-389",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17466,8 +17532,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
-   "referenced_type" : "type-148",
-   "self_type" : "type-153",
+   "referenced_type" : "type-151",
+   "self_type" : "type-156",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17476,8 +17542,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
-   "referenced_type" : "type-156",
-   "self_type" : "type-160",
+   "referenced_type" : "type-158",
+   "self_type" : "type-162",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17486,8 +17552,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
-   "referenced_type" : "type-421",
-   "self_type" : "type-425",
+   "referenced_type" : "type-418",
+   "self_type" : "type-422",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17496,7 +17562,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-138",
+   "referenced_type" : "type-140",
    "self_type" : "type-1122",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -17526,8 +17592,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_handle>",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_handle>",
-   "referenced_type" : "type-134",
-   "self_type" : "type-145",
+   "referenced_type" : "type-136",
+   "self_type" : "type-148",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17536,8 +17602,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned int>",
    "name" : "const android::hardware::hidl_vec<unsigned int>",
-   "referenced_type" : "type-128",
-   "self_type" : "type-131",
+   "referenced_type" : "type-130",
+   "self_type" : "type-133",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17556,8 +17622,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "const android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-163",
-   "self_type" : "type-164",
+   "referenced_type" : "type-166",
+   "self_type" : "type-167",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -17566,8 +17632,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase",
    "name" : "const android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-170",
-   "self_type" : "type-169",
+   "referenced_type" : "type-173",
+   "self_type" : "type-172",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
@@ -17576,8 +17642,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-297",
-   "self_type" : "type-296",
+   "referenced_type" : "type-294",
+   "self_type" : "type-293",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
@@ -17606,8 +17672,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::IBinder>",
    "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-250",
-   "self_type" : "type-275",
+   "referenced_type" : "type-252",
+   "self_type" : "type-271",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -17616,8 +17682,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::ProcessState>",
    "name" : "const android::sp<android::hardware::ProcessState>",
-   "referenced_type" : "type-281",
-   "self_type" : "type-280",
+   "referenced_type" : "type-277",
+   "self_type" : "type-276",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -17626,8 +17692,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
    "name" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
-   "referenced_type" : "type-357",
-   "self_type" : "type-381",
+   "referenced_type" : "type-354",
+   "self_type" : "type-378",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17636,8 +17702,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
    "name" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
-   "referenced_type" : "type-485",
-   "self_type" : "type-493",
+   "referenced_type" : "type-482",
+   "self_type" : "type-490",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17646,8 +17712,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
-   "referenced_type" : "type-334",
-   "self_type" : "type-389",
+   "referenced_type" : "type-331",
+   "self_type" : "type-386",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17656,8 +17722,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
-   "referenced_type" : "type-53",
-   "self_type" : "type-91",
+   "referenced_type" : "type-88",
+   "self_type" : "type-93",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17666,8 +17732,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
    "name" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
-   "referenced_type" : "type-498",
-   "self_type" : "type-506",
+   "referenced_type" : "type-496",
+   "self_type" : "type-503",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17686,8 +17752,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::base::V1_0::IBase>",
    "name" : "const android::sp<android::hidl::base::V1_0::IBase>",
-   "referenced_type" : "type-365",
-   "self_type" : "type-367",
+   "referenced_type" : "type-362",
+   "self_type" : "type-364",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17696,8 +17762,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification>",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification>",
-   "referenced_type" : "type-373",
-   "self_type" : "type-376",
+   "referenced_type" : "type-370",
+   "self_type" : "type-373",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17716,8 +17782,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ui::Transform",
    "name" : "const android::ui::Transform",
-   "referenced_type" : "type-2435",
-   "self_type" : "type-2438",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2440",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -17726,8 +17792,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ui::Transform::mat33",
    "name" : "const android::ui::Transform::mat33",
-   "referenced_type" : "type-2436",
-   "self_type" : "type-2446",
+   "referenced_type" : "type-2438",
+   "self_type" : "type-2448",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -17737,7 +17803,7 @@
    "linker_set_key" : "const bool",
    "name" : "const bool",
    "referenced_type" : "type-6",
-   "self_type" : "type-372",
+   "self_type" : "type-369",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -17746,8 +17812,8 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-290",
-   "self_type" : "type-289",
+   "referenced_type" : "type-287",
+   "self_type" : "type-286",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -17756,8 +17822,8 @@
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-181",
-   "self_type" : "type-180",
+   "referenced_type" : "type-183",
+   "self_type" : "type-182",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -17766,8 +17832,8 @@
    "is_const" : true,
    "linker_set_key" : "const double",
    "name" : "const double",
-   "referenced_type" : "type-45",
-   "self_type" : "type-854",
+   "referenced_type" : "type-44",
+   "self_type" : "type-851",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17777,7 +17843,7 @@
    "linker_set_key" : "const float",
    "name" : "const float",
    "referenced_type" : "type-10",
-   "self_type" : "type-564",
+   "self_type" : "type-561",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
   },
@@ -17793,8 +17859,8 @@
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-1775",
-   "self_type" : "type-1774",
+   "referenced_type" : "type-1776",
+   "self_type" : "type-1775",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
@@ -17809,8 +17875,8 @@
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-2415",
-   "self_type" : "type-2414",
+   "referenced_type" : "type-2417",
+   "self_type" : "type-2416",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
@@ -17818,8 +17884,8 @@
    "is_const" : true,
    "linker_set_key" : "const gralloc_module_t",
    "name" : "const gralloc_module_t",
-   "referenced_type" : "type-581",
-   "self_type" : "type-585",
+   "referenced_type" : "type-578",
+   "self_type" : "type-582",
    "size" : 344,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -17828,8 +17894,8 @@
    "is_const" : true,
    "linker_set_key" : "const hw_module_t",
    "name" : "const hw_module_t",
-   "referenced_type" : "type-550",
-   "self_type" : "type-556",
+   "referenced_type" : "type-547",
+   "self_type" : "type-553",
    "size" : 248,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -17838,8 +17904,8 @@
    "is_const" : true,
    "linker_set_key" : "const int",
    "name" : "const int",
-   "referenced_type" : "type-103",
-   "self_type" : "type-563",
+   "referenced_type" : "type-105",
+   "self_type" : "type-560",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -17855,120 +17921,120 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-126",
-   "self_type" : "type-125",
+   "referenced_type" : "type-128",
+   "self_type" : "type-127",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1576",
-   "self_type" : "type-1575",
+   "referenced_type" : "type-1581",
+   "self_type" : "type-1580",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1612",
-   "self_type" : "type-1611",
+   "referenced_type" : "type-1616",
+   "self_type" : "type-1615",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1786",
-   "self_type" : "type-1785",
+   "referenced_type" : "type-1787",
+   "self_type" : "type-1786",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1848",
-   "self_type" : "type-1847",
+   "referenced_type" : "type-1849",
+   "self_type" : "type-1848",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1867",
-   "self_type" : "type-1866",
+   "referenced_type" : "type-1868",
+   "self_type" : "type-1867",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-18",
-   "self_type" : "type-17",
+   "referenced_type" : "type-1936",
+   "self_type" : "type-1935",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1934",
-   "self_type" : "type-1933",
+   "referenced_type" : "type-2083",
+   "self_type" : "type-2082",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2081",
-   "self_type" : "type-2080",
+   "referenced_type" : "type-2175",
+   "self_type" : "type-2174",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2172",
-   "self_type" : "type-2171",
+   "referenced_type" : "type-2251",
+   "self_type" : "type-2250",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2249",
-   "self_type" : "type-2248",
+   "referenced_type" : "type-2293",
+   "self_type" : "type-2292",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2291",
-   "self_type" : "type-2290",
+   "referenced_type" : "type-2344",
+   "self_type" : "type-2343",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2342",
-   "self_type" : "type-2341",
+   "referenced_type" : "type-2476",
+   "self_type" : "type-2475",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2474",
-   "self_type" : "type-2473",
+   "referenced_type" : "type-39",
+   "self_type" : "type-38",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-413",
-   "self_type" : "type-412",
+   "referenced_type" : "type-410",
+   "self_type" : "type-409",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -17983,16 +18049,16 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-749",
-   "self_type" : "type-748",
+   "referenced_type" : "type-750",
+   "self_type" : "type-749",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-856",
-   "self_type" : "type-855",
+   "referenced_type" : "type-858",
+   "self_type" : "type-857",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -18026,7 +18092,7 @@
    "is_const" : true,
    "linker_set_key" : "const long",
    "name" : "const long",
-   "referenced_type" : "type-286",
+   "referenced_type" : "type-12",
    "self_type" : "type-848",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -18036,8 +18102,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle",
    "name" : "const native_handle",
-   "referenced_type" : "type-143",
-   "self_type" : "type-142",
+   "referenced_type" : "type-145",
+   "self_type" : "type-144",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18046,8 +18112,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle *const",
    "name" : "const native_handle *const",
-   "referenced_type" : "type-141",
-   "self_type" : "type-696",
+   "referenced_type" : "type-143",
+   "self_type" : "type-699",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18057,7 +18123,7 @@
    "linker_set_key" : "const short",
    "name" : "const short",
    "referenced_type" : "type-603",
-   "self_type" : "type-826",
+   "self_type" : "type-825",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18086,8 +18152,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3>",
    "name" : "const std::array<android::details::TVec2<float>, 3>",
-   "referenced_type" : "type-1769",
-   "self_type" : "type-1768",
+   "referenced_type" : "type-1770",
+   "self_type" : "type-1769",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -18096,8 +18162,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3>",
    "name" : "const std::array<android::details::TVec2<float>, 3>",
-   "referenced_type" : "type-2121",
-   "self_type" : "type-2120",
+   "referenced_type" : "type-2119",
+   "self_type" : "type-2118",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -18116,8 +18182,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1687",
-   "self_type" : "type-1686",
+   "referenced_type" : "type-1688",
+   "self_type" : "type-1687",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18126,8 +18192,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1793",
-   "self_type" : "type-1792",
+   "referenced_type" : "type-1794",
+   "self_type" : "type-1793",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18136,8 +18202,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1880",
-   "self_type" : "type-1879",
+   "referenced_type" : "type-1881",
+   "self_type" : "type-1880",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18146,8 +18212,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1957",
-   "self_type" : "type-1956",
+   "referenced_type" : "type-1959",
+   "self_type" : "type-1958",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18156,8 +18222,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2088",
-   "self_type" : "type-2087",
+   "referenced_type" : "type-2091",
+   "self_type" : "type-2090",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18166,8 +18232,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2186",
-   "self_type" : "type-2185",
+   "referenced_type" : "type-2189",
+   "self_type" : "type-2188",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18176,8 +18242,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2256",
-   "self_type" : "type-2255",
+   "referenced_type" : "type-2258",
+   "self_type" : "type-2257",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18186,8 +18252,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2296",
-   "self_type" : "type-2295",
+   "referenced_type" : "type-2298",
+   "self_type" : "type-2297",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18196,8 +18262,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2347",
-   "self_type" : "type-2346",
+   "referenced_type" : "type-2349",
+   "self_type" : "type-2348",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18206,8 +18272,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2512",
-   "self_type" : "type-2511",
+   "referenced_type" : "type-2514",
+   "self_type" : "type-2513",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18216,8 +18282,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-303",
-   "self_type" : "type-302",
+   "referenced_type" : "type-300",
+   "self_type" : "type-299",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18226,8 +18292,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-443",
-   "self_type" : "type-442",
+   "referenced_type" : "type-441",
+   "self_type" : "type-440",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18246,8 +18312,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-763",
-   "self_type" : "type-762",
+   "referenced_type" : "type-765",
+   "self_type" : "type-764",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18256,8 +18322,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-867",
-   "self_type" : "type-866",
+   "referenced_type" : "type-868",
+   "self_type" : "type-867",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18266,8 +18332,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-923",
-   "self_type" : "type-922",
+   "referenced_type" : "type-924",
+   "self_type" : "type-923",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18306,8 +18372,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1693",
-   "self_type" : "type-1692",
+   "referenced_type" : "type-1694",
+   "self_type" : "type-1693",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18316,8 +18382,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1799",
-   "self_type" : "type-1798",
+   "referenced_type" : "type-1800",
+   "self_type" : "type-1799",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18326,8 +18392,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1886",
-   "self_type" : "type-1885",
+   "referenced_type" : "type-1887",
+   "self_type" : "type-1886",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18336,8 +18402,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1964",
-   "self_type" : "type-1963",
+   "referenced_type" : "type-1966",
+   "self_type" : "type-1965",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18346,8 +18412,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2094",
-   "self_type" : "type-2093",
+   "referenced_type" : "type-2097",
+   "self_type" : "type-2096",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18356,8 +18422,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2193",
-   "self_type" : "type-2192",
+   "referenced_type" : "type-2196",
+   "self_type" : "type-2195",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18366,8 +18432,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2262",
-   "self_type" : "type-2261",
+   "referenced_type" : "type-2264",
+   "self_type" : "type-2263",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18376,8 +18442,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2302",
-   "self_type" : "type-2301",
+   "referenced_type" : "type-2304",
+   "self_type" : "type-2303",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18386,8 +18452,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2353",
-   "self_type" : "type-2352",
+   "referenced_type" : "type-2355",
+   "self_type" : "type-2354",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18396,8 +18462,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2518",
-   "self_type" : "type-2517",
+   "referenced_type" : "type-2520",
+   "self_type" : "type-2519",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18406,8 +18472,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-309",
-   "self_type" : "type-308",
+   "referenced_type" : "type-307",
+   "self_type" : "type-306",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18416,8 +18482,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-450",
-   "self_type" : "type-449",
+   "referenced_type" : "type-447",
+   "self_type" : "type-446",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18426,8 +18492,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-659",
-   "self_type" : "type-658",
+   "referenced_type" : "type-660",
+   "self_type" : "type-659",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18436,8 +18502,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-769",
-   "self_type" : "type-768",
+   "referenced_type" : "type-771",
+   "self_type" : "type-770",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18446,8 +18512,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-873",
-   "self_type" : "type-872",
+   "referenced_type" : "type-874",
+   "self_type" : "type-873",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18456,8 +18522,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-930",
-   "self_type" : "type-929",
+   "referenced_type" : "type-931",
+   "self_type" : "type-930",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18466,8 +18532,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1004",
-   "self_type" : "type-1003",
+   "referenced_type" : "type-1005",
+   "self_type" : "type-1004",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18486,8 +18552,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1695",
-   "self_type" : "type-1694",
+   "referenced_type" : "type-1696",
+   "self_type" : "type-1695",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18496,8 +18562,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1801",
-   "self_type" : "type-1800",
+   "referenced_type" : "type-1802",
+   "self_type" : "type-1801",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18506,8 +18572,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1888",
-   "self_type" : "type-1887",
+   "referenced_type" : "type-1889",
+   "self_type" : "type-1888",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18516,8 +18582,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1966",
-   "self_type" : "type-1965",
+   "referenced_type" : "type-1968",
+   "self_type" : "type-1967",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18526,8 +18592,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2096",
-   "self_type" : "type-2095",
+   "referenced_type" : "type-2099",
+   "self_type" : "type-2098",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18536,8 +18602,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2195",
-   "self_type" : "type-2194",
+   "referenced_type" : "type-2198",
+   "self_type" : "type-2197",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18546,8 +18612,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2264",
-   "self_type" : "type-2263",
+   "referenced_type" : "type-2266",
+   "self_type" : "type-2265",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18556,8 +18622,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2304",
-   "self_type" : "type-2303",
+   "referenced_type" : "type-2306",
+   "self_type" : "type-2305",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18566,8 +18632,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2355",
-   "self_type" : "type-2354",
+   "referenced_type" : "type-2357",
+   "self_type" : "type-2356",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18576,8 +18642,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2520",
-   "self_type" : "type-2519",
+   "referenced_type" : "type-2522",
+   "self_type" : "type-2521",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18586,8 +18652,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-312",
-   "self_type" : "type-311",
+   "referenced_type" : "type-309",
+   "self_type" : "type-308",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18596,8 +18662,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-452",
-   "self_type" : "type-451",
+   "referenced_type" : "type-449",
+   "self_type" : "type-448",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18606,8 +18672,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-661",
-   "self_type" : "type-660",
+   "referenced_type" : "type-662",
+   "self_type" : "type-661",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18626,8 +18692,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-875",
-   "self_type" : "type-874",
+   "referenced_type" : "type-876",
+   "self_type" : "type-875",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18636,8 +18702,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-932",
-   "self_type" : "type-931",
+   "referenced_type" : "type-933",
+   "self_type" : "type-932",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18666,8 +18732,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1691",
-   "self_type" : "type-1690",
+   "referenced_type" : "type-1692",
+   "self_type" : "type-1691",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18676,8 +18742,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1797",
-   "self_type" : "type-1796",
+   "referenced_type" : "type-1798",
+   "self_type" : "type-1797",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18686,8 +18752,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1884",
-   "self_type" : "type-1883",
+   "referenced_type" : "type-1885",
+   "self_type" : "type-1884",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18696,8 +18762,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1962",
-   "self_type" : "type-1961",
+   "referenced_type" : "type-1963",
+   "self_type" : "type-1962",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18706,8 +18772,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2092",
-   "self_type" : "type-2091",
+   "referenced_type" : "type-2095",
+   "self_type" : "type-2094",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18716,8 +18782,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2190",
-   "self_type" : "type-2189",
+   "referenced_type" : "type-2193",
+   "self_type" : "type-2192",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18726,8 +18792,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2260",
-   "self_type" : "type-2259",
+   "referenced_type" : "type-2262",
+   "self_type" : "type-2261",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18736,8 +18802,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2300",
-   "self_type" : "type-2299",
+   "referenced_type" : "type-2302",
+   "self_type" : "type-2301",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18746,8 +18812,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2351",
-   "self_type" : "type-2350",
+   "referenced_type" : "type-2353",
+   "self_type" : "type-2352",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18756,8 +18822,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2516",
-   "self_type" : "type-2515",
+   "referenced_type" : "type-2518",
+   "self_type" : "type-2517",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18766,8 +18832,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-307",
-   "self_type" : "type-306",
+   "referenced_type" : "type-304",
+   "self_type" : "type-303",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18776,8 +18842,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-448",
-   "self_type" : "type-447",
+   "referenced_type" : "type-445",
+   "self_type" : "type-444",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18786,8 +18852,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-657",
-   "self_type" : "type-656",
+   "referenced_type" : "type-658",
+   "self_type" : "type-657",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18796,8 +18862,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-767",
-   "self_type" : "type-766",
+   "referenced_type" : "type-769",
+   "self_type" : "type-768",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18806,8 +18872,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-871",
-   "self_type" : "type-870",
+   "referenced_type" : "type-872",
+   "self_type" : "type-871",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18816,8 +18882,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-927",
-   "self_type" : "type-926",
+   "referenced_type" : "type-928",
+   "self_type" : "type-927",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18826,8 +18892,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1006",
-   "self_type" : "type-1005",
+   "referenced_type" : "type-1007",
+   "self_type" : "type-1006",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18846,8 +18912,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1697",
-   "self_type" : "type-1696",
+   "referenced_type" : "type-1698",
+   "self_type" : "type-1697",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18856,8 +18922,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1803",
-   "self_type" : "type-1802",
+   "referenced_type" : "type-1804",
+   "self_type" : "type-1803",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18866,8 +18932,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1890",
-   "self_type" : "type-1889",
+   "referenced_type" : "type-1891",
+   "self_type" : "type-1890",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18876,8 +18942,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1968",
-   "self_type" : "type-1967",
+   "referenced_type" : "type-1970",
+   "self_type" : "type-1969",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18886,8 +18952,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2099",
-   "self_type" : "type-2098",
+   "referenced_type" : "type-2103",
+   "self_type" : "type-2102",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18896,8 +18962,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2197",
-   "self_type" : "type-2196",
+   "referenced_type" : "type-2200",
+   "self_type" : "type-2199",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18906,8 +18972,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2266",
-   "self_type" : "type-2265",
+   "referenced_type" : "type-2268",
+   "self_type" : "type-2267",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18916,8 +18982,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2306",
-   "self_type" : "type-2305",
+   "referenced_type" : "type-2308",
+   "self_type" : "type-2307",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18926,8 +18992,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2357",
-   "self_type" : "type-2356",
+   "referenced_type" : "type-2359",
+   "self_type" : "type-2358",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18936,8 +19002,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2522",
-   "self_type" : "type-2521",
+   "referenced_type" : "type-2524",
+   "self_type" : "type-2523",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18946,8 +19012,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-314",
-   "self_type" : "type-313",
+   "referenced_type" : "type-311",
+   "self_type" : "type-310",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18956,8 +19022,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-454",
-   "self_type" : "type-453",
+   "referenced_type" : "type-451",
+   "self_type" : "type-450",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18986,8 +19052,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-878",
-   "self_type" : "type-877",
+   "referenced_type" : "type-879",
+   "self_type" : "type-878",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18996,8 +19062,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-934",
-   "self_type" : "type-933",
+   "referenced_type" : "type-935",
+   "self_type" : "type-934",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19016,8 +19082,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1685",
-   "self_type" : "type-1684",
+   "referenced_type" : "type-1686",
+   "self_type" : "type-1685",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19026,8 +19092,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1791",
-   "self_type" : "type-1790",
+   "referenced_type" : "type-1792",
+   "self_type" : "type-1791",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19036,8 +19102,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1878",
-   "self_type" : "type-1877",
+   "referenced_type" : "type-1879",
+   "self_type" : "type-1878",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19046,8 +19112,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1955",
-   "self_type" : "type-1954",
+   "referenced_type" : "type-1957",
+   "self_type" : "type-1956",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19056,8 +19122,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2086",
-   "self_type" : "type-2085",
+   "referenced_type" : "type-2088",
+   "self_type" : "type-2087",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19066,8 +19132,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2184",
-   "self_type" : "type-2183",
+   "referenced_type" : "type-2187",
+   "self_type" : "type-2186",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19076,8 +19142,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2254",
-   "self_type" : "type-2253",
+   "referenced_type" : "type-2256",
+   "self_type" : "type-2255",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19086,8 +19152,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2294",
-   "self_type" : "type-2293",
+   "referenced_type" : "type-2296",
+   "self_type" : "type-2295",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19096,8 +19162,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2345",
-   "self_type" : "type-2344",
+   "referenced_type" : "type-2347",
+   "self_type" : "type-2346",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19106,8 +19172,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2510",
-   "self_type" : "type-2509",
+   "referenced_type" : "type-2512",
+   "self_type" : "type-2511",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19116,8 +19182,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-301",
-   "self_type" : "type-300",
+   "referenced_type" : "type-298",
+   "self_type" : "type-297",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19126,8 +19192,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-441",
-   "self_type" : "type-440",
+   "referenced_type" : "type-438",
+   "self_type" : "type-437",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19136,8 +19202,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-650",
-   "self_type" : "type-649",
+   "referenced_type" : "type-651",
+   "self_type" : "type-650",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19156,8 +19222,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-864",
-   "self_type" : "type-863",
+   "referenced_type" : "type-865",
+   "self_type" : "type-864",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19166,8 +19232,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-921",
-   "self_type" : "type-920",
+   "referenced_type" : "type-922",
+   "self_type" : "type-921",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19196,8 +19262,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1689",
-   "self_type" : "type-1688",
+   "referenced_type" : "type-1690",
+   "self_type" : "type-1689",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19206,8 +19272,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1795",
-   "self_type" : "type-1794",
+   "referenced_type" : "type-1796",
+   "self_type" : "type-1795",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19216,8 +19282,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1882",
-   "self_type" : "type-1881",
+   "referenced_type" : "type-1883",
+   "self_type" : "type-1882",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19226,8 +19292,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1960",
-   "self_type" : "type-1959",
+   "referenced_type" : "type-1961",
+   "self_type" : "type-1960",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19236,8 +19302,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2090",
-   "self_type" : "type-2089",
+   "referenced_type" : "type-2093",
+   "self_type" : "type-2092",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19246,8 +19312,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2188",
-   "self_type" : "type-2187",
+   "referenced_type" : "type-2191",
+   "self_type" : "type-2190",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19256,8 +19322,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2258",
-   "self_type" : "type-2257",
+   "referenced_type" : "type-2260",
+   "self_type" : "type-2259",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19266,8 +19332,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2298",
-   "self_type" : "type-2297",
+   "referenced_type" : "type-2300",
+   "self_type" : "type-2299",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19276,8 +19342,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2349",
-   "self_type" : "type-2348",
+   "referenced_type" : "type-2351",
+   "self_type" : "type-2350",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19286,8 +19352,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2514",
-   "self_type" : "type-2513",
+   "referenced_type" : "type-2516",
+   "self_type" : "type-2515",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19296,8 +19362,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-305",
-   "self_type" : "type-304",
+   "referenced_type" : "type-302",
+   "self_type" : "type-301",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19306,8 +19372,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-445",
-   "self_type" : "type-444",
+   "referenced_type" : "type-443",
+   "self_type" : "type-442",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19326,8 +19392,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-765",
-   "self_type" : "type-764",
+   "referenced_type" : "type-767",
+   "self_type" : "type-766",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19336,8 +19402,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-869",
-   "self_type" : "type-868",
+   "referenced_type" : "type-870",
+   "self_type" : "type-869",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19346,8 +19412,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-925",
-   "self_type" : "type-924",
+   "referenced_type" : "type-926",
+   "self_type" : "type-925",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19366,8 +19432,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1011",
-   "self_type" : "type-1010",
+   "referenced_type" : "type-1013",
+   "self_type" : "type-1012",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19386,8 +19452,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1701",
-   "self_type" : "type-1700",
+   "referenced_type" : "type-1702",
+   "self_type" : "type-1701",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19396,8 +19462,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1807",
-   "self_type" : "type-1806",
+   "referenced_type" : "type-1808",
+   "self_type" : "type-1807",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19406,8 +19472,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1894",
-   "self_type" : "type-1893",
+   "referenced_type" : "type-1895",
+   "self_type" : "type-1894",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19416,8 +19482,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1973",
-   "self_type" : "type-1972",
+   "referenced_type" : "type-1975",
+   "self_type" : "type-1974",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19426,8 +19492,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2105",
-   "self_type" : "type-2104",
+   "referenced_type" : "type-2107",
+   "self_type" : "type-2106",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19436,8 +19502,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2202",
-   "self_type" : "type-2201",
+   "referenced_type" : "type-2205",
+   "self_type" : "type-2204",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19446,8 +19512,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2270",
-   "self_type" : "type-2269",
+   "referenced_type" : "type-2272",
+   "self_type" : "type-2271",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19456,8 +19522,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2310",
-   "self_type" : "type-2309",
+   "referenced_type" : "type-2312",
+   "self_type" : "type-2311",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19466,8 +19532,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2361",
-   "self_type" : "type-2360",
+   "referenced_type" : "type-2363",
+   "self_type" : "type-2362",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19476,8 +19542,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2530",
-   "self_type" : "type-2529",
+   "referenced_type" : "type-2532",
+   "self_type" : "type-2531",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19486,8 +19552,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-319",
-   "self_type" : "type-318",
+   "referenced_type" : "type-316",
+   "self_type" : "type-315",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19496,8 +19562,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-458",
-   "self_type" : "type-457",
+   "referenced_type" : "type-455",
+   "self_type" : "type-454",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19506,8 +19572,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-668",
-   "self_type" : "type-667",
+   "referenced_type" : "type-669",
+   "self_type" : "type-668",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19516,8 +19582,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-779",
-   "self_type" : "type-778",
+   "referenced_type" : "type-780",
+   "self_type" : "type-779",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19526,8 +19592,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-883",
-   "self_type" : "type-882",
+   "referenced_type" : "type-884",
+   "self_type" : "type-883",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19536,8 +19602,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-939",
-   "self_type" : "type-938",
+   "referenced_type" : "type-940",
+   "self_type" : "type-939",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19546,8 +19612,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1015",
-   "self_type" : "type-1014",
+   "referenced_type" : "type-1017",
+   "self_type" : "type-1016",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19566,8 +19632,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1705",
-   "self_type" : "type-1704",
+   "referenced_type" : "type-1706",
+   "self_type" : "type-1705",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19576,8 +19642,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1811",
-   "self_type" : "type-1810",
+   "referenced_type" : "type-1812",
+   "self_type" : "type-1811",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19586,8 +19652,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1898",
-   "self_type" : "type-1897",
+   "referenced_type" : "type-1899",
+   "self_type" : "type-1898",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19596,8 +19662,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1978",
-   "self_type" : "type-1977",
+   "referenced_type" : "type-1979",
+   "self_type" : "type-1978",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19606,8 +19672,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2109",
-   "self_type" : "type-2108",
+   "referenced_type" : "type-2111",
+   "self_type" : "type-2110",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19616,8 +19682,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2206",
-   "self_type" : "type-2205",
+   "referenced_type" : "type-2209",
+   "self_type" : "type-2208",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19626,8 +19692,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2274",
-   "self_type" : "type-2273",
+   "referenced_type" : "type-2276",
+   "self_type" : "type-2275",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19636,8 +19702,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2314",
-   "self_type" : "type-2313",
+   "referenced_type" : "type-2316",
+   "self_type" : "type-2315",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19646,8 +19712,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2365",
-   "self_type" : "type-2364",
+   "referenced_type" : "type-2367",
+   "self_type" : "type-2366",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19656,8 +19722,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2534",
-   "self_type" : "type-2533",
+   "referenced_type" : "type-2536",
+   "self_type" : "type-2535",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19666,8 +19732,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-323",
-   "self_type" : "type-322",
+   "referenced_type" : "type-320",
+   "self_type" : "type-319",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19676,8 +19742,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-464",
-   "self_type" : "type-463",
+   "referenced_type" : "type-461",
+   "self_type" : "type-460",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19686,8 +19752,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-673",
-   "self_type" : "type-672",
+   "referenced_type" : "type-674",
+   "self_type" : "type-673",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19696,8 +19762,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-783",
-   "self_type" : "type-782",
+   "referenced_type" : "type-784",
+   "self_type" : "type-783",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19706,8 +19772,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-887",
-   "self_type" : "type-886",
+   "referenced_type" : "type-888",
+   "self_type" : "type-887",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19716,8 +19782,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-943",
-   "self_type" : "type-942",
+   "referenced_type" : "type-944",
+   "self_type" : "type-943",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19726,8 +19792,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1013",
-   "self_type" : "type-1012",
+   "referenced_type" : "type-1015",
+   "self_type" : "type-1014",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19746,8 +19812,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1703",
-   "self_type" : "type-1702",
+   "referenced_type" : "type-1704",
+   "self_type" : "type-1703",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19756,8 +19822,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1809",
-   "self_type" : "type-1808",
+   "referenced_type" : "type-1810",
+   "self_type" : "type-1809",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19766,8 +19832,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1896",
-   "self_type" : "type-1895",
+   "referenced_type" : "type-1897",
+   "self_type" : "type-1896",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19776,8 +19842,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1975",
-   "self_type" : "type-1974",
+   "referenced_type" : "type-1977",
+   "self_type" : "type-1976",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19786,8 +19852,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2107",
-   "self_type" : "type-2106",
+   "referenced_type" : "type-2109",
+   "self_type" : "type-2108",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19796,8 +19862,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2204",
-   "self_type" : "type-2203",
+   "referenced_type" : "type-2207",
+   "self_type" : "type-2206",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19806,8 +19872,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2272",
-   "self_type" : "type-2271",
+   "referenced_type" : "type-2274",
+   "self_type" : "type-2273",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19816,8 +19882,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2312",
-   "self_type" : "type-2311",
+   "referenced_type" : "type-2314",
+   "self_type" : "type-2313",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19826,8 +19892,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2363",
-   "self_type" : "type-2362",
+   "referenced_type" : "type-2365",
+   "self_type" : "type-2364",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19836,8 +19902,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2532",
-   "self_type" : "type-2531",
+   "referenced_type" : "type-2534",
+   "self_type" : "type-2533",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19846,8 +19912,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-321",
-   "self_type" : "type-320",
+   "referenced_type" : "type-318",
+   "self_type" : "type-317",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19856,8 +19922,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-460",
-   "self_type" : "type-459",
+   "referenced_type" : "type-459",
+   "self_type" : "type-458",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19876,8 +19942,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-781",
-   "self_type" : "type-780",
+   "referenced_type" : "type-782",
+   "self_type" : "type-781",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19886,8 +19952,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-885",
-   "self_type" : "type-884",
+   "referenced_type" : "type-886",
+   "self_type" : "type-885",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19896,8 +19962,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-941",
-   "self_type" : "type-940",
+   "referenced_type" : "type-942",
+   "self_type" : "type-941",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19906,8 +19972,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1009",
-   "self_type" : "type-1008",
+   "referenced_type" : "type-1011",
+   "self_type" : "type-1010",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19926,8 +19992,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1699",
-   "self_type" : "type-1698",
+   "referenced_type" : "type-1700",
+   "self_type" : "type-1699",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19936,8 +20002,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1805",
-   "self_type" : "type-1804",
+   "referenced_type" : "type-1806",
+   "self_type" : "type-1805",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19946,8 +20012,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1892",
-   "self_type" : "type-1891",
+   "referenced_type" : "type-1893",
+   "self_type" : "type-1892",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19956,8 +20022,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1971",
-   "self_type" : "type-1970",
+   "referenced_type" : "type-1973",
+   "self_type" : "type-1972",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19966,8 +20032,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2101",
-   "self_type" : "type-2100",
+   "referenced_type" : "type-2105",
+   "self_type" : "type-2104",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19976,8 +20042,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2200",
-   "self_type" : "type-2199",
+   "referenced_type" : "type-2203",
+   "self_type" : "type-2202",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19986,8 +20052,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2268",
-   "self_type" : "type-2267",
+   "referenced_type" : "type-2270",
+   "self_type" : "type-2269",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19996,8 +20062,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2308",
-   "self_type" : "type-2307",
+   "referenced_type" : "type-2310",
+   "self_type" : "type-2309",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20006,8 +20072,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2359",
-   "self_type" : "type-2358",
+   "referenced_type" : "type-2361",
+   "self_type" : "type-2360",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20016,8 +20082,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2528",
-   "self_type" : "type-2527",
+   "referenced_type" : "type-2530",
+   "self_type" : "type-2529",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20026,8 +20092,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-316",
-   "self_type" : "type-315",
+   "referenced_type" : "type-314",
+   "self_type" : "type-313",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20036,8 +20102,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-456",
-   "self_type" : "type-455",
+   "referenced_type" : "type-453",
+   "self_type" : "type-452",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20046,8 +20112,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-666",
-   "self_type" : "type-665",
+   "referenced_type" : "type-667",
+   "self_type" : "type-666",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20066,8 +20132,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-880",
-   "self_type" : "type-879",
+   "referenced_type" : "type-881",
+   "self_type" : "type-880",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20076,8 +20142,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-937",
-   "self_type" : "type-936",
+   "referenced_type" : "type-938",
+   "self_type" : "type-937",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20086,8 +20152,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1017",
-   "self_type" : "type-1016",
+   "referenced_type" : "type-1019",
+   "self_type" : "type-1018",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20106,8 +20172,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1707",
-   "self_type" : "type-1706",
+   "referenced_type" : "type-1708",
+   "self_type" : "type-1707",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20116,8 +20182,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1813",
-   "self_type" : "type-1812",
+   "referenced_type" : "type-1814",
+   "self_type" : "type-1813",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20126,8 +20192,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1900",
-   "self_type" : "type-1899",
+   "referenced_type" : "type-1901",
+   "self_type" : "type-1900",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20136,8 +20202,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1980",
-   "self_type" : "type-1979",
+   "referenced_type" : "type-1981",
+   "self_type" : "type-1980",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20146,8 +20212,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2111",
-   "self_type" : "type-2110",
+   "referenced_type" : "type-2113",
+   "self_type" : "type-2112",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20156,8 +20222,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2209",
-   "self_type" : "type-2208",
+   "referenced_type" : "type-2213",
+   "self_type" : "type-2212",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20166,8 +20232,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2276",
-   "self_type" : "type-2275",
+   "referenced_type" : "type-2278",
+   "self_type" : "type-2277",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20176,8 +20242,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2316",
-   "self_type" : "type-2315",
+   "referenced_type" : "type-2318",
+   "self_type" : "type-2317",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20186,8 +20252,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2367",
-   "self_type" : "type-2366",
+   "referenced_type" : "type-2369",
+   "self_type" : "type-2368",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20196,8 +20262,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2536",
-   "self_type" : "type-2535",
+   "referenced_type" : "type-2538",
+   "self_type" : "type-2537",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20206,8 +20272,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-325",
-   "self_type" : "type-324",
+   "referenced_type" : "type-322",
+   "self_type" : "type-321",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20216,8 +20282,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-466",
-   "self_type" : "type-465",
+   "referenced_type" : "type-463",
+   "self_type" : "type-462",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20226,8 +20292,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-675",
-   "self_type" : "type-674",
+   "referenced_type" : "type-676",
+   "self_type" : "type-675",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20246,8 +20312,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-889",
-   "self_type" : "type-888",
+   "referenced_type" : "type-890",
+   "self_type" : "type-889",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20256,8 +20322,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-946",
-   "self_type" : "type-945",
+   "referenced_type" : "type-947",
+   "self_type" : "type-946",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20266,8 +20332,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1027",
-   "self_type" : "type-1026",
+   "referenced_type" : "type-1028",
+   "self_type" : "type-1027",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20286,8 +20352,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1821",
-   "self_type" : "type-1820",
+   "referenced_type" : "type-1822",
+   "self_type" : "type-1821",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20296,8 +20362,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1989",
-   "self_type" : "type-1988",
+   "referenced_type" : "type-1991",
+   "self_type" : "type-1990",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20306,8 +20372,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2219",
-   "self_type" : "type-2218",
+   "referenced_type" : "type-2221",
+   "self_type" : "type-2220",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20316,8 +20382,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2284",
-   "self_type" : "type-2283",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2285",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20326,8 +20392,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2324",
-   "self_type" : "type-2323",
+   "referenced_type" : "type-2326",
+   "self_type" : "type-2325",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20336,8 +20402,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2375",
-   "self_type" : "type-2374",
+   "referenced_type" : "type-2377",
+   "self_type" : "type-2376",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20346,8 +20412,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2548",
-   "self_type" : "type-2547",
+   "referenced_type" : "type-2550",
+   "self_type" : "type-2549",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20356,8 +20422,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-474",
-   "self_type" : "type-473",
+   "referenced_type" : "type-471",
+   "self_type" : "type-470",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20366,8 +20432,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-795",
-   "self_type" : "type-794",
+   "referenced_type" : "type-796",
+   "self_type" : "type-795",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20376,8 +20442,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-899",
-   "self_type" : "type-898",
+   "referenced_type" : "type-900",
+   "self_type" : "type-899",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20386,8 +20452,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-955",
-   "self_type" : "type-954",
+   "referenced_type" : "type-956",
+   "self_type" : "type-955",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20416,8 +20482,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-1819",
-   "self_type" : "type-1818",
+   "referenced_type" : "type-1820",
+   "self_type" : "type-1819",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20426,8 +20492,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-1987",
-   "self_type" : "type-1986",
+   "referenced_type" : "type-1988",
+   "self_type" : "type-1987",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20436,8 +20502,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2217",
-   "self_type" : "type-2216",
+   "referenced_type" : "type-2219",
+   "self_type" : "type-2218",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20446,8 +20512,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2282",
-   "self_type" : "type-2281",
+   "referenced_type" : "type-2284",
+   "self_type" : "type-2283",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20456,8 +20522,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2322",
-   "self_type" : "type-2321",
+   "referenced_type" : "type-2324",
+   "self_type" : "type-2323",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20466,8 +20532,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2373",
-   "self_type" : "type-2372",
+   "referenced_type" : "type-2375",
+   "self_type" : "type-2374",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20476,8 +20542,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2546",
-   "self_type" : "type-2545",
+   "referenced_type" : "type-2548",
+   "self_type" : "type-2547",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20486,8 +20552,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-472",
-   "self_type" : "type-471",
+   "referenced_type" : "type-469",
+   "self_type" : "type-468",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20496,8 +20562,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-793",
-   "self_type" : "type-792",
+   "referenced_type" : "type-794",
+   "self_type" : "type-793",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20506,8 +20572,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-897",
-   "self_type" : "type-896",
+   "referenced_type" : "type-898",
+   "self_type" : "type-897",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20516,8 +20582,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-953",
-   "self_type" : "type-952",
+   "referenced_type" : "type-954",
+   "self_type" : "type-953",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20546,8 +20612,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-1817",
-   "self_type" : "type-1816",
+   "referenced_type" : "type-1818",
+   "self_type" : "type-1817",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20556,8 +20622,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-1985",
-   "self_type" : "type-1984",
+   "referenced_type" : "type-1986",
+   "self_type" : "type-1985",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20566,8 +20632,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2215",
-   "self_type" : "type-2214",
+   "referenced_type" : "type-2217",
+   "self_type" : "type-2216",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20576,8 +20642,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2280",
-   "self_type" : "type-2279",
+   "referenced_type" : "type-2282",
+   "self_type" : "type-2281",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20586,8 +20652,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2320",
-   "self_type" : "type-2319",
+   "referenced_type" : "type-2322",
+   "self_type" : "type-2321",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20596,8 +20662,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2371",
-   "self_type" : "type-2370",
+   "referenced_type" : "type-2373",
+   "self_type" : "type-2372",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20606,8 +20672,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2544",
-   "self_type" : "type-2543",
+   "referenced_type" : "type-2546",
+   "self_type" : "type-2545",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20616,8 +20682,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-470",
-   "self_type" : "type-469",
+   "referenced_type" : "type-467",
+   "self_type" : "type-466",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20626,8 +20692,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-791",
-   "self_type" : "type-790",
+   "referenced_type" : "type-792",
+   "self_type" : "type-791",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20636,8 +20702,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-895",
-   "self_type" : "type-894",
+   "referenced_type" : "type-896",
+   "self_type" : "type-895",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20646,8 +20712,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-950",
-   "self_type" : "type-949",
+   "referenced_type" : "type-951",
+   "self_type" : "type-950",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20676,8 +20742,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-1815",
-   "self_type" : "type-1814",
+   "referenced_type" : "type-1816",
+   "self_type" : "type-1815",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20686,8 +20752,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-1982",
-   "self_type" : "type-1981",
+   "referenced_type" : "type-1984",
+   "self_type" : "type-1983",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20696,8 +20762,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2213",
-   "self_type" : "type-2212",
+   "referenced_type" : "type-2215",
+   "self_type" : "type-2214",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20706,8 +20772,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2278",
-   "self_type" : "type-2277",
+   "referenced_type" : "type-2280",
+   "self_type" : "type-2279",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20716,8 +20782,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2318",
-   "self_type" : "type-2317",
+   "referenced_type" : "type-2320",
+   "self_type" : "type-2319",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20726,8 +20792,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2369",
-   "self_type" : "type-2368",
+   "referenced_type" : "type-2371",
+   "self_type" : "type-2370",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20736,8 +20802,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2542",
-   "self_type" : "type-2541",
+   "referenced_type" : "type-2544",
+   "self_type" : "type-2543",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20746,8 +20812,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-468",
-   "self_type" : "type-467",
+   "referenced_type" : "type-465",
+   "self_type" : "type-464",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20766,8 +20832,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-892",
-   "self_type" : "type-891",
+   "referenced_type" : "type-893",
+   "self_type" : "type-892",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20776,8 +20842,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-948",
-   "self_type" : "type-947",
+   "referenced_type" : "type-949",
+   "self_type" : "type-948",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20786,8 +20852,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1029",
-   "self_type" : "type-1028",
+   "referenced_type" : "type-1030",
+   "self_type" : "type-1029",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20806,8 +20872,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1823",
-   "self_type" : "type-1822",
+   "referenced_type" : "type-1824",
+   "self_type" : "type-1823",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20816,8 +20882,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1991",
-   "self_type" : "type-1990",
+   "referenced_type" : "type-1993",
+   "self_type" : "type-1992",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20826,8 +20892,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2221",
-   "self_type" : "type-2220",
+   "referenced_type" : "type-2224",
+   "self_type" : "type-2223",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20836,8 +20902,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2286",
-   "self_type" : "type-2285",
+   "referenced_type" : "type-2288",
+   "self_type" : "type-2287",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20846,8 +20912,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2326",
-   "self_type" : "type-2325",
+   "referenced_type" : "type-2328",
+   "self_type" : "type-2327",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20856,8 +20922,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2377",
-   "self_type" : "type-2376",
+   "referenced_type" : "type-2379",
+   "self_type" : "type-2378",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20866,8 +20932,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2550",
-   "self_type" : "type-2549",
+   "referenced_type" : "type-2552",
+   "self_type" : "type-2551",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20876,8 +20942,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-476",
-   "self_type" : "type-475",
+   "referenced_type" : "type-473",
+   "self_type" : "type-472",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20886,8 +20952,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-797",
-   "self_type" : "type-796",
+   "referenced_type" : "type-798",
+   "self_type" : "type-797",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20896,8 +20962,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-901",
-   "self_type" : "type-900",
+   "referenced_type" : "type-902",
+   "self_type" : "type-901",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20906,8 +20972,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-957",
-   "self_type" : "type-956",
+   "referenced_type" : "type-958",
+   "self_type" : "type-957",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20916,8 +20982,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1632",
-   "self_type" : "type-1631",
+   "referenced_type" : "type-1636",
+   "self_type" : "type-1635",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20926,8 +20992,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-167",
-   "self_type" : "type-166",
+   "referenced_type" : "type-169",
+   "self_type" : "type-168",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20936,8 +21002,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1870",
-   "self_type" : "type-1869",
+   "referenced_type" : "type-1871",
+   "self_type" : "type-1870",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20946,8 +21012,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1944",
-   "self_type" : "type-1943",
+   "referenced_type" : "type-1945",
+   "self_type" : "type-1944",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20956,8 +21022,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2084",
-   "self_type" : "type-2083",
+   "referenced_type" : "type-2086",
+   "self_type" : "type-2085",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20966,8 +21032,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2180",
-   "self_type" : "type-2179",
+   "referenced_type" : "type-2183",
+   "self_type" : "type-2182",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20976,8 +21042,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2252",
-   "self_type" : "type-2251",
+   "referenced_type" : "type-2254",
+   "self_type" : "type-2253",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20986,8 +21052,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-428",
-   "self_type" : "type-427",
+   "referenced_type" : "type-425",
+   "self_type" : "type-424",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20996,8 +21062,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-647",
-   "self_type" : "type-646",
+   "referenced_type" : "type-648",
+   "self_type" : "type-647",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -21006,8 +21072,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-757",
-   "self_type" : "type-756",
+   "referenced_type" : "type-758",
+   "self_type" : "type-757",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -21026,8 +21092,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1019",
-   "self_type" : "type-1018",
+   "referenced_type" : "type-1009",
+   "self_type" : "type-1008",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -21036,8 +21102,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1766",
-   "self_type" : "type-1765",
+   "referenced_type" : "type-1767",
+   "self_type" : "type-1766",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -21046,8 +21112,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2103",
-   "self_type" : "type-2102",
+   "referenced_type" : "type-2101",
+   "self_type" : "type-2100",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -21056,8 +21122,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-1757",
-   "self_type" : "type-1756",
+   "referenced_type" : "type-1758",
+   "self_type" : "type-1757",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -21066,8 +21132,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-1876",
-   "self_type" : "type-1875",
+   "referenced_type" : "type-1877",
+   "self_type" : "type-1876",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -21076,46 +21142,6 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-2405",
-   "self_type" : "type-2404",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::float_denorm_style",
-   "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-771",
-   "self_type" : "type-770",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::float_round_style",
-   "name" : "const std::float_round_style",
-   "referenced_type" : "type-1761",
-   "self_type" : "type-1760",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::float_round_style",
-   "name" : "const std::float_round_style",
-   "referenced_type" : "type-1947",
-   "self_type" : "type-1946",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::float_round_style",
-   "name" : "const std::float_round_style",
    "referenced_type" : "type-2407",
    "self_type" : "type-2406",
    "size" : 4,
@@ -21124,10 +21150,50 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const std::float_denorm_style",
+   "name" : "const std::float_denorm_style",
+   "referenced_type" : "type-763",
+   "self_type" : "type-762",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const std::float_round_style",
    "name" : "const std::float_round_style",
-   "referenced_type" : "type-859",
-   "self_type" : "type-858",
+   "referenced_type" : "type-1762",
+   "self_type" : "type-1761",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::float_round_style",
+   "name" : "const std::float_round_style",
+   "referenced_type" : "type-1948",
+   "self_type" : "type-1947",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::float_round_style",
+   "name" : "const std::float_round_style",
+   "referenced_type" : "type-2409",
+   "self_type" : "type-2408",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::float_round_style",
+   "name" : "const std::float_round_style",
+   "referenced_type" : "type-856",
+   "self_type" : "type-855",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -21146,8 +21212,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<float (float)>",
    "name" : "const std::function<float (float)>",
-   "referenced_type" : "type-1778",
-   "self_type" : "type-1777",
+   "referenced_type" : "type-1779",
+   "self_type" : "type-1778",
    "size" : 48,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -21156,8 +21222,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<float (float)>",
    "name" : "const std::function<float (float)>",
-   "referenced_type" : "type-2224",
-   "self_type" : "type-2223",
+   "referenced_type" : "type-2226",
+   "self_type" : "type-2225",
    "size" : 48,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -21166,8 +21232,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-1392",
-   "self_type" : "type-1391",
+   "referenced_type" : "type-1396",
+   "self_type" : "type-1395",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -21176,8 +21242,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-1840",
-   "self_type" : "type-1839",
+   "referenced_type" : "type-1841",
+   "self_type" : "type-1840",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -21186,8 +21252,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-2664",
-   "self_type" : "type-2663",
+   "referenced_type" : "type-2669",
+   "self_type" : "type-2668",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -21196,8 +21262,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> >",
    "name" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> >",
-   "referenced_type" : "type-2332",
-   "self_type" : "type-2331",
+   "referenced_type" : "type-2334",
+   "self_type" : "type-2333",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -21216,8 +21282,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1033",
-   "self_type" : "type-1032",
+   "referenced_type" : "type-1034",
+   "self_type" : "type-1033",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21236,8 +21302,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1582",
-   "self_type" : "type-1581",
+   "referenced_type" : "type-1586",
+   "self_type" : "type-1585",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21246,8 +21312,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1712",
-   "self_type" : "type-1711",
+   "referenced_type" : "type-1713",
+   "self_type" : "type-1712",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21256,8 +21322,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1826",
-   "self_type" : "type-1825",
+   "referenced_type" : "type-1827",
+   "self_type" : "type-1826",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21266,8 +21332,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1852",
-   "self_type" : "type-1851",
+   "referenced_type" : "type-1853",
+   "self_type" : "type-1852",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21276,8 +21342,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1903",
-   "self_type" : "type-1902",
+   "referenced_type" : "type-1904",
+   "self_type" : "type-1903",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21286,8 +21352,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1995",
-   "self_type" : "type-1994",
+   "referenced_type" : "type-1996",
+   "self_type" : "type-1995",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21296,8 +21362,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2076",
-   "self_type" : "type-2075",
+   "referenced_type" : "type-2078",
+   "self_type" : "type-2077",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21306,8 +21372,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2151",
-   "self_type" : "type-2150",
+   "referenced_type" : "type-2154",
+   "self_type" : "type-2153",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21316,8 +21382,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2234",
-   "self_type" : "type-2233",
+   "referenced_type" : "type-2236",
+   "self_type" : "type-2235",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21326,8 +21392,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2329",
-   "self_type" : "type-2328",
+   "referenced_type" : "type-2331",
+   "self_type" : "type-2330",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21336,8 +21402,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2380",
-   "self_type" : "type-2379",
+   "referenced_type" : "type-2382",
+   "self_type" : "type-2381",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21346,8 +21412,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2567",
-   "self_type" : "type-2566",
+   "referenced_type" : "type-2569",
+   "self_type" : "type-2568",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21356,8 +21422,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-330",
-   "self_type" : "type-329",
+   "referenced_type" : "type-327",
+   "self_type" : "type-326",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21366,8 +21432,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-43",
-   "self_type" : "type-42",
+   "referenced_type" : "type-477",
+   "self_type" : "type-476",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21376,8 +21442,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-480",
-   "self_type" : "type-479",
+   "referenced_type" : "type-47",
+   "self_type" : "type-46",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21396,8 +21462,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-727",
-   "self_type" : "type-726",
+   "referenced_type" : "type-728",
+   "self_type" : "type-727",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21406,8 +21472,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-834",
-   "self_type" : "type-833",
+   "referenced_type" : "type-835",
+   "self_type" : "type-834",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21416,8 +21482,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-964",
-   "self_type" : "type-963",
+   "referenced_type" : "type-966",
+   "self_type" : "type-965",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21426,8 +21492,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned char",
    "name" : "const unsigned char",
-   "referenced_type" : "type-207",
-   "self_type" : "type-214",
+   "referenced_type" : "type-220",
+   "self_type" : "type-227",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -21436,8 +21502,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned int",
    "name" : "const unsigned int",
-   "referenced_type" : "type-123",
-   "self_type" : "type-237",
+   "referenced_type" : "type-125",
+   "self_type" : "type-239",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -21446,8 +21512,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned long",
    "name" : "const unsigned long",
-   "referenced_type" : "type-124",
-   "self_type" : "type-238",
+   "referenced_type" : "type-126",
+   "self_type" : "type-240",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
   },
@@ -21456,8 +21522,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned long long",
    "name" : "const unsigned long long",
-   "referenced_type" : "type-209",
-   "self_type" : "type-216",
+   "referenced_type" : "type-222",
+   "self_type" : "type-229",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -21475,7 +21541,7 @@
    "is_const" : true,
    "linker_set_key" : "const void",
    "name" : "const void",
-   "referenced_type" : "type-150",
+   "referenced_type" : "type-153",
    "self_type" : "type-1119",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -21484,8 +21550,8 @@
    "is_const" : true,
    "linker_set_key" : "unsigned long const[3]",
    "name" : "unsigned long const[3]",
-   "referenced_type" : "type-944",
-   "self_type" : "type-951",
+   "referenced_type" : "type-936",
+   "self_type" : "type-945",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -21495,7 +21561,7 @@
    "linker_set_key" : "volatile bool",
    "name" : "volatile bool",
    "referenced_type" : "type-6",
-   "self_type" : "type-272",
+   "self_type" : "type-268",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Thread.h"
   },
@@ -21504,8 +21570,8 @@
    "is_volatile" : true,
    "linker_set_key" : "volatile int",
    "name" : "volatile int",
-   "referenced_type" : "type-103",
-   "self_type" : "type-277",
+   "referenced_type" : "type-105",
+   "self_type" : "type-273",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   }
@@ -21518,48 +21584,48 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "layers",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "format",
      "field_offset" : 96,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "usage",
      "field_offset" : 128,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "stride",
      "field_offset" : 192,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "rfu0",
      "field_offset" : 224,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "rfu1",
      "field_offset" : 256,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "AHardwareBuffer_Desc",
    "name" : "AHardwareBuffer_Desc",
-   "referenced_type" : "type-684",
-   "self_type" : "type-684",
+   "referenced_type" : "type-685",
+   "self_type" : "type-685",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
    "unique_id" : "AHardwareBuffer_Desc"
@@ -21570,23 +21636,23 @@
    [
     {
      "field_name" : "data",
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "field_name" : "pixelStride",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "rowStride",
      "field_offset" : 96,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "linker_set_key" : "AHardwareBuffer_Plane",
    "name" : "AHardwareBuffer_Plane",
-   "referenced_type" : "type-510",
-   "self_type" : "type-510",
+   "referenced_type" : "type-508",
+   "self_type" : "type-508",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
    "unique_id" : "AHardwareBuffer_Plane"
@@ -21597,18 +21663,18 @@
    [
     {
      "field_name" : "planeCount",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "planes",
      "field_offset" : 64,
-     "referenced_type" : "type-509"
+     "referenced_type" : "type-507"
     }
    ],
    "linker_set_key" : "AHardwareBuffer_Planes",
    "name" : "AHardwareBuffer_Planes",
-   "referenced_type" : "type-508",
-   "self_type" : "type-508",
+   "referenced_type" : "type-506",
+   "self_type" : "type-506",
    "size" : 72,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
    "unique_id" : "AHardwareBuffer_Planes"
@@ -21619,63 +21685,63 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-520"
+     "referenced_type" : "type-517"
     },
     {
      "field_name" : "width",
      "field_offset" : 448,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "height",
      "field_offset" : 480,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "stride",
      "field_offset" : 512,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "format",
      "field_offset" : 544,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "usage_deprecated",
      "field_offset" : 576,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "layerCount",
      "field_offset" : 640,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 704,
-     "referenced_type" : "type-525"
+     "referenced_type" : "type-522"
     },
     {
      "field_name" : "handle",
      "field_offset" : 768,
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
      "field_name" : "usage",
      "field_offset" : 832,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "reserved_proc",
      "field_offset" : 896,
-     "referenced_type" : "type-526"
+     "referenced_type" : "type-523"
     }
    ],
    "linker_set_key" : "ANativeWindowBuffer",
    "name" : "ANativeWindowBuffer",
-   "referenced_type" : "type-519",
-   "self_type" : "type-519",
+   "referenced_type" : "type-516",
+   "self_type" : "type-516",
    "size" : 168,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
    "unique_id" : "ANativeWindowBuffer"
@@ -21686,22 +21752,22 @@
    [
     {
      "field_name" : "left",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "top",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "right",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "bottom",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "ARect",
@@ -21718,7 +21784,7 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-548"
+     "referenced_type" : "type-545"
     },
     {
      "field_name" : "alloc",
@@ -21738,7 +21804,7 @@
     {
      "field_name" : "reserved_proc",
      "field_offset" : 1152,
-     "referenced_type" : "type-526"
+     "referenced_type" : "type-523"
     }
    ],
    "linker_set_key" : "alloc_device_t",
@@ -21754,20 +21820,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-519"
+     "referenced_type" : "type-516"
     },
     {
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-174"
     }
    ],
    "linker_set_key" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
    "name" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
    "record_kind" : "class",
-   "referenced_type" : "type-518",
-   "self_type" : "type-518",
+   "referenced_type" : "type-515",
+   "self_type" : "type-515",
    "size" : 184,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h",
-   "template_args" : [ "type-519", "type-527", "type-171", "type-520" ],
+   "template_args" : [ "type-516", "type-524", "type-174", "type-517" ],
    "unique_id" : "_ZTSN7android17ANativeObjectBaseI19ANativeWindowBufferNS_13GraphicBufferENS_7RefBaseE21android_native_base_tEE",
    "vtable_components" :
    [
@@ -21962,14 +22028,14 @@
     {
      "access" : "private",
      "field_name" : "mCond",
-     "referenced_type" : "type-261"
+     "referenced_type" : "type-257"
     }
    ],
    "linker_set_key" : "android::Condition",
    "name" : "android::Condition",
    "record_kind" : "class",
-   "referenced_type" : "type-260",
-   "self_type" : "type-260",
+   "referenced_type" : "type-256",
+   "self_type" : "type-256",
    "size" : 48,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "unique_id" : "_ZTSN7android9ConditionE"
@@ -22010,13 +22076,13 @@
     {
      "access" : "private",
      "field_name" : "mState",
-     "referenced_type" : "type-1377"
+     "referenced_type" : "type-1382"
     },
     {
      "access" : "private",
      "field_name" : "mMutex",
      "field_offset" : 32,
-     "referenced_type" : "type-1379"
+     "referenced_type" : "type-1384"
     },
     {
      "access" : "private",
@@ -22028,14 +22094,14 @@
      "access" : "private",
      "field_name" : "mSignalTime",
      "field_offset" : 448,
-     "referenced_type" : "type-1380"
+     "referenced_type" : "type-1385"
     }
    ],
    "linker_set_key" : "android::FenceTime",
    "name" : "android::FenceTime",
    "record_kind" : "class",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1376",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1381",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android9FenceTimeE"
@@ -22045,14 +22111,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1385"
+     "referenced_type" : "type-1389"
     }
    ],
    "fields" :
    [
     {
      "field_name" : "state",
-     "referenced_type" : "type-1384"
+     "referenced_type" : "type-1388"
     },
     {
      "field_name" : "fence",
@@ -22062,13 +22128,13 @@
     {
      "field_name" : "signalTime",
      "field_offset" : 128,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-12"
     }
    ],
    "linker_set_key" : "android::FenceTime::Snapshot",
    "name" : "android::FenceTime::Snapshot",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1383",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1387",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android9FenceTime8SnapshotE"
@@ -22080,20 +22146,20 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-1398"
+     "referenced_type" : "type-1403"
     },
     {
      "access" : "private",
      "field_name" : "mQueue",
      "field_offset" : 320,
-     "referenced_type" : "type-1399"
+     "referenced_type" : "type-1404"
     }
    ],
    "linker_set_key" : "android::FenceTimeline",
    "name" : "android::FenceTimeline",
    "record_kind" : "class",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1397",
+   "referenced_type" : "type-1402",
+   "self_type" : "type-1402",
    "size" : 88,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android13FenceTimelineE"
@@ -22105,20 +22171,20 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-1404"
+     "referenced_type" : "type-1408"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 320,
-     "referenced_type" : "type-1405"
+     "referenced_type" : "type-1409"
     }
    ],
    "linker_set_key" : "android::FenceToFenceTimeMap",
    "name" : "android::FenceToFenceTimeMap",
    "record_kind" : "class",
-   "referenced_type" : "type-1403",
-   "self_type" : "type-1403",
+   "referenced_type" : "type-1407",
+   "self_type" : "type-1407",
    "size" : 80,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android19FenceToFenceTimeMapE"
@@ -22140,11 +22206,11 @@
    "linker_set_key" : "android::Flattenable<android::FenceTime::Snapshot>",
    "name" : "android::Flattenable<android::FenceTime::Snapshot>",
    "record_kind" : "class",
-   "referenced_type" : "type-1385",
-   "self_type" : "type-1385",
+   "referenced_type" : "type-1389",
+   "self_type" : "type-1389",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1383" ],
+   "template_args" : [ "type-1387" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_9FenceTime8SnapshotEEE"
   },
   {
@@ -22152,11 +22218,11 @@
    "linker_set_key" : "android::Flattenable<android::GraphicBuffer>",
    "name" : "android::Flattenable<android::GraphicBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-534",
-   "self_type" : "type-534",
+   "referenced_type" : "type-531",
+   "self_type" : "type-531",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-527" ],
+   "template_args" : [ "type-524" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_13GraphicBufferEEE"
   },
   {
@@ -22208,36 +22274,36 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1419"
+     "referenced_type" : "type-1423"
     }
    ],
    "fields" :
    [
     {
      "field_name" : "refreshPeriodNano",
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-12"
     },
     {
      "field_name" : "desiredPresentTimesNano",
      "field_offset" : 64,
-     "referenced_type" : "type-1421"
+     "referenced_type" : "type-1425"
     },
     {
      "field_name" : "actualPresentTimesNano",
      "field_offset" : 384,
-     "referenced_type" : "type-1421"
+     "referenced_type" : "type-1425"
     },
     {
      "field_name" : "frameReadyTimesNano",
      "field_offset" : 704,
-     "referenced_type" : "type-1421"
+     "referenced_type" : "type-1425"
     }
    ],
    "linker_set_key" : "android::FrameStats",
    "name" : "android::FrameStats",
    "record_kind" : "class",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1420",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1424",
    "size" : 128,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h",
    "unique_id" : "_ZTSN7android10FrameStatsE"
@@ -22247,7 +22313,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-361"
+     "referenced_type" : "type-358"
     }
    ],
    "fields" :
@@ -22256,20 +22322,20 @@
      "access" : "private",
      "field_name" : "mMapper",
      "field_offset" : 64,
-     "referenced_type" : "type-356"
+     "referenced_type" : "type-353"
     },
     {
      "access" : "private",
      "field_name" : "mAllocator",
      "field_offset" : 128,
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-354"
     }
    ],
    "linker_set_key" : "android::Gralloc2Allocator",
    "name" : "android::Gralloc2Allocator",
    "record_kind" : "class",
-   "referenced_type" : "type-355",
-   "self_type" : "type-355",
+   "referenced_type" : "type-352",
+   "self_type" : "type-352",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h",
    "unique_id" : "_ZTSN7android17Gralloc2AllocatorE",
@@ -22306,7 +22372,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-338"
+     "referenced_type" : "type-335"
     }
    ],
    "fields" :
@@ -22315,20 +22381,20 @@
      "access" : "private",
      "field_name" : "mMapper",
      "field_offset" : 64,
-     "referenced_type" : "type-334"
+     "referenced_type" : "type-331"
     },
     {
      "access" : "private",
      "field_name" : "mMapperV2_1",
      "field_offset" : 128,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-88"
     }
    ],
    "linker_set_key" : "android::Gralloc2Mapper",
    "name" : "android::Gralloc2Mapper",
    "record_kind" : "class",
-   "referenced_type" : "type-333",
-   "self_type" : "type-333",
+   "referenced_type" : "type-330",
+   "self_type" : "type-330",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h",
    "unique_id" : "_ZTSN7android14Gralloc2MapperE",
@@ -22386,10 +22452,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-518"
+     "referenced_type" : "type-515"
     },
     {
-     "referenced_type" : "type-534"
+     "referenced_type" : "type-531"
     }
    ],
    "fields" :
@@ -22398,62 +22464,62 @@
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 1472,
-     "referenced_type" : "type-207"
+     "referenced_type" : "type-220"
     },
     {
      "access" : "private",
      "field_name" : "mBufferMapper",
      "field_offset" : 1536,
-     "referenced_type" : "type-528"
+     "referenced_type" : "type-525"
     },
     {
      "access" : "private",
      "field_name" : "mInitCheck",
      "field_offset" : 1600,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-12"
     },
     {
      "access" : "private",
      "field_name" : "mTransportNumFds",
      "field_offset" : 1664,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mTransportNumInts",
      "field_offset" : 1696,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mId",
      "field_offset" : 1728,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
      "field_name" : "mBufferId",
      "field_offset" : 1792,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mGenerationNumber",
      "field_offset" : 1824,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mDeathCallbacks",
      "field_offset" : 1856,
-     "referenced_type" : "type-533"
+     "referenced_type" : "type-530"
     }
    ],
    "linker_set_key" : "android::GraphicBuffer",
    "name" : "android::GraphicBuffer",
    "record_kind" : "class",
-   "referenced_type" : "type-527",
-   "self_type" : "type-527",
+   "referenced_type" : "type-524",
+   "self_type" : "type-524",
    "size" : 256,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h",
    "unique_id" : "_ZTSN7android13GraphicBufferE",
@@ -22493,81 +22559,81 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-542"
+     "referenced_type" : "type-539"
     }
    ],
    "fields" :
    [
     {
-     "access" : "private",
+     "access" : "protected",
      "field_name" : "mMapper",
-     "referenced_type" : "type-528"
+     "referenced_type" : "type-525"
     },
     {
-     "access" : "private",
+     "access" : "protected",
      "field_name" : "mAllocator",
      "field_offset" : 64,
-     "referenced_type" : "type-544"
+     "referenced_type" : "type-541"
     }
    ],
    "linker_set_key" : "android::GraphicBufferAllocator",
    "name" : "android::GraphicBufferAllocator",
    "record_kind" : "class",
-   "referenced_type" : "type-543",
-   "self_type" : "type-543",
+   "referenced_type" : "type-540",
+   "self_type" : "type-540",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h",
    "unique_id" : "_ZTSN7android22GraphicBufferAllocatorE"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "alignment" : 8,
    "fields" :
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "stride",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "format",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "layerCount",
      "field_offset" : 128,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "usage",
      "field_offset" : 192,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "size",
      "field_offset" : 256,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "requestorName",
      "field_offset" : 320,
-     "referenced_type" : "type-678"
+     "referenced_type" : "type-682"
     }
    ],
    "linker_set_key" : "android::GraphicBufferAllocator::alloc_rec_t",
    "name" : "android::GraphicBufferAllocator::alloc_rec_t",
-   "referenced_type" : "type-677",
-   "self_type" : "type-677",
+   "referenced_type" : "type-681",
+   "self_type" : "type-681",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h",
    "unique_id" : "_ZTSN7android22GraphicBufferAllocator11alloc_rec_tE"
@@ -22577,7 +22643,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-532"
+     "referenced_type" : "type-529"
     }
    ],
    "fields" :
@@ -22585,20 +22651,20 @@
     {
      "access" : "private",
      "field_name" : "mMapper",
-     "referenced_type" : "type-530"
+     "referenced_type" : "type-527"
     },
     {
      "access" : "private",
      "field_name" : "mMapperVersion",
      "field_offset" : 64,
-     "referenced_type" : "type-531"
+     "referenced_type" : "type-528"
     }
    ],
    "linker_set_key" : "android::GraphicBufferMapper",
    "name" : "android::GraphicBufferMapper",
    "record_kind" : "class",
-   "referenced_type" : "type-529",
-   "self_type" : "type-529",
+   "referenced_type" : "type-526",
+   "self_type" : "type-526",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h",
    "unique_id" : "_ZTSN7android19GraphicBufferMapperE"
@@ -22608,7 +22674,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-959"
+     "referenced_type" : "type-961"
     }
    ],
    "fields" :
@@ -22616,7 +22682,7 @@
     {
      "access" : "private",
      "field_name" : "mSupportedHdrTypes",
-     "referenced_type" : "type-961"
+     "referenced_type" : "type-963"
     },
     {
      "access" : "private",
@@ -22640,8 +22706,8 @@
    "linker_set_key" : "android::HdrCapabilities",
    "name" : "android::HdrCapabilities",
    "record_kind" : "class",
-   "referenced_type" : "type-960",
-   "self_type" : "type-960",
+   "referenced_type" : "type-962",
+   "self_type" : "type-962",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h",
    "unique_id" : "_ZTSN7android15HdrCapabilitiesE"
@@ -22653,17 +22719,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-234"
+     "referenced_type" : "type-236"
     }
    ],
    "linker_set_key" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
    "name" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
    "record_kind" : "class",
-   "referenced_type" : "type-249",
-   "self_type" : "type-249",
+   "referenced_type" : "type-251",
+   "self_type" : "type-251",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-178", "type-250" ],
+   "template_args" : [ "type-180", "type-252" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
   },
   {
@@ -22673,17 +22739,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-710"
+     "referenced_type" : "type-711"
     }
    ],
    "linker_set_key" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "record_kind" : "class",
-   "referenced_type" : "type-715",
-   "self_type" : "type-715",
+   "referenced_type" : "type-716",
+   "self_type" : "type-716",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-141", "type-677" ],
+   "template_args" : [ "type-143", "type-681" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -22691,11 +22757,11 @@
    "linker_set_key" : "android::LightFlattenable<android::FrameStats>",
    "name" : "android::LightFlattenable<android::FrameStats>",
    "record_kind" : "class",
-   "referenced_type" : "type-1419",
-   "self_type" : "type-1419",
+   "referenced_type" : "type-1423",
+   "self_type" : "type-1423",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1420" ],
+   "template_args" : [ "type-1424" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_10FrameStatsEEE"
   },
   {
@@ -22703,11 +22769,11 @@
    "linker_set_key" : "android::LightFlattenable<android::HdrCapabilities>",
    "name" : "android::LightFlattenable<android::HdrCapabilities>",
    "record_kind" : "class",
-   "referenced_type" : "type-959",
-   "self_type" : "type-959",
+   "referenced_type" : "type-961",
+   "self_type" : "type-961",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-960" ],
+   "template_args" : [ "type-962" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_15HdrCapabilitiesEEE"
   },
   {
@@ -22739,11 +22805,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Region>",
    "name" : "android::LightFlattenable<android::Region>",
    "record_kind" : "class",
-   "referenced_type" : "type-2391",
-   "self_type" : "type-2391",
+   "referenced_type" : "type-2393",
+   "self_type" : "type-2393",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-2390" ],
+   "template_args" : [ "type-2392" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_6RegionEEE"
   },
   {
@@ -22849,14 +22915,14 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-255"
+     "referenced_type" : "type-283"
     }
    ],
    "linker_set_key" : "android::Mutex",
    "name" : "android::Mutex",
    "record_kind" : "class",
-   "referenced_type" : "type-254",
-   "self_type" : "type-254",
+   "referenced_type" : "type-282",
+   "self_type" : "type-282",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5MutexE"
@@ -22868,14 +22934,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-258"
+     "referenced_type" : "type-1378"
     }
    ],
    "linker_set_key" : "android::Mutex::Autolock",
    "name" : "android::Mutex::Autolock",
    "record_kind" : "class",
-   "referenced_type" : "type-257",
-   "self_type" : "type-257",
+   "referenced_type" : "type-1377",
+   "self_type" : "type-1377",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5Mutex8AutolockE"
@@ -22924,12 +22990,12 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "y",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::Point",
@@ -22948,14 +23014,14 @@
     {
      "access" : "private",
      "field_name" : "mRWLock",
-     "referenced_type" : "type-265"
+     "referenced_type" : "type-261"
     }
    ],
    "linker_set_key" : "android::RWLock",
    "name" : "android::RWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-264",
-   "self_type" : "type-264",
+   "referenced_type" : "type-260",
+   "self_type" : "type-260",
    "size" : 56,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLockE"
@@ -22967,14 +23033,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-268"
+     "referenced_type" : "type-264"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoRLock",
    "name" : "android::RWLock::AutoRLock",
    "record_kind" : "class",
-   "referenced_type" : "type-267",
-   "self_type" : "type-267",
+   "referenced_type" : "type-263",
+   "self_type" : "type-263",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
@@ -22986,14 +23052,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-268"
+     "referenced_type" : "type-264"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoWLock",
    "name" : "android::RWLock::AutoWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-270",
-   "self_type" : "type-270",
+   "referenced_type" : "type-266",
+   "self_type" : "type-266",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
@@ -23026,14 +23092,14 @@
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 64,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::RefBase",
    "name" : "android::RefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-171",
-   "self_type" : "type-171",
+   "referenced_type" : "type-174",
+   "self_type" : "type-174",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBaseE",
@@ -23073,8 +23139,8 @@
    "linker_set_key" : "android::RefBase::weakref_type",
    "name" : "android::RefBase::weakref_type",
    "record_kind" : "class",
-   "referenced_type" : "type-197",
-   "self_type" : "type-197",
+   "referenced_type" : "type-200",
+   "self_type" : "type-200",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBase12weakref_typeE"
@@ -23120,7 +23186,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     }
    ],
    "fields" :
@@ -23128,14 +23194,14 @@
     {
      "access" : "private",
      "field_name" : "mStorage",
-     "referenced_type" : "type-2383"
+     "referenced_type" : "type-2385"
     }
    ],
    "linker_set_key" : "android::Region",
    "name" : "android::Region",
    "record_kind" : "class",
-   "referenced_type" : "type-2390",
-   "self_type" : "type-2390",
+   "referenced_type" : "type-2392",
+   "self_type" : "type-2392",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h",
    "unique_id" : "_ZTSN7android6RegionE"
@@ -23147,7 +23213,7 @@
     {
      "access" : "private",
      "field_name" : "mTag",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "android::ScopedTrace",
@@ -23164,11 +23230,11 @@
    "linker_set_key" : "android::Singleton<android::GraphicBufferAllocator>",
    "name" : "android::Singleton<android::GraphicBufferAllocator>",
    "record_kind" : "class",
-   "referenced_type" : "type-542",
-   "self_type" : "type-542",
+   "referenced_type" : "type-539",
+   "self_type" : "type-539",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-543" ],
+   "template_args" : [ "type-540" ],
    "unique_id" : "_ZTSN7android9SingletonINS_22GraphicBufferAllocatorEEE"
   },
   {
@@ -23176,11 +23242,11 @@
    "linker_set_key" : "android::Singleton<android::GraphicBufferMapper>",
    "name" : "android::Singleton<android::GraphicBufferMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-532",
-   "self_type" : "type-532",
+   "referenced_type" : "type-529",
+   "self_type" : "type-529",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-529" ],
+   "template_args" : [ "type-526" ],
    "unique_id" : "_ZTSN7android9SingletonINS_19GraphicBufferMapperEEE"
   },
   {
@@ -23189,17 +23255,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
    "name" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-234",
-   "self_type" : "type-234",
+   "referenced_type" : "type-236",
+   "self_type" : "type-236",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-239" ],
+   "template_args" : [ "type-241" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
    "vtable_components" :
    [
@@ -23247,14 +23313,14 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::SortedVector<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "record_kind" : "class",
-   "referenced_type" : "type-710",
-   "self_type" : "type-710",
+   "referenced_type" : "type-711",
+   "self_type" : "type-711",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
    "template_args" : [ "type-694" ],
@@ -23304,14 +23370,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     }
    ],
    "linker_set_key" : "android::SortedVectorImpl",
    "name" : "android::SortedVectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-235",
-   "self_type" : "type-235",
+   "referenced_type" : "type-237",
+   "self_type" : "type-237",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android16SortedVectorImplE",
@@ -23369,14 +23435,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-179"
+     "referenced_type" : "type-181"
     }
    ],
    "linker_set_key" : "android::String16",
    "name" : "android::String16",
    "record_kind" : "class",
-   "referenced_type" : "type-178",
-   "self_type" : "type-178",
+   "referenced_type" : "type-180",
+   "self_type" : "type-180",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "unique_id" : "_ZTSN7android8String16E"
@@ -23388,14 +23454,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-285"
     }
    ],
    "linker_set_key" : "android::String8",
    "name" : "android::String8",
    "record_kind" : "class",
-   "referenced_type" : "type-287",
-   "self_type" : "type-287",
+   "referenced_type" : "type-284",
+   "self_type" : "type-284",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "unique_id" : "_ZTSN7android7String8E"
@@ -23406,7 +23472,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-174"
     }
    ],
    "fields" :
@@ -23415,62 +23481,62 @@
      "access" : "private",
      "field_name" : "mCanCallJava",
      "field_offset" : 64,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-369"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 128,
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 192,
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-282"
     },
     {
      "access" : "private",
      "field_name" : "mThreadExitedCondition",
      "field_offset" : 512,
-     "referenced_type" : "type-260"
+     "referenced_type" : "type-256"
     },
     {
      "access" : "private",
      "field_name" : "mStatus",
      "field_offset" : 896,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mExitPending",
      "field_offset" : 928,
-     "referenced_type" : "type-272"
+     "referenced_type" : "type-268"
     },
     {
      "access" : "private",
      "field_name" : "mRunning",
      "field_offset" : 936,
-     "referenced_type" : "type-272"
+     "referenced_type" : "type-268"
     },
     {
      "access" : "private",
      "field_name" : "mHoldSelf",
      "field_offset" : 960,
-     "referenced_type" : "type-369"
+     "referenced_type" : "type-366"
     },
     {
      "access" : "private",
      "field_name" : "mTid",
      "field_offset" : 1024,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::Thread",
    "name" : "android::Thread",
    "record_kind" : "class",
-   "referenced_type" : "type-371",
-   "self_type" : "type-371",
+   "referenced_type" : "type-368",
+   "self_type" : "type-368",
    "size" : 152,
    "source_file" : "/system/core/libutils/include/utils/Thread.h",
    "unique_id" : "_ZTSN7android6ThreadE",
@@ -23560,14 +23626,14 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     }
    ],
    "linker_set_key" : "android::Vector<android::Rect>",
    "name" : "android::Vector<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-2383",
-   "self_type" : "type-2383",
+   "referenced_type" : "type-2385",
+   "self_type" : "type-2385",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-1241" ],
@@ -23615,17 +23681,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     }
    ],
    "linker_set_key" : "android::Vector<android::RefBase *>",
    "name" : "android::Vector<android::RefBase *>",
    "record_kind" : "class",
-   "referenced_type" : "type-247",
-   "self_type" : "type-247",
+   "referenced_type" : "type-249",
+   "self_type" : "type-249",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-248" ],
+   "template_args" : [ "type-250" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7RefBaseEEE",
    "vtable_components" :
    [
@@ -23670,17 +23736,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     }
    ],
    "linker_set_key" : "android::Vector<android::RefBase::weakref_type *>",
    "name" : "android::Vector<android::RefBase::weakref_type *>",
    "record_kind" : "class",
-   "referenced_type" : "type-246",
-   "self_type" : "type-246",
+   "referenced_type" : "type-248",
+   "self_type" : "type-248",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-196" ],
+   "template_args" : [ "type-199" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7RefBase12weakref_typeEEE",
    "vtable_components" :
    [
@@ -23725,17 +23791,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::BHwBinder *>",
    "name" : "android::Vector<android::hardware::BHwBinder *>",
    "record_kind" : "class",
-   "referenced_type" : "type-242",
-   "self_type" : "type-242",
+   "referenced_type" : "type-244",
+   "self_type" : "type-244",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-243" ],
+   "template_args" : [ "type-245" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_8hardware9BHwBinderEEE",
    "vtable_components" :
    [
@@ -23780,17 +23846,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "record_kind" : "class",
-   "referenced_type" : "type-240",
-   "self_type" : "type-240",
+   "referenced_type" : "type-242",
+   "self_type" : "type-242",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-241" ],
+   "template_args" : [ "type-243" ],
    "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
    "vtable_components" :
    [
@@ -23835,17 +23901,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     }
    ],
    "linker_set_key" : "android::Vector<long>",
    "name" : "android::Vector<long>",
    "record_kind" : "class",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1421",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1425",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-286" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android6VectorIlEE",
    "vtable_components" :
    [
@@ -23892,32 +23958,32 @@
      "access" : "private",
      "field_name" : "mStorage",
      "field_offset" : 64,
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "access" : "private",
      "field_name" : "mCount",
      "field_offset" : 128,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
      "field_name" : "mFlags",
      "field_offset" : 192,
-     "referenced_type" : "type-237"
+     "referenced_type" : "type-239"
     },
     {
      "access" : "private",
      "field_name" : "mItemSize",
      "field_offset" : 256,
-     "referenced_type" : "type-238"
+     "referenced_type" : "type-240"
     }
    ],
    "linker_set_key" : "android::VectorImpl",
    "name" : "android::VectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-236",
-   "self_type" : "type-236",
+   "referenced_type" : "type-238",
+   "self_type" : "type-238",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android10VectorImplE",
@@ -24003,11 +24069,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::aggregate_traits<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-825",
-   "self_type" : "type-825",
+   "referenced_type" : "type-826",
+   "self_type" : "type-826",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-141", "type-677" ],
+   "template_args" : [ "type-143", "type-681" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -24027,7 +24093,7 @@
     {
      "access" : "private",
      "field_name" : "fd_",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser>",
@@ -24092,28 +24158,28 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2412"
+     "referenced_type" : "type-2414"
+    },
+    {
+     "referenced_type" : "type-2415"
     },
     {
      "referenced_type" : "type-2413"
     },
     {
-     "referenced_type" : "type-2411"
-    },
-    {
-     "referenced_type" : "type-2419"
-    },
-    {
-     "referenced_type" : "type-2420"
+     "referenced_type" : "type-2421"
     },
     {
      "referenced_type" : "type-2422"
     },
     {
-     "referenced_type" : "type-2421"
+     "referenced_type" : "type-2424"
     },
     {
-     "referenced_type" : "type-2424"
+     "referenced_type" : "type-2423"
+    },
+    {
+     "referenced_type" : "type-2426"
     }
    ],
    "fields" :
@@ -24121,14 +24187,14 @@
     {
      "access" : "private",
      "field_name" : "m_value",
-     "referenced_type" : "type-2429"
+     "referenced_type" : "type-2431"
     }
    ],
    "linker_set_key" : "android::details::TMat44<float>",
    "name" : "android::details::TMat44<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2428",
-   "self_type" : "type-2428",
+   "referenced_type" : "type-2430",
+   "self_type" : "type-2430",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h",
    "template_args" : [ "type-10" ],
@@ -24151,8 +24217,8 @@
    "linker_set_key" : "android::details::TMatDebug<android::details::TMat44, float>",
    "name" : "android::details::TMatDebug<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2424",
-   "self_type" : "type-2424",
+   "referenced_type" : "type-2426",
+   "self_type" : "type-2426",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24175,8 +24241,8 @@
    "linker_set_key" : "android::details::TMatHelpers<android::details::TMat44, float>",
    "name" : "android::details::TMatHelpers<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2421",
-   "self_type" : "type-2421",
+   "referenced_type" : "type-2423",
+   "self_type" : "type-2423",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24199,8 +24265,8 @@
    "linker_set_key" : "android::details::TMatProductOperators<android::details::TMat44, float>",
    "name" : "android::details::TMatProductOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2419",
-   "self_type" : "type-2419",
+   "referenced_type" : "type-2421",
+   "self_type" : "type-2421",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24223,8 +24289,8 @@
    "linker_set_key" : "android::details::TMatSquareFunctions<android::details::TMat44, float>",
    "name" : "android::details::TMatSquareFunctions<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2420",
-   "self_type" : "type-2420",
+   "referenced_type" : "type-2422",
+   "self_type" : "type-2422",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24247,8 +24313,8 @@
    "linker_set_key" : "android::details::TMatTransform<android::details::TMat44, float>",
    "name" : "android::details::TMatTransform<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2422",
-   "self_type" : "type-2422",
+   "referenced_type" : "type-2424",
+   "self_type" : "type-2424",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24259,11 +24325,11 @@
    "linker_set_key" : "android::details::TQuatDebug<android::details::TQuaternion, double>",
    "name" : "android::details::TQuatDebug<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-49",
-   "self_type" : "type-49",
+   "referenced_type" : "type-51",
+   "self_type" : "type-51",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details10TQuatDebugINS0_11TQuaternionEdEE"
   },
   {
@@ -24271,8 +24337,8 @@
    "linker_set_key" : "android::details::TQuatDebug<android::details::TQuaternion, float>",
    "name" : "android::details::TQuatDebug<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-48",
-   "self_type" : "type-48",
+   "referenced_type" : "type-50",
+   "self_type" : "type-50",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24283,11 +24349,11 @@
    "linker_set_key" : "android::details::TQuatFunctions<android::details::TQuaternion, double>",
    "name" : "android::details::TQuatFunctions<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-47",
-   "self_type" : "type-47",
+   "referenced_type" : "type-49",
+   "self_type" : "type-49",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details14TQuatFunctionsINS0_11TQuaternionEdEE"
   },
   {
@@ -24295,8 +24361,8 @@
    "linker_set_key" : "android::details::TQuatFunctions<android::details::TQuaternion, float>",
    "name" : "android::details::TQuatFunctions<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-46",
-   "self_type" : "type-46",
+   "referenced_type" : "type-48",
+   "self_type" : "type-48",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24307,11 +24373,11 @@
    "linker_set_key" : "android::details::TQuatProductOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TQuatProductOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-44",
-   "self_type" : "type-44",
+   "referenced_type" : "type-43",
+   "self_type" : "type-43",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details21TQuatProductOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -24319,8 +24385,8 @@
    "linker_set_key" : "android::details::TQuatProductOperators<android::details::TQuaternion, float>",
    "name" : "android::details::TQuatProductOperators<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-39",
-   "self_type" : "type-39",
+   "referenced_type" : "type-41",
+   "self_type" : "type-41",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24331,38 +24397,38 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-343"
+     "referenced_type" : "type-339"
     },
     {
-     "referenced_type" : "type-344"
+     "referenced_type" : "type-340"
     },
     {
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-341"
     },
     {
-     "referenced_type" : "type-44"
-    },
-    {
-     "referenced_type" : "type-47"
+     "referenced_type" : "type-43"
     },
     {
      "referenced_type" : "type-49"
+    },
+    {
+     "referenced_type" : "type-51"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-337"
     }
    ],
    "linker_set_key" : "android::details::TQuaternion<double>",
    "name" : "android::details::TQuaternion<double>",
    "record_kind" : "class",
-   "referenced_type" : "type-340",
-   "self_type" : "type-340",
+   "referenced_type" : "type-336",
+   "self_type" : "type-336",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details11TQuaternionIdEE"
   },
   {
@@ -24370,27 +24436,27 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-342"
+     "referenced_type" : "type-338"
     },
     {
      "field_name" : "xyzw",
-     "referenced_type" : "type-57"
+     "referenced_type" : "type-52"
     },
     {
      "field_name" : "xyz",
-     "referenced_type" : "type-73"
+     "referenced_type" : "type-68"
     },
     {
      "field_name" : "xy",
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-57"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "name" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "record_kind" : "union",
-   "referenced_type" : "type-341",
-   "self_type" : "type-341",
+   "referenced_type" : "type-337",
+   "self_type" : "type-337",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIdEUt_E"
@@ -24401,29 +24467,29 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "z",
      "field_offset" : 128,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "w",
      "field_offset" : 192,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
    "name" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
-   "referenced_type" : "type-342",
-   "self_type" : "type-342",
+   "referenced_type" : "type-338",
+   "self_type" : "type-338",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIdEUt_Ut_E"
@@ -24433,35 +24499,35 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-418"
+     "referenced_type" : "type-414"
     },
     {
-     "referenced_type" : "type-419"
+     "referenced_type" : "type-415"
     },
     {
-     "referenced_type" : "type-420"
+     "referenced_type" : "type-416"
     },
     {
-     "referenced_type" : "type-39"
-    },
-    {
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-41"
     },
     {
      "referenced_type" : "type-48"
+    },
+    {
+     "referenced_type" : "type-50"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-416"
+     "referenced_type" : "type-412"
     }
    ],
    "linker_set_key" : "android::details::TQuaternion<float>",
    "name" : "android::details::TQuaternion<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-415",
-   "self_type" : "type-415",
+   "referenced_type" : "type-411",
+   "self_type" : "type-411",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "template_args" : [ "type-10" ],
@@ -24472,11 +24538,11 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-417"
+     "referenced_type" : "type-413"
     },
     {
      "field_name" : "xyzw",
-     "referenced_type" : "type-218"
+     "referenced_type" : "type-203"
     },
     {
      "field_name" : "xyz",
@@ -24491,8 +24557,8 @@
    "linker_set_key" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "name" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "record_kind" : "union",
-   "referenced_type" : "type-416",
-   "self_type" : "type-416",
+   "referenced_type" : "type-412",
+   "self_type" : "type-412",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIfEUt_E"
@@ -24524,8 +24590,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
    "name" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
-   "referenced_type" : "type-417",
-   "self_type" : "type-417",
+   "referenced_type" : "type-413",
+   "self_type" : "type-413",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIfEUt_Ut_E"
@@ -24535,22 +24601,22 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-397"
+     "referenced_type" : "type-391"
     },
     {
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-456"
     },
     {
-     "referenced_type" : "type-512"
+     "referenced_type" : "type-509"
     },
     {
      "referenced_type" : "type-601"
     },
     {
-     "referenced_type" : "type-645"
+     "referenced_type" : "type-644"
     }
    ],
    "fields" :
@@ -24667,44 +24733,11 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-62"
     },
     {
-     "referenced_type" : "type-68"
-    },
-    {
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-70"
-    },
-    {
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-72"
-    }
-   ],
-   "fields" :
-   [
-    {
      "referenced_type" : "type-63"
-    }
-   ],
-   "linker_set_key" : "android::details::TVec2<double>",
-   "name" : "android::details::TVec2<double>",
-   "record_kind" : "class",
-   "referenced_type" : "type-62",
-   "self_type" : "type-62",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "template_args" : [ "type-45" ],
-   "unique_id" : "_ZTSN7android7details5TVec2IdEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
+    },
     {
      "referenced_type" : "type-64"
     },
@@ -24713,14 +24746,47 @@
     },
     {
      "referenced_type" : "type-66"
+    },
+    {
+     "referenced_type" : "type-67"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "referenced_type" : "type-58"
+    }
+   ],
+   "linker_set_key" : "android::details::TVec2<double>",
+   "name" : "android::details::TVec2<double>",
+   "record_kind" : "class",
+   "referenced_type" : "type-57",
+   "self_type" : "type-57",
+   "size" : 16,
+   "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
+   "template_args" : [ "type-44" ],
+   "unique_id" : "_ZTSN7android7details5TVec2IdEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "referenced_type" : "type-59"
+    },
+    {
+     "referenced_type" : "type-60"
+    },
+    {
+     "referenced_type" : "type-61"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5) at frameworks/native/libs/math/include/math/vec2.h:49:5",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5) at frameworks/native/libs/math/include/math/vec2.h:49:5",
    "record_kind" : "union",
-   "referenced_type" : "type-63",
-   "self_type" : "type-63",
+   "referenced_type" : "type-58",
+   "self_type" : "type-58",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_E"
@@ -24731,19 +24797,19 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:50:9) at frameworks/native/libs/math/include/math/vec2.h:50:9",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:50:9) at frameworks/native/libs/math/include/math/vec2.h:50:9",
-   "referenced_type" : "type-64",
-   "self_type" : "type-64",
+   "referenced_type" : "type-59",
+   "self_type" : "type-59",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_Ut_E"
@@ -24754,19 +24820,19 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "t",
      "field_offset" : 64,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:51:9) at frameworks/native/libs/math/include/math/vec2.h:51:9",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:51:9) at frameworks/native/libs/math/include/math/vec2.h:51:9",
-   "referenced_type" : "type-65",
-   "self_type" : "type-65",
+   "referenced_type" : "type-60",
+   "self_type" : "type-60",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_Ut0_E"
@@ -24777,19 +24843,19 @@
    [
     {
      "field_name" : "r",
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "g",
      "field_offset" : 64,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:52:9) at frameworks/native/libs/math/include/math/vec2.h:52:9",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:52:9) at frameworks/native/libs/math/include/math/vec2.h:52:9",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
+   "referenced_type" : "type-61",
+   "self_type" : "type-61",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_Ut1_E"
@@ -24931,44 +24997,11 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-73"
     },
     {
-     "referenced_type" : "type-79"
-    },
-    {
-     "referenced_type" : "type-80"
-    },
-    {
-     "referenced_type" : "type-81"
-    },
-    {
-     "referenced_type" : "type-82"
-    },
-    {
-     "referenced_type" : "type-83"
-    }
-   ],
-   "fields" :
-   [
-    {
      "referenced_type" : "type-74"
-    }
-   ],
-   "linker_set_key" : "android::details::TVec3<double>",
-   "name" : "android::details::TVec3<double>",
-   "record_kind" : "class",
-   "referenced_type" : "type-73",
-   "self_type" : "type-73",
-   "size" : 24,
-   "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
-   "template_args" : [ "type-45" ],
-   "unique_id" : "_ZTSN7android7details5TVec3IdEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
+    },
     {
      "referenced_type" : "type-75"
     },
@@ -24979,24 +25012,57 @@
      "referenced_type" : "type-77"
     },
     {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "referenced_type" : "type-69"
+    }
+   ],
+   "linker_set_key" : "android::details::TVec3<double>",
+   "name" : "android::details::TVec3<double>",
+   "record_kind" : "class",
+   "referenced_type" : "type-68",
+   "self_type" : "type-68",
+   "size" : 24,
+   "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
+   "template_args" : [ "type-44" ],
+   "unique_id" : "_ZTSN7android7details5TVec3IdEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "referenced_type" : "type-70"
+    },
+    {
+     "referenced_type" : "type-71"
+    },
+    {
+     "referenced_type" : "type-72"
+    },
+    {
      "field_name" : "xy",
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "st",
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "rg",
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-57"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5) at frameworks/native/libs/math/include/math/vec3.h:47:5",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5) at frameworks/native/libs/math/include/math/vec3.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-74",
-   "self_type" : "type-74",
+   "referenced_type" : "type-69",
+   "self_type" : "type-69",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_E"
@@ -25007,24 +25073,24 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "z",
      "field_offset" : 128,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:48:9) at frameworks/native/libs/math/include/math/vec3.h:48:9",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:48:9) at frameworks/native/libs/math/include/math/vec3.h:48:9",
-   "referenced_type" : "type-75",
-   "self_type" : "type-75",
+   "referenced_type" : "type-70",
+   "self_type" : "type-70",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_Ut_E"
@@ -25035,24 +25101,24 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "t",
      "field_offset" : 64,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "p",
      "field_offset" : 128,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:49:9) at frameworks/native/libs/math/include/math/vec3.h:49:9",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:49:9) at frameworks/native/libs/math/include/math/vec3.h:49:9",
-   "referenced_type" : "type-76",
-   "self_type" : "type-76",
+   "referenced_type" : "type-71",
+   "self_type" : "type-71",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_Ut0_E"
@@ -25063,24 +25129,24 @@
    [
     {
      "field_name" : "r",
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "g",
      "field_offset" : 64,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "b",
      "field_offset" : 128,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:50:9) at frameworks/native/libs/math/include/math/vec3.h:50:9",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:50:9) at frameworks/native/libs/math/include/math/vec3.h:50:9",
-   "referenced_type" : "type-77",
-   "self_type" : "type-77",
+   "referenced_type" : "type-72",
+   "self_type" : "type-72",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_Ut1_E"
@@ -25096,13 +25162,13 @@
      "referenced_type" : "type-9"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-13"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-18"
     },
     {
      "referenced_type" : "type-37"
@@ -25249,38 +25315,38 @@
    "base_specifiers" :
    [
     {
+     "referenced_type" : "type-79"
+    },
+    {
+     "referenced_type" : "type-80"
+    },
+    {
+     "referenced_type" : "type-81"
+    },
+    {
+     "referenced_type" : "type-82"
+    },
+    {
+     "referenced_type" : "type-83"
+    },
+    {
      "referenced_type" : "type-84"
-    },
-    {
-     "referenced_type" : "type-85"
-    },
-    {
-     "referenced_type" : "type-86"
-    },
-    {
-     "referenced_type" : "type-87"
-    },
-    {
-     "referenced_type" : "type-88"
-    },
-    {
-     "referenced_type" : "type-89"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-58"
+     "referenced_type" : "type-53"
     }
    ],
    "linker_set_key" : "android::details::TVec4<double>",
    "name" : "android::details::TVec4<double>",
    "record_kind" : "class",
-   "referenced_type" : "type-57",
-   "self_type" : "type-57",
+   "referenced_type" : "type-52",
+   "self_type" : "type-52",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details5TVec4IdEE"
   },
   {
@@ -25288,45 +25354,45 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-54"
     },
     {
-     "referenced_type" : "type-60"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-56"
     },
     {
      "field_name" : "xy",
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "st",
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "rg",
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "xyz",
-     "referenced_type" : "type-73"
+     "referenced_type" : "type-68"
     },
     {
      "field_name" : "stp",
-     "referenced_type" : "type-73"
+     "referenced_type" : "type-68"
     },
     {
      "field_name" : "rgb",
-     "referenced_type" : "type-73"
+     "referenced_type" : "type-68"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
+   "referenced_type" : "type-53",
+   "self_type" : "type-53",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_E"
@@ -25337,29 +25403,29 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "z",
      "field_offset" : 128,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "w",
      "field_offset" : 192,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
-   "referenced_type" : "type-59",
-   "self_type" : "type-59",
+   "referenced_type" : "type-54",
+   "self_type" : "type-54",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_Ut_E"
@@ -25370,29 +25436,29 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "t",
      "field_offset" : 64,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "p",
      "field_offset" : 128,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "q",
      "field_offset" : 192,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
-   "referenced_type" : "type-60",
-   "self_type" : "type-60",
+   "referenced_type" : "type-55",
+   "self_type" : "type-55",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_Ut0_E"
@@ -25403,29 +25469,29 @@
    [
     {
      "field_name" : "r",
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "g",
      "field_offset" : 64,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "b",
      "field_offset" : 128,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "a",
      "field_offset" : 192,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
-   "referenced_type" : "type-61",
-   "self_type" : "type-61",
+   "referenced_type" : "type-56",
+   "self_type" : "type-56",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_Ut1_E"
@@ -25435,35 +25501,35 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-223"
+     "referenced_type" : "type-208"
     },
     {
-     "referenced_type" : "type-224"
+     "referenced_type" : "type-209"
     },
     {
-     "referenced_type" : "type-225"
+     "referenced_type" : "type-210"
     },
     {
-     "referenced_type" : "type-226"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-212"
     },
     {
-     "referenced_type" : "type-228"
+     "referenced_type" : "type-213"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-219"
+     "referenced_type" : "type-204"
     }
    ],
    "linker_set_key" : "android::details::TVec4<float>",
    "name" : "android::details::TVec4<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-218",
-   "self_type" : "type-218",
+   "referenced_type" : "type-203",
+   "self_type" : "type-203",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "template_args" : [ "type-10" ],
@@ -25474,13 +25540,13 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-220"
+     "referenced_type" : "type-205"
     },
     {
-     "referenced_type" : "type-221"
+     "referenced_type" : "type-206"
     },
     {
-     "referenced_type" : "type-222"
+     "referenced_type" : "type-207"
     },
     {
      "field_name" : "xy",
@@ -25511,8 +25577,8 @@
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-219",
-   "self_type" : "type-219",
+   "referenced_type" : "type-204",
+   "self_type" : "type-204",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_E"
@@ -25544,8 +25610,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
-   "referenced_type" : "type-220",
-   "self_type" : "type-220",
+   "referenced_type" : "type-205",
+   "self_type" : "type-205",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_Ut_E"
@@ -25577,8 +25643,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
-   "referenced_type" : "type-221",
-   "self_type" : "type-221",
+   "referenced_type" : "type-206",
+   "self_type" : "type-206",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_Ut0_E"
@@ -25610,8 +25676,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
-   "referenced_type" : "type-222",
-   "self_type" : "type-222",
+   "referenced_type" : "type-207",
+   "self_type" : "type-207",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_Ut1_E"
@@ -25633,8 +25699,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TMat44, float>",
    "name" : "android::details::TVecAddOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2411",
-   "self_type" : "type-2411",
+   "referenced_type" : "type-2413",
+   "self_type" : "type-2413",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25645,11 +25711,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TVecAddOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-343",
-   "self_type" : "type-343",
+   "referenced_type" : "type-339",
+   "self_type" : "type-339",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -25657,8 +25723,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TQuaternion, float>",
    "name" : "android::details::TVecAddOperators<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-418",
-   "self_type" : "type-418",
+   "referenced_type" : "type-414",
+   "self_type" : "type-414",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25669,8 +25735,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecAddOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-429",
-   "self_type" : "type-429",
+   "referenced_type" : "type-426",
+   "self_type" : "type-426",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -25681,11 +25747,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecAddOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-68",
-   "self_type" : "type-68",
+   "referenced_type" : "type-63",
+   "self_type" : "type-63",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -25705,11 +25771,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecAddOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-79",
-   "self_type" : "type-79",
+   "referenced_type" : "type-74",
+   "self_type" : "type-74",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -25729,11 +25795,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecAddOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-85",
-   "self_type" : "type-85",
+   "referenced_type" : "type-80",
+   "self_type" : "type-80",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -25741,8 +25807,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecAddOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-224",
-   "self_type" : "type-224",
+   "referenced_type" : "type-209",
+   "self_type" : "type-209",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25765,8 +25831,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TMat44, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2413",
-   "self_type" : "type-2413",
+   "referenced_type" : "type-2415",
+   "self_type" : "type-2415",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25777,11 +25843,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-345",
-   "self_type" : "type-345",
+   "referenced_type" : "type-341",
+   "self_type" : "type-341",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -25789,8 +25855,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TQuaternion, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-420",
-   "self_type" : "type-420",
+   "referenced_type" : "type-416",
+   "self_type" : "type-416",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25801,8 +25867,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-512",
-   "self_type" : "type-512",
+   "referenced_type" : "type-509",
+   "self_type" : "type-509",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -25813,11 +25879,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-70",
-   "self_type" : "type-70",
+   "referenced_type" : "type-65",
+   "self_type" : "type-65",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -25837,11 +25903,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-81",
-   "self_type" : "type-81",
+   "referenced_type" : "type-76",
+   "self_type" : "type-76",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -25849,8 +25915,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec3, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-12",
-   "self_type" : "type-12",
+   "referenced_type" : "type-14",
+   "self_type" : "type-14",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25861,11 +25927,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-87",
-   "self_type" : "type-87",
+   "referenced_type" : "type-82",
+   "self_type" : "type-82",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -25873,8 +25939,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-226",
-   "self_type" : "type-226",
+   "referenced_type" : "type-211",
+   "self_type" : "type-211",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25885,8 +25951,8 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec2, bool>",
    "name" : "android::details::TVecDebug<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-645",
-   "self_type" : "type-645",
+   "referenced_type" : "type-644",
+   "self_type" : "type-644",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -25897,11 +25963,11 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec2, double>",
    "name" : "android::details::TVecDebug<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-72",
-   "self_type" : "type-72",
+   "referenced_type" : "type-67",
+   "self_type" : "type-67",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details9TVecDebugINS0_5TVec2EdEE"
   },
   {
@@ -25921,11 +25987,11 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec3, double>",
    "name" : "android::details::TVecDebug<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-83",
-   "self_type" : "type-83",
+   "referenced_type" : "type-78",
+   "self_type" : "type-78",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details9TVecDebugINS0_5TVec3EdEE"
   },
   {
@@ -25945,11 +26011,11 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec4, double>",
    "name" : "android::details::TVecDebug<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-89",
-   "self_type" : "type-89",
+   "referenced_type" : "type-84",
+   "self_type" : "type-84",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details9TVecDebugINS0_5TVec4EdEE"
   },
   {
@@ -25957,8 +26023,8 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec4, float>",
    "name" : "android::details::TVecDebug<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-228",
-   "self_type" : "type-228",
+   "referenced_type" : "type-213",
+   "self_type" : "type-213",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25981,11 +26047,11 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec2, double>",
    "name" : "android::details::TVecFunctions<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-71",
-   "self_type" : "type-71",
+   "referenced_type" : "type-66",
+   "self_type" : "type-66",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details13TVecFunctionsINS0_5TVec2EdEE"
   },
   {
@@ -26005,11 +26071,11 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec3, double>",
    "name" : "android::details::TVecFunctions<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-82",
-   "self_type" : "type-82",
+   "referenced_type" : "type-77",
+   "self_type" : "type-77",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details13TVecFunctionsINS0_5TVec3EdEE"
   },
   {
@@ -26017,8 +26083,8 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec3, float>",
    "name" : "android::details::TVecFunctions<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-16",
-   "self_type" : "type-16",
+   "referenced_type" : "type-18",
+   "self_type" : "type-18",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26029,11 +26095,11 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec4, double>",
    "name" : "android::details::TVecFunctions<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-88",
-   "self_type" : "type-88",
+   "referenced_type" : "type-83",
+   "self_type" : "type-83",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details13TVecFunctionsINS0_5TVec4EdEE"
   },
   {
@@ -26041,8 +26107,8 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec4, float>",
    "name" : "android::details::TVecFunctions<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-227",
-   "self_type" : "type-227",
+   "referenced_type" : "type-212",
+   "self_type" : "type-212",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26053,8 +26119,8 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecProductOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-397",
-   "self_type" : "type-397",
+   "referenced_type" : "type-391",
+   "self_type" : "type-391",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -26065,11 +26131,11 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecProductOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-67",
-   "self_type" : "type-67",
+   "referenced_type" : "type-62",
+   "self_type" : "type-62",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details20TVecProductOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -26089,11 +26155,11 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecProductOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-78",
-   "self_type" : "type-78",
+   "referenced_type" : "type-73",
+   "self_type" : "type-73",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details20TVecProductOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -26113,11 +26179,11 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecProductOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-84",
-   "self_type" : "type-84",
+   "referenced_type" : "type-79",
+   "self_type" : "type-79",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details20TVecProductOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -26125,8 +26191,8 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecProductOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-223",
-   "self_type" : "type-223",
+   "referenced_type" : "type-208",
+   "self_type" : "type-208",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26149,8 +26215,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TMat44, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2412",
-   "self_type" : "type-2412",
+   "referenced_type" : "type-2414",
+   "self_type" : "type-2414",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26161,11 +26227,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-344",
-   "self_type" : "type-344",
+   "referenced_type" : "type-340",
+   "self_type" : "type-340",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -26173,8 +26239,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TQuaternion, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-419",
-   "self_type" : "type-419",
+   "referenced_type" : "type-415",
+   "self_type" : "type-415",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26185,8 +26251,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-461",
-   "self_type" : "type-461",
+   "referenced_type" : "type-456",
+   "self_type" : "type-456",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -26197,11 +26263,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-69",
-   "self_type" : "type-69",
+   "referenced_type" : "type-64",
+   "self_type" : "type-64",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -26221,11 +26287,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-80",
-   "self_type" : "type-80",
+   "referenced_type" : "type-75",
+   "self_type" : "type-75",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -26233,8 +26299,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec3, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-11",
-   "self_type" : "type-11",
+   "referenced_type" : "type-13",
+   "self_type" : "type-13",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26245,11 +26311,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-86",
-   "self_type" : "type-86",
+   "referenced_type" : "type-81",
+   "self_type" : "type-81",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -26257,8 +26323,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-225",
-   "self_type" : "type-225",
+   "referenced_type" : "type-210",
+   "self_type" : "type-210",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26324,7 +26390,7 @@
    [
     {
      "field_name" : "bits",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "fp",
@@ -26346,7 +26412,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -26355,32 +26421,32 @@
      "access" : "protected",
      "field_name" : "mSchedPolicy",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "protected",
      "field_name" : "mSchedPriority",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mExtras",
      "field_offset" : 128,
-     "referenced_type" : "type-245"
+     "referenced_type" : "type-247"
     },
     {
      "access" : "private",
      "field_name" : "mReserved0",
      "field_offset" : 192,
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     }
    ],
    "linker_set_key" : "android::hardware::BHwBinder",
    "name" : "android::hardware::BHwBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-244",
-   "self_type" : "type-244",
+   "referenced_type" : "type-246",
+   "self_type" : "type-246",
    "size" : 48,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware9BHwBinderE",
@@ -26487,7 +26553,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-174"
     }
    ],
    "fields" :
@@ -26496,26 +26562,26 @@
      "access" : "private",
      "field_name" : "mRemote",
      "field_offset" : 64,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-196"
     },
     {
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 128,
-     "referenced_type" : "type-196"
+     "referenced_type" : "type-199"
     },
     {
      "access" : "private",
      "field_name" : "mState",
      "field_offset" : 192,
-     "referenced_type" : "type-198"
+     "referenced_type" : "type-201"
     }
    ],
    "linker_set_key" : "android::hardware::BpHwRefBase",
    "name" : "android::hardware::BpHwRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-192",
-   "self_type" : "type-192",
+   "referenced_type" : "type-195",
+   "self_type" : "type-195",
    "size" : 48,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE",
@@ -26604,22 +26670,22 @@
    [
     {
      "field_name" : "flags",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "fdIndex",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "offset",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "extent",
      "field_offset" : 128,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "android::hardware::GrantorDescriptor",
@@ -26640,7 +26706,7 @@
     },
     {
      "is_virtual" : true,
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-174"
     }
    ],
    "linker_set_key" : "android::hardware::HidlMemory",
@@ -26728,14 +26794,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-174"
     }
    ],
    "linker_set_key" : "android::hardware::IBinder",
    "name" : "android::hardware::IBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-195",
-   "self_type" : "type-195",
+   "referenced_type" : "type-198",
+   "self_type" : "type-198",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinderE",
@@ -26845,14 +26911,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-174"
     }
    ],
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient",
    "name" : "android::hardware::IBinder::DeathRecipient",
    "record_kind" : "class",
-   "referenced_type" : "type-191",
-   "self_type" : "type-191",
+   "referenced_type" : "type-194",
+   "self_type" : "type-194",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinder14DeathRecipientE",
@@ -26933,14 +26999,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-174"
     }
    ],
    "linker_set_key" : "android::hardware::IInterface",
    "name" : "android::hardware::IInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-202",
-   "self_type" : "type-202",
+   "referenced_type" : "type-215",
+   "self_type" : "type-215",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
    "unique_id" : "_ZTSN7android8hardware10IInterfaceE",
@@ -27022,85 +27088,85 @@
     {
      "access" : "private",
      "field_name" : "mProcess",
-     "referenced_type" : "type-280"
+     "referenced_type" : "type-276"
     },
     {
      "access" : "private",
      "field_name" : "mPendingStrongDerefs",
      "field_offset" : 64,
-     "referenced_type" : "type-242"
+     "referenced_type" : "type-244"
     },
     {
      "access" : "private",
      "field_name" : "mPendingWeakDerefs",
      "field_offset" : 384,
-     "referenced_type" : "type-246"
+     "referenced_type" : "type-248"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteStrongDerefs",
      "field_offset" : 704,
-     "referenced_type" : "type-247"
+     "referenced_type" : "type-249"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteWeakDerefs",
      "field_offset" : 1024,
-     "referenced_type" : "type-246"
+     "referenced_type" : "type-248"
     },
     {
      "access" : "private",
      "field_name" : "mIn",
      "field_offset" : 1344,
-     "referenced_type" : "type-204"
+     "referenced_type" : "type-217"
     },
     {
      "access" : "private",
      "field_name" : "mOut",
      "field_offset" : 2432,
-     "referenced_type" : "type-204"
+     "referenced_type" : "type-217"
     },
     {
      "access" : "private",
      "field_name" : "mLastError",
      "field_offset" : 3520,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mCallingPid",
      "field_offset" : 3552,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mCallingSid",
      "field_offset" : 3584,
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-285"
     },
     {
      "access" : "private",
      "field_name" : "mCallingUid",
      "field_offset" : 3648,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mStrictModePolicy",
      "field_offset" : 3680,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mLastTransactionBinderFlags",
      "field_offset" : 3712,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mContextObject",
      "field_offset" : 3776,
-     "referenced_type" : "type-291"
+     "referenced_type" : "type-288"
     },
     {
      "access" : "private",
@@ -27118,26 +27184,26 @@
      "access" : "private",
      "field_name" : "mPostCommandTasks",
      "field_offset" : 3904,
-     "referenced_type" : "type-292"
+     "referenced_type" : "type-289"
     },
     {
      "access" : "private",
      "field_name" : "mIPCThreadStateBase",
      "field_offset" : 4096,
-     "referenced_type" : "type-293"
+     "referenced_type" : "type-290"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 4160,
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-274"
     }
    ],
    "linker_set_key" : "android::hardware::IPCThreadState",
    "name" : "android::hardware::IPCThreadState",
    "record_kind" : "class",
-   "referenced_type" : "type-279",
-   "self_type" : "type-279",
+   "referenced_type" : "type-275",
+   "self_type" : "type-275",
    "size" : 528,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h",
    "unique_id" : "_ZTSN7android8hardware14IPCThreadStateE"
@@ -27149,73 +27215,73 @@
     {
      "access" : "private",
      "field_name" : "mBufCachePos",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
      "field_name" : "mBufCache",
      "field_offset" : 64,
-     "referenced_type" : "type-205"
+     "referenced_type" : "type-218"
     },
     {
      "access" : "private",
      "field_name" : "mError",
      "field_offset" : 256,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mData",
      "field_offset" : 320,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-219"
     },
     {
      "access" : "private",
      "field_name" : "mDataSize",
      "field_offset" : 384,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
      "field_name" : "mDataCapacity",
      "field_offset" : 448,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
      "field_name" : "mDataPos",
      "field_offset" : 512,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
      "field_name" : "mObjects",
      "field_offset" : 576,
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-221"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsSize",
      "field_offset" : 640,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsCapacity",
      "field_offset" : 704,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
      "field_name" : "mNextObjectHint",
      "field_offset" : 768,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
      "field_name" : "mNumRef",
      "field_offset" : 832,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
@@ -27239,20 +27305,20 @@
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 960,
-     "referenced_type" : "type-210"
+     "referenced_type" : "type-223"
     },
     {
      "access" : "private",
      "field_name" : "mOwnerCookie",
      "field_offset" : 1024,
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     }
    ],
    "linker_set_key" : "android::hardware::Parcel",
    "name" : "android::hardware::Parcel",
    "record_kind" : "class",
-   "referenced_type" : "type-204",
-   "self_type" : "type-204",
+   "referenced_type" : "type-217",
+   "self_type" : "type-217",
    "size" : 136,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6ParcelE"
@@ -27264,23 +27330,23 @@
    [
     {
      "field_name" : "index",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "buffer",
      "field_offset" : 64,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-222"
     },
     {
      "field_name" : "bufend",
      "field_offset" : 128,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-222"
     }
    ],
    "linker_set_key" : "android::hardware::Parcel::BufferInfo",
    "name" : "android::hardware::Parcel::BufferInfo",
-   "referenced_type" : "type-229",
-   "self_type" : "type-229",
+   "referenced_type" : "type-231",
+   "self_type" : "type-231",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE"
@@ -27291,7 +27357,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-174"
     }
    ],
    "fields" :
@@ -27300,55 +27366,55 @@
      "access" : "private",
      "field_name" : "mDriverFD",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mVMStart",
      "field_offset" : 128,
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountLock",
      "field_offset" : 192,
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-280"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountDecrement",
      "field_offset" : 512,
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-281"
     },
     {
      "access" : "private",
      "field_name" : "mExecutingThreadsCount",
      "field_offset" : 896,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
      "field_name" : "mMaxThreads",
      "field_offset" : 960,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
      "field_name" : "mStarvationStartTimeMs",
      "field_offset" : 1024,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-12"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 1088,
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-282"
     },
     {
      "access" : "private",
      "field_name" : "mHandleToObject",
      "field_offset" : 1408,
-     "referenced_type" : "type-240"
+     "referenced_type" : "type-242"
     },
     {
      "access" : "private",
@@ -27360,25 +27426,25 @@
      "access" : "private",
      "field_name" : "mBinderContextCheckFunc",
      "field_offset" : 1792,
-     "referenced_type" : "type-276"
+     "referenced_type" : "type-272"
     },
     {
      "access" : "private",
      "field_name" : "mBinderContextUserData",
      "field_offset" : 1856,
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "access" : "private",
      "field_name" : "mContexts",
      "field_offset" : 1920,
-     "referenced_type" : "type-249"
+     "referenced_type" : "type-251"
     },
     {
      "access" : "private",
      "field_name" : "mRootDir",
      "field_offset" : 2240,
-     "referenced_type" : "type-287"
+     "referenced_type" : "type-284"
     },
     {
      "access" : "private",
@@ -27396,26 +27462,26 @@
      "access" : "private",
      "field_name" : "mThreadPoolSeq",
      "field_offset" : 2336,
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-273"
     },
     {
      "access" : "private",
      "field_name" : "mMmapSize",
      "field_offset" : 2368,
-     "referenced_type" : "type-238"
+     "referenced_type" : "type-240"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 2432,
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-274"
     }
    ],
    "linker_set_key" : "android::hardware::ProcessState",
    "name" : "android::hardware::ProcessState",
    "record_kind" : "class",
-   "referenced_type" : "type-283",
-   "self_type" : "type-283",
+   "referenced_type" : "type-279",
+   "self_type" : "type-279",
    "size" : 328,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessStateE",
@@ -27493,18 +27559,18 @@
    [
     {
      "field_name" : "binder",
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-197"
     },
     {
      "field_name" : "refs",
      "field_offset" : 64,
-     "referenced_type" : "type-196"
+     "referenced_type" : "type-199"
     }
    ],
    "linker_set_key" : "android::hardware::ProcessState::handle_entry",
    "name" : "android::hardware::ProcessState::handle_entry",
-   "referenced_type" : "type-241",
-   "self_type" : "type-241",
+   "referenced_type" : "type-243",
+   "self_type" : "type-243",
    "size" : 16,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE"
@@ -27514,7 +27580,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "fields" :
@@ -27523,17 +27589,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 288,
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-102"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
    "record_kind" : "class",
-   "referenced_type" : "type-99",
-   "self_type" : "type-99",
+   "referenced_type" : "type-101",
+   "self_type" : "type-101",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-105" ],
+   "template_args" : [ "type-107" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS0_8graphics6mapper4V2_05ErrorEEE"
   },
   {
@@ -27541,7 +27607,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "fields" :
@@ -27550,17 +27616,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 288,
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-394"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
    "record_kind" : "class",
-   "referenced_type" : "type-394",
-   "self_type" : "type-394",
+   "referenced_type" : "type-393",
+   "self_type" : "type-393",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-396" ],
+   "template_args" : [ "type-395" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS0_8graphics6mapper4V3_05ErrorEEE"
   },
   {
@@ -27568,7 +27634,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "fields" :
@@ -27577,17 +27643,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 320,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-88"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
    "record_kind" : "class",
-   "referenced_type" : "type-111",
-   "self_type" : "type-111",
+   "referenced_type" : "type-113",
+   "self_type" : "type-113",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-53" ],
+   "template_args" : [ "type-88" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics6mapper4V2_17IMapperEEEEE"
   },
   {
@@ -27595,7 +27661,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "linker_set_key" : "android::hardware::Return<void>",
@@ -27605,7 +27671,7 @@
    "self_type" : "type-1321",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-150" ],
+   "template_args" : [ "type-153" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIvEE"
   },
   {
@@ -27615,26 +27681,26 @@
     {
      "access" : "private",
      "field_name" : "mException",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mErrorCode",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-106"
     }
    ],
    "linker_set_key" : "android::hardware::Status",
    "name" : "android::hardware::Status",
    "record_kind" : "class",
-   "referenced_type" : "type-102",
-   "self_type" : "type-102",
+   "referenced_type" : "type-104",
+   "self_type" : "type-104",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware6StatusE"
@@ -27740,7 +27806,7 @@
    "self_type" : "type-1104",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware7details14const_accessorIjLm10EJEEE"
   },
   {
@@ -27754,12 +27820,12 @@
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-1100",
    "self_type" : "type-1100",
@@ -27791,16 +27857,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-136"
+     "referenced_type" : "type-138"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
-   "referenced_type" : "type-135",
-   "self_type" : "type-135",
+   "referenced_type" : "type-137",
+   "self_type" : "type-137",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-138" ],
+   "template_args" : [ "type-140" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_handleEEE"
   },
   {
@@ -27818,7 +27884,7 @@
    "self_type" : "type-1071",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-289" ],
+   "template_args" : [ "type-286" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEE"
   },
   {
@@ -27828,16 +27894,16 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-285"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-1072",
    "self_type" : "type-1072",
@@ -27851,16 +27917,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-140"
+     "referenced_type" : "type-142"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>",
-   "referenced_type" : "type-139",
-   "self_type" : "type-139",
+   "referenced_type" : "type-141",
+   "self_type" : "type-141",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-144" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEE"
   },
   {
@@ -27870,19 +27936,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-140",
-   "self_type" : "type-140",
+   "referenced_type" : "type-142",
+   "self_type" : "type-142",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEUt_E"
@@ -27894,19 +27960,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-137"
+     "referenced_type" : "type-139"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<hidl_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<hidl_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-136",
-   "self_type" : "type-136",
+   "referenced_type" : "type-138",
+   "self_type" : "type-138",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_handleEEUt_E"
@@ -27926,7 +27992,7 @@
    "self_type" : "type-1150",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-143" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEE"
   },
   {
@@ -27940,12 +28006,12 @@
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-1151",
    "self_type" : "type-1151",
@@ -27959,16 +28025,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-121"
+     "referenced_type" : "type-123"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int>",
    "name" : "android::hardware::details::hidl_pointer<unsigned int>",
-   "referenced_type" : "type-120",
-   "self_type" : "type-120",
+   "referenced_type" : "type-122",
+   "self_type" : "type-122",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIjEE"
   },
   {
@@ -27978,19 +28044,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<unsigned int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<unsigned int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-121",
-   "self_type" : "type-121",
+   "referenced_type" : "type-123",
+   "self_type" : "type-123",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIjEUt_E"
@@ -28012,7 +28078,7 @@
     {
      "access" : "private",
      "field_name" : "mStatus",
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-104"
     },
     {
      "access" : "private",
@@ -28024,8 +28090,8 @@
    "linker_set_key" : "android::hardware::details::return_status",
    "name" : "android::hardware::details::return_status",
    "record_kind" : "class",
-   "referenced_type" : "type-101",
-   "self_type" : "type-101",
+   "referenced_type" : "type-103",
+   "self_type" : "type-103",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware7details13return_statusE"
@@ -28038,7 +28104,7 @@
    "self_type" : "type-1103",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware7details9std_arrayIjLm10EJEEE"
   },
   {
@@ -28052,7 +28118,7 @@
     {
      "field_name" : "nativeHandle",
      "field_offset" : 320,
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-140"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::HardwareBuffer",
@@ -28079,7 +28145,7 @@
    "self_type" : "type-1109",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware10hidl_arrayIjLm10EJEEE"
   },
   {
@@ -28088,7 +28154,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-174"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_death_recipient",
@@ -28173,33 +28239,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
    "name" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
-   "referenced_type" : "type-148",
-   "self_type" : "type-148",
+   "referenced_type" : "type-151",
+   "self_type" : "type-151",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-149", "type-150" ],
+   "template_args" : [ "type-152", "type-153" ],
    "unique_id" : "_ZTSN7android8hardware15hidl_enum_rangeINS0_8graphics6common4V1_011BufferUsageEvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
    "name" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
-   "referenced_type" : "type-156",
-   "self_type" : "type-156",
+   "referenced_type" : "type-158",
+   "self_type" : "type-158",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-157", "type-150" ],
+   "template_args" : [ "type-159", "type-153" ],
    "unique_id" : "_ZTSN7android8hardware15hidl_enum_rangeINS0_8graphics6common4V1_111BufferUsageEvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
    "name" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
-   "referenced_type" : "type-421",
-   "self_type" : "type-421",
+   "referenced_type" : "type-418",
+   "self_type" : "type-418",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-422", "type-150" ],
+   "template_args" : [ "type-419", "type-153" ],
    "unique_id" : "_ZTSN7android8hardware15hidl_enum_rangeINS0_8graphics6common4V1_211BufferUsageEvEE"
   },
   {
@@ -28209,7 +28275,7 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-141"
     },
     {
      "access" : "private",
@@ -28220,8 +28286,8 @@
    ],
    "linker_set_key" : "android::hardware::hidl_handle",
    "name" : "android::hardware::hidl_handle",
-   "referenced_type" : "type-138",
-   "self_type" : "type-138",
+   "referenced_type" : "type-140",
+   "self_type" : "type-140",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_handleE"
@@ -28233,13 +28299,13 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-140"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 128,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
@@ -28269,7 +28335,7 @@
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -28299,7 +28365,7 @@
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -28324,13 +28390,13 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-137"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -28341,11 +28407,11 @@
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_handle>",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_handle>",
-   "referenced_type" : "type-134",
-   "self_type" : "type-134",
+   "referenced_type" : "type-136",
+   "self_type" : "type-136",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-138" ],
+   "template_args" : [ "type-140" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_11hidl_handleEEE"
   },
   {
@@ -28355,13 +28421,13 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-120"
+     "referenced_type" : "type-122"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -28372,11 +28438,11 @@
    ],
    "linker_set_key" : "android::hardware::hidl_vec<unsigned int>",
    "name" : "android::hardware::hidl_vec<unsigned int>",
-   "referenced_type" : "type-128",
-   "self_type" : "type-128",
+   "referenced_type" : "type-130",
+   "self_type" : "type-130",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecIjEE"
   },
   {
@@ -28409,23 +28475,23 @@
    [
     {
      "field_name" : "pid",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "ptr",
      "field_offset" : 64,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "arch",
      "field_offset" : 128,
-     "referenced_type" : "type-163"
+     "referenced_type" : "type-166"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo",
    "name" : "android::hidl::base::V1_0::DebugInfo",
-   "referenced_type" : "type-162",
-   "self_type" : "type-162",
+   "referenced_type" : "type-165",
+   "self_type" : "type-165",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfoE"
@@ -28436,13 +28502,13 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-174"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::IBase",
    "name" : "android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-170",
-   "self_type" : "type-170",
+   "referenced_type" : "type-173",
+   "self_type" : "type-173",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_05IBaseE",
@@ -28551,13 +28617,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-170"
+     "referenced_type" : "type-173"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification",
    "name" : "android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-297",
-   "self_type" : "type-297",
+   "referenced_type" : "type-294",
+   "self_type" : "type-294",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_020IServiceNotificationE",
@@ -28671,12 +28737,12 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
      "field_name" : "value",
      "field_offset" : 64,
-     "referenced_type" : "type-677"
+     "referenced_type" : "type-681"
     }
    ],
    "linker_set_key" : "android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
@@ -28685,7 +28751,7 @@
    "self_type" : "type-694",
    "size" : 72,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-141", "type-677" ],
+   "template_args" : [ "type-143", "type-681" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -28715,17 +28781,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     }
    ],
    "linker_set_key" : "android::sp<android::GraphicBuffer>",
    "name" : "android::sp<android::GraphicBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-680",
-   "self_type" : "type-680",
+   "referenced_type" : "type-679",
+   "self_type" : "type-679",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-527" ],
+   "template_args" : [ "type-524" ],
    "unique_id" : "_ZTSN7android2spINS_13GraphicBufferEEE"
   },
   {
@@ -28735,17 +28801,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-370"
+     "referenced_type" : "type-367"
     }
    ],
    "linker_set_key" : "android::sp<android::Thread>",
    "name" : "android::sp<android::Thread>",
    "record_kind" : "class",
-   "referenced_type" : "type-369",
-   "self_type" : "type-369",
+   "referenced_type" : "type-366",
+   "self_type" : "type-366",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-371" ],
+   "template_args" : [ "type-368" ],
    "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
   },
   {
@@ -28755,17 +28821,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-243"
+     "referenced_type" : "type-245"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::BHwBinder>",
    "name" : "android::sp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-291",
-   "self_type" : "type-291",
+   "referenced_type" : "type-288",
+   "self_type" : "type-288",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-244" ],
+   "template_args" : [ "type-246" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
   },
   {
@@ -28775,17 +28841,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-197"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IBinder>",
    "name" : "android::sp<android::hardware::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-250",
-   "self_type" : "type-250",
+   "referenced_type" : "type-252",
+   "self_type" : "type-252",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-195" ],
+   "template_args" : [ "type-198" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
   },
   {
@@ -28795,17 +28861,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-282"
+     "referenced_type" : "type-278"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::ProcessState>",
    "name" : "android::sp<android::hardware::ProcessState>",
    "record_kind" : "class",
-   "referenced_type" : "type-281",
-   "self_type" : "type-281",
+   "referenced_type" : "type-277",
+   "self_type" : "type-277",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-283" ],
+   "template_args" : [ "type-279" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
   },
   {
@@ -28815,17 +28881,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-358"
+     "referenced_type" : "type-355"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
    "record_kind" : "class",
-   "referenced_type" : "type-357",
-   "self_type" : "type-357",
+   "referenced_type" : "type-354",
+   "self_type" : "type-354",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-360" ],
+   "template_args" : [ "type-357" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics9allocator4V2_010IAllocatorEEE"
   },
   {
@@ -28835,17 +28901,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-486"
+     "referenced_type" : "type-483"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
    "record_kind" : "class",
-   "referenced_type" : "type-485",
-   "self_type" : "type-485",
+   "referenced_type" : "type-482",
+   "self_type" : "type-482",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-488" ],
+   "template_args" : [ "type-485" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics9allocator4V3_010IAllocatorEEE"
   },
   {
@@ -28855,17 +28921,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-335"
+     "referenced_type" : "type-332"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-334",
-   "self_type" : "type-334",
+   "referenced_type" : "type-331",
+   "self_type" : "type-331",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-337" ],
+   "template_args" : [ "type-334" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics6mapper4V2_07IMapperEEE"
   },
   {
@@ -28875,17 +28941,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-89"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-53",
-   "self_type" : "type-53",
+   "referenced_type" : "type-88",
+   "self_type" : "type-88",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-56" ],
+   "template_args" : [ "type-91" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics6mapper4V2_17IMapperEEE"
   },
   {
@@ -28895,17 +28961,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-499"
+     "referenced_type" : "type-497"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-498",
-   "self_type" : "type-498",
+   "referenced_type" : "type-496",
+   "self_type" : "type-496",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-501" ],
+   "template_args" : [ "type-499" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics6mapper4V3_07IMapperEEE"
   },
   {
@@ -28935,17 +29001,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-366"
+     "referenced_type" : "type-363"
     }
    ],
    "linker_set_key" : "android::sp<android::hidl::base::V1_0::IBase>",
    "name" : "android::sp<android::hidl::base::V1_0::IBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-365",
-   "self_type" : "type-365",
+   "referenced_type" : "type-362",
+   "self_type" : "type-362",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-170" ],
+   "template_args" : [ "type-173" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl4base4V1_05IBaseEEE"
   },
   {
@@ -28955,36 +29021,36 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-374"
+     "referenced_type" : "type-371"
     }
    ],
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceNotification>",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification>",
    "record_kind" : "class",
-   "referenced_type" : "type-373",
-   "self_type" : "type-373",
+   "referenced_type" : "type-370",
+   "self_type" : "type-370",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-297" ],
+   "template_args" : [ "type-294" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::trait_pointer<android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-820",
-   "self_type" : "type-820",
+   "referenced_type" : "type-821",
+   "self_type" : "type-821",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-677" ],
+   "template_args" : [ "type-681" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::Rect>",
    "name" : "android::trait_pointer<android::Rect>",
-   "referenced_type" : "type-2402",
-   "self_type" : "type-2402",
+   "referenced_type" : "type-2404",
+   "self_type" : "type-2404",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -28994,8 +29060,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::trait_pointer<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-818",
-   "self_type" : "type-818",
+   "referenced_type" : "type-819",
+   "self_type" : "type-819",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -29005,22 +29071,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<const native_handle *>",
    "name" : "android::trait_pointer<const native_handle *>",
-   "referenced_type" : "type-819",
-   "self_type" : "type-819",
+   "referenced_type" : "type-820",
+   "self_type" : "type-820",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-141" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android13trait_pointerIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<long>",
    "name" : "android::trait_pointer<long>",
-   "referenced_type" : "type-1431",
-   "self_type" : "type-1431",
+   "referenced_type" : "type-1435",
+   "self_type" : "type-1435",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android13trait_pointerIlEE"
   },
   {
@@ -29031,7 +29097,7 @@
    "self_type" : "type-813",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-677" ],
+   "template_args" : [ "type-681" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -29060,8 +29126,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-814",
-   "self_type" : "type-814",
+   "referenced_type" : "type-815",
+   "self_type" : "type-815",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -29071,8 +29137,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-490",
-   "self_type" : "type-490",
+   "referenced_type" : "type-486",
+   "self_type" : "type-486",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -29082,11 +29148,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-517",
-   "self_type" : "type-517",
+   "referenced_type" : "type-514",
+   "self_type" : "type-514",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-290" ],
+   "template_args" : [ "type-287" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
   },
   {
@@ -29097,26 +29163,26 @@
    "self_type" : "type-812",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-141" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<double>",
    "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-798",
-   "self_type" : "type-798",
+   "referenced_type" : "type-790",
+   "self_type" : "type-790",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<float>",
    "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-758",
-   "self_type" : "type-758",
+   "referenced_type" : "type-756",
+   "self_type" : "type-756",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-10" ],
@@ -29126,11 +29192,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-651",
-   "self_type" : "type-651",
+   "referenced_type" : "type-649",
+   "self_type" : "type-649",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIiEE"
   },
   {
@@ -29141,18 +29207,18 @@
    "self_type" : "type-742",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-732" ],
+   "template_args" : [ "type-730" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long>",
    "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-708",
-   "self_type" : "type-708",
+   "referenced_type" : "type-707",
+   "self_type" : "type-707",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
   },
   {
@@ -29170,22 +29236,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned char>",
    "name" : "android::trait_trivial_copy<unsigned char>",
-   "referenced_type" : "type-579",
-   "self_type" : "type-579",
+   "referenced_type" : "type-576",
+   "self_type" : "type-576",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-207" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned int>",
    "name" : "android::trait_trivial_copy<unsigned int>",
-   "referenced_type" : "type-683",
-   "self_type" : "type-683",
+   "referenced_type" : "type-678",
+   "self_type" : "type-678",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIjEE"
   },
   {
@@ -29196,18 +29262,18 @@
    "self_type" : "type-752",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-209" ],
+   "template_args" : [ "type-222" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long>",
    "name" : "android::trait_trivial_copy<unsigned long>",
-   "referenced_type" : "type-724",
-   "self_type" : "type-724",
+   "referenced_type" : "type-720",
+   "self_type" : "type-720",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyImEE"
   },
   {
@@ -29225,11 +29291,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-481",
-   "self_type" : "type-481",
+   "referenced_type" : "type-478",
+   "self_type" : "type-478",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-150" ],
+   "template_args" : [ "type-153" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
   },
   {
@@ -29240,7 +29306,7 @@
    "self_type" : "type-808",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-677" ],
+   "template_args" : [ "type-681" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -29280,8 +29346,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-483",
-   "self_type" : "type-483",
+   "referenced_type" : "type-480",
+   "self_type" : "type-480",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -29291,11 +29357,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-511",
-   "self_type" : "type-511",
+   "referenced_type" : "type-505",
+   "self_type" : "type-505",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-290" ],
+   "template_args" : [ "type-287" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
   },
   {
@@ -29306,18 +29372,18 @@
    "self_type" : "type-807",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-141" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<double>",
    "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-784",
-   "self_type" : "type-784",
+   "referenced_type" : "type-778",
+   "self_type" : "type-778",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIdEE"
   },
   {
@@ -29335,33 +29401,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-641",
-   "self_type" : "type-641",
+   "referenced_type" : "type-640",
+   "self_type" : "type-640",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long long>",
    "name" : "android::trait_trivial_ctor<long long>",
-   "referenced_type" : "type-731",
-   "self_type" : "type-731",
+   "referenced_type" : "type-729",
+   "self_type" : "type-729",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-732" ],
+   "template_args" : [ "type-730" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long>",
    "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-692",
-   "self_type" : "type-692",
+   "referenced_type" : "type-688",
+   "self_type" : "type-688",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
   },
   {
@@ -29379,52 +29445,52 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned char>",
    "name" : "android::trait_trivial_ctor<unsigned char>",
-   "referenced_type" : "type-538",
-   "self_type" : "type-538",
+   "referenced_type" : "type-533",
+   "self_type" : "type-533",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-207" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
    "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-669",
-   "self_type" : "type-669",
+   "referenced_type" : "type-665",
+   "self_type" : "type-665",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
    "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-747",
-   "self_type" : "type-747",
+   "referenced_type" : "type-746",
+   "self_type" : "type-746",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-209" ],
+   "template_args" : [ "type-222" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long>",
    "name" : "android::trait_trivial_ctor<unsigned long>",
-   "referenced_type" : "type-711",
-   "self_type" : "type-711",
+   "referenced_type" : "type-710",
+   "self_type" : "type-710",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned short>",
    "name" : "android::trait_trivial_ctor<unsigned short>",
-   "referenced_type" : "type-626",
-   "self_type" : "type-626",
+   "referenced_type" : "type-622",
+   "self_type" : "type-622",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-3" ],
@@ -29434,11 +29500,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-462",
-   "self_type" : "type-462",
+   "referenced_type" : "type-457",
+   "self_type" : "type-457",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-150" ],
+   "template_args" : [ "type-153" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
   },
   {
@@ -29449,7 +29515,7 @@
    "self_type" : "type-810",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-677" ],
+   "template_args" : [ "type-681" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -29489,8 +29555,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<bool>",
    "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-484",
-   "self_type" : "type-484",
+   "referenced_type" : "type-481",
+   "self_type" : "type-481",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -29500,11 +29566,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-513",
-   "self_type" : "type-513",
+   "referenced_type" : "type-510",
+   "self_type" : "type-510",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-290" ],
+   "template_args" : [ "type-287" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
   },
   {
@@ -29515,7 +29581,7 @@
    "self_type" : "type-809",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-141" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIPK13native_handleEE"
   },
   {
@@ -29526,7 +29592,7 @@
    "self_type" : "type-787",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIdEE"
   },
   {
@@ -29544,41 +29610,41 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<int>",
    "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-648",
-   "self_type" : "type-648",
+   "referenced_type" : "type-646",
+   "self_type" : "type-646",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long long>",
    "name" : "android::trait_trivial_dtor<long long>",
-   "referenced_type" : "type-739",
-   "self_type" : "type-739",
+   "referenced_type" : "type-737",
+   "self_type" : "type-737",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-732" ],
+   "template_args" : [ "type-730" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long>",
    "name" : "android::trait_trivial_dtor<long>",
-   "referenced_type" : "type-704",
-   "self_type" : "type-704",
+   "referenced_type" : "type-697",
+   "self_type" : "type-697",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<short>",
    "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-617",
-   "self_type" : "type-617",
+   "referenced_type" : "type-615",
+   "self_type" : "type-615",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-603" ],
@@ -29588,52 +29654,52 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned char>",
    "name" : "android::trait_trivial_dtor<unsigned char>",
-   "referenced_type" : "type-540",
-   "self_type" : "type-540",
+   "referenced_type" : "type-537",
+   "self_type" : "type-537",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-207" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
    "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-676",
-   "self_type" : "type-676",
+   "referenced_type" : "type-672",
+   "self_type" : "type-672",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
    "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-750",
-   "self_type" : "type-750",
+   "referenced_type" : "type-748",
+   "self_type" : "type-748",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-209" ],
+   "template_args" : [ "type-222" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long>",
    "name" : "android::trait_trivial_dtor<unsigned long>",
-   "referenced_type" : "type-719",
-   "self_type" : "type-719",
+   "referenced_type" : "type-715",
+   "self_type" : "type-715",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned short>",
    "name" : "android::trait_trivial_dtor<unsigned short>",
-   "referenced_type" : "type-631",
-   "self_type" : "type-631",
+   "referenced_type" : "type-629",
+   "self_type" : "type-629",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-3" ],
@@ -29643,22 +29709,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-477",
-   "self_type" : "type-477",
+   "referenced_type" : "type-474",
+   "self_type" : "type-474",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-150" ],
+   "template_args" : [ "type-153" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::trait_trivial_move<android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-816",
-   "self_type" : "type-816",
+   "referenced_type" : "type-817",
+   "self_type" : "type-817",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-677" ],
+   "template_args" : [ "type-681" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -29687,11 +29753,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String16>",
    "name" : "android::trait_trivial_move<android::String16>",
-   "referenced_type" : "type-190",
-   "self_type" : "type-190",
+   "referenced_type" : "type-193",
+   "self_type" : "type-193",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-178" ],
+   "template_args" : [ "type-180" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8String16EEE"
   },
   {
@@ -29702,15 +29768,15 @@
    "self_type" : "type-903",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-287" ],
+   "template_args" : [ "type-284" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-817",
-   "self_type" : "type-817",
+   "referenced_type" : "type-818",
+   "self_type" : "type-818",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -29720,8 +29786,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<bool>",
    "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-502",
-   "self_type" : "type-502",
+   "referenced_type" : "type-495",
+   "self_type" : "type-495",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -29731,22 +29797,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-535",
-   "self_type" : "type-535",
+   "referenced_type" : "type-532",
+   "self_type" : "type-532",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-290" ],
+   "template_args" : [ "type-287" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<const native_handle *>",
    "name" : "android::trait_trivial_move<const native_handle *>",
-   "referenced_type" : "type-815",
-   "self_type" : "type-815",
+   "referenced_type" : "type-816",
+   "self_type" : "type-816",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-141" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIPK13native_handleEE"
   },
   {
@@ -29757,7 +29823,7 @@
    "self_type" : "type-799",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIdEE"
   },
   {
@@ -29775,11 +29841,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-662",
-   "self_type" : "type-662",
+   "referenced_type" : "type-656",
+   "self_type" : "type-656",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIiEE"
   },
   {
@@ -29790,7 +29856,7 @@
    "self_type" : "type-743",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-732" ],
+   "template_args" : [ "type-730" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
   },
   {
@@ -29801,15 +29867,15 @@
    "self_type" : "type-709",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<short>",
    "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-621",
-   "self_type" : "type-621",
+   "referenced_type" : "type-620",
+   "self_type" : "type-620",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-603" ],
@@ -29823,18 +29889,18 @@
    "self_type" : "type-600",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-207" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned int>",
    "name" : "android::trait_trivial_move<unsigned int>",
-   "referenced_type" : "type-687",
-   "self_type" : "type-687",
+   "referenced_type" : "type-684",
+   "self_type" : "type-684",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIjEE"
   },
   {
@@ -29845,18 +29911,18 @@
    "self_type" : "type-753",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-209" ],
+   "template_args" : [ "type-222" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long>",
    "name" : "android::trait_trivial_move<unsigned long>",
-   "referenced_type" : "type-728",
-   "self_type" : "type-728",
+   "referenced_type" : "type-725",
+   "self_type" : "type-725",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveImEE"
   },
   {
@@ -29874,11 +29940,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-482",
-   "self_type" : "type-482",
+   "referenced_type" : "type-479",
+   "self_type" : "type-479",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-150" ],
+   "template_args" : [ "type-153" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
   },
   {
@@ -29889,15 +29955,15 @@
    "self_type" : "type-824",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-677" ],
+   "template_args" : [ "type-681" ],
    "unique_id" : "_ZTSN7android6traitsINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::Rect>",
    "name" : "android::traits<android::Rect>",
-   "referenced_type" : "type-2403",
-   "self_type" : "type-2403",
+   "referenced_type" : "type-2405",
+   "self_type" : "type-2405",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -29907,8 +29973,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::traits<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-821",
-   "self_type" : "type-821",
+   "referenced_type" : "type-822",
+   "self_type" : "type-822",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -29918,22 +29984,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<const native_handle *>",
    "name" : "android::traits<const native_handle *>",
-   "referenced_type" : "type-822",
-   "self_type" : "type-822",
+   "referenced_type" : "type-823",
+   "self_type" : "type-823",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-141" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android6traitsIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<long>",
    "name" : "android::traits<long>",
-   "referenced_type" : "type-1432",
-   "self_type" : "type-1432",
+   "referenced_type" : "type-1436",
+   "self_type" : "type-1436",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android6traitsIlEE"
   },
   {
@@ -29942,12 +30008,12 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::ui::Size",
@@ -29965,20 +30031,20 @@
     {
      "access" : "private",
      "field_name" : "mMatrix",
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     },
     {
      "access" : "private",
      "field_name" : "mType",
      "field_offset" : 288,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "linker_set_key" : "android::ui::Transform",
    "name" : "android::ui::Transform",
    "record_kind" : "class",
-   "referenced_type" : "type-2435",
-   "self_type" : "type-2435",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2437",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "unique_id" : "_ZTSN7android2ui9TransformE"
@@ -29995,8 +30061,8 @@
    ],
    "linker_set_key" : "android::ui::Transform::mat33",
    "name" : "android::ui::Transform::mat33",
-   "referenced_type" : "type-2436",
-   "self_type" : "type-2436",
+   "referenced_type" : "type-2438",
+   "self_type" : "type-2438",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "unique_id" : "_ZTSN7android2ui9Transform5mat33E"
@@ -30006,13 +30072,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2382"
+     "referenced_type" : "type-2384"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::Rect>",
    "name" : "android::use_trivial_move<android::Rect>",
-   "referenced_type" : "type-2381",
-   "self_type" : "type-2381",
+   "referenced_type" : "type-2383",
+   "self_type" : "type-2383",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -30023,13 +30089,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-701"
+     "referenced_type" : "type-704"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-700",
-   "self_type" : "type-700",
+   "referenced_type" : "type-703",
+   "self_type" : "type-703",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -30040,16 +30106,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1417"
+     "referenced_type" : "type-1422"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<long>",
    "name" : "android::use_trivial_move<long>",
-   "referenced_type" : "type-1416",
-   "self_type" : "type-1416",
+   "referenced_type" : "type-1421",
+   "self_type" : "type-1421",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveIlEE"
   },
   {
@@ -30080,12 +30146,12 @@
    [
     {
      "field_name" : "num_points",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 32,
-     "referenced_type" : "type-351"
+     "referenced_type" : "type-348"
     },
     {
      "field_name" : "xyzc_points",
@@ -30112,7 +30178,7 @@
     {
      "field_name" : "num_planes",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "planes",
@@ -30134,7 +30200,7 @@
    [
     {
      "field_name" : "top_left",
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-219"
     },
     {
      "field_name" : "component",
@@ -30144,32 +30210,32 @@
     {
      "field_name" : "bits_per_component",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "bits_used",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "h_increment",
      "field_offset" : 160,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "v_increment",
      "field_offset" : 192,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "h_subsampling",
      "field_offset" : 224,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "v_subsampling",
      "field_offset" : 256,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android_flex_plane",
@@ -30186,33 +30252,33 @@
    [
     {
      "field_name" : "magic",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "version",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 64,
-     "referenced_type" : "type-521"
+     "referenced_type" : "type-518"
     },
     {
      "field_name" : "incRef",
      "field_offset" : 320,
-     "referenced_type" : "type-522"
+     "referenced_type" : "type-519"
     },
     {
      "field_name" : "decRef",
      "field_offset" : 384,
-     "referenced_type" : "type-522"
+     "referenced_type" : "type-519"
     }
    ],
    "linker_set_key" : "android_native_base_t",
    "name" : "android_native_base_t",
-   "referenced_type" : "type-520",
-   "self_type" : "type-520",
+   "referenced_type" : "type-517",
+   "self_type" : "type-517",
    "size" : 56,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
    "unique_id" : "android_native_base_t"
@@ -30223,28 +30289,28 @@
    [
     {
      "field_name" : "left",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "top",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "right",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "bottom",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android_native_rect_t",
    "name" : "android_native_rect_t",
-   "referenced_type" : "type-620",
-   "self_type" : "type-620",
+   "referenced_type" : "type-621",
+   "self_type" : "type-621",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
    "unique_id" : "android_native_rect_t"
@@ -30319,43 +30385,43 @@
    [
     {
      "field_name" : "y",
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "field_name" : "cb",
      "field_offset" : 64,
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "field_name" : "cr",
      "field_offset" : 128,
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "field_name" : "ystride",
      "field_offset" : 192,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "cstride",
      "field_offset" : 256,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "chroma_step",
      "field_offset" : 320,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 384,
-     "referenced_type" : "type-351"
+     "referenced_type" : "type-348"
     }
    ],
    "linker_set_key" : "android_ycbcr",
    "name" : "android_ycbcr",
-   "referenced_type" : "type-350",
-   "self_type" : "type-350",
+   "referenced_type" : "type-347",
+   "self_type" : "type-347",
    "size" : 80,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_ycbcr"
@@ -30366,108 +30432,108 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-548"
+     "referenced_type" : "type-545"
     },
     {
      "field_name" : "flags",
      "field_offset" : 960,
-     "referenced_type" : "type-237"
+     "referenced_type" : "type-239"
     },
     {
      "field_name" : "width",
      "field_offset" : 992,
-     "referenced_type" : "type-237"
+     "referenced_type" : "type-239"
     },
     {
      "field_name" : "height",
      "field_offset" : 1024,
-     "referenced_type" : "type-237"
+     "referenced_type" : "type-239"
     },
     {
      "field_name" : "stride",
      "field_offset" : 1056,
-     "referenced_type" : "type-563"
+     "referenced_type" : "type-560"
     },
     {
      "field_name" : "format",
      "field_offset" : 1088,
-     "referenced_type" : "type-563"
+     "referenced_type" : "type-560"
     },
     {
      "field_name" : "xdpi",
      "field_offset" : 1120,
-     "referenced_type" : "type-564"
+     "referenced_type" : "type-561"
     },
     {
      "field_name" : "ydpi",
      "field_offset" : 1152,
-     "referenced_type" : "type-564"
+     "referenced_type" : "type-561"
     },
     {
      "field_name" : "fps",
      "field_offset" : 1184,
-     "referenced_type" : "type-564"
+     "referenced_type" : "type-561"
     },
     {
      "field_name" : "minSwapInterval",
      "field_offset" : 1216,
-     "referenced_type" : "type-563"
+     "referenced_type" : "type-560"
     },
     {
      "field_name" : "maxSwapInterval",
      "field_offset" : 1248,
-     "referenced_type" : "type-563"
+     "referenced_type" : "type-560"
     },
     {
      "field_name" : "numFramebuffers",
      "field_offset" : 1280,
-     "referenced_type" : "type-563"
+     "referenced_type" : "type-560"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 1312,
-     "referenced_type" : "type-565"
+     "referenced_type" : "type-562"
     },
     {
      "field_name" : "setSwapInterval",
      "field_offset" : 1536,
-     "referenced_type" : "type-566"
+     "referenced_type" : "type-563"
     },
     {
      "field_name" : "setUpdateRect",
      "field_offset" : 1600,
-     "referenced_type" : "type-569"
+     "referenced_type" : "type-566"
     },
     {
      "field_name" : "post",
      "field_offset" : 1664,
-     "referenced_type" : "type-571"
+     "referenced_type" : "type-568"
     },
     {
      "field_name" : "compositionComplete",
      "field_offset" : 1728,
-     "referenced_type" : "type-573"
+     "referenced_type" : "type-570"
     },
     {
      "field_name" : "dump",
      "field_offset" : 1792,
-     "referenced_type" : "type-575"
+     "referenced_type" : "type-572"
     },
     {
      "field_name" : "enableScreen",
      "field_offset" : 1856,
-     "referenced_type" : "type-566"
+     "referenced_type" : "type-563"
     },
     {
      "field_name" : "reserved_proc",
      "field_offset" : 1920,
-     "referenced_type" : "type-578"
+     "referenced_type" : "type-575"
     }
    ],
    "linker_set_key" : "framebuffer_device_t",
    "name" : "framebuffer_device_t",
-   "referenced_type" : "type-547",
-   "self_type" : "type-547",
+   "referenced_type" : "type-544",
+   "self_type" : "type-544",
    "size" : 288,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h",
    "unique_id" : "framebuffer_device_t"
@@ -30478,63 +30544,73 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-550"
+     "referenced_type" : "type-547"
     },
     {
      "field_name" : "registerBuffer",
      "field_offset" : 1984,
-     "referenced_type" : "type-582"
+     "referenced_type" : "type-579"
     },
     {
      "field_name" : "unregisterBuffer",
      "field_offset" : 2048,
-     "referenced_type" : "type-582"
+     "referenced_type" : "type-579"
     },
     {
      "field_name" : "lock",
      "field_offset" : 2112,
-     "referenced_type" : "type-586"
+     "referenced_type" : "type-583"
     },
     {
      "field_name" : "unlock",
      "field_offset" : 2176,
-     "referenced_type" : "type-582"
+     "referenced_type" : "type-579"
     },
     {
      "field_name" : "perform",
      "field_offset" : 2240,
-     "referenced_type" : "type-588"
+     "referenced_type" : "type-585"
     },
     {
      "field_name" : "lock_ycbcr",
      "field_offset" : 2304,
-     "referenced_type" : "type-590"
+     "referenced_type" : "type-587"
     },
     {
      "field_name" : "lockAsync",
      "field_offset" : 2368,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-589"
     },
     {
      "field_name" : "unlockAsync",
      "field_offset" : 2432,
-     "referenced_type" : "type-594"
+     "referenced_type" : "type-591"
     },
     {
      "field_name" : "lockAsync_ycbcr",
      "field_offset" : 2496,
-     "referenced_type" : "type-597"
+     "referenced_type" : "type-594"
+    },
+    {
+     "field_name" : "getTransportSize",
+     "field_offset" : 2560,
+     "referenced_type" : "type-596"
+    },
+    {
+     "field_name" : "validateBufferSize",
+     "field_offset" : 2624,
+     "referenced_type" : "type-598"
     },
     {
      "field_name" : "reserved_proc",
-     "field_offset" : 2560,
-     "referenced_type" : "type-599"
+     "field_offset" : 2688,
+     "referenced_type" : "type-522"
     }
    ],
    "linker_set_key" : "gralloc_module_t",
    "name" : "gralloc_module_t",
-   "referenced_type" : "type-581",
-   "self_type" : "type-581",
+   "referenced_type" : "type-578",
+   "self_type" : "type-578",
    "size" : 344,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h",
    "unique_id" : "gralloc_module_t"
@@ -30545,33 +30621,33 @@
    [
     {
      "field_name" : "tag",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "version",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "module",
      "field_offset" : 64,
-     "referenced_type" : "type-549"
+     "referenced_type" : "type-546"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 128,
-     "referenced_type" : "type-560"
+     "referenced_type" : "type-557"
     },
     {
      "field_name" : "close",
      "field_offset" : 896,
-     "referenced_type" : "type-561"
+     "referenced_type" : "type-558"
     }
    ],
    "linker_set_key" : "hw_device_t",
    "name" : "hw_device_t",
-   "referenced_type" : "type-548",
-   "self_type" : "type-548",
+   "referenced_type" : "type-545",
+   "self_type" : "type-545",
    "size" : 120,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
    "unique_id" : "hw_device_t"
@@ -30582,13 +30658,13 @@
    [
     {
      "field_name" : "open",
-     "referenced_type" : "type-553"
+     "referenced_type" : "type-550"
     }
    ],
    "linker_set_key" : "hw_module_methods_t",
    "name" : "hw_module_methods_t",
-   "referenced_type" : "type-552",
-   "self_type" : "type-552",
+   "referenced_type" : "type-549",
+   "self_type" : "type-549",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
    "unique_id" : "hw_module_methods_t"
@@ -30599,7 +30675,7 @@
    [
     {
      "field_name" : "tag",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "module_api_version",
@@ -30614,38 +30690,38 @@
     {
      "field_name" : "id",
      "field_offset" : 64,
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-285"
     },
     {
      "field_name" : "name",
      "field_offset" : 128,
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-285"
     },
     {
      "field_name" : "author",
      "field_offset" : 192,
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-285"
     },
     {
      "field_name" : "methods",
      "field_offset" : 256,
-     "referenced_type" : "type-551"
+     "referenced_type" : "type-548"
     },
     {
      "field_name" : "dso",
      "field_offset" : 320,
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 384,
-     "referenced_type" : "type-559"
+     "referenced_type" : "type-556"
     }
    ],
    "linker_set_key" : "hw_module_t",
    "name" : "hw_module_t",
-   "referenced_type" : "type-550",
-   "self_type" : "type-550",
+   "referenced_type" : "type-547",
+   "self_type" : "type-547",
    "size" : 248,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
    "unique_id" : "hw_module_t"
@@ -30711,12 +30787,12 @@
    [
     {
      "field_name" : "tv_sec",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "tv_nsec",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "linker_set_key" : "log_time",
@@ -30743,22 +30819,22 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "msg",
@@ -30790,27 +30866,27 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "euid",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "msg",
@@ -30842,27 +30918,27 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "lid",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "msg",
@@ -30894,32 +30970,32 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "lid",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "uid",
      "field_offset" : 192,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "msg",
@@ -30941,28 +31017,28 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "numFds",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "numInts",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "data",
      "field_offset" : 96,
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-146"
     }
    ],
    "linker_set_key" : "native_handle",
    "name" : "native_handle",
-   "referenced_type" : "type-143",
-   "self_type" : "type-143",
+   "referenced_type" : "type-145",
+   "self_type" : "type-145",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
    "unique_id" : "native_handle"
@@ -30972,13 +31048,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-436"
+     "referenced_type" : "type-433"
     }
    ],
    "linker_set_key" : "std::is_floating_point<android::half>",
    "name" : "std::is_floating_point<android::half>",
-   "referenced_type" : "type-435",
-   "self_type" : "type-435",
+   "referenced_type" : "type-432",
+   "self_type" : "type-432",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h",
    "template_args" : [ "type-1" ],
@@ -30989,8 +31065,8 @@
    "linker_set_key" : "std::numeric_limits<android::half>",
    "name" : "std::numeric_limits<android::half>",
    "record_kind" : "class",
-   "referenced_type" : "type-580",
-   "self_type" : "type-580",
+   "referenced_type" : "type-577",
+   "self_type" : "type-577",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h",
    "template_args" : [ "type-1" ],
@@ -31003,8 +31079,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::FenceTime::Snapshot &&",
    "name" : "android::FenceTime::Snapshot &&",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1386",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1391",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -31012,7 +31088,7 @@
    "alignment" : 8,
    "linker_set_key" : "android::HdrCapabilities &&",
    "name" : "android::HdrCapabilities &&",
-   "referenced_type" : "type-960",
+   "referenced_type" : "type-962",
    "self_type" : "type-971",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
@@ -31030,8 +31106,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &&",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &&",
-   "referenced_type" : "type-99",
-   "self_type" : "type-107",
+   "referenced_type" : "type-101",
+   "self_type" : "type-109",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -31039,8 +31115,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &&",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &&",
-   "referenced_type" : "type-394",
-   "self_type" : "type-400",
+   "referenced_type" : "type-393",
+   "self_type" : "type-397",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -31048,8 +31124,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &&",
-   "referenced_type" : "type-111",
-   "self_type" : "type-113",
+   "referenced_type" : "type-113",
+   "self_type" : "type-115",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -31066,7 +31142,7 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Status &&",
    "name" : "android::hardware::Status &&",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1311",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -31075,7 +31151,7 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::return_status &&",
    "name" : "android::hardware::details::return_status &&",
-   "referenced_type" : "type-101",
+   "referenced_type" : "type-103",
    "self_type" : "type-1316",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -31084,7 +31160,7 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_handle &&",
    "name" : "android::hardware::hidl_handle &&",
-   "referenced_type" : "type-138",
+   "referenced_type" : "type-140",
    "self_type" : "type-1087",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -31103,7 +31179,7 @@
    "linker_set_key" : "android::sp<android::Fence> &&",
    "name" : "android::sp<android::Fence> &&",
    "referenced_type" : "type-1358",
-   "self_type" : "type-1411",
+   "self_type" : "type-1415",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31111,8 +31187,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &&",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &&",
-   "referenced_type" : "type-357",
-   "self_type" : "type-380",
+   "referenced_type" : "type-354",
+   "self_type" : "type-377",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31120,8 +31196,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &&",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &&",
-   "referenced_type" : "type-485",
-   "self_type" : "type-492",
+   "referenced_type" : "type-482",
+   "self_type" : "type-489",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31129,8 +31205,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &&",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &&",
-   "referenced_type" : "type-334",
-   "self_type" : "type-388",
+   "referenced_type" : "type-331",
+   "self_type" : "type-385",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31138,8 +31214,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &&",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &&",
-   "referenced_type" : "type-53",
-   "self_type" : "type-94",
+   "referenced_type" : "type-88",
+   "self_type" : "type-96",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31147,8 +31223,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &&",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &&",
-   "referenced_type" : "type-498",
-   "self_type" : "type-505",
+   "referenced_type" : "type-496",
+   "self_type" : "type-502",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31156,7 +31232,7 @@
    "alignment" : 8,
    "linker_set_key" : "int &&",
    "name" : "int &&",
-   "referenced_type" : "type-103",
+   "referenced_type" : "type-105",
    "self_type" : "type-1294",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
diff --git a/29/64/x86_x86_64/source-based/libstagefright_bufferqueue_helper.so.lsdump b/29/64/x86_x86_64/source-based/libstagefright_bufferqueue_helper.so.lsdump
index 01acb53..ae1a1d3 100644
--- a/29/64/x86_x86_64/source-based/libstagefright_bufferqueue_helper.so.lsdump
+++ b/29/64/x86_x86_64/source-based/libstagefright_bufferqueue_helper.so.lsdump
@@ -5,15 +5,15 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_AUDIO_CHANNELTYPE [16]",
    "name" : "OMX_AUDIO_CHANNELTYPE [16]",
-   "referenced_type" : "type-1637",
-   "self_type" : "type-1642",
+   "referenced_type" : "type-1635",
+   "self_type" : "type-1641",
    "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-1499",
+   "referenced_type" : "type-1498",
    "self_type" : "type-1515",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -30,8 +30,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::MediaImage2::PlaneInfo [4]",
    "name" : "android::MediaImage2::PlaneInfo [4]",
-   "referenced_type" : "type-2423",
-   "self_type" : "type-2422",
+   "referenced_type" : "type-2426",
+   "self_type" : "type-2425",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
@@ -39,8 +39,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::MediaImage::PlaneInfo [3]",
    "name" : "android::MediaImage::PlaneInfo [3]",
-   "referenced_type" : "type-2418",
-   "self_type" : "type-2417",
+   "referenced_type" : "type-2421",
+   "self_type" : "type-2420",
    "size" : 60,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
@@ -81,7 +81,7 @@
    "linker_set_key" : "int [3]",
    "name" : "int [3]",
    "referenced_type" : "type-4",
-   "self_type" : "type-2202",
+   "self_type" : "type-2205",
    "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-2202",
-   "self_type" : "type-2201",
+   "referenced_type" : "type-2205",
+   "self_type" : "type-2204",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
   },
@@ -117,7 +117,7 @@
    "linker_set_key" : "unsigned char [16]",
    "name" : "unsigned char [16]",
    "referenced_type" : "type-90",
-   "self_type" : "type-2311",
+   "self_type" : "type-2314",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -126,7 +126,7 @@
    "linker_set_key" : "unsigned char [1]",
    "name" : "unsigned char [1]",
    "referenced_type" : "type-90",
-   "self_type" : "type-1572",
+   "self_type" : "type-1567",
    "size" : 1,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -135,7 +135,7 @@
    "linker_set_key" : "unsigned char [256]",
    "name" : "unsigned char [256]",
    "referenced_type" : "type-90",
-   "self_type" : "type-2312",
+   "self_type" : "type-2315",
    "size" : 256,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -144,7 +144,7 @@
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
    "referenced_type" : "type-90",
-   "self_type" : "type-2179",
+   "self_type" : "type-2182",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -153,7 +153,7 @@
    "linker_set_key" : "unsigned char [64]",
    "name" : "unsigned char [64]",
    "referenced_type" : "type-90",
-   "self_type" : "type-2308",
+   "self_type" : "type-2311",
    "size" : 64,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -203,8 +203,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-1242",
-   "self_type" : "type-1242",
+   "referenced_type" : "type-1245",
+   "self_type" : "type-1245",
    "size" : 2
   },
   {
@@ -245,8 +245,8 @@
    "alignment" : 4,
    "linker_set_key" : "long double",
    "name" : "long double",
-   "referenced_type" : "type-1453",
-   "self_type" : "type-1453",
+   "referenced_type" : "type-1456",
+   "self_type" : "type-1456",
    "size" : 8
   },
   {
@@ -759,6 +759,9 @@
    "name" : "_ZN7android18BnProducerListener18needsReleaseNotifyEv"
   },
   {
+   "name" : "_ZN7android18BnProducerListener18onBuffersDiscardedERKNSt3__16vectorIiNS1_9allocatorIiEEEE"
+  },
+  {
    "name" : "_ZN7android18BpConsumerListenerD0Ev"
   },
   {
@@ -3121,8 +3124,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AACPROFILETYPE",
    "name" : "OMX_AUDIO_AACPROFILETYPE",
-   "referenced_type" : "type-1676",
-   "self_type" : "type-1676",
+   "referenced_type" : "type-1671",
+   "self_type" : "type-1671",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3175,8 +3178,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
    "name" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
-   "referenced_type" : "type-1668",
-   "self_type" : "type-1668",
+   "referenced_type" : "type-1670",
+   "self_type" : "type-1670",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3273,8 +3276,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRBANDMODETYPE",
    "name" : "OMX_AUDIO_AMRBANDMODETYPE",
-   "referenced_type" : "type-1890",
-   "self_type" : "type-1890",
+   "referenced_type" : "type-1881",
+   "self_type" : "type-1881",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3319,8 +3322,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRDTXMODETYPE",
    "name" : "OMX_AUDIO_AMRDTXMODETYPE",
-   "referenced_type" : "type-1901",
-   "self_type" : "type-1901",
+   "referenced_type" : "type-1892",
+   "self_type" : "type-1892",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3369,8 +3372,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
    "name" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
-   "referenced_type" : "type-1877",
-   "self_type" : "type-1877",
+   "referenced_type" : "type-1862",
+   "self_type" : "type-1862",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3419,8 +3422,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CDMARATETYPE",
    "name" : "OMX_AUDIO_CDMARATETYPE",
-   "referenced_type" : "type-2021",
-   "self_type" : "type-2021",
+   "referenced_type" : "type-2013",
+   "self_type" : "type-2013",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3461,8 +3464,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CHANNELMODETYPE",
    "name" : "OMX_AUDIO_CHANNELMODETYPE",
-   "referenced_type" : "type-1652",
-   "self_type" : "type-1652",
+   "referenced_type" : "type-1651",
+   "self_type" : "type-1651",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3527,8 +3530,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CHANNELTYPE",
    "name" : "OMX_AUDIO_CHANNELTYPE",
-   "referenced_type" : "type-1637",
-   "self_type" : "type-1637",
+   "referenced_type" : "type-1635",
+   "self_type" : "type-1635",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3669,8 +3672,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CODINGTYPE",
    "name" : "OMX_AUDIO_CODINGTYPE",
-   "referenced_type" : "type-1618",
-   "self_type" : "type-1618",
+   "referenced_type" : "type-1616",
+   "self_type" : "type-1616",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3711,8 +3714,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_ECHOCANTYPE",
    "name" : "OMX_AUDIO_ECHOCANTYPE",
-   "referenced_type" : "type-2196",
-   "self_type" : "type-2196",
+   "referenced_type" : "type-2199",
+   "self_type" : "type-2199",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3749,8 +3752,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G723RATE",
    "name" : "OMX_AUDIO_G723RATE",
-   "referenced_type" : "type-1808",
-   "self_type" : "type-1808",
+   "referenced_type" : "type-1799",
+   "self_type" : "type-1799",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3795,8 +3798,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G726MODE",
    "name" : "OMX_AUDIO_G726MODE",
-   "referenced_type" : "type-1831",
-   "self_type" : "type-1831",
+   "referenced_type" : "type-1822",
+   "self_type" : "type-1822",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3837,8 +3840,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G729TYPE",
    "name" : "OMX_AUDIO_G729TYPE",
-   "referenced_type" : "type-1851",
-   "self_type" : "type-1851",
+   "referenced_type" : "type-1845",
+   "self_type" : "type-1845",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3895,8 +3898,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDIFORMATTYPE",
    "name" : "OMX_AUDIO_MIDIFORMATTYPE",
-   "referenced_type" : "type-2087",
-   "self_type" : "type-2087",
+   "referenced_type" : "type-2079",
+   "self_type" : "type-2079",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3949,8 +3952,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
    "name" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
-   "referenced_type" : "type-2169",
-   "self_type" : "type-2169",
+   "referenced_type" : "type-2168",
+   "self_type" : "type-2168",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3991,8 +3994,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
    "name" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
-   "referenced_type" : "type-2121",
-   "self_type" : "type-2121",
+   "referenced_type" : "type-2113",
+   "self_type" : "type-2113",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4037,8 +4040,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
    "name" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
-   "referenced_type" : "type-2111",
-   "self_type" : "type-2111",
+   "referenced_type" : "type-2102",
+   "self_type" : "type-2102",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4075,8 +4078,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
    "name" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
-   "referenced_type" : "type-1660",
-   "self_type" : "type-1660",
+   "referenced_type" : "type-1656",
+   "self_type" : "type-1656",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4113,8 +4116,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PCMMODETYPE",
    "name" : "OMX_AUDIO_PCMMODETYPE",
-   "referenced_type" : "type-1633",
-   "self_type" : "type-1633",
+   "referenced_type" : "type-1628",
+   "self_type" : "type-1628",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4171,8 +4174,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_RAFORMATTYPE",
    "name" : "OMX_AUDIO_RAFORMATTYPE",
-   "referenced_type" : "type-1752",
-   "self_type" : "type-1752",
+   "referenced_type" : "type-1746",
+   "self_type" : "type-1746",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4205,8 +4208,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
    "name" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
-   "referenced_type" : "type-1775",
-   "self_type" : "type-1775",
+   "referenced_type" : "type-1766",
+   "self_type" : "type-1766",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4239,8 +4242,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_STEREOWIDENINGTYPE",
    "name" : "OMX_AUDIO_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-2192",
-   "self_type" : "type-2192",
+   "referenced_type" : "type-2195",
+   "self_type" : "type-2195",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4281,8 +4284,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_WMAFORMATTYPE",
    "name" : "OMX_AUDIO_WMAFORMATTYPE",
-   "referenced_type" : "type-1719",
-   "self_type" : "type-1719",
+   "referenced_type" : "type-1711",
+   "self_type" : "type-1711",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4323,8 +4326,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_WMAPROFILETYPE",
    "name" : "OMX_AUDIO_WMAPROFILETYPE",
-   "referenced_type" : "type-1732",
-   "self_type" : "type-1732",
+   "referenced_type" : "type-1722",
+   "self_type" : "type-1722",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4349,8 +4352,8 @@
    ],
    "linker_set_key" : "OMX_BOOL",
    "name" : "OMX_BOOL",
-   "referenced_type" : "type-1293",
-   "self_type" : "type-1293",
+   "referenced_type" : "type-1296",
+   "self_type" : "type-1296",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "underlying_type" : "type-2",
@@ -4387,8 +4390,8 @@
    ],
    "linker_set_key" : "OMX_BUFFERSUPPLIERTYPE",
    "name" : "OMX_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-1601",
-   "self_type" : "type-1601",
+   "referenced_type" : "type-1599",
+   "self_type" : "type-1599",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -4441,8 +4444,8 @@
    ],
    "linker_set_key" : "OMX_COLORBLENDTYPE",
    "name" : "OMX_COLORBLENDTYPE",
-   "referenced_type" : "type-2209",
-   "self_type" : "type-2209",
+   "referenced_type" : "type-2212",
+   "self_type" : "type-2212",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4683,8 +4686,8 @@
    ],
    "linker_set_key" : "OMX_COLOR_FORMATTYPE",
    "name" : "OMX_COLOR_FORMATTYPE",
-   "referenced_type" : "type-2199",
-   "self_type" : "type-2199",
+   "referenced_type" : "type-2202",
+   "self_type" : "type-2202",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4729,8 +4732,8 @@
    ],
    "linker_set_key" : "OMX_COMMANDTYPE",
    "name" : "OMX_COMMANDTYPE",
-   "referenced_type" : "type-1485",
-   "self_type" : "type-1485",
+   "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-2",
@@ -4767,8 +4770,8 @@
    ],
    "linker_set_key" : "OMX_DATAUNITENCAPSULATIONTYPE",
    "name" : "OMX_DATAUNITENCAPSULATIONTYPE",
-   "referenced_type" : "type-2236",
-   "self_type" : "type-2236",
+   "referenced_type" : "type-2239",
+   "self_type" : "type-2239",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4809,8 +4812,8 @@
    ],
    "linker_set_key" : "OMX_DATAUNITTYPE",
    "name" : "OMX_DATAUNITTYPE",
-   "referenced_type" : "type-2235",
-   "self_type" : "type-2235",
+   "referenced_type" : "type-2238",
+   "self_type" : "type-2238",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4835,8 +4838,8 @@
    ],
    "linker_set_key" : "OMX_DIRTYPE",
    "name" : "OMX_DIRTYPE",
-   "referenced_type" : "type-1452",
-   "self_type" : "type-1452",
+   "referenced_type" : "type-1455",
+   "self_type" : "type-1455",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "underlying_type" : "type-2",
@@ -4877,8 +4880,8 @@
    ],
    "linker_set_key" : "OMX_DITHERTYPE",
    "name" : "OMX_DITHERTYPE",
-   "referenced_type" : "type-2238",
-   "self_type" : "type-2238",
+   "referenced_type" : "type-2241",
+   "self_type" : "type-2241",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4903,8 +4906,8 @@
    ],
    "linker_set_key" : "OMX_ENDIANTYPE",
    "name" : "OMX_ENDIANTYPE",
-   "referenced_type" : "type-1460",
-   "self_type" : "type-1460",
+   "referenced_type" : "type-1459",
+   "self_type" : "type-1459",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "underlying_type" : "type-2",
@@ -5081,8 +5084,8 @@
    ],
    "linker_set_key" : "OMX_ERRORTYPE",
    "name" : "OMX_ERRORTYPE",
-   "referenced_type" : "type-1494",
-   "self_type" : "type-1494",
+   "referenced_type" : "type-1495",
+   "self_type" : "type-1495",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-4",
@@ -5155,8 +5158,8 @@
    ],
    "linker_set_key" : "OMX_EVENTTYPE",
    "name" : "OMX_EVENTTYPE",
-   "referenced_type" : "type-1588",
-   "self_type" : "type-1588",
+   "referenced_type" : "type-1589",
+   "self_type" : "type-1589",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -5221,8 +5224,8 @@
    ],
    "linker_set_key" : "OMX_EXPOSURECONTROLTYPE",
    "name" : "OMX_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-2221",
-   "self_type" : "type-2221",
+   "referenced_type" : "type-2224",
+   "self_type" : "type-2224",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -5255,8 +5258,8 @@
    ],
    "linker_set_key" : "OMX_EXTRADATATYPE",
    "name" : "OMX_EXTRADATATYPE",
-   "referenced_type" : "type-1561",
-   "self_type" : "type-1561",
+   "referenced_type" : "type-1556",
+   "self_type" : "type-1556",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -5301,8 +5304,8 @@
    ],
    "linker_set_key" : "OMX_FOCUSSTATUSTYPE",
    "name" : "OMX_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-2246",
-   "self_type" : "type-2246",
+   "referenced_type" : "type-2249",
+   "self_type" : "type-2249",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -5371,8 +5374,8 @@
    ],
    "linker_set_key" : "OMX_IMAGEFILTERTYPE",
    "name" : "OMX_IMAGEFILTERTYPE",
-   "referenced_type" : "type-2205",
-   "self_type" : "type-2205",
+   "referenced_type" : "type-2208",
+   "self_type" : "type-2208",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -5437,8 +5440,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_CODINGTYPE",
    "name" : "OMX_IMAGE_CODINGTYPE",
-   "referenced_type" : "type-2297",
-   "self_type" : "type-2297",
+   "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-2",
@@ -5487,8 +5490,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_FLASHCONTROLTYPE",
    "name" : "OMX_IMAGE_FLASHCONTROLTYPE",
-   "referenced_type" : "type-2300",
-   "self_type" : "type-2300",
+   "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-2",
@@ -5529,8 +5532,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_FOCUSCONTROLTYPE",
    "name" : "OMX_IMAGE_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-2303",
-   "self_type" : "type-2303",
+   "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-2",
@@ -5579,8 +5582,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_HUFFMANTABLETYPE",
    "name" : "OMX_IMAGE_HUFFMANTABLETYPE",
-   "referenced_type" : "type-2309",
-   "self_type" : "type-2309",
+   "referenced_type" : "type-2312",
+   "self_type" : "type-2312",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "underlying_type" : "type-2",
@@ -5621,8 +5624,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
    "name" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-2306",
-   "self_type" : "type-2306",
+   "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-2",
@@ -6481,8 +6484,8 @@
    ],
    "linker_set_key" : "OMX_METADATACHARSETTYPE",
    "name" : "OMX_METADATACHARSETTYPE",
-   "referenced_type" : "type-2345",
-   "self_type" : "type-2345",
+   "referenced_type" : "type-2348",
+   "self_type" : "type-2348",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6523,8 +6526,8 @@
    ],
    "linker_set_key" : "OMX_METADATASCOPETYPE",
    "name" : "OMX_METADATASCOPETYPE",
-   "referenced_type" : "type-2346",
-   "self_type" : "type-2346",
+   "referenced_type" : "type-2349",
+   "self_type" : "type-2349",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6561,8 +6564,8 @@
    ],
    "linker_set_key" : "OMX_METADATASEARCHMODETYPE",
    "name" : "OMX_METADATASEARCHMODETYPE",
-   "referenced_type" : "type-2347",
-   "self_type" : "type-2347",
+   "referenced_type" : "type-2350",
+   "self_type" : "type-2350",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6599,8 +6602,8 @@
    ],
    "linker_set_key" : "OMX_METERINGTYPE",
    "name" : "OMX_METERINGTYPE",
-   "referenced_type" : "type-2242",
-   "self_type" : "type-2242",
+   "referenced_type" : "type-2245",
+   "self_type" : "type-2245",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -6641,8 +6644,8 @@
    ],
    "linker_set_key" : "OMX_MIRRORTYPE",
    "name" : "OMX_MIRRORTYPE",
-   "referenced_type" : "type-2213",
-   "self_type" : "type-2213",
+   "referenced_type" : "type-2216",
+   "self_type" : "type-2216",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -6717,8 +6720,8 @@
    ],
    "linker_set_key" : "OMX_OTHER_FORMATTYPE",
    "name" : "OMX_OTHER_FORMATTYPE",
-   "referenced_type" : "type-2314",
-   "self_type" : "type-2314",
+   "referenced_type" : "type-2317",
+   "self_type" : "type-2317",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -6759,8 +6762,8 @@
    ],
    "linker_set_key" : "OMX_PORTDOMAINTYPE",
    "name" : "OMX_PORTDOMAINTYPE",
-   "referenced_type" : "type-2332",
-   "self_type" : "type-2332",
+   "referenced_type" : "type-2335",
+   "self_type" : "type-2335",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6809,8 +6812,8 @@
    ],
    "linker_set_key" : "OMX_STATETYPE",
    "name" : "OMX_STATETYPE",
-   "referenced_type" : "type-1488",
-   "self_type" : "type-1488",
+   "referenced_type" : "type-1490",
+   "self_type" : "type-1490",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -6843,8 +6846,8 @@
    ],
    "linker_set_key" : "OMX_SUSPENSIONPOLICYTYPE",
    "name" : "OMX_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-2336",
-   "self_type" : "type-2336",
+   "referenced_type" : "type-2339",
+   "self_type" : "type-2339",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6877,8 +6880,8 @@
    ],
    "linker_set_key" : "OMX_SUSPENSIONTYPE",
    "name" : "OMX_SUSPENSIONTYPE",
-   "referenced_type" : "type-2338",
-   "self_type" : "type-2338",
+   "referenced_type" : "type-2341",
+   "self_type" : "type-2341",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6915,8 +6918,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CLOCKSTATE",
    "name" : "OMX_TIME_CLOCKSTATE",
-   "referenced_type" : "type-2321",
-   "self_type" : "type-2321",
+   "referenced_type" : "type-2324",
+   "self_type" : "type-2324",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -6953,8 +6956,8 @@
    ],
    "linker_set_key" : "OMX_TIME_REFCLOCKTYPE",
    "name" : "OMX_TIME_REFCLOCKTYPE",
-   "referenced_type" : "type-2319",
-   "self_type" : "type-2319",
+   "referenced_type" : "type-2322",
+   "self_type" : "type-2322",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -6987,8 +6990,8 @@
    ],
    "linker_set_key" : "OMX_TIME_SEEKMODETYPE",
    "name" : "OMX_TIME_SEEKMODETYPE",
-   "referenced_type" : "type-2315",
-   "self_type" : "type-2315",
+   "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-2",
@@ -7025,8 +7028,8 @@
    ],
    "linker_set_key" : "OMX_TIME_UPDATETYPE",
    "name" : "OMX_TIME_UPDATETYPE",
-   "referenced_type" : "type-2318",
-   "self_type" : "type-2318",
+   "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-2",
@@ -7079,8 +7082,8 @@
    ],
    "linker_set_key" : "OMX_TRANSITIONEFFECTTYPE",
    "name" : "OMX_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-2233",
-   "self_type" : "type-2233",
+   "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-2",
@@ -7185,8 +7188,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCLEVELTYPE",
    "name" : "OMX_VIDEO_AVCLEVELTYPE",
-   "referenced_type" : "type-2280",
-   "self_type" : "type-2280",
+   "referenced_type" : "type-2283",
+   "self_type" : "type-2283",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7223,8 +7226,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
    "name" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
-   "referenced_type" : "type-2282",
-   "self_type" : "type-2282",
+   "referenced_type" : "type-2285",
+   "self_type" : "type-2285",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7277,8 +7280,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCPROFILETYPE",
    "name" : "OMX_VIDEO_AVCPROFILETYPE",
-   "referenced_type" : "type-2279",
-   "self_type" : "type-2279",
+   "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-2",
@@ -7315,8 +7318,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCSLICEMODETYPE",
    "name" : "OMX_VIDEO_AVCSLICEMODETYPE",
-   "referenced_type" : "type-2293",
-   "self_type" : "type-2293",
+   "referenced_type" : "type-2296",
+   "self_type" : "type-2296",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7397,8 +7400,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CODINGTYPE",
    "name" : "OMX_VIDEO_CODINGTYPE",
-   "referenced_type" : "type-2248",
-   "self_type" : "type-2248",
+   "referenced_type" : "type-2251",
+   "self_type" : "type-2251",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7447,8 +7450,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONTROLRATETYPE",
    "name" : "OMX_VIDEO_CONTROLRATETYPE",
-   "referenced_type" : "type-2253",
-   "self_type" : "type-2253",
+   "referenced_type" : "type-2256",
+   "self_type" : "type-2256",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7505,8 +7508,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_H263LEVELTYPE",
    "name" : "OMX_VIDEO_H263LEVELTYPE",
-   "referenced_type" : "type-2264",
-   "self_type" : "type-2264",
+   "referenced_type" : "type-2267",
+   "self_type" : "type-2267",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7567,8 +7570,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_H263PROFILETYPE",
    "name" : "OMX_VIDEO_H263PROFILETYPE",
-   "referenced_type" : "type-2263",
-   "self_type" : "type-2263",
+   "referenced_type" : "type-2266",
+   "self_type" : "type-2266",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7605,8 +7608,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_INTRAREFRESHTYPE",
    "name" : "OMX_VIDEO_INTRAREFRESHTYPE",
-   "referenced_type" : "type-2259",
-   "self_type" : "type-2259",
+   "referenced_type" : "type-2262",
+   "self_type" : "type-2262",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7647,8 +7650,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MOTIONVECTORTYPE",
    "name" : "OMX_VIDEO_MOTIONVECTORTYPE",
-   "referenced_type" : "type-2257",
-   "self_type" : "type-2257",
+   "referenced_type" : "type-2260",
+   "self_type" : "type-2260",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7693,8 +7696,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG2LEVELTYPE",
    "name" : "OMX_VIDEO_MPEG2LEVELTYPE",
-   "referenced_type" : "type-2269",
-   "self_type" : "type-2269",
+   "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-2",
@@ -7743,8 +7746,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG2PROFILETYPE",
    "name" : "OMX_VIDEO_MPEG2PROFILETYPE",
-   "referenced_type" : "type-2268",
-   "self_type" : "type-2268",
+   "referenced_type" : "type-2271",
+   "self_type" : "type-2271",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7809,8 +7812,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG4LEVELTYPE",
    "name" : "OMX_VIDEO_MPEG4LEVELTYPE",
-   "referenced_type" : "type-2272",
-   "self_type" : "type-2272",
+   "referenced_type" : "type-2275",
+   "self_type" : "type-2275",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7899,8 +7902,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG4PROFILETYPE",
    "name" : "OMX_VIDEO_MPEG4PROFILETYPE",
-   "referenced_type" : "type-2271",
-   "self_type" : "type-2271",
+   "referenced_type" : "type-2274",
+   "self_type" : "type-2274",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7957,8 +7960,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PICTURETYPE",
    "name" : "OMX_VIDEO_PICTURETYPE",
-   "referenced_type" : "type-2265",
-   "self_type" : "type-2265",
+   "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-2",
@@ -7999,8 +8002,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_RVFORMATTYPE",
    "name" : "OMX_VIDEO_RVFORMATTYPE",
-   "referenced_type" : "type-2276",
-   "self_type" : "type-2276",
+   "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-2",
@@ -8041,8 +8044,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_WMVFORMATTYPE",
    "name" : "OMX_VIDEO_WMVFORMATTYPE",
-   "referenced_type" : "type-2274",
-   "self_type" : "type-2274",
+   "referenced_type" : "type-2277",
+   "self_type" : "type-2277",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -8107,8 +8110,8 @@
    ],
    "linker_set_key" : "OMX_WHITEBALCONTROLTYPE",
    "name" : "OMX_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-2219",
-   "self_type" : "type-2219",
+   "referenced_type" : "type-2222",
+   "self_type" : "type-2222",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -8149,8 +8152,8 @@
    ],
    "linker_set_key" : "android::ADebug::Level",
    "name" : "android::ADebug::Level",
-   "referenced_type" : "type-2292",
-   "self_type" : "type-2292",
+   "referenced_type" : "type-2295",
+   "self_type" : "type-2295",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
    "underlying_type" : "type-2",
@@ -8253,8 +8256,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::MatrixCoeffs",
    "name" : "android::ColorAspects::MatrixCoeffs",
-   "referenced_type" : "type-2432",
-   "self_type" : "type-2432",
+   "referenced_type" : "type-2435",
+   "self_type" : "type-2435",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8299,8 +8302,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::Primaries",
    "name" : "android::ColorAspects::Primaries",
-   "referenced_type" : "type-2430",
-   "self_type" : "type-2430",
+   "referenced_type" : "type-2433",
+   "self_type" : "type-2433",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8329,8 +8332,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::Range",
    "name" : "android::ColorAspects::Range",
-   "referenced_type" : "type-2429",
-   "self_type" : "type-2429",
+   "referenced_type" : "type-2432",
+   "self_type" : "type-2432",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8453,8 +8456,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::Transfer",
    "name" : "android::ColorAspects::Transfer",
-   "referenced_type" : "type-2431",
-   "self_type" : "type-2431",
+   "referenced_type" : "type-2434",
+   "self_type" : "type-2434",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8487,8 +8490,8 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorRange",
    "name" : "android::ColorUtils::ColorRange",
-   "referenced_type" : "type-1197",
-   "self_type" : "type-1197",
+   "referenced_type" : "type-1195",
+   "self_type" : "type-1195",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
    "underlying_type" : "type-2",
@@ -8553,8 +8556,8 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorStandard",
    "name" : "android::ColorUtils::ColorStandard",
-   "referenced_type" : "type-1187",
-   "self_type" : "type-1187",
+   "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-2",
@@ -8611,8 +8614,8 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorTransfer",
    "name" : "android::ColorUtils::ColorTransfer",
-   "referenced_type" : "type-1189",
-   "self_type" : "type-1189",
+   "referenced_type" : "type-1192",
+   "self_type" : "type-1192",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
    "underlying_type" : "type-2",
@@ -8677,8 +8680,8 @@
    ],
    "linker_set_key" : "android::HDRStaticInfo::ID",
    "name" : "android::HDRStaticInfo::ID",
-   "referenced_type" : "type-2436",
-   "self_type" : "type-2436",
+   "referenced_type" : "type-2439",
+   "self_type" : "type-2439",
    "size" : 1,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-90",
@@ -8761,8 +8764,8 @@
    ],
    "linker_set_key" : "android::MediaImage2::Type",
    "name" : "android::MediaImage2::Type",
-   "referenced_type" : "type-2421",
-   "self_type" : "type-2421",
+   "referenced_type" : "type-2424",
+   "self_type" : "type-2424",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8813,8 +8816,8 @@
    ],
    "linker_set_key" : "android::MediaImage::Type",
    "name" : "android::MediaImage::Type",
-   "referenced_type" : "type-2416",
-   "self_type" : "type-2416",
+   "referenced_type" : "type-2419",
+   "self_type" : "type-2419",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8847,8 +8850,8 @@
    ],
    "linker_set_key" : "android::MetadataBufferType",
    "name" : "android::MetadataBufferType",
-   "referenced_type" : "type-1234",
-   "self_type" : "type-1234",
+   "referenced_type" : "type-1235",
+   "self_type" : "type-1235",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/MetadataBufferType.h",
    "underlying_type" : "type-4",
@@ -8873,8 +8876,8 @@
    ],
    "linker_set_key" : "android::ProcessState::CallRestriction",
    "name" : "android::ProcessState::CallRestriction",
-   "referenced_type" : "type-1255",
-   "self_type" : "type-1255",
+   "referenced_type" : "type-1259",
+   "self_type" : "type-1259",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h",
    "underlying_type" : "type-4",
@@ -8891,8 +8894,8 @@
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-2657",
-   "self_type" : "type-2657",
+   "referenced_type" : "type-2660",
+   "self_type" : "type-2660",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "underlying_type" : "type-2",
@@ -8909,8 +8912,8 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-2652",
-   "self_type" : "type-2652",
+   "referenced_type" : "type-2655",
+   "self_type" : "type-2655",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "underlying_type" : "type-2",
@@ -8935,8 +8938,8 @@
    ],
    "linker_set_key" : "android::base::LogId",
    "name" : "android::base::LogId",
-   "referenced_type" : "type-4704",
-   "self_type" : "type-4704",
+   "referenced_type" : "type-4711",
+   "self_type" : "type-4711",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "type-2",
@@ -8977,8 +8980,8 @@
    ],
    "linker_set_key" : "android::base::LogSeverity",
    "name" : "android::base::LogSeverity",
-   "referenced_type" : "type-4654",
-   "self_type" : "type-4654",
+   "referenced_type" : "type-4661",
+   "self_type" : "type-4661",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "type-2",
@@ -9113,8 +9116,8 @@
    ],
    "linker_set_key" : "android::hardware::ProcessState::CallRestriction",
    "name" : "android::hardware::ProcessState::CallRestriction",
-   "referenced_type" : "type-1391",
-   "self_type" : "type-1391",
+   "referenced_type" : "type-1394",
+   "self_type" : "type-1394",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "underlying_type" : "type-4",
@@ -12107,8 +12110,8 @@
    ],
    "linker_set_key" : "log_id",
    "name" : "log_id",
-   "referenced_type" : "type-2411",
-   "self_type" : "type-2411",
+   "referenced_type" : "type-2414",
+   "self_type" : "type-2414",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
@@ -12127,9 +12130,9 @@
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1501",
-   "return_type" : "type-1494",
-   "self_type" : "type-1501",
+   "referenced_type" : "type-1500",
+   "return_type" : "type-1495",
+   "self_type" : "type-1500",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -12142,12 +12145,12 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1595"
+     "referenced_type" : "type-1598"
     }
    ],
-   "referenced_type" : "type-2382",
-   "return_type" : "type-1494",
-   "self_type" : "type-2382",
+   "referenced_type" : "type-2385",
+   "return_type" : "type-1495",
+   "self_type" : "type-2385",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12160,7 +12163,7 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-2376"
+     "referenced_type" : "type-2379"
     },
     {
      "referenced_type" : "type-2"
@@ -12172,9 +12175,9 @@
      "referenced_type" : "type-2"
     }
    ],
-   "referenced_type" : "type-2378",
-   "return_type" : "type-1494",
-   "self_type" : "type-2378",
+   "referenced_type" : "type-2381",
+   "return_type" : "type-1495",
+   "self_type" : "type-2381",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12187,7 +12190,7 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-2376"
+     "referenced_type" : "type-2379"
     },
     {
      "referenced_type" : "type-2"
@@ -12202,9 +12205,9 @@
      "referenced_type" : "type-89"
     }
    ],
-   "referenced_type" : "type-2375",
-   "return_type" : "type-1494",
-   "self_type" : "type-2375",
+   "referenced_type" : "type-2378",
+   "return_type" : "type-1495",
+   "self_type" : "type-2378",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12217,7 +12220,7 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-2376"
+     "referenced_type" : "type-2379"
     },
     {
      "referenced_type" : "type-2"
@@ -12229,9 +12232,9 @@
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-2387",
-   "return_type" : "type-1494",
-   "self_type" : "type-2387",
+   "referenced_type" : "type-2390",
+   "return_type" : "type-1495",
+   "self_type" : "type-2390",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12244,15 +12247,15 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-2385"
+     "referenced_type" : "type-2388"
     },
     {
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-2384",
-   "return_type" : "type-1494",
-   "self_type" : "type-2384",
+   "referenced_type" : "type-2387",
+   "return_type" : "type-1495",
+   "self_type" : "type-2387",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12265,7 +12268,7 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-1488"
     },
     {
      "referenced_type" : "type-2"
@@ -12274,9 +12277,9 @@
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-2362",
-   "return_type" : "type-1494",
-   "self_type" : "type-2362",
+   "referenced_type" : "type-2365",
+   "return_type" : "type-1495",
+   "self_type" : "type-2365",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12295,9 +12298,9 @@
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-2364",
-   "return_type" : "type-1494",
-   "self_type" : "type-2364",
+   "referenced_type" : "type-2367",
+   "return_type" : "type-1495",
+   "self_type" : "type-2367",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12310,12 +12313,12 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-2370"
+     "referenced_type" : "type-2373"
     }
    ],
-   "referenced_type" : "type-2369",
-   "return_type" : "type-1494",
-   "self_type" : "type-2369",
+   "referenced_type" : "type-2372",
+   "return_type" : "type-1495",
+   "self_type" : "type-2372",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12331,12 +12334,12 @@
      "referenced_type" : "type-254"
     },
     {
-     "referenced_type" : "type-2367"
+     "referenced_type" : "type-2370"
     }
    ],
-   "referenced_type" : "type-2366",
-   "return_type" : "type-1494",
-   "self_type" : "type-2366",
+   "referenced_type" : "type-2369",
+   "return_type" : "type-1495",
+   "self_type" : "type-2369",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12352,18 +12355,18 @@
      "referenced_type" : "type-254"
     },
     {
-     "referenced_type" : "type-2359"
+     "referenced_type" : "type-2362"
     },
     {
-     "referenced_type" : "type-2359"
+     "referenced_type" : "type-2362"
     },
     {
-     "referenced_type" : "type-2360"
+     "referenced_type" : "type-2363"
     }
    ],
-   "referenced_type" : "type-2358",
-   "return_type" : "type-1494",
-   "self_type" : "type-2358",
+   "referenced_type" : "type-2361",
+   "return_type" : "type-1495",
+   "self_type" : "type-2361",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12382,9 +12385,9 @@
      "referenced_type" : "type-2"
     }
    ],
-   "referenced_type" : "type-2389",
-   "return_type" : "type-1494",
-   "self_type" : "type-2389",
+   "referenced_type" : "type-2392",
+   "return_type" : "type-1495",
+   "self_type" : "type-2392",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12400,12 +12403,12 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1595"
+     "referenced_type" : "type-1598"
     }
    ],
-   "referenced_type" : "type-2380",
-   "return_type" : "type-1494",
-   "self_type" : "type-2380",
+   "referenced_type" : "type-2383",
+   "return_type" : "type-1495",
+   "self_type" : "type-2383",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12427,12 +12430,12 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-2373"
+     "referenced_type" : "type-2376"
     }
    ],
-   "referenced_type" : "type-2372",
-   "return_type" : "type-1494",
-   "self_type" : "type-2372",
+   "referenced_type" : "type-2375",
+   "return_type" : "type-1495",
+   "self_type" : "type-2375",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12448,12 +12451,12 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1595"
+     "referenced_type" : "type-1598"
     }
    ],
-   "referenced_type" : "type-1594",
-   "return_type" : "type-1494",
-   "self_type" : "type-1594",
+   "referenced_type" : "type-1597",
+   "return_type" : "type-1495",
+   "self_type" : "type-1597",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -12469,7 +12472,7 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1588"
+     "referenced_type" : "type-1589"
     },
     {
      "referenced_type" : "type-2"
@@ -12481,9 +12484,9 @@
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1592",
-   "return_type" : "type-1494",
-   "self_type" : "type-1592",
+   "referenced_type" : "type-1595",
+   "return_type" : "type-1495",
+   "self_type" : "type-1595",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -12493,18 +12496,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1247"
+     "referenced_type" : "type-1250"
     },
     {
-     "referenced_type" : "type-1037"
+     "referenced_type" : "type-1041"
     },
     {
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1246",
+   "referenced_type" : "type-1249",
    "return_type" : "type-93",
-   "self_type" : "type-1246",
+   "self_type" : "type-1249",
    "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h"
   },
   {
@@ -12514,18 +12517,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1247"
+     "referenced_type" : "type-1250"
     },
     {
-     "referenced_type" : "type-1388"
+     "referenced_type" : "type-1391"
     },
     {
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1387",
+   "referenced_type" : "type-1390",
    "return_type" : "type-93",
-   "self_type" : "type-1387",
+   "self_type" : "type-1390",
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
   {
@@ -12580,7 +12583,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1381"
+     "referenced_type" : "type-1384"
     },
     {
      "referenced_type" : "type-97"
@@ -12598,9 +12601,9 @@
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1380",
+   "referenced_type" : "type-1383",
    "return_type" : "type-9",
-   "self_type" : "type-1380",
+   "self_type" : "type-1383",
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   }
  ],
@@ -12628,7 +12631,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-4500"
+     "referenced_type" : "type-4506"
     }
    ],
    "return_type" : "type-50",
@@ -12656,7 +12659,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1271"
+     "referenced_type" : "type-1275"
     }
    ],
    "return_type" : "type-50",
@@ -12935,7 +12938,7 @@
      "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-2190"
+     "referenced_type" : "type-2193"
     }
    ],
    "return_type" : "type-9",
@@ -13281,7 +13284,7 @@
      "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-2492"
+     "referenced_type" : "type-2495"
     },
     {
      "referenced_type" : "type-4"
@@ -13390,13 +13393,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2522"
+     "referenced_type" : "type-2525"
     },
     {
      "referenced_type" : "type-725"
     }
    ],
-   "return_type" : "type-2525",
+   "return_type" : "type-2528",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -13406,13 +13409,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2522"
+     "referenced_type" : "type-2525"
     },
     {
-     "referenced_type" : "type-1862"
+     "referenced_type" : "type-1866"
     }
    ],
-   "return_type" : "type-2525",
+   "return_type" : "type-2528",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -13423,7 +13426,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2673"
+     "referenced_type" : "type-2676"
     },
     {
      "referenced_type" : "type-11"
@@ -13443,7 +13446,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2673"
+     "referenced_type" : "type-2676"
     },
     {
      "referenced_type" : "type-8"
@@ -13463,7 +13466,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2673"
+     "referenced_type" : "type-2676"
     },
     {
      "referenced_type" : "type-8"
@@ -13483,7 +13486,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2673"
+     "referenced_type" : "type-2676"
     },
     {
      "referenced_type" : "type-8"
@@ -13506,7 +13509,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2673"
+     "referenced_type" : "type-2676"
     },
     {
      "referenced_type" : "type-8"
@@ -13529,7 +13532,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2673"
+     "referenced_type" : "type-2676"
     },
     {
      "referenced_type" : "type-8"
@@ -13552,7 +13555,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2673"
+     "referenced_type" : "type-2676"
     },
     {
      "referenced_type" : "type-8"
@@ -13575,7 +13578,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2676"
+     "referenced_type" : "type-2679"
     },
     {
      "referenced_type" : "type-11"
@@ -13595,7 +13598,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2676"
+     "referenced_type" : "type-2679"
     },
     {
      "referenced_type" : "type-8"
@@ -13615,7 +13618,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2676"
+     "referenced_type" : "type-2679"
     },
     {
      "referenced_type" : "type-8"
@@ -13635,7 +13638,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2676"
+     "referenced_type" : "type-2679"
     },
     {
      "referenced_type" : "type-8"
@@ -13658,7 +13661,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2676"
+     "referenced_type" : "type-2679"
     },
     {
      "referenced_type" : "type-8"
@@ -13681,7 +13684,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2676"
+     "referenced_type" : "type-2679"
     },
     {
      "referenced_type" : "type-8"
@@ -13704,7 +13707,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2676"
+     "referenced_type" : "type-2679"
     },
     {
      "referenced_type" : "type-8"
@@ -13727,7 +13730,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2668"
+     "referenced_type" : "type-2671"
     },
     {
      "referenced_type" : "type-11"
@@ -13747,7 +13750,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2668"
+     "referenced_type" : "type-2671"
     },
     {
      "referenced_type" : "type-8"
@@ -13767,7 +13770,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2668"
+     "referenced_type" : "type-2671"
     },
     {
      "referenced_type" : "type-8"
@@ -13787,7 +13790,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2668"
+     "referenced_type" : "type-2671"
     },
     {
      "referenced_type" : "type-8"
@@ -13810,7 +13813,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2668"
+     "referenced_type" : "type-2671"
     },
     {
      "referenced_type" : "type-8"
@@ -13833,7 +13836,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2668"
+     "referenced_type" : "type-2671"
     },
     {
      "referenced_type" : "type-8"
@@ -13856,7 +13859,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2668"
+     "referenced_type" : "type-2671"
     },
     {
      "referenced_type" : "type-8"
@@ -13878,10 +13881,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2547"
+     "referenced_type" : "type-2550"
     }
    ],
-   "return_type" : "type-2476",
+   "return_type" : "type-2479",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -13891,7 +13894,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2547"
+     "referenced_type" : "type-2550"
     }
    ],
    "return_type" : "type-570",
@@ -13904,10 +13907,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2547"
+     "referenced_type" : "type-2550"
     }
    ],
-   "return_type" : "type-2463",
+   "return_type" : "type-2466",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -13918,18 +13921,18 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1513"
+     "referenced_type" : "type-1517"
     },
     {
-     "referenced_type" : "type-1648"
+     "referenced_type" : "type-1652"
     },
     {
-     "referenced_type" : "type-3128"
+     "referenced_type" : "type-3131"
     }
    ],
    "return_type" : "type-4",
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-3129", "type-83" ]
+   "template_args" : [ "type-3132", "type-83" ]
   },
   {
    "function_name" : "android::Parcel::readNullableStrongBinder",
@@ -13938,15 +13941,15 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1513"
+     "referenced_type" : "type-1517"
     },
     {
-     "referenced_type" : "type-2534"
+     "referenced_type" : "type-2537"
     }
    ],
    "return_type" : "type-4",
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-3130" ]
+   "template_args" : [ "type-3133" ]
   },
   {
    "access" : "protected",
@@ -13956,7 +13959,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-978"
+     "referenced_type" : "type-980"
     },
     {
      "referenced_type" : "type-8"
@@ -13976,7 +13979,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-978"
+     "referenced_type" : "type-980"
     },
     {
      "referenced_type" : "type-8"
@@ -13996,7 +13999,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-978"
+     "referenced_type" : "type-980"
     },
     {
      "referenced_type" : "type-8"
@@ -14019,7 +14022,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-978"
+     "referenced_type" : "type-980"
     },
     {
      "referenced_type" : "type-8"
@@ -14042,7 +14045,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-978"
+     "referenced_type" : "type-980"
     },
     {
      "referenced_type" : "type-8"
@@ -14065,7 +14068,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-978"
+     "referenced_type" : "type-980"
     },
     {
      "referenced_type" : "type-8"
@@ -14088,7 +14091,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1228"
+     "referenced_type" : "type-1232"
     },
     {
      "referenced_type" : "type-8"
@@ -14108,7 +14111,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1228"
+     "referenced_type" : "type-1232"
     },
     {
      "referenced_type" : "type-8"
@@ -14128,7 +14131,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1228"
+     "referenced_type" : "type-1232"
     },
     {
      "referenced_type" : "type-8"
@@ -14151,7 +14154,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1228"
+     "referenced_type" : "type-1232"
     },
     {
      "referenced_type" : "type-8"
@@ -14174,7 +14177,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1228"
+     "referenced_type" : "type-1232"
     },
     {
      "referenced_type" : "type-8"
@@ -14197,7 +14200,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1228"
+     "referenced_type" : "type-1232"
     },
     {
      "referenced_type" : "type-8"
@@ -14220,7 +14223,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2689"
+     "referenced_type" : "type-2692"
     },
     {
      "referenced_type" : "type-8"
@@ -14240,7 +14243,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2689"
+     "referenced_type" : "type-2692"
     },
     {
      "referenced_type" : "type-8"
@@ -14260,7 +14263,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2689"
+     "referenced_type" : "type-2692"
     },
     {
      "referenced_type" : "type-8"
@@ -14283,7 +14286,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2689"
+     "referenced_type" : "type-2692"
     },
     {
      "referenced_type" : "type-8"
@@ -14306,7 +14309,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2689"
+     "referenced_type" : "type-2692"
     },
     {
      "referenced_type" : "type-8"
@@ -14329,7 +14332,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2689"
+     "referenced_type" : "type-2692"
     },
     {
      "referenced_type" : "type-8"
@@ -14366,7 +14369,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-4500"
+     "referenced_type" : "type-4506"
     }
    ],
    "return_type" : "type-50",
@@ -14380,8 +14383,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem &",
    "name" : "android::BufferItem &",
-   "referenced_type" : "type-1224",
-   "self_type" : "type-1223",
+   "referenced_type" : "type-1227",
+   "self_type" : "type-1226",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14389,8 +14392,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem &",
    "name" : "android::BufferItem &",
-   "referenced_type" : "type-3796",
-   "self_type" : "type-3795",
+   "referenced_type" : "type-3802",
+   "self_type" : "type-3801",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14398,8 +14401,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem &",
    "name" : "android::BufferItem &",
-   "referenced_type" : "type-5857",
-   "self_type" : "type-5856",
+   "referenced_type" : "type-5877",
+   "self_type" : "type-5876",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14407,8 +14410,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem &",
    "name" : "android::BufferItem &",
-   "referenced_type" : "type-6402",
-   "self_type" : "type-6401",
+   "referenced_type" : "type-6425",
+   "self_type" : "type-6424",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14416,8 +14419,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *&",
    "name" : "android::BufferItem *&",
-   "referenced_type" : "type-1669",
-   "self_type" : "type-1853",
+   "referenced_type" : "type-1673",
+   "self_type" : "type-1857",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -14425,8 +14428,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *&",
    "name" : "android::BufferItem *&",
-   "referenced_type" : "type-4124",
-   "self_type" : "type-4132",
+   "referenced_type" : "type-4130",
+   "self_type" : "type-4138",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -14434,8 +14437,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *&",
    "name" : "android::BufferItem *&",
-   "referenced_type" : "type-6695",
-   "self_type" : "type-6709",
+   "referenced_type" : "type-6719",
+   "self_type" : "type-6733",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -14443,8 +14446,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::CompositorTiming &",
    "name" : "android::CompositorTiming &",
-   "referenced_type" : "type-1431",
-   "self_type" : "type-1430",
+   "referenced_type" : "type-1434",
+   "self_type" : "type-1433",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14452,8 +14455,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::CompositorTiming &",
    "name" : "android::CompositorTiming &",
-   "referenced_type" : "type-3961",
-   "self_type" : "type-3960",
+   "referenced_type" : "type-3967",
+   "self_type" : "type-3966",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14461,8 +14464,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::CompositorTiming &",
    "name" : "android::CompositorTiming &",
-   "referenced_type" : "type-6538",
-   "self_type" : "type-6537",
+   "referenced_type" : "type-6561",
+   "self_type" : "type-6560",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14470,8 +14473,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-2528",
-   "self_type" : "type-2527",
+   "referenced_type" : "type-2531",
+   "self_type" : "type-2530",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14479,8 +14482,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-4415",
-   "self_type" : "type-4414",
+   "referenced_type" : "type-4417",
+   "self_type" : "type-4416",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14488,8 +14491,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-4671",
-   "self_type" : "type-4670",
+   "referenced_type" : "type-4677",
+   "self_type" : "type-4676",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14497,8 +14500,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-4939",
-   "self_type" : "type-4938",
+   "referenced_type" : "type-4945",
+   "self_type" : "type-4944",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14506,8 +14509,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-5999",
-   "self_type" : "type-5998",
+   "referenced_type" : "type-6019",
+   "self_type" : "type-6018",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14515,8 +14518,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-7004",
-   "self_type" : "type-7003",
+   "referenced_type" : "type-7024",
+   "self_type" : "type-7023",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14524,8 +14527,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-7186",
-   "self_type" : "type-7185",
+   "referenced_type" : "type-7209",
+   "self_type" : "type-7208",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14533,8 +14536,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-7298",
-   "self_type" : "type-7297",
+   "referenced_type" : "type-7321",
+   "self_type" : "type-7320",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14542,8 +14545,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot::State &",
    "name" : "android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-4585",
-   "self_type" : "type-4584",
+   "referenced_type" : "type-4591",
+   "self_type" : "type-4590",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14551,8 +14554,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot::State &",
    "name" : "android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-7206",
-   "self_type" : "type-7205",
+   "referenced_type" : "type-7231",
+   "self_type" : "type-7230",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14561,7 +14564,7 @@
    "linker_set_key" : "android::Flattenable<android::BufferItem> &",
    "name" : "android::Flattenable<android::BufferItem> &",
    "referenced_type" : "type-21",
-   "self_type" : "type-1514",
+   "self_type" : "type-1518",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14570,7 +14573,7 @@
    "linker_set_key" : "android::Flattenable<android::Fence> &",
    "name" : "android::Flattenable<android::Fence> &",
    "referenced_type" : "type-16",
-   "self_type" : "type-1651",
+   "self_type" : "type-1655",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14579,7 +14582,7 @@
    "linker_set_key" : "android::Flattenable<android::FrameEventHistoryDelta> &",
    "name" : "android::Flattenable<android::FrameEventHistoryDelta> &",
    "referenced_type" : "type-25",
-   "self_type" : "type-4324",
+   "self_type" : "type-4330",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14588,7 +14591,7 @@
    "linker_set_key" : "android::Flattenable<android::GraphicBuffer> &",
    "name" : "android::Flattenable<android::GraphicBuffer> &",
    "referenced_type" : "type-14",
-   "self_type" : "type-1650",
+   "self_type" : "type-1654",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14597,7 +14600,7 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> &",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> &",
    "referenced_type" : "type-32",
-   "self_type" : "type-4326",
+   "self_type" : "type-4333",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14606,7 +14609,7 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> &",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> &",
    "referenced_type" : "type-34",
-   "self_type" : "type-4325",
+   "self_type" : "type-4332",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14614,8 +14617,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-2391",
-   "self_type" : "type-2390",
+   "referenced_type" : "type-2394",
+   "self_type" : "type-2393",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14623,8 +14626,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-4217",
-   "self_type" : "type-4216",
+   "referenced_type" : "type-4223",
+   "self_type" : "type-4222",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14632,8 +14635,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-4678",
-   "self_type" : "type-4677",
+   "referenced_type" : "type-4685",
+   "self_type" : "type-4684",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14641,8 +14644,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-4769",
-   "self_type" : "type-4768",
+   "referenced_type" : "type-4775",
+   "self_type" : "type-4774",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14650,8 +14653,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-5973",
-   "self_type" : "type-5972",
+   "referenced_type" : "type-5993",
+   "self_type" : "type-5992",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14659,8 +14662,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-6797",
-   "self_type" : "type-6796",
+   "referenced_type" : "type-6820",
+   "self_type" : "type-6819",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14668,8 +14671,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-6818",
-   "self_type" : "type-6817",
+   "referenced_type" : "type-6842",
+   "self_type" : "type-6841",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14677,8 +14680,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-7305",
-   "self_type" : "type-7304",
+   "referenced_type" : "type-7328",
+   "self_type" : "type-7327",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14686,8 +14689,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1086",
-   "self_type" : "type-1085",
+   "referenced_type" : "type-1089",
+   "self_type" : "type-1088",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14695,8 +14698,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1268",
-   "self_type" : "type-1267",
+   "referenced_type" : "type-1271",
+   "self_type" : "type-1270",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14704,8 +14707,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1410",
-   "self_type" : "type-1409",
+   "referenced_type" : "type-1413",
+   "self_type" : "type-1412",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14713,8 +14716,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-1446",
-   "self_type" : "type-1445",
+   "referenced_type" : "type-1449",
+   "self_type" : "type-1448",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14722,8 +14725,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-2172",
-   "self_type" : "type-2171",
+   "referenced_type" : "type-2176",
+   "self_type" : "type-2175",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14731,8 +14734,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3250",
-   "self_type" : "type-3249",
+   "referenced_type" : "type-3253",
+   "self_type" : "type-3252",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14749,8 +14752,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3463",
-   "self_type" : "type-3462",
+   "referenced_type" : "type-3466",
+   "self_type" : "type-3465",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14758,8 +14761,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3528",
-   "self_type" : "type-3527",
+   "referenced_type" : "type-3531",
+   "self_type" : "type-3530",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14767,8 +14770,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3639",
-   "self_type" : "type-3638",
+   "referenced_type" : "type-3642",
+   "self_type" : "type-3641",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14776,8 +14779,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3696",
-   "self_type" : "type-3695",
+   "referenced_type" : "type-3702",
+   "self_type" : "type-3701",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14785,8 +14788,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3821",
-   "self_type" : "type-3820",
+   "referenced_type" : "type-3827",
+   "self_type" : "type-3826",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14794,8 +14797,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3937",
-   "self_type" : "type-3936",
+   "referenced_type" : "type-3943",
+   "self_type" : "type-3942",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14803,8 +14806,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3978",
-   "self_type" : "type-3977",
+   "referenced_type" : "type-3985",
+   "self_type" : "type-3984",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14812,8 +14815,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-4207",
-   "self_type" : "type-4206",
+   "referenced_type" : "type-4214",
+   "self_type" : "type-4213",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14821,8 +14824,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-4386",
-   "self_type" : "type-4385",
+   "referenced_type" : "type-4392",
+   "self_type" : "type-4391",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14830,8 +14833,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-4597",
-   "self_type" : "type-4596",
+   "referenced_type" : "type-4604",
+   "self_type" : "type-4603",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14839,8 +14842,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-4764",
-   "self_type" : "type-4763",
+   "referenced_type" : "type-4771",
+   "self_type" : "type-4770",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14848,8 +14851,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5080",
-   "self_type" : "type-5079",
+   "referenced_type" : "type-5096",
+   "self_type" : "type-5095",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14857,8 +14860,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5148",
-   "self_type" : "type-5147",
+   "referenced_type" : "type-5164",
+   "self_type" : "type-5163",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14866,8 +14869,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5311",
-   "self_type" : "type-5310",
+   "referenced_type" : "type-5328",
+   "self_type" : "type-5327",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14875,8 +14878,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5524",
-   "self_type" : "type-5523",
+   "referenced_type" : "type-5541",
+   "self_type" : "type-5540",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14884,8 +14887,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5589",
-   "self_type" : "type-5588",
+   "referenced_type" : "type-5606",
+   "self_type" : "type-5605",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14893,8 +14896,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5700",
-   "self_type" : "type-5699",
+   "referenced_type" : "type-5717",
+   "self_type" : "type-5716",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14902,8 +14905,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5757",
-   "self_type" : "type-5756",
+   "referenced_type" : "type-5777",
+   "self_type" : "type-5776",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14911,8 +14914,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5882",
-   "self_type" : "type-5881",
+   "referenced_type" : "type-5902",
+   "self_type" : "type-5901",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14920,8 +14923,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6042",
-   "self_type" : "type-6041",
+   "referenced_type" : "type-6062",
+   "self_type" : "type-6061",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14929,8 +14932,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6125",
-   "self_type" : "type-6124",
+   "referenced_type" : "type-6145",
+   "self_type" : "type-6144",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14938,8 +14941,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6177",
-   "self_type" : "type-6176",
+   "referenced_type" : "type-6197",
+   "self_type" : "type-6196",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14947,8 +14950,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6271",
-   "self_type" : "type-6270",
+   "referenced_type" : "type-6291",
+   "self_type" : "type-6290",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14956,8 +14959,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6315",
-   "self_type" : "type-6314",
+   "referenced_type" : "type-6338",
+   "self_type" : "type-6337",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14965,8 +14968,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6410",
-   "self_type" : "type-6409",
+   "referenced_type" : "type-6434",
+   "self_type" : "type-6433",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14974,8 +14977,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6516",
-   "self_type" : "type-6515",
+   "referenced_type" : "type-6539",
+   "self_type" : "type-6538",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14983,8 +14986,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6553",
-   "self_type" : "type-6552",
+   "referenced_type" : "type-6576",
+   "self_type" : "type-6575",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14992,8 +14995,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6799",
-   "self_type" : "type-6798",
+   "referenced_type" : "type-6822",
+   "self_type" : "type-6821",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15001,8 +15004,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6971",
-   "self_type" : "type-6970",
+   "referenced_type" : "type-6995",
+   "self_type" : "type-6994",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15010,8 +15013,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-7222",
-   "self_type" : "type-7221",
+   "referenced_type" : "type-7245",
+   "self_type" : "type-7244",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15019,8 +15022,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-7361",
-   "self_type" : "type-7360",
+   "referenced_type" : "type-7384",
+   "self_type" : "type-7383",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15037,8 +15040,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-7585",
-   "self_type" : "type-7584",
+   "referenced_type" : "type-7608",
+   "self_type" : "type-7607",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15127,8 +15130,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-3472",
-   "self_type" : "type-3471",
+   "referenced_type" : "type-3475",
+   "self_type" : "type-3474",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15136,8 +15139,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-4303",
-   "self_type" : "type-4302",
+   "referenced_type" : "type-4309",
+   "self_type" : "type-4308",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15145,8 +15148,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-4755",
-   "self_type" : "type-4754",
+   "referenced_type" : "type-4761",
+   "self_type" : "type-4760",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15154,8 +15157,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-5533",
-   "self_type" : "type-5532",
+   "referenced_type" : "type-5550",
+   "self_type" : "type-5549",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15163,8 +15166,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-6133",
-   "self_type" : "type-6132",
+   "referenced_type" : "type-6153",
+   "self_type" : "type-6152",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15172,8 +15175,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-6894",
-   "self_type" : "type-6893",
+   "referenced_type" : "type-6917",
+   "self_type" : "type-6916",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15181,8 +15184,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-7354",
-   "self_type" : "type-7353",
+   "referenced_type" : "type-7377",
+   "self_type" : "type-7376",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15199,8 +15202,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
-   "referenced_type" : "type-1239",
-   "self_type" : "type-2660",
+   "referenced_type" : "type-1242",
+   "self_type" : "type-2663",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -15209,7 +15212,7 @@
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
    "referenced_type" : "type-121",
-   "self_type" : "type-2654",
+   "self_type" : "type-2657",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -15217,8 +15220,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 *&",
    "name" : "android::String8 *&",
-   "referenced_type" : "type-1885",
-   "self_type" : "type-1884",
+   "referenced_type" : "type-1889",
+   "self_type" : "type-1888",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -15226,8 +15229,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1101",
-   "self_type" : "type-1100",
+   "referenced_type" : "type-1104",
+   "self_type" : "type-1103",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15244,8 +15247,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1237",
-   "self_type" : "type-1236",
+   "referenced_type" : "type-1240",
+   "self_type" : "type-1239",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15253,8 +15256,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1365",
-   "self_type" : "type-1364",
+   "referenced_type" : "type-1368",
+   "self_type" : "type-1367",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15262,8 +15265,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1451",
-   "self_type" : "type-1450",
+   "referenced_type" : "type-1454",
+   "self_type" : "type-1453",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15271,8 +15274,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1524",
-   "self_type" : "type-1523",
+   "referenced_type" : "type-1529",
+   "self_type" : "type-1528",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15280,8 +15283,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1665",
-   "self_type" : "type-1664",
+   "referenced_type" : "type-1669",
+   "self_type" : "type-1668",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15289,8 +15292,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3168",
-   "self_type" : "type-3167",
+   "referenced_type" : "type-3171",
+   "self_type" : "type-3170",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15298,8 +15301,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3532",
-   "self_type" : "type-3531",
+   "referenced_type" : "type-3535",
+   "self_type" : "type-3534",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15307,8 +15310,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3643",
-   "self_type" : "type-3642",
+   "referenced_type" : "type-3646",
+   "self_type" : "type-3645",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15316,8 +15319,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3705",
-   "self_type" : "type-3704",
+   "referenced_type" : "type-3711",
+   "self_type" : "type-3710",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15325,8 +15328,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3806",
-   "self_type" : "type-3805",
+   "referenced_type" : "type-3812",
+   "self_type" : "type-3811",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15334,8 +15337,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3911",
-   "self_type" : "type-3910",
+   "referenced_type" : "type-3918",
+   "self_type" : "type-3917",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15343,8 +15346,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3984",
-   "self_type" : "type-3983",
+   "referenced_type" : "type-3990",
+   "self_type" : "type-3989",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15352,8 +15355,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4036",
-   "self_type" : "type-4035",
+   "referenced_type" : "type-4042",
+   "self_type" : "type-4041",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15361,8 +15364,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4121",
-   "self_type" : "type-4120",
+   "referenced_type" : "type-4127",
+   "self_type" : "type-4126",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15370,8 +15373,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4345",
-   "self_type" : "type-4344",
+   "referenced_type" : "type-4351",
+   "self_type" : "type-4350",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15379,8 +15382,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4484",
-   "self_type" : "type-4483",
+   "referenced_type" : "type-4490",
+   "self_type" : "type-4489",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15388,8 +15391,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4531",
-   "self_type" : "type-4530",
+   "referenced_type" : "type-4537",
+   "self_type" : "type-4536",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15397,8 +15400,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4553",
-   "self_type" : "type-4552",
+   "referenced_type" : "type-4559",
+   "self_type" : "type-4558",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15406,8 +15409,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4592",
-   "self_type" : "type-4591",
+   "referenced_type" : "type-4599",
+   "self_type" : "type-4598",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15415,8 +15418,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4771",
-   "self_type" : "type-4770",
+   "referenced_type" : "type-4777",
+   "self_type" : "type-4776",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15424,8 +15427,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4858",
-   "self_type" : "type-4857",
+   "referenced_type" : "type-4864",
+   "self_type" : "type-4863",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15433,8 +15436,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5078",
-   "self_type" : "type-5077",
+   "referenced_type" : "type-5094",
+   "self_type" : "type-5093",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15442,8 +15445,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5118",
-   "self_type" : "type-5117",
+   "referenced_type" : "type-5134",
+   "self_type" : "type-5133",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15451,8 +15454,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5154",
-   "self_type" : "type-5153",
+   "referenced_type" : "type-5170",
+   "self_type" : "type-5169",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15460,8 +15463,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5229",
-   "self_type" : "type-5228",
+   "referenced_type" : "type-5246",
+   "self_type" : "type-5245",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15469,8 +15472,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5593",
-   "self_type" : "type-5592",
+   "referenced_type" : "type-5610",
+   "self_type" : "type-5609",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15478,8 +15481,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5704",
-   "self_type" : "type-5703",
+   "referenced_type" : "type-5721",
+   "self_type" : "type-5720",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15487,8 +15490,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5766",
-   "self_type" : "type-5765",
+   "referenced_type" : "type-5786",
+   "self_type" : "type-5785",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15496,8 +15499,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5867",
-   "self_type" : "type-5866",
+   "referenced_type" : "type-5887",
+   "self_type" : "type-5886",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15505,8 +15508,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6035",
-   "self_type" : "type-6034",
+   "referenced_type" : "type-6055",
+   "self_type" : "type-6054",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15514,8 +15517,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6181",
-   "self_type" : "type-6180",
+   "referenced_type" : "type-6201",
+   "self_type" : "type-6200",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15523,8 +15526,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6277",
-   "self_type" : "type-6276",
+   "referenced_type" : "type-6297",
+   "self_type" : "type-6296",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15532,8 +15535,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6321",
-   "self_type" : "type-6320",
+   "referenced_type" : "type-6344",
+   "self_type" : "type-6343",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15541,8 +15544,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6404",
-   "self_type" : "type-6403",
+   "referenced_type" : "type-6427",
+   "self_type" : "type-6426",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15550,8 +15553,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6490",
-   "self_type" : "type-6489",
+   "referenced_type" : "type-6513",
+   "self_type" : "type-6512",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15559,8 +15562,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6558",
-   "self_type" : "type-6557",
+   "referenced_type" : "type-6581",
+   "self_type" : "type-6580",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15568,8 +15571,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6610",
-   "self_type" : "type-6609",
+   "referenced_type" : "type-6635",
+   "self_type" : "type-6634",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15577,8 +15580,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6693",
-   "self_type" : "type-6692",
+   "referenced_type" : "type-6717",
+   "self_type" : "type-6716",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15586,8 +15589,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6927",
-   "self_type" : "type-6926",
+   "referenced_type" : "type-6951",
+   "self_type" : "type-6950",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15595,8 +15598,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7070",
-   "self_type" : "type-7069",
+   "referenced_type" : "type-7095",
+   "self_type" : "type-7094",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15604,8 +15607,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7129",
-   "self_type" : "type-7128",
+   "referenced_type" : "type-7153",
+   "self_type" : "type-7152",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15613,8 +15616,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7159",
-   "self_type" : "type-7158",
+   "referenced_type" : "type-7184",
+   "self_type" : "type-7183",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15622,8 +15625,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7215",
-   "self_type" : "type-7214",
+   "referenced_type" : "type-7241",
+   "self_type" : "type-7240",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15631,8 +15634,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7366",
-   "self_type" : "type-7365",
+   "referenced_type" : "type-7389",
+   "self_type" : "type-7388",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15640,8 +15643,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7444",
-   "self_type" : "type-7443",
+   "referenced_type" : "type-7468",
+   "self_type" : "type-7467",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15649,8 +15652,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7480",
-   "self_type" : "type-7479",
+   "referenced_type" : "type-7503",
+   "self_type" : "type-7502",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15658,8 +15661,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7582",
-   "self_type" : "type-7581",
+   "referenced_type" : "type-7606",
+   "self_type" : "type-7605",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15667,8 +15670,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7611",
-   "self_type" : "type-7610",
+   "referenced_type" : "type-7635",
+   "self_type" : "type-7634",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15703,8 +15706,8 @@
    "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",
+   "referenced_type" : "type-7528",
+   "self_type" : "type-7533",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15712,24 +15715,6 @@
    "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,
@@ -15737,8 +15722,8 @@
   },
   {
    "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> > &",
+   "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-4494",
    "self_type" : "type-4497",
    "size" : 4,
@@ -15746,10 +15731,28 @@
   },
   {
    "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-4371",
+   "self_type" : "type-4374",
+   "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-4500",
+   "self_type" : "type-4503",
+   "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-4356",
+   "referenced_type" : "type-4359",
+   "self_type" : "type-4362",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15766,8 +15769,8 @@
    "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",
+   "referenced_type" : "type-7534",
+   "self_type" : "type-7537",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15793,8 +15796,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1383",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1386",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -15802,8 +15805,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-3921",
-   "self_type" : "type-3920",
+   "referenced_type" : "type-3927",
+   "self_type" : "type-3926",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -15811,8 +15814,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-6499",
-   "self_type" : "type-6498",
+   "referenced_type" : "type-6523",
+   "self_type" : "type-6522",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -15830,7 +15833,7 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> > &",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> > &",
    "referenced_type" : "type-381",
-   "self_type" : "type-7622",
+   "self_type" : "type-7646",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15839,7 +15842,7 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect> &",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect> &",
    "referenced_type" : "type-372",
-   "self_type" : "type-4594",
+   "self_type" : "type-4600",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15848,7 +15851,7 @@
    "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-4347",
+   "self_type" : "type-4353",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15857,7 +15860,7 @@
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming &",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming &",
    "referenced_type" : "type-588",
-   "self_type" : "type-4586",
+   "self_type" : "type-4592",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15866,7 +15869,7 @@
    "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-4590",
+   "self_type" : "type-4597",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15875,7 +15878,7 @@
    "linker_set_key" : "android::hardware::hidl_array<int, 4> &",
    "name" : "android::hardware::hidl_array<int, 4> &",
    "referenced_type" : "type-384",
-   "self_type" : "type-7623",
+   "self_type" : "type-5171",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15893,7 +15896,7 @@
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> &",
    "name" : "android::hardware::hidl_vec<unsigned char> &",
    "referenced_type" : "type-452",
-   "self_type" : "type-4379",
+   "self_type" : "type-4385",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15902,7 +15905,7 @@
    "linker_set_key" : "android::hardware::media::V1_0::Rect &",
    "name" : "android::hardware::media::V1_0::Rect &",
    "referenced_type" : "type-375",
-   "self_type" : "type-4598",
+   "self_type" : "type-4605",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15911,7 +15914,7 @@
    "linker_set_key" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > &",
    "name" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > &",
    "referenced_type" : "type-160",
-   "self_type" : "type-2642",
+   "self_type" : "type-2645",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15920,7 +15923,7 @@
    "linker_set_key" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > &",
    "name" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > &",
    "referenced_type" : "type-147",
-   "self_type" : "type-2638",
+   "self_type" : "type-2641",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15929,7 +15932,7 @@
    "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int> &",
    "name" : "android::key_value_pair_t<unsigned int, unsigned int> &",
    "referenced_type" : "type-143",
-   "self_type" : "type-2637",
+   "self_type" : "type-2640",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15938,7 +15941,7 @@
    "linker_set_key" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > &",
    "name" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > &",
    "referenced_type" : "type-581",
-   "self_type" : "type-2512",
+   "self_type" : "type-2515",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15947,7 +15950,7 @@
    "linker_set_key" : "android::sp<android::ALooper> &",
    "name" : "android::sp<android::ALooper> &",
    "referenced_type" : "type-321",
-   "self_type" : "type-2266",
+   "self_type" : "type-2269",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15956,7 +15959,7 @@
    "linker_set_key" : "android::sp<android::AMessage> &",
    "name" : "android::sp<android::AMessage> &",
    "referenced_type" : "type-259",
-   "self_type" : "type-2077",
+   "self_type" : "type-2068",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15965,7 +15968,7 @@
    "linker_set_key" : "android::sp<android::ComponentWrapper> &",
    "name" : "android::sp<android::ComponentWrapper> &",
    "referenced_type" : "type-567",
-   "self_type" : "type-2490",
+   "self_type" : "type-2493",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15973,8 +15976,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::Fence> &",
    "name" : "android::sp<android::Fence> &",
-   "referenced_type" : "type-1864",
-   "self_type" : "type-2525",
+   "referenced_type" : "type-1868",
+   "self_type" : "type-2528",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15983,7 +15986,7 @@
    "linker_set_key" : "android::sp<android::FrameDropper> &",
    "name" : "android::sp<android::FrameDropper> &",
    "referenced_type" : "type-578",
-   "self_type" : "type-2505",
+   "self_type" : "type-2508",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16001,7 +16004,7 @@
    "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy> &",
    "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy> &",
    "referenced_type" : "type-473",
-   "self_type" : "type-2497",
+   "self_type" : "type-2500",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16009,8 +16012,8 @@
    "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",
+   "referenced_type" : "type-4265",
+   "self_type" : "type-4268",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16018,8 +16021,8 @@
    "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",
+   "referenced_type" : "type-4274",
+   "self_type" : "type-4277",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16027,8 +16030,8 @@
    "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",
+   "referenced_type" : "type-4833",
+   "self_type" : "type-4844",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16036,8 +16039,8 @@
    "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",
+   "referenced_type" : "type-5112",
+   "self_type" : "type-5119",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16090,8 +16093,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::NativeHandle> *&",
    "name" : "android::sp<android::NativeHandle> *&",
-   "referenced_type" : "type-1880",
-   "self_type" : "type-1879",
+   "referenced_type" : "type-1884",
+   "self_type" : "type-1883",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16099,8 +16102,8 @@
    "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",
+   "referenced_type" : "type-2473",
+   "self_type" : "type-7658",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16118,7 +16121,7 @@
    "linker_set_key" : "android::wp<android::IBinder::DeathRecipient> &",
    "name" : "android::wp<android::IBinder::DeathRecipient> &",
    "referenced_type" : "type-172",
-   "self_type" : "type-4304",
+   "self_type" : "type-4310",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16127,7 +16130,7 @@
    "linker_set_key" : "android_cta861_3_metadata &",
    "name" : "android_cta861_3_metadata &",
    "referenced_type" : "type-305",
-   "self_type" : "type-1476",
+   "self_type" : "type-1480",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16145,7 +16148,7 @@
    "linker_set_key" : "android_smpte2086_metadata &",
    "name" : "android_smpte2086_metadata &",
    "referenced_type" : "type-304",
-   "self_type" : "type-1475",
+   "self_type" : "type-1479",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16162,8 +16165,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AString &",
    "name" : "const android::AString &",
-   "referenced_type" : "type-2110",
-   "self_type" : "type-2241",
+   "referenced_type" : "type-2101",
+   "self_type" : "type-2244",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -16171,8 +16174,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-1219",
-   "self_type" : "type-1222",
+   "referenced_type" : "type-1223",
+   "self_type" : "type-1225",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16180,8 +16183,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-1530",
-   "self_type" : "type-1532",
+   "referenced_type" : "type-1533",
+   "self_type" : "type-1535",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16189,8 +16192,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-1671",
-   "self_type" : "type-1673",
+   "referenced_type" : "type-1675",
+   "self_type" : "type-1677",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16198,8 +16201,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-3441",
-   "self_type" : "type-3443",
+   "referenced_type" : "type-3444",
+   "self_type" : "type-3446",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -16207,8 +16210,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-3633",
-   "self_type" : "type-3637",
+   "referenced_type" : "type-3636",
+   "self_type" : "type-3640",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16216,8 +16219,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-3791",
-   "self_type" : "type-3794",
+   "referenced_type" : "type-3798",
+   "self_type" : "type-3800",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16225,8 +16228,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-4040",
-   "self_type" : "type-4043",
+   "referenced_type" : "type-4047",
+   "self_type" : "type-4049",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16234,8 +16237,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-4126",
-   "self_type" : "type-4128",
+   "referenced_type" : "type-4132",
+   "self_type" : "type-4134",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16243,8 +16246,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-5502",
-   "self_type" : "type-5504",
+   "referenced_type" : "type-5519",
+   "self_type" : "type-5521",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -16252,8 +16255,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-5694",
-   "self_type" : "type-5698",
+   "referenced_type" : "type-5711",
+   "self_type" : "type-5715",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16261,8 +16264,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-5852",
-   "self_type" : "type-5855",
+   "referenced_type" : "type-5873",
+   "self_type" : "type-5875",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16270,8 +16273,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-6106",
-   "self_type" : "type-6108",
+   "referenced_type" : "type-6126",
+   "self_type" : "type-6128",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -16279,8 +16282,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-6265",
-   "self_type" : "type-6269",
+   "referenced_type" : "type-6285",
+   "self_type" : "type-6289",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16288,8 +16291,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-6398",
-   "self_type" : "type-6400",
+   "referenced_type" : "type-6421",
+   "self_type" : "type-6423",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16297,8 +16300,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-6616",
-   "self_type" : "type-6618",
+   "referenced_type" : "type-6639",
+   "self_type" : "type-6641",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16306,8 +16309,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-6698",
-   "self_type" : "type-6700",
+   "referenced_type" : "type-6721",
+   "self_type" : "type-6723",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16333,8 +16336,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::CompositorTiming &",
    "name" : "const android::CompositorTiming &",
-   "referenced_type" : "type-1424",
-   "self_type" : "type-1426",
+   "referenced_type" : "type-1427",
+   "self_type" : "type-1429",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16342,8 +16345,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::CompositorTiming &",
    "name" : "const android::CompositorTiming &",
-   "referenced_type" : "type-3952",
-   "self_type" : "type-3954",
+   "referenced_type" : "type-3960",
+   "self_type" : "type-3962",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16351,8 +16354,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::CompositorTiming &",
    "name" : "const android::CompositorTiming &",
-   "referenced_type" : "type-6531",
-   "self_type" : "type-6533",
+   "referenced_type" : "type-6554",
+   "self_type" : "type-6556",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16360,8 +16363,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-4579",
-   "self_type" : "type-4581",
+   "referenced_type" : "type-4585",
+   "self_type" : "type-4587",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16369,8 +16372,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-4747",
-   "self_type" : "type-4749",
+   "referenced_type" : "type-4754",
+   "self_type" : "type-4756",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16378,8 +16381,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-7200",
-   "self_type" : "type-7202",
+   "referenced_type" : "type-7225",
+   "self_type" : "type-7227",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16387,8 +16390,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-7348",
-   "self_type" : "type-7350",
+   "referenced_type" : "type-7371",
+   "self_type" : "type-7373",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16396,8 +16399,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Flattenable<android::BufferItem> &",
    "name" : "const android::Flattenable<android::BufferItem> &",
-   "referenced_type" : "type-1506",
-   "self_type" : "type-1512",
+   "referenced_type" : "type-1509",
+   "self_type" : "type-1516",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16405,8 +16408,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Flattenable<android::Fence> &",
    "name" : "const android::Flattenable<android::Fence> &",
-   "referenced_type" : "type-1634",
-   "self_type" : "type-1647",
+   "referenced_type" : "type-1638",
+   "self_type" : "type-1650",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16414,8 +16417,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Flattenable<android::FrameEventHistoryDelta> &",
    "name" : "const android::Flattenable<android::FrameEventHistoryDelta> &",
-   "referenced_type" : "type-4306",
-   "self_type" : "type-4322",
+   "referenced_type" : "type-4312",
+   "self_type" : "type-4328",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16423,8 +16426,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Flattenable<android::GraphicBuffer> &",
    "name" : "const android::Flattenable<android::GraphicBuffer> &",
-   "referenced_type" : "type-1638",
-   "self_type" : "type-1646",
+   "referenced_type" : "type-1643",
+   "self_type" : "type-1649",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16432,8 +16435,8 @@
    "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",
+   "referenced_type" : "type-4315",
+   "self_type" : "type-4327",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16441,8 +16444,8 @@
    "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",
+   "referenced_type" : "type-4318",
+   "self_type" : "type-4329",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16504,8 +16507,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel &",
    "name" : "const android::Parcel &",
-   "referenced_type" : "type-4533",
-   "self_type" : "type-4532",
+   "referenced_type" : "type-4539",
+   "self_type" : "type-4538",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16513,8 +16516,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel &",
    "name" : "const android::Parcel &",
-   "referenced_type" : "type-7132",
-   "self_type" : "type-7131",
+   "referenced_type" : "type-7155",
+   "self_type" : "type-7154",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16531,8 +16534,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-1215",
-   "self_type" : "type-1217",
+   "referenced_type" : "type-1218",
+   "self_type" : "type-1220",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16540,8 +16543,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-1490",
-   "self_type" : "type-1492",
+   "referenced_type" : "type-1493",
+   "self_type" : "type-1496",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16549,8 +16552,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-1621",
-   "self_type" : "type-1623",
+   "referenced_type" : "type-1624",
+   "self_type" : "type-1626",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16558,8 +16561,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-2683",
-   "self_type" : "type-2685",
+   "referenced_type" : "type-2686",
+   "self_type" : "type-2688",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16567,8 +16570,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-3466",
-   "self_type" : "type-3468",
+   "referenced_type" : "type-3469",
+   "self_type" : "type-3471",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16576,8 +16579,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-3787",
-   "self_type" : "type-3789",
+   "referenced_type" : "type-3793",
+   "self_type" : "type-3795",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16585,8 +16588,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-4011",
-   "self_type" : "type-4013",
+   "referenced_type" : "type-4017",
+   "self_type" : "type-4019",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16594,8 +16597,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-4090",
-   "self_type" : "type-4092",
+   "referenced_type" : "type-4096",
+   "self_type" : "type-4098",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16603,8 +16606,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-4292",
-   "self_type" : "type-4294",
+   "referenced_type" : "type-4298",
+   "self_type" : "type-4300",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16612,8 +16615,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-4572",
-   "self_type" : "type-4574",
+   "referenced_type" : "type-4578",
+   "self_type" : "type-4580",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16621,8 +16624,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-4736",
-   "self_type" : "type-4738",
+   "referenced_type" : "type-4743",
+   "self_type" : "type-4745",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16630,8 +16633,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-5019",
-   "self_type" : "type-5021",
+   "referenced_type" : "type-5025",
+   "self_type" : "type-5027",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16639,8 +16642,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-5063",
-   "self_type" : "type-5065",
+   "referenced_type" : "type-5080",
+   "self_type" : "type-5083",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16648,8 +16651,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-5527",
-   "self_type" : "type-5529",
+   "referenced_type" : "type-5544",
+   "self_type" : "type-5546",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16657,8 +16660,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-5848",
-   "self_type" : "type-5850",
+   "referenced_type" : "type-5868",
+   "self_type" : "type-5870",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16666,8 +16669,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-6030",
-   "self_type" : "type-6032",
+   "referenced_type" : "type-6050",
+   "self_type" : "type-6052",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16675,8 +16678,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-6129",
-   "self_type" : "type-6131",
+   "referenced_type" : "type-6149",
+   "self_type" : "type-6151",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16684,8 +16687,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-6394",
-   "self_type" : "type-6396",
+   "referenced_type" : "type-6417",
+   "self_type" : "type-6419",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16693,8 +16696,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-6584",
-   "self_type" : "type-6586",
+   "referenced_type" : "type-6608",
+   "self_type" : "type-6610",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16702,8 +16705,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-6663",
-   "self_type" : "type-6665",
+   "referenced_type" : "type-6686",
+   "self_type" : "type-6688",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16711,8 +16714,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-6881",
-   "self_type" : "type-6884",
+   "referenced_type" : "type-6905",
+   "self_type" : "type-6907",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16720,8 +16723,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-7192",
-   "self_type" : "type-7194",
+   "referenced_type" : "type-7216",
+   "self_type" : "type-7218",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16729,8 +16732,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-7339",
-   "self_type" : "type-7341",
+   "referenced_type" : "type-7362",
+   "self_type" : "type-7364",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16738,8 +16741,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-7565",
-   "self_type" : "type-7567",
+   "referenced_type" : "type-7588",
+   "self_type" : "type-7590",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16756,8 +16759,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-7666",
-   "self_type" : "type-7669",
+   "referenced_type" : "type-7685",
+   "self_type" : "type-7691",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16765,8 +16768,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SafeInterface::ParcelHandler &",
    "name" : "const android::SafeInterface::ParcelHandler &",
-   "referenced_type" : "type-1256",
-   "self_type" : "type-1675",
+   "referenced_type" : "type-1254",
+   "self_type" : "type-1680",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16774,8 +16777,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-1248",
-   "self_type" : "type-1247",
+   "referenced_type" : "type-1251",
+   "self_type" : "type-1250",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -16783,8 +16786,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 &",
    "name" : "const android::String8 &",
-   "referenced_type" : "type-1875",
-   "self_type" : "type-1874",
+   "referenced_type" : "type-1879",
+   "self_type" : "type-1878",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -16801,8 +16804,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-1385",
-   "self_type" : "type-1386",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1389",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16837,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-4348",
-   "self_type" : "type-4570",
+   "referenced_type" : "type-4354",
+   "self_type" : "type-4576",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16846,8 +16849,8 @@
    "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-4582",
-   "self_type" : "type-4583",
+   "referenced_type" : "type-4588",
+   "self_type" : "type-4589",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16954,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-2619",
-   "self_type" : "type-2620",
+   "referenced_type" : "type-2622",
+   "self_type" : "type-2623",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16963,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-2617",
-   "self_type" : "type-2618",
+   "referenced_type" : "type-2620",
+   "self_type" : "type-2621",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16972,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-2613",
-   "self_type" : "type-2614",
+   "referenced_type" : "type-2616",
+   "self_type" : "type-2617",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16981,8 +16984,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-2409",
-   "self_type" : "type-2408",
+   "referenced_type" : "type-2412",
+   "self_type" : "type-2411",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -16990,8 +16993,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-4845",
-   "self_type" : "type-4844",
+   "referenced_type" : "type-4851",
+   "self_type" : "type-4850",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -16999,8 +17002,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-5978",
-   "self_type" : "type-5980",
+   "referenced_type" : "type-5998",
+   "self_type" : "type-6000",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -17008,8 +17011,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-6813",
-   "self_type" : "type-6812",
+   "referenced_type" : "type-6836",
+   "self_type" : "type-6835",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -17017,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-1304",
-   "self_type" : "type-1486",
+   "referenced_type" : "type-1301",
+   "self_type" : "type-1489",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17035,8 +17038,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::AMessage> &",
    "name" : "const android::sp<android::AMessage> &",
-   "referenced_type" : "type-2175",
-   "self_type" : "type-2190",
+   "referenced_type" : "type-2174",
+   "self_type" : "type-2193",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17044,8 +17047,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::BpGraphicBufferProducer> &",
    "name" : "const android::sp<android::BpGraphicBufferProducer> &",
-   "referenced_type" : "type-4227",
-   "self_type" : "type-4232",
+   "referenced_type" : "type-4233",
+   "self_type" : "type-4238",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17053,8 +17056,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::BpProducerListener> &",
    "name" : "const android::sp<android::BpProducerListener> &",
-   "referenced_type" : "type-4516",
-   "self_type" : "type-4517",
+   "referenced_type" : "type-4522",
+   "self_type" : "type-4523",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17071,8 +17074,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::ComponentWrapper> &",
    "name" : "const android::sp<android::ComponentWrapper> &",
-   "referenced_type" : "type-2491",
-   "self_type" : "type-2492",
+   "referenced_type" : "type-2494",
+   "self_type" : "type-2495",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17080,8 +17083,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::Fence> &",
    "name" : "const android::sp<android::Fence> &",
-   "referenced_type" : "type-1863",
-   "self_type" : "type-1862",
+   "referenced_type" : "type-1867",
+   "self_type" : "type-1866",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17089,8 +17092,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::GraphicBuffer> &",
    "name" : "const android::sp<android::GraphicBuffer> &",
-   "referenced_type" : "type-1196",
-   "self_type" : "type-1859",
+   "referenced_type" : "type-1200",
+   "self_type" : "type-1864",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17107,8 +17110,8 @@
    "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",
+   "referenced_type" : "type-4270",
+   "self_type" : "type-4396",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17116,8 +17119,8 @@
    "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",
+   "referenced_type" : "type-4279",
+   "self_type" : "type-4397",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17125,8 +17128,8 @@
    "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",
+   "referenced_type" : "type-4832",
+   "self_type" : "type-4837",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17134,8 +17137,8 @@
    "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",
+   "referenced_type" : "type-5111",
+   "self_type" : "type-5116",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17143,8 +17146,8 @@
    "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",
+   "referenced_type" : "type-4306",
+   "self_type" : "type-4307",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17152,8 +17155,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IBinder> &",
    "name" : "const android::sp<android::IBinder> &",
-   "referenced_type" : "type-1036",
-   "self_type" : "type-1037",
+   "referenced_type" : "type-1040",
+   "self_type" : "type-1041",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17179,8 +17182,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer> &",
    "name" : "const android::sp<android::IGraphicBufferProducer> &",
-   "referenced_type" : "type-2485",
-   "self_type" : "type-2486",
+   "referenced_type" : "type-2488",
+   "self_type" : "type-2489",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17197,8 +17200,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::ITransactionCompletedListener> &",
    "name" : "const android::sp<android::ITransactionCompletedListener> &",
-   "referenced_type" : "type-1046",
-   "self_type" : "type-1047",
+   "referenced_type" : "type-1049",
+   "self_type" : "type-1050",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17215,8 +17218,8 @@
    "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",
+   "referenced_type" : "type-1392",
+   "self_type" : "type-1391",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -17224,8 +17227,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-2468",
-   "self_type" : "type-4222",
+   "referenced_type" : "type-2471",
+   "self_type" : "type-4228",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17233,8 +17236,8 @@
    "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-2458",
-   "self_type" : "type-4510",
+   "referenced_type" : "type-2461",
+   "self_type" : "type-4516",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17242,8 +17245,8 @@
    "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",
+   "referenced_type" : "type-4245",
+   "self_type" : "type-4250",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17251,8 +17254,8 @@
    "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",
+   "referenced_type" : "type-4476",
+   "self_type" : "type-4525",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17260,8 +17263,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-2482",
-   "self_type" : "type-4223",
+   "referenced_type" : "type-2485",
+   "self_type" : "type-4229",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17269,8 +17272,8 @@
    "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",
+   "referenced_type" : "type-2477",
+   "self_type" : "type-4519",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17278,8 +17281,8 @@
    "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",
+   "referenced_type" : "type-4239",
+   "self_type" : "type-4244",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17287,8 +17290,8 @@
    "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",
+   "referenced_type" : "type-4469",
+   "self_type" : "type-4524",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17332,8 +17335,8 @@
    "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",
+   "referenced_type" : "type-4296",
+   "self_type" : "type-4301",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17341,8 +17344,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::IBinder> &",
    "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "type-4280",
-   "self_type" : "type-4281",
+   "referenced_type" : "type-4286",
+   "self_type" : "type-4287",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17350,8 +17353,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android_cta861_3_metadata &",
    "name" : "const android_cta861_3_metadata &",
-   "referenced_type" : "type-1473",
-   "self_type" : "type-1474",
+   "referenced_type" : "type-1477",
+   "self_type" : "type-1478",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17368,8 +17371,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android_smpte2086_metadata &",
    "name" : "const android_smpte2086_metadata &",
-   "referenced_type" : "type-1471",
-   "self_type" : "type-1472",
+   "referenced_type" : "type-1474",
+   "self_type" : "type-1476",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17386,8 +17389,8 @@
    "alignment" : 4,
    "linker_set_key" : "const double &",
    "name" : "const double &",
-   "referenced_type" : "type-1077",
-   "self_type" : "type-1124",
+   "referenced_type" : "type-1080",
+   "self_type" : "type-1123",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17414,7 +17417,7 @@
    "linker_set_key" : "const int *&",
    "name" : "const int *&",
    "referenced_type" : "type-479",
-   "self_type" : "type-1511",
+   "self_type" : "type-1514",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17428,57 +17431,57 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1109",
-   "self_type" : "type-1111",
+   "referenced_type" : "type-1112",
+   "self_type" : "type-1114",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1281",
-   "self_type" : "type-1283",
+   "referenced_type" : "type-1284",
+   "self_type" : "type-1286",
    "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",
+   "referenced_type" : "type-3309",
+   "self_type" : "type-3311",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3538",
-   "self_type" : "type-3540",
+   "referenced_type" : "type-3541",
+   "self_type" : "type-3543",
    "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",
+   "referenced_type" : "type-3650",
+   "self_type" : "type-3652",
    "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",
+   "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-3832",
-   "self_type" : "type-3834",
+   "referenced_type" : "type-3838",
+   "self_type" : "type-3840",
    "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",
+   "referenced_type" : "type-4378",
+   "self_type" : "type-4380",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -17491,190 +17494,190 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-4501",
-   "self_type" : "type-4503",
+   "referenced_type" : "type-4507",
+   "self_type" : "type-4509",
    "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",
+   "referenced_type" : "type-4544",
+   "self_type" : "type-4546",
    "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",
+   "referenced_type" : "type-4569",
+   "self_type" : "type-4571",
    "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",
+   "referenced_type" : "type-4723",
+   "self_type" : "type-4725",
    "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",
+   "referenced_type" : "type-4853",
+   "self_type" : "type-4855",
    "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",
+   "referenced_type" : "type-5124",
+   "self_type" : "type-5126",
    "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",
+   "referenced_type" : "type-5177",
+   "self_type" : "type-5179",
    "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",
+   "referenced_type" : "type-5384",
+   "self_type" : "type-5386",
    "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",
+   "referenced_type" : "type-5616",
+   "self_type" : "type-5618",
    "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",
+   "referenced_type" : "type-5725",
+   "self_type" : "type-5727",
    "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",
+   "referenced_type" : "type-5791",
+   "self_type" : "type-5793",
    "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",
+   "referenced_type" : "type-5913",
+   "self_type" : "type-5915",
    "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",
+   "referenced_type" : "type-6069",
+   "self_type" : "type-6074",
    "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",
+   "referenced_type" : "type-6205",
+   "self_type" : "type-6207",
    "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",
+   "referenced_type" : "type-6301",
+   "self_type" : "type-6303",
    "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",
+   "referenced_type" : "type-6348",
+   "self_type" : "type-6352",
    "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",
+   "referenced_type" : "type-6440",
+   "self_type" : "type-6442",
    "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",
+   "referenced_type" : "type-6979",
+   "self_type" : "type-6981",
    "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",
+   "referenced_type" : "type-7113",
+   "self_type" : "type-7116",
    "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",
+   "referenced_type" : "type-7166",
+   "self_type" : "type-7168",
    "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",
+   "referenced_type" : "type-7202",
+   "self_type" : "type-7204",
    "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",
+   "referenced_type" : "type-7351",
+   "self_type" : "type-7353",
    "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",
+   "referenced_type" : "type-7451",
+   "self_type" : "type-7453",
    "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",
+   "referenced_type" : "type-7489",
+   "self_type" : "type-7491",
    "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",
+   "referenced_type" : "type-7542",
+   "self_type" : "type-7544",
    "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",
+   "referenced_type" : "type-7622",
+   "self_type" : "type-7624",
    "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",
+   "referenced_type" : "type-7687",
+   "self_type" : "type-7689",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -17688,8 +17691,8 @@
    "alignment" : 4,
    "linker_set_key" : "const log_msg &",
    "name" : "const log_msg &",
-   "referenced_type" : "type-2313",
-   "self_type" : "type-2331",
+   "referenced_type" : "type-2316",
+   "self_type" : "type-2334",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -17724,8 +17727,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
-   "referenced_type" : "type-2643",
-   "self_type" : "type-2646",
+   "referenced_type" : "type-2646",
+   "self_type" : "type-2649",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17733,8 +17736,8 @@
    "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",
+   "referenced_type" : "type-4993",
+   "self_type" : "type-4995",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17742,8 +17745,8 @@
    "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",
+   "referenced_type" : "type-6041",
+   "self_type" : "type-6043",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17751,8 +17754,8 @@
    "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",
+   "referenced_type" : "type-7529",
+   "self_type" : "type-7538",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17760,8 +17763,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
-   "referenced_type" : "type-2639",
-   "self_type" : "type-2641",
+   "referenced_type" : "type-2642",
+   "self_type" : "type-2644",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17769,8 +17772,8 @@
    "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",
+   "referenced_type" : "type-4989",
+   "self_type" : "type-4991",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17778,8 +17781,8 @@
    "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",
+   "referenced_type" : "type-6036",
+   "self_type" : "type-6038",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17787,8 +17790,8 @@
    "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",
+   "referenced_type" : "type-7516",
+   "self_type" : "type-7524",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17796,8 +17799,8 @@
    "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",
+   "referenced_type" : "type-1646",
+   "self_type" : "type-1648",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17805,8 +17808,8 @@
    "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",
+   "referenced_type" : "type-4111",
+   "self_type" : "type-4113",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17814,8 +17817,8 @@
    "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",
+   "referenced_type" : "type-6700",
+   "self_type" : "type-6702",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17832,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-1107",
-   "self_type" : "type-1106",
+   "referenced_type" : "type-1110",
+   "self_type" : "type-1109",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17841,8 +17844,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-1279",
-   "self_type" : "type-1278",
+   "referenced_type" : "type-1282",
+   "self_type" : "type-1281",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17850,8 +17853,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-3271",
-   "self_type" : "type-3270",
+   "referenced_type" : "type-3274",
+   "self_type" : "type-3273",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17859,8 +17862,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-3535",
-   "self_type" : "type-3534",
+   "referenced_type" : "type-3538",
+   "self_type" : "type-3537",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17868,8 +17871,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-3645",
-   "self_type" : "type-3644",
+   "referenced_type" : "type-3648",
+   "self_type" : "type-3647",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17877,8 +17880,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-3708",
-   "self_type" : "type-3707",
+   "referenced_type" : "type-3714",
+   "self_type" : "type-3713",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17886,8 +17889,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-3830",
-   "self_type" : "type-3829",
+   "referenced_type" : "type-3836",
+   "self_type" : "type-3835",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17904,8 +17907,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-4351",
-   "self_type" : "type-4350",
+   "referenced_type" : "type-4357",
+   "self_type" : "type-4356",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17913,8 +17916,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-4486",
-   "self_type" : "type-4485",
+   "referenced_type" : "type-4492",
+   "self_type" : "type-4491",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17922,8 +17925,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-4555",
-   "self_type" : "type-4554",
+   "referenced_type" : "type-4561",
+   "self_type" : "type-4560",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17931,8 +17934,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-4619",
-   "self_type" : "type-4618",
+   "referenced_type" : "type-4623",
+   "self_type" : "type-4622",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17940,8 +17943,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-4659",
-   "self_type" : "type-4658",
+   "referenced_type" : "type-4666",
+   "self_type" : "type-4665",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17949,8 +17952,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-4867",
-   "self_type" : "type-4866",
+   "referenced_type" : "type-4873",
+   "self_type" : "type-4872",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17958,8 +17961,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-5127",
-   "self_type" : "type-5126",
+   "referenced_type" : "type-5143",
+   "self_type" : "type-5142",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17967,8 +17970,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-5156",
-   "self_type" : "type-5155",
+   "referenced_type" : "type-5173",
+   "self_type" : "type-5172",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17976,8 +17979,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-5332",
-   "self_type" : "type-5331",
+   "referenced_type" : "type-5349",
+   "self_type" : "type-5348",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17985,8 +17988,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-5596",
-   "self_type" : "type-5595",
+   "referenced_type" : "type-5613",
+   "self_type" : "type-5612",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17994,8 +17997,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-5706",
-   "self_type" : "type-5705",
+   "referenced_type" : "type-5723",
+   "self_type" : "type-5722",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18003,8 +18006,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-5769",
-   "self_type" : "type-5768",
+   "referenced_type" : "type-5789",
+   "self_type" : "type-5788",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18012,8 +18015,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-5891",
-   "self_type" : "type-5890",
+   "referenced_type" : "type-5911",
+   "self_type" : "type-5910",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18021,8 +18024,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-6046",
-   "self_type" : "type-6045",
+   "referenced_type" : "type-6066",
+   "self_type" : "type-6065",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18030,8 +18033,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-6183",
-   "self_type" : "type-6182",
+   "referenced_type" : "type-6203",
+   "self_type" : "type-6202",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18039,8 +18042,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-6279",
-   "self_type" : "type-6278",
+   "referenced_type" : "type-6299",
+   "self_type" : "type-6298",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18048,8 +18051,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-6323",
-   "self_type" : "type-6322",
+   "referenced_type" : "type-6346",
+   "self_type" : "type-6345",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18057,8 +18060,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-6415",
-   "self_type" : "type-6414",
+   "referenced_type" : "type-6438",
+   "self_type" : "type-6437",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18066,8 +18069,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-6935",
-   "self_type" : "type-6934",
+   "referenced_type" : "type-6959",
+   "self_type" : "type-6958",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18075,8 +18078,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-7074",
-   "self_type" : "type-7073",
+   "referenced_type" : "type-7097",
+   "self_type" : "type-7096",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18084,8 +18087,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-7162",
-   "self_type" : "type-7161",
+   "referenced_type" : "type-7186",
+   "self_type" : "type-7185",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18093,8 +18096,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-7245",
-   "self_type" : "type-7244",
+   "referenced_type" : "type-7267",
+   "self_type" : "type-7266",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18102,8 +18105,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-7288",
-   "self_type" : "type-7287",
+   "referenced_type" : "type-7312",
+   "self_type" : "type-7311",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18111,8 +18114,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-7454",
-   "self_type" : "type-7453",
+   "referenced_type" : "type-7480",
+   "self_type" : "type-7479",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18120,8 +18123,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-7482",
-   "self_type" : "type-7481",
+   "referenced_type" : "type-7505",
+   "self_type" : "type-7504",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18129,8 +18132,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-7487",
-   "self_type" : "type-7486",
+   "referenced_type" : "type-7510",
+   "self_type" : "type-7509",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18138,8 +18141,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-7613",
-   "self_type" : "type-7612",
+   "referenced_type" : "type-7638",
+   "self_type" : "type-7637",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18147,8 +18150,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-7625",
-   "self_type" : "type-7624",
+   "referenced_type" : "type-7649",
+   "self_type" : "type-7648",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18165,8 +18168,8 @@
    "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",
+   "referenced_type" : "type-4382",
+   "self_type" : "type-4384",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18174,8 +18177,8 @@
    "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",
+   "referenced_type" : "type-4510",
+   "self_type" : "type-4512",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18183,8 +18186,8 @@
    "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",
+   "referenced_type" : "type-6983",
+   "self_type" : "type-6985",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18192,8 +18195,8 @@
    "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",
+   "referenced_type" : "type-7117",
+   "self_type" : "type-7119",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18228,8 +18231,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
-   "referenced_type" : "type-2520",
-   "self_type" : "type-2615",
+   "referenced_type" : "type-2523",
+   "self_type" : "type-2618",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18255,8 +18258,8 @@
    "alignment" : 4,
    "linker_set_key" : "int *&",
    "name" : "int *&",
-   "referenced_type" : "type-1509",
-   "self_type" : "type-1508",
+   "referenced_type" : "type-1512",
+   "self_type" : "type-1511",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18265,7 +18268,7 @@
    "linker_set_key" : "long long &",
    "name" : "long long &",
    "referenced_type" : "type-169",
-   "self_type" : "type-1429",
+   "self_type" : "type-1432",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18273,8 +18276,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-4758",
-   "self_type" : "type-4757",
+   "referenced_type" : "type-4765",
+   "self_type" : "type-4764",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18282,8 +18285,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-4862",
-   "self_type" : "type-4861",
+   "referenced_type" : "type-4868",
+   "self_type" : "type-4867",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18291,8 +18294,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-5067",
-   "self_type" : "type-5066",
+   "referenced_type" : "type-5085",
+   "self_type" : "type-5084",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18300,8 +18303,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-5122",
-   "self_type" : "type-5121",
+   "referenced_type" : "type-5138",
+   "self_type" : "type-5137",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18309,8 +18312,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-7356",
-   "self_type" : "type-7355",
+   "referenced_type" : "type-7379",
+   "self_type" : "type-7378",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18318,8 +18321,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-7449",
-   "self_type" : "type-7448",
+   "referenced_type" : "type-7472",
+   "self_type" : "type-7471",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18327,8 +18330,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-7575",
-   "self_type" : "type-7574",
+   "referenced_type" : "type-7600",
+   "self_type" : "type-7599",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18345,8 +18348,8 @@
    "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",
+   "referenced_type" : "type-3186",
+   "self_type" : "type-3185",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -18354,8 +18357,8 @@
    "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",
+   "referenced_type" : "type-5261",
+   "self_type" : "type-5260",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -18363,8 +18366,8 @@
    "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",
+   "referenced_type" : "type-6057",
+   "self_type" : "type-6056",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -18372,8 +18375,8 @@
    "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",
+   "referenced_type" : "type-1652",
+   "self_type" : "type-1886",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -18381,8 +18384,8 @@
    "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",
+   "referenced_type" : "type-4116",
+   "self_type" : "type-4142",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -18390,8 +18393,8 @@
    "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",
+   "referenced_type" : "type-6705",
+   "self_type" : "type-6737",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -18400,7 +18403,7 @@
    "linker_set_key" : "unsigned char &",
    "name" : "unsigned char &",
    "referenced_type" : "type-90",
-   "self_type" : "type-1428",
+   "self_type" : "type-1431",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18427,7 +18430,7 @@
    "linker_set_key" : "unsigned long long *&",
    "name" : "unsigned long long *&",
    "referenced_type" : "type-91",
-   "self_type" : "type-1871",
+   "self_type" : "type-1875",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -18436,7 +18439,7 @@
    "linker_set_key" : "unsigned short &",
    "name" : "unsigned short &",
    "referenced_type" : "type-497",
-   "self_type" : "type-1427",
+   "self_type" : "type-1430",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18444,8 +18447,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-1444",
-   "self_type" : "type-1443",
+   "referenced_type" : "type-1447",
+   "self_type" : "type-1446",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18453,8 +18456,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-3976",
-   "self_type" : "type-3975",
+   "referenced_type" : "type-3982",
+   "self_type" : "type-3981",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18462,8 +18465,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-6551",
-   "self_type" : "type-6550",
+   "referenced_type" : "type-6574",
+   "self_type" : "type-6573",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18483,8 +18486,8 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-2402",
-   "self_type" : "type-2401",
+   "referenced_type" : "type-2405",
+   "self_type" : "type-2404",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -18492,8 +18495,8 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-4833",
-   "self_type" : "type-4832",
+   "referenced_type" : "type-4839",
+   "self_type" : "type-4838",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -18501,8 +18504,8 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-5975",
-   "self_type" : "type-5974",
+   "referenced_type" : "type-5995",
+   "self_type" : "type-5994",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -18510,8 +18513,8 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-6808",
-   "self_type" : "type-6807",
+   "referenced_type" : "type-6831",
+   "self_type" : "type-6830",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -18528,8 +18531,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1142",
-   "self_type" : "type-1141",
+   "referenced_type" : "type-1137",
+   "self_type" : "type-1136",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18537,8 +18540,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1165",
-   "self_type" : "type-1164",
+   "referenced_type" : "type-1170",
+   "self_type" : "type-1169",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18546,8 +18549,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1350",
-   "self_type" : "type-1349",
+   "referenced_type" : "type-1353",
+   "self_type" : "type-1352",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18555,8 +18558,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1407",
-   "self_type" : "type-1406",
+   "referenced_type" : "type-1410",
+   "self_type" : "type-1409",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18564,8 +18567,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1423",
-   "self_type" : "type-1422",
+   "referenced_type" : "type-1426",
+   "self_type" : "type-1425",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18573,8 +18576,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1439",
-   "self_type" : "type-1438",
+   "referenced_type" : "type-1442",
+   "self_type" : "type-1441",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18582,8 +18585,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1505",
-   "self_type" : "type-1504",
+   "referenced_type" : "type-1508",
+   "self_type" : "type-1507",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18591,8 +18594,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1632",
-   "self_type" : "type-1631",
+   "referenced_type" : "type-1637",
+   "self_type" : "type-1636",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18600,8 +18603,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2612",
-   "self_type" : "type-2611",
+   "referenced_type" : "type-2615",
+   "self_type" : "type-2614",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18609,8 +18612,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3478",
-   "self_type" : "type-3477",
+   "referenced_type" : "type-3481",
+   "self_type" : "type-3480",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18618,8 +18621,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3579",
-   "self_type" : "type-3578",
+   "referenced_type" : "type-3578",
+   "self_type" : "type-3577",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18627,8 +18630,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3655",
-   "self_type" : "type-3654",
+   "referenced_type" : "type-3658",
+   "self_type" : "type-3657",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18636,8 +18639,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3745",
-   "self_type" : "type-3744",
+   "referenced_type" : "type-3743",
+   "self_type" : "type-3742",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18645,8 +18648,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3770",
-   "self_type" : "type-3769",
+   "referenced_type" : "type-3777",
+   "self_type" : "type-3776",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18654,8 +18657,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3904",
-   "self_type" : "type-3903",
+   "referenced_type" : "type-3910",
+   "self_type" : "type-3909",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18663,8 +18666,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3935",
-   "self_type" : "type-3934",
+   "referenced_type" : "type-3941",
+   "self_type" : "type-3940",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18672,8 +18675,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3951",
-   "self_type" : "type-3950",
+   "referenced_type" : "type-3957",
+   "self_type" : "type-3956",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18681,8 +18684,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3971",
-   "self_type" : "type-3970",
+   "referenced_type" : "type-3977",
+   "self_type" : "type-3976",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18690,8 +18693,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4019",
-   "self_type" : "type-4018",
+   "referenced_type" : "type-4026",
+   "self_type" : "type-4025",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18699,8 +18702,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4097",
-   "self_type" : "type-4096",
+   "referenced_type" : "type-4103",
+   "self_type" : "type-4102",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18708,8 +18711,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4299",
-   "self_type" : "type-4298",
+   "referenced_type" : "type-4305",
+   "self_type" : "type-4304",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18717,8 +18720,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4472",
-   "self_type" : "type-4471",
+   "referenced_type" : "type-4478",
+   "self_type" : "type-4477",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18726,8 +18729,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4525",
-   "self_type" : "type-4524",
+   "referenced_type" : "type-4531",
+   "self_type" : "type-4530",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18735,8 +18738,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4551",
-   "self_type" : "type-4550",
+   "referenced_type" : "type-4557",
+   "self_type" : "type-4556",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18744,8 +18747,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4578",
-   "self_type" : "type-4577",
+   "referenced_type" : "type-4584",
+   "self_type" : "type-4583",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18753,8 +18756,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4745",
-   "self_type" : "type-4744",
+   "referenced_type" : "type-4752",
+   "self_type" : "type-4751",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18762,8 +18765,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4855",
-   "self_type" : "type-4854",
+   "referenced_type" : "type-4861",
+   "self_type" : "type-4860",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18771,8 +18774,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4967",
-   "self_type" : "type-4966",
+   "referenced_type" : "type-4973",
+   "self_type" : "type-4972",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18780,8 +18783,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5075",
-   "self_type" : "type-5074",
+   "referenced_type" : "type-5091",
+   "self_type" : "type-5090",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18789,8 +18792,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5116",
-   "self_type" : "type-5115",
+   "referenced_type" : "type-5132",
+   "self_type" : "type-5131",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18798,8 +18801,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5220",
-   "self_type" : "type-5219",
+   "referenced_type" : "type-5239",
+   "self_type" : "type-5238",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18807,8 +18810,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5539",
-   "self_type" : "type-5538",
+   "referenced_type" : "type-5556",
+   "self_type" : "type-5555",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18816,8 +18819,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5640",
-   "self_type" : "type-5639",
+   "referenced_type" : "type-5653",
+   "self_type" : "type-5652",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18825,8 +18828,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5716",
-   "self_type" : "type-5715",
+   "referenced_type" : "type-5733",
+   "self_type" : "type-5732",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18834,8 +18837,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5806",
-   "self_type" : "type-5805",
+   "referenced_type" : "type-5818",
+   "self_type" : "type-5817",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18843,8 +18846,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5831",
-   "self_type" : "type-5830",
+   "referenced_type" : "type-5852",
+   "self_type" : "type-5851",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18852,8 +18855,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6014",
-   "self_type" : "type-6013",
+   "referenced_type" : "type-6035",
+   "self_type" : "type-6034",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18861,8 +18864,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6138",
-   "self_type" : "type-6137",
+   "referenced_type" : "type-6158",
+   "self_type" : "type-6157",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18870,8 +18873,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6226",
-   "self_type" : "type-6225",
+   "referenced_type" : "type-6242",
+   "self_type" : "type-6241",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18879,8 +18882,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6289",
-   "self_type" : "type-6288",
+   "referenced_type" : "type-6309",
+   "self_type" : "type-6308",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18888,8 +18891,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6361",
-   "self_type" : "type-6360",
+   "referenced_type" : "type-6376",
+   "self_type" : "type-6375",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18897,8 +18900,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6383",
-   "self_type" : "type-6382",
+   "referenced_type" : "type-6406",
+   "self_type" : "type-6405",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18906,8 +18909,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6482",
-   "self_type" : "type-6481",
+   "referenced_type" : "type-6505",
+   "self_type" : "type-6504",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18915,8 +18918,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6513",
-   "self_type" : "type-6512",
+   "referenced_type" : "type-6537",
+   "self_type" : "type-6536",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18924,8 +18927,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6530",
-   "self_type" : "type-6529",
+   "referenced_type" : "type-6553",
+   "self_type" : "type-6552",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18933,8 +18936,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6546",
-   "self_type" : "type-6545",
+   "referenced_type" : "type-6569",
+   "self_type" : "type-6568",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18942,8 +18945,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6593",
-   "self_type" : "type-6592",
+   "referenced_type" : "type-6616",
+   "self_type" : "type-6615",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18951,8 +18954,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6670",
-   "self_type" : "type-6669",
+   "referenced_type" : "type-6693",
+   "self_type" : "type-6692",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18960,8 +18963,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6889",
-   "self_type" : "type-6888",
+   "referenced_type" : "type-6912",
+   "self_type" : "type-6911",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18969,8 +18972,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7057",
-   "self_type" : "type-7056",
+   "referenced_type" : "type-7081",
+   "self_type" : "type-7080",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18978,8 +18981,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7120",
-   "self_type" : "type-7119",
+   "referenced_type" : "type-7145",
+   "self_type" : "type-7144",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18987,8 +18990,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7155",
-   "self_type" : "type-7154",
+   "referenced_type" : "type-7180",
+   "self_type" : "type-7179",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18996,8 +18999,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7199",
-   "self_type" : "type-7198",
+   "referenced_type" : "type-7222",
+   "self_type" : "type-7221",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19005,8 +19008,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7346",
-   "self_type" : "type-7345",
+   "referenced_type" : "type-7369",
+   "self_type" : "type-7368",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19014,8 +19017,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7439",
-   "self_type" : "type-7438",
+   "referenced_type" : "type-7460",
+   "self_type" : "type-7459",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19023,8 +19026,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7441",
-   "self_type" : "type-7440",
+   "referenced_type" : "type-7464",
+   "self_type" : "type-7463",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19032,8 +19035,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7477",
-   "self_type" : "type-7476",
+   "referenced_type" : "type-7501",
+   "self_type" : "type-7500",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19041,8 +19044,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7573",
-   "self_type" : "type-7572",
+   "referenced_type" : "type-7598",
+   "self_type" : "type-7597",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19050,8 +19053,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7608",
-   "self_type" : "type-7607",
+   "referenced_type" : "type-7631",
+   "self_type" : "type-7630",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19068,8 +19071,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-908",
-   "self_type" : "type-907",
+   "referenced_type" : "type-904",
+   "self_type" : "type-903",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19077,8 +19080,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE *",
    "name" : "OMX_BUFFERHEADERTYPE *",
-   "referenced_type" : "type-1540",
-   "self_type" : "type-1595",
+   "referenced_type" : "type-1536",
+   "self_type" : "type-1598",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -19086,8 +19089,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE **",
    "name" : "OMX_BUFFERHEADERTYPE **",
-   "referenced_type" : "type-1595",
-   "self_type" : "type-2376",
+   "referenced_type" : "type-1598",
+   "self_type" : "type-2379",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19095,8 +19098,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_CALLBACKTYPE *",
    "name" : "OMX_CALLBACKTYPE *",
-   "referenced_type" : "type-1590",
-   "self_type" : "type-2385",
+   "referenced_type" : "type-1593",
+   "self_type" : "type-2388",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19104,8 +19107,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *)",
    "name" : "OMX_ERRORTYPE (*)(void *)",
-   "referenced_type" : "type-1501",
-   "self_type" : "type-1500",
+   "referenced_type" : "type-1500",
+   "self_type" : "type-1499",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -19113,8 +19116,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-2382",
-   "self_type" : "type-2381",
+   "referenced_type" : "type-2385",
+   "self_type" : "type-2384",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19122,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-2378",
-   "self_type" : "type-2377",
+   "referenced_type" : "type-2381",
+   "self_type" : "type-2380",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19131,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-2375",
-   "self_type" : "type-2374",
+   "referenced_type" : "type-2378",
+   "self_type" : "type-2377",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19140,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-2387",
-   "self_type" : "type-2386",
+   "referenced_type" : "type-2390",
+   "self_type" : "type-2389",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19149,8 +19152,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
-   "referenced_type" : "type-2384",
-   "self_type" : "type-2383",
+   "referenced_type" : "type-2387",
+   "self_type" : "type-2386",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19158,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-2362",
-   "self_type" : "type-2361",
+   "referenced_type" : "type-2365",
+   "self_type" : "type-2364",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19167,8 +19170,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
-   "referenced_type" : "type-2364",
-   "self_type" : "type-2363",
+   "referenced_type" : "type-2367",
+   "self_type" : "type-2366",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19176,51 +19179,6 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
-   "referenced_type" : "type-2369",
-   "self_type" : "type-2368",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, char *, OMX_INDEXTYPE *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, char *, OMX_INDEXTYPE *)",
-   "referenced_type" : "type-2366",
-   "self_type" : "type-2365",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-2358",
-   "self_type" : "type-2357",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, unsigned char *, unsigned int)",
-   "name" : "OMX_ERRORTYPE (*)(void *, unsigned char *, unsigned int)",
-   "referenced_type" : "type-2389",
-   "self_type" : "type-2388",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, unsigned int, OMX_BUFFERHEADERTYPE *)",
-   "name" : "OMX_ERRORTYPE (*)(void *, unsigned int, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-2380",
-   "self_type" : "type-2379",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
-  },
-  {
-   "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-2372",
    "self_type" : "type-2371",
    "size" : 4,
@@ -19228,10 +19186,55 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, char *, OMX_INDEXTYPE *)",
+   "name" : "OMX_ERRORTYPE (*)(void *, char *, OMX_INDEXTYPE *)",
+   "referenced_type" : "type-2369",
+   "self_type" : "type-2368",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "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-2361",
+   "self_type" : "type-2360",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, unsigned char *, unsigned int)",
+   "name" : "OMX_ERRORTYPE (*)(void *, unsigned char *, unsigned int)",
+   "referenced_type" : "type-2392",
+   "self_type" : "type-2391",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "OMX_ERRORTYPE (*)(void *, unsigned int, OMX_BUFFERHEADERTYPE *)",
+   "name" : "OMX_ERRORTYPE (*)(void *, unsigned int, OMX_BUFFERHEADERTYPE *)",
+   "referenced_type" : "type-2383",
+   "self_type" : "type-2382",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "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-2375",
+   "self_type" : "type-2374",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, void *, OMX_BUFFERHEADERTYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, void *, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-1594",
-   "self_type" : "type-1593",
+   "referenced_type" : "type-1597",
+   "self_type" : "type-1596",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -19239,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-1592",
-   "self_type" : "type-1591",
+   "referenced_type" : "type-1595",
+   "self_type" : "type-1594",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -19249,7 +19252,7 @@
    "linker_set_key" : "OMX_INDEXTYPE *",
    "name" : "OMX_INDEXTYPE *",
    "referenced_type" : "type-1484",
-   "self_type" : "type-2367",
+   "self_type" : "type-2370",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19257,8 +19260,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_STATETYPE *",
    "name" : "OMX_STATETYPE *",
-   "referenced_type" : "type-1488",
-   "self_type" : "type-2370",
+   "referenced_type" : "type-1490",
+   "self_type" : "type-2373",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19266,8 +19269,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_TUNNELSETUPTYPE *",
    "name" : "OMX_TUNNELSETUPTYPE *",
-   "referenced_type" : "type-1612",
-   "self_type" : "type-2373",
+   "referenced_type" : "type-1613",
+   "self_type" : "type-2376",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19275,8 +19278,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_VERSIONTYPE *",
    "name" : "OMX_VERSIONTYPE *",
-   "referenced_type" : "type-1478",
-   "self_type" : "type-2359",
+   "referenced_type" : "type-1481",
+   "self_type" : "type-2362",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19293,8 +19296,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1115",
-   "self_type" : "type-1114",
+   "referenced_type" : "type-1118",
+   "self_type" : "type-1117",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19302,8 +19305,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1335",
-   "self_type" : "type-1334",
+   "referenced_type" : "type-1338",
+   "self_type" : "type-1337",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19311,8 +19314,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1402",
-   "self_type" : "type-1401",
+   "referenced_type" : "type-1405",
+   "self_type" : "type-1404",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19320,8 +19323,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1418",
-   "self_type" : "type-1417",
+   "referenced_type" : "type-1421",
+   "self_type" : "type-1420",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19329,8 +19332,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1435",
-   "self_type" : "type-1434",
+   "referenced_type" : "type-1438",
+   "self_type" : "type-1437",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19338,8 +19341,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1437",
-   "self_type" : "type-1436",
+   "referenced_type" : "type-1440",
+   "self_type" : "type-1439",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19347,8 +19350,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1503",
-   "self_type" : "type-1502",
+   "referenced_type" : "type-1506",
+   "self_type" : "type-1505",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19356,8 +19359,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1630",
-   "self_type" : "type-1629",
+   "referenced_type" : "type-1634",
+   "self_type" : "type-1633",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19365,8 +19368,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2609",
-   "self_type" : "type-2608",
+   "referenced_type" : "type-2612",
+   "self_type" : "type-2611",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19374,8 +19377,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3476",
-   "self_type" : "type-3475",
+   "referenced_type" : "type-3479",
+   "self_type" : "type-3478",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19383,8 +19386,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3548",
-   "self_type" : "type-3547",
+   "referenced_type" : "type-3547",
+   "self_type" : "type-3546",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19392,8 +19395,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3653",
-   "self_type" : "type-3652",
+   "referenced_type" : "type-3656",
+   "self_type" : "type-3655",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19401,8 +19404,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3718",
-   "self_type" : "type-3717",
+   "referenced_type" : "type-3724",
+   "self_type" : "type-3723",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19410,8 +19413,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3886",
-   "self_type" : "type-3885",
+   "referenced_type" : "type-3892",
+   "self_type" : "type-3891",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19419,8 +19422,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3929",
-   "self_type" : "type-3928",
+   "referenced_type" : "type-3936",
+   "self_type" : "type-3935",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19428,8 +19431,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3945",
-   "self_type" : "type-3944",
+   "referenced_type" : "type-3951",
+   "self_type" : "type-3950",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19437,8 +19440,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3965",
-   "self_type" : "type-3964",
+   "referenced_type" : "type-3971",
+   "self_type" : "type-3970",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19446,8 +19449,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3967",
-   "self_type" : "type-3966",
+   "referenced_type" : "type-3973",
+   "self_type" : "type-3972",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19455,8 +19458,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4017",
-   "self_type" : "type-4016",
+   "referenced_type" : "type-4023",
+   "self_type" : "type-4022",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19464,8 +19467,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4095",
-   "self_type" : "type-4094",
+   "referenced_type" : "type-4101",
+   "self_type" : "type-4100",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19473,8 +19476,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4297",
-   "self_type" : "type-4296",
+   "referenced_type" : "type-4303",
+   "self_type" : "type-4302",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19482,8 +19485,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4512",
-   "self_type" : "type-4511",
+   "referenced_type" : "type-4518",
+   "self_type" : "type-4517",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19491,8 +19494,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4523",
-   "self_type" : "type-4522",
+   "referenced_type" : "type-4529",
+   "self_type" : "type-4528",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19500,8 +19503,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4549",
-   "self_type" : "type-4548",
+   "referenced_type" : "type-4555",
+   "self_type" : "type-4554",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19509,8 +19512,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4576",
-   "self_type" : "type-4575",
+   "referenced_type" : "type-4582",
+   "self_type" : "type-4581",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19518,8 +19521,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4743",
-   "self_type" : "type-4742",
+   "referenced_type" : "type-4749",
+   "self_type" : "type-4748",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19527,8 +19530,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4853",
-   "self_type" : "type-4852",
+   "referenced_type" : "type-4859",
+   "self_type" : "type-4858",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19536,8 +19539,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4964",
-   "self_type" : "type-4963",
+   "referenced_type" : "type-4970",
+   "self_type" : "type-4969",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19545,8 +19548,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5073",
-   "self_type" : "type-5072",
+   "referenced_type" : "type-5089",
+   "self_type" : "type-5088",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19554,8 +19557,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5114",
-   "self_type" : "type-5113",
+   "referenced_type" : "type-5130",
+   "self_type" : "type-5129",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19563,8 +19566,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5207",
-   "self_type" : "type-5206",
+   "referenced_type" : "type-5225",
+   "self_type" : "type-5224",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19572,8 +19575,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5537",
-   "self_type" : "type-5536",
+   "referenced_type" : "type-5554",
+   "self_type" : "type-5553",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19581,8 +19584,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5609",
-   "self_type" : "type-5608",
+   "referenced_type" : "type-5622",
+   "self_type" : "type-5621",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19590,8 +19593,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5714",
-   "self_type" : "type-5713",
+   "referenced_type" : "type-5731",
+   "self_type" : "type-5730",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19599,8 +19602,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5779",
-   "self_type" : "type-5778",
+   "referenced_type" : "type-5799",
+   "self_type" : "type-5798",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19608,8 +19611,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5947",
-   "self_type" : "type-5946",
+   "referenced_type" : "type-5967",
+   "self_type" : "type-5966",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19617,8 +19620,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6012",
-   "self_type" : "type-6011",
+   "referenced_type" : "type-6032",
+   "self_type" : "type-6031",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19626,8 +19629,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6136",
-   "self_type" : "type-6135",
+   "referenced_type" : "type-6156",
+   "self_type" : "type-6155",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19635,8 +19638,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6195",
-   "self_type" : "type-6194",
+   "referenced_type" : "type-6211",
+   "self_type" : "type-6210",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19644,8 +19647,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6287",
-   "self_type" : "type-6286",
+   "referenced_type" : "type-6307",
+   "self_type" : "type-6306",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19653,8 +19656,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6334",
-   "self_type" : "type-6333",
+   "referenced_type" : "type-6358",
+   "self_type" : "type-6357",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19662,8 +19665,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6466",
-   "self_type" : "type-6465",
+   "referenced_type" : "type-6489",
+   "self_type" : "type-6488",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19671,8 +19674,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6508",
-   "self_type" : "type-6507",
+   "referenced_type" : "type-6531",
+   "self_type" : "type-6530",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19680,8 +19683,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6524",
-   "self_type" : "type-6523",
+   "referenced_type" : "type-6547",
+   "self_type" : "type-6546",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19689,8 +19692,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6542",
-   "self_type" : "type-6541",
+   "referenced_type" : "type-6565",
+   "self_type" : "type-6564",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19698,8 +19701,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6544",
-   "self_type" : "type-6543",
+   "referenced_type" : "type-6567",
+   "self_type" : "type-6566",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19707,8 +19710,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6591",
-   "self_type" : "type-6590",
+   "referenced_type" : "type-6614",
+   "self_type" : "type-6613",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19716,8 +19719,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6668",
-   "self_type" : "type-6667",
+   "referenced_type" : "type-6691",
+   "self_type" : "type-6690",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19725,8 +19728,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6887",
-   "self_type" : "type-6886",
+   "referenced_type" : "type-6910",
+   "self_type" : "type-6909",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19734,8 +19737,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7103",
-   "self_type" : "type-7102",
+   "referenced_type" : "type-7127",
+   "self_type" : "type-7126",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19743,8 +19746,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7118",
-   "self_type" : "type-7117",
+   "referenced_type" : "type-7142",
+   "self_type" : "type-7141",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19752,8 +19755,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7153",
-   "self_type" : "type-7152",
+   "referenced_type" : "type-7178",
+   "self_type" : "type-7177",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19761,8 +19764,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7197",
-   "self_type" : "type-7196",
+   "referenced_type" : "type-7220",
+   "self_type" : "type-7219",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19770,8 +19773,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7344",
-   "self_type" : "type-7343",
+   "referenced_type" : "type-7367",
+   "self_type" : "type-7366",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19779,8 +19782,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7434",
-   "self_type" : "type-7433",
+   "referenced_type" : "type-7455",
+   "self_type" : "type-7454",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19788,8 +19791,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7437",
-   "self_type" : "type-7436",
+   "referenced_type" : "type-7462",
+   "self_type" : "type-7461",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19797,8 +19800,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7475",
-   "self_type" : "type-7474",
+   "referenced_type" : "type-7499",
+   "self_type" : "type-7498",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19806,8 +19809,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7571",
-   "self_type" : "type-7570",
+   "referenced_type" : "type-7596",
+   "self_type" : "type-7595",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19815,8 +19818,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7606",
-   "self_type" : "type-7605",
+   "referenced_type" : "type-7629",
+   "self_type" : "type-7628",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19833,8 +19836,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-872",
-   "self_type" : "type-871",
+   "referenced_type" : "type-868",
+   "self_type" : "type-867",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19878,8 +19881,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ALooper::LooperThread *",
    "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-3759",
-   "self_type" : "type-3758",
+   "referenced_type" : "type-3763",
+   "self_type" : "type-3762",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19887,8 +19890,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ALooper::LooperThread *",
    "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-5820",
-   "self_type" : "type-5819",
+   "referenced_type" : "type-5838",
+   "self_type" : "type-5837",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19896,8 +19899,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ALooper::LooperThread *",
    "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-5968",
-   "self_type" : "type-5967",
+   "referenced_type" : "type-5988",
+   "self_type" : "type-5987",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19914,8 +19917,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::AReplyToken *",
    "name" : "android::AReplyToken *",
-   "referenced_type" : "type-1044",
-   "self_type" : "type-1163",
+   "referenced_type" : "type-1043",
+   "self_type" : "type-1166",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -19933,7 +19936,7 @@
    "linker_set_key" : "android::BBinder *",
    "name" : "android::BBinder *",
    "referenced_type" : "type-67",
-   "self_type" : "type-1206",
+   "self_type" : "type-1209",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -19960,7 +19963,7 @@
    "linker_set_key" : "android::BnInterface<android::IGraphicBufferProducer> *",
    "name" : "android::BnInterface<android::IGraphicBufferProducer> *",
    "referenced_type" : "type-71",
-   "self_type" : "type-1271",
+   "self_type" : "type-1275",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19969,7 +19972,7 @@
    "linker_set_key" : "android::BnInterface<android::IProducerListener> *",
    "name" : "android::BnInterface<android::IProducerListener> *",
    "referenced_type" : "type-80",
-   "self_type" : "type-4500",
+   "self_type" : "type-4506",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19977,8 +19980,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BnInterface<android::ITransactionCompletedListener> *",
    "name" : "android::BnInterface<android::ITransactionCompletedListener> *",
-   "referenced_type" : "type-1031",
-   "self_type" : "type-1034",
+   "referenced_type" : "type-1034",
+   "self_type" : "type-1037",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19986,8 +19989,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpConsumerListener *",
    "name" : "android::BpConsumerListener *",
-   "referenced_type" : "type-1579",
-   "self_type" : "type-1578",
+   "referenced_type" : "type-1583",
+   "self_type" : "type-1582",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19995,8 +19998,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpConsumerListener *",
    "name" : "android::BpConsumerListener *",
-   "referenced_type" : "type-4059",
-   "self_type" : "type-4058",
+   "referenced_type" : "type-4065",
+   "self_type" : "type-4064",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20004,8 +20007,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpConsumerListener *",
    "name" : "android::BpConsumerListener *",
-   "referenced_type" : "type-6632",
-   "self_type" : "type-6631",
+   "referenced_type" : "type-6655",
+   "self_type" : "type-6654",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20013,8 +20016,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpGraphicBufferConsumer *",
    "name" : "android::BpGraphicBufferConsumer *",
-   "referenced_type" : "type-1603",
-   "self_type" : "type-1602",
+   "referenced_type" : "type-1607",
+   "self_type" : "type-1606",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20022,8 +20025,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpGraphicBufferConsumer *",
    "name" : "android::BpGraphicBufferConsumer *",
-   "referenced_type" : "type-4076",
-   "self_type" : "type-4075",
+   "referenced_type" : "type-4082",
+   "self_type" : "type-4081",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20031,8 +20034,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpGraphicBufferConsumer *",
    "name" : "android::BpGraphicBufferConsumer *",
-   "referenced_type" : "type-6647",
-   "self_type" : "type-6646",
+   "referenced_type" : "type-6670",
+   "self_type" : "type-6669",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20040,8 +20043,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpGraphicBufferProducer *",
    "name" : "android::BpGraphicBufferProducer *",
-   "referenced_type" : "type-4230",
-   "self_type" : "type-4229",
+   "referenced_type" : "type-4236",
+   "self_type" : "type-4235",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20049,8 +20052,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpGraphicBufferProducer *",
    "name" : "android::BpGraphicBufferProducer *",
-   "referenced_type" : "type-6831",
-   "self_type" : "type-6830",
+   "referenced_type" : "type-6854",
+   "self_type" : "type-6853",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20058,8 +20061,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpInterface<android::IConsumerListener> *",
    "name" : "android::BpInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-1495",
-   "self_type" : "type-1498",
+   "referenced_type" : "type-1501",
+   "self_type" : "type-1504",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -20067,8 +20070,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpInterface<android::IGraphicBufferConsumer> *",
    "name" : "android::BpInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-1624",
-   "self_type" : "type-1628",
+   "referenced_type" : "type-1629",
+   "self_type" : "type-1632",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -20076,8 +20079,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpInterface<android::IGraphicBufferProducer> *",
    "name" : "android::BpInterface<android::IGraphicBufferProducer> *",
-   "referenced_type" : "type-4317",
-   "self_type" : "type-4320",
+   "referenced_type" : "type-4323",
+   "self_type" : "type-4326",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -20085,8 +20088,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpInterface<android::IProducerListener> *",
    "name" : "android::BpInterface<android::IProducerListener> *",
-   "referenced_type" : "type-4479",
-   "self_type" : "type-4482",
+   "referenced_type" : "type-4485",
+   "self_type" : "type-4488",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -20094,8 +20097,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpProducerListener *",
    "name" : "android::BpProducerListener *",
-   "referenced_type" : "type-4452",
-   "self_type" : "type-4451",
+   "referenced_type" : "type-4458",
+   "self_type" : "type-4457",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20103,8 +20106,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpProducerListener *",
    "name" : "android::BpProducerListener *",
-   "referenced_type" : "type-7045",
-   "self_type" : "type-7044",
+   "referenced_type" : "type-7069",
+   "self_type" : "type-7068",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20121,8 +20124,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-1067",
-   "self_type" : "type-1066",
+   "referenced_type" : "type-1070",
+   "self_type" : "type-1069",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20130,8 +20133,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-1529",
-   "self_type" : "type-1528",
+   "referenced_type" : "type-1532",
+   "self_type" : "type-1531",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -20139,8 +20142,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-1670",
-   "self_type" : "type-1669",
+   "referenced_type" : "type-1674",
+   "self_type" : "type-1673",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -20148,8 +20151,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-3636",
-   "self_type" : "type-3635",
+   "referenced_type" : "type-3639",
+   "self_type" : "type-3638",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -20157,8 +20160,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-3680",
-   "self_type" : "type-3679",
+   "referenced_type" : "type-3686",
+   "self_type" : "type-3685",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20166,8 +20169,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-4039",
-   "self_type" : "type-4038",
+   "referenced_type" : "type-4046",
+   "self_type" : "type-4045",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -20175,8 +20178,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-4125",
-   "self_type" : "type-4124",
+   "referenced_type" : "type-4131",
+   "self_type" : "type-4130",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -20184,8 +20187,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-5697",
-   "self_type" : "type-5696",
+   "referenced_type" : "type-5714",
+   "self_type" : "type-5713",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -20193,8 +20196,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-5741",
-   "self_type" : "type-5740",
+   "referenced_type" : "type-5761",
+   "self_type" : "type-5760",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20202,8 +20205,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-6268",
-   "self_type" : "type-6267",
+   "referenced_type" : "type-6288",
+   "self_type" : "type-6287",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -20211,8 +20214,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-6306",
-   "self_type" : "type-6305",
+   "referenced_type" : "type-6329",
+   "self_type" : "type-6328",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20220,8 +20223,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-6615",
-   "self_type" : "type-6614",
+   "referenced_type" : "type-6638",
+   "self_type" : "type-6637",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -20229,8 +20232,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-6696",
-   "self_type" : "type-6695",
+   "referenced_type" : "type-6720",
+   "self_type" : "type-6719",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -20247,8 +20250,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
    "name" : "android::BufferQueue::ProxyConsumerListener *",
-   "referenced_type" : "type-2536",
-   "self_type" : "type-2535",
+   "referenced_type" : "type-2539",
+   "self_type" : "type-2538",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20256,8 +20259,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
    "name" : "android::BufferQueue::ProxyConsumerListener *",
-   "referenced_type" : "type-4948",
-   "self_type" : "type-4947",
+   "referenced_type" : "type-4954",
+   "self_type" : "type-4953",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20265,8 +20268,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
    "name" : "android::BufferQueue::ProxyConsumerListener *",
-   "referenced_type" : "type-6006",
-   "self_type" : "type-6005",
+   "referenced_type" : "type-6026",
+   "self_type" : "type-6025",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20274,8 +20277,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
    "name" : "android::BufferQueue::ProxyConsumerListener *",
-   "referenced_type" : "type-7219",
-   "self_type" : "type-7218",
+   "referenced_type" : "type-7239",
+   "self_type" : "type-7238",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20283,8 +20286,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueConsumer *",
    "name" : "android::BufferQueueConsumer *",
-   "referenced_type" : "type-3491",
-   "self_type" : "type-3490",
+   "referenced_type" : "type-3494",
+   "self_type" : "type-3493",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20292,8 +20295,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueConsumer *",
    "name" : "android::BufferQueueConsumer *",
-   "referenced_type" : "type-5552",
-   "self_type" : "type-5551",
+   "referenced_type" : "type-5569",
+   "self_type" : "type-5568",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20301,8 +20304,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueConsumer *",
    "name" : "android::BufferQueueConsumer *",
-   "referenced_type" : "type-6148",
-   "self_type" : "type-6147",
+   "referenced_type" : "type-6168",
+   "self_type" : "type-6167",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20319,8 +20322,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-1169",
-   "self_type" : "type-1168",
+   "referenced_type" : "type-1172",
+   "self_type" : "type-1171",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20328,8 +20331,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-3517",
-   "self_type" : "type-3516",
+   "referenced_type" : "type-3520",
+   "self_type" : "type-3519",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20337,8 +20340,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-3615",
-   "self_type" : "type-3614",
+   "referenced_type" : "type-3618",
+   "self_type" : "type-3617",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20346,8 +20349,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-3773",
-   "self_type" : "type-3772",
+   "referenced_type" : "type-3779",
+   "self_type" : "type-3778",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20355,8 +20358,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-5578",
-   "self_type" : "type-5577",
+   "referenced_type" : "type-5595",
+   "self_type" : "type-5594",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20364,8 +20367,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-5676",
-   "self_type" : "type-5675",
+   "referenced_type" : "type-5693",
+   "self_type" : "type-5692",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20373,8 +20376,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-5834",
-   "self_type" : "type-5833",
+   "referenced_type" : "type-5854",
+   "self_type" : "type-5853",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20382,8 +20385,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-6167",
-   "self_type" : "type-6166",
+   "referenced_type" : "type-6187",
+   "self_type" : "type-6186",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20391,8 +20394,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-6254",
-   "self_type" : "type-6253",
+   "referenced_type" : "type-6274",
+   "self_type" : "type-6273",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20400,8 +20403,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-6385",
-   "self_type" : "type-6384",
+   "referenced_type" : "type-6408",
+   "self_type" : "type-6407",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20427,8 +20430,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueProducer *",
    "name" : "android::BufferQueueProducer *",
-   "referenced_type" : "type-3502",
-   "self_type" : "type-3501",
+   "referenced_type" : "type-3505",
+   "self_type" : "type-3504",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20436,8 +20439,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueProducer *",
    "name" : "android::BufferQueueProducer *",
-   "referenced_type" : "type-5563",
-   "self_type" : "type-5562",
+   "referenced_type" : "type-5580",
+   "self_type" : "type-5579",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20445,8 +20448,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueueProducer *",
    "name" : "android::BufferQueueProducer *",
-   "referenced_type" : "type-6157",
-   "self_type" : "type-6156",
+   "referenced_type" : "type-6177",
+   "self_type" : "type-6176",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20472,8 +20475,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ComposerService *",
    "name" : "android::ComposerService *",
-   "referenced_type" : "type-1092",
-   "self_type" : "type-1091",
+   "referenced_type" : "type-1095",
+   "self_type" : "type-1094",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -20481,8 +20484,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ComposerService *",
    "name" : "android::ComposerService *",
-   "referenced_type" : "type-3700",
-   "self_type" : "type-3699",
+   "referenced_type" : "type-3706",
+   "self_type" : "type-3705",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -20490,8 +20493,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ComposerService *",
    "name" : "android::ComposerService *",
-   "referenced_type" : "type-5761",
-   "self_type" : "type-5760",
+   "referenced_type" : "type-5781",
+   "self_type" : "type-5780",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -20499,8 +20502,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ComposerService *",
    "name" : "android::ComposerService *",
-   "referenced_type" : "type-6319",
-   "self_type" : "type-6318",
+   "referenced_type" : "type-6342",
+   "self_type" : "type-6341",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -20517,8 +20520,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-1253",
-   "self_type" : "type-1252",
+   "referenced_type" : "type-1257",
+   "self_type" : "type-1256",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20526,8 +20529,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-1455",
-   "self_type" : "type-1454",
+   "referenced_type" : "type-1458",
+   "self_type" : "type-1457",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20535,8 +20538,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-3813",
-   "self_type" : "type-3812",
+   "referenced_type" : "type-3820",
+   "self_type" : "type-3819",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20544,8 +20547,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-3986",
-   "self_type" : "type-3985",
+   "referenced_type" : "type-3992",
+   "self_type" : "type-3991",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20553,8 +20556,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-5874",
-   "self_type" : "type-5873",
+   "referenced_type" : "type-5895",
+   "self_type" : "type-5894",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20562,8 +20565,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-6408",
-   "self_type" : "type-6407",
+   "referenced_type" : "type-6431",
+   "self_type" : "type-6430",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20571,8 +20574,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-6560",
-   "self_type" : "type-6559",
+   "referenced_type" : "type-6583",
+   "self_type" : "type-6582",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20580,8 +20583,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-3291",
-   "self_type" : "type-3290",
+   "referenced_type" : "type-3294",
+   "self_type" : "type-3293",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20589,8 +20592,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-3480",
-   "self_type" : "type-3479",
+   "referenced_type" : "type-3483",
+   "self_type" : "type-3482",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20607,8 +20610,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-5352",
-   "self_type" : "type-5351",
+   "referenced_type" : "type-5369",
+   "self_type" : "type-5368",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20616,8 +20619,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-5541",
-   "self_type" : "type-5540",
+   "referenced_type" : "type-5558",
+   "self_type" : "type-5557",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20625,8 +20628,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-6052",
-   "self_type" : "type-6051",
+   "referenced_type" : "type-6072",
+   "self_type" : "type-6071",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20634,8 +20637,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-6140",
-   "self_type" : "type-6139",
+   "referenced_type" : "type-6160",
+   "self_type" : "type-6159",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20670,8 +20673,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-1285",
-   "self_type" : "type-1284",
+   "referenced_type" : "type-1288",
+   "self_type" : "type-1287",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20679,8 +20682,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-1414",
-   "self_type" : "type-1413",
+   "referenced_type" : "type-1417",
+   "self_type" : "type-1416",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20688,8 +20691,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-1433",
-   "self_type" : "type-1432",
+   "referenced_type" : "type-1436",
+   "self_type" : "type-1435",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20697,8 +20700,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-1457",
-   "self_type" : "type-1456",
+   "referenced_type" : "type-1461",
+   "self_type" : "type-1460",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20706,8 +20709,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-1584",
-   "self_type" : "type-1583",
+   "referenced_type" : "type-1588",
+   "self_type" : "type-1587",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20715,8 +20718,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-1611",
-   "self_type" : "type-1610",
+   "referenced_type" : "type-1615",
+   "self_type" : "type-1614",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20724,8 +20727,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-1866",
-   "self_type" : "type-1865",
+   "referenced_type" : "type-1870",
+   "self_type" : "type-1869",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20733,8 +20736,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3447",
-   "self_type" : "type-3446",
+   "referenced_type" : "type-3450",
+   "self_type" : "type-3449",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20742,8 +20745,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3485",
-   "self_type" : "type-3484",
+   "referenced_type" : "type-3488",
+   "self_type" : "type-3487",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20751,8 +20754,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3658",
-   "self_type" : "type-3657",
+   "referenced_type" : "type-3661",
+   "self_type" : "type-3660",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20760,8 +20763,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3660",
-   "self_type" : "type-3659",
+   "referenced_type" : "type-3663",
+   "self_type" : "type-3662",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20769,8 +20772,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3836",
-   "self_type" : "type-3835",
+   "referenced_type" : "type-3842",
+   "self_type" : "type-3841",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20778,8 +20781,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3941",
-   "self_type" : "type-3940",
+   "referenced_type" : "type-3947",
+   "self_type" : "type-3946",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20787,8 +20790,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3963",
-   "self_type" : "type-3962",
+   "referenced_type" : "type-3969",
+   "self_type" : "type-3968",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20796,8 +20799,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3988",
-   "self_type" : "type-3987",
+   "referenced_type" : "type-3994",
+   "self_type" : "type-3993",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20805,8 +20808,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-4064",
-   "self_type" : "type-4063",
+   "referenced_type" : "type-4070",
+   "self_type" : "type-4069",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20814,8 +20817,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-4083",
-   "self_type" : "type-4082",
+   "referenced_type" : "type-4089",
+   "self_type" : "type-4088",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20823,8 +20826,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-4395",
-   "self_type" : "type-4394",
+   "referenced_type" : "type-4399",
+   "self_type" : "type-4398",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20832,8 +20835,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-4653",
-   "self_type" : "type-4652",
+   "referenced_type" : "type-4659",
+   "self_type" : "type-4658",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20841,8 +20844,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-4669",
-   "self_type" : "type-4668",
+   "referenced_type" : "type-4675",
+   "self_type" : "type-4674",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20850,8 +20853,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-4932",
-   "self_type" : "type-4931",
+   "referenced_type" : "type-4938",
+   "self_type" : "type-4937",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20859,8 +20862,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5130",
-   "self_type" : "type-5129",
+   "referenced_type" : "type-5147",
+   "self_type" : "type-5146",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20868,8 +20871,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5508",
-   "self_type" : "type-5507",
+   "referenced_type" : "type-5525",
+   "self_type" : "type-5524",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20877,8 +20880,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5546",
-   "self_type" : "type-5545",
+   "referenced_type" : "type-5563",
+   "self_type" : "type-5562",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20886,8 +20889,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5719",
-   "self_type" : "type-5718",
+   "referenced_type" : "type-5736",
+   "self_type" : "type-5735",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20895,8 +20898,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5721",
-   "self_type" : "type-5720",
+   "referenced_type" : "type-5738",
+   "self_type" : "type-5737",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20904,8 +20907,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5897",
-   "self_type" : "type-5896",
+   "referenced_type" : "type-5917",
+   "self_type" : "type-5916",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20913,8 +20916,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5997",
-   "self_type" : "type-5996",
+   "referenced_type" : "type-6017",
+   "self_type" : "type-6016",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20922,8 +20925,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6110",
-   "self_type" : "type-6109",
+   "referenced_type" : "type-6130",
+   "self_type" : "type-6129",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20931,8 +20934,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6142",
-   "self_type" : "type-6141",
+   "referenced_type" : "type-6162",
+   "self_type" : "type-6161",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20940,8 +20943,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6292",
-   "self_type" : "type-6291",
+   "referenced_type" : "type-6312",
+   "self_type" : "type-6311",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20949,8 +20952,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6294",
-   "self_type" : "type-6293",
+   "referenced_type" : "type-6314",
+   "self_type" : "type-6313",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20958,8 +20961,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6421",
-   "self_type" : "type-6420",
+   "referenced_type" : "type-6444",
+   "self_type" : "type-6443",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20967,8 +20970,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6520",
-   "self_type" : "type-6519",
+   "referenced_type" : "type-6543",
+   "self_type" : "type-6542",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20976,8 +20979,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6540",
-   "self_type" : "type-6539",
+   "referenced_type" : "type-6563",
+   "self_type" : "type-6562",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20985,8 +20988,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6562",
-   "self_type" : "type-6561",
+   "referenced_type" : "type-6585",
+   "self_type" : "type-6584",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20994,8 +20997,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6637",
-   "self_type" : "type-6636",
+   "referenced_type" : "type-6660",
+   "self_type" : "type-6659",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21003,8 +21006,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6654",
-   "self_type" : "type-6653",
+   "referenced_type" : "type-6677",
+   "self_type" : "type-6676",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21012,8 +21015,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6981",
-   "self_type" : "type-6980",
+   "referenced_type" : "type-7003",
+   "self_type" : "type-7002",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21021,8 +21024,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-7171",
-   "self_type" : "type-7170",
+   "referenced_type" : "type-7194",
+   "self_type" : "type-7193",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21039,8 +21042,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-7283",
-   "self_type" : "type-7282",
+   "referenced_type" : "type-7307",
+   "self_type" : "type-7306",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21048,8 +21051,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-7296",
-   "self_type" : "type-7295",
+   "referenced_type" : "type-7319",
+   "self_type" : "type-7318",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21057,8 +21060,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-7496",
-   "self_type" : "type-7495",
+   "referenced_type" : "type-7521",
+   "self_type" : "type-7520",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21066,8 +21069,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-7642",
-   "self_type" : "type-7641",
+   "referenced_type" : "type-7665",
+   "self_type" : "type-7664",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21084,8 +21087,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FileDescriptor::Autoclose *",
    "name" : "android::FileDescriptor::Autoclose *",
-   "referenced_type" : "type-1204",
-   "self_type" : "type-1213",
+   "referenced_type" : "type-1203",
+   "self_type" : "type-1212",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h"
   },
@@ -21094,7 +21097,7 @@
    "linker_set_key" : "android::Flattenable<android::BufferItem> *",
    "name" : "android::Flattenable<android::BufferItem> *",
    "referenced_type" : "type-21",
-   "self_type" : "type-1510",
+   "self_type" : "type-1513",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -21103,7 +21106,7 @@
    "linker_set_key" : "android::Flattenable<android::Fence> *",
    "name" : "android::Flattenable<android::Fence> *",
    "referenced_type" : "type-16",
-   "self_type" : "type-1636",
+   "self_type" : "type-1642",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -21112,7 +21115,7 @@
    "linker_set_key" : "android::Flattenable<android::FrameEventHistoryDelta> *",
    "name" : "android::Flattenable<android::FrameEventHistoryDelta> *",
    "referenced_type" : "type-25",
-   "self_type" : "type-4308",
+   "self_type" : "type-4314",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -21121,7 +21124,7 @@
    "linker_set_key" : "android::Flattenable<android::GraphicBuffer> *",
    "name" : "android::Flattenable<android::GraphicBuffer> *",
    "referenced_type" : "type-14",
-   "self_type" : "type-1640",
+   "self_type" : "type-1645",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -21130,7 +21133,7 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> *",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> *",
    "referenced_type" : "type-32",
-   "self_type" : "type-4311",
+   "self_type" : "type-4317",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -21139,7 +21142,7 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> *",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> *",
    "referenced_type" : "type-34",
-   "self_type" : "type-4314",
+   "self_type" : "type-4320",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -21156,8 +21159,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-1175",
-   "self_type" : "type-1174",
+   "referenced_type" : "type-1178",
+   "self_type" : "type-1177",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21165,8 +21168,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-1468",
-   "self_type" : "type-1467",
+   "referenced_type" : "type-1472",
+   "self_type" : "type-1471",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21174,8 +21177,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-3778",
-   "self_type" : "type-3777",
+   "referenced_type" : "type-3784",
+   "self_type" : "type-3783",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21183,8 +21186,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-3997",
-   "self_type" : "type-3996",
+   "referenced_type" : "type-4003",
+   "self_type" : "type-4002",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21192,8 +21195,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-5839",
-   "self_type" : "type-5838",
+   "referenced_type" : "type-5859",
+   "self_type" : "type-5858",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21201,8 +21204,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-6389",
-   "self_type" : "type-6388",
+   "referenced_type" : "type-6412",
+   "self_type" : "type-6411",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21210,8 +21213,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-6571",
-   "self_type" : "type-6570",
+   "referenced_type" : "type-6594",
+   "self_type" : "type-6593",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21228,8 +21231,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1331",
-   "self_type" : "type-1330",
+   "referenced_type" : "type-1330",
+   "self_type" : "type-1329",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21237,8 +21240,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1416",
-   "self_type" : "type-1415",
+   "referenced_type" : "type-1419",
+   "self_type" : "type-1418",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21246,8 +21249,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1459",
-   "self_type" : "type-1458",
+   "referenced_type" : "type-1463",
+   "self_type" : "type-1462",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21255,8 +21258,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1587",
-   "self_type" : "type-1586",
+   "referenced_type" : "type-1591",
+   "self_type" : "type-1590",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21264,8 +21267,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-1608",
-   "self_type" : "type-1607",
+   "referenced_type" : "type-1612",
+   "self_type" : "type-1611",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21273,8 +21276,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3452",
-   "self_type" : "type-3451",
+   "referenced_type" : "type-3455",
+   "self_type" : "type-3454",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21282,8 +21285,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3487",
-   "self_type" : "type-3486",
+   "referenced_type" : "type-3490",
+   "self_type" : "type-3489",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21291,8 +21294,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3597",
-   "self_type" : "type-3596",
+   "referenced_type" : "type-3600",
+   "self_type" : "type-3599",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21300,8 +21303,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3662",
-   "self_type" : "type-3661",
+   "referenced_type" : "type-3665",
+   "self_type" : "type-3664",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21309,8 +21312,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3882",
-   "self_type" : "type-3881",
+   "referenced_type" : "type-3884",
+   "self_type" : "type-3883",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21318,8 +21321,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3943",
-   "self_type" : "type-3942",
+   "referenced_type" : "type-3949",
+   "self_type" : "type-3948",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21327,8 +21330,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3990",
-   "self_type" : "type-3989",
+   "referenced_type" : "type-3996",
+   "self_type" : "type-3995",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21336,8 +21339,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-4066",
-   "self_type" : "type-4065",
+   "referenced_type" : "type-4072",
+   "self_type" : "type-4071",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21345,8 +21348,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-4081",
-   "self_type" : "type-4080",
+   "referenced_type" : "type-4087",
+   "self_type" : "type-4086",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21354,8 +21357,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-4447",
-   "self_type" : "type-4446",
+   "referenced_type" : "type-4453",
+   "self_type" : "type-4452",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21363,8 +21366,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-4547",
-   "self_type" : "type-4546",
+   "referenced_type" : "type-4551",
+   "self_type" : "type-4550",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21372,8 +21375,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-4676",
-   "self_type" : "type-4675",
+   "referenced_type" : "type-4683",
+   "self_type" : "type-4682",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21381,8 +21384,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5132",
-   "self_type" : "type-5131",
+   "referenced_type" : "type-5149",
+   "self_type" : "type-5148",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21390,8 +21393,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5513",
-   "self_type" : "type-5512",
+   "referenced_type" : "type-5530",
+   "self_type" : "type-5529",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21399,8 +21402,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5548",
-   "self_type" : "type-5547",
+   "referenced_type" : "type-5565",
+   "self_type" : "type-5564",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21408,8 +21411,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5658",
-   "self_type" : "type-5657",
+   "referenced_type" : "type-5675",
+   "self_type" : "type-5674",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21417,8 +21420,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5723",
-   "self_type" : "type-5722",
+   "referenced_type" : "type-5740",
+   "self_type" : "type-5739",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21426,8 +21429,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5943",
-   "self_type" : "type-5942",
+   "referenced_type" : "type-5959",
+   "self_type" : "type-5958",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21435,8 +21438,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5970",
-   "self_type" : "type-5969",
+   "referenced_type" : "type-5990",
+   "self_type" : "type-5989",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21444,8 +21447,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6116",
-   "self_type" : "type-6115",
+   "referenced_type" : "type-6136",
+   "self_type" : "type-6135",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21453,8 +21456,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6144",
-   "self_type" : "type-6143",
+   "referenced_type" : "type-6164",
+   "self_type" : "type-6163",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21462,8 +21465,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6243",
-   "self_type" : "type-6242",
+   "referenced_type" : "type-6263",
+   "self_type" : "type-6262",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21471,8 +21474,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6296",
-   "self_type" : "type-6295",
+   "referenced_type" : "type-6316",
+   "self_type" : "type-6315",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21480,8 +21483,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6462",
-   "self_type" : "type-6461",
+   "referenced_type" : "type-6481",
+   "self_type" : "type-6480",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21489,8 +21492,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6522",
-   "self_type" : "type-6521",
+   "referenced_type" : "type-6545",
+   "self_type" : "type-6544",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21498,8 +21501,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6564",
-   "self_type" : "type-6563",
+   "referenced_type" : "type-6587",
+   "self_type" : "type-6586",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21507,8 +21510,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6613",
-   "self_type" : "type-6612",
+   "referenced_type" : "type-6632",
+   "self_type" : "type-6631",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21516,8 +21519,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6639",
-   "self_type" : "type-6638",
+   "referenced_type" : "type-6662",
+   "self_type" : "type-6661",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21525,8 +21528,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6652",
-   "self_type" : "type-6651",
+   "referenced_type" : "type-6675",
+   "self_type" : "type-6674",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21534,17 +21537,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-7039",
-   "self_type" : "type-7038",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-7303",
-   "self_type" : "type-7302",
+   "referenced_type" : "type-7062",
+   "self_type" : "type-7061",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21561,6 +21555,15 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-7326",
+   "self_type" : "type-7325",
+   "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,
@@ -21570,8 +21573,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-7500",
-   "self_type" : "type-7499",
+   "referenced_type" : "type-7523",
+   "self_type" : "type-7522",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21579,8 +21582,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-7645",
-   "self_type" : "type-7644",
+   "referenced_type" : "type-7668",
+   "self_type" : "type-7667",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21606,8 +21609,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1088",
-   "self_type" : "type-1087",
+   "referenced_type" : "type-1091",
+   "self_type" : "type-1090",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21615,8 +21618,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1270",
-   "self_type" : "type-1269",
+   "referenced_type" : "type-1273",
+   "self_type" : "type-1272",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21624,8 +21627,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1412",
-   "self_type" : "type-1411",
+   "referenced_type" : "type-1415",
+   "self_type" : "type-1414",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21633,8 +21636,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-1448",
-   "self_type" : "type-1447",
+   "referenced_type" : "type-1451",
+   "self_type" : "type-1450",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21642,8 +21645,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-2174",
-   "self_type" : "type-2173",
+   "referenced_type" : "type-2178",
+   "self_type" : "type-2177",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21651,8 +21654,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3252",
-   "self_type" : "type-3251",
+   "referenced_type" : "type-3255",
+   "self_type" : "type-3254",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21669,8 +21672,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3465",
-   "self_type" : "type-3464",
+   "referenced_type" : "type-3468",
+   "self_type" : "type-3467",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21678,8 +21681,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3530",
-   "self_type" : "type-3529",
+   "referenced_type" : "type-3533",
+   "self_type" : "type-3532",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21687,8 +21690,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3641",
-   "self_type" : "type-3640",
+   "referenced_type" : "type-3644",
+   "self_type" : "type-3643",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21696,8 +21699,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3698",
-   "self_type" : "type-3697",
+   "referenced_type" : "type-3704",
+   "self_type" : "type-3703",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21705,8 +21708,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3823",
-   "self_type" : "type-3822",
+   "referenced_type" : "type-3829",
+   "self_type" : "type-3828",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21714,8 +21717,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3939",
-   "self_type" : "type-3938",
+   "referenced_type" : "type-3945",
+   "self_type" : "type-3944",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21723,8 +21726,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3980",
-   "self_type" : "type-3979",
+   "referenced_type" : "type-3987",
+   "self_type" : "type-3986",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21732,8 +21735,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-4209",
-   "self_type" : "type-4208",
+   "referenced_type" : "type-4216",
+   "self_type" : "type-4215",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21741,8 +21744,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-4388",
-   "self_type" : "type-4387",
+   "referenced_type" : "type-4394",
+   "self_type" : "type-4393",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21750,8 +21753,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-4600",
-   "self_type" : "type-4599",
+   "referenced_type" : "type-4607",
+   "self_type" : "type-4606",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21759,8 +21762,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-4766",
-   "self_type" : "type-4765",
+   "referenced_type" : "type-4773",
+   "self_type" : "type-4772",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21768,8 +21771,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5082",
-   "self_type" : "type-5081",
+   "referenced_type" : "type-5098",
+   "self_type" : "type-5097",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21777,8 +21780,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5150",
-   "self_type" : "type-5149",
+   "referenced_type" : "type-5166",
+   "self_type" : "type-5165",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21786,8 +21789,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5313",
-   "self_type" : "type-5312",
+   "referenced_type" : "type-5330",
+   "self_type" : "type-5329",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21795,8 +21798,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5526",
-   "self_type" : "type-5525",
+   "referenced_type" : "type-5543",
+   "self_type" : "type-5542",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21804,8 +21807,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5591",
-   "self_type" : "type-5590",
+   "referenced_type" : "type-5608",
+   "self_type" : "type-5607",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21813,8 +21816,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5702",
-   "self_type" : "type-5701",
+   "referenced_type" : "type-5719",
+   "self_type" : "type-5718",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21822,8 +21825,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5759",
-   "self_type" : "type-5758",
+   "referenced_type" : "type-5779",
+   "self_type" : "type-5778",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21831,8 +21834,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5884",
-   "self_type" : "type-5883",
+   "referenced_type" : "type-5904",
+   "self_type" : "type-5903",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21840,8 +21843,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6044",
-   "self_type" : "type-6043",
+   "referenced_type" : "type-6064",
+   "self_type" : "type-6063",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21849,8 +21852,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6127",
-   "self_type" : "type-6126",
+   "referenced_type" : "type-6148",
+   "self_type" : "type-6147",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21858,8 +21861,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6179",
-   "self_type" : "type-6178",
+   "referenced_type" : "type-6199",
+   "self_type" : "type-6198",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21867,8 +21870,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6273",
-   "self_type" : "type-6272",
+   "referenced_type" : "type-6293",
+   "self_type" : "type-6292",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21876,8 +21879,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6317",
-   "self_type" : "type-6316",
+   "referenced_type" : "type-6340",
+   "self_type" : "type-6339",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21885,8 +21888,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6412",
-   "self_type" : "type-6411",
+   "referenced_type" : "type-6436",
+   "self_type" : "type-6435",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21894,8 +21897,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6518",
-   "self_type" : "type-6517",
+   "referenced_type" : "type-6541",
+   "self_type" : "type-6540",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21903,8 +21906,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6555",
-   "self_type" : "type-6554",
+   "referenced_type" : "type-6578",
+   "self_type" : "type-6577",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21912,8 +21915,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6801",
-   "self_type" : "type-6800",
+   "referenced_type" : "type-6824",
+   "self_type" : "type-6823",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21921,8 +21924,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6973",
-   "self_type" : "type-6972",
+   "referenced_type" : "type-6997",
+   "self_type" : "type-6996",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21930,8 +21933,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-7225",
-   "self_type" : "type-7224",
+   "referenced_type" : "type-7248",
+   "self_type" : "type-7247",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21939,8 +21942,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-7363",
-   "self_type" : "type-7362",
+   "referenced_type" : "type-7387",
+   "self_type" : "type-7386",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21957,8 +21960,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-7587",
-   "self_type" : "type-7586",
+   "referenced_type" : "type-7610",
+   "self_type" : "type-7609",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -22002,8 +22005,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
    "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-3902",
-   "self_type" : "type-3901",
+   "referenced_type" : "type-3908",
+   "self_type" : "type-3907",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22020,8 +22023,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
    "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-5963",
-   "self_type" : "type-5962",
+   "referenced_type" : "type-5983",
+   "self_type" : "type-5982",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22029,8 +22032,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
    "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-5990",
-   "self_type" : "type-5989",
+   "referenced_type" : "type-6010",
+   "self_type" : "type-6009",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22047,8 +22050,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-4257",
-   "self_type" : "type-4256",
+   "referenced_type" : "type-4263",
+   "self_type" : "type-4262",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22056,8 +22059,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-4266",
-   "self_type" : "type-4265",
+   "referenced_type" : "type-4272",
+   "self_type" : "type-4271",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22065,8 +22068,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-4693",
-   "self_type" : "type-4692",
+   "referenced_type" : "type-4700",
+   "self_type" : "type-4699",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22074,8 +22077,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-6853",
-   "self_type" : "type-6852",
+   "referenced_type" : "type-6876",
+   "self_type" : "type-6875",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22083,8 +22086,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-6859",
-   "self_type" : "type-6858",
+   "referenced_type" : "type-6882",
+   "self_type" : "type-6881",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22092,8 +22095,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-7316",
-   "self_type" : "type-7315",
+   "referenced_type" : "type-7339",
+   "self_type" : "type-7338",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22101,8 +22104,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-7648",
-   "self_type" : "type-7647",
+   "referenced_type" : "type-7671",
+   "self_type" : "type-7670",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22110,8 +22113,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
    "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
-   "referenced_type" : "type-4829",
-   "self_type" : "type-4828",
+   "referenced_type" : "type-4835",
+   "self_type" : "type-4834",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22119,8 +22122,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
    "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
-   "referenced_type" : "type-5098",
-   "self_type" : "type-5097",
+   "referenced_type" : "type-5114",
+   "self_type" : "type-5113",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22128,8 +22131,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
    "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
-   "referenced_type" : "type-7418",
-   "self_type" : "type-7417",
+   "referenced_type" : "type-7442",
+   "self_type" : "type-7441",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22137,8 +22140,8 @@
    "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",
+   "referenced_type" : "type-4289",
+   "self_type" : "type-4288",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22146,8 +22149,8 @@
    "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",
+   "referenced_type" : "type-4671",
+   "self_type" : "type-4670",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22155,8 +22158,8 @@
    "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",
+   "referenced_type" : "type-6896",
+   "self_type" : "type-6895",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22164,8 +22167,8 @@
    "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",
+   "referenced_type" : "type-7317",
+   "self_type" : "type-7316",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22173,8 +22176,8 @@
    "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",
+   "referenced_type" : "type-4831",
+   "self_type" : "type-4830",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22182,8 +22185,8 @@
    "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",
+   "referenced_type" : "type-7438",
+   "self_type" : "type-7437",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22191,8 +22194,8 @@
    "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",
+   "referenced_type" : "type-4291",
+   "self_type" : "type-4290",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22200,8 +22203,8 @@
    "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",
+   "referenced_type" : "type-6898",
+   "self_type" : "type-6897",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22209,8 +22212,8 @@
    "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",
+   "referenced_type" : "type-7653",
+   "self_type" : "type-7652",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22218,8 +22221,8 @@
    "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",
+   "referenced_type" : "type-5110",
+   "self_type" : "type-5109",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22227,8 +22230,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::HpGraphicBufferProducer *",
    "name" : "android::HpGraphicBufferProducer *",
-   "referenced_type" : "type-4246",
-   "self_type" : "type-4245",
+   "referenced_type" : "type-4252",
+   "self_type" : "type-4251",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22236,8 +22239,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::HpGraphicBufferProducer *",
    "name" : "android::HpGraphicBufferProducer *",
-   "referenced_type" : "type-6842",
-   "self_type" : "type-6841",
+   "referenced_type" : "type-6865",
+   "self_type" : "type-6864",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22245,8 +22248,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::HpProducerListener *",
    "name" : "android::HpProducerListener *",
-   "referenced_type" : "type-4521",
-   "self_type" : "type-4520",
+   "referenced_type" : "type-4527",
+   "self_type" : "type-4526",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22254,8 +22257,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::HpProducerListener *",
    "name" : "android::HpProducerListener *",
-   "referenced_type" : "type-7114",
-   "self_type" : "type-7113",
+   "referenced_type" : "type-7138",
+   "self_type" : "type-7137",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22290,8 +22293,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-1154",
-   "self_type" : "type-1153",
+   "referenced_type" : "type-1157",
+   "self_type" : "type-1156",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22299,8 +22302,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-1576",
-   "self_type" : "type-1575",
+   "referenced_type" : "type-1579",
+   "self_type" : "type-1578",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22308,8 +22311,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-1614",
-   "self_type" : "type-1613",
+   "referenced_type" : "type-1618",
+   "self_type" : "type-1617",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22317,8 +22320,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-3498",
-   "self_type" : "type-3497",
+   "referenced_type" : "type-3501",
+   "self_type" : "type-3500",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22326,8 +22329,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-3605",
-   "self_type" : "type-3604",
+   "referenced_type" : "type-3608",
+   "self_type" : "type-3607",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22335,8 +22338,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-3664",
-   "self_type" : "type-3663",
+   "referenced_type" : "type-3667",
+   "self_type" : "type-3666",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22344,8 +22347,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-3757",
-   "self_type" : "type-3756",
+   "referenced_type" : "type-3765",
+   "self_type" : "type-3764",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22353,8 +22356,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-4055",
-   "self_type" : "type-4054",
+   "referenced_type" : "type-4062",
+   "self_type" : "type-4061",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22362,8 +22365,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-4085",
-   "self_type" : "type-4084",
+   "referenced_type" : "type-4091",
+   "self_type" : "type-4090",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22371,8 +22374,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-4945",
-   "self_type" : "type-4944",
+   "referenced_type" : "type-4951",
+   "self_type" : "type-4950",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22380,8 +22383,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-5135",
-   "self_type" : "type-5134",
+   "referenced_type" : "type-5151",
+   "self_type" : "type-5150",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22389,8 +22392,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-5559",
-   "self_type" : "type-5558",
+   "referenced_type" : "type-5576",
+   "self_type" : "type-5575",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22398,8 +22401,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-5666",
-   "self_type" : "type-5665",
+   "referenced_type" : "type-5683",
+   "self_type" : "type-5682",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22407,8 +22410,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-5725",
-   "self_type" : "type-5724",
+   "referenced_type" : "type-5742",
+   "self_type" : "type-5741",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22416,8 +22419,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-5818",
-   "self_type" : "type-5817",
+   "referenced_type" : "type-5840",
+   "self_type" : "type-5839",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22425,8 +22428,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-6004",
-   "self_type" : "type-6003",
+   "referenced_type" : "type-6024",
+   "self_type" : "type-6023",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22434,8 +22437,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-6153",
-   "self_type" : "type-6152",
+   "referenced_type" : "type-6173",
+   "self_type" : "type-6172",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22443,8 +22446,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-6248",
-   "self_type" : "type-6247",
+   "referenced_type" : "type-6269",
+   "self_type" : "type-6268",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22452,8 +22455,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-6298",
-   "self_type" : "type-6297",
+   "referenced_type" : "type-6318",
+   "self_type" : "type-6317",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22461,8 +22464,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-6373",
-   "self_type" : "type-6372",
+   "referenced_type" : "type-6396",
+   "self_type" : "type-6395",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22470,8 +22473,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-6629",
-   "self_type" : "type-6628",
+   "referenced_type" : "type-6652",
+   "self_type" : "type-6651",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22479,8 +22482,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-6656",
-   "self_type" : "type-6655",
+   "referenced_type" : "type-6679",
+   "self_type" : "type-6678",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22488,8 +22491,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-7208",
-   "self_type" : "type-7207",
+   "referenced_type" : "type-7224",
+   "self_type" : "type-7223",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22524,8 +22527,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-1172",
-   "self_type" : "type-1171",
+   "referenced_type" : "type-1175",
+   "self_type" : "type-1174",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22533,8 +22536,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-1466",
-   "self_type" : "type-1465",
+   "referenced_type" : "type-1470",
+   "self_type" : "type-1469",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22542,8 +22545,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-1599",
-   "self_type" : "type-1598",
+   "referenced_type" : "type-1603",
+   "self_type" : "type-1602",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22551,8 +22554,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-3489",
-   "self_type" : "type-3488",
+   "referenced_type" : "type-3492",
+   "self_type" : "type-3491",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22560,8 +22563,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-3776",
-   "self_type" : "type-3775",
+   "referenced_type" : "type-3782",
+   "self_type" : "type-3781",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22569,8 +22572,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-3969",
-   "self_type" : "type-3968",
+   "referenced_type" : "type-3975",
+   "self_type" : "type-3974",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22578,8 +22581,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-3995",
-   "self_type" : "type-3994",
+   "referenced_type" : "type-4001",
+   "self_type" : "type-4000",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22587,8 +22590,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-4073",
-   "self_type" : "type-4072",
+   "referenced_type" : "type-4079",
+   "self_type" : "type-4078",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22596,8 +22599,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-5550",
-   "self_type" : "type-5549",
+   "referenced_type" : "type-5567",
+   "self_type" : "type-5566",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22614,8 +22617,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-5837",
-   "self_type" : "type-5836",
+   "referenced_type" : "type-5857",
+   "self_type" : "type-5856",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22623,8 +22626,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-5992",
-   "self_type" : "type-5991",
+   "referenced_type" : "type-6012",
+   "self_type" : "type-6011",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22632,8 +22635,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6028",
-   "self_type" : "type-6027",
+   "referenced_type" : "type-6048",
+   "self_type" : "type-6047",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22641,8 +22644,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6146",
-   "self_type" : "type-6145",
+   "referenced_type" : "type-6166",
+   "self_type" : "type-6165",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22650,8 +22653,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6387",
-   "self_type" : "type-6386",
+   "referenced_type" : "type-6410",
+   "self_type" : "type-6409",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22659,8 +22662,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6569",
-   "self_type" : "type-6568",
+   "referenced_type" : "type-6592",
+   "self_type" : "type-6591",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22668,8 +22671,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6644",
-   "self_type" : "type-6643",
+   "referenced_type" : "type-6667",
+   "self_type" : "type-6666",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22686,8 +22689,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-3500",
-   "self_type" : "type-3499",
+   "referenced_type" : "type-3503",
+   "self_type" : "type-3502",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22695,8 +22698,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-3956",
-   "self_type" : "type-3955",
+   "referenced_type" : "type-3959",
+   "self_type" : "type-3958",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22704,8 +22707,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-4225",
-   "self_type" : "type-4224",
+   "referenced_type" : "type-4231",
+   "self_type" : "type-4230",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22713,8 +22716,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-5561",
-   "self_type" : "type-5560",
+   "referenced_type" : "type-5578",
+   "self_type" : "type-5577",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22731,8 +22734,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-5988",
-   "self_type" : "type-5987",
+   "referenced_type" : "type-6008",
+   "self_type" : "type-6007",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22740,8 +22743,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-6023",
-   "self_type" : "type-6022",
+   "referenced_type" : "type-6040",
+   "self_type" : "type-6039",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22749,8 +22752,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-6155",
-   "self_type" : "type-6154",
+   "referenced_type" : "type-6175",
+   "self_type" : "type-6174",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22758,8 +22761,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-6827",
-   "self_type" : "type-6826",
+   "referenced_type" : "type-6850",
+   "self_type" : "type-6849",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22767,8 +22770,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-7502",
-   "self_type" : "type-7501",
+   "referenced_type" : "type-7526",
+   "self_type" : "type-7525",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22794,8 +22797,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1265",
-   "self_type" : "type-1264",
+   "referenced_type" : "type-1268",
+   "self_type" : "type-1267",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -22803,8 +22806,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1369",
-   "self_type" : "type-1368",
+   "referenced_type" : "type-1372",
+   "self_type" : "type-1371",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -22812,8 +22815,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-3818",
-   "self_type" : "type-3817",
+   "referenced_type" : "type-3825",
+   "self_type" : "type-3824",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -22821,8 +22824,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-3914",
-   "self_type" : "type-3913",
+   "referenced_type" : "type-3920",
+   "self_type" : "type-3919",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -22830,8 +22833,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-5879",
-   "self_type" : "type-5878",
+   "referenced_type" : "type-5900",
+   "self_type" : "type-5899",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -22839,8 +22842,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-6406",
-   "self_type" : "type-6405",
+   "referenced_type" : "type-6429",
+   "self_type" : "type-6428",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -22848,8 +22851,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-6492",
-   "self_type" : "type-6491",
+   "referenced_type" : "type-6515",
+   "self_type" : "type-6514",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -22866,8 +22869,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-1159",
-   "self_type" : "type-1158",
+   "referenced_type" : "type-1162",
+   "self_type" : "type-1161",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22875,8 +22878,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-3508",
-   "self_type" : "type-3507",
+   "referenced_type" : "type-3511",
+   "self_type" : "type-3510",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22884,8 +22887,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-3618",
-   "self_type" : "type-3617",
+   "referenced_type" : "type-3621",
+   "self_type" : "type-3620",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22893,8 +22896,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-3666",
-   "self_type" : "type-3665",
+   "referenced_type" : "type-3669",
+   "self_type" : "type-3668",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22902,8 +22905,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-3764",
-   "self_type" : "type-3763",
+   "referenced_type" : "type-3770",
+   "self_type" : "type-3769",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22911,8 +22914,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-4251",
-   "self_type" : "type-4250",
+   "referenced_type" : "type-4257",
+   "self_type" : "type-4256",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22920,8 +22923,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-4515",
-   "self_type" : "type-4514",
+   "referenced_type" : "type-4521",
+   "self_type" : "type-4520",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22929,8 +22932,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-4558",
-   "self_type" : "type-4557",
+   "referenced_type" : "type-4564",
+   "self_type" : "type-4563",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22938,8 +22941,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-4688",
-   "self_type" : "type-4687",
+   "referenced_type" : "type-4694",
+   "self_type" : "type-4693",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22947,8 +22950,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-4950",
-   "self_type" : "type-4949",
+   "referenced_type" : "type-4956",
+   "self_type" : "type-4955",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22956,8 +22959,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-5137",
-   "self_type" : "type-5136",
+   "referenced_type" : "type-5153",
+   "self_type" : "type-5152",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22965,8 +22968,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-5569",
-   "self_type" : "type-5568",
+   "referenced_type" : "type-5586",
+   "self_type" : "type-5585",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22974,8 +22977,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-5679",
-   "self_type" : "type-5678",
+   "referenced_type" : "type-5696",
+   "self_type" : "type-5695",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22983,8 +22986,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-5727",
-   "self_type" : "type-5726",
+   "referenced_type" : "type-5744",
+   "self_type" : "type-5743",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22992,8 +22995,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-5825",
-   "self_type" : "type-5824",
+   "referenced_type" : "type-5845",
+   "self_type" : "type-5844",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23001,8 +23004,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6008",
-   "self_type" : "type-6007",
+   "referenced_type" : "type-6028",
+   "self_type" : "type-6027",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23010,8 +23013,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6162",
-   "self_type" : "type-6161",
+   "referenced_type" : "type-6182",
+   "self_type" : "type-6181",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23019,8 +23022,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6256",
-   "self_type" : "type-6255",
+   "referenced_type" : "type-6276",
+   "self_type" : "type-6275",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23028,8 +23031,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6300",
-   "self_type" : "type-6299",
+   "referenced_type" : "type-6320",
+   "self_type" : "type-6319",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23037,8 +23040,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6378",
-   "self_type" : "type-6377",
+   "referenced_type" : "type-6401",
+   "self_type" : "type-6400",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23046,8 +23049,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6847",
-   "self_type" : "type-6846",
+   "referenced_type" : "type-6870",
+   "self_type" : "type-6869",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23055,8 +23058,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7107",
-   "self_type" : "type-7106",
+   "referenced_type" : "type-7131",
+   "self_type" : "type-7130",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23064,8 +23067,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7166",
-   "self_type" : "type-7165",
+   "referenced_type" : "type-7190",
+   "self_type" : "type-7189",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23073,8 +23076,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7229",
-   "self_type" : "type-7228",
+   "referenced_type" : "type-7250",
+   "self_type" : "type-7249",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23082,8 +23085,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7311",
-   "self_type" : "type-7310",
+   "referenced_type" : "type-7334",
+   "self_type" : "type-7333",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23091,8 +23094,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7485",
-   "self_type" : "type-7484",
+   "referenced_type" : "type-7508",
+   "self_type" : "type-7507",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23100,8 +23103,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7491",
-   "self_type" : "type-7490",
+   "referenced_type" : "type-7515",
+   "self_type" : "type-7514",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23109,8 +23112,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7619",
-   "self_type" : "type-7618",
+   "referenced_type" : "type-7643",
+   "self_type" : "type-7642",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23118,8 +23121,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7640",
-   "self_type" : "type-7639",
+   "referenced_type" : "type-7663",
+   "self_type" : "type-7662",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23154,8 +23157,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ISurfaceComposer *",
    "name" : "android::ISurfaceComposer *",
-   "referenced_type" : "type-1050",
-   "self_type" : "type-1049",
+   "referenced_type" : "type-1053",
+   "self_type" : "type-1052",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23163,8 +23166,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ISurfaceComposer *",
    "name" : "android::ISurfaceComposer *",
-   "referenced_type" : "type-3677",
-   "self_type" : "type-3676",
+   "referenced_type" : "type-3683",
+   "self_type" : "type-3682",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23172,8 +23175,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ISurfaceComposer *",
    "name" : "android::ISurfaceComposer *",
-   "referenced_type" : "type-5738",
-   "self_type" : "type-5737",
+   "referenced_type" : "type-5758",
+   "self_type" : "type-5757",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23181,8 +23184,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ISurfaceComposer *",
    "name" : "android::ISurfaceComposer *",
-   "referenced_type" : "type-6304",
-   "self_type" : "type-6303",
+   "referenced_type" : "type-6327",
+   "self_type" : "type-6326",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23190,8 +23193,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ITransactionCompletedListener *",
    "name" : "android::ITransactionCompletedListener *",
-   "referenced_type" : "type-1042",
-   "self_type" : "type-1041",
+   "referenced_type" : "type-1046",
+   "self_type" : "type-1045",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23199,8 +23202,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ITransactionCompletedListener *",
    "name" : "android::ITransactionCompletedListener *",
-   "referenced_type" : "type-3672",
-   "self_type" : "type-3671",
+   "referenced_type" : "type-3678",
+   "self_type" : "type-3677",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23208,8 +23211,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ITransactionCompletedListener *",
    "name" : "android::ITransactionCompletedListener *",
-   "referenced_type" : "type-5733",
-   "self_type" : "type-5732",
+   "referenced_type" : "type-5753",
+   "self_type" : "type-5752",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23217,8 +23220,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ITransactionCompletedListener *",
    "name" : "android::ITransactionCompletedListener *",
-   "referenced_type" : "type-6302",
-   "self_type" : "type-6301",
+   "referenced_type" : "type-6325",
+   "self_type" : "type-6324",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23253,8 +23256,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::LWProducerListener *",
    "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-2539",
-   "self_type" : "type-2538",
+   "referenced_type" : "type-2542",
+   "self_type" : "type-2541",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23262,8 +23265,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::LWProducerListener *",
    "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-4953",
-   "self_type" : "type-4952",
+   "referenced_type" : "type-4959",
+   "self_type" : "type-4958",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23271,8 +23274,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::LWProducerListener *",
    "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-6010",
-   "self_type" : "type-6009",
+   "referenced_type" : "type-6030",
+   "self_type" : "type-6029",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23280,8 +23283,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::LWProducerListener *",
    "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-7255",
-   "self_type" : "type-7254",
+   "referenced_type" : "type-7272",
+   "self_type" : "type-7271",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23290,7 +23293,7 @@
    "linker_set_key" : "android::LightFlattenablePod<android::Rect> *",
    "name" : "android::LightFlattenablePod<android::Rect> *",
    "referenced_type" : "type-46",
-   "self_type" : "type-4589",
+   "self_type" : "type-4595",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -23334,8 +23337,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::List<Event>::_Node *",
    "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-3687",
-   "self_type" : "type-3686",
+   "referenced_type" : "type-3693",
+   "self_type" : "type-3692",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -23343,8 +23346,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::List<Event>::_Node *",
    "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-5748",
-   "self_type" : "type-5747",
+   "referenced_type" : "type-5768",
+   "self_type" : "type-5767",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -23352,8 +23355,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::List<Event>::_Node *",
    "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-6039",
-   "self_type" : "type-6038",
+   "referenced_type" : "type-6060",
+   "self_type" : "type-6059",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -23469,8 +23472,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::OMXPluginBase *",
    "name" : "android::OMXPluginBase *",
-   "referenced_type" : "type-2393",
-   "self_type" : "type-2394",
+   "referenced_type" : "type-2396",
+   "self_type" : "type-2397",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h"
   },
@@ -23487,8 +23490,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel::FlattenableHelper<android::BufferItem> *",
    "name" : "android::Parcel::FlattenableHelper<android::BufferItem> *",
-   "referenced_type" : "type-1516",
-   "self_type" : "type-1518",
+   "referenced_type" : "type-1520",
+   "self_type" : "type-1522",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -23496,8 +23499,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel::FlattenableHelper<android::Fence> *",
    "name" : "android::Parcel::FlattenableHelper<android::Fence> *",
-   "referenced_type" : "type-1658",
-   "self_type" : "type-1661",
+   "referenced_type" : "type-1662",
+   "self_type" : "type-1665",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -23505,8 +23508,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta> *",
    "name" : "android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta> *",
-   "referenced_type" : "type-4328",
-   "self_type" : "type-4330",
+   "referenced_type" : "type-4334",
+   "self_type" : "type-4336",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -23514,8 +23517,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Parcel::FlattenableHelper<android::GraphicBuffer> *",
    "name" : "android::Parcel::FlattenableHelper<android::GraphicBuffer> *",
-   "referenced_type" : "type-1653",
-   "self_type" : "type-1655",
+   "referenced_type" : "type-1657",
+   "self_type" : "type-1659",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -23523,8 +23526,8 @@
    "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",
+   "referenced_type" : "type-4339",
+   "self_type" : "type-4342",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -23532,8 +23535,8 @@
    "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",
+   "referenced_type" : "type-4345",
+   "self_type" : "type-4347",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -23577,8 +23580,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ProcessState *",
    "name" : "android::ProcessState *",
-   "referenced_type" : "type-1261",
-   "self_type" : "type-1260",
+   "referenced_type" : "type-1264",
+   "self_type" : "type-1263",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23622,8 +23625,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1079",
-   "self_type" : "type-1078",
+   "referenced_type" : "type-1082",
+   "self_type" : "type-1081",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23631,8 +23634,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1191",
-   "self_type" : "type-1190",
+   "referenced_type" : "type-1194",
+   "self_type" : "type-1193",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23640,8 +23643,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1352",
-   "self_type" : "type-1351",
+   "referenced_type" : "type-1355",
+   "self_type" : "type-1354",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23649,8 +23652,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1404",
-   "self_type" : "type-1403",
+   "referenced_type" : "type-1407",
+   "self_type" : "type-1406",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23658,8 +23661,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1419",
+   "referenced_type" : "type-1423",
+   "self_type" : "type-1422",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23667,8 +23670,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1441",
-   "self_type" : "type-1440",
+   "referenced_type" : "type-1444",
+   "self_type" : "type-1443",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23676,8 +23679,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1482",
-   "self_type" : "type-1481",
+   "referenced_type" : "type-1486",
+   "self_type" : "type-1485",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23685,8 +23688,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1616",
-   "self_type" : "type-1615",
+   "referenced_type" : "type-1620",
+   "self_type" : "type-1619",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23694,8 +23697,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2649",
-   "self_type" : "type-2648",
+   "referenced_type" : "type-2652",
+   "self_type" : "type-2651",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23703,8 +23706,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3459",
-   "self_type" : "type-3458",
+   "referenced_type" : "type-3462",
+   "self_type" : "type-3461",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23712,8 +23715,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3525",
-   "self_type" : "type-3524",
+   "referenced_type" : "type-3528",
+   "self_type" : "type-3527",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23721,8 +23724,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3627",
-   "self_type" : "type-3626",
+   "referenced_type" : "type-3630",
+   "self_type" : "type-3629",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23730,8 +23733,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3689",
-   "self_type" : "type-3688",
+   "referenced_type" : "type-3695",
+   "self_type" : "type-3694",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23739,8 +23742,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3781",
-   "self_type" : "type-3780",
+   "referenced_type" : "type-3787",
+   "self_type" : "type-3786",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23748,8 +23751,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3842",
-   "self_type" : "type-3841",
+   "referenced_type" : "type-3848",
+   "self_type" : "type-3847",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23757,8 +23760,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3906",
-   "self_type" : "type-3905",
+   "referenced_type" : "type-3912",
+   "self_type" : "type-3911",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23766,8 +23769,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3932",
-   "self_type" : "type-3931",
+   "referenced_type" : "type-3938",
+   "self_type" : "type-3937",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23775,8 +23778,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3947",
-   "self_type" : "type-3946",
+   "referenced_type" : "type-3954",
+   "self_type" : "type-3953",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23784,8 +23787,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3973",
-   "self_type" : "type-3972",
+   "referenced_type" : "type-3979",
+   "self_type" : "type-3978",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23793,8 +23796,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4006",
-   "self_type" : "type-4005",
+   "referenced_type" : "type-4012",
+   "self_type" : "type-4011",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23802,8 +23805,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4087",
-   "self_type" : "type-4086",
+   "referenced_type" : "type-4093",
+   "self_type" : "type-4092",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23811,8 +23814,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4287",
-   "self_type" : "type-4286",
+   "referenced_type" : "type-4293",
+   "self_type" : "type-4292",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23820,8 +23823,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4474",
-   "self_type" : "type-4473",
+   "referenced_type" : "type-4480",
+   "self_type" : "type-4479",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23829,8 +23832,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4527",
-   "self_type" : "type-4526",
+   "referenced_type" : "type-4533",
+   "self_type" : "type-4532",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23838,8 +23841,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4535",
-   "self_type" : "type-4534",
+   "referenced_type" : "type-4542",
+   "self_type" : "type-4541",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23847,8 +23850,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4561",
-   "self_type" : "type-4560",
+   "referenced_type" : "type-4567",
+   "self_type" : "type-4566",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23856,8 +23859,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4711",
-   "self_type" : "type-4710",
+   "referenced_type" : "type-4718",
+   "self_type" : "type-4717",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23865,8 +23868,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4842",
-   "self_type" : "type-4841",
+   "referenced_type" : "type-4848",
+   "self_type" : "type-4847",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23874,8 +23877,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4991",
-   "self_type" : "type-4990",
+   "referenced_type" : "type-4997",
+   "self_type" : "type-4996",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23883,8 +23886,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5106",
-   "self_type" : "type-5105",
+   "referenced_type" : "type-5122",
+   "self_type" : "type-5121",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23892,8 +23895,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5143",
-   "self_type" : "type-5142",
+   "referenced_type" : "type-5161",
+   "self_type" : "type-5160",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23910,8 +23913,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5520",
-   "self_type" : "type-5519",
+   "referenced_type" : "type-5537",
+   "self_type" : "type-5536",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23919,8 +23922,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5586",
-   "self_type" : "type-5585",
+   "referenced_type" : "type-5603",
+   "self_type" : "type-5602",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23928,8 +23931,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5688",
-   "self_type" : "type-5687",
+   "referenced_type" : "type-5705",
+   "self_type" : "type-5704",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23937,8 +23940,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5750",
-   "self_type" : "type-5749",
+   "referenced_type" : "type-5770",
+   "self_type" : "type-5769",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23946,8 +23949,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5842",
-   "self_type" : "type-5841",
+   "referenced_type" : "type-5862",
+   "self_type" : "type-5861",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23955,8 +23958,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5903",
-   "self_type" : "type-5902",
+   "referenced_type" : "type-5923",
+   "self_type" : "type-5922",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23964,8 +23967,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5965",
-   "self_type" : "type-5964",
+   "referenced_type" : "type-5985",
+   "self_type" : "type-5984",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23973,8 +23976,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6025",
-   "self_type" : "type-6024",
+   "referenced_type" : "type-6045",
+   "self_type" : "type-6044",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23982,8 +23985,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6121",
-   "self_type" : "type-6120",
+   "referenced_type" : "type-6141",
+   "self_type" : "type-6140",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23991,8 +23994,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6173",
-   "self_type" : "type-6172",
+   "referenced_type" : "type-6193",
+   "self_type" : "type-6192",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24000,8 +24003,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6262",
-   "self_type" : "type-6261",
+   "referenced_type" : "type-6282",
+   "self_type" : "type-6281",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24009,8 +24012,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6311",
-   "self_type" : "type-6310",
+   "referenced_type" : "type-6334",
+   "self_type" : "type-6333",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24018,8 +24021,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6391",
-   "self_type" : "type-6390",
+   "referenced_type" : "type-6414",
+   "self_type" : "type-6413",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24027,8 +24030,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6484",
-   "self_type" : "type-6483",
+   "referenced_type" : "type-6507",
+   "self_type" : "type-6506",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24036,8 +24039,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6510",
-   "self_type" : "type-6509",
+   "referenced_type" : "type-6533",
+   "self_type" : "type-6532",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24045,8 +24048,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6526",
-   "self_type" : "type-6525",
+   "referenced_type" : "type-6550",
+   "self_type" : "type-6549",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24054,8 +24057,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6548",
-   "self_type" : "type-6547",
+   "referenced_type" : "type-6571",
+   "self_type" : "type-6570",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24063,8 +24066,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6580",
-   "self_type" : "type-6579",
+   "referenced_type" : "type-6603",
+   "self_type" : "type-6602",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24072,8 +24075,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6658",
-   "self_type" : "type-6657",
+   "referenced_type" : "type-6683",
+   "self_type" : "type-6682",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24081,8 +24084,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6877",
-   "self_type" : "type-6876",
+   "referenced_type" : "type-6900",
+   "self_type" : "type-6899",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24090,8 +24093,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7061",
-   "self_type" : "type-7060",
+   "referenced_type" : "type-7085",
+   "self_type" : "type-7084",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24099,8 +24102,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7123",
-   "self_type" : "type-7122",
+   "referenced_type" : "type-7147",
+   "self_type" : "type-7146",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24108,8 +24111,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7138",
-   "self_type" : "type-7137",
+   "referenced_type" : "type-7162",
+   "self_type" : "type-7161",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24117,8 +24120,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7175",
-   "self_type" : "type-7174",
+   "referenced_type" : "type-7198",
+   "self_type" : "type-7197",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24126,8 +24129,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7324",
-   "self_type" : "type-7323",
+   "referenced_type" : "type-7348",
+   "self_type" : "type-7347",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24144,8 +24147,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7426",
-   "self_type" : "type-7425",
+   "referenced_type" : "type-7449",
+   "self_type" : "type-7448",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24153,8 +24156,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7461",
-   "self_type" : "type-7460",
+   "referenced_type" : "type-7486",
+   "self_type" : "type-7485",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24162,8 +24165,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7517",
-   "self_type" : "type-7516",
+   "referenced_type" : "type-7540",
+   "self_type" : "type-7539",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24171,8 +24174,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7577",
-   "self_type" : "type-7576",
+   "referenced_type" : "type-7592",
+   "self_type" : "type-7591",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24180,8 +24183,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7595",
-   "self_type" : "type-7594",
+   "referenced_type" : "type-7620",
+   "self_type" : "type-7619",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24189,8 +24192,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7658",
-   "self_type" : "type-7657",
+   "referenced_type" : "type-7682",
+   "self_type" : "type-7681",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24225,8 +24228,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ReferenceRenamer *",
    "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-1166",
-   "self_type" : "type-1212",
+   "referenced_type" : "type-1167",
+   "self_type" : "type-1211",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24234,8 +24237,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> > *",
    "name" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> > *",
-   "referenced_type" : "type-1563",
-   "self_type" : "type-1564",
+   "referenced_type" : "type-1568",
+   "self_type" : "type-1569",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24243,8 +24246,8 @@
    "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",
+   "referenced_type" : "type-1572",
+   "self_type" : "type-1573",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24252,132 +24255,6 @@
    "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,
@@ -24385,8 +24262,17 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long> > *",
-   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long> > *",
+   "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-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<android_dataspace_t> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<android_dataspace_t> > *",
    "referenced_type" : "type-2091",
    "self_type" : "type-2092",
    "size" : 4,
@@ -24394,116 +24280,125 @@
   },
   {
    "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-2111",
+   "self_type" : "type-2112",
+   "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-2097",
+   "self_type" : "type-2098",
+   "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-2116",
+   "self_type" : "type-2117",
+   "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-2086",
+   "self_type" : "type-2087",
+   "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-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<int *, const sp<GraphicBuffer> &> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int *, const sp<GraphicBuffer> &> > *",
+   "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, unsigned long long, const sp<Fence> &> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int, unsigned long long, const sp<Fence> &> > *",
+   "referenced_type" : "type-2064",
+   "self_type" : "type-2065",
+   "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-2055",
+   "self_type" : "type-2056",
+   "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-2107",
+   "self_type" : "type-2108",
+   "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-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<unsigned int> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned int> > *",
+   "referenced_type" : "type-2103",
+   "self_type" : "type-2104",
+   "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-2077",
+   "self_type" : "type-2078",
+   "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-2095",
+   "self_type" : "type-2096",
+   "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,
@@ -24511,17 +24406,62 @@
   },
   {
    "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",
+   "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-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<unsigned long long *> > *",
-   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long *> > *",
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<android_dataspace_t> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<android_dataspace_t> > *",
+   "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<bool, vector<Segment, allocator<Segment> > *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool, vector<Segment, allocator<Segment> > *> > *",
+   "referenced_type" : "type-2169",
+   "self_type" : "type-2170",
+   "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-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<const String8 &, String8 *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &, String8 *> > *",
+   "referenced_type" : "type-2171",
+   "self_type" : "type-2172",
+   "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-2155",
+   "self_type" : "type-2156",
+   "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-2147",
    "self_type" : "type-2148",
    "size" : 4,
@@ -24529,10 +24469,73 @@
   },
   {
    "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-2142",
+   "self_type" : "type-2143",
+   "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-2144",
+   "self_type" : "type-2145",
+   "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-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<sp<NativeHandle> *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<sp<NativeHandle> *> > *",
+   "referenced_type" : "type-2166",
+   "self_type" : "type-2167",
+   "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-2153",
+   "self_type" : "type-2154",
+   "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-2164",
+   "self_type" : "type-2165",
+   "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-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<unsigned long long> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long> > *",
-   "referenced_type" : "type-2156",
-   "self_type" : "type-2157",
+   "referenced_type" : "type-2160",
+   "self_type" : "type-2161",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24540,8 +24543,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::SafeBnInterface<android::IConsumerListener> *",
    "name" : "android::SafeBnInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-1287",
-   "self_type" : "type-1292",
+   "referenced_type" : "type-1290",
+   "self_type" : "type-1295",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24549,8 +24552,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
    "name" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-1276",
-   "self_type" : "type-1286",
+   "referenced_type" : "type-1279",
+   "self_type" : "type-1289",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24558,8 +24561,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::SafeBnInterface<android::ITransactionCompletedListener> *",
    "name" : "android::SafeBnInterface<android::ITransactionCompletedListener> *",
-   "referenced_type" : "type-1102",
-   "self_type" : "type-1105",
+   "referenced_type" : "type-1105",
+   "self_type" : "type-1108",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24567,8 +24570,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::SafeBpInterface<android::IConsumerListener> *",
    "name" : "android::SafeBpInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-1537",
-   "self_type" : "type-1539",
+   "referenced_type" : "type-1541",
+   "self_type" : "type-1543",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24576,8 +24579,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::SafeBpInterface<android::IGraphicBufferConsumer> *",
    "name" : "android::SafeBpInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-1716",
-   "self_type" : "type-1718",
+   "referenced_type" : "type-1720",
+   "self_type" : "type-1723",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24585,8 +24588,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::SafeInterface::ParcelHandler *",
    "name" : "android::SafeInterface::ParcelHandler *",
-   "referenced_type" : "type-1235",
-   "self_type" : "type-1245",
+   "referenced_type" : "type-1238",
+   "self_type" : "type-1247",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24604,7 +24607,7 @@
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > > *",
    "name" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > > *",
    "referenced_type" : "type-159",
-   "self_type" : "type-2674",
+   "self_type" : "type-2677",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -24613,7 +24616,7 @@
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > > *",
    "name" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > > *",
    "referenced_type" : "type-146",
-   "self_type" : "type-2669",
+   "self_type" : "type-2672",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -24622,7 +24625,7 @@
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
    "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
    "referenced_type" : "type-139",
-   "self_type" : "type-2666",
+   "self_type" : "type-2669",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -24630,8 +24633,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 *",
    "name" : "android::String16 *",
-   "referenced_type" : "type-1239",
-   "self_type" : "type-2661",
+   "referenced_type" : "type-1242",
+   "self_type" : "type-2664",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -24640,7 +24643,7 @@
    "linker_set_key" : "android::String8 *",
    "name" : "android::String8 *",
    "referenced_type" : "type-121",
-   "self_type" : "type-1885",
+   "self_type" : "type-1889",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -24648,8 +24651,8 @@
    "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",
+   "referenced_type" : "type-2470",
+   "self_type" : "type-2469",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24657,8 +24660,8 @@
    "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",
+   "referenced_type" : "type-4895",
+   "self_type" : "type-4894",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24666,8 +24669,8 @@
    "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",
+   "referenced_type" : "type-6003",
+   "self_type" : "type-6002",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24675,8 +24678,8 @@
    "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",
+   "referenced_type" : "type-7039",
+   "self_type" : "type-7038",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24694,7 +24697,7 @@
    "linker_set_key" : "android::Vector<android::BufferItem> *",
    "name" : "android::Vector<android::BufferItem> *",
    "referenced_type" : "type-837",
-   "self_type" : "type-976",
+   "self_type" : "type-978",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -24702,8 +24705,8 @@
    "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",
+   "referenced_type" : "type-1228",
+   "self_type" : "type-1230",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -24711,8 +24714,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<int> *",
    "name" : "android::Vector<int> *",
-   "referenced_type" : "type-2686",
-   "self_type" : "type-2687",
+   "referenced_type" : "type-2689",
+   "self_type" : "type-2690",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -24720,8 +24723,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<long long> *",
    "name" : "android::Vector<long long> *",
-   "referenced_type" : "type-1081",
-   "self_type" : "type-1082",
+   "referenced_type" : "type-1084",
+   "self_type" : "type-1085",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -24729,8 +24732,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::VirtualLightRefBase *",
    "name" : "android::VirtualLightRefBase *",
-   "referenced_type" : "type-2354",
-   "self_type" : "type-2392",
+   "referenced_type" : "type-2357",
+   "self_type" : "type-2395",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -24738,8 +24741,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::base::EagerEvaluator<char *, char *> *",
    "name" : "android::base::EagerEvaluator<char *, char *> *",
-   "referenced_type" : "type-4699",
-   "self_type" : "type-4701",
+   "referenced_type" : "type-4705",
+   "self_type" : "type-4708",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24747,8 +24750,8 @@
    "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",
+   "referenced_type" : "type-4702",
+   "self_type" : "type-4703",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24756,8 +24759,8 @@
    "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",
+   "referenced_type" : "type-4689",
+   "self_type" : "type-4692",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24765,8 +24768,8 @@
    "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",
+   "referenced_type" : "type-4672",
+   "self_type" : "type-4687",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24774,8 +24777,8 @@
    "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",
+   "referenced_type" : "type-4729",
+   "self_type" : "type-4735",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24783,8 +24786,8 @@
    "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",
+   "referenced_type" : "type-4736",
+   "self_type" : "type-4739",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24792,8 +24795,8 @@
    "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",
+   "referenced_type" : "type-4710",
+   "self_type" : "type-4712",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24801,8 +24804,8 @@
    "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",
+   "referenced_type" : "type-4713",
+   "self_type" : "type-4714",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24810,8 +24813,8 @@
    "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",
+   "referenced_type" : "type-4740",
+   "self_type" : "type-4746",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24819,8 +24822,8 @@
    "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",
+   "referenced_type" : "type-4747",
+   "self_type" : "type-4753",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24828,8 +24831,8 @@
    "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",
+   "referenced_type" : "type-4716",
+   "self_type" : "type-4721",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24837,8 +24840,8 @@
    "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",
+   "referenced_type" : "type-4722",
+   "self_type" : "type-4727",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24846,8 +24849,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::base::ErrnoRestorer *",
    "name" : "android::base::ErrnoRestorer *",
-   "referenced_type" : "type-4656",
-   "self_type" : "type-4822",
+   "referenced_type" : "type-4663",
+   "self_type" : "type-4828",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24855,8 +24858,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
    "name" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
-   "referenced_type" : "type-2553",
-   "self_type" : "type-2565",
+   "referenced_type" : "type-2556",
+   "self_type" : "type-2568",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -24873,8 +24876,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-1362",
-   "self_type" : "type-1361",
+   "referenced_type" : "type-1365",
+   "self_type" : "type-1364",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24891,8 +24894,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-1359",
-   "self_type" : "type-1358",
+   "referenced_type" : "type-1362",
+   "self_type" : "type-1361",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24900,8 +24903,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-1377",
-   "self_type" : "type-1381",
+   "referenced_type" : "type-1380",
+   "self_type" : "type-1384",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -24909,8 +24912,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-1396",
-   "self_type" : "type-1395",
+   "referenced_type" : "type-1399",
+   "self_type" : "type-1398",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24918,8 +24921,8 @@
    "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",
+   "referenced_type" : "type-7528",
+   "self_type" : "type-7531",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24927,24 +24930,6 @@
    "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,
@@ -24952,8 +24937,8 @@
   },
   {
    "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> > *",
+   "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-4494",
    "self_type" : "type-4495",
    "size" : 4,
@@ -24961,10 +24946,28 @@
   },
   {
    "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-4371",
+   "self_type" : "type-4372",
+   "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-4500",
+   "self_type" : "type-4501",
+   "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",
+   "referenced_type" : "type-4359",
+   "self_type" : "type-4360",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24981,8 +24984,8 @@
    "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",
+   "referenced_type" : "type-7534",
+   "self_type" : "type-7535",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -25045,7 +25048,7 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> > *",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> > *",
    "referenced_type" : "type-381",
-   "self_type" : "type-7621",
+   "self_type" : "type-7645",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -25054,7 +25057,7 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect> *",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect> *",
    "referenced_type" : "type-372",
-   "self_type" : "type-4595",
+   "self_type" : "type-4601",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -25063,7 +25066,7 @@
    "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",
+   "self_type" : "type-4352",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -25081,7 +25084,7 @@
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
    "referenced_type" : "type-595",
-   "self_type" : "type-2464",
+   "self_type" : "type-2467",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25098,8 +25101,8 @@
    "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",
+   "referenced_type" : "type-2459",
+   "self_type" : "type-2458",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25107,8 +25110,8 @@
    "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",
+   "referenced_type" : "type-4691",
+   "self_type" : "type-4690",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25116,8 +25119,8 @@
    "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",
+   "referenced_type" : "type-7331",
+   "self_type" : "type-7330",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25125,8 +25128,8 @@
    "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",
+   "referenced_type" : "type-4248",
+   "self_type" : "type-4247",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25134,8 +25137,8 @@
    "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",
+   "referenced_type" : "type-6862",
+   "self_type" : "type-6861",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25143,8 +25146,8 @@
    "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",
+   "referenced_type" : "type-4471",
+   "self_type" : "type-4470",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25152,8 +25155,8 @@
    "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",
+   "referenced_type" : "type-7076",
+   "self_type" : "type-7075",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25162,7 +25165,7 @@
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
    "referenced_type" : "type-677",
-   "self_type" : "type-2477",
+   "self_type" : "type-2480",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25171,7 +25174,7 @@
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
    "referenced_type" : "type-604",
-   "self_type" : "type-2471",
+   "self_type" : "type-2474",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25179,8 +25182,8 @@
    "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",
+   "referenced_type" : "type-2483",
+   "self_type" : "type-2482",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25188,8 +25191,8 @@
    "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",
+   "referenced_type" : "type-4903",
+   "self_type" : "type-4902",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25197,8 +25200,8 @@
    "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",
+   "referenced_type" : "type-6006",
+   "self_type" : "type-6005",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25206,8 +25209,8 @@
    "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",
+   "referenced_type" : "type-7093",
+   "self_type" : "type-7092",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25215,8 +25218,8 @@
    "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",
+   "referenced_type" : "type-7661",
+   "self_type" : "type-7660",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25224,8 +25227,8 @@
    "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",
+   "referenced_type" : "type-4242",
+   "self_type" : "type-4241",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25233,8 +25236,8 @@
    "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",
+   "referenced_type" : "type-6858",
+   "self_type" : "type-6857",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25242,8 +25245,8 @@
    "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",
+   "referenced_type" : "type-4463",
+   "self_type" : "type-4462",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25251,8 +25254,8 @@
    "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",
+   "referenced_type" : "type-7072",
+   "self_type" : "type-7071",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25260,8 +25263,8 @@
    "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",
+   "referenced_type" : "type-7519",
+   "self_type" : "type-7518",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25324,7 +25327,7 @@
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > *",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > *",
    "referenced_type" : "type-462",
-   "self_type" : "type-7668",
+   "self_type" : "type-7690",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -25333,7 +25336,7 @@
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::media::V1_0::Rect> *",
    "name" : "android::hardware::hidl_vec<android::hardware::media::V1_0::Rect> *",
    "referenced_type" : "type-453",
-   "self_type" : "type-4567",
+   "self_type" : "type-4573",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -25342,7 +25345,7 @@
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> *",
    "name" : "android::hardware::hidl_vec<unsigned char> *",
    "referenced_type" : "type-452",
-   "self_type" : "type-4374",
+   "self_type" : "type-4381",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -25369,7 +25372,7 @@
    "linker_set_key" : "android::hidl::base::V1_0::IBase *",
    "name" : "android::hidl::base::V1_0::IBase *",
    "referenced_type" : "type-530",
-   "self_type" : "type-2445",
+   "self_type" : "type-2448",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25378,7 +25381,7 @@
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "android::hidl::manager::V1_0::IServiceNotification *",
    "referenced_type" : "type-533",
-   "self_type" : "type-2449",
+   "self_type" : "type-2452",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25387,7 +25390,7 @@
    "linker_set_key" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
    "name" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
    "referenced_type" : "type-160",
-   "self_type" : "type-2623",
+   "self_type" : "type-2626",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -25396,7 +25399,7 @@
    "linker_set_key" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
    "name" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
    "referenced_type" : "type-147",
-   "self_type" : "type-2622",
+   "self_type" : "type-2625",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -25405,7 +25408,7 @@
    "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int> *",
    "name" : "android::key_value_pair_t<unsigned int, unsigned int> *",
    "referenced_type" : "type-143",
-   "self_type" : "type-2621",
+   "self_type" : "type-2624",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -25413,8 +25416,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::AHandler> *",
    "name" : "android::sp<android::AHandler> *",
-   "referenced_type" : "type-1188",
-   "self_type" : "type-1243",
+   "referenced_type" : "type-1191",
+   "self_type" : "type-1246",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25423,7 +25426,7 @@
    "linker_set_key" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
    "name" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
    "referenced_type" : "type-581",
-   "self_type" : "type-2511",
+   "self_type" : "type-2514",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25432,7 +25435,7 @@
    "linker_set_key" : "android::sp<android::ALooper> *",
    "name" : "android::sp<android::ALooper> *",
    "referenced_type" : "type-321",
-   "self_type" : "type-2244",
+   "self_type" : "type-2247",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25441,7 +25444,7 @@
    "linker_set_key" : "android::sp<android::AMessage> *",
    "name" : "android::sp<android::AMessage> *",
    "referenced_type" : "type-259",
-   "self_type" : "type-1956",
+   "self_type" : "type-1947",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25449,8 +25452,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::BpGraphicBufferProducer> *",
    "name" : "android::sp<android::BpGraphicBufferProducer> *",
-   "referenced_type" : "type-4228",
-   "self_type" : "type-4274",
+   "referenced_type" : "type-4234",
+   "self_type" : "type-4280",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25458,8 +25461,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::BpProducerListener> *",
    "name" : "android::sp<android::BpProducerListener> *",
-   "referenced_type" : "type-4454",
-   "self_type" : "type-4453",
+   "referenced_type" : "type-4460",
+   "self_type" : "type-4459",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25477,7 +25480,7 @@
    "linker_set_key" : "android::sp<android::ComponentWrapper> *",
    "name" : "android::sp<android::ComponentWrapper> *",
    "referenced_type" : "type-567",
-   "self_type" : "type-2488",
+   "self_type" : "type-2491",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25494,8 +25497,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::Fence> *",
    "name" : "android::sp<android::Fence> *",
-   "referenced_type" : "type-1864",
-   "self_type" : "type-2522",
+   "referenced_type" : "type-1868",
+   "self_type" : "type-2525",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25504,7 +25507,7 @@
    "linker_set_key" : "android::sp<android::FrameDropper> *",
    "name" : "android::sp<android::FrameDropper> *",
    "referenced_type" : "type-578",
-   "self_type" : "type-2504",
+   "self_type" : "type-2507",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25512,8 +25515,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::GLConsumer::EglImage> *",
    "name" : "android::sp<android::GLConsumer::EglImage> *",
-   "referenced_type" : "type-1173",
-   "self_type" : "type-1177",
+   "referenced_type" : "type-1176",
+   "self_type" : "type-1181",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25522,7 +25525,7 @@
    "linker_set_key" : "android::sp<android::GraphicBuffer> *",
    "name" : "android::sp<android::GraphicBuffer> *",
    "referenced_type" : "type-733",
-   "self_type" : "type-1194",
+   "self_type" : "type-1198",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25531,7 +25534,7 @@
    "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy> *",
    "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy> *",
    "referenced_type" : "type-473",
-   "self_type" : "type-2496",
+   "self_type" : "type-2499",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25539,8 +25542,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::GraphicBufferSource> *",
    "name" : "android::sp<android::GraphicBufferSource> *",
-   "referenced_type" : "type-2542",
-   "self_type" : "type-2541",
+   "referenced_type" : "type-2545",
+   "self_type" : "type-2544",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25548,8 +25551,8 @@
    "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",
+   "referenced_type" : "type-4265",
+   "self_type" : "type-4264",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25557,8 +25560,8 @@
    "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",
+   "referenced_type" : "type-4274",
+   "self_type" : "type-4273",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25566,8 +25569,8 @@
    "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",
+   "referenced_type" : "type-4833",
+   "self_type" : "type-4842",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25575,8 +25578,8 @@
    "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",
+   "referenced_type" : "type-5112",
+   "self_type" : "type-5117",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25585,7 +25588,7 @@
    "linker_set_key" : "android::sp<android::IBinder::DeathRecipient> *",
    "name" : "android::sp<android::IBinder::DeathRecipient> *",
    "referenced_type" : "type-843",
-   "self_type" : "type-1274",
+   "self_type" : "type-1278",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25594,7 +25597,7 @@
    "linker_set_key" : "android::sp<android::IBinder> *",
    "name" : "android::sp<android::IBinder> *",
    "referenced_type" : "type-795",
-   "self_type" : "type-1035",
+   "self_type" : "type-1039",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25603,7 +25606,7 @@
    "linker_set_key" : "android::sp<android::IConsumerListener> *",
    "name" : "android::sp<android::IConsumerListener> *",
    "referenced_type" : "type-939",
-   "self_type" : "type-2534",
+   "self_type" : "type-2537",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25612,7 +25615,7 @@
    "linker_set_key" : "android::sp<android::IGraphicBufferConsumer> *",
    "name" : "android::sp<android::IGraphicBufferConsumer> *",
    "referenced_type" : "type-574",
-   "self_type" : "type-2498",
+   "self_type" : "type-2501",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25621,7 +25624,7 @@
    "linker_set_key" : "android::sp<android::IGraphicBufferProducer> *",
    "name" : "android::sp<android::IGraphicBufferProducer> *",
    "referenced_type" : "type-570",
-   "self_type" : "type-2484",
+   "self_type" : "type-2487",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25639,7 +25642,7 @@
    "linker_set_key" : "android::sp<android::IProducerListener> *",
    "name" : "android::sp<android::IProducerListener> *",
    "referenced_type" : "type-957",
-   "self_type" : "type-2537",
+   "self_type" : "type-2540",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25647,8 +25650,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::ITransactionCompletedListener> *",
    "name" : "android::sp<android::ITransactionCompletedListener> *",
-   "referenced_type" : "type-1040",
-   "self_type" : "type-1045",
+   "referenced_type" : "type-1044",
+   "self_type" : "type-1048",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25657,7 +25660,7 @@
    "linker_set_key" : "android::sp<android::NativeHandle> *",
    "name" : "android::sp<android::NativeHandle> *",
    "referenced_type" : "type-932",
-   "self_type" : "type-1880",
+   "self_type" : "type-1884",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25665,8 +25668,8 @@
    "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",
+   "referenced_type" : "type-2466",
+   "self_type" : "type-2468",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25674,8 +25677,8 @@
    "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",
+   "referenced_type" : "type-2457",
+   "self_type" : "type-2460",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25683,8 +25686,8 @@
    "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",
+   "referenced_type" : "type-4246",
+   "self_type" : "type-4283",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25692,8 +25695,8 @@
    "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",
+   "referenced_type" : "type-4473",
+   "self_type" : "type-4472",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25701,8 +25704,8 @@
    "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",
+   "referenced_type" : "type-2479",
+   "self_type" : "type-2481",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25710,8 +25713,8 @@
    "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",
+   "referenced_type" : "type-2473",
+   "self_type" : "type-2476",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25719,8 +25722,8 @@
    "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",
+   "referenced_type" : "type-4240",
+   "self_type" : "type-4281",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25728,8 +25731,8 @@
    "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",
+   "referenced_type" : "type-4466",
+   "self_type" : "type-4465",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25738,7 +25741,7 @@
    "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",
+   "self_type" : "type-4395",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25746,8 +25749,8 @@
    "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",
+   "referenced_type" : "type-2447",
+   "self_type" : "type-4227",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25755,8 +25758,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "referenced_type" : "type-2448",
-   "self_type" : "type-2450",
+   "referenced_type" : "type-2451",
+   "self_type" : "type-2453",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25764,8 +25767,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<const android::AHandler> *",
    "name" : "android::sp<const android::AHandler> *",
-   "referenced_type" : "type-2516",
-   "self_type" : "type-2519",
+   "referenced_type" : "type-2519",
+   "self_type" : "type-2522",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25810,7 +25813,7 @@
    "linker_set_key" : "android::wp<android::IBinder::DeathRecipient> *",
    "name" : "android::wp<android::IBinder::DeathRecipient> *",
    "referenced_type" : "type-172",
-   "self_type" : "type-1244",
+   "self_type" : "type-1248",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -25819,7 +25822,7 @@
    "linker_set_key" : "android::wp<android::IBinder> *",
    "name" : "android::wp<android::IBinder> *",
    "referenced_type" : "type-130",
-   "self_type" : "type-4279",
+   "self_type" : "type-4285",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -25828,7 +25831,7 @@
    "linker_set_key" : "android_dataspace_t *",
    "name" : "android_dataspace_t *",
    "referenced_type" : "type-170",
-   "self_type" : "type-1667",
+   "self_type" : "type-1672",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -25845,8 +25848,8 @@
    "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",
+   "referenced_type" : "type-1249",
+   "self_type" : "type-1252",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h"
   },
@@ -25854,8 +25857,8 @@
    "alignment" : 4,
    "linker_set_key" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
    "name" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
-   "referenced_type" : "type-1387",
-   "self_type" : "type-1390",
+   "referenced_type" : "type-1390",
+   "self_type" : "type-1393",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -25864,7 +25867,7 @@
    "linker_set_key" : "bool *",
    "name" : "bool *",
    "referenced_type" : "type-93",
-   "self_type" : "type-1272",
+   "self_type" : "type-1274",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -25881,8 +25884,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AHandler *",
    "name" : "const android::AHandler *",
-   "referenced_type" : "type-2518",
-   "self_type" : "type-2517",
+   "referenced_type" : "type-2521",
+   "self_type" : "type-2520",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25890,8 +25893,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AHandlerReflector<android::GraphicBufferSource> *",
    "name" : "const android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-2514",
-   "self_type" : "type-2515",
+   "referenced_type" : "type-2517",
+   "self_type" : "type-2518",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25899,8 +25902,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ALooper *",
    "name" : "const android::ALooper *",
-   "referenced_type" : "type-2289",
-   "self_type" : "type-2301",
+   "referenced_type" : "type-2292",
+   "self_type" : "type-2304",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25908,8 +25911,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AReplyToken *",
    "name" : "const android::AReplyToken *",
-   "referenced_type" : "type-1167",
-   "self_type" : "type-1170",
+   "referenced_type" : "type-1168",
+   "self_type" : "type-1173",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -25917,8 +25920,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AString *",
    "name" : "const android::AString *",
-   "referenced_type" : "type-2110",
-   "self_type" : "type-2230",
+   "referenced_type" : "type-2101",
+   "self_type" : "type-2233",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -25944,8 +25947,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BnInterface<android::IGraphicBufferProducer> *",
    "name" : "const android::BnInterface<android::IGraphicBufferProducer> *",
-   "referenced_type" : "type-1232",
-   "self_type" : "type-1233",
+   "referenced_type" : "type-1236",
+   "self_type" : "type-1237",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -25953,8 +25956,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BnInterface<android::IProducerListener> *",
    "name" : "const android::BnInterface<android::IProducerListener> *",
-   "referenced_type" : "type-4477",
-   "self_type" : "type-4478",
+   "referenced_type" : "type-4483",
+   "self_type" : "type-4484",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -25962,8 +25965,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BnInterface<android::ITransactionCompletedListener> *",
    "name" : "const android::BnInterface<android::ITransactionCompletedListener> *",
-   "referenced_type" : "type-1093",
-   "self_type" : "type-1094",
+   "referenced_type" : "type-1096",
+   "self_type" : "type-1097",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -25980,8 +25983,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-1069",
-   "self_type" : "type-1071",
+   "referenced_type" : "type-1072",
+   "self_type" : "type-1074",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -25989,8 +25992,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-1219",
-   "self_type" : "type-1218",
+   "referenced_type" : "type-1223",
+   "self_type" : "type-1222",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -25998,8 +26001,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-3633",
-   "self_type" : "type-3632",
+   "referenced_type" : "type-3636",
+   "self_type" : "type-3635",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26007,8 +26010,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-3682",
-   "self_type" : "type-3684",
+   "referenced_type" : "type-3688",
+   "self_type" : "type-3690",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -26016,8 +26019,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-3791",
-   "self_type" : "type-3790",
+   "referenced_type" : "type-3798",
+   "self_type" : "type-3797",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26025,8 +26028,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-5694",
-   "self_type" : "type-5693",
+   "referenced_type" : "type-5711",
+   "self_type" : "type-5710",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26034,8 +26037,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-5743",
-   "self_type" : "type-5745",
+   "referenced_type" : "type-5763",
+   "self_type" : "type-5765",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -26043,8 +26046,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-5852",
-   "self_type" : "type-5851",
+   "referenced_type" : "type-5873",
+   "self_type" : "type-5872",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26052,8 +26055,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-6265",
-   "self_type" : "type-6264",
+   "referenced_type" : "type-6285",
+   "self_type" : "type-6284",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26061,8 +26064,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-6307",
-   "self_type" : "type-6309",
+   "referenced_type" : "type-6330",
+   "self_type" : "type-6332",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -26070,8 +26073,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-6398",
-   "self_type" : "type-6397",
+   "referenced_type" : "type-6421",
+   "self_type" : "type-6420",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26088,8 +26091,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferQueueCore *",
    "name" : "const android::BufferQueueCore *",
-   "referenced_type" : "type-3521",
-   "self_type" : "type-3523",
+   "referenced_type" : "type-3524",
+   "self_type" : "type-3526",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26097,8 +26100,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferQueueCore *",
    "name" : "const android::BufferQueueCore *",
-   "referenced_type" : "type-5582",
-   "self_type" : "type-5584",
+   "referenced_type" : "type-5599",
+   "self_type" : "type-5601",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26106,8 +26109,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferQueueCore *",
    "name" : "const android::BufferQueueCore *",
-   "referenced_type" : "type-6168",
-   "self_type" : "type-6170",
+   "referenced_type" : "type-6188",
+   "self_type" : "type-6190",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26124,8 +26127,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ComponentWrapper *",
    "name" : "const android::ComponentWrapper *",
-   "referenced_type" : "type-2494",
-   "self_type" : "type-2495",
+   "referenced_type" : "type-2497",
+   "self_type" : "type-2498",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26133,8 +26136,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ConsumerListener *",
    "name" : "const android::ConsumerListener *",
-   "referenced_type" : "type-3513",
-   "self_type" : "type-3515",
+   "referenced_type" : "type-3516",
+   "self_type" : "type-3518",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26142,8 +26145,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ConsumerListener *",
    "name" : "const android::ConsumerListener *",
-   "referenced_type" : "type-5574",
-   "self_type" : "type-5576",
+   "referenced_type" : "type-5591",
+   "self_type" : "type-5593",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26151,8 +26154,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ConsumerListener *",
    "name" : "const android::ConsumerListener *",
-   "referenced_type" : "type-6163",
-   "self_type" : "type-6165",
+   "referenced_type" : "type-6183",
+   "self_type" : "type-6185",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26169,8 +26172,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-1309",
-   "self_type" : "type-1315",
+   "referenced_type" : "type-1312",
+   "self_type" : "type-1316",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26178,8 +26181,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-2530",
-   "self_type" : "type-2532",
+   "referenced_type" : "type-2533",
+   "self_type" : "type-2535",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26187,8 +26190,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-3448",
-   "self_type" : "type-3450",
+   "referenced_type" : "type-3451",
+   "self_type" : "type-3453",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26196,8 +26199,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-3593",
-   "self_type" : "type-3595",
+   "referenced_type" : "type-3596",
+   "self_type" : "type-3598",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26205,8 +26208,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-3859",
-   "self_type" : "type-3865",
+   "referenced_type" : "type-3865",
+   "self_type" : "type-3869",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26214,8 +26217,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-4422",
-   "self_type" : "type-4430",
+   "referenced_type" : "type-4428",
+   "self_type" : "type-4432",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26223,8 +26226,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-4672",
-   "self_type" : "type-4674",
+   "referenced_type" : "type-4679",
+   "self_type" : "type-4681",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26232,8 +26235,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-4941",
-   "self_type" : "type-4943",
+   "referenced_type" : "type-4947",
+   "self_type" : "type-4949",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26241,8 +26244,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-5509",
-   "self_type" : "type-5511",
+   "referenced_type" : "type-5526",
+   "self_type" : "type-5528",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26250,8 +26253,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-5654",
-   "self_type" : "type-5656",
+   "referenced_type" : "type-5671",
+   "self_type" : "type-5673",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26259,8 +26262,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-5920",
-   "self_type" : "type-5926",
+   "referenced_type" : "type-5940",
+   "self_type" : "type-5944",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26268,8 +26271,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-6000",
-   "self_type" : "type-6002",
+   "referenced_type" : "type-6020",
+   "self_type" : "type-6022",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26277,8 +26280,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-6111",
-   "self_type" : "type-6114",
+   "referenced_type" : "type-6132",
+   "self_type" : "type-6134",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26286,8 +26289,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-6239",
-   "self_type" : "type-6241",
+   "referenced_type" : "type-6259",
+   "self_type" : "type-6261",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26295,8 +26298,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-6440",
-   "self_type" : "type-6446",
+   "referenced_type" : "type-6463",
+   "self_type" : "type-6467",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26304,8 +26307,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-7012",
-   "self_type" : "type-7021",
+   "referenced_type" : "type-7036",
+   "self_type" : "type-7042",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26313,8 +26316,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-7189",
-   "self_type" : "type-7195",
+   "referenced_type" : "type-7212",
+   "self_type" : "type-7214",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26331,8 +26334,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-7299",
-   "self_type" : "type-7301",
+   "referenced_type" : "type-7322",
+   "self_type" : "type-7324",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26350,7 +26353,7 @@
    "linker_set_key" : "const android::FileDescriptor::Autoclose *",
    "name" : "const android::FileDescriptor::Autoclose *",
    "referenced_type" : "type-1221",
-   "self_type" : "type-1230",
+   "self_type" : "type-1229",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h"
   },
@@ -26358,8 +26361,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Flattenable<android::BufferItem> *",
    "name" : "const android::Flattenable<android::BufferItem> *",
-   "referenced_type" : "type-1506",
-   "self_type" : "type-1507",
+   "referenced_type" : "type-1509",
+   "self_type" : "type-1510",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -26367,24 +26370,6 @@
    "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,
@@ -26392,17 +26377,8 @@
   },
   {
    "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> *",
+   "linker_set_key" : "const android::Flattenable<android::FrameEventHistoryDelta> *",
+   "name" : "const android::Flattenable<android::FrameEventHistoryDelta> *",
    "referenced_type" : "type-4312",
    "self_type" : "type-4313",
    "size" : 4,
@@ -26410,10 +26386,37 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::GraphicBuffer> *",
+   "name" : "const android::Flattenable<android::GraphicBuffer> *",
+   "referenced_type" : "type-1643",
+   "self_type" : "type-1644",
+   "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-4315",
+   "self_type" : "type-4316",
+   "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-4318",
+   "self_type" : "type-4319",
+   "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",
+   "referenced_type" : "type-2511",
+   "self_type" : "type-2513",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26421,8 +26424,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-1346",
-   "self_type" : "type-1348",
+   "referenced_type" : "type-1349",
+   "self_type" : "type-1351",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26430,8 +26433,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-1461",
-   "self_type" : "type-1463",
+   "referenced_type" : "type-1465",
+   "self_type" : "type-1467",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26439,8 +26442,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-2403",
-   "self_type" : "type-2425",
+   "referenced_type" : "type-2406",
+   "self_type" : "type-2428",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26448,8 +26451,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-3454",
-   "self_type" : "type-3456",
+   "referenced_type" : "type-3457",
+   "self_type" : "type-3459",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26457,8 +26460,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-3598",
-   "self_type" : "type-3600",
+   "referenced_type" : "type-3601",
+   "self_type" : "type-3603",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26466,8 +26469,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-3898",
-   "self_type" : "type-3900",
+   "referenced_type" : "type-3904",
+   "self_type" : "type-3906",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26475,8 +26478,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-3991",
-   "self_type" : "type-3993",
+   "referenced_type" : "type-3997",
+   "self_type" : "type-3999",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26484,8 +26487,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-4218",
-   "self_type" : "type-4220",
+   "referenced_type" : "type-4224",
+   "self_type" : "type-4226",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26493,8 +26496,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-4838",
-   "self_type" : "type-4870",
+   "referenced_type" : "type-4840",
+   "self_type" : "type-4876",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26502,8 +26505,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-5515",
-   "self_type" : "type-5517",
+   "referenced_type" : "type-5532",
+   "self_type" : "type-5534",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26511,8 +26514,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-5659",
-   "self_type" : "type-5661",
+   "referenced_type" : "type-5676",
+   "self_type" : "type-5678",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26520,16 +26523,7 @@
    "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",
+   "referenced_type" : "type-5979",
    "self_type" : "type-5981",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
@@ -26538,8 +26532,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-6117",
-   "self_type" : "type-6119",
+   "referenced_type" : "type-5996",
+   "self_type" : "type-6001",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26547,8 +26541,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-6244",
-   "self_type" : "type-6246",
+   "referenced_type" : "type-6137",
+   "self_type" : "type-6139",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26556,8 +26550,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-6477",
-   "self_type" : "type-6479",
+   "referenced_type" : "type-6264",
+   "self_type" : "type-6266",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26565,8 +26559,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-6565",
-   "self_type" : "type-6567",
+   "referenced_type" : "type-6500",
+   "self_type" : "type-6503",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26574,8 +26568,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-6809",
-   "self_type" : "type-6819",
+   "referenced_type" : "type-6588",
+   "self_type" : "type-6590",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26583,8 +26577,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-6820",
-   "self_type" : "type-6822",
+   "referenced_type" : "type-6832",
+   "self_type" : "type-6840",
+   "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-6843",
+   "self_type" : "type-6845",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26610,8 +26613,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBufferSource *",
    "name" : "const android::GraphicBufferSource *",
-   "referenced_type" : "type-2546",
-   "self_type" : "type-2547",
+   "referenced_type" : "type-2549",
+   "self_type" : "type-2550",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26619,8 +26622,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IBinder *",
    "name" : "const android::IBinder *",
-   "referenced_type" : "type-1520",
-   "self_type" : "type-1525",
+   "referenced_type" : "type-1524",
+   "self_type" : "type-1530",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26628,8 +26631,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IBinder::DeathRecipient *",
    "name" : "const android::IBinder::DeathRecipient *",
-   "referenced_type" : "type-4315",
-   "self_type" : "type-4316",
+   "referenced_type" : "type-4321",
+   "self_type" : "type-4322",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26637,8 +26640,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-1155",
-   "self_type" : "type-1157",
+   "referenced_type" : "type-1158",
+   "self_type" : "type-1160",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26646,8 +26649,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-1580",
-   "self_type" : "type-1582",
+   "referenced_type" : "type-1584",
+   "self_type" : "type-1586",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26655,8 +26658,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-3611",
-   "self_type" : "type-3613",
+   "referenced_type" : "type-3614",
+   "self_type" : "type-3616",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26664,8 +26667,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-3760",
-   "self_type" : "type-3762",
+   "referenced_type" : "type-3766",
+   "self_type" : "type-3768",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26673,8 +26676,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-4060",
-   "self_type" : "type-4062",
+   "referenced_type" : "type-4066",
+   "self_type" : "type-4068",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26682,8 +26685,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-5672",
-   "self_type" : "type-5674",
+   "referenced_type" : "type-5689",
+   "self_type" : "type-5691",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26691,8 +26694,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-5821",
-   "self_type" : "type-5823",
+   "referenced_type" : "type-5841",
+   "self_type" : "type-5843",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26700,8 +26703,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-6250",
-   "self_type" : "type-6252",
+   "referenced_type" : "type-6270",
+   "self_type" : "type-6272",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26709,8 +26712,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-6374",
-   "self_type" : "type-6376",
+   "referenced_type" : "type-6397",
+   "self_type" : "type-6399",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26718,8 +26721,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-6633",
-   "self_type" : "type-6635",
+   "referenced_type" : "type-6656",
+   "self_type" : "type-6658",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26736,8 +26739,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-1604",
-   "self_type" : "type-1606",
+   "referenced_type" : "type-1608",
+   "self_type" : "type-1610",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26745,8 +26748,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-2501",
-   "self_type" : "type-2503",
+   "referenced_type" : "type-2504",
+   "self_type" : "type-2506",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26754,8 +26757,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-3494",
-   "self_type" : "type-3496",
+   "referenced_type" : "type-3497",
+   "self_type" : "type-3499",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26763,8 +26766,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-4077",
-   "self_type" : "type-4079",
+   "referenced_type" : "type-4083",
+   "self_type" : "type-4085",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26772,8 +26775,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-4914",
-   "self_type" : "type-4916",
+   "referenced_type" : "type-4920",
+   "self_type" : "type-4922",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26781,8 +26784,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-5555",
-   "self_type" : "type-5557",
+   "referenced_type" : "type-5572",
+   "self_type" : "type-5574",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26790,8 +26793,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-5993",
-   "self_type" : "type-5995",
+   "referenced_type" : "type-6013",
+   "self_type" : "type-6015",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26799,8 +26802,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6149",
-   "self_type" : "type-6151",
+   "referenced_type" : "type-6169",
+   "self_type" : "type-6171",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26808,8 +26811,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6648",
-   "self_type" : "type-6650",
+   "referenced_type" : "type-6671",
+   "self_type" : "type-6673",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26817,8 +26820,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-7134",
-   "self_type" : "type-7136",
+   "referenced_type" : "type-7157",
+   "self_type" : "type-7159",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26835,8 +26838,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferProducer *",
    "name" : "const android::IGraphicBufferProducer *",
-   "referenced_type" : "type-3504",
-   "self_type" : "type-3506",
+   "referenced_type" : "type-3507",
+   "self_type" : "type-3509",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26844,8 +26847,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferProducer *",
    "name" : "const android::IGraphicBufferProducer *",
-   "referenced_type" : "type-4247",
-   "self_type" : "type-4249",
+   "referenced_type" : "type-4253",
+   "self_type" : "type-4255",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26853,8 +26856,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferProducer *",
    "name" : "const android::IGraphicBufferProducer *",
-   "referenced_type" : "type-5565",
-   "self_type" : "type-5567",
+   "referenced_type" : "type-5582",
+   "self_type" : "type-5584",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26862,8 +26865,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferProducer *",
    "name" : "const android::IGraphicBufferProducer *",
-   "referenced_type" : "type-6158",
-   "self_type" : "type-6160",
+   "referenced_type" : "type-6178",
+   "self_type" : "type-6180",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26871,8 +26874,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IGraphicBufferProducer *",
    "name" : "const android::IGraphicBufferProducer *",
-   "referenced_type" : "type-6843",
-   "self_type" : "type-6845",
+   "referenced_type" : "type-6866",
+   "self_type" : "type-6868",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26889,8 +26892,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-1160",
-   "self_type" : "type-1162",
+   "referenced_type" : "type-1031",
+   "self_type" : "type-1033",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26898,8 +26901,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-3623",
-   "self_type" : "type-3625",
+   "referenced_type" : "type-1163",
+   "self_type" : "type-1165",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26907,8 +26910,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-3765",
-   "self_type" : "type-3767",
+   "referenced_type" : "type-3626",
+   "self_type" : "type-3628",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26916,8 +26919,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-4253",
-   "self_type" : "type-4255",
+   "referenced_type" : "type-3670",
+   "self_type" : "type-3672",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26925,8 +26928,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-4449",
-   "self_type" : "type-4448",
+   "referenced_type" : "type-3771",
+   "self_type" : "type-3773",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26934,8 +26937,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-4689",
-   "self_type" : "type-4691",
+   "referenced_type" : "type-4259",
+   "self_type" : "type-4261",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26943,8 +26946,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-5684",
-   "self_type" : "type-5686",
+   "referenced_type" : "type-4455",
+   "self_type" : "type-4454",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26952,8 +26955,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-5826",
-   "self_type" : "type-5828",
+   "referenced_type" : "type-4696",
+   "self_type" : "type-4698",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26961,8 +26964,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-6257",
-   "self_type" : "type-6259",
+   "referenced_type" : "type-5701",
+   "self_type" : "type-5703",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26970,8 +26973,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-6379",
-   "self_type" : "type-6381",
+   "referenced_type" : "type-5745",
+   "self_type" : "type-5747",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26979,8 +26982,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-6849",
-   "self_type" : "type-6851",
+   "referenced_type" : "type-5846",
+   "self_type" : "type-5848",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26988,8 +26991,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-7042",
-   "self_type" : "type-7041",
+   "referenced_type" : "type-6277",
+   "self_type" : "type-6279",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26997,8 +27000,44 @@
    "alignment" : 4,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-7312",
-   "self_type" : "type-7314",
+   "referenced_type" : "type-6321",
+   "self_type" : "type-6323",
+   "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-6402",
+   "self_type" : "type-6404",
+   "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-6872",
+   "self_type" : "type-6874",
+   "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-7066",
+   "self_type" : "type-7065",
+   "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-7335",
+   "self_type" : "type-7337",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27033,8 +27072,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect> *",
    "name" : "const android::LightFlattenablePod<android::Rect> *",
-   "referenced_type" : "type-4587",
-   "self_type" : "type-4588",
+   "referenced_type" : "type-4593",
+   "self_type" : "type-4594",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -27051,8 +27090,8 @@
    "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",
+   "referenced_type" : "type-1233",
+   "self_type" : "type-1234",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -27060,8 +27099,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::LightRefBase<android::NativeHandle> *",
    "name" : "const android::LightRefBase<android::NativeHandle> *",
-   "referenced_type" : "type-2663",
-   "self_type" : "type-2672",
+   "referenced_type" : "type-2666",
+   "self_type" : "type-2675",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -27178,7 +27217,7 @@
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
    "referenced_type" : "type-118",
-   "self_type" : "type-1513",
+   "self_type" : "type-1517",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -27195,8 +27234,8 @@
    "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",
+   "referenced_type" : "type-1523",
+   "self_type" : "type-1525",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -27204,8 +27243,8 @@
    "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",
+   "referenced_type" : "type-1666",
+   "self_type" : "type-1667",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -27213,8 +27252,8 @@
    "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",
+   "referenced_type" : "type-4337",
+   "self_type" : "type-4338",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -27222,8 +27261,8 @@
    "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",
+   "referenced_type" : "type-1660",
+   "self_type" : "type-1661",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -27231,8 +27270,8 @@
    "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",
+   "referenced_type" : "type-4343",
+   "self_type" : "type-4344",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -27240,8 +27279,8 @@
    "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",
+   "referenced_type" : "type-4348",
+   "self_type" : "type-4349",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -27258,8 +27297,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1215",
-   "self_type" : "type-1214",
+   "referenced_type" : "type-1218",
+   "self_type" : "type-1217",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27267,8 +27306,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1490",
-   "self_type" : "type-1489",
+   "referenced_type" : "type-1493",
+   "self_type" : "type-1492",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27276,8 +27315,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1621",
-   "self_type" : "type-1620",
+   "referenced_type" : "type-1624",
+   "self_type" : "type-1623",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27285,8 +27324,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-2683",
-   "self_type" : "type-2682",
+   "referenced_type" : "type-2686",
+   "self_type" : "type-2685",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27294,8 +27333,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-3787",
-   "self_type" : "type-3786",
+   "referenced_type" : "type-3793",
+   "self_type" : "type-3792",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27303,8 +27342,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4011",
-   "self_type" : "type-4010",
+   "referenced_type" : "type-4017",
+   "self_type" : "type-4016",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27312,8 +27351,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4090",
-   "self_type" : "type-4089",
+   "referenced_type" : "type-4096",
+   "self_type" : "type-4095",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27321,8 +27360,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4292",
-   "self_type" : "type-4291",
+   "referenced_type" : "type-4298",
+   "self_type" : "type-4297",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27330,8 +27369,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4572",
-   "self_type" : "type-4571",
+   "referenced_type" : "type-4578",
+   "self_type" : "type-4577",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27339,8 +27378,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4736",
-   "self_type" : "type-4735",
+   "referenced_type" : "type-4743",
+   "self_type" : "type-4742",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27348,8 +27387,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-5019",
-   "self_type" : "type-5018",
+   "referenced_type" : "type-5025",
+   "self_type" : "type-5024",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27357,8 +27396,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-5063",
-   "self_type" : "type-5062",
+   "referenced_type" : "type-5080",
+   "self_type" : "type-5079",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27366,8 +27405,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-5848",
-   "self_type" : "type-5847",
+   "referenced_type" : "type-5868",
+   "self_type" : "type-5867",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27375,8 +27414,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-6030",
-   "self_type" : "type-6029",
+   "referenced_type" : "type-6050",
+   "self_type" : "type-6049",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27384,8 +27423,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-6394",
-   "self_type" : "type-6393",
+   "referenced_type" : "type-6417",
+   "self_type" : "type-6416",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27393,8 +27432,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-6584",
-   "self_type" : "type-6583",
+   "referenced_type" : "type-6608",
+   "self_type" : "type-6607",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27402,8 +27441,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-6663",
-   "self_type" : "type-6662",
+   "referenced_type" : "type-6686",
+   "self_type" : "type-6685",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27411,8 +27450,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-6881",
-   "self_type" : "type-6880",
+   "referenced_type" : "type-6905",
+   "self_type" : "type-6904",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27420,8 +27459,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-7192",
-   "self_type" : "type-7191",
+   "referenced_type" : "type-7216",
+   "self_type" : "type-7215",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27429,8 +27468,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-7339",
-   "self_type" : "type-7338",
+   "referenced_type" : "type-7362",
+   "self_type" : "type-7361",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27438,8 +27477,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-7565",
-   "self_type" : "type-7564",
+   "referenced_type" : "type-7588",
+   "self_type" : "type-7587",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27447,8 +27486,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-7666",
-   "self_type" : "type-7665",
+   "referenced_type" : "type-7685",
+   "self_type" : "type-7684",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27456,8 +27495,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::RefBase *",
    "name" : "const android::RefBase *",
-   "referenced_type" : "type-1449",
-   "self_type" : "type-1480",
+   "referenced_type" : "type-1452",
+   "self_type" : "type-1483",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27465,8 +27504,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SafeBpInterface<android::IConsumerListener> *",
    "name" : "const android::SafeBpInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-1551",
-   "self_type" : "type-1552",
+   "referenced_type" : "type-1554",
+   "self_type" : "type-1555",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -27474,8 +27513,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SafeBpInterface<android::IGraphicBufferConsumer> *",
    "name" : "const android::SafeBpInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-1886",
-   "self_type" : "type-1887",
+   "referenced_type" : "type-1890",
+   "self_type" : "type-1891",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -27483,8 +27522,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SafeInterface::ParcelHandler *",
    "name" : "const android::SafeInterface::ParcelHandler *",
-   "referenced_type" : "type-1256",
-   "self_type" : "type-1266",
+   "referenced_type" : "type-1254",
+   "self_type" : "type-1269",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -27492,8 +27531,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-2675",
-   "self_type" : "type-2676",
+   "referenced_type" : "type-2678",
+   "self_type" : "type-2679",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27501,8 +27540,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-2671",
-   "self_type" : "type-2673",
+   "referenced_type" : "type-2674",
+   "self_type" : "type-2676",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27510,8 +27549,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-2667",
-   "self_type" : "type-2668",
+   "referenced_type" : "type-2670",
+   "self_type" : "type-2671",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27519,8 +27558,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 *",
    "name" : "const android::String16 *",
-   "referenced_type" : "type-1248",
-   "self_type" : "type-2658",
+   "referenced_type" : "type-1251",
+   "self_type" : "type-2661",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -27528,8 +27567,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 *",
    "name" : "const android::String8 *",
-   "referenced_type" : "type-1875",
-   "self_type" : "type-2653",
+   "referenced_type" : "type-1879",
+   "self_type" : "type-2656",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -27537,8 +27576,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::BufferItem> *",
    "name" : "const android::Vector<android::BufferItem> *",
-   "referenced_type" : "type-977",
-   "self_type" : "type-978",
+   "referenced_type" : "type-979",
+   "self_type" : "type-980",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27546,8 +27585,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::Rect> *",
    "name" : "const android::Vector<android::Rect> *",
-   "referenced_type" : "type-2679",
-   "self_type" : "type-2680",
+   "referenced_type" : "type-2682",
+   "self_type" : "type-2683",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27555,8 +27594,8 @@
    "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",
+   "referenced_type" : "type-1231",
+   "self_type" : "type-1232",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27564,8 +27603,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<int> *",
    "name" : "const android::Vector<int> *",
-   "referenced_type" : "type-2688",
-   "self_type" : "type-2689",
+   "referenced_type" : "type-2691",
+   "self_type" : "type-2692",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27573,8 +27612,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<long long> *",
    "name" : "const android::Vector<long long> *",
-   "referenced_type" : "type-1083",
-   "self_type" : "type-1084",
+   "referenced_type" : "type-1086",
+   "self_type" : "type-1087",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27582,8 +27621,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::VectorImpl *",
    "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-2664",
-   "self_type" : "type-2665",
+   "referenced_type" : "type-2667",
+   "self_type" : "type-2668",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -27591,8 +27630,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::base::ErrnoRestorer *",
    "name" : "const android::base::ErrnoRestorer *",
-   "referenced_type" : "type-4655",
-   "self_type" : "type-4661",
+   "referenced_type" : "type-4662",
+   "self_type" : "type-4668",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27600,8 +27639,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser> *",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser> *",
-   "referenced_type" : "type-2580",
-   "self_type" : "type-2595",
+   "referenced_type" : "type-2583",
+   "self_type" : "type-2598",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -27618,8 +27657,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::BpHwRefBase *",
    "name" : "const android::hardware::BpHwRefBase *",
-   "referenced_type" : "type-1374",
-   "self_type" : "type-1375",
+   "referenced_type" : "type-1377",
+   "self_type" : "type-1378",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -27627,8 +27666,8 @@
    "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",
+   "referenced_type" : "type-7674",
+   "self_type" : "type-7676",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27636,24 +27675,6 @@
    "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,
@@ -27661,8 +27682,8 @@
   },
   {
    "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> > *",
+   "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-4498",
    "self_type" : "type-4499",
    "size" : 4,
@@ -27670,10 +27691,28 @@
   },
   {
    "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-4375",
+   "self_type" : "type-4376",
+   "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-4504",
+   "self_type" : "type-4505",
+   "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-4357",
-   "self_type" : "type-4358",
+   "referenced_type" : "type-4363",
+   "self_type" : "type-4364",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27681,8 +27720,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<int> *",
    "name" : "const android::hardware::Return<int> *",
-   "referenced_type" : "type-4698",
-   "self_type" : "type-4700",
+   "referenced_type" : "type-4704",
+   "self_type" : "type-4706",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27690,8 +27729,8 @@
    "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",
+   "referenced_type" : "type-7677",
+   "self_type" : "type-7678",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27753,8 +27792,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-4348",
-   "self_type" : "type-4349",
+   "referenced_type" : "type-4354",
+   "self_type" : "type-4355",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -27780,8 +27819,8 @@
    "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-2460",
-   "self_type" : "type-2461",
+   "referenced_type" : "type-2463",
+   "self_type" : "type-2464",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27807,8 +27846,8 @@
    "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",
+   "referenced_type" : "type-4732",
+   "self_type" : "type-4733",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -27870,8 +27909,8 @@
    "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",
+   "referenced_type" : "type-4386",
+   "self_type" : "type-4387",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -27906,8 +27945,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-2619",
-   "self_type" : "type-2627",
+   "referenced_type" : "type-2622",
+   "self_type" : "type-2630",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27915,8 +27954,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-2617",
-   "self_type" : "type-2626",
+   "referenced_type" : "type-2620",
+   "self_type" : "type-2629",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27924,8 +27963,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-2613",
-   "self_type" : "type-2625",
+   "referenced_type" : "type-2616",
+   "self_type" : "type-2628",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27933,8 +27972,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
    "name" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
-   "referenced_type" : "type-1304",
-   "self_type" : "type-2513",
+   "referenced_type" : "type-1301",
+   "self_type" : "type-2516",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27943,7 +27982,7 @@
    "linker_set_key" : "const android::sp<android::ALooper> *",
    "name" : "const android::sp<android::ALooper> *",
    "referenced_type" : "type-320",
-   "self_type" : "type-2277",
+   "self_type" : "type-2280",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27951,8 +27990,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::AMessage> *",
    "name" : "const android::sp<android::AMessage> *",
-   "referenced_type" : "type-2175",
-   "self_type" : "type-2203",
+   "referenced_type" : "type-2174",
+   "self_type" : "type-2206",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27969,8 +28008,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::ComponentWrapper> *",
    "name" : "const android::sp<android::ComponentWrapper> *",
-   "referenced_type" : "type-2491",
-   "self_type" : "type-2493",
+   "referenced_type" : "type-2494",
+   "self_type" : "type-2496",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27987,8 +28026,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::Fence> *",
    "name" : "const android::sp<android::Fence> *",
-   "referenced_type" : "type-1863",
-   "self_type" : "type-2529",
+   "referenced_type" : "type-1867",
+   "self_type" : "type-2532",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27996,8 +28035,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::FrameDropper> *",
    "name" : "const android::sp<android::FrameDropper> *",
-   "referenced_type" : "type-2506",
-   "self_type" : "type-2507",
+   "referenced_type" : "type-2509",
+   "self_type" : "type-2510",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28005,8 +28044,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::GraphicBuffer> *",
    "name" : "const android::sp<android::GraphicBuffer> *",
-   "referenced_type" : "type-1196",
-   "self_type" : "type-1195",
+   "referenced_type" : "type-1200",
+   "self_type" : "type-1199",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28014,8 +28053,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::GraphicBufferSource> *",
    "name" : "const android::sp<android::GraphicBufferSource> *",
-   "referenced_type" : "type-2544",
-   "self_type" : "type-2545",
+   "referenced_type" : "type-2547",
+   "self_type" : "type-2548",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28023,8 +28062,8 @@
    "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",
+   "referenced_type" : "type-4270",
+   "self_type" : "type-4269",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28032,8 +28071,8 @@
    "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",
+   "referenced_type" : "type-4279",
+   "self_type" : "type-4278",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28041,8 +28080,8 @@
    "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",
+   "referenced_type" : "type-4832",
+   "self_type" : "type-4845",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28050,8 +28089,8 @@
    "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",
+   "referenced_type" : "type-5111",
+   "self_type" : "type-5120",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28059,8 +28098,8 @@
    "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",
+   "referenced_type" : "type-4306",
+   "self_type" : "type-4390",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28068,8 +28107,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IBinder> *",
    "name" : "const android::sp<android::IBinder> *",
-   "referenced_type" : "type-1036",
-   "self_type" : "type-1273",
+   "referenced_type" : "type-1040",
+   "self_type" : "type-1277",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28087,7 +28126,7 @@
    "linker_set_key" : "const android::sp<android::IGraphicBufferConsumer> *",
    "name" : "const android::sp<android::IGraphicBufferConsumer> *",
    "referenced_type" : "type-789",
-   "self_type" : "type-2500",
+   "self_type" : "type-2503",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28095,8 +28134,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer> *",
    "name" : "const android::sp<android::IGraphicBufferProducer> *",
-   "referenced_type" : "type-2485",
-   "self_type" : "type-2487",
+   "referenced_type" : "type-2488",
+   "self_type" : "type-2490",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28104,8 +28143,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IInterface> *",
    "name" : "const android::sp<android::IInterface> *",
-   "referenced_type" : "type-1487",
-   "self_type" : "type-1493",
+   "referenced_type" : "type-1491",
+   "self_type" : "type-1497",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28123,7 +28162,7 @@
    "linker_set_key" : "const android::sp<android::NativeHandle> *",
    "name" : "const android::sp<android::NativeHandle> *",
    "referenced_type" : "type-934",
-   "self_type" : "type-1597",
+   "self_type" : "type-1601",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28131,8 +28170,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-2468",
-   "self_type" : "type-2469",
+   "referenced_type" : "type-2471",
+   "self_type" : "type-2472",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28140,8 +28179,8 @@
    "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-2458",
-   "self_type" : "type-2459",
+   "referenced_type" : "type-2461",
+   "self_type" : "type-2462",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28149,8 +28188,8 @@
    "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",
+   "referenced_type" : "type-4245",
+   "self_type" : "type-4284",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28158,8 +28197,8 @@
    "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",
+   "referenced_type" : "type-4476",
+   "self_type" : "type-4475",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28167,8 +28206,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-2482",
-   "self_type" : "type-2483",
+   "referenced_type" : "type-2485",
+   "self_type" : "type-2486",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28176,8 +28215,8 @@
    "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-2475",
+   "referenced_type" : "type-2477",
+   "self_type" : "type-2478",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28185,8 +28224,8 @@
    "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",
+   "referenced_type" : "type-4239",
+   "self_type" : "type-4282",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28194,8 +28233,8 @@
    "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",
+   "referenced_type" : "type-4469",
+   "self_type" : "type-4468",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28204,7 +28243,7 @@
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient> *",
    "name" : "const android::sp<android::hardware::hidl_death_recipient> *",
    "referenced_type" : "type-513",
-   "self_type" : "type-2442",
+   "self_type" : "type-2445",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28212,8 +28251,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-2446",
-   "self_type" : "type-2447",
+   "referenced_type" : "type-2449",
+   "self_type" : "type-2450",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28221,8 +28260,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "referenced_type" : "type-2451",
-   "self_type" : "type-2453",
+   "referenced_type" : "type-2454",
+   "self_type" : "type-2456",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28257,8 +28296,8 @@
    "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",
+   "referenced_type" : "type-4296",
+   "self_type" : "type-4311",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28275,8 +28314,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-1241",
-   "self_type" : "type-1240",
+   "referenced_type" : "type-1244",
+   "self_type" : "type-1243",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -28302,8 +28341,8 @@
    "alignment" : 4,
    "linker_set_key" : "const log_msg *",
    "name" : "const log_msg *",
-   "referenced_type" : "type-2313",
-   "self_type" : "type-2320",
+   "referenced_type" : "type-2316",
+   "self_type" : "type-2323",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -28312,7 +28351,7 @@
    "linker_set_key" : "const long long *",
    "name" : "const long long *",
    "referenced_type" : "type-560",
-   "self_type" : "type-1068",
+   "self_type" : "type-1071",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28330,7 +28369,7 @@
    "linker_set_key" : "const signed char *",
    "name" : "const signed char *",
    "referenced_type" : "type-437",
-   "self_type" : "type-4723",
+   "self_type" : "type-4730",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28338,8 +28377,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-4759",
-   "self_type" : "type-4761",
+   "referenced_type" : "type-4766",
+   "self_type" : "type-4768",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28347,8 +28386,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-4863",
-   "self_type" : "type-4865",
+   "referenced_type" : "type-4869",
+   "self_type" : "type-4871",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28356,8 +28395,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-5070",
-   "self_type" : "type-5076",
+   "referenced_type" : "type-5086",
+   "self_type" : "type-5092",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28365,8 +28404,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-5123",
-   "self_type" : "type-5125",
+   "referenced_type" : "type-5139",
+   "self_type" : "type-5141",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28374,8 +28413,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-7357",
-   "self_type" : "type-7359",
+   "referenced_type" : "type-7380",
+   "self_type" : "type-7382",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28383,8 +28422,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-7450",
-   "self_type" : "type-7452",
+   "referenced_type" : "type-7475",
+   "self_type" : "type-7477",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28392,8 +28431,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-7578",
-   "self_type" : "type-7580",
+   "referenced_type" : "type-7602",
+   "self_type" : "type-7604",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28438,7 +28477,7 @@
    "linker_set_key" : "float *",
    "name" : "float *",
    "referenced_type" : "type-268",
-   "self_type" : "type-1275",
+   "self_type" : "type-1276",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28456,7 +28495,7 @@
    "linker_set_key" : "int *",
    "name" : "int *",
    "referenced_type" : "type-4",
-   "self_type" : "type-1509",
+   "self_type" : "type-1512",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28464,8 +28503,8 @@
    "alignment" : 4,
    "linker_set_key" : "log_msg *",
    "name" : "log_msg *",
-   "referenced_type" : "type-2177",
-   "self_type" : "type-2342",
+   "referenced_type" : "type-2180",
+   "self_type" : "type-2345",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -28492,7 +28531,7 @@
    "linker_set_key" : "signed char *",
    "name" : "signed char *",
    "referenced_type" : "type-438",
-   "self_type" : "type-4731",
+   "self_type" : "type-4737",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28500,8 +28539,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::tuple<> *",
    "name" : "std::tuple<> *",
-   "referenced_type" : "type-1566",
-   "self_type" : "type-1565",
+   "referenced_type" : "type-1571",
+   "self_type" : "type-1570",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28509,429 +28548,6 @@
    "alignment" : 4,
    "linker_set_key" : "std::tuple<> *",
    "name" : "std::tuple<> *",
-   "referenced_type" : "type-2072",
-   "self_type" : "type-2071",
-   "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-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,
@@ -28939,10 +28555,415 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "std::tuple<unsigned long long> *",
-   "name" : "std::tuple<unsigned long long> *",
-   "referenced_type" : "type-4162",
-   "self_type" : "type-4161",
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-4056",
+   "self_type" : "type-4055",
+   "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-4166",
+   "self_type" : "type-4165",
+   "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-6647",
+   "self_type" : "type-6646",
+   "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-6769",
+   "self_type" : "type-6768",
+   "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-2054",
+   "self_type" : "type-2053",
+   "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-4150",
+   "self_type" : "type-4149",
+   "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-6753",
+   "self_type" : "type-6752",
+   "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-1575",
+   "self_type" : "type-1574",
+   "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-4059",
+   "self_type" : "type-4058",
+   "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-6650",
+   "self_type" : "type-6649",
+   "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-2119",
+   "self_type" : "type-2118",
+   "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-4195",
+   "self_type" : "type-4194",
+   "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-6799",
+   "self_type" : "type-6798",
+   "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-2089",
+   "self_type" : "type-2088",
+   "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-4175",
+   "self_type" : "type-4174",
+   "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-6778",
+   "self_type" : "type-6777",
+   "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-2094",
+   "self_type" : "type-2093",
+   "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-4178",
+   "self_type" : "type-4177",
+   "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-6781",
+   "self_type" : "type-6780",
+   "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-2115",
+   "self_type" : "type-2114",
+   "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-4192",
+   "self_type" : "type-4191",
+   "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-6796",
+   "self_type" : "type-6795",
+   "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-2100",
+   "self_type" : "type-2099",
+   "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-4182",
+   "self_type" : "type-4181",
+   "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-6786",
+   "self_type" : "type-6785",
+   "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-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, sp<GraphicBuffer> > *",
+   "name" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "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<int, sp<GraphicBuffer> > *",
+   "name" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "referenced_type" : "type-6759",
+   "self_type" : "type-6758",
+   "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-2067",
+   "self_type" : "type-2066",
+   "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-4159",
+   "self_type" : "type-4158",
+   "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-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> *",
+   "name" : "std::tuple<int> *",
+   "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> *",
+   "name" : "std::tuple<int> *",
+   "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> *",
+   "name" : "std::tuple<int> *",
+   "referenced_type" : "type-6756",
+   "self_type" : "type-6755",
+   "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-2072",
+   "self_type" : "type-2071",
+   "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-4163",
+   "self_type" : "type-4162",
+   "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-6765",
+   "self_type" : "type-6764",
+   "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-2110",
+   "self_type" : "type-2109",
+   "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-4189",
+   "self_type" : "type-4188",
+   "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-6793",
+   "self_type" : "type-6792",
+   "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-2085",
+   "self_type" : "type-2084",
+   "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-4172",
+   "self_type" : "type-4171",
+   "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-6775",
+   "self_type" : "type-6774",
+   "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-2106",
+   "self_type" : "type-2105",
+   "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-4186",
+   "self_type" : "type-4185",
+   "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-6789",
+   "self_type" : "type-6788",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28950,8 +28971,26 @@
    "alignment" : 4,
    "linker_set_key" : "std::tuple<unsigned long long> *",
    "name" : "std::tuple<unsigned long long> *",
-   "referenced_type" : "type-6748",
-   "self_type" : "type-6747",
+   "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 long long> *",
+   "name" : "std::tuple<unsigned long long> *",
+   "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<unsigned long long> *",
+   "name" : "std::tuple<unsigned long long> *",
+   "referenced_type" : "type-6772",
+   "self_type" : "type-6771",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28959,8 +28998,8 @@
    "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",
+   "referenced_type" : "type-1653",
+   "self_type" : "type-1652",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -28968,8 +29007,8 @@
    "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",
+   "referenced_type" : "type-4117",
+   "self_type" : "type-4116",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -28977,8 +29016,8 @@
    "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",
+   "referenced_type" : "type-6706",
+   "self_type" : "type-6705",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -28987,7 +29026,7 @@
    "linker_set_key" : "unsigned char (*)[128]",
    "name" : "unsigned char (*)[128]",
    "referenced_type" : "type-1527",
-   "self_type" : "type-2360",
+   "self_type" : "type-2363",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -29005,7 +29044,7 @@
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
    "referenced_type" : "type-2",
-   "self_type" : "type-1680",
+   "self_type" : "type-1684",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -29031,8 +29070,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
    "name" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
-   "referenced_type" : "type-1380",
-   "self_type" : "type-1379",
+   "referenced_type" : "type-1383",
+   "self_type" : "type-1382",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -29072,8 +29111,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1078",
-   "self_type" : "type-1080",
+   "referenced_type" : "type-1081",
+   "self_type" : "type-1083",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29082,8 +29121,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1190",
-   "self_type" : "type-1192",
+   "referenced_type" : "type-1193",
+   "self_type" : "type-1196",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29092,8 +29131,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1351",
-   "self_type" : "type-1353",
+   "referenced_type" : "type-1354",
+   "self_type" : "type-1356",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29102,8 +29141,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1403",
-   "self_type" : "type-1405",
+   "referenced_type" : "type-1406",
+   "self_type" : "type-1408",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29112,8 +29151,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1419",
-   "self_type" : "type-1421",
+   "referenced_type" : "type-1422",
+   "self_type" : "type-1424",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29122,8 +29161,8 @@
    "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",
+   "referenced_type" : "type-1443",
+   "self_type" : "type-1445",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29132,8 +29171,8 @@
    "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",
+   "referenced_type" : "type-1485",
+   "self_type" : "type-1487",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29142,8 +29181,8 @@
    "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",
+   "referenced_type" : "type-1619",
+   "self_type" : "type-1622",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29152,8 +29191,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2648",
-   "self_type" : "type-2651",
+   "referenced_type" : "type-2651",
+   "self_type" : "type-2654",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29162,8 +29201,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",
+   "referenced_type" : "type-3461",
+   "self_type" : "type-3463",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29172,8 +29211,8 @@
    "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",
+   "referenced_type" : "type-3527",
+   "self_type" : "type-3529",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29182,8 +29221,8 @@
    "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",
+   "referenced_type" : "type-3629",
+   "self_type" : "type-3631",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29192,8 +29231,8 @@
    "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",
+   "referenced_type" : "type-3694",
+   "self_type" : "type-3696",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29202,8 +29241,8 @@
    "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",
+   "referenced_type" : "type-3786",
+   "self_type" : "type-3788",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29212,8 +29251,8 @@
    "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",
+   "referenced_type" : "type-3847",
+   "self_type" : "type-3846",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29222,8 +29261,8 @@
    "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",
+   "referenced_type" : "type-3911",
+   "self_type" : "type-3913",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29232,8 +29271,8 @@
    "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",
+   "referenced_type" : "type-3937",
+   "self_type" : "type-3939",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29242,8 +29281,8 @@
    "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",
+   "referenced_type" : "type-3953",
+   "self_type" : "type-3955",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29252,8 +29291,8 @@
    "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",
+   "referenced_type" : "type-3978",
+   "self_type" : "type-3980",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29262,8 +29301,8 @@
    "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",
+   "referenced_type" : "type-4011",
+   "self_type" : "type-4013",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29272,8 +29311,8 @@
    "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",
+   "referenced_type" : "type-4092",
+   "self_type" : "type-4094",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29282,8 +29321,8 @@
    "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",
+   "referenced_type" : "type-4292",
+   "self_type" : "type-4294",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29292,8 +29331,8 @@
    "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",
+   "referenced_type" : "type-4479",
+   "self_type" : "type-4481",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29302,8 +29341,8 @@
    "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",
+   "referenced_type" : "type-4532",
+   "self_type" : "type-4534",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29312,8 +29351,8 @@
    "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",
+   "referenced_type" : "type-4541",
+   "self_type" : "type-4543",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29322,8 +29361,8 @@
    "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",
+   "referenced_type" : "type-4566",
+   "self_type" : "type-4568",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29332,8 +29371,8 @@
    "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",
+   "referenced_type" : "type-4717",
+   "self_type" : "type-4720",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29342,8 +29381,8 @@
    "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",
+   "referenced_type" : "type-4847",
+   "self_type" : "type-4849",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29352,8 +29391,8 @@
    "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",
+   "referenced_type" : "type-4996",
+   "self_type" : "type-4998",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29362,8 +29401,8 @@
    "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",
+   "referenced_type" : "type-5121",
+   "self_type" : "type-5123",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29372,8 +29411,8 @@
    "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",
+   "referenced_type" : "type-5160",
+   "self_type" : "type-5162",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29392,8 +29431,8 @@
    "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",
+   "referenced_type" : "type-5536",
+   "self_type" : "type-5538",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29402,8 +29441,8 @@
    "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",
+   "referenced_type" : "type-5602",
+   "self_type" : "type-5604",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29412,8 +29451,8 @@
    "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",
+   "referenced_type" : "type-5704",
+   "self_type" : "type-5706",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29422,8 +29461,8 @@
    "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",
+   "referenced_type" : "type-5769",
+   "self_type" : "type-5771",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29432,8 +29471,8 @@
    "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",
+   "referenced_type" : "type-5861",
+   "self_type" : "type-5863",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29442,8 +29481,8 @@
    "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",
+   "referenced_type" : "type-5922",
+   "self_type" : "type-5921",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29452,8 +29491,8 @@
    "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",
+   "referenced_type" : "type-5984",
+   "self_type" : "type-5986",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29462,8 +29501,8 @@
    "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",
+   "referenced_type" : "type-6044",
+   "self_type" : "type-6046",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29472,8 +29511,8 @@
    "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",
+   "referenced_type" : "type-6140",
+   "self_type" : "type-6142",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29482,8 +29521,8 @@
    "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",
+   "referenced_type" : "type-6192",
+   "self_type" : "type-6194",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29492,8 +29531,8 @@
    "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",
+   "referenced_type" : "type-6281",
+   "self_type" : "type-6283",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29502,8 +29541,8 @@
    "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",
+   "referenced_type" : "type-6333",
+   "self_type" : "type-6335",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29512,8 +29551,8 @@
    "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",
+   "referenced_type" : "type-6413",
+   "self_type" : "type-6415",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29522,8 +29561,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-6483",
-   "self_type" : "type-6485",
+   "referenced_type" : "type-6506",
+   "self_type" : "type-6508",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29532,8 +29571,8 @@
    "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",
+   "referenced_type" : "type-6532",
+   "self_type" : "type-6534",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29542,8 +29581,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",
+   "referenced_type" : "type-6549",
+   "self_type" : "type-6551",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29552,8 +29591,8 @@
    "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",
+   "referenced_type" : "type-6570",
+   "self_type" : "type-6572",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29562,8 +29601,8 @@
    "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",
+   "referenced_type" : "type-6602",
+   "self_type" : "type-6604",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29572,8 +29611,8 @@
    "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",
+   "referenced_type" : "type-6682",
+   "self_type" : "type-6684",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29582,8 +29621,8 @@
    "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",
+   "referenced_type" : "type-6899",
+   "self_type" : "type-6901",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29592,8 +29631,8 @@
    "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",
+   "referenced_type" : "type-7084",
+   "self_type" : "type-7086",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29602,8 +29641,8 @@
    "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",
+   "referenced_type" : "type-7146",
+   "self_type" : "type-7149",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29612,8 +29651,8 @@
    "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",
+   "referenced_type" : "type-7161",
+   "self_type" : "type-7164",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29622,8 +29661,8 @@
    "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",
+   "referenced_type" : "type-7197",
+   "self_type" : "type-7199",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29632,8 +29671,8 @@
    "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",
+   "referenced_type" : "type-7347",
+   "self_type" : "type-7349",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29652,8 +29691,8 @@
    "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",
+   "referenced_type" : "type-7448",
+   "self_type" : "type-7450",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29662,8 +29701,8 @@
    "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",
+   "referenced_type" : "type-7485",
+   "self_type" : "type-7487",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29672,8 +29711,8 @@
    "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",
+   "referenced_type" : "type-7539",
+   "self_type" : "type-7541",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29682,8 +29721,8 @@
    "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",
+   "referenced_type" : "type-7591",
+   "self_type" : "type-7601",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29692,8 +29731,8 @@
    "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",
+   "referenced_type" : "type-7619",
+   "self_type" : "type-7621",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29702,8 +29741,8 @@
    "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",
+   "referenced_type" : "type-7681",
+   "self_type" : "type-7683",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29732,8 +29771,8 @@
    "is_const" : true,
    "linker_set_key" : "android::hardware::IBinder *const",
    "name" : "android::hardware::IBinder *const",
-   "referenced_type" : "type-1358",
-   "self_type" : "type-1372",
+   "referenced_type" : "type-1361",
+   "self_type" : "type-1375",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -29743,7 +29782,7 @@
    "linker_set_key" : "const android::AHandler",
    "name" : "const android::AHandler",
    "referenced_type" : "type-264",
-   "self_type" : "type-2518",
+   "self_type" : "type-2521",
    "size" : 48,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29753,7 +29792,7 @@
    "linker_set_key" : "const android::AHandlerReflector<android::GraphicBufferSource>",
    "name" : "const android::AHandlerReflector<android::GraphicBufferSource>",
    "referenced_type" : "type-583",
-   "self_type" : "type-2514",
+   "self_type" : "type-2517",
    "size" : 56,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29763,7 +29802,7 @@
    "linker_set_key" : "const android::ALooper",
    "name" : "const android::ALooper",
    "referenced_type" : "type-248",
-   "self_type" : "type-2289",
+   "self_type" : "type-2292",
    "size" : 52,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29772,8 +29811,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AReplyToken",
    "name" : "const android::AReplyToken",
-   "referenced_type" : "type-1044",
-   "self_type" : "type-1167",
+   "referenced_type" : "type-1043",
+   "self_type" : "type-1168",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -29783,7 +29822,7 @@
    "linker_set_key" : "const android::AString",
    "name" : "const android::AString",
    "referenced_type" : "type-253",
-   "self_type" : "type-2110",
+   "self_type" : "type-2101",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -29813,7 +29852,7 @@
    "linker_set_key" : "const android::BnInterface<android::IGraphicBufferProducer>",
    "name" : "const android::BnInterface<android::IGraphicBufferProducer>",
    "referenced_type" : "type-71",
-   "self_type" : "type-1232",
+   "self_type" : "type-1236",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -29823,7 +29862,7 @@
    "linker_set_key" : "const android::BnInterface<android::IProducerListener>",
    "name" : "const android::BnInterface<android::IProducerListener>",
    "referenced_type" : "type-80",
-   "self_type" : "type-4477",
+   "self_type" : "type-4483",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -29832,8 +29871,8 @@
    "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",
+   "referenced_type" : "type-1034",
+   "self_type" : "type-1096",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -29852,8 +29891,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-1070",
-   "self_type" : "type-1069",
+   "referenced_type" : "type-1073",
+   "self_type" : "type-1072",
    "size" : 164,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -29862,8 +29901,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-1220",
-   "self_type" : "type-1219",
+   "referenced_type" : "type-1224",
+   "self_type" : "type-1223",
    "size" : 164,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -29872,8 +29911,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-1531",
-   "self_type" : "type-1530",
+   "referenced_type" : "type-1534",
+   "self_type" : "type-1533",
    "size" : 164,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -29882,8 +29921,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-1672",
-   "self_type" : "type-1671",
+   "referenced_type" : "type-1676",
+   "self_type" : "type-1675",
    "size" : 164,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -29892,8 +29931,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-3442",
-   "self_type" : "type-3441",
+   "referenced_type" : "type-3445",
+   "self_type" : "type-3444",
    "size" : 164,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -29902,8 +29941,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-3634",
-   "self_type" : "type-3633",
+   "referenced_type" : "type-3637",
+   "self_type" : "type-3636",
    "size" : 164,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -29912,8 +29951,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-3683",
-   "self_type" : "type-3682",
+   "referenced_type" : "type-3689",
+   "self_type" : "type-3688",
    "size" : 164,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -29922,8 +29961,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-3792",
-   "self_type" : "type-3791",
+   "referenced_type" : "type-3799",
+   "self_type" : "type-3798",
    "size" : 164,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -29932,8 +29971,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-4041",
-   "self_type" : "type-4040",
+   "referenced_type" : "type-4048",
+   "self_type" : "type-4047",
    "size" : 164,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -29942,8 +29981,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-4127",
-   "self_type" : "type-4126",
+   "referenced_type" : "type-4133",
+   "self_type" : "type-4132",
    "size" : 164,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -29952,8 +29991,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-5503",
-   "self_type" : "type-5502",
+   "referenced_type" : "type-5520",
+   "self_type" : "type-5519",
    "size" : 164,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -29962,8 +30001,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-5695",
-   "self_type" : "type-5694",
+   "referenced_type" : "type-5712",
+   "self_type" : "type-5711",
    "size" : 164,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -29972,8 +30011,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-5744",
-   "self_type" : "type-5743",
+   "referenced_type" : "type-5764",
+   "self_type" : "type-5763",
    "size" : 164,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -29982,8 +30021,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-5853",
-   "self_type" : "type-5852",
+   "referenced_type" : "type-5874",
+   "self_type" : "type-5873",
    "size" : 164,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -29992,8 +30031,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-6107",
-   "self_type" : "type-6106",
+   "referenced_type" : "type-6127",
+   "self_type" : "type-6126",
    "size" : 164,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -30002,8 +30041,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-6266",
-   "self_type" : "type-6265",
+   "referenced_type" : "type-6286",
+   "self_type" : "type-6285",
    "size" : 164,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30012,8 +30051,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-6308",
-   "self_type" : "type-6307",
+   "referenced_type" : "type-6331",
+   "self_type" : "type-6330",
    "size" : 164,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -30022,8 +30061,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-6399",
-   "self_type" : "type-6398",
+   "referenced_type" : "type-6422",
+   "self_type" : "type-6421",
    "size" : 164,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30032,8 +30071,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-6617",
-   "self_type" : "type-6616",
+   "referenced_type" : "type-6640",
+   "self_type" : "type-6639",
    "size" : 164,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -30042,8 +30081,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-6699",
-   "self_type" : "type-6698",
+   "referenced_type" : "type-6722",
+   "self_type" : "type-6721",
    "size" : 164,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -30072,9 +30111,9 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferQueueCore",
    "name" : "const android::BufferQueueCore",
-   "referenced_type" : "type-3522",
-   "self_type" : "type-3521",
-   "size" : 3392,
+   "referenced_type" : "type-3525",
+   "self_type" : "type-3524",
+   "size" : 3396,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -30082,9 +30121,9 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferQueueCore",
    "name" : "const android::BufferQueueCore",
-   "referenced_type" : "type-5583",
-   "self_type" : "type-5582",
-   "size" : 3392,
+   "referenced_type" : "type-5600",
+   "self_type" : "type-5599",
+   "size" : 3396,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -30092,9 +30131,9 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferQueueCore",
    "name" : "const android::BufferQueueCore",
-   "referenced_type" : "type-6169",
-   "self_type" : "type-6168",
-   "size" : 3392,
+   "referenced_type" : "type-6189",
+   "self_type" : "type-6188",
+   "size" : 3396,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -30104,7 +30143,7 @@
    "name" : "const android::BufferQueueCore",
    "referenced_type" : "type-832",
    "self_type" : "type-831",
-   "size" : 3392,
+   "size" : 3396,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -30113,7 +30152,7 @@
    "linker_set_key" : "const android::ComponentWrapper",
    "name" : "const android::ComponentWrapper",
    "referenced_type" : "type-569",
-   "self_type" : "type-2494",
+   "self_type" : "type-2497",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30122,8 +30161,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::CompositorTiming",
    "name" : "const android::CompositorTiming",
-   "referenced_type" : "type-1425",
-   "self_type" : "type-1424",
+   "referenced_type" : "type-1428",
+   "self_type" : "type-1427",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30132,8 +30171,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::CompositorTiming",
    "name" : "const android::CompositorTiming",
-   "referenced_type" : "type-3953",
-   "self_type" : "type-3952",
+   "referenced_type" : "type-3961",
+   "self_type" : "type-3960",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30142,8 +30181,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::CompositorTiming",
    "name" : "const android::CompositorTiming",
-   "referenced_type" : "type-6532",
-   "self_type" : "type-6531",
+   "referenced_type" : "type-6555",
+   "self_type" : "type-6554",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30152,8 +30191,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ConsumerListener",
    "name" : "const android::ConsumerListener",
-   "referenced_type" : "type-3514",
-   "self_type" : "type-3513",
+   "referenced_type" : "type-3517",
+   "self_type" : "type-3516",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30162,8 +30201,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ConsumerListener",
    "name" : "const android::ConsumerListener",
-   "referenced_type" : "type-5575",
-   "self_type" : "type-5574",
+   "referenced_type" : "type-5592",
+   "self_type" : "type-5591",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30172,8 +30211,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ConsumerListener",
    "name" : "const android::ConsumerListener",
-   "referenced_type" : "type-6164",
-   "self_type" : "type-6163",
+   "referenced_type" : "type-6184",
+   "self_type" : "type-6183",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30192,8 +30231,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-1310",
-   "self_type" : "type-1309",
+   "referenced_type" : "type-1313",
+   "self_type" : "type-1312",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30202,8 +30241,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-2531",
-   "self_type" : "type-2530",
+   "referenced_type" : "type-2534",
+   "self_type" : "type-2533",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30212,8 +30251,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-3449",
-   "self_type" : "type-3448",
+   "referenced_type" : "type-3452",
+   "self_type" : "type-3451",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30222,8 +30261,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-3594",
-   "self_type" : "type-3593",
+   "referenced_type" : "type-3597",
+   "self_type" : "type-3596",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30232,8 +30271,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-3860",
-   "self_type" : "type-3859",
+   "referenced_type" : "type-3866",
+   "self_type" : "type-3865",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30242,8 +30281,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-4423",
-   "self_type" : "type-4422",
+   "referenced_type" : "type-4429",
+   "self_type" : "type-4428",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30252,8 +30291,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-4673",
-   "self_type" : "type-4672",
+   "referenced_type" : "type-4680",
+   "self_type" : "type-4679",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30262,8 +30301,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-4942",
-   "self_type" : "type-4941",
+   "referenced_type" : "type-4948",
+   "self_type" : "type-4947",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30272,8 +30311,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-5510",
-   "self_type" : "type-5509",
+   "referenced_type" : "type-5527",
+   "self_type" : "type-5526",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30282,8 +30321,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-5655",
-   "self_type" : "type-5654",
+   "referenced_type" : "type-5672",
+   "self_type" : "type-5671",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30292,8 +30331,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-5921",
-   "self_type" : "type-5920",
+   "referenced_type" : "type-5941",
+   "self_type" : "type-5940",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30302,8 +30341,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-6001",
-   "self_type" : "type-6000",
+   "referenced_type" : "type-6021",
+   "self_type" : "type-6020",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30312,8 +30351,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-6112",
-   "self_type" : "type-6111",
+   "referenced_type" : "type-6133",
+   "self_type" : "type-6132",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30322,8 +30361,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-6240",
-   "self_type" : "type-6239",
+   "referenced_type" : "type-6260",
+   "self_type" : "type-6259",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30332,8 +30371,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-6441",
-   "self_type" : "type-6440",
+   "referenced_type" : "type-6464",
+   "self_type" : "type-6463",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30342,8 +30381,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-7013",
-   "self_type" : "type-7012",
+   "referenced_type" : "type-7037",
+   "self_type" : "type-7036",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30352,8 +30391,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-7190",
-   "self_type" : "type-7189",
+   "referenced_type" : "type-7213",
+   "self_type" : "type-7212",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30372,8 +30411,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-7300",
-   "self_type" : "type-7299",
+   "referenced_type" : "type-7323",
+   "self_type" : "type-7322",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30392,8 +30431,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot::State",
    "name" : "const android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-4580",
-   "self_type" : "type-4579",
+   "referenced_type" : "type-4586",
+   "self_type" : "type-4585",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30402,8 +30441,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot::State",
    "name" : "const android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-4748",
-   "self_type" : "type-4747",
+   "referenced_type" : "type-4755",
+   "self_type" : "type-4754",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30412,8 +30451,8 @@
    "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",
+   "referenced_type" : "type-7226",
+   "self_type" : "type-7225",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30422,8 +30461,8 @@
    "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",
+   "referenced_type" : "type-7372",
+   "self_type" : "type-7371",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30432,7 +30471,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::FileDescriptor::Autoclose",
    "name" : "const android::FileDescriptor::Autoclose",
-   "referenced_type" : "type-1204",
+   "referenced_type" : "type-1203",
    "self_type" : "type-1221",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h"
@@ -30443,7 +30482,7 @@
    "linker_set_key" : "const android::Flattenable<android::BufferItem>",
    "name" : "const android::Flattenable<android::BufferItem>",
    "referenced_type" : "type-21",
-   "self_type" : "type-1506",
+   "self_type" : "type-1509",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30453,7 +30492,7 @@
    "linker_set_key" : "const android::Flattenable<android::Fence>",
    "name" : "const android::Flattenable<android::Fence>",
    "referenced_type" : "type-16",
-   "self_type" : "type-1634",
+   "self_type" : "type-1638",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30463,7 +30502,7 @@
    "linker_set_key" : "const android::Flattenable<android::FrameEventHistoryDelta>",
    "name" : "const android::Flattenable<android::FrameEventHistoryDelta>",
    "referenced_type" : "type-25",
-   "self_type" : "type-4306",
+   "self_type" : "type-4312",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30473,7 +30512,7 @@
    "linker_set_key" : "const android::Flattenable<android::GraphicBuffer>",
    "name" : "const android::Flattenable<android::GraphicBuffer>",
    "referenced_type" : "type-14",
-   "self_type" : "type-1638",
+   "self_type" : "type-1643",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30483,7 +30522,7 @@
    "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
    "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
    "referenced_type" : "type-32",
-   "self_type" : "type-4309",
+   "self_type" : "type-4315",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30493,7 +30532,7 @@
    "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
    "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
    "referenced_type" : "type-34",
-   "self_type" : "type-4312",
+   "self_type" : "type-4318",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30503,7 +30542,7 @@
    "linker_set_key" : "const android::FrameDropper",
    "name" : "const android::FrameDropper",
    "referenced_type" : "type-580",
-   "self_type" : "type-2508",
+   "self_type" : "type-2511",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30512,8 +30551,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-1347",
-   "self_type" : "type-1346",
+   "referenced_type" : "type-1350",
+   "self_type" : "type-1349",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30522,8 +30561,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-1462",
-   "self_type" : "type-1461",
+   "referenced_type" : "type-1466",
+   "self_type" : "type-1465",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30532,8 +30571,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-2404",
-   "self_type" : "type-2403",
+   "referenced_type" : "type-2407",
+   "self_type" : "type-2406",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30542,8 +30581,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-3455",
-   "self_type" : "type-3454",
+   "referenced_type" : "type-3458",
+   "self_type" : "type-3457",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30552,8 +30591,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-3599",
-   "self_type" : "type-3598",
+   "referenced_type" : "type-3602",
+   "self_type" : "type-3601",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30562,8 +30601,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-3899",
-   "self_type" : "type-3898",
+   "referenced_type" : "type-3905",
+   "self_type" : "type-3904",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30572,8 +30611,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-3992",
-   "self_type" : "type-3991",
+   "referenced_type" : "type-3998",
+   "self_type" : "type-3997",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30582,8 +30621,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-4219",
-   "self_type" : "type-4218",
+   "referenced_type" : "type-4225",
+   "self_type" : "type-4224",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30592,8 +30631,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-4839",
-   "self_type" : "type-4838",
+   "referenced_type" : "type-4841",
+   "self_type" : "type-4840",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30602,8 +30641,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-5516",
-   "self_type" : "type-5515",
+   "referenced_type" : "type-5533",
+   "self_type" : "type-5532",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30612,8 +30651,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-5660",
-   "self_type" : "type-5659",
+   "referenced_type" : "type-5677",
+   "self_type" : "type-5676",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30622,8 +30661,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-5960",
-   "self_type" : "type-5959",
+   "referenced_type" : "type-5980",
+   "self_type" : "type-5979",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30632,8 +30671,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-5977",
-   "self_type" : "type-5976",
+   "referenced_type" : "type-5997",
+   "self_type" : "type-5996",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30642,8 +30681,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-6118",
-   "self_type" : "type-6117",
+   "referenced_type" : "type-6138",
+   "self_type" : "type-6137",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30652,8 +30691,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-6245",
-   "self_type" : "type-6244",
+   "referenced_type" : "type-6265",
+   "self_type" : "type-6264",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30662,8 +30701,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-6478",
-   "self_type" : "type-6477",
+   "referenced_type" : "type-6501",
+   "self_type" : "type-6500",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30672,8 +30711,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-6566",
-   "self_type" : "type-6565",
+   "referenced_type" : "type-6589",
+   "self_type" : "type-6588",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30682,8 +30721,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-6810",
-   "self_type" : "type-6809",
+   "referenced_type" : "type-6833",
+   "self_type" : "type-6832",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30692,8 +30731,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-6821",
-   "self_type" : "type-6820",
+   "referenced_type" : "type-6844",
+   "self_type" : "type-6843",
    "size" : 156,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30723,7 +30762,7 @@
    "linker_set_key" : "const android::GraphicBufferSource",
    "name" : "const android::GraphicBufferSource",
    "referenced_type" : "type-566",
-   "self_type" : "type-2546",
+   "self_type" : "type-2549",
    "size" : 268,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30753,7 +30792,7 @@
    "linker_set_key" : "const android::IBinder",
    "name" : "const android::IBinder",
    "referenced_type" : "type-51",
-   "self_type" : "type-1520",
+   "self_type" : "type-1524",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30763,7 +30802,7 @@
    "linker_set_key" : "const android::IBinder::DeathRecipient",
    "name" : "const android::IBinder::DeathRecipient",
    "referenced_type" : "type-174",
-   "self_type" : "type-4315",
+   "self_type" : "type-4321",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -30772,8 +30811,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-1156",
-   "self_type" : "type-1155",
+   "referenced_type" : "type-1159",
+   "self_type" : "type-1158",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30782,8 +30821,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-1581",
-   "self_type" : "type-1580",
+   "referenced_type" : "type-1585",
+   "self_type" : "type-1584",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30792,8 +30831,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-3612",
-   "self_type" : "type-3611",
+   "referenced_type" : "type-3615",
+   "self_type" : "type-3614",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30802,8 +30841,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-3761",
-   "self_type" : "type-3760",
+   "referenced_type" : "type-3767",
+   "self_type" : "type-3766",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30812,8 +30851,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-4061",
-   "self_type" : "type-4060",
+   "referenced_type" : "type-4067",
+   "self_type" : "type-4066",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30822,8 +30861,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-5673",
-   "self_type" : "type-5672",
+   "referenced_type" : "type-5690",
+   "self_type" : "type-5689",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30832,8 +30871,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-5822",
-   "self_type" : "type-5821",
+   "referenced_type" : "type-5842",
+   "self_type" : "type-5841",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30842,8 +30881,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-6251",
-   "self_type" : "type-6250",
+   "referenced_type" : "type-6271",
+   "self_type" : "type-6270",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30852,8 +30891,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-6375",
-   "self_type" : "type-6374",
+   "referenced_type" : "type-6398",
+   "self_type" : "type-6397",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30862,8 +30901,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-6634",
-   "self_type" : "type-6633",
+   "referenced_type" : "type-6657",
+   "self_type" : "type-6656",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30882,8 +30921,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-1605",
-   "self_type" : "type-1604",
+   "referenced_type" : "type-1609",
+   "self_type" : "type-1608",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30892,8 +30931,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-2502",
-   "self_type" : "type-2501",
+   "referenced_type" : "type-2505",
+   "self_type" : "type-2504",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30902,8 +30941,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-3495",
-   "self_type" : "type-3494",
+   "referenced_type" : "type-3498",
+   "self_type" : "type-3497",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30912,8 +30951,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-4078",
-   "self_type" : "type-4077",
+   "referenced_type" : "type-4084",
+   "self_type" : "type-4083",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30922,8 +30961,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-4915",
-   "self_type" : "type-4914",
+   "referenced_type" : "type-4921",
+   "self_type" : "type-4920",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30932,8 +30971,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-5556",
-   "self_type" : "type-5555",
+   "referenced_type" : "type-5573",
+   "self_type" : "type-5572",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30942,8 +30981,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-5994",
-   "self_type" : "type-5993",
+   "referenced_type" : "type-6014",
+   "self_type" : "type-6013",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30952,8 +30991,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-6150",
-   "self_type" : "type-6149",
+   "referenced_type" : "type-6170",
+   "self_type" : "type-6169",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30962,8 +31001,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-6649",
-   "self_type" : "type-6648",
+   "referenced_type" : "type-6672",
+   "self_type" : "type-6671",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30972,8 +31011,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-7135",
-   "self_type" : "type-7134",
+   "referenced_type" : "type-7158",
+   "self_type" : "type-7157",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30992,8 +31031,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferProducer",
    "name" : "const android::IGraphicBufferProducer",
-   "referenced_type" : "type-3505",
-   "self_type" : "type-3504",
+   "referenced_type" : "type-3508",
+   "self_type" : "type-3507",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31002,8 +31041,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferProducer",
    "name" : "const android::IGraphicBufferProducer",
-   "referenced_type" : "type-4248",
-   "self_type" : "type-4247",
+   "referenced_type" : "type-4254",
+   "self_type" : "type-4253",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31012,8 +31051,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferProducer",
    "name" : "const android::IGraphicBufferProducer",
-   "referenced_type" : "type-5566",
-   "self_type" : "type-5565",
+   "referenced_type" : "type-5583",
+   "self_type" : "type-5582",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31022,8 +31061,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferProducer",
    "name" : "const android::IGraphicBufferProducer",
-   "referenced_type" : "type-6159",
-   "self_type" : "type-6158",
+   "referenced_type" : "type-6179",
+   "self_type" : "type-6178",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31032,8 +31071,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferProducer",
    "name" : "const android::IGraphicBufferProducer",
-   "referenced_type" : "type-6844",
-   "self_type" : "type-6843",
+   "referenced_type" : "type-6867",
+   "self_type" : "type-6866",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31052,8 +31091,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-1161",
-   "self_type" : "type-1160",
+   "referenced_type" : "type-1032",
+   "self_type" : "type-1031",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31062,8 +31101,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-3624",
-   "self_type" : "type-3623",
+   "referenced_type" : "type-1164",
+   "self_type" : "type-1163",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31072,8 +31111,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-3766",
-   "self_type" : "type-3765",
+   "referenced_type" : "type-3627",
+   "self_type" : "type-3626",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31082,8 +31121,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-4254",
-   "self_type" : "type-4253",
+   "referenced_type" : "type-3671",
+   "self_type" : "type-3670",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31092,8 +31131,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-4450",
-   "self_type" : "type-4449",
+   "referenced_type" : "type-3772",
+   "self_type" : "type-3771",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31102,8 +31141,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-4690",
-   "self_type" : "type-4689",
+   "referenced_type" : "type-4260",
+   "self_type" : "type-4259",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31112,8 +31151,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-5685",
-   "self_type" : "type-5684",
+   "referenced_type" : "type-4456",
+   "self_type" : "type-4455",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31122,8 +31161,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-5827",
-   "self_type" : "type-5826",
+   "referenced_type" : "type-4697",
+   "self_type" : "type-4696",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31132,8 +31171,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-6258",
-   "self_type" : "type-6257",
+   "referenced_type" : "type-5702",
+   "self_type" : "type-5701",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31142,8 +31181,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-6380",
-   "self_type" : "type-6379",
+   "referenced_type" : "type-5746",
+   "self_type" : "type-5745",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31152,8 +31191,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-6850",
-   "self_type" : "type-6849",
+   "referenced_type" : "type-5847",
+   "self_type" : "type-5846",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31162,8 +31201,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-7043",
-   "self_type" : "type-7042",
+   "referenced_type" : "type-6278",
+   "self_type" : "type-6277",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31172,8 +31211,48 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-7313",
-   "self_type" : "type-7312",
+   "referenced_type" : "type-6322",
+   "self_type" : "type-6321",
+   "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-6403",
+   "self_type" : "type-6402",
+   "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-6873",
+   "self_type" : "type-6872",
+   "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-7067",
+   "self_type" : "type-7066",
+   "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-7336",
+   "self_type" : "type-7335",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31213,7 +31292,7 @@
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect>",
    "name" : "const android::LightFlattenablePod<android::Rect>",
    "referenced_type" : "type-46",
-   "self_type" : "type-4587",
+   "self_type" : "type-4593",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -31232,8 +31311,8 @@
    "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",
+   "referenced_type" : "type-1214",
+   "self_type" : "type-1233",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -31243,7 +31322,7 @@
    "linker_set_key" : "const android::LightRefBase<android::NativeHandle>",
    "name" : "const android::LightRefBase<android::NativeHandle>",
    "referenced_type" : "type-521",
-   "self_type" : "type-2663",
+   "self_type" : "type-2666",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -31392,8 +31471,8 @@
    "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",
+   "referenced_type" : "type-1520",
+   "self_type" : "type-1523",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -31402,8 +31481,8 @@
    "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",
+   "referenced_type" : "type-1662",
+   "self_type" : "type-1666",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -31412,8 +31491,8 @@
    "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",
+   "referenced_type" : "type-4334",
+   "self_type" : "type-4337",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -31422,8 +31501,8 @@
    "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",
+   "referenced_type" : "type-1657",
+   "self_type" : "type-1660",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -31432,8 +31511,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-4333",
-   "self_type" : "type-4336",
+   "referenced_type" : "type-4339",
+   "self_type" : "type-4343",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -31442,8 +31521,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-4338",
-   "self_type" : "type-4341",
+   "referenced_type" : "type-4345",
+   "self_type" : "type-4348",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -31472,8 +31551,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-1216",
-   "self_type" : "type-1215",
+   "referenced_type" : "type-1219",
+   "self_type" : "type-1218",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31482,8 +31561,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-1491",
-   "self_type" : "type-1490",
+   "referenced_type" : "type-1494",
+   "self_type" : "type-1493",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31492,8 +31571,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-1622",
-   "self_type" : "type-1621",
+   "referenced_type" : "type-1625",
+   "self_type" : "type-1624",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31502,8 +31581,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-2684",
-   "self_type" : "type-2683",
+   "referenced_type" : "type-2687",
+   "self_type" : "type-2686",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31512,8 +31591,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-3467",
-   "self_type" : "type-3466",
+   "referenced_type" : "type-3470",
+   "self_type" : "type-3469",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -31522,8 +31601,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-3788",
-   "self_type" : "type-3787",
+   "referenced_type" : "type-3794",
+   "self_type" : "type-3793",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31532,8 +31611,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4012",
-   "self_type" : "type-4011",
+   "referenced_type" : "type-4018",
+   "self_type" : "type-4017",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31542,8 +31621,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4091",
-   "self_type" : "type-4090",
+   "referenced_type" : "type-4097",
+   "self_type" : "type-4096",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31552,8 +31631,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4293",
-   "self_type" : "type-4292",
+   "referenced_type" : "type-4299",
+   "self_type" : "type-4298",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31562,8 +31641,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4573",
-   "self_type" : "type-4572",
+   "referenced_type" : "type-4579",
+   "self_type" : "type-4578",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31572,8 +31651,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4737",
-   "self_type" : "type-4736",
+   "referenced_type" : "type-4744",
+   "self_type" : "type-4743",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31582,8 +31661,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-5020",
-   "self_type" : "type-5019",
+   "referenced_type" : "type-5026",
+   "self_type" : "type-5025",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31592,8 +31671,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-5064",
-   "self_type" : "type-5063",
+   "referenced_type" : "type-5081",
+   "self_type" : "type-5080",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31602,8 +31681,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-5528",
-   "self_type" : "type-5527",
+   "referenced_type" : "type-5545",
+   "self_type" : "type-5544",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -31612,8 +31691,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-5849",
-   "self_type" : "type-5848",
+   "referenced_type" : "type-5869",
+   "self_type" : "type-5868",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31622,8 +31701,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-6031",
-   "self_type" : "type-6030",
+   "referenced_type" : "type-6051",
+   "self_type" : "type-6050",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31632,8 +31711,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-6130",
-   "self_type" : "type-6129",
+   "referenced_type" : "type-6150",
+   "self_type" : "type-6149",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -31642,8 +31721,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-6395",
-   "self_type" : "type-6394",
+   "referenced_type" : "type-6418",
+   "self_type" : "type-6417",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31652,8 +31731,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-6585",
-   "self_type" : "type-6584",
+   "referenced_type" : "type-6609",
+   "self_type" : "type-6608",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31662,8 +31741,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-6664",
-   "self_type" : "type-6663",
+   "referenced_type" : "type-6687",
+   "self_type" : "type-6686",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31672,8 +31751,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-6882",
-   "self_type" : "type-6881",
+   "referenced_type" : "type-6906",
+   "self_type" : "type-6905",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31682,8 +31761,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-7193",
-   "self_type" : "type-7192",
+   "referenced_type" : "type-7217",
+   "self_type" : "type-7216",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31692,8 +31771,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-7340",
-   "self_type" : "type-7339",
+   "referenced_type" : "type-7363",
+   "self_type" : "type-7362",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31702,8 +31781,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-7566",
-   "self_type" : "type-7565",
+   "referenced_type" : "type-7589",
+   "self_type" : "type-7588",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31722,8 +31801,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-7667",
-   "self_type" : "type-7666",
+   "referenced_type" : "type-7686",
+   "self_type" : "type-7685",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31733,7 +31812,7 @@
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
    "referenced_type" : "type-52",
-   "self_type" : "type-1449",
+   "self_type" : "type-1452",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -31742,8 +31821,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SafeBpInterface<android::IConsumerListener>",
    "name" : "const android::SafeBpInterface<android::IConsumerListener>",
-   "referenced_type" : "type-1537",
-   "self_type" : "type-1551",
+   "referenced_type" : "type-1541",
+   "self_type" : "type-1554",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -31752,8 +31831,8 @@
    "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",
+   "referenced_type" : "type-1720",
+   "self_type" : "type-1890",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -31762,8 +31841,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SafeInterface::ParcelHandler",
    "name" : "const android::SafeInterface::ParcelHandler",
-   "referenced_type" : "type-1235",
-   "self_type" : "type-1256",
+   "referenced_type" : "type-1238",
+   "self_type" : "type-1254",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -31773,7 +31852,7 @@
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
    "name" : "const android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
    "referenced_type" : "type-159",
-   "self_type" : "type-2675",
+   "self_type" : "type-2678",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -31783,7 +31862,7 @@
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "const android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "referenced_type" : "type-146",
-   "self_type" : "type-2671",
+   "self_type" : "type-2674",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -31793,7 +31872,7 @@
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "const android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
    "referenced_type" : "type-139",
-   "self_type" : "type-2667",
+   "self_type" : "type-2670",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -31802,8 +31881,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-1239",
-   "self_type" : "type-1248",
+   "referenced_type" : "type-1242",
+   "self_type" : "type-1251",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -31813,7 +31892,7 @@
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
    "referenced_type" : "type-121",
-   "self_type" : "type-1875",
+   "self_type" : "type-1879",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -31823,7 +31902,7 @@
    "linker_set_key" : "const android::Vector<android::BufferItem>",
    "name" : "const android::Vector<android::BufferItem>",
    "referenced_type" : "type-837",
-   "self_type" : "type-977",
+   "self_type" : "type-979",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31832,8 +31911,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<android::Rect>",
    "name" : "const android::Vector<android::Rect>",
-   "referenced_type" : "type-2677",
-   "self_type" : "type-2679",
+   "referenced_type" : "type-2680",
+   "self_type" : "type-2682",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31842,8 +31921,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",
+   "referenced_type" : "type-1228",
+   "self_type" : "type-1231",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31852,8 +31931,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<int>",
    "name" : "const android::Vector<int>",
-   "referenced_type" : "type-2686",
-   "self_type" : "type-2688",
+   "referenced_type" : "type-2689",
+   "self_type" : "type-2691",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31862,8 +31941,8 @@
    "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",
+   "referenced_type" : "type-1084",
+   "self_type" : "type-1086",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31873,7 +31952,7 @@
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
    "referenced_type" : "type-141",
-   "self_type" : "type-2664",
+   "self_type" : "type-2667",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -31882,8 +31961,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::base::ErrnoRestorer",
    "name" : "const android::base::ErrnoRestorer",
-   "referenced_type" : "type-4656",
-   "self_type" : "type-4655",
+   "referenced_type" : "type-4663",
+   "self_type" : "type-4662",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -31892,8 +31971,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
-   "referenced_type" : "type-2553",
-   "self_type" : "type-2580",
+   "referenced_type" : "type-2556",
+   "self_type" : "type-2583",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -31912,8 +31991,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::BpHwRefBase",
    "name" : "const android::hardware::BpHwRefBase",
-   "referenced_type" : "type-1371",
-   "self_type" : "type-1374",
+   "referenced_type" : "type-1374",
+   "self_type" : "type-1377",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -31922,8 +32001,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-1377",
-   "self_type" : "type-1385",
+   "referenced_type" : "type-1380",
+   "self_type" : "type-1388",
    "size" : 68,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -31932,8 +32011,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-7504",
-   "self_type" : "type-7651",
+   "referenced_type" : "type-7528",
+   "self_type" : "type-7674",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -31942,26 +32021,6 @@
    "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,
@@ -31970,8 +32029,8 @@
   {
    "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> >",
+   "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-4494",
    "self_type" : "type-4498",
    "size" : 28,
@@ -31980,10 +32039,30 @@
   {
    "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-4371",
+   "self_type" : "type-4375",
+   "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-4500",
+   "self_type" : "type-4504",
+   "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-4353",
-   "self_type" : "type-4357",
+   "referenced_type" : "type-4359",
+   "self_type" : "type-4363",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -31993,7 +32072,7 @@
    "linker_set_key" : "const android::hardware::Return<int>",
    "name" : "const android::hardware::Return<int>",
    "referenced_type" : "type-413",
-   "self_type" : "type-4698",
+   "self_type" : "type-4704",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32002,8 +32081,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-7508",
-   "self_type" : "type-7653",
+   "referenced_type" : "type-7534",
+   "self_type" : "type-7677",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32073,7 +32152,7 @@
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned char>",
    "name" : "const android::hardware::details::hidl_pointer<unsigned char>",
    "referenced_type" : "type-390",
-   "self_type" : "type-4348",
+   "self_type" : "type-4354",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -32103,7 +32182,7 @@
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming",
    "referenced_type" : "type-588",
-   "self_type" : "type-4582",
+   "self_type" : "type-4588",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -32142,8 +32221,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-2456",
-   "self_type" : "type-2460",
+   "referenced_type" : "type-2459",
+   "self_type" : "type-2463",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32373,7 +32452,7 @@
    "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",
+   "self_type" : "type-4732",
    "size" : 64,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -32463,7 +32542,7 @@
    "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",
+   "self_type" : "type-4386",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -32523,7 +32602,7 @@
    "linker_set_key" : "const android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "const android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "referenced_type" : "type-160",
-   "self_type" : "type-2619",
+   "self_type" : "type-2622",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32533,7 +32612,7 @@
    "linker_set_key" : "const android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "name" : "const android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "referenced_type" : "type-147",
-   "self_type" : "type-2617",
+   "self_type" : "type-2620",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32543,7 +32622,7 @@
    "linker_set_key" : "const android::key_value_pair_t<unsigned int, unsigned int>",
    "name" : "const android::key_value_pair_t<unsigned int, unsigned int>",
    "referenced_type" : "type-143",
-   "self_type" : "type-2613",
+   "self_type" : "type-2616",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32551,32 +32630,32 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer>",
    "name" : "const android::sp<ANativeWindowBuffer>",
-   "referenced_type" : "type-2410",
-   "self_type" : "type-2409",
+   "referenced_type" : "type-2413",
+   "self_type" : "type-2412",
    "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",
+   "referenced_type" : "type-4852",
+   "self_type" : "type-4851",
    "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",
+   "referenced_type" : "type-5999",
+   "self_type" : "type-5998",
    "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",
+   "referenced_type" : "type-6837",
+   "self_type" : "type-6836",
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
   {
@@ -32585,7 +32664,7 @@
    "linker_set_key" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
    "name" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
    "referenced_type" : "type-581",
-   "self_type" : "type-1304",
+   "self_type" : "type-1301",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32605,7 +32684,7 @@
    "linker_set_key" : "const android::sp<android::AMessage>",
    "name" : "const android::sp<android::AMessage>",
    "referenced_type" : "type-259",
-   "self_type" : "type-2175",
+   "self_type" : "type-2174",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32614,8 +32693,8 @@
    "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",
+   "referenced_type" : "type-4234",
+   "self_type" : "type-4233",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32624,8 +32703,8 @@
    "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",
+   "referenced_type" : "type-4460",
+   "self_type" : "type-4522",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32645,7 +32724,7 @@
    "linker_set_key" : "const android::sp<android::ComponentWrapper>",
    "name" : "const android::sp<android::ComponentWrapper>",
    "referenced_type" : "type-567",
-   "self_type" : "type-2491",
+   "self_type" : "type-2494",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32664,8 +32743,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::Fence>",
    "name" : "const android::sp<android::Fence>",
-   "referenced_type" : "type-1864",
-   "self_type" : "type-1863",
+   "referenced_type" : "type-1868",
+   "self_type" : "type-1867",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32675,7 +32754,7 @@
    "linker_set_key" : "const android::sp<android::FrameDropper>",
    "name" : "const android::sp<android::FrameDropper>",
    "referenced_type" : "type-578",
-   "self_type" : "type-2506",
+   "self_type" : "type-2509",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32685,7 +32764,7 @@
    "linker_set_key" : "const android::sp<android::GraphicBuffer>",
    "name" : "const android::sp<android::GraphicBuffer>",
    "referenced_type" : "type-733",
-   "self_type" : "type-1196",
+   "self_type" : "type-1200",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32704,8 +32783,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::GraphicBufferSource>",
    "name" : "const android::sp<android::GraphicBufferSource>",
-   "referenced_type" : "type-2542",
-   "self_type" : "type-2544",
+   "referenced_type" : "type-2545",
+   "self_type" : "type-2547",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32714,8 +32793,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-4259",
-   "self_type" : "type-4264",
+   "referenced_type" : "type-4265",
+   "self_type" : "type-4270",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32724,8 +32803,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-4268",
-   "self_type" : "type-4273",
+   "referenced_type" : "type-4274",
+   "self_type" : "type-4279",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32734,8 +32813,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-4827",
-   "self_type" : "type-4826",
+   "referenced_type" : "type-4833",
+   "self_type" : "type-4832",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32744,8 +32823,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-5096",
-   "self_type" : "type-5095",
+   "referenced_type" : "type-5112",
+   "self_type" : "type-5111",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32755,7 +32834,7 @@
    "linker_set_key" : "const android::sp<android::IBinder::DeathRecipient>",
    "name" : "const android::sp<android::IBinder::DeathRecipient>",
    "referenced_type" : "type-843",
-   "self_type" : "type-4300",
+   "self_type" : "type-4306",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32765,7 +32844,7 @@
    "linker_set_key" : "const android::sp<android::IBinder>",
    "name" : "const android::sp<android::IBinder>",
    "referenced_type" : "type-795",
-   "self_type" : "type-1036",
+   "self_type" : "type-1040",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32795,7 +32874,7 @@
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer>",
    "name" : "const android::sp<android::IGraphicBufferProducer>",
    "referenced_type" : "type-570",
-   "self_type" : "type-2485",
+   "self_type" : "type-2488",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32805,7 +32884,7 @@
    "linker_set_key" : "const android::sp<android::IInterface>",
    "name" : "const android::sp<android::IInterface>",
    "referenced_type" : "type-646",
-   "self_type" : "type-1487",
+   "self_type" : "type-1491",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32824,8 +32903,8 @@
    "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",
+   "referenced_type" : "type-1044",
+   "self_type" : "type-1049",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32844,8 +32923,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",
+   "referenced_type" : "type-1262",
+   "self_type" : "type-1261",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -32854,8 +32933,8 @@
    "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",
+   "referenced_type" : "type-1370",
+   "self_type" : "type-1392",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -32864,8 +32943,8 @@
    "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",
+   "referenced_type" : "type-1397",
+   "self_type" : "type-1396",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -32874,8 +32953,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-2463",
-   "self_type" : "type-2468",
+   "referenced_type" : "type-2466",
+   "self_type" : "type-2471",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32884,8 +32963,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener>",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener>",
-   "referenced_type" : "type-2454",
-   "self_type" : "type-2458",
+   "referenced_type" : "type-2457",
+   "self_type" : "type-2461",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32894,8 +32973,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-4240",
-   "self_type" : "type-4239",
+   "referenced_type" : "type-4246",
+   "self_type" : "type-4245",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32904,8 +32983,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-4466",
-   "self_type" : "type-4469",
+   "referenced_type" : "type-4473",
+   "self_type" : "type-4476",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32914,8 +32993,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-2476",
-   "self_type" : "type-2482",
+   "referenced_type" : "type-2479",
+   "self_type" : "type-2485",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32924,8 +33003,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener>",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener>",
-   "referenced_type" : "type-2470",
-   "self_type" : "type-2474",
+   "referenced_type" : "type-2473",
+   "self_type" : "type-2477",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32934,8 +33013,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-4234",
-   "self_type" : "type-4233",
+   "referenced_type" : "type-4240",
+   "self_type" : "type-4239",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32944,8 +33023,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-4459",
-   "self_type" : "type-4462",
+   "referenced_type" : "type-4466",
+   "self_type" : "type-4469",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32964,8 +33043,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-2444",
-   "self_type" : "type-2446",
+   "referenced_type" : "type-2447",
+   "self_type" : "type-2449",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32974,8 +33053,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification>",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification>",
-   "referenced_type" : "type-2448",
-   "self_type" : "type-2451",
+   "referenced_type" : "type-2451",
+   "self_type" : "type-2454",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33015,7 +33094,7 @@
    "linker_set_key" : "const android::wp<android::IBinder::DeathRecipient>",
    "name" : "const android::wp<android::IBinder::DeathRecipient>",
    "referenced_type" : "type-172",
-   "self_type" : "type-4289",
+   "self_type" : "type-4296",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33025,7 +33104,7 @@
    "linker_set_key" : "const android::wp<android::IBinder>",
    "name" : "const android::wp<android::IBinder>",
    "referenced_type" : "type-130",
-   "self_type" : "type-4280",
+   "self_type" : "type-4286",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33035,7 +33114,7 @@
    "linker_set_key" : "const android_cta861_3_metadata",
    "name" : "const android_cta861_3_metadata",
    "referenced_type" : "type-305",
-   "self_type" : "type-1473",
+   "self_type" : "type-1477",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -33055,7 +33134,7 @@
    "linker_set_key" : "const android_smpte2086_metadata",
    "name" : "const android_smpte2086_metadata",
    "referenced_type" : "type-304",
-   "self_type" : "type-1471",
+   "self_type" : "type-1474",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -33085,7 +33164,7 @@
    "linker_set_key" : "const char *const",
    "name" : "const char *const",
    "referenced_type" : "type-122",
-   "self_type" : "type-1103",
+   "self_type" : "type-1106",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -33094,8 +33173,8 @@
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-1242",
-   "self_type" : "type-1241",
+   "referenced_type" : "type-1245",
+   "self_type" : "type-1244",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -33105,7 +33184,7 @@
    "linker_set_key" : "const double",
    "name" : "const double",
    "referenced_type" : "type-269",
-   "self_type" : "type-1077",
+   "self_type" : "type-1080",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -33141,64 +33220,64 @@
    "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-1113",
+   "self_type" : "type-1112",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1282",
-   "self_type" : "type-1281",
+   "referenced_type" : "type-1285",
+   "self_type" : "type-1284",
    "source_file" : "/system/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",
+   "referenced_type" : "type-3310",
+   "self_type" : "type-3309",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3539",
-   "self_type" : "type-3538",
+   "referenced_type" : "type-3542",
+   "self_type" : "type-3541",
    "source_file" : "/system/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",
+   "referenced_type" : "type-3651",
+   "self_type" : "type-3650",
    "source_file" : "/system/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",
+   "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-3833",
-   "self_type" : "type-3832",
+   "referenced_type" : "type-3839",
+   "self_type" : "type-3838",
    "source_file" : "/system/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",
+   "referenced_type" : "type-4379",
+   "self_type" : "type-4378",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -33213,216 +33292,216 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-4502",
-   "self_type" : "type-4501",
+   "referenced_type" : "type-4508",
+   "self_type" : "type-4507",
    "source_file" : "/system/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",
+   "referenced_type" : "type-4545",
+   "self_type" : "type-4544",
    "source_file" : "/system/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",
+   "referenced_type" : "type-4570",
+   "self_type" : "type-4569",
    "source_file" : "/system/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",
+   "referenced_type" : "type-4724",
+   "self_type" : "type-4723",
    "source_file" : "/system/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",
+   "referenced_type" : "type-4854",
+   "self_type" : "type-4853",
    "source_file" : "/system/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",
+   "referenced_type" : "type-5125",
+   "self_type" : "type-5124",
    "source_file" : "/system/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",
+   "referenced_type" : "type-5178",
+   "self_type" : "type-5177",
    "source_file" : "/system/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",
+   "referenced_type" : "type-5385",
+   "self_type" : "type-5384",
    "source_file" : "/system/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",
+   "referenced_type" : "type-5617",
+   "self_type" : "type-5616",
    "source_file" : "/system/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",
+   "referenced_type" : "type-5726",
+   "self_type" : "type-5725",
    "source_file" : "/system/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",
+   "referenced_type" : "type-5792",
+   "self_type" : "type-5791",
    "source_file" : "/system/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",
+   "referenced_type" : "type-5914",
+   "self_type" : "type-5913",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6070",
+   "self_type" : "type-6069",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6206",
+   "self_type" : "type-6205",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6302",
+   "self_type" : "type-6301",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6349",
+   "self_type" : "type-6348",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6441",
+   "self_type" : "type-6440",
    "source_file" : "/system/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",
+   "referenced_type" : "type-6980",
+   "self_type" : "type-6979",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7114",
+   "self_type" : "type-7113",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7167",
+   "self_type" : "type-7166",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7203",
+   "self_type" : "type-7202",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7352",
+   "self_type" : "type-7351",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7452",
+   "self_type" : "type-7451",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7490",
+   "self_type" : "type-7489",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7543",
+   "self_type" : "type-7542",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7623",
+   "self_type" : "type-7622",
    "source_file" : "/system/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",
+   "referenced_type" : "type-7688",
+   "self_type" : "type-7687",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -33438,8 +33517,8 @@
    "is_const" : true,
    "linker_set_key" : "const log_msg",
    "name" : "const log_msg",
-   "referenced_type" : "type-2177",
-   "self_type" : "type-2313",
+   "referenced_type" : "type-2180",
+   "self_type" : "type-2316",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -33488,8 +33567,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-1314",
-   "self_type" : "type-1313",
+   "referenced_type" : "type-1318",
+   "self_type" : "type-1317",
    "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"
   },
@@ -33498,8 +33577,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-3392",
-   "self_type" : "type-3391",
+   "referenced_type" : "type-3395",
+   "self_type" : "type-3394",
    "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"
   },
@@ -33508,8 +33587,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-3562",
-   "self_type" : "type-3561",
+   "referenced_type" : "type-3565",
+   "self_type" : "type-3564",
    "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"
   },
@@ -33518,8 +33597,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-3864",
-   "self_type" : "type-3863",
+   "referenced_type" : "type-3871",
+   "self_type" : "type-3870",
    "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"
   },
@@ -33528,8 +33607,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-4413",
-   "self_type" : "type-4412",
+   "referenced_type" : "type-4421",
+   "self_type" : "type-4420",
    "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"
   },
@@ -33538,8 +33617,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-4624",
-   "self_type" : "type-4623",
+   "referenced_type" : "type-4630",
+   "self_type" : "type-4629",
    "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"
   },
@@ -33548,8 +33627,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-4794",
-   "self_type" : "type-4793",
+   "referenced_type" : "type-4800",
+   "self_type" : "type-4799",
    "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"
   },
@@ -33558,8 +33637,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-5086",
-   "self_type" : "type-5085",
+   "referenced_type" : "type-5102",
+   "self_type" : "type-5101",
    "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"
   },
@@ -33568,8 +33647,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-5186",
-   "self_type" : "type-5185",
+   "referenced_type" : "type-5204",
+   "self_type" : "type-5203",
    "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"
   },
@@ -33578,8 +33657,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-5453",
-   "self_type" : "type-5452",
+   "referenced_type" : "type-5470",
+   "self_type" : "type-5469",
    "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"
   },
@@ -33588,8 +33667,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-5623",
-   "self_type" : "type-5622",
+   "referenced_type" : "type-5640",
+   "self_type" : "type-5639",
    "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"
   },
@@ -33598,8 +33677,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-5925",
-   "self_type" : "type-5924",
+   "referenced_type" : "type-5946",
+   "self_type" : "type-5945",
    "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"
   },
@@ -33618,8 +33697,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-6077",
-   "self_type" : "type-6076",
+   "referenced_type" : "type-6097",
+   "self_type" : "type-6096",
    "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"
   },
@@ -33628,8 +33707,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-6209",
-   "self_type" : "type-6208",
+   "referenced_type" : "type-6229",
+   "self_type" : "type-6228",
    "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"
   },
@@ -33638,8 +33717,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-6445",
-   "self_type" : "type-6444",
+   "referenced_type" : "type-6469",
+   "self_type" : "type-6468",
    "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"
   },
@@ -33648,8 +33727,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-7002",
-   "self_type" : "type-7001",
+   "referenced_type" : "type-7028",
+   "self_type" : "type-7027",
    "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"
   },
@@ -33658,8 +33737,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-7251",
-   "self_type" : "type-7250",
+   "referenced_type" : "type-7276",
+   "self_type" : "type-7275",
    "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"
   },
@@ -33668,8 +33747,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-7386",
-   "self_type" : "type-7385",
+   "referenced_type" : "type-7409",
+   "self_type" : "type-7408",
    "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"
   },
@@ -33678,8 +33757,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-7591",
-   "self_type" : "type-7590",
+   "referenced_type" : "type-7614",
+   "self_type" : "type-7613",
    "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"
   },
@@ -33698,8 +33777,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-1312",
-   "self_type" : "type-1311",
+   "referenced_type" : "type-1315",
+   "self_type" : "type-1314",
    "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"
   },
@@ -33708,8 +33787,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-3390",
-   "self_type" : "type-3389",
+   "referenced_type" : "type-3393",
+   "self_type" : "type-3392",
    "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"
   },
@@ -33718,8 +33797,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-3560",
-   "self_type" : "type-3559",
+   "referenced_type" : "type-3563",
+   "self_type" : "type-3562",
    "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"
   },
@@ -33728,8 +33807,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-3862",
-   "self_type" : "type-3861",
+   "referenced_type" : "type-3868",
+   "self_type" : "type-3867",
    "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"
   },
@@ -33738,8 +33817,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-4411",
-   "self_type" : "type-4410",
+   "referenced_type" : "type-4419",
+   "self_type" : "type-4418",
    "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"
   },
@@ -33748,8 +33827,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-4622",
-   "self_type" : "type-4621",
+   "referenced_type" : "type-4628",
+   "self_type" : "type-4627",
    "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"
   },
@@ -33758,8 +33837,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-4792",
-   "self_type" : "type-4791",
+   "referenced_type" : "type-4798",
+   "self_type" : "type-4797",
    "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"
   },
@@ -33768,8 +33847,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-5084",
-   "self_type" : "type-5083",
+   "referenced_type" : "type-5100",
+   "self_type" : "type-5099",
    "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"
   },
@@ -33778,8 +33857,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-5184",
-   "self_type" : "type-5183",
+   "referenced_type" : "type-5202",
+   "self_type" : "type-5201",
    "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"
   },
@@ -33788,8 +33867,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-5451",
-   "self_type" : "type-5450",
+   "referenced_type" : "type-5468",
+   "self_type" : "type-5467",
    "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"
   },
@@ -33798,8 +33877,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-5621",
-   "self_type" : "type-5620",
+   "referenced_type" : "type-5638",
+   "self_type" : "type-5637",
    "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"
   },
@@ -33808,8 +33887,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-5923",
-   "self_type" : "type-5922",
+   "referenced_type" : "type-5943",
+   "self_type" : "type-5942",
    "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"
   },
@@ -33828,8 +33907,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-6075",
-   "self_type" : "type-6074",
+   "referenced_type" : "type-6095",
+   "self_type" : "type-6094",
    "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"
   },
@@ -33838,8 +33917,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-6207",
-   "self_type" : "type-6206",
+   "referenced_type" : "type-6227",
+   "self_type" : "type-6226",
    "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"
   },
@@ -33848,8 +33927,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-6443",
-   "self_type" : "type-6442",
+   "referenced_type" : "type-6466",
+   "self_type" : "type-6465",
    "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"
   },
@@ -33858,8 +33937,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-7000",
-   "self_type" : "type-6999",
+   "referenced_type" : "type-7026",
+   "self_type" : "type-7025",
    "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"
   },
@@ -33868,8 +33947,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-7248",
-   "self_type" : "type-7247",
+   "referenced_type" : "type-7274",
+   "self_type" : "type-7273",
    "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"
   },
@@ -33878,8 +33957,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-7384",
-   "self_type" : "type-7383",
+   "referenced_type" : "type-7407",
+   "self_type" : "type-7406",
    "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"
   },
@@ -33888,8 +33967,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-7589",
-   "self_type" : "type-7588",
+   "referenced_type" : "type-7612",
+   "self_type" : "type-7611",
    "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"
   },
@@ -33908,8 +33987,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-1321",
-   "self_type" : "type-1320",
+   "referenced_type" : "type-1324",
+   "self_type" : "type-1323",
    "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"
   },
@@ -33918,8 +33997,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-3404",
-   "self_type" : "type-3403",
+   "referenced_type" : "type-3407",
+   "self_type" : "type-3406",
    "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"
   },
@@ -33928,8 +34007,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-3568",
-   "self_type" : "type-3567",
+   "referenced_type" : "type-3571",
+   "self_type" : "type-3570",
    "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"
   },
@@ -33938,8 +34017,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-3872",
-   "self_type" : "type-3871",
+   "referenced_type" : "type-3878",
+   "self_type" : "type-3877",
    "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"
   },
@@ -33948,8 +34027,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-4421",
-   "self_type" : "type-4420",
+   "referenced_type" : "type-4427",
+   "self_type" : "type-4426",
    "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"
   },
@@ -33958,8 +34037,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-4630",
-   "self_type" : "type-4629",
+   "referenced_type" : "type-4636",
+   "self_type" : "type-4635",
    "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"
   },
@@ -33968,8 +34047,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-4800",
-   "self_type" : "type-4799",
+   "referenced_type" : "type-4806",
+   "self_type" : "type-4805",
    "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"
   },
@@ -33978,8 +34057,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-5092",
-   "self_type" : "type-5091",
+   "referenced_type" : "type-5108",
+   "self_type" : "type-5107",
    "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"
   },
@@ -33988,8 +34067,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-5193",
-   "self_type" : "type-5192",
+   "referenced_type" : "type-5212",
+   "self_type" : "type-5211",
    "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"
   },
@@ -33998,8 +34077,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-5465",
-   "self_type" : "type-5464",
+   "referenced_type" : "type-5482",
+   "self_type" : "type-5481",
    "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"
   },
@@ -34008,8 +34087,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-5629",
-   "self_type" : "type-5628",
+   "referenced_type" : "type-5646",
+   "self_type" : "type-5645",
    "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"
   },
@@ -34018,8 +34097,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-5933",
-   "self_type" : "type-5932",
+   "referenced_type" : "type-5953",
+   "self_type" : "type-5952",
    "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"
   },
@@ -34028,8 +34107,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-6083",
-   "self_type" : "type-6082",
+   "referenced_type" : "type-6104",
+   "self_type" : "type-6103",
    "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"
   },
@@ -34048,8 +34127,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-6215",
-   "self_type" : "type-6214",
+   "referenced_type" : "type-6235",
+   "self_type" : "type-6234",
    "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"
   },
@@ -34058,8 +34137,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-6452",
-   "self_type" : "type-6451",
+   "referenced_type" : "type-6475",
+   "self_type" : "type-6474",
    "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"
   },
@@ -34068,8 +34147,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-7011",
-   "self_type" : "type-7010",
+   "referenced_type" : "type-7035",
+   "self_type" : "type-7034",
    "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"
   },
@@ -34078,8 +34157,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-7259",
-   "self_type" : "type-7258",
+   "referenced_type" : "type-7282",
+   "self_type" : "type-7281",
    "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"
   },
@@ -34088,8 +34167,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-7392",
-   "self_type" : "type-7391",
+   "referenced_type" : "type-7415",
+   "self_type" : "type-7414",
    "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"
   },
@@ -34098,8 +34177,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-7527",
-   "self_type" : "type-7526",
+   "referenced_type" : "type-7550",
+   "self_type" : "type-7549",
    "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"
   },
@@ -34118,8 +34197,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-1319",
-   "self_type" : "type-1318",
+   "referenced_type" : "type-1322",
+   "self_type" : "type-1321",
    "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"
   },
@@ -34128,8 +34207,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-3402",
-   "self_type" : "type-3401",
+   "referenced_type" : "type-3405",
+   "self_type" : "type-3404",
    "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"
   },
@@ -34138,8 +34217,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-3566",
-   "self_type" : "type-3565",
+   "referenced_type" : "type-3569",
+   "self_type" : "type-3568",
    "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"
   },
@@ -34148,8 +34227,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-3870",
-   "self_type" : "type-3869",
+   "referenced_type" : "type-3876",
+   "self_type" : "type-3875",
    "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"
   },
@@ -34158,8 +34237,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-4419",
-   "self_type" : "type-4418",
+   "referenced_type" : "type-4425",
+   "self_type" : "type-4424",
    "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"
   },
@@ -34168,8 +34247,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-4628",
-   "self_type" : "type-4627",
+   "referenced_type" : "type-4634",
+   "self_type" : "type-4633",
    "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"
   },
@@ -34178,8 +34257,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-4798",
-   "self_type" : "type-4797",
+   "referenced_type" : "type-4804",
+   "self_type" : "type-4803",
    "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"
   },
@@ -34188,8 +34267,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-5090",
-   "self_type" : "type-5089",
+   "referenced_type" : "type-5106",
+   "self_type" : "type-5105",
    "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"
   },
@@ -34198,8 +34277,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-5191",
-   "self_type" : "type-5190",
+   "referenced_type" : "type-5209",
+   "self_type" : "type-5208",
    "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"
   },
@@ -34208,8 +34287,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-5463",
-   "self_type" : "type-5462",
+   "referenced_type" : "type-5480",
+   "self_type" : "type-5479",
    "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"
   },
@@ -34218,8 +34297,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-5627",
-   "self_type" : "type-5626",
+   "referenced_type" : "type-5644",
+   "self_type" : "type-5643",
    "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"
   },
@@ -34228,8 +34307,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-5931",
-   "self_type" : "type-5930",
+   "referenced_type" : "type-5951",
+   "self_type" : "type-5950",
    "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"
   },
@@ -34238,8 +34317,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-6081",
-   "self_type" : "type-6080",
+   "referenced_type" : "type-6102",
+   "self_type" : "type-6101",
    "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"
   },
@@ -34258,8 +34337,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-6213",
-   "self_type" : "type-6212",
+   "referenced_type" : "type-6233",
+   "self_type" : "type-6232",
    "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"
   },
@@ -34268,8 +34347,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-6450",
-   "self_type" : "type-6449",
+   "referenced_type" : "type-6473",
+   "self_type" : "type-6472",
    "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"
   },
@@ -34278,8 +34357,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-7009",
-   "self_type" : "type-7008",
+   "referenced_type" : "type-7033",
+   "self_type" : "type-7032",
    "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"
   },
@@ -34288,8 +34367,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-7257",
-   "self_type" : "type-7256",
+   "referenced_type" : "type-7280",
+   "self_type" : "type-7279",
    "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"
   },
@@ -34298,8 +34377,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-7390",
-   "self_type" : "type-7389",
+   "referenced_type" : "type-7413",
+   "self_type" : "type-7412",
    "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"
   },
@@ -34308,8 +34387,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-7525",
-   "self_type" : "type-7524",
+   "referenced_type" : "type-7548",
+   "self_type" : "type-7547",
    "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"
   },
@@ -34328,8 +34407,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-1317",
-   "self_type" : "type-1316",
+   "referenced_type" : "type-1320",
+   "self_type" : "type-1319",
    "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"
   },
@@ -34338,8 +34417,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-3400",
-   "self_type" : "type-3399",
+   "referenced_type" : "type-3403",
+   "self_type" : "type-3402",
    "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"
   },
@@ -34348,8 +34427,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-3564",
-   "self_type" : "type-3563",
+   "referenced_type" : "type-3567",
+   "self_type" : "type-3566",
    "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"
   },
@@ -34358,8 +34437,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-3868",
-   "self_type" : "type-3867",
+   "referenced_type" : "type-3874",
+   "self_type" : "type-3873",
    "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"
   },
@@ -34368,8 +34447,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-4417",
-   "self_type" : "type-4416",
+   "referenced_type" : "type-4423",
+   "self_type" : "type-4422",
    "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"
   },
@@ -34378,8 +34457,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-4626",
-   "self_type" : "type-4625",
+   "referenced_type" : "type-4632",
+   "self_type" : "type-4631",
    "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"
   },
@@ -34388,8 +34467,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-4796",
-   "self_type" : "type-4795",
+   "referenced_type" : "type-4802",
+   "self_type" : "type-4801",
    "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"
   },
@@ -34398,8 +34477,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-5088",
-   "self_type" : "type-5087",
+   "referenced_type" : "type-5104",
+   "self_type" : "type-5103",
    "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"
   },
@@ -34408,8 +34487,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-5189",
-   "self_type" : "type-5188",
+   "referenced_type" : "type-5207",
+   "self_type" : "type-5206",
    "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"
   },
@@ -34418,8 +34497,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-5461",
-   "self_type" : "type-5460",
+   "referenced_type" : "type-5478",
+   "self_type" : "type-5477",
    "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"
   },
@@ -34428,8 +34507,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-5625",
-   "self_type" : "type-5624",
+   "referenced_type" : "type-5642",
+   "self_type" : "type-5641",
    "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"
   },
@@ -34438,8 +34517,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-5929",
-   "self_type" : "type-5928",
+   "referenced_type" : "type-5949",
+   "self_type" : "type-5948",
    "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"
   },
@@ -34448,8 +34527,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-6079",
-   "self_type" : "type-6078",
+   "referenced_type" : "type-6099",
+   "self_type" : "type-6098",
    "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"
   },
@@ -34468,8 +34547,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-6211",
-   "self_type" : "type-6210",
+   "referenced_type" : "type-6231",
+   "self_type" : "type-6230",
    "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"
   },
@@ -34478,8 +34557,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-6448",
-   "self_type" : "type-6447",
+   "referenced_type" : "type-6471",
+   "self_type" : "type-6470",
    "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"
   },
@@ -34488,8 +34567,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-7007",
-   "self_type" : "type-7006",
+   "referenced_type" : "type-7030",
+   "self_type" : "type-7029",
    "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"
   },
@@ -34498,8 +34577,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-7253",
-   "self_type" : "type-7252",
+   "referenced_type" : "type-7278",
+   "self_type" : "type-7277",
    "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"
   },
@@ -34508,8 +34587,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-7388",
-   "self_type" : "type-7387",
+   "referenced_type" : "type-7411",
+   "self_type" : "type-7410",
    "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"
   },
@@ -34518,8 +34597,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-7523",
-   "self_type" : "type-7522",
+   "referenced_type" : "type-7546",
+   "self_type" : "type-7545",
    "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"
   },
@@ -34538,8 +34617,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1119",
-   "self_type" : "type-1118",
+   "referenced_type" : "type-1122",
+   "self_type" : "type-1121",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34548,8 +34627,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1297",
-   "self_type" : "type-1296",
+   "referenced_type" : "type-1300",
+   "self_type" : "type-1299",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34558,8 +34637,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3374",
+   "self_type" : "type-3373",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34568,8 +34647,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3551",
+   "self_type" : "type-3550",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34578,8 +34657,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3728",
+   "self_type" : "type-3727",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34588,8 +34667,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3853",
+   "self_type" : "type-3852",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34598,8 +34677,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4405",
+   "self_type" : "type-4404",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34608,8 +34687,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4613",
+   "self_type" : "type-4612",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34618,8 +34697,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4786",
+   "self_type" : "type-4785",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34628,8 +34707,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5189",
+   "self_type" : "type-5188",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34638,8 +34717,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5449",
+   "self_type" : "type-5448",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34658,8 +34737,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5626",
+   "self_type" : "type-5625",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34668,8 +34747,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5803",
+   "self_type" : "type-5802",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34678,8 +34757,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5928",
+   "self_type" : "type-5927",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34688,8 +34767,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6082",
+   "self_type" : "type-6081",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34698,8 +34777,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6215",
+   "self_type" : "type-6214",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34708,8 +34787,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6362",
+   "self_type" : "type-6361",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34718,8 +34797,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6452",
+   "self_type" : "type-6451",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34728,8 +34807,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7011",
+   "self_type" : "type-7010",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34738,8 +34817,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7256",
+   "self_type" : "type-7255",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34748,8 +34827,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7395",
+   "self_type" : "type-7394",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34758,8 +34837,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7554",
+   "self_type" : "type-7553",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34768,8 +34847,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7696",
+   "self_type" : "type-7695",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34778,8 +34857,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-872",
+   "self_type" : "type-871",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34788,8 +34867,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-1126",
-   "self_type" : "type-1125",
+   "referenced_type" : "type-1129",
+   "self_type" : "type-1128",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34798,8 +34877,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-1303",
-   "self_type" : "type-1302",
+   "referenced_type" : "type-1307",
+   "self_type" : "type-1306",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34808,8 +34887,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-3377",
-   "self_type" : "type-3376",
+   "referenced_type" : "type-3380",
+   "self_type" : "type-3379",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34818,8 +34897,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-3554",
-   "self_type" : "type-3553",
+   "referenced_type" : "type-3557",
+   "self_type" : "type-3556",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34828,8 +34907,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-3729",
-   "self_type" : "type-3728",
+   "referenced_type" : "type-3735",
+   "self_type" : "type-3734",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34838,8 +34917,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-3853",
-   "self_type" : "type-3852",
+   "referenced_type" : "type-3860",
+   "self_type" : "type-3859",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34848,8 +34927,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-4405",
-   "self_type" : "type-4404",
+   "referenced_type" : "type-4411",
+   "self_type" : "type-4410",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34858,8 +34937,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-4613",
-   "self_type" : "type-4612",
+   "referenced_type" : "type-4619",
+   "self_type" : "type-4618",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34868,8 +34947,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-4785",
-   "self_type" : "type-4784",
+   "referenced_type" : "type-4792",
+   "self_type" : "type-4791",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34878,8 +34957,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-5178",
-   "self_type" : "type-5177",
+   "referenced_type" : "type-5195",
+   "self_type" : "type-5194",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34888,8 +34967,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-5438",
-   "self_type" : "type-5437",
+   "referenced_type" : "type-5455",
+   "self_type" : "type-5454",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34908,8 +34987,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-5615",
-   "self_type" : "type-5614",
+   "referenced_type" : "type-5632",
+   "self_type" : "type-5631",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34918,8 +34997,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-5790",
-   "self_type" : "type-5789",
+   "referenced_type" : "type-5810",
+   "self_type" : "type-5809",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34928,8 +35007,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-5914",
-   "self_type" : "type-5913",
+   "referenced_type" : "type-5935",
+   "self_type" : "type-5934",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34938,8 +35017,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-6068",
-   "self_type" : "type-6067",
+   "referenced_type" : "type-6088",
+   "self_type" : "type-6087",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34948,8 +35027,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-6201",
-   "self_type" : "type-6200",
+   "referenced_type" : "type-6221",
+   "self_type" : "type-6220",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34958,8 +35037,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-6345",
-   "self_type" : "type-6344",
+   "referenced_type" : "type-6368",
+   "self_type" : "type-6367",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34968,8 +35047,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-6435",
-   "self_type" : "type-6434",
+   "referenced_type" : "type-6458",
+   "self_type" : "type-6457",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34978,8 +35057,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-6993",
-   "self_type" : "type-6992",
+   "referenced_type" : "type-7017",
+   "self_type" : "type-7016",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34988,8 +35067,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-7239",
-   "self_type" : "type-7238",
+   "referenced_type" : "type-7263",
+   "self_type" : "type-7262",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -34998,8 +35077,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-7378",
-   "self_type" : "type-7377",
+   "referenced_type" : "type-7401",
+   "self_type" : "type-7400",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35008,8 +35087,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-7537",
-   "self_type" : "type-7536",
+   "referenced_type" : "type-7560",
+   "self_type" : "type-7559",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35018,8 +35097,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-7679",
-   "self_type" : "type-7678",
+   "referenced_type" : "type-7702",
+   "self_type" : "type-7701",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35038,8 +35117,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-1128",
-   "self_type" : "type-1127",
+   "referenced_type" : "type-1131",
+   "self_type" : "type-1130",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35048,8 +35127,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-1306",
-   "self_type" : "type-1305",
+   "referenced_type" : "type-1309",
+   "self_type" : "type-1308",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35058,8 +35137,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-3380",
-   "self_type" : "type-3379",
+   "referenced_type" : "type-3383",
+   "self_type" : "type-3382",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35068,8 +35147,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-3556",
-   "self_type" : "type-3555",
+   "referenced_type" : "type-3559",
+   "self_type" : "type-3558",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35078,8 +35157,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-3731",
-   "self_type" : "type-3730",
+   "referenced_type" : "type-3737",
+   "self_type" : "type-3736",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35088,8 +35167,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-3856",
-   "self_type" : "type-3855",
+   "referenced_type" : "type-3862",
+   "self_type" : "type-3861",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35098,8 +35177,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-4407",
-   "self_type" : "type-4406",
+   "referenced_type" : "type-4413",
+   "self_type" : "type-4412",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35108,8 +35187,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-4615",
-   "self_type" : "type-4614",
+   "referenced_type" : "type-4621",
+   "self_type" : "type-4620",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35118,8 +35197,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-4787",
-   "self_type" : "type-4786",
+   "referenced_type" : "type-4794",
+   "self_type" : "type-4793",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35128,8 +35207,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-5180",
-   "self_type" : "type-5179",
+   "referenced_type" : "type-5197",
+   "self_type" : "type-5196",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35138,18 +35217,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-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",
+   "referenced_type" : "type-5458",
+   "self_type" : "type-5457",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35168,8 +35237,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-5792",
-   "self_type" : "type-5791",
+   "referenced_type" : "type-5634",
+   "self_type" : "type-5633",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35178,8 +35247,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-5917",
-   "self_type" : "type-5916",
+   "referenced_type" : "type-5812",
+   "self_type" : "type-5811",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35188,8 +35257,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-6070",
-   "self_type" : "type-6069",
+   "referenced_type" : "type-5937",
+   "self_type" : "type-5936",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35198,8 +35267,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-6203",
-   "self_type" : "type-6202",
+   "referenced_type" : "type-6090",
+   "self_type" : "type-6089",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35208,8 +35277,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-6347",
-   "self_type" : "type-6346",
+   "referenced_type" : "type-6223",
+   "self_type" : "type-6222",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35218,8 +35287,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-6437",
-   "self_type" : "type-6436",
+   "referenced_type" : "type-6370",
+   "self_type" : "type-6369",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35228,8 +35297,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-6996",
-   "self_type" : "type-6995",
+   "referenced_type" : "type-6460",
+   "self_type" : "type-6459",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35238,8 +35307,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-7241",
-   "self_type" : "type-7240",
+   "referenced_type" : "type-7019",
+   "self_type" : "type-7018",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35248,8 +35317,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-7380",
-   "self_type" : "type-7379",
+   "referenced_type" : "type-7265",
+   "self_type" : "type-7264",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35258,8 +35327,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-7539",
-   "self_type" : "type-7538",
+   "referenced_type" : "type-7403",
+   "self_type" : "type-7402",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35268,8 +35337,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7562",
+   "self_type" : "type-7561",
+   "size" : 28,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/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-7705",
+   "self_type" : "type-7704",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35288,8 +35367,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-1123",
-   "self_type" : "type-1122",
+   "referenced_type" : "type-1127",
+   "self_type" : "type-1126",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35298,8 +35377,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-1301",
-   "self_type" : "type-1300",
+   "referenced_type" : "type-1305",
+   "self_type" : "type-1304",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35308,8 +35387,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-3375",
-   "self_type" : "type-3374",
+   "referenced_type" : "type-3378",
+   "self_type" : "type-3377",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35318,8 +35397,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-3552",
-   "self_type" : "type-3551",
+   "referenced_type" : "type-3555",
+   "self_type" : "type-3554",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35328,8 +35407,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-3726",
-   "self_type" : "type-3725",
+   "referenced_type" : "type-3733",
+   "self_type" : "type-3732",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35338,8 +35417,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-3851",
-   "self_type" : "type-3850",
+   "referenced_type" : "type-3858",
+   "self_type" : "type-3857",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35348,8 +35427,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-4403",
-   "self_type" : "type-4402",
+   "referenced_type" : "type-4409",
+   "self_type" : "type-4408",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35358,8 +35437,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-4611",
-   "self_type" : "type-4610",
+   "referenced_type" : "type-4617",
+   "self_type" : "type-4616",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35368,8 +35447,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-4783",
-   "self_type" : "type-4782",
+   "referenced_type" : "type-4790",
+   "self_type" : "type-4789",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35378,8 +35457,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-5176",
-   "self_type" : "type-5175",
+   "referenced_type" : "type-5193",
+   "self_type" : "type-5192",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35388,8 +35467,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-5436",
-   "self_type" : "type-5435",
+   "referenced_type" : "type-5453",
+   "self_type" : "type-5452",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35408,8 +35487,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-5613",
-   "self_type" : "type-5612",
+   "referenced_type" : "type-5630",
+   "self_type" : "type-5629",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35418,8 +35497,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-5787",
-   "self_type" : "type-5786",
+   "referenced_type" : "type-5808",
+   "self_type" : "type-5807",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35428,8 +35507,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-5912",
-   "self_type" : "type-5911",
+   "referenced_type" : "type-5933",
+   "self_type" : "type-5932",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35438,8 +35517,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-6065",
-   "self_type" : "type-6064",
+   "referenced_type" : "type-6086",
+   "self_type" : "type-6085",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35448,8 +35527,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-6199",
-   "self_type" : "type-6198",
+   "referenced_type" : "type-6219",
+   "self_type" : "type-6218",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35458,8 +35537,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-6343",
-   "self_type" : "type-6342",
+   "referenced_type" : "type-6366",
+   "self_type" : "type-6365",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35468,8 +35547,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-6432",
-   "self_type" : "type-6431",
+   "referenced_type" : "type-6456",
+   "self_type" : "type-6455",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35478,8 +35557,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-6991",
-   "self_type" : "type-6990",
+   "referenced_type" : "type-7015",
+   "self_type" : "type-7014",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35488,8 +35567,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-7237",
-   "self_type" : "type-7236",
+   "referenced_type" : "type-7260",
+   "self_type" : "type-7259",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35498,8 +35577,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-7376",
-   "self_type" : "type-7375",
+   "referenced_type" : "type-7399",
+   "self_type" : "type-7398",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35508,8 +35587,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-7535",
-   "self_type" : "type-7534",
+   "referenced_type" : "type-7558",
+   "self_type" : "type-7557",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35518,8 +35597,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-7677",
-   "self_type" : "type-7676",
+   "referenced_type" : "type-7700",
+   "self_type" : "type-7699",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35538,8 +35617,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-1130",
-   "self_type" : "type-1129",
+   "referenced_type" : "type-1133",
+   "self_type" : "type-1132",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35548,8 +35627,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-1308",
-   "self_type" : "type-1307",
+   "referenced_type" : "type-1311",
+   "self_type" : "type-1310",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35558,8 +35637,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-3383",
-   "self_type" : "type-3382",
+   "referenced_type" : "type-3386",
+   "self_type" : "type-3385",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35568,8 +35647,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-3558",
-   "self_type" : "type-3557",
+   "referenced_type" : "type-3561",
+   "self_type" : "type-3560",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35578,8 +35657,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-3733",
-   "self_type" : "type-3732",
+   "referenced_type" : "type-3739",
+   "self_type" : "type-3738",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35588,8 +35667,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-3858",
-   "self_type" : "type-3857",
+   "referenced_type" : "type-3864",
+   "self_type" : "type-3863",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35598,8 +35677,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-4409",
-   "self_type" : "type-4408",
+   "referenced_type" : "type-4415",
+   "self_type" : "type-4414",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35608,8 +35687,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-4617",
-   "self_type" : "type-4616",
+   "referenced_type" : "type-4626",
+   "self_type" : "type-4625",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35618,8 +35697,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-4789",
-   "self_type" : "type-4788",
+   "referenced_type" : "type-4796",
+   "self_type" : "type-4795",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35628,8 +35707,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-5182",
-   "self_type" : "type-5181",
+   "referenced_type" : "type-5200",
+   "self_type" : "type-5199",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35638,8 +35717,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-5444",
-   "self_type" : "type-5443",
+   "referenced_type" : "type-5461",
+   "self_type" : "type-5460",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35648,8 +35727,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-5619",
-   "self_type" : "type-5618",
+   "referenced_type" : "type-5636",
+   "self_type" : "type-5635",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35658,8 +35737,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-5794",
-   "self_type" : "type-5793",
+   "referenced_type" : "type-5814",
+   "self_type" : "type-5813",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35678,8 +35757,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-5919",
-   "self_type" : "type-5918",
+   "referenced_type" : "type-5939",
+   "self_type" : "type-5938",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35688,8 +35767,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-6072",
-   "self_type" : "type-6071",
+   "referenced_type" : "type-6093",
+   "self_type" : "type-6092",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35698,8 +35777,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-6205",
-   "self_type" : "type-6204",
+   "referenced_type" : "type-6225",
+   "self_type" : "type-6224",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35708,8 +35787,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-6349",
-   "self_type" : "type-6348",
+   "referenced_type" : "type-6372",
+   "self_type" : "type-6371",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35718,8 +35797,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-6439",
-   "self_type" : "type-6438",
+   "referenced_type" : "type-6462",
+   "self_type" : "type-6461",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35728,8 +35807,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-6998",
-   "self_type" : "type-6997",
+   "referenced_type" : "type-7021",
+   "self_type" : "type-7020",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35738,8 +35817,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-7243",
-   "self_type" : "type-7242",
+   "referenced_type" : "type-7270",
+   "self_type" : "type-7269",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35748,8 +35827,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-7382",
-   "self_type" : "type-7381",
+   "referenced_type" : "type-7405",
+   "self_type" : "type-7404",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35758,8 +35837,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-7541",
-   "self_type" : "type-7540",
+   "referenced_type" : "type-7564",
+   "self_type" : "type-7563",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35768,8 +35847,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-7683",
-   "self_type" : "type-7682",
+   "referenced_type" : "type-7707",
+   "self_type" : "type-7706",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35788,8 +35867,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-1117",
-   "self_type" : "type-1116",
+   "referenced_type" : "type-1120",
+   "self_type" : "type-1119",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35798,8 +35877,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-1295",
-   "self_type" : "type-1294",
+   "referenced_type" : "type-1298",
+   "self_type" : "type-1297",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35808,8 +35887,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-3369",
-   "self_type" : "type-3368",
+   "referenced_type" : "type-3372",
+   "self_type" : "type-3371",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35818,8 +35897,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-3544",
-   "self_type" : "type-3543",
+   "referenced_type" : "type-3549",
+   "self_type" : "type-3548",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35828,8 +35907,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-3720",
-   "self_type" : "type-3719",
+   "referenced_type" : "type-3726",
+   "self_type" : "type-3725",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35838,8 +35917,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-3845",
-   "self_type" : "type-3844",
+   "referenced_type" : "type-3851",
+   "self_type" : "type-3850",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35848,8 +35927,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-4397",
-   "self_type" : "type-4396",
+   "referenced_type" : "type-4403",
+   "self_type" : "type-4402",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35858,8 +35937,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-4605",
-   "self_type" : "type-4604",
+   "referenced_type" : "type-4611",
+   "self_type" : "type-4610",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35868,8 +35947,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-4776",
-   "self_type" : "type-4775",
+   "referenced_type" : "type-4783",
+   "self_type" : "type-4782",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35878,8 +35957,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-5169",
-   "self_type" : "type-5168",
+   "referenced_type" : "type-5187",
+   "self_type" : "type-5186",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35888,8 +35967,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-5430",
-   "self_type" : "type-5429",
+   "referenced_type" : "type-5447",
+   "self_type" : "type-5446",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35908,8 +35987,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-5605",
-   "self_type" : "type-5604",
+   "referenced_type" : "type-5624",
+   "self_type" : "type-5623",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35918,8 +35997,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-5781",
-   "self_type" : "type-5780",
+   "referenced_type" : "type-5801",
+   "self_type" : "type-5800",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35928,8 +36007,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-5906",
-   "self_type" : "type-5905",
+   "referenced_type" : "type-5926",
+   "self_type" : "type-5925",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35938,8 +36017,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-6059",
-   "self_type" : "type-6058",
+   "referenced_type" : "type-6079",
+   "self_type" : "type-6078",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35948,8 +36027,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-6191",
-   "self_type" : "type-6190",
+   "referenced_type" : "type-6213",
+   "self_type" : "type-6212",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35958,8 +36037,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-6337",
-   "self_type" : "type-6336",
+   "referenced_type" : "type-6360",
+   "self_type" : "type-6359",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35968,8 +36047,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-6426",
-   "self_type" : "type-6425",
+   "referenced_type" : "type-6450",
+   "self_type" : "type-6449",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35978,8 +36057,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-6985",
-   "self_type" : "type-6984",
+   "referenced_type" : "type-7009",
+   "self_type" : "type-7008",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35988,8 +36067,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-7231",
-   "self_type" : "type-7230",
+   "referenced_type" : "type-7254",
+   "self_type" : "type-7253",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -35998,8 +36077,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-7370",
-   "self_type" : "type-7369",
+   "referenced_type" : "type-7393",
+   "self_type" : "type-7392",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36008,8 +36087,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-7529",
-   "self_type" : "type-7528",
+   "referenced_type" : "type-7552",
+   "self_type" : "type-7551",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36018,8 +36097,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-7671",
-   "self_type" : "type-7670",
+   "referenced_type" : "type-7694",
+   "self_type" : "type-7693",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36028,8 +36107,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-868",
-   "self_type" : "type-867",
+   "referenced_type" : "type-870",
+   "self_type" : "type-869",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36038,8 +36117,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-1121",
-   "self_type" : "type-1120",
+   "referenced_type" : "type-1125",
+   "self_type" : "type-1124",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36048,8 +36127,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-1299",
-   "self_type" : "type-1298",
+   "referenced_type" : "type-1303",
+   "self_type" : "type-1302",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36058,8 +36137,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-3373",
-   "self_type" : "type-3372",
+   "referenced_type" : "type-3376",
+   "self_type" : "type-3375",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36068,8 +36147,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-3550",
-   "self_type" : "type-3549",
+   "referenced_type" : "type-3553",
+   "self_type" : "type-3552",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36078,8 +36157,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-3724",
-   "self_type" : "type-3723",
+   "referenced_type" : "type-3731",
+   "self_type" : "type-3730",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36088,8 +36167,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-3849",
-   "self_type" : "type-3848",
+   "referenced_type" : "type-3856",
+   "self_type" : "type-3855",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36098,8 +36177,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-4401",
-   "self_type" : "type-4400",
+   "referenced_type" : "type-4407",
+   "self_type" : "type-4406",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36108,8 +36187,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-4609",
-   "self_type" : "type-4608",
+   "referenced_type" : "type-4615",
+   "self_type" : "type-4614",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36118,8 +36197,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-4781",
-   "self_type" : "type-4780",
+   "referenced_type" : "type-4788",
+   "self_type" : "type-4787",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36128,8 +36207,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-5173",
-   "self_type" : "type-5172",
+   "referenced_type" : "type-5191",
+   "self_type" : "type-5190",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36138,8 +36217,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-5434",
-   "self_type" : "type-5433",
+   "referenced_type" : "type-5451",
+   "self_type" : "type-5450",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36158,8 +36237,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-5611",
-   "self_type" : "type-5610",
+   "referenced_type" : "type-5628",
+   "self_type" : "type-5627",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36168,8 +36247,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-5785",
-   "self_type" : "type-5784",
+   "referenced_type" : "type-5806",
+   "self_type" : "type-5805",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36178,8 +36257,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-5910",
-   "self_type" : "type-5909",
+   "referenced_type" : "type-5931",
+   "self_type" : "type-5930",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36188,8 +36267,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-6063",
-   "self_type" : "type-6062",
+   "referenced_type" : "type-6084",
+   "self_type" : "type-6083",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36198,8 +36277,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-6197",
-   "self_type" : "type-6196",
+   "referenced_type" : "type-6217",
+   "self_type" : "type-6216",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36208,8 +36287,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-6341",
-   "self_type" : "type-6340",
+   "referenced_type" : "type-6364",
+   "self_type" : "type-6363",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36218,8 +36297,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-6430",
-   "self_type" : "type-6429",
+   "referenced_type" : "type-6454",
+   "self_type" : "type-6453",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36228,8 +36307,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-6989",
-   "self_type" : "type-6988",
+   "referenced_type" : "type-7013",
+   "self_type" : "type-7012",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36238,8 +36317,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-7235",
-   "self_type" : "type-7234",
+   "referenced_type" : "type-7258",
+   "self_type" : "type-7257",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36248,8 +36327,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-7374",
-   "self_type" : "type-7373",
+   "referenced_type" : "type-7397",
+   "self_type" : "type-7396",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36258,8 +36337,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-7533",
-   "self_type" : "type-7532",
+   "referenced_type" : "type-7556",
+   "self_type" : "type-7555",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36268,8 +36347,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-7675",
-   "self_type" : "type-7674",
+   "referenced_type" : "type-7698",
+   "self_type" : "type-7697",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -36288,8 +36367,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-1139",
+   "self_type" : "type-1138",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36298,8 +36377,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-1328",
+   "self_type" : "type-1327",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36308,8 +36387,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3417",
+   "self_type" : "type-3416",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36318,8 +36397,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3576",
+   "self_type" : "type-3575",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36328,8 +36407,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3745",
+   "self_type" : "type-3744",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36338,8 +36417,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3882",
+   "self_type" : "type-3881",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36348,8 +36427,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4435",
+   "self_type" : "type-4434",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36358,8 +36437,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4640",
+   "self_type" : "type-4639",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36368,8 +36447,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4811",
+   "self_type" : "type-4810",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36378,8 +36457,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5216",
+   "self_type" : "type-5215",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36388,8 +36467,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5492",
+   "self_type" : "type-5491",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36398,8 +36477,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5651",
+   "self_type" : "type-5650",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36408,8 +36487,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5820",
+   "self_type" : "type-5819",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36418,8 +36497,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5957",
+   "self_type" : "type-5956",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36428,8 +36507,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6108",
+   "self_type" : "type-6107",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36438,8 +36517,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6240",
+   "self_type" : "type-6239",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36448,8 +36527,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6378",
+   "self_type" : "type-6377",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36468,8 +36547,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6479",
+   "self_type" : "type-6478",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36478,8 +36557,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7044",
+   "self_type" : "type-7043",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36488,8 +36567,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7287",
+   "self_type" : "type-7286",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36498,8 +36577,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7419",
+   "self_type" : "type-7418",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36508,8 +36587,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7568",
+   "self_type" : "type-7567",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36518,8 +36597,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7712",
+   "self_type" : "type-7711",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36538,8 +36617,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-1138",
-   "self_type" : "type-1137",
+   "referenced_type" : "type-1143",
+   "self_type" : "type-1142",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36548,8 +36627,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-1329",
-   "self_type" : "type-1328",
+   "referenced_type" : "type-1334",
+   "self_type" : "type-1333",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36558,8 +36637,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-3418",
-   "self_type" : "type-3417",
+   "referenced_type" : "type-3421",
+   "self_type" : "type-3420",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36568,8 +36647,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-3577",
-   "self_type" : "type-3576",
+   "referenced_type" : "type-3582",
+   "self_type" : "type-3581",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36578,8 +36657,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-3741",
-   "self_type" : "type-3740",
+   "referenced_type" : "type-3749",
+   "self_type" : "type-3748",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36588,8 +36667,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-3880",
-   "self_type" : "type-3879",
+   "referenced_type" : "type-3888",
+   "self_type" : "type-3887",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36598,8 +36677,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-4432",
-   "self_type" : "type-4431",
+   "referenced_type" : "type-4439",
+   "self_type" : "type-4438",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36608,8 +36687,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-4638",
-   "self_type" : "type-4637",
+   "referenced_type" : "type-4644",
+   "self_type" : "type-4643",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36618,8 +36697,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-4808",
-   "self_type" : "type-4807",
+   "referenced_type" : "type-4815",
+   "self_type" : "type-4814",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36628,8 +36707,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-5203",
-   "self_type" : "type-5202",
+   "referenced_type" : "type-5220",
+   "self_type" : "type-5219",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36638,8 +36717,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-5479",
-   "self_type" : "type-5478",
+   "referenced_type" : "type-5496",
+   "self_type" : "type-5495",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36648,8 +36727,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-5638",
-   "self_type" : "type-5637",
+   "referenced_type" : "type-5657",
+   "self_type" : "type-5656",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36658,8 +36737,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-5802",
-   "self_type" : "type-5801",
+   "referenced_type" : "type-5824",
+   "self_type" : "type-5823",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36668,8 +36747,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-5941",
-   "self_type" : "type-5940",
+   "referenced_type" : "type-5963",
+   "self_type" : "type-5962",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36678,8 +36757,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-6092",
-   "self_type" : "type-6091",
+   "referenced_type" : "type-6112",
+   "self_type" : "type-6111",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36688,8 +36767,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-6224",
-   "self_type" : "type-6223",
+   "referenced_type" : "type-6246",
+   "self_type" : "type-6245",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36698,8 +36777,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-6357",
-   "self_type" : "type-6356",
+   "referenced_type" : "type-6382",
+   "self_type" : "type-6381",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36718,8 +36797,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-6460",
-   "self_type" : "type-6459",
+   "referenced_type" : "type-6485",
+   "self_type" : "type-6484",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36728,8 +36807,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-7023",
-   "self_type" : "type-7022",
+   "referenced_type" : "type-7048",
+   "self_type" : "type-7047",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36738,8 +36817,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-7267",
-   "self_type" : "type-7266",
+   "referenced_type" : "type-7291",
+   "self_type" : "type-7290",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36748,8 +36827,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-7400",
-   "self_type" : "type-7399",
+   "referenced_type" : "type-7423",
+   "self_type" : "type-7422",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36758,8 +36837,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-7549",
-   "self_type" : "type-7548",
+   "referenced_type" : "type-7572",
+   "self_type" : "type-7571",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36768,8 +36847,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-7693",
-   "self_type" : "type-7692",
+   "referenced_type" : "type-7716",
+   "self_type" : "type-7715",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36778,8 +36857,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-906",
-   "self_type" : "type-905",
+   "referenced_type" : "type-908",
+   "self_type" : "type-907",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36788,8 +36867,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-1136",
-   "self_type" : "type-1135",
+   "referenced_type" : "type-1141",
+   "self_type" : "type-1140",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36798,8 +36877,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-1327",
-   "self_type" : "type-1326",
+   "referenced_type" : "type-1332",
+   "self_type" : "type-1331",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36808,8 +36887,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-3416",
-   "self_type" : "type-3415",
+   "referenced_type" : "type-3419",
+   "self_type" : "type-3418",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36818,8 +36897,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-3575",
-   "self_type" : "type-3574",
+   "referenced_type" : "type-3580",
+   "self_type" : "type-3579",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36828,8 +36907,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-3739",
-   "self_type" : "type-3738",
+   "referenced_type" : "type-3747",
+   "self_type" : "type-3746",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36838,8 +36917,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-3878",
-   "self_type" : "type-3877",
+   "referenced_type" : "type-3886",
+   "self_type" : "type-3885",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36848,8 +36927,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-4429",
-   "self_type" : "type-4428",
+   "referenced_type" : "type-4437",
+   "self_type" : "type-4436",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36858,8 +36937,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-4636",
-   "self_type" : "type-4635",
+   "referenced_type" : "type-4642",
+   "self_type" : "type-4641",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36868,8 +36947,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-4806",
-   "self_type" : "type-4805",
+   "referenced_type" : "type-4813",
+   "self_type" : "type-4812",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36878,8 +36957,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-5200",
-   "self_type" : "type-5199",
+   "referenced_type" : "type-5218",
+   "self_type" : "type-5217",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36888,8 +36967,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-5477",
-   "self_type" : "type-5476",
+   "referenced_type" : "type-5494",
+   "self_type" : "type-5493",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36898,8 +36977,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-5636",
-   "self_type" : "type-5635",
+   "referenced_type" : "type-5655",
+   "self_type" : "type-5654",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36908,8 +36987,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-5800",
-   "self_type" : "type-5799",
+   "referenced_type" : "type-5822",
+   "self_type" : "type-5821",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36918,8 +36997,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-5939",
-   "self_type" : "type-5938",
+   "referenced_type" : "type-5961",
+   "self_type" : "type-5960",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36928,8 +37007,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-6090",
-   "self_type" : "type-6089",
+   "referenced_type" : "type-6110",
+   "self_type" : "type-6109",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36938,8 +37017,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-6221",
-   "self_type" : "type-6220",
+   "referenced_type" : "type-6244",
+   "self_type" : "type-6243",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36948,8 +37027,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-6355",
-   "self_type" : "type-6354",
+   "referenced_type" : "type-6380",
+   "self_type" : "type-6379",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36968,8 +37047,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-6458",
-   "self_type" : "type-6457",
+   "referenced_type" : "type-6483",
+   "self_type" : "type-6482",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36978,8 +37057,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-7019",
-   "self_type" : "type-7018",
+   "referenced_type" : "type-7046",
+   "self_type" : "type-7045",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36988,8 +37067,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-7265",
-   "self_type" : "type-7264",
+   "referenced_type" : "type-7289",
+   "self_type" : "type-7288",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -36998,8 +37077,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-7398",
-   "self_type" : "type-7397",
+   "referenced_type" : "type-7421",
+   "self_type" : "type-7420",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37008,8 +37087,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-7547",
-   "self_type" : "type-7546",
+   "referenced_type" : "type-7570",
+   "self_type" : "type-7569",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37018,8 +37097,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-7691",
-   "self_type" : "type-7690",
+   "referenced_type" : "type-7714",
+   "self_type" : "type-7713",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37028,8 +37107,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-904",
-   "self_type" : "type-903",
+   "referenced_type" : "type-906",
+   "self_type" : "type-905",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37038,8 +37117,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-1132",
-   "self_type" : "type-1131",
+   "referenced_type" : "type-1135",
+   "self_type" : "type-1134",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37048,8 +37127,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-1323",
-   "self_type" : "type-1322",
+   "referenced_type" : "type-1326",
+   "self_type" : "type-1325",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37058,8 +37137,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-3412",
-   "self_type" : "type-3411",
+   "referenced_type" : "type-3415",
+   "self_type" : "type-3414",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37068,8 +37147,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-3571",
-   "self_type" : "type-3570",
+   "referenced_type" : "type-3574",
+   "self_type" : "type-3573",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37078,8 +37157,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-3735",
-   "self_type" : "type-3734",
+   "referenced_type" : "type-3741",
+   "self_type" : "type-3740",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37088,8 +37167,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-3874",
-   "self_type" : "type-3873",
+   "referenced_type" : "type-3880",
+   "self_type" : "type-3879",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37098,8 +37177,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-4425",
-   "self_type" : "type-4424",
+   "referenced_type" : "type-4431",
+   "self_type" : "type-4430",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37108,8 +37187,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-4632",
-   "self_type" : "type-4631",
+   "referenced_type" : "type-4638",
+   "self_type" : "type-4637",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37118,8 +37197,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-4802",
-   "self_type" : "type-4801",
+   "referenced_type" : "type-4809",
+   "self_type" : "type-4808",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37128,8 +37207,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-5196",
-   "self_type" : "type-5195",
+   "referenced_type" : "type-5214",
+   "self_type" : "type-5213",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37138,8 +37217,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-5473",
-   "self_type" : "type-5472",
+   "referenced_type" : "type-5490",
+   "self_type" : "type-5489",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37148,8 +37227,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-5632",
-   "self_type" : "type-5631",
+   "referenced_type" : "type-5649",
+   "self_type" : "type-5648",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37158,8 +37237,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-5796",
-   "self_type" : "type-5795",
+   "referenced_type" : "type-5816",
+   "self_type" : "type-5815",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37168,8 +37247,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-5935",
-   "self_type" : "type-5934",
+   "referenced_type" : "type-5955",
+   "self_type" : "type-5954",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37178,8 +37257,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-6086",
-   "self_type" : "type-6085",
+   "referenced_type" : "type-6106",
+   "self_type" : "type-6105",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37188,8 +37267,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-6217",
-   "self_type" : "type-6216",
+   "referenced_type" : "type-6238",
+   "self_type" : "type-6237",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37198,8 +37277,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-6351",
-   "self_type" : "type-6350",
+   "referenced_type" : "type-6374",
+   "self_type" : "type-6373",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37218,8 +37297,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-6454",
-   "self_type" : "type-6453",
+   "referenced_type" : "type-6477",
+   "self_type" : "type-6476",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37228,8 +37307,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-7015",
-   "self_type" : "type-7014",
+   "referenced_type" : "type-7041",
+   "self_type" : "type-7040",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37238,8 +37317,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-7261",
-   "self_type" : "type-7260",
+   "referenced_type" : "type-7285",
+   "self_type" : "type-7284",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37248,8 +37327,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-7394",
-   "self_type" : "type-7393",
+   "referenced_type" : "type-7417",
+   "self_type" : "type-7416",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37258,8 +37337,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-7543",
-   "self_type" : "type-7542",
+   "referenced_type" : "type-7566",
+   "self_type" : "type-7565",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37268,8 +37347,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-7686",
-   "self_type" : "type-7685",
+   "referenced_type" : "type-7710",
+   "self_type" : "type-7709",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37288,8 +37367,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-1140",
-   "self_type" : "type-1139",
+   "referenced_type" : "type-1145",
+   "self_type" : "type-1144",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37298,8 +37377,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-1333",
-   "self_type" : "type-1332",
+   "referenced_type" : "type-1336",
+   "self_type" : "type-1335",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37308,8 +37387,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-3421",
-   "self_type" : "type-3420",
+   "referenced_type" : "type-3424",
+   "self_type" : "type-3423",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37318,8 +37397,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-3581",
-   "self_type" : "type-3580",
+   "referenced_type" : "type-3584",
+   "self_type" : "type-3583",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37328,8 +37407,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-3743",
-   "self_type" : "type-3742",
+   "referenced_type" : "type-3751",
+   "self_type" : "type-3750",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37338,8 +37417,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-3884",
-   "self_type" : "type-3883",
+   "referenced_type" : "type-3890",
+   "self_type" : "type-3889",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37348,8 +37427,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-4434",
-   "self_type" : "type-4433",
+   "referenced_type" : "type-4441",
+   "self_type" : "type-4440",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37358,8 +37437,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-4640",
-   "self_type" : "type-4639",
+   "referenced_type" : "type-4646",
+   "self_type" : "type-4645",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37368,8 +37447,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-4810",
-   "self_type" : "type-4809",
+   "referenced_type" : "type-4817",
+   "self_type" : "type-4816",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37378,8 +37457,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-5205",
-   "self_type" : "type-5204",
+   "referenced_type" : "type-5222",
+   "self_type" : "type-5221",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37388,8 +37467,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-5482",
-   "self_type" : "type-5481",
+   "referenced_type" : "type-5499",
+   "self_type" : "type-5498",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37398,8 +37477,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-5642",
-   "self_type" : "type-5641",
+   "referenced_type" : "type-5659",
+   "self_type" : "type-5658",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37408,8 +37487,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-5804",
-   "self_type" : "type-5803",
+   "referenced_type" : "type-5826",
+   "self_type" : "type-5825",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37418,8 +37497,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-5945",
-   "self_type" : "type-5944",
+   "referenced_type" : "type-5965",
+   "self_type" : "type-5964",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37428,8 +37507,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-6094",
-   "self_type" : "type-6093",
+   "referenced_type" : "type-6114",
+   "self_type" : "type-6113",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37438,8 +37517,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-6228",
-   "self_type" : "type-6227",
+   "referenced_type" : "type-6248",
+   "self_type" : "type-6247",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37448,8 +37527,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-6359",
-   "self_type" : "type-6358",
+   "referenced_type" : "type-6384",
+   "self_type" : "type-6383",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37458,8 +37537,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-6464",
-   "self_type" : "type-6463",
+   "referenced_type" : "type-6487",
+   "self_type" : "type-6486",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37478,8 +37557,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-7025",
-   "self_type" : "type-7024",
+   "referenced_type" : "type-7050",
+   "self_type" : "type-7049",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37488,8 +37567,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-7269",
-   "self_type" : "type-7268",
+   "referenced_type" : "type-7293",
+   "self_type" : "type-7292",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37498,8 +37577,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-7402",
-   "self_type" : "type-7401",
+   "referenced_type" : "type-7425",
+   "self_type" : "type-7424",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37508,8 +37587,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-7551",
-   "self_type" : "type-7550",
+   "referenced_type" : "type-7574",
+   "self_type" : "type-7573",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37518,8 +37597,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-7695",
-   "self_type" : "type-7694",
+   "referenced_type" : "type-7718",
+   "self_type" : "type-7717",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -37538,8 +37617,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-1153",
+   "self_type" : "type-1152",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37548,8 +37627,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-1346",
+   "self_type" : "type-1345",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37558,8 +37637,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3437",
+   "self_type" : "type-3436",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37568,8 +37647,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3592",
+   "self_type" : "type-3591",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37578,8 +37657,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3759",
+   "self_type" : "type-3758",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37588,8 +37667,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-3901",
+   "self_type" : "type-3900",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37598,8 +37677,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4449",
+   "self_type" : "type-4448",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37608,8 +37687,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4655",
+   "self_type" : "type-4654",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37618,8 +37697,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-4825",
+   "self_type" : "type-4824",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37628,8 +37707,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "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"
   },
@@ -37638,8 +37717,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5234",
+   "self_type" : "type-5233",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37648,8 +37727,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5512",
+   "self_type" : "type-5511",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37658,8 +37737,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5667",
+   "self_type" : "type-5666",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37668,8 +37747,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5834",
+   "self_type" : "type-5833",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37678,8 +37757,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5976",
+   "self_type" : "type-5975",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37688,8 +37767,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6123",
+   "self_type" : "type-6122",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37698,8 +37777,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6256",
+   "self_type" : "type-6255",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37708,8 +37787,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6392",
+   "self_type" : "type-6391",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/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-6497",
+   "self_type" : "type-6496",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37728,8 +37817,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7058",
+   "self_type" : "type-7057",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37738,8 +37827,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7302",
+   "self_type" : "type-7301",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37748,8 +37837,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7433",
+   "self_type" : "type-7432",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37758,18 +37847,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-7582",
+   "self_type" : "type-7581",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37788,8 +37867,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-1148",
-   "self_type" : "type-1147",
+   "referenced_type" : "type-1151",
+   "self_type" : "type-1150",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37798,8 +37877,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-1341",
-   "self_type" : "type-1340",
+   "referenced_type" : "type-1344",
+   "self_type" : "type-1343",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37808,8 +37887,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-3432",
-   "self_type" : "type-3431",
+   "referenced_type" : "type-3435",
+   "self_type" : "type-3434",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37818,8 +37897,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-3587",
-   "self_type" : "type-3586",
+   "referenced_type" : "type-3590",
+   "self_type" : "type-3589",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37828,8 +37907,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-3751",
-   "self_type" : "type-3750",
+   "referenced_type" : "type-3757",
+   "self_type" : "type-3756",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37838,8 +37917,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-3893",
-   "self_type" : "type-3892",
+   "referenced_type" : "type-3899",
+   "self_type" : "type-3898",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37848,8 +37927,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-4441",
-   "self_type" : "type-4440",
+   "referenced_type" : "type-4447",
+   "self_type" : "type-4446",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37858,8 +37937,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-4646",
-   "self_type" : "type-4645",
+   "referenced_type" : "type-4653",
+   "self_type" : "type-4652",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37868,8 +37947,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-4817",
-   "self_type" : "type-4816",
+   "referenced_type" : "type-4823",
+   "self_type" : "type-4822",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37878,8 +37957,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-5213",
-   "self_type" : "type-5212",
+   "referenced_type" : "type-5067",
+   "self_type" : "type-5066",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37888,8 +37967,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-5493",
-   "self_type" : "type-5492",
+   "referenced_type" : "type-5232",
+   "self_type" : "type-5231",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37898,8 +37977,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-5648",
-   "self_type" : "type-5647",
+   "referenced_type" : "type-5510",
+   "self_type" : "type-5509",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37908,8 +37987,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-5812",
-   "self_type" : "type-5811",
+   "referenced_type" : "type-5665",
+   "self_type" : "type-5664",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37918,8 +37997,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-5954",
-   "self_type" : "type-5953",
+   "referenced_type" : "type-5832",
+   "self_type" : "type-5831",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37928,8 +38007,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-6101",
-   "self_type" : "type-6100",
+   "referenced_type" : "type-5974",
+   "self_type" : "type-5973",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37938,8 +38017,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-6234",
-   "self_type" : "type-6233",
+   "referenced_type" : "type-6121",
+   "self_type" : "type-6120",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37948,8 +38027,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-6367",
-   "self_type" : "type-6366",
+   "referenced_type" : "type-6254",
+   "self_type" : "type-6253",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37958,8 +38037,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6390",
+   "self_type" : "type-6389",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-6495",
+   "self_type" : "type-6494",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37978,8 +38067,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-7033",
-   "self_type" : "type-7032",
+   "referenced_type" : "type-7056",
+   "self_type" : "type-7055",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37988,8 +38077,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-7276",
-   "self_type" : "type-7275",
+   "referenced_type" : "type-7300",
+   "self_type" : "type-7299",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -37998,8 +38087,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-7408",
-   "self_type" : "type-7407",
+   "referenced_type" : "type-7431",
+   "self_type" : "type-7430",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38008,18 +38097,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-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",
+   "referenced_type" : "type-7580",
+   "self_type" : "type-7579",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38038,8 +38117,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-1146",
-   "self_type" : "type-1145",
+   "referenced_type" : "type-1149",
+   "self_type" : "type-1148",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38048,8 +38127,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-1339",
-   "self_type" : "type-1338",
+   "referenced_type" : "type-1342",
+   "self_type" : "type-1341",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38058,8 +38137,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-3430",
-   "self_type" : "type-3429",
+   "referenced_type" : "type-3433",
+   "self_type" : "type-3432",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38068,8 +38147,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-3585",
-   "self_type" : "type-3584",
+   "referenced_type" : "type-3588",
+   "self_type" : "type-3587",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38078,8 +38157,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-3749",
-   "self_type" : "type-3748",
+   "referenced_type" : "type-3755",
+   "self_type" : "type-3754",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38088,8 +38167,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-3891",
-   "self_type" : "type-3890",
+   "referenced_type" : "type-3897",
+   "self_type" : "type-3896",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38098,8 +38177,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-4439",
-   "self_type" : "type-4438",
+   "referenced_type" : "type-4445",
+   "self_type" : "type-4444",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38108,8 +38187,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-4644",
-   "self_type" : "type-4643",
+   "referenced_type" : "type-4650",
+   "self_type" : "type-4649",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38118,8 +38197,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-4815",
-   "self_type" : "type-4814",
+   "referenced_type" : "type-4821",
+   "self_type" : "type-4820",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38128,8 +38207,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-5211",
-   "self_type" : "type-5210",
+   "referenced_type" : "type-5065",
+   "self_type" : "type-5064",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38138,8 +38217,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-5491",
-   "self_type" : "type-5490",
+   "referenced_type" : "type-5229",
+   "self_type" : "type-5228",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38148,8 +38227,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-5646",
-   "self_type" : "type-5645",
+   "referenced_type" : "type-5508",
+   "self_type" : "type-5507",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38158,8 +38237,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-5810",
-   "self_type" : "type-5809",
+   "referenced_type" : "type-5663",
+   "self_type" : "type-5662",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38168,8 +38247,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-5952",
-   "self_type" : "type-5951",
+   "referenced_type" : "type-5830",
+   "self_type" : "type-5829",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38178,8 +38257,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-6099",
-   "self_type" : "type-6098",
+   "referenced_type" : "type-5972",
+   "self_type" : "type-5971",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38188,8 +38267,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-6232",
-   "self_type" : "type-6231",
+   "referenced_type" : "type-6119",
+   "self_type" : "type-6118",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38198,8 +38277,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-6365",
-   "self_type" : "type-6364",
+   "referenced_type" : "type-6252",
+   "self_type" : "type-6251",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38208,8 +38287,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6388",
+   "self_type" : "type-6387",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-6493",
+   "self_type" : "type-6492",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38228,8 +38317,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-7031",
-   "self_type" : "type-7030",
+   "referenced_type" : "type-7054",
+   "self_type" : "type-7053",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38238,8 +38327,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-7274",
-   "self_type" : "type-7273",
+   "referenced_type" : "type-7298",
+   "self_type" : "type-7297",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38248,8 +38337,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-7406",
-   "self_type" : "type-7405",
+   "referenced_type" : "type-7429",
+   "self_type" : "type-7428",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38258,18 +38347,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-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",
+   "referenced_type" : "type-7578",
+   "self_type" : "type-7577",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38288,8 +38367,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-1144",
-   "self_type" : "type-1143",
+   "referenced_type" : "type-1147",
+   "self_type" : "type-1146",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38298,8 +38377,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-1337",
-   "self_type" : "type-1336",
+   "referenced_type" : "type-1340",
+   "self_type" : "type-1339",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38308,8 +38387,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-3428",
-   "self_type" : "type-3427",
+   "referenced_type" : "type-3431",
+   "self_type" : "type-3430",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38318,8 +38397,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-3583",
-   "self_type" : "type-3582",
+   "referenced_type" : "type-3586",
+   "self_type" : "type-3585",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38328,8 +38407,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-3747",
-   "self_type" : "type-3746",
+   "referenced_type" : "type-3753",
+   "self_type" : "type-3752",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38338,8 +38417,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-3889",
-   "self_type" : "type-3888",
+   "referenced_type" : "type-3895",
+   "self_type" : "type-3894",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38348,8 +38427,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-4437",
-   "self_type" : "type-4436",
+   "referenced_type" : "type-4443",
+   "self_type" : "type-4442",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38358,8 +38437,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-4642",
-   "self_type" : "type-4641",
+   "referenced_type" : "type-4648",
+   "self_type" : "type-4647",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38368,8 +38447,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-4813",
-   "self_type" : "type-4812",
+   "referenced_type" : "type-4819",
+   "self_type" : "type-4818",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38378,8 +38457,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-5209",
-   "self_type" : "type-5208",
+   "referenced_type" : "type-5227",
+   "self_type" : "type-5226",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38388,8 +38467,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-5489",
-   "self_type" : "type-5488",
+   "referenced_type" : "type-5506",
+   "self_type" : "type-5505",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38398,8 +38477,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-5644",
-   "self_type" : "type-5643",
+   "referenced_type" : "type-5661",
+   "self_type" : "type-5660",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38408,8 +38487,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-5808",
-   "self_type" : "type-5807",
+   "referenced_type" : "type-5828",
+   "self_type" : "type-5827",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38418,8 +38497,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-5950",
-   "self_type" : "type-5949",
+   "referenced_type" : "type-5970",
+   "self_type" : "type-5969",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38428,8 +38507,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-6097",
-   "self_type" : "type-6096",
+   "referenced_type" : "type-6117",
+   "self_type" : "type-6116",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38438,8 +38517,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-6230",
-   "self_type" : "type-6229",
+   "referenced_type" : "type-6250",
+   "self_type" : "type-6249",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38448,8 +38527,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-6363",
-   "self_type" : "type-6362",
+   "referenced_type" : "type-6386",
+   "self_type" : "type-6385",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38458,8 +38537,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-6468",
-   "self_type" : "type-6467",
+   "referenced_type" : "type-6491",
+   "self_type" : "type-6490",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38478,8 +38557,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-7029",
-   "self_type" : "type-7028",
+   "referenced_type" : "type-7052",
+   "self_type" : "type-7051",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38488,8 +38567,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-7272",
-   "self_type" : "type-7271",
+   "referenced_type" : "type-7296",
+   "self_type" : "type-7295",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38498,8 +38577,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-7404",
-   "self_type" : "type-7403",
+   "referenced_type" : "type-7427",
+   "self_type" : "type-7426",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38508,8 +38587,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-7553",
-   "self_type" : "type-7552",
+   "referenced_type" : "type-7576",
+   "self_type" : "type-7575",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38518,8 +38597,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-7698",
-   "self_type" : "type-7697",
+   "referenced_type" : "type-7720",
+   "self_type" : "type-7719",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38538,8 +38617,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-1152",
-   "self_type" : "type-1151",
+   "referenced_type" : "type-1155",
+   "self_type" : "type-1154",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38548,8 +38627,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-1345",
-   "self_type" : "type-1344",
+   "referenced_type" : "type-1348",
+   "self_type" : "type-1347",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38558,8 +38637,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-3436",
-   "self_type" : "type-3435",
+   "referenced_type" : "type-3439",
+   "self_type" : "type-3438",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38568,8 +38647,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-3591",
-   "self_type" : "type-3590",
+   "referenced_type" : "type-3594",
+   "self_type" : "type-3593",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38578,8 +38657,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-3755",
-   "self_type" : "type-3754",
+   "referenced_type" : "type-3761",
+   "self_type" : "type-3760",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38588,8 +38667,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-3897",
-   "self_type" : "type-3896",
+   "referenced_type" : "type-3903",
+   "self_type" : "type-3902",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38598,8 +38677,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-4445",
-   "self_type" : "type-4444",
+   "referenced_type" : "type-4451",
+   "self_type" : "type-4450",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38608,8 +38687,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-4650",
-   "self_type" : "type-4649",
+   "referenced_type" : "type-4657",
+   "self_type" : "type-4656",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38618,8 +38697,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-4821",
-   "self_type" : "type-4820",
+   "referenced_type" : "type-4827",
+   "self_type" : "type-4826",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38628,8 +38707,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-5218",
-   "self_type" : "type-5217",
+   "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"
   },
@@ -38638,8 +38717,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-5497",
-   "self_type" : "type-5496",
+   "referenced_type" : "type-5236",
+   "self_type" : "type-5235",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38648,8 +38727,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-5652",
-   "self_type" : "type-5651",
+   "referenced_type" : "type-5514",
+   "self_type" : "type-5513",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38658,8 +38737,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-5816",
-   "self_type" : "type-5815",
+   "referenced_type" : "type-5669",
+   "self_type" : "type-5668",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38668,8 +38747,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-5958",
-   "self_type" : "type-5957",
+   "referenced_type" : "type-5836",
+   "self_type" : "type-5835",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38678,8 +38757,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-6105",
-   "self_type" : "type-6104",
+   "referenced_type" : "type-5978",
+   "self_type" : "type-5977",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38688,8 +38767,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-6238",
-   "self_type" : "type-6237",
+   "referenced_type" : "type-6125",
+   "self_type" : "type-6124",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38698,8 +38777,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-6371",
-   "self_type" : "type-6370",
+   "referenced_type" : "type-6258",
+   "self_type" : "type-6257",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38708,8 +38787,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-6394",
+   "self_type" : "type-6393",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/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-6499",
+   "self_type" : "type-6498",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38728,8 +38817,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-7037",
-   "self_type" : "type-7036",
+   "referenced_type" : "type-7060",
+   "self_type" : "type-7059",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38738,8 +38827,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-7280",
-   "self_type" : "type-7279",
+   "referenced_type" : "type-7304",
+   "self_type" : "type-7303",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38748,8 +38837,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-7412",
-   "self_type" : "type-7411",
+   "referenced_type" : "type-7435",
+   "self_type" : "type-7434",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38758,18 +38847,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-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",
+   "referenced_type" : "type-7584",
+   "self_type" : "type-7583",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -38798,8 +38877,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-1113",
-   "self_type" : "type-1112",
+   "referenced_type" : "type-1116",
+   "self_type" : "type-1115",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38808,8 +38887,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-1290",
-   "self_type" : "type-1289",
+   "referenced_type" : "type-1293",
+   "self_type" : "type-1292",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38818,8 +38897,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-3355",
-   "self_type" : "type-3354",
+   "referenced_type" : "type-3358",
+   "self_type" : "type-3357",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38828,8 +38907,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-3542",
-   "self_type" : "type-3541",
+   "referenced_type" : "type-3545",
+   "self_type" : "type-3544",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38838,8 +38917,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-3651",
-   "self_type" : "type-3650",
+   "referenced_type" : "type-3654",
+   "self_type" : "type-3653",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38848,8 +38927,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-3715",
-   "self_type" : "type-3714",
+   "referenced_type" : "type-3722",
+   "self_type" : "type-3721",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38858,8 +38937,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-3839",
-   "self_type" : "type-3838",
+   "referenced_type" : "type-3845",
+   "self_type" : "type-3844",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38868,8 +38947,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-4393",
-   "self_type" : "type-4392",
+   "referenced_type" : "type-4401",
+   "self_type" : "type-4400",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38878,8 +38957,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-4508",
-   "self_type" : "type-4507",
+   "referenced_type" : "type-4515",
+   "self_type" : "type-4514",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38888,8 +38967,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-4544",
-   "self_type" : "type-4543",
+   "referenced_type" : "type-4553",
+   "self_type" : "type-4552",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38898,8 +38977,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-4603",
-   "self_type" : "type-4602",
+   "referenced_type" : "type-4609",
+   "self_type" : "type-4608",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38908,8 +38987,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-4773",
-   "self_type" : "type-4772",
+   "referenced_type" : "type-4780",
+   "self_type" : "type-4779",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38918,8 +38997,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-4851",
-   "self_type" : "type-4850",
+   "referenced_type" : "type-4857",
+   "self_type" : "type-4856",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38928,8 +39007,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-5112",
-   "self_type" : "type-5111",
+   "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"
   },
@@ -38938,8 +39017,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::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",
+   "referenced_type" : "type-5128",
+   "self_type" : "type-5127",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-5184",
+   "self_type" : "type-5183",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38958,8 +39047,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-5416",
-   "self_type" : "type-5415",
+   "referenced_type" : "type-5433",
+   "self_type" : "type-5432",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38968,8 +39057,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-5603",
-   "self_type" : "type-5602",
+   "referenced_type" : "type-5620",
+   "self_type" : "type-5619",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38978,8 +39067,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-5712",
-   "self_type" : "type-5711",
+   "referenced_type" : "type-5729",
+   "self_type" : "type-5728",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38988,8 +39077,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-5776",
-   "self_type" : "type-5775",
+   "referenced_type" : "type-5797",
+   "self_type" : "type-5796",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38998,8 +39087,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-5900",
-   "self_type" : "type-5899",
+   "referenced_type" : "type-5920",
+   "self_type" : "type-5919",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39008,8 +39097,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-6056",
-   "self_type" : "type-6055",
+   "referenced_type" : "type-6077",
+   "self_type" : "type-6076",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39018,8 +39107,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-6189",
-   "self_type" : "type-6188",
+   "referenced_type" : "type-6209",
+   "self_type" : "type-6208",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39028,8 +39117,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-6285",
-   "self_type" : "type-6284",
+   "referenced_type" : "type-6305",
+   "self_type" : "type-6304",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39038,8 +39127,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-6331",
-   "self_type" : "type-6330",
+   "referenced_type" : "type-6355",
+   "self_type" : "type-6354",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39048,8 +39137,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-6423",
-   "self_type" : "type-6422",
+   "referenced_type" : "type-6447",
+   "self_type" : "type-6446",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39058,8 +39147,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-6979",
-   "self_type" : "type-6978",
+   "referenced_type" : "type-7005",
+   "self_type" : "type-7004",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39068,8 +39157,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-7098",
-   "self_type" : "type-7097",
+   "referenced_type" : "type-7123",
+   "self_type" : "type-7122",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39078,8 +39167,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-7149",
-   "self_type" : "type-7148",
+   "referenced_type" : "type-7174",
+   "self_type" : "type-7173",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39088,8 +39177,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-7227",
-   "self_type" : "type-7226",
+   "referenced_type" : "type-7252",
+   "self_type" : "type-7251",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39098,8 +39187,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-7368",
-   "self_type" : "type-7367",
+   "referenced_type" : "type-7391",
+   "self_type" : "type-7390",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39108,8 +39197,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-7432",
-   "self_type" : "type-7431",
+   "referenced_type" : "type-7457",
+   "self_type" : "type-7456",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39118,8 +39207,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-7472",
-   "self_type" : "type-7471",
+   "referenced_type" : "type-7496",
+   "self_type" : "type-7495",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39128,8 +39217,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-7563",
-   "self_type" : "type-7562",
+   "referenced_type" : "type-7586",
+   "self_type" : "type-7585",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39138,18 +39227,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-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",
+   "referenced_type" : "type-7626",
+   "self_type" : "type-7625",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39168,8 +39247,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-4760",
-   "self_type" : "type-4759",
+   "referenced_type" : "type-4767",
+   "self_type" : "type-4766",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39178,8 +39257,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-4864",
-   "self_type" : "type-4863",
+   "referenced_type" : "type-4870",
+   "self_type" : "type-4869",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39188,8 +39267,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-5071",
-   "self_type" : "type-5070",
+   "referenced_type" : "type-5087",
+   "self_type" : "type-5086",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39198,8 +39277,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-5124",
-   "self_type" : "type-5123",
+   "referenced_type" : "type-5140",
+   "self_type" : "type-5139",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39208,8 +39287,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-7358",
-   "self_type" : "type-7357",
+   "referenced_type" : "type-7381",
+   "self_type" : "type-7380",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39218,8 +39297,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-7451",
-   "self_type" : "type-7450",
+   "referenced_type" : "type-7476",
+   "self_type" : "type-7475",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39228,8 +39307,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-7579",
-   "self_type" : "type-7578",
+   "referenced_type" : "type-7603",
+   "self_type" : "type-7602",
    "size" : 12,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39238,8 +39317,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-2644",
-   "self_type" : "type-2643",
+   "referenced_type" : "type-2647",
+   "self_type" : "type-2646",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39248,8 +39327,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-4988",
-   "self_type" : "type-4987",
+   "referenced_type" : "type-4994",
+   "self_type" : "type-4993",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39258,8 +39337,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-6020",
-   "self_type" : "type-6019",
+   "referenced_type" : "type-6042",
+   "self_type" : "type-6041",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39268,8 +39347,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-7514",
-   "self_type" : "type-7513",
+   "referenced_type" : "type-7530",
+   "self_type" : "type-7529",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39278,8 +39357,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-2640",
-   "self_type" : "type-2639",
+   "referenced_type" : "type-2643",
+   "self_type" : "type-2642",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39288,8 +39367,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-4984",
-   "self_type" : "type-4983",
+   "referenced_type" : "type-4990",
+   "self_type" : "type-4989",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39298,8 +39377,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-6017",
-   "self_type" : "type-6016",
+   "referenced_type" : "type-6037",
+   "self_type" : "type-6036",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39308,8 +39387,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-7498",
-   "self_type" : "type-7497",
+   "referenced_type" : "type-7517",
+   "self_type" : "type-7516",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39318,8 +39397,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-4753",
-   "self_type" : "type-4752",
+   "referenced_type" : "type-4759",
+   "self_type" : "type-4758",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39328,8 +39407,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-4860",
-   "self_type" : "type-4859",
+   "referenced_type" : "type-4866",
+   "self_type" : "type-4865",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39338,8 +39417,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-5060",
-   "self_type" : "type-5059",
+   "referenced_type" : "type-5077",
+   "self_type" : "type-5076",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39348,8 +39427,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-5120",
-   "self_type" : "type-5119",
+   "referenced_type" : "type-5136",
+   "self_type" : "type-5135",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39358,8 +39437,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-7352",
-   "self_type" : "type-7351",
+   "referenced_type" : "type-7375",
+   "self_type" : "type-7374",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39368,8 +39447,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-7447",
-   "self_type" : "type-7446",
+   "referenced_type" : "type-7470",
+   "self_type" : "type-7469",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39378,8 +39457,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-7569",
-   "self_type" : "type-7568",
+   "referenced_type" : "type-7594",
+   "self_type" : "type-7593",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39388,8 +39467,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-1644",
-   "self_type" : "type-1643",
+   "referenced_type" : "type-1647",
+   "self_type" : "type-1646",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -39398,8 +39477,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-4105",
-   "self_type" : "type-4104",
+   "referenced_type" : "type-4112",
+   "self_type" : "type-4111",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -39408,8 +39487,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-6678",
-   "self_type" : "type-6677",
+   "referenced_type" : "type-6701",
+   "self_type" : "type-6700",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -39428,8 +39507,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1108",
-   "self_type" : "type-1107",
+   "referenced_type" : "type-1111",
+   "self_type" : "type-1110",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39438,8 +39517,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1280",
-   "self_type" : "type-1279",
+   "referenced_type" : "type-1283",
+   "self_type" : "type-1282",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39448,8 +39527,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-3275",
+   "self_type" : "type-3274",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39458,8 +39537,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-3539",
+   "self_type" : "type-3538",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39468,8 +39547,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-3649",
+   "self_type" : "type-3648",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39478,8 +39557,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-3715",
+   "self_type" : "type-3714",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39488,8 +39567,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-3837",
+   "self_type" : "type-3836",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39508,8 +39587,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-4358",
+   "self_type" : "type-4357",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39518,8 +39597,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-4493",
+   "self_type" : "type-4492",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39528,8 +39607,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-4562",
+   "self_type" : "type-4561",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39538,8 +39617,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-4624",
+   "self_type" : "type-4623",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39548,8 +39627,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-4667",
+   "self_type" : "type-4666",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39558,8 +39637,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-4874",
+   "self_type" : "type-4873",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39568,8 +39647,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-5144",
+   "self_type" : "type-5143",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39578,8 +39657,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-5174",
+   "self_type" : "type-5173",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39588,8 +39667,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-5350",
+   "self_type" : "type-5349",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39598,8 +39677,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-5614",
+   "self_type" : "type-5613",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39608,8 +39687,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-5724",
+   "self_type" : "type-5723",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39618,8 +39697,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-5790",
+   "self_type" : "type-5789",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39628,8 +39707,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-5912",
+   "self_type" : "type-5911",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39638,8 +39717,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6067",
+   "self_type" : "type-6066",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39648,8 +39727,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6204",
+   "self_type" : "type-6203",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39658,8 +39737,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6300",
+   "self_type" : "type-6299",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39668,8 +39747,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6347",
+   "self_type" : "type-6346",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39678,8 +39757,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6439",
+   "self_type" : "type-6438",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39688,8 +39767,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-6960",
+   "self_type" : "type-6959",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39698,8 +39777,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7098",
+   "self_type" : "type-7097",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39708,8 +39787,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7187",
+   "self_type" : "type-7186",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39718,8 +39797,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7268",
+   "self_type" : "type-7267",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39728,8 +39807,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7313",
+   "self_type" : "type-7312",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39738,8 +39817,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7481",
+   "self_type" : "type-7480",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39748,8 +39827,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7506",
+   "self_type" : "type-7505",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39758,8 +39837,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7511",
+   "self_type" : "type-7510",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39768,8 +39847,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7639",
+   "self_type" : "type-7638",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39778,8 +39857,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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",
+   "referenced_type" : "type-7650",
+   "self_type" : "type-7649",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39798,8 +39877,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-4376",
-   "self_type" : "type-4375",
+   "referenced_type" : "type-4383",
+   "self_type" : "type-4382",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -39808,8 +39887,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-4505",
-   "self_type" : "type-4504",
+   "referenced_type" : "type-4511",
+   "self_type" : "type-4510",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -39818,8 +39897,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-6960",
-   "self_type" : "type-6959",
+   "referenced_type" : "type-6984",
+   "self_type" : "type-6983",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -39828,8 +39907,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-7093",
-   "self_type" : "type-7092",
+   "referenced_type" : "type-7118",
+   "self_type" : "type-7117",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -39869,7 +39948,7 @@
    "linker_set_key" : "const unsigned short",
    "name" : "const unsigned short",
    "referenced_type" : "type-497",
-   "self_type" : "type-2520",
+   "self_type" : "type-2523",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39897,7 +39976,7 @@
    "linker_set_key" : "volatile int",
    "name" : "volatile int",
    "referenced_type" : "type-4",
-   "self_type" : "type-1250",
+   "self_type" : "type-1253",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h"
   }
@@ -39915,7 +39994,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -39930,8 +40009,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_BALANCETYPE",
    "name" : "OMX_AUDIO_CONFIG_BALANCETYPE",
-   "referenced_type" : "type-2184",
-   "self_type" : "type-2184",
+   "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_BALANCETYPE"
@@ -39947,7 +40026,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -39957,7 +40036,7 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nBass",
@@ -39967,8 +40046,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_BASSTYPE",
    "name" : "OMX_AUDIO_CONFIG_BASSTYPE",
-   "referenced_type" : "type-2188",
-   "self_type" : "type-2188",
+   "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_BASSTYPE"
@@ -39984,7 +40063,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -39999,18 +40078,18 @@
     {
      "field_name" : "bMute",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bIsMIDI",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
    "name" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
-   "referenced_type" : "type-2186",
-   "self_type" : "type-2186",
+   "referenced_type" : "type-2189",
+   "self_type" : "type-2189",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE"
@@ -40026,7 +40105,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40041,23 +40120,23 @@
     {
      "field_name" : "bLinear",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "sVolume",
      "field_offset" : 160,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     },
     {
      "field_name" : "bIsMIDI",
      "field_offset" : 256,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
    "name" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
-   "referenced_type" : "type-2183",
-   "self_type" : "type-2183",
+   "referenced_type" : "type-2186",
+   "self_type" : "type-2186",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE"
@@ -40073,7 +40152,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40083,17 +40162,17 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "sDelay",
      "field_offset" : 128,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "sModulationRate",
      "field_offset" : 224,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "nModulationDepth",
@@ -40103,13 +40182,13 @@
     {
      "field_name" : "nFeedback",
      "field_offset" : 352,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
    "name" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
-   "referenced_type" : "type-2194",
-   "self_type" : "type-2194",
+   "referenced_type" : "type-2197",
+   "self_type" : "type-2197",
    "size" : 56,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHORUSTYPE"
@@ -40125,7 +40204,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40135,13 +40214,13 @@
     {
      "field_name" : "eEchoCancelation",
      "field_offset" : 96,
-     "referenced_type" : "type-2196"
+     "referenced_type" : "type-2199"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
-   "referenced_type" : "type-2197",
-   "self_type" : "type-2197",
+   "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_ECHOCANCELATIONTYPE"
@@ -40157,7 +40236,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40167,28 +40246,28 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "sBandIndex",
      "field_offset" : 128,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "sCenterFreq",
      "field_offset" : 224,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "sBandLevel",
      "field_offset" : 320,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
    "name" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
-   "referenced_type" : "type-2191",
-   "self_type" : "type-2191",
+   "referenced_type" : "type-2194",
+   "self_type" : "type-2194",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE"
@@ -40204,7 +40283,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40214,13 +40293,13 @@
     {
      "field_name" : "bLoudness",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
    "name" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
-   "referenced_type" : "type-2187",
-   "self_type" : "type-2187",
+   "referenced_type" : "type-2190",
+   "self_type" : "type-2190",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE"
@@ -40236,7 +40315,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40246,17 +40325,17 @@
     {
      "field_name" : "sPitchTransposition",
      "field_offset" : 96,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     },
     {
      "field_name" : "sPlayBackRate",
      "field_offset" : 192,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "sTempo",
      "field_offset" : 288,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "nMaxPolyphony",
@@ -40306,8 +40385,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
-   "referenced_type" : "type-2165",
-   "self_type" : "type-2165",
+   "referenced_type" : "type-2157",
+   "self_type" : "type-2157",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE"
@@ -40323,7 +40402,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40338,13 +40417,13 @@
     {
      "field_name" : "nMidiEvents",
      "field_offset" : 128,
-     "referenced_type" : "type-1572"
+     "referenced_type" : "type-1567"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
-   "referenced_type" : "type-2143",
-   "self_type" : "type-2143",
+   "referenced_type" : "type-2135",
+   "self_type" : "type-2135",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE"
@@ -40360,7 +40439,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40380,13 +40459,13 @@
     {
      "field_name" : "nData",
      "field_offset" : 160,
-     "referenced_type" : "type-1572"
+     "referenced_type" : "type-1567"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
-   "referenced_type" : "type-2181",
-   "self_type" : "type-2181",
+   "referenced_type" : "type-2184",
+   "self_type" : "type-2184",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE"
@@ -40402,7 +40481,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40437,8 +40516,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
-   "referenced_type" : "type-2176",
-   "self_type" : "type-2176",
+   "referenced_type" : "type-2179",
+   "self_type" : "type-2179",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE"
@@ -40454,7 +40533,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40484,8 +40563,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
-   "referenced_type" : "type-2154",
-   "self_type" : "type-2154",
+   "referenced_type" : "type-2146",
+   "self_type" : "type-2146",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE"
@@ -40501,7 +40580,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40526,7 +40605,7 @@
     {
      "field_name" : "bVibra",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nNumMetaEvents",
@@ -40541,13 +40620,13 @@
     {
      "field_name" : "eMIDIPlayBackState",
      "field_offset" : 288,
-     "referenced_type" : "type-2169"
+     "referenced_type" : "type-2168"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
-   "referenced_type" : "type-2170",
-   "self_type" : "type-2170",
+   "referenced_type" : "type-2173",
+   "self_type" : "type-2173",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE"
@@ -40563,7 +40642,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40573,13 +40652,13 @@
     {
      "field_name" : "bMute",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MUTETYPE",
    "name" : "OMX_AUDIO_CONFIG_MUTETYPE",
-   "referenced_type" : "type-2185",
-   "self_type" : "type-2185",
+   "referenced_type" : "type-2188",
+   "self_type" : "type-2188",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MUTETYPE"
@@ -40595,7 +40674,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40605,13 +40684,13 @@
     {
      "field_name" : "bNoiseReduction",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
-   "referenced_type" : "type-2198",
-   "self_type" : "type-2198",
+   "referenced_type" : "type-2201",
+   "self_type" : "type-2201",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE"
@@ -40627,7 +40706,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40637,47 +40716,47 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "sRoomLevel",
      "field_offset" : 128,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     },
     {
      "field_name" : "sRoomHighFreqLevel",
      "field_offset" : 224,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     },
     {
      "field_name" : "sReflectionsLevel",
      "field_offset" : 320,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     },
     {
      "field_name" : "sReflectionsDelay",
      "field_offset" : 416,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "sReverbLevel",
      "field_offset" : 512,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     },
     {
      "field_name" : "sReverbDelay",
      "field_offset" : 608,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "sDecayTime",
      "field_offset" : 704,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "nDecayHighFreqRatio",
      "field_offset" : 800,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "nDensity",
@@ -40692,13 +40771,13 @@
     {
      "field_name" : "sReferenceHighFreq",
      "field_offset" : 960,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
-   "referenced_type" : "type-2195",
-   "self_type" : "type-2195",
+   "referenced_type" : "type-2198",
+   "self_type" : "type-2198",
    "size" : 132,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE"
@@ -40714,7 +40793,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40724,12 +40803,12 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eWideningType",
      "field_offset" : 128,
-     "referenced_type" : "type-2192"
+     "referenced_type" : "type-2195"
     },
     {
      "field_name" : "nStereoWidening",
@@ -40739,8 +40818,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
    "name" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-2193",
-   "self_type" : "type-2193",
+   "referenced_type" : "type-2196",
+   "self_type" : "type-2196",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE"
@@ -40756,7 +40835,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40766,7 +40845,7 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nTreble",
@@ -40776,8 +40855,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_TREBLETYPE",
    "name" : "OMX_AUDIO_CONFIG_TREBLETYPE",
-   "referenced_type" : "type-2189",
-   "self_type" : "type-2189",
+   "referenced_type" : "type-2192",
+   "self_type" : "type-2192",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_TREBLETYPE"
@@ -40793,7 +40872,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40803,18 +40882,18 @@
     {
      "field_name" : "bLinear",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "sVolume",
      "field_offset" : 128,
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
    "name" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
-   "referenced_type" : "type-2182",
-   "self_type" : "type-2182",
+   "referenced_type" : "type-2185",
+   "self_type" : "type-2185",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_VOLUMETYPE"
@@ -40830,7 +40909,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40875,23 +40954,23 @@
     {
      "field_name" : "eAACProfile",
      "field_offset" : 320,
-     "referenced_type" : "type-1676"
+     "referenced_type" : "type-1671"
     },
     {
      "field_name" : "eAACStreamFormat",
      "field_offset" : 352,
-     "referenced_type" : "type-1668"
+     "referenced_type" : "type-1670"
     },
     {
      "field_name" : "eChannelMode",
      "field_offset" : 384,
-     "referenced_type" : "type-1652"
+     "referenced_type" : "type-1651"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
    "name" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
-   "referenced_type" : "type-1687",
-   "self_type" : "type-1687",
+   "referenced_type" : "type-1679",
+   "self_type" : "type-1679",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_AACPROFILETYPE"
@@ -40907,7 +40986,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40932,8 +41011,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_ADPCMTYPE",
    "name" : "OMX_AUDIO_PARAM_ADPCMTYPE",
-   "referenced_type" : "type-1798",
-   "self_type" : "type-1798",
+   "referenced_type" : "type-1789",
+   "self_type" : "type-1789",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_ADPCMTYPE"
@@ -40949,7 +41028,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -40969,23 +41048,23 @@
     {
      "field_name" : "eAMRBandMode",
      "field_offset" : 160,
-     "referenced_type" : "type-1890"
+     "referenced_type" : "type-1881"
     },
     {
      "field_name" : "eAMRDTXMode",
      "field_offset" : 192,
-     "referenced_type" : "type-1901"
+     "referenced_type" : "type-1892"
     },
     {
      "field_name" : "eAMRFrameFormat",
      "field_offset" : 224,
-     "referenced_type" : "type-1877"
+     "referenced_type" : "type-1862"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_AMRTYPE",
    "name" : "OMX_AUDIO_PARAM_AMRTYPE",
-   "referenced_type" : "type-1912",
-   "self_type" : "type-1912",
+   "referenced_type" : "type-1903",
+   "self_type" : "type-1903",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_AMRTYPE"
@@ -41001,7 +41080,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41016,12 +41095,12 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-2021"
+     "referenced_type" : "type-2013"
     },
     {
      "field_name" : "bRATE_REDUCon",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nMinBitRate",
@@ -41036,23 +41115,23 @@
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 256,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bNoiseSuppressor",
      "field_offset" : 288,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_EVRCTYPE",
    "name" : "OMX_AUDIO_PARAM_EVRCTYPE",
-   "referenced_type" : "type-2055",
-   "self_type" : "type-2055",
+   "referenced_type" : "type-2046",
+   "self_type" : "type-2046",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_EVRCTYPE"
@@ -41068,7 +41147,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41093,8 +41172,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_FLACTYPE",
    "name" : "OMX_AUDIO_PARAM_FLACTYPE",
-   "referenced_type" : "type-1709",
-   "self_type" : "type-1709",
+   "referenced_type" : "type-1700",
+   "self_type" : "type-1700",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_FLACTYPE"
@@ -41110,7 +41189,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41125,28 +41204,28 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eBitRate",
      "field_offset" : 160,
-     "referenced_type" : "type-1808"
+     "referenced_type" : "type-1799"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G723TYPE",
    "name" : "OMX_AUDIO_PARAM_G723TYPE",
-   "referenced_type" : "type-1818",
-   "self_type" : "type-1818",
+   "referenced_type" : "type-1812",
+   "self_type" : "type-1812",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G723TYPE"
@@ -41162,7 +41241,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41177,13 +41256,13 @@
     {
      "field_name" : "eG726Mode",
      "field_offset" : 128,
-     "referenced_type" : "type-1831"
+     "referenced_type" : "type-1822"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G726TYPE",
    "name" : "OMX_AUDIO_PARAM_G726TYPE",
-   "referenced_type" : "type-1841",
-   "self_type" : "type-1841",
+   "referenced_type" : "type-1832",
+   "self_type" : "type-1832",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G726TYPE"
@@ -41199,7 +41278,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41214,18 +41293,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eBitType",
      "field_offset" : 160,
-     "referenced_type" : "type-1851"
+     "referenced_type" : "type-1845"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G729TYPE",
    "name" : "OMX_AUDIO_PARAM_G729TYPE",
-   "referenced_type" : "type-1860",
-   "self_type" : "type-1860",
+   "referenced_type" : "type-1855",
+   "self_type" : "type-1855",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G729TYPE"
@@ -41241,7 +41320,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41251,18 +41330,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
-   "referenced_type" : "type-1945",
-   "self_type" : "type-1945",
+   "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_GSMEFRTYPE"
@@ -41278,7 +41357,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41288,18 +41367,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMFRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMFRTYPE",
-   "referenced_type" : "type-1923",
-   "self_type" : "type-1923",
+   "referenced_type" : "type-1914",
+   "self_type" : "type-1914",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_GSMFRTYPE"
@@ -41315,7 +41394,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41325,18 +41404,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMHRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMHRTYPE",
-   "referenced_type" : "type-1934",
-   "self_type" : "type-1934",
+   "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_GSMHRTYPE"
@@ -41352,7 +41431,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41377,18 +41456,18 @@
     {
      "field_name" : "eMidiSoundBank",
      "field_offset" : 192,
-     "referenced_type" : "type-2111"
+     "referenced_type" : "type-2102"
     },
     {
      "field_name" : "eMidiSoundBankLayout",
      "field_offset" : 224,
-     "referenced_type" : "type-2121"
+     "referenced_type" : "type-2113"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
    "name" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
-   "referenced_type" : "type-2132",
-   "self_type" : "type-2132",
+   "referenced_type" : "type-2124",
+   "self_type" : "type-2124",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE"
@@ -41404,7 +41483,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41419,23 +41498,23 @@
     {
      "field_name" : "sMaxPolyphony",
      "field_offset" : 128,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1468"
     },
     {
      "field_name" : "bLoadDefaultSound",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eMidiFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-2087"
+     "referenced_type" : "type-2079"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MIDITYPE",
    "name" : "OMX_AUDIO_PARAM_MIDITYPE",
-   "referenced_type" : "type-2098",
-   "self_type" : "type-2098",
+   "referenced_type" : "type-2090",
+   "self_type" : "type-2090",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MIDITYPE"
@@ -41451,7 +41530,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41481,18 +41560,18 @@
     {
      "field_name" : "eChannelMode",
      "field_offset" : 224,
-     "referenced_type" : "type-1652"
+     "referenced_type" : "type-1651"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-1660"
+     "referenced_type" : "type-1656"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MP3TYPE",
    "name" : "OMX_AUDIO_PARAM_MP3TYPE",
-   "referenced_type" : "type-1666",
-   "self_type" : "type-1666",
+   "referenced_type" : "type-1664",
+   "self_type" : "type-1664",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MP3TYPE"
@@ -41508,7 +41587,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41528,12 +41607,12 @@
     {
      "field_name" : "eEndian",
      "field_offset" : 160,
-     "referenced_type" : "type-1460"
+     "referenced_type" : "type-1459"
     },
     {
      "field_name" : "bInterleaved",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nBitPerSample",
@@ -41548,18 +41627,18 @@
     {
      "field_name" : "ePCMMode",
      "field_offset" : 288,
-     "referenced_type" : "type-1633"
+     "referenced_type" : "type-1628"
     },
     {
      "field_name" : "eChannelMapping",
      "field_offset" : 320,
-     "referenced_type" : "type-1642"
+     "referenced_type" : "type-1641"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PCMMODETYPE",
    "name" : "OMX_AUDIO_PARAM_PCMMODETYPE",
-   "referenced_type" : "type-1641",
-   "self_type" : "type-1641",
+   "referenced_type" : "type-1640",
+   "self_type" : "type-1640",
    "size" : 104,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PCMMODETYPE"
@@ -41575,7 +41654,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41590,18 +41669,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
-   "referenced_type" : "type-2000",
-   "self_type" : "type-2000",
+   "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_PDCEFRTYPE"
@@ -41617,7 +41696,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41632,18 +41711,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCFRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCFRTYPE",
-   "referenced_type" : "type-1989",
-   "self_type" : "type-1989",
+   "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_PDCFRTYPE"
@@ -41659,7 +41738,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41674,18 +41753,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCHRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCHRTYPE",
-   "referenced_type" : "type-2011",
-   "self_type" : "type-2011",
+   "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_PDCHRTYPE"
@@ -41701,7 +41780,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41716,7 +41795,7 @@
     {
      "field_name" : "eEncoding",
      "field_offset" : 128,
-     "referenced_type" : "type-1618"
+     "referenced_type" : "type-1616"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PORTFORMATTYPE",
@@ -41738,7 +41817,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41753,7 +41832,7 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-2021"
+     "referenced_type" : "type-2013"
     },
     {
      "field_name" : "nMinBitRate",
@@ -41768,8 +41847,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_QCELP13TYPE",
    "name" : "OMX_AUDIO_PARAM_QCELP13TYPE",
-   "referenced_type" : "type-2043",
-   "self_type" : "type-2043",
+   "referenced_type" : "type-2035",
+   "self_type" : "type-2035",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_QCELP13TYPE"
@@ -41785,7 +41864,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41805,7 +41884,7 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 160,
-     "referenced_type" : "type-2021"
+     "referenced_type" : "type-2013"
     },
     {
      "field_name" : "nMinBitRate",
@@ -41820,8 +41899,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_QCELP8TYPE",
    "name" : "OMX_AUDIO_PARAM_QCELP8TYPE",
-   "referenced_type" : "type-2032",
-   "self_type" : "type-2032",
+   "referenced_type" : "type-2024",
+   "self_type" : "type-2024",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_QCELP8TYPE"
@@ -41837,7 +41916,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41882,13 +41961,13 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 320,
-     "referenced_type" : "type-1752"
+     "referenced_type" : "type-1746"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_RATYPE",
    "name" : "OMX_AUDIO_PARAM_RATYPE",
-   "referenced_type" : "type-1765",
-   "self_type" : "type-1765",
+   "referenced_type" : "type-1756",
+   "self_type" : "type-1756",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_RATYPE"
@@ -41904,7 +41983,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41944,23 +42023,23 @@
     {
      "field_name" : "bEnableBitrate",
      "field_offset" : 288,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eChannelMode",
      "field_offset" : 320,
-     "referenced_type" : "type-1652"
+     "referenced_type" : "type-1651"
     },
     {
      "field_name" : "eSBCAllocType",
      "field_offset" : 352,
-     "referenced_type" : "type-1775"
+     "referenced_type" : "type-1766"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_SBCTYPE",
    "name" : "OMX_AUDIO_PARAM_SBCTYPE",
-   "referenced_type" : "type-1785",
-   "self_type" : "type-1785",
+   "referenced_type" : "type-1779",
+   "self_type" : "type-1779",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_SBCTYPE"
@@ -41976,7 +42055,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -41991,12 +42070,12 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-2021"
+     "referenced_type" : "type-2013"
     },
     {
      "field_name" : "bRATE_REDUCon",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nMinBitRate",
@@ -42011,23 +42090,23 @@
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 256,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bNoiseSuppressor",
      "field_offset" : 288,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_SMVTYPE",
    "name" : "OMX_AUDIO_PARAM_SMVTYPE",
-   "referenced_type" : "type-2065",
-   "self_type" : "type-2065",
+   "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_SMVTYPE"
@@ -42043,7 +42122,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -42058,18 +42137,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
-   "referenced_type" : "type-1978",
-   "self_type" : "type-1978",
+   "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_TDMAEFRTYPE"
@@ -42085,7 +42164,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -42100,18 +42179,18 @@
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
    "name" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
-   "referenced_type" : "type-1967",
-   "self_type" : "type-1967",
+   "referenced_type" : "type-1958",
+   "self_type" : "type-1958",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_TDMAFRTYPE"
@@ -42127,7 +42206,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -42172,18 +42251,18 @@
     {
      "field_name" : "bManaged",
      "field_offset" : 320,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bDownmix",
      "field_offset" : 352,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_VORBISTYPE",
    "name" : "OMX_AUDIO_PARAM_VORBISTYPE",
-   "referenced_type" : "type-1698",
-   "self_type" : "type-1698",
+   "referenced_type" : "type-1689",
+   "self_type" : "type-1689",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_VORBISTYPE"
@@ -42199,7 +42278,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -42219,12 +42298,12 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-1719"
+     "referenced_type" : "type-1711"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 192,
-     "referenced_type" : "type-1732"
+     "referenced_type" : "type-1722"
     },
     {
      "field_name" : "nSamplingRate",
@@ -42249,8 +42328,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_WMATYPE",
    "name" : "OMX_AUDIO_PARAM_WMATYPE",
-   "referenced_type" : "type-1742",
-   "self_type" : "type-1742",
+   "referenced_type" : "type-1733",
+   "self_type" : "type-1733",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_WMATYPE"
@@ -42271,18 +42350,18 @@
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 64,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eEncoding",
      "field_offset" : 96,
-     "referenced_type" : "type-1618"
+     "referenced_type" : "type-1616"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PORTDEFINITIONTYPE",
    "name" : "OMX_AUDIO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-1619",
-   "self_type" : "type-1619",
+   "referenced_type" : "type-1621",
+   "self_type" : "type-1621",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PORTDEFINITIONTYPE"
@@ -42308,8 +42387,8 @@
    ],
    "linker_set_key" : "OMX_BS32",
    "name" : "OMX_BS32",
-   "referenced_type" : "type-1470",
-   "self_type" : "type-1470",
+   "referenced_type" : "type-1473",
+   "self_type" : "type-1473",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_BS32"
@@ -42335,8 +42414,8 @@
    ],
    "linker_set_key" : "OMX_BU32",
    "name" : "OMX_BU32",
-   "referenced_type" : "type-1469",
-   "self_type" : "type-1469",
+   "referenced_type" : "type-1468",
+   "self_type" : "type-1468",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_BU32"
@@ -42352,7 +42431,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "pBuffer",
@@ -42432,8 +42511,8 @@
    ],
    "linker_set_key" : "OMX_BUFFERHEADERTYPE",
    "name" : "OMX_BUFFERHEADERTYPE",
-   "referenced_type" : "type-1540",
-   "self_type" : "type-1540",
+   "referenced_type" : "type-1536",
+   "self_type" : "type-1536",
    "size" : 72,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_BUFFERHEADERTYPE"
@@ -42444,23 +42523,23 @@
    [
     {
      "field_name" : "EventHandler",
-     "referenced_type" : "type-1591"
+     "referenced_type" : "type-1594"
     },
     {
      "field_name" : "EmptyBufferDone",
      "field_offset" : 32,
-     "referenced_type" : "type-1593"
+     "referenced_type" : "type-1596"
     },
     {
      "field_name" : "FillBufferDone",
      "field_offset" : 64,
-     "referenced_type" : "type-1593"
+     "referenced_type" : "type-1596"
     }
    ],
    "linker_set_key" : "OMX_CALLBACKTYPE",
    "name" : "OMX_CALLBACKTYPE",
-   "referenced_type" : "type-1590",
-   "self_type" : "type-1590",
+   "referenced_type" : "type-1593",
+   "self_type" : "type-1593",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_CALLBACKTYPE"
@@ -42476,13 +42555,13 @@
     {
      "field_name" : "pInitialize",
      "field_offset" : 32,
-     "referenced_type" : "type-1500"
+     "referenced_type" : "type-1499"
     }
    ],
    "linker_set_key" : "OMX_COMPONENTREGISTERTYPE",
    "name" : "OMX_COMPONENTREGISTERTYPE",
-   "referenced_type" : "type-1499",
-   "self_type" : "type-1499",
+   "referenced_type" : "type-1498",
+   "self_type" : "type-1498",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_COMPONENTREGISTERTYPE"
@@ -42498,7 +42577,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "pComponentPrivate",
@@ -42513,98 +42592,98 @@
     {
      "field_name" : "GetComponentVersion",
      "field_offset" : 128,
-     "referenced_type" : "type-2357"
+     "referenced_type" : "type-2360"
     },
     {
      "field_name" : "SendCommand",
      "field_offset" : 160,
-     "referenced_type" : "type-2361"
+     "referenced_type" : "type-2364"
     },
     {
      "field_name" : "GetParameter",
      "field_offset" : 192,
-     "referenced_type" : "type-2363"
+     "referenced_type" : "type-2366"
     },
     {
      "field_name" : "SetParameter",
      "field_offset" : 224,
-     "referenced_type" : "type-2363"
+     "referenced_type" : "type-2366"
     },
     {
      "field_name" : "GetConfig",
      "field_offset" : 256,
-     "referenced_type" : "type-2363"
+     "referenced_type" : "type-2366"
     },
     {
      "field_name" : "SetConfig",
      "field_offset" : 288,
-     "referenced_type" : "type-2363"
+     "referenced_type" : "type-2366"
     },
     {
      "field_name" : "GetExtensionIndex",
      "field_offset" : 320,
-     "referenced_type" : "type-2365"
+     "referenced_type" : "type-2368"
     },
     {
      "field_name" : "GetState",
      "field_offset" : 352,
-     "referenced_type" : "type-2368"
+     "referenced_type" : "type-2371"
     },
     {
      "field_name" : "ComponentTunnelRequest",
      "field_offset" : 384,
-     "referenced_type" : "type-2371"
+     "referenced_type" : "type-2374"
     },
     {
      "field_name" : "UseBuffer",
      "field_offset" : 416,
-     "referenced_type" : "type-2374"
+     "referenced_type" : "type-2377"
     },
     {
      "field_name" : "AllocateBuffer",
      "field_offset" : 448,
-     "referenced_type" : "type-2377"
+     "referenced_type" : "type-2380"
     },
     {
      "field_name" : "FreeBuffer",
      "field_offset" : 480,
-     "referenced_type" : "type-2379"
+     "referenced_type" : "type-2382"
     },
     {
      "field_name" : "EmptyThisBuffer",
      "field_offset" : 512,
-     "referenced_type" : "type-2381"
+     "referenced_type" : "type-2384"
     },
     {
      "field_name" : "FillThisBuffer",
      "field_offset" : 544,
-     "referenced_type" : "type-2381"
+     "referenced_type" : "type-2384"
     },
     {
      "field_name" : "SetCallbacks",
      "field_offset" : 576,
-     "referenced_type" : "type-2383"
+     "referenced_type" : "type-2386"
     },
     {
      "field_name" : "ComponentDeInit",
      "field_offset" : 608,
-     "referenced_type" : "type-1500"
+     "referenced_type" : "type-1499"
     },
     {
      "field_name" : "UseEGLImage",
      "field_offset" : 640,
-     "referenced_type" : "type-2386"
+     "referenced_type" : "type-2389"
     },
     {
      "field_name" : "ComponentRoleEnum",
      "field_offset" : 672,
-     "referenced_type" : "type-2388"
+     "referenced_type" : "type-2391"
     }
    ],
    "linker_set_key" : "OMX_COMPONENTTYPE",
    "name" : "OMX_COMPONENTTYPE",
-   "referenced_type" : "type-2356",
-   "self_type" : "type-2356",
+   "referenced_type" : "type-2359",
+   "self_type" : "type-2359",
    "size" : 88,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_COMPONENTTYPE"
@@ -42620,7 +42699,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -42640,8 +42719,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_BACKLIGHTTYPE",
    "name" : "OMX_CONFIG_BACKLIGHTTYPE",
-   "referenced_type" : "type-2226",
-   "self_type" : "type-2226",
+   "referenced_type" : "type-2229",
+   "self_type" : "type-2229",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_BACKLIGHTTYPE"
@@ -42657,18 +42736,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "bEnabled",
      "field_offset" : 64,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_BOOLEANTYPE",
    "name" : "OMX_CONFIG_BOOLEANTYPE",
-   "referenced_type" : "type-2340",
-   "self_type" : "type-2340",
+   "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_CONFIG_BOOLEANTYPE"
@@ -42684,7 +42763,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -42699,8 +42778,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_BRIGHTNESSTYPE",
    "name" : "OMX_CONFIG_BRIGHTNESSTYPE",
-   "referenced_type" : "type-2225",
-   "self_type" : "type-2225",
+   "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_BRIGHTNESSTYPE"
@@ -42716,7 +42795,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -42726,12 +42805,12 @@
     {
      "field_name" : "bContinuous",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bFrameLimited",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nFrameLimit",
@@ -42741,8 +42820,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_CAPTUREMODETYPE",
    "name" : "OMX_CONFIG_CAPTUREMODETYPE",
-   "referenced_type" : "type-2240",
-   "self_type" : "type-2240",
+   "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"
@@ -42758,7 +42837,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -42773,13 +42852,13 @@
     {
      "field_name" : "eColorBlend",
      "field_offset" : 128,
-     "referenced_type" : "type-2209"
+     "referenced_type" : "type-2212"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_COLORBLENDTYPE",
    "name" : "OMX_CONFIG_COLORBLENDTYPE",
-   "referenced_type" : "type-2210",
-   "self_type" : "type-2210",
+   "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_CONFIG_COLORBLENDTYPE"
@@ -42795,7 +42874,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -42805,7 +42884,7 @@
     {
      "field_name" : "xColorMatrix",
      "field_offset" : 96,
-     "referenced_type" : "type-2201"
+     "referenced_type" : "type-2204"
     },
     {
      "field_name" : "xColorOffset",
@@ -42815,8 +42894,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_COLORCONVERSIONTYPE",
    "name" : "OMX_CONFIG_COLORCONVERSIONTYPE",
-   "referenced_type" : "type-2200",
-   "self_type" : "type-2200",
+   "referenced_type" : "type-2203",
+   "self_type" : "type-2203",
    "size" : 64,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORCONVERSIONTYPE"
@@ -42832,7 +42911,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -42842,7 +42921,7 @@
     {
      "field_name" : "bColorEnhancement",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nCustomizedU",
@@ -42857,8 +42936,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
    "name" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
-   "referenced_type" : "type-2207",
-   "self_type" : "type-2207",
+   "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_COLORENHANCEMENTTYPE"
@@ -42874,7 +42953,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -42894,8 +42973,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_COLORKEYTYPE",
    "name" : "OMX_CONFIG_COLORKEYTYPE",
-   "referenced_type" : "type-2208",
-   "self_type" : "type-2208",
+   "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_CONFIG_COLORKEYTYPE"
@@ -42911,12 +42990,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nParentNodeID",
@@ -42931,8 +43010,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
    "name" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
-   "referenced_type" : "type-2350",
-   "self_type" : "type-2350",
+   "referenced_type" : "type-2353",
+   "self_type" : "type-2353",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE"
@@ -42948,12 +43027,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nParentNodeID",
@@ -42978,13 +43057,13 @@
     {
      "field_name" : "bIsLeafType",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
    "name" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
-   "referenced_type" : "type-2351",
-   "self_type" : "type-2351",
+   "referenced_type" : "type-2354",
+   "self_type" : "type-2354",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_CONTAINERNODEIDTYPE"
@@ -43000,7 +43079,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43015,8 +43094,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_CONTRASTTYPE",
    "name" : "OMX_CONFIG_CONTRASTTYPE",
-   "referenced_type" : "type-2224",
-   "self_type" : "type-2224",
+   "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_CONTRASTTYPE"
@@ -43032,7 +43111,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43042,13 +43121,13 @@
     {
      "field_name" : "eDither",
      "field_offset" : 96,
-     "referenced_type" : "type-2238"
+     "referenced_type" : "type-2241"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_DITHERTYPE",
    "name" : "OMX_CONFIG_DITHERTYPE",
-   "referenced_type" : "type-2239",
-   "self_type" : "type-2239",
+   "referenced_type" : "type-2242",
+   "self_type" : "type-2242",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_DITHERTYPE"
@@ -43064,7 +43143,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43074,13 +43153,13 @@
     {
      "field_name" : "eExposureControl",
      "field_offset" : 96,
-     "referenced_type" : "type-2221"
+     "referenced_type" : "type-2224"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
    "name" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-2222",
-   "self_type" : "type-2222",
+   "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_EXPOSURECONTROLTYPE"
@@ -43096,7 +43175,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43106,7 +43185,7 @@
     {
      "field_name" : "eMetering",
      "field_offset" : 96,
-     "referenced_type" : "type-2242"
+     "referenced_type" : "type-2245"
     },
     {
      "field_name" : "xEVCompensation",
@@ -43121,7 +43200,7 @@
     {
      "field_name" : "bAutoAperture",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nShutterSpeedMsec",
@@ -43131,7 +43210,7 @@
     {
      "field_name" : "bAutoShutterSpeed",
      "field_offset" : 256,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nSensitivity",
@@ -43141,13 +43220,13 @@
     {
      "field_name" : "bAutoSensitivity",
      "field_offset" : 320,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_EXPOSUREVALUETYPE",
    "name" : "OMX_CONFIG_EXPOSUREVALUETYPE",
-   "referenced_type" : "type-2243",
-   "self_type" : "type-2243",
+   "referenced_type" : "type-2246",
+   "self_type" : "type-2246",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_EXPOSUREVALUETYPE"
@@ -43163,7 +43242,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43173,53 +43252,53 @@
     {
      "field_name" : "bCenter",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bLeft",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bRight",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bTop",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bBottom",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bTopLeft",
      "field_offset" : 256,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bTopRight",
      "field_offset" : 288,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bBottomLeft",
      "field_offset" : 320,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bBottomRight",
      "field_offset" : 352,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_FOCUSREGIONTYPE",
    "name" : "OMX_CONFIG_FOCUSREGIONTYPE",
-   "referenced_type" : "type-2245",
-   "self_type" : "type-2245",
+   "referenced_type" : "type-2248",
+   "self_type" : "type-2248",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_FOCUSREGIONTYPE"
@@ -43235,7 +43314,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43250,8 +43329,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_FRAMERATETYPE",
    "name" : "OMX_CONFIG_FRAMERATETYPE",
-   "referenced_type" : "type-2286",
-   "self_type" : "type-2286",
+   "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_FRAMERATETYPE"
@@ -43267,7 +43346,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43277,13 +43356,13 @@
     {
      "field_name" : "bStab",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_FRAMESTABTYPE",
    "name" : "OMX_CONFIG_FRAMESTABTYPE",
-   "referenced_type" : "type-2218",
-   "self_type" : "type-2218",
+   "referenced_type" : "type-2221",
+   "self_type" : "type-2221",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_FRAMESTABTYPE"
@@ -43299,7 +43378,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43314,8 +43393,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_GAMMATYPE",
    "name" : "OMX_CONFIG_GAMMATYPE",
-   "referenced_type" : "type-2227",
-   "self_type" : "type-2227",
+   "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_GAMMATYPE"
@@ -43331,7 +43410,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43341,13 +43420,13 @@
     {
      "field_name" : "eImageFilter",
      "field_offset" : 96,
-     "referenced_type" : "type-2205"
+     "referenced_type" : "type-2208"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_IMAGEFILTERTYPE",
    "name" : "OMX_CONFIG_IMAGEFILTERTYPE",
-   "referenced_type" : "type-2206",
-   "self_type" : "type-2206",
+   "referenced_type" : "type-2209",
+   "self_type" : "type-2209",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_IMAGEFILTERTYPE"
@@ -43363,7 +43442,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43373,13 +43452,13 @@
     {
      "field_name" : "IntraRefreshVOP",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
    "name" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
-   "referenced_type" : "type-2287",
-   "self_type" : "type-2287",
+   "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_INTRAREFRESHVOPTYPE"
@@ -43395,7 +43474,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43410,8 +43489,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_LIGHTNESSTYPE",
    "name" : "OMX_CONFIG_LIGHTNESSTYPE",
-   "referenced_type" : "type-2229",
-   "self_type" : "type-2229",
+   "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"
@@ -43427,7 +43506,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43442,13 +43521,13 @@
     {
      "field_name" : "ErrMap",
      "field_offset" : 128,
-     "referenced_type" : "type-1572"
+     "referenced_type" : "type-1567"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
    "name" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
-   "referenced_type" : "type-2288",
-   "self_type" : "type-2288",
+   "referenced_type" : "type-2291",
+   "self_type" : "type-2291",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE"
@@ -43464,7 +43543,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43474,13 +43553,13 @@
     {
      "field_name" : "bEnabled",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
    "name" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
-   "referenced_type" : "type-2290",
-   "self_type" : "type-2290",
+   "referenced_type" : "type-2293",
+   "self_type" : "type-2293",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_MBERRORREPORTINGTYPE"
@@ -43496,12 +43575,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "eScopeMode",
      "field_offset" : 64,
-     "referenced_type" : "type-2346"
+     "referenced_type" : "type-2349"
     },
     {
      "field_name" : "nScopeSpecifier",
@@ -43516,8 +43595,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
    "name" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
-   "referenced_type" : "type-2348",
-   "self_type" : "type-2348",
+   "referenced_type" : "type-2351",
+   "self_type" : "type-2351",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_METADATAITEMCOUNTTYPE"
@@ -43533,12 +43612,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "eScopeMode",
      "field_offset" : 64,
-     "referenced_type" : "type-2346"
+     "referenced_type" : "type-2349"
     },
     {
      "field_name" : "nScopeSpecifier",
@@ -43553,12 +43632,12 @@
     {
      "field_name" : "eSearchMode",
      "field_offset" : 160,
-     "referenced_type" : "type-2347"
+     "referenced_type" : "type-2350"
     },
     {
      "field_name" : "eKeyCharset",
      "field_offset" : 192,
-     "referenced_type" : "type-2345"
+     "referenced_type" : "type-2348"
     },
     {
      "field_name" : "nKeySizeUsed",
@@ -43573,7 +43652,7 @@
     {
      "field_name" : "eValueCharset",
      "field_offset" : 1280,
-     "referenced_type" : "type-2345"
+     "referenced_type" : "type-2348"
     },
     {
      "field_name" : "sLanguageCountry",
@@ -43593,13 +43672,13 @@
     {
      "field_name" : "nValue",
      "field_offset" : 1408,
-     "referenced_type" : "type-1572"
+     "referenced_type" : "type-1567"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_METADATAITEMTYPE",
    "name" : "OMX_CONFIG_METADATAITEMTYPE",
-   "referenced_type" : "type-2349",
-   "self_type" : "type-2349",
+   "referenced_type" : "type-2352",
+   "self_type" : "type-2352",
    "size" : 180,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_METADATAITEMTYPE"
@@ -43615,7 +43694,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43625,13 +43704,13 @@
     {
      "field_name" : "eMirror",
      "field_offset" : 96,
-     "referenced_type" : "type-2213"
+     "referenced_type" : "type-2216"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MIRRORTYPE",
    "name" : "OMX_CONFIG_MIRRORTYPE",
-   "referenced_type" : "type-2214",
-   "self_type" : "type-2214",
+   "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_CONFIG_MIRRORTYPE"
@@ -43647,7 +43726,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43667,8 +43746,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_PLANEBLENDTYPE",
    "name" : "OMX_CONFIG_PLANEBLENDTYPE",
-   "referenced_type" : "type-2231",
-   "self_type" : "type-2231",
+   "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_CONFIG_PLANEBLENDTYPE"
@@ -43684,7 +43763,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43704,8 +43783,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_POINTTYPE",
    "name" : "OMX_CONFIG_POINTTYPE",
-   "referenced_type" : "type-2215",
-   "self_type" : "type-2215",
+   "referenced_type" : "type-2218",
+   "self_type" : "type-2218",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_POINTTYPE"
@@ -43721,7 +43800,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43751,8 +43830,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_RECTTYPE",
    "name" : "OMX_CONFIG_RECTTYPE",
-   "referenced_type" : "type-2216",
-   "self_type" : "type-2216",
+   "referenced_type" : "type-2219",
+   "self_type" : "type-2219",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_RECTTYPE"
@@ -43768,7 +43847,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43783,8 +43862,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_ROTATIONTYPE",
    "name" : "OMX_CONFIG_ROTATIONTYPE",
-   "referenced_type" : "type-2212",
-   "self_type" : "type-2212",
+   "referenced_type" : "type-2215",
+   "self_type" : "type-2215",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_ROTATIONTYPE"
@@ -43800,7 +43879,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43815,8 +43894,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_SATURATIONTYPE",
    "name" : "OMX_CONFIG_SATURATIONTYPE",
-   "referenced_type" : "type-2228",
-   "self_type" : "type-2228",
+   "referenced_type" : "type-2231",
+   "self_type" : "type-2231",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_SATURATIONTYPE"
@@ -43832,7 +43911,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43852,8 +43931,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_SCALEFACTORTYPE",
    "name" : "OMX_CONFIG_SCALEFACTORTYPE",
-   "referenced_type" : "type-2204",
-   "self_type" : "type-2204",
+   "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_SCALEFACTORTYPE"
@@ -43869,7 +43948,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43879,13 +43958,13 @@
     {
      "field_name" : "eEffect",
      "field_offset" : 96,
-     "referenced_type" : "type-2233"
+     "referenced_type" : "type-2236"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
    "name" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-2234",
-   "self_type" : "type-2234",
+   "referenced_type" : "type-2237",
+   "self_type" : "type-2237",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_TRANSITIONEFFECTTYPE"
@@ -43901,7 +43980,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43911,13 +43990,13 @@
     {
      "field_name" : "eWhiteBalControl",
      "field_offset" : 96,
-     "referenced_type" : "type-2219"
+     "referenced_type" : "type-2222"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
    "name" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-2220",
-   "self_type" : "type-2220",
+   "referenced_type" : "type-2223",
+   "self_type" : "type-2223",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_WHITEBALCONTROLTYPE"
@@ -43933,7 +44012,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43953,8 +44032,8 @@
    ],
    "linker_set_key" : "OMX_FRAMESIZETYPE",
    "name" : "OMX_FRAMESIZETYPE",
-   "referenced_type" : "type-2211",
-   "self_type" : "type-2211",
+   "referenced_type" : "type-2214",
+   "self_type" : "type-2214",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_FRAMESIZETYPE"
@@ -43970,7 +44049,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -43980,7 +44059,7 @@
     {
      "field_name" : "eFocusControl",
      "field_offset" : 96,
-     "referenced_type" : "type-2303"
+     "referenced_type" : "type-2306"
     },
     {
      "field_name" : "nFocusSteps",
@@ -43995,8 +44074,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
    "name" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-2304",
-   "self_type" : "type-2304",
+   "referenced_type" : "type-2307",
+   "self_type" : "type-2307",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE"
@@ -44012,7 +44091,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -44022,13 +44101,13 @@
     {
      "field_name" : "eFlashControl",
      "field_offset" : 96,
-     "referenced_type" : "type-2300"
+     "referenced_type" : "type-2303"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
    "name" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
-   "referenced_type" : "type-2302",
-   "self_type" : "type-2302",
+   "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_FLASHCONTROLTYPE"
@@ -44044,7 +44123,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -44054,23 +44133,23 @@
     {
      "field_name" : "eHuffmanTable",
      "field_offset" : 96,
-     "referenced_type" : "type-2309"
+     "referenced_type" : "type-2312"
     },
     {
      "field_name" : "nNumberOfHuffmanCodeOfLength",
      "field_offset" : 128,
-     "referenced_type" : "type-2311"
+     "referenced_type" : "type-2314"
     },
     {
      "field_name" : "nHuffmanTable",
      "field_offset" : 256,
-     "referenced_type" : "type-2312"
+     "referenced_type" : "type-2315"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
    "name" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
-   "referenced_type" : "type-2310",
-   "self_type" : "type-2310",
+   "referenced_type" : "type-2313",
+   "self_type" : "type-2313",
    "size" : 288,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE"
@@ -44086,7 +44165,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -44101,18 +44180,18 @@
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-2297"
+     "referenced_type" : "type-2300"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-2199"
+     "referenced_type" : "type-2202"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
    "name" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-2299",
-   "self_type" : "type-2299",
+   "referenced_type" : "type-2302",
+   "self_type" : "type-2302",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_PORTFORMATTYPE"
@@ -44128,7 +44207,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -44143,8 +44222,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_QFACTORTYPE",
    "name" : "OMX_IMAGE_PARAM_QFACTORTYPE",
-   "referenced_type" : "type-2305",
-   "self_type" : "type-2305",
+   "referenced_type" : "type-2308",
+   "self_type" : "type-2308",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_QFACTORTYPE"
@@ -44160,7 +44239,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -44170,18 +44249,18 @@
     {
      "field_name" : "eQuantizationTable",
      "field_offset" : 96,
-     "referenced_type" : "type-2306"
+     "referenced_type" : "type-2309"
     },
     {
      "field_name" : "nQuantizationMatrix",
      "field_offset" : 128,
-     "referenced_type" : "type-2308"
+     "referenced_type" : "type-2311"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
    "name" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-2307",
-   "self_type" : "type-2307",
+   "referenced_type" : "type-2310",
+   "self_type" : "type-2310",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE"
@@ -44222,17 +44301,17 @@
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 224,
-     "referenced_type" : "type-2297"
+     "referenced_type" : "type-2300"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-2199"
+     "referenced_type" : "type-2202"
     },
     {
      "field_name" : "pNativeWindow",
@@ -44242,8 +44321,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_PORTDEFINITIONTYPE",
    "name" : "OMX_IMAGE_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-2298",
-   "self_type" : "type-2298",
+   "referenced_type" : "type-2301",
+   "self_type" : "type-2301",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PORTDEFINITIONTYPE"
@@ -44264,8 +44343,8 @@
    ],
    "linker_set_key" : "OMX_MARKTYPE",
    "name" : "OMX_MARKTYPE",
-   "referenced_type" : "type-1477",
-   "self_type" : "type-1477",
+   "referenced_type" : "type-1475",
+   "self_type" : "type-1475",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_MARKTYPE"
@@ -44281,18 +44360,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "bEnablePM",
      "field_offset" : 64,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_OTHER_CONFIG_POWERTYPE",
    "name" : "OMX_OTHER_CONFIG_POWERTYPE",
-   "referenced_type" : "type-2327",
-   "self_type" : "type-2327",
+   "referenced_type" : "type-2330",
+   "self_type" : "type-2330",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_CONFIG_POWERTYPE"
@@ -44308,13 +44387,13 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     }
    ],
    "linker_set_key" : "OMX_OTHER_CONFIG_STATSTYPE",
    "name" : "OMX_OTHER_CONFIG_STATSTYPE",
-   "referenced_type" : "type-2328",
-   "self_type" : "type-2328",
+   "referenced_type" : "type-2331",
+   "self_type" : "type-2331",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_CONFIG_STATSTYPE"
@@ -44330,7 +44409,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -44340,7 +44419,7 @@
     {
      "field_name" : "eType",
      "field_offset" : 96,
-     "referenced_type" : "type-1561"
+     "referenced_type" : "type-1556"
     },
     {
      "field_name" : "nDataSize",
@@ -44350,13 +44429,13 @@
     {
      "field_name" : "data",
      "field_offset" : 160,
-     "referenced_type" : "type-1572"
+     "referenced_type" : "type-1567"
     }
    ],
    "linker_set_key" : "OMX_OTHER_EXTRADATATYPE",
    "name" : "OMX_OTHER_EXTRADATATYPE",
-   "referenced_type" : "type-1571",
-   "self_type" : "type-1571",
+   "referenced_type" : "type-1566",
+   "self_type" : "type-1566",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_OTHER_EXTRADATATYPE"
@@ -44372,7 +44451,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -44387,13 +44466,13 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-2314"
+     "referenced_type" : "type-2317"
     }
    ],
    "linker_set_key" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
    "name" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-2330",
-   "self_type" : "type-2330",
+   "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"
@@ -44404,13 +44483,13 @@
    [
     {
      "field_name" : "eFormat",
-     "referenced_type" : "type-2314"
+     "referenced_type" : "type-2317"
     }
    ],
    "linker_set_key" : "OMX_OTHER_PORTDEFINITIONTYPE",
    "name" : "OMX_OTHER_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-2329",
-   "self_type" : "type-2329",
+   "referenced_type" : "type-2332",
+   "self_type" : "type-2332",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_PORTDEFINITIONTYPE"
@@ -44426,7 +44505,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -44436,13 +44515,13 @@
     {
      "field_name" : "eBufferSupplier",
      "field_offset" : 96,
-     "referenced_type" : "type-1601"
+     "referenced_type" : "type-1599"
     }
    ],
    "linker_set_key" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
    "name" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-1609",
-   "self_type" : "type-1609",
+   "referenced_type" : "type-1605",
+   "self_type" : "type-1605",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PARAM_BUFFERSUPPLIERTYPE"
@@ -44458,7 +44537,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "cRole",
@@ -44485,7 +44564,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "hPipe",
@@ -44495,8 +44574,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_CONTENTPIPETYPE",
    "name" : "OMX_PARAM_CONTENTPIPETYPE",
-   "referenced_type" : "type-2343",
-   "self_type" : "type-2343",
+   "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_PARAM_CONTENTPIPETYPE"
@@ -44512,18 +44591,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "contentURI",
      "field_offset" : 64,
-     "referenced_type" : "type-1572"
+     "referenced_type" : "type-1567"
     }
    ],
    "linker_set_key" : "OMX_PARAM_CONTENTURITYPE",
    "name" : "OMX_PARAM_CONTENTURITYPE",
-   "referenced_type" : "type-2341",
-   "self_type" : "type-2341",
+   "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"
@@ -44539,7 +44618,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -44549,18 +44628,18 @@
     {
      "field_name" : "eUnitType",
      "field_offset" : 96,
-     "referenced_type" : "type-2235"
+     "referenced_type" : "type-2238"
     },
     {
      "field_name" : "eEncapsulationType",
      "field_offset" : 128,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2239"
     }
    ],
    "linker_set_key" : "OMX_PARAM_DATAUNITTYPE",
    "name" : "OMX_PARAM_DATAUNITTYPE",
-   "referenced_type" : "type-2237",
-   "self_type" : "type-2237",
+   "referenced_type" : "type-2240",
+   "self_type" : "type-2240",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_DATAUNITTYPE"
@@ -44576,7 +44655,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -44586,13 +44665,13 @@
     {
      "field_name" : "bDeblocking",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_PARAM_DEBLOCKINGTYPE",
    "name" : "OMX_PARAM_DEBLOCKINGTYPE",
-   "referenced_type" : "type-2217",
-   "self_type" : "type-2217",
+   "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_PARAM_DEBLOCKINGTYPE"
@@ -44608,7 +44687,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -44618,58 +44697,58 @@
     {
      "field_name" : "eFocusStatus",
      "field_offset" : 96,
-     "referenced_type" : "type-2246"
+     "referenced_type" : "type-2249"
     },
     {
      "field_name" : "bCenterStatus",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bLeftStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bRightStatus",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bTopStatus",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bBottomStatus",
      "field_offset" : 256,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bTopLeftStatus",
      "field_offset" : 288,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bTopRightStatus",
      "field_offset" : 320,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bBottomLeftStatus",
      "field_offset" : 352,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bBottomRightStatus",
      "field_offset" : 384,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_PARAM_FOCUSSTATUSTYPE",
    "name" : "OMX_PARAM_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-2247",
-   "self_type" : "type-2247",
+   "referenced_type" : "type-2250",
+   "self_type" : "type-2250",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_FOCUSSTATUSTYPE"
@@ -44685,7 +44764,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -44695,7 +44774,7 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nInterleavePortIndex",
@@ -44705,8 +44784,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_INTERLEAVETYPE",
    "name" : "OMX_PARAM_INTERLEAVETYPE",
-   "referenced_type" : "type-2232",
-   "self_type" : "type-2232",
+   "referenced_type" : "type-2235",
+   "self_type" : "type-2235",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_INTERLEAVETYPE"
@@ -44722,7 +44801,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -44737,8 +44816,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_MACROBLOCKSTYPE",
    "name" : "OMX_PARAM_MACROBLOCKSTYPE",
-   "referenced_type" : "type-2291",
-   "self_type" : "type-2291",
+   "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"
@@ -44754,17 +44833,17 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eKeyCharset",
      "field_offset" : 96,
-     "referenced_type" : "type-2345"
+     "referenced_type" : "type-2348"
     },
     {
      "field_name" : "nKeySizeUsed",
@@ -44789,13 +44868,13 @@
     {
      "field_name" : "bEnabled",
      "field_offset" : 2240,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_PARAM_METADATAFILTERTYPE",
    "name" : "OMX_PARAM_METADATAFILTERTYPE",
-   "referenced_type" : "type-2355",
-   "self_type" : "type-2355",
+   "referenced_type" : "type-2358",
+   "self_type" : "type-2358",
    "size" : 284,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_METADATAFILTERTYPE"
@@ -44811,7 +44890,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -44821,7 +44900,7 @@
     {
      "field_name" : "eDir",
      "field_offset" : 96,
-     "referenced_type" : "type-1452"
+     "referenced_type" : "type-1455"
     },
     {
      "field_name" : "nBufferCountActual",
@@ -44841,27 +44920,27 @@
     {
      "field_name" : "bEnabled",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bPopulated",
      "field_offset" : 256,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eDomain",
      "field_offset" : 288,
-     "referenced_type" : "type-2332"
+     "referenced_type" : "type-2335"
     },
     {
      "field_name" : "format",
      "field_offset" : 320,
-     "referenced_type" : "type-2334"
+     "referenced_type" : "type-2337"
     },
     {
      "field_name" : "bBuffersContiguous",
      "field_offset" : 704,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nBufferAlignment",
@@ -44871,8 +44950,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_PORTDEFINITIONTYPE",
    "name" : "OMX_PARAM_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-2333",
-   "self_type" : "type-2333",
+   "referenced_type" : "type-2336",
+   "self_type" : "type-2336",
    "size" : 96,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_PORTDEFINITIONTYPE"
@@ -44883,27 +44962,27 @@
    [
     {
      "field_name" : "audio",
-     "referenced_type" : "type-1619"
+     "referenced_type" : "type-1621"
     },
     {
      "field_name" : "video",
-     "referenced_type" : "type-2249"
+     "referenced_type" : "type-2252"
     },
     {
      "field_name" : "image",
-     "referenced_type" : "type-2298"
+     "referenced_type" : "type-2301"
     },
     {
      "field_name" : "other",
-     "referenced_type" : "type-2329"
+     "referenced_type" : "type-2332"
     }
    ],
    "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-2334",
-   "self_type" : "type-2334",
+   "referenced_type" : "type-2337",
+   "self_type" : "type-2337",
    "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)"
@@ -44919,7 +44998,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -44934,18 +45013,18 @@
     {
      "field_name" : "bOneShot",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "sFrameSize",
      "field_offset" : 160,
-     "referenced_type" : "type-2211"
+     "referenced_type" : "type-2214"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SENSORMODETYPE",
    "name" : "OMX_PARAM_SENSORMODETYPE",
-   "referenced_type" : "type-2223",
-   "self_type" : "type-2223",
+   "referenced_type" : "type-2226",
+   "self_type" : "type-2226",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_SENSORMODETYPE"
@@ -44961,18 +45040,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "ePolicy",
      "field_offset" : 64,
-     "referenced_type" : "type-2336"
+     "referenced_type" : "type-2339"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
    "name" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-2337",
-   "self_type" : "type-2337",
+   "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_PARAM_SUSPENSIONPOLICYTYPE"
@@ -44988,18 +45067,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "eType",
      "field_offset" : 64,
-     "referenced_type" : "type-2338"
+     "referenced_type" : "type-2341"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SUSPENSIONTYPE",
    "name" : "OMX_PARAM_SUSPENSIONTYPE",
-   "referenced_type" : "type-2339",
-   "self_type" : "type-2339",
+   "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_PARAM_SUSPENSIONTYPE"
@@ -45015,7 +45094,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -45030,8 +45109,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_U32TYPE",
    "name" : "OMX_PARAM_U32TYPE",
-   "referenced_type" : "type-2335",
-   "self_type" : "type-2335",
+   "referenced_type" : "type-2338",
+   "self_type" : "type-2338",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_U32TYPE"
@@ -45047,7 +45126,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPorts",
@@ -45062,8 +45141,8 @@
    ],
    "linker_set_key" : "OMX_PORT_PARAM_TYPE",
    "name" : "OMX_PORT_PARAM_TYPE",
-   "referenced_type" : "type-1585",
-   "self_type" : "type-1585",
+   "referenced_type" : "type-1581",
+   "self_type" : "type-1581",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PORT_PARAM_TYPE"
@@ -45079,7 +45158,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nGroupPriority",
@@ -45094,8 +45173,8 @@
    ],
    "linker_set_key" : "OMX_PRIORITYMGMTTYPE",
    "name" : "OMX_PRIORITYMGMTTYPE",
-   "referenced_type" : "type-1522",
-   "self_type" : "type-1522",
+   "referenced_type" : "type-1519",
+   "self_type" : "type-1519",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PRIORITYMGMTTYPE"
@@ -45111,18 +45190,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "bResourceConcealmentForbidden",
      "field_offset" : 64,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_RESOURCECONCEALMENTTYPE",
    "name" : "OMX_RESOURCECONCEALMENTTYPE",
-   "referenced_type" : "type-2344",
-   "self_type" : "type-2344",
+   "referenced_type" : "type-2347",
+   "self_type" : "type-2347",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_RESOURCECONCEALMENTTYPE"
@@ -45138,18 +45217,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "eClock",
      "field_offset" : 64,
-     "referenced_type" : "type-2319"
+     "referenced_type" : "type-2322"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
    "name" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
-   "referenced_type" : "type-2326",
-   "self_type" : "type-2326",
+   "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_TIME_CONFIG_ACTIVEREFCLOCKTYPE"
@@ -45165,12 +45244,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "eState",
      "field_offset" : 64,
-     "referenced_type" : "type-2321"
+     "referenced_type" : "type-2324"
     },
     {
      "field_name" : "nStartTime",
@@ -45190,8 +45269,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
    "name" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
-   "referenced_type" : "type-2325",
-   "self_type" : "type-2325",
+   "referenced_type" : "type-2328",
+   "self_type" : "type-2328",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_CLOCKSTATETYPE"
@@ -45207,7 +45286,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -45232,8 +45311,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
    "name" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
-   "referenced_type" : "type-2322",
-   "self_type" : "type-2322",
+   "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_MEDIATIMEREQUESTTYPE"
@@ -45249,7 +45328,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "xScale",
@@ -45259,8 +45338,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_SCALETYPE",
    "name" : "OMX_TIME_CONFIG_SCALETYPE",
-   "referenced_type" : "type-2324",
-   "self_type" : "type-2324",
+   "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_TIME_CONFIG_SCALETYPE"
@@ -45276,18 +45355,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "eType",
      "field_offset" : 64,
-     "referenced_type" : "type-2315"
+     "referenced_type" : "type-2318"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_SEEKMODETYPE",
    "name" : "OMX_TIME_CONFIG_SEEKMODETYPE",
-   "referenced_type" : "type-2316",
-   "self_type" : "type-2316",
+   "referenced_type" : "type-2319",
+   "self_type" : "type-2319",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_SEEKMODETYPE"
@@ -45303,7 +45382,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -45318,8 +45397,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
    "name" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
-   "referenced_type" : "type-2317",
-   "self_type" : "type-2317",
+   "referenced_type" : "type-2320",
+   "self_type" : "type-2320",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_TIMESTAMPTYPE"
@@ -45335,7 +45414,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nClientPrivate",
@@ -45345,7 +45424,7 @@
     {
      "field_name" : "eUpdateType",
      "field_offset" : 96,
-     "referenced_type" : "type-2318"
+     "referenced_type" : "type-2321"
     },
     {
      "field_name" : "nMediaTimestamp",
@@ -45370,13 +45449,13 @@
     {
      "field_name" : "eState",
      "field_offset" : 352,
-     "referenced_type" : "type-2321"
+     "referenced_type" : "type-2324"
     }
    ],
    "linker_set_key" : "OMX_TIME_MEDIATIMETYPE",
    "name" : "OMX_TIME_MEDIATIMETYPE",
-   "referenced_type" : "type-2323",
-   "self_type" : "type-2323",
+   "referenced_type" : "type-2326",
+   "self_type" : "type-2326",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_MEDIATIMETYPE"
@@ -45392,13 +45471,13 @@
     {
      "field_name" : "eSupplier",
      "field_offset" : 32,
-     "referenced_type" : "type-1601"
+     "referenced_type" : "type-1599"
     }
    ],
    "linker_set_key" : "OMX_TUNNELSETUPTYPE",
    "name" : "OMX_TUNNELSETUPTYPE",
-   "referenced_type" : "type-1612",
-   "self_type" : "type-1612",
+   "referenced_type" : "type-1613",
+   "self_type" : "type-1613",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_TUNNELSETUPTYPE"
@@ -45409,7 +45488,7 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-1479"
+     "referenced_type" : "type-1482"
     },
     {
      "field_name" : "nVersion",
@@ -45419,8 +45498,8 @@
    "linker_set_key" : "OMX_VERSIONTYPE",
    "name" : "OMX_VERSIONTYPE",
    "record_kind" : "union",
-   "referenced_type" : "type-1478",
-   "self_type" : "type-1478",
+   "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"
@@ -45452,8 +45531,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "OMX_VERSIONTYPE::(anonymous struct at frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h:376:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h:376:5",
    "name" : "OMX_VERSIONTYPE::(anonymous struct at frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h:376:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h:376:5",
-   "referenced_type" : "type-1479",
-   "self_type" : "type-1479",
+   "referenced_type" : "type-1482",
+   "self_type" : "type-1482",
    "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)"
@@ -45469,7 +45548,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -45489,8 +45568,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
    "name" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
-   "referenced_type" : "type-2295",
-   "self_type" : "type-2295",
+   "referenced_type" : "type-2298",
+   "self_type" : "type-2298",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD"
@@ -45506,7 +45585,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -45521,8 +45600,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_BITRATETYPE",
    "name" : "OMX_VIDEO_CONFIG_BITRATETYPE",
-   "referenced_type" : "type-2285",
-   "self_type" : "type-2285",
+   "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_VIDEO_CONFIG_BITRATETYPE"
@@ -45538,7 +45617,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -45553,8 +45632,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_NALSIZE",
    "name" : "OMX_VIDEO_CONFIG_NALSIZE",
-   "referenced_type" : "type-2296",
-   "self_type" : "type-2296",
+   "referenced_type" : "type-2299",
+   "self_type" : "type-2299",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_NALSIZE"
@@ -45570,7 +45649,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -45590,13 +45669,13 @@
     {
      "field_name" : "eSliceMode",
      "field_offset" : 128,
-     "referenced_type" : "type-2293"
+     "referenced_type" : "type-2296"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
    "name" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
-   "referenced_type" : "type-2294",
-   "self_type" : "type-2294",
+   "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_PARAM_AVCSLICEFMO"
@@ -45612,7 +45691,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -45637,7 +45716,7 @@
     {
      "field_name" : "bUseHadamard",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nRefFrames",
@@ -45657,32 +45736,32 @@
     {
      "field_name" : "bEnableUEP",
      "field_offset" : 320,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bEnableFMO",
      "field_offset" : 352,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bEnableASO",
      "field_offset" : 384,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bEnableRS",
      "field_offset" : 416,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 448,
-     "referenced_type" : "type-2279"
+     "referenced_type" : "type-2282"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 480,
-     "referenced_type" : "type-2280"
+     "referenced_type" : "type-2283"
     },
     {
      "field_name" : "nAllowedPictureTypes",
@@ -45692,22 +45771,22 @@
     {
      "field_name" : "bFrameMBsOnly",
      "field_offset" : 544,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bMBAFF",
      "field_offset" : 576,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bEntropyCodingCABAC",
      "field_offset" : 608,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bWeightedPPrediction",
      "field_offset" : 640,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nWeightedBipredicitonMode",
@@ -45717,17 +45796,17 @@
     {
      "field_name" : "bconstIpred",
      "field_offset" : 704,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bDirect8x8Inference",
      "field_offset" : 736,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bDirectSpatialTemporal",
      "field_offset" : 768,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nCabacInitIdc",
@@ -45737,13 +45816,13 @@
     {
      "field_name" : "eLoopFilterMode",
      "field_offset" : 832,
-     "referenced_type" : "type-2282"
+     "referenced_type" : "type-2285"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_AVCTYPE",
    "name" : "OMX_VIDEO_PARAM_AVCTYPE",
-   "referenced_type" : "type-2283",
-   "self_type" : "type-2283",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2286",
    "size" : 108,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_AVCTYPE"
@@ -45759,7 +45838,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -45769,17 +45848,17 @@
     {
      "field_name" : "eControlRate",
      "field_offset" : 96,
-     "referenced_type" : "type-2253"
+     "referenced_type" : "type-2256"
     },
     {
      "field_offset" : 128,
-     "referenced_type" : "type-2255"
+     "referenced_type" : "type-2258"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_BITRATETYPE",
    "name" : "OMX_VIDEO_PARAM_BITRATETYPE",
-   "referenced_type" : "type-2254",
-   "self_type" : "type-2254",
+   "referenced_type" : "type-2257",
+   "self_type" : "type-2257",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_BITRATETYPE"
@@ -45801,8 +45880,8 @@
    "linker_set_key" : "OMX_VIDEO_PARAM_BITRATETYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5",
    "name" : "OMX_VIDEO_PARAM_BITRATETYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5",
    "record_kind" : "union",
-   "referenced_type" : "type-2255",
-   "self_type" : "type-2255",
+   "referenced_type" : "type-2258",
+   "self_type" : "type-2258",
    "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)"
@@ -45818,7 +45897,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -45828,12 +45907,12 @@
     {
      "field_name" : "bEnableHEC",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bEnableResync",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nResynchMarkerSpacing",
@@ -45843,18 +45922,18 @@
     {
      "field_name" : "bEnableDataPartitioning",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bEnableRVLC",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE",
    "name" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE",
-   "referenced_type" : "type-2261",
-   "self_type" : "type-2261",
+   "referenced_type" : "type-2264",
+   "self_type" : "type-2264",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE"
@@ -45870,7 +45949,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -45890,17 +45969,17 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 160,
-     "referenced_type" : "type-2263"
+     "referenced_type" : "type-2266"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 192,
-     "referenced_type" : "type-2264"
+     "referenced_type" : "type-2267"
     },
     {
      "field_name" : "bPLUSPTYPEAllowed",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nAllowedPictureTypes",
@@ -45910,7 +45989,7 @@
     {
      "field_name" : "bForceRoundingTypeToZero",
      "field_offset" : 288,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nPictureHeaderRepetition",
@@ -45925,8 +46004,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_H263TYPE",
    "name" : "OMX_VIDEO_PARAM_H263TYPE",
-   "referenced_type" : "type-2267",
-   "self_type" : "type-2267",
+   "referenced_type" : "type-2270",
+   "self_type" : "type-2270",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_H263TYPE"
@@ -45942,7 +46021,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -45952,7 +46031,7 @@
     {
      "field_name" : "eRefreshMode",
      "field_offset" : 96,
-     "referenced_type" : "type-2259"
+     "referenced_type" : "type-2262"
     },
     {
      "field_name" : "nAirMBs",
@@ -45972,8 +46051,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
    "name" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
-   "referenced_type" : "type-2260",
-   "self_type" : "type-2260",
+   "referenced_type" : "type-2263",
+   "self_type" : "type-2263",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE"
@@ -45989,7 +46068,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -45999,17 +46078,17 @@
     {
      "field_name" : "eAccuracy",
      "field_offset" : 96,
-     "referenced_type" : "type-2257"
+     "referenced_type" : "type-2260"
     },
     {
      "field_name" : "bUnrestrictedMVs",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bFourMV",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "sXSearchRange",
@@ -46024,8 +46103,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
    "name" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
-   "referenced_type" : "type-2258",
-   "self_type" : "type-2258",
+   "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_MOTIONVECTORTYPE"
@@ -46041,7 +46120,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -46061,18 +46140,18 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 160,
-     "referenced_type" : "type-2268"
+     "referenced_type" : "type-2271"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 192,
-     "referenced_type" : "type-2269"
+     "referenced_type" : "type-2272"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MPEG2TYPE",
    "name" : "OMX_VIDEO_PARAM_MPEG2TYPE",
-   "referenced_type" : "type-2270",
-   "self_type" : "type-2270",
+   "referenced_type" : "type-2273",
+   "self_type" : "type-2273",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MPEG2TYPE"
@@ -46088,7 +46167,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -46103,12 +46182,12 @@
     {
      "field_name" : "bSVH",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bGov",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nPFrames",
@@ -46128,7 +46207,7 @@
     {
      "field_name" : "bACPred",
      "field_offset" : 288,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nMaxPacketSize",
@@ -46143,12 +46222,12 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 384,
-     "referenced_type" : "type-2271"
+     "referenced_type" : "type-2274"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 416,
-     "referenced_type" : "type-2272"
+     "referenced_type" : "type-2275"
     },
     {
      "field_name" : "nAllowedPictureTypes",
@@ -46163,13 +46242,13 @@
     {
      "field_name" : "bReversibleVLC",
      "field_offset" : 512,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MPEG4TYPE",
    "name" : "OMX_VIDEO_PARAM_MPEG4TYPE",
-   "referenced_type" : "type-2273",
-   "self_type" : "type-2273",
+   "referenced_type" : "type-2276",
+   "self_type" : "type-2276",
    "size" : 68,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MPEG4TYPE"
@@ -46185,7 +46264,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -46200,12 +46279,12 @@
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-2248"
+     "referenced_type" : "type-2251"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-2199"
+     "referenced_type" : "type-2202"
     },
     {
      "field_name" : "xFramerate",
@@ -46215,8 +46294,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
    "name" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-2250",
-   "self_type" : "type-2250",
+   "referenced_type" : "type-2253",
+   "self_type" : "type-2253",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_PORTFORMATTYPE"
@@ -46232,7 +46311,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -46257,8 +46336,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
    "name" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
-   "referenced_type" : "type-2284",
-   "self_type" : "type-2284",
+   "referenced_type" : "type-2287",
+   "self_type" : "type-2287",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE"
@@ -46274,7 +46353,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -46299,8 +46378,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
    "name" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
-   "referenced_type" : "type-2251",
-   "self_type" : "type-2251",
+   "referenced_type" : "type-2254",
+   "self_type" : "type-2254",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE"
@@ -46316,7 +46395,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -46326,7 +46405,7 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 96,
-     "referenced_type" : "type-2276"
+     "referenced_type" : "type-2279"
     },
     {
      "field_name" : "nBitsPerPixel",
@@ -46366,23 +46445,23 @@
     {
      "field_name" : "bEnablePostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bEnableTemporalInterpolation",
      "field_offset" : 352,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bEnableLatencyMode",
      "field_offset" : 384,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_RVTYPE",
    "name" : "OMX_VIDEO_PARAM_RVTYPE",
-   "referenced_type" : "type-2278",
-   "self_type" : "type-2278",
+   "referenced_type" : "type-2281",
+   "self_type" : "type-2281",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_RVTYPE"
@@ -46398,7 +46477,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -46408,43 +46487,43 @@
     {
      "field_name" : "b16x16",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "b16x8",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "b8x16",
      "field_offset" : 160,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "b8x8",
      "field_offset" : 192,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "b8x4",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "b4x8",
      "field_offset" : 256,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "b4x4",
      "field_offset" : 288,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VBSMCTYPE",
    "name" : "OMX_VIDEO_PARAM_VBSMCTYPE",
-   "referenced_type" : "type-2262",
-   "self_type" : "type-2262",
+   "referenced_type" : "type-2265",
+   "self_type" : "type-2265",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_VBSMCTYPE"
@@ -46460,7 +46539,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -46470,7 +46549,7 @@
     {
      "field_name" : "bEnableVFU",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nFirstGOB",
@@ -46490,8 +46569,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
    "name" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
-   "referenced_type" : "type-2252",
-   "self_type" : "type-2252",
+   "referenced_type" : "type-2255",
+   "self_type" : "type-2255",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE"
@@ -46507,7 +46586,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -46517,13 +46596,13 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 96,
-     "referenced_type" : "type-2274"
+     "referenced_type" : "type-2277"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_WMVTYPE",
    "name" : "OMX_VIDEO_PARAM_WMVTYPE",
-   "referenced_type" : "type-2275",
-   "self_type" : "type-2275",
+   "referenced_type" : "type-2278",
+   "self_type" : "type-2278",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_WMVTYPE"
@@ -46574,17 +46653,17 @@
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 256,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 288,
-     "referenced_type" : "type-2248"
+     "referenced_type" : "type-2251"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 320,
-     "referenced_type" : "type-2199"
+     "referenced_type" : "type-2202"
     },
     {
      "field_name" : "pNativeWindow",
@@ -46594,8 +46673,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PORTDEFINITIONTYPE",
    "name" : "OMX_VIDEO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-2249",
-   "self_type" : "type-2249",
+   "referenced_type" : "type-2252",
+   "self_type" : "type-2252",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PORTDEFINITIONTYPE"
@@ -46605,7 +46684,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1166"
+     "referenced_type" : "type-1167"
     }
    ],
    "fields" :
@@ -46614,20 +46693,20 @@
      "access" : "private",
      "field_name" : "d_",
      "field_offset" : 32,
-     "referenced_type" : "type-1194"
+     "referenced_type" : "type-1198"
     },
     {
      "access" : "private",
      "field_name" : "s_",
      "field_offset" : 64,
-     "referenced_type" : "type-1195"
+     "referenced_type" : "type-1199"
     }
    ],
    "linker_set_key" : "Renamer",
    "name" : "Renamer",
    "record_kind" : "class",
-   "referenced_type" : "type-1193",
-   "self_type" : "type-1193",
+   "referenced_type" : "type-1197",
+   "self_type" : "type-1197",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSZN7android14ReferenceMover15move_referencesINS_13GraphicBufferEEEvPNS_2spIT_EEPKS5_jE7Renamer",
@@ -46657,8 +46736,8 @@
    "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-1039",
-   "self_type" : "type-1039",
+   "referenced_type" : "type-1042",
+   "self_type" : "type-1042",
    "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"
@@ -46667,8 +46746,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::ADebug",
    "name" : "android::ADebug",
-   "referenced_type" : "type-2281",
-   "self_type" : "type-2281",
+   "referenced_type" : "type-2284",
+   "self_type" : "type-2284",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
    "unique_id" : "_ZTSN7android6ADebugE"
@@ -47167,8 +47246,8 @@
    ],
    "linker_set_key" : "android::AReplyToken",
    "name" : "android::AReplyToken",
-   "referenced_type" : "type-1044",
-   "self_type" : "type-1044",
+   "referenced_type" : "type-1043",
+   "self_type" : "type-1043",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android11AReplyTokenE",
@@ -48137,6 +48216,10 @@
      "mangled_component_name" : "_ZN7android16ProducerListener18needsReleaseNotifyEv"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ProducerListener18onBuffersDiscardedERKNSt3__16vectorIiNS1_9allocatorIiEEEE"
+    },
+    {
      "mangled_component_name" : "_ZNK7android17IProducerListener13getHalVariantEv"
     },
     {
@@ -48287,7 +48370,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1096"
+     "referenced_type" : "type-1099"
     },
     {
      "referenced_type" : "type-67"
@@ -48296,11 +48379,11 @@
    "linker_set_key" : "android::BnInterface<android::ISurfaceComposer>",
    "name" : "android::BnInterface<android::ISurfaceComposer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1095",
-   "self_type" : "type-1095",
+   "referenced_type" : "type-1098",
+   "self_type" : "type-1098",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-1097" ],
+   "template_args" : [ "type-1100" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_16ISurfaceComposerEEE",
    "vtable_components" :
    [
@@ -48335,7 +48418,7 @@
     },
     {
      "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ISurfaceComposer28createDisplayEventConnectionENS0_11VsyncSourceE"
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer28createDisplayEventConnectionENS0_11VsyncSourceENS0_13ConfigChangedE"
     },
     {
      "is_pure" : true,
@@ -48414,6 +48497,10 @@
     },
     {
      "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer13captureScreenEyPNS_8hardware8graphics6common4V1_29DataspaceEPNS_2spINS_13GraphicBufferEEE"
+    },
+    {
+     "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"
     },
     {
@@ -48493,6 +48580,10 @@
      "mangled_component_name" : "_ZNK7android16ISurfaceComposer20setDisplayBrightnessERKNS_2spINS_7IBinderEEEf"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer15notifyPowerHintEi"
+    },
+    {
      "mangled_component_name" : "_ZN7android11BnInterfaceINS_16ISurfaceComposerEE19queryLocalInterfaceERKNS_8String16E"
     },
     {
@@ -48611,7 +48702,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1032"
+     "referenced_type" : "type-1035"
     },
     {
      "referenced_type" : "type-67"
@@ -48620,11 +48711,11 @@
    "linker_set_key" : "android::BnInterface<android::ITransactionCompletedListener>",
    "name" : "android::BnInterface<android::ITransactionCompletedListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1031",
-   "self_type" : "type-1031",
+   "referenced_type" : "type-1034",
+   "self_type" : "type-1034",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-1033" ],
+   "template_args" : [ "type-1036" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_29ITransactionCompletedListenerEEE",
    "vtable_components" :
    [
@@ -48776,7 +48867,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1496"
+     "referenced_type" : "type-1502"
     },
     {
      "referenced_type" : "type-48"
@@ -48785,11 +48876,11 @@
    "linker_set_key" : "android::BpInterface<android::IConsumerListener>",
    "name" : "android::BpInterface<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1495",
-   "self_type" : "type-1495",
+   "referenced_type" : "type-1501",
+   "self_type" : "type-1501",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-1497" ],
+   "template_args" : [ "type-1503" ],
    "unique_id" : "_ZTSN7android11BpInterfaceINS_17IConsumerListenerEEE",
    "vtable_components" :
    [
@@ -48945,7 +49036,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1625"
+     "referenced_type" : "type-1630"
     },
     {
      "referenced_type" : "type-48"
@@ -48954,11 +49045,11 @@
    "linker_set_key" : "android::BpInterface<android::IGraphicBufferConsumer>",
    "name" : "android::BpInterface<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1624",
-   "self_type" : "type-1624",
+   "referenced_type" : "type-1629",
+   "self_type" : "type-1629",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-1626" ],
+   "template_args" : [ "type-1631" ],
    "unique_id" : "_ZTSN7android11BpInterfaceINS_22IGraphicBufferConsumerEEE",
    "vtable_components" :
    [
@@ -49150,7 +49241,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-4318"
+     "referenced_type" : "type-4324"
     },
     {
      "referenced_type" : "type-48"
@@ -49159,11 +49250,11 @@
    "linker_set_key" : "android::BpInterface<android::IGraphicBufferProducer>",
    "name" : "android::BpInterface<android::IGraphicBufferProducer>",
    "record_kind" : "class",
-   "referenced_type" : "type-4317",
-   "self_type" : "type-4317",
+   "referenced_type" : "type-4323",
+   "self_type" : "type-4323",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-4319" ],
+   "template_args" : [ "type-4325" ],
    "unique_id" : "_ZTSN7android11BpInterfaceINS_22IGraphicBufferProducerEEE",
    "vtable_components" :
    [
@@ -49379,7 +49470,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-4480"
+     "referenced_type" : "type-4486"
     },
     {
      "referenced_type" : "type-48"
@@ -49388,11 +49479,11 @@
    "linker_set_key" : "android::BpInterface<android::IProducerListener>",
    "name" : "android::BpInterface<android::IProducerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-4479",
-   "self_type" : "type-4479",
+   "referenced_type" : "type-4485",
+   "self_type" : "type-4485",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-4481" ],
+   "template_args" : [ "type-4487" ],
    "unique_id" : "_ZTSN7android11BpInterfaceINS_17IProducerListenerEEE",
    "vtable_components" :
    [
@@ -49424,6 +49515,10 @@
      "mangled_component_name" : "_ZN7android16ProducerListener18needsReleaseNotifyEv"
     },
     {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ProducerListener18onBuffersDiscardedERKNSt3__16vectorIiNS1_9allocatorIiEEEE"
+    },
+    {
      "mangled_component_name" : "_ZNK7android17IProducerListener13getHalVariantEv"
     },
     {
@@ -49656,28 +49751,28 @@
    [
     {
      "field_name" : "mRange",
-     "referenced_type" : "type-2429"
+     "referenced_type" : "type-2432"
     },
     {
      "field_name" : "mPrimaries",
      "field_offset" : 32,
-     "referenced_type" : "type-2430"
+     "referenced_type" : "type-2433"
     },
     {
      "field_name" : "mTransfer",
      "field_offset" : 64,
-     "referenced_type" : "type-2431"
+     "referenced_type" : "type-2434"
     },
     {
      "field_name" : "mMatrixCoeffs",
      "field_offset" : 96,
-     "referenced_type" : "type-2432"
+     "referenced_type" : "type-2435"
     }
    ],
    "linker_set_key" : "android::ColorAspects",
    "name" : "android::ColorAspects",
-   "referenced_type" : "type-2428",
-   "self_type" : "type-2428",
+   "referenced_type" : "type-2431",
+   "self_type" : "type-2431",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android12ColorAspectsE"
@@ -49686,8 +49781,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::ColorUtils",
    "name" : "android::ColorUtils",
-   "referenced_type" : "type-1181",
-   "self_type" : "type-1181",
+   "referenced_type" : "type-1180",
+   "self_type" : "type-1180",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
    "unique_id" : "_ZTSN7android10ColorUtilsE"
@@ -49696,8 +49791,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::CompileTimeAssert<true>",
    "name" : "android::CompileTimeAssert<true>",
-   "referenced_type" : "type-2690",
-   "self_type" : "type-2690",
+   "referenced_type" : "type-2693",
+   "self_type" : "type-2693",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Debug.h",
    "unique_id" : "_ZTSN7android17CompileTimeAssertILb1EEE"
@@ -49790,7 +49885,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -49800,7 +49895,7 @@
     {
      "field_name" : "bTunneled",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nAudioHwSync",
@@ -49815,8 +49910,8 @@
    ],
    "linker_set_key" : "android::ConfigureVideoTunnelModeParams",
    "name" : "android::ConfigureVideoTunnelModeParams",
-   "referenced_type" : "type-2426",
-   "self_type" : "type-2426",
+   "referenced_type" : "type-2429",
+   "self_type" : "type-2429",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android30ConfigureVideoTunnelModeParamsE"
@@ -49832,7 +49927,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -49842,12 +49937,12 @@
     {
      "field_name" : "bRequestingDataSpace",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "bDataSpaceChanged",
      "field_offset" : 128,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nPixelFormat",
@@ -49862,13 +49957,13 @@
     {
      "field_name" : "sAspects",
      "field_offset" : 224,
-     "referenced_type" : "type-2428"
+     "referenced_type" : "type-2431"
     }
    ],
    "linker_set_key" : "android::DescribeColorAspectsParams",
    "name" : "android::DescribeColorAspectsParams",
-   "referenced_type" : "type-2427",
-   "self_type" : "type-2427",
+   "referenced_type" : "type-2430",
+   "self_type" : "type-2430",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26DescribeColorAspectsParamsE"
@@ -49884,12 +49979,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 64,
-     "referenced_type" : "type-2199"
+     "referenced_type" : "type-2202"
     },
     {
      "field_name" : "nFrameWidth",
@@ -49914,18 +50009,18 @@
     {
      "field_name" : "bUsingNativeBuffers",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "sMediaImage",
      "field_offset" : 256,
-     "referenced_type" : "type-2420"
+     "referenced_type" : "type-2423"
     }
    ],
    "linker_set_key" : "android::DescribeColorFormat2Params",
    "name" : "android::DescribeColorFormat2Params",
-   "referenced_type" : "type-2419",
-   "self_type" : "type-2419",
+   "referenced_type" : "type-2422",
+   "self_type" : "type-2422",
    "size" : 136,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26DescribeColorFormat2ParamsE"
@@ -49941,12 +50036,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 64,
-     "referenced_type" : "type-2199"
+     "referenced_type" : "type-2202"
     },
     {
      "field_name" : "nFrameWidth",
@@ -49971,18 +50066,18 @@
     {
      "field_name" : "bUsingNativeBuffers",
      "field_offset" : 224,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "sMediaImage",
      "field_offset" : 256,
-     "referenced_type" : "type-2415"
+     "referenced_type" : "type-2418"
     }
    ],
    "linker_set_key" : "android::DescribeColorFormatParams",
    "name" : "android::DescribeColorFormatParams",
-   "referenced_type" : "type-2414",
-   "self_type" : "type-2414",
+   "referenced_type" : "type-2417",
+   "self_type" : "type-2417",
    "size" : 112,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android25DescribeColorFormatParamsE"
@@ -49998,7 +50093,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50018,13 +50113,13 @@
     {
      "field_name" : "nValue",
      "field_offset" : 160,
-     "referenced_type" : "type-1572"
+     "referenced_type" : "type-1567"
     }
    ],
    "linker_set_key" : "android::DescribeHDR10PlusInfoParams",
    "name" : "android::DescribeHDR10PlusInfoParams",
-   "referenced_type" : "type-2440",
-   "self_type" : "type-2440",
+   "referenced_type" : "type-2443",
+   "self_type" : "type-2443",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android27DescribeHDR10PlusInfoParamsE"
@@ -50040,7 +50135,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50050,13 +50145,13 @@
     {
      "field_name" : "sInfo",
      "field_offset" : 96,
-     "referenced_type" : "type-2435"
+     "referenced_type" : "type-2438"
     }
    ],
    "linker_set_key" : "android::DescribeHDRStaticInfoParams",
    "name" : "android::DescribeHDRStaticInfoParams",
-   "referenced_type" : "type-2434",
-   "self_type" : "type-2434",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2437",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android27DescribeHDRStaticInfoParamsE"
@@ -50072,7 +50167,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50082,13 +50177,13 @@
     {
      "field_name" : "enable",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "android::EnableAndroidNativeBuffersParams",
    "name" : "android::EnableAndroidNativeBuffersParams",
-   "referenced_type" : "type-2395",
-   "self_type" : "type-2395",
+   "referenced_type" : "type-2398",
+   "self_type" : "type-2398",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android32EnableAndroidNativeBuffersParamsE"
@@ -50100,13 +50195,13 @@
     {
      "access" : "private",
      "field_name" : "mSharedFd",
-     "referenced_type" : "type-1199"
+     "referenced_type" : "type-1202"
     }
    ],
    "linker_set_key" : "android::FileDescriptor",
    "name" : "android::FileDescriptor",
-   "referenced_type" : "type-1198",
-   "self_type" : "type-1198",
+   "referenced_type" : "type-1201",
+   "self_type" : "type-1201",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h",
    "unique_id" : "_ZTSN7android14FileDescriptorE"
@@ -50123,8 +50218,8 @@
    ],
    "linker_set_key" : "android::FileDescriptor::Autoclose",
    "name" : "android::FileDescriptor::Autoclose",
-   "referenced_type" : "type-1204",
-   "self_type" : "type-1204",
+   "referenced_type" : "type-1203",
+   "self_type" : "type-1203",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h",
    "unique_id" : "_ZTSN7android14FileDescriptor9AutocloseE"
@@ -50308,7 +50403,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -50323,8 +50418,8 @@
    ],
    "linker_set_key" : "android::GetAndroidNativeBufferUsageParams",
    "name" : "android::GetAndroidNativeBufferUsageParams",
-   "referenced_type" : "type-2412",
-   "self_type" : "type-2412",
+   "referenced_type" : "type-2415",
+   "self_type" : "type-2415",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android33GetAndroidNativeBufferUsageParamsE"
@@ -50670,17 +50765,17 @@
    [
     {
      "field_name" : "mID",
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2439"
     },
     {
      "field_offset" : 8,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2440"
     }
    ],
    "linker_set_key" : "android::HDRStaticInfo",
    "name" : "android::HDRStaticInfo",
-   "referenced_type" : "type-2435",
-   "self_type" : "type-2435",
+   "referenced_type" : "type-2438",
+   "self_type" : "type-2438",
    "size" : 25,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfoE"
@@ -50691,15 +50786,15 @@
    [
     {
      "field_name" : "sType1",
-     "referenced_type" : "type-2438"
+     "referenced_type" : "type-2441"
     }
    ],
    "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-2437",
-   "self_type" : "type-2437",
+   "referenced_type" : "type-2440",
+   "self_type" : "type-2440",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfoUt_E"
@@ -50720,8 +50815,8 @@
    ],
    "linker_set_key" : "android::HDRStaticInfo::Primaries1",
    "name" : "android::HDRStaticInfo::Primaries1",
-   "referenced_type" : "type-2439",
-   "self_type" : "type-2439",
+   "referenced_type" : "type-2442",
+   "self_type" : "type-2442",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfo10Primaries1E"
@@ -50732,22 +50827,22 @@
    [
     {
      "field_name" : "mR",
-     "referenced_type" : "type-2439"
+     "referenced_type" : "type-2442"
     },
     {
      "field_name" : "mG",
      "field_offset" : 32,
-     "referenced_type" : "type-2439"
+     "referenced_type" : "type-2442"
     },
     {
      "field_name" : "mB",
      "field_offset" : 64,
-     "referenced_type" : "type-2439"
+     "referenced_type" : "type-2442"
     },
     {
      "field_name" : "mW",
      "field_offset" : 96,
-     "referenced_type" : "type-2439"
+     "referenced_type" : "type-2442"
     },
     {
      "field_name" : "mMaxDisplayLuminance",
@@ -50772,8 +50867,8 @@
    ],
    "linker_set_key" : "android::HDRStaticInfo::Type1",
    "name" : "android::HDRStaticInfo::Type1",
-   "referenced_type" : "type-2438",
-   "self_type" : "type-2438",
+   "referenced_type" : "type-2441",
+   "self_type" : "type-2441",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfo5Type1E"
@@ -51097,31 +51192,31 @@
     {
      "access" : "private",
      "field_name" : "mProcess",
-     "referenced_type" : "type-1258"
+     "referenced_type" : "type-1261"
     },
     {
      "access" : "private",
      "field_name" : "mPendingStrongDerefs",
      "field_offset" : 32,
-     "referenced_type" : "type-1205"
+     "referenced_type" : "type-1208"
     },
     {
      "access" : "private",
      "field_name" : "mPendingWeakDerefs",
      "field_offset" : 192,
-     "referenced_type" : "type-1207"
+     "referenced_type" : "type-1210"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteStrongDerefs",
      "field_offset" : 352,
-     "referenced_type" : "type-1208"
+     "referenced_type" : "type-1213"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteWeakDerefs",
      "field_offset" : 512,
-     "referenced_type" : "type-1207"
+     "referenced_type" : "type-1210"
     },
     {
      "access" : "private",
@@ -51187,20 +51282,20 @@
      "access" : "private",
      "field_name" : "mIPCThreadStateBase",
      "field_offset" : 1888,
-     "referenced_type" : "type-1264"
+     "referenced_type" : "type-1267"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 1920,
-     "referenced_type" : "type-1255"
+     "referenced_type" : "type-1259"
     }
    ],
    "linker_set_key" : "android::IPCThreadState",
    "name" : "android::IPCThreadState",
    "record_kind" : "class",
-   "referenced_type" : "type-1257",
-   "self_type" : "type-1257",
+   "referenced_type" : "type-1260",
+   "self_type" : "type-1260",
    "size" : 244,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h",
    "unique_id" : "_ZTSN7android14IPCThreadStateE"
@@ -51212,17 +51307,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-1200"
+     "referenced_type" : "type-1204"
     }
    ],
    "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",
+   "referenced_type" : "type-1241",
+   "self_type" : "type-1241",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-1239", "type-795" ],
+   "template_args" : [ "type-1242", "type-795" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_7IBinderEEEEE"
   },
   {
@@ -51232,17 +51327,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-1354"
+     "referenced_type" : "type-1357"
     }
    ],
    "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",
+   "referenced_type" : "type-1369",
+   "self_type" : "type-1369",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-1239", "type-1367" ],
+   "template_args" : [ "type-1242", "type-1370" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
   },
   {
@@ -51310,11 +51405,11 @@
    "linker_set_key" : "android::LightFlattenable<android::FrameStats>",
    "name" : "android::LightFlattenable<android::FrameStats>",
    "record_kind" : "class",
-   "referenced_type" : "type-1098",
-   "self_type" : "type-1098",
+   "referenced_type" : "type-1101",
+   "self_type" : "type-1101",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1099" ],
+   "template_args" : [ "type-1102" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_10FrameStatsEEE"
   },
   {
@@ -51428,17 +51523,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-1210"
+     "referenced_type" : "type-1215"
     }
    ],
    "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",
+   "referenced_type" : "type-1214",
+   "self_type" : "type-1214",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-1211" ],
+   "template_args" : [ "type-1216" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_10GLConsumer8EglImageEEE"
   },
   {
@@ -51468,17 +51563,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-2353"
+     "referenced_type" : "type-2356"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
    "name" : "android::LightRefBase<android::VirtualLightRefBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-2352",
-   "self_type" : "type-2352",
+   "referenced_type" : "type-2355",
+   "self_type" : "type-2355",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-2354" ],
+   "template_args" : [ "type-2357" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
   },
   {
@@ -51889,7 +51984,7 @@
    [
     {
      "field_name" : "mType",
-     "referenced_type" : "type-2416"
+     "referenced_type" : "type-2419"
     },
     {
      "field_name" : "mNumPlanes",
@@ -51914,13 +52009,13 @@
     {
      "field_name" : "mPlane",
      "field_offset" : 160,
-     "referenced_type" : "type-2417"
+     "referenced_type" : "type-2420"
     }
    ],
    "linker_set_key" : "android::MediaImage",
    "name" : "android::MediaImage",
-   "referenced_type" : "type-2415",
-   "self_type" : "type-2415",
+   "referenced_type" : "type-2418",
+   "self_type" : "type-2418",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android10MediaImageE"
@@ -51931,7 +52026,7 @@
    [
     {
      "field_name" : "mType",
-     "referenced_type" : "type-2421"
+     "referenced_type" : "type-2424"
     },
     {
      "field_name" : "mNumPlanes",
@@ -51961,13 +52056,13 @@
     {
      "field_name" : "mPlane",
      "field_offset" : 192,
-     "referenced_type" : "type-2422"
+     "referenced_type" : "type-2425"
     }
    ],
    "linker_set_key" : "android::MediaImage2",
    "name" : "android::MediaImage2",
-   "referenced_type" : "type-2420",
-   "self_type" : "type-2420",
+   "referenced_type" : "type-2423",
+   "self_type" : "type-2423",
    "size" : 104,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android11MediaImage2E"
@@ -52003,8 +52098,8 @@
    ],
    "linker_set_key" : "android::MediaImage2::PlaneInfo",
    "name" : "android::MediaImage2::PlaneInfo",
-   "referenced_type" : "type-2423",
-   "self_type" : "type-2423",
+   "referenced_type" : "type-2426",
+   "self_type" : "type-2426",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android11MediaImage29PlaneInfoE"
@@ -52040,8 +52135,8 @@
    ],
    "linker_set_key" : "android::MediaImage::PlaneInfo",
    "name" : "android::MediaImage::PlaneInfo",
-   "referenced_type" : "type-2418",
-   "self_type" : "type-2418",
+   "referenced_type" : "type-2421",
+   "self_type" : "type-2421",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android10MediaImage9PlaneInfoE"
@@ -52120,8 +52215,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::OMXPluginBase",
    "name" : "android::OMXPluginBase",
-   "referenced_type" : "type-2393",
-   "self_type" : "type-2393",
+   "referenced_type" : "type-2396",
+   "self_type" : "type-2396",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h",
    "unique_id" : "_ZTSN7android13OMXPluginBaseE",
@@ -52333,17 +52428,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 32,
-     "referenced_type" : "type-1512"
+     "referenced_type" : "type-1516"
     }
    ],
    "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",
+   "referenced_type" : "type-1520",
+   "self_type" : "type-1520",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-1517" ],
+   "template_args" : [ "type-1521" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_10BufferItemEEE",
    "vtable_components" :
    [
@@ -52382,17 +52477,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 32,
-     "referenced_type" : "type-1647"
+     "referenced_type" : "type-1650"
     }
    ],
    "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",
+   "referenced_type" : "type-1662",
+   "self_type" : "type-1662",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-1659" ],
+   "template_args" : [ "type-1663" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_5FenceEEE",
    "vtable_components" :
    [
@@ -52431,17 +52526,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 32,
-     "referenced_type" : "type-4322"
+     "referenced_type" : "type-4328"
     }
    ],
    "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",
+   "referenced_type" : "type-4334",
+   "self_type" : "type-4334",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-4329" ],
+   "template_args" : [ "type-4335" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEEE",
    "vtable_components" :
    [
@@ -52480,17 +52575,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 32,
-     "referenced_type" : "type-1646"
+     "referenced_type" : "type-1649"
     }
    ],
    "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",
+   "referenced_type" : "type-1657",
+   "self_type" : "type-1657",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-1654" ],
+   "template_args" : [ "type-1658" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_13GraphicBufferEEE",
    "vtable_components" :
    [
@@ -52529,17 +52624,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 32,
-     "referenced_type" : "type-4321"
+     "referenced_type" : "type-4327"
     }
    ],
    "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",
+   "referenced_type" : "type-4339",
+   "self_type" : "type-4339",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-4334" ],
+   "template_args" : [ "type-4340" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEEE",
    "vtable_components" :
    [
@@ -52578,17 +52673,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 32,
-     "referenced_type" : "type-4323"
+     "referenced_type" : "type-4329"
     }
    ],
    "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",
+   "referenced_type" : "type-4345",
+   "self_type" : "type-4345",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-4339" ],
+   "template_args" : [ "type-4346" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEEE",
    "vtable_components" :
    [
@@ -52733,7 +52828,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -52743,7 +52838,7 @@
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     },
     {
      "field_name" : "nMaxFrameWidth",
@@ -52758,8 +52853,8 @@
    ],
    "linker_set_key" : "android::PrepareForAdaptivePlaybackParams",
    "name" : "android::PrepareForAdaptivePlaybackParams",
-   "referenced_type" : "type-2406",
-   "self_type" : "type-2406",
+   "referenced_type" : "type-2409",
+   "self_type" : "type-2409",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android32PrepareForAdaptivePlaybackParamsE"
@@ -52775,18 +52870,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 64,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "android::PrependSPSPPSToIDRFramesParams",
    "name" : "android::PrependSPSPPSToIDRFramesParams",
-   "referenced_type" : "type-2413",
-   "self_type" : "type-2413",
+   "referenced_type" : "type-2416",
+   "self_type" : "type-2416",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android30PrependSPSPPSToIDRFramesParamsE"
@@ -52824,13 +52919,13 @@
      "access" : "private",
      "field_name" : "mThreadCountLock",
      "field_offset" : 128,
-     "referenced_type" : "type-1262"
+     "referenced_type" : "type-1265"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountDecrement",
      "field_offset" : 160,
-     "referenced_type" : "type-1263"
+     "referenced_type" : "type-1266"
     },
     {
      "access" : "private",
@@ -52860,7 +52955,7 @@
      "access" : "private",
      "field_name" : "mHandleToObject",
      "field_offset" : 352,
-     "referenced_type" : "type-1202"
+     "referenced_type" : "type-1206"
     },
     {
      "access" : "private",
@@ -52872,7 +52967,7 @@
      "access" : "private",
      "field_name" : "mBinderContextCheckFunc",
      "field_offset" : 544,
-     "referenced_type" : "type-1249"
+     "referenced_type" : "type-1252"
     },
     {
      "access" : "private",
@@ -52884,7 +52979,7 @@
      "access" : "private",
      "field_name" : "mContexts",
      "field_offset" : 608,
-     "referenced_type" : "type-1238"
+     "referenced_type" : "type-1241"
     },
     {
      "access" : "private",
@@ -52902,20 +52997,20 @@
      "access" : "private",
      "field_name" : "mThreadPoolSeq",
      "field_offset" : 832,
-     "referenced_type" : "type-1250"
+     "referenced_type" : "type-1253"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 864,
-     "referenced_type" : "type-1255"
+     "referenced_type" : "type-1259"
     }
    ],
    "linker_set_key" : "android::ProcessState",
    "name" : "android::ProcessState",
    "record_kind" : "class",
-   "referenced_type" : "type-1261",
-   "self_type" : "type-1261",
+   "referenced_type" : "type-1264",
+   "self_type" : "type-1264",
    "size" : 120,
    "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h",
    "unique_id" : "_ZTSN7android12ProcessStateE",
@@ -53003,8 +53098,8 @@
    ],
    "linker_set_key" : "android::ProcessState::handle_entry",
    "name" : "android::ProcessState::handle_entry",
-   "referenced_type" : "type-1203",
-   "self_type" : "type-1203",
+   "referenced_type" : "type-1207",
+   "self_type" : "type-1207",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h",
    "unique_id" : "_ZTSN7android12ProcessState12handle_entryE"
@@ -53132,8 +53227,8 @@
    "linker_set_key" : "android::ReferenceMover",
    "name" : "android::ReferenceMover",
    "record_kind" : "class",
-   "referenced_type" : "type-1589",
-   "self_type" : "type-1589",
+   "referenced_type" : "type-1592",
+   "self_type" : "type-1592",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android14ReferenceMoverE"
@@ -53143,8 +53238,8 @@
    "linker_set_key" : "android::ReferenceRenamer",
    "name" : "android::ReferenceRenamer",
    "record_kind" : "class",
-   "referenced_type" : "type-1166",
-   "self_type" : "type-1166",
+   "referenced_type" : "type-1167",
+   "self_type" : "type-1167",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android16ReferenceRenamerE",
@@ -53167,8 +53262,8 @@
    "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",
+   "referenced_type" : "type-1565",
+   "self_type" : "type-1565",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE16ElementIsPointerILj0EJRKNS_10BufferItemEEEE"
@@ -53180,14 +53275,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> >",
    "name" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> >",
    "record_kind" : "class",
-   "referenced_type" : "type-1563",
-   "self_type" : "type-1563",
+   "referenced_type" : "type-1568",
+   "self_type" : "type-1568",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE11InputReaderIJNSt3__15tupleIJEEEEEE"
@@ -53199,14 +53294,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-1572",
+   "self_type" : "type-1572",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE11InputReaderIJNSt3__15tupleIJRKNS_10BufferItemEEEEEEE"
@@ -53215,8 +53310,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::MethodCaller<tuple<> >",
    "name" : "android::SafeBnInterface<IConsumerListener>::MethodCaller<tuple<> >",
-   "referenced_type" : "type-1573",
-   "self_type" : "type-1573",
+   "referenced_type" : "type-1576",
+   "self_type" : "type-1576",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE12MethodCallerIJNSt3__15tupleIJEEEEEE"
@@ -53225,8 +53320,8 @@
    "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",
+   "referenced_type" : "type-1577",
+   "self_type" : "type-1577",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE12MethodCallerIJNSt3__15tupleIJRKNS_10BufferItemEEEEEEE"
@@ -53235,52 +53330,52 @@
    "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",
+   "referenced_type" : "type-1559",
+   "self_type" : "type-1559",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1556" ],
+   "template_args" : [ "type-1560" ],
    "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",
+   "referenced_type" : "type-1561",
+   "self_type" : "type-1561",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1558" ],
+   "template_args" : [ "type-1562" ],
    "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",
+   "referenced_type" : "type-1563",
+   "self_type" : "type-1563",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1560" ],
+   "template_args" : [ "type-1564" ],
    "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",
+   "referenced_type" : "type-1557",
+   "self_type" : "type-1557",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1554" ],
+   "template_args" : [ "type-1558" ],
    "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",
+   "referenced_type" : "type-2025",
+   "self_type" : "type-2025",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJPNS_10BufferItemExyEEE"
@@ -53289,8 +53384,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, android_dataspace_t>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, android_dataspace_t>",
-   "referenced_type" : "type-2037",
-   "self_type" : "type-2037",
+   "referenced_type" : "type-2041",
+   "self_type" : "type-2041",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJ19android_dataspace_tEEE"
@@ -53299,8 +53394,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, bool, vector<Segment, allocator<Segment> > *>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, bool, vector<Segment, allocator<Segment> > *>",
-   "referenced_type" : "type-2042",
-   "self_type" : "type-2042",
+   "referenced_type" : "type-2047",
+   "self_type" : "type-2047",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS7_EEEEEEE"
@@ -53309,8 +53404,8 @@
    "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",
+   "referenced_type" : "type-2043",
+   "self_type" : "type-2043",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJbEEE"
@@ -53319,8 +53414,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, const String8 &, String8 *>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, const String8 &, String8 *>",
-   "referenced_type" : "type-2045",
-   "self_type" : "type-2045",
+   "referenced_type" : "type-2049",
+   "self_type" : "type-2049",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJRKNS_7String8EPS4_EEE"
@@ -53329,8 +53424,8 @@
    "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",
+   "referenced_type" : "type-2040",
+   "self_type" : "type-2040",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJRKNS_7String8EEEE"
@@ -53339,8 +53434,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, const sp<IConsumerListener> &, bool>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, const sp<IConsumerListener> &, bool>",
-   "referenced_type" : "type-2030",
-   "self_type" : "type-2030",
+   "referenced_type" : "type-2034",
+   "self_type" : "type-2034",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJRKNS_2spINS_17IConsumerListenerEEEbEEE"
@@ -53349,8 +53444,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, int *, const sp<GraphicBuffer> &>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, int *, const sp<GraphicBuffer> &>",
-   "referenced_type" : "type-2025",
-   "self_type" : "type-2025",
+   "referenced_type" : "type-2029",
+   "self_type" : "type-2029",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJPiRKNS_2spINS_13GraphicBufferEEEEEE"
@@ -53359,8 +53454,8 @@
    "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",
+   "referenced_type" : "type-2031",
+   "self_type" : "type-2031",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJiyRKNS_2spINS_5FenceEEEEEE"
@@ -53369,8 +53464,8 @@
    "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",
+   "referenced_type" : "type-2028",
+   "self_type" : "type-2028",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJiEEE"
@@ -53379,8 +53474,8 @@
    "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",
+   "referenced_type" : "type-2045",
+   "self_type" : "type-2045",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJPNS_2spINS_12NativeHandleEEEEEE"
@@ -53389,8 +53484,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned int, unsigned int>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned int, unsigned int>",
-   "referenced_type" : "type-2034",
-   "self_type" : "type-2034",
+   "referenced_type" : "type-2038",
+   "self_type" : "type-2038",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJjjEEE"
@@ -53399,8 +53494,8 @@
    "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",
+   "referenced_type" : "type-2044",
+   "self_type" : "type-2044",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJjEEE"
@@ -53409,8 +53504,8 @@
    "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",
+   "referenced_type" : "type-2037",
+   "self_type" : "type-2037",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJPyEEE"
@@ -53419,8 +53514,8 @@
    "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",
+   "referenced_type" : "type-2042",
+   "self_type" : "type-2042",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJyEEE"
@@ -53429,8 +53524,8 @@
    "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",
+   "referenced_type" : "type-2026",
+   "self_type" : "type-2026",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJPNS_10BufferItemExyEEE"
@@ -53439,8 +53534,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, bool, vector<Segment, allocator<Segment> > *>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, bool, vector<Segment, allocator<Segment> > *>",
-   "referenced_type" : "type-2044",
-   "self_type" : "type-2044",
+   "referenced_type" : "type-2048",
+   "self_type" : "type-2048",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS7_EEEEEEE"
@@ -53449,8 +53544,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, const String8 &, String8 *>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, const String8 &, String8 *>",
-   "referenced_type" : "type-2046",
-   "self_type" : "type-2046",
+   "referenced_type" : "type-2050",
+   "self_type" : "type-2050",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJRKNS_7String8EPS4_EEE"
@@ -53459,8 +53554,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, const sp<IConsumerListener> &, bool>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, const sp<IConsumerListener> &, bool>",
-   "referenced_type" : "type-2031",
-   "self_type" : "type-2031",
+   "referenced_type" : "type-2036",
+   "self_type" : "type-2036",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJRKNS_2spINS_17IConsumerListenerEEEbEEE"
@@ -53469,8 +53564,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, int *, const sp<GraphicBuffer> &>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, int *, const sp<GraphicBuffer> &>",
-   "referenced_type" : "type-2026",
-   "self_type" : "type-2026",
+   "referenced_type" : "type-2030",
+   "self_type" : "type-2030",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJPiRKNS_2spINS_13GraphicBufferEEEEEE"
@@ -53479,8 +53574,8 @@
    "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",
+   "referenced_type" : "type-2032",
+   "self_type" : "type-2032",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJiyRKNS_2spINS_5FenceEEEEEE"
@@ -53489,8 +53584,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, unsigned int, unsigned int>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, unsigned int, unsigned int>",
-   "referenced_type" : "type-2035",
-   "self_type" : "type-2035",
+   "referenced_type" : "type-2039",
+   "self_type" : "type-2039",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJjjEEE"
@@ -53499,8 +53594,8 @@
    "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",
+   "referenced_type" : "type-2027",
+   "self_type" : "type-2027",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj2EJPNS_10BufferItemExyEEE"
@@ -53509,8 +53604,8 @@
    "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",
+   "referenced_type" : "type-2033",
+   "self_type" : "type-2033",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj2EJiyRKNS_2spINS_5FenceEEEEEE"
@@ -53522,14 +53617,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2073",
+   "self_type" : "type-2073",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJEEEEEE"
@@ -53541,14 +53636,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2051",
+   "self_type" : "type-2051",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPNS_10BufferItemExyEEEEEE"
@@ -53560,14 +53655,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2091",
+   "self_type" : "type-2091",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJ19android_dataspace_tEEEEEE"
@@ -53579,14 +53674,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2111",
+   "self_type" : "type-2111",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJbPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEEEE"
@@ -53598,14 +53693,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2097",
+   "self_type" : "type-2097",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJbEEEEEE"
@@ -53617,14 +53712,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2116",
+   "self_type" : "type-2116",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJRKNS_7String8EPS6_EEEEEE"
@@ -53636,14 +53731,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2086",
+   "self_type" : "type-2086",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJRKNS_7String8EEEEEEE"
@@ -53655,14 +53750,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2069",
+   "self_type" : "type-2069",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEEbEEEEEE"
@@ -53674,14 +53769,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2060",
+   "self_type" : "type-2060",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
@@ -53693,14 +53788,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2064",
+   "self_type" : "type-2064",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJiyRKNS_2spINS_5FenceEEEEEEEEE"
@@ -53712,14 +53807,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2055",
+   "self_type" : "type-2055",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJiEEEEEE"
@@ -53731,14 +53826,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2107",
+   "self_type" : "type-2107",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPNS_2spINS_12NativeHandleEEEEEEEEE"
@@ -53750,14 +53845,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2082",
+   "self_type" : "type-2082",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJjjEEEEEE"
@@ -53769,14 +53864,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2103",
+   "self_type" : "type-2103",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJjEEEEEE"
@@ -53788,14 +53883,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2077",
+   "self_type" : "type-2077",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPyEEEEEE"
@@ -53807,14 +53902,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2095",
+   "self_type" : "type-2095",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJyEEEEEE"
@@ -53823,8 +53918,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<> >",
-   "referenced_type" : "type-2122",
-   "self_type" : "type-2122",
+   "referenced_type" : "type-2126",
+   "self_type" : "type-2126",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJEEEEEE"
@@ -53833,8 +53928,8 @@
    "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",
+   "referenced_type" : "type-2120",
+   "self_type" : "type-2120",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPNS_10BufferItemExyEEEEEE"
@@ -53843,8 +53938,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<android_dataspace_t> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<android_dataspace_t> >",
-   "referenced_type" : "type-2126",
-   "self_type" : "type-2126",
+   "referenced_type" : "type-2130",
+   "self_type" : "type-2130",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJ19android_dataspace_tEEEEEE"
@@ -53853,8 +53948,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<bool, vector<Segment, allocator<Segment> > *> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<bool, vector<Segment, allocator<Segment> > *> >",
-   "referenced_type" : "type-2131",
-   "self_type" : "type-2131",
+   "referenced_type" : "type-2136",
+   "self_type" : "type-2136",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJbPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEEEE"
@@ -53863,8 +53958,8 @@
    "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",
+   "referenced_type" : "type-2132",
+   "self_type" : "type-2132",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJbEEEEEE"
@@ -53873,8 +53968,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<const String8 &, String8 *> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<const String8 &, String8 *> >",
-   "referenced_type" : "type-2133",
-   "self_type" : "type-2133",
+   "referenced_type" : "type-2137",
+   "self_type" : "type-2137",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJRKNS_7String8EPS6_EEEEEE"
@@ -53883,8 +53978,8 @@
    "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",
+   "referenced_type" : "type-2129",
+   "self_type" : "type-2129",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJRKNS_7String8EEEEEEE"
@@ -53893,8 +53988,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<const sp<IConsumerListener> &, bool> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<const sp<IConsumerListener> &, bool> >",
-   "referenced_type" : "type-2120",
-   "self_type" : "type-2120",
+   "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_2spINS_17IConsumerListenerEEEbEEEEEE"
@@ -53903,8 +53998,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<int *, const sp<GraphicBuffer> &> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<int *, const sp<GraphicBuffer> &> >",
-   "referenced_type" : "type-2118",
-   "self_type" : "type-2118",
+   "referenced_type" : "type-2122",
+   "self_type" : "type-2122",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
@@ -53913,8 +54008,8 @@
    "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",
+   "referenced_type" : "type-2123",
+   "self_type" : "type-2123",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJiyRKNS_2spINS_5FenceEEEEEEEEE"
@@ -53923,8 +54018,8 @@
    "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",
+   "referenced_type" : "type-2121",
+   "self_type" : "type-2121",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJiEEEEEE"
@@ -53933,8 +54028,8 @@
    "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",
+   "referenced_type" : "type-2134",
+   "self_type" : "type-2134",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPNS_2spINS_12NativeHandleEEEEEEEEE"
@@ -53943,8 +54038,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned int, unsigned int> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned int, unsigned int> >",
-   "referenced_type" : "type-2124",
-   "self_type" : "type-2124",
+   "referenced_type" : "type-2128",
+   "self_type" : "type-2128",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJjjEEEEEE"
@@ -53953,8 +54048,8 @@
    "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",
+   "referenced_type" : "type-2133",
+   "self_type" : "type-2133",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJjEEEEEE"
@@ -53963,8 +54058,8 @@
    "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",
+   "referenced_type" : "type-2127",
+   "self_type" : "type-2127",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPyEEEEEE"
@@ -53973,8 +54068,8 @@
    "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",
+   "referenced_type" : "type-2131",
+   "self_type" : "type-2131",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJyEEEEEE"
@@ -53986,13 +54081,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<> >",
-   "referenced_type" : "type-2145",
-   "self_type" : "type-2145",
+   "referenced_type" : "type-2149",
+   "self_type" : "type-2149",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJEEEEEE"
@@ -54004,13 +54099,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2138",
+   "self_type" : "type-2138",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPNS_10BufferItemExyEEEEEE"
@@ -54022,13 +54117,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2158",
+   "self_type" : "type-2158",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJ19android_dataspace_tEEEEEE"
@@ -54040,13 +54135,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2169",
+   "self_type" : "type-2169",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJbPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEEEE"
@@ -54058,13 +54153,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool> >",
-   "referenced_type" : "type-2158",
-   "self_type" : "type-2158",
+   "referenced_type" : "type-2162",
+   "self_type" : "type-2162",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJbEEEEEE"
@@ -54076,13 +54171,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2171",
+   "self_type" : "type-2171",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJRKNS_7String8EPS6_EEEEEE"
@@ -54094,13 +54189,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2155",
+   "self_type" : "type-2155",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJRKNS_7String8EEEEEEE"
@@ -54112,13 +54207,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2147",
+   "self_type" : "type-2147",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEEbEEEEEE"
@@ -54130,13 +54225,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2142",
+   "self_type" : "type-2142",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
@@ -54148,13 +54243,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2144",
+   "self_type" : "type-2144",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJiyRKNS_2spINS_5FenceEEEEEEEEE"
@@ -54166,13 +54261,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int> >",
-   "referenced_type" : "type-2136",
-   "self_type" : "type-2136",
+   "referenced_type" : "type-2140",
+   "self_type" : "type-2140",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJiEEEEEE"
@@ -54184,13 +54279,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2166",
+   "self_type" : "type-2166",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPNS_2spINS_12NativeHandleEEEEEEEEE"
@@ -54202,13 +54297,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2153",
+   "self_type" : "type-2153",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJjjEEEEEE"
@@ -54220,13 +54315,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2164",
+   "self_type" : "type-2164",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJjEEEEEE"
@@ -54238,13 +54333,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2151",
+   "self_type" : "type-2151",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPyEEEEEE"
@@ -54256,13 +54351,13 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "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",
+   "referenced_type" : "type-2160",
+   "self_type" : "type-2160",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJyEEEEEE"
@@ -54271,660 +54366,660 @@
    "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",
+   "referenced_type" : "type-1974",
+   "self_type" : "type-1974",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1971" ],
+   "template_args" : [ "type-1975" ],
    "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",
+   "referenced_type" : "type-1939",
+   "self_type" : "type-1939",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1936" ],
+   "template_args" : [ "type-1940" ],
    "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",
+   "referenced_type" : "type-1992",
+   "self_type" : "type-1992",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1988" ],
+   "template_args" : [ "type-1993" ],
    "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",
+   "referenced_type" : "type-2011",
+   "self_type" : "type-2011",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2008" ],
+   "template_args" : [ "type-2012" ],
    "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",
+   "referenced_type" : "type-1998",
+   "self_type" : "type-1998",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1995" ],
+   "template_args" : [ "type-1999" ],
    "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",
+   "referenced_type" : "type-2018",
+   "self_type" : "type-2018",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2015" ],
+   "template_args" : [ "type-2019" ],
    "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",
+   "referenced_type" : "type-1987",
+   "self_type" : "type-1987",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1984" ],
+   "template_args" : [ "type-1988" ],
    "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",
+   "referenced_type" : "type-1967",
+   "self_type" : "type-1967",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1964" ],
+   "template_args" : [ "type-1968" ],
    "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",
+   "referenced_type" : "type-1952",
+   "self_type" : "type-1952",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1949" ],
+   "template_args" : [ "type-1953" ],
    "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",
+   "referenced_type" : "type-1959",
+   "self_type" : "type-1959",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1955" ],
+   "template_args" : [ "type-1960" ],
    "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",
+   "referenced_type" : "type-1948",
+   "self_type" : "type-1948",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1944" ],
+   "template_args" : [ "type-1949" ],
    "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",
+   "referenced_type" : "type-2007",
+   "self_type" : "type-2007",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2004" ],
+   "template_args" : [ "type-2008" ],
    "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",
+   "referenced_type" : "type-1981",
+   "self_type" : "type-1981",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1977" ],
+   "template_args" : [ "type-1982" ],
    "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",
+   "referenced_type" : "type-2003",
+   "self_type" : "type-2003",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1999" ],
+   "template_args" : [ "type-2004" ],
    "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",
+   "referenced_type" : "type-1976",
+   "self_type" : "type-1976",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1973" ],
+   "template_args" : [ "type-1977" ],
    "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",
+   "referenced_type" : "type-1996",
+   "self_type" : "type-1996",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1993" ],
+   "template_args" : [ "type-1997" ],
    "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",
+   "referenced_type" : "type-1945",
+   "self_type" : "type-1945",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1942" ],
+   "template_args" : [ "type-1946" ],
    "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",
+   "referenced_type" : "type-1943",
+   "self_type" : "type-1943",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1940" ],
+   "template_args" : [ "type-1944" ],
    "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",
+   "referenced_type" : "type-1941",
+   "self_type" : "type-1941",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1938" ],
+   "template_args" : [ "type-1942" ],
    "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",
+   "referenced_type" : "type-2022",
+   "self_type" : "type-2022",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2019" ],
+   "template_args" : [ "type-2023" ],
    "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",
+   "referenced_type" : "type-1989",
+   "self_type" : "type-1989",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1986" ],
+   "template_args" : [ "type-1990" ],
    "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",
+   "referenced_type" : "type-2020",
+   "self_type" : "type-2020",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2017" ],
+   "template_args" : [ "type-2021" ],
    "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",
+   "referenced_type" : "type-1994",
+   "self_type" : "type-1994",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1991" ],
+   "template_args" : [ "type-1995" ],
    "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",
+   "referenced_type" : "type-2016",
+   "self_type" : "type-2016",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2013" ],
+   "template_args" : [ "type-2017" ],
    "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",
+   "referenced_type" : "type-2000",
+   "self_type" : "type-2000",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1997" ],
+   "template_args" : [ "type-2001" ],
    "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",
+   "referenced_type" : "type-2014",
+   "self_type" : "type-2014",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2010" ],
+   "template_args" : [ "type-2015" ],
    "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",
+   "referenced_type" : "type-1956",
+   "self_type" : "type-1956",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1953" ],
+   "template_args" : [ "type-1957" ],
    "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",
+   "referenced_type" : "type-1965",
+   "self_type" : "type-1965",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1962" ],
+   "template_args" : [ "type-1966" ],
    "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",
+   "referenced_type" : "type-1963",
+   "self_type" : "type-1963",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1960" ],
+   "template_args" : [ "type-1964" ],
    "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",
+   "referenced_type" : "type-1950",
+   "self_type" : "type-1950",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1947" ],
+   "template_args" : [ "type-1951" ],
    "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",
+   "referenced_type" : "type-1954",
+   "self_type" : "type-1954",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1951" ],
+   "template_args" : [ "type-1955" ],
    "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",
+   "referenced_type" : "type-1961",
+   "self_type" : "type-1961",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1958" ],
+   "template_args" : [ "type-1962" ],
    "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",
+   "referenced_type" : "type-1970",
+   "self_type" : "type-1970",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1966" ],
+   "template_args" : [ "type-1971" ],
    "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",
+   "referenced_type" : "type-1972",
+   "self_type" : "type-1972",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1969" ],
+   "template_args" : [ "type-1973" ],
    "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",
+   "referenced_type" : "type-2009",
+   "self_type" : "type-2009",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2006" ],
+   "template_args" : [ "type-2010" ],
    "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",
+   "referenced_type" : "type-1985",
+   "self_type" : "type-1985",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1982" ],
+   "template_args" : [ "type-1986" ],
    "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",
+   "referenced_type" : "type-2005",
+   "self_type" : "type-2005",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2002" ],
+   "template_args" : [ "type-2006" ],
    "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",
+   "referenced_type" : "type-1983",
+   "self_type" : "type-1983",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1980" ],
+   "template_args" : [ "type-1984" ],
    "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",
+   "referenced_type" : "type-1978",
+   "self_type" : "type-1978",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1975" ],
+   "template_args" : [ "type-1979" ],
    "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",
+   "referenced_type" : "type-1893",
+   "self_type" : "type-1893",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1889" ],
+   "template_args" : [ "type-1894" ],
    "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",
+   "referenced_type" : "type-1937",
+   "self_type" : "type-1937",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1933" ],
+   "template_args" : [ "type-1938" ],
    "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",
+   "referenced_type" : "type-1926",
+   "self_type" : "type-1926",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1922" ],
+   "template_args" : [ "type-1927" ],
    "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",
+   "referenced_type" : "type-1930",
+   "self_type" : "type-1930",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1927" ],
+   "template_args" : [ "type-1931" ],
    "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",
+   "referenced_type" : "type-1915",
+   "self_type" : "type-1915",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1911" ],
+   "template_args" : [ "type-1916" ],
    "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",
+   "referenced_type" : "type-1934",
+   "self_type" : "type-1934",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1931" ],
+   "template_args" : [ "type-1935" ],
    "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",
+   "referenced_type" : "type-1923",
+   "self_type" : "type-1923",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1920" ],
+   "template_args" : [ "type-1924" ],
    "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",
+   "referenced_type" : "type-1910",
+   "self_type" : "type-1910",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1907" ],
+   "template_args" : [ "type-1911" ],
    "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",
+   "referenced_type" : "type-1904",
+   "self_type" : "type-1904",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1900" ],
+   "template_args" : [ "type-1905" ],
    "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",
+   "referenced_type" : "type-1912",
+   "self_type" : "type-1912",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1909" ],
+   "template_args" : [ "type-1913" ],
    "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",
+   "referenced_type" : "type-1901",
+   "self_type" : "type-1901",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1898" ],
+   "template_args" : [ "type-1902" ],
    "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",
+   "referenced_type" : "type-1906",
+   "self_type" : "type-1906",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1903" ],
+   "template_args" : [ "type-1907" ],
    "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",
+   "referenced_type" : "type-1899",
+   "self_type" : "type-1899",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1896" ],
+   "template_args" : [ "type-1900" ],
    "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",
+   "referenced_type" : "type-1895",
+   "self_type" : "type-1895",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1892" ],
+   "template_args" : [ "type-1896" ],
    "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",
+   "referenced_type" : "type-1928",
+   "self_type" : "type-1928",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1925" ],
+   "template_args" : [ "type-1929" ],
    "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",
+   "referenced_type" : "type-1919",
+   "self_type" : "type-1919",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1916" ],
+   "template_args" : [ "type-1920" ],
    "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",
+   "referenced_type" : "type-1921",
+   "self_type" : "type-1921",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1918" ],
+   "template_args" : [ "type-1922" ],
    "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",
+   "referenced_type" : "type-1917",
+   "self_type" : "type-1917",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1914" ],
+   "template_args" : [ "type-1918" ],
    "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",
+   "referenced_type" : "type-1908",
+   "self_type" : "type-1908",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1905" ],
+   "template_args" : [ "type-1909" ],
    "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",
+   "referenced_type" : "type-1897",
+   "self_type" : "type-1897",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1894" ],
+   "template_args" : [ "type-1898" ],
    "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",
+   "referenced_type" : "type-1932",
+   "self_type" : "type-1932",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1929" ],
+   "template_args" : [ "type-1933" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEJEEE"
   },
   {
@@ -54941,17 +55036,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 160,
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<android::IConsumerListener>",
    "name" : "android::SafeBnInterface<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1287",
-   "self_type" : "type-1287",
+   "referenced_type" : "type-1290",
+   "self_type" : "type-1290",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1288" ],
+   "template_args" : [ "type-1291" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEEE",
    "vtable_components" :
    [
@@ -55152,17 +55247,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 128,
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<android::IGraphicBufferConsumer>",
    "name" : "android::SafeBnInterface<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1276",
-   "self_type" : "type-1276",
+   "referenced_type" : "type-1279",
+   "self_type" : "type-1279",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1277" ],
+   "template_args" : [ "type-1280" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEEE",
    "vtable_components" :
    [
@@ -55390,7 +55485,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1031"
+     "referenced_type" : "type-1034"
     }
    ],
    "fields" :
@@ -55399,17 +55494,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 128,
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<android::ITransactionCompletedListener>",
    "name" : "android::SafeBnInterface<android::ITransactionCompletedListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1102",
-   "self_type" : "type-1102",
+   "referenced_type" : "type-1105",
+   "self_type" : "type-1105",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1104" ],
+   "template_args" : [ "type-1107" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEEE",
    "vtable_components" :
    [
@@ -55560,525 +55655,525 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IConsumerListener>::ArgsMatchParams<std::tuple<>, std::tuple<> >",
    "name" : "android::SafeBpInterface<IConsumerListener>::ArgsMatchParams<std::tuple<>, std::tuple<> >",
-   "referenced_type" : "type-1544",
-   "self_type" : "type-1544",
+   "referenced_type" : "type-1547",
+   "self_type" : "type-1547",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1545", "type-1546" ],
+   "template_args" : [ "type-1548", "type-1549" ],
    "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",
+   "referenced_type" : "type-1550",
+   "self_type" : "type-1550",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1548", "type-1549" ],
+   "template_args" : [ "type-1551", "type-1552" ],
    "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",
+   "referenced_type" : "type-1544",
+   "self_type" : "type-1544",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1542", "type-1543" ],
+   "template_args" : [ "type-1545", "type-1546" ],
    "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",
+   "referenced_type" : "type-1553",
+   "self_type" : "type-1553",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1532" ],
+   "template_args" : [ "type-1535" ],
    "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",
+   "referenced_type" : "type-1819",
+   "self_type" : "type-1819",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1816", "type-1817" ],
+   "template_args" : [ "type-1820", "type-1821" ],
    "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",
+   "referenced_type" : "type-1803",
+   "self_type" : "type-1803",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1800", "type-1801" ],
+   "template_args" : [ "type-1804", "type-1805" ],
    "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",
+   "referenced_type" : "type-1833",
+   "self_type" : "type-1833",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1829", "type-1830" ],
+   "template_args" : [ "type-1834", "type-1835" ],
    "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",
+   "referenced_type" : "type-1849",
+   "self_type" : "type-1849",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1846", "type-1847" ],
+   "template_args" : [ "type-1850", "type-1851" ],
    "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",
+   "referenced_type" : "type-1839",
+   "self_type" : "type-1839",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1836", "type-1837" ],
+   "template_args" : [ "type-1840", "type-1841" ],
    "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",
+   "referenced_type" : "type-1852",
+   "self_type" : "type-1852",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1849", "type-1850" ],
+   "template_args" : [ "type-1853", "type-1854" ],
    "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",
+   "referenced_type" : "type-1829",
+   "self_type" : "type-1829",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1826", "type-1827" ],
+   "template_args" : [ "type-1830", "type-1831" ],
    "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",
+   "referenced_type" : "type-1816",
+   "self_type" : "type-1816",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1813", "type-1814" ],
+   "template_args" : [ "type-1817", "type-1818" ],
    "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",
+   "referenced_type" : "type-1813",
+   "self_type" : "type-1813",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1810", "type-1811" ],
+   "template_args" : [ "type-1814", "type-1815" ],
    "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",
+   "referenced_type" : "type-1806",
+   "self_type" : "type-1806",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1803", "type-1804" ],
+   "template_args" : [ "type-1807", "type-1808" ],
    "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",
+   "referenced_type" : "type-1809",
+   "self_type" : "type-1809",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1806", "type-1807" ],
+   "template_args" : [ "type-1810", "type-1811" ],
    "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",
+   "referenced_type" : "type-1846",
+   "self_type" : "type-1846",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1843", "type-1844" ],
+   "template_args" : [ "type-1847", "type-1848" ],
    "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",
+   "referenced_type" : "type-1826",
+   "self_type" : "type-1826",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1823", "type-1824" ],
+   "template_args" : [ "type-1827", "type-1828" ],
    "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",
+   "referenced_type" : "type-1842",
+   "self_type" : "type-1842",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1839", "type-1840" ],
+   "template_args" : [ "type-1843", "type-1844" ],
    "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",
+   "referenced_type" : "type-1836",
+   "self_type" : "type-1836",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1833", "type-1834" ],
+   "template_args" : [ "type-1837", "type-1838" ],
    "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",
+   "referenced_type" : "type-1823",
+   "self_type" : "type-1823",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1820", "type-1821" ],
+   "template_args" : [ "type-1824", "type-1825" ],
    "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",
+   "referenced_type" : "type-1724",
+   "self_type" : "type-1724",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1721", "type-1722" ],
+   "template_args" : [ "type-1725", "type-1726" ],
    "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",
+   "referenced_type" : "type-1773",
+   "self_type" : "type-1773",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1770", "type-1771" ],
+   "template_args" : [ "type-1774", "type-1775" ],
    "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",
+   "referenced_type" : "type-1790",
+   "self_type" : "type-1790",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1787", "type-1788" ],
+   "template_args" : [ "type-1791", "type-1792" ],
    "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",
+   "referenced_type" : "type-1780",
+   "self_type" : "type-1780",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1777", "type-1778" ],
+   "template_args" : [ "type-1781", "type-1782" ],
    "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",
+   "referenced_type" : "type-1796",
+   "self_type" : "type-1796",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1793", "type-1794" ],
+   "template_args" : [ "type-1797", "type-1798" ],
    "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",
+   "referenced_type" : "type-1770",
+   "self_type" : "type-1770",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1767", "type-1768" ],
+   "template_args" : [ "type-1771", "type-1772" ],
    "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",
+   "referenced_type" : "type-1753",
+   "self_type" : "type-1753",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1750", "type-1751" ],
+   "template_args" : [ "type-1754", "type-1755" ],
    "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",
+   "referenced_type" : "type-1743",
+   "self_type" : "type-1743",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1740", "type-1741" ],
+   "template_args" : [ "type-1744", "type-1745" ],
    "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",
+   "referenced_type" : "type-1734",
+   "self_type" : "type-1734",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1730", "type-1731" ],
+   "template_args" : [ "type-1735", "type-1736" ],
    "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",
+   "referenced_type" : "type-1737",
+   "self_type" : "type-1737",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1734", "type-1735" ],
+   "template_args" : [ "type-1738", "type-1739" ],
    "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",
+   "referenced_type" : "type-1786",
+   "self_type" : "type-1786",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1783", "type-1784" ],
+   "template_args" : [ "type-1787", "type-1788" ],
    "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",
+   "referenced_type" : "type-1763",
+   "self_type" : "type-1763",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1760", "type-1761" ],
+   "template_args" : [ "type-1764", "type-1765" ],
    "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",
+   "referenced_type" : "type-1783",
+   "self_type" : "type-1783",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1780", "type-1781" ],
+   "template_args" : [ "type-1784", "type-1785" ],
    "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",
+   "referenced_type" : "type-1776",
+   "self_type" : "type-1776",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1773", "type-1774" ],
+   "template_args" : [ "type-1777", "type-1778" ],
    "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",
+   "referenced_type" : "type-1760",
+   "self_type" : "type-1760",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1757", "type-1758" ],
+   "template_args" : [ "type-1761", "type-1762" ],
    "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",
+   "referenced_type" : "type-1727",
+   "self_type" : "type-1727",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1724", "type-1725" ],
+   "template_args" : [ "type-1728", "type-1729" ],
    "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",
+   "referenced_type" : "type-1793",
+   "self_type" : "type-1793",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1790", "type-1791" ],
+   "template_args" : [ "type-1794", "type-1795" ],
    "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",
+   "referenced_type" : "type-1800",
+   "self_type" : "type-1800",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1796", "type-1797" ],
+   "template_args" : [ "type-1801", "type-1802" ],
    "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",
+   "referenced_type" : "type-1757",
+   "self_type" : "type-1757",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1754", "type-1755" ],
+   "template_args" : [ "type-1758", "type-1759" ],
    "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",
+   "referenced_type" : "type-1747",
+   "self_type" : "type-1747",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1744", "type-1745" ],
+   "template_args" : [ "type-1748", "type-1749" ],
    "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",
+   "referenced_type" : "type-1740",
+   "self_type" : "type-1740",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1737", "type-1738" ],
+   "template_args" : [ "type-1741", "type-1742" ],
    "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",
+   "referenced_type" : "type-1767",
+   "self_type" : "type-1767",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1763", "type-1764" ],
+   "template_args" : [ "type-1768", "type-1769" ],
    "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",
+   "referenced_type" : "type-1730",
+   "self_type" : "type-1730",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1727", "type-1728" ],
+   "template_args" : [ "type-1731", "type-1732" ],
    "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",
+   "referenced_type" : "type-1750",
+   "self_type" : "type-1750",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1747", "type-1748" ],
+   "template_args" : [ "type-1751", "type-1752" ],
    "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",
+   "referenced_type" : "type-1856",
+   "self_type" : "type-1856",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1853" ],
+   "template_args" : [ "type-1857" ],
    "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",
+   "referenced_type" : "type-1887",
+   "self_type" : "type-1887",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1884" ],
+   "template_args" : [ "type-1888" ],
    "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",
+   "referenced_type" : "type-1882",
+   "self_type" : "type-1882",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1879" ],
+   "template_args" : [ "type-1883" ],
    "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",
+   "referenced_type" : "type-1880",
+   "self_type" : "type-1880",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-767" ],
@@ -56088,8 +56183,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<bool &>",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<bool &>",
-   "referenced_type" : "type-1869",
-   "self_type" : "type-1869",
+   "referenced_type" : "type-1873",
+   "self_type" : "type-1873",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-766" ],
@@ -56099,41 +56194,41 @@
    "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",
+   "referenced_type" : "type-1877",
+   "self_type" : "type-1877",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1874" ],
+   "template_args" : [ "type-1878" ],
    "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",
+   "referenced_type" : "type-1865",
+   "self_type" : "type-1865",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1862" ],
+   "template_args" : [ "type-1866" ],
    "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",
+   "referenced_type" : "type-1863",
+   "self_type" : "type-1863",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1859" ],
+   "template_args" : [ "type-1864" ],
    "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",
+   "referenced_type" : "type-1872",
+   "self_type" : "type-1872",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-944" ],
@@ -56143,8 +56238,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int &>",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int &>",
-   "referenced_type" : "type-1856",
-   "self_type" : "type-1856",
+   "referenced_type" : "type-1860",
+   "self_type" : "type-1860",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-198" ],
@@ -56154,41 +56249,41 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int *&>",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int *&>",
-   "referenced_type" : "type-1857",
-   "self_type" : "type-1857",
+   "referenced_type" : "type-1861",
+   "self_type" : "type-1861",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1508" ],
+   "template_args" : [ "type-1511" ],
    "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",
+   "referenced_type" : "type-1858",
+   "self_type" : "type-1858",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1429" ],
+   "template_args" : [ "type-1432" ],
    "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",
+   "referenced_type" : "type-1885",
+   "self_type" : "type-1885",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1882" ],
+   "template_args" : [ "type-1886" ],
    "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",
+   "referenced_type" : "type-1876",
+   "self_type" : "type-1876",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-10" ],
@@ -56198,8 +56293,8 @@
    "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",
+   "referenced_type" : "type-1859",
+   "self_type" : "type-1859",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-544" ],
@@ -56209,11 +56304,11 @@
    "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",
+   "referenced_type" : "type-1874",
+   "self_type" : "type-1874",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1871" ],
+   "template_args" : [ "type-1875" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRPyEE"
   },
   {
@@ -56221,7 +56316,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1495"
+     "referenced_type" : "type-1501"
     }
    ],
    "fields" :
@@ -56230,17 +56325,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 192,
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeBpInterface<android::IConsumerListener>",
    "name" : "android::SafeBpInterface<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1537",
-   "self_type" : "type-1537",
+   "referenced_type" : "type-1541",
+   "self_type" : "type-1541",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1538" ],
+   "template_args" : [ "type-1542" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_17IConsumerListenerEEE",
    "vtable_components" :
    [
@@ -56396,7 +56491,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1624"
+     "referenced_type" : "type-1629"
     }
    ],
    "fields" :
@@ -56405,17 +56500,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 160,
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeBpInterface<android::IGraphicBufferConsumer>",
    "name" : "android::SafeBpInterface<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1716",
-   "self_type" : "type-1716",
+   "referenced_type" : "type-1720",
+   "self_type" : "type-1720",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1717" ],
+   "template_args" : [ "type-1721" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEEE",
    "vtable_components" :
    [
@@ -56606,198 +56701,198 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)()>",
    "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)()>",
-   "referenced_type" : "type-1692",
-   "self_type" : "type-1692",
+   "referenced_type" : "type-1696",
+   "self_type" : "type-1696",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1693" ],
+   "template_args" : [ "type-1697" ],
    "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",
+   "referenced_type" : "type-1685",
+   "self_type" : "type-1685",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1682" ],
+   "template_args" : [ "type-1686" ],
    "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",
+   "referenced_type" : "type-1705",
+   "self_type" : "type-1705",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1702" ],
+   "template_args" : [ "type-1706" ],
    "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",
+   "referenced_type" : "type-1709",
+   "self_type" : "type-1709",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1706" ],
+   "template_args" : [ "type-1710" ],
    "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",
+   "referenced_type" : "type-1716",
+   "self_type" : "type-1716",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1713" ],
+   "template_args" : [ "type-1717" ],
    "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",
+   "referenced_type" : "type-1703",
+   "self_type" : "type-1703",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1700" ],
+   "template_args" : [ "type-1704" ],
    "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",
+   "referenced_type" : "type-1718",
+   "self_type" : "type-1718",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1715" ],
+   "template_args" : [ "type-1719" ],
    "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",
+   "referenced_type" : "type-1694",
+   "self_type" : "type-1694",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1691" ],
+   "template_args" : [ "type-1695" ],
    "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",
+   "referenced_type" : "type-1690",
+   "self_type" : "type-1690",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1686" ],
+   "template_args" : [ "type-1691" ],
    "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",
+   "referenced_type" : "type-1687",
+   "self_type" : "type-1687",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1684" ],
+   "template_args" : [ "type-1688" ],
    "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",
+   "referenced_type" : "type-1692",
+   "self_type" : "type-1692",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1689" ],
+   "template_args" : [ "type-1693" ],
    "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",
+   "referenced_type" : "type-1714",
+   "self_type" : "type-1714",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1711" ],
+   "template_args" : [ "type-1715" ],
    "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",
+   "referenced_type" : "type-1712",
+   "self_type" : "type-1712",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1708" ],
+   "template_args" : [ "type-1713" ],
    "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",
+   "referenced_type" : "type-1701",
+   "self_type" : "type-1701",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1697" ],
+   "template_args" : [ "type-1702" ],
    "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",
+   "referenced_type" : "type-1698",
+   "self_type" : "type-1698",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1695" ],
+   "template_args" : [ "type-1699" ],
    "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",
+   "referenced_type" : "type-1707",
+   "self_type" : "type-1707",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1704" ],
+   "template_args" : [ "type-1708" ],
    "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",
+   "referenced_type" : "type-1537",
+   "self_type" : "type-1537",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1534" ],
+   "template_args" : [ "type-1538" ],
    "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",
+   "referenced_type" : "type-1539",
+   "self_type" : "type-1539",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1536" ],
+   "template_args" : [ "type-1540" ],
    "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_16ConsumerListenerEFvRKNS_10BufferItemEEEE"
   },
   {
@@ -56807,14 +56902,14 @@
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-1106"
     }
    ],
    "linker_set_key" : "android::SafeInterface::ParcelHandler",
    "name" : "android::SafeInterface::ParcelHandler",
    "record_kind" : "class",
-   "referenced_type" : "type-1235",
-   "self_type" : "type-1235",
+   "referenced_type" : "type-1238",
+   "self_type" : "type-1238",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android13SafeInterface13ParcelHandlerE"
@@ -56823,8 +56918,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParcelHandler::HandleInt<false, 4, unsigned int>",
    "name" : "android::SafeInterface::ParcelHandler::HandleInt<false, 4, unsigned int>",
-   "referenced_type" : "type-1679",
-   "self_type" : "type-1679",
+   "referenced_type" : "type-1683",
+   "self_type" : "type-1683",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-2" ],
@@ -56834,8 +56929,8 @@
    "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",
+   "referenced_type" : "type-1681",
+   "self_type" : "type-1681",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-92" ],
@@ -56845,8 +56940,8 @@
    "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",
+   "referenced_type" : "type-1682",
+   "self_type" : "type-1682",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-4" ],
@@ -56856,8 +56951,8 @@
    "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",
+   "referenced_type" : "type-1678",
+   "self_type" : "type-1678",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-169" ],
@@ -56887,11 +56982,11 @@
    "linker_set_key" : "android::Singleton<android::ComposerService>",
    "name" : "android::Singleton<android::ComposerService>",
    "record_kind" : "class",
-   "referenced_type" : "type-1089",
-   "self_type" : "type-1089",
+   "referenced_type" : "type-1092",
+   "self_type" : "type-1092",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-1090" ],
+   "template_args" : [ "type-1093" ],
    "unique_id" : "_ZTSN7android9SingletonINS_15ComposerServiceEEE"
   },
   {
@@ -56918,11 +57013,11 @@
    "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",
+   "referenced_type" : "type-1204",
+   "self_type" : "type-1204",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-1201" ],
+   "template_args" : [ "type-1205" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEEE",
    "vtable_components" :
    [
@@ -56976,11 +57071,11 @@
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
    "name" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-1354",
-   "self_type" : "type-1354",
+   "referenced_type" : "type-1357",
+   "self_type" : "type-1357",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-1355" ],
+   "template_args" : [ "type-1358" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
    "vtable_components" :
    [
@@ -57270,7 +57365,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -57280,13 +57375,13 @@
     {
      "field_name" : "bStoreMetaData",
      "field_offset" : 96,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-1296"
     }
    ],
    "linker_set_key" : "android::StoreMetaDataInBuffersParams",
    "name" : "android::StoreMetaDataInBuffersParams",
-   "referenced_type" : "type-2396",
-   "self_type" : "type-2396",
+   "referenced_type" : "type-2399",
+   "self_type" : "type-2399",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android28StoreMetaDataInBuffersParamsE"
@@ -57298,14 +57393,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-1240"
+     "referenced_type" : "type-1243"
     }
    ],
    "linker_set_key" : "android::String16",
    "name" : "android::String16",
    "record_kind" : "class",
-   "referenced_type" : "type-1239",
-   "self_type" : "type-1239",
+   "referenced_type" : "type-1242",
+   "self_type" : "type-1242",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "unique_id" : "_ZTSN7android8String16E"
@@ -57494,7 +57589,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nPortIndex",
@@ -57509,18 +57604,18 @@
     {
      "field_name" : "bufferHeader",
      "field_offset" : 128,
-     "referenced_type" : "type-2376"
+     "referenced_type" : "type-2379"
     },
     {
      "field_name" : "nativeBuffer",
      "field_offset" : 160,
-     "referenced_type" : "type-2408"
+     "referenced_type" : "type-2411"
     }
    ],
    "linker_set_key" : "android::UseAndroidNativeBufferParams",
    "name" : "android::UseAndroidNativeBufferParams",
-   "referenced_type" : "type-2407",
-   "self_type" : "type-2407",
+   "referenced_type" : "type-2410",
+   "self_type" : "type-2410",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android28UseAndroidNativeBufferParamsE"
@@ -57537,11 +57632,11 @@
    "linker_set_key" : "android::Vector<android::BBinder *>",
    "name" : "android::Vector<android::BBinder *>",
    "record_kind" : "class",
-   "referenced_type" : "type-1205",
-   "self_type" : "type-1205",
+   "referenced_type" : "type-1208",
+   "self_type" : "type-1208",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-1206" ],
+   "template_args" : [ "type-1209" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7BBinderEEE",
    "vtable_components" :
    [
@@ -57647,11 +57742,11 @@
    "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",
+   "referenced_type" : "type-1206",
+   "self_type" : "type-1206",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-1203" ],
+   "template_args" : [ "type-1207" ],
    "unique_id" : "_ZTSN7android6VectorINS_12ProcessState12handle_entryEEE",
    "vtable_components" :
    [
@@ -57702,11 +57797,11 @@
    "linker_set_key" : "android::Vector<android::Rect>",
    "name" : "android::Vector<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-2677",
-   "self_type" : "type-2677",
+   "referenced_type" : "type-2680",
+   "self_type" : "type-2680",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-2678" ],
+   "template_args" : [ "type-2681" ],
    "unique_id" : "_ZTSN7android6VectorINS_4RectEEE",
    "vtable_components" :
    [
@@ -57757,8 +57852,8 @@
    "linker_set_key" : "android::Vector<android::RefBase *>",
    "name" : "android::Vector<android::RefBase *>",
    "record_kind" : "class",
-   "referenced_type" : "type-1208",
-   "self_type" : "type-1208",
+   "referenced_type" : "type-1213",
+   "self_type" : "type-1213",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-270" ],
@@ -57812,8 +57907,8 @@
    "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",
+   "referenced_type" : "type-1210",
+   "self_type" : "type-1210",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-56" ],
@@ -57867,11 +57962,11 @@
    "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",
+   "referenced_type" : "type-1363",
+   "self_type" : "type-1363",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-1361" ],
+   "template_args" : [ "type-1364" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_8hardware9BHwBinderEEE",
    "vtable_components" :
    [
@@ -57922,11 +58017,11 @@
    "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "record_kind" : "class",
-   "referenced_type" : "type-1356",
-   "self_type" : "type-1356",
+   "referenced_type" : "type-1359",
+   "self_type" : "type-1359",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-1357" ],
+   "template_args" : [ "type-1360" ],
    "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
    "vtable_components" :
    [
@@ -57977,8 +58072,8 @@
    "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",
+   "referenced_type" : "type-1228",
+   "self_type" : "type-1228",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-733" ],
@@ -58032,8 +58127,8 @@
    "linker_set_key" : "android::Vector<int>",
    "name" : "android::Vector<int>",
    "record_kind" : "class",
-   "referenced_type" : "type-2686",
-   "self_type" : "type-2686",
+   "referenced_type" : "type-2689",
+   "self_type" : "type-2689",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-4" ],
@@ -58087,8 +58182,8 @@
    "linker_set_key" : "android::Vector<long long>",
    "name" : "android::Vector<long long>",
    "record_kind" : "class",
-   "referenced_type" : "type-1081",
-   "self_type" : "type-1081",
+   "referenced_type" : "type-1084",
+   "self_type" : "type-1084",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-169" ],
@@ -58215,13 +58310,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2397"
+     "referenced_type" : "type-2400"
     }
    ],
    "linker_set_key" : "android::VideoDecoderOutputMetaData",
    "name" : "android::VideoDecoderOutputMetaData",
-   "referenced_type" : "type-2398",
-   "self_type" : "type-2398",
+   "referenced_type" : "type-2401",
+   "self_type" : "type-2401",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26VideoDecoderOutputMetaDataE"
@@ -58232,7 +58327,7 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-1234"
+     "referenced_type" : "type-1235"
     },
     {
      "field_name" : "pHandle",
@@ -58242,8 +58337,8 @@
    ],
    "linker_set_key" : "android::VideoGrallocMetadata",
    "name" : "android::VideoGrallocMetadata",
-   "referenced_type" : "type-2397",
-   "self_type" : "type-2397",
+   "referenced_type" : "type-2400",
+   "self_type" : "type-2400",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android20VideoGrallocMetadataE"
@@ -58254,7 +58349,7 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-1234"
+     "referenced_type" : "type-1235"
     },
     {
      "field_name" : "pHandle",
@@ -58264,8 +58359,8 @@
    ],
    "linker_set_key" : "android::VideoNativeHandleMetadata",
    "name" : "android::VideoNativeHandleMetadata",
-   "referenced_type" : "type-2405",
-   "self_type" : "type-2405",
+   "referenced_type" : "type-2408",
+   "self_type" : "type-2408",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android25VideoNativeHandleMetadataE"
@@ -58276,12 +58371,12 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-1234"
+     "referenced_type" : "type-1235"
     },
     {
      "field_name" : "pBuffer",
      "field_offset" : 32,
-     "referenced_type" : "type-2401"
+     "referenced_type" : "type-2404"
     },
     {
      "field_name" : "nFenceFd",
@@ -58291,8 +58386,8 @@
    ],
    "linker_set_key" : "android::VideoNativeMetadata",
    "name" : "android::VideoNativeMetadata",
-   "referenced_type" : "type-2400",
-   "self_type" : "type-2400",
+   "referenced_type" : "type-2403",
+   "self_type" : "type-2403",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android19VideoNativeMetadataE"
@@ -58302,14 +58397,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2352"
+     "referenced_type" : "type-2355"
     }
    ],
    "linker_set_key" : "android::VirtualLightRefBase",
    "name" : "android::VirtualLightRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-2354",
-   "self_type" : "type-2354",
+   "referenced_type" : "type-2357",
+   "self_type" : "type-2357",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
    "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
@@ -58356,30 +58451,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::aggregate_traits<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-2606",
-   "self_type" : "type-2606",
+   "referenced_type" : "type-2609",
+   "self_type" : "type-2609",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-4", "type-2607" ],
+   "template_args" : [ "type-4", "type-2610" ],
    "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-2603",
-   "self_type" : "type-2603",
+   "referenced_type" : "type-2606",
+   "self_type" : "type-2606",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-4", "type-2604" ],
+   "template_args" : [ "type-4", "type-2607" ],
    "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-2602",
-   "self_type" : "type-2602",
+   "referenced_type" : "type-2605",
+   "self_type" : "type-2605",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2", "type-2" ],
@@ -58438,13 +58533,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-980"
+     "referenced_type" : "type-977"
     }
    ],
    "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-979",
-   "self_type" : "type-979",
+   "referenced_type" : "type-976",
+   "self_type" : "type-976",
    "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"
@@ -58581,8 +58676,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::base::DefaultCloser",
    "name" : "android::base::DefaultCloser",
-   "referenced_type" : "type-2523",
-   "self_type" : "type-2523",
+   "referenced_type" : "type-2526",
+   "self_type" : "type-2526",
    "size" : 1,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "unique_id" : "_ZTSN7android4base13DefaultCloserE"
@@ -58603,8 +58698,8 @@
    ],
    "linker_set_key" : "android::base::EagerEvaluator<char *, char *>",
    "name" : "android::base::EagerEvaluator<char *, char *>",
-   "referenced_type" : "type-4699",
-   "self_type" : "type-4699",
+   "referenced_type" : "type-4705",
+   "self_type" : "type-4705",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-254", "type-254" ],
@@ -58626,8 +58721,8 @@
    ],
    "linker_set_key" : "android::base::EagerEvaluator<char *, const char *>",
    "name" : "android::base::EagerEvaluator<char *, const char *>",
-   "referenced_type" : "type-4695",
-   "self_type" : "type-4695",
+   "referenced_type" : "type-4702",
+   "self_type" : "type-4702",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-254", "type-122" ],
@@ -58649,8 +58744,8 @@
    ],
    "linker_set_key" : "android::base::EagerEvaluator<const char *, char *>",
    "name" : "android::base::EagerEvaluator<const char *, char *>",
-   "referenced_type" : "type-4681",
-   "self_type" : "type-4681",
+   "referenced_type" : "type-4689",
+   "self_type" : "type-4689",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-122", "type-254" ],
@@ -58672,8 +58767,8 @@
    ],
    "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",
+   "referenced_type" : "type-4672",
+   "self_type" : "type-4672",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-122", "type-122" ],
@@ -58695,11 +58790,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",
+   "referenced_type" : "type-4729",
+   "self_type" : "type-4729",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-4723", "type-4723" ],
+   "template_args" : [ "type-4730", "type-4730" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaS3_EE"
   },
   {
@@ -58718,11 +58813,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",
+   "referenced_type" : "type-4736",
+   "self_type" : "type-4736",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-4723", "type-4731" ],
+   "template_args" : [ "type-4730", "type-4737" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaPaEE"
   },
   {
@@ -58741,8 +58836,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-4703",
-   "self_type" : "type-4703",
+   "referenced_type" : "type-4710",
+   "self_type" : "type-4710",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-97", "type-97" ],
@@ -58764,8 +58859,8 @@
    ],
    "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",
+   "referenced_type" : "type-4713",
+   "self_type" : "type-4713",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-97", "type-89" ],
@@ -58787,11 +58882,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",
+   "referenced_type" : "type-4740",
+   "self_type" : "type-4740",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-4731", "type-4723" ],
+   "template_args" : [ "type-4737", "type-4730" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaPKaEE"
   },
   {
@@ -58810,11 +58905,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",
+   "referenced_type" : "type-4747",
+   "self_type" : "type-4747",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-4731", "type-4731" ],
+   "template_args" : [ "type-4737", "type-4737" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaS2_EE"
   },
   {
@@ -58833,8 +58928,8 @@
    ],
    "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",
+   "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-97" ],
@@ -58856,8 +58951,8 @@
    ],
    "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",
+   "referenced_type" : "type-4722",
+   "self_type" : "type-4722",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-89", "type-89" ],
@@ -58876,8 +58971,8 @@
    "linker_set_key" : "android::base::ErrnoRestorer",
    "name" : "android::base::ErrnoRestorer",
    "record_kind" : "class",
-   "referenced_type" : "type-4656",
-   "self_type" : "type-4656",
+   "referenced_type" : "type-4663",
+   "self_type" : "type-4663",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base13ErrnoRestorerE"
@@ -58889,14 +58984,14 @@
     {
      "access" : "private",
      "field_name" : "data_",
-     "referenced_type" : "type-4752"
+     "referenced_type" : "type-4758"
     }
    ],
    "linker_set_key" : "android::base::LogMessage",
    "name" : "android::base::LogMessage",
    "record_kind" : "class",
-   "referenced_type" : "type-4751",
-   "self_type" : "type-4751",
+   "referenced_type" : "type-4757",
+   "self_type" : "type-4757",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base10LogMessageE"
@@ -58908,14 +59003,14 @@
     {
      "access" : "private",
      "field_name" : "default_log_id_",
-     "referenced_type" : "type-4704"
+     "referenced_type" : "type-4711"
     }
    ],
    "linker_set_key" : "android::base::LogdLogger",
    "name" : "android::base::LogdLogger",
    "record_kind" : "class",
-   "referenced_type" : "type-4721",
-   "self_type" : "type-4721",
+   "referenced_type" : "type-4728",
+   "self_type" : "type-4728",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base10LogdLoggerE"
@@ -58927,14 +59022,14 @@
     {
      "access" : "private",
      "field_name" : "old_",
-     "referenced_type" : "type-4654"
+     "referenced_type" : "type-4661"
     }
    ],
    "linker_set_key" : "android::base::ScopedLogSeverity",
    "name" : "android::base::ScopedLogSeverity",
    "record_kind" : "class",
-   "referenced_type" : "type-4756",
-   "self_type" : "type-4756",
+   "referenced_type" : "type-4763",
+   "self_type" : "type-4763",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base17ScopedLogSeverityE"
@@ -58952,11 +59047,11 @@
    "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser>",
    "name" : "android::base::unique_fd_impl<android::base::DefaultCloser>",
    "record_kind" : "class",
-   "referenced_type" : "type-2553",
-   "self_type" : "type-2553",
+   "referenced_type" : "type-2556",
+   "self_type" : "type-2556",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h",
-   "template_args" : [ "type-2523" ],
+   "template_args" : [ "type-2526" ],
    "unique_id" : "_ZTSN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
   },
   {
@@ -58995,7 +59090,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1362"
     }
    ],
    "fields" :
@@ -59016,7 +59111,7 @@
      "access" : "private",
      "field_name" : "mExtras",
      "field_offset" : 96,
-     "referenced_type" : "type-1363"
+     "referenced_type" : "type-1366"
     },
     {
      "access" : "private",
@@ -59028,8 +59123,8 @@
    "linker_set_key" : "android::hardware::BHwBinder",
    "name" : "android::hardware::BHwBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-1362",
-   "self_type" : "type-1362",
+   "referenced_type" : "type-1365",
+   "self_type" : "type-1365",
    "size" : 28,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware9BHwBinderE",
@@ -59145,7 +59240,7 @@
      "access" : "private",
      "field_name" : "mRemote",
      "field_offset" : 32,
-     "referenced_type" : "type-1372"
+     "referenced_type" : "type-1375"
     },
     {
      "access" : "private",
@@ -59157,14 +59252,14 @@
      "access" : "private",
      "field_name" : "mState",
      "field_offset" : 96,
-     "referenced_type" : "type-1373"
+     "referenced_type" : "type-1376"
     }
    ],
    "linker_set_key" : "android::hardware::BpHwRefBase",
    "name" : "android::hardware::BpHwRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-1371",
-   "self_type" : "type-1371",
+   "referenced_type" : "type-1374",
+   "self_type" : "type-1374",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE",
@@ -59383,8 +59478,8 @@
    "linker_set_key" : "android::hardware::IBinder",
    "name" : "android::hardware::IBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-1359",
-   "self_type" : "type-1359",
+   "referenced_type" : "type-1362",
+   "self_type" : "type-1362",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinderE",
@@ -59500,8 +59595,8 @@
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient",
    "name" : "android::hardware::IBinder::DeathRecipient",
    "record_kind" : "class",
-   "referenced_type" : "type-1370",
-   "self_type" : "type-1370",
+   "referenced_type" : "type-1373",
+   "self_type" : "type-1373",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinder14DeathRecipientE",
@@ -59588,8 +59683,8 @@
    "linker_set_key" : "android::hardware::IInterface",
    "name" : "android::hardware::IInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1376",
+   "referenced_type" : "type-1379",
+   "self_type" : "type-1379",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
    "unique_id" : "_ZTSN7android8hardware10IInterfaceE",
@@ -59671,43 +59766,43 @@
     {
      "access" : "private",
      "field_name" : "mProcess",
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1396"
     },
     {
      "access" : "private",
      "field_name" : "mPendingStrongDerefs",
      "field_offset" : 32,
-     "referenced_type" : "type-1360"
+     "referenced_type" : "type-1363"
     },
     {
      "access" : "private",
      "field_name" : "mPendingWeakDerefs",
      "field_offset" : 192,
-     "referenced_type" : "type-1207"
+     "referenced_type" : "type-1210"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteStrongDerefs",
      "field_offset" : 352,
-     "referenced_type" : "type-1208"
+     "referenced_type" : "type-1213"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteWeakDerefs",
      "field_offset" : 512,
-     "referenced_type" : "type-1207"
+     "referenced_type" : "type-1210"
     },
     {
      "access" : "private",
      "field_name" : "mIn",
      "field_offset" : 672,
-     "referenced_type" : "type-1377"
+     "referenced_type" : "type-1380"
     },
     {
      "access" : "private",
      "field_name" : "mOut",
      "field_offset" : 1216,
-     "referenced_type" : "type-1377"
+     "referenced_type" : "type-1380"
     },
     {
      "access" : "private",
@@ -59749,7 +59844,7 @@
      "access" : "private",
      "field_name" : "mContextObject",
      "field_offset" : 1952,
-     "referenced_type" : "type-1399"
+     "referenced_type" : "type-1402"
     },
     {
      "access" : "private",
@@ -59767,26 +59862,26 @@
      "access" : "private",
      "field_name" : "mPostCommandTasks",
      "field_offset" : 2016,
-     "referenced_type" : "type-1400"
+     "referenced_type" : "type-1403"
     },
     {
      "access" : "private",
      "field_name" : "mIPCThreadStateBase",
      "field_offset" : 2112,
-     "referenced_type" : "type-1368"
+     "referenced_type" : "type-1371"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 2144,
-     "referenced_type" : "type-1391"
+     "referenced_type" : "type-1394"
     }
    ],
    "linker_set_key" : "android::hardware::IPCThreadState",
    "name" : "android::hardware::IPCThreadState",
    "record_kind" : "class",
-   "referenced_type" : "type-1392",
-   "self_type" : "type-1392",
+   "referenced_type" : "type-1395",
+   "self_type" : "type-1395",
    "size" : 272,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h",
    "unique_id" : "_ZTSN7android8hardware14IPCThreadStateE"
@@ -59804,7 +59899,7 @@
      "access" : "private",
      "field_name" : "mBufCache",
      "field_offset" : 32,
-     "referenced_type" : "type-1378"
+     "referenced_type" : "type-1381"
     },
     {
      "access" : "private",
@@ -59888,7 +59983,7 @@
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 480,
-     "referenced_type" : "type-1379"
+     "referenced_type" : "type-1382"
     },
     {
      "access" : "private",
@@ -59900,8 +59995,8 @@
    "linker_set_key" : "android::hardware::Parcel",
    "name" : "android::hardware::Parcel",
    "record_kind" : "class",
-   "referenced_type" : "type-1377",
-   "self_type" : "type-1377",
+   "referenced_type" : "type-1380",
+   "self_type" : "type-1380",
    "size" : 68,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6ParcelE"
@@ -59928,8 +60023,8 @@
    ],
    "linker_set_key" : "android::hardware::Parcel::BufferInfo",
    "name" : "android::hardware::Parcel::BufferInfo",
-   "referenced_type" : "type-1382",
-   "self_type" : "type-1382",
+   "referenced_type" : "type-1385",
+   "self_type" : "type-1385",
    "size" : 20,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE"
@@ -59961,13 +60056,13 @@
      "access" : "private",
      "field_name" : "mThreadCountLock",
      "field_offset" : 96,
-     "referenced_type" : "type-1397"
+     "referenced_type" : "type-1400"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountDecrement",
      "field_offset" : 128,
-     "referenced_type" : "type-1398"
+     "referenced_type" : "type-1401"
     },
     {
      "access" : "private",
@@ -59997,7 +60092,7 @@
      "access" : "private",
      "field_name" : "mHandleToObject",
      "field_offset" : 320,
-     "referenced_type" : "type-1356"
+     "referenced_type" : "type-1359"
     },
     {
      "access" : "private",
@@ -60009,7 +60104,7 @@
      "access" : "private",
      "field_name" : "mBinderContextCheckFunc",
      "field_offset" : 512,
-     "referenced_type" : "type-1390"
+     "referenced_type" : "type-1393"
     },
     {
      "access" : "private",
@@ -60021,7 +60116,7 @@
      "access" : "private",
      "field_name" : "mContexts",
      "field_offset" : 576,
-     "referenced_type" : "type-1366"
+     "referenced_type" : "type-1369"
     },
     {
      "access" : "private",
@@ -60045,7 +60140,7 @@
      "access" : "private",
      "field_name" : "mThreadPoolSeq",
      "field_offset" : 800,
-     "referenced_type" : "type-1250"
+     "referenced_type" : "type-1253"
     },
     {
      "access" : "private",
@@ -60057,14 +60152,14 @@
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 864,
-     "referenced_type" : "type-1391"
+     "referenced_type" : "type-1394"
     }
    ],
    "linker_set_key" : "android::hardware::ProcessState",
    "name" : "android::hardware::ProcessState",
    "record_kind" : "class",
-   "referenced_type" : "type-1396",
-   "self_type" : "type-1396",
+   "referenced_type" : "type-1399",
+   "self_type" : "type-1399",
    "size" : 120,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessStateE",
@@ -60142,7 +60237,7 @@
    [
     {
      "field_name" : "binder",
-     "referenced_type" : "type-1358"
+     "referenced_type" : "type-1361"
     },
     {
      "field_name" : "refs",
@@ -60152,8 +60247,8 @@
    ],
    "linker_set_key" : "android::hardware::ProcessState::handle_entry",
    "name" : "android::hardware::ProcessState::handle_entry",
-   "referenced_type" : "type-1357",
-   "self_type" : "type-1357",
+   "referenced_type" : "type-1360",
+   "self_type" : "type-1360",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE"
@@ -60178,8 +60273,8 @@
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::bufferqueue::V2_0::Status>",
    "name" : "android::hardware::Return<android::hardware::graphics::bufferqueue::V2_0::Status>",
    "record_kind" : "class",
-   "referenced_type" : "type-7504",
-   "self_type" : "type-7504",
+   "referenced_type" : "type-7528",
+   "self_type" : "type-7528",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "template_args" : [ "type-607" ],
@@ -60199,17 +60294,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-2463"
+     "referenced_type" : "type-2466"
     }
    ],
    "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",
+   "referenced_type" : "type-4365",
+   "self_type" : "type-4365",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-2463" ],
+   "template_args" : [ "type-2466" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducerEEEEE"
   },
   {
@@ -60226,17 +60321,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-2454"
+     "referenced_type" : "type-2457"
     }
    ],
    "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",
+   "referenced_type" : "type-4494",
+   "self_type" : "type-4494",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-2454" ],
+   "template_args" : [ "type-2457" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V1_017IProducerListenerEEEEE"
   },
   {
@@ -60253,17 +60348,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-2476"
+     "referenced_type" : "type-2479"
     }
    ],
    "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",
+   "referenced_type" : "type-4371",
+   "self_type" : "type-4371",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-2476" ],
+   "template_args" : [ "type-2479" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V2_022IGraphicBufferProducerEEEEE"
   },
   {
@@ -60280,17 +60375,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-2470"
+     "referenced_type" : "type-2473"
     }
    ],
    "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",
+   "referenced_type" : "type-4500",
+   "self_type" : "type-4500",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-2470" ],
+   "template_args" : [ "type-2473" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V2_017IProducerListenerEEEEE"
   },
   {
@@ -60313,8 +60408,8 @@
    "linker_set_key" : "android::hardware::Return<bool>",
    "name" : "android::hardware::Return<bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-4353",
-   "self_type" : "type-4353",
+   "referenced_type" : "type-4359",
+   "self_type" : "type-4359",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "template_args" : [ "type-93" ],
@@ -60367,8 +60462,8 @@
    "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",
+   "referenced_type" : "type-7534",
+   "self_type" : "type-7534",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "template_args" : [ "type-92" ],
@@ -61439,8 +61534,8 @@
    ],
    "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-2456",
+   "referenced_type" : "type-2459",
+   "self_type" : "type-2459",
    "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",
@@ -64017,8 +64112,8 @@
    "linker_set_key" : "android::sp<android::AHandler>",
    "name" : "android::sp<android::AHandler>",
    "record_kind" : "class",
-   "referenced_type" : "type-1188",
-   "self_type" : "type-1188",
+   "referenced_type" : "type-1191",
+   "self_type" : "type-1191",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-264" ],
@@ -64111,17 +64206,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4229"
+     "referenced_type" : "type-4235"
     }
    ],
    "linker_set_key" : "android::sp<android::BpGraphicBufferProducer>",
    "name" : "android::sp<android::BpGraphicBufferProducer>",
    "record_kind" : "class",
-   "referenced_type" : "type-4228",
-   "self_type" : "type-4228",
+   "referenced_type" : "type-4234",
+   "self_type" : "type-4234",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4231" ],
+   "template_args" : [ "type-4237" ],
    "unique_id" : "_ZTSN7android2spINS_23BpGraphicBufferProducerEEE"
   },
   {
@@ -64131,17 +64226,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4451"
+     "referenced_type" : "type-4457"
     }
    ],
    "linker_set_key" : "android::sp<android::BpProducerListener>",
    "name" : "android::sp<android::BpProducerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-4454",
-   "self_type" : "type-4454",
+   "referenced_type" : "type-4460",
+   "self_type" : "type-4460",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4455" ],
+   "template_args" : [ "type-4461" ],
    "unique_id" : "_ZTSN7android2spINS_18BpProducerListenerEEE"
   },
   {
@@ -64211,17 +64306,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1865"
+     "referenced_type" : "type-1869"
     }
    ],
    "linker_set_key" : "android::sp<android::Fence>",
    "name" : "android::sp<android::Fence>",
    "record_kind" : "class",
-   "referenced_type" : "type-1864",
-   "self_type" : "type-1864",
+   "referenced_type" : "type-1868",
+   "self_type" : "type-1868",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1867" ],
+   "template_args" : [ "type-1871" ],
    "unique_id" : "_ZTSN7android2spINS_5FenceEEE"
   },
   {
@@ -64251,17 +64346,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1174"
+     "referenced_type" : "type-1177"
     }
    ],
    "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",
+   "referenced_type" : "type-1176",
+   "self_type" : "type-1176",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1176" ],
+   "template_args" : [ "type-1179" ],
    "unique_id" : "_ZTSN7android2spINS_10GLConsumer8EglImageEEE"
   },
   {
@@ -64317,8 +64412,8 @@
    "linker_set_key" : "android::sp<android::GraphicBufferSource>",
    "name" : "android::sp<android::GraphicBufferSource>",
    "record_kind" : "class",
-   "referenced_type" : "type-2542",
-   "self_type" : "type-2542",
+   "referenced_type" : "type-2545",
+   "self_type" : "type-2545",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-566" ],
@@ -64331,17 +64426,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4256"
+     "referenced_type" : "type-4262"
     }
    ],
    "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",
+   "referenced_type" : "type-4265",
+   "self_type" : "type-4265",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4260" ],
+   "template_args" : [ "type-4266" ],
    "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE8ObituaryEEE"
   },
   {
@@ -64351,17 +64446,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4265"
+     "referenced_type" : "type-4271"
     }
    ],
    "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",
+   "referenced_type" : "type-4274",
+   "self_type" : "type-4274",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4269" ],
+   "template_args" : [ "type-4275" ],
    "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE8ObituaryEEE"
   },
   {
@@ -64371,17 +64466,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4828"
+     "referenced_type" : "type-4834"
     }
    ],
    "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",
+   "referenced_type" : "type-4833",
+   "self_type" : "type-4833",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4830" ],
+   "template_args" : [ "type-4836" ],
    "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE8ObituaryEEE"
   },
   {
@@ -64391,17 +64486,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-5097"
+     "referenced_type" : "type-5113"
     }
    ],
    "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",
+   "referenced_type" : "type-5112",
+   "self_type" : "type-5112",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-5099" ],
+   "template_args" : [ "type-5115" ],
    "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE8ObituaryEEE"
   },
   {
@@ -64551,17 +64646,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1049"
+     "referenced_type" : "type-1052"
     }
    ],
    "linker_set_key" : "android::sp<android::ISurfaceComposer>",
    "name" : "android::sp<android::ISurfaceComposer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1048",
-   "self_type" : "type-1048",
+   "referenced_type" : "type-1051",
+   "self_type" : "type-1051",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1051" ],
+   "template_args" : [ "type-1054" ],
    "unique_id" : "_ZTSN7android2spINS_16ISurfaceComposerEEE"
   },
   {
@@ -64571,17 +64666,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1041"
+     "referenced_type" : "type-1045"
     }
    ],
    "linker_set_key" : "android::sp<android::ITransactionCompletedListener>",
    "name" : "android::sp<android::ITransactionCompletedListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1040",
-   "self_type" : "type-1040",
+   "referenced_type" : "type-1044",
+   "self_type" : "type-1044",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1043" ],
+   "template_args" : [ "type-1047" ],
    "unique_id" : "_ZTSN7android2spINS_29ITransactionCompletedListenerEEE"
   },
   {
@@ -64611,17 +64706,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1260"
+     "referenced_type" : "type-1263"
     }
    ],
    "linker_set_key" : "android::sp<android::ProcessState>",
    "name" : "android::sp<android::ProcessState>",
    "record_kind" : "class",
-   "referenced_type" : "type-1259",
-   "self_type" : "type-1259",
+   "referenced_type" : "type-1262",
+   "self_type" : "type-1262",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1261" ],
+   "template_args" : [ "type-1264" ],
    "unique_id" : "_ZTSN7android2spINS_12ProcessStateEEE"
   },
   {
@@ -64651,17 +64746,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1361"
+     "referenced_type" : "type-1364"
     }
    ],
    "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",
+   "referenced_type" : "type-1402",
+   "self_type" : "type-1402",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1362" ],
+   "template_args" : [ "type-1365" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
   },
   {
@@ -64671,17 +64766,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1358"
+     "referenced_type" : "type-1361"
     }
    ],
    "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",
+   "referenced_type" : "type-1370",
+   "self_type" : "type-1370",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1359" ],
+   "template_args" : [ "type-1362" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
   },
   {
@@ -64691,17 +64786,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1395"
+     "referenced_type" : "type-1398"
     }
    ],
    "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",
+   "referenced_type" : "type-1397",
+   "self_type" : "type-1397",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1396" ],
+   "template_args" : [ "type-1399" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
   },
   {
@@ -64711,14 +64806,14 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2464"
+     "referenced_type" : "type-2467"
     }
    ],
    "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-2463",
-   "self_type" : "type-2463",
+   "referenced_type" : "type-2466",
+   "self_type" : "type-2466",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-595" ],
@@ -64731,17 +64826,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2455"
+     "referenced_type" : "type-2458"
     }
    ],
    "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-2454",
-   "self_type" : "type-2454",
+   "referenced_type" : "type-2457",
+   "self_type" : "type-2457",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-2456" ],
+   "template_args" : [ "type-2459" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerEEE"
   },
   {
@@ -64751,17 +64846,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4241"
+     "referenced_type" : "type-4247"
     }
    ],
    "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",
+   "referenced_type" : "type-4246",
+   "self_type" : "type-4246",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4243" ],
+   "template_args" : [ "type-4249" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerEEE"
   },
   {
@@ -64771,17 +64866,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4463"
+     "referenced_type" : "type-4470"
     }
    ],
    "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",
+   "referenced_type" : "type-4473",
+   "self_type" : "type-4473",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4467" ],
+   "template_args" : [ "type-4474" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerEEE"
   },
   {
@@ -64791,14 +64886,14 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2477"
+     "referenced_type" : "type-2480"
     }
    ],
    "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-2476",
-   "self_type" : "type-2476",
+   "referenced_type" : "type-2479",
+   "self_type" : "type-2479",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-677" ],
@@ -64811,14 +64906,14 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2471"
+     "referenced_type" : "type-2474"
     }
    ],
    "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-2470",
-   "self_type" : "type-2470",
+   "referenced_type" : "type-2473",
+   "self_type" : "type-2473",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-604" ],
@@ -64831,17 +64926,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4235"
+     "referenced_type" : "type-4241"
     }
    ],
    "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",
+   "referenced_type" : "type-4240",
+   "self_type" : "type-4240",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4237" ],
+   "template_args" : [ "type-4243" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerEEE"
   },
   {
@@ -64851,17 +64946,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4456"
+     "referenced_type" : "type-4462"
     }
    ],
    "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",
+   "referenced_type" : "type-4466",
+   "self_type" : "type-4466",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4460" ],
+   "template_args" : [ "type-4467" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerEEE"
   },
   {
@@ -64891,14 +64986,14 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2445"
+     "referenced_type" : "type-2448"
     }
    ],
    "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-2444",
-   "self_type" : "type-2444",
+   "referenced_type" : "type-2447",
+   "self_type" : "type-2447",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-530" ],
@@ -64911,14 +65006,14 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2449"
+     "referenced_type" : "type-2452"
     }
    ],
    "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-2448",
-   "self_type" : "type-2448",
+   "referenced_type" : "type-2451",
+   "self_type" : "type-2451",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-533" ],
@@ -64931,36 +65026,36 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2517"
+     "referenced_type" : "type-2520"
     }
    ],
    "linker_set_key" : "android::sp<const android::AHandler>",
    "name" : "android::sp<const android::AHandler>",
    "record_kind" : "class",
-   "referenced_type" : "type-2516",
-   "self_type" : "type-2516",
+   "referenced_type" : "type-2519",
+   "self_type" : "type-2519",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-2518" ],
+   "template_args" : [ "type-2521" ],
    "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",
+   "referenced_type" : "type-1064",
+   "self_type" : "type-1064",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1062" ],
+   "template_args" : [ "type-1065" ],
    "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-2588",
-   "self_type" : "type-2588",
+   "referenced_type" : "type-2591",
+   "self_type" : "type-2591",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-160" ],
@@ -64970,8 +65065,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::trait_pointer<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-2585",
-   "self_type" : "type-2585",
+   "referenced_type" : "type-2588",
+   "self_type" : "type-2588",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-147" ],
@@ -64981,8 +65076,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::trait_pointer<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-2581",
-   "self_type" : "type-2581",
+   "referenced_type" : "type-2584",
+   "self_type" : "type-2584",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-143" ],
@@ -64992,8 +65087,8 @@
    "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",
+   "referenced_type" : "type-1186",
+   "self_type" : "type-1186",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-733" ],
@@ -65003,8 +65098,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<int>",
    "name" : "android::trait_pointer<int>",
-   "referenced_type" : "type-2584",
-   "self_type" : "type-2584",
+   "referenced_type" : "type-2587",
+   "self_type" : "type-2587",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -65014,8 +65109,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<long long>",
    "name" : "android::trait_pointer<long long>",
-   "referenced_type" : "type-1060",
-   "self_type" : "type-1060",
+   "referenced_type" : "type-1063",
+   "self_type" : "type-1063",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-169" ],
@@ -65025,30 +65120,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::trait_pointer<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-2589",
-   "self_type" : "type-2589",
+   "referenced_type" : "type-2592",
+   "self_type" : "type-2592",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2590" ],
+   "template_args" : [ "type-2593" ],
    "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-2586",
-   "self_type" : "type-2586",
+   "referenced_type" : "type-2589",
+   "self_type" : "type-2589",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2587" ],
+   "template_args" : [ "type-2590" ],
    "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-2582",
-   "self_type" : "type-2582",
+   "referenced_type" : "type-2585",
+   "self_type" : "type-2585",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -65058,19 +65153,19 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::BufferItem>",
    "name" : "android::trait_trivial_copy<android::BufferItem>",
-   "referenced_type" : "type-1056",
-   "self_type" : "type-1056",
+   "referenced_type" : "type-1059",
+   "self_type" : "type-1059",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1057" ],
+   "template_args" : [ "type-1060" ],
    "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-2572",
-   "self_type" : "type-2572",
+   "referenced_type" : "type-2575",
+   "self_type" : "type-2575",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-160" ],
@@ -65080,8 +65175,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-2569",
-   "self_type" : "type-2569",
+   "referenced_type" : "type-2572",
+   "self_type" : "type-2572",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-147" ],
@@ -65091,8 +65186,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-2566",
-   "self_type" : "type-2566",
+   "referenced_type" : "type-2569",
+   "self_type" : "type-2569",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-143" ],
@@ -65102,8 +65197,8 @@
    "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",
+   "referenced_type" : "type-1184",
+   "self_type" : "type-1184",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-733" ],
@@ -65113,8 +65208,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-2462",
-   "self_type" : "type-2462",
+   "referenced_type" : "type-2465",
+   "self_type" : "type-2465",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-93" ],
@@ -65124,8 +65219,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-2499",
-   "self_type" : "type-2499",
+   "referenced_type" : "type-2502",
+   "self_type" : "type-2502",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-124" ],
@@ -65157,8 +65252,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-2655",
-   "self_type" : "type-2655",
+   "referenced_type" : "type-2658",
+   "self_type" : "type-2658",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -65190,8 +65285,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<short>",
    "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-2594",
-   "self_type" : "type-2594",
+   "referenced_type" : "type-2597",
+   "self_type" : "type-2597",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-499" ],
@@ -65201,30 +65296,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::trait_trivial_copy<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-2570",
-   "self_type" : "type-2570",
+   "referenced_type" : "type-2573",
+   "self_type" : "type-2573",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2571" ],
+   "template_args" : [ "type-2574" ],
    "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-2567",
-   "self_type" : "type-2567",
+   "referenced_type" : "type-2570",
+   "self_type" : "type-2570",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2568" ],
+   "template_args" : [ "type-2571" ],
    "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-2540",
-   "self_type" : "type-2540",
+   "referenced_type" : "type-2543",
+   "self_type" : "type-2543",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-90" ],
@@ -65267,8 +65362,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
    "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-2634",
-   "self_type" : "type-2634",
+   "referenced_type" : "type-2637",
+   "self_type" : "type-2637",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-497" ],
@@ -65278,8 +65373,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-2433",
-   "self_type" : "type-2433",
+   "referenced_type" : "type-2436",
+   "self_type" : "type-2436",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-9" ],
@@ -65289,19 +65384,19 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::BufferItem>",
    "name" : "android::trait_trivial_ctor<android::BufferItem>",
-   "referenced_type" : "type-1052",
-   "self_type" : "type-1052",
+   "referenced_type" : "type-1055",
+   "self_type" : "type-1055",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1053" ],
+   "template_args" : [ "type-1056" ],
    "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-2554",
-   "self_type" : "type-2554",
+   "referenced_type" : "type-2557",
+   "self_type" : "type-2557",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-160" ],
@@ -65311,8 +65406,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-2549",
-   "self_type" : "type-2549",
+   "referenced_type" : "type-2552",
+   "self_type" : "type-2552",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-147" ],
@@ -65322,8 +65417,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-2548",
-   "self_type" : "type-2548",
+   "referenced_type" : "type-2551",
+   "self_type" : "type-2551",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-143" ],
@@ -65333,8 +65428,8 @@
    "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",
+   "referenced_type" : "type-1182",
+   "self_type" : "type-1182",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-733" ],
@@ -65344,8 +65439,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-2443",
-   "self_type" : "type-2443",
+   "referenced_type" : "type-2446",
+   "self_type" : "type-2446",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-93" ],
@@ -65355,8 +65450,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-2481",
-   "self_type" : "type-2481",
+   "referenced_type" : "type-2484",
+   "self_type" : "type-2484",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-124" ],
@@ -65388,8 +65483,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-2647",
-   "self_type" : "type-2647",
+   "referenced_type" : "type-2650",
+   "self_type" : "type-2650",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -65421,8 +65516,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<short>",
    "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-2563",
-   "self_type" : "type-2563",
+   "referenced_type" : "type-2566",
+   "self_type" : "type-2566",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-499" ],
@@ -65432,30 +65527,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::trait_trivial_ctor<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-2555",
-   "self_type" : "type-2555",
+   "referenced_type" : "type-2558",
+   "self_type" : "type-2558",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2556" ],
+   "template_args" : [ "type-2559" ],
    "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-2550",
-   "self_type" : "type-2550",
+   "referenced_type" : "type-2553",
+   "self_type" : "type-2553",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2551" ],
+   "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-2526",
-   "self_type" : "type-2526",
+   "referenced_type" : "type-2529",
+   "self_type" : "type-2529",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-90" ],
@@ -65465,8 +65560,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
    "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-2670",
-   "self_type" : "type-2670",
+   "referenced_type" : "type-2673",
+   "self_type" : "type-2673",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -65498,8 +65593,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned short>",
    "name" : "android::trait_trivial_ctor<unsigned short>",
-   "referenced_type" : "type-2616",
-   "self_type" : "type-2616",
+   "referenced_type" : "type-2619",
+   "self_type" : "type-2619",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-497" ],
@@ -65509,8 +65604,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-2399",
-   "self_type" : "type-2399",
+   "referenced_type" : "type-2402",
+   "self_type" : "type-2402",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-9" ],
@@ -65520,19 +65615,19 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::BufferItem>",
    "name" : "android::trait_trivial_dtor<android::BufferItem>",
-   "referenced_type" : "type-1054",
-   "self_type" : "type-1054",
+   "referenced_type" : "type-1057",
+   "self_type" : "type-1057",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1055" ],
+   "template_args" : [ "type-1058" ],
    "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-2564",
-   "self_type" : "type-2564",
+   "referenced_type" : "type-2567",
+   "self_type" : "type-2567",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-160" ],
@@ -65542,8 +65637,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-2560",
-   "self_type" : "type-2560",
+   "referenced_type" : "type-2563",
+   "self_type" : "type-2563",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-147" ],
@@ -65553,8 +65648,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-2557",
-   "self_type" : "type-2557",
+   "referenced_type" : "type-2560",
+   "self_type" : "type-2560",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-143" ],
@@ -65564,8 +65659,8 @@
    "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",
+   "referenced_type" : "type-1183",
+   "self_type" : "type-1183",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-733" ],
@@ -65575,8 +65670,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<bool>",
    "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-2452",
-   "self_type" : "type-2452",
+   "referenced_type" : "type-2455",
+   "self_type" : "type-2455",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-93" ],
@@ -65586,8 +65681,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-2489",
-   "self_type" : "type-2489",
+   "referenced_type" : "type-2492",
+   "self_type" : "type-2492",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-124" ],
@@ -65619,8 +65714,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<int>",
    "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-2650",
-   "self_type" : "type-2650",
+   "referenced_type" : "type-2653",
+   "self_type" : "type-2653",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -65652,8 +65747,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<short>",
    "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-2583",
-   "self_type" : "type-2583",
+   "referenced_type" : "type-2586",
+   "self_type" : "type-2586",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-499" ],
@@ -65663,30 +65758,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::trait_trivial_dtor<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-2561",
-   "self_type" : "type-2561",
+   "referenced_type" : "type-2564",
+   "self_type" : "type-2564",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2562" ],
+   "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-2558",
-   "self_type" : "type-2558",
+   "referenced_type" : "type-2561",
+   "self_type" : "type-2561",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2559" ],
+   "template_args" : [ "type-2562" ],
    "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-2533",
-   "self_type" : "type-2533",
+   "referenced_type" : "type-2536",
+   "self_type" : "type-2536",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-90" ],
@@ -65696,8 +65791,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
    "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-2681",
-   "self_type" : "type-2681",
+   "referenced_type" : "type-2684",
+   "self_type" : "type-2684",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -65729,8 +65824,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned short>",
    "name" : "android::trait_trivial_dtor<unsigned short>",
-   "referenced_type" : "type-2624",
-   "self_type" : "type-2624",
+   "referenced_type" : "type-2627",
+   "self_type" : "type-2627",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-497" ],
@@ -65740,8 +65835,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-2424",
-   "self_type" : "type-2424",
+   "referenced_type" : "type-2427",
+   "self_type" : "type-2427",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-9" ],
@@ -65751,30 +65846,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::BufferItem>",
    "name" : "android::trait_trivial_move<android::BufferItem>",
-   "referenced_type" : "type-1058",
-   "self_type" : "type-1058",
+   "referenced_type" : "type-1061",
+   "self_type" : "type-1061",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1059" ],
+   "template_args" : [ "type-1062" ],
    "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-2662",
-   "self_type" : "type-2662",
+   "referenced_type" : "type-2665",
+   "self_type" : "type-2665",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-1239" ],
+   "template_args" : [ "type-1242" ],
    "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-2656",
-   "self_type" : "type-2656",
+   "referenced_type" : "type-2659",
+   "self_type" : "type-2659",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "template_args" : [ "type-121" ],
@@ -65784,8 +65879,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
-   "referenced_type" : "type-2579",
-   "self_type" : "type-2579",
+   "referenced_type" : "type-2582",
+   "self_type" : "type-2582",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-160" ],
@@ -65795,8 +65890,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-2576",
-   "self_type" : "type-2576",
+   "referenced_type" : "type-2579",
+   "self_type" : "type-2579",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-147" ],
@@ -65806,8 +65901,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-2573",
-   "self_type" : "type-2573",
+   "referenced_type" : "type-2576",
+   "self_type" : "type-2576",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-143" ],
@@ -65817,8 +65912,8 @@
    "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",
+   "referenced_type" : "type-1185",
+   "self_type" : "type-1185",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-733" ],
@@ -65828,8 +65923,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<bool>",
    "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-2472",
-   "self_type" : "type-2472",
+   "referenced_type" : "type-2475",
+   "self_type" : "type-2475",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-93" ],
@@ -65839,8 +65934,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-2521",
-   "self_type" : "type-2521",
+   "referenced_type" : "type-2524",
+   "self_type" : "type-2524",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-124" ],
@@ -65872,8 +65967,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-2659",
-   "self_type" : "type-2659",
+   "referenced_type" : "type-2662",
+   "self_type" : "type-2662",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -65905,8 +66000,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<short>",
    "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-2605",
-   "self_type" : "type-2605",
+   "referenced_type" : "type-2608",
+   "self_type" : "type-2608",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-499" ],
@@ -65916,30 +66011,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::trait_trivial_move<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-2577",
-   "self_type" : "type-2577",
+   "referenced_type" : "type-2580",
+   "self_type" : "type-2580",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2578" ],
+   "template_args" : [ "type-2581" ],
    "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-2574",
-   "self_type" : "type-2574",
+   "referenced_type" : "type-2577",
+   "self_type" : "type-2577",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2575" ],
+   "template_args" : [ "type-2578" ],
    "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-2552",
-   "self_type" : "type-2552",
+   "referenced_type" : "type-2555",
+   "self_type" : "type-2555",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-90" ],
@@ -65982,8 +66077,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned short>",
    "name" : "android::trait_trivial_move<unsigned short>",
-   "referenced_type" : "type-2645",
-   "self_type" : "type-2645",
+   "referenced_type" : "type-2648",
+   "self_type" : "type-2648",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-497" ],
@@ -65993,8 +66088,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-2441",
-   "self_type" : "type-2441",
+   "referenced_type" : "type-2444",
+   "self_type" : "type-2444",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-9" ],
@@ -66004,19 +66099,19 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::BufferItem>",
    "name" : "android::traits<android::BufferItem>",
-   "referenced_type" : "type-1064",
-   "self_type" : "type-1064",
+   "referenced_type" : "type-1067",
+   "self_type" : "type-1067",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1065" ],
+   "template_args" : [ "type-1068" ],
    "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-2599",
-   "self_type" : "type-2599",
+   "referenced_type" : "type-2602",
+   "self_type" : "type-2602",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-160" ],
@@ -66026,8 +66121,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::traits<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-2596",
-   "self_type" : "type-2596",
+   "referenced_type" : "type-2599",
+   "self_type" : "type-2599",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-147" ],
@@ -66037,8 +66132,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::traits<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-2591",
-   "self_type" : "type-2591",
+   "referenced_type" : "type-2594",
+   "self_type" : "type-2594",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-143" ],
@@ -66048,8 +66143,8 @@
    "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",
+   "referenced_type" : "type-1187",
+   "self_type" : "type-1187",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-733" ],
@@ -66059,8 +66154,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<int>",
    "name" : "android::traits<int>",
-   "referenced_type" : "type-2593",
-   "self_type" : "type-2593",
+   "referenced_type" : "type-2596",
+   "self_type" : "type-2596",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -66070,8 +66165,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<long long>",
    "name" : "android::traits<long long>",
-   "referenced_type" : "type-1063",
-   "self_type" : "type-1063",
+   "referenced_type" : "type-1066",
+   "self_type" : "type-1066",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-169" ],
@@ -66081,30 +66176,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::traits<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-2600",
-   "self_type" : "type-2600",
+   "referenced_type" : "type-2603",
+   "self_type" : "type-2603",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2601" ],
+   "template_args" : [ "type-2604" ],
    "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-2597",
-   "self_type" : "type-2597",
+   "referenced_type" : "type-2600",
+   "self_type" : "type-2600",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2598" ],
+   "template_args" : [ "type-2601" ],
    "unique_id" : "_ZTSN7android6traitsINSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<unsigned int>",
    "name" : "android::traits<unsigned int>",
-   "referenced_type" : "type-2592",
-   "self_type" : "type-2592",
+   "referenced_type" : "type-2595",
+   "self_type" : "type-2595",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -66115,16 +66210,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1075"
+     "referenced_type" : "type-1078"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::BufferItem>",
    "name" : "android::use_trivial_move<android::BufferItem>",
-   "referenced_type" : "type-1074",
-   "self_type" : "type-1074",
+   "referenced_type" : "type-1077",
+   "self_type" : "type-1077",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1076" ],
+   "template_args" : [ "type-1079" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_10BufferItemEEE"
   },
   {
@@ -66132,13 +66227,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2636"
+     "referenced_type" : "type-2639"
     }
    ],
    "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-2635",
-   "self_type" : "type-2635",
+   "referenced_type" : "type-2638",
+   "self_type" : "type-2638",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-160" ],
@@ -66149,13 +66244,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2633"
+     "referenced_type" : "type-2636"
     }
    ],
    "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-2632",
-   "self_type" : "type-2632",
+   "referenced_type" : "type-2635",
+   "self_type" : "type-2635",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-147" ],
@@ -66166,13 +66261,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2629"
+     "referenced_type" : "type-2632"
     }
    ],
    "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-2628",
-   "self_type" : "type-2628",
+   "referenced_type" : "type-2631",
+   "self_type" : "type-2631",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-143" ],
@@ -66183,13 +66278,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1186"
+     "referenced_type" : "type-1190"
     }
    ],
    "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",
+   "referenced_type" : "type-1189",
+   "self_type" : "type-1189",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-733" ],
@@ -66200,13 +66295,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2631"
+     "referenced_type" : "type-2634"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<int>",
    "name" : "android::use_trivial_move<int>",
-   "referenced_type" : "type-2630",
-   "self_type" : "type-2630",
+   "referenced_type" : "type-2633",
+   "self_type" : "type-2633",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -66217,13 +66312,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1073"
+     "referenced_type" : "type-1076"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<long long>",
    "name" : "android::use_trivial_move<long long>",
-   "referenced_type" : "type-1072",
-   "self_type" : "type-1072",
+   "referenced_type" : "type-1075",
+   "self_type" : "type-1075",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-169" ],
@@ -66288,7 +66383,7 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1252"
+     "referenced_type" : "type-1256"
     },
     {
      "access" : "private",
@@ -66300,11 +66395,11 @@
    "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",
+   "referenced_type" : "type-1255",
+   "self_type" : "type-1255",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-1254" ],
+   "template_args" : [ "type-1258" ],
    "unique_id" : "_ZTSN7android2wpINS_12ConsumerBase22FrameAvailableListenerEEE"
   },
   {
@@ -66655,13 +66750,13 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-2178"
+     "referenced_type" : "type-2181"
     }
    ],
    "linker_set_key" : "log_msg",
    "name" : "log_msg",
-   "referenced_type" : "type-2177",
-   "self_type" : "type-2177",
+   "referenced_type" : "type-2180",
+   "self_type" : "type-2180",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
@@ -66672,15 +66767,15 @@
    [
     {
      "field_name" : "buf",
-     "referenced_type" : "type-2179"
+     "referenced_type" : "type-2182"
     },
     {
      "field_name" : "entry",
-     "referenced_type" : "type-1408"
+     "referenced_type" : "type-1411"
     },
     {
      "field_name" : "entry_v4",
-     "referenced_type" : "type-1408"
+     "referenced_type" : "type-1411"
     },
     {
      "field_name" : "entry_v3",
@@ -66688,19 +66783,19 @@
     },
     {
      "field_name" : "entry_v2",
-     "referenced_type" : "type-1291"
+     "referenced_type" : "type-1294"
     },
     {
      "field_name" : "entry_v1",
-     "referenced_type" : "type-2180"
+     "referenced_type" : "type-2183"
     }
    ],
    "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-2178",
-   "self_type" : "type-2178",
+   "referenced_type" : "type-2181",
+   "self_type" : "type-2181",
    "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)"
@@ -66721,8 +66816,8 @@
    ],
    "linker_set_key" : "log_time",
    "name" : "log_time",
-   "referenced_type" : "type-2509",
-   "self_type" : "type-2509",
+   "referenced_type" : "type-2512",
+   "self_type" : "type-2512",
    "size" : 8,
    "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
    "unique_id" : "_ZTS8log_time"
@@ -66768,8 +66863,8 @@
    ],
    "linker_set_key" : "logger_entry",
    "name" : "logger_entry",
-   "referenced_type" : "type-2180",
-   "self_type" : "type-2180",
+   "referenced_type" : "type-2183",
+   "self_type" : "type-2183",
    "size" : 20,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
@@ -66820,8 +66915,8 @@
    ],
    "linker_set_key" : "logger_entry_v2",
    "name" : "logger_entry_v2",
-   "referenced_type" : "type-1291",
-   "self_type" : "type-1291",
+   "referenced_type" : "type-1294",
+   "self_type" : "type-1294",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
@@ -66929,8 +67024,8 @@
    ],
    "linker_set_key" : "logger_entry_v4",
    "name" : "logger_entry_v4",
-   "referenced_type" : "type-1408",
-   "self_type" : "type-1408",
+   "referenced_type" : "type-1411",
+   "self_type" : "type-1411",
    "size" : 28,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
@@ -66974,8 +67069,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser> &&",
    "name" : "android::base::unique_fd_impl<android::base::DefaultCloser> &&",
-   "referenced_type" : "type-2553",
-   "self_type" : "type-2610",
+   "referenced_type" : "type-2556",
+   "self_type" : "type-2613",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -66992,8 +67087,8 @@
    "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",
+   "referenced_type" : "type-7528",
+   "self_type" : "type-7532",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -67001,24 +67096,6 @@
    "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,
@@ -67026,8 +67103,8 @@
   },
   {
    "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> > &&",
+   "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-4494",
    "self_type" : "type-4496",
    "size" : 4,
@@ -67035,10 +67112,28 @@
   },
   {
    "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-4371",
+   "self_type" : "type-4373",
+   "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-4500",
+   "self_type" : "type-4502",
+   "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-4355",
+   "referenced_type" : "type-4359",
+   "self_type" : "type-4361",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -67055,8 +67150,8 @@
    "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",
+   "referenced_type" : "type-7534",
+   "self_type" : "type-7536",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -67110,7 +67205,7 @@
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> &&",
    "name" : "android::hardware::hidl_vec<unsigned char> &&",
    "referenced_type" : "type-452",
-   "self_type" : "type-4566",
+   "self_type" : "type-4572",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -67119,7 +67214,7 @@
    "linker_set_key" : "android::sp<android::ALooper> &&",
    "name" : "android::sp<android::ALooper> &&",
    "referenced_type" : "type-321",
-   "self_type" : "type-2256",
+   "self_type" : "type-2259",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67136,8 +67231,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::Fence> &&",
    "name" : "android::sp<android::Fence> &&",
-   "referenced_type" : "type-1864",
-   "self_type" : "type-2524",
+   "referenced_type" : "type-1868",
+   "self_type" : "type-2527",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67145,8 +67240,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::GraphicBufferSource> &&",
    "name" : "android::sp<android::GraphicBufferSource> &&",
-   "referenced_type" : "type-2542",
-   "self_type" : "type-2543",
+   "referenced_type" : "type-2545",
+   "self_type" : "type-2546",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67154,8 +67249,8 @@
    "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-4261",
+   "referenced_type" : "type-4265",
+   "self_type" : "type-4267",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67163,8 +67258,8 @@
    "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",
+   "referenced_type" : "type-4274",
+   "self_type" : "type-4276",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67172,8 +67267,8 @@
    "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",
+   "referenced_type" : "type-4833",
+   "self_type" : "type-4843",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67181,8 +67276,8 @@
    "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",
+   "referenced_type" : "type-5112",
+   "self_type" : "type-5118",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67191,7 +67286,7 @@
    "linker_set_key" : "android::sp<android::IBinder::DeathRecipient> &&",
    "name" : "android::sp<android::IBinder::DeathRecipient> &&",
    "referenced_type" : "type-843",
-   "self_type" : "type-4383",
+   "self_type" : "type-4389",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67200,7 +67295,7 @@
    "linker_set_key" : "android::sp<android::IConsumerListener> &&",
    "name" : "android::sp<android::IConsumerListener> &&",
    "referenced_type" : "type-939",
-   "self_type" : "type-1577",
+   "self_type" : "type-1580",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67209,7 +67304,7 @@
    "linker_set_key" : "android::sp<android::IGraphicBufferConsumer> &&",
    "name" : "android::sp<android::IGraphicBufferConsumer> &&",
    "referenced_type" : "type-574",
-   "self_type" : "type-1600",
+   "self_type" : "type-1604",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67218,7 +67313,7 @@
    "linker_set_key" : "android::sp<android::IGraphicBufferProducer> &&",
    "name" : "android::sp<android::IGraphicBufferProducer> &&",
    "referenced_type" : "type-570",
-   "self_type" : "type-4226",
+   "self_type" : "type-4232",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67227,7 +67322,7 @@
    "linker_set_key" : "android::sp<android::IProducerListener> &&",
    "name" : "android::sp<android::IProducerListener> &&",
    "referenced_type" : "type-957",
-   "self_type" : "type-4252",
+   "self_type" : "type-4258",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67236,7 +67331,7 @@
    "linker_set_key" : "android::sp<android::NativeHandle> &&",
    "name" : "android::sp<android::NativeHandle> &&",
    "referenced_type" : "type-932",
-   "self_type" : "type-1596",
+   "self_type" : "type-1600",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   }
diff --git a/29/64/x86_x86_64/source-based/libui.so.lsdump b/29/64/x86_x86_64/source-based/libui.so.lsdump
index ba6360c..8848d82 100644
--- a/29/64/x86_x86_64/source-based/libui.so.lsdump
+++ b/29/64/x86_x86_64/source-based/libui.so.lsdump
@@ -5,8 +5,8 @@
    "alignment" : 4,
    "linker_set_key" : "AHardwareBuffer_Plane [4]",
    "name" : "AHardwareBuffer_Plane [4]",
-   "referenced_type" : "type-509",
-   "self_type" : "type-508",
+   "referenced_type" : "type-506",
+   "self_type" : "type-505",
    "size" : 48,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h"
   },
@@ -14,7 +14,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<float> [3]",
    "name" : "android::details::TVec3<float> [3]",
-   "referenced_type" : "type-17",
+   "referenced_type" : "type-18",
    "self_type" : "type-904",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
@@ -23,8 +23,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<float> [4]",
    "name" : "android::details::TVec4<float> [4]",
-   "referenced_type" : "type-200",
-   "self_type" : "type-2428",
+   "referenced_type" : "type-192",
+   "self_type" : "type-2430",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -32,7 +32,7 @@
    "alignment" : 1,
    "linker_set_key" : "char [0]",
    "name" : "char [0]",
-   "referenced_type" : "type-288",
+   "referenced_type" : "type-285",
    "self_type" : "type-1261",
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -47,16 +47,16 @@
    "alignment" : 4,
    "linker_set_key" : "int [0]",
    "name" : "int [0]",
-   "referenced_type" : "type-103",
-   "self_type" : "type-145",
+   "referenced_type" : "type-105",
+   "self_type" : "type-148",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int [7]",
    "name" : "int [7]",
-   "referenced_type" : "type-103",
-   "self_type" : "type-564",
+   "referenced_type" : "type-105",
+   "self_type" : "type-561",
    "size" : 28,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -64,7 +64,7 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
-   "referenced_type" : "type-218",
+   "referenced_type" : "type-220",
    "self_type" : "type-1270",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
@@ -73,7 +73,7 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [10]",
    "name" : "unsigned int [10]",
-   "referenced_type" : "type-123",
+   "referenced_type" : "type-125",
    "self_type" : "type-1109",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -82,8 +82,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [12]",
    "name" : "unsigned int [12]",
-   "referenced_type" : "type-123",
-   "self_type" : "type-559",
+   "referenced_type" : "type-125",
+   "self_type" : "type-556",
    "size" : 48,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -91,8 +91,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [25]",
    "name" : "unsigned int [25]",
-   "referenced_type" : "type-123",
-   "self_type" : "type-558",
+   "referenced_type" : "type-125",
+   "self_type" : "type-555",
    "size" : 100,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -100,8 +100,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [3]",
    "name" : "unsigned int [3]",
-   "referenced_type" : "type-123",
-   "self_type" : "type-941",
+   "referenced_type" : "type-125",
+   "self_type" : "type-935",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -109,8 +109,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [8]",
    "name" : "unsigned int [8]",
-   "referenced_type" : "type-123",
-   "self_type" : "type-349",
+   "referenced_type" : "type-125",
+   "self_type" : "type-346",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -118,26 +118,17 @@
    "alignment" : 4,
    "linker_set_key" : "void *[1]",
    "name" : "void *[1]",
-   "referenced_type" : "type-227",
-   "self_type" : "type-523",
+   "referenced_type" : "type-229",
+   "self_type" : "type-521",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void *[3]",
-   "name" : "void *[3]",
-   "referenced_type" : "type-227",
-   "self_type" : "type-596",
-   "size" : 12,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "void *[4]",
    "name" : "void *[4]",
-   "referenced_type" : "type-227",
-   "self_type" : "type-519",
+   "referenced_type" : "type-229",
+   "self_type" : "type-517",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -145,8 +136,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *[6]",
    "name" : "void *[6]",
-   "referenced_type" : "type-227",
-   "self_type" : "type-524",
+   "referenced_type" : "type-229",
+   "self_type" : "type-522",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -154,7 +145,7 @@
    "alignment" : 4,
    "linker_set_key" : "void *[7]",
    "name" : "void *[7]",
-   "referenced_type" : "type-227",
+   "referenced_type" : "type-229",
    "self_type" : "type-609",
    "size" : 28,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
@@ -177,8 +168,8 @@
    "is_integral" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-288",
-   "self_type" : "type-288",
+   "referenced_type" : "type-285",
+   "self_type" : "type-285",
    "size" : 1
   },
   {
@@ -187,16 +178,16 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-182",
-   "self_type" : "type-182",
+   "referenced_type" : "type-185",
+   "self_type" : "type-185",
    "size" : 2
   },
   {
    "alignment" : 4,
    "linker_set_key" : "double",
    "name" : "double",
-   "referenced_type" : "type-41",
-   "self_type" : "type-41",
+   "referenced_type" : "type-43",
+   "self_type" : "type-43",
    "size" : 8
   },
   {
@@ -212,8 +203,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-103",
-   "self_type" : "type-103",
+   "referenced_type" : "type-105",
+   "self_type" : "type-105",
    "size" : 4
   },
   {
@@ -221,16 +212,16 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-687",
-   "self_type" : "type-687",
+   "referenced_type" : "type-684",
+   "self_type" : "type-684",
    "size" : 4
   },
   {
    "alignment" : 4,
    "linker_set_key" : "long double",
    "name" : "long double",
-   "referenced_type" : "type-298",
-   "self_type" : "type-298",
+   "referenced_type" : "type-295",
+   "self_type" : "type-295",
    "size" : 8
   },
   {
@@ -238,8 +229,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-284",
-   "self_type" : "type-284",
+   "referenced_type" : "type-12",
+   "self_type" : "type-12",
    "size" : 8
   },
   {
@@ -266,8 +257,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned char",
    "name" : "unsigned char",
-   "referenced_type" : "type-218",
-   "self_type" : "type-218",
+   "referenced_type" : "type-220",
+   "self_type" : "type-220",
    "size" : 1
   },
   {
@@ -276,8 +267,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned int",
    "name" : "unsigned int",
-   "referenced_type" : "type-123",
-   "self_type" : "type-123",
+   "referenced_type" : "type-125",
+   "self_type" : "type-125",
    "size" : 4
   },
   {
@@ -296,8 +287,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-124",
-   "self_type" : "type-124",
+   "referenced_type" : "type-126",
+   "self_type" : "type-126",
    "size" : 8
   },
   {
@@ -313,8 +304,8 @@
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-151",
-   "self_type" : "type-151"
+   "referenced_type" : "type-154",
+   "self_type" : "type-154"
   }
  ],
  "elf_functions" :
@@ -1805,11 +1796,11 @@
    ],
    "linker_set_key" : "AHardwareBuffer_Format",
    "name" : "AHardwareBuffer_Format",
-   "referenced_type" : "type-616",
-   "self_type" : "type-616",
+   "referenced_type" : "type-617",
+   "self_type" : "type-617",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "AHardwareBuffer_Format"
   },
   {
@@ -1971,11 +1962,11 @@
    ],
    "linker_set_key" : "AHardwareBuffer_UsageFlags",
    "name" : "AHardwareBuffer_UsageFlags",
-   "referenced_type" : "type-678",
-   "self_type" : "type-678",
+   "referenced_type" : "type-676",
+   "self_type" : "type-676",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "AHardwareBuffer_UsageFlags"
   },
   {
@@ -1993,11 +1984,11 @@
    ],
    "linker_set_key" : "android::Condition::WakeUpType",
    "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-260",
-   "self_type" : "type-260",
+   "referenced_type" : "type-256",
+   "self_type" : "type-256",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android9Condition10WakeUpTypeE"
   },
   {
@@ -2023,7 +2014,7 @@
    "self_type" : "type-1346",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android5Fence6StatusE"
   },
   {
@@ -2045,11 +2036,11 @@
    ],
    "linker_set_key" : "android::FenceTime::Snapshot::State",
    "name" : "android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1384",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1388",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android9FenceTime8Snapshot5StateE"
   },
   {
@@ -2072,11 +2063,11 @@
    ],
    "linker_set_key" : "android::FenceTime::State",
    "name" : "android::FenceTime::State",
-   "referenced_type" : "type-1378",
-   "self_type" : "type-1378",
+   "referenced_type" : "type-1383",
+   "self_type" : "type-1383",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android9FenceTime5StateE"
   },
   {
@@ -2102,11 +2093,11 @@
    ],
    "linker_set_key" : "android::GraphicBuffer::HandleWrapMethod",
    "name" : "android::GraphicBuffer::HandleWrapMethod",
-   "referenced_type" : "type-629",
-   "self_type" : "type-629",
+   "referenced_type" : "type-630",
+   "self_type" : "type-630",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h",
-   "underlying_type" : "type-218",
+   "underlying_type" : "type-220",
    "unique_id" : "_ZTSN7android13GraphicBuffer16HandleWrapMethodE"
   },
   {
@@ -2124,11 +2115,11 @@
    ],
    "linker_set_key" : "android::GraphicBufferMapper::Version",
    "name" : "android::GraphicBufferMapper::Version",
-   "referenced_type" : "type-529",
-   "self_type" : "type-529",
+   "referenced_type" : "type-527",
+   "self_type" : "type-527",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android19GraphicBufferMapper7VersionE"
   },
   {
@@ -2142,11 +2133,11 @@
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-183",
-   "self_type" : "type-183",
+   "referenced_type" : "type-186",
+   "self_type" : "type-186",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android8String1613StaticLinkageE"
   },
   {
@@ -2160,11 +2151,11 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-864",
-   "self_type" : "type-864",
+   "referenced_type" : "type-862",
+   "self_type" : "type-862",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7String813StaticLinkageE"
   },
   {
@@ -2182,7 +2173,7 @@
    "self_type" : "type-975",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details6TMat33IfE7no_initE"
   },
   {
@@ -2196,11 +2187,11 @@
    ],
    "linker_set_key" : "android::details::TMat44<float>::no_init",
    "name" : "android::details::TMat44<float>::no_init",
-   "referenced_type" : "type-2429",
-   "self_type" : "type-2429",
+   "referenced_type" : "type-2431",
+   "self_type" : "type-2431",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details6TMat44IfE7no_initE"
   },
   {
@@ -2214,11 +2205,11 @@
    ],
    "linker_set_key" : "android::details::TQuaternion<double>::no_init",
    "name" : "android::details::TQuaternion<double>::no_init",
-   "referenced_type" : "type-389",
-   "self_type" : "type-389",
+   "referenced_type" : "type-386",
+   "self_type" : "type-386",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details11TQuaternionIdE7no_initE"
   },
   {
@@ -2232,11 +2223,11 @@
    ],
    "linker_set_key" : "android::details::TQuaternion<float>::no_init",
    "name" : "android::details::TQuaternion<float>::no_init",
-   "referenced_type" : "type-428",
-   "self_type" : "type-428",
+   "referenced_type" : "type-425",
+   "self_type" : "type-425",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details11TQuaternionIfE7no_initE"
   },
   {
@@ -2254,7 +2245,7 @@
    "self_type" : "type-1255",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec2IbE7no_initE"
   },
   {
@@ -2272,7 +2263,7 @@
    "self_type" : "type-1068",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec2IdE7no_initE"
   },
   {
@@ -2290,7 +2281,7 @@
    "self_type" : "type-1135",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec2IfE7no_initE"
   },
   {
@@ -2308,7 +2299,7 @@
    "self_type" : "type-1365",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec3IdE7no_initE"
   },
   {
@@ -2322,11 +2313,11 @@
    ],
    "linker_set_key" : "android::details::TVec3<float>::no_init",
    "name" : "android::details::TVec3<float>::no_init",
-   "referenced_type" : "type-1412",
-   "self_type" : "type-1412",
+   "referenced_type" : "type-1414",
+   "self_type" : "type-1414",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec3IfE7no_initE"
   },
   {
@@ -2340,11 +2331,11 @@
    ],
    "linker_set_key" : "android::details::TVec4<double>::no_init",
    "name" : "android::details::TVec4<double>::no_init",
-   "referenced_type" : "type-148",
-   "self_type" : "type-148",
+   "referenced_type" : "type-137",
+   "self_type" : "type-137",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec4IdE7no_initE"
   },
   {
@@ -2358,11 +2349,11 @@
    ],
    "linker_set_key" : "android::details::TVec4<float>::no_init",
    "name" : "android::details::TVec4<float>::no_init",
-   "referenced_type" : "type-309",
-   "self_type" : "type-309",
+   "referenced_type" : "type-304",
+   "self_type" : "type-304",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec4IfE7no_initE"
   },
   {
@@ -2377,11 +2368,11 @@
    ],
    "linker_set_key" : "android::half::Binary",
    "name" : "android::half::Binary",
-   "referenced_type" : "type-403",
-   "self_type" : "type-403",
+   "referenced_type" : "type-399",
+   "self_type" : "type-399",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android4half6BinaryE"
   },
   {
@@ -2407,7 +2398,7 @@
    "self_type" : "type-1321",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware21HidlReturnRestrictionE"
   },
   {
@@ -2429,7 +2420,7 @@
    "self_type" : "type-1129",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android8hardware8MQFlavorE"
   },
   {
@@ -2451,11 +2442,11 @@
    ],
    "linker_set_key" : "android::hardware::ProcessState::CallRestriction",
    "name" : "android::hardware::ProcessState::CallRestriction",
-   "referenced_type" : "type-276",
-   "self_type" : "type-276",
+   "referenced_type" : "type-272",
+   "self_type" : "type-272",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware12ProcessState15CallRestrictionE"
   },
   {
@@ -2509,7 +2500,7 @@
    "self_type" : "type-1308",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware6Status9ExceptionE"
   },
   {
@@ -2563,7 +2554,7 @@
    "self_type" : "type-1223",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentor20InstrumentationEventE"
   },
   {
@@ -2665,11 +2656,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_0::BufferUsage",
-   "referenced_type" : "type-150",
-   "self_type" : "type-150",
+   "referenced_type" : "type-153",
+   "self_type" : "type-153",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_011BufferUsageE"
   },
   {
@@ -2723,7 +2714,7 @@
    "self_type" : "type-1140",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09ColorModeE"
   },
   {
@@ -2765,7 +2756,7 @@
    "self_type" : "type-1141",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_014ColorTransformE"
   },
   {
@@ -3007,7 +2998,7 @@
    "self_type" : "type-1139",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09DataspaceE"
   },
   {
@@ -3033,7 +3024,7 @@
    "self_type" : "type-1143",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_03HdrE"
   },
   {
@@ -3127,7 +3118,7 @@
    "self_type" : "type-1137",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_011PixelFormatE"
   },
   {
@@ -3161,7 +3152,7 @@
    "self_type" : "type-1138",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09TransformE"
   },
   {
@@ -3271,11 +3262,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_1::BufferUsage",
-   "referenced_type" : "type-158",
-   "self_type" : "type-158",
+   "referenced_type" : "type-160",
+   "self_type" : "type-160",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_111BufferUsageE"
   },
   {
@@ -3341,7 +3332,7 @@
    "self_type" : "type-1170",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_19ColorModeE"
   },
   {
@@ -3599,7 +3590,7 @@
    "self_type" : "type-1169",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_19DataspaceE"
   },
   {
@@ -3721,7 +3712,7 @@
    "self_type" : "type-1168",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_111PixelFormatE"
   },
   {
@@ -3751,7 +3742,7 @@
    "self_type" : "type-1171",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_112RenderIntentE"
   },
   {
@@ -3865,11 +3856,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_2::BufferUsage",
-   "referenced_type" : "type-420",
-   "self_type" : "type-420",
+   "referenced_type" : "type-417",
+   "self_type" : "type-417",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_211BufferUsageE"
   },
   {
@@ -3939,7 +3930,7 @@
    "self_type" : "type-1192",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_29ColorModeE"
   },
   {
@@ -4213,7 +4204,7 @@
    "self_type" : "type-1191",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_29DataspaceE"
   },
   {
@@ -4243,7 +4234,7 @@
    "self_type" : "type-1190",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_23HdrE"
   },
   {
@@ -4369,7 +4360,7 @@
    "self_type" : "type-1194",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_211PixelFormatE"
   },
   {
@@ -4391,11 +4382,11 @@
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-164",
-   "self_type" : "type-164",
+   "referenced_type" : "type-167",
+   "self_type" : "type-167",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfo12ArchitectureE"
   },
   {
@@ -4433,11 +4424,11 @@
    ],
    "linker_set_key" : "android::ui::Transform::orientation_flags",
    "name" : "android::ui::Transform::orientation_flags",
-   "referenced_type" : "type-2439",
-   "self_type" : "type-2439",
+   "referenced_type" : "type-2441",
+   "self_type" : "type-2441",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android2ui9Transform17orientation_flagsE"
   },
   {
@@ -4467,11 +4458,11 @@
    ],
    "linker_set_key" : "android::ui::Transform::type_mask",
    "name" : "android::ui::Transform::type_mask",
-   "referenced_type" : "type-2440",
-   "self_type" : "type-2440",
+   "referenced_type" : "type-2442",
+   "self_type" : "type-2442",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android2ui9Transform9type_maskE"
   },
   {
@@ -4521,7 +4512,7 @@
    "self_type" : "type-1257",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_LogPriority"
   },
   {
@@ -4575,7 +4566,7 @@
    "self_type" : "type-1212",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_color_mode_t"
   },
   {
@@ -4601,7 +4592,7 @@
    "self_type" : "type-1217",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_color_mode_v1_1_t"
   },
   {
@@ -4643,7 +4634,7 @@
    "self_type" : "type-1213",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_color_transform_t"
   },
   {
@@ -4885,7 +4876,7 @@
    "self_type" : "type-1211",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_dataspace_t"
   },
   {
@@ -4915,7 +4906,7 @@
    "self_type" : "type-1216",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_dataspace_v1_1_t"
   },
   {
@@ -4945,7 +4936,7 @@
    "self_type" : "type-1221",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_dataspace_v1_2_t"
   },
   {
@@ -4987,7 +4978,7 @@
    "self_type" : "type-1225",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_flex_component"
   },
   {
@@ -5025,7 +5016,7 @@
    "self_type" : "type-1227",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_flex_format"
   },
   {
@@ -5051,7 +5042,7 @@
    "self_type" : "type-1214",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_hdr_t"
   },
   {
@@ -5069,7 +5060,7 @@
    "self_type" : "type-1220",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_hdr_v1_2_t"
   },
   {
@@ -5099,7 +5090,7 @@
    "self_type" : "type-1224",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTS25android_pixel_format_sw_t"
   },
   {
@@ -5193,7 +5184,7 @@
    "self_type" : "type-1209",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_pixel_format_t"
   },
   {
@@ -5235,7 +5226,7 @@
    "self_type" : "type-1215",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_pixel_format_v1_1_t"
   },
   {
@@ -5253,7 +5244,7 @@
    "self_type" : "type-1222",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_pixel_format_v1_2_t"
   },
   {
@@ -5283,7 +5274,7 @@
    "self_type" : "type-1219",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_render_intent_v1_1_t"
   },
   {
@@ -5317,7 +5308,7 @@
    "self_type" : "type-1210",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_transform_t"
   },
   {
@@ -5371,7 +5362,7 @@
    "self_type" : "type-1258",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "log_id"
   }
  ],
@@ -5384,18 +5375,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-272"
+     "referenced_type" : "type-268"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
-   "referenced_type" : "type-271",
+   "referenced_type" : "type-267",
    "return_type" : "type-6",
-   "self_type" : "type-271",
+   "self_type" : "type-267",
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
   {
@@ -5408,11 +5399,11 @@
      "referenced_type" : "type-604"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
    "referenced_type" : "type-606",
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "self_type" : "type-606",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -5426,26 +5417,26 @@
      "referenced_type" : "type-604"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-343"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
    "referenced_type" : "type-603",
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "self_type" : "type-603",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -5456,15 +5447,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "referenced_type" : "type-580",
-   "return_type" : "type-103",
-   "self_type" : "type-580",
+   "referenced_type" : "type-578",
+   "return_type" : "type-105",
+   "self_type" : "type-578",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5474,18 +5465,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "referenced_type" : "type-592",
-   "return_type" : "type-103",
-   "self_type" : "type-592",
+   "referenced_type" : "type-590",
+   "return_type" : "type-105",
+   "self_type" : "type-590",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5495,33 +5486,33 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "referenced_type" : "type-588",
-   "return_type" : "type-103",
-   "self_type" : "type-588",
+   "referenced_type" : "type-586",
+   "return_type" : "type-105",
+   "self_type" : "type-586",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5531,36 +5522,36 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-595",
-   "return_type" : "type-103",
-   "self_type" : "type-595",
+   "referenced_type" : "type-593",
+   "return_type" : "type-105",
+   "self_type" : "type-593",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5570,33 +5561,33 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     }
    ],
-   "referenced_type" : "type-584",
-   "return_type" : "type-103",
-   "self_type" : "type-584",
+   "referenced_type" : "type-582",
+   "return_type" : "type-105",
+   "self_type" : "type-582",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5606,36 +5597,93 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-590",
-   "return_type" : "type-103",
-   "self_type" : "type-590",
+   "referenced_type" : "type-588",
+   "return_type" : "type-105",
+   "self_type" : "type-588",
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "name" : "int (const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-579"
+    },
+    {
+     "referenced_type" : "type-145"
+    },
+    {
+     "referenced_type" : "type-124"
+    },
+    {
+     "referenced_type" : "type-124"
+    }
+   ],
+   "referenced_type" : "type-595",
+   "return_type" : "type-105",
+   "self_type" : "type-595",
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "name" : "int (const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-579"
+    },
+    {
+     "referenced_type" : "type-145"
+    },
+    {
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-105"
+    },
+    {
+     "referenced_type" : "type-105"
+    },
+    {
+     "referenced_type" : "type-125"
+    }
+   ],
+   "referenced_type" : "type-597",
+   "return_type" : "type-105",
+   "self_type" : "type-597",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5645,15 +5693,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-586",
-   "return_type" : "type-103",
-   "self_type" : "type-586",
+   "referenced_type" : "type-584",
+   "return_type" : "type-105",
+   "self_type" : "type-584",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5663,18 +5711,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-554"
+     "referenced_type" : "type-551"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
-     "referenced_type" : "type-556"
+     "referenced_type" : "type-553"
     }
    ],
-   "referenced_type" : "type-553",
-   "return_type" : "type-103",
-   "self_type" : "type-553",
+   "referenced_type" : "type-550",
+   "return_type" : "type-105",
+   "self_type" : "type-550",
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
   {
@@ -5684,12 +5732,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     }
    ],
-   "referenced_type" : "type-573",
-   "return_type" : "type-103",
-   "self_type" : "type-573",
+   "referenced_type" : "type-570",
+   "return_type" : "type-105",
+   "self_type" : "type-570",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5699,15 +5747,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "referenced_type" : "type-571",
-   "return_type" : "type-103",
-   "self_type" : "type-571",
+   "referenced_type" : "type-568",
+   "return_type" : "type-105",
+   "self_type" : "type-568",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5717,15 +5765,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-566",
-   "return_type" : "type-103",
-   "self_type" : "type-566",
+   "referenced_type" : "type-563",
+   "return_type" : "type-105",
+   "self_type" : "type-563",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5735,24 +5783,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-569",
-   "return_type" : "type-103",
-   "self_type" : "type-569",
+   "referenced_type" : "type-566",
+   "return_type" : "type-105",
+   "self_type" : "type-566",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5762,12 +5810,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-557"
+     "referenced_type" : "type-554"
     }
    ],
-   "referenced_type" : "type-561",
-   "return_type" : "type-103",
-   "self_type" : "type-561",
+   "referenced_type" : "type-558",
+   "return_type" : "type-105",
+   "self_type" : "type-558",
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
   {
@@ -5777,12 +5825,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
-   "referenced_type" : "type-249",
-   "return_type" : "type-103",
-   "self_type" : "type-249",
+   "referenced_type" : "type-251",
+   "return_type" : "type-105",
+   "self_type" : "type-251",
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
   {
@@ -5795,14 +5843,14 @@
      "referenced_type" : "type-604"
     },
     {
-     "referenced_type" : "type-576"
+     "referenced_type" : "type-573"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "referenced_type" : "type-608",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "self_type" : "type-608",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -5813,27 +5861,27 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-222"
-    },
-    {
-     "referenced_type" : "type-223"
-    },
-    {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-224"
     },
     {
      "referenced_type" : "type-225"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-227"
+    },
+    {
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-229"
     }
    ],
-   "referenced_type" : "type-221",
-   "return_type" : "type-151",
-   "self_type" : "type-221",
+   "referenced_type" : "type-223",
+   "return_type" : "type-154",
+   "self_type" : "type-223",
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
   {
@@ -5843,12 +5891,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-522"
+     "referenced_type" : "type-520"
     }
    ],
-   "referenced_type" : "type-521",
-   "return_type" : "type-151",
-   "self_type" : "type-521",
+   "referenced_type" : "type-519",
+   "return_type" : "type-154",
+   "self_type" : "type-519",
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
   {
@@ -5858,18 +5906,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     },
     {
-     "referenced_type" : "type-576"
+     "referenced_type" : "type-573"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-575",
-   "return_type" : "type-151",
-   "self_type" : "type-575",
+   "referenced_type" : "type-572",
+   "return_type" : "type-154",
+   "self_type" : "type-572",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   }
  ],
@@ -5884,7 +5932,7 @@
      "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-1433",
+   "return_type" : "type-1436",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5896,7 +5944,7 @@
      "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-1434",
+   "return_type" : "type-1437",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5908,7 +5956,7 @@
      "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-1435",
+   "return_type" : "type-1438",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5920,7 +5968,7 @@
      "referenced_type" : "type-1192"
     }
    ],
-   "return_type" : "type-1436",
+   "return_type" : "type-1439",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5932,7 +5980,7 @@
      "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-1437",
+   "return_type" : "type-1440",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5941,10 +5989,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-1438",
+   "return_type" : "type-1441",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5956,7 +6004,7 @@
      "referenced_type" : "type-1171"
     }
    ],
-   "return_type" : "type-1439",
+   "return_type" : "type-1442",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5968,7 +6016,7 @@
      "referenced_type" : "type-1213"
     }
    ],
-   "return_type" : "type-1440",
+   "return_type" : "type-1443",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5980,7 +6028,7 @@
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-1441",
+   "return_type" : "type-1444",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -6067,7 +6115,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1042"
@@ -6076,7 +6124,7 @@
      "referenced_type" : "type-1042"
     }
    ],
-   "return_type" : "type-1442",
+   "return_type" : "type-1445",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6086,10 +6134,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6098,14 +6146,14 @@
      "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-1030"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1443"
+     "referenced_type" : "type-1446"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6115,10 +6163,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6128,18 +6176,18 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1444"
+     "referenced_type" : "type-1447"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1445"
+     "referenced_type" : "type-1448"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1446"
+     "referenced_type" : "type-1449"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6149,10 +6197,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6165,10 +6213,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1447"
+     "referenced_type" : "type-1450"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6178,23 +6226,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-1030"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1448"
+     "referenced_type" : "type-1451"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6204,28 +6252,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1449"
+     "referenced_type" : "type-1452"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1450"
+     "referenced_type" : "type-1453"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1451"
+     "referenced_type" : "type-1454"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6235,23 +6283,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
      "referenced_type" : "type-10"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1452"
+     "referenced_type" : "type-1455"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6261,10 +6309,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6273,14 +6321,14 @@
      "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-1030"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1453"
+     "referenced_type" : "type-1456"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6290,10 +6338,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6303,18 +6351,18 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1454"
+     "referenced_type" : "type-1457"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1455"
+     "referenced_type" : "type-1458"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1456"
+     "referenced_type" : "type-1459"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6324,10 +6372,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6340,10 +6388,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1457"
+     "referenced_type" : "type-1460"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6353,23 +6401,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-1030"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1458"
+     "referenced_type" : "type-1461"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6379,28 +6427,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1459"
+     "referenced_type" : "type-1462"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1460"
+     "referenced_type" : "type-1463"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1464"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6410,23 +6458,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
      "referenced_type" : "type-10"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1462"
+     "referenced_type" : "type-1465"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6436,16 +6484,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1427"
+     "referenced_type" : "type-1431"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
   {
@@ -6454,10 +6502,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/PixelFormat.h"
   },
   {
@@ -6467,10 +6515,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1400"
+     "referenced_type" : "type-1404"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -6480,13 +6528,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1400"
+     "referenced_type" : "type-1404"
     },
     {
-     "referenced_type" : "type-1401"
+     "referenced_type" : "type-1405"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -6496,25 +6544,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6525,10 +6573,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6538,13 +6586,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6555,28 +6603,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-1463"
+     "referenced_type" : "type-1466"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6587,34 +6635,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-629"
+     "referenced_type" : "type-630"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6624,19 +6672,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6646,22 +6694,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6671,16 +6719,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-1464"
+     "referenced_type" : "type-1467"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6690,22 +6738,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "return_type" : "type-6",
@@ -6718,10 +6766,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-621",
+   "return_type" : "type-622",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6730,10 +6778,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-621"
+     "referenced_type" : "type-622"
     }
    ],
-   "return_type" : "type-680",
+   "return_type" : "type-679",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6745,13 +6793,13 @@
      "referenced_type" : "type-628"
     }
    ],
-   "return_type" : "type-623",
+   "return_type" : "type-624",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
    "function_name" : "android::GraphicBuffer::dumpAllocationsToSystemLog",
    "linker_set_key" : "_ZN7android13GraphicBuffer26dumpAllocationsToSystemLogEv",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6763,7 +6811,7 @@
      "referenced_type" : "type-636"
     }
    ],
-   "return_type" : "type-679",
+   "return_type" : "type-678",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6773,24 +6821,24 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6800,27 +6848,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6830,10 +6878,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6843,27 +6891,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6873,30 +6921,30 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6906,33 +6954,33 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6942,16 +6990,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6961,19 +7009,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6983,7 +7031,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
      "referenced_type" : "type-1251"
@@ -6998,7 +7046,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7008,34 +7056,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-629"
+     "referenced_type" : "type-630"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7045,26 +7093,26 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1465"
+     "referenced_type" : "type-1468"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7074,25 +7122,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1132"
@@ -7101,7 +7149,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7111,29 +7159,29 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1466"
+     "referenced_type" : "type-1469"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7143,10 +7191,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7156,34 +7204,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-629"
+     "referenced_type" : "type-630"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7193,26 +7241,26 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1467"
+     "referenced_type" : "type-1470"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7222,25 +7270,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1132"
@@ -7249,7 +7297,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7259,29 +7307,29 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1468"
+     "referenced_type" : "type-1471"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7291,10 +7339,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7305,10 +7353,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7319,10 +7367,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7333,10 +7381,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7345,16 +7393,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/PixelFormat.h"
   },
   {
    "function_name" : "android::Gralloc2Mapper::preload",
    "linker_set_key" : "_ZN7android14Gralloc2Mapper7preloadEv",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7364,10 +7412,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-343"
+     "referenced_type" : "type-340"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7377,10 +7425,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-343"
+     "referenced_type" : "type-340"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7396,10 +7444,10 @@
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7415,7 +7463,7 @@
      "referenced_type" : "type-970"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7431,7 +7479,7 @@
      "referenced_type" : "type-970"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7444,7 +7492,7 @@
      "referenced_type" : "type-966"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7457,7 +7505,7 @@
      "referenced_type" : "type-966"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7483,13 +7531,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-360"
+     "referenced_type" : "type-357"
     },
     {
-     "referenced_type" : "type-354"
+     "referenced_type" : "type-351"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7499,13 +7547,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-360"
+     "referenced_type" : "type-357"
     },
     {
-     "referenced_type" : "type-354"
+     "referenced_type" : "type-351"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7524,7 +7572,7 @@
      "referenced_type" : "type-1042"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -7543,7 +7591,7 @@
      "referenced_type" : "type-1042"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -7553,16 +7601,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1405"
+     "referenced_type" : "type-1409"
     },
     {
      "referenced_type" : "type-1361"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -7573,10 +7621,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1405"
+     "referenced_type" : "type-1409"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -7586,13 +7634,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1405"
+     "referenced_type" : "type-1409"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-1469",
+   "return_type" : "type-1472",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -7602,19 +7650,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
    "function_name" : "android::GraphicBufferMapper::preloadHal",
    "linker_set_key" : "_ZN7android19GraphicBufferMapper10preloadHalEv",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7624,28 +7672,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-350"
+     "referenced_type" : "type-347"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7655,16 +7703,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7674,34 +7722,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-343"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7711,25 +7759,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7739,19 +7787,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7761,30 +7809,30 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7794,13 +7842,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7810,33 +7858,33 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7846,36 +7894,36 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7885,22 +7933,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7911,10 +7959,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7925,10 +7973,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7937,16 +7985,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2448"
+     "referenced_type" : "type-2450"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/UiConfig.h"
   },
   {
    "function_name" : "android::GraphicBufferAllocator::dumpToSystemLog",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocator15dumpToSystemLogEv",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -7956,13 +8004,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -7972,93 +8020,93 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-126"
+    },
+    {
+     "referenced_type" : "type-343"
     },
     {
      "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-122"
-    },
-    {
-     "referenced_type" : "type-124"
-    },
-    {
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorC1Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorC2Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::~GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorD1Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::~GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorD2Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -8071,7 +8119,7 @@
      "referenced_type" : "type-1359"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -8084,7 +8132,7 @@
      "referenced_type" : "type-1359"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -8094,7 +8142,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     },
     {
      "referenced_type" : "type-10"
@@ -8103,7 +8151,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8113,7 +8161,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     },
     {
      "referenced_type" : "type-10"
@@ -8128,7 +8176,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8138,10 +8186,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-10"
@@ -8150,7 +8198,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8160,10 +8208,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8199,13 +8247,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     },
     {
-     "referenced_type" : "type-2438"
+     "referenced_type" : "type-2440"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8215,13 +8263,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8231,10 +8279,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8244,13 +8292,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     },
     {
-     "referenced_type" : "type-2438"
+     "referenced_type" : "type-2440"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8260,13 +8308,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8276,10 +8324,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8289,10 +8337,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8302,10 +8350,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8315,13 +8363,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     },
     {
-     "referenced_type" : "type-2438"
+     "referenced_type" : "type-2440"
     }
    ],
-   "return_type" : "type-2442",
+   "return_type" : "type-2444",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8334,7 +8382,7 @@
      "referenced_type" : "type-1296"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
   },
   {
@@ -8347,16 +8395,16 @@
      "referenced_type" : "type-1296"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1300",
@@ -8372,10 +8420,10 @@
      "referenced_type" : "type-1296"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1300",
@@ -8391,10 +8439,10 @@
      "referenced_type" : "type-1296"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1300",
@@ -8410,10 +8458,10 @@
      "referenced_type" : "type-1358"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8426,10 +8474,10 @@
      "referenced_type" : "type-1358"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8438,7 +8486,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "referenced_type" : "type-1361"
@@ -8456,7 +8504,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-889"
+     "referenced_type" : "type-879"
     },
     {
      "referenced_type" : "type-1361"
@@ -8490,7 +8538,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8506,7 +8554,7 @@
      "referenced_type" : "type-1341"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8519,10 +8567,10 @@
      "referenced_type" : "type-1358"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8538,7 +8586,7 @@
      "referenced_type" : "type-1341"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8551,10 +8599,10 @@
      "referenced_type" : "type-1358"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8564,13 +8612,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8580,13 +8628,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8596,19 +8644,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8619,16 +8667,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8639,22 +8687,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8665,16 +8713,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8684,16 +8732,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8703,10 +8751,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8716,22 +8764,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8741,19 +8789,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8763,25 +8811,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8791,19 +8839,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8813,25 +8861,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8840,10 +8888,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8853,13 +8901,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8869,16 +8917,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8888,16 +8936,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8907,10 +8955,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8920,13 +8968,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8936,13 +8984,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8952,19 +9000,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8974,13 +9022,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8990,13 +9038,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9006,19 +9054,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9028,13 +9076,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9044,13 +9092,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9060,19 +9108,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9082,10 +9130,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "default_arg" : true,
@@ -9102,7 +9150,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-10"
@@ -9111,7 +9159,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9121,19 +9169,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9143,16 +9191,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9162,16 +9210,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9181,13 +9229,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9197,13 +9245,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9213,10 +9261,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9226,13 +9274,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9242,13 +9290,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9258,10 +9306,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9271,10 +9319,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9284,10 +9332,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9297,13 +9345,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9313,10 +9361,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     }
    ],
-   "return_type" : "type-284",
+   "return_type" : "type-12",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9326,13 +9374,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9342,13 +9390,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-1394"
+     "referenced_type" : "type-1398"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9358,7 +9406,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
      "referenced_type" : "type-1251"
@@ -9373,7 +9421,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9383,13 +9431,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9399,13 +9447,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9415,13 +9463,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9431,13 +9479,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9447,13 +9495,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-1410"
+     "referenced_type" : "type-1415"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9463,13 +9511,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9480,7 +9528,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
      "referenced_type" : "type-1361"
@@ -9489,7 +9537,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9499,13 +9547,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9515,13 +9563,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-1410"
+     "referenced_type" : "type-1415"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9531,13 +9579,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9548,7 +9596,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
      "referenced_type" : "type-1361"
@@ -9557,7 +9605,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9567,25 +9615,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
    "function_name" : "android::Singleton<android::GraphicBufferMapper>::getInstance",
    "linker_set_key" : "_ZN7android9SingletonINS_19GraphicBufferMapperEE11getInstanceEv",
-   "return_type" : "type-526",
+   "return_type" : "type-524",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "function_name" : "android::Singleton<android::GraphicBufferAllocator>::getInstance",
    "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11getInstanceEv",
-   "return_type" : "type-544",
+   "return_type" : "type-541",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
@@ -9595,7 +9643,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1429"
+     "referenced_type" : "type-1433"
     }
    ],
    "return_type" : "type-6",
@@ -9608,10 +9656,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1429"
+     "referenced_type" : "type-1433"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
   {
@@ -9621,16 +9669,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1429"
+     "referenced_type" : "type-1433"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
   {
@@ -9650,7 +9698,7 @@
      "referenced_type" : "type-1119"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9664,13 +9712,13 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9684,13 +9732,13 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9704,16 +9752,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9727,16 +9775,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9750,16 +9798,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9773,16 +9821,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9792,10 +9840,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9805,28 +9853,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-350"
+     "referenced_type" : "type-347"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9836,7 +9884,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
    "return_type" : "type-636",
@@ -9849,10 +9897,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9862,7 +9910,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
    "return_type" : "type-628",
@@ -9875,7 +9923,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     },
     {
      "referenced_type" : "type-1249"
@@ -9890,7 +9938,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9900,10 +9948,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9913,13 +9961,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -9929,28 +9977,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-350"
+     "referenced_type" : "type-347"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -9960,16 +10008,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
      "referenced_type" : "type-1122"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-343"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -9979,16 +10027,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -9998,19 +10046,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10020,31 +10068,31 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10055,13 +10103,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-351"
+     "referenced_type" : "type-348"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10071,25 +10119,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10099,31 +10147,31 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10133,13 +10181,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10149,7 +10197,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     }
    ],
    "return_type" : "type-6",
@@ -10162,10 +10210,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-973"
+     "referenced_type" : "type-974"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -10175,16 +10223,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-973"
+     "referenced_type" : "type-974"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -10194,10 +10242,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-362"
+     "referenced_type" : "type-359"
     }
    ],
-   "return_type" : "type-1566",
+   "return_type" : "type-1569",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10207,34 +10255,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-362"
+     "referenced_type" : "type-359"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-126"
+    },
+    {
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-123"
-    },
-    {
-     "referenced_type" : "type-122"
-    },
-    {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-343"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10244,7 +10292,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-362"
+     "referenced_type" : "type-359"
     }
    ],
    "return_type" : "type-6",
@@ -10257,10 +10305,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-721"
+     "referenced_type" : "type-722"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -10270,13 +10318,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-721"
+     "referenced_type" : "type-722"
     },
     {
      "referenced_type" : "type-723"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -10286,13 +10334,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1241",
@@ -10305,7 +10353,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
    "return_type" : "type-6",
@@ -10318,10 +10366,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10331,7 +10379,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
    "return_type" : "type-10",
@@ -10344,7 +10392,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
    "return_type" : "type-10",
@@ -10357,7 +10405,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
    "return_type" : "type-10",
@@ -10370,7 +10418,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
    "return_type" : "type-10",
@@ -10383,13 +10431,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10399,16 +10447,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
-    },
-    {
      "referenced_type" : "type-2443"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-2445"
+    },
+    {
+     "referenced_type" : "type-283"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10419,10 +10467,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10432,10 +10480,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10445,10 +10493,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
-   "return_type" : "type-2434",
+   "return_type" : "type-2436",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10458,10 +10506,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
-   "return_type" : "type-2427",
+   "return_type" : "type-2429",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10471,7 +10519,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
      "referenced_type" : "type-1246"
@@ -10491,13 +10539,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10507,13 +10555,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
      "referenced_type" : "type-1050"
     }
    ],
-   "return_type" : "type-22",
+   "return_type" : "type-23",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10523,13 +10571,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
      "referenced_type" : "type-1054"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-18",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10539,7 +10587,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
      "referenced_type" : "type-1280"
@@ -10555,16 +10603,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-22",
+   "return_type" : "type-23",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10574,10 +10622,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "return_type" : "type-1054",
@@ -10590,13 +10638,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
-     "referenced_type" : "type-2438"
+     "referenced_type" : "type-2440"
     }
    ],
-   "return_type" : "type-2434",
+   "return_type" : "type-2436",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10644,13 +10692,13 @@
      "referenced_type" : "type-1299"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1241",
@@ -10714,7 +10762,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10727,7 +10775,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-284",
+   "return_type" : "type-12",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10740,7 +10788,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10753,7 +10801,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10778,7 +10826,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10788,13 +10836,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10804,13 +10852,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10820,19 +10868,19 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2396"
+    },
+    {
      "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10842,10 +10890,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10855,10 +10903,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
    "return_type" : "type-6",
@@ -10871,7 +10919,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     }
    ],
    "return_type" : "type-1299",
@@ -10884,17 +10932,17 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10904,20 +10952,20 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10927,7 +10975,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     }
    ],
    "return_type" : "type-1299",
@@ -10940,13 +10988,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10956,13 +11004,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10972,19 +11020,19 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2396"
+    },
+    {
      "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10994,16 +11042,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11013,7 +11061,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
      "referenced_type" : "type-1284"
@@ -11029,13 +11077,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-6",
@@ -11048,10 +11096,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     }
    ],
    "return_type" : "type-1299",
@@ -11064,13 +11112,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11080,13 +11128,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11096,19 +11144,19 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2396"
+    },
+    {
      "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11118,13 +11166,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11134,13 +11182,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11150,19 +11198,19 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2396"
+    },
+    {
      "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11173,16 +11221,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11193,22 +11241,22 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2396"
+    },
+    {
      "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11219,16 +11267,16 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2396"
+    },
+    {
      "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2392"
-    },
-    {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11238,16 +11286,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11258,16 +11306,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2387"
+     "referenced_type" : "type-2389"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11278,16 +11326,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2387"
+     "referenced_type" : "type-2389"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11298,19 +11346,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2387"
+     "referenced_type" : "type-2389"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11321,19 +11369,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2387"
+     "referenced_type" : "type-2389"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11344,19 +11392,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2387"
+     "referenced_type" : "type-2389"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11367,19 +11415,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2387"
+     "referenced_type" : "type-2389"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11389,10 +11437,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1396"
+     "referenced_type" : "type-1400"
     }
    ],
-   "return_type" : "type-1383",
+   "return_type" : "type-1387",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11402,10 +11450,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1396"
+     "referenced_type" : "type-1400"
     }
    ],
-   "return_type" : "type-284",
+   "return_type" : "type-12",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11415,7 +11463,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1396"
+     "referenced_type" : "type-1400"
     }
    ],
    "return_type" : "type-6",
@@ -11428,10 +11476,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1394"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11441,10 +11489,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1394"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11454,7 +11502,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1394"
     },
     {
      "referenced_type" : "type-1249"
@@ -11469,24 +11517,24 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   }
  ],
  "global_vars" :
  [
   {
-   "access" : "private",
+   "access" : "protected",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocator10sAllocListE",
    "name" : "android::GraphicBufferAllocator::sAllocList",
-   "referenced_type" : "type-1570",
+   "referenced_type" : "type-1573",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocator5sLockE",
    "name" : "android::GraphicBufferAllocator::sLock",
-   "referenced_type" : "type-252",
+   "referenced_type" : "type-280",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -11522,41 +11570,41 @@
   {
    "linker_set_key" : "_ZN7android6Region14INVALID_REGIONE",
    "name" : "android::Region::INVALID_REGION",
-   "referenced_type" : "type-2388",
+   "referenced_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
    "linker_set_key" : "_ZN7android9FenceTime8NO_FENCEE",
    "name" : "android::FenceTime::NO_FENCE",
-   "referenced_type" : "type-1391",
+   "referenced_type" : "type-1395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_19GraphicBufferMapperEE5sLockE",
    "name" : "android::Singleton<android::GraphicBufferMapper>::sLock",
-   "referenced_type" : "type-252",
+   "referenced_type" : "type-280",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_19GraphicBufferMapperEE9sInstanceE",
    "name" : "android::Singleton<android::GraphicBufferMapper>::sInstance",
-   "referenced_type" : "type-539",
+   "referenced_type" : "type-537",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE5sLockE",
    "name" : "android::Singleton<android::GraphicBufferAllocator>::sLock",
-   "referenced_type" : "type-252",
+   "referenced_type" : "type-280",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE9sInstanceE",
    "name" : "android::Singleton<android::GraphicBufferAllocator>::sInstance",
-   "referenced_type" : "type-545",
+   "referenced_type" : "type-542",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   }
  ],
@@ -11566,8 +11614,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot &",
    "name" : "android::FenceTime::Snapshot &",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1387",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1392",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -11575,8 +11623,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot::State &",
    "name" : "android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1408",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1412",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -11584,8 +11632,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferAllocator &",
    "name" : "android::GraphicBufferAllocator &",
-   "referenced_type" : "type-542",
-   "self_type" : "type-544",
+   "referenced_type" : "type-539",
+   "self_type" : "type-541",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -11593,8 +11641,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-527",
-   "self_type" : "type-526",
+   "referenced_type" : "type-525",
+   "self_type" : "type-524",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -11611,8 +11659,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex &",
    "name" : "android::Mutex &",
-   "referenced_type" : "type-252",
-   "self_type" : "type-256",
+   "referenced_type" : "type-280",
+   "self_type" : "type-1379",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -11629,8 +11677,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock &",
    "name" : "android::RWLock &",
-   "referenced_type" : "type-262",
-   "self_type" : "type-266",
+   "referenced_type" : "type-258",
+   "self_type" : "type-262",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -11647,8 +11695,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Region &",
    "name" : "android::Region &",
-   "referenced_type" : "type-2389",
-   "self_type" : "type-2393",
+   "referenced_type" : "type-2391",
+   "self_type" : "type-2395",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -11656,8 +11704,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
-   "referenced_type" : "type-179",
-   "self_type" : "type-188",
+   "referenced_type" : "type-182",
+   "self_type" : "type-190",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -11665,8 +11713,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
-   "referenced_type" : "type-285",
-   "self_type" : "type-890",
+   "referenced_type" : "type-282",
+   "self_type" : "type-888",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -11674,8 +11722,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<android::Rect> &",
    "name" : "android::Vector<android::Rect> &",
-   "referenced_type" : "type-2382",
-   "self_type" : "type-2386",
+   "referenced_type" : "type-2384",
+   "self_type" : "type-2388",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -11692,8 +11740,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TMat44<float> &",
    "name" : "android::details::TMat44<float> &",
-   "referenced_type" : "type-2427",
-   "self_type" : "type-2433",
+   "referenced_type" : "type-2429",
+   "self_type" : "type-2435",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -11701,8 +11749,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TQuaternion<double> &",
    "name" : "android::details::TQuaternion<double> &",
-   "referenced_type" : "type-331",
-   "self_type" : "type-406",
+   "referenced_type" : "type-328",
+   "self_type" : "type-403",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -11710,8 +11758,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TQuaternion<float> &",
    "name" : "android::details::TQuaternion<float> &",
-   "referenced_type" : "type-410",
-   "self_type" : "type-438",
+   "referenced_type" : "type-407",
+   "self_type" : "type-435",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -11728,7 +11776,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec2<double> &",
    "name" : "android::details::TVec2<double> &",
-   "referenced_type" : "type-55",
+   "referenced_type" : "type-57",
    "self_type" : "type-1081",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -11737,7 +11785,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec2<float> &",
    "name" : "android::details::TVec2<float> &",
-   "referenced_type" : "type-22",
+   "referenced_type" : "type-23",
    "self_type" : "type-1048",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -11746,7 +11794,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<double> &",
    "name" : "android::details::TVec3<double> &",
-   "referenced_type" : "type-66",
+   "referenced_type" : "type-68",
    "self_type" : "type-1390",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
@@ -11755,7 +11803,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<float> &",
    "name" : "android::details::TVec3<float> &",
-   "referenced_type" : "type-17",
+   "referenced_type" : "type-18",
    "self_type" : "type-1052",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -11764,8 +11812,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<double> &",
    "name" : "android::details::TVec4<double> &",
-   "referenced_type" : "type-50",
-   "self_type" : "type-185",
+   "referenced_type" : "type-52",
+   "self_type" : "type-181",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -11773,8 +11821,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<float> &",
    "name" : "android::details::TVec4<float> &",
-   "referenced_type" : "type-200",
-   "self_type" : "type-330",
+   "referenced_type" : "type-192",
+   "self_type" : "type-327",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -11782,8 +11830,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &",
-   "referenced_type" : "type-99",
-   "self_type" : "type-108",
+   "referenced_type" : "type-101",
+   "self_type" : "type-110",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11791,8 +11839,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &",
-   "referenced_type" : "type-393",
-   "self_type" : "type-400",
+   "referenced_type" : "type-392",
+   "self_type" : "type-397",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11800,8 +11848,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &",
-   "referenced_type" : "type-111",
-   "self_type" : "type-114",
+   "referenced_type" : "type-113",
+   "self_type" : "type-116",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11818,7 +11866,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status &",
    "name" : "android::hardware::Status &",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1313",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -11827,8 +11875,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1658",
-   "self_type" : "type-1657",
+   "referenced_type" : "type-1662",
+   "self_type" : "type-1661",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11836,8 +11884,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1872",
-   "self_type" : "type-1871",
+   "referenced_type" : "type-1873",
+   "self_type" : "type-1872",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11845,8 +11893,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1948",
-   "self_type" : "type-1947",
+   "referenced_type" : "type-1950",
+   "self_type" : "type-1949",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11854,8 +11902,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-230",
-   "self_type" : "type-229",
+   "referenced_type" : "type-232",
+   "self_type" : "type-231",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11863,8 +11911,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-431",
-   "self_type" : "type-430",
+   "referenced_type" : "type-428",
+   "self_type" : "type-427",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11872,8 +11920,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int> &",
    "name" : "android::hardware::details::hidl_pointer<unsigned int> &",
-   "referenced_type" : "type-120",
-   "self_type" : "type-178",
+   "referenced_type" : "type-122",
+   "self_type" : "type-180",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11890,8 +11938,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned int> &",
    "name" : "android::hardware::hidl_vec<unsigned int> &",
-   "referenced_type" : "type-128",
-   "self_type" : "type-131",
+   "referenced_type" : "type-131",
+   "self_type" : "type-133",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11909,7 +11957,7 @@
    "linker_set_key" : "android::sp<android::Fence> &",
    "name" : "android::sp<android::Fence> &",
    "referenced_type" : "type-1357",
-   "self_type" : "type-1411",
+   "self_type" : "type-1416",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11917,8 +11965,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &",
-   "referenced_type" : "type-355",
-   "self_type" : "type-377",
+   "referenced_type" : "type-352",
+   "self_type" : "type-374",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11926,8 +11974,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &",
-   "referenced_type" : "type-484",
-   "self_type" : "type-489",
+   "referenced_type" : "type-481",
+   "self_type" : "type-487",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11935,8 +11983,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &",
-   "referenced_type" : "type-338",
-   "self_type" : "type-385",
+   "referenced_type" : "type-335",
+   "self_type" : "type-382",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11944,8 +11992,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
-   "referenced_type" : "type-86",
-   "self_type" : "type-93",
+   "referenced_type" : "type-88",
+   "self_type" : "type-95",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11953,8 +12001,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &",
-   "referenced_type" : "type-497",
-   "self_type" : "type-503",
+   "referenced_type" : "type-494",
+   "self_type" : "type-500",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11962,8 +12010,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ui::Transform &",
    "name" : "android::ui::Transform &",
-   "referenced_type" : "type-2434",
-   "self_type" : "type-2442",
+   "referenced_type" : "type-2436",
+   "self_type" : "type-2444",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -11986,50 +12034,50 @@
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-1771",
-   "self_type" : "type-1773",
+   "referenced_type" : "type-1772",
+   "self_type" : "type-1774",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-2133",
-   "self_type" : "type-2165",
+   "referenced_type" : "type-2132",
+   "self_type" : "type-2167",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-2406",
-   "self_type" : "type-2408",
+   "referenced_type" : "type-2408",
+   "self_type" : "type-2410",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-1762",
-   "self_type" : "type-1764",
+   "referenced_type" : "type-1763",
+   "self_type" : "type-1765",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-2046",
-   "self_type" : "type-2056",
+   "referenced_type" : "type-2044",
+   "self_type" : "type-2054",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-2424",
-   "self_type" : "type-2426",
+   "referenced_type" : "type-2426",
+   "self_type" : "type-2428",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-961",
-   "self_type" : "type-974",
+   "referenced_type" : "type-958",
+   "self_type" : "type-972",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
@@ -12045,7 +12093,7 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ColorSpace::TransferParameters &",
    "name" : "const android::ColorSpace::TransferParameters &",
-   "referenced_type" : "type-1033",
+   "referenced_type" : "type-1030",
    "self_type" : "type-1041",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
@@ -12054,8 +12102,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot &",
    "name" : "const android::FenceTime::Snapshot &",
-   "referenced_type" : "type-1388",
-   "self_type" : "type-1394",
+   "referenced_type" : "type-1393",
+   "self_type" : "type-1398",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -12063,8 +12111,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-1406",
-   "self_type" : "type-1407",
+   "referenced_type" : "type-1410",
+   "self_type" : "type-1411",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -12081,8 +12129,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Gralloc2Mapper &",
    "name" : "const android::Gralloc2Mapper &",
-   "referenced_type" : "type-344",
-   "self_type" : "type-354",
+   "referenced_type" : "type-341",
+   "self_type" : "type-351",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -12090,8 +12138,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-2059",
-   "self_type" : "type-2058",
+   "referenced_type" : "type-2061",
+   "self_type" : "type-2060",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12099,8 +12147,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-2225",
-   "self_type" : "type-2224",
+   "referenced_type" : "type-2228",
+   "self_type" : "type-2227",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12108,8 +12156,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-2229",
-   "self_type" : "type-2228",
+   "referenced_type" : "type-2231",
+   "self_type" : "type-2230",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12126,8 +12174,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-802",
-   "self_type" : "type-801",
+   "referenced_type" : "type-803",
+   "self_type" : "type-802",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12135,8 +12183,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-827",
-   "self_type" : "type-826",
+   "referenced_type" : "type-828",
+   "self_type" : "type-827",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12145,7 +12193,7 @@
    "linker_set_key" : "const android::GraphicBufferAllocator::alloc_rec_t &",
    "name" : "const android::GraphicBufferAllocator::alloc_rec_t &",
    "referenced_type" : "type-706",
-   "self_type" : "type-707",
+   "self_type" : "type-708",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12153,8 +12201,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBufferMapper &",
    "name" : "const android::GraphicBufferMapper &",
-   "referenced_type" : "type-614",
-   "self_type" : "type-630",
+   "referenced_type" : "type-615",
+   "self_type" : "type-631",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -12180,8 +12228,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Region &",
    "name" : "const android::Region &",
-   "referenced_type" : "type-2388",
-   "self_type" : "type-2392",
+   "referenced_type" : "type-2390",
+   "self_type" : "type-2394",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -12189,8 +12237,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-184",
-   "self_type" : "type-187",
+   "referenced_type" : "type-187",
+   "self_type" : "type-189",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -12198,8 +12246,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 &",
    "name" : "const android::String8 &",
-   "referenced_type" : "type-873",
-   "self_type" : "type-889",
+   "referenced_type" : "type-863",
+   "self_type" : "type-879",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -12207,8 +12255,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::Rect> &",
    "name" : "const android::Vector<android::Rect> &",
-   "referenced_type" : "type-2384",
-   "self_type" : "type-2385",
+   "referenced_type" : "type-2386",
+   "self_type" : "type-2387",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -12216,8 +12264,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TMat33<float> &",
    "name" : "const android::details::TMat33<float> &",
-   "referenced_type" : "type-925",
-   "self_type" : "type-934",
+   "referenced_type" : "type-919",
+   "self_type" : "type-926",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -12225,8 +12273,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TMat44<float> &",
    "name" : "const android::details::TMat44<float> &",
-   "referenced_type" : "type-2431",
-   "self_type" : "type-2432",
+   "referenced_type" : "type-2433",
+   "self_type" : "type-2434",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -12234,8 +12282,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TQuaternion<double> &",
    "name" : "const android::details::TQuaternion<double> &",
-   "referenced_type" : "type-404",
-   "self_type" : "type-405",
+   "referenced_type" : "type-401",
+   "self_type" : "type-402",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -12243,8 +12291,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TQuaternion<float> &",
    "name" : "const android::details::TQuaternion<float> &",
-   "referenced_type" : "type-432",
-   "self_type" : "type-433",
+   "referenced_type" : "type-429",
+   "self_type" : "type-430",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -12297,8 +12345,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TVec4<double> &",
    "name" : "const android::details::TVec4<double> &",
-   "referenced_type" : "type-166",
-   "self_type" : "type-177",
+   "referenced_type" : "type-164",
+   "self_type" : "type-171",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -12306,8 +12354,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TVec4<float> &",
    "name" : "const android::details::TVec4<float> &",
-   "referenced_type" : "type-325",
-   "self_type" : "type-326",
+   "referenced_type" : "type-322",
+   "self_type" : "type-323",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -12315,8 +12363,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-231",
-   "self_type" : "type-232",
+   "referenced_type" : "type-233",
+   "self_type" : "type-234",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -12378,8 +12426,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned int> &",
    "name" : "const android::hardware::hidl_vec<unsigned int> &",
-   "referenced_type" : "type-132",
-   "self_type" : "type-133",
+   "referenced_type" : "type-134",
+   "self_type" : "type-135",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12397,7 +12445,7 @@
    "linker_set_key" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> &",
    "name" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> &",
    "referenced_type" : "type-693",
-   "self_type" : "type-695",
+   "self_type" : "type-698",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12414,8 +12462,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
    "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-273",
-   "self_type" : "type-272",
+   "referenced_type" : "type-269",
+   "self_type" : "type-268",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -12423,8 +12471,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
-   "referenced_type" : "type-91",
-   "self_type" : "type-92",
+   "referenced_type" : "type-93",
+   "self_type" : "type-94",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12450,8 +12498,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ui::Transform &",
    "name" : "const android::ui::Transform &",
-   "referenced_type" : "type-2437",
-   "self_type" : "type-2438",
+   "referenced_type" : "type-2439",
+   "self_type" : "type-2440",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -12459,7 +12507,7 @@
    "alignment" : 4,
    "linker_set_key" : "const bool &",
    "name" : "const bool &",
-   "referenced_type" : "type-370",
+   "referenced_type" : "type-367",
    "self_type" : "type-1276",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -12468,7 +12516,7 @@
    "alignment" : 4,
    "linker_set_key" : "const double &",
    "name" : "const double &",
-   "referenced_type" : "type-853",
+   "referenced_type" : "type-850",
    "self_type" : "type-859",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -12477,7 +12525,7 @@
    "alignment" : 4,
    "linker_set_key" : "const float &",
    "name" : "const float &",
-   "referenced_type" : "type-563",
+   "referenced_type" : "type-560",
    "self_type" : "type-1218",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -12492,30 +12540,30 @@
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-1774",
-   "self_type" : "type-1776",
+   "referenced_type" : "type-1775",
+   "self_type" : "type-1777",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-2209",
+   "referenced_type" : "type-2207",
    "self_type" : "type-2221",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-2412",
-   "self_type" : "type-2414",
+   "referenced_type" : "type-2414",
+   "self_type" : "type-2416",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const int &",
    "name" : "const int &",
-   "referenced_type" : "type-562",
-   "self_type" : "type-837",
+   "referenced_type" : "type-559",
+   "self_type" : "type-835",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12538,106 +12586,106 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-125",
-   "self_type" : "type-127",
+   "referenced_type" : "type-128",
+   "self_type" : "type-130",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1576",
-   "self_type" : "type-1578",
+   "referenced_type" : "type-1580",
+   "self_type" : "type-1582",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1611",
-   "self_type" : "type-1613",
+   "referenced_type" : "type-1616",
+   "self_type" : "type-1618",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1786",
-   "self_type" : "type-1788",
+   "referenced_type" : "type-1787",
+   "self_type" : "type-1789",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1847",
-   "self_type" : "type-1849",
+   "referenced_type" : "type-1848",
+   "self_type" : "type-1850",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1866",
-   "self_type" : "type-1868",
+   "referenced_type" : "type-1867",
+   "self_type" : "type-1869",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1933",
-   "self_type" : "type-1935",
+   "referenced_type" : "type-1935",
+   "self_type" : "type-1937",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2079",
-   "self_type" : "type-2081",
+   "referenced_type" : "type-2081",
+   "self_type" : "type-2083",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2170",
-   "self_type" : "type-2173",
+   "referenced_type" : "type-2173",
+   "self_type" : "type-2176",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2247",
-   "self_type" : "type-2249",
+   "referenced_type" : "type-2249",
+   "self_type" : "type-2251",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2289",
-   "self_type" : "type-2291",
+   "referenced_type" : "type-2291",
+   "self_type" : "type-2293",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2340",
-   "self_type" : "type-2342",
+   "referenced_type" : "type-2342",
+   "self_type" : "type-2344",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2471",
-   "self_type" : "type-2473",
+   "referenced_type" : "type-2473",
+   "self_type" : "type-2475",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-36",
-   "self_type" : "type-39",
+   "referenced_type" : "type-39",
+   "self_type" : "type-41",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-416",
-   "self_type" : "type-418",
+   "referenced_type" : "type-413",
+   "self_type" : "type-415",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12650,15 +12698,15 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-747",
+   "referenced_type" : "type-748",
    "self_type" : "type-750",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-854",
-   "self_type" : "type-856",
+   "referenced_type" : "type-856",
+   "self_type" : "type-858",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12697,8 +12745,8 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle *const &",
    "name" : "const native_handle *const &",
-   "referenced_type" : "type-696",
-   "self_type" : "type-697",
+   "referenced_type" : "type-699",
+   "self_type" : "type-700",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12706,8 +12754,8 @@
    "alignment" : 4,
    "linker_set_key" : "const short &",
    "name" : "const short &",
-   "referenced_type" : "type-825",
-   "self_type" : "type-829",
+   "referenced_type" : "type-823",
+   "self_type" : "type-826",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12716,7 +12764,7 @@
    "linker_set_key" : "const signed char &",
    "name" : "const signed char &",
    "referenced_type" : "type-799",
-   "self_type" : "type-804",
+   "self_type" : "type-801",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12733,8 +12781,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3> &",
    "name" : "const std::array<android::details::TVec2<float>, 3> &",
-   "referenced_type" : "type-1768",
-   "self_type" : "type-1770",
+   "referenced_type" : "type-1769",
+   "self_type" : "type-1771",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12742,8 +12790,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3> &",
    "name" : "const std::array<android::details::TVec2<float>, 3> &",
-   "referenced_type" : "type-2121",
-   "self_type" : "type-2129",
+   "referenced_type" : "type-2119",
+   "self_type" : "type-2125",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12751,8 +12799,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1015",
-   "self_type" : "type-1029",
+   "referenced_type" : "type-1007",
+   "self_type" : "type-1021",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12760,8 +12808,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1765",
-   "self_type" : "type-1767",
+   "referenced_type" : "type-1766",
+   "self_type" : "type-1768",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12769,7 +12817,7 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2103",
+   "referenced_type" : "type-2099",
    "self_type" : "type-2113",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
@@ -12787,8 +12835,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<float (float)> &",
    "name" : "const std::function<float (float)> &",
-   "referenced_type" : "type-1777",
-   "self_type" : "type-1779",
+   "referenced_type" : "type-1778",
+   "self_type" : "type-1780",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -12796,8 +12844,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<float (float)> &",
    "name" : "const std::function<float (float)> &",
-   "referenced_type" : "type-2222",
-   "self_type" : "type-2227",
+   "referenced_type" : "type-2224",
+   "self_type" : "type-2226",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -12805,8 +12853,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-1391",
-   "self_type" : "type-1401",
+   "referenced_type" : "type-1395",
+   "self_type" : "type-1405",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -12814,8 +12862,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-1839",
-   "self_type" : "type-1841",
+   "referenced_type" : "type-1840",
+   "self_type" : "type-1842",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -12823,8 +12871,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-2662",
-   "self_type" : "type-2669",
+   "referenced_type" : "type-2667",
+   "self_type" : "type-2674",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -12832,8 +12880,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> > &",
    "name" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> > &",
-   "referenced_type" : "type-2330",
-   "self_type" : "type-2332",
+   "referenced_type" : "type-2332",
+   "self_type" : "type-2334",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -12850,8 +12898,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1031",
-   "self_type" : "type-1030",
+   "referenced_type" : "type-1032",
+   "self_type" : "type-1031",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12868,8 +12916,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1581",
-   "self_type" : "type-1580",
+   "referenced_type" : "type-1585",
+   "self_type" : "type-1584",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12877,8 +12925,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1712",
-   "self_type" : "type-1711",
+   "referenced_type" : "type-1713",
+   "self_type" : "type-1712",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12886,8 +12934,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1825",
-   "self_type" : "type-1824",
+   "referenced_type" : "type-1826",
+   "self_type" : "type-1825",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12895,8 +12943,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1851",
-   "self_type" : "type-1850",
+   "referenced_type" : "type-1852",
+   "self_type" : "type-1851",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12904,8 +12952,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1902",
-   "self_type" : "type-1901",
+   "referenced_type" : "type-1903",
+   "self_type" : "type-1902",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12913,8 +12961,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1993",
-   "self_type" : "type-1992",
+   "referenced_type" : "type-1994",
+   "self_type" : "type-1993",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12922,8 +12970,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2074",
-   "self_type" : "type-2073",
+   "referenced_type" : "type-2076",
+   "self_type" : "type-2075",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12931,8 +12979,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2149",
-   "self_type" : "type-2148",
+   "referenced_type" : "type-2152",
+   "self_type" : "type-2151",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12940,8 +12988,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2232",
-   "self_type" : "type-2231",
+   "referenced_type" : "type-2234",
+   "self_type" : "type-2233",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12949,8 +12997,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2327",
-   "self_type" : "type-2326",
+   "referenced_type" : "type-2329",
+   "self_type" : "type-2328",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12958,8 +13006,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2378",
-   "self_type" : "type-2377",
+   "referenced_type" : "type-2380",
+   "self_type" : "type-2379",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12967,8 +13015,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2565",
-   "self_type" : "type-2564",
+   "referenced_type" : "type-2567",
+   "self_type" : "type-2566",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12976,8 +13024,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-328",
-   "self_type" : "type-327",
+   "referenced_type" : "type-325",
+   "self_type" : "type-324",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12985,8 +13033,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-45",
-   "self_type" : "type-44",
+   "referenced_type" : "type-47",
+   "self_type" : "type-46",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12994,8 +13042,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-478",
-   "self_type" : "type-477",
+   "referenced_type" : "type-475",
+   "self_type" : "type-474",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13012,8 +13060,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-726",
-   "self_type" : "type-725",
+   "referenced_type" : "type-727",
+   "self_type" : "type-726",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13021,8 +13069,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-832",
-   "self_type" : "type-831",
+   "referenced_type" : "type-833",
+   "self_type" : "type-832",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13030,8 +13078,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-959",
-   "self_type" : "type-958",
+   "referenced_type" : "type-961",
+   "self_type" : "type-960",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13039,8 +13087,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned char &",
    "name" : "const unsigned char &",
-   "referenced_type" : "type-224",
-   "self_type" : "type-821",
+   "referenced_type" : "type-226",
+   "self_type" : "type-812",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13048,8 +13096,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned int &",
    "name" : "const unsigned int &",
-   "referenced_type" : "type-236",
-   "self_type" : "type-846",
+   "referenced_type" : "type-238",
+   "self_type" : "type-842",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13057,7 +13105,7 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long &",
    "name" : "const unsigned long long &",
-   "referenced_type" : "type-226",
+   "referenced_type" : "type-228",
    "self_type" : "type-849",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -13067,7 +13115,7 @@
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
    "referenced_type" : "type-830",
-   "self_type" : "type-834",
+   "self_type" : "type-831",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13093,7 +13141,7 @@
    "alignment" : 4,
    "linker_set_key" : "int &",
    "name" : "int &",
-   "referenced_type" : "type-103",
+   "referenced_type" : "type-105",
    "self_type" : "type-1145",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
@@ -13102,7 +13150,7 @@
    "alignment" : 4,
    "linker_set_key" : "int *&",
    "name" : "int *&",
-   "referenced_type" : "type-593",
+   "referenced_type" : "type-591",
    "self_type" : "type-1347",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
@@ -13111,8 +13159,8 @@
    "alignment" : 4,
    "linker_set_key" : "long long &",
    "name" : "long long &",
-   "referenced_type" : "type-284",
-   "self_type" : "type-1409",
+   "referenced_type" : "type-12",
+   "self_type" : "type-1413",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -13120,8 +13168,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-1753",
-   "self_type" : "type-1752",
+   "referenced_type" : "type-1754",
+   "self_type" : "type-1753",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13129,8 +13177,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-1854",
-   "self_type" : "type-1853",
+   "referenced_type" : "type-1855",
+   "self_type" : "type-1854",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13138,8 +13186,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-2416",
-   "self_type" : "type-2415",
+   "referenced_type" : "type-2418",
+   "self_type" : "type-2417",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13147,8 +13195,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-703",
-   "self_type" : "type-702",
+   "referenced_type" : "type-696",
+   "self_type" : "type-695",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13156,8 +13204,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2147",
-   "self_type" : "type-2146",
+   "referenced_type" : "type-2150",
+   "self_type" : "type-2149",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -13165,8 +13213,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2396",
-   "self_type" : "type-2395",
+   "referenced_type" : "type-2398",
+   "self_type" : "type-2397",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -13174,8 +13222,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2444",
-   "self_type" : "type-2443",
+   "referenced_type" : "type-2446",
+   "self_type" : "type-2445",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -13183,8 +13231,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2449",
-   "self_type" : "type-2448",
+   "referenced_type" : "type-2451",
+   "self_type" : "type-2450",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/UiConfig.h"
   },
@@ -13201,7 +13249,7 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int &",
    "name" : "unsigned int &",
-   "referenced_type" : "type-123",
+   "referenced_type" : "type-125",
    "self_type" : "type-1250",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
@@ -13210,7 +13258,7 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned long long &",
    "name" : "unsigned long long &",
-   "referenced_type" : "type-124",
+   "referenced_type" : "type-126",
    "self_type" : "type-1146",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
@@ -13219,7 +13267,7 @@
    "alignment" : 4,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-227",
+   "referenced_type" : "type-229",
    "self_type" : "type-1249",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
@@ -13231,8 +13279,8 @@
    "alignment" : 4,
    "linker_set_key" : "AHardwareBuffer *",
    "name" : "AHardwareBuffer *",
-   "referenced_type" : "type-2066",
-   "self_type" : "type-2065",
+   "referenced_type" : "type-2069",
+   "self_type" : "type-2068",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -13240,8 +13288,8 @@
    "alignment" : 4,
    "linker_set_key" : "AHardwareBuffer *",
    "name" : "AHardwareBuffer *",
-   "referenced_type" : "type-622",
-   "self_type" : "type-621",
+   "referenced_type" : "type-623",
+   "self_type" : "type-622",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -13249,7 +13297,7 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-517",
+   "referenced_type" : "type-515",
    "self_type" : "type-636",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
@@ -13276,8 +13324,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1833",
-   "self_type" : "type-1832",
+   "referenced_type" : "type-1834",
+   "self_type" : "type-1833",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13285,8 +13333,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1838",
-   "self_type" : "type-1837",
+   "referenced_type" : "type-1839",
+   "self_type" : "type-1838",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13294,8 +13342,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2631",
-   "self_type" : "type-2630",
+   "referenced_type" : "type-2633",
+   "self_type" : "type-2632",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13303,8 +13351,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2653",
-   "self_type" : "type-2652",
+   "referenced_type" : "type-2655",
+   "self_type" : "type-2654",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13321,8 +13369,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1414",
-   "self_type" : "type-1413",
+   "referenced_type" : "type-1418",
+   "self_type" : "type-1417",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13330,8 +13378,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1828",
-   "self_type" : "type-1827",
+   "referenced_type" : "type-1829",
+   "self_type" : "type-1828",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13339,8 +13387,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1843",
-   "self_type" : "type-1842",
+   "referenced_type" : "type-1844",
+   "self_type" : "type-1843",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13348,8 +13396,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2621",
-   "self_type" : "type-2620",
+   "referenced_type" : "type-2623",
+   "self_type" : "type-2622",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13357,8 +13405,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2678",
-   "self_type" : "type-2677",
+   "referenced_type" : "type-2683",
+   "self_type" : "type-2682",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13375,8 +13423,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
    "name" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
-   "referenced_type" : "type-516",
-   "self_type" : "type-537",
+   "referenced_type" : "type-514",
+   "self_type" : "type-534",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
   },
@@ -13385,7 +13433,7 @@
    "linker_set_key" : "android::ColorSpace *",
    "name" : "android::ColorSpace *",
    "referenced_type" : "type-979",
-   "self_type" : "type-1006",
+   "self_type" : "type-1000",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -13402,8 +13450,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Condition *",
    "name" : "android::Condition *",
-   "referenced_type" : "type-258",
-   "self_type" : "type-261",
+   "referenced_type" : "type-254",
+   "self_type" : "type-257",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h"
   },
@@ -13420,8 +13468,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime *",
    "name" : "android::FenceTime *",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1393",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1397",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13429,8 +13477,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot *",
    "name" : "android::FenceTime::Snapshot *",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1382",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1386",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13438,8 +13486,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTimeline *",
    "name" : "android::FenceTimeline *",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1400",
+   "referenced_type" : "type-1401",
+   "self_type" : "type-1404",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13447,8 +13495,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceToFenceTimeMap *",
    "name" : "android::FenceToFenceTimeMap *",
-   "referenced_type" : "type-1402",
-   "self_type" : "type-1405",
+   "referenced_type" : "type-1406",
+   "self_type" : "type-1409",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13465,8 +13513,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FrameStats *",
    "name" : "android::FrameStats *",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1427",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1431",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
@@ -13474,8 +13522,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Gralloc2Allocator *",
    "name" : "android::Gralloc2Allocator *",
-   "referenced_type" : "type-353",
-   "self_type" : "type-360",
+   "referenced_type" : "type-350",
+   "self_type" : "type-357",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -13483,8 +13531,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Gralloc2Mapper *",
    "name" : "android::Gralloc2Mapper *",
-   "referenced_type" : "type-337",
-   "self_type" : "type-343",
+   "referenced_type" : "type-334",
+   "self_type" : "type-340",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -13492,8 +13540,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-525",
-   "self_type" : "type-680",
+   "referenced_type" : "type-523",
+   "self_type" : "type-679",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13501,8 +13549,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferAllocator *",
    "name" : "android::GraphicBufferAllocator *",
-   "referenced_type" : "type-542",
-   "self_type" : "type-545",
+   "referenced_type" : "type-539",
+   "self_type" : "type-542",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -13510,8 +13558,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-527",
-   "self_type" : "type-539",
+   "referenced_type" : "type-525",
+   "self_type" : "type-537",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -13528,8 +13576,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1679",
-   "self_type" : "type-1678",
+   "referenced_type" : "type-1680",
+   "self_type" : "type-1679",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13537,8 +13585,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1874",
-   "self_type" : "type-1873",
+   "referenced_type" : "type-1875",
+   "self_type" : "type-1874",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13546,8 +13594,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1952",
-   "self_type" : "type-1951",
+   "referenced_type" : "type-1953",
+   "self_type" : "type-1952",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13555,8 +13603,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-292",
-   "self_type" : "type-291",
+   "referenced_type" : "type-289",
+   "self_type" : "type-288",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13564,8 +13612,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-437",
-   "self_type" : "type-436",
+   "referenced_type" : "type-434",
+   "self_type" : "type-433",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13573,8 +13621,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
-   "referenced_type" : "type-715",
-   "self_type" : "type-716",
+   "referenced_type" : "type-716",
+   "self_type" : "type-717",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -13583,7 +13631,7 @@
    "linker_set_key" : "android::LightFlattenablePod<android::Rect> *",
    "name" : "android::LightFlattenablePod<android::Rect> *",
    "referenced_type" : "type-1243",
-   "self_type" : "type-2399",
+   "self_type" : "type-2401",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -13600,8 +13648,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex *",
    "name" : "android::Mutex *",
-   "referenced_type" : "type-252",
-   "self_type" : "type-254",
+   "referenced_type" : "type-280",
+   "self_type" : "type-1376",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -13609,8 +13657,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex::Autolock *",
    "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-255",
-   "self_type" : "type-257",
+   "referenced_type" : "type-1378",
+   "self_type" : "type-1380",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -13627,8 +13675,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock *",
    "name" : "android::RWLock *",
-   "referenced_type" : "type-262",
-   "self_type" : "type-264",
+   "referenced_type" : "type-258",
+   "self_type" : "type-260",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -13636,8 +13684,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock::AutoRLock *",
    "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-265",
-   "self_type" : "type-267",
+   "referenced_type" : "type-261",
+   "self_type" : "type-263",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -13645,8 +13693,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock::AutoWLock *",
    "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-268",
-   "self_type" : "type-269",
+   "referenced_type" : "type-264",
+   "self_type" : "type-265",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -13663,8 +13711,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase *",
    "name" : "android::RefBase *",
-   "referenced_type" : "type-172",
-   "self_type" : "type-246",
+   "referenced_type" : "type-175",
+   "self_type" : "type-248",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13672,8 +13720,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-118",
-   "self_type" : "type-117",
+   "referenced_type" : "type-120",
+   "self_type" : "type-119",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13699,8 +13747,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-14",
-   "self_type" : "type-13",
+   "referenced_type" : "type-1577",
+   "self_type" : "type-1576",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13708,8 +13756,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1573",
-   "self_type" : "type-1572",
+   "referenced_type" : "type-16",
+   "self_type" : "type-15",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13717,8 +13765,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1608",
-   "self_type" : "type-1607",
+   "referenced_type" : "type-1612",
+   "self_type" : "type-1611",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13726,8 +13774,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-175",
-   "self_type" : "type-174",
+   "referenced_type" : "type-178",
+   "self_type" : "type-177",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13735,8 +13783,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1783",
-   "self_type" : "type-1782",
+   "referenced_type" : "type-1784",
+   "self_type" : "type-1783",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13744,8 +13792,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1830",
-   "self_type" : "type-1829",
+   "referenced_type" : "type-1831",
+   "self_type" : "type-1830",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13753,8 +13801,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1835",
-   "self_type" : "type-1834",
+   "referenced_type" : "type-1836",
+   "self_type" : "type-1835",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13762,8 +13810,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1845",
-   "self_type" : "type-1844",
+   "referenced_type" : "type-1846",
+   "self_type" : "type-1845",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13771,8 +13819,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1864",
-   "self_type" : "type-1863",
+   "referenced_type" : "type-1865",
+   "self_type" : "type-1864",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13780,8 +13828,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1930",
-   "self_type" : "type-1929",
+   "referenced_type" : "type-1931",
+   "self_type" : "type-1930",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13789,8 +13837,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2015",
-   "self_type" : "type-2014",
+   "referenced_type" : "type-2016",
+   "self_type" : "type-2015",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13798,8 +13846,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2167",
-   "self_type" : "type-2166",
+   "referenced_type" : "type-2170",
+   "self_type" : "type-2169",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13807,8 +13855,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2245",
-   "self_type" : "type-2244",
+   "referenced_type" : "type-2247",
+   "self_type" : "type-2246",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13816,8 +13864,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2287",
-   "self_type" : "type-2286",
+   "referenced_type" : "type-2289",
+   "self_type" : "type-2288",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13825,8 +13873,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2338",
-   "self_type" : "type-2337",
+   "referenced_type" : "type-2340",
+   "self_type" : "type-2339",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13834,8 +13882,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2457",
-   "self_type" : "type-2456",
+   "referenced_type" : "type-2459",
+   "self_type" : "type-2458",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13843,8 +13891,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2623",
-   "self_type" : "type-2622",
+   "referenced_type" : "type-2625",
+   "self_type" : "type-2624",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13852,8 +13900,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2649",
-   "self_type" : "type-2648",
+   "referenced_type" : "type-2651",
+   "self_type" : "type-2650",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13861,8 +13909,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-408",
-   "self_type" : "type-407",
+   "referenced_type" : "type-405",
+   "self_type" : "type-404",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13870,8 +13918,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-514",
-   "self_type" : "type-513",
+   "referenced_type" : "type-511",
+   "self_type" : "type-510",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13879,8 +13927,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-744",
-   "self_type" : "type-743",
+   "referenced_type" : "type-745",
+   "self_type" : "type-744",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13888,8 +13936,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-851",
-   "self_type" : "type-850",
+   "referenced_type" : "type-852",
+   "self_type" : "type-851",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13915,8 +13963,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_type *",
    "name" : "android::RefBase::weakref_type *",
-   "referenced_type" : "type-198",
-   "self_type" : "type-197",
+   "referenced_type" : "type-211",
+   "self_type" : "type-210",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -13933,8 +13981,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Region *",
    "name" : "android::Region *",
-   "referenced_type" : "type-2389",
-   "self_type" : "type-2391",
+   "referenced_type" : "type-2391",
+   "self_type" : "type-2393",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -13960,8 +14008,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 *",
    "name" : "android::String16 *",
-   "referenced_type" : "type-179",
-   "self_type" : "type-189",
+   "referenced_type" : "type-182",
+   "self_type" : "type-191",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -13969,8 +14017,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 *",
    "name" : "android::String8 *",
-   "referenced_type" : "type-285",
-   "self_type" : "type-901",
+   "referenced_type" : "type-282",
+   "self_type" : "type-891",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -13978,8 +14026,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Thread *",
    "name" : "android::Thread *",
-   "referenced_type" : "type-369",
-   "self_type" : "type-368",
+   "referenced_type" : "type-366",
+   "self_type" : "type-365",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13987,8 +14035,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<android::Rect> *",
    "name" : "android::Vector<android::Rect> *",
-   "referenced_type" : "type-2382",
-   "self_type" : "type-2383",
+   "referenced_type" : "type-2384",
+   "self_type" : "type-2385",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -13996,8 +14044,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<long long> *",
    "name" : "android::Vector<long long> *",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1424",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1428",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14032,8 +14080,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TMat44<float> *",
    "name" : "android::details::TMat44<float> *",
-   "referenced_type" : "type-2427",
-   "self_type" : "type-2430",
+   "referenced_type" : "type-2429",
+   "self_type" : "type-2432",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -14042,7 +14090,7 @@
    "linker_set_key" : "android::details::TMatTransform<android::details::TMat33, float> *",
    "name" : "android::details::TMatTransform<android::details::TMat33, float> *",
    "referenced_type" : "type-910",
-   "self_type" : "type-957",
+   "self_type" : "type-949",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -14050,8 +14098,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TMatTransform<android::details::TMat44, float> *",
    "name" : "android::details::TMatTransform<android::details::TMat44, float> *",
-   "referenced_type" : "type-2421",
-   "self_type" : "type-2422",
+   "referenced_type" : "type-2423",
+   "self_type" : "type-2424",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -14059,8 +14107,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TQuaternion<double> *",
    "name" : "android::details::TQuaternion<double> *",
-   "referenced_type" : "type-331",
-   "self_type" : "type-397",
+   "referenced_type" : "type-328",
+   "self_type" : "type-391",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -14068,8 +14116,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TQuaternion<float> *",
    "name" : "android::details::TQuaternion<float> *",
-   "referenced_type" : "type-410",
-   "self_type" : "type-429",
+   "referenced_type" : "type-407",
+   "self_type" : "type-426",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -14086,7 +14134,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec2<double> *",
    "name" : "android::details::TVec2<double> *",
-   "referenced_type" : "type-55",
+   "referenced_type" : "type-57",
    "self_type" : "type-1069",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -14095,7 +14143,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec2<float> *",
    "name" : "android::details::TVec2<float> *",
-   "referenced_type" : "type-22",
+   "referenced_type" : "type-23",
    "self_type" : "type-1245",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -14104,7 +14152,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<double> *",
    "name" : "android::details::TVec3<double> *",
-   "referenced_type" : "type-66",
+   "referenced_type" : "type-68",
    "self_type" : "type-1368",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
@@ -14113,8 +14161,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<float> *",
    "name" : "android::details::TVec3<float> *",
-   "referenced_type" : "type-17",
-   "self_type" : "type-16",
+   "referenced_type" : "type-18",
+   "self_type" : "type-17",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
   },
@@ -14122,8 +14170,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<double> *",
    "name" : "android::details::TVec4<double> *",
-   "referenced_type" : "type-50",
-   "self_type" : "type-155",
+   "referenced_type" : "type-52",
+   "self_type" : "type-151",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -14131,8 +14179,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<float> *",
    "name" : "android::details::TVec4<float> *",
-   "referenced_type" : "type-200",
-   "self_type" : "type-316",
+   "referenced_type" : "type-192",
+   "self_type" : "type-311",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -14140,7 +14188,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec2, float> *",
    "name" : "android::details::TVecAddOperators<android::details::TVec2, float> *",
-   "referenced_type" : "type-28",
+   "referenced_type" : "type-29",
    "self_type" : "type-1049",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -14149,7 +14197,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec3, float> *",
    "name" : "android::details::TVecAddOperators<android::details::TVec3, float> *",
-   "referenced_type" : "type-34",
+   "referenced_type" : "type-35",
    "self_type" : "type-1053",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -14158,7 +14206,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec2, float> *",
    "name" : "android::details::TVecProductOperators<android::details::TVec2, float> *",
-   "referenced_type" : "type-27",
+   "referenced_type" : "type-28",
    "self_type" : "type-1057",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -14167,7 +14215,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec3, float> *",
    "name" : "android::details::TVecProductOperators<android::details::TVec3, float> *",
-   "referenced_type" : "type-33",
+   "referenced_type" : "type-34",
    "self_type" : "type-1058",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -14177,7 +14225,7 @@
    "linker_set_key" : "android::half *",
    "name" : "android::half *",
    "referenced_type" : "type-1",
-   "self_type" : "type-1381",
+   "self_type" : "type-1377",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -14203,8 +14251,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-242",
-   "self_type" : "type-241",
+   "referenced_type" : "type-244",
+   "self_type" : "type-243",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14221,8 +14269,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-196",
-   "self_type" : "type-195",
+   "referenced_type" : "type-209",
+   "self_type" : "type-208",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14230,8 +14278,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-215",
-   "self_type" : "type-222",
+   "referenced_type" : "type-217",
+   "self_type" : "type-224",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -14239,8 +14287,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-281",
-   "self_type" : "type-280",
+   "referenced_type" : "type-277",
+   "self_type" : "type-276",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14248,8 +14296,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
-   "referenced_type" : "type-99",
-   "self_type" : "type-106",
+   "referenced_type" : "type-101",
+   "self_type" : "type-108",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14257,8 +14305,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
-   "referenced_type" : "type-393",
-   "self_type" : "type-398",
+   "referenced_type" : "type-392",
+   "self_type" : "type-395",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14266,8 +14314,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
-   "referenced_type" : "type-111",
-   "self_type" : "type-112",
+   "referenced_type" : "type-113",
+   "self_type" : "type-114",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14284,7 +14332,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status *",
    "name" : "android::hardware::Status *",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1309",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -14311,8 +14359,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int> *",
    "name" : "android::hardware::details::hidl_pointer<unsigned int> *",
-   "referenced_type" : "type-120",
-   "self_type" : "type-169",
+   "referenced_type" : "type-122",
+   "self_type" : "type-172",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14320,7 +14368,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status *",
    "name" : "android::hardware::details::return_status *",
-   "referenced_type" : "type-101",
+   "referenced_type" : "type-103",
    "self_type" : "type-1315",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -14329,8 +14377,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1727",
-   "self_type" : "type-1726",
+   "referenced_type" : "type-1728",
+   "self_type" : "type-1727",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14338,8 +14386,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1909",
-   "self_type" : "type-1908",
+   "referenced_type" : "type-1910",
+   "self_type" : "type-1909",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14347,8 +14395,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2115",
-   "self_type" : "type-2114",
+   "referenced_type" : "type-2118",
+   "self_type" : "type-2117",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14356,8 +14404,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2153",
-   "self_type" : "type-2152",
+   "referenced_type" : "type-2156",
+   "self_type" : "type-2155",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14365,8 +14413,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2235",
-   "self_type" : "type-2234",
+   "referenced_type" : "type-2237",
+   "self_type" : "type-2236",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14374,8 +14422,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-357",
-   "self_type" : "type-356",
+   "referenced_type" : "type-354",
+   "self_type" : "type-353",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14383,8 +14431,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-685",
-   "self_type" : "type-684",
+   "referenced_type" : "type-687",
+   "self_type" : "type-686",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14401,8 +14449,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-836",
-   "self_type" : "type-835",
+   "referenced_type" : "type-837",
+   "self_type" : "type-836",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14410,8 +14458,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-1997",
-   "self_type" : "type-1996",
+   "referenced_type" : "type-1998",
+   "self_type" : "type-1997",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14419,8 +14467,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-2160",
-   "self_type" : "type-2159",
+   "referenced_type" : "type-2163",
+   "self_type" : "type-2162",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14428,8 +14476,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-2241",
-   "self_type" : "type-2240",
+   "referenced_type" : "type-2243",
+   "self_type" : "type-2242",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14437,8 +14485,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-486",
-   "self_type" : "type-485",
+   "referenced_type" : "type-483",
+   "self_type" : "type-482",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14446,8 +14494,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-737",
-   "self_type" : "type-736",
+   "referenced_type" : "type-738",
+   "self_type" : "type-737",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14455,8 +14503,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-843",
-   "self_type" : "type-842",
+   "referenced_type" : "type-844",
+   "self_type" : "type-843",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14464,8 +14512,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1716",
-   "self_type" : "type-1715",
+   "referenced_type" : "type-1717",
+   "self_type" : "type-1716",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14473,8 +14521,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1915",
-   "self_type" : "type-1914",
+   "referenced_type" : "type-1916",
+   "self_type" : "type-1915",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14482,8 +14530,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2118",
-   "self_type" : "type-2117",
+   "referenced_type" : "type-2122",
+   "self_type" : "type-2121",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14491,8 +14539,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2155",
-   "self_type" : "type-2154",
+   "referenced_type" : "type-2158",
+   "self_type" : "type-2157",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14500,8 +14548,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2237",
-   "self_type" : "type-2236",
+   "referenced_type" : "type-2239",
+   "self_type" : "type-2238",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14509,8 +14557,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-340",
-   "self_type" : "type-339",
+   "referenced_type" : "type-337",
+   "self_type" : "type-336",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14545,8 +14593,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1587",
-   "self_type" : "type-1586",
+   "referenced_type" : "type-1591",
+   "self_type" : "type-1590",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14554,8 +14602,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1859",
-   "self_type" : "type-1858",
+   "referenced_type" : "type-1860",
+   "self_type" : "type-1859",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14563,8 +14611,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2120",
-   "self_type" : "type-2119",
+   "referenced_type" : "type-2124",
+   "self_type" : "type-2123",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14572,8 +14620,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2158",
-   "self_type" : "type-2157",
+   "referenced_type" : "type-2161",
+   "self_type" : "type-2160",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14581,8 +14629,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2239",
-   "self_type" : "type-2238",
+   "referenced_type" : "type-2241",
+   "self_type" : "type-2240",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14617,8 +14665,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-88",
-   "self_type" : "type-87",
+   "referenced_type" : "type-90",
+   "self_type" : "type-89",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14626,8 +14674,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
-   "referenced_type" : "type-1724",
-   "self_type" : "type-1723",
+   "referenced_type" : "type-1725",
+   "self_type" : "type-1724",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -14635,8 +14683,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
-   "referenced_type" : "type-1906",
-   "self_type" : "type-1905",
+   "referenced_type" : "type-1908",
+   "self_type" : "type-1907",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -14644,8 +14692,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
-   "referenced_type" : "type-352",
-   "self_type" : "type-351",
+   "referenced_type" : "type-349",
+   "self_type" : "type-348",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -14653,8 +14701,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-2007",
-   "self_type" : "type-2006",
+   "referenced_type" : "type-2008",
+   "self_type" : "type-2007",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14662,8 +14710,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-2163",
-   "self_type" : "type-2162",
+   "referenced_type" : "type-2166",
+   "self_type" : "type-2165",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14671,8 +14719,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-2243",
-   "self_type" : "type-2242",
+   "referenced_type" : "type-2245",
+   "self_type" : "type-2244",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14680,8 +14728,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-499",
-   "self_type" : "type-498",
+   "referenced_type" : "type-496",
+   "self_type" : "type-495",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14698,8 +14746,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-845",
-   "self_type" : "type-844",
+   "referenced_type" : "type-846",
+   "self_type" : "type-845",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14725,8 +14773,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_handle *",
    "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-139",
-   "self_type" : "type-138",
+   "referenced_type" : "type-142",
+   "self_type" : "type-141",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14743,8 +14791,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned int> *",
    "name" : "android::hardware::hidl_vec<unsigned int> *",
-   "referenced_type" : "type-128",
-   "self_type" : "type-129",
+   "referenced_type" : "type-131",
+   "self_type" : "type-132",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14761,8 +14809,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::base::V1_0::IBase *",
    "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-171",
-   "self_type" : "type-364",
+   "referenced_type" : "type-174",
+   "self_type" : "type-361",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14770,8 +14818,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-295",
-   "self_type" : "type-372",
+   "referenced_type" : "type-292",
+   "self_type" : "type-369",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14780,7 +14828,7 @@
    "linker_set_key" : "android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "referenced_type" : "type-694",
-   "self_type" : "type-698",
+   "self_type" : "type-701",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14797,8 +14845,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::GraphicBuffer> *",
    "name" : "android::sp<android::GraphicBuffer> *",
-   "referenced_type" : "type-679",
-   "self_type" : "type-681",
+   "referenced_type" : "type-678",
+   "self_type" : "type-682",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14806,8 +14854,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
-   "referenced_type" : "type-355",
-   "self_type" : "type-376",
+   "referenced_type" : "type-352",
+   "self_type" : "type-373",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14815,8 +14863,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
-   "referenced_type" : "type-484",
-   "self_type" : "type-488",
+   "referenced_type" : "type-481",
+   "self_type" : "type-486",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14824,8 +14872,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
-   "referenced_type" : "type-338",
-   "self_type" : "type-384",
+   "referenced_type" : "type-335",
+   "self_type" : "type-381",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14833,8 +14881,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
-   "referenced_type" : "type-86",
-   "self_type" : "type-90",
+   "referenced_type" : "type-88",
+   "self_type" : "type-92",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14842,8 +14890,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
-   "referenced_type" : "type-497",
-   "self_type" : "type-502",
+   "referenced_type" : "type-494",
+   "self_type" : "type-499",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14851,8 +14899,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "referenced_type" : "type-371",
-   "self_type" : "type-373",
+   "referenced_type" : "type-368",
+   "self_type" : "type-370",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14869,8 +14917,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ui::Transform *",
    "name" : "android::ui::Transform *",
-   "referenced_type" : "type-2434",
-   "self_type" : "type-2436",
+   "referenced_type" : "type-2436",
+   "self_type" : "type-2438",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -14878,8 +14926,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ui::Transform::mat33 *",
    "name" : "android::ui::Transform::mat33 *",
-   "referenced_type" : "type-2435",
-   "self_type" : "type-2447",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2449",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -14896,8 +14944,8 @@
    "alignment" : 4,
    "linker_set_key" : "android_native_base_t *",
    "name" : "android_native_base_t *",
-   "referenced_type" : "type-518",
-   "self_type" : "type-522",
+   "referenced_type" : "type-516",
+   "self_type" : "type-520",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -14905,8 +14953,8 @@
    "alignment" : 4,
    "linker_set_key" : "android_ycbcr *",
    "name" : "android_ycbcr *",
-   "referenced_type" : "type-348",
-   "self_type" : "type-347",
+   "referenced_type" : "type-345",
+   "self_type" : "type-344",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -14914,8 +14962,8 @@
    "alignment" : 4,
    "linker_set_key" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
    "name" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
-   "referenced_type" : "type-271",
-   "self_type" : "type-274",
+   "referenced_type" : "type-267",
+   "self_type" : "type-270",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -14924,7 +14972,7 @@
    "linker_set_key" : "bool *",
    "name" : "bool *",
    "referenced_type" : "type-6",
-   "self_type" : "type-350",
+   "self_type" : "type-347",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -14932,8 +14980,8 @@
    "alignment" : 4,
    "linker_set_key" : "char *",
    "name" : "char *",
-   "referenced_type" : "type-288",
-   "self_type" : "type-576",
+   "referenced_type" : "type-285",
+   "self_type" : "type-573",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -14941,8 +14989,8 @@
    "alignment" : 4,
    "linker_set_key" : "const AHardwareBuffer *",
    "name" : "const AHardwareBuffer *",
-   "referenced_type" : "type-2069",
-   "self_type" : "type-2071",
+   "referenced_type" : "type-2071",
+   "self_type" : "type-2073",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -14959,7 +15007,7 @@
    "alignment" : 4,
    "linker_set_key" : "const ANativeWindowBuffer *",
    "name" : "const ANativeWindowBuffer *",
-   "referenced_type" : "type-637",
+   "referenced_type" : "type-638",
    "self_type" : "type-639",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
@@ -14968,8 +15016,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
    "name" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
-   "referenced_type" : "type-535",
-   "self_type" : "type-536",
+   "referenced_type" : "type-532",
+   "self_type" : "type-533",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
   },
@@ -15004,8 +15052,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime *",
    "name" : "const android::FenceTime *",
-   "referenced_type" : "type-1395",
-   "self_type" : "type-1396",
+   "referenced_type" : "type-1399",
+   "self_type" : "type-1400",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -15013,8 +15061,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot *",
    "name" : "const android::FenceTime::Snapshot *",
-   "referenced_type" : "type-1388",
-   "self_type" : "type-1389",
+   "referenced_type" : "type-1393",
+   "self_type" : "type-1394",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -15031,8 +15079,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FrameStats *",
    "name" : "const android::FrameStats *",
-   "referenced_type" : "type-1428",
-   "self_type" : "type-1429",
+   "referenced_type" : "type-1432",
+   "self_type" : "type-1433",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
@@ -15040,8 +15088,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Gralloc2Allocator *",
    "name" : "const android::Gralloc2Allocator *",
-   "referenced_type" : "type-361",
-   "self_type" : "type-362",
+   "referenced_type" : "type-358",
+   "self_type" : "type-359",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15049,8 +15097,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Gralloc2Mapper *",
    "name" : "const android::Gralloc2Mapper *",
-   "referenced_type" : "type-344",
-   "self_type" : "type-345",
+   "referenced_type" : "type-341",
+   "self_type" : "type-342",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15058,8 +15106,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-624",
-   "self_type" : "type-623",
+   "referenced_type" : "type-625",
+   "self_type" : "type-624",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -15067,8 +15115,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBufferAllocator *",
    "name" : "const android::GraphicBufferAllocator *",
-   "referenced_type" : "type-720",
-   "self_type" : "type-721",
+   "referenced_type" : "type-721",
+   "self_type" : "type-722",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -15076,8 +15124,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBufferMapper *",
    "name" : "const android::GraphicBufferMapper *",
-   "referenced_type" : "type-614",
-   "self_type" : "type-615",
+   "referenced_type" : "type-615",
+   "self_type" : "type-616",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -15085,8 +15133,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::HdrCapabilities *",
    "name" : "const android::HdrCapabilities *",
-   "referenced_type" : "type-972",
-   "self_type" : "type-973",
+   "referenced_type" : "type-973",
+   "self_type" : "type-974",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -15094,8 +15142,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
-   "referenced_type" : "type-717",
-   "self_type" : "type-718",
+   "referenced_type" : "type-718",
+   "self_type" : "type-719",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -15103,8 +15151,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect> *",
    "name" : "const android::LightFlattenablePod<android::Rect> *",
-   "referenced_type" : "type-2397",
-   "self_type" : "type-2398",
+   "referenced_type" : "type-2399",
+   "self_type" : "type-2400",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15157,8 +15205,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Region *",
    "name" : "const android::Region *",
-   "referenced_type" : "type-2388",
-   "self_type" : "type-2394",
+   "referenced_type" : "type-2390",
+   "self_type" : "type-2396",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -15175,8 +15223,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 *",
    "name" : "const android::String16 *",
-   "referenced_type" : "type-184",
-   "self_type" : "type-186",
+   "referenced_type" : "type-187",
+   "self_type" : "type-188",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -15184,8 +15232,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 *",
    "name" : "const android::String8 *",
-   "referenced_type" : "type-873",
-   "self_type" : "type-878",
+   "referenced_type" : "type-863",
+   "self_type" : "type-874",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -15193,8 +15241,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::Rect> *",
    "name" : "const android::Vector<android::Rect> *",
-   "referenced_type" : "type-2384",
-   "self_type" : "type-2387",
+   "referenced_type" : "type-2386",
+   "self_type" : "type-2389",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -15202,8 +15250,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<long long> *",
    "name" : "const android::Vector<long long> *",
-   "referenced_type" : "type-1425",
-   "self_type" : "type-1426",
+   "referenced_type" : "type-1429",
+   "self_type" : "type-1430",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -15211,8 +15259,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::VectorImpl *",
    "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-1422",
-   "self_type" : "type-1423",
+   "referenced_type" : "type-1426",
+   "self_type" : "type-1427",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -15229,7 +15277,7 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TMat33<float> *",
    "name" : "const android::details::TMat33<float> *",
-   "referenced_type" : "type-925",
+   "referenced_type" : "type-919",
    "self_type" : "type-976",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
@@ -15257,7 +15305,7 @@
    "linker_set_key" : "const android::details::TVec3<float> *",
    "name" : "const android::details::TVec3<float> *",
    "referenced_type" : "type-1055",
-   "self_type" : "type-1418",
+   "self_type" : "type-1419",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
   },
@@ -15265,8 +15313,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::half *",
    "name" : "const android::half *",
-   "referenced_type" : "type-42",
-   "self_type" : "type-130",
+   "referenced_type" : "type-44",
+   "self_type" : "type-127",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -15292,8 +15340,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::BpHwRefBase *",
    "name" : "const android::hardware::BpHwRefBase *",
-   "referenced_type" : "type-211",
-   "self_type" : "type-212",
+   "referenced_type" : "type-213",
+   "self_type" : "type-214",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -15301,8 +15349,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
-   "referenced_type" : "type-109",
-   "self_type" : "type-110",
+   "referenced_type" : "type-111",
+   "self_type" : "type-112",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15310,8 +15358,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
-   "referenced_type" : "type-401",
-   "self_type" : "type-402",
+   "referenced_type" : "type-398",
+   "self_type" : "type-400",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15319,8 +15367,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
-   "referenced_type" : "type-115",
-   "self_type" : "type-116",
+   "referenced_type" : "type-117",
+   "self_type" : "type-118",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15346,8 +15394,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle> *",
-   "referenced_type" : "type-293",
-   "self_type" : "type-297",
+   "referenced_type" : "type-290",
+   "self_type" : "type-294",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15355,8 +15403,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned int> *",
    "name" : "const android::hardware::details::hidl_pointer<unsigned int> *",
-   "referenced_type" : "type-190",
-   "self_type" : "type-214",
+   "referenced_type" : "type-203",
+   "self_type" : "type-216",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15373,8 +15421,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1744",
-   "self_type" : "type-1746",
+   "referenced_type" : "type-1745",
+   "self_type" : "type-1747",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15382,8 +15430,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1910",
-   "self_type" : "type-1913",
+   "referenced_type" : "type-1912",
+   "self_type" : "type-1914",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15391,8 +15439,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-381",
-   "self_type" : "type-383",
+   "referenced_type" : "type-378",
+   "self_type" : "type-380",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15400,8 +15448,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-2003",
-   "self_type" : "type-2005",
+   "referenced_type" : "type-2004",
+   "self_type" : "type-2006",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15409,8 +15457,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-494",
-   "self_type" : "type-496",
+   "referenced_type" : "type-491",
+   "self_type" : "type-493",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15418,8 +15466,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::BufferUsage *",
    "name" : "const android::hardware::graphics::common::V1_0::BufferUsage *",
-   "referenced_type" : "type-153",
-   "self_type" : "type-152",
+   "referenced_type" : "type-156",
+   "self_type" : "type-155",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15427,8 +15475,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::BufferUsage *",
    "name" : "const android::hardware::graphics::common::V1_1::BufferUsage *",
-   "referenced_type" : "type-160",
-   "self_type" : "type-159",
+   "referenced_type" : "type-162",
+   "self_type" : "type-161",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15436,8 +15484,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::BufferUsage *",
    "name" : "const android::hardware::graphics::common::V1_2::BufferUsage *",
-   "referenced_type" : "type-422",
-   "self_type" : "type-421",
+   "referenced_type" : "type-419",
+   "self_type" : "type-418",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15445,8 +15493,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1584",
-   "self_type" : "type-1583",
+   "referenced_type" : "type-1588",
+   "self_type" : "type-1587",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15454,8 +15502,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1856",
-   "self_type" : "type-1855",
+   "referenced_type" : "type-1857",
+   "self_type" : "type-1856",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15463,8 +15511,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-84",
-   "self_type" : "type-83",
+   "referenced_type" : "type-86",
+   "self_type" : "type-85",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15472,8 +15520,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1594",
-   "self_type" : "type-1596",
+   "referenced_type" : "type-1598",
+   "self_type" : "type-1600",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15481,8 +15529,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1860",
-   "self_type" : "type-1862",
+   "referenced_type" : "type-1861",
+   "self_type" : "type-1863",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15490,8 +15538,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-96",
-   "self_type" : "type-98",
+   "referenced_type" : "type-98",
+   "self_type" : "type-100",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15499,8 +15547,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-1918",
-   "self_type" : "type-1917",
+   "referenced_type" : "type-1919",
+   "self_type" : "type-1918",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15508,8 +15556,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-391",
-   "self_type" : "type-390",
+   "referenced_type" : "type-388",
+   "self_type" : "type-387",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15526,8 +15574,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void> *",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void> *",
-   "referenced_type" : "type-154",
-   "self_type" : "type-156",
+   "referenced_type" : "type-157",
+   "self_type" : "type-158",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15535,8 +15583,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void> *",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void> *",
-   "referenced_type" : "type-161",
-   "self_type" : "type-162",
+   "referenced_type" : "type-163",
+   "self_type" : "type-165",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15544,8 +15592,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void> *",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void> *",
-   "referenced_type" : "type-423",
-   "self_type" : "type-424",
+   "referenced_type" : "type-420",
+   "self_type" : "type-421",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15562,8 +15610,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_handle> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_handle> *",
-   "referenced_type" : "type-146",
-   "self_type" : "type-147",
+   "referenced_type" : "type-149",
+   "self_type" : "type-150",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15571,8 +15619,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned int> *",
    "name" : "const android::hardware::hidl_vec<unsigned int> *",
-   "referenced_type" : "type-132",
-   "self_type" : "type-134",
+   "referenced_type" : "type-134",
+   "self_type" : "type-136",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15589,8 +15637,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
    "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-170",
-   "self_type" : "type-176",
+   "referenced_type" : "type-173",
+   "self_type" : "type-179",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
@@ -15598,8 +15646,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-294",
-   "self_type" : "type-296",
+   "referenced_type" : "type-291",
+   "self_type" : "type-293",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
@@ -15608,7 +15656,7 @@
    "linker_set_key" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "referenced_type" : "type-693",
-   "self_type" : "type-699",
+   "self_type" : "type-702",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15625,8 +15673,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
    "name" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
-   "referenced_type" : "type-379",
-   "self_type" : "type-380",
+   "referenced_type" : "type-376",
+   "self_type" : "type-377",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15634,8 +15682,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
    "name" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
-   "referenced_type" : "type-492",
-   "self_type" : "type-493",
+   "referenced_type" : "type-489",
+   "self_type" : "type-490",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15643,8 +15691,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
-   "referenced_type" : "type-387",
-   "self_type" : "type-388",
+   "referenced_type" : "type-384",
+   "self_type" : "type-385",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15652,8 +15700,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
-   "referenced_type" : "type-91",
-   "self_type" : "type-95",
+   "referenced_type" : "type-93",
+   "self_type" : "type-97",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15661,8 +15709,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
    "name" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
-   "referenced_type" : "type-505",
-   "self_type" : "type-506",
+   "referenced_type" : "type-502",
+   "self_type" : "type-503",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15679,8 +15727,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::base::V1_0::IBase> *",
    "name" : "const android::sp<android::hidl::base::V1_0::IBase> *",
-   "referenced_type" : "type-365",
-   "self_type" : "type-366",
+   "referenced_type" : "type-362",
+   "self_type" : "type-363",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15688,8 +15736,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "referenced_type" : "type-374",
-   "self_type" : "type-375",
+   "referenced_type" : "type-371",
+   "self_type" : "type-372",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15706,8 +15754,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ui::Transform *",
    "name" : "const android::ui::Transform *",
-   "referenced_type" : "type-2437",
-   "self_type" : "type-2441",
+   "referenced_type" : "type-2439",
+   "self_type" : "type-2443",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -15715,8 +15763,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ui::Transform::mat33 *",
    "name" : "const android::ui::Transform::mat33 *",
-   "referenced_type" : "type-2445",
-   "self_type" : "type-2446",
+   "referenced_type" : "type-2447",
+   "self_type" : "type-2448",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -15724,8 +15772,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-287",
-   "self_type" : "type-286",
+   "referenced_type" : "type-284",
+   "self_type" : "type-283",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -15733,8 +15781,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-181",
-   "self_type" : "type-180",
+   "referenced_type" : "type-184",
+   "self_type" : "type-183",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -15742,8 +15790,8 @@
    "alignment" : 4,
    "linker_set_key" : "const gralloc_module_t *",
    "name" : "const gralloc_module_t *",
-   "referenced_type" : "type-582",
-   "self_type" : "type-581",
+   "referenced_type" : "type-580",
+   "self_type" : "type-579",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -15751,8 +15799,8 @@
    "alignment" : 4,
    "linker_set_key" : "const hw_module_t *",
    "name" : "const hw_module_t *",
-   "referenced_type" : "type-555",
-   "self_type" : "type-554",
+   "referenced_type" : "type-552",
+   "self_type" : "type-551",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15760,7 +15808,7 @@
    "alignment" : 4,
    "linker_set_key" : "const int *",
    "name" : "const int *",
-   "referenced_type" : "type-562",
+   "referenced_type" : "type-559",
    "self_type" : "type-1348",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
@@ -15779,7 +15827,7 @@
    "linker_set_key" : "const long long *",
    "name" : "const long long *",
    "referenced_type" : "type-847",
-   "self_type" : "type-1415",
+   "self_type" : "type-1420",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15787,8 +15835,8 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle *",
    "name" : "const native_handle *",
-   "referenced_type" : "type-143",
-   "self_type" : "type-142",
+   "referenced_type" : "type-146",
+   "self_type" : "type-145",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15796,8 +15844,8 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle **",
    "name" : "const native_handle **",
-   "referenced_type" : "type-142",
-   "self_type" : "type-346",
+   "referenced_type" : "type-145",
+   "self_type" : "type-343",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15805,8 +15853,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned char *",
    "name" : "const unsigned char *",
-   "referenced_type" : "type-224",
-   "self_type" : "type-223",
+   "referenced_type" : "type-226",
+   "self_type" : "type-225",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -15814,7 +15862,7 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned int *",
    "name" : "const unsigned int *",
-   "referenced_type" : "type-236",
+   "referenced_type" : "type-238",
    "self_type" : "type-1104",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -15823,8 +15871,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long *",
    "name" : "const unsigned long long *",
-   "referenced_type" : "type-226",
-   "self_type" : "type-225",
+   "referenced_type" : "type-228",
+   "self_type" : "type-227",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -15841,8 +15889,8 @@
    "alignment" : 4,
    "linker_set_key" : "framebuffer_device_t *",
    "name" : "framebuffer_device_t *",
-   "referenced_type" : "type-546",
-   "self_type" : "type-567",
+   "referenced_type" : "type-543",
+   "self_type" : "type-564",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -15850,8 +15898,8 @@
    "alignment" : 4,
    "linker_set_key" : "hw_device_t *",
    "name" : "hw_device_t *",
-   "referenced_type" : "type-547",
-   "self_type" : "type-557",
+   "referenced_type" : "type-544",
+   "self_type" : "type-554",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15859,8 +15907,8 @@
    "alignment" : 4,
    "linker_set_key" : "hw_device_t **",
    "name" : "hw_device_t **",
-   "referenced_type" : "type-557",
-   "self_type" : "type-556",
+   "referenced_type" : "type-554",
+   "self_type" : "type-553",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15868,8 +15916,8 @@
    "alignment" : 4,
    "linker_set_key" : "hw_module_methods_t *",
    "name" : "hw_module_methods_t *",
-   "referenced_type" : "type-551",
-   "self_type" : "type-550",
+   "referenced_type" : "type-548",
+   "self_type" : "type-547",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15877,8 +15925,8 @@
    "alignment" : 4,
    "linker_set_key" : "hw_module_t *",
    "name" : "hw_module_t *",
-   "referenced_type" : "type-549",
-   "self_type" : "type-548",
+   "referenced_type" : "type-546",
+   "self_type" : "type-545",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15904,8 +15952,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *)",
    "name" : "int (*)(const gralloc_module_t *, const native_handle *)",
-   "referenced_type" : "type-580",
-   "self_type" : "type-579",
+   "referenced_type" : "type-578",
+   "self_type" : "type-577",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -15913,42 +15961,6 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int *)",
    "name" : "int (*)(const gralloc_module_t *, const native_handle *, int *)",
-   "referenced_type" : "type-592",
-   "self_type" : "type-591",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "referenced_type" : "type-588",
-   "self_type" : "type-587",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "referenced_type" : "type-595",
-   "self_type" : "type-594",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "referenced_type" : "type-584",
-   "self_type" : "type-583",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
    "referenced_type" : "type-590",
    "self_type" : "type-589",
    "size" : 4,
@@ -15956,8 +15968,8 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, int, ...)",
-   "name" : "int (*)(const gralloc_module_t *, int, ...)",
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
    "referenced_type" : "type-586",
    "self_type" : "type-585",
    "size" : 4,
@@ -15965,10 +15977,64 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
+   "referenced_type" : "type-593",
+   "self_type" : "type-592",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
+   "referenced_type" : "type-582",
+   "self_type" : "type-581",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
+   "referenced_type" : "type-588",
+   "self_type" : "type-587",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "referenced_type" : "type-595",
+   "self_type" : "type-594",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "referenced_type" : "type-597",
+   "self_type" : "type-596",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, int, ...)",
+   "name" : "int (*)(const gralloc_module_t *, int, ...)",
+   "referenced_type" : "type-584",
+   "self_type" : "type-583",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "int (*)(const hw_module_t *, const char *, hw_device_t **)",
    "name" : "int (*)(const hw_module_t *, const char *, hw_device_t **)",
-   "referenced_type" : "type-553",
-   "self_type" : "type-552",
+   "referenced_type" : "type-550",
+   "self_type" : "type-549",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15976,8 +16042,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(framebuffer_device_t *)",
    "name" : "int (*)(framebuffer_device_t *)",
-   "referenced_type" : "type-573",
-   "self_type" : "type-572",
+   "referenced_type" : "type-570",
+   "self_type" : "type-569",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -15985,8 +16051,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(framebuffer_device_t *, const native_handle *)",
    "name" : "int (*)(framebuffer_device_t *, const native_handle *)",
-   "referenced_type" : "type-571",
-   "self_type" : "type-570",
+   "referenced_type" : "type-568",
+   "self_type" : "type-567",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -15994,8 +16060,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(framebuffer_device_t *, int)",
    "name" : "int (*)(framebuffer_device_t *, int)",
-   "referenced_type" : "type-566",
-   "self_type" : "type-565",
+   "referenced_type" : "type-563",
+   "self_type" : "type-562",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16003,8 +16069,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(framebuffer_device_t *, int, int, int, int)",
    "name" : "int (*)(framebuffer_device_t *, int, int, int, int)",
-   "referenced_type" : "type-569",
-   "self_type" : "type-568",
+   "referenced_type" : "type-566",
+   "self_type" : "type-565",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16012,8 +16078,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(hw_device_t *)",
    "name" : "int (*)(hw_device_t *)",
-   "referenced_type" : "type-561",
-   "self_type" : "type-560",
+   "referenced_type" : "type-558",
+   "self_type" : "type-557",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -16021,8 +16087,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
-   "referenced_type" : "type-249",
-   "self_type" : "type-250",
+   "referenced_type" : "type-251",
+   "self_type" : "type-252",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
@@ -16030,8 +16096,8 @@
    "alignment" : 4,
    "linker_set_key" : "int *",
    "name" : "int *",
-   "referenced_type" : "type-103",
-   "self_type" : "type-593",
+   "referenced_type" : "type-105",
+   "self_type" : "type-591",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
@@ -16048,8 +16114,8 @@
    "alignment" : 4,
    "linker_set_key" : "long long *",
    "name" : "long long *",
-   "referenced_type" : "type-284",
-   "self_type" : "type-1432",
+   "referenced_type" : "type-12",
+   "self_type" : "type-11",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16057,7 +16123,7 @@
    "alignment" : 4,
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
-   "referenced_type" : "type-144",
+   "referenced_type" : "type-147",
    "self_type" : "type-1132",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
@@ -16066,8 +16132,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned char *",
    "name" : "unsigned char *",
-   "referenced_type" : "type-218",
-   "self_type" : "type-217",
+   "referenced_type" : "type-220",
+   "self_type" : "type-219",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -16075,8 +16141,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
-   "referenced_type" : "type-123",
-   "self_type" : "type-122",
+   "referenced_type" : "type-125",
+   "self_type" : "type-124",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16084,8 +16150,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned long long *",
    "name" : "unsigned long long *",
-   "referenced_type" : "type-124",
-   "self_type" : "type-219",
+   "referenced_type" : "type-126",
+   "self_type" : "type-221",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16102,8 +16168,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
    "name" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
-   "referenced_type" : "type-221",
-   "self_type" : "type-220",
+   "referenced_type" : "type-223",
+   "self_type" : "type-222",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16111,8 +16177,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(android_native_base_t *)",
    "name" : "void (*)(android_native_base_t *)",
-   "referenced_type" : "type-521",
-   "self_type" : "type-520",
+   "referenced_type" : "type-519",
+   "self_type" : "type-518",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -16120,8 +16186,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(framebuffer_device_t *, char *, int)",
    "name" : "void (*)(framebuffer_device_t *, char *, int)",
-   "referenced_type" : "type-575",
-   "self_type" : "type-574",
+   "referenced_type" : "type-572",
+   "self_type" : "type-571",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16129,8 +16195,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *",
    "name" : "void *",
-   "referenced_type" : "type-151",
-   "self_type" : "type-227",
+   "referenced_type" : "type-154",
+   "self_type" : "type-229",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -16138,8 +16204,8 @@
    "alignment" : 4,
    "linker_set_key" : "void **",
    "name" : "void **",
-   "referenced_type" : "type-227",
-   "self_type" : "type-251",
+   "referenced_type" : "type-229",
+   "self_type" : "type-253",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   }
@@ -16151,8 +16217,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-117",
-   "self_type" : "type-119",
+   "referenced_type" : "type-119",
+   "self_type" : "type-121",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16181,8 +16247,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-13",
-   "self_type" : "type-15",
+   "referenced_type" : "type-1576",
+   "self_type" : "type-1579",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16191,8 +16257,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1572",
-   "self_type" : "type-1574",
+   "referenced_type" : "type-15",
+   "self_type" : "type-37",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16201,8 +16267,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1607",
-   "self_type" : "type-1609",
+   "referenced_type" : "type-1611",
+   "self_type" : "type-1613",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16211,8 +16277,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-174",
-   "self_type" : "type-173",
+   "referenced_type" : "type-177",
+   "self_type" : "type-176",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16221,8 +16287,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1782",
-   "self_type" : "type-1784",
+   "referenced_type" : "type-1783",
+   "self_type" : "type-1785",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16231,8 +16297,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1829",
-   "self_type" : "type-1831",
+   "referenced_type" : "type-1830",
+   "self_type" : "type-1832",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16241,8 +16307,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1834",
-   "self_type" : "type-1836",
+   "referenced_type" : "type-1835",
+   "self_type" : "type-1837",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16251,8 +16317,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1844",
-   "self_type" : "type-1846",
+   "referenced_type" : "type-1845",
+   "self_type" : "type-1847",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16261,8 +16327,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1863",
-   "self_type" : "type-1865",
+   "referenced_type" : "type-1864",
+   "self_type" : "type-1866",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16271,8 +16337,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1929",
-   "self_type" : "type-1931",
+   "referenced_type" : "type-1930",
+   "self_type" : "type-1932",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16281,8 +16347,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2014",
-   "self_type" : "type-2016",
+   "referenced_type" : "type-2015",
+   "self_type" : "type-2017",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16291,8 +16357,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2166",
-   "self_type" : "type-2168",
+   "referenced_type" : "type-2169",
+   "self_type" : "type-2171",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16301,8 +16367,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2244",
-   "self_type" : "type-2246",
+   "referenced_type" : "type-2246",
+   "self_type" : "type-2248",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16311,8 +16377,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2286",
-   "self_type" : "type-2288",
+   "referenced_type" : "type-2288",
+   "self_type" : "type-2290",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16321,8 +16387,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2337",
-   "self_type" : "type-2339",
+   "referenced_type" : "type-2339",
+   "self_type" : "type-2341",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16331,8 +16397,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2456",
-   "self_type" : "type-2455",
+   "referenced_type" : "type-2458",
+   "self_type" : "type-2457",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16341,8 +16407,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2622",
-   "self_type" : "type-2624",
+   "referenced_type" : "type-2624",
+   "self_type" : "type-2626",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16351,8 +16417,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2648",
-   "self_type" : "type-2650",
+   "referenced_type" : "type-2650",
+   "self_type" : "type-2652",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16361,8 +16427,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-407",
-   "self_type" : "type-409",
+   "referenced_type" : "type-404",
+   "self_type" : "type-406",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16371,8 +16437,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-513",
-   "self_type" : "type-515",
+   "referenced_type" : "type-510",
+   "self_type" : "type-512",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16381,8 +16447,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-743",
-   "self_type" : "type-745",
+   "referenced_type" : "type-744",
+   "self_type" : "type-746",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16391,8 +16457,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-850",
-   "self_type" : "type-852",
+   "referenced_type" : "type-851",
+   "self_type" : "type-853",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16421,8 +16487,8 @@
    "is_const" : true,
    "linker_set_key" : "android::hardware::IBinder *const",
    "name" : "android::hardware::IBinder *const",
-   "referenced_type" : "type-195",
-   "self_type" : "type-194",
+   "referenced_type" : "type-208",
+   "self_type" : "type-207",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -16438,32 +16504,32 @@
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-1772",
-   "self_type" : "type-1771",
+   "referenced_type" : "type-1773",
+   "self_type" : "type-1772",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-2134",
-   "self_type" : "type-2133",
+   "referenced_type" : "type-2133",
+   "self_type" : "type-2132",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-2407",
-   "self_type" : "type-2406",
+   "referenced_type" : "type-2409",
+   "self_type" : "type-2408",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const AHardwareBuffer",
    "name" : "const AHardwareBuffer",
-   "referenced_type" : "type-2070",
-   "self_type" : "type-2069",
+   "referenced_type" : "type-2072",
+   "self_type" : "type-2071",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -16479,8 +16545,8 @@
    "is_const" : true,
    "linker_set_key" : "const ANativeWindowBuffer",
    "name" : "const ANativeWindowBuffer",
-   "referenced_type" : "type-517",
-   "self_type" : "type-637",
+   "referenced_type" : "type-515",
+   "self_type" : "type-638",
    "size" : 96,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -16488,32 +16554,32 @@
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-1763",
-   "self_type" : "type-1762",
+   "referenced_type" : "type-1764",
+   "self_type" : "type-1763",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-2047",
-   "self_type" : "type-2046",
+   "referenced_type" : "type-2045",
+   "self_type" : "type-2044",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-2425",
-   "self_type" : "type-2424",
+   "referenced_type" : "type-2427",
+   "self_type" : "type-2426",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-962",
-   "self_type" : "type-961",
+   "referenced_type" : "type-959",
+   "self_type" : "type-958",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
@@ -16521,8 +16587,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
    "name" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
-   "referenced_type" : "type-516",
-   "self_type" : "type-535",
+   "referenced_type" : "type-514",
+   "self_type" : "type-532",
    "size" : 104,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
   },
@@ -16542,7 +16608,7 @@
    "linker_set_key" : "const android::ColorSpace::TransferParameters",
    "name" : "const android::ColorSpace::TransferParameters",
    "referenced_type" : "type-981",
-   "self_type" : "type-1033",
+   "self_type" : "type-1030",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -16571,8 +16637,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime",
    "name" : "const android::FenceTime",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1395",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1399",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -16581,8 +16647,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot",
    "name" : "const android::FenceTime::Snapshot",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1388",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1393",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -16591,8 +16657,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot::State",
    "name" : "const android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1406",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1410",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16601,8 +16667,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::State",
    "name" : "const android::FenceTime::State",
-   "referenced_type" : "type-1378",
-   "self_type" : "type-1377",
+   "referenced_type" : "type-1383",
+   "self_type" : "type-1382",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -16621,8 +16687,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FrameStats",
    "name" : "const android::FrameStats",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1428",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1432",
    "size" : 68,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
@@ -16631,8 +16697,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Gralloc2Allocator",
    "name" : "const android::Gralloc2Allocator",
-   "referenced_type" : "type-353",
-   "self_type" : "type-361",
+   "referenced_type" : "type-350",
+   "self_type" : "type-358",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -16641,8 +16707,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Gralloc2Mapper",
    "name" : "const android::Gralloc2Mapper",
-   "referenced_type" : "type-337",
-   "self_type" : "type-344",
+   "referenced_type" : "type-334",
+   "self_type" : "type-341",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -16651,8 +16717,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-2060",
-   "self_type" : "type-2059",
+   "referenced_type" : "type-2062",
+   "self_type" : "type-2061",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -16661,8 +16727,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-2226",
-   "self_type" : "type-2225",
+   "referenced_type" : "type-2229",
+   "self_type" : "type-2228",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -16671,8 +16737,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-2230",
-   "self_type" : "type-2229",
+   "referenced_type" : "type-2232",
+   "self_type" : "type-2231",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -16691,8 +16757,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-803",
-   "self_type" : "type-802",
+   "referenced_type" : "type-804",
+   "self_type" : "type-803",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -16701,8 +16767,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-828",
-   "self_type" : "type-827",
+   "referenced_type" : "type-829",
+   "self_type" : "type-828",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -16711,8 +16777,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-525",
-   "self_type" : "type-624",
+   "referenced_type" : "type-523",
+   "self_type" : "type-625",
    "size" : 152,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -16721,8 +16787,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferAllocator",
    "name" : "const android::GraphicBufferAllocator",
-   "referenced_type" : "type-542",
-   "self_type" : "type-720",
+   "referenced_type" : "type-539",
+   "self_type" : "type-721",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -16731,7 +16797,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferAllocator::alloc_rec_t",
    "name" : "const android::GraphicBufferAllocator::alloc_rec_t",
-   "referenced_type" : "type-676",
+   "referenced_type" : "type-680",
    "self_type" : "type-706",
    "size" : 44,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -16741,8 +16807,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferMapper",
    "name" : "const android::GraphicBufferMapper",
-   "referenced_type" : "type-527",
-   "self_type" : "type-614",
+   "referenced_type" : "type-525",
+   "self_type" : "type-615",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -16752,7 +16818,7 @@
    "linker_set_key" : "const android::HdrCapabilities",
    "name" : "const android::HdrCapabilities",
    "referenced_type" : "type-964",
-   "self_type" : "type-972",
+   "self_type" : "type-973",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -16761,8 +16827,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-715",
-   "self_type" : "type-717",
+   "referenced_type" : "type-716",
+   "self_type" : "type-718",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -16772,7 +16838,7 @@
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect>",
    "name" : "const android::LightFlattenablePod<android::Rect>",
    "referenced_type" : "type-1243",
-   "self_type" : "type-2397",
+   "self_type" : "type-2399",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16821,7 +16887,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
-   "referenced_type" : "type-172",
+   "referenced_type" : "type-175",
    "self_type" : "type-1078",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
@@ -16831,8 +16897,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Region",
    "name" : "const android::Region",
-   "referenced_type" : "type-2389",
-   "self_type" : "type-2388",
+   "referenced_type" : "type-2391",
+   "self_type" : "type-2390",
    "size" : 20,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -16851,8 +16917,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-179",
-   "self_type" : "type-184",
+   "referenced_type" : "type-182",
+   "self_type" : "type-187",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -16861,8 +16927,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
-   "referenced_type" : "type-285",
-   "self_type" : "type-873",
+   "referenced_type" : "type-282",
+   "self_type" : "type-863",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -16871,8 +16937,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<android::Rect>",
    "name" : "const android::Vector<android::Rect>",
-   "referenced_type" : "type-2382",
-   "self_type" : "type-2384",
+   "referenced_type" : "type-2384",
+   "self_type" : "type-2386",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16881,8 +16947,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<long long>",
    "name" : "const android::Vector<long long>",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1425",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1429",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16891,8 +16957,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
-   "referenced_type" : "type-235",
-   "self_type" : "type-1422",
+   "referenced_type" : "type-237",
+   "self_type" : "type-1426",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -16912,7 +16978,7 @@
    "linker_set_key" : "const android::details::TMat33<float>",
    "name" : "const android::details::TMat33<float>",
    "referenced_type" : "type-903",
-   "self_type" : "type-925",
+   "self_type" : "type-919",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -16921,8 +16987,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TMat44<float>",
    "name" : "const android::details::TMat44<float>",
-   "referenced_type" : "type-2427",
-   "self_type" : "type-2431",
+   "referenced_type" : "type-2429",
+   "self_type" : "type-2433",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -16931,8 +16997,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TQuaternion<double>",
    "name" : "const android::details::TQuaternion<double>",
-   "referenced_type" : "type-331",
-   "self_type" : "type-404",
+   "referenced_type" : "type-328",
+   "self_type" : "type-401",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -16941,8 +17007,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TQuaternion<float>",
    "name" : "const android::details::TQuaternion<float>",
-   "referenced_type" : "type-410",
-   "self_type" : "type-432",
+   "referenced_type" : "type-407",
+   "self_type" : "type-429",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -16961,7 +17027,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec2<double>",
    "name" : "const android::details::TVec2<double>",
-   "referenced_type" : "type-55",
+   "referenced_type" : "type-57",
    "self_type" : "type-1070",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -16971,7 +17037,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec2<float>",
    "name" : "const android::details::TVec2<float>",
-   "referenced_type" : "type-22",
+   "referenced_type" : "type-23",
    "self_type" : "type-1051",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -16981,7 +17047,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec3<double>",
    "name" : "const android::details::TVec3<double>",
-   "referenced_type" : "type-66",
+   "referenced_type" : "type-68",
    "self_type" : "type-1369",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
@@ -16991,7 +17057,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec3<float>",
    "name" : "const android::details::TVec3<float>",
-   "referenced_type" : "type-17",
+   "referenced_type" : "type-18",
    "self_type" : "type-1055",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -17001,8 +17067,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec4<double>",
    "name" : "const android::details::TVec4<double>",
-   "referenced_type" : "type-50",
-   "self_type" : "type-166",
+   "referenced_type" : "type-52",
+   "self_type" : "type-164",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -17011,8 +17077,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec4<float>",
    "name" : "const android::details::TVec4<float>",
-   "referenced_type" : "type-200",
-   "self_type" : "type-325",
+   "referenced_type" : "type-192",
+   "self_type" : "type-322",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -17022,7 +17088,7 @@
    "linker_set_key" : "const android::half",
    "name" : "const android::half",
    "referenced_type" : "type-1",
-   "self_type" : "type-42",
+   "self_type" : "type-44",
    "size" : 2,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -17051,8 +17117,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::BpHwRefBase",
    "name" : "const android::hardware::BpHwRefBase",
-   "referenced_type" : "type-193",
-   "self_type" : "type-211",
+   "referenced_type" : "type-206",
+   "self_type" : "type-213",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -17061,8 +17127,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-215",
-   "self_type" : "type-231",
+   "referenced_type" : "type-217",
+   "self_type" : "type-233",
    "size" : 68,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -17071,8 +17137,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
-   "referenced_type" : "type-99",
-   "self_type" : "type-109",
+   "referenced_type" : "type-101",
+   "self_type" : "type-111",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17081,8 +17147,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
-   "referenced_type" : "type-393",
-   "self_type" : "type-401",
+   "referenced_type" : "type-392",
+   "self_type" : "type-398",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17091,8 +17157,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
-   "referenced_type" : "type-111",
-   "self_type" : "type-115",
+   "referenced_type" : "type-113",
+   "self_type" : "type-117",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17101,7 +17167,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Status",
    "name" : "const android::hardware::Status",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1310",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -17121,8 +17187,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
-   "referenced_type" : "type-136",
-   "self_type" : "type-293",
+   "referenced_type" : "type-139",
+   "self_type" : "type-290",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17131,8 +17197,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned int>",
    "name" : "const android::hardware::details::hidl_pointer<unsigned int>",
-   "referenced_type" : "type-120",
-   "self_type" : "type-190",
+   "referenced_type" : "type-122",
+   "self_type" : "type-203",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17141,7 +17207,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::return_status",
    "name" : "const android::hardware::details::return_status",
-   "referenced_type" : "type-101",
+   "referenced_type" : "type-103",
    "self_type" : "type-1319",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -17151,8 +17217,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
-   "referenced_type" : "type-1745",
-   "self_type" : "type-1744",
+   "referenced_type" : "type-1746",
+   "self_type" : "type-1745",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17161,8 +17227,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
-   "referenced_type" : "type-1911",
-   "self_type" : "type-1910",
+   "referenced_type" : "type-1913",
+   "self_type" : "type-1912",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17171,8 +17237,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
-   "referenced_type" : "type-382",
-   "self_type" : "type-381",
+   "referenced_type" : "type-379",
+   "self_type" : "type-378",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17181,8 +17247,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
-   "referenced_type" : "type-2004",
-   "self_type" : "type-2003",
+   "referenced_type" : "type-2005",
+   "self_type" : "type-2004",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17191,8 +17257,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
-   "referenced_type" : "type-495",
-   "self_type" : "type-494",
+   "referenced_type" : "type-492",
+   "self_type" : "type-491",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17201,8 +17267,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_0::BufferUsage",
-   "referenced_type" : "type-150",
-   "self_type" : "type-153",
+   "referenced_type" : "type-153",
+   "self_type" : "type-156",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -17271,8 +17337,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_1::BufferUsage",
-   "referenced_type" : "type-158",
-   "self_type" : "type-160",
+   "referenced_type" : "type-160",
+   "self_type" : "type-162",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -17321,8 +17387,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_2::BufferUsage",
-   "referenced_type" : "type-420",
-   "self_type" : "type-422",
+   "referenced_type" : "type-417",
+   "self_type" : "type-419",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -17371,8 +17437,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper",
-   "referenced_type" : "type-1585",
-   "self_type" : "type-1584",
+   "referenced_type" : "type-1589",
+   "self_type" : "type-1588",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17381,8 +17447,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper",
-   "referenced_type" : "type-1857",
-   "self_type" : "type-1856",
+   "referenced_type" : "type-1858",
+   "self_type" : "type-1857",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17391,8 +17457,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper",
-   "referenced_type" : "type-85",
-   "self_type" : "type-84",
+   "referenced_type" : "type-87",
+   "self_type" : "type-86",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17401,8 +17467,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper",
-   "referenced_type" : "type-1595",
-   "self_type" : "type-1594",
+   "referenced_type" : "type-1599",
+   "self_type" : "type-1598",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17411,8 +17477,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper",
-   "referenced_type" : "type-1861",
-   "self_type" : "type-1860",
+   "referenced_type" : "type-1862",
+   "self_type" : "type-1861",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17421,8 +17487,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper",
-   "referenced_type" : "type-97",
-   "self_type" : "type-96",
+   "referenced_type" : "type-99",
+   "self_type" : "type-98",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17431,8 +17497,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper",
-   "referenced_type" : "type-1919",
-   "self_type" : "type-1918",
+   "referenced_type" : "type-1920",
+   "self_type" : "type-1919",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17441,8 +17507,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper",
-   "referenced_type" : "type-392",
-   "self_type" : "type-391",
+   "referenced_type" : "type-389",
+   "self_type" : "type-388",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17461,8 +17527,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
-   "referenced_type" : "type-149",
-   "self_type" : "type-154",
+   "referenced_type" : "type-152",
+   "self_type" : "type-157",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17471,8 +17537,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
-   "referenced_type" : "type-157",
-   "self_type" : "type-161",
+   "referenced_type" : "type-159",
+   "self_type" : "type-163",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17481,8 +17547,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
-   "referenced_type" : "type-419",
-   "self_type" : "type-423",
+   "referenced_type" : "type-416",
+   "self_type" : "type-420",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17491,7 +17557,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-139",
+   "referenced_type" : "type-142",
    "self_type" : "type-1121",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -17521,8 +17587,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_handle>",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_handle>",
-   "referenced_type" : "type-135",
-   "self_type" : "type-146",
+   "referenced_type" : "type-138",
+   "self_type" : "type-149",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17531,8 +17597,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned int>",
    "name" : "const android::hardware::hidl_vec<unsigned int>",
-   "referenced_type" : "type-128",
-   "self_type" : "type-132",
+   "referenced_type" : "type-131",
+   "self_type" : "type-134",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17551,8 +17617,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "const android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-164",
-   "self_type" : "type-165",
+   "referenced_type" : "type-167",
+   "self_type" : "type-168",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -17561,8 +17627,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase",
    "name" : "const android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-171",
-   "self_type" : "type-170",
+   "referenced_type" : "type-174",
+   "self_type" : "type-173",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
@@ -17571,8 +17637,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-295",
-   "self_type" : "type-294",
+   "referenced_type" : "type-292",
+   "self_type" : "type-291",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
@@ -17601,8 +17667,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::IBinder>",
    "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-248",
-   "self_type" : "type-273",
+   "referenced_type" : "type-250",
+   "self_type" : "type-269",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -17611,8 +17677,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::ProcessState>",
    "name" : "const android::sp<android::hardware::ProcessState>",
-   "referenced_type" : "type-279",
-   "self_type" : "type-278",
+   "referenced_type" : "type-275",
+   "self_type" : "type-274",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -17621,8 +17687,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
    "name" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
-   "referenced_type" : "type-355",
-   "self_type" : "type-379",
+   "referenced_type" : "type-352",
+   "self_type" : "type-376",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17631,8 +17697,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
    "name" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
-   "referenced_type" : "type-484",
-   "self_type" : "type-492",
+   "referenced_type" : "type-481",
+   "self_type" : "type-489",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17641,8 +17707,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
-   "referenced_type" : "type-338",
-   "self_type" : "type-387",
+   "referenced_type" : "type-335",
+   "self_type" : "type-384",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17651,8 +17717,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
-   "referenced_type" : "type-86",
-   "self_type" : "type-91",
+   "referenced_type" : "type-88",
+   "self_type" : "type-93",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17661,8 +17727,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
    "name" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
-   "referenced_type" : "type-497",
-   "self_type" : "type-505",
+   "referenced_type" : "type-494",
+   "self_type" : "type-502",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17681,8 +17747,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::base::V1_0::IBase>",
    "name" : "const android::sp<android::hidl::base::V1_0::IBase>",
-   "referenced_type" : "type-363",
-   "self_type" : "type-365",
+   "referenced_type" : "type-360",
+   "self_type" : "type-362",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17691,8 +17757,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification>",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification>",
-   "referenced_type" : "type-371",
-   "self_type" : "type-374",
+   "referenced_type" : "type-368",
+   "self_type" : "type-371",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17711,8 +17777,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ui::Transform",
    "name" : "const android::ui::Transform",
-   "referenced_type" : "type-2434",
-   "self_type" : "type-2437",
+   "referenced_type" : "type-2436",
+   "self_type" : "type-2439",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -17721,8 +17787,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ui::Transform::mat33",
    "name" : "const android::ui::Transform::mat33",
-   "referenced_type" : "type-2435",
-   "self_type" : "type-2445",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2447",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -17732,7 +17798,7 @@
    "linker_set_key" : "const bool",
    "name" : "const bool",
    "referenced_type" : "type-6",
-   "self_type" : "type-370",
+   "self_type" : "type-367",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -17741,8 +17807,8 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-288",
-   "self_type" : "type-287",
+   "referenced_type" : "type-285",
+   "self_type" : "type-284",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -17751,8 +17817,8 @@
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-182",
-   "self_type" : "type-181",
+   "referenced_type" : "type-185",
+   "self_type" : "type-184",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -17761,8 +17827,8 @@
    "is_const" : true,
    "linker_set_key" : "const double",
    "name" : "const double",
-   "referenced_type" : "type-41",
-   "self_type" : "type-853",
+   "referenced_type" : "type-43",
+   "self_type" : "type-850",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17772,7 +17838,7 @@
    "linker_set_key" : "const float",
    "name" : "const float",
    "referenced_type" : "type-10",
-   "self_type" : "type-563",
+   "self_type" : "type-560",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
   },
@@ -17788,24 +17854,24 @@
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-1775",
-   "self_type" : "type-1774",
+   "referenced_type" : "type-1776",
+   "self_type" : "type-1775",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-2210",
-   "self_type" : "type-2209",
+   "referenced_type" : "type-2208",
+   "self_type" : "type-2207",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-2413",
-   "self_type" : "type-2412",
+   "referenced_type" : "type-2415",
+   "self_type" : "type-2414",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
@@ -17813,8 +17879,8 @@
    "is_const" : true,
    "linker_set_key" : "const gralloc_module_t",
    "name" : "const gralloc_module_t",
-   "referenced_type" : "type-578",
-   "self_type" : "type-582",
+   "referenced_type" : "type-576",
+   "self_type" : "type-580",
    "size" : 176,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -17823,8 +17889,8 @@
    "is_const" : true,
    "linker_set_key" : "const hw_module_t",
    "name" : "const hw_module_t",
-   "referenced_type" : "type-549",
-   "self_type" : "type-555",
+   "referenced_type" : "type-546",
+   "self_type" : "type-552",
    "size" : 128,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -17833,8 +17899,8 @@
    "is_const" : true,
    "linker_set_key" : "const int",
    "name" : "const int",
-   "referenced_type" : "type-103",
-   "self_type" : "type-562",
+   "referenced_type" : "type-105",
+   "self_type" : "type-559",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -17850,120 +17916,120 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-126",
-   "self_type" : "type-125",
+   "referenced_type" : "type-129",
+   "self_type" : "type-128",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1577",
-   "self_type" : "type-1576",
+   "referenced_type" : "type-1581",
+   "self_type" : "type-1580",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1612",
-   "self_type" : "type-1611",
+   "referenced_type" : "type-1617",
+   "self_type" : "type-1616",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1787",
-   "self_type" : "type-1786",
+   "referenced_type" : "type-1788",
+   "self_type" : "type-1787",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1848",
-   "self_type" : "type-1847",
+   "referenced_type" : "type-1849",
+   "self_type" : "type-1848",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1867",
-   "self_type" : "type-1866",
+   "referenced_type" : "type-1868",
+   "self_type" : "type-1867",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1934",
-   "self_type" : "type-1933",
+   "referenced_type" : "type-1936",
+   "self_type" : "type-1935",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2080",
-   "self_type" : "type-2079",
+   "referenced_type" : "type-2082",
+   "self_type" : "type-2081",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2171",
-   "self_type" : "type-2170",
+   "referenced_type" : "type-2174",
+   "self_type" : "type-2173",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2248",
-   "self_type" : "type-2247",
+   "referenced_type" : "type-2250",
+   "self_type" : "type-2249",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2290",
-   "self_type" : "type-2289",
+   "referenced_type" : "type-2292",
+   "self_type" : "type-2291",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2341",
-   "self_type" : "type-2340",
+   "referenced_type" : "type-2343",
+   "self_type" : "type-2342",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2472",
-   "self_type" : "type-2471",
+   "referenced_type" : "type-2474",
+   "self_type" : "type-2473",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-37",
-   "self_type" : "type-36",
+   "referenced_type" : "type-40",
+   "self_type" : "type-39",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-417",
-   "self_type" : "type-416",
+   "referenced_type" : "type-414",
+   "self_type" : "type-413",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -17978,16 +18044,16 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-748",
-   "self_type" : "type-747",
+   "referenced_type" : "type-749",
+   "self_type" : "type-748",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-855",
-   "self_type" : "type-854",
+   "referenced_type" : "type-857",
+   "self_type" : "type-856",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -18021,7 +18087,7 @@
    "is_const" : true,
    "linker_set_key" : "const long long",
    "name" : "const long long",
-   "referenced_type" : "type-284",
+   "referenced_type" : "type-12",
    "self_type" : "type-847",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -18031,8 +18097,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle",
    "name" : "const native_handle",
-   "referenced_type" : "type-144",
-   "self_type" : "type-143",
+   "referenced_type" : "type-147",
+   "self_type" : "type-146",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18041,8 +18107,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle *const",
    "name" : "const native_handle *const",
-   "referenced_type" : "type-142",
-   "self_type" : "type-696",
+   "referenced_type" : "type-145",
+   "self_type" : "type-699",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18052,7 +18118,7 @@
    "linker_set_key" : "const short",
    "name" : "const short",
    "referenced_type" : "type-599",
-   "self_type" : "type-825",
+   "self_type" : "type-823",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18081,8 +18147,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3>",
    "name" : "const std::array<android::details::TVec2<float>, 3>",
-   "referenced_type" : "type-1769",
-   "self_type" : "type-1768",
+   "referenced_type" : "type-1770",
+   "self_type" : "type-1769",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -18091,8 +18157,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3>",
    "name" : "const std::array<android::details::TVec2<float>, 3>",
-   "referenced_type" : "type-2122",
-   "self_type" : "type-2121",
+   "referenced_type" : "type-2120",
+   "self_type" : "type-2119",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -18111,8 +18177,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1687",
-   "self_type" : "type-1686",
+   "referenced_type" : "type-1688",
+   "self_type" : "type-1687",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18121,8 +18187,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1793",
-   "self_type" : "type-1792",
+   "referenced_type" : "type-1794",
+   "self_type" : "type-1793",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18131,8 +18197,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1880",
-   "self_type" : "type-1879",
+   "referenced_type" : "type-1881",
+   "self_type" : "type-1880",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18141,8 +18207,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1956",
-   "self_type" : "type-1955",
+   "referenced_type" : "type-1958",
+   "self_type" : "type-1957",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18151,8 +18217,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2087",
-   "self_type" : "type-2086",
+   "referenced_type" : "type-2090",
+   "self_type" : "type-2089",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18161,8 +18227,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2185",
-   "self_type" : "type-2184",
+   "referenced_type" : "type-2188",
+   "self_type" : "type-2187",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18171,8 +18237,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2255",
-   "self_type" : "type-2254",
+   "referenced_type" : "type-2257",
+   "self_type" : "type-2256",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18181,8 +18247,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2295",
-   "self_type" : "type-2294",
+   "referenced_type" : "type-2297",
+   "self_type" : "type-2296",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18191,8 +18257,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2346",
-   "self_type" : "type-2345",
+   "referenced_type" : "type-2348",
+   "self_type" : "type-2347",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18201,8 +18267,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2510",
-   "self_type" : "type-2509",
+   "referenced_type" : "type-2512",
+   "self_type" : "type-2511",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18211,8 +18277,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-302",
-   "self_type" : "type-301",
+   "referenced_type" : "type-299",
+   "self_type" : "type-298",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18221,8 +18287,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-442",
-   "self_type" : "type-441",
+   "referenced_type" : "type-439",
+   "self_type" : "type-438",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18241,8 +18307,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-762",
-   "self_type" : "type-761",
+   "referenced_type" : "type-764",
+   "self_type" : "type-763",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18251,8 +18317,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-866",
-   "self_type" : "type-865",
+   "referenced_type" : "type-867",
+   "self_type" : "type-866",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18261,8 +18327,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-922",
-   "self_type" : "type-921",
+   "referenced_type" : "type-923",
+   "self_type" : "type-922",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18281,8 +18347,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1001",
-   "self_type" : "type-1000",
+   "referenced_type" : "type-1002",
+   "self_type" : "type-1001",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18301,8 +18367,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1693",
-   "self_type" : "type-1692",
+   "referenced_type" : "type-1694",
+   "self_type" : "type-1693",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18311,8 +18377,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1799",
-   "self_type" : "type-1798",
+   "referenced_type" : "type-1800",
+   "self_type" : "type-1799",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18321,8 +18387,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1886",
-   "self_type" : "type-1885",
+   "referenced_type" : "type-1887",
+   "self_type" : "type-1886",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18331,8 +18397,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1963",
-   "self_type" : "type-1962",
+   "referenced_type" : "type-1964",
+   "self_type" : "type-1963",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18341,8 +18407,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2093",
-   "self_type" : "type-2092",
+   "referenced_type" : "type-2096",
+   "self_type" : "type-2095",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18351,8 +18417,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2192",
-   "self_type" : "type-2191",
+   "referenced_type" : "type-2195",
+   "self_type" : "type-2194",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18361,8 +18427,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2261",
-   "self_type" : "type-2260",
+   "referenced_type" : "type-2263",
+   "self_type" : "type-2262",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18371,8 +18437,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2301",
-   "self_type" : "type-2300",
+   "referenced_type" : "type-2303",
+   "self_type" : "type-2302",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18381,8 +18447,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2352",
-   "self_type" : "type-2351",
+   "referenced_type" : "type-2354",
+   "self_type" : "type-2353",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18391,8 +18457,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2516",
-   "self_type" : "type-2515",
+   "referenced_type" : "type-2518",
+   "self_type" : "type-2517",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18401,8 +18467,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-308",
-   "self_type" : "type-307",
+   "referenced_type" : "type-306",
+   "self_type" : "type-305",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18411,8 +18477,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-448",
-   "self_type" : "type-447",
+   "referenced_type" : "type-445",
+   "self_type" : "type-444",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18421,8 +18487,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-658",
-   "self_type" : "type-657",
+   "referenced_type" : "type-659",
+   "self_type" : "type-658",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18441,8 +18507,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-872",
-   "self_type" : "type-871",
+   "referenced_type" : "type-873",
+   "self_type" : "type-872",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18451,8 +18517,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-929",
-   "self_type" : "type-928",
+   "referenced_type" : "type-930",
+   "self_type" : "type-929",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18461,8 +18527,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1003",
-   "self_type" : "type-1002",
+   "referenced_type" : "type-1004",
+   "self_type" : "type-1003",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18481,8 +18547,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1695",
-   "self_type" : "type-1694",
+   "referenced_type" : "type-1696",
+   "self_type" : "type-1695",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18491,8 +18557,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1801",
-   "self_type" : "type-1800",
+   "referenced_type" : "type-1802",
+   "self_type" : "type-1801",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18501,8 +18567,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1888",
-   "self_type" : "type-1887",
+   "referenced_type" : "type-1889",
+   "self_type" : "type-1888",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18511,8 +18577,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1965",
-   "self_type" : "type-1964",
+   "referenced_type" : "type-1967",
+   "self_type" : "type-1966",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18521,8 +18587,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2095",
-   "self_type" : "type-2094",
+   "referenced_type" : "type-2098",
+   "self_type" : "type-2097",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18531,8 +18597,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2194",
-   "self_type" : "type-2193",
+   "referenced_type" : "type-2197",
+   "self_type" : "type-2196",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18541,8 +18607,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2263",
-   "self_type" : "type-2262",
+   "referenced_type" : "type-2265",
+   "self_type" : "type-2264",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18551,8 +18617,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2303",
-   "self_type" : "type-2302",
+   "referenced_type" : "type-2305",
+   "self_type" : "type-2304",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18561,8 +18627,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2354",
-   "self_type" : "type-2353",
+   "referenced_type" : "type-2356",
+   "self_type" : "type-2355",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18571,8 +18637,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2518",
-   "self_type" : "type-2517",
+   "referenced_type" : "type-2520",
+   "self_type" : "type-2519",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18581,8 +18647,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-311",
-   "self_type" : "type-310",
+   "referenced_type" : "type-308",
+   "self_type" : "type-307",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18591,8 +18657,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-450",
-   "self_type" : "type-449",
+   "referenced_type" : "type-447",
+   "self_type" : "type-446",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18601,8 +18667,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-660",
-   "self_type" : "type-659",
+   "referenced_type" : "type-661",
+   "self_type" : "type-660",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18621,8 +18687,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-875",
-   "self_type" : "type-874",
+   "referenced_type" : "type-876",
+   "self_type" : "type-875",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18631,8 +18697,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-931",
-   "self_type" : "type-930",
+   "referenced_type" : "type-932",
+   "self_type" : "type-931",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18651,8 +18717,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1691",
-   "self_type" : "type-1690",
+   "referenced_type" : "type-1692",
+   "self_type" : "type-1691",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18661,8 +18727,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1797",
-   "self_type" : "type-1796",
+   "referenced_type" : "type-1798",
+   "self_type" : "type-1797",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18671,8 +18737,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1884",
-   "self_type" : "type-1883",
+   "referenced_type" : "type-1885",
+   "self_type" : "type-1884",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18681,8 +18747,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1961",
-   "self_type" : "type-1960",
+   "referenced_type" : "type-1962",
+   "self_type" : "type-1961",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18691,8 +18757,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2091",
-   "self_type" : "type-2090",
+   "referenced_type" : "type-2094",
+   "self_type" : "type-2093",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18701,8 +18767,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2189",
-   "self_type" : "type-2188",
+   "referenced_type" : "type-2192",
+   "self_type" : "type-2191",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18711,8 +18777,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2259",
-   "self_type" : "type-2258",
+   "referenced_type" : "type-2261",
+   "self_type" : "type-2260",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18721,8 +18787,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2299",
-   "self_type" : "type-2298",
+   "referenced_type" : "type-2301",
+   "self_type" : "type-2300",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18731,8 +18797,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2350",
-   "self_type" : "type-2349",
+   "referenced_type" : "type-2352",
+   "self_type" : "type-2351",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18741,8 +18807,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2514",
-   "self_type" : "type-2513",
+   "referenced_type" : "type-2516",
+   "self_type" : "type-2515",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18751,8 +18817,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-306",
-   "self_type" : "type-305",
+   "referenced_type" : "type-303",
+   "self_type" : "type-302",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18761,8 +18827,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-446",
-   "self_type" : "type-445",
+   "referenced_type" : "type-443",
+   "self_type" : "type-442",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18771,8 +18837,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-656",
-   "self_type" : "type-655",
+   "referenced_type" : "type-657",
+   "self_type" : "type-656",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18781,8 +18847,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-766",
-   "self_type" : "type-765",
+   "referenced_type" : "type-768",
+   "self_type" : "type-767",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18791,8 +18857,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-870",
-   "self_type" : "type-869",
+   "referenced_type" : "type-871",
+   "self_type" : "type-870",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18801,8 +18867,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-927",
-   "self_type" : "type-926",
+   "referenced_type" : "type-928",
+   "self_type" : "type-927",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18821,8 +18887,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1005",
-   "self_type" : "type-1004",
+   "referenced_type" : "type-1006",
+   "self_type" : "type-1005",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18841,8 +18907,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1697",
-   "self_type" : "type-1696",
+   "referenced_type" : "type-1698",
+   "self_type" : "type-1697",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18851,8 +18917,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1803",
-   "self_type" : "type-1802",
+   "referenced_type" : "type-1804",
+   "self_type" : "type-1803",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18861,8 +18927,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1890",
-   "self_type" : "type-1889",
+   "referenced_type" : "type-1891",
+   "self_type" : "type-1890",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18871,8 +18937,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1967",
-   "self_type" : "type-1966",
+   "referenced_type" : "type-1969",
+   "self_type" : "type-1968",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18881,8 +18947,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2098",
-   "self_type" : "type-2097",
+   "referenced_type" : "type-2102",
+   "self_type" : "type-2101",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18891,8 +18957,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2196",
-   "self_type" : "type-2195",
+   "referenced_type" : "type-2199",
+   "self_type" : "type-2198",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18901,8 +18967,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2265",
-   "self_type" : "type-2264",
+   "referenced_type" : "type-2267",
+   "self_type" : "type-2266",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18911,8 +18977,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2305",
-   "self_type" : "type-2304",
+   "referenced_type" : "type-2307",
+   "self_type" : "type-2306",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18921,8 +18987,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2356",
-   "self_type" : "type-2355",
+   "referenced_type" : "type-2358",
+   "self_type" : "type-2357",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18931,8 +18997,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2520",
-   "self_type" : "type-2519",
+   "referenced_type" : "type-2522",
+   "self_type" : "type-2521",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18941,8 +19007,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-313",
-   "self_type" : "type-312",
+   "referenced_type" : "type-310",
+   "self_type" : "type-309",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18951,8 +19017,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-452",
-   "self_type" : "type-451",
+   "referenced_type" : "type-449",
+   "self_type" : "type-448",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18981,8 +19047,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-877",
-   "self_type" : "type-876",
+   "referenced_type" : "type-878",
+   "self_type" : "type-877",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18991,8 +19057,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-933",
-   "self_type" : "type-932",
+   "referenced_type" : "type-934",
+   "self_type" : "type-933",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19011,8 +19077,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1685",
-   "self_type" : "type-1684",
+   "referenced_type" : "type-1686",
+   "self_type" : "type-1685",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19021,8 +19087,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1791",
-   "self_type" : "type-1790",
+   "referenced_type" : "type-1792",
+   "self_type" : "type-1791",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19031,8 +19097,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1878",
-   "self_type" : "type-1877",
+   "referenced_type" : "type-1879",
+   "self_type" : "type-1878",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19041,8 +19107,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1954",
-   "self_type" : "type-1953",
+   "referenced_type" : "type-1955",
+   "self_type" : "type-1954",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19051,8 +19117,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2085",
-   "self_type" : "type-2084",
+   "referenced_type" : "type-2087",
+   "self_type" : "type-2086",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19061,8 +19127,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2183",
-   "self_type" : "type-2182",
+   "referenced_type" : "type-2186",
+   "self_type" : "type-2185",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19071,8 +19137,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2253",
-   "self_type" : "type-2252",
+   "referenced_type" : "type-2255",
+   "self_type" : "type-2254",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19081,8 +19147,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2293",
-   "self_type" : "type-2292",
+   "referenced_type" : "type-2295",
+   "self_type" : "type-2294",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19091,8 +19157,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2344",
-   "self_type" : "type-2343",
+   "referenced_type" : "type-2346",
+   "self_type" : "type-2345",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19101,8 +19167,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2508",
-   "self_type" : "type-2507",
+   "referenced_type" : "type-2510",
+   "self_type" : "type-2509",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19111,8 +19177,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-300",
-   "self_type" : "type-299",
+   "referenced_type" : "type-297",
+   "self_type" : "type-296",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19121,8 +19187,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-440",
-   "self_type" : "type-439",
+   "referenced_type" : "type-437",
+   "self_type" : "type-436",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19131,8 +19197,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-649",
-   "self_type" : "type-648",
+   "referenced_type" : "type-650",
+   "self_type" : "type-649",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19151,8 +19217,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-863",
-   "self_type" : "type-862",
+   "referenced_type" : "type-865",
+   "self_type" : "type-864",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19161,8 +19227,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-920",
-   "self_type" : "type-919",
+   "referenced_type" : "type-921",
+   "self_type" : "type-920",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19191,8 +19257,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1689",
-   "self_type" : "type-1688",
+   "referenced_type" : "type-1690",
+   "self_type" : "type-1689",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19201,8 +19267,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1795",
-   "self_type" : "type-1794",
+   "referenced_type" : "type-1796",
+   "self_type" : "type-1795",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19211,8 +19277,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1882",
-   "self_type" : "type-1881",
+   "referenced_type" : "type-1883",
+   "self_type" : "type-1882",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19221,8 +19287,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1958",
-   "self_type" : "type-1957",
+   "referenced_type" : "type-1960",
+   "self_type" : "type-1959",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19231,8 +19297,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2089",
-   "self_type" : "type-2088",
+   "referenced_type" : "type-2092",
+   "self_type" : "type-2091",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19241,8 +19307,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2187",
-   "self_type" : "type-2186",
+   "referenced_type" : "type-2190",
+   "self_type" : "type-2189",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19251,8 +19317,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2257",
-   "self_type" : "type-2256",
+   "referenced_type" : "type-2259",
+   "self_type" : "type-2258",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19261,8 +19327,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2297",
-   "self_type" : "type-2296",
+   "referenced_type" : "type-2299",
+   "self_type" : "type-2298",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19271,8 +19337,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2348",
-   "self_type" : "type-2347",
+   "referenced_type" : "type-2350",
+   "self_type" : "type-2349",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19281,8 +19347,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2512",
-   "self_type" : "type-2511",
+   "referenced_type" : "type-2514",
+   "self_type" : "type-2513",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19291,8 +19357,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-304",
-   "self_type" : "type-303",
+   "referenced_type" : "type-301",
+   "self_type" : "type-300",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19301,8 +19367,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-444",
-   "self_type" : "type-443",
+   "referenced_type" : "type-441",
+   "self_type" : "type-440",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19321,8 +19387,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-764",
-   "self_type" : "type-763",
+   "referenced_type" : "type-766",
+   "self_type" : "type-765",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19331,8 +19397,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-868",
-   "self_type" : "type-867",
+   "referenced_type" : "type-869",
+   "self_type" : "type-868",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19341,8 +19407,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-924",
-   "self_type" : "type-923",
+   "referenced_type" : "type-925",
+   "self_type" : "type-924",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19361,8 +19427,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1010",
-   "self_type" : "type-1009",
+   "referenced_type" : "type-1012",
+   "self_type" : "type-1011",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19381,8 +19447,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1702",
-   "self_type" : "type-1701",
+   "referenced_type" : "type-1703",
+   "self_type" : "type-1702",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19391,8 +19457,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1807",
-   "self_type" : "type-1806",
+   "referenced_type" : "type-1808",
+   "self_type" : "type-1807",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19401,8 +19467,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1894",
-   "self_type" : "type-1893",
+   "referenced_type" : "type-1895",
+   "self_type" : "type-1894",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19411,8 +19477,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1972",
-   "self_type" : "type-1971",
+   "referenced_type" : "type-1974",
+   "self_type" : "type-1973",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19421,8 +19487,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2102",
-   "self_type" : "type-2101",
+   "referenced_type" : "type-2106",
+   "self_type" : "type-2105",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19431,8 +19497,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2201",
-   "self_type" : "type-2200",
+   "referenced_type" : "type-2204",
+   "self_type" : "type-2203",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19441,8 +19507,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2269",
-   "self_type" : "type-2268",
+   "referenced_type" : "type-2271",
+   "self_type" : "type-2270",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19451,8 +19517,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2309",
-   "self_type" : "type-2308",
+   "referenced_type" : "type-2311",
+   "self_type" : "type-2310",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19461,8 +19527,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2360",
-   "self_type" : "type-2359",
+   "referenced_type" : "type-2362",
+   "self_type" : "type-2361",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19471,8 +19537,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2528",
-   "self_type" : "type-2527",
+   "referenced_type" : "type-2530",
+   "self_type" : "type-2529",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19481,8 +19547,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-318",
-   "self_type" : "type-317",
+   "referenced_type" : "type-315",
+   "self_type" : "type-314",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19491,8 +19557,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-457",
-   "self_type" : "type-456",
+   "referenced_type" : "type-454",
+   "self_type" : "type-453",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19501,8 +19567,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-667",
-   "self_type" : "type-666",
+   "referenced_type" : "type-668",
+   "self_type" : "type-667",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19511,8 +19577,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-778",
-   "self_type" : "type-777",
+   "referenced_type" : "type-779",
+   "self_type" : "type-778",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19521,8 +19587,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-882",
-   "self_type" : "type-881",
+   "referenced_type" : "type-883",
+   "self_type" : "type-882",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19531,8 +19597,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-938",
-   "self_type" : "type-937",
+   "referenced_type" : "type-939",
+   "self_type" : "type-938",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19541,8 +19607,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1013",
+   "referenced_type" : "type-1016",
+   "self_type" : "type-1015",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19561,8 +19627,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1706",
-   "self_type" : "type-1705",
+   "referenced_type" : "type-1707",
+   "self_type" : "type-1706",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19571,8 +19637,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1811",
-   "self_type" : "type-1810",
+   "referenced_type" : "type-1812",
+   "self_type" : "type-1811",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19581,8 +19647,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1898",
-   "self_type" : "type-1897",
+   "referenced_type" : "type-1899",
+   "self_type" : "type-1898",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19591,8 +19657,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1976",
-   "self_type" : "type-1975",
+   "referenced_type" : "type-1978",
+   "self_type" : "type-1977",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19601,8 +19667,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2108",
-   "self_type" : "type-2107",
+   "referenced_type" : "type-2110",
+   "self_type" : "type-2109",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19611,8 +19677,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2206",
-   "self_type" : "type-2205",
+   "referenced_type" : "type-2210",
+   "self_type" : "type-2209",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19621,8 +19687,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2273",
-   "self_type" : "type-2272",
+   "referenced_type" : "type-2275",
+   "self_type" : "type-2274",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19631,8 +19697,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2313",
-   "self_type" : "type-2312",
+   "referenced_type" : "type-2315",
+   "self_type" : "type-2314",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19641,8 +19707,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2364",
-   "self_type" : "type-2363",
+   "referenced_type" : "type-2366",
+   "self_type" : "type-2365",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19651,8 +19717,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2532",
-   "self_type" : "type-2531",
+   "referenced_type" : "type-2534",
+   "self_type" : "type-2533",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19661,8 +19727,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-322",
-   "self_type" : "type-321",
+   "referenced_type" : "type-319",
+   "self_type" : "type-318",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19671,8 +19737,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-461",
-   "self_type" : "type-460",
+   "referenced_type" : "type-459",
+   "self_type" : "type-458",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19681,8 +19747,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-672",
-   "self_type" : "type-671",
+   "referenced_type" : "type-673",
+   "self_type" : "type-672",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19701,8 +19767,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-886",
-   "self_type" : "type-885",
+   "referenced_type" : "type-887",
+   "self_type" : "type-886",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19711,8 +19777,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-943",
-   "self_type" : "type-942",
+   "referenced_type" : "type-944",
+   "self_type" : "type-943",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19721,8 +19787,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1012",
-   "self_type" : "type-1011",
+   "referenced_type" : "type-1014",
+   "self_type" : "type-1013",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19741,8 +19807,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1704",
-   "self_type" : "type-1703",
+   "referenced_type" : "type-1705",
+   "self_type" : "type-1704",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19751,8 +19817,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1809",
-   "self_type" : "type-1808",
+   "referenced_type" : "type-1810",
+   "self_type" : "type-1809",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19761,8 +19827,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1896",
-   "self_type" : "type-1895",
+   "referenced_type" : "type-1897",
+   "self_type" : "type-1896",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19771,8 +19837,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1974",
-   "self_type" : "type-1973",
+   "referenced_type" : "type-1976",
+   "self_type" : "type-1975",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19781,8 +19847,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2106",
-   "self_type" : "type-2105",
+   "referenced_type" : "type-2108",
+   "self_type" : "type-2107",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19791,8 +19857,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2203",
-   "self_type" : "type-2202",
+   "referenced_type" : "type-2206",
+   "self_type" : "type-2205",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19801,8 +19867,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2271",
-   "self_type" : "type-2270",
+   "referenced_type" : "type-2273",
+   "self_type" : "type-2272",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19811,8 +19877,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2311",
-   "self_type" : "type-2310",
+   "referenced_type" : "type-2313",
+   "self_type" : "type-2312",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19821,8 +19887,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2362",
-   "self_type" : "type-2361",
+   "referenced_type" : "type-2364",
+   "self_type" : "type-2363",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19831,8 +19897,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2530",
-   "self_type" : "type-2529",
+   "referenced_type" : "type-2532",
+   "self_type" : "type-2531",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19841,8 +19907,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-320",
-   "self_type" : "type-319",
+   "referenced_type" : "type-317",
+   "self_type" : "type-316",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19851,8 +19917,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-459",
-   "self_type" : "type-458",
+   "referenced_type" : "type-457",
+   "self_type" : "type-456",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19871,8 +19937,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-780",
-   "self_type" : "type-779",
+   "referenced_type" : "type-781",
+   "self_type" : "type-780",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19881,8 +19947,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-884",
-   "self_type" : "type-883",
+   "referenced_type" : "type-885",
+   "self_type" : "type-884",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19891,8 +19957,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-940",
-   "self_type" : "type-939",
+   "referenced_type" : "type-941",
+   "self_type" : "type-940",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19901,8 +19967,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1008",
-   "self_type" : "type-1007",
+   "referenced_type" : "type-1010",
+   "self_type" : "type-1009",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19921,8 +19987,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1699",
-   "self_type" : "type-1698",
+   "referenced_type" : "type-1701",
+   "self_type" : "type-1700",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19931,8 +19997,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1805",
-   "self_type" : "type-1804",
+   "referenced_type" : "type-1806",
+   "self_type" : "type-1805",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19941,8 +20007,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1892",
-   "self_type" : "type-1891",
+   "referenced_type" : "type-1893",
+   "self_type" : "type-1892",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19951,8 +20017,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1970",
-   "self_type" : "type-1969",
+   "referenced_type" : "type-1971",
+   "self_type" : "type-1970",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19961,8 +20027,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2100",
-   "self_type" : "type-2099",
+   "referenced_type" : "type-2104",
+   "self_type" : "type-2103",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19971,8 +20037,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2199",
-   "self_type" : "type-2198",
+   "referenced_type" : "type-2202",
+   "self_type" : "type-2201",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19981,8 +20047,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2267",
-   "self_type" : "type-2266",
+   "referenced_type" : "type-2269",
+   "self_type" : "type-2268",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19991,8 +20057,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2307",
-   "self_type" : "type-2306",
+   "referenced_type" : "type-2309",
+   "self_type" : "type-2308",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20001,8 +20067,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2358",
-   "self_type" : "type-2357",
+   "referenced_type" : "type-2360",
+   "self_type" : "type-2359",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20011,8 +20077,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2526",
-   "self_type" : "type-2525",
+   "referenced_type" : "type-2528",
+   "self_type" : "type-2527",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20021,8 +20087,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-315",
-   "self_type" : "type-314",
+   "referenced_type" : "type-313",
+   "self_type" : "type-312",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20031,8 +20097,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-455",
-   "self_type" : "type-454",
+   "referenced_type" : "type-452",
+   "self_type" : "type-451",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20041,8 +20107,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-665",
-   "self_type" : "type-664",
+   "referenced_type" : "type-666",
+   "self_type" : "type-665",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20051,8 +20117,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-776",
-   "self_type" : "type-775",
+   "referenced_type" : "type-777",
+   "self_type" : "type-776",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20061,8 +20127,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-880",
-   "self_type" : "type-879",
+   "referenced_type" : "type-881",
+   "self_type" : "type-880",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20071,8 +20137,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-936",
-   "self_type" : "type-935",
+   "referenced_type" : "type-937",
+   "self_type" : "type-936",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20101,8 +20167,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1708",
-   "self_type" : "type-1707",
+   "referenced_type" : "type-1709",
+   "self_type" : "type-1708",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20111,8 +20177,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1813",
-   "self_type" : "type-1812",
+   "referenced_type" : "type-1814",
+   "self_type" : "type-1813",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20121,8 +20187,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1900",
-   "self_type" : "type-1899",
+   "referenced_type" : "type-1901",
+   "self_type" : "type-1900",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20131,8 +20197,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1979",
-   "self_type" : "type-1978",
+   "referenced_type" : "type-1980",
+   "self_type" : "type-1979",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20141,8 +20207,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2110",
-   "self_type" : "type-2109",
+   "referenced_type" : "type-2112",
+   "self_type" : "type-2111",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20151,8 +20217,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2208",
-   "self_type" : "type-2207",
+   "referenced_type" : "type-2212",
+   "self_type" : "type-2211",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20161,8 +20227,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2275",
-   "self_type" : "type-2274",
+   "referenced_type" : "type-2277",
+   "self_type" : "type-2276",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20171,8 +20237,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2315",
-   "self_type" : "type-2314",
+   "referenced_type" : "type-2317",
+   "self_type" : "type-2316",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20181,8 +20247,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2366",
-   "self_type" : "type-2365",
+   "referenced_type" : "type-2368",
+   "self_type" : "type-2367",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20191,8 +20257,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2534",
-   "self_type" : "type-2533",
+   "referenced_type" : "type-2536",
+   "self_type" : "type-2535",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20201,8 +20267,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-324",
-   "self_type" : "type-323",
+   "referenced_type" : "type-321",
+   "self_type" : "type-320",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20211,8 +20277,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-464",
-   "self_type" : "type-463",
+   "referenced_type" : "type-461",
+   "self_type" : "type-460",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20221,8 +20287,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-674",
-   "self_type" : "type-673",
+   "referenced_type" : "type-675",
+   "self_type" : "type-674",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20241,8 +20307,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-888",
-   "self_type" : "type-887",
+   "referenced_type" : "type-890",
+   "self_type" : "type-889",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20251,8 +20317,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-945",
-   "self_type" : "type-944",
+   "referenced_type" : "type-946",
+   "self_type" : "type-945",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20261,8 +20327,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1026",
-   "self_type" : "type-1025",
+   "referenced_type" : "type-1027",
+   "self_type" : "type-1026",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20281,8 +20347,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1821",
-   "self_type" : "type-1820",
+   "referenced_type" : "type-1822",
+   "self_type" : "type-1821",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20291,8 +20357,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1988",
-   "self_type" : "type-1987",
+   "referenced_type" : "type-1989",
+   "self_type" : "type-1988",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20301,8 +20367,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2218",
-   "self_type" : "type-2217",
+   "referenced_type" : "type-2220",
+   "self_type" : "type-2219",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20311,8 +20377,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2283",
-   "self_type" : "type-2282",
+   "referenced_type" : "type-2285",
+   "self_type" : "type-2284",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20321,8 +20387,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2323",
-   "self_type" : "type-2322",
+   "referenced_type" : "type-2325",
+   "self_type" : "type-2324",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20331,8 +20397,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2374",
-   "self_type" : "type-2373",
+   "referenced_type" : "type-2376",
+   "self_type" : "type-2375",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20341,8 +20407,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2546",
-   "self_type" : "type-2545",
+   "referenced_type" : "type-2548",
+   "self_type" : "type-2547",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20351,8 +20417,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-473",
-   "self_type" : "type-472",
+   "referenced_type" : "type-470",
+   "self_type" : "type-469",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20361,8 +20427,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-794",
-   "self_type" : "type-793",
+   "referenced_type" : "type-795",
+   "self_type" : "type-794",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20371,8 +20437,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-898",
-   "self_type" : "type-897",
+   "referenced_type" : "type-899",
+   "self_type" : "type-898",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20381,8 +20447,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-954",
-   "self_type" : "type-953",
+   "referenced_type" : "type-955",
+   "self_type" : "type-954",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20391,8 +20457,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-1024",
-   "self_type" : "type-1023",
+   "referenced_type" : "type-1025",
+   "self_type" : "type-1024",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20411,8 +20477,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-1819",
-   "self_type" : "type-1818",
+   "referenced_type" : "type-1820",
+   "self_type" : "type-1819",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20421,8 +20487,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-1986",
-   "self_type" : "type-1985",
+   "referenced_type" : "type-1987",
+   "self_type" : "type-1986",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20431,8 +20497,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2216",
-   "self_type" : "type-2215",
+   "referenced_type" : "type-2218",
+   "self_type" : "type-2217",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20441,8 +20507,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2281",
-   "self_type" : "type-2280",
+   "referenced_type" : "type-2283",
+   "self_type" : "type-2282",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20451,8 +20517,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2321",
-   "self_type" : "type-2320",
+   "referenced_type" : "type-2323",
+   "self_type" : "type-2322",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20461,8 +20527,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2372",
-   "self_type" : "type-2371",
+   "referenced_type" : "type-2374",
+   "self_type" : "type-2373",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20471,8 +20537,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2544",
-   "self_type" : "type-2543",
+   "referenced_type" : "type-2546",
+   "self_type" : "type-2545",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20481,8 +20547,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-471",
-   "self_type" : "type-470",
+   "referenced_type" : "type-468",
+   "self_type" : "type-467",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20491,8 +20557,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-792",
-   "self_type" : "type-791",
+   "referenced_type" : "type-793",
+   "self_type" : "type-792",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20501,8 +20567,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-896",
-   "self_type" : "type-895",
+   "referenced_type" : "type-897",
+   "self_type" : "type-896",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20511,8 +20577,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-952",
-   "self_type" : "type-951",
+   "referenced_type" : "type-953",
+   "self_type" : "type-952",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20521,8 +20587,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-1022",
-   "self_type" : "type-1021",
+   "referenced_type" : "type-1023",
+   "self_type" : "type-1022",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20541,8 +20607,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-1817",
-   "self_type" : "type-1816",
+   "referenced_type" : "type-1818",
+   "self_type" : "type-1817",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20551,8 +20617,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-1983",
-   "self_type" : "type-1982",
+   "referenced_type" : "type-1985",
+   "self_type" : "type-1984",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20561,8 +20627,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2214",
-   "self_type" : "type-2213",
+   "referenced_type" : "type-2216",
+   "self_type" : "type-2215",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20571,8 +20637,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2279",
-   "self_type" : "type-2278",
+   "referenced_type" : "type-2281",
+   "self_type" : "type-2280",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20581,8 +20647,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2319",
-   "self_type" : "type-2318",
+   "referenced_type" : "type-2321",
+   "self_type" : "type-2320",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20591,8 +20657,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2370",
-   "self_type" : "type-2369",
+   "referenced_type" : "type-2372",
+   "self_type" : "type-2371",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20601,8 +20667,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2542",
-   "self_type" : "type-2541",
+   "referenced_type" : "type-2544",
+   "self_type" : "type-2543",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20611,8 +20677,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-468",
-   "self_type" : "type-467",
+   "referenced_type" : "type-466",
+   "self_type" : "type-465",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20621,8 +20687,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-790",
-   "self_type" : "type-789",
+   "referenced_type" : "type-791",
+   "self_type" : "type-790",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20631,8 +20697,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-894",
-   "self_type" : "type-893",
+   "referenced_type" : "type-895",
+   "self_type" : "type-894",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20641,8 +20707,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-950",
-   "self_type" : "type-949",
+   "referenced_type" : "type-951",
+   "self_type" : "type-950",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20671,8 +20737,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-1815",
-   "self_type" : "type-1814",
+   "referenced_type" : "type-1816",
+   "self_type" : "type-1815",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20681,8 +20747,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-1981",
-   "self_type" : "type-1980",
+   "referenced_type" : "type-1983",
+   "self_type" : "type-1982",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20691,8 +20757,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2212",
-   "self_type" : "type-2211",
+   "referenced_type" : "type-2214",
+   "self_type" : "type-2213",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20701,8 +20767,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2277",
-   "self_type" : "type-2276",
+   "referenced_type" : "type-2279",
+   "self_type" : "type-2278",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20711,8 +20777,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2317",
-   "self_type" : "type-2316",
+   "referenced_type" : "type-2319",
+   "self_type" : "type-2318",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20721,8 +20787,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2368",
-   "self_type" : "type-2367",
+   "referenced_type" : "type-2370",
+   "self_type" : "type-2369",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20731,8 +20797,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2540",
-   "self_type" : "type-2539",
+   "referenced_type" : "type-2542",
+   "self_type" : "type-2541",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20741,8 +20807,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-466",
-   "self_type" : "type-465",
+   "referenced_type" : "type-464",
+   "self_type" : "type-463",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20751,8 +20817,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-788",
-   "self_type" : "type-787",
+   "referenced_type" : "type-789",
+   "self_type" : "type-788",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20761,8 +20827,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-892",
-   "self_type" : "type-891",
+   "referenced_type" : "type-893",
+   "self_type" : "type-892",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20771,8 +20837,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-947",
-   "self_type" : "type-946",
+   "referenced_type" : "type-948",
+   "self_type" : "type-947",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20781,8 +20847,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1028",
-   "self_type" : "type-1027",
+   "referenced_type" : "type-1029",
+   "self_type" : "type-1028",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20801,8 +20867,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1823",
-   "self_type" : "type-1822",
+   "referenced_type" : "type-1824",
+   "self_type" : "type-1823",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20811,8 +20877,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1990",
-   "self_type" : "type-1989",
+   "referenced_type" : "type-1992",
+   "self_type" : "type-1991",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20821,8 +20887,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2220",
-   "self_type" : "type-2219",
+   "referenced_type" : "type-2223",
+   "self_type" : "type-2222",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20831,8 +20897,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2285",
-   "self_type" : "type-2284",
+   "referenced_type" : "type-2287",
+   "self_type" : "type-2286",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20841,8 +20907,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2325",
-   "self_type" : "type-2324",
+   "referenced_type" : "type-2327",
+   "self_type" : "type-2326",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20851,8 +20917,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2376",
-   "self_type" : "type-2375",
+   "referenced_type" : "type-2378",
+   "self_type" : "type-2377",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20861,8 +20927,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2548",
-   "self_type" : "type-2547",
+   "referenced_type" : "type-2550",
+   "self_type" : "type-2549",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20871,8 +20937,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-475",
-   "self_type" : "type-474",
+   "referenced_type" : "type-472",
+   "self_type" : "type-471",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20891,8 +20957,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-900",
-   "self_type" : "type-899",
+   "referenced_type" : "type-901",
+   "self_type" : "type-900",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20901,8 +20967,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-956",
-   "self_type" : "type-955",
+   "referenced_type" : "type-957",
+   "self_type" : "type-956",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20911,8 +20977,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1633",
-   "self_type" : "type-1632",
+   "referenced_type" : "type-1637",
+   "self_type" : "type-1636",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20921,8 +20987,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-168",
-   "self_type" : "type-167",
+   "referenced_type" : "type-170",
+   "self_type" : "type-169",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20931,8 +20997,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1870",
-   "self_type" : "type-1869",
+   "referenced_type" : "type-1871",
+   "self_type" : "type-1870",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20941,8 +21007,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1943",
-   "self_type" : "type-1942",
+   "referenced_type" : "type-1944",
+   "self_type" : "type-1943",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20951,8 +21017,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2083",
-   "self_type" : "type-2082",
+   "referenced_type" : "type-2085",
+   "self_type" : "type-2084",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20961,8 +21027,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2179",
-   "self_type" : "type-2178",
+   "referenced_type" : "type-2182",
+   "self_type" : "type-2181",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20971,8 +21037,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2251",
-   "self_type" : "type-2250",
+   "referenced_type" : "type-2253",
+   "self_type" : "type-2252",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20981,8 +21047,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-426",
-   "self_type" : "type-425",
+   "referenced_type" : "type-423",
+   "self_type" : "type-422",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20991,8 +21057,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-646",
-   "self_type" : "type-645",
+   "referenced_type" : "type-647",
+   "self_type" : "type-646",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -21001,8 +21067,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-756",
-   "self_type" : "type-755",
+   "referenced_type" : "type-757",
+   "self_type" : "type-756",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -21021,8 +21087,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1016",
-   "self_type" : "type-1015",
+   "referenced_type" : "type-1008",
+   "self_type" : "type-1007",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -21031,8 +21097,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1766",
-   "self_type" : "type-1765",
+   "referenced_type" : "type-1767",
+   "self_type" : "type-1766",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -21041,8 +21107,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2104",
-   "self_type" : "type-2103",
+   "referenced_type" : "type-2100",
+   "self_type" : "type-2099",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -21051,8 +21117,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-1758",
-   "self_type" : "type-1757",
+   "referenced_type" : "type-1759",
+   "self_type" : "type-1758",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -21061,8 +21127,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-1876",
-   "self_type" : "type-1875",
+   "referenced_type" : "type-1877",
+   "self_type" : "type-1876",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -21071,46 +21137,6 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-2403",
-   "self_type" : "type-2402",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::float_denorm_style",
-   "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-768",
-   "self_type" : "type-767",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::float_round_style",
-   "name" : "const std::float_round_style",
-   "referenced_type" : "type-1761",
-   "self_type" : "type-1760",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::float_round_style",
-   "name" : "const std::float_round_style",
-   "referenced_type" : "type-1946",
-   "self_type" : "type-1945",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::float_round_style",
-   "name" : "const std::float_round_style",
    "referenced_type" : "type-2405",
    "self_type" : "type-2404",
    "size" : 4,
@@ -21119,10 +21145,50 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const std::float_denorm_style",
+   "name" : "const std::float_denorm_style",
+   "referenced_type" : "type-762",
+   "self_type" : "type-761",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const std::float_round_style",
    "name" : "const std::float_round_style",
-   "referenced_type" : "type-858",
-   "self_type" : "type-857",
+   "referenced_type" : "type-1762",
+   "self_type" : "type-1761",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::float_round_style",
+   "name" : "const std::float_round_style",
+   "referenced_type" : "type-1947",
+   "self_type" : "type-1946",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::float_round_style",
+   "name" : "const std::float_round_style",
+   "referenced_type" : "type-2407",
+   "self_type" : "type-2406",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::float_round_style",
+   "name" : "const std::float_round_style",
+   "referenced_type" : "type-855",
+   "self_type" : "type-854",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -21141,8 +21207,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<float (float)>",
    "name" : "const std::function<float (float)>",
-   "referenced_type" : "type-1778",
-   "self_type" : "type-1777",
+   "referenced_type" : "type-1779",
+   "self_type" : "type-1778",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -21151,8 +21217,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<float (float)>",
    "name" : "const std::function<float (float)>",
-   "referenced_type" : "type-2223",
-   "self_type" : "type-2222",
+   "referenced_type" : "type-2225",
+   "self_type" : "type-2224",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -21161,8 +21227,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-1392",
-   "self_type" : "type-1391",
+   "referenced_type" : "type-1396",
+   "self_type" : "type-1395",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -21171,8 +21237,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-1840",
-   "self_type" : "type-1839",
+   "referenced_type" : "type-1841",
+   "self_type" : "type-1840",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -21181,8 +21247,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-2663",
-   "self_type" : "type-2662",
+   "referenced_type" : "type-2668",
+   "self_type" : "type-2667",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -21191,8 +21257,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> >",
    "name" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> >",
-   "referenced_type" : "type-2331",
-   "self_type" : "type-2330",
+   "referenced_type" : "type-2333",
+   "self_type" : "type-2332",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -21211,8 +21277,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1032",
-   "self_type" : "type-1031",
+   "referenced_type" : "type-1033",
+   "self_type" : "type-1032",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21231,8 +21297,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1582",
-   "self_type" : "type-1581",
+   "referenced_type" : "type-1586",
+   "self_type" : "type-1585",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21241,8 +21307,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1713",
-   "self_type" : "type-1712",
+   "referenced_type" : "type-1714",
+   "self_type" : "type-1713",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21251,8 +21317,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1826",
-   "self_type" : "type-1825",
+   "referenced_type" : "type-1827",
+   "self_type" : "type-1826",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21261,8 +21327,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1852",
-   "self_type" : "type-1851",
+   "referenced_type" : "type-1853",
+   "self_type" : "type-1852",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21271,8 +21337,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1903",
-   "self_type" : "type-1902",
+   "referenced_type" : "type-1904",
+   "self_type" : "type-1903",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21281,8 +21347,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1994",
-   "self_type" : "type-1993",
+   "referenced_type" : "type-1995",
+   "self_type" : "type-1994",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21291,8 +21357,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2075",
-   "self_type" : "type-2074",
+   "referenced_type" : "type-2077",
+   "self_type" : "type-2076",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21301,8 +21367,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2150",
-   "self_type" : "type-2149",
+   "referenced_type" : "type-2153",
+   "self_type" : "type-2152",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21311,8 +21377,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2233",
-   "self_type" : "type-2232",
+   "referenced_type" : "type-2235",
+   "self_type" : "type-2234",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21321,8 +21387,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2328",
-   "self_type" : "type-2327",
+   "referenced_type" : "type-2330",
+   "self_type" : "type-2329",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21331,8 +21397,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2379",
-   "self_type" : "type-2378",
+   "referenced_type" : "type-2381",
+   "self_type" : "type-2380",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21341,8 +21407,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2566",
-   "self_type" : "type-2565",
+   "referenced_type" : "type-2568",
+   "self_type" : "type-2567",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21351,8 +21417,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-329",
-   "self_type" : "type-328",
+   "referenced_type" : "type-326",
+   "self_type" : "type-325",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21361,8 +21427,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-46",
-   "self_type" : "type-45",
+   "referenced_type" : "type-476",
+   "self_type" : "type-475",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21371,8 +21437,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-479",
-   "self_type" : "type-478",
+   "referenced_type" : "type-48",
+   "self_type" : "type-47",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21391,8 +21457,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-727",
-   "self_type" : "type-726",
+   "referenced_type" : "type-728",
+   "self_type" : "type-727",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21401,8 +21467,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-833",
-   "self_type" : "type-832",
+   "referenced_type" : "type-834",
+   "self_type" : "type-833",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21411,8 +21477,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-960",
-   "self_type" : "type-959",
+   "referenced_type" : "type-962",
+   "self_type" : "type-961",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21421,8 +21487,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned char",
    "name" : "const unsigned char",
-   "referenced_type" : "type-218",
-   "self_type" : "type-224",
+   "referenced_type" : "type-220",
+   "self_type" : "type-226",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -21431,8 +21497,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned int",
    "name" : "const unsigned int",
-   "referenced_type" : "type-123",
-   "self_type" : "type-236",
+   "referenced_type" : "type-125",
+   "self_type" : "type-238",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
   },
@@ -21441,8 +21507,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned long long",
    "name" : "const unsigned long long",
-   "referenced_type" : "type-124",
-   "self_type" : "type-226",
+   "referenced_type" : "type-126",
+   "self_type" : "type-228",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -21460,7 +21526,7 @@
    "is_const" : true,
    "linker_set_key" : "const void",
    "name" : "const void",
-   "referenced_type" : "type-151",
+   "referenced_type" : "type-154",
    "self_type" : "type-1118",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -21469,8 +21535,8 @@
    "is_const" : true,
    "linker_set_key" : "unsigned int const[3]",
    "name" : "unsigned int const[3]",
-   "referenced_type" : "type-941",
-   "self_type" : "type-948",
+   "referenced_type" : "type-935",
+   "self_type" : "type-942",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -21480,7 +21546,7 @@
    "linker_set_key" : "volatile bool",
    "name" : "volatile bool",
    "referenced_type" : "type-6",
-   "self_type" : "type-270",
+   "self_type" : "type-266",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Thread.h"
   },
@@ -21489,8 +21555,8 @@
    "is_volatile" : true,
    "linker_set_key" : "volatile int",
    "name" : "volatile int",
-   "referenced_type" : "type-103",
-   "self_type" : "type-275",
+   "referenced_type" : "type-105",
+   "self_type" : "type-271",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   }
@@ -21503,48 +21569,48 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "layers",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "format",
      "field_offset" : 96,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "usage",
      "field_offset" : 128,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "stride",
      "field_offset" : 192,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "rfu0",
      "field_offset" : 224,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "rfu1",
      "field_offset" : 256,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "AHardwareBuffer_Desc",
    "name" : "AHardwareBuffer_Desc",
-   "referenced_type" : "type-683",
-   "self_type" : "type-683",
+   "referenced_type" : "type-685",
+   "self_type" : "type-685",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
    "unique_id" : "AHardwareBuffer_Desc"
@@ -21555,23 +21621,23 @@
    [
     {
      "field_name" : "data",
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "pixelStride",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "rowStride",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "linker_set_key" : "AHardwareBuffer_Plane",
    "name" : "AHardwareBuffer_Plane",
-   "referenced_type" : "type-509",
-   "self_type" : "type-509",
+   "referenced_type" : "type-506",
+   "self_type" : "type-506",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
    "unique_id" : "AHardwareBuffer_Plane"
@@ -21582,18 +21648,18 @@
    [
     {
      "field_name" : "planeCount",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "planes",
      "field_offset" : 32,
-     "referenced_type" : "type-508"
+     "referenced_type" : "type-505"
     }
    ],
    "linker_set_key" : "AHardwareBuffer_Planes",
    "name" : "AHardwareBuffer_Planes",
-   "referenced_type" : "type-507",
-   "self_type" : "type-507",
+   "referenced_type" : "type-504",
+   "self_type" : "type-504",
    "size" : 52,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
    "unique_id" : "AHardwareBuffer_Planes"
@@ -21604,63 +21670,63 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-518"
+     "referenced_type" : "type-516"
     },
     {
      "field_name" : "width",
      "field_offset" : 256,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "height",
      "field_offset" : 288,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "stride",
      "field_offset" : 320,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "format",
      "field_offset" : 352,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "usage_deprecated",
      "field_offset" : 384,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "layerCount",
      "field_offset" : 416,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 448,
-     "referenced_type" : "type-523"
+     "referenced_type" : "type-521"
     },
     {
      "field_name" : "handle",
      "field_offset" : 480,
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
      "field_name" : "usage",
      "field_offset" : 512,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "reserved_proc",
      "field_offset" : 576,
-     "referenced_type" : "type-524"
+     "referenced_type" : "type-522"
     }
    ],
    "linker_set_key" : "ANativeWindowBuffer",
    "name" : "ANativeWindowBuffer",
-   "referenced_type" : "type-517",
-   "self_type" : "type-517",
+   "referenced_type" : "type-515",
+   "self_type" : "type-515",
    "size" : 96,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
    "unique_id" : "ANativeWindowBuffer"
@@ -21671,22 +21737,22 @@
    [
     {
      "field_name" : "left",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "top",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "right",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "bottom",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "ARect",
@@ -21703,7 +21769,7 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-547"
+     "referenced_type" : "type-544"
     },
     {
      "field_name" : "alloc",
@@ -21739,20 +21805,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-517"
+     "referenced_type" : "type-515"
     },
     {
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
    "name" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
    "record_kind" : "class",
-   "referenced_type" : "type-516",
-   "self_type" : "type-516",
+   "referenced_type" : "type-514",
+   "self_type" : "type-514",
    "size" : 104,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h",
-   "template_args" : [ "type-517", "type-525", "type-172", "type-518" ],
+   "template_args" : [ "type-515", "type-523", "type-175", "type-516" ],
    "unique_id" : "_ZTSN7android17ANativeObjectBaseI19ANativeWindowBufferNS_13GraphicBufferENS_7RefBaseE21android_native_base_tEE",
    "vtable_components" :
    [
@@ -21840,7 +21906,7 @@
      "access" : "private",
      "field_name" : "mWhitePoint",
      "field_offset" : 1664,
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     }
    ],
    "linker_set_key" : "android::ColorSpace",
@@ -21947,14 +22013,14 @@
     {
      "access" : "private",
      "field_name" : "mCond",
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-255"
     }
    ],
    "linker_set_key" : "android::Condition",
    "name" : "android::Condition",
    "record_kind" : "class",
-   "referenced_type" : "type-258",
-   "self_type" : "type-258",
+   "referenced_type" : "type-254",
+   "self_type" : "type-254",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "unique_id" : "_ZTSN7android9ConditionE"
@@ -21995,13 +22061,13 @@
     {
      "access" : "private",
      "field_name" : "mState",
-     "referenced_type" : "type-1377"
+     "referenced_type" : "type-1382"
     },
     {
      "access" : "private",
      "field_name" : "mMutex",
      "field_offset" : 32,
-     "referenced_type" : "type-1379"
+     "referenced_type" : "type-1384"
     },
     {
      "access" : "private",
@@ -22013,14 +22079,14 @@
      "access" : "private",
      "field_name" : "mSignalTime",
      "field_offset" : 128,
-     "referenced_type" : "type-1380"
+     "referenced_type" : "type-1385"
     }
    ],
    "linker_set_key" : "android::FenceTime",
    "name" : "android::FenceTime",
    "record_kind" : "class",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1376",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1381",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android9FenceTimeE"
@@ -22030,14 +22096,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1385"
+     "referenced_type" : "type-1389"
     }
    ],
    "fields" :
    [
     {
      "field_name" : "state",
-     "referenced_type" : "type-1384"
+     "referenced_type" : "type-1388"
     },
     {
      "field_name" : "fence",
@@ -22047,13 +22113,13 @@
     {
      "field_name" : "signalTime",
      "field_offset" : 64,
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
    "linker_set_key" : "android::FenceTime::Snapshot",
    "name" : "android::FenceTime::Snapshot",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1383",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1387",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android9FenceTime8SnapshotE"
@@ -22065,20 +22131,20 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-1398"
+     "referenced_type" : "type-1402"
     },
     {
      "access" : "private",
      "field_name" : "mQueue",
      "field_offset" : 32,
-     "referenced_type" : "type-1399"
+     "referenced_type" : "type-1403"
     }
    ],
    "linker_set_key" : "android::FenceTimeline",
    "name" : "android::FenceTimeline",
    "record_kind" : "class",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1397",
+   "referenced_type" : "type-1401",
+   "self_type" : "type-1401",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android13FenceTimelineE"
@@ -22090,20 +22156,20 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-1403"
+     "referenced_type" : "type-1407"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-1404"
+     "referenced_type" : "type-1408"
     }
    ],
    "linker_set_key" : "android::FenceToFenceTimeMap",
    "name" : "android::FenceToFenceTimeMap",
    "record_kind" : "class",
-   "referenced_type" : "type-1402",
-   "self_type" : "type-1402",
+   "referenced_type" : "type-1406",
+   "self_type" : "type-1406",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android19FenceToFenceTimeMapE"
@@ -22125,11 +22191,11 @@
    "linker_set_key" : "android::Flattenable<android::FenceTime::Snapshot>",
    "name" : "android::Flattenable<android::FenceTime::Snapshot>",
    "record_kind" : "class",
-   "referenced_type" : "type-1385",
-   "self_type" : "type-1385",
+   "referenced_type" : "type-1389",
+   "self_type" : "type-1389",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1383" ],
+   "template_args" : [ "type-1387" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_9FenceTime8SnapshotEEE"
   },
   {
@@ -22137,11 +22203,11 @@
    "linker_set_key" : "android::Flattenable<android::GraphicBuffer>",
    "name" : "android::Flattenable<android::GraphicBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-532",
-   "self_type" : "type-532",
+   "referenced_type" : "type-530",
+   "self_type" : "type-530",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-525" ],
+   "template_args" : [ "type-523" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_13GraphicBufferEEE"
   },
   {
@@ -22193,36 +22259,36 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1419"
+     "referenced_type" : "type-1423"
     }
    ],
    "fields" :
    [
     {
      "field_name" : "refreshPeriodNano",
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     },
     {
      "field_name" : "desiredPresentTimesNano",
      "field_offset" : 64,
-     "referenced_type" : "type-1421"
+     "referenced_type" : "type-1425"
     },
     {
      "field_name" : "actualPresentTimesNano",
      "field_offset" : 224,
-     "referenced_type" : "type-1421"
+     "referenced_type" : "type-1425"
     },
     {
      "field_name" : "frameReadyTimesNano",
      "field_offset" : 384,
-     "referenced_type" : "type-1421"
+     "referenced_type" : "type-1425"
     }
    ],
    "linker_set_key" : "android::FrameStats",
    "name" : "android::FrameStats",
    "record_kind" : "class",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1420",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1424",
    "size" : 68,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h",
    "unique_id" : "_ZTSN7android10FrameStatsE"
@@ -22232,7 +22298,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-359"
+     "referenced_type" : "type-356"
     }
    ],
    "fields" :
@@ -22241,20 +22307,20 @@
      "access" : "private",
      "field_name" : "mMapper",
      "field_offset" : 32,
-     "referenced_type" : "type-354"
+     "referenced_type" : "type-351"
     },
     {
      "access" : "private",
      "field_name" : "mAllocator",
      "field_offset" : 64,
-     "referenced_type" : "type-355"
+     "referenced_type" : "type-352"
     }
    ],
    "linker_set_key" : "android::Gralloc2Allocator",
    "name" : "android::Gralloc2Allocator",
    "record_kind" : "class",
-   "referenced_type" : "type-353",
-   "self_type" : "type-353",
+   "referenced_type" : "type-350",
+   "self_type" : "type-350",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h",
    "unique_id" : "_ZTSN7android17Gralloc2AllocatorE",
@@ -22291,7 +22357,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-342"
+     "referenced_type" : "type-339"
     }
    ],
    "fields" :
@@ -22300,20 +22366,20 @@
      "access" : "private",
      "field_name" : "mMapper",
      "field_offset" : 32,
-     "referenced_type" : "type-338"
+     "referenced_type" : "type-335"
     },
     {
      "access" : "private",
      "field_name" : "mMapperV2_1",
      "field_offset" : 64,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-88"
     }
    ],
    "linker_set_key" : "android::Gralloc2Mapper",
    "name" : "android::Gralloc2Mapper",
    "record_kind" : "class",
-   "referenced_type" : "type-337",
-   "self_type" : "type-337",
+   "referenced_type" : "type-334",
+   "self_type" : "type-334",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h",
    "unique_id" : "_ZTSN7android14Gralloc2MapperE",
@@ -22371,10 +22437,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-516"
+     "referenced_type" : "type-514"
     },
     {
-     "referenced_type" : "type-532"
+     "referenced_type" : "type-530"
     }
    ],
    "fields" :
@@ -22383,62 +22449,62 @@
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 832,
-     "referenced_type" : "type-218"
+     "referenced_type" : "type-220"
     },
     {
      "access" : "private",
      "field_name" : "mBufferMapper",
      "field_offset" : 864,
-     "referenced_type" : "type-526"
+     "referenced_type" : "type-524"
     },
     {
      "access" : "private",
      "field_name" : "mInitCheck",
      "field_offset" : 896,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mTransportNumFds",
      "field_offset" : 928,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mTransportNumInts",
      "field_offset" : 960,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mId",
      "field_offset" : 992,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
      "field_name" : "mBufferId",
      "field_offset" : 1056,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mGenerationNumber",
      "field_offset" : 1088,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mDeathCallbacks",
      "field_offset" : 1120,
-     "referenced_type" : "type-531"
+     "referenced_type" : "type-529"
     }
    ],
    "linker_set_key" : "android::GraphicBuffer",
    "name" : "android::GraphicBuffer",
    "record_kind" : "class",
-   "referenced_type" : "type-525",
-   "self_type" : "type-525",
+   "referenced_type" : "type-523",
+   "self_type" : "type-523",
    "size" : 152,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h",
    "unique_id" : "_ZTSN7android13GraphicBufferE",
@@ -22478,7 +22544,91 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "protected",
+     "field_name" : "mMapper",
+     "referenced_type" : "type-524"
+    },
+    {
+     "access" : "protected",
+     "field_name" : "mAllocator",
+     "field_offset" : 32,
+     "referenced_type" : "type-540"
+    }
+   ],
+   "linker_set_key" : "android::GraphicBufferAllocator",
+   "name" : "android::GraphicBufferAllocator",
+   "record_kind" : "class",
+   "referenced_type" : "type-539",
+   "self_type" : "type-539",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h",
+   "unique_id" : "_ZTSN7android22GraphicBufferAllocatorE"
+  },
+  {
+   "access" : "protected",
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "width",
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "height",
+     "field_offset" : 32,
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "stride",
+     "field_offset" : 64,
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "format",
+     "field_offset" : 96,
+     "referenced_type" : "type-105"
+    },
+    {
+     "field_name" : "layerCount",
+     "field_offset" : 128,
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "usage",
+     "field_offset" : 160,
+     "referenced_type" : "type-126"
+    },
+    {
+     "field_name" : "size",
+     "field_offset" : 224,
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "requestorName",
+     "field_offset" : 256,
+     "referenced_type" : "type-681"
+    }
+   ],
+   "linker_set_key" : "android::GraphicBufferAllocator::alloc_rec_t",
+   "name" : "android::GraphicBufferAllocator::alloc_rec_t",
+   "referenced_type" : "type-680",
+   "self_type" : "type-680",
+   "size" : 44,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h",
+   "unique_id" : "_ZTSN7android22GraphicBufferAllocator11alloc_rec_tE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-528"
     }
    ],
    "fields" :
@@ -22490,100 +22640,16 @@
     },
     {
      "access" : "private",
-     "field_name" : "mAllocator",
-     "field_offset" : 32,
-     "referenced_type" : "type-543"
-    }
-   ],
-   "linker_set_key" : "android::GraphicBufferAllocator",
-   "name" : "android::GraphicBufferAllocator",
-   "record_kind" : "class",
-   "referenced_type" : "type-542",
-   "self_type" : "type-542",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h",
-   "unique_id" : "_ZTSN7android22GraphicBufferAllocatorE"
-  },
-  {
-   "access" : "private",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "width",
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "height",
-     "field_offset" : 32,
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "stride",
-     "field_offset" : 64,
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "format",
-     "field_offset" : 96,
-     "referenced_type" : "type-103"
-    },
-    {
-     "field_name" : "layerCount",
-     "field_offset" : 128,
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "usage",
-     "field_offset" : 160,
-     "referenced_type" : "type-124"
-    },
-    {
-     "field_name" : "size",
-     "field_offset" : 224,
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "requestorName",
-     "field_offset" : 256,
-     "referenced_type" : "type-677"
-    }
-   ],
-   "linker_set_key" : "android::GraphicBufferAllocator::alloc_rec_t",
-   "name" : "android::GraphicBufferAllocator::alloc_rec_t",
-   "referenced_type" : "type-676",
-   "self_type" : "type-676",
-   "size" : 44,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h",
-   "unique_id" : "_ZTSN7android22GraphicBufferAllocator11alloc_rec_tE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-530"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMapper",
-     "referenced_type" : "type-528"
-    },
-    {
-     "access" : "private",
      "field_name" : "mMapperVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-529"
+     "referenced_type" : "type-527"
     }
    ],
    "linker_set_key" : "android::GraphicBufferMapper",
    "name" : "android::GraphicBufferMapper",
    "record_kind" : "class",
-   "referenced_type" : "type-527",
-   "self_type" : "type-527",
+   "referenced_type" : "type-525",
+   "self_type" : "type-525",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h",
    "unique_id" : "_ZTSN7android19GraphicBufferMapperE"
@@ -22638,17 +22704,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-235"
     }
    ],
    "linker_set_key" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
    "name" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
    "record_kind" : "class",
-   "referenced_type" : "type-247",
-   "self_type" : "type-247",
+   "referenced_type" : "type-249",
+   "self_type" : "type-249",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-179", "type-248" ],
+   "template_args" : [ "type-182", "type-250" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
   },
   {
@@ -22664,11 +22730,11 @@
    "linker_set_key" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "record_kind" : "class",
-   "referenced_type" : "type-715",
-   "self_type" : "type-715",
+   "referenced_type" : "type-716",
+   "self_type" : "type-716",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-142", "type-676" ],
+   "template_args" : [ "type-145", "type-680" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -22676,11 +22742,11 @@
    "linker_set_key" : "android::LightFlattenable<android::FrameStats>",
    "name" : "android::LightFlattenable<android::FrameStats>",
    "record_kind" : "class",
-   "referenced_type" : "type-1419",
-   "self_type" : "type-1419",
+   "referenced_type" : "type-1423",
+   "self_type" : "type-1423",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1420" ],
+   "template_args" : [ "type-1424" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_10FrameStatsEEE"
   },
   {
@@ -22724,11 +22790,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Region>",
    "name" : "android::LightFlattenable<android::Region>",
    "record_kind" : "class",
-   "referenced_type" : "type-2390",
-   "self_type" : "type-2390",
+   "referenced_type" : "type-2392",
+   "self_type" : "type-2392",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-2389" ],
+   "template_args" : [ "type-2391" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_6RegionEEE"
   },
   {
@@ -22834,14 +22900,14 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-281"
     }
    ],
    "linker_set_key" : "android::Mutex",
    "name" : "android::Mutex",
    "record_kind" : "class",
-   "referenced_type" : "type-252",
-   "self_type" : "type-252",
+   "referenced_type" : "type-280",
+   "self_type" : "type-280",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5MutexE"
@@ -22853,14 +22919,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-256"
+     "referenced_type" : "type-1379"
     }
    ],
    "linker_set_key" : "android::Mutex::Autolock",
    "name" : "android::Mutex::Autolock",
    "record_kind" : "class",
-   "referenced_type" : "type-255",
-   "self_type" : "type-255",
+   "referenced_type" : "type-1378",
+   "self_type" : "type-1378",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5Mutex8AutolockE"
@@ -22909,12 +22975,12 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "y",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::Point",
@@ -22933,14 +22999,14 @@
     {
      "access" : "private",
      "field_name" : "mRWLock",
-     "referenced_type" : "type-263"
+     "referenced_type" : "type-259"
     }
    ],
    "linker_set_key" : "android::RWLock",
    "name" : "android::RWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-262",
-   "self_type" : "type-262",
+   "referenced_type" : "type-258",
+   "self_type" : "type-258",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLockE"
@@ -22952,14 +23018,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-262"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoRLock",
    "name" : "android::RWLock::AutoRLock",
    "record_kind" : "class",
-   "referenced_type" : "type-265",
-   "self_type" : "type-265",
+   "referenced_type" : "type-261",
+   "self_type" : "type-261",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
@@ -22971,14 +23037,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-262"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoWLock",
    "name" : "android::RWLock::AutoWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-268",
-   "self_type" : "type-268",
+   "referenced_type" : "type-264",
+   "self_type" : "type-264",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
@@ -23011,14 +23077,14 @@
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 32,
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-176"
     }
    ],
    "linker_set_key" : "android::RefBase",
    "name" : "android::RefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-172",
-   "self_type" : "type-172",
+   "referenced_type" : "type-175",
+   "self_type" : "type-175",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBaseE",
@@ -23058,8 +23124,8 @@
    "linker_set_key" : "android::RefBase::weakref_type",
    "name" : "android::RefBase::weakref_type",
    "record_kind" : "class",
-   "referenced_type" : "type-198",
-   "self_type" : "type-198",
+   "referenced_type" : "type-211",
+   "self_type" : "type-211",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBase12weakref_typeE"
@@ -23105,7 +23171,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2390"
+     "referenced_type" : "type-2392"
     }
    ],
    "fields" :
@@ -23113,14 +23179,14 @@
     {
      "access" : "private",
      "field_name" : "mStorage",
-     "referenced_type" : "type-2382"
+     "referenced_type" : "type-2384"
     }
    ],
    "linker_set_key" : "android::Region",
    "name" : "android::Region",
    "record_kind" : "class",
-   "referenced_type" : "type-2389",
-   "self_type" : "type-2389",
+   "referenced_type" : "type-2391",
+   "self_type" : "type-2391",
    "size" : 20,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h",
    "unique_id" : "_ZTSN7android6RegionE"
@@ -23132,7 +23198,7 @@
     {
      "access" : "private",
      "field_name" : "mTag",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "android::ScopedTrace",
@@ -23149,11 +23215,11 @@
    "linker_set_key" : "android::Singleton<android::GraphicBufferAllocator>",
    "name" : "android::Singleton<android::GraphicBufferAllocator>",
    "record_kind" : "class",
-   "referenced_type" : "type-541",
-   "self_type" : "type-541",
+   "referenced_type" : "type-538",
+   "self_type" : "type-538",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-542" ],
+   "template_args" : [ "type-539" ],
    "unique_id" : "_ZTSN7android9SingletonINS_22GraphicBufferAllocatorEEE"
   },
   {
@@ -23161,11 +23227,11 @@
    "linker_set_key" : "android::Singleton<android::GraphicBufferMapper>",
    "name" : "android::Singleton<android::GraphicBufferMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-530",
-   "self_type" : "type-530",
+   "referenced_type" : "type-528",
+   "self_type" : "type-528",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-527" ],
+   "template_args" : [ "type-525" ],
    "unique_id" : "_ZTSN7android9SingletonINS_19GraphicBufferMapperEEE"
   },
   {
@@ -23174,17 +23240,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-234"
+     "referenced_type" : "type-236"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
    "name" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-233",
-   "self_type" : "type-233",
+   "referenced_type" : "type-235",
+   "self_type" : "type-235",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-237" ],
+   "template_args" : [ "type-239" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
    "vtable_components" :
    [
@@ -23232,7 +23298,7 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-234"
+     "referenced_type" : "type-236"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
@@ -23289,14 +23355,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::SortedVectorImpl",
    "name" : "android::SortedVectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-234",
-   "self_type" : "type-234",
+   "referenced_type" : "type-236",
+   "self_type" : "type-236",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android16SortedVectorImplE",
@@ -23354,14 +23420,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-180"
+     "referenced_type" : "type-183"
     }
    ],
    "linker_set_key" : "android::String16",
    "name" : "android::String16",
    "record_kind" : "class",
-   "referenced_type" : "type-179",
-   "self_type" : "type-179",
+   "referenced_type" : "type-182",
+   "self_type" : "type-182",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "unique_id" : "_ZTSN7android8String16E"
@@ -23373,14 +23439,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     }
    ],
    "linker_set_key" : "android::String8",
    "name" : "android::String8",
    "record_kind" : "class",
-   "referenced_type" : "type-285",
-   "self_type" : "type-285",
+   "referenced_type" : "type-282",
+   "self_type" : "type-282",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "unique_id" : "_ZTSN7android7String8E"
@@ -23391,7 +23457,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "fields" :
@@ -23400,62 +23466,62 @@
      "access" : "private",
      "field_name" : "mCanCallJava",
      "field_offset" : 32,
-     "referenced_type" : "type-370"
+     "referenced_type" : "type-367"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 64,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 96,
-     "referenced_type" : "type-252"
+     "referenced_type" : "type-280"
     },
     {
      "access" : "private",
      "field_name" : "mThreadExitedCondition",
      "field_offset" : 128,
-     "referenced_type" : "type-258"
+     "referenced_type" : "type-254"
     },
     {
      "access" : "private",
      "field_name" : "mStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mExitPending",
      "field_offset" : 192,
-     "referenced_type" : "type-270"
+     "referenced_type" : "type-266"
     },
     {
      "access" : "private",
      "field_name" : "mRunning",
      "field_offset" : 200,
-     "referenced_type" : "type-270"
+     "referenced_type" : "type-266"
     },
     {
      "access" : "private",
      "field_name" : "mHoldSelf",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-364"
     },
     {
      "access" : "private",
      "field_name" : "mTid",
      "field_offset" : 256,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::Thread",
    "name" : "android::Thread",
    "record_kind" : "class",
-   "referenced_type" : "type-369",
-   "self_type" : "type-369",
+   "referenced_type" : "type-366",
+   "self_type" : "type-366",
    "size" : 44,
    "source_file" : "/system/core/libutils/include/utils/Thread.h",
    "unique_id" : "_ZTSN7android6ThreadE",
@@ -23545,14 +23611,14 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::Rect>",
    "name" : "android::Vector<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-2382",
-   "self_type" : "type-2382",
+   "referenced_type" : "type-2384",
+   "self_type" : "type-2384",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-1241" ],
@@ -23600,17 +23666,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::RefBase *>",
    "name" : "android::Vector<android::RefBase *>",
    "record_kind" : "class",
-   "referenced_type" : "type-245",
-   "self_type" : "type-245",
+   "referenced_type" : "type-247",
+   "self_type" : "type-247",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-246" ],
+   "template_args" : [ "type-248" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7RefBaseEEE",
    "vtable_components" :
    [
@@ -23655,17 +23721,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::RefBase::weakref_type *>",
    "name" : "android::Vector<android::RefBase::weakref_type *>",
    "record_kind" : "class",
-   "referenced_type" : "type-244",
-   "self_type" : "type-244",
+   "referenced_type" : "type-246",
+   "self_type" : "type-246",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-197" ],
+   "template_args" : [ "type-210" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7RefBase12weakref_typeEEE",
    "vtable_components" :
    [
@@ -23710,17 +23776,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::BHwBinder *>",
    "name" : "android::Vector<android::hardware::BHwBinder *>",
    "record_kind" : "class",
-   "referenced_type" : "type-240",
-   "self_type" : "type-240",
+   "referenced_type" : "type-242",
+   "self_type" : "type-242",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-241" ],
+   "template_args" : [ "type-243" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_8hardware9BHwBinderEEE",
    "vtable_components" :
    [
@@ -23765,17 +23831,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "record_kind" : "class",
-   "referenced_type" : "type-238",
-   "self_type" : "type-238",
+   "referenced_type" : "type-240",
+   "self_type" : "type-240",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-239" ],
+   "template_args" : [ "type-241" ],
    "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
    "vtable_components" :
    [
@@ -23820,17 +23886,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<long long>",
    "name" : "android::Vector<long long>",
    "record_kind" : "class",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1421",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1425",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android6VectorIxEE",
    "vtable_components" :
    [
@@ -23877,32 +23943,32 @@
      "access" : "private",
      "field_name" : "mStorage",
      "field_offset" : 32,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "access" : "private",
      "field_name" : "mCount",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mFlags",
      "field_offset" : 96,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "access" : "private",
      "field_name" : "mItemSize",
      "field_offset" : 128,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     }
    ],
    "linker_set_key" : "android::VectorImpl",
    "name" : "android::VectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-235",
-   "self_type" : "type-235",
+   "referenced_type" : "type-237",
+   "self_type" : "type-237",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android10VectorImplE",
@@ -23988,11 +24054,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::aggregate_traits<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-824",
-   "self_type" : "type-824",
+   "referenced_type" : "type-825",
+   "self_type" : "type-825",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142", "type-676" ],
+   "template_args" : [ "type-145", "type-680" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -24012,7 +24078,7 @@
     {
      "access" : "private",
      "field_name" : "fd_",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser>",
@@ -24077,28 +24143,28 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2410"
+     "referenced_type" : "type-2412"
+    },
+    {
+     "referenced_type" : "type-2413"
     },
     {
      "referenced_type" : "type-2411"
     },
     {
-     "referenced_type" : "type-2409"
-    },
-    {
-     "referenced_type" : "type-2417"
-    },
-    {
-     "referenced_type" : "type-2419"
+     "referenced_type" : "type-2420"
     },
     {
      "referenced_type" : "type-2421"
     },
     {
-     "referenced_type" : "type-2420"
+     "referenced_type" : "type-2423"
     },
     {
-     "referenced_type" : "type-2423"
+     "referenced_type" : "type-2422"
+    },
+    {
+     "referenced_type" : "type-2425"
     }
    ],
    "fields" :
@@ -24106,14 +24172,14 @@
     {
      "access" : "private",
      "field_name" : "m_value",
-     "referenced_type" : "type-2428"
+     "referenced_type" : "type-2430"
     }
    ],
    "linker_set_key" : "android::details::TMat44<float>",
    "name" : "android::details::TMat44<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2427",
-   "self_type" : "type-2427",
+   "referenced_type" : "type-2429",
+   "self_type" : "type-2429",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h",
    "template_args" : [ "type-10" ],
@@ -24136,8 +24202,8 @@
    "linker_set_key" : "android::details::TMatDebug<android::details::TMat44, float>",
    "name" : "android::details::TMatDebug<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2423",
-   "self_type" : "type-2423",
+   "referenced_type" : "type-2425",
+   "self_type" : "type-2425",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24160,8 +24226,8 @@
    "linker_set_key" : "android::details::TMatHelpers<android::details::TMat44, float>",
    "name" : "android::details::TMatHelpers<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2420",
-   "self_type" : "type-2420",
+   "referenced_type" : "type-2422",
+   "self_type" : "type-2422",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24184,8 +24250,8 @@
    "linker_set_key" : "android::details::TMatProductOperators<android::details::TMat44, float>",
    "name" : "android::details::TMatProductOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2417",
-   "self_type" : "type-2417",
+   "referenced_type" : "type-2420",
+   "self_type" : "type-2420",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24208,8 +24274,8 @@
    "linker_set_key" : "android::details::TMatSquareFunctions<android::details::TMat44, float>",
    "name" : "android::details::TMatSquareFunctions<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2419",
-   "self_type" : "type-2419",
+   "referenced_type" : "type-2421",
+   "self_type" : "type-2421",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24232,8 +24298,8 @@
    "linker_set_key" : "android::details::TMatTransform<android::details::TMat44, float>",
    "name" : "android::details::TMatTransform<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2421",
-   "self_type" : "type-2421",
+   "referenced_type" : "type-2423",
+   "self_type" : "type-2423",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24244,11 +24310,11 @@
    "linker_set_key" : "android::details::TQuatDebug<android::details::TQuaternion, double>",
    "name" : "android::details::TQuatDebug<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-49",
-   "self_type" : "type-49",
+   "referenced_type" : "type-51",
+   "self_type" : "type-51",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details10TQuatDebugINS0_11TQuaternionEdEE"
   },
   {
@@ -24256,8 +24322,8 @@
    "linker_set_key" : "android::details::TQuatDebug<android::details::TQuaternion, float>",
    "name" : "android::details::TQuatDebug<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-48",
-   "self_type" : "type-48",
+   "referenced_type" : "type-50",
+   "self_type" : "type-50",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24268,11 +24334,11 @@
    "linker_set_key" : "android::details::TQuatFunctions<android::details::TQuaternion, double>",
    "name" : "android::details::TQuatFunctions<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-47",
-   "self_type" : "type-47",
+   "referenced_type" : "type-49",
+   "self_type" : "type-49",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details14TQuatFunctionsINS0_11TQuaternionEdEE"
   },
   {
@@ -24280,8 +24346,8 @@
    "linker_set_key" : "android::details::TQuatFunctions<android::details::TQuaternion, float>",
    "name" : "android::details::TQuatFunctions<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-43",
-   "self_type" : "type-43",
+   "referenced_type" : "type-45",
+   "self_type" : "type-45",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24292,11 +24358,11 @@
    "linker_set_key" : "android::details::TQuatProductOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TQuatProductOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-40",
-   "self_type" : "type-40",
+   "referenced_type" : "type-42",
+   "self_type" : "type-42",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details21TQuatProductOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -24316,38 +24382,38 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-334"
+     "referenced_type" : "type-331"
     },
     {
-     "referenced_type" : "type-335"
+     "referenced_type" : "type-332"
     },
     {
-     "referenced_type" : "type-336"
+     "referenced_type" : "type-333"
     },
     {
-     "referenced_type" : "type-40"
-    },
-    {
-     "referenced_type" : "type-47"
+     "referenced_type" : "type-42"
     },
     {
      "referenced_type" : "type-49"
+    },
+    {
+     "referenced_type" : "type-51"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-332"
+     "referenced_type" : "type-329"
     }
    ],
    "linker_set_key" : "android::details::TQuaternion<double>",
    "name" : "android::details::TQuaternion<double>",
    "record_kind" : "class",
-   "referenced_type" : "type-331",
-   "self_type" : "type-331",
+   "referenced_type" : "type-328",
+   "self_type" : "type-328",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details11TQuaternionIdEE"
   },
   {
@@ -24355,27 +24421,27 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-330"
     },
     {
      "field_name" : "xyzw",
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-52"
     },
     {
      "field_name" : "xyz",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-68"
     },
     {
      "field_name" : "xy",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "name" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "record_kind" : "union",
-   "referenced_type" : "type-332",
-   "self_type" : "type-332",
+   "referenced_type" : "type-329",
+   "self_type" : "type-329",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIdEUt_E"
@@ -24386,29 +24452,29 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "z",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "w",
      "field_offset" : 192,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
    "name" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
-   "referenced_type" : "type-333",
-   "self_type" : "type-333",
+   "referenced_type" : "type-330",
+   "self_type" : "type-330",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIdEUt_Ut_E"
@@ -24418,35 +24484,35 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-413"
+     "referenced_type" : "type-410"
     },
     {
-     "referenced_type" : "type-414"
+     "referenced_type" : "type-411"
     },
     {
-     "referenced_type" : "type-415"
+     "referenced_type" : "type-412"
     },
     {
      "referenced_type" : "type-38"
     },
     {
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-50"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-411"
+     "referenced_type" : "type-408"
     }
    ],
    "linker_set_key" : "android::details::TQuaternion<float>",
    "name" : "android::details::TQuaternion<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-410",
-   "self_type" : "type-410",
+   "referenced_type" : "type-407",
+   "self_type" : "type-407",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "template_args" : [ "type-10" ],
@@ -24457,27 +24523,27 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-412"
+     "referenced_type" : "type-409"
     },
     {
      "field_name" : "xyzw",
-     "referenced_type" : "type-200"
+     "referenced_type" : "type-192"
     },
     {
      "field_name" : "xyz",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-18"
     },
     {
      "field_name" : "xy",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "name" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "record_kind" : "union",
-   "referenced_type" : "type-411",
-   "self_type" : "type-411",
+   "referenced_type" : "type-408",
+   "self_type" : "type-408",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIfEUt_E"
@@ -24509,8 +24575,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
    "name" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
-   "referenced_type" : "type-412",
-   "self_type" : "type-412",
+   "referenced_type" : "type-409",
+   "self_type" : "type-409",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIfEUt_Ut_E"
@@ -24520,16 +24586,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-396"
+     "referenced_type" : "type-390"
     },
     {
-     "referenced_type" : "type-427"
+     "referenced_type" : "type-424"
     },
     {
-     "referenced_type" : "type-462"
+     "referenced_type" : "type-455"
     },
     {
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-507"
     },
     {
      "referenced_type" : "type-600"
@@ -24652,12 +24718,6 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-61"
-    },
-    {
      "referenced_type" : "type-62"
     },
     {
@@ -24668,22 +24728,28 @@
     },
     {
      "referenced_type" : "type-65"
+    },
+    {
+     "referenced_type" : "type-66"
+    },
+    {
+     "referenced_type" : "type-67"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-58"
     }
    ],
    "linker_set_key" : "android::details::TVec2<double>",
    "name" : "android::details::TVec2<double>",
    "record_kind" : "class",
-   "referenced_type" : "type-55",
-   "self_type" : "type-55",
+   "referenced_type" : "type-57",
+   "self_type" : "type-57",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details5TVec2IdEE"
   },
   {
@@ -24691,21 +24757,21 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-57"
-    },
-    {
-     "referenced_type" : "type-58"
-    },
-    {
      "referenced_type" : "type-59"
+    },
+    {
+     "referenced_type" : "type-60"
+    },
+    {
+     "referenced_type" : "type-61"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5) at frameworks/native/libs/math/include/math/vec2.h:49:5",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5) at frameworks/native/libs/math/include/math/vec2.h:49:5",
    "record_kind" : "union",
-   "referenced_type" : "type-56",
-   "self_type" : "type-56",
+   "referenced_type" : "type-58",
+   "self_type" : "type-58",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_E"
@@ -24716,19 +24782,19 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:50:9) at frameworks/native/libs/math/include/math/vec2.h:50:9",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:50:9) at frameworks/native/libs/math/include/math/vec2.h:50:9",
-   "referenced_type" : "type-57",
-   "self_type" : "type-57",
+   "referenced_type" : "type-59",
+   "self_type" : "type-59",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_Ut_E"
@@ -24739,19 +24805,19 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "t",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:51:9) at frameworks/native/libs/math/include/math/vec2.h:51:9",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:51:9) at frameworks/native/libs/math/include/math/vec2.h:51:9",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
+   "referenced_type" : "type-60",
+   "self_type" : "type-60",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_Ut0_E"
@@ -24762,19 +24828,19 @@
    [
     {
      "field_name" : "r",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "g",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:52:9) at frameworks/native/libs/math/include/math/vec2.h:52:9",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:52:9) at frameworks/native/libs/math/include/math/vec2.h:52:9",
-   "referenced_type" : "type-59",
-   "self_type" : "type-59",
+   "referenced_type" : "type-61",
+   "self_type" : "type-61",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_Ut1_E"
@@ -24784,9 +24850,6 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-27"
-    },
-    {
      "referenced_type" : "type-28"
     },
     {
@@ -24800,19 +24863,22 @@
     },
     {
      "referenced_type" : "type-32"
+    },
+    {
+     "referenced_type" : "type-33"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-24"
     }
    ],
    "linker_set_key" : "android::details::TVec2<float>",
    "name" : "android::details::TVec2<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-22",
-   "self_type" : "type-22",
+   "referenced_type" : "type-23",
+   "self_type" : "type-23",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "template_args" : [ "type-10" ],
@@ -24823,21 +24889,21 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-24"
-    },
-    {
      "referenced_type" : "type-25"
     },
     {
      "referenced_type" : "type-26"
+    },
+    {
+     "referenced_type" : "type-27"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5) at frameworks/native/libs/math/include/math/vec2.h:49:5",
    "name" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5) at frameworks/native/libs/math/include/math/vec2.h:49:5",
    "record_kind" : "union",
-   "referenced_type" : "type-23",
-   "self_type" : "type-23",
+   "referenced_type" : "type-24",
+   "self_type" : "type-24",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IfEUt_E"
@@ -24859,8 +24925,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:50:9) at frameworks/native/libs/math/include/math/vec2.h:50:9",
    "name" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:50:9) at frameworks/native/libs/math/include/math/vec2.h:50:9",
-   "referenced_type" : "type-24",
-   "self_type" : "type-24",
+   "referenced_type" : "type-25",
+   "self_type" : "type-25",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IfEUt_Ut_E"
@@ -24882,8 +24948,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:51:9) at frameworks/native/libs/math/include/math/vec2.h:51:9",
    "name" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:51:9) at frameworks/native/libs/math/include/math/vec2.h:51:9",
-   "referenced_type" : "type-25",
-   "self_type" : "type-25",
+   "referenced_type" : "type-26",
+   "self_type" : "type-26",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IfEUt_Ut0_E"
@@ -24905,8 +24971,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:52:9) at frameworks/native/libs/math/include/math/vec2.h:52:9",
    "name" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:52:9) at frameworks/native/libs/math/include/math/vec2.h:52:9",
-   "referenced_type" : "type-26",
-   "self_type" : "type-26",
+   "referenced_type" : "type-27",
+   "self_type" : "type-27",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IfEUt_Ut1_E"
@@ -24916,12 +24982,6 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-72"
-    },
-    {
      "referenced_type" : "type-73"
     },
     {
@@ -24932,22 +24992,28 @@
     },
     {
      "referenced_type" : "type-76"
+    },
+    {
+     "referenced_type" : "type-77"
+    },
+    {
+     "referenced_type" : "type-78"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-69"
     }
    ],
    "linker_set_key" : "android::details::TVec3<double>",
    "name" : "android::details::TVec3<double>",
    "record_kind" : "class",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
+   "referenced_type" : "type-68",
+   "self_type" : "type-68",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details5TVec3IdEE"
   },
   {
@@ -24955,33 +25021,33 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-68"
-    },
-    {
-     "referenced_type" : "type-69"
-    },
-    {
      "referenced_type" : "type-70"
     },
     {
+     "referenced_type" : "type-71"
+    },
+    {
+     "referenced_type" : "type-72"
+    },
+    {
      "field_name" : "xy",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "st",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "rg",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5) at frameworks/native/libs/math/include/math/vec3.h:47:5",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5) at frameworks/native/libs/math/include/math/vec3.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-67",
-   "self_type" : "type-67",
+   "referenced_type" : "type-69",
+   "self_type" : "type-69",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_E"
@@ -24992,24 +25058,24 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "z",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:48:9) at frameworks/native/libs/math/include/math/vec3.h:48:9",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:48:9) at frameworks/native/libs/math/include/math/vec3.h:48:9",
-   "referenced_type" : "type-68",
-   "self_type" : "type-68",
+   "referenced_type" : "type-70",
+   "self_type" : "type-70",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_Ut_E"
@@ -25020,24 +25086,24 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "t",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "p",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:49:9) at frameworks/native/libs/math/include/math/vec3.h:49:9",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:49:9) at frameworks/native/libs/math/include/math/vec3.h:49:9",
-   "referenced_type" : "type-69",
-   "self_type" : "type-69",
+   "referenced_type" : "type-71",
+   "self_type" : "type-71",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_Ut0_E"
@@ -25048,24 +25114,24 @@
    [
     {
      "field_name" : "r",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "g",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "b",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:50:9) at frameworks/native/libs/math/include/math/vec3.h:50:9",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:50:9) at frameworks/native/libs/math/include/math/vec3.h:50:9",
-   "referenced_type" : "type-70",
-   "self_type" : "type-70",
+   "referenced_type" : "type-72",
+   "self_type" : "type-72",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_Ut1_E"
@@ -25075,35 +25141,35 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-33"
+     "referenced_type" : "type-34"
     },
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-35"
     },
     {
      "referenced_type" : "type-9"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-13"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "type-36"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-19"
     }
    ],
    "linker_set_key" : "android::details::TVec3<float>",
    "name" : "android::details::TVec3<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-17",
-   "self_type" : "type-17",
+   "referenced_type" : "type-18",
+   "self_type" : "type-18",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "template_args" : [ "type-10" ],
@@ -25114,33 +25180,33 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-19"
-    },
-    {
      "referenced_type" : "type-20"
     },
     {
      "referenced_type" : "type-21"
     },
     {
-     "field_name" : "xy",
      "referenced_type" : "type-22"
     },
     {
+     "field_name" : "xy",
+     "referenced_type" : "type-23"
+    },
+    {
      "field_name" : "st",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "rg",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5) at frameworks/native/libs/math/include/math/vec3.h:47:5",
    "name" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5) at frameworks/native/libs/math/include/math/vec3.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-18",
-   "self_type" : "type-18",
+   "referenced_type" : "type-19",
+   "self_type" : "type-19",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IfEUt_E"
@@ -25167,8 +25233,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:48:9) at frameworks/native/libs/math/include/math/vec3.h:48:9",
    "name" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:48:9) at frameworks/native/libs/math/include/math/vec3.h:48:9",
-   "referenced_type" : "type-19",
-   "self_type" : "type-19",
+   "referenced_type" : "type-20",
+   "self_type" : "type-20",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IfEUt_Ut_E"
@@ -25195,8 +25261,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:49:9) at frameworks/native/libs/math/include/math/vec3.h:49:9",
    "name" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:49:9) at frameworks/native/libs/math/include/math/vec3.h:49:9",
-   "referenced_type" : "type-20",
-   "self_type" : "type-20",
+   "referenced_type" : "type-21",
+   "self_type" : "type-21",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IfEUt_Ut0_E"
@@ -25223,8 +25289,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:50:9) at frameworks/native/libs/math/include/math/vec3.h:50:9",
    "name" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:50:9) at frameworks/native/libs/math/include/math/vec3.h:50:9",
-   "referenced_type" : "type-21",
-   "self_type" : "type-21",
+   "referenced_type" : "type-22",
+   "self_type" : "type-22",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IfEUt_Ut1_E"
@@ -25234,12 +25300,6 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-78"
-    },
-    {
      "referenced_type" : "type-79"
     },
     {
@@ -25250,22 +25310,28 @@
     },
     {
      "referenced_type" : "type-82"
+    },
+    {
+     "referenced_type" : "type-83"
+    },
+    {
+     "referenced_type" : "type-84"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-53"
     }
    ],
    "linker_set_key" : "android::details::TVec4<double>",
    "name" : "android::details::TVec4<double>",
    "record_kind" : "class",
-   "referenced_type" : "type-50",
-   "self_type" : "type-50",
+   "referenced_type" : "type-52",
+   "self_type" : "type-52",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details5TVec4IdEE"
   },
   {
@@ -25273,45 +25339,45 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-52"
-    },
-    {
-     "referenced_type" : "type-53"
-    },
-    {
      "referenced_type" : "type-54"
     },
     {
-     "field_name" : "xy",
      "referenced_type" : "type-55"
     },
     {
+     "referenced_type" : "type-56"
+    },
+    {
+     "field_name" : "xy",
+     "referenced_type" : "type-57"
+    },
+    {
      "field_name" : "st",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "rg",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "xyz",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-68"
     },
     {
      "field_name" : "stp",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-68"
     },
     {
      "field_name" : "rgb",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-68"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-51",
-   "self_type" : "type-51",
+   "referenced_type" : "type-53",
+   "self_type" : "type-53",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_E"
@@ -25322,29 +25388,29 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "z",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "w",
      "field_offset" : 192,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
-   "referenced_type" : "type-52",
-   "self_type" : "type-52",
+   "referenced_type" : "type-54",
+   "self_type" : "type-54",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_Ut_E"
@@ -25355,29 +25421,29 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "t",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "p",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "q",
      "field_offset" : 192,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
-   "referenced_type" : "type-53",
-   "self_type" : "type-53",
+   "referenced_type" : "type-55",
+   "self_type" : "type-55",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_Ut0_E"
@@ -25388,29 +25454,29 @@
    [
     {
      "field_name" : "r",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "g",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "b",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "a",
      "field_offset" : 192,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
-   "referenced_type" : "type-54",
-   "self_type" : "type-54",
+   "referenced_type" : "type-56",
+   "self_type" : "type-56",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_Ut1_E"
@@ -25420,35 +25486,35 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-205"
+     "referenced_type" : "type-197"
     },
     {
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-198"
     },
     {
-     "referenced_type" : "type-207"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-200"
     },
     {
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-201"
     },
     {
-     "referenced_type" : "type-210"
+     "referenced_type" : "type-202"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-193"
     }
    ],
    "linker_set_key" : "android::details::TVec4<float>",
    "name" : "android::details::TVec4<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-200",
-   "self_type" : "type-200",
+   "referenced_type" : "type-192",
+   "self_type" : "type-192",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "template_args" : [ "type-10" ],
@@ -25459,45 +25525,45 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-202"
+     "referenced_type" : "type-194"
     },
     {
-     "referenced_type" : "type-203"
+     "referenced_type" : "type-195"
     },
     {
-     "referenced_type" : "type-204"
+     "referenced_type" : "type-196"
     },
     {
      "field_name" : "xy",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "st",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "rg",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "xyz",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-18"
     },
     {
      "field_name" : "stp",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-18"
     },
     {
      "field_name" : "rgb",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-18"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-201",
-   "self_type" : "type-201",
+   "referenced_type" : "type-193",
+   "self_type" : "type-193",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_E"
@@ -25529,8 +25595,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
-   "referenced_type" : "type-202",
-   "self_type" : "type-202",
+   "referenced_type" : "type-194",
+   "self_type" : "type-194",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_Ut_E"
@@ -25562,8 +25628,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
-   "referenced_type" : "type-203",
-   "self_type" : "type-203",
+   "referenced_type" : "type-195",
+   "self_type" : "type-195",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_Ut0_E"
@@ -25595,8 +25661,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
-   "referenced_type" : "type-204",
-   "self_type" : "type-204",
+   "referenced_type" : "type-196",
+   "self_type" : "type-196",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_Ut1_E"
@@ -25618,8 +25684,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TMat44, float>",
    "name" : "android::details::TVecAddOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2409",
-   "self_type" : "type-2409",
+   "referenced_type" : "type-2411",
+   "self_type" : "type-2411",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25630,11 +25696,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TVecAddOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-334",
-   "self_type" : "type-334",
+   "referenced_type" : "type-331",
+   "self_type" : "type-331",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -25642,8 +25708,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TQuaternion, float>",
    "name" : "android::details::TVecAddOperators<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-413",
-   "self_type" : "type-413",
+   "referenced_type" : "type-410",
+   "self_type" : "type-410",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25654,8 +25720,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecAddOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-427",
-   "self_type" : "type-427",
+   "referenced_type" : "type-424",
+   "self_type" : "type-424",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -25666,11 +25732,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecAddOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-61",
-   "self_type" : "type-61",
+   "referenced_type" : "type-63",
+   "self_type" : "type-63",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -25678,8 +25744,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec2, float>",
    "name" : "android::details::TVecAddOperators<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-28",
-   "self_type" : "type-28",
+   "referenced_type" : "type-29",
+   "self_type" : "type-29",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25690,11 +25756,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecAddOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-72",
-   "self_type" : "type-72",
+   "referenced_type" : "type-74",
+   "self_type" : "type-74",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -25702,8 +25768,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec3, float>",
    "name" : "android::details::TVecAddOperators<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-34",
-   "self_type" : "type-34",
+   "referenced_type" : "type-35",
+   "self_type" : "type-35",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25714,11 +25780,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecAddOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-78",
-   "self_type" : "type-78",
+   "referenced_type" : "type-80",
+   "self_type" : "type-80",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -25726,8 +25792,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecAddOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-206",
-   "self_type" : "type-206",
+   "referenced_type" : "type-198",
+   "self_type" : "type-198",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25750,8 +25816,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TMat44, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2411",
-   "self_type" : "type-2411",
+   "referenced_type" : "type-2413",
+   "self_type" : "type-2413",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25762,11 +25828,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-336",
-   "self_type" : "type-336",
+   "referenced_type" : "type-333",
+   "self_type" : "type-333",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -25774,8 +25840,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TQuaternion, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-415",
-   "self_type" : "type-415",
+   "referenced_type" : "type-412",
+   "self_type" : "type-412",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25786,8 +25852,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-510",
-   "self_type" : "type-510",
+   "referenced_type" : "type-507",
+   "self_type" : "type-507",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -25798,11 +25864,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-63",
-   "self_type" : "type-63",
+   "referenced_type" : "type-65",
+   "self_type" : "type-65",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -25810,8 +25876,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec2, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-30",
-   "self_type" : "type-30",
+   "referenced_type" : "type-31",
+   "self_type" : "type-31",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25822,11 +25888,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-74",
-   "self_type" : "type-74",
+   "referenced_type" : "type-76",
+   "self_type" : "type-76",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -25834,8 +25900,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec3, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-11",
-   "self_type" : "type-11",
+   "referenced_type" : "type-13",
+   "self_type" : "type-13",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25846,11 +25912,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-80",
-   "self_type" : "type-80",
+   "referenced_type" : "type-82",
+   "self_type" : "type-82",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -25858,8 +25924,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-208",
-   "self_type" : "type-208",
+   "referenced_type" : "type-200",
+   "self_type" : "type-200",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25882,11 +25948,11 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec2, double>",
    "name" : "android::details::TVecDebug<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-65",
-   "self_type" : "type-65",
+   "referenced_type" : "type-67",
+   "self_type" : "type-67",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details9TVecDebugINS0_5TVec2EdEE"
   },
   {
@@ -25894,8 +25960,8 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec2, float>",
    "name" : "android::details::TVecDebug<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-32",
-   "self_type" : "type-32",
+   "referenced_type" : "type-33",
+   "self_type" : "type-33",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25906,11 +25972,11 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec3, double>",
    "name" : "android::details::TVecDebug<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-76",
-   "self_type" : "type-76",
+   "referenced_type" : "type-78",
+   "self_type" : "type-78",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details9TVecDebugINS0_5TVec3EdEE"
   },
   {
@@ -25918,8 +25984,8 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec3, float>",
    "name" : "android::details::TVecDebug<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-35",
-   "self_type" : "type-35",
+   "referenced_type" : "type-36",
+   "self_type" : "type-36",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25930,11 +25996,11 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec4, double>",
    "name" : "android::details::TVecDebug<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-82",
-   "self_type" : "type-82",
+   "referenced_type" : "type-84",
+   "self_type" : "type-84",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details9TVecDebugINS0_5TVec4EdEE"
   },
   {
@@ -25942,8 +26008,8 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec4, float>",
    "name" : "android::details::TVecDebug<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-210",
-   "self_type" : "type-210",
+   "referenced_type" : "type-202",
+   "self_type" : "type-202",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25966,11 +26032,11 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec2, double>",
    "name" : "android::details::TVecFunctions<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-64",
-   "self_type" : "type-64",
+   "referenced_type" : "type-66",
+   "self_type" : "type-66",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details13TVecFunctionsINS0_5TVec2EdEE"
   },
   {
@@ -25978,8 +26044,8 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec2, float>",
    "name" : "android::details::TVecFunctions<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-31",
-   "self_type" : "type-31",
+   "referenced_type" : "type-32",
+   "self_type" : "type-32",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25990,11 +26056,11 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec3, double>",
    "name" : "android::details::TVecFunctions<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-75",
-   "self_type" : "type-75",
+   "referenced_type" : "type-77",
+   "self_type" : "type-77",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details13TVecFunctionsINS0_5TVec3EdEE"
   },
   {
@@ -26002,8 +26068,8 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec3, float>",
    "name" : "android::details::TVecFunctions<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-12",
-   "self_type" : "type-12",
+   "referenced_type" : "type-14",
+   "self_type" : "type-14",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26014,11 +26080,11 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec4, double>",
    "name" : "android::details::TVecFunctions<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-81",
-   "self_type" : "type-81",
+   "referenced_type" : "type-83",
+   "self_type" : "type-83",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details13TVecFunctionsINS0_5TVec4EdEE"
   },
   {
@@ -26026,8 +26092,8 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec4, float>",
    "name" : "android::details::TVecFunctions<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-209",
-   "self_type" : "type-209",
+   "referenced_type" : "type-201",
+   "self_type" : "type-201",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26038,8 +26104,8 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecProductOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-396",
-   "self_type" : "type-396",
+   "referenced_type" : "type-390",
+   "self_type" : "type-390",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -26050,11 +26116,11 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecProductOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-60",
-   "self_type" : "type-60",
+   "referenced_type" : "type-62",
+   "self_type" : "type-62",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details20TVecProductOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -26062,8 +26128,8 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec2, float>",
    "name" : "android::details::TVecProductOperators<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-27",
-   "self_type" : "type-27",
+   "referenced_type" : "type-28",
+   "self_type" : "type-28",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26074,11 +26140,11 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecProductOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-71",
-   "self_type" : "type-71",
+   "referenced_type" : "type-73",
+   "self_type" : "type-73",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details20TVecProductOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -26086,8 +26152,8 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec3, float>",
    "name" : "android::details::TVecProductOperators<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-33",
-   "self_type" : "type-33",
+   "referenced_type" : "type-34",
+   "self_type" : "type-34",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26098,11 +26164,11 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecProductOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-77",
-   "self_type" : "type-77",
+   "referenced_type" : "type-79",
+   "self_type" : "type-79",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details20TVecProductOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -26110,8 +26176,8 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecProductOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-205",
-   "self_type" : "type-205",
+   "referenced_type" : "type-197",
+   "self_type" : "type-197",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26134,8 +26200,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TMat44, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2410",
-   "self_type" : "type-2410",
+   "referenced_type" : "type-2412",
+   "self_type" : "type-2412",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26146,11 +26212,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-335",
-   "self_type" : "type-335",
+   "referenced_type" : "type-332",
+   "self_type" : "type-332",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -26158,8 +26224,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TQuaternion, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-414",
-   "self_type" : "type-414",
+   "referenced_type" : "type-411",
+   "self_type" : "type-411",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26170,8 +26236,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-462",
-   "self_type" : "type-462",
+   "referenced_type" : "type-455",
+   "self_type" : "type-455",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -26182,11 +26248,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-62",
-   "self_type" : "type-62",
+   "referenced_type" : "type-64",
+   "self_type" : "type-64",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -26194,8 +26260,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec2, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-29",
-   "self_type" : "type-29",
+   "referenced_type" : "type-30",
+   "self_type" : "type-30",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26206,11 +26272,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-73",
-   "self_type" : "type-73",
+   "referenced_type" : "type-75",
+   "self_type" : "type-75",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -26230,11 +26296,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-79",
-   "self_type" : "type-79",
+   "referenced_type" : "type-81",
+   "self_type" : "type-81",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -26242,8 +26308,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-207",
-   "self_type" : "type-207",
+   "referenced_type" : "type-199",
+   "self_type" : "type-199",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26309,7 +26375,7 @@
    [
     {
      "field_name" : "bits",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "fp",
@@ -26331,7 +26397,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-196"
+     "referenced_type" : "type-209"
     }
    ],
    "fields" :
@@ -26340,32 +26406,32 @@
      "access" : "protected",
      "field_name" : "mSchedPolicy",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "protected",
      "field_name" : "mSchedPriority",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mExtras",
      "field_offset" : 96,
-     "referenced_type" : "type-243"
+     "referenced_type" : "type-245"
     },
     {
      "access" : "private",
      "field_name" : "mReserved0",
      "field_offset" : 128,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
    "linker_set_key" : "android::hardware::BHwBinder",
    "name" : "android::hardware::BHwBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-242",
-   "self_type" : "type-242",
+   "referenced_type" : "type-244",
+   "self_type" : "type-244",
    "size" : 28,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware9BHwBinderE",
@@ -26472,7 +26538,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "fields" :
@@ -26481,26 +26547,26 @@
      "access" : "private",
      "field_name" : "mRemote",
      "field_offset" : 32,
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-207"
     },
     {
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 64,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-210"
     },
     {
      "access" : "private",
      "field_name" : "mState",
      "field_offset" : 96,
-     "referenced_type" : "type-199"
+     "referenced_type" : "type-212"
     }
    ],
    "linker_set_key" : "android::hardware::BpHwRefBase",
    "name" : "android::hardware::BpHwRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-193",
-   "self_type" : "type-193",
+   "referenced_type" : "type-206",
+   "self_type" : "type-206",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE",
@@ -26589,22 +26655,22 @@
    [
     {
      "field_name" : "flags",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "fdIndex",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "offset",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "extent",
      "field_offset" : 128,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "android::hardware::GrantorDescriptor",
@@ -26625,7 +26691,7 @@
     },
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::HidlMemory",
@@ -26713,14 +26779,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::IBinder",
    "name" : "android::hardware::IBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-196",
-   "self_type" : "type-196",
+   "referenced_type" : "type-209",
+   "self_type" : "type-209",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinderE",
@@ -26830,14 +26896,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient",
    "name" : "android::hardware::IBinder::DeathRecipient",
    "record_kind" : "class",
-   "referenced_type" : "type-192",
-   "self_type" : "type-192",
+   "referenced_type" : "type-205",
+   "self_type" : "type-205",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinder14DeathRecipientE",
@@ -26918,14 +26984,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::IInterface",
    "name" : "android::hardware::IInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-213",
-   "self_type" : "type-213",
+   "referenced_type" : "type-215",
+   "self_type" : "type-215",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
    "unique_id" : "_ZTSN7android8hardware10IInterfaceE",
@@ -27007,85 +27073,85 @@
     {
      "access" : "private",
      "field_name" : "mProcess",
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-274"
     },
     {
      "access" : "private",
      "field_name" : "mPendingStrongDerefs",
      "field_offset" : 32,
-     "referenced_type" : "type-240"
+     "referenced_type" : "type-242"
     },
     {
      "access" : "private",
      "field_name" : "mPendingWeakDerefs",
      "field_offset" : 192,
-     "referenced_type" : "type-244"
+     "referenced_type" : "type-246"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteStrongDerefs",
      "field_offset" : 352,
-     "referenced_type" : "type-245"
+     "referenced_type" : "type-247"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteWeakDerefs",
      "field_offset" : 512,
-     "referenced_type" : "type-244"
+     "referenced_type" : "type-246"
     },
     {
      "access" : "private",
      "field_name" : "mIn",
      "field_offset" : 672,
-     "referenced_type" : "type-215"
+     "referenced_type" : "type-217"
     },
     {
      "access" : "private",
      "field_name" : "mOut",
      "field_offset" : 1216,
-     "referenced_type" : "type-215"
+     "referenced_type" : "type-217"
     },
     {
      "access" : "private",
      "field_name" : "mLastError",
      "field_offset" : 1760,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mCallingPid",
      "field_offset" : 1792,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mCallingSid",
      "field_offset" : 1824,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "access" : "private",
      "field_name" : "mCallingUid",
      "field_offset" : 1856,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mStrictModePolicy",
      "field_offset" : 1888,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mLastTransactionBinderFlags",
      "field_offset" : 1920,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mContextObject",
      "field_offset" : 1952,
-     "referenced_type" : "type-289"
+     "referenced_type" : "type-286"
     },
     {
      "access" : "private",
@@ -27103,26 +27169,26 @@
      "access" : "private",
      "field_name" : "mPostCommandTasks",
      "field_offset" : 2016,
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-287"
     },
     {
      "access" : "private",
      "field_name" : "mIPCThreadStateBase",
      "field_offset" : 2112,
-     "referenced_type" : "type-291"
+     "referenced_type" : "type-288"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 2144,
-     "referenced_type" : "type-276"
+     "referenced_type" : "type-272"
     }
    ],
    "linker_set_key" : "android::hardware::IPCThreadState",
    "name" : "android::hardware::IPCThreadState",
    "record_kind" : "class",
-   "referenced_type" : "type-277",
-   "self_type" : "type-277",
+   "referenced_type" : "type-273",
+   "self_type" : "type-273",
    "size" : 272,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h",
    "unique_id" : "_ZTSN7android8hardware14IPCThreadStateE"
@@ -27134,73 +27200,73 @@
     {
      "access" : "private",
      "field_name" : "mBufCachePos",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mBufCache",
      "field_offset" : 32,
-     "referenced_type" : "type-216"
+     "referenced_type" : "type-218"
     },
     {
      "access" : "private",
      "field_name" : "mError",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mData",
      "field_offset" : 160,
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-219"
     },
     {
      "access" : "private",
      "field_name" : "mDataSize",
      "field_offset" : 192,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mDataCapacity",
      "field_offset" : 224,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mDataPos",
      "field_offset" : 256,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mObjects",
      "field_offset" : 288,
-     "referenced_type" : "type-219"
+     "referenced_type" : "type-221"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsSize",
      "field_offset" : 320,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsCapacity",
      "field_offset" : 352,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mNextObjectHint",
      "field_offset" : 384,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mNumRef",
      "field_offset" : 416,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -27224,20 +27290,20 @@
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 480,
-     "referenced_type" : "type-220"
+     "referenced_type" : "type-222"
     },
     {
      "access" : "private",
      "field_name" : "mOwnerCookie",
      "field_offset" : 512,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
    "linker_set_key" : "android::hardware::Parcel",
    "name" : "android::hardware::Parcel",
    "record_kind" : "class",
-   "referenced_type" : "type-215",
-   "self_type" : "type-215",
+   "referenced_type" : "type-217",
+   "self_type" : "type-217",
    "size" : 68,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6ParcelE"
@@ -27249,23 +27315,23 @@
    [
     {
      "field_name" : "index",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "buffer",
      "field_offset" : 32,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "bufend",
      "field_offset" : 96,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "android::hardware::Parcel::BufferInfo",
    "name" : "android::hardware::Parcel::BufferInfo",
-   "referenced_type" : "type-228",
-   "self_type" : "type-228",
+   "referenced_type" : "type-230",
+   "self_type" : "type-230",
    "size" : 20,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE"
@@ -27276,7 +27342,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "fields" :
@@ -27285,55 +27351,55 @@
      "access" : "private",
      "field_name" : "mDriverFD",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mVMStart",
      "field_offset" : 64,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountLock",
      "field_offset" : 96,
-     "referenced_type" : "type-282"
+     "referenced_type" : "type-278"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountDecrement",
      "field_offset" : 128,
-     "referenced_type" : "type-283"
+     "referenced_type" : "type-279"
     },
     {
      "access" : "private",
      "field_name" : "mExecutingThreadsCount",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mMaxThreads",
      "field_offset" : 192,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mStarvationStartTimeMs",
      "field_offset" : 224,
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 288,
-     "referenced_type" : "type-252"
+     "referenced_type" : "type-280"
     },
     {
      "access" : "private",
      "field_name" : "mHandleToObject",
      "field_offset" : 320,
-     "referenced_type" : "type-238"
+     "referenced_type" : "type-240"
     },
     {
      "access" : "private",
@@ -27345,25 +27411,25 @@
      "access" : "private",
      "field_name" : "mBinderContextCheckFunc",
      "field_offset" : 512,
-     "referenced_type" : "type-274"
+     "referenced_type" : "type-270"
     },
     {
      "access" : "private",
      "field_name" : "mBinderContextUserData",
      "field_offset" : 544,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "access" : "private",
      "field_name" : "mContexts",
      "field_offset" : 576,
-     "referenced_type" : "type-247"
+     "referenced_type" : "type-249"
     },
     {
      "access" : "private",
      "field_name" : "mRootDir",
      "field_offset" : 736,
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-282"
     },
     {
      "access" : "private",
@@ -27381,26 +27447,26 @@
      "access" : "private",
      "field_name" : "mThreadPoolSeq",
      "field_offset" : 800,
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-271"
     },
     {
      "access" : "private",
      "field_name" : "mMmapSize",
      "field_offset" : 832,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 864,
-     "referenced_type" : "type-276"
+     "referenced_type" : "type-272"
     }
    ],
    "linker_set_key" : "android::hardware::ProcessState",
    "name" : "android::hardware::ProcessState",
    "record_kind" : "class",
-   "referenced_type" : "type-281",
-   "self_type" : "type-281",
+   "referenced_type" : "type-277",
+   "self_type" : "type-277",
    "size" : 120,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessStateE",
@@ -27478,18 +27544,18 @@
    [
     {
      "field_name" : "binder",
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-208"
     },
     {
      "field_name" : "refs",
      "field_offset" : 32,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-210"
     }
    ],
    "linker_set_key" : "android::hardware::ProcessState::handle_entry",
    "name" : "android::hardware::ProcessState::handle_entry",
-   "referenced_type" : "type-239",
-   "self_type" : "type-239",
+   "referenced_type" : "type-241",
+   "self_type" : "type-241",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE"
@@ -27499,7 +27565,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "fields" :
@@ -27508,17 +27574,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-102"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
    "record_kind" : "class",
-   "referenced_type" : "type-99",
-   "self_type" : "type-99",
+   "referenced_type" : "type-101",
+   "self_type" : "type-101",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-105" ],
+   "template_args" : [ "type-107" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS0_8graphics6mapper4V2_05ErrorEEE"
   },
   {
@@ -27526,7 +27592,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "fields" :
@@ -27535,17 +27601,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-393"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
    "record_kind" : "class",
-   "referenced_type" : "type-393",
-   "self_type" : "type-393",
+   "referenced_type" : "type-392",
+   "self_type" : "type-392",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-395" ],
+   "template_args" : [ "type-394" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS0_8graphics6mapper4V3_05ErrorEEE"
   },
   {
@@ -27553,7 +27619,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "fields" :
@@ -27562,17 +27628,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-88"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
    "record_kind" : "class",
-   "referenced_type" : "type-111",
-   "self_type" : "type-111",
+   "referenced_type" : "type-113",
+   "self_type" : "type-113",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-88" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics6mapper4V2_17IMapperEEEEE"
   },
   {
@@ -27580,7 +27646,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "linker_set_key" : "android::hardware::Return<void>",
@@ -27590,7 +27656,7 @@
    "self_type" : "type-1322",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIvEE"
   },
   {
@@ -27600,26 +27666,26 @@
     {
      "access" : "private",
      "field_name" : "mException",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mErrorCode",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-106"
     }
    ],
    "linker_set_key" : "android::hardware::Status",
    "name" : "android::hardware::Status",
    "record_kind" : "class",
-   "referenced_type" : "type-102",
-   "self_type" : "type-102",
+   "referenced_type" : "type-104",
+   "self_type" : "type-104",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware6StatusE"
@@ -27725,7 +27791,7 @@
    "self_type" : "type-1103",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware7details14const_accessorIjLj10EJEEE"
   },
   {
@@ -27739,12 +27805,12 @@
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-1099",
    "self_type" : "type-1099",
@@ -27776,16 +27842,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-137"
+     "referenced_type" : "type-140"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
-   "referenced_type" : "type-136",
-   "self_type" : "type-136",
+   "referenced_type" : "type-139",
+   "self_type" : "type-139",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-139" ],
+   "template_args" : [ "type-142" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_handleEEE"
   },
   {
@@ -27803,7 +27869,7 @@
    "self_type" : "type-1071",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-287" ],
+   "template_args" : [ "type-284" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEE"
   },
   {
@@ -27813,16 +27879,16 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-1072",
    "self_type" : "type-1072",
@@ -27836,16 +27902,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-144"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>",
-   "referenced_type" : "type-140",
-   "self_type" : "type-140",
+   "referenced_type" : "type-143",
+   "self_type" : "type-143",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-143" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEE"
   },
   {
@@ -27855,19 +27921,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-141",
-   "self_type" : "type-141",
+   "referenced_type" : "type-144",
+   "self_type" : "type-144",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEUt_E"
@@ -27879,19 +27945,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-141"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<hidl_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<hidl_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-137",
-   "self_type" : "type-137",
+   "referenced_type" : "type-140",
+   "self_type" : "type-140",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_handleEEUt_E"
@@ -27911,7 +27977,7 @@
    "self_type" : "type-1150",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-144" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEE"
   },
   {
@@ -27925,12 +27991,12 @@
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-1151",
    "self_type" : "type-1151",
@@ -27944,16 +28010,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-121"
+     "referenced_type" : "type-123"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int>",
    "name" : "android::hardware::details::hidl_pointer<unsigned int>",
-   "referenced_type" : "type-120",
-   "self_type" : "type-120",
+   "referenced_type" : "type-122",
+   "self_type" : "type-122",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIjEE"
   },
   {
@@ -27963,19 +28029,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<unsigned int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<unsigned int>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
-   "referenced_type" : "type-121",
-   "self_type" : "type-121",
+   "referenced_type" : "type-123",
+   "self_type" : "type-123",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIjEUt_E"
@@ -27997,7 +28063,7 @@
     {
      "access" : "private",
      "field_name" : "mStatus",
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-104"
     },
     {
      "access" : "private",
@@ -28009,8 +28075,8 @@
    "linker_set_key" : "android::hardware::details::return_status",
    "name" : "android::hardware::details::return_status",
    "record_kind" : "class",
-   "referenced_type" : "type-101",
-   "self_type" : "type-101",
+   "referenced_type" : "type-103",
+   "self_type" : "type-103",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware7details13return_statusE"
@@ -28023,7 +28089,7 @@
    "self_type" : "type-1102",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware7details9std_arrayIjLj10EJEEE"
   },
   {
@@ -28037,7 +28103,7 @@
     {
      "field_name" : "nativeHandle",
      "field_offset" : 320,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-142"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::HardwareBuffer",
@@ -28064,7 +28130,7 @@
    "self_type" : "type-1108",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware10hidl_arrayIjLj10EJEEE"
   },
   {
@@ -28073,7 +28139,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_death_recipient",
@@ -28158,33 +28224,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
    "name" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
-   "referenced_type" : "type-149",
-   "self_type" : "type-149",
+   "referenced_type" : "type-152",
+   "self_type" : "type-152",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-150", "type-151" ],
+   "template_args" : [ "type-153", "type-154" ],
    "unique_id" : "_ZTSN7android8hardware15hidl_enum_rangeINS0_8graphics6common4V1_011BufferUsageEvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
    "name" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
-   "referenced_type" : "type-157",
-   "self_type" : "type-157",
+   "referenced_type" : "type-159",
+   "self_type" : "type-159",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-158", "type-151" ],
+   "template_args" : [ "type-160", "type-154" ],
    "unique_id" : "_ZTSN7android8hardware15hidl_enum_rangeINS0_8graphics6common4V1_111BufferUsageEvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
    "name" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
-   "referenced_type" : "type-419",
-   "self_type" : "type-419",
+   "referenced_type" : "type-416",
+   "self_type" : "type-416",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-420", "type-151" ],
+   "template_args" : [ "type-417", "type-154" ],
    "unique_id" : "_ZTSN7android8hardware15hidl_enum_rangeINS0_8graphics6common4V1_211BufferUsageEvEE"
   },
   {
@@ -28194,7 +28260,7 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-140"
+     "referenced_type" : "type-143"
     },
     {
      "access" : "private",
@@ -28205,8 +28271,8 @@
    ],
    "linker_set_key" : "android::hardware::hidl_handle",
    "name" : "android::hardware::hidl_handle",
-   "referenced_type" : "type-139",
-   "self_type" : "type-139",
+   "referenced_type" : "type-142",
+   "self_type" : "type-142",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_handleE"
@@ -28218,13 +28284,13 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-142"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 128,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
@@ -28254,7 +28320,7 @@
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -28284,7 +28350,7 @@
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -28309,13 +28375,13 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-136"
+     "referenced_type" : "type-139"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -28326,11 +28392,11 @@
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_handle>",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_handle>",
-   "referenced_type" : "type-135",
-   "self_type" : "type-135",
+   "referenced_type" : "type-138",
+   "self_type" : "type-138",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-139" ],
+   "template_args" : [ "type-142" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_11hidl_handleEEE"
   },
   {
@@ -28340,13 +28406,13 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-120"
+     "referenced_type" : "type-122"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -28357,11 +28423,11 @@
    ],
    "linker_set_key" : "android::hardware::hidl_vec<unsigned int>",
    "name" : "android::hardware::hidl_vec<unsigned int>",
-   "referenced_type" : "type-128",
-   "self_type" : "type-128",
+   "referenced_type" : "type-131",
+   "self_type" : "type-131",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecIjEE"
   },
   {
@@ -28394,23 +28460,23 @@
    [
     {
      "field_name" : "pid",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "ptr",
      "field_offset" : 64,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "arch",
      "field_offset" : 128,
-     "referenced_type" : "type-164"
+     "referenced_type" : "type-167"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo",
    "name" : "android::hidl::base::V1_0::DebugInfo",
-   "referenced_type" : "type-163",
-   "self_type" : "type-163",
+   "referenced_type" : "type-166",
+   "self_type" : "type-166",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfoE"
@@ -28421,13 +28487,13 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::IBase",
    "name" : "android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-171",
-   "self_type" : "type-171",
+   "referenced_type" : "type-174",
+   "self_type" : "type-174",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_05IBaseE",
@@ -28536,13 +28602,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-174"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification",
    "name" : "android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-295",
-   "self_type" : "type-295",
+   "referenced_type" : "type-292",
+   "self_type" : "type-292",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_020IServiceNotificationE",
@@ -28656,12 +28722,12 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
      "field_name" : "value",
      "field_offset" : 32,
-     "referenced_type" : "type-676"
+     "referenced_type" : "type-680"
     }
    ],
    "linker_set_key" : "android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
@@ -28670,7 +28736,7 @@
    "self_type" : "type-694",
    "size" : 48,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142", "type-676" ],
+   "template_args" : [ "type-145", "type-680" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -28700,17 +28766,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
    "linker_set_key" : "android::sp<android::GraphicBuffer>",
    "name" : "android::sp<android::GraphicBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-679",
-   "self_type" : "type-679",
+   "referenced_type" : "type-678",
+   "self_type" : "type-678",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-525" ],
+   "template_args" : [ "type-523" ],
    "unique_id" : "_ZTSN7android2spINS_13GraphicBufferEEE"
   },
   {
@@ -28720,17 +28786,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-365"
     }
    ],
    "linker_set_key" : "android::sp<android::Thread>",
    "name" : "android::sp<android::Thread>",
    "record_kind" : "class",
-   "referenced_type" : "type-367",
-   "self_type" : "type-367",
+   "referenced_type" : "type-364",
+   "self_type" : "type-364",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-369" ],
+   "template_args" : [ "type-366" ],
    "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
   },
   {
@@ -28740,17 +28806,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-241"
+     "referenced_type" : "type-243"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::BHwBinder>",
    "name" : "android::sp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-289",
-   "self_type" : "type-289",
+   "referenced_type" : "type-286",
+   "self_type" : "type-286",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-242" ],
+   "template_args" : [ "type-244" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
   },
   {
@@ -28760,17 +28826,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-208"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IBinder>",
    "name" : "android::sp<android::hardware::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-248",
-   "self_type" : "type-248",
+   "referenced_type" : "type-250",
+   "self_type" : "type-250",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-196" ],
+   "template_args" : [ "type-209" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
   },
   {
@@ -28780,17 +28846,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-280"
+     "referenced_type" : "type-276"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::ProcessState>",
    "name" : "android::sp<android::hardware::ProcessState>",
    "record_kind" : "class",
-   "referenced_type" : "type-279",
-   "self_type" : "type-279",
+   "referenced_type" : "type-275",
+   "self_type" : "type-275",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-281" ],
+   "template_args" : [ "type-277" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
   },
   {
@@ -28800,17 +28866,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-356"
+     "referenced_type" : "type-353"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
    "record_kind" : "class",
-   "referenced_type" : "type-355",
-   "self_type" : "type-355",
+   "referenced_type" : "type-352",
+   "self_type" : "type-352",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-358" ],
+   "template_args" : [ "type-355" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics9allocator4V2_010IAllocatorEEE"
   },
   {
@@ -28820,17 +28886,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-485"
+     "referenced_type" : "type-482"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
    "record_kind" : "class",
-   "referenced_type" : "type-484",
-   "self_type" : "type-484",
+   "referenced_type" : "type-481",
+   "self_type" : "type-481",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-487" ],
+   "template_args" : [ "type-484" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics9allocator4V3_010IAllocatorEEE"
   },
   {
@@ -28840,17 +28906,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-339"
+     "referenced_type" : "type-336"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-338",
-   "self_type" : "type-338",
+   "referenced_type" : "type-335",
+   "self_type" : "type-335",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-341" ],
+   "template_args" : [ "type-338" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics6mapper4V2_07IMapperEEE"
   },
   {
@@ -28860,17 +28926,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-87"
+     "referenced_type" : "type-89"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-86",
-   "self_type" : "type-86",
+   "referenced_type" : "type-88",
+   "self_type" : "type-88",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-89" ],
+   "template_args" : [ "type-91" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics6mapper4V2_17IMapperEEE"
   },
   {
@@ -28880,17 +28946,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-498"
+     "referenced_type" : "type-495"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-497",
-   "self_type" : "type-497",
+   "referenced_type" : "type-494",
+   "self_type" : "type-494",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-500" ],
+   "template_args" : [ "type-497" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics6mapper4V3_07IMapperEEE"
   },
   {
@@ -28920,17 +28986,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-364"
+     "referenced_type" : "type-361"
     }
    ],
    "linker_set_key" : "android::sp<android::hidl::base::V1_0::IBase>",
    "name" : "android::sp<android::hidl::base::V1_0::IBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-363",
-   "self_type" : "type-363",
+   "referenced_type" : "type-360",
+   "self_type" : "type-360",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-171" ],
+   "template_args" : [ "type-174" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl4base4V1_05IBaseEEE"
   },
   {
@@ -28940,36 +29006,36 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-369"
     }
    ],
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceNotification>",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification>",
    "record_kind" : "class",
-   "referenced_type" : "type-371",
-   "self_type" : "type-371",
+   "referenced_type" : "type-368",
+   "self_type" : "type-368",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-295" ],
+   "template_args" : [ "type-292" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::trait_pointer<android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-819",
-   "self_type" : "type-819",
+   "referenced_type" : "type-820",
+   "self_type" : "type-820",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::Rect>",
    "name" : "android::trait_pointer<android::Rect>",
-   "referenced_type" : "type-2400",
-   "self_type" : "type-2400",
+   "referenced_type" : "type-2402",
+   "self_type" : "type-2402",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -28979,8 +29045,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::trait_pointer<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-817",
-   "self_type" : "type-817",
+   "referenced_type" : "type-818",
+   "self_type" : "type-818",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -28990,33 +29056,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<const native_handle *>",
    "name" : "android::trait_pointer<const native_handle *>",
-   "referenced_type" : "type-818",
-   "self_type" : "type-818",
+   "referenced_type" : "type-819",
+   "self_type" : "type-819",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android13trait_pointerIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<long long>",
    "name" : "android::trait_pointer<long long>",
-   "referenced_type" : "type-1430",
-   "self_type" : "type-1430",
+   "referenced_type" : "type-1434",
+   "self_type" : "type-1434",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android13trait_pointerIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::trait_trivial_copy<android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-812",
-   "self_type" : "type-812",
+   "referenced_type" : "type-813",
+   "self_type" : "type-813",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -29045,8 +29111,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-813",
-   "self_type" : "type-813",
+   "referenced_type" : "type-814",
+   "self_type" : "type-814",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -29056,8 +29122,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-483",
-   "self_type" : "type-483",
+   "referenced_type" : "type-480",
+   "self_type" : "type-480",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -29067,11 +29133,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-512",
-   "self_type" : "type-512",
+   "referenced_type" : "type-509",
+   "self_type" : "type-509",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-288" ],
+   "template_args" : [ "type-285" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
   },
   {
@@ -29082,26 +29148,26 @@
    "self_type" : "type-811",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<double>",
    "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-795",
-   "self_type" : "type-795",
+   "referenced_type" : "type-787",
+   "self_type" : "type-787",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<float>",
    "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-757",
-   "self_type" : "type-757",
+   "referenced_type" : "type-755",
+   "self_type" : "type-755",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-10" ],
@@ -29111,11 +29177,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-647",
-   "self_type" : "type-647",
+   "referenced_type" : "type-645",
+   "self_type" : "type-645",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIiEE"
   },
   {
@@ -29126,26 +29192,26 @@
    "self_type" : "type-741",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long>",
    "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-704",
-   "self_type" : "type-704",
+   "referenced_type" : "type-697",
+   "self_type" : "type-697",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-687" ],
+   "template_args" : [ "type-684" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<short>",
    "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-617",
-   "self_type" : "type-617",
+   "referenced_type" : "type-614",
+   "self_type" : "type-614",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-599" ],
@@ -29155,22 +29221,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned char>",
    "name" : "android::trait_trivial_copy<unsigned char>",
-   "referenced_type" : "type-540",
-   "self_type" : "type-540",
+   "referenced_type" : "type-536",
+   "self_type" : "type-536",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-218" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned int>",
    "name" : "android::trait_trivial_copy<unsigned int>",
-   "referenced_type" : "type-675",
-   "self_type" : "type-675",
+   "referenced_type" : "type-671",
+   "self_type" : "type-671",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIjEE"
   },
   {
@@ -29181,15 +29247,15 @@
    "self_type" : "type-751",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long>",
    "name" : "android::trait_trivial_copy<unsigned long>",
-   "referenced_type" : "type-722",
-   "self_type" : "type-722",
+   "referenced_type" : "type-720",
+   "self_type" : "type-720",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-710" ],
@@ -29199,8 +29265,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
    "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-631",
-   "self_type" : "type-631",
+   "referenced_type" : "type-629",
+   "self_type" : "type-629",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-3" ],
@@ -29210,11 +29276,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-476",
-   "self_type" : "type-476",
+   "referenced_type" : "type-473",
+   "self_type" : "type-473",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
   },
   {
@@ -29225,7 +29291,7 @@
    "self_type" : "type-807",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -29265,8 +29331,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-481",
-   "self_type" : "type-481",
+   "referenced_type" : "type-478",
+   "self_type" : "type-478",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -29276,11 +29342,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-501",
-   "self_type" : "type-501",
+   "referenced_type" : "type-498",
+   "self_type" : "type-498",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-288" ],
+   "template_args" : [ "type-285" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
   },
   {
@@ -29291,18 +29357,18 @@
    "self_type" : "type-806",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<double>",
    "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-781",
-   "self_type" : "type-781",
+   "referenced_type" : "type-775",
+   "self_type" : "type-775",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIdEE"
   },
   {
@@ -29320,11 +29386,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-638",
-   "self_type" : "type-638",
+   "referenced_type" : "type-637",
+   "self_type" : "type-637",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIiEE"
   },
   {
@@ -29335,18 +29401,18 @@
    "self_type" : "type-729",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long>",
    "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-686",
-   "self_type" : "type-686",
+   "referenced_type" : "type-683",
+   "self_type" : "type-683",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-687" ],
+   "template_args" : [ "type-684" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
   },
   {
@@ -29364,33 +29430,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned char>",
    "name" : "android::trait_trivial_ctor<unsigned char>",
-   "referenced_type" : "type-534",
-   "self_type" : "type-534",
+   "referenced_type" : "type-531",
+   "self_type" : "type-531",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-218" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
    "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-661",
-   "self_type" : "type-661",
+   "referenced_type" : "type-655",
+   "self_type" : "type-655",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
    "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-746",
-   "self_type" : "type-746",
+   "referenced_type" : "type-743",
+   "self_type" : "type-743",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIyEE"
   },
   {
@@ -29408,8 +29474,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned short>",
    "name" : "android::trait_trivial_ctor<unsigned short>",
-   "referenced_type" : "type-620",
-   "self_type" : "type-620",
+   "referenced_type" : "type-619",
+   "self_type" : "type-619",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-3" ],
@@ -29419,11 +29485,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-453",
-   "self_type" : "type-453",
+   "referenced_type" : "type-450",
+   "self_type" : "type-450",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
   },
   {
@@ -29434,7 +29500,7 @@
    "self_type" : "type-809",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -29474,8 +29540,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<bool>",
    "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-482",
-   "self_type" : "type-482",
+   "referenced_type" : "type-479",
+   "self_type" : "type-479",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -29485,11 +29551,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-511",
-   "self_type" : "type-511",
+   "referenced_type" : "type-508",
+   "self_type" : "type-508",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-288" ],
+   "template_args" : [ "type-285" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
   },
   {
@@ -29500,7 +29566,7 @@
    "self_type" : "type-808",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIPK13native_handleEE"
   },
   {
@@ -29511,7 +29577,7 @@
    "self_type" : "type-786",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIdEE"
   },
   {
@@ -29533,18 +29599,18 @@
    "self_type" : "type-644",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long long>",
    "name" : "android::trait_trivial_dtor<long long>",
-   "referenced_type" : "type-738",
-   "self_type" : "type-738",
+   "referenced_type" : "type-736",
+   "self_type" : "type-736",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
   },
   {
@@ -29555,7 +29621,7 @@
    "self_type" : "type-692",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-687" ],
+   "template_args" : [ "type-684" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
   },
   {
@@ -29573,41 +29639,41 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned char>",
    "name" : "android::trait_trivial_dtor<unsigned char>",
-   "referenced_type" : "type-538",
-   "self_type" : "type-538",
+   "referenced_type" : "type-535",
+   "self_type" : "type-535",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-218" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
    "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-668",
-   "self_type" : "type-668",
+   "referenced_type" : "type-664",
+   "self_type" : "type-664",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
    "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-749",
-   "self_type" : "type-749",
+   "referenced_type" : "type-747",
+   "self_type" : "type-747",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long>",
    "name" : "android::trait_trivial_dtor<unsigned long>",
-   "referenced_type" : "type-719",
-   "self_type" : "type-719",
+   "referenced_type" : "type-715",
+   "self_type" : "type-715",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-710" ],
@@ -29617,8 +29683,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned short>",
    "name" : "android::trait_trivial_dtor<unsigned short>",
-   "referenced_type" : "type-625",
-   "self_type" : "type-625",
+   "referenced_type" : "type-621",
+   "self_type" : "type-621",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-3" ],
@@ -29628,22 +29694,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-469",
-   "self_type" : "type-469",
+   "referenced_type" : "type-462",
+   "self_type" : "type-462",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::trait_trivial_move<android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-815",
-   "self_type" : "type-815",
+   "referenced_type" : "type-816",
+   "self_type" : "type-816",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -29672,11 +29738,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String16>",
    "name" : "android::trait_trivial_move<android::String16>",
-   "referenced_type" : "type-191",
-   "self_type" : "type-191",
+   "referenced_type" : "type-204",
+   "self_type" : "type-204",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-179" ],
+   "template_args" : [ "type-182" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8String16EEE"
   },
   {
@@ -29687,15 +29753,15 @@
    "self_type" : "type-902",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-285" ],
+   "template_args" : [ "type-282" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-816",
-   "self_type" : "type-816",
+   "referenced_type" : "type-817",
+   "self_type" : "type-817",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -29705,8 +29771,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<bool>",
    "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-490",
-   "self_type" : "type-490",
+   "referenced_type" : "type-485",
+   "self_type" : "type-485",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -29716,22 +29782,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-533",
-   "self_type" : "type-533",
+   "referenced_type" : "type-513",
+   "self_type" : "type-513",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-288" ],
+   "template_args" : [ "type-285" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<const native_handle *>",
    "name" : "android::trait_trivial_move<const native_handle *>",
-   "referenced_type" : "type-814",
-   "self_type" : "type-814",
+   "referenced_type" : "type-815",
+   "self_type" : "type-815",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIPK13native_handleEE"
   },
   {
@@ -29742,7 +29808,7 @@
    "self_type" : "type-798",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIdEE"
   },
   {
@@ -29760,11 +29826,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-650",
-   "self_type" : "type-650",
+   "referenced_type" : "type-648",
+   "self_type" : "type-648",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIiEE"
   },
   {
@@ -29775,18 +29841,18 @@
    "self_type" : "type-742",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long>",
    "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-708",
-   "self_type" : "type-708",
+   "referenced_type" : "type-707",
+   "self_type" : "type-707",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-687" ],
+   "template_args" : [ "type-684" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
   },
   {
@@ -29804,22 +29870,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned char>",
    "name" : "android::trait_trivial_move<unsigned char>",
-   "referenced_type" : "type-577",
-   "self_type" : "type-577",
+   "referenced_type" : "type-574",
+   "self_type" : "type-574",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-218" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned int>",
    "name" : "android::trait_trivial_move<unsigned int>",
-   "referenced_type" : "type-682",
-   "self_type" : "type-682",
+   "referenced_type" : "type-677",
+   "self_type" : "type-677",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIjEE"
   },
   {
@@ -29830,15 +29896,15 @@
    "self_type" : "type-752",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long>",
    "name" : "android::trait_trivial_move<unsigned long>",
-   "referenced_type" : "type-728",
-   "self_type" : "type-728",
+   "referenced_type" : "type-725",
+   "self_type" : "type-725",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-710" ],
@@ -29859,30 +29925,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-480",
-   "self_type" : "type-480",
+   "referenced_type" : "type-477",
+   "self_type" : "type-477",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::traits<android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-823",
-   "self_type" : "type-823",
+   "referenced_type" : "type-824",
+   "self_type" : "type-824",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android6traitsINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::Rect>",
    "name" : "android::traits<android::Rect>",
-   "referenced_type" : "type-2401",
-   "self_type" : "type-2401",
+   "referenced_type" : "type-2403",
+   "self_type" : "type-2403",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -29892,8 +29958,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::traits<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-820",
-   "self_type" : "type-820",
+   "referenced_type" : "type-821",
+   "self_type" : "type-821",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -29907,18 +29973,18 @@
    "self_type" : "type-822",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android6traitsIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<long long>",
    "name" : "android::traits<long long>",
-   "referenced_type" : "type-1431",
-   "self_type" : "type-1431",
+   "referenced_type" : "type-1435",
+   "self_type" : "type-1435",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android6traitsIxEE"
   },
   {
@@ -29927,12 +29993,12 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::ui::Size",
@@ -29950,20 +30016,20 @@
     {
      "access" : "private",
      "field_name" : "mMatrix",
-     "referenced_type" : "type-2435"
+     "referenced_type" : "type-2437"
     },
     {
      "access" : "private",
      "field_name" : "mType",
      "field_offset" : 288,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "linker_set_key" : "android::ui::Transform",
    "name" : "android::ui::Transform",
    "record_kind" : "class",
-   "referenced_type" : "type-2434",
-   "self_type" : "type-2434",
+   "referenced_type" : "type-2436",
+   "self_type" : "type-2436",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "unique_id" : "_ZTSN7android2ui9TransformE"
@@ -29980,8 +30046,8 @@
    ],
    "linker_set_key" : "android::ui::Transform::mat33",
    "name" : "android::ui::Transform::mat33",
-   "referenced_type" : "type-2435",
-   "self_type" : "type-2435",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2437",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "unique_id" : "_ZTSN7android2ui9Transform5mat33E"
@@ -29991,13 +30057,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2381"
+     "referenced_type" : "type-2383"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::Rect>",
    "name" : "android::use_trivial_move<android::Rect>",
-   "referenced_type" : "type-2380",
-   "self_type" : "type-2380",
+   "referenced_type" : "type-2382",
+   "self_type" : "type-2382",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -30008,13 +30074,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-701"
+     "referenced_type" : "type-704"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-700",
-   "self_type" : "type-700",
+   "referenced_type" : "type-703",
+   "self_type" : "type-703",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -30025,16 +30091,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1417"
+     "referenced_type" : "type-1422"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<long long>",
    "name" : "android::use_trivial_move<long long>",
-   "referenced_type" : "type-1416",
-   "self_type" : "type-1416",
+   "referenced_type" : "type-1421",
+   "self_type" : "type-1421",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveIxEE"
   },
   {
@@ -30065,12 +30131,12 @@
    [
     {
      "field_name" : "num_points",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 32,
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     },
     {
      "field_name" : "xyzc_points",
@@ -30097,7 +30163,7 @@
     {
      "field_name" : "num_planes",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "planes",
@@ -30119,7 +30185,7 @@
    [
     {
      "field_name" : "top_left",
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-219"
     },
     {
      "field_name" : "component",
@@ -30129,32 +30195,32 @@
     {
      "field_name" : "bits_per_component",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "bits_used",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "h_increment",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "v_increment",
      "field_offset" : 160,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "h_subsampling",
      "field_offset" : 192,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "v_subsampling",
      "field_offset" : 224,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android_flex_plane",
@@ -30171,33 +30237,33 @@
    [
     {
      "field_name" : "magic",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "version",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 64,
-     "referenced_type" : "type-519"
+     "referenced_type" : "type-517"
     },
     {
      "field_name" : "incRef",
      "field_offset" : 192,
-     "referenced_type" : "type-520"
+     "referenced_type" : "type-518"
     },
     {
      "field_name" : "decRef",
      "field_offset" : 224,
-     "referenced_type" : "type-520"
+     "referenced_type" : "type-518"
     }
    ],
    "linker_set_key" : "android_native_base_t",
    "name" : "android_native_base_t",
-   "referenced_type" : "type-518",
-   "self_type" : "type-518",
+   "referenced_type" : "type-516",
+   "self_type" : "type-516",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
    "unique_id" : "android_native_base_t"
@@ -30208,28 +30274,28 @@
    [
     {
      "field_name" : "left",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "top",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "right",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "bottom",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android_native_rect_t",
    "name" : "android_native_rect_t",
-   "referenced_type" : "type-619",
-   "self_type" : "type-619",
+   "referenced_type" : "type-620",
+   "self_type" : "type-620",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
    "unique_id" : "android_native_rect_t"
@@ -30304,43 +30370,43 @@
    [
     {
      "field_name" : "y",
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "cb",
      "field_offset" : 32,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "cr",
      "field_offset" : 64,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "ystride",
      "field_offset" : 96,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "cstride",
      "field_offset" : 128,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "chroma_step",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 192,
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     }
    ],
    "linker_set_key" : "android_ycbcr",
    "name" : "android_ycbcr",
-   "referenced_type" : "type-348",
-   "self_type" : "type-348",
+   "referenced_type" : "type-345",
+   "self_type" : "type-345",
    "size" : 56,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_ycbcr"
@@ -30351,108 +30417,108 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-547"
+     "referenced_type" : "type-544"
     },
     {
      "field_name" : "flags",
      "field_offset" : 512,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "field_name" : "width",
      "field_offset" : 544,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "field_name" : "height",
      "field_offset" : 576,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "field_name" : "stride",
      "field_offset" : 608,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "format",
      "field_offset" : 640,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "xdpi",
      "field_offset" : 672,
-     "referenced_type" : "type-563"
+     "referenced_type" : "type-560"
     },
     {
      "field_name" : "ydpi",
      "field_offset" : 704,
-     "referenced_type" : "type-563"
+     "referenced_type" : "type-560"
     },
     {
      "field_name" : "fps",
      "field_offset" : 736,
-     "referenced_type" : "type-563"
+     "referenced_type" : "type-560"
     },
     {
      "field_name" : "minSwapInterval",
      "field_offset" : 768,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "maxSwapInterval",
      "field_offset" : 800,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "numFramebuffers",
      "field_offset" : 832,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 864,
-     "referenced_type" : "type-564"
+     "referenced_type" : "type-561"
     },
     {
      "field_name" : "setSwapInterval",
      "field_offset" : 1088,
-     "referenced_type" : "type-565"
+     "referenced_type" : "type-562"
     },
     {
      "field_name" : "setUpdateRect",
      "field_offset" : 1120,
-     "referenced_type" : "type-568"
+     "referenced_type" : "type-565"
     },
     {
      "field_name" : "post",
      "field_offset" : 1152,
-     "referenced_type" : "type-570"
+     "referenced_type" : "type-567"
     },
     {
      "field_name" : "compositionComplete",
      "field_offset" : 1184,
-     "referenced_type" : "type-572"
+     "referenced_type" : "type-569"
     },
     {
      "field_name" : "dump",
      "field_offset" : 1216,
-     "referenced_type" : "type-574"
+     "referenced_type" : "type-571"
     },
     {
      "field_name" : "enableScreen",
      "field_offset" : 1248,
-     "referenced_type" : "type-565"
+     "referenced_type" : "type-562"
     },
     {
      "field_name" : "reserved_proc",
      "field_offset" : 1280,
-     "referenced_type" : "type-524"
+     "referenced_type" : "type-522"
     }
    ],
    "linker_set_key" : "framebuffer_device_t",
    "name" : "framebuffer_device_t",
-   "referenced_type" : "type-546",
-   "self_type" : "type-546",
+   "referenced_type" : "type-543",
+   "self_type" : "type-543",
    "size" : 184,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h",
    "unique_id" : "framebuffer_device_t"
@@ -30463,63 +30529,73 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-549"
+     "referenced_type" : "type-546"
     },
     {
      "field_name" : "registerBuffer",
      "field_offset" : 1024,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-577"
     },
     {
      "field_name" : "unregisterBuffer",
      "field_offset" : 1056,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-577"
     },
     {
      "field_name" : "lock",
      "field_offset" : 1088,
-     "referenced_type" : "type-583"
+     "referenced_type" : "type-581"
     },
     {
      "field_name" : "unlock",
      "field_offset" : 1120,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-577"
     },
     {
      "field_name" : "perform",
      "field_offset" : 1152,
-     "referenced_type" : "type-585"
+     "referenced_type" : "type-583"
     },
     {
      "field_name" : "lock_ycbcr",
      "field_offset" : 1184,
-     "referenced_type" : "type-587"
+     "referenced_type" : "type-585"
     },
     {
      "field_name" : "lockAsync",
      "field_offset" : 1216,
-     "referenced_type" : "type-589"
+     "referenced_type" : "type-587"
     },
     {
      "field_name" : "unlockAsync",
      "field_offset" : 1248,
-     "referenced_type" : "type-591"
+     "referenced_type" : "type-589"
     },
     {
      "field_name" : "lockAsync_ycbcr",
      "field_offset" : 1280,
+     "referenced_type" : "type-592"
+    },
+    {
+     "field_name" : "getTransportSize",
+     "field_offset" : 1312,
      "referenced_type" : "type-594"
     },
     {
-     "field_name" : "reserved_proc",
-     "field_offset" : 1312,
+     "field_name" : "validateBufferSize",
+     "field_offset" : 1344,
      "referenced_type" : "type-596"
+    },
+    {
+     "field_name" : "reserved_proc",
+     "field_offset" : 1376,
+     "referenced_type" : "type-521"
     }
    ],
    "linker_set_key" : "gralloc_module_t",
    "name" : "gralloc_module_t",
-   "referenced_type" : "type-578",
-   "self_type" : "type-578",
+   "referenced_type" : "type-576",
+   "self_type" : "type-576",
    "size" : 176,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h",
    "unique_id" : "gralloc_module_t"
@@ -30530,33 +30606,33 @@
    [
     {
      "field_name" : "tag",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "version",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "module",
      "field_offset" : 64,
-     "referenced_type" : "type-548"
+     "referenced_type" : "type-545"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 96,
-     "referenced_type" : "type-559"
+     "referenced_type" : "type-556"
     },
     {
      "field_name" : "close",
      "field_offset" : 480,
-     "referenced_type" : "type-560"
+     "referenced_type" : "type-557"
     }
    ],
    "linker_set_key" : "hw_device_t",
    "name" : "hw_device_t",
-   "referenced_type" : "type-547",
-   "self_type" : "type-547",
+   "referenced_type" : "type-544",
+   "self_type" : "type-544",
    "size" : 64,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
    "unique_id" : "hw_device_t"
@@ -30567,13 +30643,13 @@
    [
     {
      "field_name" : "open",
-     "referenced_type" : "type-552"
+     "referenced_type" : "type-549"
     }
    ],
    "linker_set_key" : "hw_module_methods_t",
    "name" : "hw_module_methods_t",
-   "referenced_type" : "type-551",
-   "self_type" : "type-551",
+   "referenced_type" : "type-548",
+   "self_type" : "type-548",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
    "unique_id" : "hw_module_methods_t"
@@ -30584,7 +30660,7 @@
    [
     {
      "field_name" : "tag",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "module_api_version",
@@ -30599,38 +30675,38 @@
     {
      "field_name" : "id",
      "field_offset" : 64,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "field_name" : "name",
      "field_offset" : 96,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "field_name" : "author",
      "field_offset" : 128,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "field_name" : "methods",
      "field_offset" : 160,
-     "referenced_type" : "type-550"
+     "referenced_type" : "type-547"
     },
     {
      "field_name" : "dso",
      "field_offset" : 192,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 224,
-     "referenced_type" : "type-558"
+     "referenced_type" : "type-555"
     }
    ],
    "linker_set_key" : "hw_module_t",
    "name" : "hw_module_t",
-   "referenced_type" : "type-549",
-   "self_type" : "type-549",
+   "referenced_type" : "type-546",
+   "self_type" : "type-546",
    "size" : 128,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
    "unique_id" : "hw_module_t"
@@ -30696,12 +30772,12 @@
    [
     {
      "field_name" : "tv_sec",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "tv_nsec",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "linker_set_key" : "log_time",
@@ -30728,22 +30804,22 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "msg",
@@ -30775,27 +30851,27 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "euid",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "msg",
@@ -30827,27 +30903,27 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "lid",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "msg",
@@ -30879,32 +30955,32 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "lid",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "uid",
      "field_offset" : 192,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "msg",
@@ -30926,28 +31002,28 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "numFds",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "numInts",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "data",
      "field_offset" : 96,
-     "referenced_type" : "type-145"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "native_handle",
    "name" : "native_handle",
-   "referenced_type" : "type-144",
-   "self_type" : "type-144",
+   "referenced_type" : "type-147",
+   "self_type" : "type-147",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
    "unique_id" : "native_handle"
@@ -30957,13 +31033,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-435"
+     "referenced_type" : "type-432"
     }
    ],
    "linker_set_key" : "std::is_floating_point<android::half>",
    "name" : "std::is_floating_point<android::half>",
-   "referenced_type" : "type-434",
-   "self_type" : "type-434",
+   "referenced_type" : "type-431",
+   "self_type" : "type-431",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h",
    "template_args" : [ "type-1" ],
@@ -30974,8 +31050,8 @@
    "linker_set_key" : "std::numeric_limits<android::half>",
    "name" : "std::numeric_limits<android::half>",
    "record_kind" : "class",
-   "referenced_type" : "type-597",
-   "self_type" : "type-597",
+   "referenced_type" : "type-575",
+   "self_type" : "type-575",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h",
    "template_args" : [ "type-1" ],
@@ -30988,8 +31064,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot &&",
    "name" : "android::FenceTime::Snapshot &&",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1386",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1391",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -31015,8 +31091,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &&",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &&",
-   "referenced_type" : "type-99",
-   "self_type" : "type-107",
+   "referenced_type" : "type-101",
+   "self_type" : "type-109",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -31024,8 +31100,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &&",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &&",
-   "referenced_type" : "type-393",
-   "self_type" : "type-399",
+   "referenced_type" : "type-392",
+   "self_type" : "type-396",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -31033,8 +31109,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &&",
-   "referenced_type" : "type-111",
-   "self_type" : "type-113",
+   "referenced_type" : "type-113",
+   "self_type" : "type-115",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -31051,7 +31127,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status &&",
    "name" : "android::hardware::Status &&",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1312",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -31060,7 +31136,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status &&",
    "name" : "android::hardware::details::return_status &&",
-   "referenced_type" : "type-101",
+   "referenced_type" : "type-103",
    "self_type" : "type-1318",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -31069,7 +31145,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_handle &&",
    "name" : "android::hardware::hidl_handle &&",
-   "referenced_type" : "type-139",
+   "referenced_type" : "type-142",
    "self_type" : "type-1087",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -31088,7 +31164,7 @@
    "linker_set_key" : "android::sp<android::Fence> &&",
    "name" : "android::sp<android::Fence> &&",
    "referenced_type" : "type-1357",
-   "self_type" : "type-1410",
+   "self_type" : "type-1415",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31096,8 +31172,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &&",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &&",
-   "referenced_type" : "type-355",
-   "self_type" : "type-378",
+   "referenced_type" : "type-352",
+   "self_type" : "type-375",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31105,8 +31181,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &&",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &&",
-   "referenced_type" : "type-484",
-   "self_type" : "type-491",
+   "referenced_type" : "type-481",
+   "self_type" : "type-488",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31114,8 +31190,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &&",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &&",
-   "referenced_type" : "type-338",
-   "self_type" : "type-386",
+   "referenced_type" : "type-335",
+   "self_type" : "type-383",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31123,8 +31199,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &&",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &&",
-   "referenced_type" : "type-86",
-   "self_type" : "type-94",
+   "referenced_type" : "type-88",
+   "self_type" : "type-96",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31132,8 +31208,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &&",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &&",
-   "referenced_type" : "type-497",
-   "self_type" : "type-504",
+   "referenced_type" : "type-494",
+   "self_type" : "type-501",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31141,7 +31217,7 @@
    "alignment" : 4,
    "linker_set_key" : "int &&",
    "name" : "int &&",
-   "referenced_type" : "type-103",
+   "referenced_type" : "type-105",
    "self_type" : "type-1294",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"